Remove "Core" namespace, move everything in it up one level

sinai-dev · sinai-dev · commit a73e992a0c98 · 2022-01-17T19:42:05.000+11:00
diff --git a/src/CSConsole/ScriptInteraction.cs b/src/CSConsole/ScriptInteraction.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Text;
 using UnityEngine;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
 using UniverseLib;
 
 namespace UnityExplorer.CSConsole
diff --git a/src/CacheObject/CacheConfigEntry.cs b/src/CacheObject/CacheConfigEntry.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.CacheObject.Views;
 
 namespace UnityExplorer.CacheObject
diff --git a/src/CacheObject/CacheMember.cs b/src/CacheObject/CacheMember.cs
@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Text;
 using UnityEngine;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
 using UnityExplorer.CacheObject.Views;
 using UnityExplorer.Inspectors;
 using UniverseLib.UI.Models;
diff --git a/src/CacheObject/CacheObjectBase.cs b/src/CacheObject/CacheObjectBase.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
 using UnityExplorer.CacheObject.IValues;
 using UnityExplorer.CacheObject.Views;
 using UniverseLib.UI.Models;
diff --git a/src/CacheObject/IValues/InteractiveString.cs b/src/CacheObject/IValues/InteractiveString.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.CacheObject;
 using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI;
diff --git a/src/CacheObject/Views/CacheMemberCell.cs b/src/CacheObject/Views/CacheMemberCell.cs
@@ -12,15 +12,11 @@ namespace UnityExplorer.CacheObject.Views
 {
     public class CacheMemberCell : CacheObjectCell
     {
-        //public ReflectionInspector Owner { get; set; }
-
         public CacheMember MemberOccupant => Occupant as CacheMember;
 
         public GameObject EvaluateHolder;
         public ButtonRef EvaluateButton;
 
-        //public Toggle UpdateToggle;
-
         protected virtual void EvaluateClicked()
         {
             this.MemberOccupant.OnEvaluateClicked();
@@ -38,16 +34,5 @@ protected override void ConstructEvaluateHolder(GameObject parent)
             UIFactory.SetLayoutElement(EvaluateButton.Component.gameObject, minWidth: 100, minHeight: 25);
             EvaluateButton.OnClick += EvaluateClicked;
         }
-
-        //protected override void ConstructUpdateToggle(GameObject parent)
-        //{
-        //    // Auto-update toggle
-        //
-        //    var updateToggle = UIFactory.CreateToggle(parent, "AutoUpdate", out UpdateToggle, out Text autoText);
-        //    UIFactory.SetLayoutElement(updateToggle, minHeight: 25, minWidth: 30, flexibleWidth: 0, flexibleHeight: 0);
-        //    GameObject.Destroy(autoText);
-        //    UpdateToggle.isOn = false;
-        //    UpdateToggle.onValueChanged.AddListener((bool val) => { MemberOccupant.AutoUpdateWanted = val; });
-        //}
     }
 }
diff --git a/src/CacheObject/Views/CacheObjectCell.cs b/src/CacheObject/Views/CacheObjectCell.cs
@@ -45,6 +45,7 @@ public void Enable()
         public bool SubContentActive => SubContentHolder.activeSelf;
 
         public LayoutElement NameLayout;
+        public GameObject RightGroupContent;
         public LayoutElement RightGroupLayout;
 
         public Text NameLabel;
@@ -136,16 +137,16 @@ public virtual GameObject CreateContent(GameObject parent)
 
             // Right vertical group
 
-            var rightGroupHolder = UIFactory.CreateUIObject("RightGroup", horiRow);
-            UIFactory.SetLayoutGroup<VerticalLayoutGroup>(rightGroupHolder, false, false, true, true, 4, childAlignment: TextAnchor.UpperLeft);
-            UIFactory.SetLayoutElement(rightGroupHolder, minHeight: 25, minWidth: 200, flexibleWidth: 9999, flexibleHeight: 800);
-            RightGroupLayout = rightGroupHolder.GetComponent<LayoutElement>();
+            RightGroupContent = UIFactory.CreateUIObject("RightGroup", horiRow);
+            UIFactory.SetLayoutGroup<VerticalLayoutGroup>(RightGroupContent, false, false, true, true, 4, childAlignment: TextAnchor.UpperLeft);
+            UIFactory.SetLayoutElement(RightGroupContent, minHeight: 25, minWidth: 200, flexibleWidth: 9999, flexibleHeight: 800);
+            RightGroupLayout = RightGroupContent.GetComponent<LayoutElement>();
 
-            ConstructEvaluateHolder(rightGroupHolder);
+            ConstructEvaluateHolder(RightGroupContent);
 
             // Right horizontal group
 
-            var rightHoriGroup = UIFactory.CreateUIObject("RightHoriGroup", rightGroupHolder);
+            var rightHoriGroup = UIFactory.CreateUIObject("RightHoriGroup", RightGroupContent);
             UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(rightHoriGroup, false, false, true, true, 4, childAlignment: TextAnchor.UpperLeft);
             UIFactory.SetLayoutElement(rightHoriGroup, minHeight: 25, minWidth: 200, flexibleWidth: 9999, flexibleHeight: 800);
 
diff --git a/src/Config/ConfigElement.cs b/src/Config/ConfigElement.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace UnityExplorer.Core.Config
+namespace UnityExplorer.Config
 {
     public class ConfigElement<T> : IConfigElement
     {
diff --git a/src/Config/ConfigHandler.cs b/src/Config/ConfigHandler.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace UnityExplorer.Core.Config
+namespace UnityExplorer.Config
 {
     public abstract class ConfigHandler
     {
diff --git a/src/Config/ConfigManager.cs b/src/Config/ConfigManager.cs
@@ -8,7 +8,7 @@
 using UnityEngine;
 using UnityExplorer.UI;
 
-namespace UnityExplorer.Core.Config
+namespace UnityExplorer.Config
 {
     public static class ConfigManager
     {
diff --git a/src/Config/IConfigElement.cs b/src/Config/IConfigElement.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace UnityExplorer.Core.Config
+namespace UnityExplorer.Config
 {
     public interface IConfigElement
     {
diff --git a/src/Config/InternalConfigHandler.cs b/src/Config/InternalConfigHandler.cs
@@ -7,7 +7,7 @@
 using UnityEngine;
 using UnityExplorer.UI;
 
-namespace UnityExplorer.Core.Config
+namespace UnityExplorer.Config
 {
     public class InternalConfigHandler : ConfigHandler
     {
diff --git a/src/ExplorerBehaviour.cs b/src/ExplorerBehaviour.cs
diff --git a/src/ExplorerCore.cs b/src/ExplorerCore.cs
@@ -4,11 +4,11 @@
 using System.IO;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.UI;
 using UnityExplorer.ObjectExplorer;
 using UnityExplorer.UI.Panels;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
 using UniverseLib.Input;
 
 namespace UnityExplorer
@@ -51,8 +51,6 @@ public static void Init(IExplorerLoader loader)
                 Force_Unlock_Mouse = ConfigManager.Force_Unlock_Mouse.Value,
                 Unhollowed_Modules_Folder = loader.UnhollowedModulesFolder
             });
-            
-            Log($"Finished core setup, waiting for late setup...");
         }
 
         // Do a delayed setup so that objects aren't destroyed instantly.
diff --git a/src/Hooks/HookManager.cs b/src/Hooks/HookManager.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using HarmonyLib;
 using UnityEngine;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
 using UnityExplorer.CSConsole;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
diff --git a/src/Inspectors/InspectUnderMouse.cs b/src/Inspectors/InspectUnderMouse.cs
@@ -5,9 +5,8 @@
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
-using UnityExplorer.Core;
 using UniverseLib.Input;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
 using UnityExplorer.Inspectors.MouseInspectors;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
diff --git a/src/Inspectors/ReflectionInspector.cs b/src/Inspectors/ReflectionInspector.cs
@@ -8,8 +8,8 @@
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Config;
+using UnityExplorer.Runtime;
 using UnityExplorer.CacheObject;
 using UnityExplorer.CacheObject.Views;
 using UnityExplorer.UI.Panels;
diff --git a/src/Loader/BepInEx/BepInExConfigHandler.cs b/src/Loader/BepInEx/BepInExConfigHandler.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 
 namespace UnityExplorer.Loader.BIE
 {
diff --git a/src/Loader/BepInEx/ExplorerBepInPlugin.cs b/src/Loader/BepInEx/ExplorerBepInPlugin.cs
@@ -9,8 +9,7 @@
 using System.Text;
 using UnityEngine;
 using UnityEngine.EventSystems;
-using UnityExplorer.Core;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UniverseLib.Input;
 using UnityExplorer.Loader.BIE;
 #if CPP
diff --git a/src/Loader/IExplorerLoader.cs b/src/Loader/IExplorerLoader.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 
 namespace UnityExplorer
 {
diff --git a/src/Loader/MelonLoader/ExplorerMelonMod.cs b/src/Loader/MelonLoader/ExplorerMelonMod.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using MelonLoader;
 using UnityExplorer;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.Loader.ML;
 
 [assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.UNIVERSAL)]
diff --git a/src/Loader/MelonLoader/MelonLoaderConfigHandler.cs b/src/Loader/MelonLoader/MelonLoaderConfigHandler.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using UnityEngine;
 using UnityExplorer.Core;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 
 namespace UnityExplorer.Loader.ML
 {
diff --git a/src/Loader/Standalone/ExplorerStandalone.cs b/src/Loader/Standalone/ExplorerStandalone.cs
@@ -4,7 +4,7 @@
 using System.IO;
 using System.Reflection;
 using UnityEngine;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.Loader.STANDALONE;
 using UnityEngine.EventSystems;
 using UniverseLib.Input;
diff --git a/src/Loader/Standalone/StandaloneConfigHandler.cs b/src/Loader/Standalone/StandaloneConfigHandler.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using IniParser.Parser;
 using System.IO;
 using UnityEngine;
diff --git a/src/ObjectExplorer/SceneExplorer.cs b/src/ObjectExplorer/SceneExplorer.cs
@@ -7,7 +7,6 @@
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
-using UnityExplorer.Core;
 using UnityExplorer.UI;
 using UniverseLib.UI.Models;
 using UnityExplorer.UI.Panels;
diff --git a/src/ObjectExplorer/SearchProvider.cs b/src/ObjectExplorer/SearchProvider.cs
@@ -5,8 +5,7 @@
 using System.Text;
 using UnityEngine;
 using UnityEngine.SceneManagement;
-using UnityExplorer.Core;
-using UnityExplorer.Core.Runtime;
+using UnityExplorer.Runtime;
 using UniverseLib;
 
 namespace UnityExplorer.ObjectExplorer
diff --git a/src/Runtime/Il2CppProvider.cs b/src/Runtime/Il2CppProvider.cs
@@ -14,7 +14,7 @@
 using UnityEngine.UI;
 using UnityEngine.EventSystems;
 
-namespace UnityExplorer.Core.Runtime
+namespace UnityExplorer.Runtime
 {
     public class Il2CppProvider : RuntimeHelper
     {
diff --git a/src/Runtime/MonoProvider.cs b/src/Runtime/MonoProvider.cs
@@ -12,7 +12,7 @@
 using UnityEngine.UI;
 using UnityExplorer;
 
-namespace UnityExplorer.Core.Runtime
+namespace UnityExplorer.Runtime
 {
     public class MonoProvider : RuntimeHelper
     {
diff --git a/src/Runtime/RuntimeHelper.cs b/src/Runtime/RuntimeHelper.cs
@@ -8,10 +8,10 @@
 using UnityEngine.EventSystems;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UniverseLib;
 
-namespace UnityExplorer.Core.Runtime
+namespace UnityExplorer.Runtime
 {
     public abstract class RuntimeHelper
     {
diff --git a/src/Tests/TestClass.cs b/src/Tests/TestClass.cs
@@ -30,7 +30,7 @@ static TestClass()
         public static IDictionary MixedDictionary;
         public static Hashtable Hashtable;
         public static byte[] ByteArray = new byte[16];
-        public static List<short> ABigList = new List<short>(10000);
+        public static List<short> ABigList = new(10000);
 
         // Test const behaviour (should be a readonly field)
         public const int ConstantInt5 = 5;
@@ -64,21 +64,17 @@ public int this[int index]
 
         private static object GetRandomObject()
         {
-            object ret = null;
-
-            int ran = UnityEngine.Random.Range(0, 7);
-            switch (ran)
+            return UnityEngine.Random.Range(0, 7) switch
             {
-                case 0: return null;
-                case 1: return 123;
-                case 2: return true;
-                case 3: return "hello";
-                case 4: return 50.5f;
-                case 5: return CameraClearFlags.Color;
-                case 6: return new List<string> { "one", "two" };
-            }
-
-            return ret;
+                0 => null,
+                1 => 123,
+                2 => true,
+                3 => "hello",
+                4 => 50.5f,
+                5 => CameraClearFlags.Color,
+                6 => new List<string> { "one", "two" },
+                _ => null,
+            };
         }
 
         public static void TestComponent<T>() where T : Component
diff --git a/src/UI/Panels/CSConsolePanel.cs b/src/UI/Panels/CSConsolePanel.cs
@@ -6,7 +6,7 @@
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.CSConsole;
 using UnityExplorer.UI.Widgets;
 using UniverseLib;
diff --git a/src/UI/Panels/HookManagerPanel.cs b/src/UI/Panels/HookManagerPanel.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.Hooks;
 using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI.Widgets.AutoComplete;
diff --git a/src/UI/Panels/InspectorPanel.cs b/src/UI/Panels/InspectorPanel.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.Inspectors;
 using UniverseLib.UI;
 
diff --git a/src/UI/Panels/LogPanel.cs b/src/UI/Panels/LogPanel.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.Core.Config;
+using UnityExplorer.Config;
 using UnityExplorer.UI.Widgets;
 using UniverseLib;
 using UniverseLib.UI;
diff --git a/src/UI/Panels/ObjectExplorerPanel.cs b/src/UI/Panels/ObjectExplorerPanel.cs
diff --git a/src/UI/Panels/OptionsPanel.cs b/src/UI/Panels/OptionsPanel.cs
diff --git a/src/UI/Panels/UIPanel.cs b/src/UI/Panels/UIPanel.cs
diff --git a/src/UI/UIManager.cs b/src/UI/UIManager.cs
diff --git a/src/UI/Widgets/AutoComplete/AutoCompleteModal.cs b/src/UI/Widgets/AutoComplete/AutoCompleteModal.cs
diff --git a/src/UI/Widgets/AutoComplete/Suggestion.cs b/src/UI/Widgets/AutoComplete/Suggestion.cs
diff --git a/src/UnityExplorer.csproj b/src/UnityExplorer.csproj

Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,11 @@ namespace UnityExplorer.CacheObject.Views`
`12`	`12`	`{`
`13`	`13`	`public class CacheMemberCell : CacheObjectCell`
`14`	`14`	`{`
`15`		`- //public ReflectionInspector Owner { get; set; }`
`16`		`-`
`17`	`15`	`public CacheMember MemberOccupant => Occupant as CacheMember;`
`18`	`16`
`19`	`17`	`public GameObject EvaluateHolder;`
`20`	`18`	`public ButtonRef EvaluateButton;`
`21`	`19`
`22`		`- //public Toggle UpdateToggle;`
`23`		`-`
`24`	`20`	`protected virtual void EvaluateClicked()`
`25`	`21`	`{`
`26`	`22`	`this.MemberOccupant.OnEvaluateClicked();`
`@@ -38,16 +34,5 @@ protected override void ConstructEvaluateHolder(GameObject parent)`
`38`	`34`	`UIFactory.SetLayoutElement(EvaluateButton.Component.gameObject, minWidth: 100, minHeight: 25);`
`39`	`35`	`EvaluateButton.OnClick += EvaluateClicked;`
`40`	`36`	`}`
`41`		`-`
`42`		`- //protected override void ConstructUpdateToggle(GameObject parent)`
`43`		`- //{`
`44`		`- // // Auto-update toggle`
`45`		`- //`
`46`		`- // var updateToggle = UIFactory.CreateToggle(parent, "AutoUpdate", out UpdateToggle, out Text autoText);`
`47`		`- // UIFactory.SetLayoutElement(updateToggle, minHeight: 25, minWidth: 30, flexibleWidth: 0, flexibleHeight: 0);`
`48`		`- // GameObject.Destroy(autoText);`
`49`		`- // UpdateToggle.isOn = false;`
`50`		`- // UpdateToggle.onValueChanged.AddListener((bool val) => { MemberOccupant.AutoUpdateWanted = val; });`
`51`		`- //}`
`52`	`37`	`}`
`53`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Text;`
`5`	`5`
`6`		`-namespace UnityExplorer.Core.Config`
	`6`	`+namespace UnityExplorer.Config`
`7`	`7`	`{`
`8`	`8`	`public class ConfigElement<T> : IConfigElement`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`using UnityEngine;`
`9`	`9`	`using UnityExplorer.UI;`
`10`	`10`
`11`		`-namespace UnityExplorer.Core.Config`
	`11`	`+namespace UnityExplorer.Config`
`12`	`12`	`{`
`13`	`13`	`public static class ConfigManager`
`14`	`14`	`{`