1.6.6

* Added better support for Properties with index parameters, can now support multiple parameters and non-int parameters.
* Parameters are now formatted in a more expected fashion (in the `(Type arg0, Type arg1)` format).
* Got rid of all the ugly yellow text.
* Cleaned up some minor GUI display / layout issues.
* Refactored some of CacheMethod into CacheObjectBase

.gitignore

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

README.md

@@ -1,4 +1,4 @@
-# CppExplorer [![Version](https://img.shields.io/badge/MelonLoader-0.2.7.1-green.svg)]()
+# CppExplorer [![Version](https://img.shields.io/badge/MelonLoader-0.2.7.1-green.svg)](https://github.com/HerpDerpinstine/MelonLoader)
 
 <p align="center">
   <img align="center" src="https://sinai-dev.github.io/images/thumbs/02.png">
@@ -16,16 +16,9 @@
 
 ### 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.
 
-## Features
-* Scene hierarchy explorer
-* Search loaded assets with filters
-* Traverse and manipulate GameObjects
-* Generic Reflection inspector
-* C# REPL Console
-* Inspect-under-mouse
-
 ## How to install
 
 Requires [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) to be installed for your game.
@@ -39,13 +32,23 @@ 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.
 
+### Features
+[![](img.png)](img.png)
+
+<i>An overview of the different CppExplorer menus.</i>
+
+* Scene hierarchy explorer
+* Search loaded assets with filters
+* Traverse and manipulate GameObjects
+* Generic Reflection inspector
+* C# REPL Console
+* Inspect-under-mouse
+
 ### 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/BzTOCvp.png)](https://i.imgur.com/BzTOCvp.png)
-
 ### Inspectors
 
 CppExplorer has two main inspector modes: <b>GameObject Inspector</b>, and <b>Reflection Inspector</b>.
@@ -59,30 +62,22 @@ 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/DiDvl0Q.png)](https://i.imgur.com/DiDvl0Q.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/Pq127XD.png)](https://i.imgur.com/Pq127XD.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# 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)
-
 ### Inspect-under-mouse
 
 * Press Shift+RMB (Right Mouse Button) while the CppExplorer menu is open to begin Inspect-Under-Mouse.
@@ -97,10 +92,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

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
-using Explorer.CachedObjects;
 using MelonLoader;
 using UnhollowerBaseLib;
 using UnityEngine;
@@ -15,15 +14,19 @@ namespace Explorer
     {
         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 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;
@@ -44,7 +47,6 @@ namespace Explorer
         // ===== Abstract/Virtual Methods ===== //
 
         public virtual void Init() { }
-
         public abstract void DrawValue(Rect window, float width);
 
         // ===== Static Methods ===== //
@@ -80,11 +82,7 @@ namespace Explorer
         {
             Type type = null;
 
-            if (obj != null)
-            {
-                type = ReflectionHelpers.GetActualType(obj);
-            }
-            else if (memberInfo != null)
+            if (memberInfo != null)
             {
                 if (memberInfo is FieldInfo fi)
                 {
@@ -99,6 +97,10 @@ namespace Explorer
                     type = mi.ReturnType;
                 }
             }
+            else if (obj != null)
+            {
+                type = ReflectionHelpers.GetActualType(obj);
+            }
 
             if (type == null)
             {
@@ -115,7 +117,21 @@ namespace Explorer
         {
             CacheObjectBase holder;
 
-            if (memberInfo is MethodInfo mi)
+            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 (mi != null)
             {
                 if (CacheMethod.CanEvaluate(mi))
                 {
@@ -154,20 +170,22 @@ namespace Explorer
             {
                 holder = new CacheRect();
             }
-            else if (ReflectionHelpers.IsArray(valueType) || ReflectionHelpers.IsList(valueType))
-            {
-                holder = new CacheList();
-            }
+            // must check this before IsEnumerable
             else if (ReflectionHelpers.IsDictionary(valueType))
             {
                 holder = new CacheDictionary();
             }
+            else if (ReflectionHelpers.IsEnumerable(valueType) || ReflectionHelpers.IsCppList(valueType))
+            {
+                holder = new CacheList();
+            }
             else
             {
                 holder = new CacheOther();
             }
 
             holder.Value = obj;
+            holder.ValueType = valueType;
             holder.ValueTypeName = valueType.FullName;
 
             if (memberInfo != null)
@@ -175,7 +193,21 @@ namespace Explorer
                 holder.MemInfo = memberInfo;
                 holder.DeclaringType = memberInfo.DeclaringType;
                 holder.DeclaringInstance = declaringInstance;
+            }
 
+            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];
+
+            if (!holder.HasParameters)
+            {
                 holder.UpdateValue();
             }
 
@@ -184,11 +216,57 @@ namespace Explorer
             return holder;
         }
 
+        public static bool CanProcessArgs(ParameterInfo[] parameters)
+        {
+            foreach (var param in parameters)
+            {
+                if (!param.ParameterType.IsPrimitive && param.ParameterType != typeof(string))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
         // ======== Instance Methods =========
 
+        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 == typeof(string))
+                {
+                    parsedArgs.Add(input);
+                }
+                else
+                {
+                    try
+                    {
+                        parsedArgs.Add(type.GetMethod("Parse", new Type[] { typeof(string) }).Invoke(null, new object[] { input }));
+                    }
+                    catch
+                    {
+                        //MelonLogger.Log($"Unable to parse '{input}' to type '{type.Name}'");
+
+                        // try add a null arg i guess
+                        parsedArgs.Add(null);
+
+                        //break;
+                    }
+                }
+            }
+
+            return parsedArgs.ToArray();
+        }
+
         public virtual void UpdateValue()
         {
-            if (MemInfo == null || !string.IsNullOrEmpty(ReflectionException))
+            if (MemInfo == null)
             {
                 return;
             }
@@ -203,13 +281,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
                     {
@@ -218,6 +294,8 @@ namespace Explorer
                 }
 
                 ReflectionException = null;
+                m_evaluated = true;
+                m_isEvaluating = false;
             }
             catch (Exception e)
             {
@@ -238,10 +316,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
                     {
@@ -258,6 +335,7 @@ namespace Explorer
         // ========= Instance 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)
         {
@@ -276,19 +354,86 @@ 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;
+
+                        GUILayout.BeginHorizontal(null);
+                        GUILayout.Label(i.ToString(), new GUILayoutOption[] { GUILayout.Width(30) });
+                        m_argumentInput[i] = GUILayout.TextField(input, new GUILayoutOption[] { GUILayout.Width(150) });
+                        GUILayout.Label("<color=#2df7b2>" + type + "</color> <color=cyan>" + name + "</color>", 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);
@@ -299,30 +444,6 @@ namespace Explorer
             }
             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);
             }
         }
@@ -342,15 +463,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)
             {
                 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/Object/CacheDictionary.cs

@@ -1,34 +1,304 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using MelonLoader;
 using UnityEngine;
+using System.Reflection;
+using UnhollowerBaseLib;
 
 namespace Explorer
 {
-    public class CacheDictionary : CacheObjectBase
+    public class CacheDictionary : CacheObjectBase, IExpandHeight
     {
+        public bool IsExpanded { get; set; }
+        public float WhiteSpace { get; set; } = 215f;
+        public float ButtonWidthOffset { get; set; } = 350f;
 
+        public PageHelper Pages = new PageHelper();
 
-        public override void Init()
+        private CacheObjectBase[] m_cachedKeys;
+        private CacheObjectBase[] m_cachedValues;
+
+        public Type TypeOfKeys
         {
-            //base.Init();
+            get
+            {
+                if (m_keysType == null) GetGenericArguments();
+                return m_keysType;
+            }
+        }
+        private Type m_keysType;
 
-            Value = "Unsupported";
+        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);
+            var values = ValueType.GetProperty("Values").GetValue(Value);
+
+            // 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));
+            }
+        }
+
+        private void GetGenericArguments()
+        {
+            if (this.MemInfo != null)
+            {
+                Type memberType = null;
+                switch (this.MemInfo.MemberType)
+                {
+                    case MemberTypes.Field:
+                        memberType = (MemInfo as FieldInfo).FieldType;
+                        break;
+                    case MemberTypes.Property:
+                        memberType = (MemInfo as PropertyInfo).PropertyType;
+                        break;
+                }
+
+                if (memberType != null && memberType.IsGenericType)
+                {
+                    m_keysType = memberType.GetGenericArguments()[0];
+                    m_valuesType = memberType.GetGenericArguments()[1];
+                }
+            }
+            else if (Value != null)
+            {
+                var type = Value.GetType();
+                if (type.IsGenericType)
+                {
+                    m_keysType = type.GetGenericArguments()[0];
+                    m_valuesType = type.GetGenericArguments()[1];
+                }
+            }
         }
 
         public override void UpdateValue()
         {
-            //base.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)
+            {
+                var cache = GetCacheObject(key, TypeOfKeys);
+                keys.Add(cache);
+            }
+
+            var values = new List<CacheObjectBase>();
+            foreach (var val in IDict.Values)
+            {
+                var cache = GetCacheObject(val, TypeOfValues);
+                values.Add(cache);
+            }
+
+            m_cachedKeys = keys.ToArray();
+            m_cachedValues = values.ToArray();
         }
 
+        private bool EnsureDictionaryIsSupported()
+        {
+            if (typeof(IDictionary).IsAssignableFrom(ValueType))
+            {
+                return true;
+            }
+
+            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; 
+            }
+        }
+
+        // ============= GUI Draw =============
+
         public override void DrawValue(Rect window, float width)
         {
-            GUILayout.Label("<color=red>Dictionary (unsupported)</color>", null);
+            if (m_cachedKeys == null || m_cachedValues == null)
+            {
+                GUILayout.Label("Cached keys or values is null!", null);
+                return;
+            }
+
+            float whitespace = WhiteSpace;
+            if (whitespace > 0)
+            {
+                ClampLabelWidth(window, ref whitespace);
+            }
+
+            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 = $"<color=#2df7b2>[{count}] 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;
+
+            GUILayout.Space(5);
+
+            if (IsExpanded)
+            {
+                Pages.ItemCount = count;
+
+                if (count > Pages.ItemsPerPage)
+                {
+                    GUILayout.EndHorizontal();
+                    GUILayout.BeginHorizontal(null);
+
+                    GUILayout.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();
+
+                    GUILayout.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(null);
+
+                    //GUILayout.Space(whitespace);
+
+                    if (key == null || val == null)
+                    {
+                        GUILayout.Label($"[{i}] <i><color=grey>(null)</color></i>", null);
+                    }
+                    else
+                    {
+                        GUI.skin.label.alignment = TextAnchor.MiddleCenter;
+                        GUILayout.Label($"[{i}]", new GUILayoutOption[] { GUILayout.Width(30) });
+
+                        GUILayout.Label("Key:", new GUILayoutOption[] { GUILayout.Width(40) });
+                        key.DrawValue(window, (window.width / 2) - 30f);
+
+                        GUILayout.Label("Value:", new GUILayoutOption[] { GUILayout.Width(40) });
+                        val.DrawValue(window, (window.width / 2) - 30f);
+                    }
+
+                }
+
+                GUI.skin.label.alignment = TextAnchor.UpperLeft;
+            }
         }
     }
 }

src/CachedObjects/Object/CacheList.cs

@@ -8,13 +8,13 @@ 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 ButtonWidthOffset { get; set; } = 290f;
 
-        public float WhiteSpace = 215f;
-        public float ButtonWidthOffset = 290f;
+        public PageHelper Pages = new PageHelper();
 
         private CacheObjectBase[] m_cachedEntries;
 
@@ -52,6 +52,7 @@ namespace Explorer
         {
             get => GetItemProperty();
         }
+
         private PropertyInfo m_itemProperty;
 
         // ========== Methods ==========
@@ -244,6 +245,12 @@ namespace Explorer
                 return;
             }
 
+            float whitespace = WhiteSpace;
+            if (whitespace > 0)
+            {
+                ClampLabelWidth(window, ref whitespace);
+            }
+
             int count = m_cachedEntries.Length;
 
             if (!IsExpanded)
@@ -261,9 +268,11 @@ 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.MaxWidth(negativeWhitespace) }))
             {
                 WindowManager.InspectObject(Value, out bool _);
             }
@@ -273,12 +282,6 @@ namespace Explorer
 
             if (IsExpanded)
             {
-                float whitespace = WhiteSpace;                
-                if (whitespace > 0)
-                {
-                    ClampLabelWidth(window, ref whitespace);
-                }
-
                 Pages.ItemCount = count;
 
                 if (count > Pages.ItemsPerPage)
@@ -305,12 +308,6 @@ namespace Explorer
                     GUILayout.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++)

src/CachedObjects/Other/CacheMethod.cs

@@ -11,147 +11,30 @@ 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
+            // TODO generic args
             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];
+            // primitive and string args supported
+            return CanProcessArgs(mi.GetParameters());
         }
 
         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()
+        public void Evaluate()
         {
-            var mi = MemInfo as MethodInfo;
+            m_isEvaluating = false;
 
+            var mi = MemInfo as MethodInfo;
             object ret = null;
 
             if (!HasParameters)
@@ -161,57 +44,22 @@ namespace Explorer
             }
             else
             {
-                var arguments = new List<object>();
-                for (int i = 0; i < m_arguments.Length; i++)
+                var parsedArgs = ParseArguments();
+
+                try
                 {
-                    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());
+                    ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, parsedArgs.ToArray());
                     m_evaluated = true;
                 }
-                else
+                catch (Exception e)
                 {
-                    MelonLogger.Log($"Did not invoke because {m_arguments.Length - arguments.Count} arguments could not be parsed!");
+                    MelonLogger.Log($"Exception evaluating: {e.GetType()}, {e.Message}");
                 }
             }
 
             if (ret != null)
             {
                 m_cachedReturnValue = GetCacheObject(ret);
-                if (m_cachedReturnValue is CacheList cacheList)
-                {
-                    cacheList.WhiteSpace = 0f;
-                    cacheList.ButtonWidthOffset += 70f;
-                }
                 m_cachedReturnValue.UpdateValue();
             }
             else
@@ -219,5 +67,26 @@ namespace Explorer
                 m_cachedReturnValue = null;
             }
         }
+
+        // ==== GUI DRAW ====
+
+        public override void DrawValue(Rect window, float width)
+        {
+            if (m_evaluated)
+            {
+                if (m_cachedReturnValue != null)
+                {
+                    m_cachedReturnValue.DrawValue(window, width);
+                }
+                else
+                {
+                    GUILayout.Label($"null (<color=#2df7b2>{ValueTypeName}</color>)", null);
+                }
+            }
+            else
+            {
+                GUILayout.Label($"<color=grey><i>Not yet evaluated</i></color> (<color=#2df7b2>{ValueTypeName}</color>)", null);
+            }
+        }
     }
 }

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) }))
+            if (GUILayout.Button(label, new GUILayoutOption[] { GUILayout.Width(width - 15) }))
             {
                 WindowManager.InspectObject(Value, out bool _);
             }

src/CachedObjects/Struct/CacheColor.cs

@@ -5,15 +5,19 @@ using System.Text;
 using System.Threading.Tasks;
 using UnityEngine;
 
-namespace Explorer.CachedObjects
+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 float ButtonWidthOffset { get; set; } = 290f;
+
         public override void UpdateValue()
         {
             base.UpdateValue();
@@ -28,12 +32,38 @@ namespace Explorer.CachedObjects
 
         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;
+
+                float whitespace = WhiteSpace;
+                if (whitespace > 0)
+                {
+                    ClampLabelWidth(window, ref whitespace);
+                }
 
                 GUILayout.BeginHorizontal(null);
                 GUILayout.Space(whitespace);
@@ -79,7 +109,8 @@ namespace Explorer.CachedObjects
                 && float.TryParse(b, out float fB)
                 && float.TryParse(a, out float fA))
             {
-                Value = new Color(fR, fB, fG, fA);                
+                Value = new Color(fR, fB, fG, fA);
+                SetValue();
             }
         }
     }

src/CachedObjects/Struct/CacheEnum.cs

@@ -51,7 +51,7 @@ namespace Explorer
                 }
             }
 
-            GUILayout.Label(Value.ToString(), null);// + "<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

@@ -8,91 +8,37 @@ namespace Explorer
 {
     public class CachePrimitive : CacheObjectBase
     {
-        public enum PrimitiveTypes
-        {
-            Bool,
-            Double,
-            Float,
-            Int,
-            String,
-            Char
-        }
+        private bool m_isBool;
+        private bool m_isString;
 
         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;
-            }
-        }
-
+        public MethodInfo ParseMethod => m_parseMethod ?? (m_parseMethod = Value.GetType().GetMethod("Parse", new Type[] { typeof(string) }));
         private MethodInfo m_parseMethod;
 
         public override void Init()
         {
-            if (Value == null)
+            if (ValueType == null)
             {
-                // this must mean it is a string. No other primitive type should be nullable.
-                PrimitiveType = PrimitiveTypes.String;
-                return;
+                ValueType = Value?.GetType();
+
+                // has to be a string at this point
+                if (ValueType == null)
+                {
+                    ValueType = typeof(string);
+                }
             }
 
-            m_valueToString = Value.ToString();
-            var type = Value.GetType();
-
-            if (type == typeof(bool))
+            if (ValueType == typeof(string))
             {
-                PrimitiveType = PrimitiveTypes.Bool;
+                m_isString = true;
             }
-            else if (type == typeof(double))
+            else if (ValueType == typeof(bool))
             {
-                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;
+                m_isBool = true;
             }
         }
 
-        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();
@@ -102,11 +48,10 @@ namespace Explorer
 
         public override void DrawValue(Rect window, float width)
         {
-            if (PrimitiveType == PrimitiveTypes.Bool)
+            if (m_isBool)
             {
                 var b = (bool)Value;
-                var color = $"<color={(b ? "lime>" : "red>")}";
-                var label = $"{color}{b}</color>";
+                var label = $"<color={(b ? "lime" : "red")}>{b}</color>";
 
                 if (CanWrite)
                 {
@@ -123,10 +68,11 @@ namespace Explorer
             }
             else
             {
-                GUILayout.Label("<color=yellow><i>" + PrimitiveType + "</i></color>", new GUILayoutOption[] { GUILayout.Width(50) });
+                // using ValueType.Name instead of ValueTypeName, because we only want the short name.
+                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)
@@ -146,11 +92,11 @@ namespace Explorer
                     }
                 }
 
-                GUILayout.Space(5);
+                GUILayout.Space(10);
             }
         }
 
-        public void SetValueFromInput(string value)
+        public void SetValueFromInput(string valueString)
         {
             if (MemInfo == null)
             {
@@ -158,16 +104,15 @@ namespace Explorer
                 return;
             }
 
-            if (PrimitiveType == PrimitiveTypes.String)
+            if (m_isString)
             {
-                Value = value;
+                Value = valueString;
             }
             else
             {
                 try
                 {
-                    var val = ParseMethod.Invoke(null, new object[] { value });
-                    Value = val;                    
+                    Value = ParseMethod.Invoke(null, new object[] { valueString });
                 }
                 catch (Exception e)
                 {

src/CachedObjects/Struct/CacheQuaternion.cs

@@ -7,33 +7,58 @@ using UnityEngine;
 
 namespace Explorer
 {
-    public class CacheQuaternion : CacheObjectBase
+    public class CacheQuaternion : CacheObjectBase, IExpandHeight
     {
-        private Vector3 EulerAngle = Vector3.zero;
-
         private string x = "0";
         private string y = "0";
         private string z = "0";
 
+        public bool IsExpanded { get; set; }
+        public float WhiteSpace { get; set; } = 215f;
+        public float ButtonWidthOffset { get; set; } = 290f;
+
         public override void UpdateValue()
         {
             base.UpdateValue();
 
-            EulerAngle = ((Quaternion)Value).eulerAngles;
+            var euler = ((Quaternion)Value).eulerAngles;
 
-            x = EulerAngle.x.ToString();
-            y = EulerAngle.y.ToString();
-            z = EulerAngle.z.ToString();
+            x = euler.x.ToString();
+            y = euler.y.ToString();
+            z = euler.z.ToString();
         }
 
         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;
+
+                float whitespace = WhiteSpace;
+                if (whitespace > 0)
+                {
+                    ClampLabelWidth(window, ref whitespace);
+                }
 
                 GUILayout.BeginHorizontal(null);
                 GUILayout.Space(whitespace);

src/CachedObjects/Struct/CacheRect.cs

@@ -5,15 +5,19 @@ using System.Text;
 using System.Threading.Tasks;
 using UnityEngine;
 
-namespace Explorer.CachedObjects
+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 float ButtonWidthOffset { get; set; } = 290f;
+
         public override void UpdateValue()
         {
             base.UpdateValue();
@@ -28,12 +32,35 @@ namespace Explorer.CachedObjects
 
         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;
+
+                float whitespace = WhiteSpace;
+                if (whitespace > 0)
+                {
+                    ClampLabelWidth(window, ref whitespace);
+                }
 
                 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,10 @@ namespace Explorer
 
         private MethodInfo m_toStringMethod;
 
+        public bool IsExpanded { get; set; }
+        public float WhiteSpace { get; set; } = 215f;
+        public float ButtonWidthOffset { get; set; } = 290f;
+
         public override void Init()
         {
             if (Value is Vector2)
@@ -63,12 +67,34 @@ 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;
+                float whitespace = WhiteSpace;
+                if (whitespace > 0)
+                {
+                    ClampLabelWidth(window, ref whitespace);
+                }
 
                 // always draw x and y
                 GUILayout.BeginHorizontal(null);

src/CppExplorer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -11,15 +12,10 @@ namespace Explorer
 {
     public class CppExplorer : MelonMod
     {
-        public const string GUID = "com.sinai.cppexplorer";
-        public const string VERSION = "1.5.6";
-        public const string AUTHOR = "Sinai";
-
-        public const string NAME = "CppExplorer"
-#if Release_Unity2018
-        + " (Unity 2018)"
-#endif
-        ;
+        public const string NAME    = "CppExplorer";
+        public const string VERSION = "1.6.5";
+        public const string AUTHOR  = "Sinai";
+        public const string GUID    = "com.sinai.cppexplorer";
 
         public static CppExplorer Instance { get; private set; }
 
@@ -54,6 +50,8 @@ namespace Explorer
         {
             Instance = this;
 
+            InputHelper.Init();
+
             new MainMenu();
             new WindowManager();
 
@@ -78,7 +76,7 @@ namespace Explorer
         public override void OnUpdate()
         {
             // Check main toggle key input
-            if (Input.GetKeyDown(KeyCode.F7))
+            if (InputHelper.GetKeyDown(KeyCode.F7))
             {
                 ShowMenu = !ShowMenu;
             }
@@ -86,7 +84,7 @@ namespace Explorer
             if (ShowMenu)
             {
                 // Check Force-Unlock input
-                if (Input.GetKeyDown(KeyCode.LeftAlt))
+                if (InputHelper.GetKeyDown(KeyCode.LeftAlt))
                 {
                     ForceUnlockMouse = !ForceUnlockMouse;
                 }

src/CppExplorer.csproj

@@ -12,32 +12,19 @@
     <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>
+    <OutputPath>..\Release\</OutputPath>
+    <DefineConstants />
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x64</PlatformTarget>
     <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>
@@ -60,66 +47,33 @@
       <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'">
+    <Reference Include="UnityEngine">
       <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="UnityEngine.CoreModule" Condition="'$(Configuration)'=='Debug'">
+    <Reference Include="UnityEngine.CoreModule">
       <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.CoreModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="UnityEngine.IMGUIModule" Condition="'$(Configuration)'=='Debug'">
+    <Reference Include="UnityEngine.IMGUIModule">
       <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'">
+    <Reference Include="UnityEngine.PhysicsModule">
       <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.PhysicsModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="UnityEngine.TextRenderingModule" Condition="'$(Configuration)'=='Debug'">
+    <Reference Include="UnityEngine.TextRenderingModule">
       <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="UnityEngine.UI" Condition="'$(Configuration)'=='Debug'">
+    <Reference Include="UnityEngine.UI">
       <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="Helpers\IExpandHeight.cs" />
     <Compile Include="CachedObjects\Struct\CacheColor.cs" />
     <Compile Include="CachedObjects\Object\CacheDictionary.cs" />
     <Compile Include="CachedObjects\Struct\CacheEnum.cs" />
@@ -133,6 +87,8 @@
     <Compile Include="CachedObjects\Struct\CacheRect.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

@@ -7,14 +7,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppExplorer", "CppExplorer.
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release_Unity2018|Any CPU = Release_Unity2018|Any CPU
+		Release|Any CPU = Release|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
+		{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/Extensions/ReflectionExtensions.cs

@@ -3,14 +3,38 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Reflection;
 
 namespace Explorer
 {
     public static class ReflectionExtensions
     {
+        /// <summary>
+        /// Extension to allow for easy, non-generic Il2Cpp casting.
+        /// The extension is on System.Object, but only Il2Cpp objects would be a valid target.
+        /// </summary>
         public static object Il2CppCast(this object obj, Type castTo)
         {
             return ReflectionHelpers.Il2CppCast(obj, castTo);
         }
+
+        /// <summary>
+        /// Extension to safely try to get all Types from an Assembly, with a fallback for ReflectionTypeLoadException.
+        /// </summary>
+        public static IEnumerable<Type> TryGetTypes(this Assembly asm)
+        {
+            try
+            {
+                return asm.GetTypes();
+            }
+            catch (ReflectionTypeLoadException e)
+            {
+                return e.Types.Where(t => t != null);
+            }
+            catch
+            {
+                return Enumerable.Empty<Type>();
+            }
+        }
     }
 }

src/Helpers/IExpandHeight.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Explorer
+{
+    interface IExpandHeight
+    {
+        bool IsExpanded { get; set; }
+
+        float WhiteSpace { get; set; }
+        float ButtonWidthOffset { get; set; }
+    }
+}

src/Helpers/InputHelper.cs

@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Reflection;
+using UnityEngine;
+using MelonLoader;
+
+namespace Explorer
+{
+    /// <summary>
+    /// Version-agnostic UnityEngine Input module using Reflection.
+    /// </summary>
+    public static class InputHelper
+    {
+        // If Input module failed to load at all
+        public static bool NO_INPUT;
+
+        // Base UnityEngine.Input class
+        private static Type Input => _input ?? (_input = ReflectionHelpers.GetTypeByName("UnityEngine.Input"));
+        private static Type _input;
+
+        // Cached member infos
+        private static PropertyInfo _mousePosition;
+        private static MethodInfo _getKey;
+        private static MethodInfo _getKeyDown;
+        private static MethodInfo _getMouseButton;
+        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 (NO_INPUT) return Vector3.zero;
+                return (Vector3)_mousePosition.GetValue(null);
+            }
+        }
+#pragma warning restore IDE1006
+
+        public static bool GetKeyDown(KeyCode key)
+        {
+            if (NO_INPUT) return false;
+            return (bool)_getKeyDown.Invoke(null, new object[] { key });
+        }
+
+        public static bool GetKey(KeyCode 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 (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 (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/Helpers/PageHelper.cs

@@ -16,7 +16,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 = 20;
+
         public int ItemCount 
         {
             get => m_count;

src/Helpers/ReflectionHelpers.cs

@@ -1,14 +1,13 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Reflection;
 using UnhollowerBaseLib;
 using UnhollowerRuntimeLib;
 using UnityEngine;
 using BF = System.Reflection.BindingFlags;
-using MelonLoader;
+using ILType = Il2CppSystem.Type;
 
 namespace Explorer
 {
@@ -16,11 +15,11 @@ 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>();
+        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");
 
@@ -33,6 +32,94 @@ namespace Explorer
                     .Invoke(obj, null);
         }
 
+        public static bool IsEnumerable(Type t)
+        {
+            return typeof(IEnumerable).IsAssignableFrom(t);
+        }
+
+        // Only Il2Cpp List needs this check. C# List is IEnumerable.
+        public static bool IsCppList(Type t)
+        {
+            if (t.IsGenericType && t.GetGenericTypeDefinition() is Type g)
+            {
+                return typeof(Il2CppSystem.Collections.Generic.List<>).IsAssignableFrom(g)
+                    || typeof(Il2CppSystem.Collections.Generic.IList<>).IsAssignableFrom(g);
+            }
+            else
+            {
+                return typeof(Il2CppSystem.Collections.IList).IsAssignableFrom(t);
+            }
+        }
+
+        public static bool IsDictionary(Type t)
+        {
+            if (typeof(IDictionary).IsAssignableFrom(t))
+            {
+                return true;
+            }
+
+            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);
+            }
+        }
+
+        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 (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();
+        }
+
         public static string ExceptionToString(Exception e)
         {
             if (IsFailedGeneric(e))
@@ -73,84 +160,5 @@ 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();
-        }
     }
 }

src/Helpers/UIStyles.cs

@@ -56,7 +56,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 +76,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/Helpers/UnityHelpers.cs

@@ -15,7 +15,7 @@ namespace Explorer
         {
             get
             {
-                if (m_mainCamera == null)
+                if (!m_mainCamera)
                 {
                     m_mainCamera = Camera.main;
                 }

src/MainMenu/InspectUnderMouse.cs

@@ -17,7 +17,7 @@ namespace Explorer
         {
             if (CppExplorer.ShowMenu)
             {
-                if (Input.GetKey(KeyCode.LeftShift) && Input.GetMouseButtonDown(1))
+                if (InputHelper.GetKey(KeyCode.LeftShift) && InputHelper.GetMouseButtonDown(1))
                 {
                     EnableInspect = !EnableInspect;
                 }
@@ -35,7 +35,10 @@ namespace Explorer
 
         public static void InspectRaycast()
         {
-            Ray ray = UnityHelpers.MainCamera.ScreenPointToRay(Input.mousePosition);
+            if (!UnityHelpers.MainCamera)
+                return;
+
+            var ray = UnityHelpers.MainCamera.ScreenPointToRay(InputHelper.mousePosition);
 
             if (Physics.Raycast(ray, out RaycastHit hit, 1000f))
             {
@@ -43,7 +46,7 @@ namespace Explorer
 
                 m_objUnderMouseName = obj.transform.GetGameObjectPath();
 
-                if (Input.GetMouseButtonDown(0))
+                if (InputHelper.GetMouseButtonDown(0))
                 {
                     EnableInspect = false;
                     m_objUnderMouseName = "";
@@ -63,7 +66,7 @@ namespace Explorer
             {
                 if (m_objUnderMouseName != "")
                 {
-                    var pos = Input.mousePosition;
+                    var pos = InputHelper.mousePosition;
                     var rect = new Rect(
                         pos.x - (Screen.width / 2), // x
                         Screen.height - pos.y - 50, // y

src/MainMenu/Pages/ConsolePage.cs

@@ -14,11 +14,13 @@ 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 = "";
 
@@ -124,7 +126,12 @@ MelonLogger.Log(""hello world"");";
             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) });
+
+            inputAreaScroll = GUIUnstrip.BeginScrollView(inputAreaScroll, new GUILayoutOption[] { GUILayout.Height(250) });
+
+            MethodInput = GUILayout.TextArea(MethodInput, new GUILayoutOption[] { GUILayout.ExpandHeight(true) });
+
+            GUIUnstrip.EndScrollView();
 
             if (GUILayout.Button("<color=cyan><b>Execute</b></color>", null))
             {

src/MainMenu/Pages/ScenePage.cs

@@ -12,16 +12,14 @@ namespace Explorer
     {
         public static ScenePage Instance;
 
-        public override string Name { get => "Scene Explorer"; set => base.Name = value; }
+        public override string Name { get => "Scene Explorer"; }
 
         public PageHelper Pages = new PageHelper();
 
         private float m_timeOfLastUpdate = -1f;
-        private static int PASSIVE_UPDATE_INTERVAL = 1;
+        private const int PASSIVE_UPDATE_INTERVAL = 1;
 
-        private static bool m_getRootObjectsFailed = false;
-
-        // ----- Holders for GUI elements ----- //
+        private static bool m_getRootObjectsFailed;
 
         private static string m_currentScene = "";
 
@@ -34,8 +32,6 @@ namespace Explorer
         private string m_searchInput = "";
         private List<GameObjectCache> m_searchResults = new List<GameObjectCache>();
 
-        // ------------ Init and Update ------------ //
-
         public override void Init()
         {
             Instance = this;
@@ -54,7 +50,7 @@ namespace Explorer
             if (m_searching)
                 CancelSearch();
 
-            Update_Impl();
+            Update_Impl(true);
         }
 
         public void TraverseUp()
@@ -90,11 +86,12 @@ namespace Explorer
         {
             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)
+                var go = obj.TryCast<GameObject>();
+                if (go.name.ToLower().Contains(_search.ToLower()) && go.scene.name == m_currentScene)
                 {
-                    matches.Add(new GameObjectCache(obj));
+                    matches.Add(new GameObjectCache(go));
                 }
             }
 
@@ -111,9 +108,9 @@ namespace Explorer
             Update_Impl();
         }
 
-        private void Update_Impl()
+        private void Update_Impl(bool manual = false)
         {
-            var allTransforms = new List<Transform>();
+            List<Transform> allTransforms = new List<Transform>();
 
             // get current list of all transforms (either scene root or our current transform children)
             if (m_currentTransform)
@@ -129,24 +126,27 @@ namespace Explorer
                 {
                     try
                     {
-                        var list = SceneManager.GetActiveScene().GetRootGameObjects().ToArray();
+                        var scene = SceneManager.GetSceneByName(m_currentScene);
 
-                        foreach (var obj in list)
-                        {
-                            allTransforms.Add(obj.transform);
-                        }
+                        allTransforms.AddRange(scene.GetRootGameObjects()
+                                                    .Select(it => it.transform));
                     }
                     catch
                     {
-                        m_getRootObjectsFailed = true;
-                        PASSIVE_UPDATE_INTERVAL = 2;
+                        MelonLogger.Log("Exception getting root scene objects, falling back to backup method...");
 
-                        allTransforms = GetRootObjectsManual_Impl();
+                        m_getRootObjectsFailed = true;
+                        allTransforms.AddRange(GetRootObjectsManual_Impl());
                     }
                 }
                 else
                 {
-                    allTransforms = GetRootObjectsManual_Impl();
+                    if (!manual)
+                    {
+                        return;
+                    }
+
+                    allTransforms.AddRange(GetRootObjectsManual_Impl());
                 }
             }
 
@@ -166,16 +166,33 @@ namespace Explorer
             }
         }
 
-        private List<Transform> GetRootObjectsManual_Impl()
+        private IEnumerable<Transform> GetRootObjectsManual_Impl()
         {
-            var allTransforms = Resources.FindObjectsOfTypeAll<Transform>()
-                       .Where(x => x.parent == null && x.gameObject.scene.name == m_currentScene)
-                       .ToList();
+            try
+            {
+                var array = Resources.FindObjectsOfTypeAll(ReflectionHelpers.TransformType);
 
-            return allTransforms;
+                var list = new List<Transform>();
+                foreach (var obj in array)
+                {
+                    var transform = obj.TryCast<Transform>();
+                    if (transform.parent == null && transform.gameObject.scene.name == m_currentScene)
+                    {
+                        list.Add(transform);
+                    }
+                }
+                return list;
+            }
+            catch (Exception e)
+            {
+                MelonLogger.Log("Exception getting root scene objects (manual): " 
+                    + e.GetType() + ", " + e.Message + "\r\n" 
+                    + e.StackTrace);
+                return new Transform[0];
+            }
         }
 
-        // --------- GUI Draw Function --------- //        
+        // --------- GUI Draw Function --------- //
 
         public override void DrawWindow()
         {
@@ -198,11 +215,9 @@ namespace Explorer
 
                 GUILayout.EndVertical();
             }
-            catch (Exception e)
+            catch
             {
-                MelonLogger.Log("Exception drawing ScenePage! " + e.GetType() + ", " + e.Message);
-                MelonLogger.Log(e.StackTrace);
-                m_currentTransform = null;
+                // supress
             }
         }
 
@@ -212,39 +227,7 @@ namespace Explorer
 
             // 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 { }
+            SceneChangeButtons();
             GUILayout.Label("<color=cyan>" + m_currentScene + "</color>", null); //new GUILayoutOption[] { GUILayout.Width(250) });
 
             GUILayout.EndHorizontal();
@@ -252,7 +235,9 @@ namespace Explorer
             // ----- GameObject Search -----
             GUILayout.BeginHorizontal(GUI.skin.box, null);
             GUILayout.Label("<b>Search Scene:</b>", new GUILayoutOption[] { GUILayout.Width(100) });
+
             m_searchInput = GUILayout.TextField(m_searchInput, null);
+
             if (GUILayout.Button("Search", new GUILayoutOption[] { GUILayout.Width(80) }))
             {
                 Search();
@@ -262,6 +247,39 @@ namespace Explorer
             GUILayout.Space(5);
         }
 
+        private void SceneChangeButtons()
+        {
+            // 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;
+                }
+            }
+        }
+
         private void DrawPageButtons()
         {
             GUILayout.BeginHorizontal(null);
@@ -274,7 +292,7 @@ namespace Explorer
                 {
                     Pages.TurnPage(Turn.Left, ref this.scroll);
 
-                    Update_Impl();
+                    Update_Impl(true);
                 }
 
                 Pages.CurrentPageLabel();
@@ -283,7 +301,7 @@ namespace Explorer
                 {
                     Pages.TurnPage(Turn.Right, ref this.scroll);
 
-                    Update_Impl();
+                    Update_Impl(true);
                 }
             }
 
@@ -313,6 +331,14 @@ namespace Explorer
             else
             {
                 GUILayout.Label("Scene Root GameObjects:", null);
+
+                if (m_getRootObjectsFailed)
+                {
+                    if (GUILayout.Button("Update Root Object List (auto-update failed!)", null))
+                    {
+                        Update_Impl(true);
+                    }
+                }
             }
 
             if (m_objectList.Count > 0)

src/MainMenu/Pages/SearchPage.cs

@@ -13,7 +13,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 = "";
@@ -137,14 +137,11 @@ 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
@@ -175,16 +172,6 @@ namespace Explorer
             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;
-
             GUILayout.EndHorizontal();
 
             GUILayout.BeginHorizontal(null);
@@ -266,7 +253,7 @@ namespace Explorer
             CacheResults(FindAllObjectsOfType(m_searchInput, m_typeInput));
         }
 
-        private List<object> FindAllObjectsOfType(string _search, string _type)
+        private List<object> FindAllObjectsOfType(string searchQuery, string typeName)
         {
             Il2CppSystem.Type searchType = null;
 
@@ -274,13 +261,18 @@ namespace Explorer
             {
                 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)
+                    {
+                        searchType = Il2CppSystem.Type.GetType(t.AssemblyQualifiedName);
+                    }
+                    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);
+                    MelonLogger.Log("Exception getting Search Type: " + e.GetType() + ", " + e.Message);
                 }
             }
             else if (TypeMode == TypeFilter.Object)
@@ -298,7 +290,10 @@ namespace Explorer
 
             if (!ReflectionHelpers.ObjectType.IsAssignableFrom(searchType))
             {
-                MelonLogger.LogError("Your Custom Class Type must inherit from UnityEngine.Object!");
+                if (searchType != null)
+                {
+                    MelonLogger.LogWarning("Your Custom Class Type must inherit from UnityEngine.Object!");
+                }
                 return new List<object>();
             }
 
@@ -313,12 +308,13 @@ namespace Explorer
             {
                 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
+                    && ReflectionHelpers.TransformType.IsAssignableFrom(obj.GetIl2CppType()))
                 {
                     // Transforms shouldn't really be counted as Components, skip them.
                     // They're more akin to GameObjects.
@@ -376,43 +372,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);
+                    }
+                    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) || ReflectionHelpers.IsCppList(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/MainMenu/Pages/WindowPage.cs

@@ -9,7 +9,7 @@ namespace Explorer
 {
     public abstract class WindowPage
     {
-        public virtual string Name { get; set; }
+        public virtual string Name { get; }
 
         public Vector2 scroll = Vector2.zero;
 

src/Tests/TestClass.cs

@@ -0,0 +1,74 @@
+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;
+
+        public string this[int index]
+        {
+            get
+            {
+                return $"int indexer: {index}";
+            }
+        }
+
+        public string this[string stringIndex]
+        {
+            get
+            {
+                return $"string indexer: {stringIndex}";
+            }
+        }
+
+        public string this[int arg0, string arg1]
+        {
+            get
+            {
+                return $"arg0: {arg0}, arg1: {arg1}";
+            }
+        }
+
+        public static List<string> TestList = new List<string>
+        {
+            "1",
+            "2",
+            "3",
+            "etc..."
+        };
+
+        public static Dictionary<int, List<string>> NestedDictionary = new Dictionary<int, List<string>>
+        {
+            {
+                123,
+                new List<string>
+                {
+                    "One",
+                    "Two"
+                }
+            },
+            {
+                567,
+                new List<string>
+                {
+                    "One",
+                    "Two"
+                }
+            },
+        };
+
+        public static Color TestMethod(float r, float g, float b, float a)
+        {
+            return new Color(r, g, b, a);
+        }
+    }
+}

src/UnstripFixes/GUIUnstrip.cs

@@ -24,15 +24,24 @@ namespace Explorer
         {
             get
             {
-#if Release_2019
-                return GUI.scrollViewStates;
-#else 
-                return GUI.s_ScrollViewStates;
-#endif
+                if (m_scrollViewStatesInfo == null)
+                {
+                    try
+                    {
+                        m_scrollViewStatesInfo = typeof(GUI).GetProperty("scrollViewStates");
+                        if (m_scrollViewStatesInfo == null) throw new Exception();
+                    }
+                    catch
+                    {
+                        m_scrollViewStatesInfo = typeof(GUI).GetProperty("s_scrollViewStates");
+                    }
+                }
+
+                return (GenericStack)m_scrollViewStatesInfo?.GetValue(null, null);
             }
         }
-
-        // ======= public methods ======= //   
+        private static PropertyInfo m_scrollViewStatesInfo;
+        
 
         public static Rect GetLastRect()
         {
@@ -49,24 +58,6 @@ namespace Explorer
             return last;
         }
 
-        public static float HorizontalScrollbar(Rect position, float value, float size, float leftValue, float rightValue, GUIStyle style)
-        {
-            return Scroller_Impl(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_Impl(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.
 
         public static Vector2 BeginScrollView(Vector2 scroll, params GUILayoutOption[] options)
@@ -81,7 +72,6 @@ namespace Explorer
                 catch
                 {
                     ScrollFailed = true;
-                    return scroll;
                 }
             }
 
@@ -94,10 +84,8 @@ namespace Explorer
                 }
                 catch (Exception e)
                 {
-                    MelonLogger.Log("Exception on GUIUnstrip.BeginScrollView_ImplLayout: " + e.GetType() + ", " + e.Message + "\r\n" + e.StackTrace);
-
+                    MelonLogger.Log("Exception on manual BeginScrollView: " + e.GetType() + ", " + e.Message + "\r\n" + e.StackTrace);
                     ManualUnstripFailed = true;
-                    return scroll;
                 }
             }
 
@@ -121,8 +109,6 @@ namespace Explorer
             }
         }
 
-        // ======= private methods ======= //
-
         private static Vector2 BeginScrollView_ImplLayout(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, 
             GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, GUIStyle background, params GUILayoutOption[] options)
         {
@@ -221,7 +207,7 @@ namespace Explorer
                     }
                     if (flag2 && horizontalScrollbar != GUIStyle.none)
                     {
-                        scrollPosition.x = HorizontalScrollbar(
+                        scrollPosition.x = HorizBar_Impl(
                             new Rect(
                                 position.x,
                                 position.yMax - horizontalScrollbar.fixedHeight,
@@ -243,7 +229,7 @@ namespace Explorer
                     }
                     if (flag && verticalScrollbar != GUIStyle.none)
                     {
-                        scrollPosition.y = VerticalScrollbar(
+                        scrollPosition.y = VertBar_Impl(
                             new Rect(
                                 screenRect.xMax + (float)verticalScrollbar.margin.left,
                                 screenRect.y,
@@ -279,6 +265,24 @@ namespace Explorer
             return scrollPosition;
         }
 
+        public static float HorizBar_Impl(Rect position, float value, float size, float leftValue, float rightValue, GUIStyle style)
+        {
+            return Scroller_Impl(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 VertBar_Impl(Rect position, float value, float size, float topValue, float bottomValue, GUIStyle style)
+        {
+            return Scroller_Impl(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 void EndScrollView_Impl(bool handleScrollWheel)
         {
             GUIUtility.CheckOnGUI();
@@ -337,7 +341,7 @@ namespace Explorer
                 rect2 = new Rect(position.x, position.yMax - rightButton.fixedHeight, position.width, rightButton.fixedHeight);
             }
 
-            value = Slider(position2, value, size, leftValue, rightValue, slider, thumb, horiz, controlID);
+            value = Slider_Impl(position2, value, size, leftValue, rightValue, slider, thumb, horiz, controlID);
 
             bool flag = Event.current.type == EventType.MouseUp;
             if (ScrollerRepeatButton_Impl(controlID, rect, leftButton))
@@ -363,7 +367,7 @@ namespace Explorer
             return value;
         }
 
-        public static float Slider(Rect position, float value, float size, float start, float end, GUIStyle slider, GUIStyle thumb, bool horiz, int id)
+        public static float Slider_Impl(Rect position, float value, float size, float start, float end, GUIStyle slider, GUIStyle thumb, bool horiz, int id)
         {
             if (id == 0)
             {

src/Windows/GameObjectWindow.cs

@@ -48,12 +48,6 @@ namespace Explorer
 
         public bool GetObjectAsGameObject()
         {
-            if (Target == null)
-            {
-                MelonLogger.Log("Target is null!");
-                return false;
-            }
-
             var targetType = Target.GetType();
 
             if (targetType == typeof(GameObject))
@@ -108,6 +102,22 @@ namespace Explorer
         {
             try
             {
+                if (Target == null)
+                {
+                    MelonLogger.Log("Target is null!");
+                    DestroyWindow();
+                    return;
+                }
+                else if (Target is UnityEngine.Object uObj)
+                {
+                    if (!uObj)
+                    {
+                        MelonLogger.Log("Target was destroyed!");
+                        DestroyWindow();
+                        return;
+                    }
+                }
+
                 if (!m_object && !GetObjectAsGameObject())
                 {
                     throw new Exception("Object is null!");
@@ -128,28 +138,22 @@ namespace Explorer
                     m_object.transform.localScale = m_frozenScale;
                 }
 
-                var list = new List<Transform>();
+                // update child objects
+                var childList = new List<Transform>();
                 for (int i = 0; i < m_object.transform.childCount; i++)
                 {
-                    list.Add(m_object.transform.GetChild(i));
+                    childList.Add(m_object.transform.GetChild(i));
                 }
-                list.Sort((a, b) => b.childCount.CompareTo(a.childCount));
-                m_children = list.ToArray();
+                childList.Sort((a, b) => b.childCount.CompareTo(a.childCount));
+                m_children = childList.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;
-                    }
+                // update components
+                var compList = new Il2CppSystem.Collections.Generic.List<Component>();
+                m_object.GetComponentsInternal(ReflectionHelpers.ComponentType, true, false, true, false, compList);
 
-                    list2.Add(comp);
-                }
-                m_components = list2.ToArray();
+                m_components = compList.ToArray();
 
                 CompPages.ItemCount = m_components.Length;
             }

src/Windows/ReflectionWindow.cs

@@ -22,8 +22,6 @@ 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 = "";
@@ -69,6 +67,20 @@ namespace Explorer
 
         public override void Update()
         {
+            if (Target == null)
+            {
+                DestroyWindow();
+                return;
+            }
+            else if (Target is UnityEngine.Object uObj)
+            {
+                if (!uObj)
+                {
+                    DestroyWindow();
+                    return;
+                }
+            }
+
             m_cachedMembersFiltered = m_allCachedMembers.Where(x => ShouldProcessMember(x)).ToArray();
 
             if (m_autoUpdate)
@@ -150,10 +162,20 @@ namespace Explorer
                             name += " (";
                             foreach (var param in mi.GetParameters())
                             {
-                                name += param.ParameterType.Name + ", ";
+                                name += $"{param.ParameterType.Name} {param.Name}, ";
                             }
                             name += ")";
                         }
+                        else if (member is PropertyInfo pi)
+                        {
+                            name += " (";
+                            foreach (var param in pi.GetIndexParameters())
+                            {
+                                name += $"{param.ParameterType.Name} {param.Name}, ";
+                            }
+                            name += ")";
+                        }
+
                         if (names.Contains(name))
                         {
                             continue;

src/Windows/ResizeDrag.cs

@@ -34,15 +34,17 @@ namespace Explorer
                     //var r = GUILayoutUtility.GetLastRect();
                     var r = GUIUnstrip.GetLastRect();
 
-                    Vector2 mouse = GUIUtility.ScreenToGUIPoint(new Vector2(Input.mousePosition.x, Screen.height - Input.mousePosition.y));
+                    var mousePos = InputHelper.mousePosition;
 
-                    if (r.Contains(mouse) && Input.GetMouseButtonDown(0))
+                    Vector2 mouse = GUIUtility.ScreenToGUIPoint(new Vector2(mousePos.x, Screen.height - mousePos.y));
+
+                    if (r.Contains(mouse) && InputHelper.GetMouseButtonDown(0))
                     {
                         isResizing = true;
                         m_currentWindow = ID;
                         m_currentResize = new Rect(mouse.x, mouse.y, _rect.width, _rect.height);
                     }
-                    else if (!Input.GetMouseButton(0))
+                    else if (!InputHelper.GetMouseButton(0))
                     {
                         isResizing = false;
                     }

src/Windows/TabViewWindow.cs

@@ -26,6 +26,7 @@ namespace Explorer
         }
 
         public override void Init() { }
+
         public override void Update() 
         {
             while (TargetTabID >= WindowManager.Windows.Count)

src/Windows/WindowManager.cs

@@ -90,7 +90,7 @@ namespace Explorer
         {
             createdNew = false;
 
-            if (Input.GetKey(KeyCode.LeftShift))
+            if (InputHelper.GetKey(KeyCode.LeftShift))
             {
                 forceReflection = true;
             }
@@ -109,7 +109,7 @@ namespace Explorer
 
                     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)
                             {
@@ -192,7 +192,8 @@ namespace Explorer
 
         private static bool RectContainsMouse(Rect rect)
         {
-            return rect.Contains(new Vector2(Input.mousePosition.x, Screen.height - Input.mousePosition.y));
+            var mousePos = InputHelper.mousePosition;
+            return rect.Contains(new Vector2(mousePos.x, Screen.height - mousePos.y));
         }
 
         public static int NextWindowID()