1.5.6 hotfix

* Fix for setting CacheColor value
* Cleanup

Author: sinai-dev

src/CachedObjects/CacheObjectBase.cs

@@ -4,7 +4,6 @@
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
-using Explorer.CachedObjects;
 using MelonLoader;
 using UnhollowerBaseLib;
 using UnityEngine;

src/CachedObjects/Struct/CacheColor.cs

@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using UnityEngine;
 
-namespace Explorer.CachedObjects
+namespace Explorer
 {
     public class CacheColor : CacheObjectBase
     {
@@ -79,7 +79,8 @@ private void SetValueFromInput()
                 && float.TryParse(b, out float fB)
                 && float.TryParse(a, out float fA))
             {
-                Value = new Color(fR, fB, fG, fA);                
+                Value = new Color(fR, fB, fG, fA);
+                SetValue();
             }
         }
     }

src/CachedObjects/Struct/CachePrimitive.cs

@@ -8,7 +8,7 @@ namespace Explorer
 {
     public class CachePrimitive : CacheObjectBase
     {
-        public enum PrimitiveTypes
+        public enum Types
         {
             Bool,
             Double,
@@ -20,79 +20,49 @@ public enum PrimitiveTypes
 
         private string m_valueToString;
 
-        public PrimitiveTypes PrimitiveType;
-
-        public MethodInfo ParseMethod
-        {
-            get
-            {
-                if (m_parseMethod == null)
-                {
-                    m_parseMethod = Value.GetType().GetMethod("Parse", new Type[] { typeof(string) });
-                }
-                return m_parseMethod;
-            }
-        }
+        public Types PrimitiveType;
 
+        public MethodInfo ParseMethod => m_parseMethod ?? (m_parseMethod = Value.GetType().GetMethod("Parse", new Type[] { typeof(string) }));
         private MethodInfo m_parseMethod;
 
         public override void Init()
         {
             if (Value == null)
             {
                 // this must mean it is a string. No other primitive type should be nullable.
-                PrimitiveType = PrimitiveTypes.String;
+                PrimitiveType = Types.String;
                 return;
             }
 
             m_valueToString = Value.ToString();
-            var type = Value.GetType();
 
+            var type = Value.GetType();
             if (type == typeof(bool))
             {
-                PrimitiveType = PrimitiveTypes.Bool;
+                PrimitiveType = Types.Bool;
             }
             else if (type == typeof(double))
             {
-                PrimitiveType = PrimitiveTypes.Double;
+                PrimitiveType = Types.Double;
             }
             else if (type == typeof(float))
             {
-                PrimitiveType = PrimitiveTypes.Float;
+                PrimitiveType = Types.Float;
             }
-            else if (IsInteger(type))
+            else if (type == typeof(char))
             {
-                PrimitiveType = PrimitiveTypes.Int;
+                PrimitiveType = Types.Char;
             }
-            else if (type == typeof(char))
+            else if (typeof(int).IsAssignableFrom(type))
             {
-                PrimitiveType = PrimitiveTypes.Char;
+                PrimitiveType = Types.Int;
             }
             else
             {
-                PrimitiveType = PrimitiveTypes.String;
+                PrimitiveType = Types.String;
             }
         }
 
-        private static bool IsInteger(Type type)
-        {
-            // For our purposes, all types of int can be treated the same, including IntPtr.
-            return _integerTypes.Contains(type);
-        }
-
-        private static readonly HashSet<Type> _integerTypes = new HashSet<Type>
-        {
-            typeof(int),
-            typeof(uint),
-            typeof(short),
-            typeof(ushort),
-            typeof(long),
-            typeof(ulong),
-            typeof(byte),
-            typeof(sbyte),
-            typeof(IntPtr)
-        };
-
         public override void UpdateValue()
         {
             base.UpdateValue();
@@ -102,11 +72,10 @@ public override void UpdateValue()
 
         public override void DrawValue(Rect window, float width)
         {
-            if (PrimitiveType == PrimitiveTypes.Bool)
+            if (PrimitiveType == Types.Bool)
             {
                 var b = (bool)Value;
-                var color = $"<color={(b ? "lime>" : "red>")}";
-                var label = $"{color}{b}</color>";
+                var label = $"<color={(b ? "lime" : "red")}>{b}</color>";
 
                 if (CanWrite)
                 {
@@ -150,24 +119,23 @@ public override void DrawValue(Rect window, float width)
             }
         }
 
-        public void SetValueFromInput(string value)
+        public void SetValueFromInput(string valueString)
         {
             if (MemInfo == null)
             {
                 MelonLogger.Log("Trying to SetValue but the MemberInfo is null!");
                 return;
             }
 
-            if (PrimitiveType == PrimitiveTypes.String)
+            if (PrimitiveType == Types.String)
             {
-                Value = value;
+                Value = valueString;
             }
             else
             {
                 try
                 {
-                    var val = ParseMethod.Invoke(null, new object[] { value });
-                    Value = val;                    
+                    Value = ParseMethod.Invoke(null, new object[] { valueString });
                 }
                 catch (Exception e)
                 {

src/CachedObjects/Struct/CacheQuaternion.cs

@@ -9,8 +9,6 @@ namespace Explorer
 {
     public class CacheQuaternion : CacheObjectBase
     {
-        private Vector3 EulerAngle = Vector3.zero;
-
         private string x = "0";
         private string y = "0";
         private string z = "0";
@@ -19,11 +17,11 @@ public override void UpdateValue()
         {
             base.UpdateValue();
 
-            EulerAngle = ((Quaternion)Value).eulerAngles;
+            var euler = ((Quaternion)Value).eulerAngles;
 
-            x = EulerAngle.x.ToString();
-            y = EulerAngle.y.ToString();
-            z = EulerAngle.z.ToString();
+            x = euler.x.ToString();
+            y = euler.y.ToString();
+            z = euler.z.ToString();
         }
 
         public override void DrawValue(Rect window, float width)

src/CachedObjects/Struct/CacheRect.cs

@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using UnityEngine;
 
-namespace Explorer.CachedObjects
+namespace Explorer
 {
     public class CacheRect : CacheObjectBase
     {