merged dev to master

BuildTools · BuildTools · commit 393005dd94b2 · 2024-02-14T17:27:35.000-05:00
diff --git a/Config.cs b/Config.cs
@@ -17,7 +17,7 @@ internal struct SplotchConfigStruct
             public bool splotchEnabled;
             public bool consoleEnabled;
             public bool verboseLoggingEnabled;
-            public bool nightly; // I touched it (;
+            public bool nightly;
         }
 
         internal static SplotchConfigStruct LoadedSplotchConfig = new SplotchConfigStruct
@@ -82,7 +82,6 @@ internal struct SplotchConfigCont
             }
             else
             {
-
                 try {
 
                     using (StreamReader reader = new StreamReader("splotch_config/splotchconfig.yaml"))
diff --git a/Event.cs b/Event.cs
@@ -70,11 +70,16 @@ public static void RegisterEventListener(Type eventListener)
         /// </summary>
         internal static void PatchEventTypes()
         {
-            // retrieve all types that extend Event
-            Type[] eventExtensions = AppDomain.CurrentDomain.GetAssemblies()
-               .SelectMany(domainAssembly => domainAssembly.GetTypes())
-               .Where(type => type.IsSubclassOf(typeof(Event))
-               ).ToArray();
+            Logger.Debug("Looking for events...");
+
+            IEnumerable<Type> eventExtensions = new List<Type>();             //
+            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) // 
+                if (!assembly.GetName().Name.StartsWith("BepInEx."))          // mm spaghetti
+                    foreach (var type in assembly.ExportedTypes)              // it works so don't mess with it
+                        if (type.IsSubclassOf(typeof(Event)))                 //
+                            eventExtensions.Append(type);                     //
+
+            Logger.Debug($"Found {eventExtensions.Count()} events!");
 
             // run all patches on Event extensions
             foreach (Type eventExtension in eventExtensions) { 
@@ -93,6 +98,7 @@ internal static void PatchEventTypes()
         internal static void Load()
         {
             PatchEventTypes();
+            Logger.Debug("Loaded events!");
         }
     }
 
diff --git a/GuiModifications.cs b/GuiModifications.cs
@@ -2,6 +2,9 @@
 using TMPro;
 using System.Reflection;
 using UnityEngine.UI;
+using System;
+using System.Collections.Generic;
+using System.Collections;
 
 namespace Splotch.Loader
 {
@@ -40,7 +43,7 @@ internal static void RunMainMenuModifications()
             // set the text to the version info
             AssemblyName name = Assembly.GetExecutingAssembly().GetName();
 
-            textComponent.text = $"{ModManager.GetLoadedModsInfoText()}\n{name.Name} version {VersionChecker.currentVersionString}";
+            textComponent.text = $"{ModManager.GetLoadedModsInfoText()}\n{GetBepInExInfo()}\n{name.Name} version {VersionChecker.currentVersionString}";
 
             // change settings
             textComponent.font = LocalizedText.localizationTable.GetFont(Settings.Get().Language, false);
@@ -60,5 +63,32 @@ internal static void RunMainMenuModifications()
             rectTransform.sizeDelta = new Vector2(1200, 0);
             rectTransform.anchoredPosition = new Vector2(-10, 30);
         }
+
+        internal static string GetBepInExInfo()
+        {
+            string text = "";
+            if (Loader.BepInExPresent)
+            {
+                Type chainloader = Assembly.LoadFrom(@"BepInEx\core\BepInEx.dll").GetType("BepInEx.Bootstrap.Chainloader");
+                IEnumerable pluginInfos = (IEnumerable)chainloader.GetProperty("PluginInfos", BindingFlags.Public | BindingFlags.Static).GetValue(null);
+                foreach ( var pluginInfoKeyValue in pluginInfos )
+                {
+                    var pluginInfo = pluginInfoKeyValue.GetType().GetProperty("Value").GetValue(pluginInfoKeyValue);
+
+                    var metadataProperty = pluginInfo.GetType().GetProperty("Metadata");
+                    var pluginMetadata  = metadataProperty.GetValue(pluginInfo);
+
+                    var nameProperty    = pluginMetadata.GetType().GetProperty("Name");
+                    var versionProperty = pluginMetadata.GetType().GetProperty("Version");
+
+                    string name     = nameProperty.GetValue(pluginMetadata) as string;
+                    Version version = versionProperty.GetValue(pluginMetadata) as Version;
+
+                    text += $"{name} version {version} (BepInEx plugin)\n";
+                }
+                text += $"BepInEx version {Assembly.LoadFrom(@"BepInEx\core\BepInEx.dll").GetName().Version}";
+            }
+            return text;
+        }
     }
 }
diff --git a/HarmonyLoader.cs b/HarmonyLoader.cs
@@ -7,13 +7,12 @@ namespace Splotch.Loader
     /// </summary>
     internal static class Patcher
     {
-        public static Harmony harmony;
+        public static Harmony harmony = new Harmony("com.codemob.splotch");
         /// <summary>
         /// Runs all of Splotch's patches.
         /// </summary>
 		public static void DoPatching()
         {
-            harmony = new Harmony("com.codemob.splotch");
 			harmony.PatchAll(typeof(Patches));
 		}
 
diff --git a/Loader.cs b/Loader.cs
@@ -4,7 +4,12 @@
 using Splotch;
 using UnityEngine;
 using System;
-using System.Diagnostics;
+using System.IO;
+using System.Collections.Generic;
+using System.Linq;
+using System.Collections;
+using HarmonyLib;
+using MonoMod.Utils;
 
 namespace Splotch.Loader
 {
@@ -13,6 +18,7 @@ namespace Splotch.Loader
     /// </summary>
     public static class Loader
     {
+        public static bool BepInExPresent { get { return Directory.Exists(@"BepInEx\core\"); } }
 
         struct SplotchConfigContainer
         {
@@ -40,21 +46,50 @@ public static void OnEnterScene(Scene scene, LoadSceneMode loadSceneMode)
             EventManager.Load();
 
             GameObject obj = new GameObject("Unloader", new Type[] { typeof(UnLoader) });
+            Logger.Debug("Finished main menu loading!");
+        }
+
+        public static void LoadBepInEx()
+        {
+            string path = @"BepInEx\core\BepInEx.Preloader.dll";
+
+
+            // Trick BepInEx to think it was invoked with doorstop
+            string actualInvokePath = Environment.GetEnvironmentVariable("DOORSTOP_INVOKE_DLL_PATH");
+            Environment.SetEnvironmentVariable("DOORSTOP_INVOKE_DLL_PATH", Path.Combine(Directory.GetCurrentDirectory(), path));
+
+
+            Assembly bepInExPreloader = Assembly.LoadFrom(path);
+
+            if (bepInExPreloader != null)
+            {
+                MethodInfo entrypointMethod = bepInExPreloader.GetType("BepInEx.Preloader.Entrypoint", true)
+                    .GetMethod("Main");
+
+                entrypointMethod.Invoke(null, null);
+            }
+
+            Environment.SetEnvironmentVariable("DOORSTOP_INVOKE_DLL_PATH", actualInvokePath);
         }
 
         /// <summary>
         /// The main entrypoint for Splotch, called by Doorstop.
         /// </summary>
         public static void Main()
         {
+            if (BepInExPresent)
+                LoadBepInEx();
+
             Config.CreateConfigAndLoadSplotchConfig();
 
             if (!Config.LoadedSplotchConfig.splotchEnabled) 
                 return;
 
-            SceneManager.sceneLoaded += SceneLoaded;
-
-            
+            // BepInEx does some shenanigans with assembly loading so by using reflection to run unity
+            // methods we can avoid loading assemblies before bepinex
+            typeof(Loader).Assembly.GetType($"Splotch.Loader.BepInExLoader")
+                .GetMethod(nameof(BepInExLoader.LoadBepInExUnstable))
+                .Invoke(null, null);
         }
 
         internal static void GameExit()
@@ -68,7 +103,7 @@ internal static void GameExit()
         /// </summary>
         /// <param name="scene">The scene to be loaded</param>
         /// <param name="loadSceneMode">The scene mode</param>
-        private static void SceneLoaded(Scene scene, LoadSceneMode loadSceneMode)
+        public static void SceneLoaded(Scene scene, LoadSceneMode loadSceneMode)
         {
             // Execute patching after unity has finished it's startup and loaded at least the first game scene
             if (!enteredScene)
@@ -98,4 +133,12 @@ public void OnApplicationQuit()
             Loader.GameExit();
         }
     }
+
+    class BepInExLoader
+    {
+        public static void LoadBepInExUnstable()
+        {
+            SceneManager.sceneLoaded += Loader.SceneLoaded;
+        }
+    }
 }
diff --git a/ModLoader.cs b/ModLoader.cs
@@ -203,7 +203,7 @@ internal bool LoadMod(string modFolder)
                 string dllAbsolutePath = Path.Combine(modFolder, dll);
                 Logger.Debug($"Loading {dllAbsolutePath}");
 
-                assembly = Assembly.Load(File.ReadAllBytes(dllAbsolutePath));
+                assembly = Assembly.LoadFrom(dllAbsolutePath);
 
                 Logger.Debug($"Loaded {assembly}");
                 Type assemblyEntrypoint = assembly.GetType(className);
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -36,4 +36,4 @@
 // X: major versions
 // Y: feature addition/ removal
 // Z: small patch/ bugfix
-[assembly: AssemblyVersion("0.3.0")]
+[assembly: AssemblyVersion("0.4.0")]
diff --git a/Splotch.dll.config b/Splotch.dll.config
@@ -0,0 +1,11 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Mono.Cecil" publicKeyToken="50cebf1cceb9d05e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.11.4.0" newVersion="0.11.4.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/version b/version
@@ -1,2 +1,2 @@
-﻿latest=0.3.0
-latestNightly=0.3.0
+﻿latest=0.4.0
+latestNightly=0.4.0

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ internal struct SplotchConfigStruct`
`17`	`17`	`public bool splotchEnabled;`
`18`	`18`	`public bool consoleEnabled;`
`19`	`19`	`public bool verboseLoggingEnabled;`
`20`		`- public bool nightly; // I touched it (;`
	`20`	`+ public bool nightly;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`internal static SplotchConfigStruct LoadedSplotchConfig = new SplotchConfigStruct`
`@@ -82,7 +82,6 @@ internal struct SplotchConfigCont`
`82`	`82`	`}`
`83`	`83`	`else`
`84`	`84`	`{`
`85`		`-`
`86`	`85`	`try {`
`87`	`86`
`88`	`87`	`using (StreamReader reader = new StreamReader("splotch_config/splotchconfig.yaml"))`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,12 @@ namespace Splotch.Loader`
`7`	`7`	`/// </summary>`
`8`	`8`	`internal static class Patcher`
`9`	`9`	`{`
`10`		`- public static Harmony harmony;`
	`10`	`+ public static Harmony harmony = new Harmony("com.codemob.splotch");`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// Runs all of Splotch's patches.`
`13`	`13`	`/// </summary>`
`14`	`14`	`public static void DoPatching()`
`15`	`15`	`{`
`16`		`- harmony = new Harmony("com.codemob.splotch");`
`17`	`16`	`harmony.PatchAll(typeof(Patches));`
`18`	`17`	`}`
`19`	`18`