1.4.5 finalize

Will be pushed when MelonLoader releases 0.2.7.

Author: sinai-dev

src/CachedObjects/CacheList.cs

@@ -24,7 +24,7 @@ public Type EntryType
                 {
                     if (this.MemberInfo != null)
                     {
-                        switch (this.MemberInfoType)
+                        switch (this.MemberInfo.MemberType)
                         {
                             case MemberTypes.Field:
                                 m_entryType = (MemberInfo as FieldInfo).FieldType.GetGenericArguments()[0];

src/CachedObjects/CacheMethod.cs

@@ -152,15 +152,14 @@ public override void DrawValue(Rect window, float width)
 
         private void Evaluate()
         {
-            m_evaluated = true;
-
             var mi = MemberInfo as MethodInfo;
 
             object ret = null;
 
             if (!HasParameters)
             {
                 ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, new object[0]);
+                m_evaluated = true;
             }
             else
             {
@@ -199,6 +198,7 @@ private void Evaluate()
                 if (arguments.Count == m_arguments.Length)
                 {
                     ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, arguments.ToArray());
+                    m_evaluated = true;
                 }
                 else
                 {

src/CachedObjects/CacheObjectBase.cs

@@ -41,17 +41,6 @@ public bool CanWrite
             }
         }
 
-        public MemberTypes MemberInfoType
-        {
-            get
-            {
-                if (MemberInfo is FieldInfo) return MemberTypes.Field;
-                if (MemberInfo is PropertyInfo) return MemberTypes.Property;
-                if (MemberInfo is MethodInfo) return MemberTypes.Method;
-                return MemberTypes.All;
-            }
-        }
-
         // methods
         public virtual void Init() { }
         public abstract void DrawValue(Rect window, float width);
@@ -202,7 +191,7 @@ public void Draw(Rect window, float labelWidth = 215f)
             {
                 GUILayout.Label("<color=red>Reflection failed!</color> (" + ReflectionException + ")", null);
             }
-            else if (Value == null && MemberInfoType != MemberTypes.Method)
+            else if (Value == null && MemberInfo?.MemberType != MemberTypes.Method)
             {
                 GUILayout.Label("<i>null (" + ValueType + ")</i>", null);
             }

src/Windows/ReflectionWindow.cs

@@ -90,7 +90,7 @@ private void UpdateValues()
 
         private bool ShouldProcessMember(CacheObjectBase holder)
         {
-            if (m_filter != MemberTypes.All && m_filter != holder.MemberInfoType) return false;
+            if (m_filter != MemberTypes.All && m_filter != holder.MemberInfo?.MemberType) return false;
 
             if (!string.IsNullOrEmpty(holder.ReflectionException) && m_hideFailedReflection) return false;