Cleanup remaining IL2CPP related code

README.md

@@ -11,9 +11,12 @@
 This is a fork of [UnityExplorer](https://github.com/sinai-dev/UnityExplorer), modified to work as a standalone Kerbal Space Program plugin : 
 - Uses Harmony instead of HarmonyX
 - Uses a forked version of UniverseLib wich also uses Harmony instead of HarmonyX
-- All dependencies, and notably `Mono.Cecil` are packed in the assembly to avoid conflicts with the outdated `Mono.Cecil` bundled with KSP.
+- All dependencies, and notably `Mono.Cecil` are IL-packed and internalized in the assembly to avoid conflicts with the outdated `Mono.Cecil` bundled with KSP.
 - Removed unused code (IL2CPP support, bepinex/melon loaders...)
 
+### Dependencies
+- [HarmonyKSP](https://github.com/KSPModdingLibs/HarmonyKSP)
+
 # Features
 
 <p align="center">

src/CSConsole/ConsoleController.cs

@@ -45,11 +45,7 @@ public static class ConsoleController
             "System.Collections.Generic",
             "System.Reflection",
             "UnityEngine",
-            "UniverseLib",
-#if CPP
-            "UnhollowerBaseLib",
-            "UnhollowerRuntimeLib",
-#endif
+            "UniverseLib"
         };
 
         const int CSCONSOLE_LINEHEIGHT = 18;

src/Config/ConfigManager.cs

@@ -52,9 +52,7 @@ public static void Init(ConfigHandler configHandler)
             Handler.LoadConfig();
             InternalHandler.LoadConfig();
 
-#if STANDALONE
             Loader.Standalone.ExplorerEditorBehaviour.Instance?.LoadConfigs();
-#endif
         }
 
         internal static void RegisterConfigElement<T>(ConfigElement<T> configElement)

src/ExplorerBehaviour.cs

@@ -1,28 +1,13 @@
 using UnityExplorer.UI;
-#if CPP
-#if UNHOLLOWER
-using UnhollowerRuntimeLib;
-#else
-using Il2CppInterop.Runtime.Injection;
-#endif
-#endif
 
 namespace UnityExplorer
 {
     public class ExplorerBehaviour : MonoBehaviour
     {
         internal static ExplorerBehaviour Instance { get; private set; }
 
-#if CPP
-        public ExplorerBehaviour(System.IntPtr ptr) : base(ptr) { }
-#endif
-
         internal static void Setup()
         {
-#if CPP
-            ClassInjector.RegisterTypeInIl2Cpp<ExplorerBehaviour>();
-#endif
-
             GameObject obj = new("ExplorerBehaviour");
             DontDestroyOnLoad(obj);
             obj.hideFlags = HideFlags.HideAndDontSave;

src/ExplorerCore.cs

@@ -25,7 +25,7 @@ public static class ExplorerCore
 
         public static IExplorerLoader Loader { get; private set; }
         public static string ExplorerFolder => Path.Combine(Loader.ExplorerFolderDestination, Loader.ExplorerFolderName);
-        public const string DEFAULT_EXPLORER_FOLDER_NAME = "sinai-dev-UnityExplorer";
+        public const string DEFAULT_EXPLORER_FOLDER_NAME = "PluginData";
 
         public static HarmonyLib.Harmony Harmony { get; } = new HarmonyLib.Harmony(GUID);
 
@@ -41,7 +41,6 @@ public static void Init(IExplorerLoader loader)
 
             Log($"{NAME} {VERSION} initializing...");
 
-            CheckLegacyExplorerFolder();
             Directory.CreateDirectory(ExplorerFolder);
             ConfigManager.Init(Loader.ConfigHandler);
 
@@ -127,63 +126,5 @@ private static void Log(object message, LogType logType)
         }
 
         #endregion
-
-
-        #region LEGACY FOLDER MIGRATION
-
-        // Can be removed eventually. For migration from <4.7.0
-        static void CheckLegacyExplorerFolder()
-        {
-            string legacyPath = Path.Combine(Loader.ExplorerFolderDestination, "UnityExplorer");
-            if (Directory.Exists(legacyPath))
-            {
-                LogWarning($"Attempting to migrate old 'UnityExplorer/' folder to 'sinai-dev-UnityExplorer/'...");
-
-                // If new folder doesn't exist yet, let's just use Move().
-                if (!Directory.Exists(ExplorerFolder))
-                {
-                    try
-                    {
-                        Directory.Move(legacyPath, ExplorerFolder);
-                        Log("Migrated successfully.");
-                    }
-                    catch (Exception ex)
-                    {
-                        LogWarning($"Exception migrating folder: {ex}");
-                    }
-                }
-                else // We have to merge
-                {
-                    try
-                    {
-                        CopyAll(new(legacyPath), new(ExplorerFolder));
-                        Directory.Delete(legacyPath, true);
-                        Log("Migrated successfully.");
-                    }
-                    catch (Exception ex)
-                    {
-                        LogWarning($"Exception migrating folder: {ex}");
-                    }
-                }
-            }
-        }
-
-        public static void CopyAll(DirectoryInfo source, DirectoryInfo target)
-        {
-            Directory.CreateDirectory(target.FullName);
-
-            // Copy each file into it's new directory.
-            foreach (FileInfo fi in source.GetFiles())
-                fi.MoveTo(Path.Combine(target.ToString(), fi.Name));
-
-            // Copy each subdirectory using recursion.
-            foreach (DirectoryInfo diSourceSubDir in source.GetDirectories())
-            {
-                DirectoryInfo nextTargetSubDir = target.CreateSubdirectory(diSourceSubDir.Name);
-                CopyAll(diSourceSubDir, nextTargetSubDir);
-            }
-        }
-
-        #endregion
     }
 }

src/Loader/Standalone/Editor/ExplorerEditorBehaviour.cs

@@ -1,5 +1,4 @@
-#if STANDALONE
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -55,5 +54,4 @@ internal void LoadConfigs()
             ConfigManager.Disable_EventSystem_Override.Value = this.Disable_EventSystem_Override;
         }
     }
-}
-#endif
+}

src/Loader/Standalone/Editor/ExplorerEditorLoader.cs

@@ -1,5 +1,4 @@
-#if STANDALONE
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -39,5 +38,4 @@ protected override void CheckExplorerFolder()
                 explorerFolderDest = Path.GetDirectoryName(Application.dataPath);
         }
     }
-}
-#endif
+}

src/Loader/Standalone/ExplorerStandalone.cs

@@ -1,5 +1,4 @@
-#if STANDALONE
-using HarmonyLib;
+using HarmonyLib;
 using System;
 using System.IO;
 using System.Reflection;
@@ -8,9 +7,6 @@
 using UnityEngine.EventSystems;
 using UniverseLib.Input;
 using UnityExplorer.Loader.Standalone;
-#if CPP
-using UnhollowerRuntimeLib;
-#endif
 
 namespace UnityExplorer
 {
@@ -102,5 +98,4 @@ protected virtual void CheckExplorerFolder()
             }
         }
     }
-}
-#endif
+}

src/Loader/Standalone/StandaloneConfigHandler.cs

@@ -1,5 +1,4 @@
-#if STANDALONE
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -98,6 +97,4 @@ public override void SaveConfig()
             File.WriteAllText(CONFIG_PATH, document.SerializedValue);
         }
     }
-}
-
-#endif
+}

src/UEKSPLoader.cs → src/Loader/UEKSPLoader.cs

@@ -1,7 +1,7 @@
 namespace UnityExplorer
 {
     [KSPAddon(KSPAddon.Startup.Instantly, false)]
-    public class UEKSPLoader : MonoBehaviour
+    public class UnityExplorerKSPLoader : MonoBehaviour
     {
         void Start()
         {

src/Properties/AssemblyInfo.cs

@@ -34,4 +34,5 @@
 [assembly: AssemblyVersion(ExplorerCore.VERSION)]
 [assembly: AssemblyFileVersion(ExplorerCore.VERSION)]
 [assembly: KSPAssembly("UnityExplorerKSP", 1, 0)]
-[assembly: KSPAssemblyDependency("UniverseLibKSP", 1, 0)]
+[assembly: KSPAssemblyDependency("UniverseLibKSP", 1, 0)]
+[assembly: KSPAssemblyDependency("HarmonyKSP", 1, 0)]

src/Runtime/MonoHelper.cs

@@ -1,6 +1,4 @@
-#if MONO
-
-namespace UnityExplorer.Runtime
+namespace UnityExplorer.Runtime
 {
     public class MonoHelper : UERuntimeHelper
     {
@@ -12,6 +10,4 @@ public override void SetupEvents()
         private void Application_logMessageReceived(string condition, string stackTrace, LogType type)
              => ExplorerCore.LogUnity(condition, type);
     }
-}
-
-#endif
+}