Cleanups, method summaries, bump version

* Added standalone release build (thanks @Alloc86)
* Improved formatting for ToString methods which accept an IFormatProvider
* When editing a struct, the reference to the parent member will now be updated if you modify the struct values.

README.md

@@ -17,7 +17,6 @@
 - [Features](#features)
 - [How to install](#how-to-install)
 - [Mod Config](#mod-config)
-- [Mouse Control](#mouse-control)
 - [Building](#building)
 - [Credits](#credits)
 
@@ -25,11 +24,12 @@
 
 | Mod Loader  | IL2CPP | Mono |
 | ----------- | ------ | ---- |
-| [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) | ✔️ [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) |
+| [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 | ❌ n/a | ✅ [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) | 
 
-<b>IL2CPP Issues:</b>
-* Some methods may still fail with a `MissingMethodException`, please let me know if you experience this (with full debug log please).
+\* BepInEx 6.X Mono release may not work on all games yet.
 
 ## Features
 
@@ -44,27 +44,44 @@
 * <b>Reflection Inspector</b>: Inspect Properties and Fields. Can also set primitive values and evaluate primitive methods.
 * <b>Search</b>: Search for UnityEngine.Objects with various filters, or use the helpers for static Instances and Classes.
 * <b>C# Console</b>: Interactive console for evaluating C# methods on the fly, with some basic helpers.
-* <b>Inspect-under-mouse</b>: Hover over an object with a collider and inspect it by clicking on it.
+* <b>Inspect-under-mouse</b>: Hover over an object with a collider and inspect it by clicking on it. There's also a UI mode to inspect UI objects.
 
 ## How to install
 
 ### 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.dll` file and put it in `[GameFolder]\BepInEx\plugins\`
-3. Take the `UnityExplorer\` folder (with `explorerui.bundle`) and put it in `[GameFolder]\Mods\`, so it looks like `[GameFolder]\Mods\UnityExplorer\explorerui.bundle`.
-4. In IL2CPP, it is highly recommended to get the base Unity libs for the game's Unity version and put them in the `BepInEx\unhollowed\base\` folder. 
+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.dll` and `[GameFolder]\Mods\UnityExplorer\explorerui.bundle`.
+2. Take the contents of the release and put it in the `[GameFolder]\Mods\` folder. It should look like `[GameFolder]\Mods\UnityExplorer.ML.___.dll`
 
-## Mod Config
+### Standalone
 
-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).
+The standalone release is based on the BepInEx build, so it requires Harmony 2.0 (or HarmonyX) to function properly.
+
+0. Load the DLL from your mod or inject it. You must also make sure that the required libraries (Harmony, Unhollower for Il2Cpp, etc) are loaded.
+1. Create an instance of Unity Explorer with `ExplorerStandalone.CreateInstance();`
+2. Optionally subscribe to the `ExplorerStandalone.OnLog` event to handle logging if you wish.
+
+## Logging
+
+Explorer saves all logs to disk (only keeps the most recent 10 logs). They can be found in a "UnityExplorer" folder in the same place as where you put the DLL file.
+
+These logs are also visible in the Debug Console part of the UI.
+
+## Settings
+
+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`
@@ -82,23 +99,30 @@ You can access the settings via the "Options" page of the main menu, or directly
 `Default Output Path` (string)
 * Default: `Mods\UnityExplorer`
 * Where output is generated to, by default (for Texture PNG saving, etc).
-* Currently this is not actually used for anything, but it will be soon.
 
 `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
 
-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.
 
+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.
+4. For Standalone builds, you can either install BepInEx for the game to build, or just change the .csproj file and set the Unhollower reference manually.
+
+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
 

src/CSConsole/CodeEditor.cs

@@ -32,7 +32,7 @@ namespace UnityExplorer.CSConsole
         private Text inputHighlightText;
 
         private readonly CSharpLexer highlightLexer;
-        private readonly StringBuilder sbHighlight;
+        //private readonly StringBuilder sbHighlight;
 
         internal int m_lastCaretPos;
         internal int m_fixCaretPos;
@@ -68,7 +68,6 @@ The following helper methods are available:
 
         public CodeEditor()
         {
-            sbHighlight = new StringBuilder();
             highlightLexer = new CSharpLexer();
 
             ConstructUI();
@@ -76,8 +75,24 @@ The following helper methods are available:
             InputField.onValueChanged.AddListener((string s) => { OnInputChanged(s); });
         }
 
+        internal static bool IsUserCopyPasting()
+        {
+            return (InputManager.GetKey(KeyCode.LeftControl) || InputManager.GetKey(KeyCode.RightControl))
+                && InputManager.GetKeyDown(KeyCode.V);
+        }
+
         public void Update()
         {
+            if (s_copyPasteBuffer != null)
+            {
+                if (!IsUserCopyPasting())
+                {
+                    OnInputChanged(s_copyPasteBuffer);
+
+                    s_copyPasteBuffer = null;
+                }
+            }
+
             if (EnableCtrlRShortcut)
             {
                 if ((InputManager.GetKey(KeyCode.LeftControl) || InputManager.GetKey(KeyCode.RightControl))
@@ -149,11 +164,18 @@ The following helper methods are available:
             AutoCompleter.ClearAutocompletes();
         }
 
-        public void OnInputChanged(string newInput, bool forceUpdate = false)
-        {
-            string newText = newInput;
+        internal static string s_copyPasteBuffer;
 
-            UpdateIndent(newInput);
+        public void OnInputChanged(string newText, bool forceUpdate = false)
+        {
+            if (IsUserCopyPasting())
+            {
+                //Console.WriteLine("Copy+Paste detected!");
+                s_copyPasteBuffer = newText;
+                return;
+            }
+
+            UpdateIndent(newText);
 
             if (!forceUpdate && string.IsNullOrEmpty(newText))
                 inputHighlightText.text = string.Empty;
@@ -203,35 +225,29 @@ The following helper methods are available:
         {
             int offset = 0;
 
-            sbHighlight.Length = 0;
+            //Console.WriteLine("Highlighting input text:\r\n" + inputText);
+
+            string ret = "";
 
             foreach (LexerMatchInfo match in highlightLexer.GetMatches(inputText))
             {
                 for (int i = offset; i < match.startIndex; i++)
-                {
-                    sbHighlight.Append(inputText[i]);
-                }
+                    ret += inputText[i];
 
-                sbHighlight.Append($"{match.htmlColor}");
+                ret += $"{match.htmlColor}";
 
                 for (int i = match.startIndex; i < match.endIndex; i++)
-                {
-                    sbHighlight.Append(inputText[i]);
-                }
+                    ret += inputText[i];
 
-                sbHighlight.Append(CLOSE_COLOR_TAG);
+                ret += CLOSE_COLOR_TAG;
 
                 offset = match.endIndex;
             }
 
             for (int i = offset; i < inputText.Length; i++)
-            {
-                sbHighlight.Append(inputText[i]);
-            }
+                ret += inputText[i];
 
-            inputText = sbHighlight.ToString();
-
-            return inputText;
+            return ret;
         }
 
         private void AutoIndentCaret()

src/Config/ExplorerConfig.cs

@@ -0,0 +1,153 @@
+using System;
+using System.IO;
+using UnityEngine;
+using IniParser;
+using IniParser.Parser;
+using UnityExplorer.UI;
+
+namespace UnityExplorer.Config
+{
+    public class ExplorerConfig
+    {
+        public static ExplorerConfig Instance;
+
+        internal static readonly IniDataParser _parser = new IniDataParser();
+        internal static readonly string INI_PATH = Path.Combine(ExplorerCore.Loader.ConfigFolder, "config.ini");
+
+        static ExplorerConfig()
+        {
+            _parser.Configuration.CommentString = "#";
+
+            PanelDragger.OnFinishResize += PanelDragger_OnFinishResize;
+        }
+
+        // Actual configs
+        public KeyCode  Main_Menu_Toggle    = KeyCode.F7;
+        public bool     Force_Unlock_Mouse  = true;
+        public int      Default_Page_Limit  = 25;
+        public string   Default_Output_Path = Path.Combine(ExplorerCore.ExplorerFolder, "Output");
+        public bool     Log_Unity_Debug     = false;
+        public bool     Hide_On_Startup     = false;
+        public string   Window_Anchors      = DEFAULT_WINDOW_ANCHORS;
+
+        private const string DEFAULT_WINDOW_ANCHORS = "0.25,0.1,0.78,0.95";
+
+        public static event Action OnConfigChanged;
+
+        internal static void InvokeConfigChanged()
+        {
+            OnConfigChanged?.Invoke();
+        }
+
+        public static void OnLoad()
+        {
+            Instance = new ExplorerConfig();
+
+            if (LoadSettings())
+                return;
+
+            SaveSettings();
+        }
+
+        public static bool LoadSettings()
+        {
+            if (!File.Exists(INI_PATH))
+                return false;
+
+            string ini = File.ReadAllText(INI_PATH);
+
+            var data = _parser.Parse(ini);
+
+            foreach (var config in data.Sections["Config"])
+            {
+                switch (config.KeyName)
+                {
+                    case nameof(Main_Menu_Toggle):
+                        Instance.Main_Menu_Toggle = (KeyCode)Enum.Parse(typeof(KeyCode), config.Value);
+                        break;
+                    case nameof(Force_Unlock_Mouse):
+                        Instance.Force_Unlock_Mouse = bool.Parse(config.Value);
+                        break;
+                    case nameof(Default_Page_Limit):
+                        Instance.Default_Page_Limit = int.Parse(config.Value);
+                        break;
+                    case nameof(Log_Unity_Debug):
+                        Instance.Log_Unity_Debug = bool.Parse(config.Value);
+                        break;
+                    case nameof(Default_Output_Path):
+                        Instance.Default_Output_Path = config.Value;
+                        break;
+                    case nameof(Hide_On_Startup):
+                        Instance.Hide_On_Startup = bool.Parse(config.Value);
+                        break;
+                    case nameof(Window_Anchors):
+                        Instance.Window_Anchors = config.Value;
+                        break;
+                }
+            }
+
+            return true;
+        }
+
+        public static void SaveSettings()
+        {
+            var data = new IniParser.Model.IniData();
+
+            data.Sections.AddSection("Config");
+
+            var sec = data.Sections["Config"];
+            sec.AddKey(nameof(Main_Menu_Toggle),    Instance.Main_Menu_Toggle.ToString());
+            sec.AddKey(nameof(Force_Unlock_Mouse),  Instance.Force_Unlock_Mouse.ToString());
+            sec.AddKey(nameof(Default_Page_Limit),  Instance.Default_Page_Limit.ToString());
+            sec.AddKey(nameof(Log_Unity_Debug),     Instance.Log_Unity_Debug.ToString());
+            sec.AddKey(nameof(Default_Output_Path), Instance.Default_Output_Path);
+            sec.AddKey(nameof(Hide_On_Startup),     Instance.Hide_On_Startup.ToString());
+            sec.AddKey(nameof(Window_Anchors),      GetWindowAnchorsString());
+
+            if (!Directory.Exists(ExplorerCore.Loader.ConfigFolder))
+                Directory.CreateDirectory(ExplorerCore.Loader.ConfigFolder);
+
+            File.WriteAllText(INI_PATH, data.ToString());
+        }
+
+        // ============ Window Anchors specific stuff ============== //
+
+        private static void PanelDragger_OnFinishResize()
+        {
+            Instance.Window_Anchors = GetWindowAnchorsString();
+            SaveSettings();
+        }
+
+        internal Vector4 GetWindowAnchorsVector()
+        {
+            try
+            {
+                var split = Window_Anchors.Split(',');
+                Vector4 ret = Vector4.zero;
+                ret.x = float.Parse(split[0]);
+                ret.y = float.Parse(split[1]);
+                ret.z = float.Parse(split[2]);
+                ret.w = float.Parse(split[3]);
+                return ret;
+            }
+            catch
+            {
+                Window_Anchors = DEFAULT_WINDOW_ANCHORS;
+                return GetWindowAnchorsVector();
+            }
+        }
+
+        internal static string GetWindowAnchorsString()
+        {
+            try
+            {
+                var rect = PanelDragger.Instance.Panel;
+                return $"{rect.anchorMin.x},{rect.anchorMin.y},{rect.anchorMax.x},{rect.anchorMax.y}";
+            }
+            catch
+            {
+                return DEFAULT_WINDOW_ANCHORS;
+            }
+        }
+    }
+}

src/Config/ModConfig.cs

@@ -1,100 +0,0 @@
-using System;
-using System.IO;
-using UnityEngine;
-using IniParser;
-using IniParser.Parser;
-
-namespace UnityExplorer.Config
-{
-    public class ModConfig
-    {
-        public static ModConfig Instance;
-
-        internal static readonly IniDataParser _parser = new IniDataParser();
-        internal const string INI_PATH = ExplorerCore.EXPLORER_FOLDER + @"\config.ini";
-
-        static ModConfig()
-        {
-            _parser.Configuration.CommentString = "#";
-        }
-
-        // Actual configs
-        public KeyCode  Main_Menu_Toggle    = KeyCode.F7;
-        public bool     Force_Unlock_Mouse  = true;
-        public int      Default_Page_Limit  = 25;
-        public string   Default_Output_Path = ExplorerCore.EXPLORER_FOLDER;
-        public bool     Log_Unity_Debug     = false;
-        public bool     Save_Logs_To_Disk   = true;
-
-        public static event Action OnConfigChanged;
-
-        internal static void InvokeConfigChanged()
-        {
-            OnConfigChanged?.Invoke();
-        }
-
-        public static void OnLoad()
-        {
-            Instance = new ModConfig();
-
-            if (LoadSettings())
-                return;
-
-            SaveSettings();
-        }
-
-        public static bool LoadSettings()
-        {
-            if (!File.Exists(INI_PATH))
-                return false;
-
-            string ini = File.ReadAllText(INI_PATH);
-
-            var data = _parser.Parse(ini);
-
-            foreach (var config in data.Sections["Config"])
-            {
-                switch (config.KeyName)
-                {
-                    case "Main_Menu_Toggle":
-                        Instance.Main_Menu_Toggle = (KeyCode)Enum.Parse(typeof(KeyCode), config.Value);
-                        break;
-                    case "Force_Unlock_Mouse":
-                        Instance.Force_Unlock_Mouse = bool.Parse(config.Value);
-                        break;
-                    case "Default_Page_Limit":
-                        Instance.Default_Page_Limit = int.Parse(config.Value);
-                        break;
-                    case "Log_Unity_Debug":
-                        Instance.Log_Unity_Debug = bool.Parse(config.Value);
-                        break;
-                    case "Save_Logs_To_Disk":
-                        Instance.Save_Logs_To_Disk = bool.Parse(config.Value);
-                        break;
-                    case "Default_Output_Path":
-                        Instance.Default_Output_Path = config.Value;
-                        break;
-                }
-            }
-
-            return true;
-        }
-
-        public static void SaveSettings()
-        {
-            var data = new IniParser.Model.IniData();
-
-            data.Sections.AddSection("Config");
-
-            var sec = data.Sections["Config"];
-            sec.AddKey("Main_Menu_Toggle",      Instance.Main_Menu_Toggle.ToString());
-            sec.AddKey("Force_Unlock_Mouse",    Instance.Force_Unlock_Mouse.ToString());
-            sec.AddKey("Default_Page_Limit",    Instance.Default_Page_Limit.ToString());
-            sec.AddKey("Log_Unity_Debug",       Instance.Log_Unity_Debug.ToString());
-            sec.AddKey("Save_Logs_To_Disk",     Instance.Save_Logs_To_Disk.ToString());
-            sec.AddKey("Default_Output_Path",   Instance.Default_Output_Path);
-
-            File.WriteAllText(INI_PATH, data.ToString());
-        }
-    }
-}

src/ExplorerCore.cs

@@ -1,37 +1,37 @@
 using System;
 using System.IO;
+using System.Reflection;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityExplorer.Config;
+using UnityExplorer.Helpers;
 using UnityExplorer.Input;
 using UnityExplorer.Inspectors;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Modules;
-#if CPP
-using UnityExplorer.Helpers;
-#endif
 
 namespace UnityExplorer
 {
     public class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "3.0.6";
+        public const string VERSION = "3.2.2";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
-        public const string EXPLORER_FOLDER = @"Mods\UnityExplorer";
 
         public static ExplorerCore Instance { get; private set; }
 
-        public static bool ShowMenu
-        {
-            get => s_showMenu;
-            set => SetShowMenu(value);
-        }
-        public static bool s_showMenu;
+        private static IExplorerLoader s_loader;
+        public static IExplorerLoader Loader => s_loader
+#if ML
+                                             ?? (s_loader = ExplorerMelonMod.Instance);   
+#elif BIE
+                                             ?? (s_loader = ExplorerBepInPlugin.Instance);
+#elif STANDALONE
+                                             ?? (s_loader = ExplorerStandalone.Instance);
+#endif
 
-        private static bool s_doneUIInit;
-        private static float s_timeSinceStartup;
+        public static string ExplorerFolder => Loader.ExplorerFolder;
 
         public ExplorerCore()
         {
@@ -47,56 +47,29 @@ namespace UnityExplorer
             ReflectionHelpers.TryLoadGameModules();
 #endif
 
-            if (!Directory.Exists(EXPLORER_FOLDER))
-                Directory.CreateDirectory(EXPLORER_FOLDER);
+            if (!Directory.Exists(ExplorerFolder))
+                Directory.CreateDirectory(ExplorerFolder);
 
-            ModConfig.OnLoad();
+            ExplorerConfig.OnLoad();
 
             InputManager.Init();
             ForceUnlockCursor.Init();
 
             SetupEvents();
 
-            ShowMenu = true;
+            UIManager.ShowMenu = true;
 
             Log($"{NAME} {VERSION} initialized.");
         }
 
         public static void Update()
         {
-            if (!s_doneUIInit)
-                CheckUIInit();
+            UIManager.CheckUIInit();
 
             if (MouseInspector.Enabled)
                 MouseInspector.UpdateInspect();
             else
-            {
-                if (InputManager.GetKeyDown(ModConfig.Instance.Main_Menu_Toggle))
-                    ShowMenu = !ShowMenu;
-
-                if (ShowMenu && s_doneUIInit)
-                    UIManager.Update();
-            }
-        }
-
-        private static void CheckUIInit()
-        {
-            s_timeSinceStartup += Time.deltaTime;
-
-            if (s_timeSinceStartup > 0.1f)
-            {
-                s_doneUIInit = true;
-                try
-                {
-                    UIManager.Init();
-                    Log("Initialized UnityExplorer UI.");
-                    // InspectorManager.Instance.Inspect(Tests.TestClass.Instance);
-                }
-                catch (Exception e)
-                {
-                    LogWarning($"Exception setting up UI: {e}");
-                }
-            }
+                UIManager.Update();
         }
 
         private void SetupEvents()
@@ -105,10 +78,14 @@ namespace UnityExplorer
             try
             {
                 Application.add_logMessageReceived(new Action<string, string, LogType>(OnUnityLog));
+
                 SceneManager.add_sceneLoaded(new Action<Scene, LoadSceneMode>((Scene a, LoadSceneMode b) => { OnSceneLoaded(); }));
                 SceneManager.add_activeSceneChanged(new Action<Scene, Scene>((Scene a, Scene b) => { OnSceneLoaded(); }));
             }
-            catch { }
+            catch
+            {
+               // exceptions here are non-fatal, just ignore. 
+            }
 #else
             Application.logMessageReceived += OnUnityLog;
             SceneManager.sceneLoaded += (Scene a, LoadSceneMode b) => { OnSceneLoaded(); }; 
@@ -121,23 +98,6 @@ namespace UnityExplorer
             UIManager.OnSceneChange();
         }
 
-        private static void SetShowMenu(bool show)
-        {
-            s_showMenu = show;
-
-            if (UIManager.CanvasRoot)
-            {
-                UIManager.CanvasRoot.SetActive(show);
-
-                if (show)
-                    ForceUnlockCursor.SetEventSystem();
-                else
-                    ForceUnlockCursor.ReleaseEventSystem();
-            }
-
-            ForceUnlockCursor.UpdateCursorControl();
-        }
-
         private void OnUnityLog(string message, string stackTrace, LogType type)
         {
             if (!DebugConsole.LogUnity)
@@ -168,11 +128,7 @@ namespace UnityExplorer
             if (unity)
                 return;
 
-#if ML
-            MelonLoader.MelonLogger.Log(message?.ToString());
-#else
-            ExplorerBepInPlugin.Logging?.LogMessage(message?.ToString());
-#endif
+            Loader.OnLogMessage(message);
         }
 
         public static void LogWarning(object message, bool unity = false)
@@ -182,11 +138,7 @@ namespace UnityExplorer
             if (unity)
                 return;
 
-#if ML
-            MelonLoader.MelonLogger.LogWarning(message?.ToString());
-#else
-                        ExplorerBepInPlugin.Logging?.LogWarning(message?.ToString());
-#endif
+            Loader.OnLogWarning(message);
         }
 
         public static void LogError(object message, bool unity = false)
@@ -196,22 +148,7 @@ namespace UnityExplorer
             if (unity)
                 return;
 
-#if ML
-            MelonLoader.MelonLogger.LogError(message?.ToString());
-#else
-                        ExplorerBepInPlugin.Logging?.LogError(message?.ToString());
-#endif
-        }
-
-
-        public static string RemoveInvalidFilenameChars(string s)
-        {
-            var invalid = System.IO.Path.GetInvalidFileNameChars();
-            foreach (var c in invalid)
-            {
-                s = s.Replace(c.ToString(), "");
-            }
-            return s;
+            Loader.OnLogError(message);
         }
     }
 }

src/ExplorerMelonMod.cs

@@ -1,29 +0,0 @@
-#if ML
-using System;
-using MelonLoader;
-
-namespace UnityExplorer
-{
-    public class ExplorerMelonMod : MelonMod
-    {
-        public static ExplorerMelonMod Instance;
-
-        public override void OnApplicationStart()
-        {
-            Instance = this;
-
-            new ExplorerCore();
-        }
-
-        public override void OnUpdate()
-        {
-            ExplorerCore.Update();
-        }
-
-        public override void OnLevelWasLoaded(int level)
-        {
-            ExplorerCore.Instance.OnSceneLoaded();
-        }
-    }
-}
-#endif

src/Helpers/ICallHelper.cs

@@ -11,20 +11,27 @@ namespace UnityExplorer.Helpers
     {
         private static readonly Dictionary<string, Delegate> iCallCache = new Dictionary<string, Delegate>();
 
-        public static T GetICall<T>(string iCallName) where T : Delegate
+        /// <summary>
+        /// Helper to get and cache an iCall by providing the signature (eg. "UnityEngine.Resources::FindObjectsOfTypeAll").
+        /// </summary>
+        /// <typeparam name="T">The Type of Delegate to provide for the iCall.</typeparam>
+        /// <param name="signature">The signature of the iCall you want to get.</param>
+        /// <returns>The <typeparamref name="T"/> delegate if successful.</returns>
+        /// <exception cref="MissingMethodException">If the iCall could not be found.</exception>
+        public static T GetICall<T>(string signature) where T : Delegate
         {
-            if (iCallCache.ContainsKey(iCallName))
-                return (T)iCallCache[iCallName];
+            if (iCallCache.ContainsKey(signature))
+                return (T)iCallCache[signature];
 
-            IntPtr ptr = il2cpp_resolve_icall(iCallName);
+            IntPtr ptr = il2cpp_resolve_icall(signature);
 
             if (ptr == IntPtr.Zero)
             {
-                throw new MissingMethodException($"Could not resolve internal call by name '{iCallName}'!");
+                throw new MissingMethodException($"Could not resolve internal call by name '{signature}'!");
             }
 
             Delegate iCall = Marshal.GetDelegateForFunctionPointer(ptr, typeof(T));
-            iCallCache.Add(iCallName, iCall);
+            iCallCache.Add(signature, iCall);
 
             return (T)iCall;
         }

src/Helpers/ReflectionHelpers.cs

@@ -21,26 +21,61 @@ namespace UnityExplorer.Helpers
     {
         public static BF CommonFlags = BF.Public | BF.Instance | BF.NonPublic | BF.Static;
 
+        // cache for GetTypeByName
+        internal static readonly Dictionary<string, Type> s_typesByName = new Dictionary<string, Type>();
+
+        /// <summary>
+        /// Find a <see cref="Type"/> in the current AppDomain whose <see cref="Type.FullName"/> matches the provided <paramref name="fullName"/>.
+        /// </summary>
+        /// <param name="fullName">The <see cref="Type.FullName"/> you want to search for - case sensitive and full matches only.</param>
+        /// <returns>The Type if found, otherwise null.</returns>
         public static Type GetTypeByName(string fullName)
         {
-            foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
+            s_typesByName.TryGetValue(fullName, out Type ret);
+
+            if (ret != null)
+                return ret;
+
+            foreach (var type in from asm in AppDomain.CurrentDomain.GetAssemblies() 
+                                 from type in asm.TryGetTypes() 
+                                 select type)
             {
-                foreach (var type in asm.TryGetTypes())
+                if (type.FullName == fullName)
                 {
-                    if (type.FullName == fullName)
-                    {
-                        return type;
-                    }
+                    ret = type;
+                    break;
                 }
             }
 
-            return null;
+            if (s_typesByName.ContainsKey(fullName))
+                s_typesByName[fullName] = ret;
+            else
+                s_typesByName.Add(fullName, ret);
+
+            return ret;
         }
 
+        // cache for GetBaseTypes
+        internal static readonly Dictionary<string, Type[]> s_cachedTypeInheritance = new Dictionary<string, Type[]>();
+
+        /// <summary>
+        /// Get all base types of the provided Type, including itself.
+        /// </summary>
         public static Type[] GetAllBaseTypes(object obj) => GetAllBaseTypes(GetActualType(obj));
 
+        /// <summary>
+        /// Get all base types of the provided Type, including itself.
+        /// </summary>
         public static Type[] GetAllBaseTypes(Type type)
         {
+            if (type == null)
+                throw new ArgumentNullException("type");
+
+            var name = type.AssemblyQualifiedName;
+
+            if (s_cachedTypeInheritance.TryGetValue(name, out Type[] ret))
+                return ret;
+
             List<Type> list = new List<Type>();
 
             while (type != null)
@@ -49,9 +84,18 @@ namespace UnityExplorer.Helpers
                 type = type.BaseType;
             }
 
-            return list.ToArray();
+            ret = list.ToArray();
+
+            s_cachedTypeInheritance.Add(name, ret);
+
+            return ret;
         }
 
+        /// <summary>
+        /// Helper for IL2CPP to get the underlying true Type (Unhollowed) of the object.
+        /// </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 GetActualType(this object obj)
         {
             if (obj == null)
@@ -59,9 +103,9 @@ namespace UnityExplorer.Helpers
 
             var type = obj.GetType();
 #if CPP
-            if (obj is Il2CppSystem.Object ilObject)
+            if (obj is Il2CppSystem.Object cppObject)
             {
-                if (ilObject is CppType)
+                if (cppObject is CppType)
                     return typeof(CppType);
 
                 if (!string.IsNullOrEmpty(type.Namespace))
@@ -69,22 +113,22 @@ namespace UnityExplorer.Helpers
                     // Il2CppSystem-namespace objects should just return GetType,
                     // because using GetIl2CppType returns the System namespace type instead.
                     if (type.Namespace.StartsWith("System.") || type.Namespace.StartsWith("Il2CppSystem."))
-                        return ilObject.GetType();
+                        return cppObject.GetType();
                 }
 
-                var il2cppType = ilObject.GetIl2CppType();
+                var cppType = cppObject.GetIl2CppType();
 
                 // check if type is injected
-                IntPtr classPtr = il2cpp_object_get_class(ilObject.Pointer);
+                IntPtr classPtr = il2cpp_object_get_class(cppObject.Pointer);
                 if (RuntimeSpecificsStore.IsInjected(classPtr))
                 {
-                    var typeByName = GetTypeByName(il2cppType.FullName);
+                    var typeByName = GetTypeByName(cppType.FullName);
                     if (typeByName != null)
                         return typeByName;
                 }
 
                 // this should be fine for all other il2cpp objects
-                var getType = GetMonoType(il2cppType);
+                var getType = GetMonoType(cppType);
                 if (getType != null)
                     return getType;
             }
@@ -93,19 +137,55 @@ namespace UnityExplorer.Helpers
         }
 
 #if CPP
-        private static readonly Dictionary<CppType, Type> Il2CppToMonoType = new Dictionary<CppType, Type>();
+        // caching for GetMonoType
+        private static readonly Dictionary<string, Type> Il2CppToMonoType = new Dictionary<string, Type>();
 
+        // keep unobfuscated type name cache, used to display proper name.
+        internal static Dictionary<string, string> UnobfuscatedTypeNames = new Dictionary<string, string>();
+
+        /// <summary>
+        /// Try to get the Mono (Unhollowed) Type representation of the provided <see cref="Il2CppSystem.Type"/>.
+        /// </summary>
+        /// <param name="cppType">The Cpp Type you want to convert to Mono.</param>
+        /// <returns>The Mono Type if found, otherwise null.</returns>
         public static Type GetMonoType(CppType cppType)
         {
-            if (Il2CppToMonoType.ContainsKey(cppType))
-                return Il2CppToMonoType[cppType];
+            string name = cppType.AssemblyQualifiedName;
 
-            var getType = Type.GetType(cppType.AssemblyQualifiedName);
-            Il2CppToMonoType.Add(cppType, getType);
-            return getType;
+            if (Il2CppToMonoType.ContainsKey(name))
+                return Il2CppToMonoType[name];
+
+            Type ret = Type.GetType(name);
+            
+            if (ret == null)
+            {
+                string baseName = cppType.FullName;
+                string baseAssembly = cppType.Assembly.GetName().name;
+
+                ret = AppDomain.CurrentDomain
+                    .GetAssemblies()
+                    .FirstOrDefault(a 
+                        => a.GetName().Name == baseAssembly)?
+                    .TryGetTypes()
+                    .FirstOrDefault(t 
+                        => t.CustomAttributes.Any(ca 
+                            => ca.AttributeType.Name == "ObfuscatedNameAttribute"
+                               && (string)ca.ConstructorArguments[0].Value == baseName));
+
+                if (ret != null)
+                {
+                    // unobfuscated type was found, add to cache.
+                    UnobfuscatedTypeNames.Add(cppType.FullName, ret.FullName);
+                }
+            }
+
+            Il2CppToMonoType.Add(name, ret);
+
+            return ret;
         }
 
-        private static readonly Dictionary<Type, IntPtr> CppClassPointers = new Dictionary<Type, IntPtr>();
+        // cached class pointers for Il2CppCast
+        private static readonly Dictionary<string, IntPtr> CppClassPointers = new Dictionary<string, IntPtr>();
 
         /// <summary>
         /// Attempt to cast the object to its underlying type.
@@ -139,7 +219,43 @@ namespace UnityExplorer.Helpers
             return Activator.CreateInstance(castTo, ilObj.Pointer);
         }
 
-        internal static readonly Dictionary<Type, MethodInfo> s_unboxMethods = new Dictionary<Type, MethodInfo>();
+        /// <summary>
+        /// Get the Il2Cpp Class Pointer for the provided Mono (Unhollowed) Type.
+        /// </summary>
+        /// <param name="type">The Mono/Unhollowed Type you want the Il2Cpp Class Pointer for.</param>
+        /// <returns>True if successful, false if not.</returns>
+        public static bool Il2CppTypeNotNull(Type type) => Il2CppTypeNotNull(type, out _);
+
+        /// <summary>
+        /// Get the Il2Cpp Class Pointer for the provided Mono (Unhollowed) Type.
+        /// </summary>
+        /// <param name="type">The Mono/Unhollowed Type you want the Il2Cpp Class Pointer for.</param>
+        /// <param name="il2cppPtr">The IntPtr for the Il2Cpp class, or IntPtr.Zero if not found.</param>
+        /// <returns>True if successful, false if not.</returns>
+        public static bool Il2CppTypeNotNull(Type type, out IntPtr il2cppPtr)
+        {
+            if (CppClassPointers.TryGetValue(type.AssemblyQualifiedName, out il2cppPtr))
+                return il2cppPtr != IntPtr.Zero;
+
+            il2cppPtr = (IntPtr)typeof(Il2CppClassPointerStore<>)
+                    .MakeGenericType(new Type[] { type })
+                    .GetField("NativeClassPtr", BF.Public | BF.Static)
+                    .GetValue(null);
+
+            CppClassPointers.Add(type.AssemblyQualifiedName, il2cppPtr);
+
+            return il2cppPtr != IntPtr.Zero;
+        }
+
+        // Extern C++ methods 
+        [DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public static extern bool il2cpp_class_is_assignable_from(IntPtr klass, IntPtr oklass);
+
+        [DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public static extern IntPtr il2cpp_object_get_class(IntPtr obj);
+
+        // cached il2cpp unbox methods
+        internal static readonly Dictionary<string, MethodInfo> s_unboxMethods = new Dictionary<string, MethodInfo>();
 
         /// <summary>
         /// Attempt to unbox the object to the underlying struct type.
@@ -162,41 +278,18 @@ namespace UnityExplorer.Helpers
             if (!(obj is Il2CppSystem.Object))
                 return obj;
 
-            if (!s_unboxMethods.ContainsKey(type))
+            var name = type.AssemblyQualifiedName;
+
+            if (!s_unboxMethods.ContainsKey(name))
             {
-                s_unboxMethods.Add(type, typeof(Il2CppObjectBase)
+                s_unboxMethods.Add(name, typeof(Il2CppObjectBase)
                                             .GetMethod("Unbox")
                                             .MakeGenericMethod(type));
             }
 
-            return s_unboxMethods[type].Invoke(obj, new object[0]);
+            return s_unboxMethods[name].Invoke(obj, new object[0]);
         }
 
-        public static bool Il2CppTypeNotNull(Type type) => Il2CppTypeNotNull(type, out _);
-
-        public static bool Il2CppTypeNotNull(Type type, out IntPtr il2cppPtr)
-        {
-            if (!CppClassPointers.ContainsKey(type))
-            {
-                il2cppPtr = (IntPtr)typeof(Il2CppClassPointerStore<>)
-                    .MakeGenericType(new Type[] { type })
-                    .GetField("NativeClassPtr", BF.Public | BF.Static)
-                    .GetValue(null);
-
-                CppClassPointers.Add(type, il2cppPtr);
-            }
-            else
-                il2cppPtr = CppClassPointers[type];
-
-            return il2cppPtr != IntPtr.Zero;
-        }
-
-        [DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
-        public static extern bool il2cpp_class_is_assignable_from(IntPtr klass, IntPtr oklass);
-
-        [DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
-        public static extern IntPtr il2cpp_object_get_class(IntPtr obj);
-
 #endif
 
         public static IEnumerable<Type> TryGetTypes(this Assembly asm)
@@ -222,49 +315,17 @@ namespace UnityExplorer.Helpers
             }
         }
 
-#if CPP
-        internal static void TryLoadGameModules()
-        {
-            LoadModule("Assembly-CSharp");
-            LoadModule("Assembly-CSharp-firstpass");
-        }
-
-        public static bool LoadModule(string module)
-        {
-#if ML
-            var path = $@"MelonLoader\Managed\{module}.dll";
-#else
-            var path = $@"BepInEx\unhollowed\{module}.dll";
-#endif
-
-            return LoadModuleInternal(path);
-        }
-
-        internal static bool LoadModuleInternal(string fullPath)
-        {
-            if (!File.Exists(fullPath))
-                return false;
-
-            try
-            {
-                Assembly.Load(File.ReadAllBytes(fullPath));
-                return true;
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.GetType() + ", " + e.Message);
-            }
-
-            return false;
-        }
-#else
-        public static bool LoadModule(string module) => true;
-#endif
+        // Helper for IL2CPP to check if a Type is assignable to IEnumerable
 
 #if CPP
         internal static IntPtr s_cppEnumerableClassPtr;
 #endif
 
+        /// <summary>
+        /// Check if the provided Type is assignable to IEnumerable.
+        /// </summary>
+        /// <param name="t">The Type to check</param>
+        /// <returns>True if the Type is assignable to IEnumerable, otherwise false.</returns>
         public static bool IsEnumerable(Type t)
         {
             if (typeof(IEnumerable).IsAssignableFrom(t))
@@ -275,8 +336,8 @@ namespace UnityExplorer.Helpers
                 if (s_cppEnumerableClassPtr == IntPtr.Zero)
                     Il2CppTypeNotNull(typeof(Il2CppSystem.Collections.IEnumerable), out s_cppEnumerableClassPtr);
 
-                if (s_cppEnumerableClassPtr != IntPtr.Zero 
-                    && Il2CppTypeNotNull(t, out IntPtr classPtr) 
+                if (s_cppEnumerableClassPtr != IntPtr.Zero
+                    && Il2CppTypeNotNull(t, out IntPtr classPtr)
                     && il2cpp_class_is_assignable_from(s_cppEnumerableClassPtr, classPtr))
                 {
                     return true;
@@ -287,10 +348,17 @@ namespace UnityExplorer.Helpers
             return false;
         }
 
+        // Helper for IL2CPP to check if a Type is assignable to IDictionary
+
 #if CPP
         internal static IntPtr s_cppDictionaryClassPtr;
 #endif
 
+        /// <summary>
+        /// Check if the provided Type is assignable to IDictionary.
+        /// </summary>
+        /// <param name="t">The Type to check</param>
+        /// <returns>True if the Type is assignable to IDictionary, otherwise false.</returns>
         public static bool IsDictionary(Type t)
         {
             if (typeof(IDictionary).IsAssignableFrom(t))
@@ -313,18 +381,68 @@ namespace UnityExplorer.Helpers
             return false;
         }
 
-        public static string ExceptionToString(Exception e, bool innerMost = false)
-        {
-            while (innerMost && e.InnerException != null)
-            {
+        // Helper for IL2CPP to try to make sure the Unhollowed game assemblies are actually loaded.
+
 #if CPP
-                if (e.InnerException is System.Runtime.CompilerServices.RuntimeWrappedException runtimeEx)
-                    break;
+        internal static void TryLoadGameModules()
+        {
+            LoadModule("Assembly-CSharp");
+            LoadModule("Assembly-CSharp-firstpass");
+        }
+
+        public static bool LoadModule(string module)
+        {
+#if ML
+            var path = Path.Combine("MelonLoader", "Managed", $"{module}.dll");
+#else
+            var path = Path.Combine("BepInEx", "unhollowed", $"{module}.dll");
 #endif
-                e = e.InnerException;
+            return LoadModuleInternal(path);
+        }
+
+        internal static bool LoadModuleInternal(string fullPath)
+        {
+            if (!File.Exists(fullPath))
+                return false;
+
+            try
+            {
+                Assembly.Load(File.ReadAllBytes(fullPath));
+                return true;
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.GetType() + ", " + e.Message);
             }
 
-            return e.GetType() + ", " + e.Message;
+            return false;
+        }
+#else
+        // For Mono, just return true and do nothing, Mono will sort it out itself.
+        public static bool LoadModule(string module) => true;
+#endif
+
+        /// <summary>
+        /// Helper to display a simple "{ExceptionType}: {Message}" of the exception, and optionally use the inner-most exception.
+        /// </summary>
+        /// <param name="e">The Exception to convert to string.</param>
+        /// <param name="innerMost">Should the inner-most Exception of the stack be used? If false, the Exception you provided will be used directly.</param>
+        /// <returns>The exception to string.</returns>
+        public static string ExceptionToString(Exception e, bool innerMost = false)
+        {
+            if (innerMost)
+            {
+                while (e.InnerException != null)
+                {
+#if CPP
+                    if (e.InnerException is System.Runtime.CompilerServices.RuntimeWrappedException)
+                        break;
+#endif
+                    e = e.InnerException;
+                }
+            }
+
+            return $"{e.GetType()}: {e.Message}";
         }
     }
 }

src/Helpers/Texture2DHelpers.cs

@@ -15,6 +15,16 @@ namespace UnityExplorer.Helpers
         private static MethodInfo EncodeToPNGMethod => m_encodeToPNGMethod ?? GetEncodeToPNGMethod();
         private static MethodInfo m_encodeToPNGMethod;
 
+        public static byte[] EncodeToPNGSafe(this Texture2D tex)
+        {
+            var method = EncodeToPNGMethod;
+
+            if (method.IsStatic)
+                return (byte[])method.Invoke(null, new object[] { tex });
+            else
+                return (byte[])method.Invoke(tex, new object[0]);
+        }
+
         private static MethodInfo GetEncodeToPNGMethod()
         {
             if (ReflectionHelpers.GetTypeByName("UnityEngine.ImageConversion") is Type imageConversion)
@@ -60,7 +70,12 @@ namespace UnityExplorer.Helpers
 
             pixels = orig.GetPixels((int)rect.x, (int)rect.y, (int)rect.width, (int)rect.height);
 
+            // use full constructor for better compatibility
+#if CPP
+            var _newTex = new Texture2D((int)rect.width, (int)rect.height, TextureFormat.RGBA32, Texture.GenerateAllMips, false, IntPtr.Zero);
+#else
             var _newTex = new Texture2D((int)rect.width, (int)rect.height);
+#endif
             _newTex.SetPixels(pixels);
 
             return _newTex;

src/Inspectors/GameObjects/ComponentList.cs

@@ -80,7 +80,11 @@ namespace UnityExplorer.Inspectors.GameObjects
                     text.text = UISyntaxHighlight.ParseFullSyntax(ReflectionHelpers.GetActualType(comp), true);
 
                     var toggle = s_compToggles[i];
+#if CPP
+                    if (comp.TryCast<Behaviour>() is Behaviour behaviour)
+#else
                     if (comp is Behaviour behaviour)
+#endif
                     {
                         if (!toggle.gameObject.activeSelf)
                             toggle.gameObject.SetActive(true);
@@ -107,8 +111,11 @@ namespace UnityExplorer.Inspectors.GameObjects
         internal static void OnCompToggleClicked(int index, bool value)
         {
             var comp = s_compShortlist[index];
-
+#if CPP
+            comp.TryCast<Behaviour>().enabled = value;
+#else
             (comp as Behaviour).enabled = value;
+#endif
         }
 
         internal static void OnCompListObjectClicked(int index)
@@ -130,7 +137,7 @@ namespace UnityExplorer.Inspectors.GameObjects
         }
 
 
-        #region UI CONSTRUCTION
+#region UI CONSTRUCTION
 
         internal void ConstructCompList(GameObject parent)
         {
@@ -168,34 +175,34 @@ namespace UnityExplorer.Inspectors.GameObjects
         {
             int thisIndex = s_compListTexts.Count;
 
-            GameObject btnGroupObj = UIFactory.CreateHorizontalGroup(s_compListContent, new Color(0.07f, 0.07f, 0.07f));
-            HorizontalLayoutGroup btnGroup = btnGroupObj.GetComponent<HorizontalLayoutGroup>();
-            btnGroup.childForceExpandWidth = true;
-            btnGroup.childControlWidth = true;
-            btnGroup.childForceExpandHeight = false;
-            btnGroup.childControlHeight = true;
-            btnGroup.childAlignment = TextAnchor.MiddleLeft;
-            LayoutElement btnLayout = btnGroupObj.AddComponent<LayoutElement>();
-            btnLayout.minWidth = 25;
-            btnLayout.flexibleWidth = 999;
-            btnLayout.minHeight = 25;
-            btnLayout.flexibleHeight = 0;
-            btnGroupObj.AddComponent<Mask>();
+            GameObject groupObj = UIFactory.CreateHorizontalGroup(s_compListContent, new Color(0.07f, 0.07f, 0.07f));
+            HorizontalLayoutGroup group = groupObj.GetComponent<HorizontalLayoutGroup>();
+            group.childForceExpandWidth = true;
+            group.childControlWidth = true;
+            group.childForceExpandHeight = false;
+            group.childControlHeight = true;
+            group.childAlignment = TextAnchor.MiddleLeft;
+            LayoutElement groupLayout = groupObj.AddComponent<LayoutElement>();
+            groupLayout.minWidth = 25;
+            groupLayout.flexibleWidth = 999;
+            groupLayout.minHeight = 25;
+            groupLayout.flexibleHeight = 0;
+            groupObj.AddComponent<Mask>();
 
             // Behaviour enabled toggle
 
-            var toggleObj = UIFactory.CreateToggle(btnGroupObj, out Toggle toggle, out Text toggleText, new Color(0.3f, 0.3f, 0.3f));
+            var toggleObj = UIFactory.CreateToggle(groupObj, out Toggle toggle, out Text toggleText, new Color(0.3f, 0.3f, 0.3f));
             var toggleLayout = toggleObj.AddComponent<LayoutElement>();
             toggleLayout.minHeight = 25;
             toggleLayout.minWidth = 25;
             toggleText.text = "";
-            toggle.isOn = false;
+            toggle.isOn = true;
             s_compToggles.Add(toggle);
             toggle.onValueChanged.AddListener((bool val) => { OnCompToggleClicked(thisIndex, val); });
 
             // Main component button
 
-            GameObject mainButtonObj = UIFactory.CreateButton(btnGroupObj);
+            GameObject mainButtonObj = UIFactory.CreateButton(groupObj);
             LayoutElement mainBtnLayout = mainButtonObj.AddComponent<LayoutElement>();
             mainBtnLayout.minHeight = 25;
             mainBtnLayout.flexibleHeight = 0;
@@ -224,6 +231,6 @@ namespace UnityExplorer.Inspectors.GameObjects
         }
 
 
-        #endregion
+#endregion
     }
 }

src/Inspectors/InspectorManager.cs

@@ -38,7 +38,7 @@ namespace UnityExplorer.Inspectors
             }
         }
 
-        public void Inspect(object obj)
+        public void Inspect(object obj, CacheObjectBase parentMember = null)
         {
 #if CPP
             obj = obj.Il2CppCast(ReflectionHelpers.GetActualType(obj));
@@ -76,6 +76,9 @@ namespace UnityExplorer.Inspectors
             else
                 inspector = new InstanceInspector(obj);
 
+            if (inspector is ReflectionInspector ri)
+                ri.ParentMember = parentMember;
+
             m_currentInspectors.Add(inspector);
             SetInspectorTab(inspector);
         }

src/Inspectors/MouseInspector.cs

@@ -109,21 +109,12 @@ namespace UnityExplorer.Inspectors
         internal static void RaycastWorld(Vector2 mousePos)
         {
             var ray = UnityHelpers.MainCamera.ScreenPointToRay(mousePos);
-            var casts = Physics.RaycastAll(ray, 1000f);
+            Physics.Raycast(ray, out RaycastHit hit, 1000f);
 
-            if (casts.Length > 0)
+            if (hit.transform)
             {
-                foreach (var cast in casts)
-                {
-                    if (cast.transform)
-                    {
-                        var obj = cast.transform.gameObject;
-
-                        OnHitGameObject(obj);
-
-                        break;
-                    }
-                }
+                var obj = hit.transform.gameObject;
+                OnHitGameObject(obj);
             }
             else
             {

src/Inspectors/Reflection/CacheObject/CacheField.cs

@@ -33,6 +33,9 @@ namespace UnityExplorer.Inspectors.Reflection
         {
             var fi = MemInfo as FieldInfo;
             fi.SetValue(fi.IsStatic ? null : DeclaringInstance, IValue.Value);
+
+            if (this.ParentInspector?.ParentMember != null)
+                this.ParentInspector.ParentMember.SetValue();
         }
     }
 }

src/Inspectors/Reflection/CacheObject/CacheMember.cs

@@ -19,6 +19,7 @@ namespace UnityExplorer.Inspectors.Reflection
 
         public override Type FallbackType { get; }
 
+        public ReflectionInspector ParentInspector { get; set; }
         public MemberInfo MemInfo { get; set; }
         public Type DeclaringType { get; set; }
         public object DeclaringInstance { get; set; }
@@ -380,7 +381,7 @@ namespace UnityExplorer.Inspectors.Reflection
             argLabelLayout.minHeight = 25;
             var argText = argLabelObj.GetComponent<Text>();
             var argTypeTxt = UISyntaxHighlight.ParseFullSyntax(arg.ParameterType, false);
-            argText.text = $"{argTypeTxt} <color={UISyntaxHighlight.Local}>{arg.Name}</color>";
+            argText.text = $"{argTypeTxt} <color={UISyntaxHighlight.LOCAL_ARG}>{arg.Name}</color>";
 
             var argInputObj = UIFactory.CreateInputField(rowObj, 14, (int)TextAnchor.MiddleLeft, 1);
             var argInputLayout = argInputObj.AddComponent<LayoutElement>();

src/Inspectors/Reflection/CacheObject/CacheMethod.cs

@@ -168,7 +168,7 @@ namespace UnityExplorer.Inspectors.Reflection
             //var argLayout = argLabelObj.AddComponent<LayoutElement>();
             //argLayout.minWidth = 20;
             var argText = argLabelObj.GetComponent<Text>();
-            argText.text = $"{constrainTxt} <color={UISyntaxHighlight.Enum}>{arg.Name}</color>";
+            argText.text = $"{constrainTxt} <color={UISyntaxHighlight.CONST_VAR}>{arg.Name}</color>";
 
             var argInputObj = UIFactory.CreateInputField(rowObj, 14, (int)TextAnchor.MiddleLeft, 1);
             var argInputLayout = argInputObj.AddComponent<LayoutElement>();

src/Inspectors/Reflection/CacheObject/CacheProperty.cs

@@ -63,6 +63,9 @@ namespace UnityExplorer.Inspectors.Reflection
             var target = pi.GetAccessors()[0].IsStatic ? null : DeclaringInstance;
 
             pi.SetValue(target, IValue.Value, ParseArguments());
+
+            if (this.ParentInspector?.ParentMember != null)
+                this.ParentInspector.ParentMember.SetValue();
         }
     }
 }

src/Inspectors/Reflection/InstanceInspector.cs

@@ -4,6 +4,8 @@ using UnityEngine;
 using UnityExplorer.Helpers;
 using UnityExplorer.UI;
 using UnityEngine.UI;
+using UnityExplorer.Unstrip;
+using System.IO;
 
 namespace UnityExplorer.Inspectors.Reflection
 {
@@ -70,8 +72,8 @@ namespace UnityExplorer.Inspectors.Reflection
 
             // WIP
 
-            //if (m_targetType == typeof(Texture2D))
-            //    ConstructTextureHelper();
+            if (m_targetType == typeof(Texture2D))
+                ConstructTextureHelper();
         }
 
         internal void ConstructCompHelper(GameObject rowObj)
@@ -136,94 +138,176 @@ namespace UnityExplorer.Inspectors.Reflection
             //btn.onClick.AddListener(() => { InspectorManager.Instance.Inspect(comp.gameObject); });
         }
 
-        //internal bool showingTextureHelper;
-        //internal bool constructedTextureViewer;
+        internal bool showingTextureHelper;
+        internal bool constructedTextureViewer;
 
-        //internal void ConstructTextureHelper()
-        //{
-        //    var rowObj = UIFactory.CreateHorizontalGroup(Content, new Color(0.1f, 0.1f, 0.1f));
-        //    var rowLayout = rowObj.AddComponent<LayoutElement>();
-        //    rowLayout.minHeight = 25;
-        //    rowLayout.flexibleHeight = 0;
-        //    var rowGroup = rowObj.GetComponent<HorizontalLayoutGroup>();
-        //    rowGroup.childForceExpandHeight = true;
-        //    rowGroup.childForceExpandWidth = false;
-        //    rowGroup.padding.top = 3;
-        //    rowGroup.padding.left = 3;
-        //    rowGroup.padding.bottom = 3;
-        //    rowGroup.padding.right = 3;
-        //    rowGroup.spacing = 5;
+        internal GameObject m_textureViewerObj;
 
-        //    var showBtnObj = UIFactory.CreateButton(rowObj, new Color(0.2f, 0.2f, 0.2f));
-        //    var showBtnLayout = showBtnObj.AddComponent<LayoutElement>();
-        //    showBtnLayout.minWidth = 50;
-        //    showBtnLayout.flexibleWidth = 0;
-        //    var showText = showBtnObj.GetComponentInChildren<Text>();
-        //    showText.text = "Show";
-        //    var showBtn = showBtnObj.GetComponent<Button>();
+        internal void ConstructTextureHelper()
+        {
+            var rowObj = UIFactory.CreateHorizontalGroup(Content, new Color(0.1f, 0.1f, 0.1f));
+            var rowLayout = rowObj.AddComponent<LayoutElement>();
+            rowLayout.minHeight = 25;
+            rowLayout.flexibleHeight = 0;
+            var rowGroup = rowObj.GetComponent<HorizontalLayoutGroup>();
+            rowGroup.childForceExpandHeight = true;
+            rowGroup.childForceExpandWidth = false;
+            rowGroup.padding.top = 3;
+            rowGroup.padding.left = 3;
+            rowGroup.padding.bottom = 3;
+            rowGroup.padding.right = 3;
+            rowGroup.spacing = 5;
 
-        //    var labelObj = UIFactory.CreateLabel(rowObj, TextAnchor.MiddleLeft);
-        //    var labelText = labelObj.GetComponent<Text>();
-        //    labelText.text = "Texture Viewer";
+            var showBtnObj = UIFactory.CreateButton(rowObj, new Color(0.2f, 0.6f, 0.2f));
+            var showBtnLayout = showBtnObj.AddComponent<LayoutElement>();
+            showBtnLayout.minWidth = 50;
+            showBtnLayout.flexibleWidth = 0;
+            var showText = showBtnObj.GetComponentInChildren<Text>();
+            showText.text = "Show";
+            var showBtn = showBtnObj.GetComponent<Button>();
 
-        //    var textureViewerObj = UIFactory.CreateScrollView(Content, out GameObject scrollContent, out _, new Color(0.1f, 0.1f, 0.1f));
-        //    var viewerGroup = scrollContent.GetComponent<VerticalLayoutGroup>();
-        //    viewerGroup.childForceExpandHeight = false;
-        //    viewerGroup.childForceExpandWidth = false;
-        //    viewerGroup.childControlHeight = true;
-        //    viewerGroup.childControlWidth = true;
-        //    var mainLayout = textureViewerObj.GetComponent<LayoutElement>();
-        //    mainLayout.flexibleHeight = -1;
-        //    mainLayout.flexibleWidth = 2000;
-        //    mainLayout.minHeight = 25;
+            var labelObj = UIFactory.CreateLabel(rowObj, TextAnchor.MiddleLeft);
+            var labelText = labelObj.GetComponent<Text>();
+            labelText.text = "Texture Viewer";
 
-        //    textureViewerObj.SetActive(false);
+            var textureViewerObj = UIFactory.CreateScrollView(Content, out GameObject scrollContent, out _, new Color(0.1f, 0.1f, 0.1f));
+            var viewerGroup = scrollContent.GetComponent<VerticalLayoutGroup>();
+            viewerGroup.childForceExpandHeight = false;
+            viewerGroup.childForceExpandWidth = false;
+            viewerGroup.childControlHeight = true;
+            viewerGroup.childControlWidth = true;
+            var mainLayout = textureViewerObj.GetComponent<LayoutElement>();
+            mainLayout.flexibleHeight = 9999;
+            mainLayout.flexibleWidth = 9999;
+            mainLayout.minHeight = 100;
 
-        //    showBtn.onClick.AddListener(() =>
-        //    {
-        //        showingTextureHelper = !showingTextureHelper;
+            textureViewerObj.SetActive(false);
 
-        //        if (showingTextureHelper)
-        //        {
-        //            if (!constructedTextureViewer)
-        //                ConstructTextureViewerArea(scrollContent);
+            m_textureViewerObj = textureViewerObj;
 
-        //            showText.text = "Hide";
-        //            textureViewerObj.SetActive(true);
-        //        }
-        //        else
-        //        {
-        //            showText.text = "Show";
-        //            textureViewerObj.SetActive(false);
-        //        }
-        //    });
-        //}
+            showBtn.onClick.AddListener(() =>
+            {
+                showingTextureHelper = !showingTextureHelper;
 
-        //internal void ConstructTextureViewerArea(GameObject parent)
-        //{
-        //    constructedTextureViewer = true;
+                if (showingTextureHelper)
+                {
+                    if (!constructedTextureViewer)
+                        ConstructTextureViewerArea(scrollContent);
 
-        //    var tex = Target as Texture2D;
+                    showText.text = "Hide";
+                    ToggleTextureViewer(true);
+                }
+                else
+                {
+                    showText.text = "Show";
+                    ToggleTextureViewer(false);
+                }
+            });
+        }
 
-        //    if (!tex)
-        //    {
-        //        ExplorerCore.LogWarning("Could not cast the target instance to Texture2D!");
-        //        return;
-        //    }
+        internal void ConstructTextureViewerArea(GameObject parent)
+        {
+            constructedTextureViewer = true;
 
-        //    var imageObj = UIFactory.CreateUIObject("TextureViewerImage", parent, new Vector2(1, 1));
-        //    var image = imageObj.AddComponent<Image>();
-        //    var sprite = UIManager.CreateSprite(tex);
-        //    image.sprite = sprite;
+            var tex = Target as Texture2D;
+#if CPP
+            if (!tex)
+                tex = (Target as Il2CppSystem.Object).TryCast<Texture2D>();
+#endif
 
-        //    var fitter = imageObj.AddComponent<ContentSizeFitter>();
-        //    fitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
-        //    //fitter.horizontalFit = ContentSizeFitter.FitMode.PreferredSize;
+            if (!tex)
+            {
+                ExplorerCore.LogWarning("Could not cast the target instance to Texture2D! Maybe its null or destroyed?");
+                return;
+            }
 
-        //    var imageLayout = imageObj.AddComponent<LayoutElement>();
-        //    imageLayout.preferredHeight = sprite.rect.height;
-        //    imageLayout.preferredWidth = sprite.rect.width;
-        //}
+            // Save helper
+
+            var saveRowObj = UIFactory.CreateHorizontalGroup(parent, new Color(0.1f, 0.1f, 0.1f));
+            var saveRow = saveRowObj.GetComponent<HorizontalLayoutGroup>();
+            saveRow.childForceExpandHeight = true;
+            saveRow.childForceExpandWidth = true;
+            saveRow.padding = new RectOffset() { left = 2, bottom = 2, right = 2, top = 2 };
+            saveRow.spacing = 2;
+
+            var btnObj = UIFactory.CreateButton(saveRowObj, new Color(0.2f, 0.2f, 0.2f));
+            var btnLayout = btnObj.AddComponent<LayoutElement>();
+            btnLayout.minHeight = 25;
+            btnLayout.minWidth = 100;
+            btnLayout.flexibleWidth = 0;
+            var saveBtn = btnObj.GetComponent<Button>();
+
+            var saveBtnText = btnObj.GetComponentInChildren<Text>();
+            saveBtnText.text = "Save .PNG";
+
+            var inputObj = UIFactory.CreateInputField(saveRowObj);
+            var inputLayout = inputObj.AddComponent<LayoutElement>();
+            inputLayout.minHeight = 25;
+            inputLayout.minWidth = 100;
+            inputLayout.flexibleWidth = 9999;
+            var inputField = inputObj.GetComponent<InputField>();
+
+            var name = tex.name;
+            if (string.IsNullOrEmpty(name))
+                name = "untitled";
+
+            var savePath = $@"{Config.ExplorerConfig.Instance.Default_Output_Path}\{name}.png";
+            inputField.text = savePath;
+
+            saveBtn.onClick.AddListener(() => 
+            {
+                if (tex && !string.IsNullOrEmpty(inputField.text))
+                {
+                    var path = inputField.text;
+                    if (!path.EndsWith(".png", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        ExplorerCore.LogWarning("Desired save path must end with '.png'!");
+                        return;
+                    }
+
+                    var dir = Path.GetDirectoryName(path);
+                    if (!Directory.Exists(dir))
+                        Directory.CreateDirectory(dir);
+
+                    if (File.Exists(path))
+                        File.Delete(path);
+
+                    if (!tex.IsReadable())
+                        tex = Texture2DHelpers.ForceReadTexture(tex);
+#if CPP
+                    byte[] data = tex.EncodeToPNG();
+#else
+                    byte[] data = tex.EncodeToPNGSafe();
+#endif
+
+                    File.WriteAllBytes(path, data);
+                }
+            });
+
+            // Actual texture viewer
+
+            var imageObj = UIFactory.CreateUIObject("TextureViewerImage", parent);
+            var image = imageObj.AddComponent<Image>();
+            var sprite = ImageConversionUnstrip.CreateSprite(tex);
+            image.sprite = sprite;
+
+            var fitter = imageObj.AddComponent<ContentSizeFitter>();
+            fitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
+            //fitter.horizontalFit = ContentSizeFitter.FitMode.PreferredSize;
+
+            var imageLayout = imageObj.AddComponent<LayoutElement>();
+            imageLayout.preferredHeight = sprite.rect.height;
+            imageLayout.preferredWidth = sprite.rect.width;
+        }
+
+        internal void ToggleTextureViewer(bool enabled)
+        {
+            m_textureViewerObj.SetActive(enabled);
+
+            m_filterAreaObj.SetActive(!enabled);
+            m_memberListObj.SetActive(!enabled);
+            m_updateRowObj.SetActive(!enabled);
+        }
 
         public void ConstructInstanceFilters(GameObject parent)
         {

src/Inspectors/Reflection/InteractiveValue/InteractiveDictionary.cs

@@ -59,7 +59,7 @@ namespace UnityExplorer.Inspectors.Reflection
             = new List<KeyValuePair<CachePaired, CachePaired>>();
 
         internal readonly KeyValuePair<CachePaired, CachePaired>[] m_displayedEntries
-            = new KeyValuePair<CachePaired, CachePaired>[ModConfig.Instance.Default_Page_Limit];
+            = new KeyValuePair<CachePaired, CachePaired>[ExplorerConfig.Instance.Default_Page_Limit];
 
         internal bool m_recacheWanted = true;
 

src/Inspectors/Reflection/InteractiveValue/InteractiveEnum.cs

@@ -47,13 +47,34 @@ namespace UnityExplorer.Inspectors.Reflection
 
                 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/InteractiveEnumerable.cs

@@ -46,7 +46,7 @@ namespace UnityExplorer.Inspectors.Reflection
         internal readonly Type m_baseEntryType;
 
         internal readonly List<CacheEnumerated> m_entries = new List<CacheEnumerated>();
-        internal readonly CacheEnumerated[] m_displayedEntries = new CacheEnumerated[ModConfig.Instance.Default_Page_Limit];
+        internal readonly CacheEnumerated[] m_displayedEntries = new CacheEnumerated[ExplorerConfig.Instance.Default_Page_Limit];
         internal bool m_recacheWanted = true;
 
         public override void OnValueUpdated()

src/Inspectors/Reflection/InteractiveValue/InteractiveValue.cs

@@ -176,6 +176,10 @@ namespace UnityExplorer.Inspectors.Reflection
                 ConstructSubcontent();
         }
 
+        internal MethodInfo m_toStringMethod;
+        internal MethodInfo m_toStringFormatMethod;
+        internal bool m_gotToStringMethods;
+
         public string GetDefaultLabel(bool updateType = true)
         {
             var valueType = Value?.GetType() ?? this.FallbackType;
@@ -190,6 +194,7 @@ namespace UnityExplorer.Inspectors.Reflection
 
             string label;
 
+            // Two dirty fixes for TextAsset and EventSystem, which can have very long ToString results.
             if (Value is TextAsset textAsset)
             {
                 label = textAsset.text;
@@ -203,22 +208,50 @@ namespace UnityExplorer.Inspectors.Reflection
             {
                 label = m_richValueType;
             }
-            else
+            else // For everything else...
             {
-                var toString = (string)valueType.GetMethod("ToString", new Type[0])?.Invoke(Value, null) 
-                                ?? Value.ToString();
+                if (!m_gotToStringMethods)
+                {
+                    m_gotToStringMethods = true;
 
-                var fullnametemp = valueType.ToString();
-                if (fullnametemp.StartsWith("Il2CppSystem"))
-                    fullnametemp = fullnametemp.Substring(6, fullnametemp.Length - 6);
+                    m_toStringMethod = valueType.GetMethod("ToString", new Type[0]);
+                    m_toStringFormatMethod = valueType.GetMethod("ToString", new Type[] { typeof(string) });
 
-                var temp = toString.Replace(fullnametemp, "").Trim();
+                    // test format method actually works
+                    try
+                    {
+                        m_toStringFormatMethod.Invoke(Value, new object[] { "F3" });
+                    }
+                    catch
+                    {
+                        m_toStringFormatMethod = null;
+                    }
+                }
 
-                if (string.IsNullOrEmpty(temp))
+                string toString;
+                if (m_toStringFormatMethod != null)
+                    toString = (string)m_toStringFormatMethod.Invoke(Value, new object[] { "F3" });
+                else
+                    toString = (string)m_toStringMethod.Invoke(Value, new object[0]);
+
+                string typeName = valueType.FullName;
+                if (typeName.StartsWith("Il2CppSystem."))
+                    typeName = typeName.Substring(6, typeName.Length - 6);
+#if CPP
+                var cppType = UnhollowerRuntimeLib.Il2CppType.From(valueType);
+                if (cppType != null && ReflectionHelpers.UnobfuscatedTypeNames.ContainsKey(cppType.FullName))
+                {
+                    typeName = ReflectionHelpers.UnobfuscatedTypeNames[cppType.FullName];
+                    toString = toString.Replace(cppType.FullName, typeName);
+                }
+#endif
+
+                // If the ToString is just the type name, use our syntax highlighted type name instead.
+                if (toString == typeName)
                 {
                     label = m_richValueType;
                 }
-                else
+                else // Otherwise, parse the result and put our highlighted name in.
                 {
                     if (toString.Length > 200)
                         toString = toString.Substring(0, 200) + "...";
@@ -303,7 +336,7 @@ namespace UnityExplorer.Inspectors.Reflection
             void OnInspectClicked()
             {
                 if (!Value.IsNullOrDestroyed(false))
-                    InspectorManager.Instance.Inspect(this.Value);
+                    InspectorManager.Instance.Inspect(this.Value, this.Owner);
             }
 
             m_inspectButton.SetActive(false);

src/Inspectors/Reflection/ReflectionInspector.cs

@@ -43,6 +43,7 @@ namespace UnityExplorer.Inspectors
             "Collider2D.Cast",
             "Collider2D.Raycast",
             "Texture2D.SetPixelDataImpl",
+            "Camera.CalculateProjectionMatrixFromPhysicalProperties",
 #endif
         };
         private static readonly HashSet<string> bl_memberNameStartsWith = new HashSet<string>
@@ -58,6 +59,8 @@ namespace UnityExplorer.Inspectors
 
         public override string TabLabel => m_targetTypeShortName;
 
+        internal CacheObjectBase ParentMember { get; set; }
+
         internal readonly Type m_targetType;
         internal readonly string m_targetTypeShortName;
 
@@ -66,7 +69,7 @@ namespace UnityExplorer.Inspectors
         // filtered members based on current filters
         internal readonly List<CacheMember> m_membersFiltered = new List<CacheMember>();
         // actual shortlist of displayed members
-        internal readonly CacheMember[] m_displayedMembers = new CacheMember[ModConfig.Instance.Default_Page_Limit];
+        internal readonly CacheMember[] m_displayedMembers = new CacheMember[ExplorerConfig.Instance.Default_Page_Limit];
 
         internal bool m_autoUpdate;
 
@@ -170,11 +173,11 @@ namespace UnityExplorer.Inspectors
                 {
                     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;
@@ -202,6 +205,8 @@ namespace UnityExplorer.Inspectors
                             list.Add(new CacheProperty(pi, target, m_scrollContent));
                         else
                             list.Add(new CacheField(fi, target, m_scrollContent));
+
+                        list.Last().ParentInspector = this;
                     }
                     catch (Exception e)
                     {
@@ -363,6 +368,10 @@ namespace UnityExplorer.Inspectors
 
         #region UI CONSTRUCTION
 
+        internal GameObject m_filterAreaObj;
+        internal GameObject m_updateRowObj;
+        internal GameObject m_memberListObj;
+
         internal void ConstructUI()
         {
             var parent = InspectorManager.Instance.m_inspectorContent;
@@ -423,7 +432,7 @@ namespace UnityExplorer.Inspectors
 
             ConstructFilterArea();
 
-            ConstructOptionsArea();
+            ConstructUpdateRow();
         }
 
         internal void ConstructFilterArea()
@@ -444,6 +453,8 @@ namespace UnityExplorer.Inspectors
             filterGroup.padding.top = 4;
             filterGroup.padding.bottom = 4;
 
+            m_filterAreaObj = filterAreaObj;
+
             // name filter
 
             var nameFilterRowObj = UIFactory.CreateHorizontalGroup(filterAreaObj, new Color(1, 1, 1, 0));
@@ -540,7 +551,7 @@ namespace UnityExplorer.Inspectors
             btn.colors = colors;
         }
 
-        internal void ConstructOptionsArea()
+        internal void ConstructUpdateRow()
         {
             var optionsRowObj = UIFactory.CreateHorizontalGroup(Content, new Color(1, 1, 1, 0));
             var optionsLayout = optionsRowObj.AddComponent<LayoutElement>();
@@ -551,6 +562,8 @@ namespace UnityExplorer.Inspectors
             optionsGroup.childAlignment = TextAnchor.MiddleLeft;
             optionsGroup.spacing = 10;
 
+            m_updateRowObj = optionsRowObj;
+
             // update button
 
             var updateButtonObj = UIFactory.CreateButton(optionsRowObj, new Color(0.2f, 0.2f, 0.2f));
@@ -578,11 +591,12 @@ namespace UnityExplorer.Inspectors
             autoUpdateToggle.isOn = false;
             autoUpdateToggle.onValueChanged.AddListener((bool val) => { m_autoUpdate = val; });
         }
-
+        
         internal void ConstructMemberList()
         {
             var scrollobj = UIFactory.CreateScrollView(Content, out m_scrollContent, out m_sliderScroller, new Color(0.05f, 0.05f, 0.05f));
 
+            m_memberListObj = scrollobj;
             m_scrollContentRect = m_scrollContent.GetComponent<RectTransform>();
 
             var scrollGroup = m_scrollContent.GetComponent<VerticalLayoutGroup>();

src/Inspectors/SceneExplorer.cs

@@ -55,16 +55,15 @@ namespace UnityExplorer.Inspectors
         {
             get
             {
-                if (!m_dontDestroyObject)
+                if (!s_dontDestroyObject)
                 {
-                    m_dontDestroyObject = new GameObject("DontDestroyMe");
-                    GameObject.DontDestroyOnLoad(m_dontDestroyObject);
+                    s_dontDestroyObject = new GameObject("DontDestroyMe");
+                    GameObject.DontDestroyOnLoad(s_dontDestroyObject);
                 }
-                return m_dontDestroyObject;
+                return s_dontDestroyObject;
             }
         }
-
-        internal static GameObject m_dontDestroyObject;
+        internal static GameObject s_dontDestroyObject;
 
         public void Init()
         {
@@ -97,22 +96,6 @@ namespace UnityExplorer.Inspectors
             }
         }
 
-//#if CPP
-//        public int GetSceneHandle(string sceneName)
-//        {
-//            if (sceneName == "DontDestroyOnLoad")
-//                return DontDestroyScene;
-
-//            for (int i = 0; i < SceneManager.sceneCount; i++)
-//            {
-//                var scene = SceneManager.GetSceneAt(i);
-//                if (scene.name == sceneName)
-//                    return scene.handle;
-//            }
-//            return -1;
-//        }
-//#endif
-
         internal void OnSceneChange()
         {
             m_sceneDropdown.OnCancel(null);
@@ -121,8 +104,13 @@ namespace UnityExplorer.Inspectors
 
         private void RefreshSceneSelector()
         {
-            var names = new List<string>();
-            var scenes = new List<Scene>();
+            var newNames = new List<string>();
+            var newScenes = new List<Scene>();
+
+            if (m_currentScenes == null)
+                m_currentScenes = new Scene[0];
+
+            bool anyChange = SceneManager.sceneCount != m_currentScenes.Length - 1;
 
             for (int i = 0; i < SceneManager.sceneCount; i++)
             {
@@ -131,33 +119,32 @@ namespace UnityExplorer.Inspectors
                 if (scene == default)
                     continue;
 
-                scenes.Add(scene);
-                names.Add(scene.name);
+                if (!anyChange && !m_currentScenes.Any(it => it.GetHandle() == scene.GetHandle()))
+                    anyChange = true;
+
+                newScenes.Add(scene);
+                newNames.Add(scene.name);
             }
 
-            names.Add("DontDestroyOnLoad");
-            scenes.Add(DontDestroyScene);
+            newNames.Add("DontDestroyOnLoad");
+            newScenes.Add(DontDestroyScene);
 
             m_sceneDropdown.options.Clear();
 
-            foreach (string scene in names)
+            foreach (string scene in newNames)
             {
                 m_sceneDropdown.options.Add(new Dropdown.OptionData { text = scene });
             }
 
-            if (!names.Contains(m_sceneDropdownText.text))
+            if (anyChange)
             {
-                m_sceneDropdownText.text = names[0];
-                SetTargetScene(scenes[0]);
+                m_sceneDropdownText.text = newNames[0];
+                SetTargetScene(newScenes[0]);
             }
 
-            m_currentScenes = scenes.ToArray();
+            m_currentScenes = newScenes.ToArray();
         }
 
-//#if CPP
-//        public void SetTargetScene(string name) => SetTargetScene(scene.handle);
-//#endif
-
         public void SetTargetScene(Scene scene)
         {
             if (scene == default)
@@ -167,7 +154,7 @@ namespace UnityExplorer.Inspectors
 #if CPP
             GameObject[] rootObjs = SceneUnstrip.GetRootGameObjects(scene.handle);
 #else
-            GameObject[] rootObjs = SceneUnstrip.GetRootGameObjects(scene);
+            GameObject[] rootObjs = scene.GetRootGameObjects();
 #endif
             SetSceneObjectList(rootObjs);
 

src/Loader/ExplorerBepIn5Plugin.cs

@@ -0,0 +1,41 @@
+#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, IExplorerLoader
+    {
+        public static ExplorerBepInPlugin Instance;
+
+        public static ManualLogSource Logging => Instance?.Logger;
+
+        public Harmony HarmonyInstance => s_harmony;
+        private static readonly Harmony s_harmony = new Harmony(ExplorerCore.GUID);
+
+        public string ExplorerFolder => Path.Combine(Paths.PluginPath, ExplorerCore.NAME);
+        public string ConfigFolder => Path.Combine(Paths.ConfigPath, ExplorerCore.NAME);
+
+        public Action<object> OnLogMessage => (object log) => { Logging?.LogMessage(log?.ToString() ?? ""); };
+        public Action<object> OnLogWarning => (object log) => { Logging?.LogWarning(log?.ToString() ?? ""); };
+        public Action<object> OnLogError   => (object log) => { Logging?.LogError(log?.ToString() ?? ""); };
+
+        internal void Awake()
+        {
+            Instance = this;
+
+            new ExplorerCore();
+        }
+
+        internal void Update()
+        {
+            ExplorerCore.Update();
+        }
+    }
+}
+#endif

src/Loader/ExplorerBepIn6Plugin.cs

@@ -1,4 +1,4 @@
-#if BIE
+#if BIE6
 using System;
 using System.IO;
 using System.Reflection;
@@ -18,21 +18,27 @@ namespace UnityExplorer
 {
 #if MONO
     [BepInPlugin(ExplorerCore.GUID, "UnityExplorer", ExplorerCore.VERSION)]
-    public class ExplorerBepInPlugin : BaseUnityPlugin
+    public class ExplorerBepInPlugin : BaseUnityPlugin, IExplorerLoader
     {
         public static ExplorerBepInPlugin Instance;
 
         public static ManualLogSource Logging => Instance?.Logger;
 
-        public static readonly Harmony HarmonyInstance = new Harmony(ExplorerCore.GUID);
+        public Harmony HarmonyInstance => s_harmony;
+        private static readonly Harmony s_harmony = new Harmony(ExplorerCore.GUID);
+        
+        public string ExplorerFolder => Path.Combine(Paths.PluginPath, ExplorerCore.NAME);
+        public string ConfigFolder => Path.Combine(Paths.ConfigPath, ExplorerCore.NAME);
+
+        public Action<object> OnLogMessage => (object log) => { Logging?.LogMessage(log?.ToString() ?? ""); };
+        public Action<object> OnLogWarning => (object log) => { Logging?.LogWarning(log?.ToString() ?? ""); };
+        public Action<object> OnLogError   => (object log) => { Logging?.LogError(log?.ToString() ?? ""); };
 
         internal void Awake()
         {
             Instance = this;
 
             new ExplorerCore();
-
-            // HarmonyInstance.PatchAll();
         }
 
         internal void Update()
@@ -44,13 +50,21 @@ namespace UnityExplorer
 
 #if CPP
     [BepInPlugin(ExplorerCore.GUID, "UnityExplorer", ExplorerCore.VERSION)]
-    public class ExplorerBepInPlugin : BasePlugin
+    public class ExplorerBepInPlugin : BasePlugin, IExplorerLoader
     {
         public static ExplorerBepInPlugin Instance;
 
         public static ManualLogSource Logging => Instance?.Log;
 
-        public static readonly Harmony HarmonyInstance = new Harmony(ExplorerCore.GUID);
+        public Harmony HarmonyInstance => s_harmony;
+        private static readonly Harmony s_harmony = new Harmony(ExplorerCore.GUID);
+
+        public string ExplorerFolder => Path.Combine(Paths.PluginPath, ExplorerCore.NAME);
+        public string ConfigFolder => Path.Combine(Paths.ConfigPath, ExplorerCore.NAME);
+
+        public Action<object> OnLogMessage => (object log) => { Logging?.LogMessage(log?.ToString() ?? ""); };
+        public Action<object> OnLogWarning => (object log) => { Logging?.LogWarning(log?.ToString() ?? ""); };
+        public Action<object> OnLogError   => (object log) => { Logging?.LogError(log?.ToString() ?? ""); };
 
         // Init
         public override void Load()
@@ -67,8 +81,6 @@ namespace UnityExplorer
             GameObject.DontDestroyOnLoad(obj);
 
             new ExplorerCore();
-
-            // HarmonyInstance.PatchAll();
         }
 
         // BepInEx Il2Cpp mod class doesn't have monobehaviour methods yet, so wrap them in a dummy.

src/Loader/ExplorerMelonMod.cs

@@ -0,0 +1,39 @@
+#if ML
+using System;
+using System.IO;
+using MelonLoader;
+
+namespace UnityExplorer
+{
+    public class ExplorerMelonMod : MelonMod, IExplorerLoader
+    {
+        public static ExplorerMelonMod Instance;
+
+        public string ExplorerFolder => Path.Combine("Mods", ExplorerCore.NAME);
+        public string ConfigFolder => ExplorerFolder;
+
+        public Action<object> OnLogMessage => (object log) => { MelonLogger.Msg(log?.ToString() ?? ""); };
+        public Action<object> OnLogWarning => (object log) => { MelonLogger.Warning(log?.ToString() ?? ""); };
+        public Action<object> OnLogError   => (object log) => { MelonLogger.Error(log?.ToString() ?? ""); };
+
+        public Harmony.HarmonyInstance HarmonyInstance => Instance.Harmony;
+
+        public override void OnApplicationStart()
+        {
+            Instance = this;
+
+            new ExplorerCore();
+        }
+
+        public override void OnUpdate()
+        {
+            ExplorerCore.Update();
+        }
+
+        public override void OnSceneWasLoaded(int buildIndex, string sceneName)
+        {
+            ExplorerCore.Instance.OnSceneLoaded();
+        }
+    }
+}
+#endif

src/Loader/ExplorerStandalone.cs

@@ -0,0 +1,105 @@
+#if STANDALONE
+using HarmonyLib;
+using System;
+using System.IO;
+using System.Reflection;
+using UnityEngine;
+#if CPP
+using UnhollowerRuntimeLib;
+#endif
+
+namespace UnityExplorer
+{
+	public class ExplorerStandalone : IExplorerLoader
+    {
+        /// <summary>
+        /// Call this to initialize UnityExplorer. Optionally, also subscribe to the 'OnLog' event to handle logging.
+        /// </summary>
+        /// <returns>The new (or active, if one exists) instance of ExplorerStandalone.</returns>
+        public static ExplorerStandalone CreateInstance()
+        {
+            if (Instance != null)
+                return Instance;
+
+            return new ExplorerStandalone();
+        }
+
+        private ExplorerStandalone()
+        {
+            Init();
+        }
+
+        public static ExplorerStandalone Instance { get; private set; }
+
+        /// <summary>
+        /// Invoked whenever Explorer logs something. Subscribe to this to handle logging.
+        /// </summary>
+        public static event Action<string, LogType> OnLog;
+
+        public Harmony HarmonyInstance => s_harmony;
+        public static readonly Harmony s_harmony = new Harmony(ExplorerCore.GUID);
+
+        public string ExplorerFolder
+        {
+            get
+            {
+                if (s_explorerFolder == null)
+                {
+                    s_explorerFolder = 
+                        Path.Combine(
+                            Path.GetDirectoryName(
+                                Uri.UnescapeDataString(new Uri(Assembly.GetExecutingAssembly().CodeBase)
+                                .AbsolutePath)), 
+                        "UnityExplorer");
+
+                    if (!Directory.Exists(s_explorerFolder))
+                        Directory.CreateDirectory(s_explorerFolder);
+                }
+
+                return s_explorerFolder;
+            }
+        }
+        private static string s_explorerFolder;
+        
+        public string ConfigFolder => ExplorerFolder;
+
+        Action<object> IExplorerLoader.OnLogMessage => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Log); };
+        Action<object> IExplorerLoader.OnLogWarning => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Warning); };
+        Action<object> IExplorerLoader.OnLogError   => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Error); };
+
+        private void Init()
+        {
+            Instance = this;
+#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
+
+            obj.hideFlags = HideFlags.HideAndDontSave;
+            GameObject.DontDestroyOnLoad(obj);
+
+            new ExplorerCore();
+        }
+
+        public class ExplorerBehaviour : MonoBehaviour
+        {
+#if CPP
+            public ExplorerBehaviour(IntPtr ptr) : base(ptr) { }
+#endif
+            internal void Update()
+            {
+                ExplorerCore.Update();
+            }
+        }
+    }
+}
+#endif

src/Loader/IExplorerLoader.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace UnityExplorer
+{
+    public interface IExplorerLoader
+    {
+        string ExplorerFolder { get; }
+
+        string ConfigFolder { get; }
+
+        Action<object> OnLogMessage { get; }
+        Action<object> OnLogWarning { get; }
+        Action<object> OnLogError { get; }
+
+#if ML
+        Harmony.HarmonyInstance HarmonyInstance { get; }
+#else
+        HarmonyLib.Harmony HarmonyInstance { get; }
+#endif
+    }
+}

src/Tests/Tests.cs

@@ -5,6 +5,7 @@ using UnityEngine;
 using System;
 using System.Runtime.InteropServices;
 using System.Text;
+using UnityExplorer.Unstrip;
 #if CPP
 using UnhollowerBaseLib;
 using UnityExplorer.Helpers;
@@ -12,6 +13,14 @@ using UnityExplorer.Helpers;
 
 namespace UnityExplorer.Tests
 {
+    internal enum TestByteEnum : byte
+    {
+        One,
+        Two,
+        Three,
+        TwoFiftyFive = 255,
+    }
+
     public static class StaticTestClass
     {
         public static int StaticProperty => 5;
@@ -27,6 +36,8 @@ namespace UnityExplorer.Tests
 
     public class TestClass
     {
+        internal static TestByteEnum testingByte = TestByteEnum.One;
+
         public string AAALongString = @"1
 2
 3
@@ -121,15 +132,15 @@ namespace UnityExplorer.Tests
         private static bool m_setOnlyProperty;
         public static bool ReadSetOnlyProperty => m_setOnlyProperty;
 
-        public Texture TestTexture;
+        public Texture2D TestTexture;
         public static Sprite TestSprite;
 
 #if CPP
         public static Il2CppSystem.Collections.Generic.HashSet<string> CppHashSetTest;
         public static Il2CppSystem.Collections.Generic.List<string> CppStringTest;
         public static Il2CppSystem.Collections.IList CppIList;
-        public static Il2CppSystem.Collections.Generic.Dictionary<string, string> CppDictTest;
-        public static Il2CppSystem.Collections.Generic.Dictionary<int, float> CppDictTest2;
+        //public static Il2CppSystem.Collections.Generic.Dictionary<string, string> CppDictTest;
+        //public static Il2CppSystem.Collections.Generic.Dictionary<int, float> CppDictTest2;
 #endif
 
         public TestClass()
@@ -156,35 +167,35 @@ namespace UnityExplorer.Tests
             CppStringTest.Add("1");
             CppStringTest.Add("2");
 
-            CppDictTest = new Il2CppSystem.Collections.Generic.Dictionary<string, string>();
-            CppDictTest.Add("key1", "value1");
-            CppDictTest.Add("key2", "value2");
-            CppDictTest.Add("key3", "value3");
+            //CppDictTest = new Il2CppSystem.Collections.Generic.Dictionary<string, string>();
+            //CppDictTest.Add("key1", "value1");
+            //CppDictTest.Add("key2", "value2");
+            //CppDictTest.Add("key3", "value3");
 
-            CppDictTest2 = new Il2CppSystem.Collections.Generic.Dictionary<int, float>();
-            CppDictTest2.Add(0, 0.5f);
-            CppDictTest2.Add(1, 0.5f);
-            CppDictTest2.Add(2, 0.5f);
+            //CppDictTest2 = new Il2CppSystem.Collections.Generic.Dictionary<int, float>();
+            //CppDictTest2.Add(0, 0.5f);
+            //CppDictTest2.Add(1, 0.5f);
+            //CppDictTest2.Add(2, 0.5f);
 #endif
         }
 
         private void TextureSpriteTest()
         {
-            //TestTexture = UIManager.MakeSolidTexture(Color.white, 1000, 600);
-            //TestTexture = new Texture();
-            //TestTexture.name = "TestTexture";
+            TestTexture = new Texture2D(32, 32, TextureFormat.ARGB32, false)
+            {
+                name = "TestTexture"
+            };
+            TestSprite = ImageConversionUnstrip.CreateSprite(TestTexture);
 
-            //var r = new Rect(0, 0, TestTexture.width, TestTexture.height);
-            //var v2 = Vector2.zero;
-            //var v4 = Vector4.zero;
-            //TestSprite = Sprite.CreateSprite_Injected((Texture2D)TestTexture, ref r, ref v2, 100f, 0u, SpriteMeshType.Tight, ref v4, false);
+            GameObject.DontDestroyOnLoad(TestTexture);
+            GameObject.DontDestroyOnLoad(TestSprite);
 
-            //GameObject.DontDestroyOnLoad(TestTexture);
-            //GameObject.DontDestroyOnLoad(TestSprite);
-
-            //// test loading a tex from file
-            //var dataToLoad = System.IO.File.ReadAllBytes(@"Mods\UnityExplorer\Tex_Nemundis_Nebula.png");
-            //ExplorerCore.Log($"Tex load success: {TestTexture.LoadImage(dataToLoad, false)}");
+            // test loading a tex from file
+            if (System.IO.File.Exists(@"D:\Downloads\test.png"))
+            {
+                var dataToLoad = System.IO.File.ReadAllBytes(@"D:\Downloads\test.png");
+                ExplorerCore.Log($"Tex load success: {TestTexture.LoadImage(dataToLoad, false)}");
+            }
         }
 
         public static string TestRefInOutGeneric<T>(ref string arg0, in int arg1, out string arg2) where T : Component

src/UI/ForceUnlockCursor.cs

@@ -28,7 +28,7 @@ namespace UnityExplorer.UI
             UpdateCursorControl();
         }
 
-        public static bool ShouldForceMouse => ExplorerCore.ShowMenu && Unlock;
+        public static bool ShouldForceMouse => UIManager.ShowMenu && Unlock;
 
         private static CursorLockMode m_lastLockMode;
         private static bool m_lastVisibleState;
@@ -42,7 +42,7 @@ namespace UnityExplorer.UI
 
         public static void Init()
         {
-            ModConfig.OnConfigChanged += ModConfig_OnConfigChanged;
+            ExplorerConfig.OnConfigChanged += ModConfig_OnConfigChanged;
 
             SetupPatches();
 
@@ -51,7 +51,7 @@ namespace UnityExplorer.UI
 
         internal static void ModConfig_OnConfigChanged()
         {
-            Unlock = ModConfig.Instance.Force_Unlock_Mouse;
+            Unlock = ExplorerConfig.Instance.Force_Unlock_Mouse;
         }
 
         private static void SetupPatches()
@@ -87,12 +87,6 @@ namespace UnityExplorer.UI
                     new HarmonyMethod(typeof(ForceUnlockCursor).GetMethod(nameof(Prefix_set_visible))),
                     true);
 
-#if BIE
-#if CPP
-                // temporarily disabling this patch in BepInEx il2cpp as it's causing a crash in some games.
-                return;
-#endif
-#endif
                 TryPatch(typeof(EventSystem),
                     "current",
                     new HarmonyMethod(typeof(ForceUnlockCursor).GetMethod(nameof(Prefix_EventSystem_set_current))),
@@ -108,12 +102,7 @@ namespace UnityExplorer.UI
         {
             try
             {
-                var harmony =
-#if ML
-                    ExplorerMelonMod.Instance.harmonyInstance;
-#else
-                    ExplorerBepInPlugin.HarmonyInstance;
-#endif
+                var harmony = ExplorerCore.Loader.HarmonyInstance;
 
                 System.Reflection.PropertyInfo prop = type.GetProperty(property);
 
@@ -164,11 +153,25 @@ namespace UnityExplorer.UI
 
         public static void SetEventSystem()
         {
+            // temp disabled for new InputSystem
             if (InputManager.CurrentType == InputType.InputSystem)
                 return;
 
+            // Disable current event system object
+            if (m_lastEventSystem || EventSystem.current)
+            {
+                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
             m_settingEventSystem = true;
             EventSystem.current = UIManager.EventSys;
+            UIManager.EventSys.enabled = true;
             InputManager.ActivateUIModule();
             m_settingEventSystem = false;
         }
@@ -180,6 +183,9 @@ namespace UnityExplorer.UI
 
             if (m_lastEventSystem)
             {
+                m_lastEventSystem.enabled = true;
+                //m_lastEventSystem.gameObject.SetActive(true);
+
                 m_settingEventSystem = true;
                 EventSystem.current = m_lastEventSystem;
                 m_lastInputModule?.ActivateModule();
@@ -195,7 +201,7 @@ namespace UnityExplorer.UI
                 m_lastEventSystem = value;
                 m_lastInputModule = value?.currentInputModule;
 
-                if (ExplorerCore.ShowMenu)
+                if (UIManager.ShowMenu)
                 {
                     value = UIManager.EventSys;
                 }

src/UI/MainMenu.cs

@@ -155,8 +155,11 @@ namespace UnityExplorer.UI
             MainPanel = UIFactory.CreatePanel(UIManager.CanvasRoot, "MainMenu", out GameObject content);
 
             RectTransform panelRect = MainPanel.GetComponent<RectTransform>();
-            panelRect.anchorMin = new Vector2(0.25f, 0.1f);
-            panelRect.anchorMax = new Vector2(0.78f, 0.95f);
+            //panelRect.anchorMin = new Vector2(0.25f, 0.1f);
+            //panelRect.anchorMax = new Vector2(0.78f, 0.95f);
+            var anchors = ExplorerConfig.Instance.GetWindowAnchorsVector();
+            panelRect.anchorMin = new Vector2(anchors.x, anchors.y);
+            panelRect.anchorMax = new Vector2(anchors.z, anchors.w);
 
             MainPanel.AddComponent<Mask>();
 
@@ -208,7 +211,7 @@ namespace UnityExplorer.UI
             GameObject hideBtnObj = UIFactory.CreateButton(titleBar);
 
             Button hideBtn = hideBtnObj.GetComponent<Button>();
-            hideBtn.onClick.AddListener(() => { ExplorerCore.ShowMenu = false; });
+            hideBtn.onClick.AddListener(() => { UIManager.ShowMenu = false; });
             ColorBlock colorBlock = hideBtn.colors;
             colorBlock.normalColor = new Color(65f / 255f, 23f / 255f, 23f / 255f);
             colorBlock.pressedColor = new Color(35f / 255f, 10f / 255f, 10f / 255f);
@@ -224,13 +227,13 @@ namespace UnityExplorer.UI
             hideText.resizeTextForBestFit = true;
             hideText.resizeTextMinSize = 8;
             hideText.resizeTextMaxSize = 14;
-            hideText.text = $"Hide ({ModConfig.Instance.Main_Menu_Toggle})";
+            hideText.text = $"Hide ({ExplorerConfig.Instance.Main_Menu_Toggle})";
 
-            ModConfig.OnConfigChanged += ModConfig_OnConfigChanged; 
+            ExplorerConfig.OnConfigChanged += ModConfig_OnConfigChanged; 
             
             void ModConfig_OnConfigChanged()
             {
-                hideText.text = $"Hide ({ModConfig.Instance.Main_Menu_Toggle})";
+                hideText.text = $"Hide ({ExplorerConfig.Instance.Main_Menu_Toggle})";
             }
         }
 

src/UI/Modules/DebugConsole.cs

@@ -15,8 +15,8 @@ namespace UnityExplorer.UI.Modules
     {
         public static DebugConsole Instance { get; private set; }
 
-        public static bool LogUnity { get; set; } = ModConfig.Instance.Log_Unity_Debug;
-        public static bool SaveToDisk { get; set; } = ModConfig.Instance.Save_Logs_To_Disk;
+        public static bool LogUnity { get; set; } = ExplorerConfig.Instance.Log_Unity_Debug;
+        //public static bool SaveToDisk { get; set; } = ModConfig.Instance.Save_Logs_To_Disk;
 
         internal static StreamWriter s_streamWriter;
 
@@ -49,10 +49,10 @@ namespace UnityExplorer.UI.Modules
 
             // set up IO
 
-            if (!SaveToDisk)
-                return;
+            //if (!SaveToDisk)
+            //    return;
 
-            var path = ExplorerCore.EXPLORER_FOLDER + @"\Logs";
+            var path = ExplorerCore.ExplorerFolder + @"\Logs";
 
             if (!Directory.Exists(path))
                 Directory.CreateDirectory(path);
@@ -69,7 +69,7 @@ namespace UnityExplorer.UI.Modules
             }
 
             var fileName = "UnityExplorer " + DateTime.Now.ToString("u") + ".txt";
-            fileName = ExplorerCore.RemoveInvalidFilenameChars(fileName);
+            fileName = RemoveInvalidFilenameChars(fileName);
 
             var stream = File.Create(path + @"\" + fileName);
             s_streamWriter = new StreamWriter(stream)
@@ -81,6 +81,16 @@ namespace UnityExplorer.UI.Modules
                 s_streamWriter.WriteLine(msg);
         }
 
+        public static string RemoveInvalidFilenameChars(string s)
+        {
+            var invalid = Path.GetInvalidFileNameChars();
+            foreach (var c in invalid)
+            {
+                s = s.Replace(c.ToString(), "");
+            }
+            return s;
+        }
+
         public static void Log(string message)
         {
             Log(message, null);
@@ -256,8 +266,8 @@ namespace UnityExplorer.UI.Modules
             void ToggleLogUnity(bool val)
             {
                 LogUnity = val;
-                ModConfig.Instance.Log_Unity_Debug = val;
-                ModConfig.SaveSettings();
+                ExplorerConfig.Instance.Log_Unity_Debug = val;
+                ExplorerConfig.SaveSettings();
             }
 
             var unityToggleLayout = unityToggleObj.AddComponent<LayoutElement>();

src/UI/Modules/OptionsPage.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-//using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Config;
@@ -19,6 +18,7 @@ namespace UnityExplorer.UI.Modules
         private Toggle m_unlockMouseToggle;
         private InputField m_pageLimitInput;
         private InputField m_defaultOutputInput;
+        private Toggle m_hideOnStartupToggle;
 
         public override void Init()
         {
@@ -27,29 +27,24 @@ namespace UnityExplorer.UI.Modules
 
         public override void Update()
         {
-            // not needed?
         }
 
         internal void OnApply()
         {
             if (!string.IsNullOrEmpty(m_keycodeInput.text) && Enum.Parse(typeof(KeyCode), m_keycodeInput.text) is KeyCode keyCode)
-            {
-                ModConfig.Instance.Main_Menu_Toggle = keyCode;
-            }
+                ExplorerConfig.Instance.Main_Menu_Toggle = keyCode;
 
-            ModConfig.Instance.Force_Unlock_Mouse = m_unlockMouseToggle.isOn;
+            ExplorerConfig.Instance.Force_Unlock_Mouse = m_unlockMouseToggle.isOn;
 
             if (!string.IsNullOrEmpty(m_pageLimitInput.text) && int.TryParse(m_pageLimitInput.text, out int lim))
-            {
-                ModConfig.Instance.Default_Page_Limit = lim;
-            }
+                ExplorerConfig.Instance.Default_Page_Limit = lim;
 
-            ModConfig.Instance.Default_Output_Path = m_defaultOutputInput.text;
+            ExplorerConfig.Instance.Default_Output_Path = m_defaultOutputInput.text;
 
-            // todo default output path
+            ExplorerConfig.Instance.Hide_On_Startup = m_hideOnStartupToggle.isOn;
 
-            ModConfig.SaveSettings();
-            ModConfig.InvokeConfigChanged();
+            ExplorerConfig.SaveSettings();
+            ExplorerConfig.InvokeConfigChanged();
         }
 
         #region UI CONSTRUCTION
@@ -98,6 +93,7 @@ namespace UnityExplorer.UI.Modules
             ConstructMouseUnlockOpt(optionsGroupObj);
             ConstructPageLimitOpt(optionsGroupObj);
             ConstructOutputPathOpt(optionsGroupObj);
+            ConstructHideOnStartupOpt(optionsGroupObj);
 
             var applyBtnObj = UIFactory.CreateButton(Content, new Color(0.2f, 0.2f, 0.2f));
             var applyText = applyBtnObj.GetComponentInChildren<Text>();
@@ -113,10 +109,34 @@ namespace UnityExplorer.UI.Modules
             applyBtn.onClick.AddListener(OnApply);
         }
 
+        private void ConstructHideOnStartupOpt(GameObject optionsGroupObj)
+        {
+            var rowObj = UIFactory.CreateHorizontalGroup(optionsGroupObj, new Color(1, 1, 1, 0));
+            var rowGroup = rowObj.GetComponent<HorizontalLayoutGroup>();
+            rowGroup.childControlWidth = true;
+            rowGroup.childForceExpandWidth = false;
+            rowGroup.childControlHeight = true;
+            rowGroup.childForceExpandHeight = true;
+            var groupLayout = rowObj.AddComponent<LayoutElement>();
+            groupLayout.minHeight = 25;
+            groupLayout.flexibleHeight = 0;
+            groupLayout.minWidth = 200;
+            groupLayout.flexibleWidth = 1000;
+
+            var labelObj = UIFactory.CreateLabel(rowObj, TextAnchor.MiddleLeft);
+            var labelText = labelObj.GetComponent<Text>();
+            labelText.text = "Hide UI on startup:";
+            var labelLayout = labelObj.AddComponent<LayoutElement>();
+            labelLayout.minWidth = 150;
+            labelLayout.minHeight = 25;
+
+            UIFactory.CreateToggle(rowObj, out m_hideOnStartupToggle, out Text toggleText);
+            m_hideOnStartupToggle.isOn = ExplorerConfig.Instance.Hide_On_Startup;
+            toggleText.text = "";
+        }
+
         internal void ConstructKeycodeOpt(GameObject parent)
         {
-            //public KeyCode Main_Menu_Toggle = KeyCode.F7;
-
             var rowObj = UIFactory.CreateHorizontalGroup(parent, new Color(1, 1, 1, 0));
             var rowGroup = rowObj.GetComponent<HorizontalLayoutGroup>();
             rowGroup.childControlWidth = true;
@@ -139,15 +159,13 @@ namespace UnityExplorer.UI.Modules
             var keycodeInputObj = UIFactory.CreateInputField(rowObj);
             
             m_keycodeInput = keycodeInputObj.GetComponent<InputField>();
-            m_keycodeInput.text = ModConfig.Instance.Main_Menu_Toggle.ToString();
+            m_keycodeInput.text = ExplorerConfig.Instance.Main_Menu_Toggle.ToString();
 
             m_keycodeInput.placeholder.gameObject.GetComponent<Text>().text = "KeyCode, eg. F7";
         }
 
         internal void ConstructMouseUnlockOpt(GameObject parent)
         {
-            //public bool Force_Unlock_Mouse = true;
-
             var rowObj = UIFactory.CreateHorizontalGroup(parent, new Color(1, 1, 1, 0));
             var rowGroup = rowObj.GetComponent<HorizontalLayoutGroup>();
             rowGroup.childControlWidth = true;
@@ -168,7 +186,7 @@ namespace UnityExplorer.UI.Modules
             labelLayout.minHeight = 25;
 
             UIFactory.CreateToggle(rowObj, out m_unlockMouseToggle, out Text toggleText);
-            m_unlockMouseToggle.isOn = ModConfig.Instance.Force_Unlock_Mouse;
+            m_unlockMouseToggle.isOn = ExplorerConfig.Instance.Force_Unlock_Mouse;
             toggleText.text = "";
         }
 
@@ -198,7 +216,7 @@ namespace UnityExplorer.UI.Modules
             var inputObj = UIFactory.CreateInputField(rowObj);
 
             m_pageLimitInput = inputObj.GetComponent<InputField>();
-            m_pageLimitInput.text = ModConfig.Instance.Default_Page_Limit.ToString();
+            m_pageLimitInput.text = ExplorerConfig.Instance.Default_Page_Limit.ToString();
 
             m_pageLimitInput.placeholder.gameObject.GetComponent<Text>().text = "Integer, eg. 20";
         }
@@ -229,7 +247,7 @@ namespace UnityExplorer.UI.Modules
             var inputObj = UIFactory.CreateInputField(rowObj);
 
             m_defaultOutputInput = inputObj.GetComponent<InputField>();
-            m_defaultOutputInput.text = ModConfig.Instance.Default_Output_Path.ToString();
+            m_defaultOutputInput.text = ExplorerConfig.Instance.Default_Output_Path.ToString();
 
             m_defaultOutputInput.placeholder.gameObject.GetComponent<Text>().text = @"Directory, eg. Mods\UnityExplorer";
         }

src/UI/Modules/SearchPage.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-//using TMPro;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
@@ -9,6 +8,7 @@ using UnityExplorer.Helpers;
 using UnityExplorer.Inspectors;
 using UnityExplorer.UI.Shared;
 using UnityExplorer.Unstrip;
+using System.Reflection;
 #if CPP
 using UnhollowerRuntimeLib;
 #endif
@@ -21,7 +21,7 @@ namespace UnityExplorer.UI.Modules
         GameObject,
         Component,
         Custom,
-        Instance,
+        Singleton,
         StaticClass
     }
 
@@ -46,11 +46,14 @@ namespace UnityExplorer.UI.Modules
 
         public static SearchPage Instance;
 
+        internal SearchContext m_context;
+        private SceneFilter m_sceneFilter;
+        private ChildFilter m_childFilter;
+
         // ui elements
 
         private Text m_resultCountText;
 
-        internal SearchContext m_context;
         private InputField m_customTypeInput;
 
         private InputField m_nameInput;
@@ -60,9 +63,6 @@ namespace UnityExplorer.UI.Modules
 
         private Dropdown m_sceneDropdown;
         private int m_lastSceneCount = -1;
-        private SceneFilter m_sceneFilter;
-
-        private ChildFilter m_childFilter;
 
         private GameObject m_extraFilterRow;
 
@@ -132,10 +132,9 @@ namespace UnityExplorer.UI.Modules
                 else
                 {
                     var obj = m_results[itemIndex];
+                    var unityObj = obj as UnityEngine.Object;
 
-                    var uObj = obj as UnityEngine.Object;
-
-                    if (obj == null || (uObj != null && !uObj))
+                    if (obj == null || (unityObj != null && !unityObj))
                         continue;
 
                     if (i >= m_resultShortList.Count)
@@ -150,17 +149,25 @@ namespace UnityExplorer.UI.Modules
 
                     var text = m_resultListTexts[i];
 
-                    var name = $"<color={UISyntaxHighlight.Class_Instance}>{ReflectionHelpers.GetActualType(obj).Name}</color>";
-
-                    if (m_context != SearchContext.Instance && m_context != SearchContext.StaticClass)
+                    if (m_context != SearchContext.StaticClass)
                     {
-                        if (uObj && !string.IsNullOrEmpty(uObj.name))
-                            name += $": {uObj.name}";
-                        else
-                            name += ": <i><color=grey>untitled</color></i>";
-                    }
+                        var name = UISyntaxHighlight.ParseFullSyntax(obj.GetActualType(), true);
 
-                    text.text = name;
+                        if (unityObj && m_context != SearchContext.Singleton)
+                        {
+                            if (unityObj && !string.IsNullOrEmpty(unityObj.name))
+                                name += $": {unityObj.name}";
+                            else
+                                name += ": <i><color=grey>untitled</color></i>";
+                        }
+
+                        text.text = name;
+                    }
+                    else
+                    {
+                        var type = obj as Type;
+                        text.text = UISyntaxHighlight.ParseFullSyntax(type, true);
+                    }
 
                     var label = text.transform.parent.parent.gameObject;
                     if (!label.activeSelf)
@@ -222,14 +229,127 @@ namespace UnityExplorer.UI.Modules
             }
 
             m_sceneDropdown.transform.Find("Label").GetComponent<Text>().text = "Any";
+            m_sceneFilter = SceneFilter.Any;
         }
 
         // ~~~~~ UI Callbacks ~~~~~
 
-        internal void OnUnitySearchClicked()
+        internal void OnSearchClicked()
         {
             m_resultListPageHandler.CurrentPage = 0;
 
+            if (m_context == SearchContext.StaticClass)
+                StaticClassSearch();
+            else if (m_context == SearchContext.Singleton)
+                SingletonSearch();
+            else
+                UnityObjectSearch();
+
+            RefreshResultList();
+
+            if (m_results.Length > 0)
+                m_resultCountText.text = $"{m_results.Length} Results";
+            else
+                m_resultCountText.text = "No results...";
+        }
+
+        internal void StaticClassSearch()
+        {
+            var list = new List<Type>();
+
+            var nameFilter = "";
+            if (!string.IsNullOrEmpty(m_nameInput.text))
+                nameFilter = m_nameInput.text.ToLower();
+            
+            foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
+            {
+                foreach (var type in asm.TryGetTypes().Where(it => it.IsSealed && it.IsAbstract))
+                {
+                    if (!string.IsNullOrEmpty(nameFilter) && !type.FullName.ToLower().Contains(nameFilter))
+                        continue;
+
+                    list.Add(type);
+                }
+            }
+
+            m_results = list.ToArray();
+        }
+
+        internal string[] s_instanceNames = new string[]
+        {
+            "m_instance",
+            "m_Instance",
+            "s_instance",
+            "s_Instance",
+            "_instance",
+            "_Instance",
+            "instance",
+            "Instance",
+            "<Instance>k__BackingField",
+            "<instance>k__BackingField",
+        };
+
+        private void SingletonSearch()
+        {
+            var instances = new List<object>();
+
+            var nameFilter = "";
+            if (!string.IsNullOrEmpty(m_nameInput.text))
+                nameFilter = m_nameInput.text.ToLower();
+
+            var flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static;
+
+            foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
+            {
+                // Search all non-static, non-enum classes.
+                foreach (var type in asm.TryGetTypes().Where(it => !(it.IsSealed && it.IsAbstract) && !it.IsEnum))
+                {
+                    try
+                    {
+                        if (!string.IsNullOrEmpty(nameFilter) && !type.FullName.ToLower().Contains(nameFilter))
+                            continue;
+#if CPP
+                        // Only look for Properties in IL2CPP, not for Mono.
+                        PropertyInfo pi;
+                        foreach (var name in s_instanceNames)
+                        {
+                            pi = type.GetProperty(name, flags);
+                            if (pi != null)
+                            {
+                                var instance = pi.GetValue(null, null);
+                                if (instance != null)
+                                {
+                                    instances.Add(instance);
+                                    continue;
+                                }
+                            }
+                        }
+#endif
+                        // Look for a typical Instance backing field.
+                        FieldInfo fi;
+                        foreach (var name in s_instanceNames)
+                        {
+                            fi = type.GetField(name, flags);
+                            if (fi != null)
+                            {
+                                var instance = fi.GetValue(null);
+                                if (instance != null)
+                                {
+                                    instances.Add(instance);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    catch { }
+                }
+            }
+
+            m_results = instances.ToArray();
+        }
+
+        internal void UnityObjectSearch()
+        {
             Type searchType = null;
             switch (m_context)
             {
@@ -305,12 +425,12 @@ namespace UnityExplorer.UI.Modules
                             : obj.TryCast<Component>().gameObject;
 #endif
 
-                    if (!go)
-                        continue;
-
                     // scene check
                     if (m_sceneFilter != SceneFilter.Any)
                     {
+                        if (!go)
+                            continue;
+
                         switch (m_context)
                         {
                             case SearchContext.GameObject:
@@ -325,24 +445,23 @@ namespace UnityExplorer.UI.Modules
                         }
                     }
 
-                    // root object check (no parent)
-                    if (m_childFilter == ChildFilter.HasParent && !go.transform.parent)
-                        continue;
-                    else if (m_childFilter == ChildFilter.RootObject && go.transform.parent)
-                        continue;
+                    if (m_childFilter != ChildFilter.Any)
+                    {
+                        if (!go)
+                            continue;
+
+                        // root object check (no parent)
+                        if (m_childFilter == ChildFilter.HasParent && !go.transform.parent)
+                            continue;
+                        else if (m_childFilter == ChildFilter.RootObject && go.transform.parent)
+                            continue;
+                    }
                 }
 
                 results.Add(obj);
             }
 
             m_results = results.ToArray();
-
-            if (m_results.Length > 0)
-                m_resultCountText.text = $"{m_results.Length} Results";
-            else
-                m_resultCountText.text = "No results...";
-
-            RefreshResultList();
         }
 
         private void OnResultPageTurn()
@@ -490,6 +609,23 @@ namespace UnityExplorer.UI.Modules
             m_customTypeInput = customTypeObj.GetComponent<InputField>();
             m_customTypeInput.placeholder.gameObject.GetComponent<Text>().text = "eg. UnityEngine.Texture2D, etc...";
 
+            // static class and singleton buttons
+
+            var secondRow = UIFactory.CreateHorizontalGroup(optionsGroupObj, new Color(1, 1, 1, 0));
+            var secondGroup = secondRow.GetComponent<HorizontalLayoutGroup>();
+            secondGroup.childForceExpandWidth = false;
+            secondGroup.childForceExpandHeight = false;
+            secondGroup.spacing = 3;
+            var secondLayout = secondRow.AddComponent<LayoutElement>();
+            secondLayout.minHeight = 25;
+            var spacer = UIFactory.CreateUIObject("spacer", secondRow);
+            var spaceLayout = spacer.AddComponent<LayoutElement>();
+            spaceLayout.minWidth = 125;
+            spaceLayout.minHeight = 25;
+
+            AddContextButton(secondRow, "Static Class", SearchContext.StaticClass);
+            AddContextButton(secondRow, "Singleton", SearchContext.Singleton);
+
             // search input
 
             var nameRowObj = UIFactory.CreateHorizontalGroup(optionsGroupObj, new Color(1, 1, 1, 0));
@@ -601,7 +737,7 @@ namespace UnityExplorer.UI.Modules
             searchBtnLayout.flexibleHeight = 0;
             var searchBtn = searchBtnObj.GetComponent<Button>();
 
-            searchBtn.onClick.AddListener(OnUnitySearchClicked);
+            searchBtn.onClick.AddListener(OnSearchClicked);
         }
 
         internal void AddContextButton(GameObject parent, string label, SearchContext context, float width = 110)

src/UI/Shared/InputFieldScroller.cs

@@ -33,6 +33,8 @@ namespace UnityExplorer.UI.Shared
             this.sliderScroller = sliderScroller;
             this.inputField = inputField;
 
+            sliderScroller.m_parentInputScroller = this;
+
             inputField.onValueChanged.AddListener(OnTextChanged);
 
             inputRect = inputField.GetComponent<RectTransform>();
@@ -68,6 +70,17 @@ namespace UnityExplorer.UI.Shared
             }
         }
 
+        internal bool CheckDestroyed()
+        {
+            if (sliderScroller == null || sliderScroller.CheckDestroyed())
+            {
+                Instances.Remove(this);
+                return true;
+            }
+
+            return false;
+        }
+
         internal void OnTextChanged(string text)
         {
             m_lastText = text;

src/UI/Shared/PageHandler.cs

@@ -21,7 +21,7 @@ namespace UnityExplorer.UI.Shared
     {
         public PageHandler(SliderScrollbar scroll)
         {
-            ItemsPerPage = ModConfig.Instance?.Default_Page_Limit ?? 20;
+            ItemsPerPage = ExplorerConfig.Instance?.Default_Page_Limit ?? 20;
             m_scrollbar = scroll;
         }
 

src/UI/Shared/SliderScrollbar.cs

@@ -8,150 +8,154 @@ using UnityExplorer;
 using UnityExplorer.Helpers;
 using UnityExplorer.UI;
 
-// Basically just to fix an issue with Scrollbars, instead we use a Slider as the scrollbar.
-public class SliderScrollbar
+namespace UnityExplorer.UI.Shared
 {
-	internal static readonly List<SliderScrollbar> Instances = new List<SliderScrollbar>();
-
-    public bool IsActive { get; private set; }
-
-	internal readonly Scrollbar m_scrollbar;
-	internal readonly Slider m_slider;
-    internal readonly RectTransform m_scrollRect;
-
-	public SliderScrollbar(Scrollbar scrollbar, Slider slider)
+    // Basically just to fix an issue with Scrollbars, instead we use a Slider as the scrollbar.
+    public class SliderScrollbar
     {
-		Instances.Add(this);
+        internal static readonly List<SliderScrollbar> Instances = new List<SliderScrollbar>();
 
-		this.m_scrollbar = scrollbar;
-		this.m_slider = slider;
-        this.m_scrollRect = scrollbar.transform.parent.GetComponent<RectTransform>();
+        public bool IsActive { get; private set; }
 
-        this.m_scrollbar.onValueChanged.AddListener(this.OnScrollbarValueChanged);
-        this.m_slider.onValueChanged.AddListener(this.OnSliderValueChanged);
+        internal readonly Scrollbar m_scrollbar;
+        internal readonly Slider m_slider;
+        internal readonly RectTransform m_scrollRect;
 
-        this.RefreshVisibility();
-		this.m_slider.Set(1f, false);
-	}
+        internal InputFieldScroller m_parentInputScroller;
 
-    internal bool CheckDestroyed()
-    {
-        if (!m_slider || !m_scrollbar)
+        public SliderScrollbar(Scrollbar scrollbar, Slider slider)
         {
-            Instances.Remove(this);
-            return true;
+            Instances.Add(this);
+
+            this.m_scrollbar = scrollbar;
+            this.m_slider = slider;
+            this.m_scrollRect = scrollbar.transform.parent.GetComponent<RectTransform>();
+
+            this.m_scrollbar.onValueChanged.AddListener(this.OnScrollbarValueChanged);
+            this.m_slider.onValueChanged.AddListener(this.OnSliderValueChanged);
+
+            this.RefreshVisibility();
+            this.m_slider.Set(1f, false);
         }
 
-        return false;
-    }
-
-	internal void Update()
-	{
-		this.RefreshVisibility();
-    }
-
-	internal void RefreshVisibility()
-	{
-        if (!m_slider.gameObject.activeInHierarchy)
+        internal bool CheckDestroyed()
         {
-            IsActive = false;
-            return;
+            if (!m_slider || !m_scrollbar)
+            {
+                Instances.Remove(this);
+                return true;
+            }
+
+            return false;
         }
 
-        bool shouldShow = !Mathf.Approximately(this.m_scrollbar.size, 1);
-        var obj = this.m_slider.handleRect.gameObject;
-
-        if (IsActive != shouldShow)
+        internal void Update()
         {
-            IsActive = shouldShow;
-            obj.SetActive(IsActive);
-
-            if (IsActive)
-                this.m_slider.Set(this.m_scrollbar.value, false);
-            else
-                m_slider.Set(1f, false);
+            this.RefreshVisibility();
         }
+
+        internal void RefreshVisibility()
+        {
+            if (!m_slider.gameObject.activeInHierarchy)
+            {
+                IsActive = false;
+                return;
+            }
+
+            bool shouldShow = !Mathf.Approximately(this.m_scrollbar.size, 1);
+            var obj = this.m_slider.handleRect.gameObject;
+
+            if (IsActive != shouldShow)
+            {
+                IsActive = shouldShow;
+                obj.SetActive(IsActive);
+
+                if (IsActive)
+                    this.m_slider.Set(this.m_scrollbar.value, false);
+                else
+                    m_slider.Set(1f, false);
+            }
+        }
+
+        public void OnScrollbarValueChanged(float _value)
+        {
+            if (this.m_slider.value != _value)
+                this.m_slider.Set(_value, false);
+        }
+
+        public void OnSliderValueChanged(float _value)
+        {
+            this.m_scrollbar.value = _value;
+        }
+
+        #region UI CONSTRUCTION
+
+        public static GameObject CreateSliderScrollbar(GameObject parent, out Slider slider)
+        {
+            GameObject sliderObj = UIFactory.CreateUIObject("Slider", parent, UIFactory.thinSize);
+
+            GameObject bgObj = UIFactory.CreateUIObject("Background", sliderObj);
+            GameObject fillAreaObj = UIFactory.CreateUIObject("Fill Area", sliderObj);
+            GameObject fillObj = UIFactory.CreateUIObject("Fill", fillAreaObj);
+            GameObject handleSlideAreaObj = UIFactory.CreateUIObject("Handle Slide Area", sliderObj);
+            GameObject handleObj = UIFactory.CreateUIObject("Handle", handleSlideAreaObj);
+
+            Image bgImage = bgObj.AddComponent<Image>();
+            bgImage.type = Image.Type.Sliced;
+            bgImage.color = new Color(0.05f, 0.05f, 0.05f, 1.0f);
+
+            RectTransform bgRect = bgObj.GetComponent<RectTransform>();
+            bgRect.anchorMin = Vector2.zero;
+            bgRect.anchorMax = Vector2.one;
+            bgRect.sizeDelta = Vector2.zero;
+            bgRect.offsetMax = new Vector2(-10f, 0f);
+
+            RectTransform fillAreaRect = fillAreaObj.GetComponent<RectTransform>();
+            fillAreaRect.anchorMin = new Vector2(0f, 0.25f);
+            fillAreaRect.anchorMax = new Vector2(1f, 0.75f);
+            fillAreaRect.anchoredPosition = new Vector2(-5f, 0f);
+            fillAreaRect.sizeDelta = new Vector2(-20f, 0f);
+
+            Image fillImage = fillObj.AddComponent<Image>();
+            fillImage.type = Image.Type.Sliced;
+            fillImage.color = Color.clear;
+
+            fillObj.GetComponent<RectTransform>().sizeDelta = new Vector2(10f, 0f);
+
+            RectTransform handleSlideRect = handleSlideAreaObj.GetComponent<RectTransform>();
+            handleSlideRect.anchorMin = new Vector2(0f, 0f);
+            handleSlideRect.anchorMax = new Vector2(1f, 1f);
+            handleSlideRect.offsetMin = new Vector2(15f, 30f);
+            handleSlideRect.offsetMax = new Vector2(-15f, 0f);
+            handleSlideRect.sizeDelta = new Vector2(-30f, -30f);
+
+            Image handleImage = handleObj.AddComponent<Image>();
+            handleImage.color = new Color(0.5f, 0.5f, 0.5f, 1.0f);
+
+            var handleRect = handleObj.GetComponent<RectTransform>();
+            handleRect.sizeDelta = new Vector2(15f, 30f);
+            handleRect.offsetMin = new Vector2(-13f, -28f);
+            handleRect.offsetMax = new Vector2(3f, -2f);
+
+            var sliderBarLayout = sliderObj.AddComponent<LayoutElement>();
+            sliderBarLayout.minWidth = 25;
+            sliderBarLayout.flexibleWidth = 0;
+            sliderBarLayout.minHeight = 30;
+            sliderBarLayout.flexibleHeight = 5000;
+
+            slider = sliderObj.AddComponent<Slider>();
+            slider.fillRect = fillObj.GetComponent<RectTransform>();
+            slider.handleRect = handleObj.GetComponent<RectTransform>();
+            slider.targetGraphic = handleImage;
+            slider.direction = Slider.Direction.BottomToTop;
+            UIFactory.SetDefaultColorTransitionValues(slider);
+
+            return sliderObj;
+        }
+
+        #endregion
     }
 
-	public void OnScrollbarValueChanged(float _value)
-	{
-		if (this.m_slider.value != _value)
-            this.m_slider.Set(_value, false);
-	}
-
-	public void OnSliderValueChanged(float _value)
-	{
-        this.m_scrollbar.value = _value;
-    }
-
-    #region UI CONSTRUCTION
-
-    public static GameObject CreateSliderScrollbar(GameObject parent, out Slider slider)
-    {
-        GameObject sliderObj = UIFactory.CreateUIObject("Slider", parent, UIFactory.thinSize);
-
-        GameObject bgObj = UIFactory.CreateUIObject("Background", sliderObj);
-        GameObject fillAreaObj = UIFactory.CreateUIObject("Fill Area", sliderObj);
-        GameObject fillObj = UIFactory.CreateUIObject("Fill", fillAreaObj);
-        GameObject handleSlideAreaObj = UIFactory.CreateUIObject("Handle Slide Area", sliderObj);
-        GameObject handleObj = UIFactory.CreateUIObject("Handle", handleSlideAreaObj);
-
-        Image bgImage = bgObj.AddComponent<Image>();
-        bgImage.type = Image.Type.Sliced;
-        bgImage.color = new Color(0.05f, 0.05f, 0.05f, 1.0f);
-
-        RectTransform bgRect = bgObj.GetComponent<RectTransform>();
-        bgRect.anchorMin = Vector2.zero;
-        bgRect.anchorMax = Vector2.one;
-        bgRect.sizeDelta = Vector2.zero;
-        bgRect.offsetMax = new Vector2(-10f, 0f);
-
-        RectTransform fillAreaRect = fillAreaObj.GetComponent<RectTransform>();
-        fillAreaRect.anchorMin = new Vector2(0f, 0.25f);
-        fillAreaRect.anchorMax = new Vector2(1f, 0.75f);
-        fillAreaRect.anchoredPosition = new Vector2(-5f, 0f);
-        fillAreaRect.sizeDelta = new Vector2(-20f, 0f);
-
-        Image fillImage = fillObj.AddComponent<Image>();
-        fillImage.type = Image.Type.Sliced;
-        fillImage.color = Color.clear;
-
-        fillObj.GetComponent<RectTransform>().sizeDelta = new Vector2(10f, 0f);
-
-        RectTransform handleSlideRect = handleSlideAreaObj.GetComponent<RectTransform>();
-        handleSlideRect.anchorMin = new Vector2(0f, 0f);
-        handleSlideRect.anchorMax = new Vector2(1f, 1f);
-        handleSlideRect.offsetMin = new Vector2(15f, 30f);
-        handleSlideRect.offsetMax = new Vector2(-15f, 0f);
-        handleSlideRect.sizeDelta = new Vector2(-30f, -30f);
-
-        Image handleImage = handleObj.AddComponent<Image>();
-        handleImage.color = new Color(0.5f, 0.5f, 0.5f, 1.0f);
-
-        var handleRect = handleObj.GetComponent<RectTransform>();
-        handleRect.sizeDelta = new Vector2(15f, 30f);
-        handleRect.offsetMin = new Vector2(-13f, -28f);
-        handleRect.offsetMax = new Vector2(3f, -2f);
-
-        var sliderBarLayout = sliderObj.AddComponent<LayoutElement>();
-        sliderBarLayout.minWidth = 25;
-        sliderBarLayout.flexibleWidth = 0;
-        sliderBarLayout.minHeight = 30;
-        sliderBarLayout.flexibleHeight = 5000;
-
-        slider = sliderObj.AddComponent<Slider>();
-        slider.fillRect = fillObj.GetComponent<RectTransform>();
-        slider.handleRect = handleObj.GetComponent<RectTransform>();
-        slider.targetGraphic = handleImage;
-        slider.direction = Slider.Direction.BottomToTop;
-        UIFactory.SetDefaultColorTransitionValues(slider);
-
-        return sliderObj;
-    }
-
-    #endregion
-}
-
 #if MONO
 public static class SliderExtensions
 {
@@ -175,4 +179,5 @@ public static class SliderExtensions
 		SetMethod.Invoke(slider, new object[] { value, invokeCallback });
 	}
 }
-#endif
+#endif
+}

src/UI/UIManager.cs

@@ -8,6 +8,8 @@ using System.Reflection;
 using UnityExplorer.Helpers;
 using UnityExplorer.UI.Shared;
 using UnityExplorer.Input;
+using System;
+using UnityExplorer.Config;
 #if CPP
 using UnityExplorer.Unstrip;
 #endif
@@ -24,6 +26,43 @@ namespace UnityExplorer.UI
         internal static Sprite ResizeCursor { get; private set; }
         internal static Shader BackupShader { get; private set; }
 
+        public static bool ShowMenu
+        {
+            get => s_showMenu;
+            set => SetShowMenu(value);
+        }
+        public static bool s_showMenu;
+
+        private static bool s_doneUIInit;
+        private static float s_timeSinceStartup;
+
+        internal static void CheckUIInit()
+        {
+            if (s_doneUIInit)
+                return;
+
+            s_timeSinceStartup += Time.deltaTime;
+
+            if (s_timeSinceStartup > 0.1f)
+            {
+                s_doneUIInit = true;
+                try
+                {
+                    Init();
+                    ExplorerCore.Log("Initialized UnityExplorer UI.");
+
+                    if (ExplorerConfig.Instance.Hide_On_Startup)
+                        ShowMenu = false;
+
+                    // InspectorManager.Instance.Inspect(Tests.TestClass.Instance);
+                }
+                catch (Exception e)
+                {
+                    ExplorerCore.LogWarning($"Exception setting up UI: {e}");
+                }
+            }
+        }
+
         public static void Init()
         {
             LoadBundle();
@@ -40,6 +79,26 @@ namespace UnityExplorer.UI
             Canvas.ForceUpdateCanvases();
         }
 
+        private static void SetShowMenu(bool show)
+        {
+            if (s_showMenu == show)
+                return;
+
+            s_showMenu = show;
+
+            if (CanvasRoot)
+            {
+                CanvasRoot.SetActive(show);
+
+                if (show)
+                    ForceUnlockCursor.SetEventSystem();
+                else
+                    ForceUnlockCursor.ReleaseEventSystem();
+            }
+
+            ForceUnlockCursor.UpdateCursorControl();
+        }
+
         public static void OnSceneChange()
         {
             SceneExplorer.Instance?.OnSceneChange();
@@ -48,17 +107,20 @@ namespace UnityExplorer.UI
 
         public static void Update()
         {
+            if (InputManager.GetKeyDown(ExplorerConfig.Instance.Main_Menu_Toggle))
+                ShowMenu = !ShowMenu;
+
+            if (!ShowMenu || !s_doneUIInit || !CanvasRoot)
+                return;
+
             MainMenu.Instance?.Update();
 
             if (EventSys)
             {
                 if (EventSystem.current != EventSys)
-                {
                     ForceUnlockCursor.SetEventSystem();
-                }
-
 #if CPP
-                // Fix for games which override the InputModule pointer events (eg, VRChat)
+                // Some IL2CPP games behave weird with multiple UI Input Systems, some fixes for them.
                 var evt = InputManager.InputPointerEvent;
                 if (evt != null)
                 {
@@ -69,9 +131,7 @@ namespace UnityExplorer.UI
             }
 
             if (PanelDragger.Instance != null)
-            {
                 PanelDragger.Instance.Update();
-            }
 
             for (int i = 0; i < SliderScrollbar.Instances.Count; i++)
             {
@@ -87,40 +147,73 @@ namespace UnityExplorer.UI
             {
                 var input = InputFieldScroller.Instances[i];
 
-                if (input.sliderScroller.CheckDestroyed())
+                if (input.CheckDestroyed())
                     i--;
                 else
                     input.Update();
             }
         }
 
+        private static AssetBundle LoadExplorerUi(string id)
+        {
+            return AssetBundle.LoadFromMemory(ReadFully(typeof(ExplorerCore).Assembly.GetManifestResourceStream($"UnityExplorer.Resources.explorerui.{id}.bundle")));
+        }
+
+        private static byte[] ReadFully(this Stream input)
+        {
+            using (var ms = new MemoryStream())
+            {
+                byte[] buffer = new byte[81920];
+                int read;
+                while ((read = input.Read(buffer, 0, buffer.Length)) != 0)
+                    ms.Write(buffer, 0, read);
+
+                return ms.ToArray();
+            }
+        }
+
         private static void LoadBundle()
         {
-            var bundlePath = ExplorerCore.EXPLORER_FOLDER + @"\explorerui.bundle";
-            if (File.Exists(bundlePath))
+            AssetBundle bundle = null;
+
+            try
             {
-                var bundle = AssetBundle.LoadFromFile(bundlePath);
-
-                BackupShader = bundle.LoadAsset<Shader>("DefaultUI");
-
-                // Fix for games which don't ship with 'UI/Default' shader.
-                if (Graphic.defaultGraphicMaterial.shader?.name != "UI/Default")
-                {
-                    ExplorerCore.Log("This game does not ship with the 'UI/Default' shader, using manual Default Shader...");
-                    Graphic.defaultGraphicMaterial.shader = BackupShader;
-                }
-
-                ResizeCursor = bundle.LoadAsset<Sprite>("cursor");
-
-                ConsoleFont = bundle.LoadAsset<Font>("CONSOLA");
-
-                ExplorerCore.Log("Loaded UI bundle");
+                bundle = LoadExplorerUi("modern");
             }
-            else
+            catch
             {
-                ExplorerCore.LogWarning("Could not find the ExplorerUI Bundle! It should exist at '" + bundlePath + "'");
+                ExplorerCore.Log("Failed to load modern ExplorerUI Bundle, falling back to legacy");
+
+                try
+                {
+                    bundle = LoadExplorerUi("legacy");
+                }
+                catch
+                {
+                    // ignored
+                }
+            }
+
+            if (bundle == null)
+            {
+                ExplorerCore.LogWarning("Could not load the ExplorerUI Bundle!");
                 return;
             }
+
+            BackupShader = bundle.LoadAsset<Shader>("DefaultUI");
+
+            // Fix for games which don't ship with 'UI/Default' shader.
+            if (Graphic.defaultGraphicMaterial.shader?.name != "UI/Default")
+            {
+                ExplorerCore.Log("This game does not ship with the 'UI/Default' shader, using manual Default Shader...");
+                Graphic.defaultGraphicMaterial.shader = BackupShader;
+            }
+
+            ResizeCursor = bundle.LoadAsset<Sprite>("cursor");
+
+            ConsoleFont = bundle.LoadAsset<Font>("CONSOLA");
+
+            ExplorerCore.Log("Loaded UI bundle");
         }
 
         private static GameObject CreateRootCanvas()
@@ -139,7 +232,7 @@ namespace UnityExplorer.UI
             canvas.renderMode = RenderMode.ScreenSpaceCamera;
             canvas.referencePixelsPerUnit = 100;
             canvas.sortingOrder = 999;
-            canvas.pixelPerfect = false;
+            //canvas.pixelPerfect = false;
 
             CanvasScaler scaler = rootObj.AddComponent<CanvasScaler>();
             scaler.referenceResolution = new Vector2(1920, 1080);

src/UI/UISyntaxHighlight.cs

@@ -8,36 +8,36 @@ namespace UnityExplorer.UI
 {
     public class UISyntaxHighlight
     {
-        public const string Field_Static = "#8d8dc6";
-        public const string Field_Instance = "#c266ff";
+        public const string FIELD_STATIC = "#8d8dc6";
+        public const string FIELD_INSTANCE = "#c266ff";
 
-        public const string Method_Static = "#b55b02";
-        public const string Method_Instance = "#ff8000";
+        public const string METHOD_STATIC = "#b55b02";
+        public const string METHOD_INSTANCE = "#ff8000";
 
-        public const string Prop_Static = "#588075";
-        public const string Prop_Instance = "#55a38e";
+        public const string PROP_STATIC = "#588075";
+        public const string PROP_INSTANCE = "#55a38e";
 
-        public const string Class_Static = "#3a8d71";
-        public const string Class_Instance = "#2df7b2";
+        public const string CLASS_STATIC = "#3a8d71";
+        public const string CLASS_INSTANCE = "#2df7b2";
 
-        public const string Local = "#a6e9e9";
+        public const string CLASS_STRUCT = "#0fba3a";
 
-        public const string StructGreen = "#0fba3a";
+        public const string LOCAL_ARG = "#a6e9e9";
 
-        public static string Enum = "#92c470";
+        public static string CONST_VAR = "#92c470";
 
         internal static readonly Color s_silver = new Color(0.66f, 0.66f, 0.66f);
 
         internal static string GetClassColor(Type type)
         {
             if (type.IsAbstract && type.IsSealed)
-                return Class_Static;
+                return CLASS_STATIC;
             else if (type.IsEnum || type.IsGenericParameter)
-                return Enum;
+                return CONST_VAR;
             else if (type.IsValueType)
-                return StructGreen;
+                return CLASS_STRUCT;
             else
-                return Class_Instance;
+                return CLASS_INSTANCE;
         }
 
         public static string ParseFullSyntax(Type type, bool includeNamespace, MemberInfo memberInfo = null)
@@ -49,7 +49,7 @@ namespace UnityExplorer.UI
 
             if (type.IsGenericParameter || (type.HasElementType && type.GetElementType().IsGenericParameter))
             {
-                ret = $"<color={Enum}>{type.Name}</color>";
+                ret = $"<color={CONST_VAR}>{type.Name}</color>";
             }
             else
             {
@@ -134,7 +134,7 @@ namespace UnityExplorer.UI
 
                 if (allGeneric)
                 {
-                    args += $"<color={Enum}>{arg.Name}</color>";
+                    args += $"<color={CONST_VAR}>{arg.Name}</color>";
                     continue;
                 }
 
@@ -153,30 +153,30 @@ namespace UnityExplorer.UI
                 if (fi.IsStatic)
                 {
                     isStatic = true;
-                    memberColor = Field_Static;
+                    memberColor = FIELD_STATIC;
                 }
                 else
-                    memberColor = Field_Instance;
+                    memberColor = FIELD_INSTANCE;
             }
             else if (memberInfo is MethodInfo mi)
             {
                 if (mi.IsStatic)
                 {
                     isStatic = true;
-                    memberColor = Method_Static;
+                    memberColor = METHOD_STATIC;
                 }
                 else
-                    memberColor = Method_Instance;
+                    memberColor = METHOD_INSTANCE;
             }
             else if (memberInfo is PropertyInfo pi)
             {
                 if (pi.GetAccessors(true)[0].IsStatic)
                 {
                     isStatic = true;
-                    memberColor = Prop_Static;
+                    memberColor = PROP_STATIC;
                 }
                 else
-                    memberColor = Prop_Instance;
+                    memberColor = PROP_INSTANCE;
             }
             return memberColor;
         }

src/UnityExplorer.csproj

@@ -11,7 +11,7 @@
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
-    <OutputPath>..\Release\Explorer.MelonLoader.Il2Cpp\</OutputPath>
+    <OutputPath>..\Release\UnityExplorer.MelonLoader.Il2Cpp\</OutputPath>
     <DefineConstants>
     </DefineConstants>
     <IsCpp>false</IsCpp>
@@ -25,9 +25,9 @@
     <Prefer32Bit>false</Prefer32Bit>
     <RootNamespace>UnityExplorer</RootNamespace>
     <!-- Set this to the BepInEx Il2Cpp Game folder, without the ending '\' character. -->
-    <BIECppGameFolder>D:\source\Unity Projects\Test\_BUILD</BIECppGameFolder>
+    <BIECppGameFolder>E:\source\Unity Projects\Test\_BUILD</BIECppGameFolder>
     <!-- Set this to the MelonLoader Il2Cpp Game folder, without the ending '\' character. -->
-    <MLCppGameFolder>D:\source\Unity Projects\Test\_BUILD</MLCppGameFolder>
+    <MLCppGameFolder>E:\source\Unity Projects\Test\_BUILD</MLCppGameFolder>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -53,21 +53,50 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_BIE_Cpp|AnyCPU' ">
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <OutputPath>..\Release\UnityExplorer.BepInEx.Il2Cpp\</OutputPath>
-    <DefineConstants>CPP,BIE</DefineConstants>
+    <DefineConstants>CPP,BIE,BIE6</DefineConstants>
     <AssemblyName>UnityExplorer.BIE.IL2CPP</AssemblyName>
     <IsCpp>true</IsCpp>
     <IsMelonLoader>false</IsMelonLoader>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_BIE_Mono|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_BIE6_Mono|AnyCPU' ">
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <OutputPath>..\Release\UnityExplorer.BepInEx.Mono\</OutputPath>
-    <DefineConstants>MONO,BIE</DefineConstants>
-    <AssemblyName>UnityExplorer.BIE.Mono</AssemblyName>
+    <OutputPath>..\Release\UnityExplorer.BepInEx6.Mono\</OutputPath>
+    <DefineConstants>MONO,BIE,BIE6</DefineConstants>
+    <AssemblyName>UnityExplorer.BIE6.Mono</AssemblyName>
     <IsCpp>false</IsCpp>
     <IsMelonLoader>false</IsMelonLoader>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_BIE5_Mono|AnyCPU'">
+    <OutputPath>..\Release\UnityExplorer.BepInEx5.Mono\</OutputPath>
+    <DefineConstants>MONO,BIE,BIE5</DefineConstants>
+    <AssemblyName>UnityExplorer.BIE5.Mono</AssemblyName>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_STANDALONE_Mono|AnyCPU'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <OutputPath>..\Release\UnityExplorer.Standalone.Mono\</OutputPath>
+    <DefineConstants>MONO,STANDALONE</DefineConstants>
+    <AssemblyName>UnityExplorer.STANDALONE.Mono</AssemblyName>
+    <IsCpp>false</IsCpp>
+    <IsMelonLoader>false</IsMelonLoader>
+    <IsStandalone>true</IsStandalone>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_STANDALONE_Cpp|AnyCPU'">
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <OutputPath>..\Release\UnityExplorer.Standalone.Il2Cpp\</OutputPath>
+    <DefineConstants>CPP,STANDALONE</DefineConstants>
+    <AssemblyName>UnityExplorer.STANDALONE.IL2CPP</AssemblyName>
+    <IsCpp>true</IsCpp>
+    <IsMelonLoader>false</IsMelonLoader>
+    <IsStandalone>true</IsStandalone>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="INIFileParser, Version=2.5.2.0, Culture=neutral, PublicKeyToken=79af7b307b65cf3c, processorArchitecture=MSIL">
       <HintPath>packages\ini-parser.2.5.2\lib\net20\INIFileParser.dll</HintPath>
@@ -98,13 +127,13 @@
   </ItemGroup>
   <!-- MelonLoader Mono refs -->
   <ItemGroup Condition="'$(IsMelonLoader)|$(IsCpp)'=='true|false'">
-    <Reference Include="MelonLoader.ModHandler">
-      <HintPath>..\lib\MelonLoader.ModHandler.dll</HintPath>
+    <Reference Include="MelonLoader">
+      <HintPath>..\lib\MelonLoader.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
-  <!-- BepInEx Mono refs -->
-  <ItemGroup Condition="'$(IsMelonLoader)|$(IsCpp)'=='false|false'">
+  <!-- BepInEx 5 Mono refs -->
+  <ItemGroup Condition="'$(IsMelonLoader)|$(IsCpp)|$(Configuration)'=='false|false|Release_BIE5_Mono'">
     <Reference Include="BepInEx">
       <HintPath>..\lib\BepInEx.dll</HintPath>
       <Private>False</Private>
@@ -114,10 +143,32 @@
       <Private>False</Private>
     </Reference>
   </ItemGroup>
+  <!-- BepInEx 6 Mono refs -->
+  <ItemGroup Condition="'$(IsMelonLoader)|$(IsCpp)|$(Configuration)'=='false|false|Release_BIE6_Mono'">
+    <Reference Include="BepInEx">
+      <HintPath>..\lib\BepInEx.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="BepInEx.Unity">
+      <HintPath>..\lib\BepInEx.Unity.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="0Harmony">
+      <HintPath>..\lib\0Harmony.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <!-- Standalone refs -->
+  <ItemGroup Condition="'$(IsStandalone)'=='true'">
+    <Reference Include="0Harmony">
+      <HintPath>..\lib\0Harmony.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <!-- MelonLoader Il2Cpp refs -->
   <ItemGroup Condition="'$(IsMelonLoader)|$(IsCpp)'=='true|true'">
-    <Reference Include="MelonLoader.ModHandler">
-      <HintPath>$(MLCppGameFolder)\MelonLoader\MelonLoader.ModHandler.dll</HintPath>
+    <Reference Include="MelonLoader">
+      <HintPath>$(MLCppGameFolder)\MelonLoader\MelonLoader.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnhollowerBaseLib">
@@ -217,6 +268,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Loader\ExplorerBepIn6Plugin.cs" />
+    <Compile Include="Loader\ExplorerStandalone.cs" />
     <Compile Include="Helpers\EventHelper.cs" />
     <Compile Include="Inspectors\MouseInspector.cs" />
     <Compile Include="Inspectors\Reflection\CacheObject\CacheEnumerated.cs" />
@@ -227,10 +280,10 @@
     <Compile Include="Inspectors\Reflection\CacheObject\CacheProperty.cs" />
     <Compile Include="Inspectors\Reflection\CacheObject\CacheObjectBase.cs" />
     <Compile Include="Helpers\Texture2DHelpers.cs" />
-    <Compile Include="Config\ModConfig.cs" />
+    <Compile Include="Config\ExplorerConfig.cs" />
     <Compile Include="ExplorerCore.cs" />
-    <Compile Include="ExplorerBepInPlugin.cs" />
-    <Compile Include="ExplorerMelonMod.cs" />
+    <Compile Include="Loader\ExplorerBepIn5Plugin.cs" />
+    <Compile Include="Loader\ExplorerMelonMod.cs" />
     <Compile Include="Helpers\ReflectionHelpers.cs" />
     <Compile Include="Helpers\UnityHelpers.cs" />
     <Compile Include="Inspectors\GameObjects\ChildList.cs" />
@@ -244,6 +297,7 @@
     <Compile Include="Inspectors\Reflection\InteractiveValue\InteractiveNumber.cs" />
     <Compile Include="Inspectors\Reflection\InteractiveValue\InteractiveString.cs" />
     <Compile Include="Inspectors\Reflection\InteractiveValue\InteractiveUnityStruct.cs" />
+    <Compile Include="Loader\IExplorerLoader.cs" />
     <Compile Include="UI\ForceUnlockCursor.cs" />
     <Compile Include="Input\IHandleInput.cs" />
     <Compile Include="Tests\Tests.cs" />
@@ -293,6 +347,7 @@
     <Compile Include="Unstrip\SceneUnstrip.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UI\UIFactory.cs" />
+    <EmbeddedResource Include="Resources\*" />
   </ItemGroup>
   <ItemGroup>
     <None Include="ILRepack.targets" />

src/UnityExplorer.sln

@@ -8,19 +8,28 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Release_BIE_Cpp|Any CPU = Release_BIE_Cpp|Any CPU
-		Release_BIE_Mono|Any CPU = Release_BIE_Mono|Any CPU
+		Release_BIE5_Mono|Any CPU = Release_BIE5_Mono|Any CPU
+		Release_BIE6_Mono|Any CPU = Release_BIE6_Mono|Any CPU
 		Release_ML_Cpp|Any CPU = Release_ML_Cpp|Any CPU
 		Release_ML_Mono|Any CPU = Release_ML_Mono|Any CPU
+		Release_STANDALONE_Cpp|Any CPU = Release_STANDALONE_Cpp|Any CPU
+		Release_STANDALONE_Mono|Any CPU = Release_STANDALONE_Mono|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_BIE_Cpp|Any CPU.ActiveCfg = Release_BIE_Cpp|Any CPU
 		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_BIE_Cpp|Any CPU.Build.0 = Release_BIE_Cpp|Any CPU
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_BIE_Mono|Any CPU.ActiveCfg = Release_BIE_Mono|Any CPU
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_BIE_Mono|Any CPU.Build.0 = Release_BIE_Mono|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_BIE5_Mono|Any CPU.ActiveCfg = Release_BIE5_Mono|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_BIE5_Mono|Any CPU.Build.0 = Release_BIE5_Mono|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_BIE6_Mono|Any CPU.ActiveCfg = Release_BIE6_Mono|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_BIE6_Mono|Any CPU.Build.0 = Release_BIE6_Mono|Any CPU
 		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_ML_Cpp|Any CPU.ActiveCfg = Release_ML_Cpp|Any CPU
 		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_ML_Cpp|Any CPU.Build.0 = Release_ML_Cpp|Any CPU
 		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_ML_Mono|Any CPU.ActiveCfg = Release_ML_Mono|Any CPU
 		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_ML_Mono|Any CPU.Build.0 = Release_ML_Mono|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_STANDALONE_Cpp|Any CPU.ActiveCfg = Release_STANDALONE_Cpp|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_STANDALONE_Cpp|Any CPU.Build.0 = Release_STANDALONE_Cpp|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_STANDALONE_Mono|Any CPU.ActiveCfg = Release_STANDALONE_Mono|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_STANDALONE_Mono|Any CPU.Build.0 = Release_STANDALONE_Mono|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Unstrip/AssetBundleUnstrip.cs

@@ -24,6 +24,17 @@ namespace UnityExplorer.Unstrip
 
             return new AssetBundle(ptr);
         }
+        
+        private delegate IntPtr d_LoadFromMemory(IntPtr binary, uint crc);
+
+        public static AssetBundle LoadFromMemory(byte[] binary, uint crc = 0)
+        {
+            var iCall = ICallHelper.GetICall<d_LoadFromMemory>("UnityEngine.AssetBundle::LoadFromMemory_Internal");
+
+            var ptr = iCall(((Il2CppStructArray<byte>) binary).Pointer, crc);
+
+            return new AssetBundle(ptr);
+        }
 
         // ~~~~~~~~~~~~ Instance ~~~~~~~~~~~~
 

src/Unstrip/ImageConversionUnstrip.cs

@@ -43,14 +43,11 @@ namespace UnityExplorer.Unstrip
 
         public static bool LoadImage(this Texture2D tex, byte[] data, bool markNonReadable)
         {
-            Il2CppStructArray<byte> il2cppArray = new Il2CppStructArray<byte>(data.Length);
-            for (int i = 0; i < data.Length; i++)
-                il2cppArray[i] = data[i];
+            var il2cppArray = (Il2CppStructArray<byte>)data;
 
-            bool ret = ICallHelper.GetICall<d_LoadImage>("UnityEngine.ImageConversion::LoadImage")
-                .Invoke(tex.Pointer, il2cppArray.Pointer, markNonReadable);
-
-            return ret;
+            var iCall = ICallHelper.GetICall<d_LoadImage>("UnityEngine.ImageConversion::LoadImage");
+                
+            return iCall.Invoke(tex.Pointer, il2cppArray.Pointer, markNonReadable);
         }
 
         // Sprite Sprite.Create
@@ -70,5 +67,16 @@ namespace UnityExplorer.Unstrip
                 return new Sprite(ptr);
         }
 #endif
+
+        // Simpler CreateSprite helper
+
+        public static Sprite CreateSprite(Texture2D texture)
+        {
+#if CPP
+            return CreateSprite(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero, 100f, 0u, Vector4.zero);
+#else
+            return Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
+#endif
+        }
     }
 }

src/Unstrip/SceneUnstrip.cs

@@ -3,36 +3,25 @@ using UnityExplorer.Helpers;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityExplorer.Inspectors;
+using System.Reflection;
 
 namespace UnityExplorer.Unstrip
 {
-    public class SceneUnstrip
+    public static class SceneUnstrip
     {
 #if MONO
-        public static GameObject[] GetRootGameObjects(Scene scene) => scene.GetRootGameObjects();
-
-        //public static GameObject[] GetRootGameObjects(int handle)
-        //{
-        //    Scene scene = default;
-        //    if (handle == SceneExplorer.DontDestroyHandle)
-        //        scene = SceneExplorer.DontDestroyObject.scene;
-        //    else
-        //    {
-        //        for (int i = 0; i < SceneManager.sceneCount; i++)
-        //        {
-        //            var iscene = SceneManager.GetSceneAt(i);
-        //            if (iscene.handle == handle)
-        //                scene = iscene;
-        //        }
-        //    }
-
-        //    if (scene != default && scene.handle != -1)
-        //        return scene.GetRootGameObjects();
-
-        //    return new GameObject[0];
-        //}
+        private static readonly FieldInfo fi_Scene_handle = typeof(Scene).GetField("m_Handle", ReflectionHelpers.CommonFlags);
 #endif
 
+        public static int GetHandle(this Scene scene)
+        {
+#if CPP
+            return scene.handle;
+#else
+            return (int)fi_Scene_handle.GetValue(scene);
+#endif
+        }
+
 #if CPP
         //Scene.GetRootGameObjects();
 
@@ -43,13 +32,16 @@ namespace UnityExplorer.Unstrip
         public static GameObject[] GetRootGameObjects(int handle)
         {
             if (handle == -1)
-            {
                 return new GameObject[0];
-            }
 
-            Il2CppSystem.Collections.Generic.List<GameObject> list = new Il2CppSystem.Collections.Generic.List<GameObject>(GetRootCount(handle));
+            int count = GetRootCount(handle);
 
-            d_GetRootGameObjects iCall = ICallHelper.GetICall<d_GetRootGameObjects>("UnityEngine.SceneManagement.Scene::GetRootGameObjectsInternal");
+            if (count < 1)
+                return new GameObject[0];
+
+            var list = new Il2CppSystem.Collections.Generic.List<GameObject>(count);
+
+            var iCall = ICallHelper.GetICall<d_GetRootGameObjects>("UnityEngine.SceneManagement.Scene::GetRootGameObjectsInternal");
 
             iCall.Invoke(handle, list.Pointer);
 
@@ -58,14 +50,14 @@ namespace UnityExplorer.Unstrip
 
         //Scene.rootCount;
 
-        internal delegate int GetRootCountInternal_delegate(int handle);
+        internal delegate int d_GetRootCountInternal(int handle);
 
         public static int GetRootCount(Scene scene) => GetRootCount(scene.handle);
 
         public static int GetRootCount(int handle)
         {
-            GetRootCountInternal_delegate iCall = ICallHelper.GetICall<GetRootCountInternal_delegate>("UnityEngine.SceneManagement.Scene::GetRootCountInternal");
-            return iCall.Invoke(handle);
+            return ICallHelper.GetICall<d_GetRootCountInternal>("UnityEngine.SceneManagement.Scene::GetRootCountInternal")
+                   .Invoke(handle);
         }
 #endif
     }