1.8.3.1

* Added some internal caching for Enum Names, should vastly improve speed when inspecting certain classes (worst case scenario I found went from over 50 seconds to less than 1 second).
* ILRepack is now done as part of the build process, should simplify things if you are building the project yourself.

README.md

@@ -45,14 +45,14 @@ Requires [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) to be ins
 
 1. Download the relevant <b>Explorer_MelonLoader_.zip</b> from above.
 2. Unzip the file into the `Mods` folder in your game's installation directory, created by MelonLoader.
-3. Make sure it's not in a sub-folder, `Explorer.dll` and `mcs.dll` should be directly in the `Mods\` folder.
+3. Make sure it's not in a sub-folder, `Explorer.dll` should be directly in the `Mods\` folder.
 
 ### BepInEx
 Requires [BepInEx](https://github.com/BepInEx/BepInEx) to be installed for your game.
 
 1. Download the relevant <b>Explorer_BepInEx_.zip</b> from above.
 2. Unzip the file into the `BepInEx\plugins\` folder in your game's installation directory, created by BepInEx.
-3. Make sure it's not in a sub-folder, `Explorer.dll` and `mcs.dll` should be directly in the `plugins\` folder.
+3. Make sure it's not in a sub-folder, `Explorer.dll` should be directly in the `plugins\` folder.
 
 ## How to use
 
@@ -147,7 +147,7 @@ public class MenuClass_CursorUpdate
 
 ## Building
 
-If you'd like to build this yourself, everything you need (other than MelonLoader and/or BepInEx) is included with this repository.
+If you'd like to build this yourself, you will need to have installed BepInEx and/or MelonLoader for at least one Unity game. If you want to build all 6 versions, you will need at least one Il2Cpp and one Mono game, with BepInEx and MelonLoader installed for both.
 
 1. Install MelonLoader or BepInEx for your game.
 2. Open the `src\Explorer.csproj` file in a text editor.
@@ -155,6 +155,7 @@ If you'd like to build this yourself, everything you need (other than MelonLoade
 4. Open the `src\Explorer.sln` project.
 5. Select `Solution 'Explorer' (1 of 1 project)` in the Solution Explorer panel, and set the <b>Active config</b> property to the version you want to build, then build it.
 5. The DLLs are built to the `Release\` folder in the root of the repository.
+6. If ILRepack fails or is missing, use the NuGet package manager to re-install `ILRepack.Lib.MSBuild.Task`, then re-build.
 
 ## Credits
 

src/CachedObjects/Object/CacheDictionary.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Threading;
 using UnityEngine;
 #if CPP
 using UnhollowerBaseLib;
@@ -15,8 +16,8 @@ namespace Explorer
 
         public PageHelper Pages = new PageHelper();
 
-        private CacheObjectBase[] m_cachedKeys;
-        private CacheObjectBase[] m_cachedValues;
+        private CacheObjectBase[] m_cachedKeys = new CacheObjectBase[0];
+        private CacheObjectBase[] m_cachedValues = new CacheObjectBase[0];
 
         public Type TypeOfKeys
         {
@@ -119,6 +120,11 @@ namespace Explorer
 
             base.UpdateValue();
 
+            CacheEntries();
+        }
+
+        public void CacheEntries()
+        {
             // reset
             IDict = null;
 
@@ -190,8 +196,6 @@ namespace Explorer
 
             var whitespace = CalcWhitespace(window);
 
-            int count = m_cachedKeys.Length;
-
             if (!IsExpanded)
             {
                 if (GUILayout.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
@@ -209,6 +213,8 @@ namespace Explorer
 
             var negativeWhitespace = window.width - (whitespace + 100f);
 
+            int count = m_cachedKeys.Length;
+
             GUI.skin.button.alignment = TextAnchor.MiddleLeft;
             string btnLabel = $"[{count}] <color=#2df7b2>Dictionary<{TypeOfKeys.FullName}, {TypeOfValues.FullName}></color>";
             if (GUILayout.Button(btnLabel, new GUILayoutOption[] { GUILayout.Width(negativeWhitespace) }))
@@ -260,21 +266,27 @@ namespace Explorer
 
                     //GUIUnstrip.Space(whitespace);
 
-                    if (key == null || val == null)
+                    if (key == null && val == null)
                     {
                         GUILayout.Label($"[{i}] <i><color=grey>(null)</color></i>", new GUILayoutOption[0]);
                     }
                     else
                     {
                         GUI.skin.label.alignment = TextAnchor.MiddleCenter;
-                        GUILayout.Label($"[{i}]", new GUILayoutOption[] { GUILayout.Width(30) });
+                        GUILayout.Label($"[{i}]", new GUILayoutOption[] { GUILayout.Width(40) });
 
                         GUI.skin.label.alignment = TextAnchor.MiddleLeft;
                         GUILayout.Label("Key:", new GUILayoutOption[] { GUILayout.Width(40) });
-                        key.DrawValue(window, (window.width / 2) - 80f);
+                        if (key != null)
+                            key.DrawValue(window, (window.width / 2) - 80f);
+                        else
+                            GUILayout.Label("<i>null</i>", new GUILayoutOption[0]);
 
                         GUILayout.Label("Value:", new GUILayoutOption[] { GUILayout.Width(40) });
-                        val.DrawValue(window, (window.width / 2) - 80f);
+                        if (Value != null)
+                            val.DrawValue(window, (window.width / 2) - 80f);
+                        else
+                            GUILayout.Label("<i>null</i>", new GUILayoutOption[0]);
                     }
 
                 }

src/CachedObjects/Object/CacheList.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Threading;
 using System.Reflection;
 using UnityEngine;
 
@@ -13,7 +14,7 @@ namespace Explorer
 
         public PageHelper Pages = new PageHelper();
 
-        private CacheObjectBase[] m_cachedEntries;
+        private CacheObjectBase[] m_cachedEntries = new CacheObjectBase[0];
 
         // Type of Entries in the Array
         public Type EntryType 
@@ -218,6 +219,11 @@ namespace Explorer
                 return;
             }
 
+            CacheEntries();
+        }
+
+        public void CacheEntries()
+        {
             var enumerator = Enumerable.GetEnumerator();
             if (enumerator == null)
             {
@@ -276,8 +282,6 @@ namespace Explorer
 
             var whitespace = CalcWhitespace(window);
 
-            int count = m_cachedEntries.Length;
-
             if (!IsExpanded)
             {
                 if (GUILayout.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
@@ -295,6 +299,8 @@ namespace Explorer
 
             var negativeWhitespace = window.width - (whitespace + 100f);
 
+            int count = m_cachedEntries.Length;
+
             GUI.skin.button.alignment = TextAnchor.MiddleLeft;
             string btnLabel = $"[{count}] <color=#2df7b2>{EntryType.FullName}</color>";
             if (GUILayout.Button(btnLabel, new GUILayoutOption[] { GUILayout.Width(negativeWhitespace) }))

src/CachedObjects/Struct/CacheEnum.cs

@@ -9,6 +9,8 @@ namespace Explorer
 {
     public class CacheEnum : CacheObjectBase
     {
+        internal static Dictionary<Type, string[]> EnumNamesInternalCache = new Dictionary<Type, string[]>();
+
         // public Type EnumType;
         public string[] EnumNames = new string[0];
 
@@ -21,18 +23,7 @@ namespace Explorer
 
             if (ValueType != null)
             {
-                // using GetValues not GetNames, to catch instances of weird enums (eg CameraClearFlags)
-                var values = Enum.GetValues(ValueType);
-
-                var list = new List<string>();
-                foreach (var value in values)
-                {
-                    var v = value.ToString();
-                    if (list.Contains(v)) continue;
-                    list.Add(v);
-                }
-
-                EnumNames = list.ToArray();
+                GetNames();
             }
             else
             {
@@ -40,6 +31,27 @@ namespace Explorer
             }
         }
 
+        internal void GetNames()
+        {
+            if (!EnumNamesInternalCache.ContainsKey(ValueType))
+            {
+                // using GetValues not GetNames, to catch instances of weird enums (eg CameraClearFlags)
+                var values = Enum.GetValues(ValueType);
+
+                var set = new HashSet<string>();
+                foreach (var value in values)
+                {
+                    var v = value.ToString();
+                    if (set.Contains(v)) continue;
+                    set.Add(v);
+                }
+
+                EnumNamesInternalCache.Add(ValueType, set.ToArray());
+            }
+
+            EnumNames = EnumNamesInternalCache[ValueType];
+        }
+
         public override void DrawValue(Rect window, float width)
         {
             if (CanWrite)

src/Explorer.csproj

@@ -27,14 +27,14 @@
     <AssemblyName>Explorer</AssemblyName>
     <!-- Set this to the MelonLoader Il2Cpp Game folder, without the ending '\' character. -->
     <MLCppGameFolder>D:\Steam\steamapps\common\Hellpoint</MLCppGameFolder>
-    <!--<MLCppGameFolder>D:\source\Unity Projects\Test\_BUILD</MLCppGameFolder>-->
     <!-- Set this to the MelonLoader Mono Game folder, without the ending '\' character. -->
     <MLMonoGameFolder>D:\Steam\steamapps\common\Outward</MLMonoGameFolder>
     <!-- Set this to the BepInEx Il2Cpp Game folder, without the ending '\' character. -->
-    <BIECppGameFolder>D:\Steam\steamapps\common\Outward - Il2Cpp</BIECppGameFolder>
+    <BIECppGameFolder>D:\Steam\steamapps\common\Outward_Il2Cpp</BIECppGameFolder>
     <!-- Set this to the BepInEx Mono Game folder, without the ending '\' character. -->
     <BIEMonoGameFolder>D:\Steam\steamapps\common\Outward</BIEMonoGameFolder>
-    <!-- <BIEMonoGameFolder>D:\source\Unity Projects\! My Unity Games\NewInputSystemTest\_BUILD</BIEMonoGameFolder> -->
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_ML_Cpp|AnyCPU' ">
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
@@ -95,11 +95,11 @@
     <!-- MCS ref -->
     <Reference Include="mcs" Condition="'$(IsNet35)'=='false'">
       <HintPath>..\lib\mcs.dll</HintPath>
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="mcs" Condition="'$(IsNet35)'=='true'">
       <HintPath>..\lib\mcs.NET35.dll</HintPath>
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <!-- Universal Mono UnityEngine.dll ref (v5.3) -->
@@ -241,7 +241,10 @@
     <Compile Include="ExplorerBepInPlugin.cs" />
     <Compile Include="ExplorerMelonMod.cs" />
     <Compile Include="Extensions\ReflectionExtensions.cs" />
-    <Compile Include="Helpers\InputHelper.cs" />
+    <Compile Include="Input\AbstractInput.cs" />
+    <Compile Include="Input\InputManager.cs" />
+    <Compile Include="Input\InputSystem.cs" />
+    <Compile Include="Input\LegacyInput.cs" />
     <Compile Include="Menu\CursorControl.cs" />
     <Compile Include="Menu\MainMenu\Pages\OptionsPage.cs" />
     <Compile Include="Tests\TestClass.cs" />
@@ -274,5 +277,16 @@
     <Compile Include="UnstripFixes\Internal.cs" />
     <Compile Include="UnstripFixes\Internal_SliderState.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ILRepack.targets" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="packages\ILRepack.Lib.MSBuild.Task.2.0.18.1\build\ILRepack.Lib.MSBuild.Task.targets" Condition="Exists('packages\ILRepack.Lib.MSBuild.Task.2.0.18.1\build\ILRepack.Lib.MSBuild.Task.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\ILRepack.Lib.MSBuild.Task.2.0.18.1\build\ILRepack.Lib.MSBuild.Task.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\ILRepack.Lib.MSBuild.Task.2.0.18.1\build\ILRepack.Lib.MSBuild.Task.targets'))" />
+  </Target>
 </Project>

src/ExplorerBepInPlugin.cs

@@ -62,24 +62,11 @@ namespace Explorer
             SceneManager.activeSceneChanged += DoSceneChange;
 #endif
 
-            LoadMCS();
-
             new ExplorerCore();
 
             //HarmonyInstance.PatchAll();
         }
 
-        void LoadMCS()
-        {
-#if NET35
-            var path = @"BepInEx\plugins\mcs.NET35.dll";
-#else
-            var path = @"BepInEx\plugins\mcs.dll";
-#endif
-            Assembly.Load(File.ReadAllBytes(path));
-            ExplorerCore.Log("Loaded mcs!");
-        }
-
         internal static void DoSceneChange(Scene arg0, Scene arg1)
         {
             ExplorerCore.OnSceneChange();

src/ExplorerCore.cs

@@ -5,7 +5,7 @@ namespace Explorer
     public class ExplorerCore
     {
         public const string NAME    = "Explorer (" + PLATFORM + ", " + MODLOADER + ")";
-        public const string VERSION = "1.8.22";
+        public const string VERSION = "1.8.3.1";
         public const string AUTHOR  = "Sinai";
         public const string GUID    = "com.sinai.explorer";
 
@@ -33,7 +33,7 @@ namespace Explorer
             new MainMenu();
             new WindowManager();
 
-            InputHelper.Init();
+            InputManager.Init();
             CursorControl.Init();
 
             Log($"{NAME} {VERSION} initialized.");
@@ -54,7 +54,7 @@ namespace Explorer
 
         public static void Update()
         {
-            if (InputHelper.GetKeyDown(ModConfig.Instance.Main_Menu_Toggle))
+            if (InputManager.GetKeyDown(ModConfig.Instance.Main_Menu_Toggle))
             {
                 ShowMenu = !ShowMenu;
             }

src/Helpers/InputHelper.cs

@@ -1,205 +0,0 @@
-using System;
-using System.Reflection;
-using UnityEngine;
-
-namespace Explorer
-{
-    /// <summary>
-    /// Version-agnostic Input module using Reflection.
-    /// </summary>
-    public static class InputHelper
-    {
-        // If no Input modules loaded at all
-        public static bool NO_INPUT;
-
-        // If using new InputSystem module
-        public static bool USING_NEW_INPUT;
-
-        // Cached Types
-        private static Type TInput => _input ?? (_input = ReflectionHelpers.GetTypeByName("UnityEngine.Input"));
-        private static Type _input;
-
-        private static Type TKeyboard => _keyboard ?? (_keyboard = ReflectionHelpers.GetTypeByName("UnityEngine.InputSystem.Keyboard"));
-        private static Type _keyboard;
-
-        private static Type TMouse => _mouse ?? (_mouse = ReflectionHelpers.GetTypeByName("UnityEngine.InputSystem.Mouse"));
-        private static Type _mouse;
-
-        private static Type TKey => _key ?? (_key = ReflectionHelpers.GetTypeByName("UnityEngine.InputSystem.Key"));
-        private static Type _key;
-
-        // Cached member infos (new system)
-        private static PropertyInfo _btnIsPressedProp;
-        private static PropertyInfo _btnWasPressedProp;
-
-        private static object CurrentKeyboard => _currentKeyboard ?? (_currentKeyboard = _kbCurrentProp.GetValue(null, null));
-        private static object _currentKeyboard;
-        private static PropertyInfo _kbCurrentProp;
-        private static PropertyInfo _kbIndexer;
-
-        private static object CurrentMouse => _currentMouse ?? (_currentMouse = _mouseCurrentProp.GetValue(null, null));
-        private static object _currentMouse;
-        private static PropertyInfo _mouseCurrentProp;
-
-        private static object LeftMouseButton => _lmb ?? (_lmb = _leftButtonProp.GetValue(CurrentMouse, null));
-        private static object _lmb;
-        private static PropertyInfo _leftButtonProp;
-
-        private static object RightMouseButton => _rmb ?? (_rmb = _rightButtonProp.GetValue(CurrentMouse, null));
-        private static object _rmb;
-        private static PropertyInfo _rightButtonProp;
-
-        private static object MousePositionInfo => _pos ?? (_pos = _positionProp.GetValue(CurrentMouse, null));
-        private static object _pos;
-        private static PropertyInfo _positionProp;
-        private static MethodInfo _readVector2InputMethod;
-
-        // Cached member infos (legacy)
-        private static PropertyInfo _mousePositionProp;
-        private static MethodInfo _getKeyMethod;
-        private static MethodInfo _getKeyDownMethod;
-        private static MethodInfo _getMouseButtonMethod;
-        private static MethodInfo _getMouseButtonDownMethod;
-
-        public static void Init()
-        {
-            if (TKeyboard != null || TryLoadModule("Unity.InputSystem", TKeyboard))
-            {
-                InitNewInput();
-            }
-            else if (TInput != null || TryLoadModule("UnityEngine.Input", TInput))
-            {
-                InitLegacyInput();
-            }
-            else
-            {
-                ExplorerCore.LogWarning("Could not find any Input module!");
-                NO_INPUT = true;
-            }
-        }
-
-        private static bool TryLoadModule(string dll, Type check) => ReflectionHelpers.LoadModule(dll) && check != null;
-
-        private static void InitNewInput()
-        {
-            ExplorerCore.Log("Initializing new InputSystem support...");
-
-            USING_NEW_INPUT = true;
-
-            _kbCurrentProp = TKeyboard.GetProperty("current");
-            _kbIndexer = TKeyboard.GetProperty("Item", new Type[] { TKey });
-
-            var btnControl = ReflectionHelpers.GetTypeByName("UnityEngine.InputSystem.Controls.ButtonControl");
-            _btnIsPressedProp = btnControl.GetProperty("isPressed");
-            _btnWasPressedProp = btnControl.GetProperty("wasPressedThisFrame");
-
-            _mouseCurrentProp = TMouse.GetProperty("current");
-            _leftButtonProp = TMouse.GetProperty("leftButton");
-            _rightButtonProp = TMouse.GetProperty("rightButton");
-
-            _positionProp = ReflectionHelpers.GetTypeByName("UnityEngine.InputSystem.Pointer")
-                            .GetProperty("position");
-
-            _readVector2InputMethod = ReflectionHelpers.GetTypeByName("UnityEngine.InputSystem.InputControl`1")
-                                      .MakeGenericType(typeof(Vector2))
-                                      .GetMethod("ReadValue");
-        }
-
-        private static void InitLegacyInput()
-        {
-            ExplorerCore.Log("Initializing Legacy Input support...");
-
-            _mousePositionProp = TInput.GetProperty("mousePosition");
-            _getKeyMethod = TInput.GetMethod("GetKey", new Type[] { typeof(KeyCode) });
-            _getKeyDownMethod = TInput.GetMethod("GetKeyDown", new Type[] { typeof(KeyCode) });
-            _getMouseButtonMethod = TInput.GetMethod("GetMouseButton", new Type[] { typeof(int) });
-            _getMouseButtonDownMethod = TInput.GetMethod("GetMouseButtonDown", new Type[] { typeof(int) });
-        }
-
-        public static Vector3 MousePosition
-        {
-            get
-            {
-                if (NO_INPUT) 
-                    return Vector3.zero;
-
-                if (USING_NEW_INPUT)
-                    return (Vector2)_readVector2InputMethod.Invoke(MousePositionInfo, new object[0]);
-
-                return (Vector3)_mousePositionProp.GetValue(null, null);
-            }
-        }
-
-        public static bool GetKeyDown(KeyCode key)
-        {
-            if (NO_INPUT) return false;
-
-            if (USING_NEW_INPUT)
-            {
-                var parsedKey = Enum.Parse(TKey, key.ToString());
-                var actualKey = _kbIndexer.GetValue(CurrentKeyboard, new object[] { parsedKey });
-
-                return (bool)_btnWasPressedProp.GetValue(actualKey, null);
-            }
-
-            return (bool)_getKeyDownMethod.Invoke(null, new object[] { key });
-        }
-
-        public static bool GetKey(KeyCode key)
-        {
-            if (NO_INPUT) return false;
-
-            if (USING_NEW_INPUT)
-            {
-                var parsed = Enum.Parse(TKey, key.ToString());
-                var actualKey = _kbIndexer.GetValue(CurrentKeyboard, new object[] { parsed });
-
-                return (bool)_btnIsPressedProp.GetValue(actualKey, null);
-            }
-
-            return (bool)_getKeyMethod.Invoke(null, new object[] { key });
-        }
-
-        /// <param name="btn">0 = left, 1 = right, 2 = middle.</param>
-        public static bool GetMouseButtonDown(int btn)
-        {
-            if (NO_INPUT) return false;
-
-            if (USING_NEW_INPUT)
-            {
-                object actualBtn;
-                switch (btn)
-                {
-                    case 0: actualBtn = LeftMouseButton; break;
-                    case 1: actualBtn = RightMouseButton; break;
-                    default: throw new NotImplementedException();
-                }
-
-                return (bool)_btnWasPressedProp.GetValue(actualBtn, null);
-            }
-
-            return (bool)_getMouseButtonDownMethod.Invoke(null, new object[] { btn });
-        }
-
-        /// <param name="btn">0 = left, 1 = right, 2 = middle.</param>
-        public static bool GetMouseButton(int btn)
-        {
-            if (NO_INPUT) return false;
-
-            if (USING_NEW_INPUT)
-            {
-                object actualBtn;
-                switch (btn)
-                {
-                    case 0: actualBtn = LeftMouseButton; break;
-                    case 1: actualBtn = RightMouseButton; break;
-                    default: throw new NotImplementedException();
-                }
-
-                return (bool)_btnIsPressedProp.GetValue(actualBtn, null);
-            }
-
-            return (bool)_getMouseButtonMethod.Invoke(null, new object[] { btn });
-        }
-    }
-}

src/ILRepack.targets

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="ILRepacker" AfterTargets="Build">
+
+    <!-- Merging DLLs -->
+    <ItemGroup>
+      <InputAssemblies Include="$(OutputPath)$(AssemblyName).dll" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(IsNet35)'=='false'">
+      <InputAssemblies Include="..\lib\mcs.dll" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(IsNet35)'=='true'">
+      <InputAssemblies Include="..\lib\mcs.NET35.dll" />
+    </ItemGroup> 
+
+    <ILRepack
+      Parallel="true"
+      Internalize="true"
+      DebugInfo="false"
+      LibraryPath="..\lib\"
+      InputAssemblies="@(InputAssemblies)"      
+      TargetKind="Dll"
+      OutputFile="$(OutputPath)$(AssemblyName).dll"
+    />
+
+  </Target>
+</Project>

src/Input/AbstractInput.cs

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

src/Input/InputManager.cs

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

src/Input/InputSystem.cs

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

src/Input/LegacyInput.cs

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

src/Menu/CursorControl.cs

@@ -108,7 +108,7 @@ namespace Explorer
         public static void Update()
         {
             // Check Force-Unlock input
-            if (InputHelper.GetKeyDown(KeyCode.LeftAlt))
+            if (InputManager.GetKeyDown(KeyCode.LeftAlt))
             {
                 ForceUnlockMouse = !ForceUnlockMouse;
             }

src/Menu/InspectUnderMouse.cs

@@ -12,7 +12,7 @@ namespace Explorer
         {
             if (ExplorerCore.ShowMenu)
             {
-                if (InputHelper.GetKey(KeyCode.LeftShift) && InputHelper.GetMouseButtonDown(1))
+                if (InputManager.GetKey(KeyCode.LeftShift) && InputManager.GetMouseButtonDown(1))
                 {
                     EnableInspect = !EnableInspect;
                 }
@@ -33,7 +33,7 @@ namespace Explorer
             if (!UnityHelpers.MainCamera)
                 return;
 
-            var ray = UnityHelpers.MainCamera.ScreenPointToRay(InputHelper.MousePosition);
+            var ray = UnityHelpers.MainCamera.ScreenPointToRay(InputManager.MousePosition);
 
             if (Physics.Raycast(ray, out RaycastHit hit, 1000f))
             {
@@ -41,7 +41,7 @@ namespace Explorer
 
                 m_objUnderMouseName = obj.transform.GetGameObjectPath();
 
-                if (InputHelper.GetMouseButtonDown(0))
+                if (InputManager.GetMouseButtonDown(0))
                 {
                     EnableInspect = false;
                     m_objUnderMouseName = "";
@@ -61,7 +61,7 @@ namespace Explorer
             {
                 if (m_objUnderMouseName != "")
                 {
-                    var pos = InputHelper.MousePosition;
+                    var pos = InputManager.MousePosition;
                     var rect = new Rect(
                         pos.x - (Screen.width / 2), // x
                         Screen.height - pos.y - 50, // y

src/Menu/ResizeDrag.cs

@@ -32,24 +32,24 @@ namespace Explorer
 #if ML
                     GUILayout.Button(gcDrag, GUI.skin.label, new GUILayoutOption[] { GUILayout.Height(15) });
 #else
-                    GUILayout.Button(gcDrag.ToString(), new GUILayoutOption[] { GUILayout.Height(15) });
+                    GUILayout.Button("<-- Drag to resize -->", new GUILayoutOption[] { GUILayout.Height(15) });
 #endif
 
                     //var r = GUILayoutUtility.GetLastRect();
                     var r = Internal_LayoutUtility.GetLastRect();
 
-                    var mousePos = InputHelper.MousePosition;
+                    var mousePos = InputManager.MousePosition;
 
                     try
                     {
                         var mouse = GUIUnstrip.ScreenToGUIPoint(new Vector2(mousePos.x, Screen.height - mousePos.y));
-                        if (r.Contains(mouse) && InputHelper.GetMouseButtonDown(0))
+                        if (r.Contains(mouse) && InputManager.GetMouseButtonDown(0))
                         {
                             isResizing = true;
                             m_currentWindow = ID;
                             m_currentResize = new Rect(mouse.x, mouse.y, _rect.width, _rect.height);
                         }
-                        else if (!InputHelper.GetMouseButton(0))
+                        else if (!InputManager.GetMouseButton(0))
                         {
                             isResizing = false;
                         }
@@ -125,16 +125,16 @@ namespace Explorer
             //var r = GUILayoutUtility.GetLastRect();
             var r = GUILayoutUtility.GetLastRect();
 
-            var mousePos = InputHelper.MousePosition;
+            var mousePos = InputManager.MousePosition;
 
             var mouse = GUIUnstrip.ScreenToGUIPoint(new Vector2(mousePos.x, Screen.height - mousePos.y));
-            if (r.Contains(mouse) && InputHelper.GetMouseButtonDown(0))
+            if (r.Contains(mouse) && InputManager.GetMouseButtonDown(0))
             {
                 isResizing = true;
                 m_currentWindow = ID;
                 m_currentResize = new Rect(mouse.x, mouse.y, _rect.width, _rect.height);
             }
-            else if (!InputHelper.GetMouseButton(0))
+            else if (!InputManager.GetMouseButton(0))
             {
                 isResizing = false;
             }

src/Menu/Windows/GameObjectWindow.cs

@@ -109,7 +109,7 @@ namespace Explorer
                     DestroyWindow();
                     return;
                 }
-                else if (Target is UnityEngine.Object uObj)
+                if (Target is UnityEngine.Object uObj)
                 {
                     if (!uObj)
                     {

src/Menu/Windows/ReflectionWindow.cs

@@ -78,13 +78,15 @@ namespace Explorer
         {
             if (Target == null)
             {
+                ExplorerCore.Log("Target is null!");
                 DestroyWindow();
                 return;
             }
-            else if (Target is UnityEngine.Object uObj)
+            if (Target is UnityEngine.Object uObj)
             {
                 if (!uObj)
                 {
+                    ExplorerCore.Log("Target was destroyed!");
                     DestroyWindow();
                     return;
                 }
@@ -200,7 +202,7 @@ namespace Explorer
                         continue;
                     }
 
-                    // ExplorerCore.Log($"Trying to cache member {signature}...");
+                    //ExplorerCore.Log($"Trying to cache member {sig}...");
 
                     try
                     {

src/Menu/Windows/WindowManager.cs

@@ -81,7 +81,7 @@ namespace Explorer
         {
             createdNew = false;
 
-            if (InputHelper.GetKey(KeyCode.LeftShift))
+            if (InputManager.GetKey(KeyCode.LeftShift))
             {
                 forceReflection = true;
             }
@@ -189,7 +189,7 @@ namespace Explorer
 
         private static bool RectContainsMouse(Rect rect)
         {
-            var mousePos = InputHelper.MousePosition;
+            var mousePos = InputManager.MousePosition;
             return rect.Contains(new Vector2(mousePos.x, Screen.height - mousePos.y));
         }
 

src/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ILRepack.Lib.MSBuild.Task" version="2.0.18.1" targetFramework="net472" />
+</packages>