1.5.1

* Added support for Properties with an index parameter on the Reflection Window (ie. "this[index]")
* Fixed a crash that occured when inspecting Il2CppSystem.Type objects
* Back-end cleanups

Author: sinai-dev

src/CachedObjects/CacheEnum.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Reflection;
 using MelonLoader;
 using UnityEngine;
 
@@ -15,8 +16,23 @@ public class CacheEnum : CacheObjectBase
 
         public override void Init()
         {
-            EnumType = Value.GetType();
-            EnumNames = Enum.GetNames(EnumType);
+            try
+            {
+                EnumType = Value.GetType();
+            }
+            catch
+            {
+                EnumType = (MemInfo as FieldInfo)?.FieldType ?? (MemInfo as PropertyInfo).PropertyType;
+            }
+
+            if (EnumType != null)
+            {
+                EnumNames = Enum.GetNames(EnumType);
+            }
+            else
+            {
+                ReflectionException = "Unknown, could not get Enum names.";
+            }
         }
 
         public override void DrawValue(Rect window, float width)

src/CachedObjects/CacheList.cs

@@ -145,16 +145,16 @@ private Type GetEntryType()
         {
             if (m_entryType == null)
             {
-                if (this.MemberInfo != null)
+                if (this.MemInfo != null)
                 {
                     Type memberType = null;
-                    switch (this.MemberInfo.MemberType)
+                    switch (this.MemInfo.MemberType)
                     {
                         case MemberTypes.Field:
-                            memberType = (MemberInfo as FieldInfo).FieldType;
+                            memberType = (MemInfo as FieldInfo).FieldType;
                             break;
                         case MemberTypes.Property:
-                            memberType = (MemberInfo as PropertyInfo).PropertyType;
+                            memberType = (MemInfo as PropertyInfo).PropertyType;
                             break;
                     }
 
@@ -201,17 +201,47 @@ public override void UpdateValue()
             while (enumerator.MoveNext())
             {
                 var obj = enumerator.Current;
-                var type = ReflectionHelpers.GetActualType(obj);
 
-                if (obj is Il2CppSystem.Object iObj)
+                if (obj != null && ReflectionHelpers.GetActualType(obj) is Type t)
                 {
-                    obj = iObj.Il2CppCast(type);
+                    if (obj is Il2CppSystem.Object iObj)
+                    {
+                        try
+                        {
+                            var cast = iObj.Il2CppCast(t);
+                            if (cast != null)
+                            {
+                                obj = cast;
+                            }
+                        }
+                        catch { }
+                    }
+
+                    if (GetCacheObject(obj, t) is CacheObjectBase cached)
+                    {
+                        list.Add(cached);
+                    }
+                    else
+                    {
+                        list.Add(null);
+                    }
+                }
+                else
+                {
+                    list.Add(null);
                 }
 
-                var cached = GetCacheObject(obj, null, null, type);
-                cached.UpdateValue();
+                //var type = ReflectionHelpers.GetActualType(obj);
 
-                list.Add(cached);
+                //if (obj is Il2CppSystem.Object iObj)
+                //{
+                //    obj = iObj.Il2CppCast(type);
+                //}
+
+                //var cached = GetCacheObject(obj, null, null, type);
+                //cached.UpdateValue();
+
+                //list.Add(cached);
             }
 
             m_cachedEntries = list.ToArray();
@@ -310,16 +340,18 @@ public override void DrawValue(Rect window, float width)
 
                     GUILayout.Space(whitespace);
 
-                    if (entry.Value == null)
+                    if (entry == null || entry.Value == null)
                     {
-                        GUILayout.Label(i + "<i><color=grey> (null)</color></i>", 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) });
-                        entry.DrawValue(window, window.width - (whitespace + 85));
+
+                        entry.DrawValue(window, window.width - (whitespace + 85));                        
                     }
+                    
                 }
 
                 GUI.skin.label.alignment = TextAnchor.UpperLeft;

src/CachedObjects/CacheMethod.cs

@@ -24,7 +24,7 @@ public bool HasParameters
             {
                 if (m_hasParams == null)
                 {
-                    m_hasParams = (MemberInfo as MethodInfo).GetParameters().Length > 0;
+                    m_hasParams = (MemInfo as MethodInfo).GetParameters().Length > 0;
                 }
                 return (bool)m_hasParams;
             }
@@ -55,7 +55,7 @@ public override void Init()
         {
             base.Init();
 
-            var mi = MemberInfo as MethodInfo;
+            var mi = MemInfo as MethodInfo;
 
             m_arguments = mi.GetParameters();
             m_argumentInput = new string[m_arguments.Length];
@@ -136,12 +136,12 @@ public override void DrawValue(Rect window, float width)
                 }
                 else
                 {
-                    GUILayout.Label($"null (<color=yellow>{ValueType}</color>)", null);
+                    GUILayout.Label($"null (<color=yellow>{ValueTypeName}</color>)", null);
                 }
             }
             else
             {
-                GUILayout.Label($"<color=grey><i>Not yet evaluated</i></color> (<color=yellow>{ValueType}</color>)", null);
+                GUILayout.Label($"<color=grey><i>Not yet evaluated</i></color> (<color=yellow>{ValueTypeName}</color>)", null);
             }
             GUILayout.EndHorizontal();
 
@@ -150,7 +150,7 @@ public override void DrawValue(Rect window, float width)
 
         private void Evaluate()
         {
-            var mi = MemberInfo as MethodInfo;
+            var mi = MemInfo as MethodInfo;
 
             object ret = null;