Revert timing change for sn1 stable only

SubnauticaModding · Jun 1, 2021 · ae1571a · ae1571a
1 parent f75fc6f
commit ae1571a
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/QModPluginEmulator/QModPluginGenerator.cs b/QModPluginEmulator/QModPluginGenerator.cs
@@ -117,9 +117,29 @@ private static void LibcHelper_Format_Postfix(ref string __result)
 
 #if SUBNAUTICA_STABLE
         [HarmonyPatch(typeof(SystemsSpawner), nameof(SystemsSpawner.Awake))]
+        [HarmonyPrefix]
+        private static void PreInitializeQMM()
+        {
+            Patcher.Patch(); // Run QModManager patch
+
+            ModsToLoad = QModsToLoad.ToList();
+            Initializer = new Initializer(Patcher.CurrentlyRunningGame);
+            Initializer.InitializeMods(ModsToLoad, PatchingOrder.MetaPreInitialize);
+            Initializer.InitializeMods(ModsToLoad, PatchingOrder.PreInitialize);
+            Initializer.InitializeMods(ModsToLoad, PatchingOrder.NormalInitialize);
+            Initializer.InitializeMods(ModsToLoad, PatchingOrder.PostInitialize);
+            Initializer.InitializeMods(ModsToLoad, PatchingOrder.MetaPostInitialize);
+
+            SummaryLogger.ReportIssues(ModsToLoad);
+            SummaryLogger.LogSummaries(ModsToLoad);
+            foreach(Dialog dialog in Patcher.Dialogs)
+            {
+                dialog.Show();
+            }
+
+        }
 #else
         [HarmonyPatch(typeof(PreStartScreen), nameof(PreStartScreen.Start))]
-#endif
         [HarmonyPrefix]
         private static void PreInitializeQMM()
         {
@@ -142,7 +162,7 @@ private static void PreInitializeQMM()
                     ), postfix: new HarmonyMethod(AccessTools.Method(typeof(QModPluginGenerator), nameof(QModPluginGenerator.InitializeQMM))));
         }
 
-#if SUBNAUTICA
+#if SUBNAUTICA_EXP
         private static IEnumerator InitializeQMM(IEnumerator result)
         {
             if(ModsToLoad != null)
@@ -180,6 +200,7 @@ private static void InitializeQMM()
                 }
             }
         }
+#endif
 #endif
 
         private static string[] QMMKnownAssemblyPaths = new[] {