1.8.3

* Merging `mcs.dll` into the main `Explorer.dll` file, no longer needs to be in the Mods / Plugins folder.

.gitignore

@@ -9,6 +9,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+*/mcs-unity*
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

README.md

@@ -1,55 +1,93 @@
-# CppExplorer [![Version](https://img.shields.io/badge/MelonLoader-0.2.7.1-green.svg)]()
-
 <p align="center">
-  <img align="center" src="https://sinai-dev.github.io/images/thumbs/02.png">
+  <img align="center" src="icon.png">
 </p>
 
 <p align="center">
-  An in-game explorer and a suite of debugging tools for <a href="https://docs.unity3d.com/Manual/IL2CPP.html">IL2CPP</a> Unity games, using <a href="https://github.com/HerpDerpinstine/MelonLoader">MelonLoader</a>.<br><br>
+  An in-game explorer and a suite of debugging tools for <a href="https://docs.unity3d.com/Manual/IL2CPP.html">IL2CPP</a> and <b>Mono</b> Unity games, using <a href="https://github.com/HerpDerpinstine/MelonLoader">MelonLoader</a> and <a href="https://github.com/BepInEx/BepInEx">BepInEx</a>.<br><br>
 
   <a href="../../releases/latest">
-    <img src="https://img.shields.io/github/release/sinai-dev/CppExplorer.svg" />
+    <img src="https://img.shields.io/github/release/sinai-dev/Explorer.svg" />
   </a>
  
-  <img src="https://img.shields.io/github/downloads/sinai-dev/CppExplorer/total.svg" />
+  <img src="https://img.shields.io/github/downloads/sinai-dev/Explorer/total.svg" />
 </p>
 
-### Known issue
-Some games are experiencing `MissingMethodException`s or exceptions about failed unstripping, which prevent the CppExplorer menu from showing properly or at all. This is a bug with [Il2CppAssemblyUnhollower](https://github.com/knah/Il2CppAssemblyUnhollower) and there isn't much I can do about it myself. 
+<p align="center">
+  <img src="https://raw.githubusercontent.com/sinai-dev/Explorer/master/overview.png">  
+</p>
 
-If you're familiar with C# and Unity, one possibility for now is making a fork of this repo and manually fixing all the broken methods to ones which aren't broken (if possible). There may be another overload of the same method which wasn't stripped or was unstripped successfully, which you can use instead.
+- [Current status](#current-status)
+- [How to install](#how-to-install)
+- [How to use](#how-to-use)
+  - [Mod Config](#mod-config)
+- [Features](#features)
+  - [Mouse Control](#mouse-control)
+- [Building](#building)
+- [Credits](#credits)
 
-## Features
-* Scene hierarchy explorer
-* Search loaded assets with filters
-* Traverse and manipulate GameObjects
-* Generic Reflection inspector
-* C# REPL Console
-* Inspect-under-mouse
+## Current status
+
+| Mod Loader  | Il2Cpp | Mono | Mono (.NET 3.5) |
+| ----------- | ------ | ---- | ----|
+| [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) | ✔️ [link](https://github.com/sinai-dev/Explorer/releases/latest/download/Explorer.MelonLoader.Il2Cpp.zip) | ✔️ [link](https://github.com/sinai-dev/Explorer/releases/latest/download/Explorer.MelonLoader.Mono.zip) | ✔️ [link](https://github.com/sinai-dev/Explorer/releases/latest/download/Explorer.MelonLoader.Mono.NET35.zip) |
+| [BepInEx](https://github.com/BepInEx/BepInEx) | ❔ [link](https://github.com/sinai-dev/Explorer/releases/latest/download/Explorer.BepInEx.Il2Cpp.zip) | ✔️ [link](https://github.com/sinai-dev/Explorer/releases/latest/download/Explorer.BepInEx.Mono.zip) | ✔️ [link](https://github.com/sinai-dev/Explorer/releases/latest/download/Explorer.BepInEx.Mono.NET35.zip) |
+
+<b>IL2CPP Issues:</b>
+* .NET 3.5 is not currently supported (Unity 5.6.1 and older), this might change in the future.
+* Some methods may still fail with a `MissingMethodException`, please let me know if you experience this (with full MelonLoader log please).
+* Reflection may fail with certain types, see [here](https://github.com/knah/Il2CppAssemblyUnhollower#known-issues) for more details.
+* Scrolling with mouse wheel in the Explorer menu may not work on all games at the moment.
 
 ## How to install
 
+### MelonLoader
 Requires [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) to be installed for your game.
 
-1. Download <b>CppExplorer.zip</b> from [Releases](https://github.com/sinaioutlander/CppExplorer/releases).
+1. Download the relevant <b>Explorer_MelonLoader_.zip</b> from above.
 2. Unzip the file into the `Mods` folder in your game's installation directory, created by MelonLoader.
-3. Make sure it's not in a sub-folder, `CppExplorer.dll` and `mcs.dll` should be directly in the `Mods\` folder.
+3. Make sure it's not in a sub-folder, `Explorer.dll` and `mcs.dll` should be directly in the `Mods\` folder.
+
+### BepInEx
+Requires [BepInEx](https://github.com/BepInEx/BepInEx) to be installed for your game.
+
+1. Download the relevant <b>Explorer_BepInEx_.zip</b> from above.
+2. Unzip the file into the `BepInEx\plugins\` folder in your game's installation directory, created by BepInEx.
+3. Make sure it's not in a sub-folder, `Explorer.dll` and `mcs.dll` should be directly in the `plugins\` folder.
 
 ## How to use
 
 * Press F7 to show or hide the menu.
-* Simply browse through the scene, search for objects, etc, most of it is pretty self-explanatory.
+* Use the Scene Explorer or the Object Search to start Exploring, or the C# Console to test some code.
+* See below for more specific details.
+
+### Mod Config
+
+There is a simple Mod Config for the Explorer. You can access the settings via the "Options" page of the main menu.
+
+`Main Menu Toggle` (KeyCode)
+* Sets the keybinding for the Main Menu toggle (show/hide all Explorer windows)
+* See [this article](https://docs.unity3d.com/ScriptReference/KeyCode.html) for a full list of all accepted KeyCodes.
+* Default: `F7`
+
+`Default Window Size` (Vector2)
+* Sets the default width and height for all Explorer windows when created.
+* `x` is width, `y` is height.
+* Default: `<x>550</x> <y>700</y>`
+
+`Default Items per Page` (Int)
+* Sets the default items per page when viewing lists or search results.
+* Default: `20`
+
+## Features
 
 ### Scene Explorer
 
 * A simple menu which allows you to traverse the Transform heirarchy of the scene.
 * Click on a GameObject to set it as the current path, or <b>Inspect</b> it to send it to an Inspector Window.
 
-[![](https://i.imgur.com/2b0q0jL.png)](https://i.imgur.com/2b0q0jL.png)
-
 ### Inspectors
 
-CppExplorer has two main inspector modes: <b>GameObject Inspector</b>, and <b>Reflection Inspector</b>.
+Explorer has two main inspector modes: <b>GameObject Inspector</b>, and <b>Reflection Inspector</b>.
 
 <b>Tips:</b> 
 * When in Tab View, GameObjects are denoted by a [G] prefix, and Reflection objects are denoted by a [R] prefix.
@@ -60,48 +98,68 @@ CppExplorer has two main inspector modes: <b>GameObject Inspector</b>, and <b>Re
 * Allows you to see the children and components on a GameObject.
 * Can use some basic GameObject Controls such as translating and rotating the object, destroy it, clone it, etc.
 
-[![](https://i.imgur.com/JTxqlx4.png)](https://i.imgur.com/JTxqlx4.png)
-
 ### Reflection Inspector
 
 * The Reflection Inspector is used for all other supported objects.
 * Allows you to inspect Properties, Fields and basic Methods, as well as set primitive values and evaluate primitive methods.
 * Can search and filter members for the ones you are interested in.
 
-[![](https://i.imgur.com/iq92m0l.png)](https://i.imgur.com/iq92m0l.png)
-
 ### Object Search
 
 * You can search for an `UnityEngine.Object` with the Object Search feature.
 * Filter by name, type, etc.
 * For GameObjects and Transforms you can filter which scene they are found in too.
 
-[![](https://i.imgur.com/lK2RthM.png)](https://i.imgur.com/lK2RthM.png)
+### C# console
 
-### C# REPL console
-
-* A simple C# REPL console, allows you to execute a method body on the fly.
-
-[![](https://i.imgur.com/5U4D1a8.png)](https://i.imgur.com/5U4D1a8.png)
+* A simple C# console, allows you to execute a method body on the fly.
 
 ### Inspect-under-mouse
 
-* Press Shift+RMB (Right Mouse Button) while the CppExplorer menu is open to begin Inspect-Under-Mouse.
+* Press Shift+RMB (Right Mouse Button) while the Explorer menu is open to begin Inspect-Under-Mouse.
 * Hover over your desired object, if you see the name appear then you can click on it to inspect it.
 * Only objects with Colliders are supported.
 
 ### Mouse Control
 
-CppExplorer can force the mouse to be visible and unlocked when the menu is open, if you have enabled "Force Unlock Mouse" (Left-Alt toggle). However, you may also want to prevent the mouse clicking-through onto the game behind CppExplorer, this is possible but it requires specific patches for that game.
+Explorer can force the mouse to be visible and unlocked when the menu is open, if you have enabled "Force Unlock Mouse" (Left-Alt toggle). However, you may also want to prevent the mouse clicking-through onto the game behind Explorer, this is possible but it requires specific patches for that game.
 
 * For VRChat, use [VRCExplorerMouseControl](https://github.com/sinai-dev/VRCExplorerMouseControl)
 * For Hellpoint, use [HPExplorerMouseControl](https://github.com/sinai-dev/Hellpoint-Mods/tree/master/HPExplorerMouseControl/HPExplorerMouseControl)
 * You can create your own plugin using one of the two plugins above as an example. Usually only a few simple Harmony patches are needed to fix the problem.
 
+For example:
+```csharp
+using Explorer;
+using Harmony; // or 'using HarmonyLib;' for BepInEx
+// ...
+[HarmonyPatch(typeof(MyGame.MenuClass), nameof(MyGame.MenuClass.CursorUpdate)]
+public class MenuClass_CursorUpdate 
+{
+    [HarmonyPrefix]
+    public static bool Prefix()
+    {
+        // prevent method running if menu open, let it run if not.
+        return !ExplorerCore.ShowMenu;
+    }
+}
+```
+
+## Building
+
+If you'd like to build this yourself, everything you need (other than MelonLoader and/or BepInEx) is included with this repository.
+
+1. Install MelonLoader or BepInEx for your game.
+2. Open the `src\Explorer.csproj` file in a text editor.
+3. Set the relevant `GameFolder` values for the versions you want to build, eg. set `MLCppGameFolder` if you want to build for a MelonLoader Il2Cpp game.
+4. Open the `src\Explorer.sln` project.
+5. Select `Solution 'Explorer' (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.
+
 ## Credits
 
 Written by Sinai.
 
 Thanks to:
 * [ManlyMarco](https://github.com/ManlyMarco) for their [Runtime Unity Editor](https://github.com/ManlyMarco/RuntimeUnityEditor), which I used for the REPL Console and the "Find instances" snippet, and the UI style.
-* [denikson](https://github.com/denikson) for [mcs-unity](https://github.com/denikson/mcs-unity). I commented out the `SkipVisibilityExt` constructor in `mcs.dll` since it was causing an exception with the Hook it attempted.
+* [denikson](https://github.com/denikson) for [mcs-unity](https://github.com/denikson/mcs-unity). I commented out the `SkipVisibilityExt` constructor since it was causing an exception with the Hook it attempted.

src/CachedObjects/CacheDictionary.cs

@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using MelonLoader;
-using UnityEngine;
-
-namespace Explorer
-{
-    public class CacheDictionary : CacheObjectBase
-    {
-
-
-        public override void Init()
-        {
-            //base.Init();
-
-            Value = "Unsupported";
-        }
-
-        public override void UpdateValue()
-        {
-            //base.UpdateValue();
-
-
-        }
-
-        public override void DrawValue(Rect window, float width)
-        {
-            GUILayout.Label("<color=red>Dictionary (unsupported)</color>", null);
-        }
-    }
-}

src/CachedObjects/CacheEnum.cs

@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Reflection;
-using MelonLoader;
-using UnityEngine;
-
-namespace Explorer
-{
-    public class CacheEnum : CacheObjectBase
-    {
-        public Type EnumType;
-        public string[] EnumNames;
-
-        public override void Init()
-        {
-            try
-            {
-                EnumType = Value.GetType();
-            }
-            catch
-            {
-                EnumType = (MemInfo as FieldInfo)?.FieldType ?? (MemInfo as PropertyInfo).PropertyType;
-            }
-
-            if (EnumType != null)
-            {
-                EnumNames = Enum.GetNames(EnumType);
-            }
-            else
-            {
-                ReflectionException = "Unknown, could not get Enum names.";
-            }
-        }
-
-        public override void DrawValue(Rect window, float width)
-        {
-            if (CanWrite)
-            {
-                if (GUILayout.Button("<", new GUILayoutOption[] { GUILayout.Width(25) }))
-                {
-                    SetEnum(ref Value, -1);
-                    SetValue();
-                }
-                if (GUILayout.Button(">", new GUILayoutOption[] { GUILayout.Width(25) }))
-                {
-                    SetEnum(ref Value, 1);
-                    SetValue();
-                }
-            }
-
-            GUILayout.Label(Value.ToString(), null);// + "<color=yellow><i> (" + ValueType + ")</i></color>", null);
-        }
-
-        public void SetEnum(ref object value, int change)
-        {
-            var names = EnumNames.ToList();
-
-            int newindex = names.IndexOf(value.ToString()) + change;
-
-            if ((change < 0 && newindex >= 0) || (change > 0 && newindex < names.Count))
-            {
-                value = Enum.Parse(EnumType, names[newindex]);
-            }
-        }
-    }
-}

src/CachedObjects/CacheFactory.cs

@@ -0,0 +1,169 @@
+using System;
+using System.Reflection;
+using UnityEngine;
+
+namespace Explorer
+{
+    public static class CacheFactory
+    {
+        public static CacheObjectBase GetTypeAndCacheObject(object obj) 
+            => GetTypeAndCacheObject(obj, null, null);
+
+        public static CacheObjectBase GetTypeAndCacheObject(MemberInfo memberInfo, object declarer) 
+            => GetTypeAndCacheObject(null, memberInfo, declarer);
+
+        public static CacheObjectBase GetTypeAndCacheObject(object obj, MemberInfo memberInfo, object declarer)
+        {
+            Type type = null;
+
+            if (memberInfo != null)
+            {
+                if (memberInfo is FieldInfo fi)
+                {
+                    type = fi.FieldType;
+                }
+                else if (memberInfo is PropertyInfo pi)
+                {
+                    type = pi.PropertyType;
+                }
+                else if (memberInfo is MethodInfo mi)
+                {
+                    type = mi.ReturnType;
+                }
+            }
+            else if (obj != null)
+            {
+                type = ReflectionHelpers.GetActualType(obj);
+            }
+
+            if (type == null)
+            {
+                return null;
+            }
+
+            return GetCacheObject(obj, memberInfo, declarer, type);
+        }
+
+        public static CacheObjectBase GetCacheObject(object obj, Type valueType)
+            => GetCacheObject(obj, null, null, valueType);
+
+        private static CacheObjectBase GetCacheObject(object obj, MemberInfo memberInfo, object declaringInstance, Type valueType)
+        {
+            CacheObjectBase cached;
+
+            var pi = memberInfo as PropertyInfo;
+            var mi = memberInfo as MethodInfo;
+
+            // Check if can process args
+            if ((pi != null && !CanProcessArgs(pi.GetIndexParameters()))
+                || (mi != null && !CanProcessArgs(mi.GetParameters())))
+            {
+                return null;
+            }
+
+            if (mi != null)
+            {
+                cached = new CacheMethod();
+            }
+            else if (valueType == typeof(GameObject) || valueType == typeof(Transform))
+            {
+                cached = new CacheGameObject();
+            }
+            else if (valueType.IsPrimitive || valueType == typeof(string))
+            {
+                cached = new CachePrimitive();
+            }
+            else if (valueType.IsEnum)
+            {
+                if (valueType.GetCustomAttributes(typeof(FlagsAttribute), true) is object[] attributes && attributes.Length > 0)
+                {
+                    cached = new CacheEnumFlags();
+                }
+                else
+                {
+                    cached = new CacheEnum();
+                }
+            }
+            else if (valueType == typeof(Vector2) || valueType == typeof(Vector3) || valueType == typeof(Vector4))
+            {
+                cached = new CacheVector();
+            }
+            else if (valueType == typeof(Quaternion))
+            {
+                cached = new CacheQuaternion();
+            }
+            else if (valueType == typeof(Color))
+            {
+                cached = new CacheColor();
+            }
+            else if (valueType == typeof(Rect))
+            {
+                cached = new CacheRect();
+            }
+            // must check this before IsEnumerable
+            else if (ReflectionHelpers.IsDictionary(valueType))
+            {
+                cached = new CacheDictionary();
+            }
+            else if (ReflectionHelpers.IsEnumerable(valueType))
+            {
+                cached = new CacheList();
+            }
+            else
+            {
+                cached = new CacheOther();
+            }
+
+            cached.Value = obj;
+            cached.ValueType = valueType;
+
+            if (memberInfo != null)
+            {
+                cached.MemInfo = memberInfo;
+                cached.DeclaringType = memberInfo.DeclaringType;
+                cached.DeclaringInstance = declaringInstance;
+            }
+
+            if (pi != null)
+            {
+                cached.m_arguments = pi.GetIndexParameters();
+            }
+            else if (mi != null)
+            {
+                cached.m_arguments = mi.GetParameters();
+            }
+
+            cached.m_argumentInput = new string[cached.m_arguments.Length];
+
+            cached.UpdateValue();
+
+            cached.Init();
+
+            return cached;
+        }
+
+        public static bool CanProcessArgs(ParameterInfo[] parameters)
+        {
+            foreach (var param in parameters)
+            {
+                var pType = param.ParameterType;
+
+                if (pType.IsByRef && pType.HasElementType)
+                {
+                    pType = pType.GetElementType();
+                }
+
+                if (pType.IsPrimitive || pType == typeof(string))
+                {
+                    continue;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}

src/CachedObjects/CacheMethod.cs

@@ -1,223 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Reflection;
-using UnityEngine;
-using MelonLoader;
-
-namespace Explorer
-{
-    public class CacheMethod : CacheObjectBase
-    {
-        private bool m_evaluated = false;
-        private CacheObjectBase m_cachedReturnValue;
-
-        private bool m_isEvaluating;
-        private ParameterInfo[] m_arguments;
-        private string[] m_argumentInput;
-
-        public bool HasParameters
-        {
-            get
-            {
-                if (m_hasParams == null)
-                {
-                    m_hasParams = (MemInfo as MethodInfo).GetParameters().Length > 0;
-                }
-                return (bool)m_hasParams;
-            }
-        }
-        private bool? m_hasParams;
-
-        public static bool CanEvaluate(MethodInfo mi)
-        {
-            // generic type args not supported yet
-            if (mi.GetGenericArguments().Length > 0)
-            {
-                return false;
-            }
-
-            // only primitive and string args supported
-            foreach (var param in mi.GetParameters())
-            {
-                if (!param.ParameterType.IsPrimitive && param.ParameterType != typeof(string))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        public override void Init()
-        {
-            base.Init();
-
-            var mi = MemInfo as MethodInfo;
-
-            m_arguments = mi.GetParameters();
-            m_argumentInput = new string[m_arguments.Length];
-        }
-
-        public override void UpdateValue()
-        {
-            //base.UpdateValue();
-        }        
-
-        public override void DrawValue(Rect window, float width)
-        {
-            GUILayout.BeginVertical(null);
-
-            string evaluateLabel = "<color=lime>Evaluate</color>";
-            if (HasParameters)
-            {
-                if (m_isEvaluating)
-                {
-                    for (int i = 0; i < m_arguments.Length; i++)
-                    {
-                        var name = m_arguments[i].Name;
-                        var input = m_argumentInput[i];
-                        var type = m_arguments[i].ParameterType.Name;
-
-                        GUILayout.BeginHorizontal(null);
-                        m_argumentInput[i] = GUILayout.TextField(input, new GUILayoutOption[] { GUILayout.Width(150) });
-                        GUILayout.Label(i + ": <color=cyan>" + name + "</color> <color=yellow>(" + type + ")</color>", null);
-
-                        GUILayout.EndHorizontal();
-                    }
-
-                    GUILayout.BeginHorizontal(null);
-                    if (GUILayout.Button(evaluateLabel, new GUILayoutOption[] { GUILayout.Width(70) }))
-                    {
-                        Evaluate();
-                        m_isEvaluating = false;
-                    }
-                    if (GUILayout.Button("Cancel", new GUILayoutOption[] { GUILayout.Width(70) }))
-                    {
-                        m_isEvaluating = false;
-                    }
-                }
-                else
-                {
-                    GUILayout.BeginHorizontal(null);
-                    if (GUILayout.Button($"Evaluate ({m_arguments.Length} params)", new GUILayoutOption[] { GUILayout.Width(150) }))
-                    {
-                        m_isEvaluating = true;
-                    }
-                }
-            }
-            else
-            {
-                GUILayout.BeginHorizontal(null);
-                if (GUILayout.Button(evaluateLabel, new GUILayoutOption[] { GUILayout.Width(70) }))
-                {
-                    Evaluate();
-                }
-            }
-            
-            GUILayout.EndHorizontal();
-
-            GUILayout.BeginHorizontal(null);
-            if (m_evaluated)
-            {
-                if (m_cachedReturnValue != null)
-                {
-                    try
-                    {
-                        m_cachedReturnValue.DrawValue(window, width);
-                    }
-                    catch (Exception e)
-                    {
-                        MelonLogger.Log("Exception drawing m_cachedReturnValue!");
-                        MelonLogger.Log(e.ToString());
-                    }
-                }
-                else
-                {
-                    GUILayout.Label($"null (<color=yellow>{ValueTypeName}</color>)", null);
-                }
-            }
-            else
-            {
-                GUILayout.Label($"<color=grey><i>Not yet evaluated</i></color> (<color=yellow>{ValueTypeName}</color>)", null);
-            }
-            GUILayout.EndHorizontal();
-
-            GUILayout.EndVertical();
-        }
-
-        private void Evaluate()
-        {
-            var mi = MemInfo as MethodInfo;
-
-            object ret = null;
-
-            if (!HasParameters)
-            {
-                ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, new object[0]);
-                m_evaluated = true;
-            }
-            else
-            {
-                var arguments = new List<object>();
-                for (int i = 0; i < m_arguments.Length; i++)
-                {
-                    var input = m_argumentInput[i];
-                    var type = m_arguments[i].ParameterType;
-
-                    if (type == typeof(string))
-                    {
-                        arguments.Add(input);
-                    }
-                    else
-                    {
-                        try
-                        {
-                            if (type.GetMethod("Parse", new Type[] { typeof(string) }).Invoke(null, new object[] { input }) is object parsed)
-                            {
-                                arguments.Add(parsed);
-                            }
-                            else
-                            {
-                                throw new Exception();
-                            }
-
-                        }
-                        catch
-                        {
-                            MelonLogger.Log($"Unable to parse '{input}' to type '{type.Name}'");
-                            break;
-                        }
-                    }
-                }
-
-                if (arguments.Count == m_arguments.Length)
-                {
-                    ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, arguments.ToArray());
-                    m_evaluated = true;
-                }
-                else
-                {
-                    MelonLogger.Log($"Did not invoke because {m_arguments.Length - arguments.Count} arguments could not be parsed!");
-                }
-            }
-
-            if (ret != null)
-            {
-                m_cachedReturnValue = GetCacheObject(ret);
-                if (m_cachedReturnValue is CacheList cacheList)
-                {
-                    cacheList.WhiteSpace = 0f;
-                    cacheList.ButtonWidthOffset += 70f;
-                }
-                m_cachedReturnValue.UpdateValue();
-            }
-            else
-            {
-                m_cachedReturnValue = null;
-            }
-        }
-    }
-}

src/CachedObjects/CacheObjectBase.cs

@@ -2,10 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using MelonLoader;
-using UnhollowerBaseLib;
 using UnityEngine;
 
 namespace Explorer
@@ -13,169 +9,44 @@ namespace Explorer
     public abstract class CacheObjectBase
     {
         public object Value;
-        public string ValueTypeName;
+        public Type ValueType;
 
-        // Reflection Inspector only
         public MemberInfo MemInfo { get; set; }
         public Type DeclaringType { get; set; }
         public object DeclaringInstance { get; set; }
-        public string ReflectionException { get; set; }
 
-        public int PropertyIndex { get; private set; }
-        private string m_propertyIndexInput = "0";
+        public virtual bool HasParameters => m_arguments != null && m_arguments.Length > 0;
+
+        public bool m_evaluated = false;
+        public bool m_isEvaluating;
+        public ParameterInfo[] m_arguments = new ParameterInfo[0];
+        public string[] m_argumentInput = new string[0];
+
+        public string ReflectionException { get; set; }
 
         public string RichTextName => m_richTextName ?? GetRichTextName();
         private string m_richTextName;
 
-        public bool CanWrite
-        {
-            get
-            {
-                if (MemInfo is FieldInfo fi)
-                    return !(fi.IsLiteral && !fi.IsInitOnly);
-                else if (MemInfo is PropertyInfo pi)
-                    return pi.CanWrite;
-                else
-                    return false;
-            }
-        }
-
-        // ===== Abstract/Virtual Methods ===== //
+        public bool CanWrite => m_canWrite ?? GetCanWrite();
+        private bool? m_canWrite;
 
         public virtual void Init() { }
 
-        public abstract void DrawValue(Rect window, float width);
-
-        // ===== Static Methods ===== //
-
-        /// <summary>
-        /// Get CacheObject from only an object instance
-        /// Calls GetCacheObject(obj, memberInfo, declaringInstance) with (obj, null, null)</summary>
-        public static CacheObjectBase GetCacheObject(object obj)
-        {
-            return GetCacheObject(obj, null, null);
-        }
-
-        /// <summary>
-        /// Get CacheObject from an object instance and provide the value type
-        /// Calls GetCacheObjectImpl directly</summary>
-        public static CacheObjectBase GetCacheObject(object obj, Type valueType)
-        {
-            return GetCacheObjectImpl(obj, null, null, valueType);
-        }
-
-        /// <summary>
-        /// Get CacheObject from only a MemberInfo and declaring instance
-        /// Calls GetCacheObject(obj, memberInfo, declaringInstance) with (null, memberInfo, declaringInstance)</summary>
-        public static CacheObjectBase GetCacheObject(MemberInfo memberInfo, object declaringInstance)
-        {
-            return GetCacheObject(null, memberInfo, declaringInstance);
-        }
-
-        /// <summary>
-        /// Get CacheObject from either an object or MemberInfo, and don't provide the type.
-        /// This gets the type and then calls GetCacheObjectImpl</summary>
-        public static CacheObjectBase GetCacheObject(object obj, MemberInfo memberInfo, object declaringInstance)
-        {
-            Type type = null;
-
-            if (obj != null)
-            {
-                type = ReflectionHelpers.GetActualType(obj);
-            }
-            else if (memberInfo != null)
-            {
-                if (memberInfo is FieldInfo fi)
-                {
-                    type = fi.FieldType;
-                }
-                else if (memberInfo is PropertyInfo pi)
-                {
-                    type = pi.PropertyType;
-                }
-                else if (memberInfo is MethodInfo mi)
-                {
-                    type = mi.ReturnType;
-                }
-            }
-
-            if (type == null)
-            {
-                return null;
-            }
-
-            return GetCacheObjectImpl(obj, memberInfo, declaringInstance, type);
-        }
-
-        /// <summary>
-        /// Actual GetCacheObject implementation (private)
-        /// </summary>
-        private static CacheObjectBase GetCacheObjectImpl(object obj, MemberInfo memberInfo, object declaringInstance, Type valueType)
-        {
-            CacheObjectBase holder;
-
-            if (memberInfo is MethodInfo mi)
-            {
-                if (CacheMethod.CanEvaluate(mi))
-                {
-                    holder = new CacheMethod();
-                }
-                else
-                {
-                    return null;
-                }
-            }
-            else if (valueType == typeof(GameObject) || valueType == typeof(Transform))
-            {
-                holder = new CacheGameObject();
-            }
-            else if (valueType.IsPrimitive || valueType == typeof(string))
-            {
-                holder = new CachePrimitive();
-            }
-            else if (valueType.IsEnum)
-            {
-                holder = new CacheEnum();
-            }
-            else if (ReflectionHelpers.IsArray(valueType) || ReflectionHelpers.IsList(valueType))
-            {
-                holder = new CacheList();
-            }
-            else if (ReflectionHelpers.IsDictionary(valueType))
-            {
-                holder = new CacheDictionary();
-            }
-            else
-            {
-                holder = new CacheOther();
-            }
-
-            holder.Value = obj;
-            holder.ValueTypeName = valueType.FullName;
-
-            if (memberInfo != null)
-            {
-                holder.MemInfo = memberInfo;
-                holder.DeclaringType = memberInfo.DeclaringType;
-                holder.DeclaringInstance = declaringInstance;
-
-                holder.UpdateValue();
-            }
-
-            holder.Init();
-
-            return holder;
-        }
-
-        // ======== Instance Methods =========
+        public abstract void DrawValue(Rect window, float width); 
 
         public virtual void UpdateValue()
         {
-            if (MemInfo == null || !string.IsNullOrEmpty(ReflectionException))
+            if (MemInfo == null)
             {
                 return;
             }
 
+            if (HasParameters && !m_isEvaluating)
+            {
+                // Need to enter parameters first
+                return;
+            }
+
             try
             {
                 if (MemInfo.MemberType == MemberTypes.Field)
@@ -186,21 +57,14 @@ namespace Explorer
                 else if (MemInfo.MemberType == MemberTypes.Property)
                 {
                     var pi = MemInfo as PropertyInfo;
-                    bool isStatic = pi.GetAccessors()[0].IsStatic;
-                    var target = isStatic ? null : DeclaringInstance;
+                    var target = pi.GetAccessors()[0].IsStatic ? null : DeclaringInstance;
 
-                    if (pi.GetIndexParameters().Length > 0)
-                    {
-                        var indexes = new object[] { PropertyIndex };
-                        Value = pi.GetValue(target, indexes);
-                    }
-                    else
-                    {
-                        Value = pi.GetValue(target, null);
-                    }
+                    Value = pi.GetValue(target, ParseArguments());
                 }
 
                 ReflectionException = null;
+                m_evaluated = true;
+                m_isEvaluating = false;
             }
             catch (Exception e)
             {
@@ -221,26 +85,92 @@ namespace Explorer
                 {
                     var pi = MemInfo as PropertyInfo;
 
-                    if (pi.GetIndexParameters().Length > 0)
+                    if (HasParameters)
                     {
-                        var indexes = new object[] { PropertyIndex };
-                        pi.SetValue(pi.GetAccessors()[0].IsStatic ? null : DeclaringInstance, Value, indexes);
+                        pi.SetValue(pi.GetAccessors()[0].IsStatic ? null : DeclaringInstance, Value, ParseArguments());
                     }
                     else
                     {
-                        pi.SetValue(pi.GetAccessors()[0].IsStatic ? null : DeclaringInstance, Value);
+                        pi.SetValue(pi.GetAccessors()[0].IsStatic ? null : DeclaringInstance, Value, null);
                     }
                 }
             }
             catch (Exception e)
             {
-                MelonLogger.LogWarning($"Error setting value: {e.GetType()}, {e.Message}");
+                ExplorerCore.LogWarning($"Error setting value: {e.GetType()}, {e.Message}");
             }
         }
 
-        // ========= Instance Gui Draw ==========
+        public object[] ParseArguments()
+        {
+            var parsedArgs = new List<object>();
+            for (int i = 0; i < m_arguments.Length; i++)
+            {
+                var input = m_argumentInput[i];
+                var type = m_arguments[i].ParameterType;
+
+                if (type.IsByRef)
+                {
+                    type = type.GetElementType();
+                }
+
+                if (!string.IsNullOrEmpty(input))
+                {
+                    if (type == typeof(string))
+                    {
+                        parsedArgs.Add(input);
+                        continue;
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var arg = type.GetMethod("Parse", new Type[] { typeof(string) })
+                                          .Invoke(null, new object[] { input });
+
+                            parsedArgs.Add(arg);
+                            continue;
+                        }
+                        catch
+                        {
+                            ExplorerCore.Log($"Argument #{i} '{m_arguments[i].Name}' ({type.Name}), could not parse input '{input}'.");
+                        }
+                    }
+                }
+
+                // No input, see if there is a default value.
+                if (HasDefaultValue(m_arguments[i]))
+                {
+                    parsedArgs.Add(m_arguments[i].DefaultValue);
+                    continue;
+                }
+
+                // Try add a null arg I guess
+                parsedArgs.Add(null);
+            }
+
+            return parsedArgs.ToArray();
+        }
+
+        public static bool HasDefaultValue(ParameterInfo arg) => arg.DefaultValue != DBNull.Value;
+
+        // ========= Gui Draw ==========
 
         public const float MAX_LABEL_WIDTH = 400f;
+        public const string EVALUATE_LABEL = "<color=lime>Evaluate</color>";
+
+        public float CalcWhitespace(Rect window)
+        {
+            if (!(this is IExpandHeight)) return 0f;
+
+            float whitespace = (this as IExpandHeight).WhiteSpace;
+            if (whitespace > 0)
+            {
+                ClampLabelWidth(window, ref whitespace);
+            }
+
+            return whitespace;
+        }
 
         public static void ClampLabelWidth(Rect window, ref float labelWidth)
         {
@@ -259,84 +189,239 @@ namespace Explorer
 
             if (MemInfo != null)
             {
-                var name = RichTextName;
-                if (MemInfo is PropertyInfo pi && pi.GetIndexParameters().Length > 0)
-                {
-                    name += $"[{PropertyIndex}]";
-                }
-
-                GUILayout.Label(name, new GUILayoutOption[] { GUILayout.Width(labelWidth) });
+                GUILayout.Label(RichTextName, new GUILayoutOption[] { GUILayout.Width(labelWidth) });
             }
             else
             {
-                GUILayout.Space(labelWidth);
+                GUIUnstrip.Space(labelWidth);
             }
 
-            if (!string.IsNullOrEmpty(ReflectionException))
+            var cm = this as CacheMethod;
+
+            if (HasParameters)
             {
-                GUILayout.Label("<color=red>Reflection failed!</color> (" + ReflectionException + ")", null);
-            }
-            else if (Value == null && MemInfo?.MemberType != MemberTypes.Method)
-            {
-                GUILayout.Label("<i>null (" + ValueTypeName + ")</i>", null);
-            }
-            else
-            {
-                if (MemInfo is PropertyInfo pi && pi.GetIndexParameters().Length > 0)
+                GUILayout.BeginVertical(new GUILayoutOption[0]);
+
+                if (m_isEvaluating)
                 {
-                    GUILayout.Label("index:", new GUILayoutOption[] { GUILayout.Width(50) });
-
-                    m_propertyIndexInput = GUILayout.TextField(m_propertyIndexInput, new GUILayoutOption[] { GUILayout.Width(100) });
-                    if (GUILayout.Button("Set", new GUILayoutOption[] { GUILayout.Width(60) }))
+                    if (cm != null && cm.GenericArgs.Length > 0)
                     {
-                        if (int.TryParse(m_propertyIndexInput, out int i))
+                        GUILayout.Label($"<b><color=orange>Generic Arguments:</color></b>", new GUILayoutOption[0]);
+
+                        for (int i = 0; i < cm.GenericArgs.Length; i++)
                         {
-                            PropertyIndex = i;
-                            UpdateValue();
-                        }
-                        else
-                        {
-                            MelonLogger.Log($"Could not parse '{m_propertyIndexInput}' to an int!");
+                            string types = "";
+                            if (cm.GenericConstraints[i].Length > 0)
+                            {
+                                foreach (var constraint in cm.GenericConstraints[i])
+                                {
+                                    if (types != "") types += ", ";
+
+                                    string type;
+
+                                    if (constraint == null)
+                                        type = "Any";
+                                    else
+                                        type = constraint.ToString();
+
+                                    types += $"<color={UIStyles.Syntax.Class_Instance}>{type}</color>";
+                                }
+                            }
+                            else
+                            {
+                                types = $"<color={UIStyles.Syntax.Class_Instance}>Any</color>";
+                            }
+                            var input = cm.GenericArgInput[i];
+
+                            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+
+                            GUI.skin.label.alignment = TextAnchor.MiddleCenter;
+                            GUILayout.Label(
+                                $"<color={UIStyles.Syntax.StructGreen}>{cm.GenericArgs[i].Name}</color>", 
+                                new GUILayoutOption[] { GUILayout.Width(15) }
+                            );
+                            cm.GenericArgInput[i] = GUIUnstrip.TextField(input, new GUILayoutOption[] { GUILayout.Width(150) });
+                            GUI.skin.label.alignment = TextAnchor.MiddleLeft;
+                            GUILayout.Label(types, new GUILayoutOption[0]);
+
+                            GUILayout.EndHorizontal();
                         }
                     }
 
-                    // new line and space
+                    if (m_arguments.Length > 0)
+                    {
+                        GUILayout.Label($"<b><color=orange>Arguments:</color></b>", new GUILayoutOption[0]);
+                        for (int i = 0; i < m_arguments.Length; i++)
+                        {
+                            var name = m_arguments[i].Name;
+                            var input = m_argumentInput[i];
+                            var type = m_arguments[i].ParameterType.Name;
+
+                            var label = $"<color={UIStyles.Syntax.Class_Instance}>{type}</color> ";
+                            label += $"<color={UIStyles.Syntax.Local}>{name}</color>";
+                            if (HasDefaultValue(m_arguments[i]))
+                            {
+                                label = $"<i>[{label} = {m_arguments[i].DefaultValue ?? "null"}]</i>";
+                            }
+
+                            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+
+                            GUI.skin.label.alignment = TextAnchor.MiddleCenter;
+                            GUILayout.Label(i.ToString(), new GUILayoutOption[] { GUILayout.Width(15) });
+                            m_argumentInput[i] = GUIUnstrip.TextField(input, new GUILayoutOption[] { GUILayout.Width(150) });
+                            GUI.skin.label.alignment = TextAnchor.MiddleLeft;
+                            GUILayout.Label(label, new GUILayoutOption[0]);
+
+                            GUILayout.EndHorizontal();
+                        }
+                    }
+
+                    GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                    if (GUILayout.Button(EVALUATE_LABEL, new GUILayoutOption[] { GUILayout.Width(70) }))
+                    {
+                        if (cm != null)
+                            cm.Evaluate();
+                        else
+                            UpdateValue();
+                    }
+                    if (GUILayout.Button("Cancel", new GUILayoutOption[] { GUILayout.Width(70) }))
+                    {
+                        m_isEvaluating = false;
+                    }
                     GUILayout.EndHorizontal();
-                    GUILayout.BeginHorizontal(null);
-                    GUILayout.Space(labelWidth);
+                }
+                else
+                {
+                    var lbl = $"Evaluate (";
+                    int len = m_arguments.Length;
+                    if (cm != null) len += cm.GenericArgs.Length;
+                    lbl += len + " params)";
+
+                    if (GUILayout.Button(lbl, new GUILayoutOption[] { GUILayout.Width(150) }))
+                    {
+                        m_isEvaluating = true;
+                    }
                 }
 
+                GUILayout.EndVertical();
+
+                GUILayout.EndHorizontal();
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(labelWidth);
+            }
+            else if (cm != null)
+            {
+                if (GUILayout.Button(EVALUATE_LABEL, new GUILayoutOption[] { GUILayout.Width(70) }))
+                {
+                    cm.Evaluate();
+                }
+
+                GUILayout.EndHorizontal();
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(labelWidth);
+            }
+
+            string typeName = $"<color={UIStyles.Syntax.Class_Instance}>{ValueType.FullName}</color>";
+
+            if (!string.IsNullOrEmpty(ReflectionException))
+            {
+                GUILayout.Label("<color=red>Reflection failed!</color> (" + ReflectionException + ")", new GUILayoutOption[0]);
+            }
+            else if ((HasParameters || this is CacheMethod) && !m_evaluated)
+            {
+                GUILayout.Label($"<color=grey><i>Not yet evaluated</i></color> ({typeName})", new GUILayoutOption[0]);
+            }
+            else if (Value == null && !(this is CacheMethod))
+            {
+                GUILayout.Label($"<i>null ({typeName})</i>", new GUILayoutOption[0]);
+            }
+            else
+            {
                 DrawValue(window, window.width - labelWidth - 90);
             }
         }
 
+        private bool GetCanWrite()
+        {
+            if (MemInfo is FieldInfo fi)
+                m_canWrite = !(fi.IsLiteral && !fi.IsInitOnly);
+            else if (MemInfo is PropertyInfo pi)
+                m_canWrite = pi.CanWrite;
+            else
+                m_canWrite = false;
+
+            return (bool)m_canWrite;
+        }
+
         private string GetRichTextName()
         {
             string memberColor = "";
-            switch (MemInfo.MemberType)
-            {
-                case MemberTypes.Field:
-                    memberColor = "#c266ff"; break;
-                case MemberTypes.Property:
-                    memberColor = "#72a6a6"; break;
-                case MemberTypes.Method:
-                    memberColor = "#ff8000"; break;
-            };
+            bool isStatic = false;
 
-            m_richTextName = $"<color=#2df7b2>{MemInfo.DeclaringType.Name}</color>.<color={memberColor}>{MemInfo.Name}</color>";
-
-            if (MemInfo is MethodInfo mi)
+            if (MemInfo is FieldInfo fi)
             {
-                m_richTextName += "(";
-                var _params = "";
-                foreach (var param in mi.GetParameters())
+                if (fi.IsStatic)
                 {
-                    if (_params != "") _params += ", ";
-
-                    _params += $"<color=#a6e9e9>{param.Name}</color>";
+                    isStatic = true;
+                    memberColor = UIStyles.Syntax.Field_Static;
                 }
-                m_richTextName += _params;
-                m_richTextName += ")";
+                else
+                    memberColor = UIStyles.Syntax.Field_Instance;
+            }
+            else if (MemInfo is MethodInfo mi)
+            {
+                if (mi.IsStatic)
+                {
+                    isStatic = true;
+                    memberColor = UIStyles.Syntax.Method_Static;
+                }   
+                else
+                    memberColor = UIStyles.Syntax.Method_Instance;
+            }
+            else if (MemInfo is PropertyInfo pi)
+            {
+                if (pi.GetAccessors()[0].IsStatic)
+                {
+                    isStatic = true;
+                    memberColor = UIStyles.Syntax.Prop_Static;
+                }
+                else
+                    memberColor = UIStyles.Syntax.Prop_Instance;
+            }
+
+            string classColor;
+            if (MemInfo.DeclaringType.IsValueType)
+            {
+                classColor = UIStyles.Syntax.StructGreen;
+            }
+            else if (MemInfo.DeclaringType.IsAbstract && MemInfo.DeclaringType.IsSealed)
+            {
+                classColor = UIStyles.Syntax.Class_Static;
+            }
+            else
+            {
+                classColor = UIStyles.Syntax.Class_Instance;
+            }
+
+            m_richTextName = $"<color={classColor}>{MemInfo.DeclaringType.Name}</color>.";
+            if (isStatic) m_richTextName += "<i>";
+            m_richTextName += $"<color={memberColor}>{MemInfo.Name}</color>";
+            if (isStatic) m_richTextName += "</i>";
+
+            // generic method args
+            if (this is CacheMethod cm && cm.GenericArgs.Length > 0)
+            {
+                m_richTextName += "<";
+
+                var args = "";
+                for (int i = 0; i < cm.GenericArgs.Length; i++)
+                {
+                    if (args != "") args += ", ";
+                    args += $"<color={UIStyles.Syntax.StructGreen}>{cm.GenericArgs[i].Name}</color>";
+                }
+                m_richTextName += args;
+
+                m_richTextName += ">";
             }
 
             return m_richTextName;

src/CachedObjects/CacheOther.cs

@@ -1,60 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Reflection;
-using UnityEngine;
-
-namespace Explorer
-{
-    public class CacheOther : CacheObjectBase
-    {
-        private MethodInfo m_toStringMethod;
-
-        public MethodInfo ToStringMethod
-        {
-            get
-            {
-                if (m_toStringMethod == null)
-                {
-                    try
-                    {
-                        m_toStringMethod = ReflectionHelpers.GetActualType(Value).GetMethod("ToString", new Type[0]) 
-                                           ?? typeof(object).GetMethod("ToString", new Type[0]);
-
-                        // test invoke
-                        m_toStringMethod.Invoke(Value, null);
-                    }
-                    catch
-                    {
-                        m_toStringMethod = typeof(object).GetMethod("ToString", new Type[0]);
-                    }
-                }
-                return m_toStringMethod;
-            }
-        }
-
-        public override void DrawValue(Rect window, float width)
-        {
-            string label = (string)ToStringMethod?.Invoke(Value, null) ?? Value.ToString();
-            
-            if (!label.Contains(ValueTypeName))
-            {
-                label += $" ({ValueTypeName})";
-            }
-            if (Value is UnityEngine.Object unityObj && !label.Contains(unityObj.name))
-            {
-                label = unityObj.name + " | " + label;
-            }
-
-            GUI.skin.button.alignment = TextAnchor.MiddleLeft;
-            if (GUILayout.Button("<color=yellow>" + label + "</color>", new GUILayoutOption[] { GUILayout.Width(width) }))
-            {
-                WindowManager.InspectObject(Value, out bool _);
-            }
-            GUI.skin.button.alignment = TextAnchor.MiddleCenter;
-        }
-    }
-}

src/CachedObjects/CachePrimitive.cs

@@ -1,181 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using MelonLoader;
-using UnityEngine;
-
-namespace Explorer
-{
-    public class CachePrimitive : CacheObjectBase
-    {
-        public enum PrimitiveTypes
-        {
-            Bool,
-            Double,
-            Float,
-            Int,
-            String,
-            Char
-        }
-
-        private string m_valueToString;
-
-        public PrimitiveTypes PrimitiveType;
-
-        public MethodInfo ParseMethod
-        {
-            get
-            {
-                if (m_parseMethod == null)
-                {
-                    m_parseMethod = Value.GetType().GetMethod("Parse", new Type[] { typeof(string) });
-                }
-                return m_parseMethod;
-            }
-        }
-
-        private MethodInfo m_parseMethod;
-
-        public override void Init()
-        {
-            if (Value == null)
-            {
-                // this must mean it is a string. No other primitive type should be nullable.
-                PrimitiveType = PrimitiveTypes.String;
-                return;
-            }
-
-            m_valueToString = Value.ToString();
-            var type = Value.GetType();
-
-            if (type == typeof(bool))
-            {
-                PrimitiveType = PrimitiveTypes.Bool;
-            }
-            else if (type == typeof(double))
-            {
-                PrimitiveType = PrimitiveTypes.Double;
-            }
-            else if (type == typeof(float))
-            {
-                PrimitiveType = PrimitiveTypes.Float;
-            }
-            else if (IsInteger(type))
-            {
-                PrimitiveType = PrimitiveTypes.Int;
-            }
-            else if (type == typeof(char))
-            {
-                PrimitiveType = PrimitiveTypes.Char;
-            }
-            else
-            {
-                PrimitiveType = PrimitiveTypes.String;
-            }
-        }
-
-        private static bool IsInteger(Type type)
-        {
-            // For our purposes, all types of int can be treated the same, including IntPtr.
-            return _integerTypes.Contains(type);
-        }
-
-        private static readonly HashSet<Type> _integerTypes = new HashSet<Type>
-        {
-            typeof(int),
-            typeof(uint),
-            typeof(short),
-            typeof(ushort),
-            typeof(long),
-            typeof(ulong),
-            typeof(byte),
-            typeof(sbyte),
-            typeof(IntPtr)
-        };
-
-        public override void UpdateValue()
-        {
-            base.UpdateValue();
-
-            m_valueToString = Value?.ToString();
-        }
-
-        public override void DrawValue(Rect window, float width)
-        {
-            if (PrimitiveType == PrimitiveTypes.Bool)
-            {
-                var b = (bool)Value;
-                var color = $"<color={(b ? "lime>" : "red>")}";
-                var label = $"{color}{b}</color>";
-
-                if (CanWrite)
-                {
-                    b = GUILayout.Toggle(b, label, null);
-                    if (b != (bool)Value)
-                    {
-                        SetValueFromInput(b.ToString());
-                    }
-                }
-                else
-                {
-                    GUILayout.Label(label, null);
-                }
-            }
-            else
-            {
-                GUILayout.Label("<color=yellow><i>" + PrimitiveType + "</i></color>", new GUILayoutOption[] { GUILayout.Width(50) });
-
-                int dynSize = 25 + (m_valueToString.Length * 15);
-                var maxwidth = window.width - 300f;
-                if (CanWrite) maxwidth -= 60;
-
-                if (dynSize > maxwidth)
-                {
-                    m_valueToString = GUILayout.TextArea(m_valueToString, new GUILayoutOption[] { GUILayout.MaxWidth(maxwidth) });
-                }
-                else
-                {
-                    m_valueToString = GUILayout.TextField(m_valueToString, new GUILayoutOption[] { GUILayout.MaxWidth(dynSize) });
-                }
-
-                if (CanWrite)
-                {
-                    if (GUILayout.Button("<color=#00FF00>Apply</color>", new GUILayoutOption[] { GUILayout.Width(60) }))
-                    {
-                        SetValueFromInput(m_valueToString);
-                    }
-                }
-
-                GUILayout.Space(5);
-            }
-        }
-
-        public void SetValueFromInput(string value)
-        {
-            if (MemInfo == null)
-            {
-                MelonLogger.Log("Trying to SetValue but the MemberInfo is null!");
-                return;
-            }
-
-            if (PrimitiveType == PrimitiveTypes.String)
-            {
-                Value = value;
-            }
-            else
-            {
-                try
-                {
-                    var val = ParseMethod.Invoke(null, new object[] { value });
-                    Value = val;                    
-                }
-                catch (Exception e)
-                {
-                    MelonLogger.Log("Exception parsing value: " + e.GetType() + ", " + e.Message);
-                }
-            }
-
-            SetValue();
-        }
-    }
-}

src/CachedObjects/IExpandHeight.cs

@@ -0,0 +1,8 @@
+namespace Explorer
+{
+    interface IExpandHeight
+    {
+        bool IsExpanded { get; set; }
+        float WhiteSpace { get; set; }        
+    }
+}

src/CachedObjects/Object/CacheDictionary.cs

@@ -0,0 +1,286 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+#if CPP
+using UnhollowerBaseLib;
+#endif
+
+namespace Explorer
+{
+    public class CacheDictionary : CacheObjectBase, IExpandHeight
+    {
+        public bool IsExpanded { get; set; }
+        public float WhiteSpace { get; set; } = 215f;
+
+        public PageHelper Pages = new PageHelper();
+
+        private CacheObjectBase[] m_cachedKeys;
+        private CacheObjectBase[] m_cachedValues;
+
+        public Type TypeOfKeys
+        {
+            get
+            {
+                if (m_keysType == null) GetGenericArguments();
+                return m_keysType;
+            }
+        }
+        private Type m_keysType;
+
+        public Type TypeOfValues
+        {
+            get
+            {
+                if (m_valuesType == null) GetGenericArguments();
+                return m_valuesType;
+            }
+        }
+        private Type m_valuesType;
+
+        public IDictionary IDict
+        {
+            get => m_iDictionary ?? (m_iDictionary = Value as IDictionary) ?? Il2CppDictionaryToMono();
+            set => m_iDictionary = value;
+        }
+        private IDictionary m_iDictionary;
+
+        // ========== Methods ==========
+
+        // This is a bit janky due to Il2Cpp Dictionary not implementing IDictionary.
+        private IDictionary Il2CppDictionaryToMono()
+        {
+            // note: "ValueType" is the Dictionary itself, TypeOfValues is the 'Dictionary.Values' type.
+
+            // get keys and values
+            var keys   = ValueType.GetProperty("Keys")  .GetValue(Value, null);
+            var values = ValueType.GetProperty("Values").GetValue(Value, null);
+
+            // create lists to hold them
+            var keyList   = new List<object>();
+            var valueList = new List<object>();
+
+            // store entries with reflection
+            EnumerateWithReflection(keys, keyList);
+            EnumerateWithReflection(values, valueList);
+
+            // make actual mono dictionary
+            var dict = (IDictionary)Activator.CreateInstance(typeof(Dictionary<,>)
+                                             .MakeGenericType(TypeOfKeys, TypeOfValues));
+
+            // finally iterate into dictionary
+            for (int i = 0; i < keyList.Count; i++)
+            {
+                dict.Add(keyList[i], valueList[i]);
+            }
+
+            return dict;
+        }
+
+        private void EnumerateWithReflection(object collection, List<object> list)
+        {
+            // invoke GetEnumerator
+            var enumerator = collection.GetType().GetMethod("GetEnumerator").Invoke(collection, null);
+            // get the type of it
+            var enumeratorType = enumerator.GetType();
+            // reflect MoveNext and Current
+            var moveNext = enumeratorType.GetMethod("MoveNext");
+            var current = enumeratorType.GetProperty("Current");
+            // iterate
+            while ((bool)moveNext.Invoke(enumerator, null))
+            {
+                list.Add(current.GetValue(enumerator, null));
+            }
+        }
+
+        private void GetGenericArguments()
+        {
+            if (ValueType.IsGenericType)
+            {
+                m_keysType = ValueType.GetGenericArguments()[0];
+                m_valuesType = ValueType.GetGenericArguments()[1];
+            }
+            else
+            {
+                // It's non-generic, just use System.Object to allow for anything.
+                m_keysType = typeof(object);
+                m_valuesType = typeof(object);
+            }
+        }
+
+        public override void UpdateValue()
+        {
+            // first make sure we won't run into a TypeInitializationException.
+            if (!EnsureDictionaryIsSupported())
+            {
+                ReflectionException = "Dictionary Type not supported with Reflection!";
+                return;
+            }
+
+            base.UpdateValue();
+
+            // reset
+            IDict = null;
+
+            if (Value == null || IDict == null)
+            {
+                return;
+            }
+
+            var keys = new List<CacheObjectBase>();
+            foreach (var key in IDict.Keys)
+            {
+                Type t = ReflectionHelpers.GetActualType(key) ?? TypeOfKeys;
+                var cache = CacheFactory.GetCacheObject(key, t);
+                keys.Add(cache);
+            }
+
+            var values = new List<CacheObjectBase>();
+            foreach (var val in IDict.Values)
+            {
+                Type t = ReflectionHelpers.GetActualType(val) ?? TypeOfValues;
+                var cache = CacheFactory.GetCacheObject(val, t);
+                values.Add(cache);
+            }
+
+            m_cachedKeys = keys.ToArray();
+            m_cachedValues = values.ToArray();
+        }
+
+        private bool EnsureDictionaryIsSupported()
+        {
+            if (typeof(IDictionary).IsAssignableFrom(ValueType))
+            {
+                return true;
+            }
+
+#if CPP
+            try
+            {
+                return Check(TypeOfKeys) && Check(TypeOfValues);
+
+                bool Check(Type type)
+                {
+                    var ptr = (IntPtr)typeof(Il2CppClassPointerStore<>)
+                        .MakeGenericType(type)
+                        .GetField("NativeClassPtr")
+                        .GetValue(null);
+
+                    return Il2CppSystem.Type.internal_from_handle(IL2CPP.il2cpp_class_get_type(ptr)) is Il2CppSystem.Type;
+                }
+            }
+            catch 
+            { 
+                return false; 
+            }
+#else
+            return false;
+#endif
+        }
+
+        // ============= GUI Draw =============
+
+        public override void DrawValue(Rect window, float width)
+        {
+            if (m_cachedKeys == null || m_cachedValues == null)
+            {
+                GUILayout.Label("Cached keys or values is null!", new GUILayoutOption[0]);
+                return;
+            }
+
+            var whitespace = CalcWhitespace(window);
+
+            int count = m_cachedKeys.Length;
+
+            if (!IsExpanded)
+            {
+                if (GUILayout.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
+                {
+                    IsExpanded = true;
+                }
+            }
+            else
+            {
+                if (GUILayout.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
+                {
+                    IsExpanded = false;
+                }
+            }
+
+            var negativeWhitespace = window.width - (whitespace + 100f);
+
+            GUI.skin.button.alignment = TextAnchor.MiddleLeft;
+            string btnLabel = $"[{count}] <color=#2df7b2>Dictionary<{TypeOfKeys.FullName}, {TypeOfValues.FullName}></color>";
+            if (GUILayout.Button(btnLabel, new GUILayoutOption[] { GUILayout.Width(negativeWhitespace) }))
+            {
+                WindowManager.InspectObject(Value, out bool _);
+            }
+            GUI.skin.button.alignment = TextAnchor.MiddleCenter;
+
+            GUIUnstrip.Space(5);
+
+            if (IsExpanded)
+            {
+                Pages.ItemCount = count;
+
+                if (count > Pages.ItemsPerPage)
+                {
+                    GUILayout.EndHorizontal();
+                    GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+
+                    GUIUnstrip.Space(whitespace);
+
+                    Pages.CurrentPageLabel();
+
+                    // prev/next page buttons
+                    if (GUILayout.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(60) }))
+                    {
+                        Pages.TurnPage(Turn.Left);
+                    }
+                    if (GUILayout.Button("Next >", new GUILayoutOption[] { GUILayout.Width(60) }))
+                    {
+                        Pages.TurnPage(Turn.Right);
+                    }
+
+                    Pages.DrawLimitInputArea();
+
+                    GUIUnstrip.Space(5);
+                }
+
+                int offset = Pages.CalculateOffsetIndex();
+
+                for (int i = offset; i < offset + Pages.ItemsPerPage && i < count; i++)
+                {
+                    var key = m_cachedKeys[i];
+                    var val = m_cachedValues[i];
+
+                    //collapsing the BeginHorizontal called from ReflectionWindow.WindowFunction or previous array entry
+                    GUILayout.EndHorizontal();
+                    GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+
+                    //GUIUnstrip.Space(whitespace);
+
+                    if (key == null || val == null)
+                    {
+                        GUILayout.Label($"[{i}] <i><color=grey>(null)</color></i>", new GUILayoutOption[0]);
+                    }
+                    else
+                    {
+                        GUI.skin.label.alignment = TextAnchor.MiddleCenter;
+                        GUILayout.Label($"[{i}]", new GUILayoutOption[] { GUILayout.Width(30) });
+
+                        GUI.skin.label.alignment = TextAnchor.MiddleLeft;
+                        GUILayout.Label("Key:", new GUILayoutOption[] { GUILayout.Width(40) });
+                        key.DrawValue(window, (window.width / 2) - 80f);
+
+                        GUILayout.Label("Value:", new GUILayoutOption[] { GUILayout.Width(40) });
+                        val.DrawValue(window, (window.width / 2) - 80f);
+                    }
+
+                }
+
+                GUI.skin.label.alignment = TextAnchor.UpperLeft;
+            }
+        }
+    }
+}

src/CachedObjects/Object/CacheGameObject.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using MelonLoader;
-using UnityEngine;
+using UnityEngine;
 
 namespace Explorer
 {

src/CachedObjects/Object/CacheList.cs

@@ -1,20 +1,17 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using MelonLoader;
 using UnityEngine;
 
 namespace Explorer
 {
-    public class CacheList : CacheObjectBase
+    public class CacheList : CacheObjectBase, IExpandHeight
     {
         public bool IsExpanded { get; set; }
-        public PageHelper Pages = new PageHelper();
+        public float WhiteSpace { get; set; } = 215f;
 
-        public float WhiteSpace = 215f;
-        public float ButtonWidthOffset = 290f;
+        public PageHelper Pages = new PageHelper();
 
         private CacheObjectBase[] m_cachedEntries;
 
@@ -41,7 +38,7 @@ namespace Explorer
         private Type m_genericTypeDef;
 
         // Cached ToArray method for Lists
-        public MethodInfo GenericToArrayMethod
+        public MethodInfo CppListToArrayMethod
         {
             get => GetGenericToArrayMethod();
         }
@@ -52,6 +49,7 @@ namespace Explorer
         {
             get => GetItemProperty();
         }
+
         private PropertyInfo m_itemProperty;
 
         // ========== Methods ==========
@@ -60,7 +58,7 @@ namespace Explorer
         {
             if (m_enumerable == null && Value != null)
             {
-                m_enumerable = Value as IEnumerable ?? GetEnumerableFromIl2CppList();
+                m_enumerable = Value as IEnumerable ?? EnumerateWithReflection();
             }
             return m_enumerable;
         }
@@ -100,21 +98,50 @@ namespace Explorer
             return m_itemProperty;
         }
 
-        private IEnumerable GetEnumerableFromIl2CppList()
+        private IEnumerable EnumerateWithReflection()
         {
             if (Value == null) return null;
 
+#if CPP
             if (GenericTypeDef == typeof(Il2CppSystem.Collections.Generic.List<>))
             {
-                return (IEnumerable)GenericToArrayMethod?.Invoke(Value, new object[0]);
+                return (IEnumerable)CppListToArrayMethod?.Invoke(Value, new object[0]);
+            }
+            else if (GenericTypeDef == typeof(Il2CppSystem.Collections.Generic.HashSet<>))
+            {
+                return CppHashSetToMono();
             }
             else
             {
-                return ConvertIListToMono();
+                return CppIListToMono();
             }
+#else
+            return Value as IEnumerable;
+#endif
         }
 
-        private IList ConvertIListToMono()
+#if CPP
+        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 enumeratorType = enumerator.GetType();
+            // reflect MoveNext and Current
+            var moveNext = enumeratorType.GetMethod("MoveNext");
+            var current = enumeratorType.GetProperty("Current");
+            // iterate
+            while ((bool)moveNext.Invoke(enumerator, null))
+            {
+                set.Add(current.GetValue(enumerator));
+            }
+
+            return set;
+        }
+
+        private IList CppIListToMono()
         {
             try
             {
@@ -135,10 +162,11 @@ namespace Explorer
             }
             catch (Exception e)
             {
-                MelonLogger.Log("Exception converting Il2Cpp IList to Mono IList: " + e.GetType() + ", " + e.Message);
+                ExplorerCore.Log("Exception converting Il2Cpp IList to Mono IList: " + e.GetType() + ", " + e.Message);
                 return null;
             }
         }
+#endif
 
         private Type GetEntryType()
         {
@@ -203,6 +231,7 @@ namespace Explorer
 
                 if (obj != null && ReflectionHelpers.GetActualType(obj) is Type t)
                 {
+#if CPP
                     if (obj is Il2CppSystem.Object iObj)
                     {
                         try
@@ -215,8 +244,9 @@ namespace Explorer
                         }
                         catch { }
                     }
+#endif
 
-                    if (GetCacheObject(obj, t) is CacheObjectBase cached)
+                    if (CacheFactory.GetCacheObject(obj, t) is CacheObjectBase cached)
                     {
                         list.Add(cached);
                     }
@@ -240,10 +270,12 @@ namespace Explorer
         {
             if (m_cachedEntries == null)
             {
-                GUILayout.Label("m_cachedEntries is null!", null);
+                GUILayout.Label("m_cachedEntries is null!", new GUILayoutOption[0]);
                 return;
             }
 
+            var whitespace = CalcWhitespace(window);
+
             int count = m_cachedEntries.Length;
 
             if (!IsExpanded)
@@ -261,32 +293,28 @@ namespace Explorer
                 }
             }
 
+            var negativeWhitespace = window.width - (whitespace + 100f);
+
             GUI.skin.button.alignment = TextAnchor.MiddleLeft;
-            string btnLabel = "<color=yellow>[" + count + "] " + EntryType + "</color>";
-            if (GUILayout.Button(btnLabel, new GUILayoutOption[] { GUILayout.MaxWidth(window.width - ButtonWidthOffset) }))
+            string btnLabel = $"[{count}] <color=#2df7b2>{EntryType.FullName}</color>";
+            if (GUILayout.Button(btnLabel, new GUILayoutOption[] { GUILayout.Width(negativeWhitespace) }))
             {
                 WindowManager.InspectObject(Value, out bool _);
             }
             GUI.skin.button.alignment = TextAnchor.MiddleCenter;
 
-            GUILayout.Space(5);
+            GUIUnstrip.Space(5);
 
             if (IsExpanded)
             {
-                float whitespace = WhiteSpace;                
-                if (whitespace > 0)
-                {
-                    ClampLabelWidth(window, ref whitespace);
-                }
-
                 Pages.ItemCount = count;
 
                 if (count > Pages.ItemsPerPage)
                 {
                     GUILayout.EndHorizontal();
-                    GUILayout.BeginHorizontal(null);
+                    GUILayout.BeginHorizontal(new GUILayoutOption[0]);
 
-                    GUILayout.Space(whitespace);
+                    GUIUnstrip.Space(whitespace);
                  
                     Pages.CurrentPageLabel();
 
@@ -302,15 +330,9 @@ namespace Explorer
 
                     Pages.DrawLimitInputArea();
 
-                    GUILayout.Space(5);
+                    GUIUnstrip.Space(5);
                 }
 
-                //int offset = ArrayOffset * ArrayLimit;
-                //if (offset >= count)
-                //{
-                //    offset = 0;
-                //    ArrayOffset = 0;
-                //}
                 int offset = Pages.CalculateOffsetIndex();
 
                 for (int i = offset; i < offset + Pages.ItemsPerPage && i < count; i++)
@@ -319,19 +341,20 @@ namespace Explorer
 
                     //collapsing the BeginHorizontal called from ReflectionWindow.WindowFunction or previous array entry
                     GUILayout.EndHorizontal();
-                    GUILayout.BeginHorizontal(null);
+                    GUILayout.BeginHorizontal(new GUILayoutOption[0]);
 
-                    GUILayout.Space(whitespace);
+                    GUIUnstrip.Space(whitespace);
 
                     if (entry == null || entry.Value == null)
                     {
-                        GUILayout.Label($"[{i}] <i><color=grey>(null)</color></i>", null);
+                        GUILayout.Label($"[{i}] <i><color=grey>(null)</color></i>", new GUILayoutOption[0]);
                     }
                     else
                     {
                         GUI.skin.label.alignment = TextAnchor.MiddleCenter;
                         GUILayout.Label($"[{i}]", new GUILayoutOption[] { GUILayout.Width(30) });
 
+                        GUI.skin.label.alignment = TextAnchor.MiddleLeft;
                         entry.DrawValue(window, window.width - (whitespace + 85));                        
                     }
                     

src/CachedObjects/Other/CacheMethod.cs

@@ -0,0 +1,141 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using UnityEngine;
+
+namespace Explorer
+{
+    public class CacheMethod : CacheObjectBase
+    {
+        private CacheObjectBase m_cachedReturnValue;
+
+        public override bool HasParameters => base.HasParameters || GenericArgs.Length > 0;
+
+        public Type[] GenericArgs { get; private set; }
+        public Type[][] GenericConstraints { get; private set; }
+
+        public string[] GenericArgInput = new string[0];
+
+        public override void Init()
+        {
+            var mi = (MemInfo as MethodInfo);
+            GenericArgs = mi.GetGenericArguments();
+
+            GenericConstraints = GenericArgs.Select(x => x.GetGenericParameterConstraints())
+                                            .ToArray();
+
+            GenericArgInput = new string[GenericArgs.Length];
+
+            ValueType = mi.ReturnType;
+        }
+
+        public override void UpdateValue()
+        {
+            //base.UpdateValue();
+        }
+
+        public void Evaluate()
+        {
+            MethodInfo mi;
+            if (GenericArgs.Length > 0)
+            {
+                mi = MakeGenericMethodFromInput();
+                if (mi == null) return;
+            }
+            else
+            {
+                mi = MemInfo as MethodInfo;
+            }
+
+            object ret = null;
+
+            try
+            {
+                ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, ParseArguments());
+                m_evaluated = true;
+                m_isEvaluating = false;
+            }
+            catch (Exception e)
+            {
+                ExplorerCore.LogWarning($"Exception evaluating: {e.GetType()}, {e.Message}");
+                ReflectionException = ReflectionHelpers.ExceptionToString(e);
+            }
+
+            if (ret != null)
+            {
+                m_cachedReturnValue = CacheFactory.GetTypeAndCacheObject(ret);
+                m_cachedReturnValue.UpdateValue();
+            }
+            else
+            {
+                m_cachedReturnValue = null;
+            }
+        }
+
+        private MethodInfo MakeGenericMethodFromInput()
+        {
+            var mi = MemInfo as MethodInfo;
+
+            var list = new List<Type>();
+            for (int i = 0; i < GenericArgs.Length; i++)
+            {
+                var input = GenericArgInput[i];
+                if (ReflectionHelpers.GetTypeByName(input) is Type t)
+                {
+                    if (GenericConstraints[i].Length == 0)
+                    {
+                        list.Add(t);
+                    }
+                    else
+                    {
+                        foreach (var constraint in GenericConstraints[i].Where(x => x != null))
+                        {
+                           if (!constraint.IsAssignableFrom(t))
+                           {
+                                ExplorerCore.LogWarning($"Generic argument #{i}, '{input}' is not assignable from the constraint '{constraint}'!");
+                                return null;
+                           }
+                        }
+
+                        list.Add(t);
+                    }
+                }
+                else
+                {
+                    ExplorerCore.LogWarning($"Generic argument #{i}, could not get any type by the name of '{input}'!" +
+                        $" Make sure you use the full name, including the NameSpace.");
+                    return null;
+                }
+            }
+
+            // make into a generic with type list
+            mi = mi.MakeGenericMethod(list.ToArray());
+
+            return mi;
+        }
+
+        // ==== GUI DRAW ====
+
+        public override void DrawValue(Rect window, float width)
+        {
+            string typeLabel = $"<color={UIStyles.Syntax.Class_Instance}>{ValueType.FullName}</color>";
+
+            if (m_evaluated)
+            {
+                if (m_cachedReturnValue != null)
+                {
+                    m_cachedReturnValue.DrawValue(window, width);
+                }
+                else
+                {
+                    GUILayout.Label($"null ({typeLabel})", new GUILayoutOption[0]);
+                }
+            }
+            else
+            {
+                GUILayout.Label($"<color=grey><i>Not yet evaluated</i></color> ({typeLabel})", new GUILayoutOption[0]);
+            }
+        }
+    }
+}

src/CachedObjects/Other/CacheOther.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Reflection;
+using UnityEngine;
+
+namespace Explorer
+{
+    public class CacheOther : CacheObjectBase
+    {
+        public string ButtonLabel => m_btnLabel ?? GetButtonLabel();
+        private string m_btnLabel;
+
+        public MethodInfo ToStringMethod => m_toStringMethod ?? GetToStringMethod();
+        private MethodInfo m_toStringMethod;
+
+        public override void UpdateValue()
+        {
+            base.UpdateValue();
+
+            GetButtonLabel();
+        }
+
+        public override void DrawValue(Rect window, float width)
+        {
+            GUI.skin.button.alignment = TextAnchor.MiddleLeft;
+            if (GUILayout.Button(ButtonLabel, new GUILayoutOption[] { GUILayout.Width(width - 15) }))
+            {
+                WindowManager.InspectObject(Value, out bool _);
+            }
+            GUI.skin.button.alignment = TextAnchor.MiddleCenter;
+        }
+
+        private MethodInfo GetToStringMethod()
+        {
+            try
+            {
+                m_toStringMethod = ReflectionHelpers.GetActualType(Value).GetMethod("ToString", new Type[0])
+                                   ?? typeof(object).GetMethod("ToString", new Type[0]);
+
+                // test invoke
+                m_toStringMethod.Invoke(Value, null);
+            }
+            catch
+            {
+                m_toStringMethod = typeof(object).GetMethod("ToString", new Type[0]);
+            }
+            return m_toStringMethod;
+        }
+
+        private string GetButtonLabel()
+        {
+            if (Value == null) return null;
+
+            string label = (string)ToStringMethod?.Invoke(Value, null) ?? Value.ToString();
+
+            var classColor = ValueType.IsAbstract && ValueType.IsSealed
+                ? UIStyles.Syntax.Class_Static
+                : UIStyles.Syntax.Class_Instance;
+
+            string typeLabel = $"<color={classColor}>{ValueType.FullName}</color>";
+
+            if (Value is UnityEngine.Object)
+            {
+                label = label.Replace($"({ValueType.FullName})", $"({typeLabel})");
+            }
+            else
+            {
+                if (!label.Contains(ValueType.FullName))
+                {
+                    label += $" ({typeLabel})";
+                }
+                else
+                {
+                    label = label.Replace(ValueType.FullName, typeLabel);
+                }
+            }
+
+            return m_btnLabel = label;
+        }
+    }
+}

src/CachedObjects/Struct/CacheColor.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+
+namespace Explorer
+{
+    public class CacheColor : CacheObjectBase, IExpandHeight
+    {
+        private string r = "0";
+        private string g = "0";
+        private string b = "0";
+        private string a = "0";
+
+        public bool IsExpanded { get; set; }
+        public float WhiteSpace { get; set; } = 215f;
+
+        public override void UpdateValue()
+        {
+            base.UpdateValue();
+
+            if (Value == null) return;
+
+            var color = (Color)Value;
+
+            r = color.r.ToString();
+            g = color.g.ToString();
+            b = color.b.ToString();
+            a = color.a.ToString();
+        }
+
+        public override void DrawValue(Rect window, float width)
+        {
+            if (CanWrite)
+            {
+                if (!IsExpanded)
+                {
+                    if (GUILayout.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = true;
+                    }
+                }
+                else
+                {
+                    if (GUILayout.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = false;
+                    }
+                }
+            }
+
+            //var c = (Color)Value;
+            //GUI.color = c;
+            GUILayout.Label($"<color=#2df7b2>Color:</color> {((Color)Value).ToString()}", new GUILayoutOption[0]);
+            //GUI.color = Color.white;
+
+            if (CanWrite && IsExpanded)
+            {
+                GUILayout.EndHorizontal();
+
+                var whitespace = CalcWhitespace(window);
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                GUILayout.Label("R:", new GUILayoutOption[] { GUILayout.Width(30) });
+                r = GUIUnstrip.TextField(r, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                GUILayout.Label("G:", new GUILayoutOption[] { GUILayout.Width(30) });
+                g = GUIUnstrip.TextField(g, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                GUILayout.Label("B:", new GUILayoutOption[] { GUILayout.Width(30) });
+                b = GUIUnstrip.TextField(b, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                GUILayout.Label("A:", new GUILayoutOption[] { GUILayout.Width(30) });
+                a = GUIUnstrip.TextField(a, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUILayout.EndHorizontal();
+
+                // draw set value button
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                if (GUILayout.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
+                {
+                    SetValueFromInput();
+                }
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            }
+        }
+
+        private void SetValueFromInput()
+        {
+            if (float.TryParse(r, out float fR)
+                && float.TryParse(g, out float fG)
+                && float.TryParse(b, out float fB)
+                && float.TryParse(a, out float fA))
+            {
+                Value = new Color(fR, fG, fB, fA);
+                SetValue();
+            }
+        }
+    }
+}

src/CachedObjects/Struct/CacheEnum.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using UnityEngine;
+
+namespace Explorer
+{
+    public class CacheEnum : CacheObjectBase
+    {
+        // public Type EnumType;
+        public string[] EnumNames = new string[0];
+
+        public override void Init()
+        {
+            if (ValueType == null && Value != null)
+            {
+                ValueType = Value.GetType();
+            }
+
+            if (ValueType != null)
+            {
+                // using GetValues not GetNames, to catch instances of weird enums (eg CameraClearFlags)
+                var values = Enum.GetValues(ValueType);
+
+                var list = new List<string>();
+                foreach (var value in values)
+                {
+                    var v = value.ToString();
+                    if (list.Contains(v)) continue;
+                    list.Add(v);
+                }
+
+                EnumNames = list.ToArray();
+            }
+            else
+            {
+                ReflectionException = "Unknown, could not get Enum names.";
+            }
+        }
+
+        public override void DrawValue(Rect window, float width)
+        {
+            if (CanWrite)
+            {
+                if (GUILayout.Button("<", new GUILayoutOption[] { GUILayout.Width(25) }))
+                {
+                    SetEnum(-1);
+                    SetValue();
+                }
+                if (GUILayout.Button(">", new GUILayoutOption[] { GUILayout.Width(25) }))
+                {
+                    SetEnum(1);
+                    SetValue();
+                }
+            }
+
+            GUILayout.Label(Value.ToString() + $"<color={UIStyles.Syntax.StructGreen}><i> ({ValueType})</i></color>", new GUILayoutOption[0]);
+        }
+
+        public void SetEnum(int change)
+        {
+            var names = EnumNames.ToList();
+
+            int newindex = names.IndexOf(Value.ToString()) + change;
+
+            if (newindex >= 0 && newindex < names.Count)
+            {
+                Value = Enum.Parse(ValueType, EnumNames[newindex]);
+            }
+        }
+    }
+}

src/CachedObjects/Struct/CacheEnumFlags.cs

@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+
+namespace Explorer
+{
+    public class CacheEnumFlags : CacheEnum, IExpandHeight
+    {
+        public bool[] m_enabledFlags = new bool[0];
+
+        public bool IsExpanded { get; set; }
+        public float WhiteSpace { get; set; } = 215f;
+
+        public override void Init()
+        {
+            base.Init();
+
+            UpdateValue();
+        }
+
+        public override void UpdateValue()
+        {
+            base.UpdateValue();
+
+            if (Value == null) return;
+
+            try
+            {
+                var enabledNames = Value.ToString().Split(',').Select(it => it.Trim());
+
+                m_enabledFlags = new bool[EnumNames.Length];
+
+                for (int i = 0; i < EnumNames.Length; i++)
+                {
+                    m_enabledFlags[i] = enabledNames.Contains(EnumNames[i]);
+                }
+            }
+            catch (Exception e)
+            {
+                ExplorerCore.Log(e.ToString());
+            }
+        }
+
+        public override void DrawValue(Rect window, float width)
+        {
+            if (CanWrite)
+            {
+                if (!IsExpanded)
+                {
+                    if (GUILayout.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = true;
+                    }
+                }
+                else
+                {
+                    if (GUILayout.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = false;
+                    }
+                }
+            }
+
+            GUILayout.Label(Value.ToString() + "<color=#2df7b2><i> (" + ValueType + ")</i></color>", new GUILayoutOption[0]);
+
+            if (IsExpanded)
+            {
+                GUILayout.EndHorizontal();
+
+                var whitespace = CalcWhitespace(window);
+
+                for (int i = 0; i < EnumNames.Length; i++)
+                {
+                    GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                    GUIUnstrip.Space(whitespace);
+
+                    m_enabledFlags[i] = GUILayout.Toggle(m_enabledFlags[i], EnumNames[i], new GUILayoutOption[0]);
+
+                    GUILayout.EndHorizontal();
+                }
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                if (GUILayout.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
+                {
+                    SetFlagsFromInput();
+                }
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            }
+        }
+
+        public void SetFlagsFromInput()
+        {
+            string val = "";
+            for (int i = 0; i < EnumNames.Length; i++)
+            {
+                if (m_enabledFlags[i])
+                {
+                    if (val != "") val += ", ";
+                    val += EnumNames[i];
+                }
+            }
+            Value = Enum.Parse(ValueType, val);
+            SetValue();
+        }
+    }
+}

src/CachedObjects/Struct/CachePrimitive.cs

@@ -0,0 +1,251 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using UnityEngine;
+#if CPP
+using UnhollowerRuntimeLib;
+#endif
+
+namespace Explorer
+{
+    public class CachePrimitive : CacheObjectBase
+    {
+        private string m_valueToString;
+        private bool m_isBool;
+        private bool m_isString;
+
+        public MethodInfo ParseMethod => m_parseMethod ?? (m_parseMethod = Value.GetType().GetMethod("Parse", new Type[] { typeof(string) }));
+        private MethodInfo m_parseMethod;
+
+        private bool m_canBitwiseOperate;
+        private bool m_inBitwiseMode;
+        private string m_bitwiseOperatorInput = "0";
+        private string m_binaryInput;
+
+        public override void Init()
+        {
+            if (ValueType == null)
+            {
+                ValueType = Value?.GetType();
+
+                // has to be a string at this point
+                if (ValueType == null)
+                {
+                    ValueType = typeof(string);
+                }
+            }
+
+            if (ValueType == typeof(string))
+            {
+                m_isString = true;
+            }
+            else if (ValueType == typeof(bool))
+            {
+                m_isBool = true;
+            }
+
+            m_canBitwiseOperate = typeof(int).IsAssignableFrom(ValueType);
+
+            UpdateValue();
+        }
+
+        public override void UpdateValue()
+        {
+            base.UpdateValue();
+
+            RefreshToString();
+        }
+
+        private void RefreshToString()
+        {
+            m_valueToString = Value?.ToString();
+
+            if (m_canBitwiseOperate)
+            {
+                var _int = (int)Value;
+                m_binaryInput = Convert.ToString(_int, toBase: 2);
+            }
+        }
+
+        public override void DrawValue(Rect window, float width)
+        {
+            if (m_isBool)
+            {
+                var b = (bool)Value;
+                var label = $"<color={(b ? "lime" : "red")}>{b}</color>";
+
+                if (CanWrite)
+                {
+                    b = GUILayout.Toggle(b, label, new GUILayoutOption[0]);
+                    if (b != (bool)Value)
+                    {
+                        Value = b;
+                        SetValue();
+                    }
+                }
+                else
+                {
+                    GUILayout.Label(label, new GUILayoutOption[0]);
+                }
+
+                return;
+            }
+
+            // all other non-bool values use TextField
+
+            GUILayout.BeginVertical(new GUILayoutOption[0]);
+
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+
+            GUILayout.Label("<color=#2df7b2><i>" + ValueType.Name + "</i></color>", new GUILayoutOption[] { GUILayout.Width(50) });
+
+            m_valueToString = GUIUnstrip.TextArea(m_valueToString, new GUILayoutOption[] { GUILayout.ExpandWidth(true) });
+            if (CanWrite)
+            {
+                if (GUILayout.Button("<color=#00FF00>Apply</color>", new GUILayoutOption[] { GUILayout.Width(60) }))
+                {
+                    SetValueFromInput();
+                }
+            }
+
+            if (m_canBitwiseOperate)
+            {
+                m_inBitwiseMode = GUILayout.Toggle(m_inBitwiseMode, "Bitwise?", new GUILayoutOption[0]);
+            }
+
+            GUIUnstrip.Space(10);
+
+            GUILayout.EndHorizontal();
+
+            if (m_inBitwiseMode)
+            {
+                DrawBitwise();
+            }
+
+            GUILayout.EndVertical();
+        }
+
+        private void DrawBitwise()
+        {
+            if (CanWrite)
+            {
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+
+                GUI.skin.label.alignment = TextAnchor.MiddleRight;
+                GUILayout.Label("RHS:", new GUILayoutOption[] { GUILayout.Width(35) });
+                GUI.skin.label.alignment = TextAnchor.UpperLeft;
+
+                if (GUILayout.Button("~", new GUILayoutOption[] { GUILayout.Width(25) }))
+                {
+                    if (int.TryParse(m_bitwiseOperatorInput, out int bit))
+                    {
+                        Value = ~bit;
+                        RefreshToString();
+                    }
+                }
+
+                if (GUILayout.Button("<<", new GUILayoutOption[] { GUILayout.Width(25) }))
+                {
+                    if (int.TryParse(m_bitwiseOperatorInput, out int bit))
+                    {
+                        Value = (int)Value << bit;
+                        RefreshToString();
+                    }
+                }
+                if (GUILayout.Button(">>", new GUILayoutOption[] { GUILayout.Width(25) }))
+                {
+                    if (int.TryParse(m_bitwiseOperatorInput, out int bit))
+                    {
+                        Value = (int)Value >> bit;
+                        RefreshToString();
+                    }
+                }
+                if (GUILayout.Button("|", new GUILayoutOption[] { GUILayout.Width(25) }))
+                {
+                    if (int.TryParse(m_bitwiseOperatorInput, out int bit))
+                    {
+                        Value = (int)Value | bit;
+                        RefreshToString();
+                    }
+                }
+                if (GUILayout.Button("&", new GUILayoutOption[] { GUILayout.Width(25) }))
+                {
+                    if (int.TryParse(m_bitwiseOperatorInput, out int bit))
+                    {
+                        Value = (int)Value & bit;
+                        RefreshToString();
+                    }
+                }
+                if (GUILayout.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
+                {
+                    if (int.TryParse(m_bitwiseOperatorInput, out int bit))
+                    {
+                        Value = (int)Value ^ bit;
+                        RefreshToString();
+                    }
+                }
+
+                m_bitwiseOperatorInput = GUIUnstrip.TextField(m_bitwiseOperatorInput, new GUILayoutOption[] { GUILayout.Width(55) });
+
+                GUILayout.EndHorizontal();
+            }
+
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            GUILayout.Label($"<color=cyan>Binary:</color>", new GUILayoutOption[] { GUILayout.Width(60) });
+            m_binaryInput = GUIUnstrip.TextField(m_binaryInput, new GUILayoutOption[0]);
+            if (CanWrite)
+            {
+                if (GUILayout.Button("Apply", new GUILayoutOption[0]))
+                {
+                    SetValueFromBinaryInput();
+                }
+            }
+            GUILayout.EndHorizontal();
+        }
+
+        public void SetValueFromInput()
+        {
+            if (MemInfo == null)
+            {
+                ExplorerCore.Log("Trying to SetValue but the MemberInfo is null!");
+                return;
+            }
+
+            if (m_isString)
+            {
+                Value = m_valueToString;
+            }
+            else
+            {
+                try
+                {
+                    Value = ParseMethod.Invoke(null, new object[] { m_valueToString });
+                }
+                catch (Exception e)
+                {
+                    ExplorerCore.Log("Exception parsing value: " + e.GetType() + ", " + e.Message);
+                }
+            }
+
+            SetValue();
+            RefreshToString();
+        }
+
+        private void SetValueFromBinaryInput()
+        {
+            try
+            {
+                var method = typeof(Convert).GetMethod($"To{ValueType.Name}", new Type[] { typeof(string), typeof(int) });
+                Value = method.Invoke(null, new object[] { m_binaryInput, 2 });
+
+                SetValue();
+                RefreshToString();
+            }
+            catch (Exception e)
+            {
+                ExplorerCore.Log("Exception setting value: " + e.GetType() + ", " + e.Message);
+            }
+        }
+    }
+}

src/CachedObjects/Struct/CacheQuaternion.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+
+namespace Explorer
+{
+    public class CacheQuaternion : CacheObjectBase, IExpandHeight
+    {
+        private string x = "0";
+        private string y = "0";
+        private string z = "0";
+
+        public bool IsExpanded { get; set; }
+        public float WhiteSpace { get; set; } = 215f;
+
+        public override void UpdateValue()
+        {
+            base.UpdateValue();
+
+            if (Value == null) return;
+
+            var euler = ((Quaternion)Value).eulerAngles;
+
+            x = euler.x.ToString();
+            y = euler.y.ToString();
+            z = euler.z.ToString();
+        }
+
+        public override void DrawValue(Rect window, float width)
+        {
+            if (CanWrite)
+            {
+                if (!IsExpanded)
+                {
+                    if (GUILayout.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = true;
+                    }
+                }
+                else
+                {
+                    if (GUILayout.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = false;
+                    }
+                }
+            }
+
+            GUILayout.Label($"<color=#2df7b2>Quaternion</color>: {((Quaternion)Value).eulerAngles.ToString()}", new GUILayoutOption[0]);
+
+            if (CanWrite && IsExpanded)
+            {
+                GUILayout.EndHorizontal();
+
+                var whitespace = CalcWhitespace(window);
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                GUILayout.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) });
+                x = GUIUnstrip.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                GUILayout.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) });
+                y = GUIUnstrip.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                GUILayout.Label("Z:", new GUILayoutOption[] { GUILayout.Width(30) });
+                z = GUIUnstrip.TextField(z, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUILayout.EndHorizontal();
+
+                // draw set value button
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                if (GUILayout.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
+                {
+                    SetValueFromInput();
+                }
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            }
+        }
+
+        private void SetValueFromInput()
+        {
+            if (float.TryParse(x, out float fX)
+                && float.TryParse(y, out float fY)
+                && float.TryParse(z, out float fZ))
+            {
+                Value = Quaternion.Euler(new Vector3(fX, fY, fZ));
+                SetValue();
+            }
+        }
+    }
+}

src/CachedObjects/Struct/CacheRect.cs

@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+
+namespace Explorer
+{
+    public class CacheRect : CacheObjectBase, IExpandHeight
+    {
+        private string x = "0";
+        private string y = "0";
+        private string w = "0";
+        private string h = "0";
+
+        public bool IsExpanded { get; set; }
+        public float WhiteSpace { get; set; } = 215f;
+
+        public override void UpdateValue()
+        {
+            base.UpdateValue();
+
+            if (Value == null) return;
+
+            var rect = (Rect)Value;
+
+            x = rect.x.ToString();
+            y = rect.y.ToString();
+            w = rect.width.ToString();
+            h = rect.height.ToString();
+        }
+
+        public override void DrawValue(Rect window, float width)
+        {
+            if (CanWrite)
+            {
+                if (!IsExpanded)
+                {
+                    if (GUILayout.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = true;
+                    }
+                }
+                else
+                {
+                    if (GUILayout.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = false;
+                    }
+                }
+            }
+
+            GUILayout.Label($"<color=#2df7b2>Rect</color>: {((Rect)Value).ToString()}", new GUILayoutOption[0]);
+
+            if (CanWrite && IsExpanded)
+            {
+                GUILayout.EndHorizontal();
+
+                var whitespace = CalcWhitespace(window);
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                GUILayout.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) });
+                x = GUIUnstrip.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                GUILayout.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) });
+                y = GUIUnstrip.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                GUILayout.Label("W:", new GUILayoutOption[] { GUILayout.Width(30) });
+                w = GUIUnstrip.TextField(w, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                GUILayout.Label("H:", new GUILayoutOption[] { GUILayout.Width(30) });
+                h = GUIUnstrip.TextField(h, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUILayout.EndHorizontal();
+
+                // draw set value button
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                if (GUILayout.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
+                {
+                    SetValueFromInput();
+                }
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            }
+        }
+
+        private void SetValueFromInput()
+        {
+            if (float.TryParse(x, out float fX)
+                && float.TryParse(y, out float fY)
+                && float.TryParse(w, out float fW)
+                && float.TryParse(h, out float fH))
+            {
+                Value = new Rect(fX, fY, fW, fH);
+                SetValue();
+            }
+        }
+    }
+}

src/CachedObjects/Struct/CacheVector.cs

@@ -0,0 +1,169 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Reflection;
+using UnityEngine;
+
+namespace Explorer
+{
+    public class CacheVector : CacheObjectBase, IExpandHeight
+    {
+        public int VectorSize = 2;
+
+        private string x = "0";
+        private string y = "0";
+        private string z = "0";
+        private string w = "0";
+
+        private MethodInfo m_toStringMethod;
+
+        public bool IsExpanded { get; set; }
+        public float WhiteSpace { get; set; } = 215f;
+
+        public override void Init()
+        {
+            if (ValueType == null && Value != null)
+            {
+                ValueType = Value.GetType();
+            }
+
+            if (ValueType == typeof(Vector2))
+            {
+                VectorSize = 2;
+                m_toStringMethod = typeof(Vector2).GetMethod("ToString", new Type[0]);
+            }
+            else if (ValueType == typeof(Vector3))
+            {
+                VectorSize = 3;
+                m_toStringMethod = typeof(Vector3).GetMethod("ToString", new Type[0]);
+            }
+            else
+            {
+                VectorSize = 4;
+                m_toStringMethod = typeof(Vector4).GetMethod("ToString", new Type[0]);
+            }
+        }
+
+        public override void UpdateValue()
+        {
+            base.UpdateValue();
+
+            if (Value is Vector2 vec2)
+            {
+                x = vec2.x.ToString();
+                y = vec2.y.ToString();
+            }
+            else if (Value is Vector3 vec3)
+            {
+                x = vec3.x.ToString();
+                y = vec3.y.ToString();
+                z = vec3.z.ToString();
+            }
+            else if (Value is Vector4 vec4)
+            {
+                x = vec4.x.ToString();
+                y = vec4.y.ToString();
+                z = vec4.z.ToString();
+                w = vec4.w.ToString();
+            }
+        }
+
+        public override void DrawValue(Rect window, float width)
+        {
+            if (CanWrite)
+            {
+                if (!IsExpanded)
+                {
+                    if (GUILayout.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = true;
+                    }
+                }
+                else
+                {
+                    if (GUILayout.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = false;
+                    }
+                }
+            }
+
+            GUILayout.Label($"<color=#2df7b2>Vector{VectorSize}</color>: {(string)m_toStringMethod.Invoke(Value, new object[0])}", new GUILayoutOption[0]);            
+
+            if (CanWrite && IsExpanded)
+            {
+                GUILayout.EndHorizontal();
+
+                var whitespace = CalcWhitespace(window);
+
+                // always draw x and y
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                GUILayout.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) });
+                x = GUIUnstrip.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                GUILayout.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) });
+                y = GUIUnstrip.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUILayout.EndHorizontal();
+
+                if (VectorSize > 2)
+                {
+                    // draw z
+                    GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                    GUIUnstrip.Space(whitespace);
+                    GUILayout.Label("Z:", new GUILayoutOption[] { GUILayout.Width(30) });
+                    z = GUIUnstrip.TextField(z, new GUILayoutOption[] { GUILayout.Width(120) });
+                    GUILayout.EndHorizontal();
+                }
+                if (VectorSize > 3)
+                {
+                    // draw w
+                    GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                    GUIUnstrip.Space(whitespace);
+                    GUILayout.Label("W:", new GUILayoutOption[] { GUILayout.Width(30) });
+                    w = GUIUnstrip.TextField(w, new GUILayoutOption[] { GUILayout.Width(120) });
+                    GUILayout.EndHorizontal();
+                }
+
+                // draw set value button
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUIUnstrip.Space(whitespace);
+                if (GUILayout.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
+                {
+                    SetValueFromInput();
+                }
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            }
+        }
+
+        private void SetValueFromInput()
+        {
+            if (float.TryParse(x, out float fX)
+                && float.TryParse(y, out float fY)
+                && float.TryParse(z, out float fZ)
+                && float.TryParse(w, out float fW))
+            {
+                object vector = null;
+
+                switch (VectorSize)
+                {
+                    case 2: vector = new Vector2(fX, fY); break;
+                    case 3: vector = new Vector3(fX, fY, fZ); break;
+                    case 4: vector = new Vector4(fX, fY, fZ, fW); break;
+                }
+
+                if (vector != null)
+                {
+                    Value = vector;
+                    SetValue();
+                }
+            }
+        }
+    }
+}

src/Config/ModConfig.cs

@@ -0,0 +1,65 @@
+using System.IO;
+using System.Xml.Serialization;
+using UnityEngine;
+
+namespace Explorer
+{
+    public class ModConfig
+    {
+        [XmlIgnore] public static readonly XmlSerializer Serializer = new XmlSerializer(typeof(ModConfig));
+
+        [XmlIgnore] private const string EXPLORER_FOLDER = @"Mods\Explorer";
+        [XmlIgnore] private const string SETTINGS_PATH = EXPLORER_FOLDER + @"\config.xml";
+
+        [XmlIgnore] public static ModConfig Instance;
+
+        public KeyCode Main_Menu_Toggle = KeyCode.F7;
+        public Vector2 Default_Window_Size = new Vector2(550, 700);
+        public int Default_Page_Limit = 20;
+
+        public static void OnLoad()
+        {
+            if (!Directory.Exists(EXPLORER_FOLDER))
+            {
+                Directory.CreateDirectory(EXPLORER_FOLDER);
+            }
+
+            if (LoadSettings()) return;
+
+            Instance = new ModConfig();
+            SaveSettings();
+        }
+
+        // returns true if settings successfully loaded
+        public static bool LoadSettings()
+        {
+            if (!File.Exists(SETTINGS_PATH))
+                return false;
+
+            try
+            {
+                using (var file = File.OpenRead(SETTINGS_PATH))
+                {
+                    Instance = (ModConfig)Serializer.Deserialize(file);
+                }
+            }
+            catch 
+            {
+                return false;
+            }
+
+            return Instance != null;
+        }
+
+        public static void SaveSettings()
+        {
+            if (File.Exists(SETTINGS_PATH))
+                File.Delete(SETTINGS_PATH);
+
+            using (var file = File.Create(SETTINGS_PATH))
+            {
+                Serializer.Serialize(file, Instance);
+            }
+        }
+    }
+}

src/CppExplorer.cs

@@ -1,201 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using Harmony;
-using MelonLoader;
-using UnhollowerBaseLib;
-using UnityEngine;
-
-namespace Explorer
-{
-    public class CppExplorer : MelonMod
-    {
-        public const string GUID = "com.sinai.cppexplorer";
-        public const string VERSION = "1.5.4";
-        public const string AUTHOR = "Sinai";
-
-        public const string NAME = "CppExplorer"
-#if Release_Unity2018
-        + " (Unity 2018)"
-#endif
-        ;
-
-        public static CppExplorer Instance { get; private set; }
-
-        public static bool ShowMenu
-        {
-            get => m_showMenu;
-            set => SetShowMenu(value);
-        }
-        private static bool m_showMenu;
-
-        public static bool ForceUnlockMouse
-        {
-            get => m_forceUnlock;
-            set => SetForceUnlock(value);
-        }
-        private static bool m_forceUnlock;
-        private static CursorLockMode m_lastLockMode;
-        private static bool m_lastVisibleState;
-        private static bool m_currentlySettingCursor = false;
-
-        public static bool ShouldForceMouse => ShowMenu && ForceUnlockMouse;
-
-        private static void SetShowMenu(bool show)
-        {
-            m_showMenu = show;
-            UpdateCursorControl();
-        }
-
-        // ========== MonoBehaviour methods ==========
-
-        public override void OnApplicationStart()
-        {
-            Instance = this;
-
-            new MainMenu();
-            new WindowManager();
-
-            // Get current cursor state and enable cursor
-            m_lastLockMode = Cursor.lockState;
-            m_lastVisibleState = Cursor.visible;
-
-            // Enable ShowMenu and ForceUnlockMouse 
-            // (set m_showMenu to not call UpdateCursorState twice)
-            m_showMenu = true;
-            SetForceUnlock(true);
-
-            MelonLogger.Log($"CppExplorer {VERSION} initialized.");
-        }
-
-        public override void OnLevelWasLoaded(int level)
-        {
-            ScenePage.Instance?.OnSceneChange();
-            SearchPage.Instance?.OnSceneChange();
-        }
-
-        public override void OnUpdate()
-        {
-            // Check main toggle key input
-            if (Input.GetKeyDown(KeyCode.F7))
-            {
-                ShowMenu = !ShowMenu;
-            }
-
-            if (ShowMenu)
-            {
-                // Check Force-Unlock input
-                if (Input.GetKeyDown(KeyCode.LeftAlt))
-                {
-                    ForceUnlockMouse = !ForceUnlockMouse;
-                }
-
-                MainMenu.Instance.Update();
-                WindowManager.Instance.Update();
-                InspectUnderMouse.Update();
-            }
-        }
-
-        public override void OnGUI()
-        {
-            if (!ShowMenu) return;
-
-            MainMenu.Instance.OnGUI();
-            WindowManager.Instance.OnGUI();
-            InspectUnderMouse.OnGUI();
-        }
-
-        // =========== Cursor control ===========
-
-        private static void SetForceUnlock(bool unlock)
-        {
-            m_forceUnlock = unlock;
-            UpdateCursorControl();
-        }
-
-        private static void UpdateCursorControl()
-        {
-            m_currentlySettingCursor = true;
-            if (ShouldForceMouse)
-            {
-                Cursor.lockState = CursorLockMode.None;
-                Cursor.visible = true;
-            }
-            else
-            {
-                Cursor.lockState = m_lastLockMode;
-                Cursor.visible = m_lastVisibleState;
-            }
-            m_currentlySettingCursor = false;
-        }
-
-        // Force mouse to stay unlocked and visible while UnlockMouse and ShowMenu are true.
-        // Also keep track of when anything else tries to set Cursor state, this will be the
-        // value that we set back to when we close the menu or disable force-unlock.
-
-        [HarmonyPatch(typeof(Cursor), nameof(Cursor.lockState), MethodType.Setter)]
-        public class Cursor_set_lockState
-        {
-            [HarmonyPrefix]
-            public static void Prefix(ref CursorLockMode value)
-            {
-                if (!m_currentlySettingCursor)
-                {
-                    m_lastLockMode = value;
-
-                    if (ShouldForceMouse)
-                    {
-                        value = CursorLockMode.None;
-                    }
-                }                
-            }
-        }
-
-        [HarmonyPatch(typeof(Cursor), nameof(Cursor.visible), MethodType.Setter)]
-        public class Cursor_set_visible
-        {
-            [HarmonyPrefix]
-            public static void Prefix(ref bool value)
-            {
-                if (!m_currentlySettingCursor)
-                {
-                    m_lastVisibleState = value;
-
-                    if (ShouldForceMouse)
-                    {
-                        value = true;
-                    }
-                }
-            }
-        }
-
-        // Make it appear as though UnlockMouse is disabled to the rest of the application.
-
-        [HarmonyPatch(typeof(Cursor), nameof(Cursor.lockState), MethodType.Getter)]
-        public class Cursor_get_lockState
-        {
-            [HarmonyPostfix]
-            public static void Postfix(ref CursorLockMode __result)
-            {
-                if (ShouldForceMouse)
-                {
-                    __result = m_lastLockMode;
-                }
-            }
-        }
-
-        [HarmonyPatch(typeof(Cursor), nameof(Cursor.visible), MethodType.Getter)]
-        public class Cursor_get_visible
-        {
-            [HarmonyPostfix]
-            public static void Postfix(ref bool __result)
-            {
-                if (ShouldForceMouse)
-                {
-                    __result = m_lastVisibleState;
-                }
-            }
-        }
-    }
-}

src/CppExplorer.csproj

@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Explorer</RootNamespace>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AssemblyName>CppExplorer</AssemblyName>
-    <DebugSymbols>false</DebugSymbols>
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\Release\2019\</OutputPath>
-    <DefineConstants>Release_2019</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Unity2018|AnyCPU' ">
-    <AssemblyName>CppExplorer_Unity2018</AssemblyName>
-    <DebugSymbols>false</DebugSymbols>
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\Release\2018\</OutputPath>
-    <DefineConstants>Release_Unity2018</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Il2Cppmscorlib">
-      <HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\Il2Cppmscorlib.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="mcs">
-      <HintPath>..\lib\mcs.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="MelonLoader.ModHandler">
-      <HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\MelonLoader.ModHandler.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="UnhollowerBaseLib">
-      <HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnhollowerBaseLib.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <!-- Unity 2019 build (InputLegacyModule.dll) -->
-    <Reference Include="UnityEngine" Condition="'$(Configuration)'=='Debug'">
-      <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.CoreModule" Condition="'$(Configuration)'=='Debug'">
-      <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.CoreModule.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.IMGUIModule" Condition="'$(Configuration)'=='Debug'">
-      <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.IMGUIModule.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.InputModule" Condition="'$(Configuration)'=='Debug'">
-      <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.InputLegacyModule.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.PhysicsModule" Condition="'$(Configuration)'=='Debug'">
-      <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.PhysicsModule.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.TextRenderingModule" Condition="'$(Configuration)'=='Debug'">
-      <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.UI" Condition="'$(Configuration)'=='Debug'">
-      <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.UI.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <!-- Unity 2018 build (InputModule.dll) -->
-    <Reference Include="UnityEngine" Condition="'$(Configuration)'=='Release_Unity2018'">
-      <HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.CoreModule" Condition="'$(Configuration)'=='Release_Unity2018'">
-      <HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.CoreModule.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.IMGUIModule" Condition="'$(Configuration)'=='Release_Unity2018'">
-      <HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.IMGUIModule.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.InputModule" Condition="'$(Configuration)'=='Release_Unity2018'">
-      <HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.InputModule.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.PhysicsModule" Condition="'$(Configuration)'=='Release_Unity2018'">
-      <HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.PhysicsModule.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.TextRenderingModule" Condition="'$(Configuration)'=='Release_Unity2018'">
-      <HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.UI" Condition="'$(Configuration)'=='Release_Unity2018'">
-      <HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.UI.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CachedObjects\CacheDictionary.cs" />
-    <Compile Include="CachedObjects\CacheEnum.cs" />
-    <Compile Include="CachedObjects\CacheGameObject.cs" />
-    <Compile Include="CachedObjects\CacheList.cs" />
-    <Compile Include="CachedObjects\CachePrimitive.cs" />
-    <Compile Include="CachedObjects\CacheOther.cs" />
-    <Compile Include="CachedObjects\CacheMethod.cs" />
-    <Compile Include="CppExplorer.cs" />
-    <Compile Include="Extensions\ReflectionExtensions.cs" />
-    <Compile Include="Unstripping\GUIUnstrip.cs" />
-    <Compile Include="Unstripping\ScrollViewStateUnstrip.cs" />
-    <Compile Include="Extensions\UnityExtensions.cs" />
-    <Compile Include="Helpers\PageHelper.cs" />
-    <Compile Include="Helpers\ReflectionHelpers.cs" />
-    <Compile Include="Helpers\UIHelpers.cs" />
-    <Compile Include="Helpers\UnityHelpers.cs" />
-    <Compile Include="MainMenu\InspectUnderMouse.cs" />
-    <Compile Include="CachedObjects\CacheObjectBase.cs" />
-    <Compile Include="Unstripping\SliderHandlerUnstrip.cs" />
-    <Compile Include="Unstripping\UnstripExtensions.cs" />
-    <Compile Include="Windows\ResizeDrag.cs" />
-    <Compile Include="Windows\TabViewWindow.cs" />
-    <Compile Include="Windows\UIWindow.cs" />
-    <Compile Include="MainMenu\Pages\ConsolePage.cs" />
-    <Compile Include="MainMenu\Pages\Console\REPL.cs" />
-    <Compile Include="MainMenu\Pages\Console\REPLHelper.cs" />
-    <Compile Include="MainMenu\Pages\WindowPage.cs" />
-    <Compile Include="Windows\WindowManager.cs" />
-    <Compile Include="MainMenu\MainMenu.cs" />
-    <Compile Include="Windows\GameObjectWindow.cs" />
-    <Compile Include="Windows\ReflectionWindow.cs" />
-    <Compile Include="MainMenu\Pages\ScenePage.cs" />
-    <Compile Include="MainMenu\Pages\SearchPage.cs" />
-    <Compile Include="Helpers\UIStyles.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

src/CppExplorer.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30128.74
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppExplorer", "CppExplorer.csproj", "{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release_Unity2018|Any CPU = Release_Unity2018|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_Unity2018|Any CPU.ActiveCfg = Release_Unity2018|Any CPU
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_Unity2018|Any CPU.Build.0 = Release_Unity2018|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DD5C0A5D-03F1-4CC3-8B4D-E10834908C5A}
-	EndGlobalSection
-EndGlobal

src/Explorer.csproj

@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Release_ML_Cpp</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
+    <OutputPath>..\Release\Explorer.MelonLoader.Il2Cpp\</OutputPath>
+    <DefineConstants>CPP,ML</DefineConstants>
+    <IsCpp>true</IsCpp>
+    <IsMelonLoader>true</IsMelonLoader>
+    <IsNet35>false</IsNet35>
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
+    <RootNamespace>Explorer</RootNamespace>
+    <AssemblyName>Explorer</AssemblyName>
+    <!-- Set this to the MelonLoader Il2Cpp Game folder, without the ending '\' character. -->
+    <MLCppGameFolder>D:\Steam\steamapps\common\Hellpoint</MLCppGameFolder>
+    <!-- Set this to the MelonLoader Mono Game folder, without the ending '\' character. -->
+    <MLMonoGameFolder>D:\Steam\steamapps\common\Outward</MLMonoGameFolder>
+    <!-- Set this to the BepInEx Il2Cpp Game folder, without the ending '\' character. -->
+    <BIECppGameFolder>D:\Steam\steamapps\common\Outward - Il2Cpp</BIECppGameFolder>
+    <!-- Set this to the BepInEx Mono Game folder, without the ending '\' character. -->
+    <BIEMonoGameFolder>D:\Steam\steamapps\common\Outward</BIEMonoGameFolder>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_ML_Cpp|AnyCPU' ">
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <OutputPath>..\Release\Explorer.MelonLoader.Il2Cpp\</OutputPath>
+    <DefineConstants>CPP,ML</DefineConstants>
+    <IsCpp>true</IsCpp>
+    <IsMelonLoader>true</IsMelonLoader>
+    <IsNet35>false</IsNet35>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_ML_Mono|AnyCPU' ">
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <OutputPath>..\Release\Explorer.MelonLoader.Mono\</OutputPath>
+    <DefineConstants>MONO,ML</DefineConstants>
+    <Prefer32Bit>false</Prefer32Bit>
+    <IsCpp>false</IsCpp>
+    <IsMelonLoader>true</IsMelonLoader>
+    <IsNet35>false</IsNet35>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_ML_Mono_NET35|AnyCPU' ">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <OutputPath>..\Release\Explorer.MelonLoader.Mono.NET35\</OutputPath>
+    <DefineConstants>MONO,ML,NET35</DefineConstants>
+    <IsCpp>false</IsCpp>
+    <IsMelonLoader>true</IsMelonLoader>
+    <IsNet35>true</IsNet35>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_BIE_Cpp|AnyCPU' ">
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <OutputPath>..\Release\Explorer.BepInEx.Il2Cpp\</OutputPath>
+    <DefineConstants>CPP,BIE</DefineConstants>
+    <IsCpp>true</IsCpp>
+    <IsMelonLoader>false</IsMelonLoader>
+    <IsNet35>false</IsNet35>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_BIE_Mono|AnyCPU' ">
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <OutputPath>..\Release\Explorer.BepInEx.Mono\</OutputPath>
+    <DefineConstants>MONO,BIE</DefineConstants>
+    <IsCpp>false</IsCpp>
+    <IsMelonLoader>false</IsMelonLoader>
+    <IsNet35>false</IsNet35>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_BIE_Mono_NET35|AnyCPU' ">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <OutputPath>..\Release\Explorer.BepInEx.Mono.NET35\</OutputPath>
+    <DefineConstants>MONO,BIE,NET35</DefineConstants>
+    <IsCpp>false</IsCpp>
+    <IsMelonLoader>false</IsMelonLoader>
+    <IsNet35>true</IsNet35>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <!-- MCS ref -->
+    <Reference Include="mcs" Condition="'$(IsNet35)'=='false'">
+      <HintPath>..\lib\mcs.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="mcs" Condition="'$(IsNet35)'=='true'">
+      <HintPath>..\lib\mcs.NET35.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <!-- Universal Mono UnityEngine.dll ref (v5.3) -->
+  <ItemGroup Condition="'$(IsCpp)'=='false'">
+    <Reference Include="UnityEngine">
+      <HintPath>..\lib\UnityEngine.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <!-- MelonLoader Mono ref -->
+  <ItemGroup Condition="'$(IsMelonLoader)|$(IsCpp)'=='true|false'">
+    <Reference Include="MelonLoader.ModHandler">
+      <HintPath>$(MLMonoGameFolder)\MelonLoader\MelonLoader.ModHandler.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <!-- BepInEx Mono refs -->
+  <ItemGroup Condition="'$(IsMelonLoader)|$(IsCpp)'=='false|false'">
+    <Reference Include="BepInEx">
+      <HintPath>$(BIEMonoGameFolder)\BepInEx\core\BepInEx.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="0Harmony">
+      <HintPath>$(BIEMonoGameFolder)\BepInEx\core\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>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnhollowerBaseLib">
+      <HintPath>$(MLCppGameFolder)\MelonLoader\Managed\UnhollowerBaseLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Il2Cppmscorlib">
+      <HintPath>$(MLCppGameFolder)\MelonLoader\Managed\Il2Cppmscorlib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Il2CppSystem.Core">
+      <HintPath>$(MLCppGameFolder)\MelonLoader\Managed\Il2CppSystem.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine">
+      <HintPath>$(MLCppGameFolder)\MelonLoader\Managed\UnityEngine.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.CoreModule">
+      <HintPath>$(MLCppGameFolder)\MelonLoader\Managed\UnityEngine.CoreModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.IMGUIModule">
+      <HintPath>$(MLCppGameFolder)\MelonLoader\Managed\UnityEngine.IMGUIModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.PhysicsModule">
+      <HintPath>$(MLCppGameFolder)\MelonLoader\Managed\UnityEngine.PhysicsModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.TextRenderingModule">
+      <HintPath>$(MLCppGameFolder)\MelonLoader\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>$(MLCppGameFolder)\MelonLoader\Managed\UnityEngine.UI.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <!-- BepInEx Il2Cpp refs -->
+  <ItemGroup Condition="'$(IsMelonLoader)|$(IsCpp)'=='false|true'">
+    <Reference Include="BepInEx">
+      <HintPath>$(BIECppGameFolder)\BepInEx\core\BepInEx.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="0Harmony">
+      <HintPath>$(BIECppGameFolder)\BepInEx\core\0Harmony.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="BepInEx.IL2CPP">
+      <HintPath>$(BIECppGameFolder)\BepInEx\core\BepInEx.IL2CPP.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnhollowerBaseLib">
+      <HintPath>$(BIECppGameFolder)\BepInEx\core\UnhollowerBaseLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Il2Cppmscorlib">
+      <HintPath>$(BIECppGameFolder)\BepInEx\unhollowed\Il2Cppmscorlib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Il2CppSystem.Core">
+      <HintPath>$(BIECppGameFolder)\BepInEx\unhollowed\Il2CppSystem.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine">
+      <HintPath>$(BIECppGameFolder)\BepInEx\unhollowed\UnityEngine.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.CoreModule">
+      <HintPath>$(BIECppGameFolder)\BepInEx\unhollowed\UnityEngine.CoreModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.IMGUIModule">
+      <HintPath>$(BIECppGameFolder)\BepInEx\unhollowed\UnityEngine.IMGUIModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.PhysicsModule">
+      <HintPath>$(BIECppGameFolder)\BepInEx\unhollowed\UnityEngine.PhysicsModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.TextRenderingModule">
+      <HintPath>$(BIECppGameFolder)\BepInEx\unhollowed\UnityEngine.TextRenderingModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>$(BIECppGameFolder)\BepInEx\unhollowed\UnityEngine.UI.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CachedObjects\CacheFactory.cs" />
+    <Compile Include="CachedObjects\IExpandHeight.cs" />
+    <Compile Include="CachedObjects\Struct\CacheColor.cs" />
+    <Compile Include="CachedObjects\Object\CacheDictionary.cs" />
+    <Compile Include="CachedObjects\Struct\CacheEnum.cs" />
+    <Compile Include="CachedObjects\Object\CacheGameObject.cs" />
+    <Compile Include="CachedObjects\Object\CacheList.cs" />
+    <Compile Include="CachedObjects\Struct\CacheEnumFlags.cs" />
+    <Compile Include="CachedObjects\Struct\CachePrimitive.cs" />
+    <Compile Include="CachedObjects\Other\CacheOther.cs" />
+    <Compile Include="CachedObjects\Other\CacheMethod.cs" />
+    <Compile Include="CachedObjects\Struct\CacheQuaternion.cs" />
+    <Compile Include="CachedObjects\Struct\CacheVector.cs" />
+    <Compile Include="CachedObjects\Struct\CacheRect.cs" />
+    <Compile Include="Config\ModConfig.cs" />
+    <Compile Include="ExplorerCore.cs" />
+    <Compile Include="ExplorerBepInPlugin.cs" />
+    <Compile Include="ExplorerMelonMod.cs" />
+    <Compile Include="Extensions\ReflectionExtensions.cs" />
+    <Compile Include="Input\AbstractInput.cs" />
+    <Compile Include="Input\InputManager.cs" />
+    <Compile Include="Input\InputSystem.cs" />
+    <Compile Include="Input\LegacyInput.cs" />
+    <Compile Include="Menu\CursorControl.cs" />
+    <Compile Include="Menu\MainMenu\Pages\OptionsPage.cs" />
+    <Compile Include="Tests\TestClass.cs" />
+    <Compile Include="UnstripFixes\GUIUnstrip.cs" />
+    <Compile Include="UnstripFixes\Internal_LayoutUtility.cs" />
+    <Compile Include="Extensions\UnityExtensions.cs" />
+    <Compile Include="Helpers\PageHelper.cs" />
+    <Compile Include="Helpers\ReflectionHelpers.cs" />
+    <Compile Include="Menu\UIHelpers.cs" />
+    <Compile Include="Helpers\UnityHelpers.cs" />
+    <Compile Include="Menu\InspectUnderMouse.cs" />
+    <Compile Include="CachedObjects\CacheObjectBase.cs" />
+    <Compile Include="UnstripFixes\Internal_ScrollViewState.cs" />
+    <Compile Include="UnstripFixes\Internal_SliderHandler.cs" />
+    <Compile Include="Menu\ResizeDrag.cs" />
+    <Compile Include="Menu\Windows\TabViewWindow.cs" />
+    <Compile Include="Menu\Windows\UIWindow.cs" />
+    <Compile Include="Menu\MainMenu\Pages\ConsolePage.cs" />
+    <Compile Include="Menu\MainMenu\Pages\Console\REPL.cs" />
+    <Compile Include="Menu\MainMenu\Pages\Console\REPLHelper.cs" />
+    <Compile Include="Menu\MainMenu\Pages\WindowPage.cs" />
+    <Compile Include="Menu\Windows\WindowManager.cs" />
+    <Compile Include="Menu\MainMenu\MainMenu.cs" />
+    <Compile Include="Menu\Windows\GameObjectWindow.cs" />
+    <Compile Include="Menu\Windows\ReflectionWindow.cs" />
+    <Compile Include="Menu\MainMenu\Pages\ScenePage.cs" />
+    <Compile Include="Menu\MainMenu\Pages\SearchPage.cs" />
+    <Compile Include="Menu\UIStyles.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UnstripFixes\Internal.cs" />
+    <Compile Include="UnstripFixes\Internal_SliderState.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

src/Explorer.sln

@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30128.74
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Explorer", "Explorer.csproj", "{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Release_BIE_Cpp|Any CPU = Release_BIE_Cpp|Any CPU
+		Release_BIE_Mono_NET35|Any CPU = Release_BIE_Mono_NET35|Any CPU
+		Release_BIE_Mono|Any CPU = Release_BIE_Mono|Any CPU
+		Release_ML_Cpp|Any CPU = Release_ML_Cpp|Any CPU
+		Release_ML_Mono_NET35|Any CPU = Release_ML_Mono_NET35|Any CPU
+		Release_ML_Mono|Any CPU = Release_ML_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_NET35|Any CPU.ActiveCfg = Release_BIE_Mono_NET35|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_BIE_Mono_NET35|Any CPU.Build.0 = Release_BIE_Mono_NET35|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_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_NET35|Any CPU.ActiveCfg = Release_ML_Mono_NET35|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_ML_Mono_NET35|Any CPU.Build.0 = Release_ML_Mono_NET35|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
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {DD5C0A5D-03F1-4CC3-8B4D-E10834908C5A}
+	EndGlobalSection
+EndGlobal

src/ExplorerBepInPlugin.cs

@@ -0,0 +1,109 @@
+#if BIE
+using System;
+using System.IO;
+using System.Reflection;
+using BepInEx;
+using BepInEx.Logging;
+using HarmonyLib;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+#if CPP
+using UnhollowerRuntimeLib;
+using BepInEx.IL2CPP;
+#endif
+
+namespace Explorer
+{
+    [BepInPlugin(ExplorerCore.GUID, ExplorerCore.NAME, ExplorerCore.VERSION)]
+#if CPP
+    public class ExplorerBepInPlugin : BasePlugin
+#else
+    public class ExplorerBepInPlugin : BaseUnityPlugin
+#endif
+    {
+        public static ExplorerBepInPlugin Instance;
+
+        public static ManualLogSource Logging =>
+#if CPP
+                                        Instance?.Log;
+#else
+                                        Instance?.Logger;
+#endif
+
+        public static readonly Harmony HarmonyInstance = new Harmony(ExplorerCore.GUID);
+
+#if CPP
+        // temporary for Il2Cpp until scene change delegate works
+        private static string lastSceneName;
+#endif
+
+        // Init
+#if CPP
+        public override void Load()
+        {
+#else
+        internal void Awake()
+        {
+#endif
+            Instance = this;
+
+#if CPP
+            ClassInjector.RegisterTypeInIl2Cpp<ExplorerBehaviour>();
+
+            var obj = new GameObject(
+                "ExplorerBehaviour",
+                new Il2CppSystem.Type[]
+                {
+                    Il2CppType.Of<ExplorerBehaviour>()
+                }
+            );
+            GameObject.DontDestroyOnLoad(obj);
+#else
+            SceneManager.activeSceneChanged += DoSceneChange;
+#endif
+
+            new ExplorerCore();
+
+            //HarmonyInstance.PatchAll();
+        }
+
+        internal static void DoSceneChange(Scene arg0, Scene arg1)
+        {
+            ExplorerCore.OnSceneChange();
+        }
+
+#if CPP // BepInEx Il2Cpp mod class doesn't have monobehaviour methods yet, so wrap them in a dummy.
+        public class ExplorerBehaviour : MonoBehaviour
+        {
+            public ExplorerBehaviour(IntPtr ptr) : base(ptr) { }
+
+            internal void Awake()
+            {
+                Logging.LogMessage("ExplorerBehaviour.Awake");
+            }
+
+#endif
+            internal void Update()
+            {
+                ExplorerCore.Update();
+
+#if CPP
+                var scene = SceneManager.GetActiveScene();
+                if (scene.name != lastSceneName)
+                {
+                    lastSceneName = scene.name;
+                    DoSceneChange(scene, scene);
+                }
+#endif
+            }
+
+            internal void OnGUI()
+            {
+                ExplorerCore.OnGUI();
+            }
+#if CPP
+        }
+#endif
+    }
+}
+#endif

src/ExplorerCore.cs

@@ -0,0 +1,119 @@
+using UnityEngine;
+
+namespace Explorer
+{
+    public class ExplorerCore
+    {
+        public const string NAME    = "Explorer (" + PLATFORM + ", " + MODLOADER + ")";
+        public const string VERSION = "1.8.3";
+        public const string AUTHOR  = "Sinai";
+        public const string GUID    = "com.sinai.explorer";
+
+        public const string PLATFORM =
+#if CPP
+            "Il2Cpp";
+#else
+            "Mono";
+#endif
+        public const string MODLOADER =
+#if ML
+            "MelonLoader";
+#else
+            "BepInEx";
+#endif
+
+        public static ExplorerCore Instance { get; private set; }
+
+        public ExplorerCore()
+        {
+            Instance = this;
+
+            ModConfig.OnLoad();
+
+            new MainMenu();
+            new WindowManager();
+
+            InputManager.Init();
+            CursorControl.Init();
+
+            Log($"{NAME} {VERSION} initialized.");
+        }
+
+        public static bool ShowMenu
+        {
+            get => m_showMenu;
+            set => SetShowMenu(value);
+        }
+        public static bool m_showMenu;        
+
+        private static void SetShowMenu(bool show)
+        {
+            m_showMenu = show;
+            CursorControl.UpdateCursorControl();
+        }
+
+        public static void Update()
+        {
+            if (InputManager.GetKeyDown(ModConfig.Instance.Main_Menu_Toggle))
+            {
+                ShowMenu = !ShowMenu;
+            }
+
+            if (ShowMenu)
+            {
+                CursorControl.Update();
+                InspectUnderMouse.Update();
+
+                MainMenu.Instance.Update();
+                WindowManager.Instance.Update();
+            }
+        }
+
+        public static void OnGUI()
+        {
+            if (!ShowMenu) return;
+
+            var origSkin = GUI.skin;
+            GUI.skin = UIStyles.WindowSkin;
+
+            MainMenu.Instance.OnGUI();
+            WindowManager.Instance.OnGUI();
+            InspectUnderMouse.OnGUI();
+
+            GUI.skin = origSkin;
+        }
+
+        public static void OnSceneChange()
+        {
+            ScenePage.Instance?.OnSceneChange();
+            SearchPage.Instance?.OnSceneChange();
+        }
+
+        public static void Log(string message)
+        {
+#if ML
+            MelonLoader.MelonLogger.Log(message);
+#else
+            ExplorerBepInPlugin.Logging?.LogMessage(message);
+#endif
+        }
+
+        public static void LogWarning(string message)
+        {
+#if ML
+            MelonLoader.MelonLogger.LogWarning(message);
+#else
+            ExplorerBepInPlugin.Logging?.LogWarning(message);
+#endif
+        }
+
+        public static void LogError(string message)
+        {
+#if ML
+            MelonLoader.MelonLogger.LogError(message);
+#else
+            ExplorerBepInPlugin.Logging?.LogError(message);
+#endif
+        }
+    }
+}

src/ExplorerMelonMod.cs

@@ -0,0 +1,37 @@
+#if ML
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using MelonLoader;
+
+namespace Explorer
+{
+    public class ExplorerMelonMod : MelonMod
+    {
+        public static ExplorerMelonMod Instance;
+
+        public override void OnApplicationStart()
+        {
+            Instance = this;
+
+            new ExplorerCore();
+        }
+
+        public override void OnLevelWasLoaded(int level)
+        {
+            ExplorerCore.OnSceneChange();
+        }
+
+        public override void OnUpdate()
+        {
+            ExplorerCore.Update();
+        }
+
+        public override void OnGUI()
+        {
+            ExplorerCore.OnGUI();
+        }
+    }
+}
+#endif

src/Extensions/ReflectionExtensions.cs

@@ -1,16 +1,40 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Reflection;
 
 namespace Explorer
 {
     public static class ReflectionExtensions
     {
+#if CPP
         public static object Il2CppCast(this object obj, Type castTo)
         {
             return ReflectionHelpers.Il2CppCast(obj, castTo);
         }
+#endif
+
+        public static IEnumerable<Type> TryGetTypes(this Assembly asm)
+        {
+            try
+            {
+                return asm.GetTypes();
+            }
+            catch (ReflectionTypeLoadException e)
+            {
+                try
+                {
+                    return asm.GetExportedTypes();
+                }
+                catch
+                {
+                    return e.Types.Where(t => t != null);
+                }
+            }
+            catch
+            {
+                return Enumerable.Empty<Type>();
+            }
+        }
     }
 }

src/Extensions/UnityExtensions.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnhollowerBaseLib;
-using UnityEngine;
+using UnityEngine;
 
 namespace Explorer
 {

src/Helpers/PageHelper.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
+using UnityEngine;
 
 namespace Explorer
 {
@@ -16,7 +11,18 @@ namespace Explorer
     public class PageHelper
     {
         public int PageOffset { get; set; }
-        public int ItemsPerPage { get; set; } = 20;
+
+        public int ItemsPerPage
+        {
+            get => m_itemsPerPage;
+            set
+            {
+                m_itemsPerPage = value;
+                CalculateMaxOffset();
+            }
+        }
+        private int m_itemsPerPage = ModConfig.Instance.Default_Page_Limit;
+
         public int ItemCount 
         {
             get => m_count;
@@ -88,7 +94,7 @@ namespace Explorer
         {
             GUILayout.Label("Limit: ", new GUILayoutOption[] { GUILayout.Width(50) });
             var limit = this.ItemsPerPage.ToString();
-            limit = GUILayout.TextField(limit, new GUILayoutOption[] { GUILayout.Width(50) });
+            limit = GUIUnstrip.TextField(limit, new GUILayoutOption[] { GUILayout.Width(50) });
             if (limit != ItemsPerPage.ToString() && int.TryParse(limit, out int i))
             {
                 ItemsPerPage = i;

src/Helpers/ReflectionHelpers.cs

@@ -1,14 +1,16 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO;
 using System.Reflection;
-using UnhollowerBaseLib;
-using UnhollowerRuntimeLib;
 using UnityEngine;
 using BF = System.Reflection.BindingFlags;
-using MelonLoader;
+
+#if CPP
+using ILType = Il2CppSystem.Type;
+using UnhollowerBaseLib;
+using UnhollowerRuntimeLib;
+#endif
 
 namespace Explorer
 {
@@ -16,25 +18,160 @@ namespace Explorer
     {
         public static BF CommonFlags = BF.Public | BF.Instance | BF.NonPublic | BF.Static;
 
-        public static Il2CppSystem.Type GameObjectType => Il2CppType.Of<GameObject>();
-        public static Il2CppSystem.Type TransformType => Il2CppType.Of<Transform>();
-        public static Il2CppSystem.Type ObjectType => Il2CppType.Of<UnityEngine.Object>();
-        public static Il2CppSystem.Type ComponentType => Il2CppType.Of<Component>();
-        public static Il2CppSystem.Type BehaviourType => Il2CppType.Of<Behaviour>();
+#if CPP
+        public static ILType GameObjectType =>  Il2CppType.Of<GameObject>();
+        public static ILType TransformType  =>  Il2CppType.Of<Transform>();
+        public static ILType ObjectType     =>  Il2CppType.Of<UnityEngine.Object>();
+        public static ILType ComponentType  =>  Il2CppType.Of<Component>();
+        public static ILType BehaviourType  =>  Il2CppType.Of<Behaviour>();
 
-        private static readonly MethodInfo m_tryCastMethodInfo = typeof(Il2CppObjectBase).GetMethod("TryCast");
+        private static readonly MethodInfo tryCastMethodInfo = typeof(Il2CppObjectBase).GetMethod("TryCast");
+        private static readonly Dictionary<Type, MethodInfo> cachedTryCastMethods = new Dictionary<Type, MethodInfo>();
 
         public static object Il2CppCast(object obj, Type castTo)
         {
             if (!typeof(Il2CppSystem.Object).IsAssignableFrom(castTo)) return obj;
 
-            return m_tryCastMethodInfo
-                    .MakeGenericMethod(castTo)
-                    .Invoke(obj, null);
+            if (!cachedTryCastMethods.ContainsKey(castTo))
+            {
+                cachedTryCastMethods.Add(castTo, tryCastMethodInfo.MakeGenericMethod(castTo));
+            }
+
+            return cachedTryCastMethods[castTo].Invoke(obj, null);
+        }
+#else
+        public static Type GameObjectType =>    typeof(GameObject);
+        public static Type TransformType  =>    typeof(Transform);
+        public static Type ObjectType     =>    typeof(UnityEngine.Object);
+        public static Type ComponentType  =>    typeof(Component);
+        public static Type BehaviourType  =>    typeof(Behaviour);
+#endif
+
+        public static bool IsEnumerable(Type t)
+        {
+            if (typeof(IEnumerable).IsAssignableFrom(t))
+            {
+                return true;
+            }
+
+#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;
+#endif
+        }
+
+        public static bool IsDictionary(Type t)
+        {
+            if (typeof(IDictionary).IsAssignableFrom(t))
+            {
+                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;
+#endif
+        }
+
+        public static Type GetTypeByName(string fullName)
+        {
+            foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
+            {
+                foreach (var type in asm.TryGetTypes())
+                {
+                    if (type.FullName == fullName)
+                    {
+                        return type;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        public static Type GetActualType(object obj)
+        {
+            if (obj == null) return null;
+
+#if CPP
+            // Need to use GetIl2CppType for Il2CppSystem Objects
+            if (obj is Il2CppSystem.Object ilObject)
+            {
+                // Prevent weird behaviour when inspecting an Il2CppSystem.Type object.
+                if (ilObject is ILType)
+                {
+                    return typeof(ILType);
+                }
+
+                return Type.GetType(ilObject.GetIl2CppType().AssemblyQualifiedName) ?? obj.GetType();
+            }
+#endif
+
+            // It's a normal object, this is fine
+            return obj.GetType();
+        }
+
+        public static Type[] GetAllBaseTypes(object obj)
+        {
+            var list = new List<Type>();
+
+            var type = GetActualType(obj);
+
+            while (type != null)
+            {
+                list.Add(type);
+                type = type.BaseType;
+            }
+
+            return list.ToArray();
+        }
+
+        public static bool LoadModule(string module)
+        {
+#if CPP
+#if ML
+            var path = $@"MelonLoader\Managed\{module}.dll";
+#else
+            var path = $@"BepInEx\unhollowed\{module}.dll";
+#endif
+            if (!File.Exists(path)) return false;
+
+            try
+            {
+                Assembly.Load(File.ReadAllBytes(path));
+                return true;
+            }
+            catch (Exception e)
+            {
+                ExplorerCore.Log(e.GetType() + ", " + e.Message);
+            }
+#endif
+            return false;
         }
 
         public static string ExceptionToString(Exception e)
         {
+#if CPP
             if (IsFailedGeneric(e))
             {
                 return "Unable to initialize this type.";
@@ -43,10 +180,11 @@ namespace Explorer
             {
                 return "Garbage collected in Il2Cpp.";
             }
-
+#endif
             return e.GetType() + ", " + e.Message;
         }
 
+#if CPP
         public static bool IsFailedGeneric(Exception e)
         {
             return IsExceptionOfType(e, typeof(TargetInvocationException)) && IsExceptionOfType(e, typeof(TypeLoadException));
@@ -73,84 +211,6 @@ namespace Explorer
             else
                 return false;
         }
-
-        public static bool IsArray(Type t)
-        {
-            return typeof(System.Collections.IEnumerable).IsAssignableFrom(t);
-        }
-
-        public static bool IsList(Type t)
-        {
-            if (t.IsGenericType)
-            {
-                var generic = t.GetGenericTypeDefinition();
-
-                return generic.IsAssignableFrom(typeof(Il2CppSystem.Collections.Generic.List<>))
-                    || generic.IsAssignableFrom(typeof(Il2CppSystem.Collections.Generic.IList<>));
-            }
-            else
-            {
-                return t.IsAssignableFrom(typeof(Il2CppSystem.Collections.IList));
-            }
-        }
-
-        public static bool IsDictionary(Type t)
-        {
-            return t.IsGenericType
-                && t.GetGenericTypeDefinition() is Type typeDef
-                && typeDef.IsAssignableFrom(typeof(Il2CppSystem.Collections.Generic.Dictionary<,>));
-        }
-
-        public static Type GetTypeByName(string typeName)
-        {
-            foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
-            {
-                try
-                {
-                    if (asm.GetType(typeName) is Type type)
-                    {
-                        return type;
-                    }
-                }
-                catch { }
-            }
-
-            return null;
-        }
-
-        public static Type GetActualType(object obj)
-        {
-            if (obj == null) return null;
-
-            if (obj is Il2CppSystem.Object ilObject)
-            {
-                var ilTypeName = ilObject.GetIl2CppType().AssemblyQualifiedName;
-
-                if (Type.GetType(ilTypeName) is Type t && !t.FullName.Contains("System.RuntimeType"))
-                {
-                    return t;
-                }
-
-                return ilObject.GetType();
-            }
-
-            return obj.GetType();
-        }
-
-        public static Type[] GetAllBaseTypes(object obj)
-        {
-            var list = new List<Type>();
-
-            var type = GetActualType(obj);
-            list.Add(type);
-
-            while (type.BaseType != null)
-            {
-                type = type.BaseType;
-                list.Add(type);
-            }
-
-            return list.ToArray();
-        }
+#endif
     }
 }

src/Helpers/UnityHelpers.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
+using UnityEngine;
 
 namespace Explorer
 {
@@ -15,7 +10,7 @@ namespace Explorer
         {
             get
             {
-                if (m_mainCamera == null)
+                if (!m_mainCamera)
                 {
                     m_mainCamera = Camera.main;
                 }

src/Input/AbstractInput.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+
+namespace Explorer.Input
+{
+    public abstract class AbstractInput
+    {
+        public abstract void Init();
+
+        public abstract Vector2 MousePosition { get; }
+
+        public abstract bool GetKeyDown(KeyCode key);
+        public abstract bool GetKey(KeyCode key);
+
+        public abstract bool GetMouseButtonDown(int btn);
+        public abstract bool GetMouseButton(int btn);
+    }
+}

src/Input/InputManager.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Reflection;
+using UnityEngine;
+using Explorer.Input;
+
+namespace Explorer
+{
+    public static class InputManager
+    {
+        // If no Input modules loaded at all
+        public static bool NO_INPUT { get; private set; }
+
+        // If using new InputSystem module
+        public static bool USING_NEW_INPUT { get; private set; }
+
+        private static AbstractInput inputModule;
+
+        public static void Init()
+        {
+            if (InputSystem.TKeyboard != null || TryLoadModule("Unity.InputSystem", InputSystem.TKeyboard))
+            {
+                USING_NEW_INPUT = true;
+                inputModule = new InputSystem();
+            }
+            else if (LegacyInput.TInput != null || TryLoadModule("UnityEngine.Input", LegacyInput.TInput))
+            {
+                inputModule = new LegacyInput();
+            }
+            
+            if (inputModule == null)
+            {
+                ExplorerCore.LogWarning("Could not find any Input module!");
+                NO_INPUT = true;
+            }
+            else
+            {
+                inputModule.Init();
+            }
+
+            bool TryLoadModule(string dll, Type check) => ReflectionHelpers.LoadModule(dll) && check != null;
+        }
+
+        public static Vector3 MousePosition => inputModule?.MousePosition ?? Vector3.zero;
+
+        public static bool GetKeyDown(KeyCode key) => inputModule?.GetKeyDown(key) ?? false;
+
+        public static bool GetKey(KeyCode key) => inputModule?.GetKey(key) ?? false;
+
+        /// <param name="btn">0 = left, 1 = right, 2 = middle.</param>
+        public static bool GetMouseButtonDown(int btn) => inputModule?.GetMouseButtonDown(btn) ?? false;
+
+        /// <param name="btn">0 = left, 1 = right, 2 = middle.</param>
+        public static bool GetMouseButton(int btn) => inputModule?.GetMouseButton(btn) ?? false;
+    }
+}

src/Input/InputSystem.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+
+namespace Explorer.Input
+{
+    public class InputSystem : AbstractInput
+    {
+        public static Type TKeyboard => _keyboard ?? (_keyboard = ReflectionHelpers.GetTypeByName("UnityEngine.InputSystem.Keyboard"));
+        private static Type _keyboard;
+
+        public static Type TMouse => _mouse ?? (_mouse = ReflectionHelpers.GetTypeByName("UnityEngine.InputSystem.Mouse"));
+        private static Type _mouse;
+
+        public static Type TKey => _key ?? (_key = ReflectionHelpers.GetTypeByName("UnityEngine.InputSystem.Key"));
+        private static Type _key;
+
+        private static PropertyInfo _btnIsPressedProp;
+        private static PropertyInfo _btnWasPressedProp;
+
+        private static object CurrentKeyboard => _currentKeyboard ?? (_currentKeyboard = _kbCurrentProp.GetValue(null, null));
+        private static object _currentKeyboard;
+        private static PropertyInfo _kbCurrentProp;
+        private static PropertyInfo _kbIndexer;
+
+        private static object CurrentMouse => _currentMouse ?? (_currentMouse = _mouseCurrentProp.GetValue(null, null));
+        private static object _currentMouse;
+        private static PropertyInfo _mouseCurrentProp;
+
+        private static object LeftMouseButton => _lmb ?? (_lmb = _leftButtonProp.GetValue(CurrentMouse, null));
+        private static object _lmb;
+        private static PropertyInfo _leftButtonProp;
+
+        private static object RightMouseButton => _rmb ?? (_rmb = _rightButtonProp.GetValue(CurrentMouse, null));
+        private static object _rmb;
+        private static PropertyInfo _rightButtonProp;
+
+        private static object MousePositionInfo => _pos ?? (_pos = _positionProp.GetValue(CurrentMouse, null));
+        private static object _pos;
+        private static PropertyInfo _positionProp;
+        private static MethodInfo _readVector2InputMethod;
+
+        public override Vector2 MousePosition => (Vector2)_readVector2InputMethod.Invoke(MousePositionInfo, new object[0]);
+
+        public override bool GetKeyDown(KeyCode key)
+        {
+            var parsedKey = Enum.Parse(TKey, key.ToString());
+            var actualKey = _kbIndexer.GetValue(CurrentKeyboard, new object[] { parsedKey });
+
+            return (bool)_btnWasPressedProp.GetValue(actualKey, null);
+        }
+
+        public override bool GetKey(KeyCode key)
+        {
+            var parsed = Enum.Parse(TKey, key.ToString());
+            var actualKey = _kbIndexer.GetValue(CurrentKeyboard, new object[] { parsed });
+
+            return (bool)_btnIsPressedProp.GetValue(actualKey, null);
+        }
+
+        public override bool GetMouseButtonDown(int btn)
+        {
+            switch (btn)
+            {
+                case 0: return (bool)_btnWasPressedProp.GetValue(LeftMouseButton, null);
+                case 1: return (bool)_btnWasPressedProp.GetValue(RightMouseButton, null);
+                // case 2: return (bool)_btnWasPressedProp.GetValue(MiddleMouseButton, null);
+                default: throw new NotImplementedException();
+            }
+        }
+
+        public override bool GetMouseButton(int btn)
+        {
+            switch (btn)
+            {
+                case 0: return (bool)_btnIsPressedProp.GetValue(LeftMouseButton, null);
+                case 1: return (bool)_btnIsPressedProp.GetValue(RightMouseButton, null);
+                // case 2: return (bool)_btnIsPressedProp.GetValue(MiddleMouseButton, null);
+                default: throw new NotImplementedException();
+            }
+        }
+
+        public override void Init()
+        {
+            ExplorerCore.Log("Initializing new InputSystem support...");
+
+            _kbCurrentProp = TKeyboard.GetProperty("current");
+            _kbIndexer = TKeyboard.GetProperty("Item", new Type[] { TKey });
+
+            var btnControl = ReflectionHelpers.GetTypeByName("UnityEngine.InputSystem.Controls.ButtonControl");
+            _btnIsPressedProp = btnControl.GetProperty("isPressed");
+            _btnWasPressedProp = btnControl.GetProperty("wasPressedThisFrame");
+
+            _mouseCurrentProp = TMouse.GetProperty("current");
+            _leftButtonProp = TMouse.GetProperty("leftButton");
+            _rightButtonProp = TMouse.GetProperty("rightButton");
+
+            _positionProp = ReflectionHelpers.GetTypeByName("UnityEngine.InputSystem.Pointer")
+                            .GetProperty("position");
+
+            _readVector2InputMethod = ReflectionHelpers.GetTypeByName("UnityEngine.InputSystem.InputControl`1")
+                                      .MakeGenericType(typeof(Vector2))
+                                      .GetMethod("ReadValue");
+        }
+    }
+}

src/Input/LegacyInput.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+
+namespace Explorer.Input
+{
+    public class LegacyInput : AbstractInput
+    {
+        public static Type TInput => _input ?? (_input = ReflectionHelpers.GetTypeByName("UnityEngine.Input"));
+        private static Type _input;
+
+        private static PropertyInfo _mousePositionProp;
+        private static MethodInfo _getKeyMethod;
+        private static MethodInfo _getKeyDownMethod;
+        private static MethodInfo _getMouseButtonMethod;
+        private static MethodInfo _getMouseButtonDownMethod;
+
+        public override Vector2 MousePosition => (Vector3)_mousePositionProp.GetValue(null, null);
+
+        public override bool GetKey(KeyCode key) => (bool)_getKeyMethod.Invoke(null, new object[] { key });
+
+        public override bool GetKeyDown(KeyCode key) => (bool)_getKeyDownMethod.Invoke(null, new object[] { key });
+
+        public override bool GetMouseButton(int btn) => (bool)_getMouseButtonMethod.Invoke(null, new object[] { btn });
+
+        public override bool GetMouseButtonDown(int btn) => (bool)_getMouseButtonDownMethod.Invoke(null, new object[] { btn });
+
+        public override void Init()
+        {
+            ExplorerCore.Log("Initializing Legacy Input support...");
+
+            _mousePositionProp = TInput.GetProperty("mousePosition");
+            _getKeyMethod = TInput.GetMethod("GetKey", new Type[] { typeof(KeyCode) });
+            _getKeyDownMethod = TInput.GetMethod("GetKeyDown", new Type[] { typeof(KeyCode) });
+            _getMouseButtonMethod = TInput.GetMethod("GetMouseButton", new Type[] { typeof(int) });
+            _getMouseButtonDownMethod = TInput.GetMethod("GetMouseButtonDown", new Type[] { typeof(int) });
+        }
+    }
+}

src/Menu/CursorControl.cs

@@ -0,0 +1,190 @@
+using System;
+using UnityEngine;
+#if ML
+using Harmony;
+#else
+using HarmonyLib;
+#endif
+
+namespace Explorer
+{
+    public class CursorControl
+    {
+        public static bool ForceUnlockMouse
+        {
+            get => m_forceUnlock;
+            set => SetForceUnlock(value);
+        }
+        private static bool m_forceUnlock;
+        private static CursorLockMode m_lastLockMode;
+        private static bool m_lastVisibleState;
+        private static bool m_currentlySettingCursor = false;
+
+        public static bool ShouldForceMouse => ExplorerCore.ShowMenu && ForceUnlockMouse;
+
+        private static Type CursorType => m_cursorType ?? (m_cursorType = ReflectionHelpers.GetTypeByName("UnityEngine.Cursor"));
+        private static Type m_cursorType;
+
+        public static void Init()
+        {
+            try
+            {
+                // Check if Cursor class is loaded
+                if (CursorType == null)
+                {
+                    ExplorerCore.Log("Trying to manually load Cursor module...");
+
+                    if (ReflectionHelpers.LoadModule("UnityEngine.CoreModule") && CursorType != null)
+                    {
+                        ExplorerCore.Log("Ok!");
+                    }
+                    else
+                    {
+                        throw new Exception("Could not load UnityEngine.Cursor module!");
+                    }
+                }
+
+                // Get current cursor state and enable cursor
+                m_lastLockMode = Cursor.lockState;
+                m_lastVisibleState = Cursor.visible;
+
+                // Setup Harmony Patches
+                TryPatch("lockState", new HarmonyMethod(typeof(CursorControl).GetMethod(nameof(Prefix_set_lockState))), true);
+                TryPatch("lockState", new HarmonyMethod(typeof(CursorControl).GetMethod(nameof(Postfix_get_lockState))), false);
+
+                TryPatch("visible", new HarmonyMethod(typeof(CursorControl).GetMethod(nameof(Prefix_set_visible))), true);
+                TryPatch("visible", new HarmonyMethod(typeof(CursorControl).GetMethod(nameof(Postfix_get_visible))), false);
+            }
+            catch (Exception e)
+            {
+                ExplorerCore.Log($"Exception on CursorControl.Init! {e.GetType()}, {e.Message}");
+            }
+
+            // Enable ShowMenu and ForceUnlockMouse 
+            // (set m_showMenu directly to not call UpdateCursorState twice)
+            ExplorerCore.m_showMenu = true;
+            ForceUnlockMouse = true;
+        }
+
+        private static void TryPatch(string property, HarmonyMethod patch, bool setter)
+        {
+            try
+            {
+                // var harmony = ExplorerCore.Instance.harmonyInstance;
+
+                var harmony =
+#if ML
+                    ExplorerMelonMod.Instance.harmonyInstance;
+#else
+                    ExplorerBepInPlugin.HarmonyInstance;
+#endif
+                ;
+
+                var prop = typeof(Cursor).GetProperty(property);
+
+                if (setter)
+                {
+                    // setter is prefix
+                    harmony.Patch(prop.GetSetMethod(), patch);
+                }
+                else
+                {
+                    // getter is postfix
+                    harmony.Patch(prop.GetGetMethod(), null, patch);
+                }
+            }
+            catch (Exception e)
+            {
+                ExplorerCore.Log($"[NON-FATAL] Couldn't patch a method: {e.Message}");
+            }
+        }
+
+        private static void SetForceUnlock(bool unlock)
+        {
+            m_forceUnlock = unlock;
+            UpdateCursorControl();
+        }
+
+        public static void Update()
+        {
+            // Check Force-Unlock input
+            if (InputManager.GetKeyDown(KeyCode.LeftAlt))
+            {
+                ForceUnlockMouse = !ForceUnlockMouse;
+            }
+        }
+
+        public static void UpdateCursorControl()
+        {
+            try
+            {
+                m_currentlySettingCursor = true;
+                if (ShouldForceMouse)
+                {
+                    Cursor.lockState = CursorLockMode.None;
+                    Cursor.visible = true;
+                }
+                else
+                {
+                    Cursor.lockState = m_lastLockMode;
+                    Cursor.visible = m_lastVisibleState;
+                }
+                m_currentlySettingCursor = false;
+            }
+            catch (Exception e)
+            {
+                ExplorerCore.Log($"Exception setting Cursor state: {e.GetType()}, {e.Message}");
+            }
+        }
+
+        // Force mouse to stay unlocked and visible while UnlockMouse and ShowMenu are true.
+        // Also keep track of when anything else tries to set Cursor state, this will be the
+        // value that we set back to when we close the menu or disable force-unlock.
+
+        [HarmonyPrefix]
+        public static void Prefix_set_lockState(ref CursorLockMode value)
+        {
+            if (!m_currentlySettingCursor)
+            {
+                m_lastLockMode = value;
+
+                if (ShouldForceMouse)
+                {
+                    value = CursorLockMode.None;
+                }
+            }
+        }
+
+        [HarmonyPrefix]
+        public static void Prefix_set_visible(ref bool value)
+        {
+            if (!m_currentlySettingCursor)
+            {
+                m_lastVisibleState = value;
+
+                if (ShouldForceMouse)
+                {
+                    value = true;
+                }
+            }
+        }
+
+        [HarmonyPrefix]
+        public static void Postfix_get_lockState(ref CursorLockMode __result)
+        {
+            if (ShouldForceMouse)
+            {
+                __result = m_lastLockMode;
+            }
+        }
+
+        [HarmonyPrefix]
+        public static void Postfix_get_visible(ref bool __result)
+        {
+            if (ShouldForceMouse)
+            {
+                __result = m_lastVisibleState;
+            }
+        }
+    }
+}

src/Menu/InspectUnderMouse.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
+using UnityEngine;
 
 namespace Explorer
 {
@@ -15,9 +10,9 @@ namespace Explorer
 
         public static void Update()
         {
-            if (CppExplorer.ShowMenu)
+            if (ExplorerCore.ShowMenu)
             {
-                if (Input.GetKey(KeyCode.LeftShift) && Input.GetMouseButtonDown(1))
+                if (InputManager.GetKey(KeyCode.LeftShift) && InputManager.GetMouseButtonDown(1))
                 {
                     EnableInspect = !EnableInspect;
                 }
@@ -35,7 +30,10 @@ namespace Explorer
 
         public static void InspectRaycast()
         {
-            Ray ray = UnityHelpers.MainCamera.ScreenPointToRay(Input.mousePosition);
+            if (!UnityHelpers.MainCamera)
+                return;
+
+            var ray = UnityHelpers.MainCamera.ScreenPointToRay(InputManager.MousePosition);
 
             if (Physics.Raycast(ray, out RaycastHit hit, 1000f))
             {
@@ -43,7 +41,7 @@ namespace Explorer
 
                 m_objUnderMouseName = obj.transform.GetGameObjectPath();
 
-                if (Input.GetMouseButtonDown(0))
+                if (InputManager.GetMouseButtonDown(0))
                 {
                     EnableInspect = false;
                     m_objUnderMouseName = "";
@@ -63,7 +61,7 @@ namespace Explorer
             {
                 if (m_objUnderMouseName != "")
                 {
-                    var pos = Input.mousePosition;
+                    var pos = InputManager.MousePosition;
                     var rect = new Rect(
                         pos.x - (Screen.width / 2), // x
                         Screen.height - pos.y - 50, // y

src/Menu/MainMenu/MainMenu.cs

@@ -3,9 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityEngine;
-using UnityEngine.UI;
-using UnityEngine.EventSystems;
-using MelonLoader;
 
 namespace Explorer
 {
@@ -20,27 +17,33 @@ namespace Explorer
             Pages.Add(new ScenePage());
             Pages.Add(new SearchPage());
             Pages.Add(new ConsolePage());
+            Pages.Add(new OptionsPage());
 
-            foreach (var page in Pages)
+            for (int i = 0; i < Pages.Count; i++)
             {
+                var page = Pages[i];
                 page.Init();
+
+                // If page failed to init, it will remove itself from the list. Lower the iterate counter.
+                if (!Pages.Contains(page)) i--;
             }
         }
 
-        public const int MainWindowID = 10;
-        public static Rect MainRect = new Rect(5, 5, 550, 700);
-        private static readonly List<WindowPage> Pages = new List<WindowPage>();
+        public const int MainWindowID = 5000;
+        public static Rect MainRect = new Rect(5, 5, ModConfig.Instance.Default_Window_Size.x, ModConfig.Instance.Default_Window_Size.y);
+
+        public static readonly List<WindowPage> Pages = new List<WindowPage>();
         private static int m_currentPage = 0;
 
         public static void SetCurrentPage(int index)
         {
             if (index < 0 || Pages.Count <= index)
             {
-                MelonLogger.Log("cannot set page " + index);
+                ExplorerCore.Log("cannot set page " + index);
                 return;
             }
             m_currentPage = index;
-            GUI.BringWindowToFront(MainWindowID);
+            GUIUnstrip.BringWindowToFront(MainWindowID);
             GUI.FocusWindow(MainWindowID);
         }
 
@@ -51,25 +54,20 @@ namespace Explorer
 
         public void OnGUI()
         {
-            var origSkin = GUI.skin;
-            GUI.skin = UIStyles.WindowSkin;
-
-            MainRect = GUI.Window(MainWindowID, MainRect, (GUI.WindowFunction)MainWindow, CppExplorer.NAME);
-
-            GUI.skin = origSkin;
+            MainRect = GUIUnstrip.Window(MainWindowID, MainRect, (GUI.WindowFunction)MainWindow, ExplorerCore.NAME);
         }
 
         private void MainWindow(int id)
         {
             GUI.DragWindow(new Rect(0, 0, MainRect.width - 90, 20));
 
-            if (GUI.Button(new Rect(MainRect.width - 90, 2, 80, 20), "Hide (F7)"))
+            if (GUIUnstrip.Button(new Rect(MainRect.width - 90, 2, 80, 20), $"Hide ({ModConfig.Instance.Main_Menu_Toggle})"))
             {
-                CppExplorer.ShowMenu = false;
+                ExplorerCore.ShowMenu = false;
                 return;
             }
 
-            GUILayout.BeginArea(new Rect(5, 25, MainRect.width - 10, MainRect.height - 35), GUI.skin.box);
+            GUIUnstrip.BeginArea(new Rect(5, 25, MainRect.width - 10, MainRect.height - 35), GUI.skin.box);
 
             MainHeader();
 
@@ -83,12 +81,12 @@ namespace Explorer
 
             MainRect = ResizeDrag.ResizeWindow(MainRect, MainWindowID);
 
-            GUILayout.EndArea();
+            GUIUnstrip.EndArea();
         }
 
         private void MainHeader()
         {
-            GUILayout.BeginHorizontal(null);
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
             for (int i = 0; i < Pages.Count; i++)
             {
                 if (m_currentPage == i)
@@ -96,25 +94,27 @@ namespace Explorer
                 else
                     GUI.color = Color.white;
 
-                if (GUILayout.Button(Pages[i].Name, null))
+                if (GUILayout.Button(Pages[i].Name, new GUILayoutOption[0]))
                 {
                     m_currentPage = i;
                 }
             }
             GUILayout.EndHorizontal();
 
-            GUILayout.BeginHorizontal(null);
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
             GUI.color = Color.white;
-            InspectUnderMouse.EnableInspect = GUILayout.Toggle(InspectUnderMouse.EnableInspect, "Inspect Under Mouse (Shift + RMB)", null);
+            InspectUnderMouse.EnableInspect = GUILayout.Toggle(InspectUnderMouse.EnableInspect, "Inspect Under Mouse (Shift + RMB)", new GUILayoutOption[0]);
 
-            bool mouseState = CppExplorer.ForceUnlockMouse;
-            bool setMouse = GUILayout.Toggle(mouseState, "Force Unlock Mouse (Left Alt)", null);
-            if (setMouse != mouseState) CppExplorer.ForceUnlockMouse = setMouse;
+            bool mouseState = CursorControl.ForceUnlockMouse;
+            bool setMouse = GUILayout.Toggle(mouseState, "Force Unlock Mouse (Left Alt)", new GUILayoutOption[0]);
+            if (setMouse != mouseState) CursorControl.ForceUnlockMouse = setMouse;
 
-            WindowManager.TabView = GUILayout.Toggle(WindowManager.TabView, "Tab View", null);
+            WindowManager.TabView = GUILayout.Toggle(WindowManager.TabView, "Tab View", new GUILayoutOption[0]);
             GUILayout.EndHorizontal();
 
-            GUILayout.Space(10);
+            //GUIUnstrip.Space(10);
+            GUIUnstrip.Space(10);
+
             GUI.color = Color.white;
         }
     }

src/Menu/MainMenu/Pages/Console/REPL.cs

@@ -1,9 +1,4 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
 using Mono.CSharp;
 using UnityEngine;
 using Attribute = System.Attribute;

src/Menu/MainMenu/Pages/Console/REPLHelper.cs

@@ -1,15 +1,14 @@
-using System.Collections;
-//using Il2CppSystem;
-using MelonLoader;
+using System;
 using UnityEngine;
-using System;
 using Object = UnityEngine.Object;
 
 namespace Explorer
 {
     public class ReplHelper : MonoBehaviour
     {
+#if CPP
         public ReplHelper(IntPtr intPtr) : base(intPtr) { }
+#endif
 
         public T Find<T>() where T : Object
         {

src/Menu/MainMenu/Pages/ConsolePage.cs

@@ -1,24 +1,22 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using System.Reflection;
-using Mono.CSharp;
 using System.IO;
-using MelonLoader;
+using System.Reflection;
+using System.Text;
+using Mono.CSharp;
+using UnityEngine;
 
 namespace Explorer
 {
     public class ConsolePage : WindowPage
     {
-        public override string Name { get => "C# Console"; set => base.Name = value; }
+        public override string Name { get => "C# Console"; }
 
         private ScriptEvaluator _evaluator;
         private readonly StringBuilder _sb = new StringBuilder();
 
+        private Vector2 inputAreaScroll;
+
         private string MethodInput = "";
         private string UsingInput = "";
 
@@ -32,20 +30,29 @@ namespace Explorer
             "System.Collections",
             "System.Collections.Generic",
             "System.Reflection",
+#if ML
             "MelonLoader"
+#endif
         };
 
         public override void Init()
         {
+#if CPP
             UnhollowerRuntimeLib.ClassInjector.RegisterTypeInIl2Cpp<ReplHelper>();
-
+#endif
             try
             {
-                MethodInput = @"// This is a basic C# REPL console. 
+                MethodInput = @"// This is a basic C# console. 
 // Some common using directives are added by default, you can add more below.
-// If you want to return some output, MelonLogger.Log() it.
+// If you want to return some output, Debug.Log() or MelonLogger.Log() it.
 
-MelonLogger.Log(""hello world"");";
+"
+#if ML
++ @"MelonLogger.Log(""hello world"");";
+#else
++ @"Debug.Log(""hello world"");";
+#endif
+                ;
 
                 ResetConsole();
 
@@ -56,7 +63,9 @@ MelonLogger.Log(""hello world"");";
             }
             catch (Exception e)
             {
-                MelonLogger.Log($"Error setting up console!\r\nMessage: {e.Message}\r\nStack: {e.StackTrace}");
+                ExplorerCore.Log($"Error setting up console!\r\nMessage: {e.Message}");
+                MainMenu.SetCurrentPage(0);
+                MainMenu.Pages.Remove(this);
             }
         }
 
@@ -109,7 +118,7 @@ MelonLogger.Log(""hello world"");";
             {
                 if (!suppressWarning)
                 {
-                    MelonLogger.LogWarning(e.GetType() + ", " + e.Message);
+                    ExplorerCore.LogWarning(e.GetType() + ", " + e.Message);
                 }
             }
 
@@ -119,14 +128,19 @@ MelonLogger.Log(""hello world"");";
 
         public override void DrawWindow()
         {
-            GUILayout.Label("<b><size=15><color=cyan>C# REPL Console</color></size></b>", null);
+            GUILayout.Label("<b><size=15><color=cyan>C# Console</color></size></b>", new GUILayoutOption[0]);
 
             GUI.skin.label.alignment = TextAnchor.UpperLeft;
 
-            GUILayout.Label("Enter code here as though it is a method body:", null);
-            MethodInput = GUILayout.TextArea(MethodInput, new GUILayoutOption[] { GUILayout.Height(250) });
+            GUILayout.Label("Enter code here as though it is a method body:", new GUILayoutOption[0]);
 
-            if (GUILayout.Button("<color=cyan><b>Execute</b></color>", null))
+            inputAreaScroll = GUIUnstrip.BeginScrollView(inputAreaScroll, new GUILayoutOption[] { GUILayout.Height(250) });
+
+            MethodInput = GUIUnstrip.TextArea(MethodInput, new GUILayoutOption[] { GUILayout.ExpandHeight(true) });
+
+            GUIUnstrip.EndScrollView();
+
+            if (GUILayout.Button("<color=cyan><b>Execute</b></color>", new GUILayoutOption[0]))
             {
                 try
                 {
@@ -138,21 +152,21 @@ MelonLogger.Log(""hello world"");";
 
                         if (result != null && !Equals(result, VoidType.Value))
                         {
-                            MelonLogger.Log("[Console Output]\r\n" + result.ToString());
+                            ExplorerCore.Log("[Console Output]\r\n" + result.ToString());
                         }
                     }
                 }
                 catch (Exception e)
                 {
-                    MelonLogger.LogError("Exception compiling!\r\nMessage: " + e.Message + "\r\nStack: " + e.StackTrace);
+                    ExplorerCore.LogError("Exception compiling!\r\nMessage: " + e.Message + "\r\nStack: " + e.StackTrace);
                 }
             }
 
-            GUILayout.Label("<b>Using directives:</b>", null);
+            GUILayout.Label("<b>Using directives:</b>", new GUILayoutOption[0]);
 
-            GUILayout.BeginHorizontal(null);
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
             GUILayout.Label("Add namespace:", new GUILayoutOption[] { GUILayout.Width(105) });
-            UsingInput = GUILayout.TextField(UsingInput, new GUILayoutOption[] { GUILayout.Width(150) });
+            UsingInput = GUIUnstrip.TextField(UsingInput, new GUILayoutOption[] { GUILayout.Width(150) });
             if (GUILayout.Button("<b><color=lime>Add</color></b>", new GUILayoutOption[] { GUILayout.Width(120) }))
             {
                 AddUsing(UsingInput);
@@ -165,7 +179,7 @@ MelonLogger.Log(""hello world"");";
 
             foreach (var asm in UsingDirectives)
             {
-                GUILayout.Label(AsmToUsing(asm, true), null);
+                GUILayout.Label(AsmToUsing(asm, true), new GUILayoutOption[0]);
             }            
         }
 

src/Menu/MainMenu/Pages/OptionsPage.cs

@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Explorer.Tests;
+using UnityEngine;
+
+namespace Explorer
+{
+    public class OptionsPage : WindowPage
+    {
+        public override string Name => "Options";
+
+        public string toggleKeyInputString = "";
+        public Vector2 defaultSizeInputVector;
+        public int defaultPageLimit;
+
+        private CacheObjectBase toggleKeyInput;
+        private CacheObjectBase defaultSizeInput;
+        private CacheObjectBase defaultPageLimitInput;        
+
+        public override void Init()
+        {
+            toggleKeyInputString = ModConfig.Instance.Main_Menu_Toggle.ToString();
+            toggleKeyInput = CacheFactory.GetTypeAndCacheObject(typeof(OptionsPage).GetField("toggleKeyInputString"), this);
+
+            defaultSizeInputVector = ModConfig.Instance.Default_Window_Size;
+            defaultSizeInput = CacheFactory.GetTypeAndCacheObject(typeof(OptionsPage).GetField("defaultSizeInputVector"), this);
+
+            defaultPageLimit = ModConfig.Instance.Default_Page_Limit;
+            defaultPageLimitInput = CacheFactory.GetTypeAndCacheObject(typeof(OptionsPage).GetField("defaultPageLimit"), this);
+        }
+
+        public override void Update() { }
+
+        public override void DrawWindow()
+        {
+            GUI.skin.label.alignment = TextAnchor.MiddleCenter;
+            GUILayout.Label("<color=orange><size=16><b>Settings</b></size></color>", new GUILayoutOption[0]);
+            GUI.skin.label.alignment = TextAnchor.MiddleLeft;
+
+            GUILayout.BeginVertical(GUIContent.none, GUI.skin.box, new GUILayoutOption[0]);
+
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            GUILayout.Label($"Menu Toggle Key:", new GUILayoutOption[] { GUILayout.Width(215f) });
+            toggleKeyInput.DrawValue(MainMenu.MainRect, MainMenu.MainRect.width - 215f);
+            GUILayout.EndHorizontal();
+
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            GUILayout.Label($"Default Window Size:", new GUILayoutOption[] { GUILayout.Width(215f) });
+            defaultSizeInput.DrawValue(MainMenu.MainRect, MainMenu.MainRect.width - 215f);
+            GUILayout.EndHorizontal();
+
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            GUILayout.Label($"Default Items per Page:", new GUILayoutOption[] { GUILayout.Width(215f) });
+            defaultPageLimitInput.DrawValue(MainMenu.MainRect, MainMenu.MainRect.width - 215f);
+            GUILayout.EndHorizontal();
+
+            if (GUILayout.Button("<color=lime><b>Apply and Save</b></color>", new GUILayoutOption[0]))
+            {
+                ApplyAndSave();
+            }
+
+            GUILayout.EndVertical();
+
+            //GUIUnstrip.Space(10f);
+
+            //GUI.skin.label.alignment = TextAnchor.MiddleCenter;
+            //GUILayout.Label("<color=orange><size=16><b>Other</b></size></color>", new GUILayoutOption[0]);
+            //GUI.skin.label.alignment = TextAnchor.MiddleLeft;
+
+            //GUILayout.BeginVertical(GUIContent.none, GUI.skin.box, new GUILayoutOption[0]);
+
+            //if (GUILayout.Button("Inspect Test Class", new GUILayoutOption[0]))
+            //{
+            //    WindowManager.InspectObject(TestClass.Instance, out bool _);
+            //}
+
+            //GUILayout.EndVertical();
+        }
+
+        private void ApplyAndSave()
+        {
+            if (Enum.Parse(typeof(KeyCode), toggleKeyInputString) is KeyCode key)
+            {
+                ModConfig.Instance.Main_Menu_Toggle = key;
+            }
+            else
+            {
+                ExplorerCore.LogWarning($"Could not parse '{toggleKeyInputString}' to KeyCode!");
+            }
+
+            ModConfig.Instance.Default_Window_Size = defaultSizeInputVector;
+            ModConfig.Instance.Default_Page_Limit = defaultPageLimit;
+
+            ModConfig.SaveSettings();
+        }
+    }
+}

src/Menu/MainMenu/Pages/ScenePage.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using MelonLoader;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
@@ -12,27 +10,26 @@ namespace Explorer
     {
         public static ScenePage Instance;
 
-        public override string Name { get => "Scene Explorer"; set => base.Name = value; }
+        public override string Name { get => "Scenes"; }
 
         public PageHelper Pages = new PageHelper();
 
         private float m_timeOfLastUpdate = -1f;
+        private const int PASSIVE_UPDATE_INTERVAL = 1;
 
-    // ----- Holders for GUI elements ----- //
+        private static bool m_getRootObjectsFailed;
 
-    private string m_currentScene = "";
+        private static string m_currentScene = "";
 
         // gameobject list
         private Transform m_currentTransform;
-        private List<GameObjectCache> m_objectList = new List<GameObjectCache>();
+        private readonly List<GameObjectCache> m_objectList = new List<GameObjectCache>();
 
         // search bar
         private bool m_searching = false;
         private string m_searchInput = "";
         private List<GameObjectCache> m_searchResults = new List<GameObjectCache>();
 
-        // ------------ Init and Update ------------ //
-
         public override void Init()
         {
             Instance = this;
@@ -44,59 +41,6 @@ namespace Explorer
             SetTransformTarget(null);
         }
 
-        //public void CheckOffset(ref int offset, int childCount)
-        //{
-        //    if (offset >= childCount)
-        //    {
-        //        offset = 0;
-        //        m_pageOffset = 0;
-        //    }
-        //}
-
-        public override void Update()
-        {
-            if (m_searching) return;
-
-            if (Time.time - m_timeOfLastUpdate < 1f) return;
-            m_timeOfLastUpdate = Time.time;
-
-            m_objectList = new List<GameObjectCache>();
-
-            var allTransforms = new List<Transform>();
-
-            // get current list of all transforms (either scene root or our current transform children)
-            if (m_currentTransform)
-            {
-                for (int i = 0; i < m_currentTransform.childCount; i++)
-                {
-                    allTransforms.Add(m_currentTransform.GetChild(i));
-                }
-            }
-            else
-            {
-                var scene = SceneManager.GetSceneByName(m_currentScene);
-                var rootObjects = scene.GetRootGameObjects();
-
-                foreach (var obj in rootObjects)
-                {
-                    allTransforms.Add(obj.transform);
-                }
-            }
-
-            Pages.ItemCount = allTransforms.Count;            
-
-            int offset = Pages.CalculateOffsetIndex();
-
-            // sort by childcount
-            allTransforms.Sort((a, b) => b.childCount.CompareTo(a.childCount));
-
-            for (int i = offset; i < offset + Pages.ItemsPerPage && i < Pages.ItemCount; i++)
-            {
-                var child = allTransforms[i];
-                m_objectList.Add(new GameObjectCache(child.gameObject));
-            }
-        }
-
         public void SetTransformTarget(Transform t)
         {
             m_currentTransform = t;
@@ -104,8 +48,7 @@ namespace Explorer
             if (m_searching)
                 CancelSearch();
 
-            m_timeOfLastUpdate = -1f;
-            Update();
+            Update_Impl(true);
         }
 
         public void TraverseUp()
@@ -130,24 +73,140 @@ namespace Explorer
         public void CancelSearch()
         {
             m_searching = false;
+
+            if (m_getRootObjectsFailed && !m_currentTransform)
+            {
+                GetRootObjectsManual_Impl();
+            }
         }
 
         public List<GameObjectCache> SearchSceneObjects(string _search)
         {
             var matches = new List<GameObjectCache>();
 
-            foreach (var obj in Resources.FindObjectsOfTypeAll<GameObject>())
+            foreach (var obj in Resources.FindObjectsOfTypeAll(ReflectionHelpers.GameObjectType))
             {
-                if (obj.name.ToLower().Contains(_search.ToLower()) && obj.scene.name == m_currentScene)
+#if CPP
+                var go = obj.TryCast<GameObject>();
+#else
+                var go = obj as GameObject;
+#endif
+                if (go.name.ToLower().Contains(_search.ToLower()) && go.scene.name == m_currentScene)
                 {
-                    matches.Add(new GameObjectCache(obj));
+                    matches.Add(new GameObjectCache(go));
                 }
             }
 
             return matches;
         }
 
-        // --------- GUI Draw Function --------- //        
+        public override void Update()
+        {
+            if (m_searching) return;
+
+            if (Time.time - m_timeOfLastUpdate < PASSIVE_UPDATE_INTERVAL) return;
+            m_timeOfLastUpdate = Time.time;
+
+            Update_Impl();
+        }
+
+        private void Update_Impl(bool manual = false)
+        {
+            List<Transform> allTransforms = new List<Transform>();
+
+            // get current list of all transforms (either scene root or our current transform children)
+            if (m_currentTransform)
+            {
+                for (int i = 0; i < m_currentTransform.childCount; i++)
+                {
+                    allTransforms.Add(m_currentTransform.GetChild(i));
+                }
+            }
+            else
+            {
+                if (!m_getRootObjectsFailed)
+                {
+                    try
+                    {
+                        for (int i = 0; i < SceneManager.sceneCount; i++)
+                        {
+                            var scene = SceneManager.GetSceneAt(i);
+
+                            if (scene.name == m_currentScene)
+                            {
+                                allTransforms.AddRange(scene.GetRootGameObjects()
+                                                .Select(it => it.transform));
+
+                                break;
+                            }
+                        }
+                    }
+                    catch
+                    {
+                        ExplorerCore.Log("Exception getting root scene objects, falling back to backup method...");
+
+                        m_getRootObjectsFailed = true;
+                        allTransforms.AddRange(GetRootObjectsManual_Impl());
+                    }
+                }
+                else
+                {
+                    if (!manual)
+                    {
+                        return;
+                    }
+
+                    allTransforms.AddRange(GetRootObjectsManual_Impl());
+                }
+            }
+
+            Pages.ItemCount = allTransforms.Count;
+
+            int offset = Pages.CalculateOffsetIndex();
+
+            // sort by childcount
+            allTransforms.Sort((a, b) => b.childCount.CompareTo(a.childCount));
+
+            m_objectList.Clear();
+
+            for (int i = offset; i < offset + Pages.ItemsPerPage && i < Pages.ItemCount; i++)
+            {
+                var child = allTransforms[i];
+                m_objectList.Add(new GameObjectCache(child.gameObject));
+            }
+        }
+
+        private IEnumerable<Transform> GetRootObjectsManual_Impl()
+        {
+            try
+            {
+                var array = Resources.FindObjectsOfTypeAll(ReflectionHelpers.TransformType);
+
+                var list = new List<Transform>();
+                foreach (var obj in array)
+                {
+#if CPP
+                    var transform = obj.TryCast<Transform>();
+#else
+                    var transform = obj as Transform;
+#endif
+                    if (transform.parent == null && transform.gameObject.scene.name == m_currentScene)
+                    {
+                        list.Add(transform);
+                    }
+                }
+                return list;
+            }
+            catch (Exception e)
+            {
+                ExplorerCore.Log("Exception getting root scene objects (manual): " 
+                    + e.GetType() + ", " + e.Message + "\r\n" 
+                    + e.StackTrace);
+                return new Transform[0];
+            }
+        }
+
+        // --------- GUI Draw Function --------- //
 
         public override void DrawWindow()
         {
@@ -155,7 +214,7 @@ namespace Explorer
             {
                 DrawHeaderArea();
 
-                GUILayout.BeginVertical(GUI.skin.box, null);
+                GUILayout.BeginVertical(GUIContent.none, GUI.skin.box, null);
 
                 DrawPageButtons();
 
@@ -172,71 +231,81 @@ namespace Explorer
             }
             catch (Exception e)
             {
-                MelonLogger.Log("Exception drawing ScenePage! " + e.GetType() + ", " + e.Message);
-                MelonLogger.Log(e.StackTrace);
-                m_currentTransform = null;
+                if (!e.Message.Contains("in a group with only"))
+                {
+                    ExplorerCore.Log(e.ToString());
+                }
             }
         }
 
         private void DrawHeaderArea()
         {
-            GUILayout.BeginHorizontal(null);
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
 
             // Current Scene label
             GUILayout.Label("Current Scene:", new GUILayoutOption[] { GUILayout.Width(120) });
-            try
-            {
-                // Need to do 'ToList()' so the object isn't cleaned up by Il2Cpp GC.
-                var scenes = SceneManager.GetAllScenes().ToList();
-
-                if (scenes.Count > 1)
-                {
-                    int changeWanted = 0;
-                    if (GUILayout.Button("<", new GUILayoutOption[] { GUILayout.Width(30) }))
-                    {
-                        changeWanted = -1;
-                    }
-                    if (GUILayout.Button(">", new GUILayoutOption[] { GUILayout.Width(30) }))
-                    {
-                        changeWanted = 1;
-                    }
-                    if (changeWanted != 0)
-                    {
-                        int index = scenes.IndexOf(SceneManager.GetSceneByName(m_currentScene));
-                        index += changeWanted;
-                        if (index > scenes.Count - 1)
-                        {
-                            index = 0;
-                        }
-                        else if (index < 0)
-                        {
-                            index = scenes.Count - 1;
-                        }
-                        m_currentScene = scenes[index].name;
-                    }
-                }
-            }
-            catch { }
-            GUILayout.Label("<color=cyan>" + m_currentScene + "</color>", null); //new GUILayoutOption[] { GUILayout.Width(250) });
+            SceneChangeButtons();
+            GUILayout.Label("<color=cyan>" + m_currentScene + "</color>", new GUILayoutOption[0]);
 
             GUILayout.EndHorizontal();
 
             // ----- GameObject Search -----
-            GUILayout.BeginHorizontal(GUI.skin.box, null);
+            GUILayout.BeginHorizontal(GUIContent.none, GUI.skin.box, null);
             GUILayout.Label("<b>Search Scene:</b>", new GUILayoutOption[] { GUILayout.Width(100) });
-            m_searchInput = GUILayout.TextField(m_searchInput, null);
+
+            m_searchInput = GUIUnstrip.TextField(m_searchInput, new GUILayoutOption[0]);
+
             if (GUILayout.Button("Search", new GUILayoutOption[] { GUILayout.Width(80) }))
             {
                 Search();
             }
             GUILayout.EndHorizontal();
 
-            GUILayout.Space(5);
+            GUIUnstrip.Space(5);
+        }
+
+        private void SceneChangeButtons()
+        {
+            var scenes = new List<Scene>();
+            var names = new List<string>();
+            for (int i = 0; i < SceneManager.sceneCount; i++)
+            {
+                var scene = SceneManager.GetSceneAt(i);
+                names.Add(scene.name);
+                scenes.Add(scene);
+            }
+
+            if (scenes.Count > 1)
+            {
+                int changeWanted = 0;
+                if (GUILayout.Button("<", new GUILayoutOption[] { GUILayout.Width(30) }))
+                {
+                    changeWanted = -1;
+                }
+                if (GUILayout.Button(">", new GUILayoutOption[] { GUILayout.Width(30) }))
+                {
+                    changeWanted = 1;
+                }
+                if (changeWanted != 0)
+                {
+                    int index = names.IndexOf(m_currentScene);
+                    index += changeWanted;
+                    if (index > scenes.Count - 1)
+                    {
+                        index = 0;
+                    }
+                    else if (index < 0)
+                    {
+                        index = scenes.Count - 1;
+                    }
+                    m_currentScene = scenes[index].name;
+                }
+            }
         }
 
         private void DrawPageButtons()
         {
-            GUILayout.BeginHorizontal(null);
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
 
             Pages.DrawLimitInputArea();
 
@@ -246,8 +315,7 @@ namespace Explorer
                 {
                     Pages.TurnPage(Turn.Left, ref this.scroll);
 
-                    m_timeOfLastUpdate = -1f;
-                    Update();
+                    Update_Impl(true);
                 }
 
                 Pages.CurrentPageLabel();
@@ -256,8 +324,7 @@ namespace Explorer
                 {
                     Pages.TurnPage(Turn.Right, ref this.scroll);
 
-                    m_timeOfLastUpdate = -1f;
-                    Update();
+                    Update_Impl(true);
                 }
             }
 
@@ -269,7 +336,7 @@ namespace Explorer
         {
             if (m_currentTransform != null)
             {
-                GUILayout.BeginHorizontal(null);
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
                 if (GUILayout.Button("<-", new GUILayoutOption[] { GUILayout.Width(35) }))
                 {
                     TraverseUp();
@@ -286,13 +353,25 @@ namespace Explorer
             }
             else
             {
-                GUILayout.Label("Scene Root GameObjects:", null);
+                GUILayout.Label("Scene Root GameObjects:", new GUILayoutOption[0]);
+
+                if (m_getRootObjectsFailed)
+                {
+                    if (GUILayout.Button("Update Root Object List (auto-update failed!)", new GUILayoutOption[0]))
+                    {
+                        Update_Impl(true);
+                    }
+                }
             }
 
             if (m_objectList.Count > 0)
             {
-                foreach (var obj in m_objectList)
+                for (int i = 0; i < m_objectList.Count; i++)
                 {
+                    var obj = m_objectList[i];
+
+                    if (obj == null) continue;
+
                     if (!obj.RefGameObject)
                     {
                         string label = "<color=red><i>null";
@@ -303,7 +382,7 @@ namespace Explorer
                         }
 
                         label += "</i></color>";
-                        GUILayout.Label(label, null);
+                        GUILayout.Label(label, new GUILayoutOption[0]);
                     }
                     else
                     {
@@ -326,7 +405,7 @@ namespace Explorer
                 CancelSearch();
             }
 
-            GUILayout.Label("Search Results:", null);
+            GUILayout.Label("Search Results:", new GUILayoutOption[0]);
 
             if (m_searchResults.Count > 0)
             {
@@ -348,13 +427,13 @@ namespace Explorer
                     }
                     else
                     {
-                        GUILayout.Label("<i><color=red>Null or destroyed!</color></i>", null);
+                        GUILayout.Label("<i><color=red>Null or destroyed!</color></i>", new GUILayoutOption[0]);
                     }
                 }
             }
             else
             {
-                GUILayout.Label("<color=red><i>No results found!</i></color>", null);
+                GUILayout.Label("<color=red><i>No results found!</i></color>", new GUILayoutOption[0]);
             }
         }
 

src/Menu/MainMenu/Pages/SearchPage.cs

@@ -2,10 +2,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using UnityEngine;
 using System.Reflection;
-using MelonLoader;
+using UnityEngine;
 
 namespace Explorer
 {
@@ -13,7 +11,7 @@ namespace Explorer
     {
         public static SearchPage Instance;
 
-        public override string Name { get => "Object Search"; set => base.Name = value; }
+        public override string Name { get => "Object Search"; }
 
         private string m_searchInput = "";
         private string m_typeInput = "";
@@ -66,12 +64,19 @@ namespace Explorer
             {
                 var toCache = obj;
 
+#if CPP
                 if (toCache is Il2CppSystem.Object ilObject)
                 {
                     toCache = ilObject.TryCast<GameObject>() ?? ilObject.TryCast<Transform>()?.gameObject ?? ilObject;
                 }
+#else
+                if (toCache is GameObject || toCache is Transform)
+                {
+                    toCache = toCache as GameObject ?? (toCache as Transform).gameObject;
+                }
+#endif
 
-                var cache = CacheObjectBase.GetCacheObject(toCache);
+                var cache = CacheFactory.GetTypeAndCacheObject(toCache);
                 m_searchResults.Add(cache);
             }
 
@@ -84,7 +89,7 @@ namespace Explorer
             try
             {
                 // helpers
-                GUILayout.BeginHorizontal(GUI.skin.box, null);
+                GUILayout.BeginHorizontal(GUIContent.none, GUI.skin.box, null);
                 GUILayout.Label("<b><color=orange>Helpers</color></b>", new GUILayoutOption[] { GUILayout.Width(70) });
                 if (GUILayout.Button("Find Static Instances", new GUILayoutOption[] { GUILayout.Width(180) }))
                 {
@@ -97,15 +102,15 @@ namespace Explorer
                 SearchBox();
 
                 // results
-                GUILayout.BeginVertical(GUI.skin.box, null);
+                GUILayout.BeginVertical(GUIContent.none, GUI.skin.box, null);
 
                 GUI.skin.label.alignment = TextAnchor.MiddleCenter;
-                GUILayout.Label("<b><color=orange>Results </color></b>" + " (" + m_searchResults.Count + ")", null);
+                GUILayout.Label("<b><color=orange>Results </color></b>" + " (" + m_searchResults.Count + ")", new GUILayoutOption[0]);
                 GUI.skin.label.alignment = TextAnchor.UpperLeft;
 
                 int count = m_searchResults.Count;
 
-                GUILayout.BeginHorizontal(null);
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
 
                 Pages.DrawLimitInputArea();
 
@@ -137,19 +142,16 @@ namespace Explorer
 
                 if (m_searchResults.Count > 0)
                 {
-                    //int offset = m_pageOffset * this.m_limit;
-                    //if (offset >= count) m_pageOffset = 0;
                     int offset = Pages.CalculateOffsetIndex();
 
                     for (int i = offset; i < offset + Pages.ItemsPerPage && i < count; i++)
                     {
                         m_searchResults[i].Draw(MainMenu.MainRect, 0f);
-                        //m_searchResults[i].DrawValue(MainMenu.MainRect);
                     }
                 }
                 else
                 {
-                    GUILayout.Label("<color=red><i>No results found!</i></color>", null);
+                    GUILayout.Label("<color=red><i>No results found!</i></color>", new GUILayoutOption[0]);
                 }
 
                 GUIUnstrip.EndScrollView();
@@ -163,31 +165,21 @@ namespace Explorer
 
         private void SearchBox()
         {
-            GUILayout.BeginVertical(GUI.skin.box, null);
+            GUILayout.BeginVertical(GUIContent.none, GUI.skin.box, null);
 
             // ----- GameObject Search -----
             GUI.skin.label.alignment = TextAnchor.MiddleCenter;
-            GUILayout.Label("<b><color=orange>Search</color></b>", null);
+            GUILayout.Label("<b><color=orange>Search</color></b>", new GUILayoutOption[0]);
             GUI.skin.label.alignment = TextAnchor.UpperLeft;
 
-            GUILayout.BeginHorizontal(null);
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
 
             GUILayout.Label("Name Contains:", new GUILayoutOption[] { GUILayout.Width(100) });
-            m_searchInput = GUILayout.TextField(m_searchInput, new GUILayoutOption[] { GUILayout.Width(200) });
-
-            //GUI.skin.label.alignment = TextAnchor.MiddleRight;
-            //GUILayout.Label("Results per page:", new GUILayoutOption[] { GUILayout.Width(120) });
-            //var resultinput = m_limit.ToString();
-            //resultinput = GUILayout.TextField(resultinput, new GUILayoutOption[] { GUILayout.Width(55) });
-            //if (int.TryParse(resultinput, out int _i) && _i > 0)
-            //{
-            //    m_limit = _i;
-            //}
-            //GUI.skin.label.alignment = TextAnchor.UpperLeft;
+            m_searchInput = GUIUnstrip.TextField(m_searchInput, new GUILayoutOption[] { GUILayout.Width(200) });
 
             GUILayout.EndHorizontal();
 
-            GUILayout.BeginHorizontal(null);
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
 
             GUILayout.Label("Class Filter:", new GUILayoutOption[] { GUILayout.Width(100) });
             ClassFilterToggle(TypeFilter.Object, "Object");
@@ -197,15 +189,15 @@ namespace Explorer
             GUILayout.EndHorizontal();
             if (TypeMode == TypeFilter.Custom)
             {
-                GUILayout.BeginHorizontal(null);
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
                 GUI.skin.label.alignment = TextAnchor.MiddleRight;
                 GUILayout.Label("Custom Class:", new GUILayoutOption[] {  GUILayout.Width(250) });
                 GUI.skin.label.alignment = TextAnchor.UpperLeft;
-                m_typeInput = GUILayout.TextField(m_typeInput, new GUILayoutOption[] {  GUILayout.Width(250) });
+                m_typeInput = GUIUnstrip.TextField(m_typeInput, new GUILayoutOption[] {  GUILayout.Width(250) });
                 GUILayout.EndHorizontal();
             }
 
-            GUILayout.BeginHorizontal(null);
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
             GUILayout.Label("Scene Filter:", new GUILayoutOption[] {  GUILayout.Width(100) });
             SceneFilterToggle(SceneFilter.Any, "Any", 60);
             SceneFilterToggle(SceneFilter.This, "This Scene", 100);
@@ -213,7 +205,7 @@ namespace Explorer
             SceneFilterToggle(SceneFilter.None, "No Scene", 80);
             GUILayout.EndHorizontal();
 
-            if (GUILayout.Button("<b><color=cyan>Search</color></b>", null))
+            if (GUILayout.Button("<b><color=cyan>Search</color></b>", new GUILayoutOption[0]))
             {
                 Search();
             }
@@ -266,21 +258,34 @@ namespace Explorer
             CacheResults(FindAllObjectsOfType(m_searchInput, m_typeInput));
         }
 
-        private List<object> FindAllObjectsOfType(string _search, string _type)
+        private List<object> FindAllObjectsOfType(string searchQuery, string typeName)
         {
+#if CPP
             Il2CppSystem.Type searchType = null;
 
+#else
+            Type searchType = null;
+#endif
             if (TypeMode == TypeFilter.Custom)
             {
                 try
                 {
-                    var findType = ReflectionHelpers.GetTypeByName(_type);
-                    searchType = Il2CppSystem.Type.GetType(findType.AssemblyQualifiedName);
-                    //MelonLogger.Log("Search type: " + findType.AssemblyQualifiedName);
+                    if (ReflectionHelpers.GetTypeByName(typeName) is Type t)
+                    {
+#if CPP
+                        searchType = Il2CppSystem.Type.GetType(t.AssemblyQualifiedName);
+#else
+                        searchType = t;
+#endif
+                    }
+                    else
+                    {
+                        throw new Exception($"Could not find a Type by the name of '{typeName}'!");
+                    }
                 }
                 catch (Exception e)
                 {
-                    MelonLogger.Log("Exception: " + e.GetType() + ", " + e.Message + "\r\n" + e.StackTrace);
+                    ExplorerCore.Log("Exception getting Search Type: " + e.GetType() + ", " + e.Message);
                 }
             }
             else if (TypeMode == TypeFilter.Object)
@@ -298,7 +303,10 @@ namespace Explorer
 
             if (!ReflectionHelpers.ObjectType.IsAssignableFrom(searchType))
             {
-                MelonLogger.LogError("Your Custom Class Type must inherit from UnityEngine.Object!");
+                if (searchType != null)
+                {
+                    ExplorerCore.LogWarning("Your Custom Class Type must inherit from UnityEngine.Object!");
+                }
                 return new List<object>();
             }
 
@@ -306,19 +314,24 @@ namespace Explorer
 
             var allObjectsOfType = Resources.FindObjectsOfTypeAll(searchType);
 
-            //MelonLogger.Log("Found count: " + allObjectsOfType.Length);
+            //ExplorerCore.Log("Found count: " + allObjectsOfType.Length);
 
             int i = 0;
             foreach (var obj in allObjectsOfType)
             {
                 if (i >= 2000) break;
 
-                if (_search != "" && !obj.name.ToLower().Contains(_search.ToLower()))
+                if (searchQuery != "" && !obj.name.ToLower().Contains(searchQuery.ToLower()))
                 {
                     continue;
                 }
 
-                if (searchType == ReflectionHelpers.ComponentType && ReflectionHelpers.TransformType.IsAssignableFrom(obj.GetIl2CppType()))
+                if (searchType.FullName == ReflectionHelpers.ComponentType.FullName
+#if CPP
+                    && ReflectionHelpers.TransformType.IsAssignableFrom(obj.GetIl2CppType()))
+#else
+                    && ReflectionHelpers.TransformType.IsAssignableFrom(obj.GetType()))
+#endif
                 {
                     // Transforms shouldn't really be counted as Components, skip them.
                     // They're more akin to GameObjects.
@@ -343,15 +356,18 @@ namespace Explorer
 
         public static bool FilterScene(object obj, SceneFilter filter)
         {
-            GameObject go;
+            GameObject go = null;
+#if CPP
             if (obj is Il2CppSystem.Object ilObject)
             {
                 go = ilObject.TryCast<GameObject>() ?? ilObject.TryCast<Component>().gameObject;                
             }
-            else
+#else
+            if (obj is GameObject || obj is Component)
             {
                 go = (obj as GameObject) ?? (obj as Component).gameObject;                
             }
+#endif
 
             if (!go)
             {
@@ -376,43 +392,70 @@ namespace Explorer
 
         // ====== other ========
 
+        private static bool FilterName(string name)
+        {
+            // Don't really want these instances.
+            return !name.StartsWith("Mono") 
+                && !name.StartsWith("System") 
+                && !name.StartsWith("Il2CppSystem") 
+                && !name.StartsWith("Iced");
+        }
+
         // credit: ManlyMarco (RuntimeUnityEditor)
         public static IEnumerable<object> GetInstanceClassScanner()
         {
             var query = AppDomain.CurrentDomain.GetAssemblies()
-                .Where(x => !x.FullName.StartsWith("Mono"))
-                .SelectMany(GetTypesSafe)
-                .Where(t => t.IsClass && !t.IsAbstract && !t.ContainsGenericParameters);
+                        .SelectMany(t => t.TryGetTypes())
+                        .Where(t => t.IsClass && !t.IsAbstract && !t.ContainsGenericParameters);
+
+            var flags = BindingFlags.Public | BindingFlags.Static;
+            var flatFlags = flags | BindingFlags.FlattenHierarchy;
 
             foreach (var type in query)
             {
                 object obj = null;
                 try
                 {
-                    obj = type.GetProperty("Instance", BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy)?.GetValue(null, null);
-                }
-                catch
-                {
-                    try
+                    var pi = type.GetProperty("Instance", flags);
+
+                    if (pi == null)
                     {
-                        obj = type.GetField("Instance", BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy)?.GetValue(null);
+                        pi = type.GetProperty("Instance", flatFlags);
                     }
-                    catch
+
+                    if (pi != null)
                     {
+                        obj = pi.GetValue(null, null);
+                    }
+                    else
+                    {
+                        var fi = type.GetField("Instance", flags);
+
+                        if (fi == null)
+                        {
+                            fi = type.GetField("Instance", flatFlags);
+                        }
+
+                        if (fi != null)
+                        {
+                            obj = fi.GetValue(null);
+                        }
                     }
                 }
-                if (obj != null && !obj.ToString().StartsWith("Mono"))
+                catch { }
+
+                if (obj != null)
                 {
+                    var t = ReflectionHelpers.GetActualType(obj);
+
+                    if (!FilterName(t.FullName) || ReflectionHelpers.IsEnumerable(t))
+                    {
+                        continue;
+                    }
+
                     yield return obj;
                 }
             }
         }
-
-        public static IEnumerable<Type> GetTypesSafe(Assembly asm)
-        {
-            try { return asm.GetTypes(); }
-            catch (ReflectionTypeLoadException e) { return e.Types.Where(x => x != null); }
-            catch { return Enumerable.Empty<Type>(); }
-        }
     }
 }

src/Menu/MainMenu/Pages/WindowPage.cs

@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
+using UnityEngine;
 
 namespace Explorer
 {
     public abstract class WindowPage
     {
-        public virtual string Name { get; set; }
+        public virtual string Name { get; }
 
         public Vector2 scroll = Vector2.zero;
 

src/Menu/ResizeDrag.cs

@@ -0,0 +1,158 @@
+using System;
+#if CPP
+using UnhollowerBaseLib;
+#endif
+using UnityEngine;
+
+namespace Explorer
+{
+    public class ResizeDrag
+    {
+#if CPP
+        private static bool RESIZE_FAILED = false;
+#endif
+
+        private static readonly GUIContent gcDrag = new GUIContent("<-- Drag to resize -->");
+        private static bool isResizing = false;
+        private static Rect m_currentResize;
+        private static int m_currentWindow;
+
+        public static Rect ResizeWindow(Rect _rect, int ID)
+        {
+#if CPP
+            if (!RESIZE_FAILED)
+            {
+                var origRect = _rect;
+
+                try
+                {
+                    GUILayout.BeginHorizontal(GUIContent.none, GUI.skin.box, null);
+
+                    GUI.skin.label.alignment = TextAnchor.MiddleCenter;
+#if ML
+                    GUILayout.Button(gcDrag, GUI.skin.label, new GUILayoutOption[] { GUILayout.Height(15) });
+#else
+                    GUILayout.Button(gcDrag.ToString(), new GUILayoutOption[] { GUILayout.Height(15) });
+#endif
+
+                    //var r = GUILayoutUtility.GetLastRect();
+                    var r = Internal_LayoutUtility.GetLastRect();
+
+                    var mousePos = InputManager.MousePosition;
+
+                    try
+                    {
+                        var mouse = GUIUnstrip.ScreenToGUIPoint(new Vector2(mousePos.x, Screen.height - mousePos.y));
+                        if (r.Contains(mouse) && InputManager.GetMouseButtonDown(0))
+                        {
+                            isResizing = true;
+                            m_currentWindow = ID;
+                            m_currentResize = new Rect(mouse.x, mouse.y, _rect.width, _rect.height);
+                        }
+                        else if (!InputManager.GetMouseButton(0))
+                        {
+                            isResizing = false;
+                        }
+
+                        if (isResizing && ID == m_currentWindow)
+                        {
+                            _rect.width = Mathf.Max(100, m_currentResize.width + (mouse.x - m_currentResize.x));
+                            _rect.height = Mathf.Max(100, m_currentResize.height + (mouse.y - m_currentResize.y));
+                            _rect.xMax = Mathf.Min(Screen.width, _rect.xMax);  // modifying xMax affects width, not x
+                            _rect.yMax = Mathf.Min(Screen.height, _rect.yMax);  // modifying yMax affects height, not y
+                        }
+                    }
+                    catch 
+                    {
+                        // throw safe Managed exception
+                        throw new Exception("");
+                    }
+
+                    GUILayout.EndHorizontal();
+                }
+                catch (Exception e) when (e.Message.StartsWith("System.ArgumentException"))
+                {
+                    // suppress
+                    return origRect;
+                }
+                catch (Exception e)
+                {
+                    RESIZE_FAILED = true;
+                    ExplorerCore.Log("Exception on GuiResize: " + e.GetType() + ", " + e.Message);
+                    //ExplorerCore.Log(e.StackTrace);
+                    return origRect;
+                }
+
+                GUI.skin.label.alignment = TextAnchor.UpperLeft;
+            }
+            else
+            {
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+
+                GUILayout.Label("Resize window:", new GUILayoutOption[] { GUILayout.Width(100) });
+
+                GUI.skin.label.alignment = TextAnchor.MiddleRight;
+                GUILayout.Label("<color=cyan>Width:</color>", new GUILayoutOption[] { GUILayout.Width(60) });
+                if (GUIUnstrip.RepeatButton("-", new GUILayoutOption[] { GUILayout.Width(20) }))
+                {
+                    _rect.width -= 5f;
+                }
+                if (GUIUnstrip.RepeatButton("+", new GUILayoutOption[] { GUILayout.Width(20) }))
+                {
+                    _rect.width += 5f;
+                }
+                GUILayout.Label("<color=cyan>Height:</color>", new GUILayoutOption[] { GUILayout.Width(60) });
+                if (GUIUnstrip.RepeatButton("-", new GUILayoutOption[] { GUILayout.Width(20) }))
+                {
+                    _rect.height -= 5f;
+                }
+                if (GUIUnstrip.RepeatButton("+", new GUILayoutOption[] { GUILayout.Width(20) }))
+                {
+                    _rect.height += 5f;
+                }
+
+                GUILayout.EndHorizontal();
+                GUI.skin.label.alignment = TextAnchor.UpperLeft;
+            }
+
+#else      // mono
+
+            GUILayout.BeginHorizontal(GUIContent.none, GUI.skin.box, null);
+
+            GUI.skin.label.alignment = TextAnchor.MiddleCenter;
+            GUILayout.Button(gcDrag, GUI.skin.label, new GUILayoutOption[] { GUILayout.Height(15) });
+
+            //var r = GUILayoutUtility.GetLastRect();
+            var r = GUILayoutUtility.GetLastRect();
+
+            var mousePos = InputManager.MousePosition;
+
+            var mouse = GUIUnstrip.ScreenToGUIPoint(new Vector2(mousePos.x, Screen.height - mousePos.y));
+            if (r.Contains(mouse) && InputManager.GetMouseButtonDown(0))
+            {
+                isResizing = true;
+                m_currentWindow = ID;
+                m_currentResize = new Rect(mouse.x, mouse.y, _rect.width, _rect.height);
+            }
+            else if (!InputManager.GetMouseButton(0))
+            {
+                isResizing = false;
+            }
+
+            if (isResizing && ID == m_currentWindow)
+            {
+                _rect.width = Mathf.Max(100, m_currentResize.width + (mouse.x - m_currentResize.x));
+                _rect.height = Mathf.Max(100, m_currentResize.height + (mouse.y - m_currentResize.y));
+                _rect.xMax = Mathf.Min(Screen.width, _rect.xMax);  // modifying xMax affects width, not x
+                _rect.yMax = Mathf.Min(Screen.height, _rect.yMax);  // modifying yMax affects height, not y
+            }
+
+            GUILayout.EndHorizontal();
+
+#endif
+            GUI.skin.label.alignment = TextAnchor.MiddleLeft;
+
+            return _rect;
+        }
+    }
+}

src/Menu/UIHelpers.cs

@@ -1,10 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Reflection;
-using UnhollowerRuntimeLib;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
@@ -62,13 +56,13 @@ namespace Explorer
 
             if (!obj)
             {
-                GUILayout.Label("<i><color=red>null</color></i>", null);
+                GUILayout.Label("<i><color=red>null</color></i>", new GUILayoutOption[0]);
                 return;
             }
 
             // ------ toggle active button ------
 
-            GUILayout.BeginHorizontal(null);
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
             GUI.skin.button.alignment = TextAnchor.UpperLeft;
 
             GUI.color = activeColor;
@@ -108,7 +102,7 @@ namespace Explorer
 
         public static void SmallInspectButton(object obj)
         {
-            if (GUILayout.Button("Inspect", null))
+            if (GUILayout.Button("Inspect", new GUILayoutOption[0]))
             {
                 WindowManager.InspectObject(obj, out bool _);
             }

src/Menu/UIStyles.cs

@@ -1,16 +1,29 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using UnityEngine;
+using UnityEngine;
 using Object = UnityEngine.Object;
 
 namespace Explorer
 {
     public class UIStyles
     {
+        public class Syntax
+        {
+            public const string Field_Static = "#8d8dc6";
+            public const string Field_Instance = "#c266ff";
+
+            public const string Method_Static = "#b55b02";
+            public const string Method_Instance = "#ff8000";
+
+            public const string Prop_Static = "#588075";
+            public const string Prop_Instance = "#55a38e";
+
+            public const string Class_Static = "#3a8d71";
+            public const string Class_Instance = "#2df7b2";
+
+            public const string Local = "#a6e9e9";
+
+            public const string StructGreen = "#92c470";
+        }
+
         public static Color LightGreen = new Color(Color.green.r - 0.3f, Color.green.g - 0.3f, Color.green.b - 0.3f);
 
         public static GUISkin WindowSkin
@@ -56,7 +69,10 @@ namespace Explorer
                 {
                     _horizBarStyle = new GUIStyle();
                     _horizBarStyle.normal.background = Texture2D.whiteTexture;
-                    _horizBarStyle.margin = new RectOffset(0, 0, 4, 4);
+                    var rectOffset = new RectOffset();
+                    rectOffset.top = 4;
+                    rectOffset.bottom = 4;
+                    _horizBarStyle.margin = rectOffset;
                     _horizBarStyle.fixedHeight = 2;
                 }
 
@@ -73,7 +89,10 @@ namespace Explorer
                 {
                     _horizBarSmallStyle = new GUIStyle();
                     _horizBarSmallStyle.normal.background = Texture2D.whiteTexture;
-                    _horizBarSmallStyle.margin = new RectOffset(0, 0, 2, 2);
+                    var rectOffset = new RectOffset();
+                    rectOffset.top = 2;
+                    rectOffset.bottom = 2;
+                    _horizBarSmallStyle.margin = rectOffset;
                     _horizBarSmallStyle.fixedHeight = 1;
                 }
 

src/Menu/Windows/GameObjectWindow.cs

@@ -0,0 +1,715 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+#if CPP
+using UnhollowerRuntimeLib;
+#endif
+
+namespace Explorer
+{
+    public class GameObjectWindow : UIWindow
+    {
+        public override string Title => WindowManager.TabView
+            ? $"<color=cyan>[G]</color> {TargetGO.name}"
+            : $"GameObject Inspector ({TargetGO.name})";
+
+        public GameObject TargetGO;
+
+        private static bool m_hideControls;
+
+        // gui element holders
+        private string m_name;
+        private string m_scene;
+
+        private Transform[] m_children;
+        private Vector2 m_transformScroll = Vector2.zero;
+        private readonly PageHelper ChildPages = new PageHelper();
+
+        private Component[] m_components;
+        private Vector2 m_compScroll = Vector2.zero;
+        private readonly PageHelper CompPages = new PageHelper();
+
+        private readonly Vector3[] m_cachedInput = new Vector3[3];
+        private float m_translateAmount = 0.3f;
+        private float m_rotateAmount = 50f;
+        private float m_scaleAmount = 0.1f;
+        private bool m_freeze;
+        private Vector3 m_frozenPosition;
+        private Quaternion m_frozenRotation;
+        private Vector3 m_frozenScale;
+        private bool m_autoApplyTransform;
+        private bool m_autoUpdateTransform;
+        private bool m_localContext;
+
+        private readonly List<Component> m_cachedDestroyList = new List<Component>();
+        private string m_addComponentInput = "";
+
+        private string m_setParentInput = "Enter a GameObject name or path";
+
+        public bool GetObjectAsGameObject()
+        {
+            var targetType = Target.GetType();
+
+            if (targetType == typeof(GameObject))
+            {
+                TargetGO = Target as GameObject;
+                return true;
+            }
+            else if (targetType == typeof(Transform))
+            {
+                TargetGO = (Target as Transform).gameObject;
+                return true;
+            }
+
+            ExplorerCore.Log("Error: Target is null or not a GameObject/Transform!");
+            DestroyWindow();
+            return false;
+        }
+
+        public override void Init()
+        {
+            if (!GetObjectAsGameObject())
+            {
+                return;
+            }
+
+            m_name = TargetGO.name;
+            m_scene = string.IsNullOrEmpty(TargetGO.scene.name) 
+                        ? "None (Asset/Resource)" 
+                        : TargetGO.scene.name;
+
+            CacheTransformValues();
+
+            Update();
+        }
+
+        private void CacheTransformValues()
+        {
+            if (m_localContext)
+            {
+                m_cachedInput[0] = TargetGO.transform.localPosition;
+                m_cachedInput[1] = TargetGO.transform.localEulerAngles;
+            }
+            else
+            {
+                m_cachedInput[0] = TargetGO.transform.position;
+                m_cachedInput[1] = TargetGO.transform.eulerAngles;
+            }
+            m_cachedInput[2] = TargetGO.transform.localScale;
+        }
+
+        public override void Update()
+        {
+            try
+            {
+                if (Target == null)
+                {
+                    ExplorerCore.Log("Target is null!");
+                    DestroyWindow();
+                    return;
+                }
+                if (Target is UnityEngine.Object uObj)
+                {
+                    if (!uObj)
+                    {
+                        ExplorerCore.Log("Target was destroyed!");
+                        DestroyWindow();
+                        return;
+                    }
+                }
+
+                if (!TargetGO && !GetObjectAsGameObject())
+                {
+                    throw new Exception("Object is null!");
+                }
+
+                if (m_freeze)
+                {
+                    if (m_localContext)
+                    {
+                        TargetGO.transform.localPosition = m_frozenPosition;
+                        TargetGO.transform.localRotation = m_frozenRotation;
+                    }
+                    else
+                    {
+                        TargetGO.transform.position = m_frozenPosition;
+                        TargetGO.transform.rotation = m_frozenRotation;
+                    }
+                    TargetGO.transform.localScale = m_frozenScale;
+                }
+
+                // update child objects
+                var childList = new List<Transform>();
+                for (int i = 0; i < TargetGO.transform.childCount; i++)
+                {
+                    childList.Add(TargetGO.transform.GetChild(i));
+                }
+                childList.Sort((a, b) => b.childCount.CompareTo(a.childCount));
+                m_children = childList.ToArray();
+
+                ChildPages.ItemCount = m_children.Length;
+
+                // update components
+#if CPP
+                var compList = new Il2CppSystem.Collections.Generic.List<Component>();
+                TargetGO.GetComponentsInternal(ReflectionHelpers.ComponentType, true, false, true, false, compList);
+                m_components = compList.ToArray();
+#else
+                m_components = TargetGO.GetComponents<Component>();
+#endif
+
+                CompPages.ItemCount = m_components.Length;
+            }
+            catch (Exception e)
+            {
+                DestroyOnException(e);
+            }
+        }
+
+        private void DestroyOnException(Exception e)
+        {
+            ExplorerCore.Log($"Exception drawing GameObject Window: {e.GetType()}, {e.Message}");
+            DestroyWindow();
+        }
+
+        private void InspectGameObject(Transform obj)
+        {
+            var window = WindowManager.InspectObject(obj, out bool created);
+            
+            if (created)
+            {
+                window.m_rect = new Rect(this.m_rect.x, this.m_rect.y, this.m_rect.width, this.m_rect.height);
+                DestroyWindow();
+            }
+        }
+
+#if CPP
+        private void ReflectObject(Il2CppSystem.Object obj)
+#else
+        private void ReflectObject(object obj)
+#endif
+        { 
+            var window = WindowManager.InspectObject(obj, out bool created, true);
+
+            if (created)
+            {
+                if (this.m_rect.x <= (Screen.width - this.m_rect.width - 100))
+                {
+                    window.m_rect = new Rect(
+                        this.m_rect.x + this.m_rect.width + 20,
+                        this.m_rect.y,
+                        550,
+                        700);
+                }
+                else
+                {
+                    window.m_rect = new Rect(this.m_rect.x + 50, this.m_rect.y + 50, 550, 700);
+                }
+            }
+        }
+
+        public override void WindowFunction(int windowID)
+        {
+            try
+            {
+                var rect = WindowManager.TabView ? TabViewWindow.Instance.m_rect : this.m_rect;
+
+                if (!WindowManager.TabView)
+                {
+                    Header();
+                    GUIUnstrip.BeginArea(new Rect(5, 25, rect.width - 10, rect.height - 35), GUI.skin.box);
+                }
+
+                scroll = GUIUnstrip.BeginScrollView(scroll);
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUILayout.Label("Scene: <color=cyan>" + (m_scene == "" ? "n/a" : m_scene) + "</color>", new GUILayoutOption[0]);
+                if (m_scene == UnityHelpers.ActiveSceneName)
+                {
+                    if (GUILayout.Button("<color=#00FF00>Send to Scene View</color>", new GUILayoutOption[] { GUILayout.Width(150) }))
+                    {
+                        ScenePage.Instance.SetTransformTarget(TargetGO.transform);
+                        MainMenu.SetCurrentPage(0);
+                    }
+                }
+                if (GUILayout.Button("Reflection Inspect", new GUILayoutOption[] { GUILayout.Width(150) }))
+                {
+                    WindowManager.InspectObject(Target, out _, true);
+                }
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUILayout.Label("Path:", new GUILayoutOption[] { GUILayout.Width(50) });
+                string pathlabel = TargetGO.transform.GetGameObjectPath();
+                if (TargetGO.transform.parent != null)
+                {
+                    if (GUILayout.Button("<-", new GUILayoutOption[] { GUILayout.Width(35) }))
+                    {
+                        InspectGameObject(TargetGO.transform.parent);
+                    }
+                }
+                GUIUnstrip.TextArea(pathlabel, new GUILayoutOption[0]);
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUILayout.Label("Name:", new GUILayoutOption[] { GUILayout.Width(50) });
+                GUIUnstrip.TextArea(m_name, new GUILayoutOption[0]);
+                GUILayout.EndHorizontal();
+
+                // --- Horizontal Columns section ---
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+
+                GUILayout.BeginVertical(new GUILayoutOption[] { GUILayout.Width(rect.width / 2 - 17) });
+                TransformList(rect);
+                GUILayout.EndVertical();
+
+                GUILayout.BeginVertical(new GUILayoutOption[] { GUILayout.Width(rect.width / 2 - 17) });
+                ComponentList(rect);
+                GUILayout.EndVertical();
+
+                GUILayout.EndHorizontal(); // end horiz columns
+
+                GameObjectControls();
+
+                GUIUnstrip.EndScrollView();
+
+                if (!WindowManager.TabView)
+                {
+                    m_rect = ResizeDrag.ResizeWindow(rect, windowID);
+
+                    GUIUnstrip.EndArea();
+                }
+            }
+            catch (Exception e)
+            {
+                DestroyOnException(e);
+            }
+        }
+
+        private void TransformList(Rect m_rect)
+        {
+            GUILayout.BeginVertical(GUIContent.none, GUI.skin.box, null);
+            m_transformScroll = GUIUnstrip.BeginScrollView(m_transformScroll);
+
+            GUILayout.Label("<b><size=15>Children</size></b>", new GUILayoutOption[0]);
+
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            ChildPages.DrawLimitInputArea();
+
+            if (ChildPages.ItemCount > ChildPages.ItemsPerPage)
+            {
+                ChildPages.CurrentPageLabel();
+
+                GUILayout.EndHorizontal();
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+
+                if (GUILayout.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(80) }))
+                {
+                    ChildPages.TurnPage(Turn.Left, ref this.m_transformScroll);
+                }
+                if (GUILayout.Button("Next >", new GUILayoutOption[] { GUILayout.Width(80) }))
+                {
+                    ChildPages.TurnPage(Turn.Right, ref this.m_transformScroll);
+                }
+            }
+            GUILayout.EndHorizontal();
+
+            if (m_children != null && m_children.Length > 0)
+            {
+                int start = ChildPages.CalculateOffsetIndex();
+
+                for (int j = start; (j < start + ChildPages.ItemsPerPage && j < ChildPages.ItemCount); j++)
+                {
+                    var obj = m_children[j];
+
+                    if (!obj)
+                    {
+                        GUILayout.Label("null", new GUILayoutOption[0]);
+                        continue;
+                    }
+
+                    UIHelpers.GOButton(obj.gameObject, InspectGameObject, false, m_rect.width / 2 - 80);
+                }
+            }
+            else
+            {
+                GUILayout.Label("<i>None</i>", new GUILayoutOption[0]);
+            }
+
+            GUIUnstrip.EndScrollView();
+            GUILayout.EndVertical();
+        }
+
+        private void ComponentList(Rect m_rect)
+        {
+            GUILayout.BeginVertical(GUIContent.none, GUI.skin.box, null);
+            m_compScroll = GUIUnstrip.BeginScrollView(m_compScroll);
+            GUILayout.Label("<b><size=15>Components</size></b>", new GUILayoutOption[0]);
+
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            CompPages.DrawLimitInputArea();
+
+            if (CompPages.ItemCount > CompPages.ItemsPerPage)
+            {
+                CompPages.CurrentPageLabel();
+
+                GUILayout.EndHorizontal();
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+
+                if (GUILayout.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(80) }))
+                {
+                    CompPages.TurnPage(Turn.Left, ref this.m_compScroll);
+                }
+                if (GUILayout.Button("Next >", new GUILayoutOption[] { GUILayout.Width(80) }))
+                {
+                    CompPages.TurnPage(Turn.Right, ref this.m_compScroll);
+                }
+            }
+            GUILayout.EndHorizontal();
+
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            var width = m_rect.width / 2 - 135f;
+            m_addComponentInput = GUIUnstrip.TextField(m_addComponentInput, new GUILayoutOption[] { GUILayout.Width(width) });
+            if (GUILayout.Button("Add Comp", new GUILayoutOption[0]))
+            {
+                if (ReflectionHelpers.GetTypeByName(m_addComponentInput) is Type compType)
+                {
+                    if (typeof(Component).IsAssignableFrom(compType))
+                    {
+#if CPP
+                        TargetGO.AddComponent(Il2CppType.From(compType));
+#else
+                        TargetGO.AddComponent(compType);
+#endif
+                    }
+                    else
+                    {
+                        ExplorerCore.LogWarning($"Type '{compType.Name}' is not assignable from Component!");
+                    }
+                }
+                else
+                {
+                    ExplorerCore.LogWarning($"Could not find a type by the name of '{m_addComponentInput}'!");
+                }
+            }
+            GUILayout.EndHorizontal();
+
+            GUI.skin.button.alignment = TextAnchor.MiddleLeft;
+            if (m_cachedDestroyList.Count > 0)
+            {
+                m_cachedDestroyList.Clear();
+            }
+
+            if (m_components != null)
+            {
+                int start = CompPages.CalculateOffsetIndex();
+
+                for (int j = start; (j < start + CompPages.ItemsPerPage && j < CompPages.ItemCount); j++)
+                {
+                    var component = m_components[j];
+
+                    if (!component) continue;
+
+                    var type =
+#if CPP
+                        component.GetIl2CppType();
+#else
+                        component.GetType();
+#endif
+                    GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                    if (ReflectionHelpers.BehaviourType.IsAssignableFrom(type))
+                    {
+#if CPP
+                        BehaviourEnabledBtn(component.TryCast<Behaviour>());
+#else
+                        BehaviourEnabledBtn(component as Behaviour);
+#endif
+                    }
+                    else
+                    {
+                        GUIUnstrip.Space(26);
+                    }
+                    if (GUILayout.Button("<color=cyan>" + type.Name + "</color>", new GUILayoutOption[] { GUILayout.Width(m_rect.width / 2 - 100) }))
+                    {
+                        ReflectObject(component);
+                    }
+                    if (GUILayout.Button("<color=red>-</color>", new GUILayoutOption[] { GUILayout.Width(20) }))
+                    {
+                        m_cachedDestroyList.Add(component);
+                    }
+                    GUILayout.EndHorizontal();
+                }
+            }
+
+            GUI.skin.button.alignment = TextAnchor.MiddleCenter;
+            if (m_cachedDestroyList.Count > 0)
+            {
+                for (int i = m_cachedDestroyList.Count - 1; i >= 0; i--)
+                {
+                    var comp = m_cachedDestroyList[i];
+                    GameObject.Destroy(comp);
+                }
+            }
+
+            GUIUnstrip.EndScrollView();
+
+            GUILayout.EndVertical();
+        }
+
+        private void BehaviourEnabledBtn(Behaviour obj)
+        {
+            var _col = GUI.color;
+            bool _enabled = obj.enabled;
+            if (_enabled)
+            {
+                GUI.color = Color.green;
+            }
+            else
+            {
+                GUI.color = Color.red;
+            }
+
+            // ------ toggle active button ------
+
+            _enabled = GUILayout.Toggle(_enabled, "", new GUILayoutOption[] { GUILayout.Width(18) });
+            if (obj.enabled != _enabled)
+            {
+                obj.enabled = _enabled;
+            }
+            GUI.color = _col;
+        }
+
+        private void GameObjectControls()
+        {
+            if (m_hideControls)
+            {
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+                GUILayout.Label("<b><size=15>GameObject Controls</size></b>", new GUILayoutOption[] { GUILayout.Width(200) });
+                if (GUILayout.Button("^ Show ^", new GUILayoutOption[] { GUILayout.Width(75) }))
+                {
+                    m_hideControls = false;
+                }
+                GUILayout.EndHorizontal();
+
+                return;
+            }
+
+            GUILayout.BeginVertical(GUIContent.none, GUI.skin.box, new GUILayoutOption[] { GUILayout.Width(520) });
+
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            GUILayout.Label("<b><size=15>GameObject Controls</size></b>", new GUILayoutOption[] { GUILayout.Width(200) });
+            if (GUILayout.Button("v Hide v", new GUILayoutOption[] { GUILayout.Width(75) }))
+            {
+                m_hideControls = true;
+            }
+            GUILayout.EndHorizontal();
+
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            bool m_active = TargetGO.activeSelf;
+            m_active = GUILayout.Toggle(m_active, (m_active ? "<color=lime>Enabled " : "<color=red>Disabled") + "</color>",
+                new GUILayoutOption[] { GUILayout.Width(80) });
+            if (TargetGO.activeSelf != m_active) { TargetGO.SetActive(m_active); }
+
+            UIHelpers.InstantiateButton(TargetGO, 100);
+
+            if (GUILayout.Button("Set DontDestroyOnLoad", new GUILayoutOption[] { GUILayout.Width(170) }))
+            {
+                GameObject.DontDestroyOnLoad(TargetGO);
+                TargetGO.hideFlags |= HideFlags.DontUnloadUnusedAsset;
+            }
+
+            var lbl = m_freeze ? "<color=lime>Unfreeze</color>" : "<color=orange>Freeze Pos/Rot</color>";
+            if (GUILayout.Button(lbl, new GUILayoutOption[] { GUILayout.Width(110) }))
+            {
+                m_freeze = !m_freeze;
+                if (m_freeze)
+                {
+                    UpdateFreeze();
+                }
+            }
+
+            GUILayout.EndHorizontal();
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+
+            m_setParentInput = GUIUnstrip.TextField(m_setParentInput, new GUILayoutOption[0]);
+            if (GUILayout.Button("Set Parent", new GUILayoutOption[] { GUILayout.Width(80) }))
+            {
+                if (GameObject.Find(m_setParentInput) is GameObject newparent)
+                {
+                    TargetGO.transform.parent = newparent.transform;
+                }
+                else
+                {
+                    ExplorerCore.LogWarning($"Could not find gameobject '{m_setParentInput}'");
+                }
+            }
+
+            if (GUILayout.Button("Detach from parent", new GUILayoutOption[] { GUILayout.Width(160) }))
+            {
+                TargetGO.transform.parent = null;
+            }
+            GUILayout.EndHorizontal();
+
+            GUILayout.BeginVertical(GUIContent.none, GUI.skin.box, null);
+
+            m_cachedInput[0] = TranslateControl(TranslateType.Position, ref m_translateAmount,  false);
+            m_cachedInput[1] = TranslateControl(TranslateType.Rotation, ref m_rotateAmount,     true);
+            m_cachedInput[2] = TranslateControl(TranslateType.Scale,    ref m_scaleAmount,      false);
+
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            if (GUILayout.Button("<color=lime>Apply to Transform</color>", new GUILayoutOption[0]) || m_autoApplyTransform)
+            {
+                if (m_localContext)
+                {
+                    TargetGO.transform.localPosition = m_cachedInput[0];
+                    TargetGO.transform.localEulerAngles = m_cachedInput[1];
+                }
+                else
+                {
+                    TargetGO.transform.position = m_cachedInput[0];
+                    TargetGO.transform.eulerAngles = m_cachedInput[1];
+                }
+                TargetGO.transform.localScale = m_cachedInput[2];
+
+                if (m_freeze)
+                {
+                    UpdateFreeze();
+                }
+            }
+            if (GUILayout.Button("<color=lime>Update from Transform</color>", new GUILayoutOption[0]) || m_autoUpdateTransform)
+            {
+                CacheTransformValues();
+            }
+            GUILayout.EndHorizontal();
+
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            BoolToggle(ref m_autoApplyTransform, "Auto-apply to Transform?");
+            BoolToggle(ref m_autoUpdateTransform, "Auto-update from transform?");
+            GUILayout.EndHorizontal();
+
+            bool b = m_localContext;
+            b = GUILayout.Toggle(b, "<color=" + (b ? "lime" : "orange") + ">Use local transform values?</color>", new GUILayoutOption[0]);
+            if (b != m_localContext)
+            {
+                m_localContext = b;
+                CacheTransformValues();
+                if (m_freeze)
+                {
+                    UpdateFreeze();
+                }
+            }
+
+            GUILayout.EndVertical();
+
+            if (GUILayout.Button("<color=red><b>Destroy</b></color>", new GUILayoutOption[] { GUILayout.Width(120) }))
+            {
+                GameObject.Destroy(TargetGO);
+                DestroyWindow();
+                return;
+            }
+
+            GUILayout.EndVertical();
+        }
+
+        private void UpdateFreeze()
+        {
+            if (m_localContext)
+            {
+                m_frozenPosition = TargetGO.transform.localPosition;
+                m_frozenRotation = TargetGO.transform.localRotation;
+            }
+            else
+            {
+                m_frozenPosition = TargetGO.transform.position;
+                m_frozenRotation = TargetGO.transform.rotation;
+            }
+            m_frozenScale = TargetGO.transform.localScale;
+        }
+
+        private void BoolToggle(ref bool value, string message)
+        {
+            string lbl = "<color=";
+            lbl += value ? "lime" : "orange";
+            lbl += $">{message}</color>";
+
+            value = GUILayout.Toggle(value, lbl, new GUILayoutOption[0]);
+        }
+
+        public enum TranslateType
+        {
+            Position,
+            Rotation,
+            Scale
+        }
+
+        private Vector3 TranslateControl(TranslateType mode, ref float amount, bool multByTime)
+        {
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            GUILayout.Label($"<color=cyan><b>{(m_localContext ? "Local " : "")}{mode}</b></color>:", 
+                new GUILayoutOption[] { GUILayout.Width(m_localContext ? 110 : 65) });
+
+            var transform = TargetGO.transform;
+            switch (mode)
+            {
+                case TranslateType.Position:
+                    var pos = m_localContext ? transform.localPosition : transform.position;
+                    GUILayout.Label(pos.ToString(), new GUILayoutOption[] { GUILayout.Width(250) });
+                    break;
+                case TranslateType.Rotation:
+                    var rot = m_localContext ? transform.localEulerAngles : transform.eulerAngles;
+                    GUILayout.Label(rot.ToString(), new GUILayoutOption[] { GUILayout.Width(250) });
+                    break;
+                case TranslateType.Scale:
+                    GUILayout.Label(transform.localScale.ToString(), new GUILayoutOption[] { GUILayout.Width(250) });
+                    break;
+            }
+            GUILayout.EndHorizontal();
+
+            Vector3 input = m_cachedInput[(int)mode];
+
+            GUILayout.BeginHorizontal(new GUILayoutOption[0]);
+            GUI.skin.label.alignment = TextAnchor.MiddleRight;
+
+            GUILayout.Label("<color=cyan>X:</color>", new GUILayoutOption[] { GUILayout.Width(20) });
+            PlusMinusFloat(ref input.x, amount, multByTime);
+
+            GUILayout.Label("<color=cyan>Y:</color>", new GUILayoutOption[] { GUILayout.Width(20) });
+            PlusMinusFloat(ref input.y, amount, multByTime);
+
+            GUILayout.Label("<color=cyan>Z:</color>", new GUILayoutOption[] { GUILayout.Width(20) });
+            PlusMinusFloat(ref input.z, amount, multByTime);            
+
+            GUILayout.Label("+/-:", new GUILayoutOption[] { GUILayout.Width(30) });
+            var amountInput = amount.ToString("F3");
+            amountInput = GUIUnstrip.TextField(amountInput, new GUILayoutOption[] { GUILayout.Width(60) });
+            if (float.TryParse(amountInput, out float f))
+            {
+                amount = f;
+            }
+
+            GUI.skin.label.alignment = TextAnchor.UpperLeft;
+            GUILayout.EndHorizontal();
+
+            return input;
+        }
+
+        private void PlusMinusFloat(ref float f, float amount, bool multByTime)
+        {
+            string s = f.ToString("F3");
+            s = GUIUnstrip.TextField(s, new GUILayoutOption[] { GUILayout.Width(60) });
+            if (float.TryParse(s, out float f2))
+            {
+                f = f2;
+            }
+            if (GUIUnstrip.RepeatButton("-", new GUILayoutOption[] { GUILayout.Width(20) }))
+            {
+                f -= multByTime ? amount * Time.deltaTime : amount;
+            }
+            if (GUIUnstrip.RepeatButton("+", new GUILayoutOption[] { GUILayout.Width(20) }))
+            {
+                f += multByTime ? amount * Time.deltaTime : amount;
+            }
+        }
+    }
+}

src/Menu/Windows/ReflectionWindow.cs

@@ -1,12 +1,11 @@
 using System;
-using System.CodeDom;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using MelonLoader;
-using UnhollowerBaseLib;
 using UnityEngine;
+#if CPP
+using UnhollowerBaseLib;
+#endif
 
 namespace Explorer
 {
@@ -22,28 +21,39 @@ namespace Explorer
         private CacheObjectBase[] m_cachedMembersFiltered;
 
         public PageHelper Pages = new PageHelper();
-        //private int m_pageOffset;
-        //private int m_limitPerPage = 20;
 
         private bool m_autoUpdate = false;
         private string m_search = "";
         public MemberTypes m_filter = MemberTypes.Property;
         private bool m_hideFailedReflection = false;
 
-        // some extra caching
+        // some extra cast-caching
         private UnityEngine.Object m_uObj;
         private Component m_component;
 
+        private static readonly HashSet<string> _typeAndMemberBlacklist = new HashSet<string>
+        {
+            // Causes a crash
+            "Type.DeclaringMethod",
+            // Causes a crash
+            "Rigidbody2D.Cast",
+        };
+
+        private static readonly HashSet<string> _methodStartsWithBlacklist = new HashSet<string>
+        {
+            // Pointless (handled by Properties)
+            "get_",
+            "set_",
+        };
+
         public override void Init()
         {
-            var type = ReflectionHelpers.GetActualType(Target);
+            TargetType = ReflectionHelpers.GetActualType(Target);
 
-            TargetType = type;
-
-            var types = ReflectionHelpers.GetAllBaseTypes(Target);
-
-            CacheMembers(types);
+            CacheMembers(ReflectionHelpers.GetAllBaseTypes(Target));
 
+            // cache the extra cast-caching
+#if CPP
             if (Target is Il2CppSystem.Object ilObject)
             {
                 var unityObj = ilObject.TryCast<UnityEngine.Object>();
@@ -58,17 +68,30 @@ namespace Explorer
                     }
                 }
             }
-
-            m_filter = MemberTypes.All;
-            m_autoUpdate = true;
-            Update();
-
-            m_autoUpdate = false;
-            m_filter = MemberTypes.Property;
+#else
+            m_uObj = Target as UnityEngine.Object;
+            m_component = Target as Component;
+#endif
         }
 
         public override void Update()
         {
+            if (Target == null)
+            {
+                ExplorerCore.Log("Target is null!");
+                DestroyWindow();
+                return;
+            }
+            if (Target is UnityEngine.Object uObj)
+            {
+                if (!uObj)
+                {
+                    ExplorerCore.Log("Target was destroyed!");
+                    DestroyWindow();
+                    return;
+                }
+            }
+
             m_cachedMembersFiltered = m_allCachedMembers.Where(x => ShouldProcessMember(x)).ToArray();
 
             if (m_autoUpdate)
@@ -87,40 +110,46 @@ namespace Explorer
 
         private bool ShouldProcessMember(CacheObjectBase holder)
         {
-            if (m_filter != MemberTypes.All && m_filter != holder.MemInfo?.MemberType) return false;
+            // check MemberTypes filter
+            if (m_filter != MemberTypes.All && m_filter != holder.MemInfo?.MemberType) 
+                return false;
 
-            if (!string.IsNullOrEmpty(holder.ReflectionException) && m_hideFailedReflection) return false;
+            // hide failed reflection
+            if (!string.IsNullOrEmpty(holder.ReflectionException) && m_hideFailedReflection) 
+                return false;
 
-            if (m_search == "" || holder.MemInfo == null) return true;
+            // see if we should do name search
+            if (m_search == "" || holder.MemInfo == null) 
+                return true;
 
-            var name = holder.MemInfo.DeclaringType.Name + "." + holder.MemInfo.Name;
-
-            return name.ToLower().Contains(m_search.ToLower());
+            // ok do name search
+            return (holder.MemInfo.DeclaringType.Name + "." + holder.MemInfo.Name)
+                    .ToLower()
+                    .Contains(m_search.ToLower());
         }
 
         private void CacheMembers(Type[] types)
         {
             var list = new List<CacheObjectBase>();
-
-            var names = new List<string>();
+            var cachedSigs = new List<string>();
 
             foreach (var declaringType in types)
             {
                 MemberInfo[] infos;
-                string exception = null;
-
                 try
                 {
                     infos = declaringType.GetMembers(ReflectionHelpers.CommonFlags);
                 }
                 catch 
                 {
-                    MelonLogger.Log($"Exception getting members for type: {declaringType.FullName}");
+                    ExplorerCore.Log($"Exception getting members for type: {declaringType.FullName}");
                     continue;
                 }
 
                 object target = Target;
+                string exception = null;
 
+#if CPP
                 if (target is Il2CppSystem.Object ilObject)
                 {
                     try
@@ -132,49 +161,64 @@ namespace Explorer
                         exception = ReflectionHelpers.ExceptionToString(e);
                     }
                 }
+#endif
 
                 foreach (var member in infos)
                 {
-                    if (member.MemberType == MemberTypes.Field || member.MemberType == MemberTypes.Property || member.MemberType == MemberTypes.Method)
+                    // make sure member type is Field, Method of Property (4 / 8 / 16)
+                    int m = (int)member.MemberType;
+                    if (m < 4 || m > 16)
+                        continue;
+
+                    // check blacklisted members
+                    var sig = $"{member.DeclaringType.Name}.{member.Name}";
+                    if (_typeAndMemberBlacklist.Any(it => it == sig))
+                        continue;
+
+                    if (_methodStartsWithBlacklist.Any(it => member.Name.StartsWith(it)))
+                        continue;
+
+                    if (member is MethodInfo mi)
                     {
-                        var name = $"{member.DeclaringType.Name}.{member.Name}";
+                        AppendParams(mi.GetParameters());
+                    }
+                    else if (member is PropertyInfo pi)
+                    {
+                        AppendParams(pi.GetIndexParameters());
+                    }
 
-                        // blacklist (should probably make a proper implementation)
-                        if (name == "Type.DeclaringMethod" || member.Name.StartsWith("get_") || member.Name.StartsWith("set_")) //|| member.Name.Contains("Il2CppType")
+                    void AppendParams(ParameterInfo[] _args)
+                    {
+                        sig += " (";
+                        foreach (var param in _args)
                         {
-                            continue;
+                            sig += $"{param.ParameterType.Name} {param.Name}, ";
                         }
+                        sig += ")";
+                    }
 
-                        if (member is MethodInfo mi)
-                        {
-                            name += " (";
-                            foreach (var param in mi.GetParameters())
-                            {
-                                name += param.ParameterType.Name + ", ";
-                            }
-                            name += ")";
-                        }
-                        if (names.Contains(name))
-                        {
-                            continue;
-                        }
+                    if (cachedSigs.Contains(sig))
+                    {
+                        continue;
+                    }
 
-                        try
+                    // ExplorerCore.Log($"Trying to cache member {signature}...");
+
+                    try
+                    {
+                        var cached = CacheFactory.GetTypeAndCacheObject(member, target);
+                        if (cached != null)
                         {
-                            var cached = CacheObjectBase.GetCacheObject(member, target);
-                            if (cached != null)
-                            {
-                                names.Add(name);
-                                list.Add(cached);
-                                cached.ReflectionException = exception;
-                            }
-                        }
-                        catch (Exception e) 
-                        {
-                            MelonLogger.LogWarning($"Exception caching member {name}!");
-                            MelonLogger.Log(e.ToString());
+                            cachedSigs.Add(sig);
+                            list.Add(cached);
+                            cached.ReflectionException = exception;
                         }
                     }
+                    catch (Exception e)
+                    {
+                        ExplorerCore.LogWarning($"Exception caching member {sig}!");
+                        ExplorerCore.Log(e.ToString());
+                    }
                 }
             }
 
@@ -194,20 +238,20 @@ namespace Explorer
                 if (!WindowManager.TabView)
                 {
                     Header();
-                    GUILayout.BeginArea(new Rect(5, 25, rect.width - 10, rect.height - 35), GUI.skin.box);
+                    GUIUnstrip.BeginArea(new Rect(5, 25, rect.width - 10, rect.height - 35), GUI.skin.box);
                 }
 
-                GUILayout.BeginHorizontal(null);
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
                 GUILayout.Label("<b>Type:</b> <color=cyan>" + TargetType.FullName + "</color>", new GUILayoutOption[] { GUILayout.Width(245f) });
                 if (m_uObj)
                 {
-                    GUILayout.Label("Name: " + m_uObj.name, null);
+                    GUILayout.Label("Name: " + m_uObj.name, new GUILayoutOption[0]);
                 }
                 GUILayout.EndHorizontal();
 
                 if (m_uObj)
                 {
-                    GUILayout.BeginHorizontal(null);
+                    GUILayout.BeginHorizontal(new GUILayoutOption[0]);
                     GUILayout.Label("<b>Tools:</b>", new GUILayoutOption[] { GUILayout.Width(80) });
                     UIHelpers.InstantiateButton(m_uObj);
                     if (m_component && m_component.gameObject is GameObject obj)
@@ -228,12 +272,12 @@ namespace Explorer
 
                 UIStyles.HorizontalLine(Color.grey);
 
-                GUILayout.BeginHorizontal(null);
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
                 GUILayout.Label("<b>Search:</b>", new GUILayoutOption[] { GUILayout.Width(75) });
-                m_search = GUILayout.TextField(m_search, null);                
+                m_search = GUIUnstrip.TextField(m_search, new GUILayoutOption[0]);                
                 GUILayout.EndHorizontal();
 
-                GUILayout.BeginHorizontal(null);
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
                 GUILayout.Label("<b>Filter:</b>", new GUILayoutOption[] { GUILayout.Width(75) });
                 FilterToggle(MemberTypes.All, "All");
                 FilterToggle(MemberTypes.Property, "Properties");
@@ -241,7 +285,7 @@ namespace Explorer
                 FilterToggle(MemberTypes.Method, "Methods");
                 GUILayout.EndHorizontal();
 
-                GUILayout.BeginHorizontal(null);
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
                 GUILayout.Label("<b>Values:</b>", new GUILayoutOption[] { GUILayout.Width(75) });
                 if (GUILayout.Button("Update", new GUILayoutOption[] { GUILayout.Width(100) }))
                 {
@@ -254,12 +298,12 @@ namespace Explorer
                 GUI.color = Color.white;
                 GUILayout.EndHorizontal();
 
-                GUILayout.Space(10);
+                GUIUnstrip.Space(10);
 
                 Pages.ItemCount = m_cachedMembersFiltered.Length;
 
                 // prev/next page buttons
-                GUILayout.BeginHorizontal(null);
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
 
                 Pages.DrawLimitInputArea();
 
@@ -283,11 +327,11 @@ namespace Explorer
 
                 scroll = GUIUnstrip.BeginScrollView(scroll);
 
-                GUILayout.Space(10);
+                GUIUnstrip.Space(10);
 
                 UIStyles.HorizontalLine(Color.grey);
 
-                GUILayout.BeginVertical(GUI.skin.box, null);
+                GUILayout.BeginVertical(GUIContent.none, GUI.skin.box, null);
 
                 var members = this.m_cachedMembersFiltered;
                 int start = Pages.CalculateOffsetIndex();
@@ -320,19 +364,16 @@ namespace Explorer
                 {
                     m_rect = ResizeDrag.ResizeWindow(rect, windowID);
 
-                    GUILayout.EndArea();
+                    GUIUnstrip.EndArea();
                 }
             }
-            catch (Il2CppException e)
+            catch (Exception e) when (e.Message.Contains("in a group with only"))
             {
-                if (!e.Message.Contains("in a group with only"))
-                {
-                    throw;
-                }
+                // suppress
             }
             catch (Exception e)
             {
-                MelonLogger.LogWarning("Exception drawing ReflectionWindow: " + e.GetType() + ", " + e.Message);
+                ExplorerCore.LogWarning("Exception drawing ReflectionWindow: " + e.GetType() + ", " + e.Message);
                 DestroyWindow();
                 return;
             }

src/Menu/Windows/TabViewWindow.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using MelonLoader;
-using UnityEngine;
+using UnityEngine;
 
 namespace Explorer
 {
@@ -26,6 +20,7 @@ namespace Explorer
         }
 
         public override void Init() { }
+
         public override void Update() 
         {
             while (TargetTabID >= WindowManager.Windows.Count)
@@ -55,7 +50,7 @@ namespace Explorer
             try
             {
                 GUI.DragWindow(new Rect(0, 0, m_rect.width - 90, 20));
-                if (GUI.Button(new Rect(m_rect.width - 90, 2, 80, 20), "<color=red>Close All</color>"))
+                if (GUIUnstrip.Button(new Rect(m_rect.width - 90, 2, 80, 20), "<color=red>Close All</color>"))
                 {
                     foreach (var window in WindowManager.Windows)
                     {
@@ -64,10 +59,10 @@ namespace Explorer
                     return;
                 }
 
-                GUILayout.BeginArea(new Rect(5, 25, m_rect.width - 10, m_rect.height - 35), GUI.skin.box);
+                GUIUnstrip.BeginArea(new Rect(5, 25, m_rect.width - 10, m_rect.height - 35), GUI.skin.box);
 
-                GUILayout.BeginVertical(GUI.skin.box, null);
-                GUILayout.BeginHorizontal(null);
+                GUILayout.BeginVertical(GUIContent.none, GUI.skin.box, null);
+                GUILayout.BeginHorizontal(new GUILayoutOption[0]);
                 GUI.skin.button.alignment = TextAnchor.MiddleLeft;
                 int tabPerRow = Mathf.FloorToInt((float)((decimal)m_rect.width / 238));
                 int rowCount = 0;
@@ -77,7 +72,7 @@ namespace Explorer
                     {
                         rowCount = 0;
                         GUILayout.EndHorizontal();
-                        GUILayout.BeginHorizontal(null);
+                        GUILayout.BeginHorizontal(new GUILayoutOption[0]);
                     }
                     rowCount++;
 
@@ -108,7 +103,7 @@ namespace Explorer
                 }
                 catch { }
 
-                GUILayout.EndArea();
+                GUIUnstrip.EndArea();
             }
             catch { }
         }

src/Menu/Windows/UIWindow.cs

@@ -1,11 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Harmony;
-using MelonLoader;
-using UnhollowerBaseLib;
-using UnhollowerRuntimeLib;
 using UnityEngine;
 
 namespace Explorer
@@ -17,7 +10,7 @@ namespace Explorer
         public object Target;
 
         public int windowID;
-        public Rect m_rect = new Rect(0, 0, 550, 700);
+        public Rect m_rect = new Rect(0,0, ModConfig.Instance.Default_Window_Size.x,ModConfig.Instance.Default_Window_Size.y);
 
         public Vector2 scroll = Vector2.zero;
 
@@ -49,15 +42,11 @@ namespace Explorer
 
         public void OnGUI()
         {
-            if (CppExplorer.ShowMenu)
-            {
-                var origSkin = GUI.skin;
-
-                GUI.skin = UIStyles.WindowSkin;
-                m_rect = GUI.Window(windowID, m_rect, (GUI.WindowFunction)WindowFunction, Title);
-
-                GUI.skin = origSkin;
-            }
+#if CPP
+            m_rect = GUI.Window(windowID, m_rect, (GUI.WindowFunction)WindowFunction, GUIContent.Temp(Title), GUI.skin.window);
+#else
+            m_rect = GUI.Window(windowID, m_rect, WindowFunction, Title);
+#endif
         }
 
         public void Header()
@@ -65,8 +54,12 @@ namespace Explorer
             if (!WindowManager.TabView)
             {
                 GUI.DragWindow(new Rect(0, 0, m_rect.width - 90, 20));
-            
-                if (GUI.Button(new Rect(m_rect.width - 90, 2, 80, 20), "<color=red><b>X</b></color>"))
+
+#if CPP
+                if (GUI.Button(new Rect(m_rect.width - 90, 2, 80, 20), GUIContent.Temp("<color=red><b>X</b></color>"), GUI.skin.button))
+#else
+                if (GUI.Button(new Rect(m_rect.width - 90, 2, 80, 20), "<color=red><b>X</b></color>", GUI.skin.button))
+#endif
                 {
                     DestroyWindow();
                     return;

src/Menu/Windows/WindowManager.cs

@@ -1,14 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Harmony;
-using MelonLoader;
-using UnhollowerBaseLib;
-using UnhollowerRuntimeLib;
+using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.EventSystems;
 
 namespace Explorer
 {
@@ -90,16 +81,20 @@ namespace Explorer
         {
             createdNew = false;
 
-            if (Input.GetKey(KeyCode.LeftShift))
+            if (InputManager.GetKey(KeyCode.LeftShift))
             {
                 forceReflection = true;
             }
-            
+
+#if CPP
             Il2CppSystem.Object iObj = null;
             if (obj is Il2CppSystem.Object isObj)
             {
                 iObj = isObj;
             }
+#else
+            var iObj = obj;
+#endif
 
             if (!forceReflection)
             {
@@ -107,9 +102,10 @@ namespace Explorer
                 {
                     bool equals = ReferenceEquals(obj, window.Target);
 
+#if CPP
                     if (!equals && iObj is Il2CppSystem.Object iCurrent && window.Target is Il2CppSystem.Object iTarget)
                     {
-                        if (iCurrent.GetIl2CppType() != iTarget.GetIl2CppType())
+                        if (iCurrent.GetIl2CppType().FullName != iTarget.GetIl2CppType().FullName)
                         {
                             if (iCurrent is Transform transform)
                             {
@@ -119,6 +115,7 @@ namespace Explorer
 
                         equals = iCurrent.Pointer == iTarget.Pointer;
                     }
+#endif
 
                     if (equals)
                     {
@@ -143,7 +140,7 @@ namespace Explorer
         {
             if (!TabView)
             {
-                GUI.BringWindowToFront(window.windowID);
+                GUIUnstrip.BringWindowToFront(window.windowID);
                 GUI.FocusWindow(window.windowID);
             }
             else
@@ -174,7 +171,7 @@ namespace Explorer
         {
             get
             {
-                if (!CppExplorer.ShowMenu)
+                if (!ExplorerCore.ShowMenu)
                 {
                     return false;
                 }
@@ -192,7 +189,8 @@ namespace Explorer
 
         private static bool RectContainsMouse(Rect rect)
         {
-            return rect.Contains(new Vector2(Input.mousePosition.x, Screen.height - Input.mousePosition.y));
+            var mousePos = InputManager.MousePosition;
+            return rect.Contains(new Vector2(mousePos.x, Screen.height - mousePos.y));
         }
 
         public static int NextWindowID()

src/Properties/AssemblyInfo.cs

@@ -2,19 +2,22 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Explorer;
+
+#if ML
 using MelonLoader;
 
-[assembly: MelonInfo(typeof(CppExplorer), CppExplorer.NAME, CppExplorer.VERSION, CppExplorer.AUTHOR)]
+[assembly: MelonInfo(typeof(ExplorerMelonMod), "Explorer", ExplorerCore.VERSION, ExplorerCore.AUTHOR)]
 [assembly: MelonGame(null, null)]
+#endif
 
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle(CppExplorer.NAME)]
+[assembly: AssemblyTitle(ExplorerCore.NAME)]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany(CppExplorer.AUTHOR)]
-[assembly: AssemblyProduct(CppExplorer.NAME)]
+[assembly: AssemblyCompany(ExplorerCore.AUTHOR)]
+[assembly: AssemblyProduct(ExplorerCore.NAME)]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

src/Tests/TestClass.cs

@@ -0,0 +1,182 @@
+using System.Collections;
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+using System.Reflection;
+using System.Collections.Specialized;
+
+// used to test multiple generic constraints
+public class TestGeneric : IComparable<string>
+{
+    public TestGeneric() { }
+
+    public int CompareTo(string other) => throw new NotImplementedException();
+}
+
+[Flags]
+public enum TestFlags
+{
+    Red,
+    Green,
+    Blue
+}
+
+// test non-flags weird enum
+public enum WeirdEnum
+{
+    First = 1,
+    Second,
+    Third = 2,
+    Fourth,
+    Fifth
+}
+
+namespace Explorer.Tests
+{
+    public class TestClass
+    {
+        public static TestFlags testFlags = TestFlags.Blue | TestFlags.Green;
+        public static WeirdEnum testWeird = WeirdEnum.First;
+
+        public static int testBitmask;
+
+        public static TestClass Instance => m_instance ?? (m_instance = new TestClass());
+        private static TestClass m_instance;
+
+#if CPP
+        public static Il2CppSystem.Collections.Generic.HashSet<string> ILHashSetTest;
+#endif
+
+        public TestClass()
+        {
+#if CPP
+            ILHashSetTest = new Il2CppSystem.Collections.Generic.HashSet<string>();
+            ILHashSetTest.Add("1");
+            ILHashSetTest.Add("2");
+            ILHashSetTest.Add("3");
+#endif
+
+            testBitmask = 1 | 2;
+        }
+
+        public static int StaticProperty => 5;
+        public static int StaticField = 5;
+        public int NonStaticField;
+
+        public static string TestGeneric<C, T>(string arg0) where C : Component where T : TestGeneric, IComparable<string>
+        {
+            return $"C: '{typeof(C).FullName}', T: '{typeof(T).FullName}', arg0: '{arg0}'";
+        }
+
+        public static string TestRefInOutGeneric<T>(ref string arg0, in int arg1, out string arg2)
+        {
+            arg2 = "this is arg2";
+
+            return $"T: '{typeof(T).FullName}', ref arg0: '{arg0}', in arg1: '{arg1}', out arg2: '{arg2}'";
+        }
+
+        //// this type of generic is not supported, due to requiring a non-primitive argument.
+        //public static T TestDifferentGeneric<T>(T obj) where T : Component
+        //{
+        //    return obj;
+        //}
+
+        // test a non-generic dictionary
+
+        public Hashtable TestNonGenericDict()
+        {
+            return new Hashtable
+            {
+                { "One",   1 },
+                { "Two",   2 },
+                { "Three", 3 },
+            };
+        }
+
+        // IL2CPP HASHTABLE NOT SUPPORTED! Cannot assign Il2CppSystem.Object from primitive struct / string.
+        // Technically they are "supported" but if they contain System types they will not work.
+
+        //public Il2CppSystem.Collections.Hashtable TestIl2CppNonGenericDict()
+        //{
+        //    var table = new Il2CppSystem.Collections.Hashtable();
+        //    table.Add("One", 1);
+        //    table.Add("One", 2);
+        //    table.Add("One", 3);
+        //    return table;
+        //}
+
+        // test HashSets
+
+        public static HashSet<string> HashSetTest = new HashSet<string>
+        {
+            "One",
+            "Two",
+            "Three"
+        };
+
+
+        // Test indexed parameter
+
+        public string this[int arg0, string arg1]
+        {
+            get
+            {
+                return $"arg0: {arg0}, arg1: {arg1}";
+            }
+        }
+
+        // Test basic list
+
+        public static List<string> TestList = new List<string>
+        {
+            "1",
+            "2",
+            "3",
+            "etc..."
+        };
+
+        // Test a nested dictionary
+
+        public static Dictionary<int, Dictionary<string, int>> NestedDictionary = new Dictionary<int, Dictionary<string, int>>
+        {
+            {
+                1,
+                new  Dictionary<string, int>
+                {
+                    {
+                        "Sub 1", 123
+                    },
+                    {
+                        "Sub 2", 456
+                    },
+                }
+            },
+            {
+                2,
+                new  Dictionary<string, int>
+                {
+                    {
+                        "Sub 3", 789
+                    },
+                    {
+                        "Sub 4", 000
+                    },
+                }
+            },
+        };
+
+        // Test a basic method
+
+        public static Color TestMethod(float r, float g, float b, float a)
+        {
+            return new Color(r, g, b, a);
+        }
+
+        // A method with default arguments
+
+        public static Vector3 TestDefaultArgs(float arg0, float arg1, float arg2 = 5.0f)
+        {
+            return new Vector3(arg0, arg1, arg2);
+        }
+    }
+}

src/UnstripFixes/GUIUnstrip.cs

@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using UnityEngine;
+#if CPP
+using Explorer.UnstripInternals;
+using UnityEngineInternal;
+using UnhollowerRuntimeLib;
+#endif
+
+namespace Explorer
+{
+    public class GUIUnstrip
+    {
+        public static string TextField(string text, GUILayoutOption[] options)
+        {
+#if CPP
+            return Internal.TextField(text, options);
+#else
+            return GUILayout.TextField(text, options);
+#endif
+        }
+
+        public static Rect Window(int id, Rect rect, GUI.WindowFunction windowFunc, string title)
+        {
+#if CPP
+            return GUI.Window(id, rect, windowFunc, GUIContent.Temp(title), GUI.skin.window);
+#else
+            return GUI.Window(id, rect, windowFunc, title);
+#endif
+        }
+
+        public static bool Button(Rect rect, string title)
+        {
+#if CPP
+            return GUI.Button(rect, GUIContent.Temp(title), GUI.skin.button);
+#else
+            return GUI.Button(rect, title);
+#endif
+        }
+
+        public static string TextArea(string text, params GUILayoutOption[] options)
+        {
+#if CPP
+            return GUILayout.DoTextField(text, -1, true, GUI.skin.textArea, options);
+#else
+            return GUILayout.TextArea(text, options);
+#endif
+        }
+
+        public static void BringWindowToFront(int id)
+        {
+#if CPP
+            Internal.BringWindowToFront(id);
+#else
+            GUI.BringWindowToFront(id);
+#endif
+        }
+
+        public static Vector2 ScreenToGUIPoint(Vector2 screenPoint)
+        {
+#if CPP
+            return Internal.ScreenToGUIPoint(screenPoint);
+#else
+            return GUIUtility.ScreenToGUIPoint(screenPoint);
+#endif
+        }
+
+        public static void Space(float pixels)
+        {
+#if CPP
+            Internal.Space(pixels);
+#else
+            GUILayout.Space(pixels);
+#endif
+        }
+
+        public static bool RepeatButton(string text, params GUILayoutOption[] options)
+        {
+#if CPP
+            return Internal.DoRepeatButton(GUIContent.Temp(text), GUI.skin.button, options);
+#else
+            return GUILayout.RepeatButton(text, options);
+#endif
+        }
+
+        public static void BeginArea(Rect screenRect, GUIStyle style)
+        {
+#if CPP
+            Internal.BeginArea(screenRect, GUIContent.none, style);
+#else
+            GUILayout.BeginArea(screenRect, style);
+#endif
+        }
+
+        static public void EndArea()
+        {
+#if CPP
+            Internal.EndArea();
+#else
+            GUILayout.EndArea();
+#endif
+        }
+
+
+        public static Vector2 BeginScrollView(Vector2 scroll, params GUILayoutOption[] options)
+        {
+#if CPP
+            return Internal.BeginScrollView(scroll, options);
+#else
+            return GUILayout.BeginScrollView(scroll, options);
+#endif
+        }
+
+        public static void EndScrollView(bool handleScrollWheel = true)
+        {
+#if CPP
+            Internal.EndScrollView(handleScrollWheel);
+#else
+            GUILayout.EndScrollView();
+#endif
+        }
+    }
+}

src/UnstripFixes/Internal.cs

@@ -0,0 +1,680 @@
+#if CPP
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using UnityEngine;
+using UnityEngineInternal;
+using UnhollowerRuntimeLib;
+
+namespace Explorer.UnstripInternals
+{
+    public class Internal
+    {
+        #region Properties
+        public static int s_ScrollControlId;
+
+        public static bool ScrollFailed = false;
+        public static bool ManualUnstripFailed = false;        
+
+        public static GenericStack ScrollStack => m_scrollStack ?? GetScrollStack();
+        public static PropertyInfo m_scrollViewStatesInfo;
+        public static GenericStack m_scrollStack;
+
+        public static Dictionary<int, Il2CppSystem.Object> StateCache => m_stateCacheDict ?? GetStateCacheDict();
+        public static Dictionary<int, Il2CppSystem.Object> m_stateCacheDict;
+
+        public static GUIStyle SpaceStyle => m_spaceStyle ?? GetSpaceStyle();
+        public static GUIStyle m_spaceStyle;
+
+        public static DateTime nextScrollStepTime;
+
+        public static MethodInfo ScreenToGuiPointMethod;
+        public static bool m_screenToGuiAttemped;
+
+        public static MethodInfo m_bringWindowToFrontMethod;
+        public static bool m_bringWindowFrontAttempted;
+
+        private static GenericStack GetScrollStack()
+        {
+            if (m_scrollViewStatesInfo == null)
+            {
+                if (typeof(GUI).GetProperty("scrollViewStates", ReflectionHelpers.CommonFlags) is PropertyInfo scrollStatesInfo)
+                {
+                    m_scrollViewStatesInfo = scrollStatesInfo;
+                }
+                else if (typeof(GUI).GetProperty("s_ScrollViewStates", ReflectionHelpers.CommonFlags) is PropertyInfo s_scrollStatesInfo)
+                {
+                    m_scrollViewStatesInfo = s_scrollStatesInfo;
+                }
+            }
+
+            if (m_scrollViewStatesInfo?.GetValue(null, null) is GenericStack stack)
+            {
+                m_scrollStack = stack;
+            }
+            else
+            {
+                m_scrollStack = new GenericStack();
+            }
+
+            return m_scrollStack;
+        }
+
+        private static Dictionary<int, Il2CppSystem.Object> GetStateCacheDict()
+        {
+            if (m_stateCacheDict == null)
+            {
+                try
+                {
+                    var type = ReflectionHelpers.GetTypeByName("UnityEngine.GUIStateObjects");
+                    m_stateCacheDict = type.GetProperty("s_StateCache")
+                                            .GetValue(null, null)
+                                            as Dictionary<int, Il2CppSystem.Object>;
+
+                    if (m_stateCacheDict == null) throw new Exception();
+                }
+                catch 
+                {
+                    m_stateCacheDict = new Dictionary<int, Il2CppSystem.Object>();
+                }
+            }
+            return m_stateCacheDict;
+        }
+
+        private static GUIStyle GetSpaceStyle()
+        {
+            try
+            {
+                m_spaceStyle = typeof(GUILayoutUtility)
+                    .GetProperty("s_SpaceStyle")
+                    .GetValue(null, null)
+                    .Il2CppCast(typeof(GUIStyle))
+                    as GUIStyle;
+
+                if (m_spaceStyle == null) throw new Exception();
+            }
+            catch { }
+
+            if (m_spaceStyle == null)
+            {
+                m_spaceStyle = new GUIStyle();
+            }
+            m_spaceStyle.stretchWidth = false;
+            return m_spaceStyle;
+        }
+
+        #endregion
+
+        #region GUILayout Methods
+
+        public static string TextField(string text, GUILayoutOption[] options)
+        {
+            text = text ?? "";
+
+            int controlID = GUIUtility.GetControlID(FocusType.Keyboard);
+            GUIContent guicontent = GUIContent.Temp(text);
+            bool flag = GUIUtility.keyboardControl != controlID;
+            if (flag)
+            {
+                guicontent = GUIContent.Temp(text);
+            }
+            else
+            {
+                guicontent = GUIContent.Temp(text);
+                // guicontent = GUIContent.Temp(text + GUIUtility.compositionString);
+            }
+            Rect rect = Internal_LayoutUtility.GetRect(guicontent, GUI.skin.textField, options);
+            bool flag2 = GUIUtility.keyboardControl == controlID;
+            if (flag2)
+            {
+                guicontent = GUIContent.Temp(text);
+            }
+            DoTextField(rect, controlID, guicontent, false, -1, GUI.skin.textField);
+            return guicontent.text;
+        }
+
+        internal static void DoTextField(Rect position, int id, GUIContent content, bool multiline, int maxLength, GUIStyle style)
+        {
+            if (GetStateObject(Il2CppType.Of<TextEditor>(), id).TryCast<TextEditor>() is TextEditor textEditor)
+            {
+                if (maxLength >= 0 && content.text.Length > maxLength)
+                {
+                    content.text = content.text.Substring(0, maxLength);
+                }
+                textEditor.m_Content.text = content.text;
+                textEditor.SaveBackup();
+                textEditor.position = position;
+                textEditor.style = style;
+                textEditor.multiline = multiline;
+                textEditor.controlID = id;
+                textEditor.DetectFocusChange();
+                GUI.HandleTextFieldEventForDesktop(position, id, content, multiline, maxLength, style, textEditor);
+                textEditor.UpdateScrollOffsetIfNeeded(Event.current);
+            }
+        }
+
+        public static bool DoRepeatButton(GUIContent content, GUIStyle style, GUILayoutOption[] options)
+        {
+            return GUI.DoRepeatButton(Internal_LayoutUtility.GetRect(content, style, options), content, style, FocusType.Passive);
+        }
+
+        public static void Space(float pixels)
+        {
+            if (GUILayoutUtility.current.topLevel.isVertical)
+                Internal_LayoutUtility.GetRect(0, pixels, SpaceStyle, new GUILayoutOption[] { GUILayout.Height(pixels) });
+            else
+                Internal_LayoutUtility.GetRect(pixels, 0, SpaceStyle, new GUILayoutOption[] { GUILayout.Width(pixels) });
+
+            if (Event.current.type == EventType.Layout)
+            {
+                GUILayoutUtility.current.topLevel.entries[GUILayoutUtility.current.topLevel.entries.Count - 1].consideredForMargin = false;
+            }
+        }
+
+        public static Vector2 ScreenToGUIPoint(Vector2 screenPoint)
+        {
+            if (!m_screenToGuiAttemped)
+            {
+                m_screenToGuiAttemped = true;
+                ScreenToGuiPointMethod = typeof(GUIUtility).GetMethod("ScreenToGUIPoint");
+            }
+            if (ScreenToGuiPointMethod == null)
+            {
+                throw new Exception("Couldn't get method 'GUIUtility.ScreenToGUIPoint'!");
+            }
+            return (Vector2)ScreenToGuiPointMethod.Invoke(null, new object[] { screenPoint });
+        }
+
+        public static void BringWindowToFront(int id)
+        {
+            if (!m_bringWindowFrontAttempted)
+            {
+                m_bringWindowFrontAttempted = true;
+                m_bringWindowToFrontMethod = typeof(GUI).GetMethod("BringWindowToFront");
+            }
+            if (m_bringWindowToFrontMethod == null)
+            {
+                throw new Exception("Couldn't get method 'GUIUtility.BringWindowToFront'!");
+            }
+            m_bringWindowToFrontMethod.Invoke(null, new object[] { id });
+        }
+
+        public static void BeginArea(Rect screenRect, GUIContent content, GUIStyle style)
+        {
+            var g = BeginLayoutArea(style, typeof(GUILayoutGroup));
+            if (Event.current.type == EventType.Layout)
+            {
+                g.resetCoords = true;
+                g.minWidth = g.maxWidth = screenRect.width;
+                g.minHeight = g.maxHeight = screenRect.height;
+                g.rect = Rect.MinMaxRect(screenRect.xMin, screenRect.yMin, g.rect.xMax, g.rect.yMax);
+            }
+
+            BeginGroup(g.rect, content, style);
+        }
+
+        internal static GUILayoutGroup BeginLayoutArea(GUIStyle style, Type layoutType)
+        {
+            EventType type = Event.current.type;
+            GUILayoutGroup guilayoutGroup;
+            if (type != EventType.Used && type != EventType.Layout)
+            {
+                guilayoutGroup = GUILayoutUtility.current.windows.GetNext().TryCast<GUILayoutGroup>();
+                guilayoutGroup.ResetCursor();
+            }
+            else
+            {
+                guilayoutGroup = (GUILayoutGroup)Activator.CreateInstance(layoutType);
+                guilayoutGroup.style = style;
+                GUILayoutUtility.current.windows.Add(guilayoutGroup);
+            }
+            GUILayoutUtility.current.layoutGroups.Push(guilayoutGroup);
+            GUILayoutUtility.current.topLevel = guilayoutGroup;
+            return guilayoutGroup;
+        }
+
+        public static void BeginGroup(Rect position, GUIContent content, GUIStyle style)
+        {
+            BeginGroup(position, content, style, Vector2.zero);
+        }
+
+        internal static void BeginGroup(Rect position, GUIContent content, GUIStyle style, Vector2 scrollOffset)
+        {
+            int id = GUIUtility.GetControlID(GUI.s_BeginGroupHash, FocusType.Passive);
+
+            if (content != GUIContent.none || style != GUIStyle.none)
+            {
+                switch (Event.current.type)
+                {
+                    case EventType.Repaint:
+                        style.Draw(position, content, id);
+                        break;
+                    default:
+                        if (position.Contains(Event.current.mousePosition))
+                            GUIUtility.mouseUsed = true;
+                        break;
+                }
+            }
+            GUIClip.Push(position, scrollOffset, Vector2.zero, false);
+        }
+
+        public static void EndArea()
+        {
+            if (Event.current.type == EventType.Used)
+                return;
+            GUILayoutUtility.current.layoutGroups.Pop();
+            GUILayoutUtility.current.topLevel = GUILayoutUtility.current.layoutGroups.Peek().TryCast<GUILayoutGroup>();
+            GUI.EndGroup();
+        }
+
+#endregion
+
+        #region Scrolling
+
+        private static Il2CppSystem.Object GetStateObject(Il2CppSystem.Type type, int controlID)
+        {
+            Il2CppSystem.Object obj;
+            if (StateCache.ContainsKey(controlID))
+            {
+                obj = StateCache[controlID];
+            }
+            else
+            {
+                obj = Il2CppSystem.Activator.CreateInstance(type);
+                StateCache.Add(controlID, obj);
+            }
+
+            return obj;
+        }
+
+        public static Vector2 BeginScrollView(Vector2 scroll, params GUILayoutOption[] options)
+        {
+            // First, just try normal way, may not have been stripped or was unstripped successfully.
+            if (!ScrollFailed)
+            {
+                try
+                {
+                    return GUILayout.BeginScrollView(scroll, options);
+                }
+                catch
+                {
+                    ScrollFailed = true;
+                }
+            }
+
+            // Try manual implementation.
+            if (!ManualUnstripFailed)
+            {
+                try
+                {
+                    return BeginScrollView_ImplLayout(scroll,
+                        false,
+                        false,
+                        GUI.skin.horizontalScrollbar,
+                        GUI.skin.verticalScrollbar,
+                        GUI.skin.scrollView,
+                        options);
+                }
+                catch (Exception e)
+                {
+                    ExplorerCore.Log("Exception on manual BeginScrollView: " + e.GetType() + ", " + e.Message + "\r\n" + e.StackTrace);
+                    ManualUnstripFailed = true;
+                }
+            }
+
+            // Sorry! No scrolling for you.
+            return scroll;
+        }
+
+        internal static void EndScrollView(bool handleScrollWheel)
+        {
+            // Only end the scroll view for the relevant BeginScrollView option, if any.
+
+            if (!ScrollFailed)
+            {
+                GUILayout.EndScrollView();
+            }
+            else if (!ManualUnstripFailed)
+            {
+                GUILayoutUtility.EndLayoutGroup();
+
+                if (ScrollStack.Count <= 0) return;
+
+                var state = ScrollStack.Peek().TryCast<ScrollViewState>();
+                var scrollExt = Internal_ScrollViewState.FromPointer(state.Pointer);
+
+                if (scrollExt == null) throw new Exception("Could not get scrollExt!");
+
+                GUIClip.Pop();
+
+                ScrollStack.Pop();
+
+                var position = scrollExt.position;
+
+                if (handleScrollWheel && Event.current.type == EventType.ScrollWheel && position.Contains(Event.current.mousePosition))
+                {
+                    var pos = scrollExt.scrollPosition;
+                    pos.x = Mathf.Clamp(scrollExt.scrollPosition.x + Event.current.delta.x * 20f, 0f, scrollExt.viewRect.width - scrollExt.visibleRect.width);
+                    pos.y = Mathf.Clamp(scrollExt.scrollPosition.y + Event.current.delta.y * 20f, 0f, scrollExt.viewRect.height - scrollExt.visibleRect.height);
+
+                    if (scrollExt.scrollPosition.x < 0f)
+                    {
+                        pos.x = 0f;
+                    }
+                    if (pos.y < 0f)
+                    {
+                        pos.y = 0f;
+                    }
+
+                    scrollExt.apply = true;
+
+                    Event.current.Use();
+                }
+            }
+        }
+
+        private static Vector2 BeginScrollView_ImplLayout(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical,
+            GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, GUIStyle background, params GUILayoutOption[] options)
+        {
+            var guiscrollGroup = GUILayoutUtility.BeginLayoutGroup(background, null, Il2CppType.Of<GUIScrollGroup>())
+                                                 .TryCast<GUIScrollGroup>();
+
+            EventType type = Event.current.type;
+            if (type == EventType.Layout)
+            {
+                guiscrollGroup.resetCoords = true;
+                guiscrollGroup.isVertical = true;
+                guiscrollGroup.stretchWidth = 1;
+                guiscrollGroup.stretchHeight = 1;
+                guiscrollGroup.verticalScrollbar = verticalScrollbar;
+                guiscrollGroup.horizontalScrollbar = horizontalScrollbar;
+                guiscrollGroup.needsVerticalScrollbar = alwaysShowVertical;
+                guiscrollGroup.needsHorizontalScrollbar = alwaysShowHorizontal;
+                guiscrollGroup.ApplyOptions(options);
+            }
+
+            return BeginScrollView_Impl(guiscrollGroup.rect,
+                scrollPosition,
+                new Rect(0f, 0f, guiscrollGroup.clientWidth, guiscrollGroup.clientHeight),
+                alwaysShowHorizontal,
+                alwaysShowVertical,
+                horizontalScrollbar,
+                verticalScrollbar,
+                background
+            );
+        }
+
+        private static Vector2 BeginScrollView_Impl(Rect position, Vector2 scrollPosition, Rect viewRect, bool alwaysShowHorizontal,
+            bool alwaysShowVertical, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, GUIStyle background)
+        {
+            // GUIUtility.CheckOnGUI();
+
+            int controlID = GUIUtility.GetControlID(GUI.s_ScrollviewHash, FocusType.Passive);
+
+            var scrollViewState = GetStateObject(Il2CppType.Of<ScrollViewState>(), controlID)
+                                    .TryCast<ScrollViewState>();
+
+            if (scrollViewState == null) 
+                return scrollPosition;
+
+            var scrollExt = Internal_ScrollViewState.FromPointer(scrollViewState.Pointer);
+
+            if (scrollExt == null)
+                return scrollPosition;
+
+            bool apply = scrollExt.apply;
+            if (apply)
+            {
+                scrollPosition = scrollExt.scrollPosition;
+                scrollExt.apply = false;
+            }
+
+            scrollExt.position = position;
+
+            scrollExt.scrollPosition = scrollPosition;
+            scrollExt.visibleRect = scrollExt.viewRect = viewRect;
+
+            var rect = scrollExt.visibleRect;
+            rect.width = position.width;
+            rect.height = position.height;
+
+            ScrollStack.Push(scrollViewState);
+
+            Rect screenRect = new Rect(position.x, position.y, position.width, position.height);
+            EventType type = Event.current.type;
+            if (type != EventType.Layout)
+            {
+                if (type != EventType.Used)
+                {
+                    bool flag = alwaysShowVertical;
+                    bool flag2 = alwaysShowHorizontal;
+                    if (flag2 || viewRect.width > screenRect.width)
+                    {
+                        rect.height = position.height - horizontalScrollbar.fixedHeight + (float)horizontalScrollbar.margin.top;
+
+                        screenRect.height -= horizontalScrollbar.fixedHeight + (float)horizontalScrollbar.margin.top;
+                        flag2 = true;
+                    }
+                    if (flag || viewRect.height > screenRect.height)
+                    {
+                        rect.width = position.width - verticalScrollbar.fixedWidth + (float)verticalScrollbar.margin.left;
+
+                        screenRect.width -= verticalScrollbar.fixedWidth + (float)verticalScrollbar.margin.left;
+                        flag = true;
+                        if (!flag2 && viewRect.width > screenRect.width)
+                        {
+                            rect.height = position.height - horizontalScrollbar.fixedHeight + (float)horizontalScrollbar.margin.top;
+                            screenRect.height -= horizontalScrollbar.fixedHeight + (float)horizontalScrollbar.margin.top;
+                            flag2 = true;
+                        }
+                    }
+                    if (Event.current.type == EventType.Repaint && background != GUIStyle.none)
+                    {
+                        background.Draw(position, position.Contains(Event.current.mousePosition), false, flag2 && flag, false);
+                    }
+                    if (flag2 && horizontalScrollbar != GUIStyle.none)
+                    {
+                        scrollPosition.x = HorizontalScroll(
+                            new Rect(
+                                position.x,
+                                position.yMax - horizontalScrollbar.fixedHeight,
+                                screenRect.width,
+                                horizontalScrollbar.fixedHeight),
+                            scrollPosition.x,
+                            Mathf.Min(screenRect.width, viewRect.width),
+                            0f,
+                            viewRect.width,
+                            horizontalScrollbar
+                        );
+                    }
+                    else
+                    {
+                        GUIUtility.GetControlID(GUI.s_SliderHash, FocusType.Passive);
+                        GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
+                        GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
+                        scrollPosition.x = ((horizontalScrollbar == GUIStyle.none)
+                            ? Mathf.Clamp(scrollPosition.x, 0f, Mathf.Max(viewRect.width - position.width, 0f))
+                            : 0f);
+                    }
+                    if (flag && verticalScrollbar != GUIStyle.none)
+                    {
+                        scrollPosition.y = VerticalScroll(
+                            new Rect(
+                                screenRect.xMax + (float)verticalScrollbar.margin.left,
+                                screenRect.y,
+                                verticalScrollbar.fixedWidth,
+                                screenRect.height),
+                            scrollPosition.y,
+                            Mathf.Min(screenRect.height, viewRect.height),
+                            0f,
+                            viewRect.height,
+                            verticalScrollbar
+                        );
+                    }
+                    else
+                    {
+                        GUIUtility.GetControlID(GUI.s_SliderHash, FocusType.Passive);
+                        GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
+                        GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
+                        scrollPosition.y = ((verticalScrollbar == GUIStyle.none)
+                            ? Mathf.Clamp(scrollPosition.y, 0f, Mathf.Max(viewRect.height - position.height, 0f))
+                            : 0f);
+                    }
+                }
+            }
+            else
+            {
+                GUIUtility.GetControlID(GUI.s_SliderHash, FocusType.Passive);
+                GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
+                GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
+                GUIUtility.GetControlID(GUI.s_SliderHash, FocusType.Passive);
+                GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
+                GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
+            }
+            GUIClip.Push(screenRect,
+                new Vector2(
+                    Mathf.Round(-scrollPosition.x - viewRect.x),
+                    Mathf.Round(-scrollPosition.y - viewRect.y)),
+                Vector2.zero,
+                false
+            );
+
+            return scrollPosition;
+        }
+
+        public static float HorizontalScroll(Rect position, float value, float size, float leftValue, float rightValue, GUIStyle style)
+        {
+            return Scroller(position, value, size, leftValue, rightValue, style,
+                GUI.skin.GetStyle(style.name + "thumb"),
+                GUI.skin.GetStyle(style.name + "leftbutton"),
+                GUI.skin.GetStyle(style.name + "rightbutton"),
+                true);
+        }
+
+        public static float VerticalScroll(Rect position, float value, float size, float topValue, float bottomValue, GUIStyle style)
+        {
+            return Scroller(position, value, size, topValue, bottomValue, style,
+                GUI.skin.GetStyle(style.name + "thumb"),
+                GUI.skin.GetStyle(style.name + "upbutton"),
+                GUI.skin.GetStyle(style.name + "downbutton"),
+                false);
+        }
+
+        private static float Scroller(Rect position, float value, float size, float leftValue, float rightValue, GUIStyle slider,
+            GUIStyle thumb, GUIStyle leftButton, GUIStyle rightButton, bool horiz)
+        {
+            GUIUtility.CheckOnGUI();
+            int controlID = GUIUtility.GetControlID(GUI.s_SliderHash, FocusType.Passive, position);
+            Rect position2;
+            Rect rect;
+            Rect rect2;
+            if (horiz)
+            {
+                position2 = new Rect(position.x + leftButton.fixedWidth,
+                    position.y,
+                    position.width - leftButton.fixedWidth - rightButton.fixedWidth,
+                    position.height);
+
+                rect = new Rect(position.x, position.y, leftButton.fixedWidth, position.height);
+                rect2 = new Rect(position.xMax - rightButton.fixedWidth, position.y, rightButton.fixedWidth, position.height);
+            }
+            else
+            {
+                position2 = new Rect(position.x,
+                    position.y + leftButton.fixedHeight,
+                    position.width,
+                    position.height - leftButton.fixedHeight - rightButton.fixedHeight);
+
+                rect = new Rect(position.x, position.y, position.width, leftButton.fixedHeight);
+                rect2 = new Rect(position.x, position.yMax - rightButton.fixedHeight, position.width, rightButton.fixedHeight);
+            }
+
+            value = Slider(position2, value, size, leftValue, rightValue, slider, thumb, horiz, controlID);
+
+            bool flag = Event.current.type == EventType.MouseUp;
+            if (ScrollerRepeatButton(controlID, rect, leftButton))
+            {
+                value -= 10f * ((leftValue >= rightValue) ? -1f : 1f);
+            }
+            if (ScrollerRepeatButton(controlID, rect2, rightButton))
+            {
+                value += 10f * ((leftValue >= rightValue) ? -1f : 1f);
+            }
+            if (flag && Event.current.type == EventType.Used)
+            {
+                s_ScrollControlId = 0;
+            }
+            if (leftValue < rightValue)
+            {
+                value = Mathf.Clamp(value, leftValue, rightValue - size);
+            }
+            else
+            {
+                value = Mathf.Clamp(value, rightValue, leftValue - size);
+            }
+            return value;
+        }
+
+        public static float Slider(Rect position, float value, float size, float start, float end, GUIStyle slider,
+            GUIStyle thumb, bool horiz, int id)
+        {
+            if (id == 0)
+            {
+                id = GUIUtility.GetControlID(GUI.s_SliderHash, FocusType.Passive, position);
+            }
+            var sliderHandler = new Internal_SliderHandler(position, value, size, start, end, slider, thumb, horiz, id);
+            return sliderHandler.Handle();
+        }
+
+        private static bool ScrollerRepeatButton(int scrollerID, Rect rect, GUIStyle style)
+        {
+            bool result = false;
+            if (GUI.DoRepeatButton(rect, GUIContent.none, style, FocusType.Passive))
+            {
+                bool flag = s_ScrollControlId != scrollerID;
+                s_ScrollControlId = scrollerID;
+
+                if (flag)
+                {
+                    result = true;
+                    nextScrollStepTime = DateTime.Now.AddMilliseconds(250.0);
+                }
+                else if (DateTime.Now >= nextScrollStepTime)
+                {
+                    result = true;
+                    nextScrollStepTime = DateTime.Now.AddMilliseconds(30.0);
+                }
+                if (Event.current.type == EventType.Repaint)
+                {
+                    GUI.InternalRepaintEditorWindow();
+                }
+            }
+            return result;
+        }
+
+#endregion
+    }
+
+    #region Extensions
+
+    public static class Extensions
+    {
+        public static Rect Unstripped_GetLast(this GUILayoutGroup group)
+        {
+            Rect result;
+            if (group.m_Cursor > 0 && group.m_Cursor <= group.entries.Count)
+            {
+                GUILayoutEntry guilayoutEntry = group.entries[group.m_Cursor - 1];
+                result = guilayoutEntry.rect;
+            }
+            else
+            {
+                result = GUILayoutEntry.kDummyRect;
+            }
+            return result;
+        }
+    }
+
+    #endregion
+}
+#endif

src/UnstripFixes/Internal_LayoutUtility.cs

@@ -0,0 +1,92 @@
+#if CPP
+using UnityEngine;
+using Explorer.UnstripInternals;
+
+namespace Explorer
+{
+    public class Internal_LayoutUtility
+    {
+        public static Rect GetRect(float width, float height, GUIStyle style, params GUILayoutOption[] options)
+        {
+            switch (Event.current.type)
+            {
+                case EventType.Layout:
+                    GUILayoutUtility.current.topLevel.Add(new GUILayoutEntry(width, width, height, height, style, options));
+                    return GUILayoutUtility.kDummyRect;
+                case EventType.Used:
+                    return GUILayoutUtility.kDummyRect;
+                default:
+                    return GUILayoutUtility.current.topLevel.GetNext().rect;
+            }
+        }
+
+        public static Rect GetRect(GUIContent content, GUIStyle style, params GUILayoutOption[] options)
+        {
+            return DoGetRect(content, style, options);
+        }
+
+        static Rect DoGetRect(GUIContent content, GUIStyle style, GUILayoutOption[] options)
+        {
+            switch (Event.current.type)
+            {
+                case EventType.Layout:
+                    if (style.isHeightDependantOnWidth)
+                    {
+                        GUILayoutUtility.current.topLevel.Add(new GUIWordWrapSizer(style, content, options));
+                    }
+                    else
+                    {
+                        Vector2 sizeConstraints = new Vector2(0, 0);
+                        if (options != null)
+                        {
+                            foreach (var option in options)
+                            {
+                                if (float.TryParse(option.value.ToString(), out float f))
+                                {
+                                    switch (option.type)
+                                    {
+                                        case GUILayoutOption.Type.maxHeight:
+                                            sizeConstraints.y = f;
+                                            break;
+                                        case GUILayoutOption.Type.maxWidth:
+                                            sizeConstraints.x = f;
+                                            break;
+                                    }
+                                }
+                            }
+                        }
+
+                        Vector2 size = style.CalcSizeWithConstraints(content, sizeConstraints);
+                        // This is needed on non-integer scale ratios to avoid errors to accumulate in further layout calculations
+                        size.x = Mathf.Ceil(size.x);
+                        size.y = Mathf.Ceil(size.y);
+                        GUILayoutUtility.current.topLevel.Add(new GUILayoutEntry(size.x, size.x, size.y, size.y, style, options));
+                    }
+                    return GUILayoutUtility.kDummyRect;
+
+                case EventType.Used:
+                    return GUILayoutUtility.kDummyRect;
+                default:
+                    var entry = GUILayoutUtility.current.topLevel.GetNext();
+                    //GUIDebugger.LogLayoutEntry(entry.rect, entry.marginLeft, entry.marginRight, entry.marginTop, entry.marginBottom, entry.style);
+                    return entry.rect;
+            }
+        }
+
+        public static Rect GetLastRect()
+        {
+            EventType type = Event.current.type;
+            Rect last;
+            if (type != EventType.Layout && type != EventType.Used)
+            {
+                last = GUILayoutUtility.current.topLevel.Unstripped_GetLast();
+            }
+            else
+            {
+                last = GUILayoutUtility.kDummyRect;
+            }
+            return last;
+        }    
+    }
+}
+#endif

src/UnstripFixes/Internal_ScrollViewState.cs

@@ -0,0 +1,29 @@
+#if CPP
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Explorer
+{
+    public class Internal_ScrollViewState
+    {
+        public Rect position;
+        public Rect visibleRect;
+        public Rect viewRect;
+        public Vector2 scrollPosition;
+        public bool apply;
+
+        public static Dictionary<IntPtr, Internal_ScrollViewState> Dict = new Dictionary<IntPtr, Internal_ScrollViewState>();
+
+        public static Internal_ScrollViewState FromPointer(IntPtr ptr)
+        {
+            if (!Dict.ContainsKey(ptr))
+            {
+                Dict.Add(ptr, new Internal_ScrollViewState());
+            }
+
+            return Dict[ptr];
+        }
+    }
+}
+#endif

src/UnstripFixes/Internal_SliderHandler.cs

@@ -1,25 +1,54 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
+#if CPP
+using System;
 using UnhollowerRuntimeLib;
+using UnityEngine;
+using Explorer.UnstripInternals;
+using Il2CppSystem.Reflection;
 
 namespace Explorer
 {
-	// This is a manual unstrip of UnityEngine.SliderHandler.
-	// This code is provided "as-is".
-	// Taken from dnSpy output using Unity 2018.4.20.
-
-	// "Unity", Unity logos, and other Unity trademarks are trademarks or 
-	// registered trademarks of Unity Technologies or its affiliates in the 
-	// U.S. and elsewhere. 
-	// https://unity3d.com/legal/terms-of-service
-	// https://unity3d.com/legal/terms-of-service/software
-
-	public struct SliderHandlerUnstrip
+    public struct Internal_SliderHandler
 	{
+		public static int ScrollTroughSide
+        {
+			get
+            {
+				if (!m_getScrollTroughSideFailed)
+                {
+					try
+                    {
+						return GUI.scrollTroughSide;
+                    }
+					catch
+                    {
+						m_getScrollTroughSideFailed = true;
+                    }
+				}
+
+				return m_manualScrollTrough;
+            }
+			set
+            {
+				if (!m_setScrollTroughSideFailed)
+                {
+					try
+                    {
+						GUI.scrollTroughSide = value;
+						return;
+                    }
+					catch
+                    {
+						m_setScrollTroughSideFailed = true;
+                    }
+                }
+				m_manualScrollTrough = value;
+            }
+        }
+		private static bool m_getScrollTroughSideFailed;
+		private static bool m_setScrollTroughSideFailed;
+		private static int m_manualScrollTrough;
+
+
 		private readonly Rect position;
 		private readonly float currentValue;
 		private readonly float size;
@@ -30,7 +59,8 @@ namespace Explorer
 		private readonly bool horiz;
 		private readonly int id;
 
-		public SliderHandlerUnstrip(Rect position, float currentValue, float size, float start, float end, GUIStyle slider, GUIStyle thumb, bool horiz, int id)
+		public Internal_SliderHandler(Rect position, float currentValue, float size, float start, 
+			float end, GUIStyle slider, GUIStyle thumb, bool horiz, int id)
 		{
 			this.position = position;
 			this.currentValue = currentValue;
@@ -77,7 +107,7 @@ namespace Explorer
 			}
 			else
 			{
-				GUI.scrollTroughSide = 0;
+				ScrollTroughSide = 0;
 				GUIUtility.hotControl = this.id;
 				this.CurrentEvent().Use();
 				if (this.ThumbSelectionRect().Contains(this.CurrentEvent().mousePosition))
@@ -90,9 +120,10 @@ namespace Explorer
 					GUI.changed = true;
 					if (this.SupportsPageMovements())
 					{
-						this.SliderState().isDragging = false;
-						GUI.nextScrollStepTime = SystemClock.now.AddMilliseconds(250.0);
-						GUI.scrollTroughSide = this.CurrentScrollTroughSide();
+						var ext = Internal_SliderState.FromPointer(GetSliderState().Pointer);
+						ext.isDragging = false;
+						Internal.nextScrollStepTime = DateTime.Now.AddMilliseconds(250.0);
+						ScrollTroughSide = this.CurrentScrollTroughSide();
 						result = this.PageMovementValue();
 					}
 					else
@@ -115,8 +146,8 @@ namespace Explorer
 			}
 			else
 			{
-				SliderState sliderState = this.SliderState();
-				if (!sliderState.isDragging)
+				var ext = Internal_SliderState.FromPointer(GetSliderState().Pointer);
+				if (!ext.isDragging)
 				{
 					result = this.currentValue;
 				}
@@ -124,8 +155,8 @@ namespace Explorer
 				{
 					GUI.changed = true;
 					this.CurrentEvent().Use();
-					float num = this.MousePosition() - sliderState.dragStartPos;
-					float value = sliderState.dragStartValue + num / this.ValuesPerPixel();
+					float num = this.MousePosition() - ext.dragStartPos;
+					float value = ext.dragStartValue + num / this.ValuesPerPixel();
 					result = this.Clamp(value);
 				}
 			}
@@ -156,7 +187,7 @@ namespace Explorer
 			}
 			else if (this.ThumbRect().Contains(this.CurrentEvent().mousePosition))
 			{
-				if (GUI.scrollTroughSide != 0)
+				if (ScrollTroughSide != 0)
 				{
 					GUIUtility.hotControl = 0;
 				}
@@ -165,20 +196,20 @@ namespace Explorer
 			else
 			{
 				GUI.InternalRepaintEditorWindow();
-				if (SystemClock.now < GUI.nextScrollStepTime)
+				if (DateTime.Now < Internal.nextScrollStepTime)
 				{
 					result = this.currentValue;
 				}
-				else if (this.CurrentScrollTroughSide() != GUI.scrollTroughSide)
+				else if (this.CurrentScrollTroughSide() != ScrollTroughSide)
 				{
 					result = this.currentValue;
 				}
 				else
 				{
-					GUI.nextScrollStepTime = SystemClock.now.AddMilliseconds(30.0);
+					Internal.nextScrollStepTime = DateTime.Now.AddMilliseconds(30.0);
 					if (this.SupportsPageMovements())
 					{
-						this.SliderState().isDragging = false;
+						Internal_SliderState.FromPointer(GetSliderState().Pointer).isDragging = false;
 						GUI.changed = true;
 						result = this.PageMovementValue();
 					}
@@ -274,15 +305,15 @@ namespace Explorer
 
 		private void StartDraggingWithValue(float dragStartValue)
 		{
-			SliderState sliderState = this.SliderState();
-			sliderState.dragStartPos = this.MousePosition();
-			sliderState.dragStartValue = dragStartValue;
-			sliderState.isDragging = true;
+			var ext = Internal_SliderState.FromPointer(GetSliderState().Pointer);
+			ext.dragStartPos = this.MousePosition();
+			ext.dragStartValue = dragStartValue;
+			ext.isDragging = true;
 		}
 
-		private SliderState SliderState()
+		private SliderState GetSliderState()
 		{
-			return (SliderState)GUIUtility.GetStateObject(Il2CppType.Of<SliderState>(), this.id).Il2CppCast(typeof(SliderState));
+			return GUIUtility.GetStateObject(Il2CppType.Of<SliderState>(), this.id).TryCast<SliderState>();
 		}
 
 		private Rect ThumbRect()
@@ -379,3 +410,4 @@ namespace Explorer
 
 	}
 }
+#endif

src/UnstripFixes/Internal_SliderState.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Explorer
+{
+    public class Internal_SliderState
+    {
+        public float dragStartPos;
+        public float dragStartValue;
+        public bool isDragging;
+
+        public static Dictionary<IntPtr, Internal_SliderState> Dict = new Dictionary<IntPtr, Internal_SliderState>();
+
+        public static Internal_SliderState FromPointer(IntPtr ptr)
+        {
+            if (!Dict.ContainsKey(ptr))
+            {
+                Dict.Add(ptr, new Internal_SliderState());
+            }
+
+            return Dict[ptr];
+        }
+    }
+}

src/Unstripping/GUIUnstrip.cs

@@ -1,443 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using MelonLoader;
-using UnhollowerBaseLib;
-using UnhollowerRuntimeLib;
-using System.Reflection;
-using UnityEngineInternal;
-using Harmony;
-
-namespace Explorer
-{
-    // This is a manual unstrip of UnityEngine.GUI and UnityEngine.GUILayout methods.
-    // This code is provided "as-is".
-    // Taken from dnSpy output using Unity 2018.4.20.
-
-    // "Unity", Unity logos, and other Unity trademarks are trademarks or 
-    // registered trademarks of Unity Technologies or its affiliates in the 
-    // U.S. and elsewhere. 
-    // https://unity3d.com/legal/terms-of-service
-    // https://unity3d.com/legal/terms-of-service/software
-
-    public class GUIUnstrip
-    {
-        public static int s_ScrollControlId;
-
-        public static bool ScrollFailed = false;
-        public static bool ManualUnstripFailed = false;
-
-        private static GenericStack ScrollStack
-        {
-            get
-            {
-#if Release_2019
-                return GUI.scrollViewStates;
-#else 
-                return GUI.s_ScrollViewStates;
-#endif
-            }
-        }
-
-        // ======= public methods ======= //   
-        
-        // Fix for GUILayoutUtility.GetLastRect().
-        // Calls UnstripExtensions.GetLastRectUnstripped.
-
-        public static Rect GetLastRect()
-        {
-            EventType type = Event.current.type;
-            Rect last;
-            if (type != EventType.Layout && type != EventType.Used)
-            {
-                last = GUILayoutUtility.current.topLevel.GetLastUnstripped();
-            }
-            else
-            {
-                last = GUILayoutUtility.kDummyRect;
-            }
-            return last;
-        }
-
-        // Fix for GUILayout.Scroller and GUILayout.ScrollerRepeatButton, just calling fixed implementations.
-
-        public static float Scroller(Rect position, float value, float size, float leftValue, float rightValue, GUIStyle slider, GUIStyle thumb, GUIStyle leftButton, GUIStyle rightButton, bool horiz)
-            => Scroller_Impl(position, value, size, leftValue, rightValue, slider, thumb, leftButton, rightButton, horiz);
-
-        public static bool ScrollerRepeatButton(int scrollerID, Rect rect, GUIStyle style)
-            => ScrollerRepeatButton_Impl(scrollerID, rect, style);
-
-        // Simple unstrips for HorizontalScrollbar and VerticalScrollbar, they just call the Scroller unstrip.
-
-        public static float HorizontalScrollbar(Rect position, float value, float size, float leftValue, float rightValue, GUIStyle style)
-        {
-            return Scroller(position, value, size, leftValue, rightValue, style, GUI.skin.GetStyle(style.name + "thumb"), GUI.skin.GetStyle(style.name + "leftbutton"), GUI.skin.GetStyle(style.name + "rightbutton"), true);
-        }
-
-        public static float VerticalScrollbar(Rect position, float value, float size, float topValue, float bottomValue, GUIStyle style)
-        {
-            return Scroller(position, value, size, topValue, bottomValue, style, GUI.skin.GetStyle(style.name + "thumb"), GUI.skin.GetStyle(style.name + "upbutton"), GUI.skin.GetStyle(style.name + "downbutton"), false);
-        }
-
-        // Fix for BeginScrollView.
-        // Uses several manually unstripped methods.
-
-        public static Vector2 BeginScrollView(Vector2 scroll, params GUILayoutOption[] options)
-        {
-            // First, just try normal way, may not have been stripped or was unstripped successfully.
-            if (!ScrollFailed)
-            {
-                try
-                {
-                    return GUILayout.BeginScrollView(scroll, options);
-                }
-                catch
-                {
-                    ScrollFailed = true;
-                    return scroll;
-                }
-            }
-
-            // Try manual unstripping implementation.
-            if (!ManualUnstripFailed)
-            {
-                try
-                {
-                    return BeginScrollView_Impl(scroll, false, false, GUI.skin.horizontalScrollbar, GUI.skin.verticalScrollbar, GUI.skin.scrollView, options);
-                }
-                catch (Exception e)
-                {
-                    MelonLogger.Log("Exception on GUIUnstrip.BeginScrollView_Impl: " + e.GetType() + ", " + e.Message + "\r\n" + e.StackTrace);
-
-                    ManualUnstripFailed = true;
-                    return scroll;
-                }
-            }
-
-            // Sorry! No scrolling for you.
-            return scroll;
-        }
-
-        public static void EndScrollView(bool handleScrollWheel = true)
-        {
-            // Only end the scroll view for the relevant BeginScrollView option, if any.
-
-            if (!ScrollFailed)
-            {
-                GUILayout.EndScrollView();
-            }
-            else if (!ManualUnstripFailed)
-            {
-                GUILayoutUtility.EndLayoutGroup();
-
-                EndScrollView_Impl(handleScrollWheel);
-            }
-        }
-
-        // ======= private methods ======= //
-
-        // Actual unstrip of GUILayout.BeginScrollView()
-
-        private static Vector2 BeginScrollView_Impl(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, GUIStyle horizontalScrollbar,
-            GUIStyle verticalScrollbar, GUIStyle background, params GUILayoutOption[] options)
-        {
-            GUIUtility.CheckOnGUI();
-
-            var guiscrollGroup = (GUIScrollGroup)GUILayoutUtility.BeginLayoutGroup(
-                background,
-                null,
-                Il2CppType.Of<GUIScrollGroup>()
-            ).Il2CppCast(typeof(GUIScrollGroup));
-
-            EventType type = Event.current.type;
-            if (type == EventType.Layout)
-            {
-                guiscrollGroup.resetCoords = true;
-                guiscrollGroup.isVertical = true;
-                guiscrollGroup.stretchWidth = 1;
-                guiscrollGroup.stretchHeight = 1;
-                guiscrollGroup.verticalScrollbar = verticalScrollbar;
-                guiscrollGroup.horizontalScrollbar = horizontalScrollbar;
-                guiscrollGroup.needsVerticalScrollbar = alwaysShowVertical;
-                guiscrollGroup.needsHorizontalScrollbar = alwaysShowHorizontal;
-                guiscrollGroup.ApplyOptions(options);
-            }
-
-            return BeginScrollView_Impl(guiscrollGroup.rect,
-                scrollPosition,
-                new Rect(0f, 0f, guiscrollGroup.clientWidth, guiscrollGroup.clientHeight),
-                alwaysShowHorizontal,
-                alwaysShowVertical,
-                horizontalScrollbar,
-                verticalScrollbar,
-                background
-            );
-        }
-
-        // Actual unstrip of GUI.BeginScrollView() -- note: not GUILayout.
-
-        private static Vector2 BeginScrollView_Impl(Rect position, Vector2 scrollPosition, Rect viewRect, bool alwaysShowHorizontal, bool alwaysShowVertical,
-            GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, GUIStyle background)
-        {
-            GUIUtility.CheckOnGUI();
-
-            int controlID = GUIUtility.GetControlID(GUI.s_ScrollviewHash, FocusType.Passive);
-
-            var scrollViewState = (ScrollViewState)GUIUtility.GetStateObject(Il2CppType.Of<ScrollViewState>(), controlID).Il2CppCast(typeof(ScrollViewState));
-
-            var scrollExt = ScrollViewStateUnstrip.FromPointer(scrollViewState.Pointer);
-
-            if (scrollExt == null) throw new Exception($"Could not get scrollExt for pointer '{scrollViewState.Pointer}'!");
-
-            bool apply = scrollExt.apply;
-            if (apply)
-            {
-                scrollPosition = scrollExt.scrollPosition;
-                scrollExt.apply = false;
-            }
-
-            scrollExt.position = position;
-
-            scrollExt.scrollPosition = scrollPosition;
-            scrollExt.visibleRect = scrollExt.viewRect = viewRect;
-
-            var rect = scrollExt.visibleRect;
-            rect.width = position.width;
-            rect.height = position.height;
-
-            ScrollStack.Push(scrollViewState);
-
-            Rect screenRect = new Rect(position);
-            EventType type = Event.current.type;
-            if (type != EventType.Layout)
-            {
-                if (type != EventType.Used)
-                {
-                    bool flag = alwaysShowVertical;
-                    bool flag2 = alwaysShowHorizontal;
-                    if (flag2 || viewRect.width > screenRect.width)
-                    {
-                        rect.height = position.height - horizontalScrollbar.fixedHeight + (float)horizontalScrollbar.margin.top;
-
-                        screenRect.height -= horizontalScrollbar.fixedHeight + (float)horizontalScrollbar.margin.top;
-                        flag2 = true;
-                    }
-                    if (flag || viewRect.height > screenRect.height)
-                    {
-                        rect.width = position.width - verticalScrollbar.fixedWidth + (float)verticalScrollbar.margin.left;
-
-                        screenRect.width -= verticalScrollbar.fixedWidth + (float)verticalScrollbar.margin.left;
-                        flag = true;
-                        if (!flag2 && viewRect.width > screenRect.width)
-                        {
-                            rect.height = position.height - horizontalScrollbar.fixedHeight + (float)horizontalScrollbar.margin.top;
-                            screenRect.height -= horizontalScrollbar.fixedHeight + (float)horizontalScrollbar.margin.top;
-                            flag2 = true;
-                        }
-                    }
-                    if (Event.current.type == EventType.Repaint && background != GUIStyle.none)
-                    {
-                        background.Draw(position, position.Contains(Event.current.mousePosition), false, flag2 && flag, false);
-                    }
-                    if (flag2 && horizontalScrollbar != GUIStyle.none)
-                    {
-                        scrollPosition.x = HorizontalScrollbar(
-                            new Rect(
-                                position.x,
-                                position.yMax - horizontalScrollbar.fixedHeight,
-                                screenRect.width,
-                                horizontalScrollbar.fixedHeight),
-                            scrollPosition.x,
-                            Mathf.Min(screenRect.width, viewRect.width),
-                            0f,
-                            viewRect.width,
-                            horizontalScrollbar
-                        );
-                    }
-                    else
-                    {
-                        GUIUtility.GetControlID(GUI.s_SliderHash, FocusType.Passive);
-                        GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
-                        GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
-                        scrollPosition.x = ((horizontalScrollbar == GUIStyle.none) ? Mathf.Clamp(scrollPosition.x, 0f, Mathf.Max(viewRect.width - position.width, 0f)) : 0f);
-                    }
-                    if (flag && verticalScrollbar != GUIStyle.none)
-                    {
-                        scrollPosition.y = VerticalScrollbar(
-                            new Rect(
-                                screenRect.xMax + (float)verticalScrollbar.margin.left,
-                                screenRect.y,
-                                verticalScrollbar.fixedWidth,
-                                screenRect.height),
-                            scrollPosition.y,
-                            Mathf.Min(screenRect.height, viewRect.height),
-                            0f,
-                            viewRect.height,
-                            verticalScrollbar
-                        );
-                    }
-                    else
-                    {
-                        GUIUtility.GetControlID(GUI.s_SliderHash, FocusType.Passive);
-                        GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
-                        GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
-                        scrollPosition.y = ((verticalScrollbar == GUIStyle.none) ? Mathf.Clamp(scrollPosition.y, 0f, Mathf.Max(viewRect.height - position.height, 0f)) : 0f);
-                    }
-                }
-            }
-            else
-            {
-                GUIUtility.GetControlID(GUI.s_SliderHash, FocusType.Passive);
-                GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
-                GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
-                GUIUtility.GetControlID(GUI.s_SliderHash, FocusType.Passive);
-                GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
-                GUIUtility.GetControlID(GUI.s_RepeatButtonHash, FocusType.Passive);
-            }
-            GUIClip.Push(screenRect, new Vector2(Mathf.Round(-scrollPosition.x - viewRect.x), Mathf.Round(-scrollPosition.y - viewRect.y)), Vector2.zero, false);
-
-            return scrollPosition;
-        }
-
-        // Actual unstrip of GUI.EndScrollView()
-
-        private static void EndScrollView_Impl(bool handleScrollWheel)
-        {
-            GUIUtility.CheckOnGUI();
-
-            if (ScrollStack.Count <= 0) return;
-
-            //ScrollViewState scrollViewState = (ScrollViewState)GUI.s_ScrollViewStates.Peek();
-            var state = (ScrollViewState)ScrollStack.Peek().Il2CppCast(typeof(ScrollViewState));
-            //ScrollViewExtensions.Dict.TryGetValue(state.Pointer, out ScrollViewExtensions scrollExt);
-            var scrollExt = ScrollViewStateUnstrip.FromPointer(state.Pointer);
-
-            if (scrollExt == null) throw new Exception("Could not get scrollExt!");
-
-            GUIClip.Pop();
-
-            //GUI.s_ScrollViewStates.Pop();
-            ScrollStack.Pop();
-
-            var position = scrollExt.position;
-
-            if (handleScrollWheel && Event.current.type == EventType.ScrollWheel && position.Contains(Event.current.mousePosition))
-            {
-                var pos = scrollExt.scrollPosition;
-                pos.x = Mathf.Clamp(scrollExt.scrollPosition.x + Event.current.delta.x * 20f, 0f, scrollExt.viewRect.width - scrollExt.visibleRect.width);
-                pos.y = Mathf.Clamp(scrollExt.scrollPosition.y + Event.current.delta.y * 20f, 0f, scrollExt.viewRect.height - scrollExt.visibleRect.height);
-
-                if (scrollExt.scrollPosition.x < 0f)
-                {
-                    pos.x = 0f;
-                }
-                if (pos.y < 0f)
-                {
-                    pos.y = 0f;
-                }
-
-                // state.apply = true;
-                scrollExt.apply = true;
-
-                Event.current.Use();
-            }
-        }
-
-        // Actual unstrip of GUI.Scroller
-
-        private static float Scroller_Impl(Rect position, float value, float size, float leftValue, float rightValue, GUIStyle slider, GUIStyle thumb, GUIStyle leftButton, GUIStyle rightButton, bool horiz)
-        {
-            GUIUtility.CheckOnGUI();
-            int controlID = GUIUtility.GetControlID(GUI.s_SliderHash, FocusType.Passive, position);
-            Rect position2;
-            Rect rect;
-            Rect rect2;
-            if (horiz)
-            {
-                position2 = new Rect(position.x + leftButton.fixedWidth, position.y, position.width - leftButton.fixedWidth - rightButton.fixedWidth, position.height);
-                rect = new Rect(position.x, position.y, leftButton.fixedWidth, position.height);
-                rect2 = new Rect(position.xMax - rightButton.fixedWidth, position.y, rightButton.fixedWidth, position.height);
-            }
-            else
-            {
-                position2 = new Rect(position.x, position.y + leftButton.fixedHeight, position.width, position.height - leftButton.fixedHeight - rightButton.fixedHeight);
-                rect = new Rect(position.x, position.y, position.width, leftButton.fixedHeight);
-                rect2 = new Rect(position.x, position.yMax - rightButton.fixedHeight, position.width, rightButton.fixedHeight);
-            }
-
-            //value = GUI.Slider(position2, value, size, leftValue, rightValue, slider, thumb, horiz, controlID);
-            value = Slider(position2, value, size, leftValue, rightValue, slider, thumb, horiz, controlID);
-
-            bool flag = Event.current.type == EventType.MouseUp;
-            if (ScrollerRepeatButton_Impl(controlID, rect, leftButton))
-            {
-                value -= 10f * ((leftValue >= rightValue) ? -1f : 1f);
-            }
-            if (ScrollerRepeatButton_Impl(controlID, rect2, rightButton))
-            {
-                value += 10f * ((leftValue >= rightValue) ? -1f : 1f);
-            }
-            if (flag && Event.current.type == EventType.Used)
-            {
-                //GUI.s_ScrollControlId = 0;
-                GUIUnstrip.s_ScrollControlId = 0;
-            }
-            if (leftValue < rightValue)
-            {
-                value = Mathf.Clamp(value, leftValue, rightValue - size);
-            }
-            else
-            {
-                value = Mathf.Clamp(value, rightValue, leftValue - size);
-            }
-            return value;
-        }
-
-        // Actual unstrip of GUI.Slider
-
-        public static float Slider(Rect position, float value, float size, float start, float end, GUIStyle slider, GUIStyle thumb, bool horiz, int id)
-        {
-            //GUIUtility.CheckOnGUI();
-            if (id == 0)
-            {
-                id = GUIUtility.GetControlID(GUI.s_SliderHash, FocusType.Passive, position);
-            }
-            var sliderHandler = new SliderHandlerUnstrip(position, value, size, start, end, slider, thumb, horiz, id);
-            return sliderHandler.Handle();
-        }
-
-        // Actual unstrip of GUI.ScrollerRepeatButton
-
-        private static bool ScrollerRepeatButton_Impl(int scrollerID, Rect rect, GUIStyle style)
-        {
-            bool result = false;
-            if (GUI.DoRepeatButton(rect, GUIContent.none, style, FocusType.Passive))
-            {
-                //bool flag = GUI.s_ScrollControlId != scrollerID;
-                //GUI.s_ScrollControlId = scrollerID;
-
-                bool flag = GUIUnstrip.s_ScrollControlId != scrollerID;
-                GUIUnstrip.s_ScrollControlId = scrollerID;
-
-                if (flag)
-                {
-                    result = true;
-                    GUI.nextScrollStepTime = Il2CppSystem.DateTime.Now.AddMilliseconds(250.0);
-                }
-                else if (Il2CppSystem.DateTime.Now >= GUI.nextScrollStepTime)
-                {
-                    result = true;
-                    GUI.nextScrollStepTime = Il2CppSystem.DateTime.Now.AddMilliseconds(30.0);
-                }
-                if (Event.current.type == EventType.Repaint)
-                {
-                    GUI.InternalRepaintEditorWindow();
-                }
-            }
-            return result;
-        }
-    }
-}

src/Unstripping/ScrollViewStateUnstrip.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Harmony;
-using MelonLoader;
-using UnityEngine;
-
-namespace Explorer
-{    
-    // This is a manual unstrip of UnityEngine.ScrollViewState.
-    // This code is provided "as-is".
-    // Taken from dnSpy output using Unity 2018.4.20.
-
-    // "Unity", Unity logos, and other Unity trademarks are trademarks or 
-    // registered trademarks of Unity Technologies or its affiliates in the 
-    // U.S. and elsewhere. 
-    // https://unity3d.com/legal/terms-of-service
-    // https://unity3d.com/legal/terms-of-service/software
-
-    public class ScrollViewStateUnstrip
-    {
-        public Rect position;
-        public Rect visibleRect;
-        public Rect viewRect;
-        public Vector2 scrollPosition;
-        public bool apply;
-
-        public static Dictionary<IntPtr, ScrollViewStateUnstrip> Dict = new Dictionary<IntPtr, ScrollViewStateUnstrip>();
-
-        public static ScrollViewStateUnstrip FromPointer(IntPtr ptr)
-        {
-            if (!Dict.ContainsKey(ptr))
-            {
-                Dict.Add(ptr, new ScrollViewStateUnstrip());
-            }
-
-            return Dict[ptr];
-        }
-    }
-}

src/Unstripping/UnstripExtensions.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
-namespace Explorer
-{
-    // "Unity", Unity logos, and other Unity trademarks are trademarks or 
-    // registered trademarks of Unity Technologies or its affiliates in the 
-    // U.S. and elsewhere. 
-    // https://unity3d.com/legal/terms-of-service
-    // https://unity3d.com/legal/terms-of-service/software
-
-    public static class UnstripExtensions
-    {
-        // This is a manual unstrip of GUILayoutGroup.GetLast().
-        // I'm using it as an Extension because it's easier this way.
-
-        public static Rect GetLastUnstripped(this GUILayoutGroup group)
-        {
-            Rect result;
-            if (group.m_Cursor == 0)
-            {
-                Debug.LogError("You cannot call GetLast immediately after beginning a group.");
-                result = GUILayoutEntry.kDummyRect;
-            }
-            else if (group.m_Cursor <= group.entries.Count)
-            {
-                GUILayoutEntry guilayoutEntry = group.entries[group.m_Cursor - 1];
-                result = guilayoutEntry.rect;
-            }
-            else
-            {
-                Debug.LogError(string.Concat(new object[]
-                {
-                    "Getting control ",
-                    group.m_Cursor,
-                    "'s position in a group with only ",
-                    group.entries.Count,
-                    " controls when doing ",
-                    Event.current.type
-                }));
-                result = GUILayoutEntry.kDummyRect;
-            }
-            return result;
-        }
-    }
-}

src/Windows/GameObjectWindow.cs

@@ -1,529 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using MelonLoader;
-using UnhollowerRuntimeLib;
-using UnityEngine;
-using UnityEngine.SceneManagement;
-
-namespace Explorer
-{
-    public class GameObjectWindow : UIWindow
-    {
-        public override string Title => WindowManager.TabView
-            ? $"<color=cyan>[G]</color> {m_object.name}"
-            : $"GameObject Inspector ({m_object.name})";
-
-        public GameObject m_object;
-
-        // gui element holders
-        private string m_name;
-        private string m_scene;
-
-        private Transform[] m_children;
-        private Vector2 m_transformScroll = Vector2.zero;
-        private PageHelper ChildPages = new PageHelper();
-
-        private Component[] m_components;
-        private Vector2 m_compScroll = Vector2.zero;
-        private PageHelper CompPages = new PageHelper();
-
-        private float m_translateAmount = 0.3f;
-        private float m_rotateAmount = 50f;
-        private float m_scaleAmount = 0.1f;
-
-        private readonly List<Component> m_cachedDestroyList = new List<Component>();
-        //private string m_addComponentInput = "";
-
-        private string m_setParentInput = "Enter a GameObject name or path";
-
-        public bool GetObjectAsGameObject()
-        {
-            if (Target == null)
-            {
-                MelonLogger.Log("Target is null!");
-                return false;
-            }
-
-            var targetType = Target.GetType();
-
-            if (targetType == typeof(GameObject))
-            {
-                m_object = Target as GameObject;
-                return true;
-            }
-            else if (targetType == typeof(Transform))
-            {
-                m_object = (Target as Transform).gameObject;
-                return true;
-            }
-
-            MelonLogger.Log("Error: Target is null or not a GameObject/Transform!");
-            DestroyWindow();
-            return false;
-        }
-
-        public override void Init()
-        {
-            if (!GetObjectAsGameObject())
-            {
-                return;
-            }
-
-            m_name = m_object.name;
-            m_scene = string.IsNullOrEmpty(m_object.scene.name) 
-                        ? "None" 
-                        : m_object.scene.name;
-
-            Update();
-        }
-
-        public override void Update()
-        {
-            try
-            {
-                if (!m_object && !GetObjectAsGameObject())
-                {
-                    throw new Exception("Object is null!");
-                }
-
-                var list = new List<Transform>();
-                for (int i = 0; i < m_object.transform.childCount; i++)
-                {
-                    list.Add(m_object.transform.GetChild(i));
-                }
-                list.Sort((a, b) => b.childCount.CompareTo(a.childCount));
-                m_children = list.ToArray();
-
-                ChildPages.ItemCount = m_children.Length;
-
-                var list2 = new List<Component>();
-                foreach (var comp in m_object.GetComponents(ReflectionHelpers.ComponentType))
-                {
-                    var ilType = comp.GetIl2CppType();
-                    if (ilType == ReflectionHelpers.TransformType)
-                    {
-                        continue;
-                    }
-
-                    list2.Add(comp);
-                }
-                m_components = list2.ToArray();
-
-                CompPages.ItemCount = m_components.Length;
-            }
-            catch (Exception e)
-            {
-                DestroyOnException(e);
-            }
-        }
-
-        private void DestroyOnException(Exception e)
-        {
-            MelonLogger.Log($"Exception drawing GameObject Window: {e.GetType()}, {e.Message}");
-            DestroyWindow();
-        }
-
-        private void InspectGameObject(Transform obj)
-        {
-            var window = WindowManager.InspectObject(obj, out bool created);
-            
-            if (created)
-            {
-                window.m_rect = new Rect(this.m_rect.x, this.m_rect.y, this.m_rect.width, this.m_rect.height);
-                DestroyWindow();
-            }
-        }
-
-        private void ReflectObject(Il2CppSystem.Object obj)
-        {
-            var window = WindowManager.InspectObject(obj, out bool created);
-
-            if (created)
-            {
-                if (this.m_rect.x <= (Screen.width - this.m_rect.width - 100))
-                {
-                    window.m_rect = new Rect(
-                        this.m_rect.x + this.m_rect.width + 20,
-                        this.m_rect.y,
-                        550,
-                        700);
-                }
-                else
-                {
-                    window.m_rect = new Rect(this.m_rect.x + 50, this.m_rect.y + 50, 550, 700);
-                }
-            }
-        }
-
-        public override void WindowFunction(int windowID)
-        {
-            try
-            {
-                var rect = WindowManager.TabView ? TabViewWindow.Instance.m_rect : this.m_rect;
-
-                if (!WindowManager.TabView)
-                {
-                    Header();
-                    GUILayout.BeginArea(new Rect(5, 25, rect.width - 10, rect.height - 35), GUI.skin.box);
-                }
-
-                scroll = GUIUnstrip.BeginScrollView(scroll);
-
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Label("Scene: <color=cyan>" + (m_scene == "" ? "n/a" : m_scene) + "</color>", null);
-                if (m_scene == UnityHelpers.ActiveSceneName)
-                {
-                    if (GUILayout.Button("<color=#00FF00>Send to Scene View</color>", new GUILayoutOption[] { GUILayout.Width(150) }))
-                    {
-                        ScenePage.Instance.SetTransformTarget(m_object.transform);
-                        MainMenu.SetCurrentPage(0);
-                    }
-                }
-                if (GUILayout.Button("Reflection Inspect", new GUILayoutOption[] { GUILayout.Width(150) }))
-                {
-                    WindowManager.InspectObject(Target, out _, true);
-                }
-                GUILayout.EndHorizontal();
-
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Label("Path:", new GUILayoutOption[] { GUILayout.Width(50) });
-                string pathlabel = m_object.transform.GetGameObjectPath();
-                if (m_object.transform.parent != null)
-                {
-                    if (GUILayout.Button("<-", new GUILayoutOption[] { GUILayout.Width(35) }))
-                    {
-                        InspectGameObject(m_object.transform.parent);
-                    }
-                }
-                GUILayout.TextArea(pathlabel, null);
-                GUILayout.EndHorizontal();
-
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Label("Name:", new GUILayoutOption[] { GUILayout.Width(50) });
-                GUILayout.TextArea(m_name, null);
-                GUILayout.EndHorizontal();
-
-                // --- Horizontal Columns section ---
-                GUILayout.BeginHorizontal(null);
-
-                GUILayout.BeginVertical(new GUILayoutOption[] { GUILayout.Width(rect.width / 2 - 17) });
-                TransformList(rect);
-                GUILayout.EndVertical();
-
-                GUILayout.BeginVertical(new GUILayoutOption[] { GUILayout.Width(rect.width / 2 - 17) });
-                ComponentList(rect);
-                GUILayout.EndVertical();
-
-                GUILayout.EndHorizontal(); // end horiz columns
-
-                GameObjectControls();
-
-                GUIUnstrip.EndScrollView();
-
-                if (!WindowManager.TabView)
-                {
-                    m_rect = ResizeDrag.ResizeWindow(rect, windowID);
-
-                    GUILayout.EndArea();
-                }
-            }
-            catch (Exception e)
-            {
-                DestroyOnException(e);
-            }
-        }
-
-        private void TransformList(Rect m_rect)
-        {
-            GUILayout.BeginVertical(GUI.skin.box, null);
-            m_transformScroll = GUIUnstrip.BeginScrollView(m_transformScroll);
-
-            GUILayout.Label("<b><size=15>Children</size></b>", null);
-
-            GUILayout.BeginHorizontal(null);
-            ChildPages.DrawLimitInputArea();
-
-            if (ChildPages.ItemCount > ChildPages.ItemsPerPage)
-            {
-                ChildPages.CurrentPageLabel();
-
-                GUILayout.EndHorizontal();
-                GUILayout.BeginHorizontal(null);
-
-                if (GUILayout.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(80) }))
-                {
-                    ChildPages.TurnPage(Turn.Left, ref this.m_transformScroll);
-                }
-                if (GUILayout.Button("Next >", new GUILayoutOption[] { GUILayout.Width(80) }))
-                {
-                    ChildPages.TurnPage(Turn.Right, ref this.m_transformScroll);
-                }
-            }
-            GUILayout.EndHorizontal();
-
-            if (m_children != null && m_children.Length > 0)
-            {
-                int start = ChildPages.CalculateOffsetIndex();
-
-                for (int j = start; (j < start + ChildPages.ItemsPerPage && j < ChildPages.ItemCount); j++)
-                {
-                    var obj = m_children[j];
-
-                    if (!obj)
-                    {
-                        GUILayout.Label("null", null);
-                        continue;
-                    }
-
-                    UIHelpers.GOButton(obj.gameObject, InspectGameObject, false, m_rect.width / 2 - 80);
-                }
-            }
-            else
-            {
-                GUILayout.Label("<i>None</i>", null);
-            }
-
-            GUIUnstrip.EndScrollView();
-            GUILayout.EndVertical();
-        }
-
-        private void ComponentList(Rect m_rect)
-        {
-            GUILayout.BeginVertical(GUI.skin.box, null);
-            m_compScroll = GUIUnstrip.BeginScrollView(m_compScroll);
-            GUILayout.Label("<b><size=15>Components</size></b>", null);
-
-            GUILayout.BeginHorizontal(null);
-            CompPages.DrawLimitInputArea();
-
-            if (CompPages.ItemCount > CompPages.ItemsPerPage)
-            {
-                CompPages.CurrentPageLabel();
-
-                GUILayout.EndHorizontal();
-                GUILayout.BeginHorizontal(null);
-
-                if (GUILayout.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(80) }))
-                {
-                    CompPages.TurnPage(Turn.Left, ref this.m_compScroll);
-                }
-                if (GUILayout.Button("Next >", new GUILayoutOption[] { GUILayout.Width(80) }))
-                {
-                    CompPages.TurnPage(Turn.Right, ref this.m_compScroll);
-                }
-            }
-            GUILayout.EndHorizontal();
-
-            GUI.skin.button.alignment = TextAnchor.MiddleLeft;
-            if (m_cachedDestroyList.Count > 0)
-            {
-                m_cachedDestroyList.Clear();
-            }
-
-            if (m_components != null)
-            {
-                int start = CompPages.CalculateOffsetIndex();
-
-                for (int j = start; (j < start + CompPages.ItemsPerPage && j < CompPages.ItemCount); j++)
-                {
-                    var component = m_components[j];
-
-                    if (!component) continue;
-
-                    var ilType = component.GetIl2CppType();
-
-                    GUILayout.BeginHorizontal(null);
-                    if (ReflectionHelpers.BehaviourType.IsAssignableFrom(ilType))
-                    {
-                        BehaviourEnabledBtn(component.TryCast<Behaviour>());
-                    }
-                    else
-                    {
-                        GUILayout.Space(26);
-                    }
-                    if (GUILayout.Button("<color=cyan>" + ilType.Name + "</color>", new GUILayoutOption[] { GUILayout.Width(m_rect.width / 2 - 100) }))
-                    {
-                        ReflectObject(component);
-                    }
-                    if (GUILayout.Button("<color=red>-</color>", new GUILayoutOption[] { GUILayout.Width(20) }))
-                    {
-                        m_cachedDestroyList.Add(component);
-                    }
-                    GUILayout.EndHorizontal();
-                }
-            }
-
-            GUI.skin.button.alignment = TextAnchor.MiddleCenter;
-            if (m_cachedDestroyList.Count > 0)
-            {
-                for (int i = m_cachedDestroyList.Count - 1; i >= 0; i--)
-                {
-                    var comp = m_cachedDestroyList[i];
-                    GameObject.Destroy(comp);
-                }
-            }
-
-            GUIUnstrip.EndScrollView();
-
-            GUILayout.EndVertical();
-        }
-
-        private void BehaviourEnabledBtn(Behaviour obj)
-        {
-            var _col = GUI.color;
-            bool _enabled = obj.enabled;
-            if (_enabled)
-            {
-                GUI.color = Color.green;
-            }
-            else
-            {
-                GUI.color = Color.red;
-            }
-
-            // ------ toggle active button ------
-
-            _enabled = GUILayout.Toggle(_enabled, "", new GUILayoutOption[] { GUILayout.Width(18) });
-            if (obj.enabled != _enabled)
-            {
-                obj.enabled = _enabled;
-            }
-            GUI.color = _col;
-        }
-
-        private void GameObjectControls()
-        {
-            GUILayout.BeginVertical(GUI.skin.box, new GUILayoutOption[] { GUILayout.Width(520) });
-            GUILayout.Label("<b><size=15>GameObject Controls</size></b>", null);
-
-            GUILayout.BeginHorizontal(null);
-            bool m_active = m_object.activeSelf;
-            m_active = GUILayout.Toggle(m_active, (m_active ? "<color=lime>Enabled " : "<color=red>Disabled") + "</color>",
-                new GUILayoutOption[] { GUILayout.Width(80) });
-            if (m_object.activeSelf != m_active) { m_object.SetActive(m_active); }
-
-            UIHelpers.InstantiateButton(m_object, 100);
-
-            if (GUILayout.Button("Set DontDestroyOnLoad", new GUILayoutOption[] { GUILayout.Width(170) }))
-            {
-                GameObject.DontDestroyOnLoad(m_object);
-                m_object.hideFlags |= HideFlags.DontUnloadUnusedAsset;
-            }
-
-            GUILayout.EndHorizontal();
-            GUILayout.BeginHorizontal(null);
-
-            m_setParentInput = GUILayout.TextField(m_setParentInput, null);
-            if (GUILayout.Button("Set Parent", new GUILayoutOption[] { GUILayout.Width(80) }))
-            {
-                if (GameObject.Find(m_setParentInput) is GameObject newparent)
-                {
-                    m_object.transform.parent = newparent.transform;
-                }
-                else
-                {
-                    MelonLogger.LogWarning($"Could not find gameobject '{m_setParentInput}'");
-                }
-            }
-
-            if (GUILayout.Button("Detach from parent", new GUILayoutOption[] { GUILayout.Width(160) }))
-            {
-                m_object.transform.parent = null;
-            }
-            GUILayout.EndHorizontal();
-
-            GUILayout.BeginVertical(GUI.skin.box, null);
-
-            var t = m_object.transform;
-            TranslateControl(t, TranslateType.Position, ref m_translateAmount,  false);
-            TranslateControl(t, TranslateType.Rotation, ref m_rotateAmount,     true);
-            TranslateControl(t, TranslateType.Scale,    ref m_scaleAmount,      false);
-
-            GUILayout.EndVertical();
-
-            if (GUILayout.Button("<color=red><b>Destroy</b></color>", new GUILayoutOption[] { GUILayout.Width(120) }))
-            {
-                GameObject.Destroy(m_object);
-                DestroyWindow();
-                return;
-            }
-
-            GUILayout.EndVertical();
-        }
-
-        public enum TranslateType
-        {
-            Position,
-            Rotation,
-            Scale
-        }
-
-        private void TranslateControl(Transform transform, TranslateType mode, ref float amount, bool multByTime)
-        {
-            GUILayout.BeginHorizontal(null);
-            GUILayout.Label("<color=cyan><b>" + mode + "</b></color>:", new GUILayoutOption[] { GUILayout.Width(65) });
-
-            Vector3 vector = Vector3.zero;
-            switch (mode)
-            {
-                case TranslateType.Position: vector = transform.localPosition; break;
-                case TranslateType.Rotation: vector = transform.localRotation.eulerAngles; break;
-                case TranslateType.Scale:    vector = transform.localScale; break;
-            }
-            GUILayout.Label(vector.ToString(), new GUILayoutOption[] { GUILayout.Width(250)  });
-            GUILayout.EndHorizontal();
-
-            GUILayout.BeginHorizontal(null);
-            GUI.skin.label.alignment = TextAnchor.MiddleRight;
-
-            GUILayout.Label("<color=cyan>X:</color>", new GUILayoutOption[] { GUILayout.Width(20) });
-            PlusMinusFloat(ref vector.x, amount, multByTime);
-
-            GUILayout.Label("<color=cyan>Y:</color>", new GUILayoutOption[] { GUILayout.Width(20) });
-            PlusMinusFloat(ref vector.y, amount, multByTime);
-
-            GUILayout.Label("<color=cyan>Z:</color>", new GUILayoutOption[] { GUILayout.Width(20) });
-            PlusMinusFloat(ref vector.z, amount, multByTime);
-
-            switch (mode)
-            {
-                case TranslateType.Position: transform.localPosition = vector; break;
-                case TranslateType.Rotation: transform.localRotation = Quaternion.Euler(vector); break;
-                case TranslateType.Scale:    transform.localScale = vector; break;
-            }
-
-            GUILayout.Label("+/-:", new GUILayoutOption[] { GUILayout.Width(30) });
-            var input = amount.ToString("F3");
-            input = GUILayout.TextField(input, new GUILayoutOption[] { GUILayout.Width(40) });
-            if (float.TryParse(input, out float f))
-            {
-                amount = f;
-            }
-
-            GUI.skin.label.alignment = TextAnchor.UpperLeft;
-            GUILayout.EndHorizontal();
-        }
-
-        private void PlusMinusFloat(ref float f, float amount, bool multByTime)
-        {
-            string s = f.ToString("F3");
-            s = GUILayout.TextField(s, new GUILayoutOption[] { GUILayout.Width(60) });
-            if (float.TryParse(s, out float f2))
-            {
-                f = f2;
-            }
-            if (GUILayout.RepeatButton("-", new GUILayoutOption[] { GUILayout.Width(20) }))
-            {
-                f -= multByTime ? amount * Time.deltaTime : amount;
-            }
-            if (GUILayout.RepeatButton("+", new GUILayoutOption[] { GUILayout.Width(20) }))
-            {
-                f += multByTime ? amount * Time.deltaTime : amount;
-            }
-        }
-
-        
-    }
-}

src/Windows/ResizeDrag.cs

@@ -1,108 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using MelonLoader;
-using UnhollowerBaseLib;
-
-namespace Explorer
-{
-    public class ResizeDrag
-    {
-        private static bool RESIZE_FAILED = false;
-
-        private static readonly GUIContent gcDrag = new GUIContent("<-- Drag to resize -->");
-        private static bool isResizing = false;
-        private static Rect m_currentResize;
-        private static int m_currentWindow;
-
-        public static Rect ResizeWindow(Rect _rect, int ID)
-        {
-            if (!RESIZE_FAILED)
-            {
-                var origRect = _rect;
-
-                try
-                {
-                    GUILayout.BeginHorizontal(GUI.skin.box, null);
-
-                    GUI.skin.label.alignment = TextAnchor.MiddleCenter;
-                    GUILayout.Button(gcDrag, GUI.skin.label, new GUILayoutOption[] { GUILayout.Height(15) });
-
-                    //var r = GUILayoutUtility.GetLastRect();
-                    var r = GUIUnstrip.GetLastRect();
-
-                    Vector2 mouse = GUIUtility.ScreenToGUIPoint(new Vector2(Input.mousePosition.x, Screen.height - Input.mousePosition.y));
-
-                    if (r.Contains(mouse) && Input.GetMouseButtonDown(0))
-                    {
-                        isResizing = true;
-                        m_currentWindow = ID;
-                        m_currentResize = new Rect(mouse.x, mouse.y, _rect.width, _rect.height);
-                    }
-                    else if (!Input.GetMouseButton(0))
-                    {
-                        isResizing = false;
-                    }
-
-                    if (isResizing && ID == m_currentWindow)
-                    {
-                        _rect.width = Mathf.Max(100, m_currentResize.width + (mouse.x - m_currentResize.x));
-                        _rect.height = Mathf.Max(100, m_currentResize.height + (mouse.y - m_currentResize.y));
-                        _rect.xMax = Mathf.Min(Screen.width, _rect.xMax);  // modifying xMax affects width, not x
-                        _rect.yMax = Mathf.Min(Screen.height, _rect.yMax);  // modifying yMax affects height, not y
-                    }
-
-                    GUILayout.EndHorizontal();
-                }
-                catch (Il2CppException e) when (e.Message.StartsWith("System.ArgumentException"))
-                {
-                    // suppress
-                    return origRect;
-                }
-                catch (Exception e)
-                {
-                    RESIZE_FAILED = true;
-                    MelonLogger.Log("Exception on GuiResize: " + e.GetType() + ", " + e.Message);
-                    MelonLogger.Log(e.StackTrace);
-                    return origRect;
-                }
-
-                GUI.skin.label.alignment = TextAnchor.UpperLeft;
-            }
-            else
-            {
-                GUILayout.BeginHorizontal(GUI.skin.box, null);
-
-                GUILayout.Label("Resize window:", new GUILayoutOption[] { GUILayout.Width(100) });
-
-                GUI.skin.label.alignment = TextAnchor.MiddleRight;
-                GUILayout.Label("<color=cyan>Width:</color>", new GUILayoutOption[] { GUILayout.Width(60) });
-                if (GUILayout.RepeatButton("-", new GUILayoutOption[] { GUILayout.Width(20) }))
-                {
-                    _rect.width -= 5f;
-                }
-                if (GUILayout.RepeatButton("+", new GUILayoutOption[] { GUILayout.Width(20) }))
-                {
-                    _rect.width += 5f;
-                }
-                GUILayout.Label("<color=cyan>Height:</color>", new GUILayoutOption[] { GUILayout.Width(60) });
-                if (GUILayout.RepeatButton("-", new GUILayoutOption[] { GUILayout.Width(20) }))
-                {
-                    _rect.height -= 5f;
-                }
-                if (GUILayout.RepeatButton("+", new GUILayoutOption[] { GUILayout.Width(20) }))
-                {
-                    _rect.height += 5f;
-                }
-
-                GUILayout.EndHorizontal();
-                GUI.skin.label.alignment = TextAnchor.UpperLeft;
-            }
-
-            return _rect;
-        }
-    }
-}