create subfolder for standalone

README.md

@@ -24,9 +24,12 @@
 
 | Mod Loader  | IL2CPP | Mono |
 | ----------- | ------ | ---- |
-| [BepInEx](https://github.com/BepInEx/BepInEx) | ✔️ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx.Il2Cpp.zip) | ✔️ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.BepInEx.Mono.zip) |
-| [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) | ✔️ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader.Il2Cpp.zip) | ✔️ [link](https://github.com/sinai-dev/UnityExplorer/releases/latest/download/UnityExplorer.MelonLoader.Mono.zip) | 
-| 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) | 
+| [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) | 
+
+\* BepInEx 6.X Mono release may not work on all games yet.
 
 ## Features
 
@@ -41,12 +44,14 @@
 * <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.BIE.___.dll` file and put it in `[GameFolder]\BepInEx\plugins\`
@@ -54,20 +59,29 @@
 
 ### MelonLoader
 
+Note: You must use version 0.3 of MelonLoader or greater. Version 0.3 is currently in pre-release, so you must opt-in from your MelonLoader installer (enable alpha releases).
+
 0. Install [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) for your game.
 1. Download the UnityExplorer release for MelonLoader IL2CPP or Mono above.
 2. Take the contents of the release and put it in the `[GameFolder]\Mods\` folder. It should look like `[GameFolder]\Mods\UnityExplorer.ML.___.dll`
 
 ### Standalone
 
-0. Load the DLL from your mod or inject it.
-1. Create an instance of Unity Explorer with `new ExplorerCore();`
-2. You will need to call ExplorerCore.Update() (static method) from your Update method.
-3. Subscribe to the `ExplorerCore.OnLog__` methods for logging.
+The standalone release is based on the BepInEx build, so it requires Harmony 2.0 (or HarmonyX) to function properly.
 
-## Mod Config
+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.
 
-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).
+## 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`
@@ -85,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.
 
-1. Install BepInEx or MelonLoader for your game, or use the standalone build.
+For IL2CPP:
+1. Install BepInEx or MelonLoader for your game.
 2. Open the `src\UnityExplorer.csproj` file in a text editor.
-3. For IL2CPP builds, make sure you set `BIECppGameFolder` (for BepInEx) and/or `MLCppGameFolder` (for MelonLoader) so the project can locate the necessary references.
-4. Open the `src\UnityExplorer.sln` project.
-5. Select `Solution 'UnityExplorer' (1 of 1 project)` in the Solution Explorer panel, and set the <b>Active config</b> property to the version you want to build, then build it.
-5. The DLLs are built to the `Release\` folder in the root of the repository.
-6. If ILRepack fails or is missing, use the NuGet package manager to re-install `ILRepack.Lib.MSBuild.Task`, then re-build.
+3. Set `BIECppGameFolder` (for BepInEx) and/or `MLCppGameFolder` (for MelonLoader) so the project can locate the necessary references.
+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/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 static readonly string INI_PATH = Path.Combine(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,7 +22,7 @@ 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 + @"\Output";
+        public string   Default_Output_Path = ExplorerCore.ExplorerFolder + @"\Output";
         public bool     Log_Unity_Debug     = false;
         public bool     Hide_On_Startup     = false;
         //public bool     Save_Logs_To_Disk   = true;
@@ -36,7 +36,7 @@ namespace UnityExplorer.Config
 
         public static void OnLoad()
         {
-            Instance = new ModConfig();
+            Instance = new ExplorerConfig();
 
             if (LoadSettings())
                 return;
@@ -99,6 +99,9 @@ namespace UnityExplorer.Config
             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

@@ -15,43 +15,23 @@ namespace UnityExplorer
     public class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "3.1.10";
+        public const string VERSION = "3.2.1";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 
-#if ML
-        public static string EXPLORER_FOLDER = Path.Combine("Mods", NAME);
-#elif BIE
-        public static string EXPLORER_FOLDER = Path.Combine(BepInEx.Paths.ConfigPath, NAME);
-#elif STANDALONE
-        public static string EXPLORER_FOLDER
-        {
-            get
-            {
-                if (s_explorerFolder == null)
-                {
-                    s_explorerFolder = (new Uri(Assembly.GetExecutingAssembly().CodeBase)).AbsolutePath;
-                    s_explorerFolder = Uri.UnescapeDataString(s_explorerFolder);
-                    s_explorerFolder = Path.GetDirectoryName(s_explorerFolder);                    
-                }
-                
-                return s_explorerFolder;
-            }
-        }
-        private static string s_explorerFolder;
-#endif
-
         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()
         {
@@ -67,61 +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.");
-
-                    if (ModConfig.Instance.Hide_On_Startup)
-                        ShowMenu = false;
-
-                    // InspectorManager.Instance.Inspect(Tests.TestClass.Instance);
-                }
-                catch (Exception e)
-                {
-                    LogWarning($"Exception setting up UI: {e}");
-                }
-            }
-        }
 
         private void SetupEvents()
         {
@@ -129,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(); }; 
@@ -145,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)
@@ -185,12 +121,6 @@ namespace UnityExplorer
             }
         }
 
-#if STANDALONE
-        public static Action<string> OnLogMessage;
-        public static Action<string> OnLogWarning;
-        public static Action<string> OnLogError;
-#endif
-
         public static void Log(object message, bool unity = false)
         {
             DebugConsole.Log(message?.ToString());
@@ -198,13 +128,7 @@ namespace UnityExplorer
             if (unity)
                 return;
 
-#if ML
-            MelonLoader.MelonLogger.Log(message?.ToString());
-#elif BIE
-            ExplorerBepInPlugin.Logging?.LogMessage(message?.ToString());
-#elif STANDALONE
-            OnLogMessage?.Invoke(message?.ToString());
-#endif
+            Loader.OnLogMessage(message);
         }
 
         public static void LogWarning(object message, bool unity = false)
@@ -214,13 +138,7 @@ namespace UnityExplorer
             if (unity)
                 return;
 
-#if ML
-            MelonLoader.MelonLogger.LogWarning(message?.ToString());
-#elif BIE
-            ExplorerBepInPlugin.Logging?.LogWarning(message?.ToString());
-#elif STANDALONE
-            OnLogWarning?.Invoke(message?.ToString());
-#endif
+            Loader.OnLogWarning(message);
         }
 
         public static void LogError(object message, bool unity = false)
@@ -230,24 +148,7 @@ namespace UnityExplorer
             if (unity)
                 return;
 
-#if ML
-            MelonLoader.MelonLogger.LogError(message?.ToString());
-#elif BIE
-            ExplorerBepInPlugin.Logging?.LogError(message?.ToString());
-#elif STANDALONE
-            OnLogError?.Invoke(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/ExplorerStandalone.cs

@@ -1,11 +0,0 @@
-#if STANDALONE
-using HarmonyLib;
-
-namespace UnityExplorer
-{
-	public class ExplorerStandalone
-	{
-		public static readonly Harmony HarmonyInstance = new Harmony(ExplorerCore.GUID);
-	}
-}
-#endif

src/Helpers/ReflectionHelpers.cs

@@ -93,18 +93,18 @@ 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);
             
             if (getType != null)
             {
-                Il2CppToMonoType.Add(cppType, getType);
+                Il2CppToMonoType.Add(cppType.AssemblyQualifiedName, getType);
                 return getType;
             }
             else
@@ -112,11 +112,17 @@ namespace UnityExplorer.Helpers
                 string baseName = cppType.FullName;
                 string baseAssembly = cppType.Assembly.GetName().name;
 
-                Type unhollowedType = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(a => a.GetName().Name == baseAssembly)?.GetTypes().FirstOrDefault(t =>
-                    t.CustomAttributes.Any(ca =>
-                        ca.AttributeType.Name == "ObfuscatedNameAttribute" && (string)ca.ConstructorArguments[0].Value == baseName));
+                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);
 
-                Il2CppToMonoType.Add(cppType, unhollowedType);
                 return unhollowedType;
             }
         }

src/Inspectors/Reflection/InstanceInspector.cs

@@ -251,7 +251,7 @@ namespace UnityExplorer.Inspectors.Reflection
             if (string.IsNullOrEmpty(name))
                 name = "untitled";
 
-            var savePath = $@"{Config.ModConfig.Instance.Default_Output_Path}\{name}.png";
+            var savePath = $@"{Config.ExplorerConfig.Instance.Default_Output_Path}\{name}.png";
             inputField.text = savePath;
 
             saveBtn.onClick.AddListener(() => 

src/Inspectors/Reflection/InteractiveValue/InteractiveDictionary.cs

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

src/Inspectors/Reflection/InteractiveValue/InteractiveEnum.cs

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

src/Inspectors/Reflection/InteractiveValue/InteractiveEnumerable.cs

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

src/Inspectors/Reflection/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>
@@ -68,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;
 
@@ -172,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;

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

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

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()
@@ -102,14 +102,7 @@ namespace UnityExplorer.UI
         {
             try
             {
-                var harmony =
-#if ML
-                    ExplorerMelonMod.Instance.harmonyInstance;
-#elif BIE
-                    ExplorerBepInPlugin.HarmonyInstance;
-#elif STANDALONE
-                    ExplorerStandalone.HarmonyInstance;
-#endif
+                var harmony = ExplorerCore.Loader.HarmonyInstance;
 
                 System.Reflection.PropertyInfo prop = type.GetProperty(property);
 
@@ -208,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,7 +15,7 @@ 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 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;
@@ -52,7 +52,7 @@ namespace UnityExplorer.UI.Modules
             //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

@@ -32,19 +32,19 @@ namespace UnityExplorer.UI.Modules
         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;
 
-            ModConfig.Instance.Hide_On_Startup = m_hideOnStartupToggle.isOn;
+            ExplorerConfig.Instance.Hide_On_Startup = m_hideOnStartupToggle.isOn;
 
-            ModConfig.SaveSettings();
-            ModConfig.InvokeConfigChanged();
+            ExplorerConfig.SaveSettings();
+            ExplorerConfig.InvokeConfigChanged();
         }
 
         #region UI CONSTRUCTION
@@ -131,7 +131,7 @@ namespace UnityExplorer.UI.Modules
             labelLayout.minHeight = 25;
 
             UIFactory.CreateToggle(rowObj, out m_hideOnStartupToggle, out Text toggleText);
-            m_hideOnStartupToggle.isOn = ModConfig.Instance.Hide_On_Startup;
+            m_hideOnStartupToggle.isOn = ExplorerConfig.Instance.Hide_On_Startup;
             toggleText.text = "";
         }
 
@@ -159,7 +159,7 @@ 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";
         }
@@ -186,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 = "";
         }
 
@@ -216,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";
         }
@@ -247,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/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/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,13 +79,40 @@ 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();
             SearchPage.Instance?.OnSceneChange();
         }
+
         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)

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>
@@ -53,21 +53,30 @@
   <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>
@@ -75,6 +84,7 @@
     <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'">
@@ -84,6 +94,7 @@
     <AssemblyName>UnityExplorer.STANDALONE.IL2CPP</AssemblyName>
     <IsCpp>true</IsCpp>
     <IsMelonLoader>false</IsMelonLoader>
+    <IsStandalone>true</IsStandalone>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
@@ -116,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>
@@ -132,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">
@@ -235,7 +268,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ExplorerStandalone.cs" />
+    <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" />
@@ -246,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" />
@@ -263,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" />

src/UnityExplorer.sln

@@ -8,7 +8,8 @@ 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
@@ -17,8 +18,10 @@ Global
 	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

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
     }