separate Bep5 and Bep6 support. Fix enums not backed by ints.

Author: sinai-dev

README.md

@@ -24,8 +24,9 @@
 
 | Mod Loader  | IL2CPP | Mono |
 | ----------- | ------ | ---- |
-| [BepInEx](https://github.com/BepInEx/BepInEx) | ✔️ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx.Il2Cpp.zip) | ✔️ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx.Mono.zip) |
-| [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) | ✔️ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader.Il2Cpp.zip) | ✔️ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader.Mono.zip) | 
+| [BepInEx](https://github.com/BepInEx/BepInEx) 6.X | ✔️ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx.Il2Cpp.zip) | ❓ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx6.Mono.zip) |
+| [BepInEx](https://github.com/BepInEx/BepInEx) 5.X | ❌ | ✔️ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx5.Mono.zip) |
+| [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) 0.3 | ✔️ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader.Il2Cpp.zip) | ✔️ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader.Mono.zip) | 
 | Standalone | ✔️ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.Standalone.Il2Cpp.zip) | ✔️ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.Standalone.Mono.zip) | 
 
 ## Features
@@ -47,13 +48,17 @@
 
 ### BepInEx
 
+Note: For IL2CPP you should use [BepInEx 6 (Bleeding Edge)](https://builds.bepis.io/projects/bepinex_be), for Mono you should use [BepInEx 5](https://github.com/BepInEx/BepInEx/releases) (until Mono support stabilizes in BepInEx 6).
+
 0. Install [BepInEx](https://github.com/BepInEx/BepInEx) for your game.
 1. Download the UnityExplorer release for BepInEx IL2CPP or Mono above.
 2. Take the `UnityExplorer.BIE.___.dll` file and put it in `[GameFolder]\BepInEx\plugins\`
 3. In IL2CPP, it is highly recommended to get the base Unity libs for the game's Unity version and put them in the `BepInEx\unity-libs\` folder. 
 
 ### MelonLoader
 
+Note: You must use version 0.3 of MelonLoader or greater. Version 0.3 is currently in pre-release, so you must opt-in from your MelonLoader installer (enable alpha releases).
+
 0. Install [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) for your game.
 1. Download the UnityExplorer release for MelonLoader IL2CPP or Mono above.
 2. Take the contents of the release and put it in the `[GameFolder]\Mods\` folder. It should look like `[GameFolder]\Mods\UnityExplorer.ML.___.dll`
@@ -62,12 +67,12 @@
 
 0. Load the DLL from your mod or inject it.
 1. Create an instance of Unity Explorer with `new ExplorerCore();`
-2. You will need to call ExplorerCore.Update() (static method) from your Update method.
+2. You will need to call `ExplorerCore.Update()` (static method) from your Update method.
 3. Subscribe to the `ExplorerCore.OnLog__` methods for logging.
 
-## Mod Config
+## Settings
 
-You can access the settings via the "Options" page of the main menu, or directly from the config at `Mods\UnityExplorer\config.ini` (generated after first launch).
+You can change the settings via the "Options" page of the main menu, or directly from the config file (generated after first launch). The config file will be found either inside a "UnityExplorer" folder in the same directory as where you put the DLL file, or for BepInEx it will be at `BepInEx\config\UnityExplorer\`.
 
 `Main Menu Toggle` (KeyCode)
 * Default: `F7`
@@ -91,17 +96,24 @@ You can access the settings via the "Options" page of the main menu, or directly
 * Default: `false`
 * Listens for Unity `Debug.Log` messages and prints them to UnityExplorer's log.
 
+`Hide on Startup` (bool)
+* Default: `false`
+* If true, UnityExplorer will be hidden when you start the game, you must open it via the keybind.
+
 ## Building
 
-If you'd like to build this yourself, you will need to have installed BepInEx and/or MelonLoader for at least one Unity game. If you want to build all 4 versions, you will need at least one IL2CPP and one Mono game, with BepInEx and MelonLoader installed for both.
+If you'd like to build this yourself, all you need to do is download this repository and build from Visual Studio. If you want to build for BepInEx or MelonLoader IL2CPP then you will need to install the mod loader for a game and set the directory in the `csproj` file.
 
-1. Install BepInEx or MelonLoader for your game, or use the standalone build.
+For IL2CPP:
+1. Install BepInEx or MelonLoader for your game.
 2. Open the `src\UnityExplorer.csproj` file in a text editor.
-3. For IL2CPP builds, make sure you set `BIECppGameFolder` (for BepInEx) and/or `MLCppGameFolder` (for MelonLoader) so the project can locate the necessary references.
-4. Open the `src\UnityExplorer.sln` project.
-5. Select `Solution 'UnityExplorer' (1 of 1 project)` in the Solution Explorer panel, and set the <b>Active config</b> property to the version you want to build, then build it.
-5. The DLLs are built to the `Release\` folder in the root of the repository.
-6. If ILRepack fails or is missing, use the NuGet package manager to re-install `ILRepack.Lib.MSBuild.Task`, then re-build.
+3. Set `BIECppGameFolder` (for BepInEx) and/or `MLCppGameFolder` (for MelonLoader) so the project can locate the necessary references.
+
+For all builds:
+1. Open the `src\UnityExplorer.sln` project.
+2. Select `Solution 'UnityExplorer' (1 of 1 project)` in the Solution Explorer panel, and set the <b>Active config</b> property to the version you want to build, then build it.
+3. The DLLs are built to the `Release\` folder in the root of the repository.
+4. If ILRepack fails or is missing, use the NuGet package manager to re-install `ILRepack.Lib.MSBuild.Task`, then re-build.
 
 ## Credits
 

lib/BepInEx.Unity.dll

@@ -0,0 +1,35 @@
+#if BIE5
+using System;
+using System.IO;
+using System.Reflection;
+using BepInEx;
+using BepInEx.Logging;
+using HarmonyLib;
+
+namespace UnityExplorer
+{
+    [BepInPlugin(ExplorerCore.GUID, "UnityExplorer", ExplorerCore.VERSION)]
+    public class ExplorerBepInPlugin : BaseUnityPlugin
+    {
+        public static ExplorerBepInPlugin Instance;
+
+        public static ManualLogSource Logging => Instance?.Logger;
+
+        public static readonly Harmony HarmonyInstance = new Harmony(ExplorerCore.GUID);
+
+        internal void Awake()
+        {
+            Instance = this;
+
+            new ExplorerCore();
+
+            // HarmonyInstance.PatchAll();
+        }
+
+        internal void Update()
+        {
+            ExplorerCore.Update();
+        }
+    }
+}
+#endif

src/ExplorerBepIn5Plugin.cs

@@ -1,4 +1,4 @@
-#if BIE
+#if BIE6
 using System;
 using System.IO;
 using System.Reflection;

src/ExplorerBepInPlugin.cs renamed to src/ExplorerBepIn6Plugin.cs

@@ -15,7 +15,7 @@ namespace UnityExplorer
     public class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "3.1.12";
+        public const string VERSION = "3.2.0";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 

src/ExplorerCore.cs

@@ -47,13 +47,34 @@ internal void GetNames()
 
                 var list = new List<KeyValuePair<int, string>>();
                 var set = new HashSet<string>();
+
                 foreach (var value in values)
                 {
                     var name = value.ToString();
+
                     if (set.Contains(name)) 
                         continue;
+
                     set.Add(name);
-                    list.Add(new KeyValuePair<int, string>((int)value, name));
+
+                    var backingType = Enum.GetUnderlyingType(type);
+                    int intValue;
+                    try
+                    {
+                        // this approach is necessary, a simple '(int)value' is not sufficient.
+
+                        var unbox = Convert.ChangeType(value, backingType);
+
+                        intValue = (int)Convert.ChangeType(unbox, typeof(int));
+                    }
+                    catch (Exception ex)
+                    {
+                        ExplorerCore.LogWarning("[InteractiveEnum] Could not Unbox underlying type " + backingType.Name + " from " + type.FullName);
+                        ExplorerCore.Log(ex.ToString());
+                        continue;
+                    }
+
+                    list.Add(new KeyValuePair<int, string>(intValue, name));
                 }
 
                 s_enumNamesCache.Add(type, list.ToArray());

src/Inspectors/Reflection/InteractiveValue/InteractiveEnum.cs

@@ -43,6 +43,7 @@ private static void OnContainerResized()
             "Collider2D.Cast",
             "Collider2D.Raycast",
             "Texture2D.SetPixelDataImpl",
+            "Camera.CalculateProjectionMatrixFromPhysicalProperties",
 #endif
         };
         private static readonly HashSet<string> bl_memberNameStartsWith = new HashSet<string>
@@ -172,11 +173,11 @@ public void CacheMembers(Type type)
                 {
                     try
                     {
+                        var sig = GetSig(member);
+
                         //ExplorerCore.Log($"Trying to cache member {sig}...");
                         //ExplorerCore.Log(member.DeclaringType.FullName + "." + member.Name);
 
-                        var sig = GetSig(member);
-
                         var mi = member as MethodInfo;
                         var pi = member as PropertyInfo;
                         var fi = member as FieldInfo;

src/Inspectors/Reflection/ReflectionInspector.cs

@@ -13,6 +13,14 @@
 
 namespace UnityExplorer.Tests
 {
+    internal enum TestByteEnum : byte
+    {
+        One,
+        Two,
+        Three,
+        TwoFiftyFive = 255,
+    }
+
     public static class StaticTestClass
     {
         public static int StaticProperty => 5;
@@ -28,6 +36,8 @@ public static void StaticMethod() { }
 
     public class TestClass
     {
+        internal static TestByteEnum testingByte = TestByteEnum.One;
+
         public string AAALongString = @"1
 2
 3

src/Tests/Tests.cs

@@ -104,7 +104,7 @@ private static void TryPatch(Type type, string property, HarmonyMethod patch, bo
             {
                 var harmony =
 #if ML
-                    ExplorerMelonMod.Instance.harmonyInstance;
+                    ExplorerMelonMod.Instance.Harmony;
 #elif BIE
                     ExplorerBepInPlugin.HarmonyInstance;
 #elif STANDALONE