Fix bug in ForceUnlockCursor, fix mistake in Reflection Inspector, reduced amount casting with Reflection Inspector

Author: sinai-dev

src/UI/ForceUnlockCursor.cs

@@ -1,6 +1,7 @@
 using System;
 using UnityEngine;
 using Explorer.Helpers;
+using BF = System.Reflection.BindingFlags;
 #if ML
 using Harmony;
 #else
@@ -40,8 +41,17 @@ public static void Init()
                 }
 
                 // Get current cursor state and enable cursor
-                m_lastLockMode = Cursor.lockState;
-                m_lastVisibleState = Cursor.visible;
+                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;
+                }
+                catch { }
 
                 // Setup Harmony Patches
                 TryPatch("lockState", new HarmonyMethod(typeof(ForceUnlockCursor).GetMethod(nameof(Prefix_set_lockState))), true);

src/UI/Inspectors/ReflectionInspector.cs

@@ -99,19 +99,19 @@ public virtual bool ShouldProcessMember(CacheMember holder)
             if (m_typeFilter != MemberTypes.All && m_typeFilter != holder.MemInfo?.MemberType)
                 return false;
 
+            // hide failed reflection
+            if (!string.IsNullOrEmpty(holder.ReflectionException) && m_hideFailedReflection)
+                return false;
+
             // check scope filter
-            if (m_scopeFilter == MemberScopes.Instance)
+            if (m_scopeFilter == MemberScopes.Instance && holder.IsStatic)
             {
-                return !holder.IsStatic;
+                return false;
             }
-            else if (m_scopeFilter == MemberScopes.Static)
+            else if (m_scopeFilter == MemberScopes.Static && !holder.IsStatic)
             {
-                return holder.IsStatic;
-            }
-
-            // hide failed reflection
-            if (!string.IsNullOrEmpty(holder.ReflectionException) && m_hideFailedReflection)
                 return false;
+            }
 
             // see if we should do name search
             if (m_search == "" || holder.MemInfo == null)
@@ -141,22 +141,6 @@ private void CacheMembers(Type[] types)
                     continue;
                 }
 
-                object target = Target;
-                string exception = null;
-
-#if CPP
-                if (!IsStaticInspector && target is Il2CppSystem.Object ilObject)
-                {
-                    try
-                    {
-                        target = ilObject.Il2CppCast(declaringType);
-                    }
-                    catch (Exception e)
-                    {
-                        exception = ReflectionHelpers.ExceptionToString(e);
-                    }
-                }
-#endif
                 foreach (var member in infos)
                 {
                     try
@@ -211,17 +195,12 @@ void AppendParams(ParameterInfo[] _args)
 
                         try
                         {
-                            var cached = CacheFactory.GetCacheObject(member, target);
+                            var cached = CacheFactory.GetCacheObject(member, Target);
 
                             if (cached != null)
                             {
                                 cachedSigs.Add(sig);
                                 list.Add(cached);
-
-                                if (string.IsNullOrEmpty(cached.ReflectionException))
-                                {
-                                    cached.ReflectionException = exception;
-                                }
                             }
                         }
                         catch (Exception e)

src/UI/WindowBase.cs

@@ -2,6 +2,7 @@
 using UnityEngine;
 using Explorer.Config;
 using Explorer.UI.Inspectors;
+using Explorer.Helpers;
 
 namespace Explorer.UI
 {
@@ -26,7 +27,15 @@ public static WindowBase CreateWindow<T>(object target) where T : WindowBase
         {
             var window = Activator.CreateInstance<T>();
 
+#if CPP
+            if (target is Il2CppSystem.Object ilObject)
+            {
+                target = ilObject.Il2CppCast(ReflectionHelpers.GetActualType(ilObject));
+            }
+#endif
+
             window.Target = target;
+
             window.windowID = WindowManager.NextWindowID();
             window.m_rect = WindowManager.GetNewWindowRect();