From ddd271c00d142cc0a5f845646fcd375c055bc9c8 Mon Sep 17 00:00:00 2001
From: Sinai <49360850+sinai-dev@users.noreply.github.com>
Date: Wed, 21 Jul 2021 20:12:34 +1000
Subject: [PATCH] Cleanup

---
 .../{BIE => BepInEx}/BepInExConfigHandler.cs  |   0
 .../{BIE => BepInEx}/ExplorerBepInPlugin.cs   |   0
 .../{ML => MelonLoader}/ExplorerMelonMod.cs   |   0
 .../MelonLoaderConfigHandler.cs               | 152 +++++++++---------
 src/Loader/STANDALONE/ExplorerStandalone.cs   |   3 -
 src/UnityExplorer.csproj                      |  12 +-
 6 files changed, 82 insertions(+), 85 deletions(-)
 rename src/Loader/{BIE => BepInEx}/BepInExConfigHandler.cs (100%)
 rename src/Loader/{BIE => BepInEx}/ExplorerBepInPlugin.cs (100%)
 rename src/Loader/{ML => MelonLoader}/ExplorerMelonMod.cs (100%)
 rename src/Loader/{ML => MelonLoader}/MelonLoaderConfigHandler.cs (96%)

diff --git a/src/Loader/BIE/BepInExConfigHandler.cs b/src/Loader/BepInEx/BepInExConfigHandler.cs
similarity index 100%
rename from src/Loader/BIE/BepInExConfigHandler.cs
rename to src/Loader/BepInEx/BepInExConfigHandler.cs
diff --git a/src/Loader/BIE/ExplorerBepInPlugin.cs b/src/Loader/BepInEx/ExplorerBepInPlugin.cs
similarity index 100%
rename from src/Loader/BIE/ExplorerBepInPlugin.cs
rename to src/Loader/BepInEx/ExplorerBepInPlugin.cs
diff --git a/src/Loader/ML/ExplorerMelonMod.cs b/src/Loader/MelonLoader/ExplorerMelonMod.cs
similarity index 100%
rename from src/Loader/ML/ExplorerMelonMod.cs
rename to src/Loader/MelonLoader/ExplorerMelonMod.cs
diff --git a/src/Loader/ML/MelonLoaderConfigHandler.cs b/src/Loader/MelonLoader/MelonLoaderConfigHandler.cs
similarity index 96%
rename from src/Loader/ML/MelonLoaderConfigHandler.cs
rename to src/Loader/MelonLoader/MelonLoaderConfigHandler.cs
index 2f6ca3a..5071f6b 100644
--- a/src/Loader/ML/MelonLoaderConfigHandler.cs
+++ b/src/Loader/MelonLoader/MelonLoaderConfigHandler.cs
@@ -1,77 +1,77 @@
-#if ML
-using MelonLoader;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using UnityEngine;
-using UnityExplorer.Core;
-using UnityExplorer.Core.Config;
-
-namespace UnityExplorer.Loader.ML
-{
-    public class MelonLoaderConfigHandler : ConfigHandler
-    {
-        internal const string CTG_NAME = "UnityExplorer";
-
-        internal MelonPreferences_Category prefCategory;
-
-        public override void Init()
-        {
-            prefCategory = MelonPreferences.CreateCategory(CTG_NAME, $"{CTG_NAME} Settings", false, true);
-        }
-
-        public override void LoadConfig()
-        {
-            foreach (var entry in ConfigManager.ConfigElements)
-            {
-                var key = entry.Key;
-                if (prefCategory.GetEntry(key) is MelonPreferences_Entry)
-                {
-                    var config = entry.Value;
-                    config.BoxedValue = config.GetLoaderConfigValue();
-                }
-            }
-        }
-
-        public override void RegisterConfigElement<T>(ConfigElement<T> config)
-        {
-            var entry = prefCategory.CreateEntry(config.Name, config.Value, null, config.Description, config.IsInternal, false);
-            
-            entry.OnValueChangedUntyped += () => 
-            {
-                if ((entry.Value == null && config.Value == null) || config.Value.Equals(entry.Value))
-                    return;
-
-                config.Value = entry.Value;
-            };
-        }
-
-        public override void SetConfigValue<T>(ConfigElement<T> config, T value)
-        {
-            if (prefCategory.GetEntry<T>(config.Name) is MelonPreferences_Entry<T> entry)
-            { 
-                entry.Value = value;
-                //entry.Save();
-            }
-        }
-
-        public override T GetConfigValue<T>(ConfigElement<T> config)
-        {
-            if (prefCategory.GetEntry<T>(config.Name) is MelonPreferences_Entry<T> entry)
-                return entry.Value;
-
-            return default;
-        }
-
-        public override void OnAnyConfigChanged()
-        {
-        }
-
-        public override void SaveConfig()
-        {
-            MelonPreferences.Save();
-        }
-    }
-}
+#if ML
+using MelonLoader;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+using UnityExplorer.Core;
+using UnityExplorer.Core.Config;
+
+namespace UnityExplorer.Loader.ML
+{
+    public class MelonLoaderConfigHandler : ConfigHandler
+    {
+        internal const string CTG_NAME = "UnityExplorer";
+
+        internal MelonPreferences_Category prefCategory;
+
+        public override void Init()
+        {
+            prefCategory = MelonPreferences.CreateCategory(CTG_NAME, $"{CTG_NAME} Settings", false, true);
+        }
+
+        public override void LoadConfig()
+        {
+            foreach (var entry in ConfigManager.ConfigElements)
+            {
+                var key = entry.Key;
+                if (prefCategory.GetEntry(key) is MelonPreferences_Entry)
+                {
+                    var config = entry.Value;
+                    config.BoxedValue = config.GetLoaderConfigValue();
+                }
+            }
+        }
+
+        public override void RegisterConfigElement<T>(ConfigElement<T> config)
+        {
+            var entry = prefCategory.CreateEntry(config.Name, config.Value, null, config.Description, config.IsInternal, false);
+            
+            entry.OnValueChangedUntyped += () => 
+            {
+                if ((entry.Value == null && config.Value == null) || config.Value.Equals(entry.Value))
+                    return;
+
+                config.Value = entry.Value;
+            };
+        }
+
+        public override void SetConfigValue<T>(ConfigElement<T> config, T value)
+        {
+            if (prefCategory.GetEntry<T>(config.Name) is MelonPreferences_Entry<T> entry)
+            { 
+                entry.Value = value;
+                //entry.Save();
+            }
+        }
+
+        public override T GetConfigValue<T>(ConfigElement<T> config)
+        {
+            if (prefCategory.GetEntry<T>(config.Name) is MelonPreferences_Entry<T> entry)
+                return entry.Value;
+
+            return default;
+        }
+
+        public override void OnAnyConfigChanged()
+        {
+        }
+
+        public override void SaveConfig()
+        {
+            MelonPreferences.Save();
+        }
+    }
+}
 #endif
\ No newline at end of file
diff --git a/src/Loader/STANDALONE/ExplorerStandalone.cs b/src/Loader/STANDALONE/ExplorerStandalone.cs
index a2d8387..9097f50 100644
--- a/src/Loader/STANDALONE/ExplorerStandalone.cs
+++ b/src/Loader/STANDALONE/ExplorerStandalone.cs
@@ -48,9 +48,6 @@ namespace UnityExplorer
         /// </summary>
         public static event Action<string, LogType> OnLog;
 
-        public Harmony HarmonyInstance => s_harmony;
-        public static readonly Harmony s_harmony = new Harmony(ExplorerCore.GUID);
-
         public ConfigHandler ConfigHandler => _configHandler;
         private StandaloneConfigHandler _configHandler;
 
diff --git a/src/UnityExplorer.csproj b/src/UnityExplorer.csproj
index b24311c..4ec912a 100644
--- a/src/UnityExplorer.csproj
+++ b/src/UnityExplorer.csproj
@@ -298,13 +298,13 @@
     <Compile Include="Core\Tests\TestClass.cs" />
     <Compile Include="Core\Utility\UnityHelpers.cs" />
     <Compile Include="ExplorerCore.cs" />
-    <Compile Include="Loader\BIE\BepInExConfigHandler.cs" />
-    <Compile Include="Loader\BIE\ExplorerBepInPlugin.cs" />
+    <Compile Include="Loader\BepInEx\BepInExConfigHandler.cs" />
+    <Compile Include="Loader\BepInEx\ExplorerBepInPlugin.cs" />
     <Compile Include="Loader\IExplorerLoader.cs" />
-    <Compile Include="Loader\ML\ExplorerMelonMod.cs" />
-    <Compile Include="Loader\ML\MelonLoaderConfigHandler.cs" />
-    <Compile Include="Loader\STANDALONE\ExplorerStandalone.cs" />
-    <Compile Include="Loader\STANDALONE\StandaloneConfigHandler.cs" />
+    <Compile Include="Loader\MelonLoader\ExplorerMelonMod.cs" />
+    <Compile Include="Loader\MelonLoader\MelonLoaderConfigHandler.cs" />
+    <Compile Include="Loader\Standalone\ExplorerStandalone.cs" />
+    <Compile Include="Loader\Standalone\StandaloneConfigHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UI\Models\UIBehaviourModel.cs" />
     <Compile Include="UI\Models\UIModel.cs" />