Merge pull request #237 from SubnauticaModding/Dev

QModManager 4.1.4 Patch time and Logging hotfixes
SubnauticaModding · Jun 1, 2021 · c976a95 · c976a95
2 parents 164348e + 18b6a3e
commit c976a95
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 56 deletions.
diff --git a/Data/latest-version.txt b/Data/latest-version.txt
@@ -1 +1 @@
-4.1.3
+4.1.4.0
diff --git a/Executable/Properties/AssemblyInfo.cs b/Executable/Properties/AssemblyInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("4.1.3")]
-[assembly: AssemblyFileVersion("4.1.3")]
+[assembly: AssemblyVersion("4.1.4")]
+[assembly: AssemblyFileVersion("4.1.4")]
diff --git a/Installer/BZ.EXP.iss b/Installer/BZ.EXP.iss
@@ -5,7 +5,7 @@
 #endif
 
 #define Name "QModManager" ; The name of the game will be added after it
-#define Version "4.1.3"
+#define Version "4.1.4"
 #define Author "QModManager"
 #define URL "https://github.com/QModManager/QModManager"
 #define SupportURL "https://discord.gg/UpWuWwq"

diff --git a/Installer/BZ.STABLE.iss b/Installer/BZ.STABLE.iss
@@ -5,7 +5,7 @@
 #endif
 
 #define Name "QModManager" ; The name of the game will be added after it
-#define Version "4.1.3"
+#define Version "4.1.4"
 #define Author "QModManager"
 #define URL "https://github.com/QModManager/QModManager"
 #define SupportURL "https://discord.gg/UpWuWwq"

diff --git a/Installer/Properties/AssemblyInfo.cs b/Installer/Properties/AssemblyInfo.cs
@@ -14,5 +14,5 @@
 
 [assembly: Guid("8c6c9a0b-80c4-43d2-89f2-749e6f09fdda")]
 
-[assembly: AssemblyVersion("4.1.3")]
-[assembly: AssemblyFileVersion("4.1.3")]
+[assembly: AssemblyVersion("4.1.4")]
+[assembly: AssemblyFileVersion("4.1.4")]
diff --git a/Installer/SN.EXP.iss b/Installer/SN.EXP.iss
@@ -5,7 +5,7 @@
 #endif
 
 #define Name "QModManager" ; The name of the game will be added after it
-#define Version "4.1.3"
+#define Version "4.1.4"
 #define Author "QModManager"
 #define URL "https://github.com/QModManager/QModManager"
 #define SupportURL "https://discord.gg/UpWuWwq"

diff --git a/Installer/SN.STABLE.iss b/Installer/SN.STABLE.iss
@@ -5,7 +5,7 @@
 #endif
 
 #define Name "QModManager" ; The name of the game will be added after it
-#define Version "4.1.3"
+#define Version "4.1.4"
 #define Author "QModManager"
 #define URL "https://github.com/QModManager/QModManager"
 #define SupportURL "https://discord.gg/UpWuWwq"

diff --git a/OculusNewtonsoftRedirect/Properties/AssemblyInfo.cs b/OculusNewtonsoftRedirect/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.1.3")]
-[assembly: AssemblyFileVersion("4.1.3")]
+[assembly: AssemblyVersion("4.1.4")]
+[assembly: AssemblyFileVersion("4.1.4")]
diff --git a/QModManager/Properties/AssemblyInfo.cs b/QModManager/Properties/AssemblyInfo.cs
@@ -13,8 +13,8 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("4.1.3")]
-[assembly: AssemblyFileVersion("4.1.3")]
+[assembly: AssemblyVersion("4.1.4")]
+[assembly: AssemblyFileVersion("4.1.4")]
 
 [assembly: InternalsVisibleTo("QMMTests")]
 [assembly: InternalsVisibleTo("QModManager")]

diff --git a/QModPluginEmulator/Properties/AssemblyInfo.cs b/QModPluginEmulator/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.1.3")]
-[assembly: AssemblyFileVersion("4.1.3")]
+[assembly: AssemblyVersion("4.1.4")]
+[assembly: AssemblyFileVersion("4.1.4")]
 [assembly: NeutralResourcesLanguage("en")]
 
 [assembly: InternalsVisibleTo("QModManager.QMMLoader")]
diff --git a/QModPluginEmulator/QModPluginGenerator.cs b/QModPluginEmulator/QModPluginGenerator.cs
@@ -6,21 +6,22 @@
 #if SUBNAUTICA_STABLE
 using Oculus.Newtonsoft.Json;
 #else
-    using Newtonsoft.Json;
+using Newtonsoft.Json;
 #endif
 using QModManager.API;
 using QModManager.Patching;
 using QModManager.Utility;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Text.RegularExpressions;
+using QModManager.API.ModLoading;
 using TypeloaderCache = System.Collections.Generic.Dictionary<string, BepInEx.Bootstrap.CachedAssembly<BepInEx.PluginInfo>>;
 using QMMAssemblyCache = System.Collections.Generic.Dictionary<string, long>;
-using QModManager.API.ModLoading;
-using System.Collections;
 
 namespace QModManager
 {
@@ -57,14 +58,14 @@ public static void Finish()
             {
                 PluginCache = GetPluginCache();
                 Harmony = new Harmony("QModManager.QModPluginGenerator");
-                foreach(Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
+                foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
                 {
-                    if(assembly?.GetName()?.Name?.Contains("MirrorInternalLogs") ?? false)
+                    if (assembly?.GetName()?.Name?.Contains("MirrorInternalLogs") ?? false)
                     {
                         Type type = AccessTools.TypeByName("MirrorInternalLogs.Util.LibcHelper");
                         var method = type?.GetMethod("Format");
 
-                        if(method != null)
+                        if (method != null)
                             Harmony.Patch(method, postfix: new HarmonyMethod(typeof(QModPluginGenerator), nameof(QModPluginGenerator.LibcHelper_Format_Postfix)));
                         break;
                     }
@@ -82,44 +83,51 @@ public static void Finish()
             }
         }
 
-        public static List<string> DirtyStartStrings = new List<string>()
-        {
-            "Resetting cell with", "Replacing cell",
-            "PerformGarbage", "Fallback handler could not load"
-        };
-
-        public static List<string> DirtyMidStrings = new List<string>()
-        {
-            "\n(Filename", 
+        private readonly static List<Regex> DirtyRegexPatterns = new List<Regex>() {
+            new Regex(@"([\r\n]+)?(\(Filename: .*\))$", RegexOptions.Compiled | RegexOptions.Multiline),
+            new Regex(@"^(Replacing cell.*)$", RegexOptions.Compiled | RegexOptions.Multiline),
+            new Regex(@"^(Resetting cell with.*)$", RegexOptions.Compiled | RegexOptions.Multiline),
+            new Regex(@"^(PerformGarbage.*)$", RegexOptions.Compiled | RegexOptions.Multiline),
+            new Regex(@"^(Fallback handler could not load.*)$", RegexOptions.Compiled | RegexOptions.Multiline),
+            new Regex(@"^(Heartbeat CSV.*,[0-9])$", RegexOptions.Compiled | RegexOptions.Multiline),
+            new Regex(@"^(L0: PerformGarbageCollection ->.*)$", RegexOptions.Compiled | RegexOptions.Multiline),
+            new Regex(@"^(L0: CellManager::EstimateBytes.*)$", RegexOptions.Compiled | RegexOptions.Multiline),
+            new Regex(@"^(Kinematic body only supports Speculative Continuous collision detection.*)$", RegexOptions.Compiled | RegexOptions.Multiline),
         };
 
         private static void LibcHelper_Format_Postfix(ref string __result)
         {
-            foreach(string dirtyString in DirtyStartStrings)
+            foreach (Regex pattern in DirtyRegexPatterns)
             {
-                if(__result.StartsWith(dirtyString))
-                {
-                    __result = "";
-                    return;
-                }
-            }
-
-            foreach(string dirtyString in DirtyMidStrings)
-            {
-                int i = __result.IndexOf(dirtyString);
-                if(i >= 0)
-                {
-                    __result = __result.Remove(i);
-                    return;
-                }
+                __result = pattern.Replace(__result, string.Empty).Trim();
             }
         }
 
 #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,10 +150,10 @@ 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)
+            if (ModsToLoad != null)
             {
                 yield return result;
 
@@ -155,7 +163,7 @@ private static IEnumerator InitializeQMM(IEnumerator result)
 
                 SummaryLogger.ReportIssues(ModsToLoad);
                 SummaryLogger.LogSummaries(ModsToLoad);
-                foreach(Dialog dialog in Patcher.Dialogs)
+                foreach (Dialog dialog in Patcher.Dialogs)
                 {
                     dialog.Show();
                 }
@@ -165,7 +173,7 @@ private static IEnumerator InitializeQMM(IEnumerator result)
 #elif BELOWZERO
         private static void InitializeQMM()
         {
-            if(ModsToLoad != null)
+            if (ModsToLoad != null)
             {
                 Initializer.InitializeMods(ModsToLoad, PatchingOrder.NormalInitialize);
                 Initializer.InitializeMods(ModsToLoad, PatchingOrder.PostInitialize);
@@ -174,12 +182,13 @@ private static void InitializeQMM()
                 SummaryLogger.ReportIssues(ModsToLoad);
                 SummaryLogger.LogSummaries(ModsToLoad);
 
-                foreach(Dialog dialog in Patcher.Dialogs)
+                foreach (Dialog dialog in Patcher.Dialogs)
                 {
                     dialog.Show();
                 }
             }
         }
+#endif
 #endif
 
         private static string[] QMMKnownAssemblyPaths = new[] {
@@ -254,7 +263,7 @@ private static void SaveQMMAssemblyCache()
 
                 using (var ms = new MemoryStream())
                 using (var writer = new StreamWriter(ms))
-                using(var jsreader = new JsonTextWriter(writer))
+                using (var jsreader = new JsonTextWriter(writer))
                 {
                     var serializer = new JsonSerializer();
                     serializer.Serialize(jsreader, QMMAssemblyCache);
@@ -283,7 +292,7 @@ private static void ClearBepInExCache()
             {
                 Directory.Delete(BepInExCachePath, true);
             }
-            catch(IOException e)
+            catch (IOException e)
             {
                 Logger.LogDebug($"Clearing BepInEx cache failed with exception. \n{e}");
             }

diff --git a/UnityAudioFixer/Properties/AssemblyInfo.cs b/UnityAudioFixer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.1.3")]
-[assembly: AssemblyFileVersion("4.1.3")]
+[assembly: AssemblyVersion("4.1.4")]
+[assembly: AssemblyFileVersion("4.1.4")]