From 7f8cb890a911db871547ace3936f8d9d1b2ba54c Mon Sep 17 00:00:00 2001
From: ghorsington <neigh@coder.horse>
Date: Sat, 1 Jan 2022 22:01:14 +0200
Subject: [PATCH] WIP support for new Doorstop

---
 BepInEx.IL2CPP/DoorstopEntrypoint.cs | 81 +++++++++++++++-------------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/BepInEx.IL2CPP/DoorstopEntrypoint.cs b/BepInEx.IL2CPP/DoorstopEntrypoint.cs
index f76bde1..fdc17f8 100644
--- a/BepInEx.IL2CPP/DoorstopEntrypoint.cs
+++ b/BepInEx.IL2CPP/DoorstopEntrypoint.cs
@@ -2,12 +2,15 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using BepInEx.IL2CPP;
 using BepInEx.Preloader.Core;
 
 namespace BepInEx.IL2CPP
 {
     internal static class UnityPreloaderRunner
     {
+        internal static string preloaderPath;
+
         public static void PreloaderMain()
         {
             var bepinPath =
@@ -24,7 +27,7 @@ namespace BepInEx.IL2CPP
             Preloader.IL2CPPUnhollowedPath = Path.Combine(Paths.BepInExRootPath, "unhollowed");
 
             AppDomain.CurrentDomain.AssemblyResolve += LocalResolve;
-            AppDomain.CurrentDomain.AssemblyResolve -= DoorstopEntrypoint.ResolveCurrentDirectory;
+            AppDomain.CurrentDomain.AssemblyResolve -= ResolveCurrentDirectory;
 
 
             Preloader.Run();
@@ -56,43 +59,6 @@ namespace BepInEx.IL2CPP
 
             return null;
         }
-    }
-
-    internal static class DoorstopEntrypoint
-    {
-        private static string preloaderPath;
-
-        /// <summary>
-        ///     The main entrypoint of BepInEx, called from Doorstop.
-        /// </summary>
-        /// <param name="args">
-        ///     The arguments passed in from Doorstop. First argument is the path of the currently executing
-        ///     process.
-        /// </param>
-        public static void Main()
-        {
-            // We set it to the current directory first as a fallback, but try to use the same location as the .exe file.
-            var silentExceptionLog = $"preloader_{DateTime.Now:yyyyMMdd_HHmmss_fff}.log";
-
-            try
-            {
-                EnvVars.LoadVars();
-
-                silentExceptionLog =
-                    Path.Combine(Path.GetDirectoryName(EnvVars.DOORSTOP_PROCESS_PATH), silentExceptionLog);
-
-                // Get the path of this DLL via Doorstop env var because Assembly.Location mangles non-ASCII characters on some versions of Mono for unknown reasons
-                preloaderPath = Path.GetDirectoryName(Path.GetFullPath(EnvVars.DOORSTOP_INVOKE_DLL_PATH));
-
-                AppDomain.CurrentDomain.AssemblyResolve += ResolveCurrentDirectory;
-
-                UnityPreloaderRunner.PreloaderMain();
-            }
-            catch (Exception ex)
-            {
-                File.WriteAllText(silentExceptionLog, ex.ToString());
-            }
-        }
 
         public static Assembly ResolveCurrentDirectory(object sender, ResolveEventArgs args)
         {
@@ -109,3 +75,42 @@ namespace BepInEx.IL2CPP
         }
     }
 }
+
+namespace Doorstop
+{
+    internal static class Entrypoint
+    {
+        /// <summary>
+        ///     The main entrypoint of BepInEx, called from Doorstop.
+        /// </summary>
+        /// <param name="args">
+        ///     The arguments passed in from Doorstop. First argument is the path of the currently executing
+        ///     process.
+        /// </param>
+        public static void Start()
+        {
+            // We set it to the current directory first as a fallback, but try to use the same location as the .exe file.
+            var silentExceptionLog = $"preloader_{DateTime.Now:yyyyMMdd_HHmmss_fff}.log";
+
+            try
+            {
+                EnvVars.LoadVars();
+
+                silentExceptionLog =
+                    Path.Combine(Path.GetDirectoryName(EnvVars.DOORSTOP_PROCESS_PATH), silentExceptionLog);
+
+                // Get the path of this DLL via Doorstop env var because Assembly.Location mangles non-ASCII characters on some versions of Mono for unknown reasons
+                UnityPreloaderRunner.preloaderPath =
+                    Path.GetDirectoryName(Path.GetFullPath(EnvVars.DOORSTOP_INVOKE_DLL_PATH));
+
+                AppDomain.CurrentDomain.AssemblyResolve += UnityPreloaderRunner.ResolveCurrentDirectory;
+
+                UnityPreloaderRunner.PreloaderMain();
+            }
+            catch (Exception ex)
+            {
+                File.WriteAllText(silentExceptionLog, ex.ToString());
+            }
+        }
+    }
+}