1.6.3

* Merged the two builds into one, there is now only one release. Using Reflection for UnityEngine.Input
* A few small fixes and cleanups

src/CachedObjects/CacheObjectBase.cs

@@ -16,15 +16,14 @@ namespace Explorer
         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 string ReflectionException { get; set; }
+
         public string RichTextName => m_richTextName ?? GetRichTextName();
         private string m_richTextName;
 

src/CachedObjects/Object/CacheDictionary.cs

@@ -7,16 +7,17 @@ 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 PageHelper Pages = new PageHelper();
+        public float WhiteSpace { get; set; } = 215f;
+        public float ButtonWidthOffset { get; set; } = 290f;
 
-        public float WhiteSpace = 215f;
+        public PageHelper Pages = new PageHelper();
-        public float ButtonWidthOffset = 290f;
 
         private CacheObjectBase[] m_cachedKeys;
         private CacheObjectBase[] m_cachedValues;
@@ -48,44 +49,30 @@ namespace Explorer
         }
         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.
 
-            // make generic dictionary from key and value type
-            var dict = (IDictionary)Activator.CreateInstance(typeof(Dictionary<,>)
-                                            .MakeGenericType(TypeOfKeys, TypeOfValues));
-
             // get keys and values
             var keys   = ValueType.GetProperty("Keys")  .GetValue(Value);
             var values = ValueType.GetProperty("Values").GetValue(Value);
 
-            // create a list to hold them
+            // create lists to hold them
             var keyList   = new List<object>();
             var valueList = new List<object>();
 
-            // get keys enumerator and store keys
+            // store entries with reflection
-            var keyEnumerator = keys.GetType().GetMethod("GetEnumerator").Invoke(keys, null);
+            EnumerateWithReflection(keys, keyList);
-            var keyCollectionType = keyEnumerator.GetType();
+            EnumerateWithReflection(values, valueList);
-            var keyMoveNext = keyCollectionType.GetMethod("MoveNext");
-            var keyCurrent = keyCollectionType.GetProperty("Current");
-            while ((bool)keyMoveNext.Invoke(keyEnumerator, null))
-            {
-                keyList.Add(keyCurrent.GetValue(keyEnumerator));
-            }
 
-            // get values enumerator and store values
+            // make actual mono dictionary
-            var valueEnumerator = values.GetType().GetMethod("GetEnumerator").Invoke(values, null);
+            var dict = (IDictionary)Activator.CreateInstance(typeof(Dictionary<,>)
-            var valueCollectionType = valueEnumerator.GetType();
+                                             .MakeGenericType(TypeOfKeys, TypeOfValues));
-            var valueMoveNext = valueCollectionType.GetMethod("MoveNext");
-            var valueCurrent = valueCollectionType.GetProperty("Current");
-            while ((bool)valueMoveNext.Invoke(valueEnumerator, null))
-            {
-                valueList.Add(valueCurrent.GetValue(valueEnumerator));
-            }
 
-            // finally iterate into actual dictionary
+            // finally iterate into dictionary
             for (int i = 0; i < keyList.Count; i++)
             {
                 dict.Add(keyList[i], valueList[i]);
@@ -94,11 +81,23 @@ namespace Explorer
             return dict;
         }
 
-        // ========== Methods ==========
+        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 (m_keysType == null || m_valuesType == null)
         {
             if (this.MemInfo != null)
             {
@@ -130,11 +129,15 @@ namespace Explorer
             }
         }
 
+        public override void UpdateValue()
+        {
+            // first make sure we won't run into a TypeInitializationException.
+            if (!EnsureDictionaryIsSupported())
+            {
+                ReflectionException = "Dictionary Type not supported with Reflection!";
                 return;
             }
 
-        public override void UpdateValue()
-        {
             base.UpdateValue();
 
             // reset
@@ -165,6 +168,28 @@ namespace Explorer
             m_cachedValues = values.ToArray();
         }
 
+        private bool EnsureDictionaryIsSupported()
+        {
+            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)
@@ -258,15 +283,11 @@ namespace Explorer
                         GUI.skin.label.alignment = TextAnchor.MiddleCenter;
                         GUILayout.Label($"[{i}]", new GUILayoutOption[] { GUILayout.Width(30) });
 
-                        GUILayout.BeginHorizontal(new GUILayoutOption[] { GUILayout.MinWidth((window.width / 3) - 60f) });
                         GUILayout.Label("Key:", new GUILayoutOption[] { GUILayout.Width(40) });
                         key.DrawValue(window, (window.width / 2) - 30f);
-                        GUILayout.EndHorizontal();
 
-                        GUILayout.BeginHorizontal(null);
                         GUILayout.Label("Value:", new GUILayoutOption[] { GUILayout.Width(40) });
                         val.DrawValue(window, (window.width / 2) - 30f);
-                        GUILayout.EndHorizontal();
                     }
 
                 }

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 PageHelper Pages = new PageHelper();
-        public float ButtonWidthOffset = 290f;
 
         private CacheObjectBase[] m_cachedEntries;
 
@@ -52,6 +52,7 @@ namespace Explorer
         {
             get => GetItemProperty();
         }
+
         private PropertyInfo m_itemProperty;
 
         // ========== Methods ==========

src/CachedObjects/Other/CacheMethod.cs

@@ -18,28 +18,17 @@ namespace Explorer
         private ParameterInfo[] m_arguments;
         private string[] m_argumentInput;
 
-        public bool HasParameters
+        public bool HasParameters => m_arguments != null && m_arguments.Length > 0;
-        {
-            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
+            // primitive and string args supported
             foreach (var param in mi.GetParameters())
             {
                 if (!param.ParameterType.IsPrimitive && param.ParameterType != typeof(string))
@@ -66,6 +55,83 @@ namespace Explorer
             //base.UpdateValue();
         }
 
+        private void Evaluate()
+        {
+            var mi = MemInfo as MethodInfo;
+
+            object ret = null;
+
+            if (!HasParameters)
+            {
+                ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, new object[0]);
+                m_evaluated = true;
+            }
+            else
+            {
+                var parsedArgs = new List<object>();
+                for (int i = 0; i < m_arguments.Length; i++)
+                {
+                    var input = m_argumentInput[i];
+                    var type = m_arguments[i].ParameterType;
+
+                    if (type == typeof(string))
+                    {
+                        parsedArgs.Add(input);
+                    }
+                    else
+                    {
+                        try
+                        {
+                            if (type.GetMethod("Parse", new Type[] { typeof(string) }).Invoke(null, new object[] { input }) is object parsed)
+                            {
+                                parsedArgs.Add(parsed);
+                            }
+                            else
+                            {
+                                // try add a null arg i guess
+                                parsedArgs.Add(null);
+                            }
+
+                        }
+                        catch
+                        {
+                            MelonLogger.Log($"Unable to parse '{input}' to type '{type.Name}'");
+                            break;
+                        }
+                    }
+                }
+
+                try
+                {
+                    ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, parsedArgs.ToArray());
+                    m_evaluated = true;
+                }
+                catch (Exception e)
+                {
+                    MelonLogger.Log($"Exception evaluating: {e.GetType()}, {e.Message}");
+                }
+            }
+
+            if (ret != null)
+            {
+                m_cachedReturnValue = GetCacheObject(ret);
+
+                if (m_cachedReturnValue is IExpandHeight expander)
+                {
+                    expander.WhiteSpace = 0f;
+                    expander.ButtonWidthOffset += 70f;
+                }
+
+                m_cachedReturnValue.UpdateValue();
+            }
+            else
+            {
+                m_cachedReturnValue = null;
+            }
+        }
+
+        // ==== GUI DRAW ====
+
         public override void DrawValue(Rect window, float width)
         {
             GUILayout.BeginVertical(null);
@@ -123,17 +189,9 @@ namespace Explorer
             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);
@@ -147,77 +205,5 @@ namespace Explorer
 
             GUILayout.EndVertical();
         }
-
-        private void Evaluate()
-        {
-            var mi = MemInfo as MethodInfo;
-
-            object ret = null;
-
-            if (!HasParameters)
-            {
-                ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, new object[0]);
-                m_evaluated = true;
-            }
-            else
-            {
-                var arguments = new List<object>();
-                for (int i = 0; i < m_arguments.Length; i++)
-                {
-                    var input = m_argumentInput[i];
-                    var type = m_arguments[i].ParameterType;
-
-                    if (type == typeof(string))
-                    {
-                        arguments.Add(input);
-                    }
-                    else
-                    {
-                        try
-                        {
-                            if (type.GetMethod("Parse", new Type[] { typeof(string) }).Invoke(null, new object[] { input }) is object parsed)
-                            {
-                                arguments.Add(parsed);
-                            }
-                            else
-                            {
-                                throw new Exception();
-                            }
-
-                        }
-                        catch
-                        {
-                            MelonLogger.Log($"Unable to parse '{input}' to type '{type.Name}'");
-                            break;
-                        }
-                    }
-                }
-
-                if (arguments.Count == m_arguments.Length)
-                {
-                    ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, arguments.ToArray());
-                    m_evaluated = true;
-                }
-                else
-                {
-                    MelonLogger.Log($"Did not invoke because {m_arguments.Length - arguments.Count} arguments could not be parsed!");
-                }
-            }
-
-            if (ret != null)
-            {
-                m_cachedReturnValue = GetCacheObject(ret);
-                if (m_cachedReturnValue is CacheList cacheList)
-                {
-                    cacheList.WhiteSpace = 0f;
-                    cacheList.ButtonWidthOffset += 70f;
-                }
-                m_cachedReturnValue.UpdateValue();
-            }
-            else
-            {
-                m_cachedReturnValue = null;
-            }
-        }
     }
 }

src/CachedObjects/Other/CacheOther.cs

@@ -50,7 +50,7 @@ namespace Explorer
             }
 
             GUI.skin.button.alignment = TextAnchor.MiddleLeft;
-            if (GUILayout.Button("<color=yellow>" + label + "</color>", new GUILayoutOption[] { GUILayout.Width(width) }))
+            if (GUILayout.Button("<color=yellow>" + label + "</color>", new GUILayoutOption[] { GUILayout.Width(width - 15) }))
             {
                 WindowManager.InspectObject(Value, out bool _);
             }

src/CppExplorer.cs

@@ -12,15 +12,10 @@ namespace Explorer
 {
     public class CppExplorer : MelonMod
     {
-        public const string GUID = "com.sinai.cppexplorer";
+        public const string NAME    = "CppExplorer";
-        public const string VERSION = "1.5.9";
+        public const string VERSION = "1.6.3";
         public const string AUTHOR  = "Sinai";
-
+        public const string GUID    = "com.sinai.cppexplorer";
-        public const string NAME = "CppExplorer"
-#if Release_Unity2018
-        + " (Unity 2018)"
-#endif
-        ;
 
         public static CppExplorer Instance { get; private set; }
 
@@ -79,7 +74,7 @@ namespace Explorer
         public override void OnUpdate()
         {
             // Check main toggle key input
-            if (Input.GetKeyDown(KeyCode.F7))
+            if (InputHelper.GetKeyDown(KeyCode.F7))
             {
                 ShowMenu = !ShowMenu;
             }
@@ -87,7 +82,7 @@ namespace Explorer
             if (ShowMenu)
             {
                 // Check Force-Unlock input
-                if (Input.GetKeyDown(KeyCode.LeftAlt))
+                if (InputHelper.GetKeyDown(KeyCode.LeftAlt))
                 {
                     ForceUnlockMouse = !ForceUnlockMouse;
                 }

src/CppExplorer.csproj

@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -12,26 +12,12 @@
     <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>
+    <OutputPath>..\Release\</OutputPath>
-    <DefineConstants>Release_2019</DefineConstants>
+    <DefineConstants />
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Unity2018|AnyCPU' ">
-    <AssemblyName>CppExplorer_Unity2018</AssemblyName>
-    <DebugSymbols>false</DebugSymbols>
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\Release\2018\</OutputPath>
-    <DefineConstants>Release_Unity2018</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x64</PlatformTarget>
@@ -60,66 +46,34 @@
       <HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnhollowerBaseLib.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <!-- Unity 2019 build (InputLegacyModule.dll) -->
+    <!-- Replace these references with ones from your game (..\MelonLoader\ folder) -->
-    <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'">
+    <Reference Include="UnityEngine.PhysicsModule">
-      <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.InputLegacyModule.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.PhysicsModule" Condition="'$(Configuration)'=='Debug'">
       <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.PhysicsModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="UnityEngine.TextRenderingModule" Condition="'$(Configuration)'=='Debug'">
+    <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,7 @@
     <Compile Include="CachedObjects\Struct\CacheRect.cs" />
     <Compile Include="CppExplorer.cs" />
     <Compile Include="Extensions\ReflectionExtensions.cs" />
+    <Compile Include="Helpers\InputHelper.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|Any CPU = Release|Any CPU
-		Release_Unity2018|Any CPU = Release_Unity2018|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_Unity2018|Any CPU.ActiveCfg = Release_Unity2018|Any CPU
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_Unity2018|Any CPU.Build.0 = Release_Unity2018|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Reflection;
+using UnityEngine;
+
+namespace Explorer
+{
+    /// <summary>
+    /// Version-agnostic UnityEngine.Input module using Reflection
+    /// </summary>
+    public class InputHelper
+    {
+        private static readonly Type input = ReflectionHelpers.GetTypeByName("UnityEngine.Input");
+
+        private static readonly PropertyInfo mousePositionInfo = input.GetProperty("mousePosition");
+
+        private static readonly MethodInfo getKey = input.GetMethod("GetKey", new Type[] { typeof(KeyCode) });
+        private static readonly MethodInfo getKeyDown = input.GetMethod("GetKeyDown", new Type[] { typeof(KeyCode) });
+        private static readonly MethodInfo getMouseButtonDown = input.GetMethod("GetMouseButtonDown", new Type[] { typeof(int) });
+        private static readonly MethodInfo getMouseButton = input.GetMethod("GetMouseButton", new Type[] { typeof(int) });
+
+#pragma warning disable IDE1006 // Camel-case property (Unity style)
+        public static Vector3 mousePosition => (Vector3)mousePositionInfo.GetValue(null);
+#pragma warning restore IDE1006
+
+        public static bool GetKeyDown(KeyCode key)
+        {
+            return (bool)getKeyDown.Invoke(null, new object[] { key });
+        }
+
+        public static bool GetKey(KeyCode key)
+        {
+            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)
+        {
+            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)
+        {
+            return (bool)getMouseButton.Invoke(null, new object[] { btn });
+        }
+    }
+}

src/Helpers/ReflectionHelpers.cs

@@ -9,6 +9,8 @@ using UnhollowerRuntimeLib;
 using UnityEngine;
 using BF = System.Reflection.BindingFlags;
 using MelonLoader;
+using System.Collections;
+using Mono.CSharp;
 
 namespace Explorer
 {
@@ -76,40 +78,48 @@ namespace Explorer
 
         public static bool IsEnumerable(Type t)
         {
-            return typeof(System.Collections.IEnumerable).IsAssignableFrom(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)
+            if (t.IsGenericType && t.GetGenericTypeDefinition() is Type g)
             {
-                var generic = t.GetGenericTypeDefinition();
+                return typeof(Il2CppSystem.Collections.Generic.List<>).IsAssignableFrom(g)
-
+                    || typeof(Il2CppSystem.Collections.Generic.IList<>).IsAssignableFrom(g);
-                return generic.IsAssignableFrom(typeof(Il2CppSystem.Collections.Generic.List<>))
-                    || generic.IsAssignableFrom(typeof(Il2CppSystem.Collections.Generic.IList<>));
             }
             else
             {
-                return t.IsAssignableFrom(typeof(Il2CppSystem.Collections.IList));
+                return typeof(Il2CppSystem.Collections.IList).IsAssignableFrom(t);
             }
         }
 
         public static bool IsDictionary(Type t)
         {
-            return t.IsGenericType
+            if (typeof(IDictionary).IsAssignableFrom(t))
-                && t.GetGenericTypeDefinition() is Type typeDef
+            {
-                && (typeDef.IsAssignableFrom(typeof(Il2CppSystem.Collections.Generic.Dictionary<,>))
+                return true;
-                    || typeDef.IsAssignableFrom(typeof(Dictionary<,>)));
             }
 
-        public static Type GetTypeByName(string typeName)
+            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 GetTypesSafe(asm))
                 {
-                    if (type.FullName == typeName)
+                    if (type.FullName == fullName)
                     {
                         return type;
                     }

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

@@ -19,6 +19,8 @@ namespace Explorer
         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/UnstripFixes/GUIUnstrip.cs

@@ -42,7 +42,6 @@ namespace Explorer
         }
         private static PropertyInfo m_scrollViewStatesInfo;
         
-        // ======= public methods ======= //   
 
         public static Rect GetLastRect()
         {
@@ -73,7 +72,6 @@ namespace Explorer
                 catch
                 {
                     ScrollFailed = true;
-                    return scroll;
                 }
             }
 
@@ -86,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;
                 }
             }
 
@@ -113,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)
         {

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!");

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)

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/WindowManager.cs

@@ -90,7 +90,7 @@ namespace Explorer
         {
             createdNew = false;
 
-            if (Input.GetKey(KeyCode.LeftShift))
+            if (InputHelper.GetKey(KeyCode.LeftShift))
             {
                 forceReflection = true;
             }
@@ -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()