Add proper support for InputSystem

* Fixed Harmony patches not working properly for games which use older BepInEx releases (ie. Risk of Rain 2)
* Fixed a couple minor issues with the config settings

README.md

@@ -6,7 +6,7 @@
   An in-game explorer and a suite of debugging tools for <a href="https://docs.unity3d.com/Manual/IL2CPP.html">IL2CPP</a> and <b>Mono</b> Unity games, to aid with modding development.
 </p>
 
-## Releases [![](https://img.shields.io/github/release/sinai-dev/Explorer.svg?label=release%20notes)](../../releases/latest) [![](https://img.shields.io/github/downloads/sinai-dev/Explorer/total.svg)]() [![](https://img.shields.io/github/downloads/sinai-dev/Explorer/latest/total.svg)]()
+## Releases [![](https://img.shields.io/github/release/sinai-dev/Explorer.svg?label=release%20notes)](../../releases/latest) [![](https://img.shields.io/github/downloads/sinai-dev/Explorer/total.svg)](../../releases) [![](https://img.shields.io/github/downloads/sinai-dev/Explorer/latest/total.svg)](../../releases/latest)
 
 | Mod Loader  | IL2CPP | Mono |
 | ----------- | ------ | ---- |
@@ -19,24 +19,54 @@
 
 ### BepInEx
 
-0. Install [BepInEx](https://github.com/BepInEx/BepInEx) for your game. 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).
-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, you will need to download the [Unity libs](https://github.com/LavaGang/Unity-Runtime-Libraries) for the game's Unity version and put them in the `BepInEx\unity-libs\` folder. 
+1. Install [BepInEx](https://github.com/BepInEx/BepInEx) for your game. 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).
+2. Download the UnityExplorer release for BepInEx IL2CPP or Mono above.
+3. Take the `UnityExplorer.BIE.___.dll` file and put it in `[GameFolder]\BepInEx\plugins\`
+4. In IL2CPP, you will need to download the [Unity libs](https://github.com/LavaGang/Unity-Runtime-Libraries) for the game's Unity version and put them in the `BepInEx\unity-libs\` folder. 
 
 ### MelonLoader
 
-0. Install [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) 0.3+ for your game. Version 0.3 is currently in pre-release, so you must "Enable ALPHA Releases" in your MelonLoader Installer settings to see the option for it.
-1. Download the UnityExplorer release for MelonLoader IL2CPP or Mono above.
-2. Take the `UnityExplorer.ML.___.dll` file and put it in the `[GameFolder]\Mods\` folder.
+1. Install [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) 0.3+ for your game. Version 0.3 is currently in pre-release, so you must "Enable ALPHA Releases" in your MelonLoader Installer settings to see the option for it.
+2. Download the UnityExplorer release for MelonLoader IL2CPP or Mono above.
+3. Take the `UnityExplorer.ML.___.dll` file and put it in the `[GameFolder]\Mods\` folder.
 
 ### Standalone
 
-The standalone release is based on the BepInEx build, so it requires Harmony 2.0 (or HarmonyX) to function properly.
+The standalone release requires you to also load `0Harmony.dll` (HarmonyX, from the `lib\` folder) to function properly, and the IL2CPP also requires `UnhollowerBaseLib.dll` as well. The Mono release should be fairly easy to use with any loader, but the IL2CPP one may be tricky, I'd recommend just using BepInEx or MelonLoader for IL2CPP.
 
-0. Load the DLL from your mod or inject it. You must also make sure `0Harmony.dll` is loaded, and `UnhollowerBaseLib.dll` for IL2CPP as well.
-1. Create an instance of Unity Explorer with `UnityExplorer.ExplorerStandalone.CreateInstance();`
-2. Optionally subscribe to the `ExplorerStandalone.OnLog` event to handle logging if you wish.
+1. Load the UnityExplorer DLL from your mod or inject it, as well as `0Harmony.dll` and `UnhollowerBaseLib.dll` as required.
+2. Create an instance of Unity Explorer with `UnityExplorer.ExplorerStandalone.CreateInstance();`
+3. Optionally subscribe to the `ExplorerStandalone.OnLog` event to handle logging if you wish.
+
+## Issues and contributions
+
+Both issue reports and PR contributions are welcome in this repository.
+
+### Issue reporting
+
+To report an issue with UnityExplorer, please use the following template (as well as any other information / images you can provide).
+
+Template:
+
+```
+* Game issue occurs on: 
+* UnityExplorer version: (eg BIE.IL2CPP v3.3.3, etc)
+
+* Description of issue:
+
+* Unity log link:
+* Mod Loader log link: 
+```
+
+Please upload your Unity log file to [Pastebin](https://pastebin.com/) (or equivalent service) and provide a link to the paste.
+
+* The log should be found at `%userprofile%\AppData\LocalLow\[Company]\[Game]\` unless redirected by your Mod Loader.
+* The file will be called either `output_log.txt` or `Player.log`
+
+As well as the Unity log, please upload your Mod Loader's log:
+
+* BepInEx: `BepInEx\LogOutput.log`
+* MelonLoader: `MelonLoader\Latest.log`
 
 ## Features
 
@@ -94,31 +124,6 @@ Depending on the release you are using, the config file will be found at:
 * MelonLoader: `UserData\MelonPreferences.cfg`
 * Standalone `{DLL_location}\UnityExplorer\config.ini`
 
-`Main Menu Toggle` (KeyCode)
-* Default: `F7`
-* See [this article](https://docs.unity3d.com/ScriptReference/KeyCode.html) for a full list of all accepted KeyCodes.
-
-`Force Unlock Mouse` (bool)
-* Default: `true`
-* Forces the cursor to be unlocked and visible while the UnityExplorer menu is open, and prevents anything else taking control.
-
-`Default Page Limit` (int)
-* Default: `25`
-* Sets the default items per page when viewing lists or search results.
-* <b>Requires a restart to take effect</b>, apart from Reflection Inspector tabs.
-
-`Default Output Path` (string)
-* Default: `Mods\UnityExplorer`
-* Where output is generated to, by default (for Texture PNG saving, etc).
-
-`Log Unity Debug` (bool)
-* 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
 
 Building the project should be straight-forward, the references are all inside the `lib\` folder.
@@ -130,10 +135,10 @@ Building the project should be straight-forward, the references are all inside t
 
 ## Acknowledgments
 
-* [ManlyMarco](https://github.com/ManlyMarco) for [Runtime Unity Editor](https://github.com/ManlyMarco/RuntimeUnityEditor), snippets from the REPL Console were used for UnityExplorer's C# Console.
-* [denikson](https://github.com/denikson) (aka Horse) for [mcs-unity](https://github.com/denikson/mcs-unity), used as the `Mono.CSharp` reference for the C# Console.
-* [HerpDerpenstine](https://github.com/HerpDerpinstine) for [MelonCoroutines](https://github.com/LavaGang/MelonLoader/blob/master/MelonLoader.Support.Il2Cpp/MelonCoroutines.cs), they were included for standalone IL2CPP coroutine support.
-* [InGameCodeEditor](https://assetstore.unity.com/packages/tools/gui/ingame-code-editor-144254) was used as the base for the syntax highlighting for UnityExplorer's C# console (`UnityExplorer.UI.Main.CSConsole.Lexer`).
+* [ManlyMarco](https://github.com/ManlyMarco) for [Runtime Unity Editor](https://github.com/ManlyMarco/RuntimeUnityEditor) \[[license](THIRDPARTY_LICENSES.md#runtimeunityeditor-license)\], snippets from the REPL Console were used for UnityExplorer's C# Console.
+* [denikson](https://github.com/denikson) (aka Horse) for [mcs-unity](https://github.com/denikson/mcs-unity) \[no license\], used as the `Mono.CSharp` reference for the C# Console.
+* [HerpDerpenstine](https://github.com/HerpDerpinstine) for [MelonCoroutines](https://github.com/LavaGang/MelonLoader/blob/6cc958ec23b5e2e8453a73bc2e0d5aa353d4f0d1/MelonLoader.Support.Il2Cpp/MelonCoroutines.cs) \[[license](THIRDPARTY_LICENSES.md#melonloader-license)\], they were included for standalone IL2CPP coroutine support.
+* [InGameCodeEditor](https://assetstore.unity.com/packages/tools/gui/ingame-code-editor-144254) \[[license](THIRDPARTY_LICENSES.md#ingamecodeeditor-license)\] was used as the base for the syntax highlighting for UnityExplorer's C# console (`UnityExplorer.UI.Main.CSConsole.Lexer`).
 
 ### Disclaimer
 

src/Core/CSharp/ScriptInteraction.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI.Main.CSConsole;
 using UnityExplorer.UI.Main.Home;
+using UnityExplorer.UI.Inspectors;
 
 namespace UnityExplorer.Core.CSharp
 {

src/Core/Config/ConfigElement.cs

@@ -46,7 +46,7 @@ namespace UnityExplorer.Core.Config
 
         private void SetValue(T value)
         {
-            if ((m_value == null && value == null) || m_value.Equals(value))
+            if ((m_value == null && value == null) || (m_value != null && m_value.Equals(value)))
                 return;
 
             m_value = value;

src/Core/Config/ConfigManager.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using UnityEngine;
 using UnityExplorer.UI.Main;
@@ -45,6 +46,8 @@ namespace UnityExplorer.Core.Config
             PanelDragger.OnFinishDrag += PanelDragger_OnFinishDrag;
             MainMenu.OnActiveTabChanged += MainMenu_OnActiveTabChanged;
             DebugConsole.OnToggleShow += DebugConsole_OnToggleShow;
+
+            InitConsoleCallback();
         }
 
         internal static void RegisterConfigElement<T>(ConfigElement<T> configElement)
@@ -134,6 +137,33 @@ namespace UnityExplorer.Core.Config
             Last_SceneExplorer_State.Value = showing;
         }
 
+        #region CONSOLE ONEXIT CALLBACK
+
+        internal static void InitConsoleCallback()
+        {
+            handler = new ConsoleEventDelegate(ConsoleEventCallback);
+            SetConsoleCtrlHandler(handler, true);
+        }
+
+        static bool ConsoleEventCallback(int eventType)
+        {
+            // 2 is Console Quit
+            if (eventType == 2)
+                Handler.SaveConfig();
+
+            return false;
+        }
+
+        static ConsoleEventDelegate handler;
+        private delegate bool ConsoleEventDelegate(int eventType);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern bool SetConsoleCtrlHandler(ConsoleEventDelegate callback, bool add);
+
+        #endregion
+
+        #region WINDOW ANCHORS / POSITION HELPERS
+
         // Window Anchors helpers
 
         private const string DEFAULT_WINDOW_ANCHORS = "0.25,0.10,0.78,0.95";
@@ -210,5 +240,7 @@ namespace UnityExplorer.Core.Config
                 //ExplorerCore.LogWarning("Exception setting window position: " + ex);
             }
         }
+
+        #endregion
     }
 }

src/Core/Input/CursorUnlocker.cs

@@ -46,91 +46,33 @@ namespace UnityExplorer.Core.Input
 
             UpdateCursorControl();
 
-            Unlock = true;
+            Unlock = ConfigManager.Force_Unlock_Mouse.Value;
             ConfigManager.Force_Unlock_Mouse.OnValueChanged += (bool val) => { Unlock = val; };
         }
 
-        private static void SetupPatches()
-        {
-            try
-            {
-                if (CursorType == null)
-                {
-                    throw new Exception("Could not find Type 'UnityEngine.Cursor'!");
-                }
-
-                // Get current cursor state and enable cursor
-                try
-                {
-                    m_lastLockMode = (CursorLockMode?)typeof(Cursor).GetProperty("lockState", BF.Public | BF.Static)?.GetValue(null, null)
-                                     ?? CursorLockMode.None;
-
-                    m_lastVisibleState = (bool?)typeof(Cursor).GetProperty("visible", BF.Public | BF.Static)?.GetValue(null, null)
-                                         ?? false;
-                }
-                catch { }
-
-                // Setup Harmony Patches
-                TryPatch(typeof(Cursor),
-                    "lockState",
-                    new HarmonyMethod(typeof(CursorUnlocker).GetMethod(nameof(Prefix_set_lockState))),
-                    true);
-
-                TryPatch(typeof(Cursor),
-                    "visible",
-                    new HarmonyMethod(typeof(CursorUnlocker).GetMethod(nameof(Prefix_set_visible))),
-                    true);
-
-                TryPatch(typeof(EventSystem),
-                    "current",
-                    new HarmonyMethod(typeof(CursorUnlocker).GetMethod(nameof(Prefix_EventSystem_set_current))),
-                    true);
-            }
-            catch (Exception e)
-            {
-                ExplorerCore.Log($"Exception on ForceUnlockCursor.Init! {e.GetType()}, {e.Message}");
-            }
-        }
-
-        private static void TryPatch(Type type, string property, HarmonyMethod patch, bool setter)
-        {
-            try
-            {
-                var harmony = ExplorerCore.Loader.HarmonyInstance;
-
-                var prop = type.GetProperty(property);
-
-                if (setter) // setter is prefix
-                {
-                    harmony.Patch(prop.GetSetMethod(), prefix: patch);
-                }
-                else // getter is postfix
-                {
-                    harmony.Patch(prop.GetGetMethod(), postfix: patch);
-                }
-            }
-            catch (Exception e)
-            {
-                string suf = setter ? "set_" : "get_";
-                ExplorerCore.Log($"Unable to patch {type.Name}.{suf}{property}: {e.Message}");
-            }
-        }
-
         public static void UpdateCursorControl()
         {
             try
             {
                 m_currentlySettingCursor = true;
+
                 if (ShouldActuallyUnlock)
                 {
                     Cursor.lockState = CursorLockMode.None;
                     Cursor.visible = true;
+
+                    if (UIManager.EventSys)
+                        SetEventSystem();
                 }
                 else
                 {
                     Cursor.lockState = m_lastLockMode;
                     Cursor.visible = m_lastVisibleState;
+
+                    if (UIManager.EventSys)
+                        ReleaseEventSystem();
                 }
+
                 m_currentlySettingCursor = false;
             }
             catch (Exception e)
@@ -157,9 +99,7 @@ namespace UnityExplorer.Core.Input
                 if (!m_lastEventSystem)
                     m_lastEventSystem = EventSystem.current;
 
-                //ExplorerCore.Log("Disabling current event system...");
                 m_lastEventSystem.enabled = false;
-                //m_lastEventSystem.gameObject.SetActive(false);
             }
 
             // Set to our current system
@@ -178,7 +118,6 @@ namespace UnityExplorer.Core.Input
             if (m_lastEventSystem)
             {
                 m_lastEventSystem.enabled = true;
-                //m_lastEventSystem.gameObject.SetActive(true);
 
                 m_settingEventSystem = true;
                 EventSystem.current = m_lastEventSystem;
@@ -187,7 +126,30 @@ namespace UnityExplorer.Core.Input
             }
         }
 
-        [HarmonyPrefix]
+        // Patches
+
+        private static void SetupPatches()
+        {
+            try
+            {
+                if (CursorType == null)
+                    throw new Exception("Could not load Type 'UnityEngine.Cursor'!");
+
+                // Get current cursor state and enable cursor
+                m_lastLockMode = (CursorLockMode?)CursorType.GetProperty("lockState", BF.Public | BF.Static)?.GetValue(null, null)
+                                 ?? CursorLockMode.None;
+
+                m_lastVisibleState = (bool?)CursorType.GetProperty("visible", BF.Public | BF.Static)?.GetValue(null, null)
+                                     ?? false;
+
+                ExplorerCore.Loader.SetupPatches();
+            }
+            catch (Exception e)
+            {
+                ExplorerCore.Log($"Error on CursorUnlocker.Init! {e.GetType()}, {e.Message}");
+            }
+        }
+
         public static void Prefix_EventSystem_set_current(ref EventSystem value)
         {
             if (!m_settingEventSystem)
@@ -204,7 +166,6 @@ namespace UnityExplorer.Core.Input
         // Also keep track of when anything else tries to set Cursor state, this will be the
         // value that we set back to when we close the menu or disable force-unlock.
 
-        [HarmonyPrefix]
         public static void Prefix_set_lockState(ref CursorLockMode value)
         {
             if (!m_currentlySettingCursor)
@@ -216,7 +177,6 @@ namespace UnityExplorer.Core.Input
             }
         }
 
-        [HarmonyPrefix]
         public static void Prefix_set_visible(ref bool value)
         {
             if (!m_currentlySettingCursor)

src/Core/Input/IHandleInput.cs

@@ -15,8 +15,6 @@ namespace UnityExplorer.Core.Input
 
         BaseInputModule UIModule { get; }
 
-        PointerEventData InputPointerEvent { get; }
-
         void AddUIInputModule();
         void ActivateModule();
     }

src/Core/Input/InputManager.cs

@@ -27,7 +27,6 @@ namespace UnityExplorer.Core.Input
         public static bool GetMouseButton(int btn) => m_inputModule.GetMouseButton(btn);
 
         public static BaseInputModule UIInput => m_inputModule.UIModule;
-        public static PointerEventData InputPointerEvent => m_inputModule.InputPointerEvent;
 
         public static void ActivateUIModule() => m_inputModule.ActivateModule();
 
@@ -52,7 +51,7 @@ namespace UnityExplorer.Core.Input
 
             if (m_inputModule == null)
             {
-                ExplorerCore.LogWarning("Could not find any Input module!");
+                ExplorerCore.LogWarning("Could not find any Input Module Type!");
                 m_inputModule = new NoInput();
                 CurrentType = InputType.None;
             }

src/Core/Input/InputSystem.cs

@@ -5,6 +5,10 @@ using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityExplorer.UI;
 using System.Collections.Generic;
+using UnityExplorer.UI.Inspectors;
+#if CPP
+using UnhollowerRuntimeLib;
+#endif
 
 namespace UnityExplorer.Core.Input
 {
@@ -131,41 +135,74 @@ namespace UnityExplorer.Core.Input
 
         // UI Input
 
-        //public Type TInputSystemUIInputModule 
-        //    => m_tUIInputModule 
-        //    ?? (m_tUIInputModule = ReflectionHelpers.GetTypeByName("UnityEngine.InputSystem.UI.InputSystemUIInputModule"));
-        //internal Type m_tUIInputModule;
+        public Type TInputSystemUIInputModule
+            => m_tUIInputModule
+            ?? (m_tUIInputModule = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.UI.InputSystemUIInputModule"));
+        internal Type m_tUIInputModule;
 
-        public BaseInputModule UIModule => null; // m_newInputModule;
-        //internal BaseInputModule m_newInputModule;
-
-        public PointerEventData InputPointerEvent => null;
+        public BaseInputModule UIModule => m_newInputModule;
+        internal BaseInputModule m_newInputModule;
 
         public void AddUIInputModule()
         {
-//            if (TInputSystemUIInputModule != null)
-//            {
-//#if CPP
-//                // m_newInputModule = UIManager.CanvasRoot.AddComponent(Il2CppType.From(TInputSystemUIInputModule)).TryCast<BaseInputModule>();
-//#else
-//                m_newInputModule = (BaseInputModule)UIManager.CanvasRoot.AddComponent(TInputSystemUIInputModule);
-//#endif
-//            }
-//            else
-//            {
-//                ExplorerCore.LogWarning("New input system: Could not find type by name 'UnityEngine.InputSystem.UI.InputSystemUIInputModule'");
-//            }
+            if (TInputSystemUIInputModule == null)
+            {
+                ExplorerCore.LogWarning("Unable to find UI Input Module Type, Input will not work!");
+                return;
+            }
+
+            var assetType = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.InputActionAsset");
+#if CPP
+                m_newInputModule = UIManager.CanvasRoot.AddComponent(Il2CppType.From(TInputSystemUIInputModule)).TryCast<BaseInputModule>();
+                var asset = ScriptableObject.CreateInstance(Il2CppType.From(assetType));
+#else
+            m_newInputModule = (BaseInputModule)UIManager.CanvasRoot.AddComponent(TInputSystemUIInputModule);
+            var asset = ScriptableObject.CreateInstance(assetType);
+#endif
+            inputExtensions = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.InputActionSetupExtensions");
+
+            var addMap = inputExtensions.GetMethod("AddActionMap", new Type[] { assetType, typeof(string) });
+            var map = addMap.Invoke(null, new object[] { asset, "UI" });
+
+            CreateAction(map, "point", new[] { "<Mouse>/position" }, "point");
+            CreateAction(map, "click", new[] { "<Mouse>/leftButton" }, "leftClick");
+            CreateAction(map, "rightClick", new[] { "<Mouse>/rightButton" }, "rightClick");
+            CreateAction(map, "scrollWheel", new[] { "<Mouse>/scroll" }, "scrollWheel");
+
+            UI_Enable = map.GetType().GetMethod("Enable");
+            UI_Enable.Invoke(map, new object[0]);
+            UI_ActionMap = map;
+        }
+
+        private Type inputExtensions;
+        private object UI_ActionMap;
+        private MethodInfo UI_Enable;
+
+        private void CreateAction(object map, string actionName, string[] bindings, string propertyName)
+        {
+            var addAction = inputExtensions.GetMethod("AddAction");
+            var pointAction = addAction.Invoke(null, new object[] { map, actionName, default, null, null, null, null, null });
+
+            var inputActionType = pointAction.GetType();
+            var addBinding = inputExtensions.GetMethod("AddBinding",
+                new Type[] { inputActionType, typeof(string), typeof(string), typeof(string), typeof(string) });
+
+            foreach (string binding in bindings)
+                addBinding.Invoke(null, new object[] { pointAction, binding, null, null, null });
+
+            var inputRef = ReflectionUtility.GetTypeByName("UnityEngine.InputSystem.InputActionReference")
+                            .GetMethod("Create")
+                            .Invoke(null, new object[] { pointAction });
+
+            TInputSystemUIInputModule
+                .GetProperty(propertyName)
+                .SetValue(m_newInputModule, inputRef, null);
         }
 
         public void ActivateModule()
         {
-//#if CPP
-//            // m_newInputModule.ActivateModule();
-//#else
-//            m_newInputModule.ActivateModule();
-//#endif
-
-
+            m_newInputModule.ActivateModule();
+            UI_Enable.Invoke(UI_ActionMap, new object[0]);
         }
     }
 }

src/Core/Input/LegacyInput.cs

@@ -44,13 +44,6 @@ namespace UnityExplorer.Core.Input
         public BaseInputModule UIModule => m_inputModule;
         internal StandaloneInputModule m_inputModule;
 
-        public PointerEventData InputPointerEvent =>
-#if CPP
-            m_inputModule.m_InputPointerEvent;
-#else
-            null;
-#endif
-
         public void AddUIInputModule()
         {
             m_inputModule = UIManager.CanvasRoot.gameObject.AddComponent<StandaloneInputModule>();

src/Core/Input/NoInput.cs

@@ -16,7 +16,6 @@ namespace UnityExplorer.Core.Input
         public bool GetMouseButtonDown(int btn) => false;
 
         public BaseInputModule UIModule => null;
-        public PointerEventData InputPointerEvent => null;
         public void ActivateModule() { }
         public void AddUIInputModule() { }
     }

src/Core/ReflectionUtility.cs

@@ -7,7 +7,7 @@ using System.Reflection;
 using BF = System.Reflection.BindingFlags;
 using UnityExplorer.Core.Runtime;
 
-namespace UnityExplorer.Core
+namespace UnityExplorer
 {
     public static class ReflectionUtility
     {
@@ -18,7 +18,7 @@ namespace UnityExplorer.Core
         /// </summary>
         /// <param name="obj">The object to get the true Type for.</param>
         /// <returns>The most accurate Type of the object which could be identified.</returns>
-        public static Type GetType(this object obj)
+        public static Type GetActualType(this object obj)
         {
             if (obj == null)
                 return null;
@@ -32,7 +32,7 @@ namespace UnityExplorer.Core
         /// <param name="obj">The object to cast</param>
         /// <returns>The object, cast to the underlying Type if possible, otherwise the original object.</returns>
         public static object Cast(this object obj)
-            => ReflectionProvider.Instance.Cast(obj, GetType(obj));
+            => ReflectionProvider.Instance.Cast(obj, GetActualType(obj));
 
         /// <summary>
         /// Cast an object to a Type, if possible.
@@ -105,7 +105,7 @@ namespace UnityExplorer.Core
         /// <summary>
         /// Get all base types of the provided Type, including itself.
         /// </summary>
-        public static Type[] GetAllBaseTypes(this object obj) => GetAllBaseTypes(GetType(obj));
+        public static Type[] GetAllBaseTypes(this object obj) => GetAllBaseTypes(GetActualType(obj));
 
         /// <summary>
         /// Get all base types of the provided Type, including itself.

src/Core/Runtime/Il2Cpp/Il2CppProvider.cs

@@ -89,10 +89,13 @@ namespace UnityExplorer.Core.Runtime.Il2Cpp
 
         internal delegate void d_GetRootGameObjects(int handle, IntPtr list);
 
-        public override GameObject[] GetRootGameObjects(Scene scene) => GetRootGameObjects(scene.handle);
-
-        public static GameObject[] GetRootGameObjects(int handle)
+        public override GameObject[] GetRootGameObjects(Scene scene)
         {
+            if (!scene.isLoaded)
+                return new GameObject[0];
+
+            int handle = scene.handle;
+
             if (handle == -1)
                 return new GameObject[0];
 

src/Core/Runtime/Il2Cpp/Il2CppReflection.cs

@@ -154,21 +154,24 @@ namespace UnityExplorer.Core.Runtime.Il2Cpp
         /// <returns>The object, as the type (or a normal C# object) if successful or the input value if not.</returns>
         public static object Il2CppCast(object obj, Type castTo)
         {
-            if (!(obj is Il2CppSystem.Object ilObj))
+            if (!(obj is Il2CppSystem.Object cppObj))
                 return obj;
 
             if (!Il2CppTypeNotNull(castTo, out IntPtr castToPtr))
                 return obj;
 
-            IntPtr castFromPtr = il2cpp_object_get_class(ilObj.Pointer);
+            IntPtr castFromPtr = il2cpp_object_get_class(cppObj.Pointer);
 
             if (!il2cpp_class_is_assignable_from(castToPtr, castFromPtr))
-                return obj;
+                return null;
 
             if (RuntimeSpecificsStore.IsInjected(castToPtr))
-                return UnhollowerBaseLib.Runtime.ClassInjectorBase.GetMonoObjectFromIl2CppPointer(ilObj.Pointer);
+                return UnhollowerBaseLib.Runtime.ClassInjectorBase.GetMonoObjectFromIl2CppPointer(cppObj.Pointer);
 
-            return Activator.CreateInstance(castTo, ilObj.Pointer);
+            if (castTo == typeof(string))
+                return cppObj.ToString();
+
+            return Activator.CreateInstance(castTo, cppObj.Pointer);
         }
 
         /// <summary>
@@ -319,6 +322,14 @@ namespace UnityExplorer.Core.Runtime.Il2Cpp
             return false;
         }
 
+        public override void BoxStringToType(ref object value, Type castTo)
+        {
+            if (castTo == typeof(Il2CppSystem.String))
+                value = (Il2CppSystem.String)(value as string);
+            else
+                value = (Il2CppSystem.Object)(value as string);
+        }
+
         // ~~~~~~~~~~ not used ~~~~~~~~~~~~
 
         // cached il2cpp unbox methods

src/Core/Runtime/Mono/MonoProvider.cs

@@ -52,6 +52,9 @@ namespace UnityExplorer.Core.Runtime.Mono
 
         public override GameObject[] GetRootGameObjects(Scene scene)
         {
+            if (!scene.isLoaded)
+                return new GameObject[0];
+
             return scene.GetRootGameObjects();
         }
 

src/Core/Runtime/Mono/MonoReflection.cs

@@ -27,6 +27,9 @@ namespace UnityExplorer.Core.Runtime.Mono
 
         public override string ProcessTypeNameInString(Type type, string theString, ref string typeName)
             => theString;
+
+        // not necessary
+        public override void BoxStringToType(ref object _string, Type castTo) { }
     }
 }
 

src/Core/Runtime/ReflectionProvider.cs

@@ -25,5 +25,7 @@ namespace UnityExplorer.Core.Runtime
         public abstract string ProcessTypeNameInString(Type type, string theString, ref string typeName);
 
         public abstract bool LoadModule(string module);
+
+        public abstract void BoxStringToType(ref object _string, Type castTo);
     }
 }

src/Core/TestClass.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace UnityExplorer
+{
+    public static class TestClass
+    {
+#if CPP
+        public static string testStringOne = "Test";
+        public static Il2CppSystem.Object testStringTwo = "string boxed as cpp object";
+        public static Il2CppSystem.String testStringThree = "string boxed as cpp string";
+        public static string nullString = null;
+
+        public static Il2CppSystem.Collections.Hashtable testHashset;
+
+        static TestClass()
+        {
+            testHashset = new Il2CppSystem.Collections.Hashtable();
+            testHashset.Add("key1", "itemOne");
+            testHashset.Add("key2", "itemTwo");
+            testHashset.Add("key3", "itemThree");
+        }
+#endif
+    }
+}

src/ExplorerCore.cs

@@ -5,6 +5,7 @@ using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Input;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI;
+using UnityExplorer.UI.Inspectors;
 using UnityExplorer.UI.Main;
 
 namespace UnityExplorer
@@ -12,7 +13,7 @@ namespace UnityExplorer
     public class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "3.3.2";
+        public const string VERSION = "3.3.7";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 
@@ -46,6 +47,8 @@ namespace UnityExplorer
             UIManager.Init();
 
             Log($"{NAME} {VERSION} initialized.");
+
+            // InspectorManager.Instance.Inspect(typeof(TestClass));
         }
 
         public static void Update()

src/Loader/BIE/ExplorerBepInPlugin.cs

@@ -10,6 +10,9 @@ using System.Text;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Loader.BIE;
 using UnityEngine;
+using UnityExplorer.Core;
+using UnityEngine.EventSystems;
+using UnityExplorer.Core.Input;
 #if CPP
 using BepInEx.IL2CPP;
 using UnhollowerRuntimeLib;
@@ -75,10 +78,8 @@ namespace UnityExplorer
 
             ClassInjector.RegisterTypeInIl2Cpp<ExplorerBehaviour>();
 
-            var obj = new GameObject(
-                "ExplorerBehaviour",
-                new Il2CppSystem.Type[] { Il2CppType.Of<ExplorerBehaviour>() }
-            );
+            var obj = new GameObject("ExplorerBehaviour");
+            obj.AddComponent<ExplorerBehaviour>();
             obj.hideFlags = HideFlags.HideAndDontSave;
             GameObject.DontDestroyOnLoad(obj);
 
@@ -101,6 +102,48 @@ namespace UnityExplorer
             }
         }
 #endif
+
+        public void SetupPatches()
+        {
+            try
+            {
+                this.HarmonyInstance.PatchAll();
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.Log($"Exception setting up Harmony patches:\r\n{ex.ReflectionExToString()}");
+            }
+        }
+
+        [HarmonyPatch(typeof(EventSystem), "current", MethodType.Setter)]
+        public class PATCH_EventSystem_current
+        {
+            [HarmonyPrefix]
+            public static void Prefix_EventSystem_set_current(ref EventSystem value)
+            {
+                CursorUnlocker.Prefix_EventSystem_set_current(ref value);
+            }
+        }
+
+        [HarmonyPatch(typeof(Cursor), "lockState", MethodType.Setter)]
+        public class PATCH_Cursor_lockState
+        {
+            [HarmonyPrefix]
+            public static void Prefix_set_lockState(ref CursorLockMode value)
+            {
+                CursorUnlocker.Prefix_set_lockState(ref value);
+            }
+        }
+
+        [HarmonyPatch(typeof(Cursor), "visible", MethodType.Setter)]
+        public class PATCH_Cursor_visible
+        {
+            [HarmonyPrefix]
+            public static void Prefix_set_visible(ref bool value)
+            {
+                CursorUnlocker.Prefix_set_visible(ref value);
+            }
+        }
     }
 }
 #endif

src/Loader/IExplorerLoader.cs

@@ -17,10 +17,6 @@ namespace UnityExplorer
         Action<object> OnLogWarning { get; }
         Action<object> OnLogError { get; }
 
-#if ML
-        Harmony.HarmonyInstance HarmonyInstance { get; }
-#else
-        HarmonyLib.Harmony HarmonyInstance { get; }
-#endif
+        void SetupPatches();
     }
 }

src/Loader/ML/ExplorerMelonMod.cs

@@ -1,10 +1,14 @@
 #if ML
 using System;
 using System.IO;
+using Harmony;
 using MelonLoader;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityExplorer;
+using UnityExplorer.Core;
 using UnityExplorer.Core.Config;
+using UnityExplorer.Core.Input;
 using UnityExplorer.Loader.ML;
 
 [assembly: MelonInfo(typeof(ExplorerMelonMod), ExplorerCore.NAME, ExplorerCore.VERSION, ExplorerCore.AUTHOR)]
@@ -40,6 +44,41 @@ namespace UnityExplorer
         {
             ExplorerCore.Update();
         }
+
+        public void SetupPatches()
+        {
+            try
+            {
+                PrefixProperty(typeof(Cursor),
+                "lockState",
+                new HarmonyMethod(typeof(CursorUnlocker).GetMethod(nameof(CursorUnlocker.Prefix_set_lockState))));
+
+                PrefixProperty(typeof(Cursor),
+                    "visible",
+                    new HarmonyMethod(typeof(CursorUnlocker).GetMethod(nameof(CursorUnlocker.Prefix_set_visible))));
+
+                PrefixProperty(typeof(EventSystem),
+                    "current",
+                    new HarmonyMethod(typeof(CursorUnlocker).GetMethod(nameof(CursorUnlocker.Prefix_EventSystem_set_current))));
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.Log($"Exception setting up Harmony patches:\r\n{ex.ReflectionExToString()}");
+            }
+        }
+
+        private void PrefixProperty(Type type, string property, HarmonyMethod prefix)
+        {
+            try
+            {
+                var prop = type.GetProperty(property);
+                this.Harmony.Patch(prop.GetSetMethod(), prefix: prefix);
+            }
+            catch (Exception e)
+            {
+                ExplorerCore.Log($"Unable to patch {type.Name}.set_{property}: {e.Message}");
+            }
+        }
     }
 }
 #endif

src/Loader/ML/MelonLoaderConfigHandler.cs

@@ -21,7 +21,11 @@ namespace UnityExplorer.Loader.ML
         {
             prefCategory = MelonPreferences.CreateCategory(CTG_NAME, $"{CTG_NAME} Settings");
 
-            MelonPreferences.Mapper.RegisterMapper(KeycodeReader, KeycodeWriter);
+            try
+            {
+                MelonPreferences.Mapper.RegisterMapper(KeycodeReader, KeycodeWriter);
+            }
+            catch { }
         }
 
         public override void LoadConfig()
@@ -69,7 +73,6 @@ namespace UnityExplorer.Loader.ML
 
         public override void OnAnyConfigChanged()
         {
-            MelonPreferences.Save();
         }
 
         public override void SaveConfig()

src/Loader/STANDALONE/ExplorerStandalone.cs

@@ -6,6 +6,9 @@ using System.Reflection;
 using UnityEngine;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Loader.STANDALONE;
+using UnityEngine.EventSystems;
+using UnityExplorer.Core.Input;
+using UnityExplorer.Core;
 #if CPP
 using UnhollowerRuntimeLib;
 #endif
@@ -86,17 +89,9 @@ namespace UnityExplorer
 
 #if CPP
             ClassInjector.RegisterTypeInIl2Cpp<ExplorerBehaviour>();
-
-            var obj = new GameObject(
-                "ExplorerBehaviour",
-                new Il2CppSystem.Type[] { Il2CppType.Of<ExplorerBehaviour>() }
-            );
-#else
-            var obj = new GameObject(
-                "ExplorerBehaviour",
-                new Type[] { typeof(ExplorerBehaviour) }
-            );
 #endif
+            var obj = new GameObject("ExplorerBehaviour");
+            obj.AddComponent<ExplorerBehaviour>();
 
             GameObject.DontDestroyOnLoad(obj);
             obj.hideFlags = HideFlags.HideAndDontSave;
@@ -114,6 +109,48 @@ namespace UnityExplorer
                 ExplorerCore.Update();
             }
         }
+
+        public void SetupPatches()
+        {
+            try
+            {
+                this.HarmonyInstance.PatchAll();
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.Log($"Exception setting up Harmony patches:\r\n{ex.ReflectionExToString()}");
+            }
+        }
+
+        [HarmonyPatch(typeof(EventSystem), "current", MethodType.Setter)]
+        public class PATCH_EventSystem_current
+        {
+            [HarmonyPrefix]
+            public static void Prefix_EventSystem_set_current(ref EventSystem value)
+            {
+                CursorUnlocker.Prefix_EventSystem_set_current(ref value);
+            }
+        }
+
+        [HarmonyPatch(typeof(Cursor), "lockState", MethodType.Setter)]
+        public class PATCH_Cursor_lockState
+        {
+            [HarmonyPrefix]
+            public static void Prefix_set_lockState(ref CursorLockMode value)
+            {
+                CursorUnlocker.Prefix_set_lockState(ref value);
+            }
+        }
+
+        [HarmonyPatch(typeof(Cursor), "visible", MethodType.Setter)]
+        public class PATCH_Cursor_visible
+        {
+            [HarmonyPrefix]
+            public static void Prefix_set_visible(ref bool value)
+            {
+                CursorUnlocker.Prefix_set_visible(ref value);
+            }
+        }
     }
 }
 #endif

src/UI/CacheObject/CacheMember.cs

@@ -10,7 +10,7 @@ using UnityExplorer.Core.Runtime;
 using UnityExplorer.Core;
 using UnityExplorer.UI.Utility;
 using UnityExplorer.UI.InteractiveValues;
-using UnityExplorer.UI.Main.Home.Inspectors.Reflection;
+using UnityExplorer.UI.Inspectors.Reflection;
 
 namespace UnityExplorer.UI.CacheObject
 {
@@ -86,7 +86,7 @@ namespace UnityExplorer.UI.CacheObject
             {
                 try
                 {
-                    Type baseType = ReflectionUtility.GetType(IValue.Value) ?? FallbackType;
+                    Type baseType = ReflectionUtility.GetActualType(IValue.Value) ?? FallbackType;
 
                     if (!ReflectionProvider.Instance.IsReflectionSupported(baseType))
                         throw new Exception("Type not supported with reflection");
@@ -94,7 +94,7 @@ namespace UnityExplorer.UI.CacheObject
                     UpdateReflection();
 
                     if (IValue.Value != null)
-                        IValue.Value = IValue.Value.Cast(ReflectionUtility.GetType(IValue.Value));
+                        IValue.Value = IValue.Value.Cast(ReflectionUtility.GetActualType(IValue.Value));
                 }
                 catch (Exception e)
                 {

src/UI/CacheObject/CacheObjectBase.cs

@@ -55,7 +55,7 @@ namespace UnityExplorer.UI.CacheObject
             // if the type has changed fundamentally, make a new interactivevalue for it
             var type = value == null 
                 ? FallbackType
-                : ReflectionUtility.GetType(value);
+                : ReflectionUtility.GetActualType(value);
 
             var ivalueType = InteractiveValue.GetIValueForType(type);
 

src/UI/Inspectors/GameObjects/ChildList.cs

@@ -7,7 +7,7 @@ using UnityEngine.UI;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI.Utility;
 
-namespace UnityExplorer.UI.Main.Home.Inspectors.GameObjects
+namespace UnityExplorer.UI.Inspectors.GameObjects
 {
     public class ChildList
     {
@@ -169,7 +169,7 @@ namespace UnityExplorer.UI.Main.Home.Inspectors.GameObjects
             toggle.onValueChanged.AddListener((bool val) => { OnToggleClicked(thisIndex, val); });
 
             ColorBlock mainColors = new ColorBlock();
-            RuntimeProvider.Instance.SetColorBlock(mainColors, new Color(0.07f, 0.07f, 0.07f), 
+            mainColors = RuntimeProvider.Instance.SetColorBlock(mainColors, new Color(0.07f, 0.07f, 0.07f), 
                 new Color(0.2f, 0.2f, 0.2f, 1), new Color(0.05f, 0.05f, 0.05f));
 
             var mainBtn = UIFactory.CreateButton(btnGroupObj, 

src/UI/Inspectors/GameObjects/ComponentList.cs

@@ -8,7 +8,7 @@ using UnityExplorer.Core;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI.Utility;
 
-namespace UnityExplorer.UI.Main.Home.Inspectors.GameObjects
+namespace UnityExplorer.UI.Inspectors.GameObjects
 {
     public class ComponentList
     {
@@ -75,7 +75,7 @@ namespace UnityExplorer.UI.Main.Home.Inspectors.GameObjects
 
                     var text = s_compListTexts[i];
 
-                    text.text = SignatureHighlighter.ParseFullSyntax(ReflectionUtility.GetType(comp), true);
+                    text.text = SignatureHighlighter.ParseFullSyntax(ReflectionUtility.GetActualType(comp), true);
 
                     var toggle = s_compToggles[i];
 #if CPP
@@ -176,7 +176,7 @@ namespace UnityExplorer.UI.Main.Home.Inspectors.GameObjects
             // Main component button
 
             ColorBlock mainColors = new ColorBlock();
-            RuntimeProvider.Instance.SetColorBlock(mainColors, new Color(0.07f, 0.07f, 0.07f), 
+            mainColors = RuntimeProvider.Instance.SetColorBlock(mainColors, new Color(0.07f, 0.07f, 0.07f), 
                 new Color(0.2f, 0.2f, 0.2f, 1), new Color(0.05f, 0.05f, 0.05f));
 
             var mainBtn = UIFactory.CreateButton(groupObj, 

src/UI/Inspectors/GameObjects/GameObjectControls.cs

@@ -8,7 +8,7 @@ using UnityExplorer.Core.Input;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.Core.Unity;
 
-namespace UnityExplorer.UI.Main.Home.Inspectors.GameObjects
+namespace UnityExplorer.UI.Inspectors.GameObjects
 {
     public class GameObjectControls
     {

src/UI/Inspectors/GameObjects/GameObjectInspector.cs

@@ -7,7 +7,7 @@ using UnityEngine.UI;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.Core.Unity;
 
-namespace UnityExplorer.UI.Main.Home.Inspectors.GameObjects
+namespace UnityExplorer.UI.Inspectors.GameObjects
 {
     public class GameObjectInspector : InspectorBase
     {

src/UI/Inspectors/InspectUnderMouse.cs

@@ -11,6 +11,7 @@ using UnityExplorer.Core.Input;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Main;
+using UnityExplorer.UI.Inspectors;
 
 namespace UnityExplorer.UI.Main.Home
 {

src/UI/Inspectors/InspectorBase.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Unity;
 
-namespace UnityExplorer.UI.Main.Home.Inspectors
+namespace UnityExplorer.UI.Inspectors
 {
     public abstract class InspectorBase
     {

src/UI/Inspectors/InspectorManager.cs

@@ -9,12 +9,11 @@ using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI.Main.Home;
-using UnityExplorer.UI.Main.Home.Inspectors;
 using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.Main.Home.Inspectors.GameObjects;
-using UnityExplorer.UI.Main.Home.Inspectors.Reflection;
+using UnityExplorer.UI.Inspectors.GameObjects;
+using UnityExplorer.UI.Inspectors.Reflection;
 
-namespace UnityExplorer.UI.Main.Home
+namespace UnityExplorer.UI.Inspectors
 {
     public class InspectorManager
     {

src/UI/Inspectors/Reflection/InstanceInspector.cs

@@ -9,7 +9,7 @@ using UnityExplorer.Core;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Runtime;
 
-namespace UnityExplorer.UI.Main.Home.Inspectors.Reflection
+namespace UnityExplorer.UI.Inspectors.Reflection
 {
     public enum MemberScopes
     {

src/UI/Inspectors/Reflection/ReflectionInspector.cs

@@ -9,9 +9,11 @@ using UnityExplorer.Core;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI.CacheObject;
+using UnityExplorer.UI.Main;
+using UnityExplorer.UI.Main.Home;
 using UnityExplorer.UI.Utility;
 
-namespace UnityExplorer.UI.Main.Home.Inspectors.Reflection
+namespace UnityExplorer.UI.Inspectors.Reflection
 {
     public class ReflectionInspector : InspectorBase
     {
@@ -78,7 +80,7 @@ namespace UnityExplorer.UI.Main.Home.Inspectors.Reflection
             if (this is StaticInspector)
                 m_targetType = target as Type;
             else
-                m_targetType = ReflectionUtility.GetType(target);
+                m_targetType = ReflectionUtility.GetActualType(target);
 
             m_targetTypeShortName = SignatureHighlighter.ParseFullSyntax(m_targetType, false);
 

src/UI/Inspectors/Reflection/StaticInspector.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace UnityExplorer.UI.Main.Home.Inspectors.Reflection
+namespace UnityExplorer.UI.Inspectors.Reflection
 {
     public class StaticInspector : ReflectionInspector
     {

src/UI/InteractiveValues/InteractiveDictionary.cs

@@ -218,32 +218,37 @@ namespace UnityExplorer.UI.InteractiveValues
 
         private IDictionary EnumerateWithReflection()
         {
-            var valueType = ReflectionUtility.GetType(Value);
+            var valueType = ReflectionUtility.GetActualType(Value);
 
-            // get keys and values
-            var keys = valueType.GetProperty("Keys").GetValue(Value, null);
-            var values = valueType.GetProperty("Values").GetValue(Value, null);
-
-            // create lists to hold them
             var keyList = new List<object>();
             var valueList = new List<object>();
 
-            // store entries with reflection
-            EnumerateCollection(keys, keyList);
-            EnumerateCollection(values, valueList);
+            var hashtable = Value.Cast(typeof(Il2CppSystem.Collections.Hashtable)) as Il2CppSystem.Collections.Hashtable;
 
-            // make actual mono dictionary
-            var dict = (IDictionary)Activator.CreateInstance(typeof(Dictionary<,>)
-                                             .MakeGenericType(m_typeOfKeys, m_typeofValues));
+            if (hashtable != null)
+            {
+                EnumerateCppHashtable(hashtable, keyList, valueList);
+            }
+            else
+            {
+                var keys = valueType.GetProperty("Keys").GetValue(Value, null);
+                var values = valueType.GetProperty("Values").GetValue(Value, null);
+
+                EnumerateCppIDictionary(keys, keyList);
+                EnumerateCppIDictionary(values, valueList);
+            }
+
+            var dict = Activator.CreateInstance(typeof(Dictionary<,>)
+                                .MakeGenericType(m_typeOfKeys, m_typeofValues))
+                                as IDictionary;
 
-            // finally iterate into mono dictionary
             for (int i = 0; i < keyList.Count; i++)
                 dict.Add(keyList[i], valueList[i]);
 
             return dict;
         }
 
-        private void EnumerateCollection(object collection, List<object> list)
+        private void EnumerateCppIDictionary(object collection, List<object> list)
         {
             // invoke GetEnumerator
             var enumerator = collection.GetType().GetMethod("GetEnumerator").Invoke(collection, null);
@@ -258,11 +263,23 @@ namespace UnityExplorer.UI.InteractiveValues
                 list.Add(current.GetValue(enumerator, null));
             }
         }
+
+        private void EnumerateCppHashtable(Il2CppSystem.Collections.Hashtable hashtable, List<object> keys, List<object> values)
+        {
+            for (int i = 0; i < hashtable.buckets.Count; i++)
+            {
+                var bucket = hashtable.buckets[i];
+                if (bucket == null || bucket.key == null)
+                    continue;
+                keys.Add(bucket.key);
+                values.Add(bucket.val);
+            }
+        }
 #endif
 
-#endregion
+        #endregion
 
-#region UI CONSTRUCTION
+        #region UI CONSTRUCTION
 
         internal GameObject m_listContent;
         internal LayoutElement m_listLayout;

src/UI/InteractiveValues/InteractiveEnumerable.cs

@@ -6,6 +6,7 @@ using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.Core;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Unity;
 using UnityExplorer.UI;
@@ -38,11 +39,11 @@ namespace UnityExplorer.UI.InteractiveValues
 
         internal IEnumerable RefIEnumerable;
         internal IList RefIList;
-#if CPP
-        internal Il2CppSystem.Collections.ICollection CppICollection;
-#else
-        internal ICollection CppICollection = null;
-#endif
+//#if CPP
+//        internal object CppICollection;
+//#else
+//        internal object CppICollection = null;
+//#endif
 
         internal readonly Type m_baseEntryType;
 
@@ -55,13 +56,17 @@ namespace UnityExplorer.UI.InteractiveValues
             RefIEnumerable = Value as IEnumerable;
             RefIList = Value as IList;
 
-#if CPP
-            if (Value != null && RefIList == null)
-            {
-                try { CppICollection = (Value as Il2CppSystem.Object).TryCast<Il2CppSystem.Collections.ICollection>(); }
-                catch { }
-            }
-#endif
+//#if CPP
+//            if (Value != null && RefIList == null)
+//            {
+//                try 
+//                {
+//                    var type = typeof(Il2CppSystem.Collections.ICollection).MakeGenericType(this.m_baseEntryType);
+//                    CppICollection = (Value as Il2CppSystem.Object).Cast(type);
+//                }
+//                catch { }
+//            }
+//#endif
 
             if (m_subContentParent.activeSelf)
             {
@@ -91,8 +96,8 @@ namespace UnityExplorer.UI.InteractiveValues
             if (Value != null)
             {
                 string count = "?";
-                if (m_recacheWanted && (RefIList != null || CppICollection != null))
-                    count = RefIList?.Count.ToString() ?? CppICollection.Count.ToString();
+                if (m_recacheWanted && RefIList != null)// || CppICollection != null))
+                    count = RefIList.Count.ToString();// ?? CppICollection.Count.ToString();
                 else if (!m_recacheWanted)
                     count = m_entries.Count.ToString();
 

src/UI/InteractiveValues/InteractiveString.cs

@@ -9,6 +9,7 @@ using UnityExplorer.Core.Unity;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Utility;
 using UnityExplorer.UI.CacheObject;
+using UnityExplorer.Core.Runtime;
 
 namespace UnityExplorer.UI.InteractiveValues
 {
@@ -23,6 +24,14 @@ namespace UnityExplorer.UI.InteractiveValues
 
         public override void OnValueUpdated()
         {
+#if CPP
+            // strings boxed as Il2CppSystem.Objects can behave weirdly.
+            // GetActualType will find they are a string, but if its boxed
+            // then we need to unbox it like this...
+            if (!(Value is string) && Value is Il2CppSystem.Object cppobj)
+                Value = cppobj.ToString();
+#endif
+
             base.OnValueUpdated();
         }
 
@@ -88,10 +97,18 @@ namespace UnityExplorer.UI.InteractiveValues
             m_labelLayout.flexibleWidth = 0;
         }
 
-        internal void OnApplyClicked()
+        internal void SetValueFromInput()
         {
             Value = m_valueInput.text;
+
+            if (!typeof(string).IsAssignableFrom(Owner.FallbackType))
+                ReflectionProvider.Instance.BoxStringToType(ref Value, Owner.FallbackType);
+            
             Owner.SetValue();
+
+            // revert back to string now
+            OnValueUpdated();
+
             RefreshUIForValue();
         }
 
@@ -162,7 +179,7 @@ namespace UnityExplorer.UI.InteractiveValues
 
             if (Owner.CanWrite)
             {
-                var apply = UIFactory.CreateButton(groupObj, "ApplyButton", "Apply", OnApplyClicked, new Color(0.2f, 0.2f, 0.2f));
+                var apply = UIFactory.CreateButton(groupObj, "ApplyButton", "Apply", SetValueFromInput, new Color(0.2f, 0.2f, 0.2f));
                 UIFactory.SetLayoutElement(apply.gameObject, minWidth: 50, minHeight: 25, flexibleWidth: 0);
             }
             else

src/UI/InteractiveValues/InteractiveValue.cs

@@ -12,6 +12,7 @@ using UnityExplorer.UI;
 using UnityExplorer.UI.Utility;
 using UnityExplorer.UI.CacheObject;
 using UnityExplorer.UI.Main.Home;
+using UnityExplorer.UI.Inspectors;
 
 namespace UnityExplorer.UI.InteractiveValues
 {
@@ -30,8 +31,8 @@ namespace UnityExplorer.UI.InteractiveValues
             // arbitrarily check some types, fastest methods first.
             if (type == typeof(bool))
                 return typeof(InteractiveBool);
-            // if type is primitive then it must be a number if its not a bool
-            else if (type.IsPrimitive)
+            // if type is primitive then it must be a number if its not a bool. Also check for decimal.
+            else if (type.IsPrimitive || type == typeof(decimal))
                 return typeof(InteractiveNumber);
             // check for strings
             else if (type == typeof(string))
@@ -66,7 +67,7 @@ namespace UnityExplorer.UI.InteractiveValues
 
         public static InteractiveValue Create(object value, Type fallbackType)
         {
-            var type = ReflectionUtility.GetType(value) ?? fallbackType;
+            var type = ReflectionUtility.GetActualType(value) ?? fallbackType;
             var iType = GetIValueForType(type);
 
             return (InteractiveValue)Activator.CreateInstance(iType, new object[] { value, type });

src/UI/Main/DebugConsole.cs

@@ -217,7 +217,6 @@ namespace UnityExplorer.UI.Main
             {
                 LogUnity = val;
                 ConfigManager.Log_Unity_Debug.Value = val;
-                ConfigManager.Handler.SaveConfig();
             });
 
             ConfigManager.Log_Unity_Debug.OnValueChanged += (bool val) => { unityToggle.isOn = val; };

src/UI/Main/Home/HomePage.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI.Inspectors;
 
 namespace UnityExplorer.UI.Main.Home
 {

src/UI/Main/Home/SceneExplorer.cs

@@ -13,6 +13,7 @@ using UnityExplorer.UI.Utility;
 using UnityExplorer.UI.Main.Search;
 using System.IO;
 using UnityExplorer.Core;
+using UnityExplorer.UI.Inspectors;
 
 namespace UnityExplorer.UI.Main.Home
 {

src/UI/Main/MainMenu.cs

@@ -180,7 +180,7 @@ namespace UnityExplorer.UI.Main
             // Hide button
 
             ColorBlock colorBlock = new ColorBlock();
-            RuntimeProvider.Instance.SetColorBlock(colorBlock, new Color(65f / 255f, 23f / 255f, 23f / 255f),
+            colorBlock = RuntimeProvider.Instance.SetColorBlock(colorBlock, new Color(65f / 255f, 23f / 255f, 23f / 255f),
                 new Color(35f / 255f, 10f / 255f, 10f / 255f), new Color(156f / 255f, 0f, 0f));
 
             var hideButton = UIFactory.CreateButton(titleBar, 

src/UI/Main/Search/SearchPage.cs

@@ -10,6 +10,7 @@ using UnityExplorer.Core;
 using UnityExplorer.UI.Utility;
 using UnityExplorer.Core.Search;
 using UnityExplorer.UI.Main.Home;
+using UnityExplorer.UI.Inspectors;
 
 namespace UnityExplorer.UI.Main.Search
 {
@@ -129,7 +130,7 @@ namespace UnityExplorer.UI.Main.Search
 
                     if (m_context != SearchContext.StaticClass)
                     {
-                        var name = SignatureHighlighter.ParseFullSyntax(ReflectionUtility.GetType(obj), true);
+                        var name = SignatureHighlighter.ParseFullSyntax(ReflectionUtility.GetActualType(obj), true);
 
                         if (unityObj && m_context != SearchContext.Singleton)
                         {

src/UI/UIManager.cs

@@ -53,8 +53,7 @@ namespace UnityExplorer.UI
             // Force refresh of anchors etc
             Canvas.ForceUpdateCanvases();
 
-            if (!ConfigManager.Hide_On_Startup.Value)
-                ShowMenu = true;
+            ShowMenu = !ConfigManager.Hide_On_Startup.Value;
 
             ExplorerCore.Log("UI initialized.");
         }
@@ -141,6 +140,8 @@ namespace UnityExplorer.UI
                 ExplorerCore.Log("This game does not ship with the 'UI/Default' shader, using manual Default Shader...");
                 Graphic.defaultGraphicMaterial.shader = BackupShader;
             }
+            else
+                BackupShader = Graphic.defaultGraphicMaterial.shader;
 
             ConsoleFont = bundle.LoadAsset<Font>("CONSOLA");
 
@@ -149,9 +150,11 @@ namespace UnityExplorer.UI
 
         private static AssetBundle LoadExplorerUi(string id)
         {
-            var data = ReadFully(typeof(ExplorerCore)
+            var stream = typeof(ExplorerCore)
                 .Assembly
-                .GetManifestResourceStream($"UnityExplorer.Resources.explorerui.{id}.bundle"));
+                .GetManifestResourceStream($"UnityExplorer.Resources.explorerui.{id}.bundle");
+
+            var data = ReadFully(stream);
 
             return AssetBundle.LoadFromMemory(data);
         }

src/UnityExplorer.csproj

@@ -246,6 +246,7 @@
     <Compile Include="Core\Search\SceneFilter.cs" />
     <Compile Include="Core\Search\SearchContext.cs" />
     <Compile Include="Core\Search\SearchProvider.cs" />
+    <Compile Include="Core\TestClass.cs" />
     <Compile Include="Core\Unity\UnityHelpers.cs" />
     <Compile Include="Loader\BIE\BepInExConfigHandler.cs" />
     <Compile Include="Loader\BIE\ExplorerBepInPlugin.cs" />
@@ -286,16 +287,16 @@
     <Compile Include="UI\Main\CSConsole\Lexer\SymbolMatch.cs" />
     <Compile Include="UI\Main\DebugConsole.cs" />
     <Compile Include="UI\Main\Home\HomePage.cs" />
-    <Compile Include="UI\Main\Home\InspectorManager.cs" />
-    <Compile Include="UI\Main\Home\Inspectors\GameObjects\ChildList.cs" />
-    <Compile Include="UI\Main\Home\Inspectors\GameObjects\ComponentList.cs" />
-    <Compile Include="UI\Main\Home\Inspectors\GameObjects\GameObjectControls.cs" />
-    <Compile Include="UI\Main\Home\Inspectors\GameObjects\GameObjectInspector.cs" />
-    <Compile Include="UI\Main\Home\Inspectors\InspectorBase.cs" />
-    <Compile Include="UI\Main\Home\Inspectors\Reflection\InstanceInspector.cs" />
-    <Compile Include="UI\Main\Home\Inspectors\Reflection\ReflectionInspector.cs" />
-    <Compile Include="UI\Main\Home\Inspectors\Reflection\StaticInspector.cs" />
-    <Compile Include="UI\Main\Home\InspectUnderMouse.cs" />
+    <Compile Include="UI\Inspectors\InspectorManager.cs" />
+    <Compile Include="UI\Inspectors\GameObjects\ChildList.cs" />
+    <Compile Include="UI\Inspectors\GameObjects\ComponentList.cs" />
+    <Compile Include="UI\Inspectors\GameObjects\GameObjectControls.cs" />
+    <Compile Include="UI\Inspectors\GameObjects\GameObjectInspector.cs" />
+    <Compile Include="UI\Inspectors\InspectorBase.cs" />
+    <Compile Include="UI\Inspectors\Reflection\InstanceInspector.cs" />
+    <Compile Include="UI\Inspectors\Reflection\ReflectionInspector.cs" />
+    <Compile Include="UI\Inspectors\Reflection\StaticInspector.cs" />
+    <Compile Include="UI\Inspectors\InspectUnderMouse.cs" />
     <Compile Include="UI\Main\Home\SceneExplorer.cs" />
     <Compile Include="UI\Main\MainMenu.cs" />
     <Compile Include="UI\Main\Options\OptionsPage.cs" />