2.1.0

* Fix a bug with Il2Cpp reflection causing TargetInvocationException and other weird issues.

src/Explorer.csproj

@@ -25,7 +25,7 @@
     <RootNamespace>Explorer</RootNamespace>
     <AssemblyName>Explorer</AssemblyName>
     <!-- Set this to the MelonLoader Il2Cpp Game folder, without the ending '\' character. -->
-    <MLCppGameFolder>D:\Steam\steamapps\common\Hellpoint</MLCppGameFolder>
+    <MLCppGameFolder>D:\Steam\steamapps\common\VRChat</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. -->

src/ExplorerCore.cs

@@ -12,7 +12,7 @@ namespace Explorer
     public class ExplorerCore
     {
         public const string NAME    = "Explorer " + VERSION + " (" + PLATFORM + ", " + MODLOADER + ")";
-        public const string VERSION = "2.0.8";
+        public const string VERSION = "2.1.0";
         public const string AUTHOR  = "Sinai";
         public const string GUID    = "com.sinai.explorer";
 

src/Helpers/ReflectionHelpers.cs

@@ -43,7 +43,7 @@ namespace Explorer.Helpers
                 return obj;
 
             if (!typeof(Il2CppSystem.Object).IsAssignableFrom(castTo))
-                return obj;
+                return obj as System.Object;
 
             IntPtr castToPtr;
             if (!ClassPointers.ContainsKey(castTo))

src/Tests/TestClass.cs

@@ -49,6 +49,7 @@ namespace Explorer.Tests
 
 #if CPP
         public static Il2CppSystem.Collections.Generic.HashSet<string> ILHashSetTest;
+        public static Il2CppReferenceArray<Il2CppSystem.Object> testRefArray;
 #endif
 
         public TestClass()
@@ -64,6 +65,12 @@ namespace Explorer.Tests
             GameObject.DontDestroyOnLoad(TestTexture);
             GameObject.DontDestroyOnLoad(TestSprite);
 
+            testRefArray = new Il2CppReferenceArray<Il2CppSystem.Object>(5);
+            for (int i = 0; i < 5; i++)
+            {
+                testRefArray[i] = "hi " + i;
+            }
+
             //// test loading a tex from file
             //var dataToLoad = System.IO.File.ReadAllBytes(@"Mods\Explorer\Tex_Nemundis_Nebula.png");
             //ExplorerCore.Log($"Tex load success: {TestTexture.LoadImage(dataToLoad, false)}");

src/UI/ForceUnlockCursor.cs

@@ -43,15 +43,14 @@ namespace Explorer.UI
                 // Get current cursor state and enable cursor
                 try
                 {
-                    //m_lastLockMode = Cursor.lockState;
-                    m_lastLockMode = (CursorLockMode?)typeof(Cursor).GetProperty("lockState", BF.Public | BF.Static)?.GetValue(null, null)
-                                     ?? CursorLockMode.None;
-
-                    //m_lastVisibleState = Cursor.visible;
-                    m_lastVisibleState = (bool?)typeof(Cursor).GetProperty("visible", BF.Public | BF.Static)?.GetValue(null, null) 
-                                         ?? false;
+                    m_lastLockMode = (CursorLockMode)typeof(Cursor).GetProperty("lockState", BF.Public | BF.Static).GetValue(null, null);
+                    m_lastVisibleState = (bool)typeof(Cursor).GetProperty("visible", BF.Public | BF.Static).GetValue(null, null);
+                }
+                catch 
+                {
+                    m_lastLockMode = CursorLockMode.None;
+                    m_lastVisibleState = true;
                 }
-                catch { }
 
                 // Setup Harmony Patches
                 TryPatch("lockState", new HarmonyMethod(typeof(ForceUnlockCursor).GetMethod(nameof(Prefix_set_lockState))), true);

src/UI/Inspectors/ReflectionInspector.cs

@@ -10,6 +10,7 @@ using Explorer.UI.Inspectors;
 using Explorer.Helpers;
 #if CPP
 using UnhollowerBaseLib;
+using UnhollowerRuntimeLib;
 #endif
 
 namespace Explorer.UI.Inspectors
@@ -141,6 +142,18 @@ namespace Explorer.UI.Inspectors
                     continue;
                 }
 
+                var target = Target;
+#if CPP
+                try
+                {
+                    target = target.Il2CppCast(declaringType);
+                }
+                catch //(Exception e)
+                {
+                    //ExplorerCore.LogWarning("Excepting casting " + target.GetType().FullName + " to " + declaringType.FullName);
+                }
+#endif
+
                 foreach (var member in infos)
                 {
                     try
@@ -150,14 +163,13 @@ namespace Explorer.UI.Inspectors
                         if (m < 4 || m > 16)
                             continue;
 
-                        var fi = member as FieldInfo;
                         var pi = member as PropertyInfo;
                         var mi = member as MethodInfo;
 
                         if (IsStaticInspector)
                         {
-                            if (fi != null && !fi.IsStatic) continue;
-                            else if (pi != null && !pi.GetAccessors()[0].IsStatic) continue;
+                            if (member is FieldInfo fi && !fi.IsStatic) continue;
+                            else if (pi != null && !pi.GetAccessors(true)[0].IsStatic) continue;
                             else if (mi != null && !mi.IsStatic) continue;
                         }
 
@@ -195,7 +207,9 @@ namespace Explorer.UI.Inspectors
 
                         try
                         {
-                            var cached = CacheFactory.GetCacheObject(member, Target);
+                            // ExplorerCore.Log($"Trying to cache member {sig}...");
+
+                            var cached = CacheFactory.GetCacheObject(member, target);
 
                             if (cached != null)
                             {

src/UI/InteractiveValue/Object/InteractiveSprite.cs

@@ -11,6 +11,11 @@ namespace Explorer.UI
     {
         private Sprite refSprite;
 
+        public override void Init()
+        {
+            base.Init();
+        }
+
         public override void UpdateValue()
         {
 #if CPP
@@ -30,7 +35,7 @@ namespace Explorer.UI
 
         public override void GetTexture2D()
         {
-            if (refSprite)
+            if (refSprite && refSprite.texture)
             {
                 currentTex = refSprite.texture;
             }

src/UI/Main/ScenePage.cs

@@ -35,6 +35,7 @@ namespace Explorer.UI.Main
         public override void Init()
         {
             Instance = this;
+            m_currentScene = UnityHelpers.ActiveSceneName;
         }
 
         public void OnSceneChange()

src/Unstrip/IMGUI/GUIHelper.cs

@@ -18,7 +18,7 @@ namespace Explorer
 #if CPP
             return GUIUnstrip.ExpandWidth(expand);
 #else
-            return GUIHelper.ExpandWidth(expand);
+            return GUILayout.ExpandWidth(expand);
 #endif
         }