Update README.md

* Added a ModConfig, allowing you to define the main menu toggle keybind and the default window size (so far).
* Made the parsing of arguments more intelligent, should now behave as expected for null or empty arguments.

.gitignore

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

README.md

@@ -16,6 +16,7 @@
 
 ### Known issues
 * CppExplorer may experience a `MissingMethodException` when trying to use certain UnityEngine methods. If you experience this, please open an issue and I will do my best to fix it.
+* Reflection may fail with certain types (eg. `Nullable<T>`, some Dictionary types, etc). Please see [Il2CppAssemblyUnhollower](https://github.com/knah/Il2CppAssemblyUnhollower#known-issues) for more details.
 * Scrolling with mouse wheel in the CppExplorer menu may not work on all games at the moment.
 
 ## How to install
@@ -31,8 +32,24 @@ Requires [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) to be ins
 * Press F7 to show or hide the menu.
 * Simply browse through the scene, search for objects, etc, most of it is pretty self-explanatory.
 
+### Mod Config
+
+There is a simple Mod Config for the CppExplorer, which is generated the first time you run it.
+
+This config is generated to `Mods\CppExplorer\config.xml`. Edit the config while the game is closed if you wish to change it.
+
+`Main_Menu_Toggle` (KeyCode)
+* Sets the keybinding for the Main Menu toggle (show/hide all CppExplorer 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 CppExplorer windows when created.
+* `x` is width, `y` is height.
+* Default: `<x>550</x> <y>700</y>`
+
 ### Features
-[![](img.png)](img.png)
+[![](overview.png)](overview.png)
 
 <i>An overview of the different CppExplorer menus.</i>
 
@@ -91,10 +108,21 @@ CppExplorer can force the mouse to be visible and unlocked when the menu is open
 * 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.
 
+## Building
+
+If you'd like to build this yourself, everything you need (other than MelonLoader) is included with this repository, there is no need for recursive cloning etc.
+
+1. Install MelonLoader for your game.
+2. Open the `src\CppExplorer.csproj` file in a text editor.
+3. Scroll down until you see the `<ItemGroup>` containing the References.
+4. Fix all of the paths in the `..\Steam\` directory for your game (use the full path if you need to).
+5. Open the `src\CppExplorer.sln` project and build it.
+6. The dll is 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/CacheObjectBase.cs

@@ -19,8 +19,12 @@ namespace Explorer
         public MemberInfo MemInfo { get; set; }
         public Type DeclaringType { get; set; }
         public object DeclaringInstance { get; set; }
-        public int PropertyIndex { get; private set; }
-        private string m_propertyIndexInput = "0";
+
+        public 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; }
 
@@ -40,14 +44,10 @@ namespace Explorer
             }
         }
 
-        // ===== Abstract/Virtual Methods ===== //
-
         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>
@@ -114,12 +114,21 @@ namespace Explorer
         {
             CacheObjectBase holder;
 
+            var pi = memberInfo as PropertyInfo;
+            var mi = memberInfo as MethodInfo;
+
+            // if PropertyInfo, check if can process args
+            if (pi != null && !CanProcessArgs(pi.GetIndexParameters()))
+            {
+                return null;
+            }
+
             // This is pretty ugly, could probably make a cleaner implementation.
             // However, the only cleaner ways I can think of are slower and probably not worth it. 
 
             // Note: the order is somewhat important.
 
-            if (memberInfo is MethodInfo mi)
+            if (mi != null)
             {
                 if (CacheMethod.CanEvaluate(mi))
                 {
@@ -181,24 +190,113 @@ namespace Explorer
                 holder.MemInfo = memberInfo;
                 holder.DeclaringType = memberInfo.DeclaringType;
                 holder.DeclaringInstance = declaringInstance;
-
-                holder.UpdateValue();
             }
 
+            if (pi != null)
+            {
+                holder.m_arguments = pi.GetIndexParameters();
+            }
+            else if (mi != null)
+            {
+                holder.m_arguments = mi.GetParameters();
+            }
+
+            holder.m_argumentInput = new string[holder.m_arguments.Length];
+            
+            holder.UpdateValue();
+
             holder.Init();
 
             return holder;
         }
 
-        // ======== Instance Methods =========
+        public static bool CanProcessArgs(ParameterInfo[] parameters)
+        {
+            foreach (var param in parameters)
+            {
+                if (!param.ParameterType.IsPrimitive && param.ParameterType != typeof(string))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        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 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;
+
+                // First, try parse the input and use that.
+                if (!string.IsNullOrEmpty(input))
+                {
+                    // strings can obviously just be used directly
+                    if (type == typeof(string))
+                    {
+                        parsedArgs.Add(input);
+                        continue;
+                    }
+                    else
+                    {
+                        // try to invoke the parse method and use that.
+                        try
+                        {
+                            parsedArgs.Add(type.GetMethod("Parse", new Type[] { typeof(string) })
+                                               .Invoke(null, new object[] { input }));
+
+                            continue;
+                        }
+                        catch
+                        {
+                            MelonLogger.Log($"Argument #{i} '{m_arguments[i].Name}' ({type.Name}), could not parse input '{input}'.");
+                        }
+                    }
+                }
+
+                // Didn't use input, see if there is a default value.
+                if (m_arguments[i].HasDefaultValue)
+                {
+                    parsedArgs.Add(m_arguments[i].DefaultValue);
+                    continue;
+                }
+
+                // Try add a null arg I guess
+                parsedArgs.Add(null);
+            }
+
+            return parsedArgs.ToArray();
+        }
 
         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)
@@ -209,13 +307,11 @@ 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)
+                    if (HasParameters)
                     {
-                        var indexes = new object[] { PropertyIndex };
-                        Value = pi.GetValue(target, indexes);
+                        Value = pi.GetValue(target, ParseArguments());
                     }
                     else
                     {
@@ -224,6 +320,8 @@ namespace Explorer
                 }
 
                 ReflectionException = null;
+                m_evaluated = true;
+                m_isEvaluating = false;
             }
             catch (Exception e)
             {
@@ -244,10 +342,9 @@ 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
                     {
@@ -261,9 +358,10 @@ namespace Explorer
             }
         }
 
-        // ========= Instance Gui Draw ==========
+        // ========= Gui Draw ==========
 
         public const float MAX_LABEL_WIDTH = 400f;
+        public const string EVALUATE_LABEL = "<color=lime>Evaluate</color>";
 
         public static void ClampLabelWidth(Rect window, ref float labelWidth)
         {
@@ -282,53 +380,108 @@ 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);
             }
 
+            var cm = this as CacheMethod;
+
+            if (HasParameters)
+            {
+                GUILayout.BeginVertical(null);
+
+                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;
+
+                        var label = "<color=#2df7b2>" + type + "</color> <color=#a6e9e9>" + name + "</color>";
+                        if (m_arguments[i].HasDefaultValue)
+                        {
+                            label = $"<i>[{label} = {m_arguments[i].DefaultValue}]</i>";
+                        }
+
+                        GUILayout.BeginHorizontal(null);
+
+                        GUILayout.Label(i.ToString(), new GUILayoutOption[] { GUILayout.Width(20) });
+                        m_argumentInput[i] = GUILayout.TextField(input, new GUILayoutOption[] { GUILayout.Width(150) });
+                        GUILayout.Label(label, null);
+
+                        GUILayout.EndHorizontal();
+                    }
+
+                    GUILayout.BeginHorizontal(null);
+                    if (cm != null)
+                    {
+                        if (GUILayout.Button(EVALUATE_LABEL, new GUILayoutOption[] { GUILayout.Width(70) }))
+                        {
+                            cm.Evaluate();
+                        }
+                    }
+                    else
+                    {
+                        if (GUILayout.Button(EVALUATE_LABEL, new GUILayoutOption[] { GUILayout.Width(70) }))
+                        {
+                            UpdateValue();
+                        }
+                    }
+                    
+                    if (GUILayout.Button("Cancel", new GUILayoutOption[] { GUILayout.Width(70) }))
+                    {
+                        m_isEvaluating = false;
+                    }
+                    GUILayout.EndHorizontal();
+                }
+                else
+                {
+                    if (GUILayout.Button($"Evaluate ({m_arguments.Length} params)", new GUILayoutOption[] { GUILayout.Width(150) }))
+                    {
+                        m_isEvaluating = true;
+                    }
+                }
+
+                GUILayout.EndVertical();
+
+                // new line and space
+                GUILayout.EndHorizontal();
+                GUILayout.BeginHorizontal(null);
+                GUILayout.Space(labelWidth);
+            }
+            else if (cm != null)
+            {
+                //GUILayout.BeginHorizontal(null);
+
+                if (GUILayout.Button(EVALUATE_LABEL, new GUILayoutOption[] { GUILayout.Width(70) }))
+                {
+                    cm.Evaluate();
+                }
+
+                // new line and space
+                GUILayout.EndHorizontal();
+                GUILayout.BeginHorizontal(null);
+                GUILayout.Space(labelWidth);
+            }
+
             if (!string.IsNullOrEmpty(ReflectionException))
             {
                 GUILayout.Label("<color=red>Reflection failed!</color> (" + ReflectionException + ")", null);
             }
-            else if (Value == null && MemInfo?.MemberType != MemberTypes.Method)
+            else if ((HasParameters || this is CacheMethod) && !m_evaluated)
+            {
+                GUILayout.Label($"<color=grey><i>Not yet evaluated</i></color> (<color=#2df7b2>{ValueTypeName}</color>)", null);
+            }
+            else if (Value == null && !(this is CacheMethod))
             {
                 GUILayout.Label("<i>null (" + ValueTypeName + ")</i>", null);
             }
             else
             {
-                if (MemInfo is PropertyInfo pi && pi.GetIndexParameters().Length > 0)
-                {
-                    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 (int.TryParse(m_propertyIndexInput, out int i))
-                        {
-                            PropertyIndex = i;
-                            UpdateValue();
-                        }
-                        else
-                        {
-                            MelonLogger.Log($"Could not parse '{m_propertyIndexInput}' to an int!");
-                        }
-                    }
-
-                    // new line and space
-                    GUILayout.EndHorizontal();
-                    GUILayout.BeginHorizontal(null);
-                    GUILayout.Space(labelWidth);
-                }
-
                 DrawValue(window, window.width - labelWidth - 90);
             }
         }
@@ -348,15 +501,15 @@ namespace Explorer
 
             m_richTextName = $"<color=#2df7b2>{MemInfo.DeclaringType.Name}</color>.<color={memberColor}>{MemInfo.Name}</color>";
 
-            if (MemInfo is MethodInfo mi)
+            if (m_arguments.Length > 0 || this is CacheMethod)
             {
                 m_richTextName += "(";
                 var _params = "";
-                foreach (var param in mi.GetParameters())
+                foreach (var param in m_arguments)
                 {
                     if (_params != "") _params += ", ";
 
-                    _params += $"<color=#a6e9e9>{param.Name}</color>";
+                    _params += $"<color=#2df7b2>{param.ParameterType.Name}</color> <color=#a6e9e9>{param.Name}</color>";
                 }
                 m_richTextName += _params;
                 m_richTextName += ")";

src/CachedObjects/IExpandHeight.cs

@@ -9,8 +9,6 @@ namespace Explorer
     interface IExpandHeight
     {
         bool IsExpanded { get; set; }
-
-        float WhiteSpace { get; set; }
-        float ButtonWidthOffset { get; set; }
+        float WhiteSpace { get; set; }        
     }
 }

src/CachedObjects/Object/CacheDictionary.cs

@@ -15,7 +15,6 @@ namespace Explorer
     {
         public bool IsExpanded { get; set; }
         public float WhiteSpace { get; set; } = 215f;
-        public float ButtonWidthOffset { get; set; } = 290f;
 
         public PageHelper Pages = new PageHelper();
 
@@ -126,6 +125,10 @@ namespace Explorer
                     m_keysType = type.GetGenericArguments()[0];
                     m_valuesType = type.GetGenericArguments()[1];
                 }
+                else
+                {
+                    MelonLogger.Log("TODO? Dictionary is of type: " + Value.GetType().FullName);
+                }
             }
         }
 
@@ -152,7 +155,6 @@ namespace Explorer
             foreach (var key in IDict.Keys)
             {
                 var cache = GetCacheObject(key, TypeOfKeys);
-                cache.UpdateValue();
                 keys.Add(cache);
             }
 
@@ -160,7 +162,6 @@ namespace Explorer
             foreach (var val in IDict.Values)
             {
                 var cache = GetCacheObject(val, TypeOfValues);
-                cache.UpdateValue();
                 values.Add(cache);
             }
 
@@ -170,6 +171,11 @@ namespace Explorer
 
         private bool EnsureDictionaryIsSupported()
         {
+            if (typeof(IDictionary).IsAssignableFrom(ValueType))
+            {
+                return true;
+            }
+
             try
             {
                 return Check(TypeOfKeys) && Check(TypeOfValues);
@@ -200,6 +206,8 @@ namespace Explorer
                 return;
             }
 
+            var whitespace = CalcWhitespace(window);
+
             int count = m_cachedKeys.Length;
 
             if (!IsExpanded)
@@ -217,9 +225,11 @@ namespace Explorer
                 }
             }
 
+            var negativeWhitespace = window.width - (whitespace + 100f);
+
             GUI.skin.button.alignment = TextAnchor.MiddleLeft;
-            string btnLabel = $"<color=yellow>[{count}] Dictionary<{TypeOfKeys.FullName}, {TypeOfValues.FullName}></color>";
-            if (GUILayout.Button(btnLabel, new GUILayoutOption[] { GUILayout.MaxWidth(window.width - ButtonWidthOffset) }))
+            string btnLabel = $"<color=#2df7b2>[{count}] Dictionary<{TypeOfKeys.FullName}, {TypeOfValues.FullName}></color>";
+            if (GUILayout.Button(btnLabel, new GUILayoutOption[] { GUILayout.Width(negativeWhitespace) }))
             {
                 WindowManager.InspectObject(Value, out bool _);
             }
@@ -229,12 +239,6 @@ namespace Explorer
 
             if (IsExpanded)
             {
-                float whitespace = WhiteSpace;
-                if (whitespace > 0)
-                {
-                    ClampLabelWidth(window, ref whitespace);
-                }
-
                 Pages.ItemCount = count;
 
                 if (count > Pages.ItemsPerPage)

src/CachedObjects/Object/CacheList.cs

@@ -12,7 +12,6 @@ namespace Explorer
     {
         public bool IsExpanded { get; set; }
         public float WhiteSpace { get; set; } = 215f;
-        public float ButtonWidthOffset { get; set; } = 290f;
 
         public PageHelper Pages = new PageHelper();
 
@@ -219,7 +218,6 @@ namespace Explorer
 
                     if (GetCacheObject(obj, t) is CacheObjectBase cached)
                     {
-                        cached.UpdateValue();
                         list.Add(cached);
                     }
                     else
@@ -246,6 +244,8 @@ namespace Explorer
                 return;
             }
 
+            var whitespace = CalcWhitespace(window);
+
             int count = m_cachedEntries.Length;
 
             if (!IsExpanded)
@@ -263,9 +263,11 @@ namespace Explorer
                 }
             }
 
+            var negativeWhitespace = window.width - (whitespace + 100f);
+
             GUI.skin.button.alignment = TextAnchor.MiddleLeft;
-            string btnLabel = "<color=yellow>[" + count + "] " + EntryType.FullName + "</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.MaxWidth(negativeWhitespace) }))
             {
                 WindowManager.InspectObject(Value, out bool _);
             }
@@ -275,12 +277,6 @@ namespace Explorer
 
             if (IsExpanded)
             {
-                float whitespace = WhiteSpace;                
-                if (whitespace > 0)
-                {
-                    ClampLabelWidth(window, ref whitespace);
-                }
-
                 Pages.ItemCount = count;
 
                 if (count > Pages.ItemsPerPage)

src/CachedObjects/Other/CacheMethod.cs

@@ -11,15 +11,8 @@ 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 => m_arguments != null && m_arguments.Length > 0;
-
         public static bool CanEvaluate(MethodInfo mi)
         {
             // TODO generic args
@@ -29,25 +22,7 @@ namespace Explorer
             }
 
             // 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];
+            return CanProcessArgs(mi.GetParameters());
         }
 
         public override void UpdateValue()
@@ -55,10 +30,11 @@ namespace Explorer
             //base.UpdateValue();
         }
 
-        private void Evaluate()
+        public void Evaluate()
         {
-            var mi = MemInfo as MethodInfo;
+            m_isEvaluating = false;
 
+            var mi = MemInfo as MethodInfo;
             object ret = null;
 
             if (!HasParameters)
@@ -68,42 +44,9 @@ namespace Explorer
             }
             else
             {
-                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 == typeof(string))
-                    {
-                        parsedArgs.Add(input);
-                    }
-                    else
-                    {
-                        try
-                        {
-                            if (type.GetMethod("Parse", new Type[] { typeof(string) }).Invoke(null, new object[] { input }) is object parsed)
-                            {
-                                parsedArgs.Add(parsed);
-                            }
-                            else
-                            {
-                                // try add a null arg i guess
-                                parsedArgs.Add(null);
-                            }
-
-                        }
-                        catch
-                        {
-                            MelonLogger.Log($"Unable to parse '{input}' to type '{type.Name}'");
-                            break;
-                        }
-                    }
-                }
-
                 try
                 {
-                    ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, parsedArgs.ToArray());
+                    ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, ParseArguments());
                     m_evaluated = true;
                 }
                 catch (Exception e)
@@ -115,13 +58,6 @@ namespace Explorer
             if (ret != null)
             {
                 m_cachedReturnValue = GetCacheObject(ret);
-
-                if (m_cachedReturnValue is IExpandHeight expander)
-                {
-                    expander.WhiteSpace = 0f;
-                    expander.ButtonWidthOffset += 70f;
-                }
-
                 m_cachedReturnValue.UpdateValue();
             }
             else
@@ -134,58 +70,6 @@ namespace Explorer
 
         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)
@@ -194,16 +78,13 @@ namespace Explorer
                 }
                 else
                 {
-                    GUILayout.Label($"null (<color=yellow>{ValueTypeName}</color>)", null);
+                    GUILayout.Label($"null (<color=#2df7b2>{ValueTypeName}</color>)", null);
                 }
             }
             else
             {
-                GUILayout.Label($"<color=grey><i>Not yet evaluated</i></color> (<color=yellow>{ValueTypeName}</color>)", null);
+                GUILayout.Label($"<color=grey><i>Not yet evaluated</i></color> (<color=#2df7b2>{ValueTypeName}</color>)", null);
             }
-            GUILayout.EndHorizontal();
-
-            GUILayout.EndVertical();
         }
     }
 }

src/CachedObjects/Other/CacheOther.cs

@@ -42,15 +42,20 @@ namespace Explorer
             
             if (!label.Contains(ValueTypeName))
             {
-                label += $" ({ValueTypeName})";
+                label += $" (<color=#2df7b2>{ValueTypeName}</color>)";
             }
+            else
+            {
+                label = label.Replace(ValueTypeName, $"<color=#2df7b2>{ValueTypeName}</color>");
+            }
+
             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 - 15) }))
+            if (GUILayout.Button(label, new GUILayoutOption[] { GUILayout.Width(width - 15) }))
             {
                 WindowManager.InspectObject(Value, out bool _);
             }

src/CachedObjects/Struct/CacheColor.cs

@@ -7,13 +7,16 @@ using UnityEngine;
 
 namespace Explorer
 {
-    public class CacheColor : CacheObjectBase
+    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();
@@ -28,12 +31,34 @@ namespace Explorer
 
         public override void DrawValue(Rect window, float width)
         {
-            GUILayout.Label($"<color=yellow>Color</color>: {((Color)Value).ToString()}", null);
-
             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> {c.ToString()}", null);
+            GUI.color = Color.white;
+
+            if (CanWrite && IsExpanded)
             {
                 GUILayout.EndHorizontal();
-                var whitespace = window.width - width - 90;
+
+                var whitespace = CalcWhitespace(window);
 
                 GUILayout.BeginHorizontal(null);
                 GUILayout.Space(whitespace);

src/CachedObjects/Struct/CacheEnum.cs

@@ -51,7 +51,7 @@ namespace Explorer
                 }
             }
 
-            GUILayout.Label(Value.ToString() + "<color=yellow><i> (" + ValueType + ")</i></color>", null);
+            GUILayout.Label(Value.ToString() + "<color=#2df7b2><i> (" + ValueType + ")</i></color>", null);
         }
 
         public void SetEnum(ref object value, int change)

src/CachedObjects/Struct/CachePrimitive.cs

@@ -69,10 +69,10 @@ namespace Explorer
             else
             {
                 // using ValueType.Name instead of ValueTypeName, because we only want the short name.
-                GUILayout.Label("<color=yellow><i>" + ValueType.Name + "</i></color>", new GUILayoutOption[] { GUILayout.Width(50) });
+                GUILayout.Label("<color=#2df7b2><i>" + ValueType.Name + "</i></color>", new GUILayoutOption[] { GUILayout.Width(50) });
 
                 int dynSize = 25 + (m_valueToString.Length * 15);
-                var maxwidth = window.width - 300f;
+                var maxwidth = window.width - 310f;
                 if (CanWrite) maxwidth -= 60;
 
                 if (dynSize > maxwidth)
@@ -92,7 +92,7 @@ namespace Explorer
                     }
                 }
 
-                GUILayout.Space(5);
+                GUILayout.Space(10);
             }
         }
 

src/CachedObjects/Struct/CacheQuaternion.cs

@@ -7,12 +7,15 @@ using UnityEngine;
 
 namespace Explorer
 {
-    public class CacheQuaternion : CacheObjectBase
+    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();
@@ -26,12 +29,31 @@ namespace Explorer
 
         public override void DrawValue(Rect window, float width)
         {
-            GUILayout.Label($"<color=yellow>Quaternion</color>: {((Quaternion)Value).eulerAngles.ToString()}", null);
-
             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()}", null);
+
+            if (CanWrite && IsExpanded)
             {
                 GUILayout.EndHorizontal();
-                var whitespace = window.width - width - 90;
+
+                var whitespace = CalcWhitespace(window);
 
                 GUILayout.BeginHorizontal(null);
                 GUILayout.Space(whitespace);

src/CachedObjects/Struct/CacheRect.cs

@@ -7,13 +7,16 @@ using UnityEngine;
 
 namespace Explorer
 {
-    public class CacheRect : CacheObjectBase
+    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();
@@ -28,12 +31,31 @@ namespace Explorer
 
         public override void DrawValue(Rect window, float width)
         {
-            GUILayout.Label($"<color=yellow>Rect</color>: {((Rect)Value).ToString()}", null);
-
             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()}", null);
+
+            if (CanWrite && IsExpanded)
             {
                 GUILayout.EndHorizontal();
-                var whitespace = window.width - width - 90;
+
+                var whitespace = CalcWhitespace(window);
 
                 GUILayout.BeginHorizontal(null);
                 GUILayout.Space(whitespace);

src/CachedObjects/Struct/CacheVector.cs

@@ -8,7 +8,7 @@ using UnityEngine;
 
 namespace Explorer
 {
-    public class CacheVector : CacheObjectBase
+    public class CacheVector : CacheObjectBase, IExpandHeight
     {
         public int VectorSize = 2;
 
@@ -19,6 +19,9 @@ namespace Explorer
 
         private MethodInfo m_toStringMethod;
 
+        public bool IsExpanded { get; set; }
+        public float WhiteSpace { get; set; } = 215f;
+
         public override void Init()
         {
             if (Value is Vector2)
@@ -63,12 +66,31 @@ namespace Explorer
 
         public override void DrawValue(Rect window, float width)
         {
-            GUILayout.Label($"<color=yellow>Vector{VectorSize}</color>: {(string)m_toStringMethod.Invoke(Value, new object[0])}", null);            
-
             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])}", null);            
+
+            if (CanWrite && IsExpanded)
             {
                 GUILayout.EndHorizontal();
-                var whitespace = window.width - width - 90;
+
+                var whitespace = CalcWhitespace(window);
 
                 // always draw x and y
                 GUILayout.BeginHorizontal(null);

src/Config/ModConfig.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+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\CppExplorer";
+        [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 static void OnLoad()
+        {
+            if (!Directory.Exists(EXPLORER_FOLDER))
+            {
+                Directory.CreateDirectory(EXPLORER_FOLDER);
+            }
+
+            if (File.Exists(SETTINGS_PATH))
+            {
+                LoadSettings(false);
+            }
+            else
+            {
+                Instance = new ModConfig();
+                SaveSettings(false);
+            }
+        }
+
+        public static void LoadSettings(bool checkExist = true)
+        {
+            if (checkExist && !File.Exists(SETTINGS_PATH))
+                return;
+
+            var file = File.OpenRead(SETTINGS_PATH);
+            Instance = (ModConfig)Serializer.Deserialize(file);
+            file.Close();
+        }
+
+        public static void SaveSettings(bool checkExist = true)
+        {
+            if (checkExist && File.Exists(SETTINGS_PATH))
+                File.Delete(SETTINGS_PATH);
+
+            FileStream file = File.Create(SETTINGS_PATH);
+            Serializer.Serialize(file, Instance);
+            file.Close();
+        }
+    }
+}

src/CppExplorer.cs

@@ -13,7 +13,7 @@ namespace Explorer
     public class CppExplorer : MelonMod
     {
         public const string NAME    = "CppExplorer";
-        public const string VERSION = "1.6.4";
+        public const string VERSION = "1.6.8";
         public const string AUTHOR  = "Sinai";
         public const string GUID    = "com.sinai.cppexplorer";
 
@@ -44,13 +44,19 @@ namespace Explorer
             UpdateCursorControl();
         }
 
-        // ========== MonoBehaviour methods ==========
+        private static void SetForceUnlock(bool unlock)
+        {
+            m_forceUnlock = unlock;
+            UpdateCursorControl();
+        }
 
         public override void OnApplicationStart()
         {
             Instance = this;
 
-            InputHelper.CheckInput();
+            ModConfig.OnLoad();
+
+            InputHelper.Init();
 
             new MainMenu();
             new WindowManager();
@@ -60,9 +66,9 @@ namespace Explorer
             m_lastVisibleState = Cursor.visible;
 
             // Enable ShowMenu and ForceUnlockMouse 
-            // (set m_showMenu to not call UpdateCursorState twice)
+            // (set m_showMenu directly to not call UpdateCursorState twice)
             m_showMenu = true;
-            SetForceUnlock(true);
+            ForceUnlockMouse = true;
 
             MelonLogger.Log($"CppExplorer {VERSION} initialized.");
         }
@@ -76,7 +82,7 @@ namespace Explorer
         public override void OnUpdate()
         {
             // Check main toggle key input
-            if (InputHelper.GetKeyDown(KeyCode.F7))
+            if (InputHelper.GetKeyDown(ModConfig.Instance.Main_Menu_Toggle))
             {
                 ShowMenu = !ShowMenu;
             }
@@ -104,14 +110,6 @@ namespace Explorer
             InspectUnderMouse.OnGUI();
         }
 
-        // =========== Cursor control ===========
-
-        private static void SetForceUnlock(bool unlock)
-        {
-            m_forceUnlock = unlock;
-            UpdateCursorControl();
-        }
-
         private static void UpdateCursorControl()
         {
             m_currentlySettingCursor = true;

src/CppExplorer.csproj

@@ -2,7 +2,7 @@
 <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</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -24,6 +24,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <!-- Replace the '..\Steam\..` references with ones from your game (make sure to use the 'MelonLoader\' folder) -->
     <Reference Include="Il2Cppmscorlib">
       <HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\Il2Cppmscorlib.dll</HintPath>
       <Private>False</Private>
@@ -46,7 +47,6 @@
       <HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnhollowerBaseLib.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <!-- Replace these references with ones from your game (..\MelonLoader\ folder) -->
     <Reference Include="UnityEngine">
       <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.dll</HintPath>
       <Private>False</Private>
@@ -73,7 +73,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Helpers\IExpandHeight.cs" />
+    <Compile Include="CachedObjects\IExpandHeight.cs" />
     <Compile Include="CachedObjects\Struct\CacheColor.cs" />
     <Compile Include="CachedObjects\Object\CacheDictionary.cs" />
     <Compile Include="CachedObjects\Struct\CacheEnum.cs" />
@@ -85,9 +85,11 @@
     <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="CppExplorer.cs" />
     <Compile Include="Extensions\ReflectionExtensions.cs" />
     <Compile Include="Helpers\InputHelper.cs" />
+    <Compile Include="Tests\TestClass.cs" />
     <Compile Include="UnstripFixes\GUIUnstrip.cs" />
     <Compile Include="UnstripFixes\ScrollViewStateUnstrip.cs" />
     <Compile Include="Extensions\UnityExtensions.cs" />

src/CppExplorer.sln

@@ -10,8 +10,8 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Helpers/InputHelper.cs

@@ -15,93 +15,106 @@ namespace Explorer
     /// </summary>
     public static class InputHelper
     {
-        public static void CheckInput()
-        {
-            if (Input == null)
-            {
-                MelonLogger.Log("UnityEngine.Input is null, trying to load manually....");
+        // If Input module failed to load at all
+        public static bool NO_INPUT;
 
-                if ((TryLoad("UnityEngine.InputLegacyModule.dll") || TryLoad("UnityEngine.CoreModule.dll")) && Input != null)
-                {
-                    MelonLogger.Log("Ok!");
-                }
-                else
-                {
-                    MelonLogger.Log("Could not load Input module!");
-                }
-
-                bool TryLoad(string module)
-                {
-                    var path = $@"MelonLoader\Managed\{module}";
-                    if (!File.Exists(path)) return false;
-
-                    try
-                    {
-                        Assembly.Load(File.ReadAllBytes(path));
-                        return true;
-                    }
-                    catch (Exception e)
-                    {
-                        MelonLogger.Log(e.GetType() + ", " + e.Message);
-                        return false;
-                    }
-                }
-            }
-        }
-
-        public static Type Input => _input ?? (_input = ReflectionHelpers.GetTypeByName("UnityEngine.Input"));
+        // Base UnityEngine.Input class
+        private static Type Input => _input ?? (_input = ReflectionHelpers.GetTypeByName("UnityEngine.Input"));
         private static Type _input;
 
-        private static PropertyInfo MousePosInfo => _mousePosition ?? (_mousePosition = Input?.GetProperty("mousePosition"));
+        // Cached member infos
         private static PropertyInfo _mousePosition;
-
-        private static MethodInfo GetKeyInfo => _getKey ?? (_getKey = Input?.GetMethod("GetKey", new Type[] { typeof(KeyCode) }));
         private static MethodInfo _getKey;
-
-        private static MethodInfo GetKeyDownInfo => _getKeyDown ?? (_getKeyDown = Input?.GetMethod("GetKeyDown", new Type[] { typeof(KeyCode) }));
         private static MethodInfo _getKeyDown;
-
-        private static MethodInfo GetMouseButtonInfo => _getMouseButton ?? (_getMouseButton = Input?.GetMethod("GetMouseButton", new Type[] { typeof(int) }));
         private static MethodInfo _getMouseButton;
-
-        private static MethodInfo GetMouseButtonDownInfo => _getMouseButtonDown ?? (_getMouseButtonDown = Input?.GetMethod("GetMouseButtonDown", new Type[] { typeof(int) }));
         private static MethodInfo _getMouseButtonDown;
 
+        public static void Init()
+        {
+            if (Input == null && !TryManuallyLoadInput())
+            {
+                NO_INPUT = true;
+                return;
+            }
+
+            // Cache reflection now that we know Input is loaded
+
+            _mousePosition = Input.GetProperty("mousePosition");
+
+            _getKey = Input.GetMethod("GetKey", new Type[] { typeof(KeyCode) });
+            _getKeyDown = Input.GetMethod("GetKeyDown", new Type[] { typeof(KeyCode) });
+            _getMouseButton = Input.GetMethod("GetMouseButton", new Type[] { typeof(int) });
+            _getMouseButtonDown = Input.GetMethod("GetMouseButtonDown", new Type[] { typeof(int) });
+        }
+
 #pragma warning disable IDE1006 // Camel-case property (Unity style)
         public static Vector3 mousePosition
         {
             get
             {
-                if (Input == null) return Vector3.zero;
-                return (Vector3)MousePosInfo.GetValue(null);
+                if (NO_INPUT) return Vector3.zero;
+                return (Vector3)_mousePosition.GetValue(null);
             }
         }
 #pragma warning restore IDE1006
 
         public static bool GetKeyDown(KeyCode key)
         {
-            if (Input == null) return false;
-            return (bool)GetKeyDownInfo.Invoke(null, new object[] { key });
+            if (NO_INPUT) return false;
+            return (bool)_getKeyDown.Invoke(null, new object[] { key });
         }
 
         public static bool GetKey(KeyCode key)
         {
-            if (Input == null) return false;
-            return (bool)GetKeyInfo.Invoke(null, new object[] { key });
+            if (NO_INPUT) return false;
+            return (bool)_getKey.Invoke(null, new object[] { key });
         }
 
         /// <param name="btn">1 = left, 2 = middle, 3 = right, etc</param>
         public static bool GetMouseButtonDown(int btn)
         {
-            if (Input == null) return false;
-            return (bool)GetMouseButtonDownInfo.Invoke(null, new object[] { btn });
+            if (NO_INPUT) return false;
+            return (bool)_getMouseButtonDown.Invoke(null, new object[] { btn });
         }
 
         /// <param name="btn">1 = left, 2 = middle, 3 = right, etc</param>
         public static bool GetMouseButton(int btn)
         {
-            if (Input == null) return false;
-            return (bool)GetMouseButtonInfo.Invoke(null, new object[] { btn });
+            if (NO_INPUT) return false;
+            return (bool)_getMouseButton.Invoke(null, new object[] { btn });
+        }
+
+        private static bool TryManuallyLoadInput()
+        {
+            MelonLogger.Log("UnityEngine.Input is null, trying to load manually....");
+
+            if ((TryLoad("UnityEngine.InputLegacyModule.dll") || TryLoad("UnityEngine.CoreModule.dll")) && Input != null)
+            {
+                MelonLogger.Log("Ok!");
+                return true;
+            }
+            else
+            {
+                MelonLogger.Log("Could not load Input module!");
+                return false;
+            }
+
+            bool TryLoad(string module)
+            {
+                var path = $@"MelonLoader\Managed\{module}";
+                if (!File.Exists(path)) return false;
+
+                try
+                {
+                    Assembly.Load(File.ReadAllBytes(path));
+                    return true;
+                }
+                catch (Exception e)
+                {
+                    MelonLogger.Log(e.GetType() + ", " + e.Message);
+                    return false;
+                }
+            }
         }
     }
 }

src/MainMenu/MainMenu.cs

@@ -27,8 +27,9 @@ namespace Explorer
             }
         }
 
-        public const int MainWindowID = 10;
-        public static Rect MainRect = new Rect(5, 5, 550, 700);
+        public const int MainWindowID = 5000;
+        public static Rect MainRect = new Rect(new Vector2(5,5), ModConfig.Instance.Default_Window_Size);
+
         private static readonly List<WindowPage> Pages = new List<WindowPage>();
         private static int m_currentPage = 0;
 
@@ -63,7 +64,7 @@ namespace Explorer
         {
             GUI.DragWindow(new Rect(0, 0, MainRect.width - 90, 20));
 
-            if (GUI.Button(new Rect(MainRect.width - 90, 2, 80, 20), "Hide (F7)"))
+            if (GUI.Button(new Rect(MainRect.width - 90, 2, 80, 20), $"Hide ({ModConfig.Instance.Main_Menu_Toggle})"))
             {
                 CppExplorer.ShowMenu = false;
                 return;

src/Tests/TestClass.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MelonLoader;
+using UnityEngine;
+
+namespace Explorer.Tests
+{
+    public class TestClass
+    {
+        public static TestClass Instance => m_instance ?? (m_instance = new TestClass());
+        private static TestClass m_instance;
+
+        // 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/Windows/ReflectionWindow.cs

@@ -28,20 +28,26 @@ namespace Explorer
         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> _memberBlacklist = new HashSet<string>
+        {
+            // Causes a crash
+            "Type.DeclaringMethod",
+            // 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 (Target is Il2CppSystem.Object ilObject)
             {
                 var unityObj = ilObject.TryCast<UnityEngine.Object>();
@@ -56,13 +62,6 @@ namespace Explorer
                     }
                 }
             }
-
-            m_filter = MemberTypes.All;
-            m_autoUpdate = true;
-            Update();
-
-            m_autoUpdate = false;
-            m_filter = MemberTypes.Property;
         }
 
         public override void Update()
@@ -99,28 +98,32 @@ 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);
@@ -132,6 +135,7 @@ namespace Explorer
                 }
 
                 object target = Target;
+                string exception = null;
 
                 if (target is Il2CppSystem.Object ilObject)
                 {
@@ -147,46 +151,56 @@ namespace Explorer
 
                 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
+                    if (_memberBlacklist.Any(it => member.Name.StartsWith(it)))
+                        continue;
+
+                    // compare signature to already cached members
+                    var signature = $"{member.DeclaringType.Name}.{member.Name}";
+                    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)
+                    {
+                        signature += " (";
+                        foreach (var param in _args)
                         {
-                            continue;
+                            signature += $"{param.ParameterType.Name} {param.Name}, ";
                         }
+                        signature += ")";
+                    }
 
-                        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(signature))
+                    {
+                        continue;
+                    }
 
-                        try
+                    try
+                    {
+                        var cached = CacheObjectBase.GetCacheObject(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(signature);
+                            list.Add(cached);
+                            cached.ReflectionException = exception;
                         }
                     }
+                    catch (Exception e)
+                    {
+                        MelonLogger.LogWarning($"Exception caching member {signature}!");
+                        MelonLogger.Log(e.ToString());
+                    }
                 }
             }
 

src/Windows/UIWindow.cs

@@ -17,7 +17,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(Vector2.zero, ModConfig.Instance.Default_Window_Size);
 
         public Vector2 scroll = Vector2.zero;