Cleanup

Author: sinai-dev

src/CacheObject/CacheMember.cs

@@ -61,19 +61,22 @@ public override void UnlinkFromView()
 
         protected abstract void TrySetValue(object value);
 
-        public void EvaluateAndSetCell()
+        /// <summary>
+        /// Evaluate is called when first shown (if ShouldAutoEvaluate), or else when Evaluate button is clicked, or auto-updated.
+        /// </summary>
+        public void Evaluate()
         {
-            Evaluate();
-            if (CellView != null)
-                SetDataToCell(CellView);
+            SetValueFromSource(TryEvaluate());
         }
 
         /// <summary>
-        /// Evaluate when first shown (if ShouldAutoEvaluate), or else when Evaluate button is clicked, or auto-updated.
+        /// Called when user presses the Evaluate button.
         /// </summary>
-        public void Evaluate()
+        public void EvaluateAndSetCell()
         {
-            SetValueFromSource(TryEvaluate());
+            Evaluate();
+            if (CellView != null)
+                SetDataToCell(CellView);
         }
 
         public override void TrySetUserValue(object value)
@@ -85,9 +88,6 @@ public override void TrySetUserValue(object value)
         protected override void SetValueState(CacheObjectCell cell, ValueStateArgs args)
         {
             base.SetValueState(cell, args);
-
-            //var memCell = cell as CacheMemberCell;
-            //memCell.UpdateToggle.gameObject.SetActive(ShouldAutoEvaluate);
         }
 
         private static readonly Color evalEnabledColor = new Color(0.15f, 0.25f, 0.15f);
@@ -100,7 +100,6 @@ protected override bool SetCellEvaluateState(CacheObjectCell objectcell)
             cell.EvaluateHolder.SetActive(!ShouldAutoEvaluate);
             if (!ShouldAutoEvaluate)
             {
-                //cell.UpdateToggle.gameObject.SetActive(false);
                 cell.EvaluateButton.Component.gameObject.SetActive(true);
                 if (HasArguments)
                 {
@@ -119,11 +118,6 @@ protected override bool SetCellEvaluateState(CacheObjectCell objectcell)
                 if (!Evaluating)
                     RuntimeProvider.Instance.SetColorBlock(cell.EvaluateButton.Component, evalDisabledColor, evalDisabledColor * 1.3f);
             }
-            //else
-            //{
-            //    cell.UpdateToggle.gameObject.SetActive(true);
-            //    cell.UpdateToggle.isOn = AutoUpdateWanted;
-            //}
 
             if (State == ValueState.NotEvaluated && !ShouldAutoEvaluate)
             {

src/CacheObject/IValues/InteractiveDictionary.cs

@@ -169,7 +169,6 @@ public void SetCell(CacheKeyValuePairCell cell, int index)
         }
 
         public int AdjustedWidth => (int)UIRect.rect.width - 80;
-        //public int AdjustedKeyWidth => HalfWidth - 50;
 
         public override void SetLayout()
         {

src/Inspectors/InspectUnderMouse.cs

@@ -46,24 +46,24 @@ public static void OnDropdownSelect(int index)
         public override bool ShouldSaveActiveState => false;
         public override bool ShowByDefault => false;
 
-        internal static Text objNameLabel;
-        internal static Text objPathLabel;
-        internal static Text mousePosLabel;
+        private static Text objNameLabel;
+        private static Text objPathLabel;
+        private static Text mousePosLabel;
 
         // Mouse Inspector
         public static bool Inspecting { get; set; }
         public static MouseInspectMode Mode { get; set; }
 
+        private static Camera MainCamera;
+        private static GraphicRaycaster[] graphicRaycasters;
+
         private static GameObject lastHitObject;
         private static Vector3 lastMousePos;
 
         private static readonly List<Graphic> wasDisabledGraphics = new List<Graphic>();
         private static readonly List<CanvasGroup> wasDisabledCanvasGroups = new List<CanvasGroup>();
         private static readonly List<GameObject> objectsAddedCastersTo = new List<GameObject>();
 
-        internal static Camera MainCamera;
-        internal static GraphicRaycaster[] graphicRaycasters;
-
         public void StartInspect(MouseInspectMode mode)
         {
             MainCamera = Camera.main;

src/Inspectors/InspectorManager.cs

@@ -21,19 +21,6 @@ public static class InspectorManager
 
         public static float PanelWidth;
 
-        internal static void CloseAllTabs()
-        {
-            if (Inspectors.Any())
-            {
-                for (int i = Inspectors.Count - 1; i >= 0; i--)
-                    Inspectors[i].CloseInspector();
-
-                Inspectors.Clear();
-            }
-
-            UIManager.SetPanelActive(UIManager.Panels.Inspector, false);
-        }
-
         public static void Inspect(object obj, CacheObjectBase sourceCache = null)
         {
             if (obj.IsNullOrDestroyed())
@@ -50,6 +37,11 @@ public static void Inspect(object obj, CacheObjectBase sourceCache = null)
                 CreateInspector<ReflectionInspector>(obj, false, sourceCache);
         }
 
+        public static void Inspect(Type type)
+        {
+            CreateInspector<ReflectionInspector>(type, true);
+        }
+
         private static bool TryFocusActiveInspector(object target)
         {
             foreach (var inspector in Inspectors)
@@ -64,11 +56,6 @@ private static bool TryFocusActiveInspector(object target)
             return false;
         }
 
-        public static void Inspect(Type type)
-        {
-            CreateInspector<ReflectionInspector>(type, true);
-        }
-
         public static void SetInspectorActive(InspectorBase inspector)
         {
             UnsetActiveInspector();
@@ -87,6 +74,19 @@ public static void UnsetActiveInspector()
             }
         }
 
+        internal static void CloseAllTabs()
+        {
+            if (Inspectors.Any())
+            {
+                for (int i = Inspectors.Count - 1; i >= 0; i--)
+                    Inspectors[i].CloseInspector();
+
+                Inspectors.Clear();
+            }
+
+            UIManager.SetPanelActive(UIManager.Panels.Inspector, false);
+        }
+
         private static void CreateInspector<T>(object target, bool staticReflection = false,
             CacheObjectBase sourceCache = null) where T : InspectorBase
         {

src/Loader/MelonLoader/ExplorerMelonMod.cs

@@ -2,16 +2,11 @@
 using System;
 using System.IO;
 using MelonLoader;
-using UnityEngine;
-using UnityEngine.EventSystems;
 using UnityExplorer;
-using UnityExplorer.Core;
 using UnityExplorer.Core.Config;
-using UnityExplorer.Core.Input;
 using UnityExplorer.Loader.ML;
-using HarmonyLib;
-[assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.UNIVERSAL)]
 
+[assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.UNIVERSAL)]
 [assembly: MelonInfo(typeof(ExplorerMelonMod), ExplorerCore.NAME, ExplorerCore.VERSION, ExplorerCore.AUTHOR)]
 [assembly: MelonGame(null, null)]
 [assembly: MelonColor(ConsoleColor.DarkCyan)]

src/UI/Panels/OptionsPanel.cs

@@ -11,8 +11,6 @@
 
 namespace UnityExplorer.UI.Panels
 {
-    // TODO move the logic out of this class into ConfigManager
-
     public class OptionsPanel : UIPanel, ICacheObjectController, ICellPoolDataSource<ConfigEntryCell>
     {
         public override string Name => "Options";

src/UI/Panels/UIPanel.cs

@@ -116,10 +116,8 @@ public override void SetActive(bool active)
 
             if (NavButtonWanted)
             {
-                if (active)
-                    RuntimeProvider.Instance.SetColorBlock(NavButton.Component, UIManager.enabledButtonColor, UIManager.enabledButtonColor * 1.2f);
-                else
-                    RuntimeProvider.Instance.SetColorBlock(NavButton.Component, UIManager.disabledButtonColor, UIManager.disabledButtonColor * 1.2f);
+                var color = active ? UIManager.enabledButtonColor : UIManager.disabledButtonColor;
+                RuntimeProvider.Instance.SetColorBlock(NavButton.Component, color, color * 1.2f);
             }
 
             if (!active)