create subfolder for standalone

* 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

@@ -6,14 +6,14 @@ using IniParser.Parser;
 
 namespace UnityExplorer.Config
 {
-    public class ModConfig
+    public class ExplorerConfig
     {
-        public static ModConfig Instance;
+        public static ExplorerConfig Instance;
 
         internal static readonly IniDataParser _parser = new IniDataParser();
-        internal const string INI_PATH = ExplorerCore.EXPLORER_FOLDER + @"\config.ini";
+        internal static readonly string INI_PATH = Path.Combine(ExplorerCore.Loader.ConfigFolder, "config.ini");
 
-        static ModConfig()
+        static ExplorerConfig()
         {
             _parser.Configuration.CommentString = "#";
         }
@@ -22,9 +22,10 @@ namespace UnityExplorer.Config
         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 string   Default_Output_Path = ExplorerCore.ExplorerFolder + @"\Output";
         public bool     Log_Unity_Debug     = false;
-        public bool     Save_Logs_To_Disk   = true;
+        public bool     Hide_On_Startup     = false;
+        //public bool     Save_Logs_To_Disk   = true;
 
         public static event Action OnConfigChanged;
 
@@ -35,7 +36,7 @@ namespace UnityExplorer.Config
 
         public static void OnLoad()
         {
-            Instance = new ModConfig();
+            Instance = new ExplorerConfig();
 
             if (LoadSettings())
                 return;
@@ -56,24 +57,27 @@ namespace UnityExplorer.Config
             {
                 switch (config.KeyName)
                 {
-                    case "Main_Menu_Toggle":
+                    case nameof(Main_Menu_Toggle):
                         Instance.Main_Menu_Toggle = (KeyCode)Enum.Parse(typeof(KeyCode), config.Value);
                         break;
-                    case "Force_Unlock_Mouse":
+                    case nameof(Force_Unlock_Mouse):
                         Instance.Force_Unlock_Mouse = bool.Parse(config.Value);
                         break;
-                    case "Default_Page_Limit":
+                    case nameof(Default_Page_Limit):
                         Instance.Default_Page_Limit = int.Parse(config.Value);
                         break;
-                    case "Log_Unity_Debug":
+                    case nameof(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":
+                    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(Save_Logs_To_Disk):
+                    //    Instance.Save_Logs_To_Disk = bool.Parse(config.Value);
+                    //    break;
                 }
             }
 
@@ -87,12 +91,16 @@ namespace UnityExplorer.Config
             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);
+            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("Save_Logs_To_Disk",     Instance.Save_Logs_To_Disk.ToString());
+
+            if (!Directory.Exists(ExplorerCore.Loader.ConfigFolder))
+                Directory.CreateDirectory(ExplorerCore.Loader.ConfigFolder);
 
             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.5";
+        public const string VERSION = "3.2.1";
         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,30 @@ 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.");
-                }
-                catch (Exception e)
-                {
-                    LogWarning($"Exception setting up UI: {e}");
-                }
-            }
-        }
 
         private void SetupEvents()
         {
@@ -104,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(); }; 
@@ -120,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)
@@ -167,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)
@@ -181,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)
@@ -195,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/ReflectionHelpers.cs

@@ -52,7 +52,7 @@ namespace UnityExplorer.Helpers
             return list.ToArray();
         }
 
-        public static Type GetActualType(object obj)
+        public static Type GetActualType(this object obj)
         {
             if (obj == null)
                 return null;
@@ -93,20 +93,55 @@ namespace UnityExplorer.Helpers
         }
 
 #if CPP
-        private static readonly Dictionary<CppType, Type> Il2CppToMonoType = new Dictionary<CppType, Type>();
+        private static readonly Dictionary<string, Type> Il2CppToMonoType = new Dictionary<string, Type>();
 
         public static Type GetMonoType(CppType cppType)
         {
-            if (Il2CppToMonoType.ContainsKey(cppType))
-                return Il2CppToMonoType[cppType];
+            if (Il2CppToMonoType.ContainsKey(cppType.AssemblyQualifiedName))
+                return Il2CppToMonoType[cppType.AssemblyQualifiedName];
 
             var getType = Type.GetType(cppType.AssemblyQualifiedName);
-            Il2CppToMonoType.Add(cppType, getType);
+            
+            if (getType != null)
+            {
+                Il2CppToMonoType.Add(cppType.AssemblyQualifiedName, getType);
                 return getType;
             }
+            else
+            {
+                string baseName = cppType.FullName;
+                string baseAssembly = cppType.Assembly.GetName().name;
+
+                Type unhollowedType = 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));
+
+                Il2CppToMonoType.Add(cppType.AssemblyQualifiedName, unhollowedType);
+
+                return unhollowedType;
+            }
+        }
 
         private static readonly Dictionary<Type, IntPtr> CppClassPointers = new Dictionary<Type, IntPtr>();
 
+        /// <summary>
+        /// Attempt to cast the object to its underlying type.
+        /// </summary>
+        /// <param name="obj">The object you want to cast.</param>
+        /// <returns>The object, as the underlying type if successful or the input value if not.</returns>
+        public static object Il2CppCast(this object obj) => Il2CppCast(obj, GetActualType(obj));
+
+        /// <summary>
+        /// Attempt to cast the object to the provided type.
+        /// </summary>
+        /// <param name="obj">The object you want to cast.</param>
+        /// <param name="castTo">The Type you want to cast to.</param>
+        /// <returns>The object, as the type (or a normal C# object) if successful or the input value if not.</returns>
         public static object Il2CppCast(this object obj, Type castTo)
         {
             if (!(obj is Il2CppSystem.Object ilObj))
@@ -126,6 +161,39 @@ namespace UnityExplorer.Helpers
             return Activator.CreateInstance(castTo, ilObj.Pointer);
         }
 
+        internal static readonly Dictionary<Type, MethodInfo> s_unboxMethods = new Dictionary<Type, MethodInfo>();
+
+        /// <summary>
+        /// Attempt to unbox the object to the underlying struct type.
+        /// </summary>
+        /// <param name="obj">The object which is a struct underneath.</param>
+        /// <returns>The struct if successful, otherwise null.</returns>
+        public static object Unbox(this object obj) => Unbox(obj, GetActualType(obj));
+
+        /// <summary>
+        /// Attempt to unbox the object to the struct type.
+        /// </summary>
+        /// <param name="obj">The object which is a struct underneath.</param>
+        /// <param name="type">The type of the struct you want to unbox to.</param>
+        /// <returns>The struct if successful, otherwise null.</returns>
+        public static object Unbox(this object obj, Type type)
+        {
+            if (!type.IsValueType)
+                return null;
+
+            if (!(obj is Il2CppSystem.Object))
+                return obj;
+
+            if (!s_unboxMethods.ContainsKey(type))
+            {
+                s_unboxMethods.Add(type, typeof(Il2CppObjectBase)
+                                            .GetMethod("Unbox")
+                                            .MakeGenericMethod(type));
+            }
+
+            return s_unboxMethods[type].Invoke(obj, new object[0]);
+        }
+
         public static bool Il2CppTypeNotNull(Type type) => Il2CppTypeNotNull(type, out _);
 
         public static bool Il2CppTypeNotNull(Type type, out IntPtr il2cppPtr)
@@ -215,50 +283,56 @@ namespace UnityExplorer.Helpers
         public static bool LoadModule(string module) => true;
 #endif
 
+#if CPP
+        internal static IntPtr s_cppEnumerableClassPtr;
+#endif
+
         public static bool IsEnumerable(Type t)
         {
             if (typeof(IEnumerable).IsAssignableFrom(t))
+                return true;
+#if CPP
+            try
+            {
+                if (s_cppEnumerableClassPtr == IntPtr.Zero)
+                    Il2CppTypeNotNull(typeof(Il2CppSystem.Collections.IEnumerable), out s_cppEnumerableClassPtr);
+
+                if (s_cppEnumerableClassPtr != IntPtr.Zero 
+                    && Il2CppTypeNotNull(t, out IntPtr classPtr) 
+                    && il2cpp_class_is_assignable_from(s_cppEnumerableClassPtr, classPtr))
                 {
                     return true;
                 }
+            }
+            catch { }
+#endif
+            return false;
+        }
 
 #if CPP
-            if (t.IsGenericType && t.GetGenericTypeDefinition() is Type g)
-            {
-                return typeof(Il2CppSystem.Collections.Generic.List<>).IsAssignableFrom(g)
-                    || typeof(Il2CppSystem.Collections.Generic.IList<>).IsAssignableFrom(g)
-                    || typeof(Il2CppSystem.Collections.Generic.HashSet<>).IsAssignableFrom(g);
-            }
-            else
-            {
-                return typeof(Il2CppSystem.Collections.IList).IsAssignableFrom(t);
-            }
-#else
-            return false;
+        internal static IntPtr s_cppDictionaryClassPtr;
 #endif
-        }
 
         public static bool IsDictionary(Type t)
         {
             if (typeof(IDictionary).IsAssignableFrom(t))
+                return true;
+#if CPP
+            try
             {
+                if (s_cppDictionaryClassPtr == IntPtr.Zero)
+                    if (!Il2CppTypeNotNull(typeof(Il2CppSystem.Collections.IDictionary), out s_cppDictionaryClassPtr))
+                        return false;
+
+                if (Il2CppTypeNotNull(t, out IntPtr classPtr))
+                {
+                    if (il2cpp_class_is_assignable_from(s_cppDictionaryClassPtr, classPtr))
                         return true;
                 }
-
-#if CPP
-            if (t.IsGenericType && t.GetGenericTypeDefinition() is Type g)
-            {
-                return typeof(Il2CppSystem.Collections.Generic.Dictionary<,>).IsAssignableFrom(g)
-                    || typeof(Il2CppSystem.Collections.Generic.IDictionary<,>).IsAssignableFrom(g);
             }
-            else
-            {
-                return typeof(Il2CppSystem.Collections.IDictionary).IsAssignableFrom(t)
-                    || typeof(Il2CppSystem.Collections.Hashtable).IsAssignableFrom(t);
-            }
-#else
-            return false;
+            catch { }
 #endif
+            return false;
         }
 
         public static string ExceptionToString(Exception e, bool innerMost = false)

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)
@@ -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;

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;
-
+                var obj = hit.transform.gameObject;
                 OnHitGameObject(obj);
-
-                        break;
-                    }
-                }
             }
             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; }

src/Inspectors/Reflection/CacheObject/CacheMethod.cs

@@ -71,6 +71,9 @@ namespace UnityExplorer.Inspectors.Reflection
             }
             catch (Exception e)
             {
+                while (e.InnerException != null)
+                    e = e.InnerException;
+
                 ExplorerCore.LogWarning($"Exception evaluating: {e.GetType()}, {e.Message}");
                 ReflectionException = ReflectionHelpers.ExceptionToString(e);
             }

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

@@ -10,6 +10,9 @@ using UnityExplorer.Helpers;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Shared;
 using System.Reflection;
+#if CPP
+using CppDictionary = Il2CppSystem.Collections.IDictionary;
+#endif
 
 namespace UnityExplorer.Inspectors.Reflection
 {
@@ -44,7 +47,11 @@ namespace UnityExplorer.Inspectors.Reflection
         }
 
         internal IDictionary RefIDictionary;
-
+#if CPP
+        internal CppDictionary RefCppDictionary;
+#else
+        internal IDictionary RefCppDictionary = null;
+#endif
         internal Type m_typeOfKeys;
         internal Type m_typeofValues;
 
@@ -52,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;
 
@@ -65,6 +72,11 @@ namespace UnityExplorer.Inspectors.Reflection
         {
             RefIDictionary = Value as IDictionary;
 
+#if CPP
+            try { RefCppDictionary = (Value as Il2CppSystem.Object).TryCast<CppDictionary>(); }
+            catch { }
+#endif
+
             if (m_subContentParent.activeSelf)
             {
                 GetCacheEntries();
@@ -129,13 +141,6 @@ namespace UnityExplorer.Inspectors.Reflection
                 {
                     var value = RefIDictionary[key];
 
-                    //if (index >= m_rowHolders.Count)
-                    //{
-                    //    AddRowHolder();
-                    //}
-
-                    //var holder = m_rowHolders[index];
-
                     var cacheKey = new CachePaired(index, this, this.RefIDictionary, PairTypes.Key, m_listContent);
                     cacheKey.CreateIValue(key, this.m_typeOfKeys);
                     cacheKey.Disable();
@@ -209,6 +214,7 @@ namespace UnityExplorer.Inspectors.Reflection
 #region CPP fixes
 #if CPP
         // temp fix for Il2Cpp IDictionary until interfaces are fixed
+
         private IDictionary EnumerateWithReflection()
         {
             var valueType = Value?.GetType() ?? FallbackType;
@@ -222,8 +228,8 @@ namespace UnityExplorer.Inspectors.Reflection
             var valueList = new List<object>();
 
             // store entries with reflection
-            EnumerateWithReflection(keys, keyList);
-            EnumerateWithReflection(values, valueList);
+            EnumerateCollection(keys, keyList);
+            EnumerateCollection(values, valueList);
 
             // make actual mono dictionary
             var dict = (IDictionary)Activator.CreateInstance(typeof(Dictionary<,>)
@@ -236,7 +242,7 @@ namespace UnityExplorer.Inspectors.Reflection
             return dict;
         }
 
-        private void EnumerateWithReflection(object collection, List<object> list)
+        private void EnumerateCollection(object collection, List<object> list)
         {
             // invoke GetEnumerator
             var enumerator = collection.GetType().GetMethod("GetEnumerator").Invoke(collection, null);

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

@@ -37,11 +37,16 @@ namespace UnityExplorer.Inspectors.Reflection
 
         internal IEnumerable RefIEnumerable;
         internal IList RefIList;
+#if CPP
+        internal Il2CppSystem.Collections.ICollection CppICollection;
+#else
+        internal ICollection CppICollection = null;
+#endif
 
         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()
@@ -49,6 +54,14 @@ namespace UnityExplorer.Inspectors.Reflection
             RefIEnumerable = Value as IEnumerable;
             RefIList = Value as IList;
 
+#if CPP
+            if (Value != null && RefIList == null)
+            {
+                try { CppICollection = (Value as Il2CppSystem.Object).TryCast<Il2CppSystem.Collections.ICollection>(); }
+                catch { }
+            }
+#endif
+
             if (m_subContentParent.activeSelf)
             {
                 GetCacheEntries();
@@ -77,8 +90,8 @@ namespace UnityExplorer.Inspectors.Reflection
             if (Value != null)
             {
                 string count = "?";
-                if (m_recacheWanted && RefIList != null)
-                    count = RefIList.Count.ToString();
+                if (m_recacheWanted && (RefIList != null || CppICollection != null))
+                    count = RefIList?.Count.ToString() ?? CppICollection.Count.ToString();
                 else if (!m_recacheWanted)
                     count = m_entries.Count.ToString();
 
@@ -174,79 +187,52 @@ namespace UnityExplorer.Inspectors.Reflection
 #if CPP
         // some temp fixes for Il2Cpp IEnumerables until interfaces are fixed
 
+        internal static readonly Dictionary<Type, MethodInfo> s_getEnumeratorMethods = new Dictionary<Type, MethodInfo>();
+
+        internal static readonly Dictionary<Type, EnumeratorInfo> s_enumeratorInfos = new Dictionary<Type, EnumeratorInfo>();
+        
+        internal class EnumeratorInfo
+        {
+            internal MethodInfo moveNext;
+            internal PropertyInfo current;
+        }
+
         private IEnumerable EnumerateWithReflection()
         {
-            if (Value.IsNullOrDestroyed()) 
+            if (Value == null) 
                 return null;
 
-            var genericDef = Value.GetType().GetGenericTypeDefinition();
-
-            if (genericDef == typeof(Il2CppSystem.Collections.Generic.List<>))
-                return CppListToMono(genericDef);
-            else if (genericDef == typeof(Il2CppSystem.Collections.Generic.HashSet<>))
-                return CppHashSetToMono();
-            else
-                return CppIListToMono();
-        }
-
-        // List<T>.ToArray()
-        private IEnumerable CppListToMono(Type genericTypeDef)
+            // new test
+            var CppEnumerable = (Value as Il2CppSystem.Object)?.TryCast<Il2CppSystem.Collections.IEnumerable>();
+            if (CppEnumerable != null)
             {
-            if (genericTypeDef == null) return null;
+                var type = Value.GetType();
+                if (!s_getEnumeratorMethods.ContainsKey(type))
+                    s_getEnumeratorMethods.Add(type, type.GetMethod("GetEnumerator"));
                 
-            return genericTypeDef
-                    .MakeGenericType(new Type[] { this.m_baseEntryType })
-                    .GetMethod("ToArray")
-                    .Invoke(Value, new object[0]) as IEnumerable;
-        }
-
-        // HashSet.GetEnumerator
-        private IEnumerable CppHashSetToMono()
-        {
-            var set = new HashSet<object>();
-
-            // invoke GetEnumerator
-            var enumerator = Value.GetType().GetMethod("GetEnumerator").Invoke(Value, null);
-            // get the type of it
+                var enumerator = s_getEnumeratorMethods[type].Invoke(Value, null);
                 var enumeratorType = enumerator.GetType();
-            // reflect MoveNext and Current
-            var moveNext = enumeratorType.GetMethod("MoveNext");
-            var current = enumeratorType.GetProperty("Current");
+
+                if (!s_enumeratorInfos.ContainsKey(enumeratorType))
+                {
+                    s_enumeratorInfos.Add(enumeratorType, new EnumeratorInfo
+                    {
+                        current = enumeratorType.GetProperty("Current"),
+                        moveNext = enumeratorType.GetMethod("MoveNext"),
+                    });
+                }
+                var info = s_enumeratorInfos[enumeratorType];
+
                 // iterate
-            while ((bool)moveNext.Invoke(enumerator, null))
-                set.Add(current.GetValue(enumerator));
-
-            return set;
-        }
-
-        // IList.Item
-        private IList CppIListToMono()
-        {
-            try
-            {
-                var genericType = typeof(List<>).MakeGenericType(new Type[] { this.m_baseEntryType });
-                var list = (IList)Activator.CreateInstance(genericType);
-
-                for (int i = 0; ; i++)
-                {
-                    try
-                    {
-                        var itm = Value?.GetType()
-                            .GetProperty("Item")
-                            .GetValue(Value, new object[] { i });
-                        list.Add(itm);
-                    }
-                    catch { break; }
-                }
+                var list = new List<object>();
+                while ((bool)info.moveNext.Invoke(enumerator, null))
+                    list.Add(info.current.GetValue(enumerator));
 
                 return list;
             }
-            catch (Exception e)
-            {
-                ExplorerCore.Log("Exception converting Il2Cpp IList to Mono IList: " + e.GetType() + ", " + e.Message);
+
             return null;
         }
-        }
 #endif
 
 #endregion

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;
@@ -205,8 +209,29 @@ namespace UnityExplorer.Inspectors.Reflection
             }
             else
             {
-                var toString = (string)valueType.GetMethod("ToString", new Type[0])?.Invoke(Value, null) 
-                                ?? Value.ToString();
+                if (!m_gotToStringMethods)
+                {
+                    m_gotToStringMethods = true;
+
+                    m_toStringMethod = valueType.GetMethod("ToString", new Type[0]);
+                    m_toStringFormatMethod = valueType.GetMethod("ToString", new Type[] { typeof(string) });
+
+                    // test format method actually works
+                    try
+                    {
+                        m_toStringFormatMethod.Invoke(Value, new object[] { "F3" });
+                    }
+                    catch
+                    {
+                        m_toStringFormatMethod = null;
+                    }
+                }
+
+                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]);
 
                 var fullnametemp = valueType.ToString();
                 if (fullnametemp.StartsWith("Il2CppSystem"))
@@ -303,7 +328,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));
@@ -583,6 +596,7 @@ namespace UnityExplorer.Inspectors
         {
             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

@@ -3,11 +3,24 @@ using System.Collections.Generic;
 using UnityExplorer.UI;
 using UnityEngine;
 using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using UnityExplorer.Unstrip;
 #if CPP
+using UnhollowerBaseLib;
+using UnityExplorer.Helpers;
 #endif
 
 namespace UnityExplorer.Tests
 {
+    internal enum TestByteEnum : byte
+    {
+        One,
+        Two,
+        Three,
+        TwoFiftyFive = 255,
+    }
+
     public static class StaticTestClass
     {
         public static int StaticProperty => 5;
@@ -19,11 +32,12 @@ namespace UnityExplorer.Tests
             "three",
         };
         public static void StaticMethod() { }
-
     }
 
     public class TestClass
     {
+        internal static TestByteEnum testingByte = TestByteEnum.One;
+
         public string AAALongString = @"1
 2
 3
@@ -118,13 +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;
 #endif
 
         public TestClass()
@@ -140,20 +156,7 @@ namespace UnityExplorer.Tests
             }
 
 #if CPP
-            TestTexture = UIManager.MakeSolidTexture(Color.white, 1000, 600);
-            TestTexture.name = "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);
-
-            //// 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)}");
+            TextureSpriteTest();
 
             CppHashSetTest = new Il2CppSystem.Collections.Generic.HashSet<string>();
             CppHashSetTest.Add("1");
@@ -163,9 +166,38 @@ namespace UnityExplorer.Tests
             CppStringTest = new Il2CppSystem.Collections.Generic.List<string>();
             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");
+
+            //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 = new Texture2D(32, 32, TextureFormat.ARGB32, false)
+            {
+                name = "TestTexture"
+            };
+            TestSprite = ImageConversionUnstrip.CreateSprite(TestTexture);
+
+            GameObject.DontDestroyOnLoad(TestTexture);
+            GameObject.DontDestroyOnLoad(TestSprite);
+
+            // 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
         {
             arg2 = "this is arg2";

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

@@ -208,7 +208,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 +224,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}";
+                        var name = UISyntaxHighlight.ParseFullSyntax(obj.GetActualType(), true);
+
+                        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
                         }
                     }
 
+                    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,6 +8,8 @@ using UnityExplorer;
 using UnityExplorer.Helpers;
 using UnityExplorer.UI;
 
+namespace UnityExplorer.UI.Shared
+{
     // Basically just to fix an issue with Scrollbars, instead we use a Slider as the scrollbar.
     public class SliderScrollbar
     {
@@ -19,6 +21,8 @@ public class SliderScrollbar
         internal readonly Slider m_slider;
         internal readonly RectTransform m_scrollRect;
 
+        internal InputFieldScroller m_parentInputScroller;
+
         public SliderScrollbar(Scrollbar scrollbar, Slider slider)
         {
             Instances.Add(this);
@@ -176,3 +180,4 @@ public static class SliderExtensions
 	}
 }
 #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,19 +147,58 @@ 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);
+                bundle = LoadExplorerUi("modern");
+            }
+            catch
+            {
+                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");
 
@@ -116,12 +215,6 @@ namespace UnityExplorer.UI
 
             ExplorerCore.Log("Loaded UI bundle");
         }
-            else
-            {
-                ExplorerCore.LogWarning("Could not find the ExplorerUI Bundle! It should exist at '" + bundlePath + "'");
-                return;
-            }
-        }
 
         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);
@@ -149,37 +242,5 @@ namespace UnityExplorer.UI
 
             return rootObj;
         }
-
-        public static Sprite CreateSprite(Texture2D tex, Rect size = default)
-        {
-#if CPP
-            Vector2 pivot = Vector2.zero;
-            Vector4 border = Vector4.zero;
-
-            if (size == default)
-            {
-                size = new Rect(0, 0, tex.width, tex.height);
-            }
-
-            return Sprite.CreateSprite_Injected(tex, ref size, ref pivot, 100f, 0u, SpriteMeshType.Tight, ref border, false);
-#else
-            return Sprite.Create(tex, size, Vector2.zero);
-#endif
-        }
-
-        public static Texture2D MakeSolidTexture(Color color, int width, int height)
-        {
-            Color[] pixels = new Color[width * height];
-            for (int i = 0; i < pixels.Length; i++)
-            {
-                pixels[i] = color;
-            }
-
-            Texture2D tex = new Texture2D(width, height);
-            tex.SetPixels(pixels);
-            tex.Apply();
-
-            return tex;
-        }
     }
 }

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

@@ -25,6 +25,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 ~~~~~~~~~~~~
 
         private readonly IntPtr m_bundlePtr = IntPtr.Zero;

src/Unstrip/ImageConversionUnstrip.cs

@@ -10,6 +10,16 @@ namespace UnityExplorer.Unstrip
 {
     public static class ImageConversionUnstrip
     {
+        // LoadImage helper from a filepath
+
+        public static bool LoadImage(Texture2D tex, string filePath, bool markNonReadable)
+        {
+            if (!File.Exists(filePath))
+                return false;
+
+            return tex.LoadImage(File.ReadAllBytes(filePath), markNonReadable);
+        }
+
 #if CPP
         // byte[] ImageConversion.EncodeToPNG(this Texture2D image);
 
@@ -17,8 +27,12 @@ namespace UnityExplorer.Unstrip
 
         public static byte[] EncodeToPNG(this Texture2D tex)
         {
-            IntPtr ptr = ICallHelper.GetICall<d_EncodeToPNG>("UnityEngine.ImageConversion::EncodeToPNG")
-                .Invoke(tex.Pointer);
+            var iCall = ICallHelper.GetICall<d_EncodeToPNG>("UnityEngine.ImageConversion::EncodeToPNG");
+
+            IntPtr ptr = iCall.Invoke(tex.Pointer);
+
+            if (ptr == IntPtr.Zero)
+                return null;
 
             return new Il2CppStructArray<byte>(ptr);
         }
@@ -29,28 +43,40 @@ 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);
+            var iCall = ICallHelper.GetICall<d_LoadImage>("UnityEngine.ImageConversion::LoadImage");
                 
-            return ret;
+            return iCall.Invoke(tex.Pointer, il2cppArray.Pointer, markNonReadable);
+        }
+
+        // Sprite Sprite.Create
+
+        internal delegate IntPtr d_CreateSprite(IntPtr texture, ref Rect rect, ref Vector2 pivot, float pixelsPerUnit, 
+            uint extrude, int meshType, ref Vector4 border, bool generateFallbackPhysicsShape);
+
+        public static Sprite CreateSprite(Texture texture, Rect rect, Vector2 pivot, float pixelsPerUnit, uint extrude, Vector4 border)
+        {
+            var iCall = ICallHelper.GetICall<d_CreateSprite>("UnityEngine.Sprite::CreateSprite_Injected");
+
+            var ptr = iCall.Invoke(texture.Pointer, ref rect, ref pivot, pixelsPerUnit, extrude, 1, ref border, false);
+
+            if (ptr == IntPtr.Zero)
+                return null;
+            else
+                return new Sprite(ptr);
         }
 #endif
 
-        // Helper for LoadImage from filepath
+        // Simpler CreateSprite helper
 
-        public static bool LoadImage(Texture2D tex, string filePath, bool markNonReadable)
+        public static Sprite CreateSprite(Texture2D texture)
         {
-            if (!File.Exists(filePath))
-            {
-                return false;
-            }
-
-            byte[] data = File.ReadAllBytes(filePath);
-            return tex.LoadImage(data, markNonReadable);
+#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
     }