Merge pull request #284 from SubnauticaModding/Dev

Author: Metious

.gitignore

@@ -291,3 +291,5 @@ __pycache__/
 
 # Game Assemblies
 [Dd]ependencies/**/[Aa]ssemblies/
+*.zip
+*.dll

BepinexPackages/BelowZero_Packages/BepInExPack_BelowZero.zip

@@ -1,6 +1,6 @@
 {
     "name": "QModManager_BZ",
-    "version_number": "4.4.3",
+    "version_number": "4.4.4",
     "website_url": "https://github.com/SubnauticaModding/QModManager",
     "description": "QModManager is an intermidiate loader for mods made for the QMM system.",
     "dependencies": [ 

BepinexPackages/BelowZero_Packages/QModManager/manifest.json

@@ -1,6 +1,6 @@
 {
     "name": "QModManager_BZ_Experimental",
-    "version_number": "4.4.3",
+    "version_number": "4.4.4",
     "website_url": "https://github.com/SubnauticaModding/QModManager",
     "description": "QModManager is an intermidiate loader for mods made for the QMM system.",
     "dependencies": [ 

BepinexPackages/BelowZero_Packages/QModManager/patchers/QModManager/QModManager.QModPluginGenerator.dll

@@ -1,6 +1,6 @@
 {
     "name": "QModManager",
-    "version_number": "4.4.3",
+    "version_number": "4.4.4",
     "website_url": "https://github.com/SubnauticaModding/QModManager",
     "description": "QModManager is an intermidiate loader for mods made for the QMM system.",
     "dependencies": [ 

BepinexPackages/BelowZero_Packages/QModManager/plugins/QModManager/QModInstaller.dll

@@ -1,6 +1,6 @@
 {
     "name": "QModManager_Experimental",
-    "version_number": "4.4.3",
+    "version_number": "4.4.4",
     "website_url": "https://github.com/SubnauticaModding/QModManager",
     "description": "QModManager is an intermidiate loader for mods made for the QMM system.",
     "dependencies": [ 

BepinexPackages/BelowZero_Packages/QModManager/plugins/QModManager/QModInstaller.xml

@@ -1 +1 @@
-4.4.3
+4.4.4.0

BepinexPackages/BelowZero_Packages/QModManager_BelowZero.zip

@@ -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.4.3")]
-[assembly: AssemblyFileVersion("4.4.3")]
+[assembly: AssemblyVersion("4.4.4")]
+[assembly: AssemblyFileVersion("4.4.4")]

BepinexPackages/BelowZero_Packages/QModManager_BelowZero_Experimental.zip

@@ -47,5 +47,14 @@ public interface IQModServices : IQModAPI
         ///   <c>true</c> if Nitrox is being used; otherwise, <c>false</c>.
         /// </value>
         bool NitroxRunning { get; }
+
+
+        /// <summary>
+        /// Gets a value indicating whether Piracy was detected.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if Piracy was detected; otherwise, <c>false</c>.
+        /// </value>
+        bool PirateDetected { get; }
     }
 }

BepinexPackages/BelowZero_Packages/QModManager_Exp/manifest.json

@@ -157,5 +157,13 @@ public void AddCriticalMessage(string msg, int size = MainMenuMessages.defaultSi
         ///   <c>true</c> if Nitrox is being used; otherwise, <c>false</c>.
         /// </value>
         public bool NitroxRunning => NitroxCheck.IsRunning;
+
+        /// <summary>
+        /// Gets a value indicating whether Piracy was detected.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if Piracy was detected; otherwise, <c>false</c>.
+        /// </value>
+        public bool PirateDetected => PirateCheck.PirateDetected;
     }
 }

BepinexPackages/BelowZero_Packages/QModManager_Exp/patchers/QModManager/QModManager.QModPluginGenerator.dll

@@ -13,7 +13,7 @@ internal class LogFilter : BaseUnityPlugin
     {
         internal const string PluginGuid = "QModManager.LogFilter";
         internal const string PluginName = PluginGuid;
-        internal const string PluginVersion = "4.4.3";
+        internal const string PluginVersion = "4.4.4";
 
         private void Awake()
         {

BepinexPackages/BelowZero_Packages/QModManager_Exp/plugins/QModManager/QModInstaller.dll

@@ -9,8 +9,10 @@
 namespace QModInstaller.BepInEx.Plugins
 {
     using QModManager.API.ModLoading;
+    using QModManager.Checks;
     using QModManager.Patching;
     using QModManager.Utility;
+    using System;
 
     /// <summary>
     /// QMMLoader - simply fires up the QModManager entry point.
@@ -21,11 +23,20 @@ public class QMMLoader : BaseUnityPlugin
     {
         internal const string PluginGuid = "QModManager.QMMLoader";
         internal const string PluginName = "QMMLoader";
-        internal const string PluginVersion = "4.4.3";
+        internal const string PluginVersion = "4.4.4";
 
         internal static List<QMod> QModsToLoad;
         private static Initializer Initializer;
 
+        /// <summary>
+        /// "Only for use by Bepinex"
+        /// </summary>
+        [Obsolete("Only for use by Bepinex", true)]
+        public QMMLoader()
+        {
+            PirateCheck.IsPirate();
+        }
+
         /// <summary>
         /// Prevents a default instance of the <see cref="QMMLoader"/> class from being created 
         /// Also ensures the root bepinex object does not get destroyed if the game reloads for steam.
@@ -84,13 +95,15 @@ private static IEnumerator InitializeQMods(IEnumerator result)
         {
             while (result.MoveNext())
             {
-                yield return result;
+                yield return result.Current;
             }
 
-#if BELOWZERO
-            if(!SpriteManager.hasInitialized)
-                yield return new WaitUntil(()=>SpriteManager.hasInitialized);
-#endif
+            var hasInitializedField = typeof(SpriteManager).GetField("hasInitialized", System.Reflection.BindingFlags.Public|System.Reflection.BindingFlags.Static);
+            if (hasInitializedField != null)
+            {
+                if (!(bool)hasInitializedField.GetValue(null))
+                    yield return new WaitUntil(() => (bool)hasInitializedField.GetValue(null));
+            }
 
             Initializer.InitializeMods(QModsToLoad, PatchingOrder.NormalInitialize);
             Initializer.InitializeMods(QModsToLoad, PatchingOrder.PostInitialize);

BepinexPackages/Both_Packages/MirrorInternalLogs/MirrorInternalLogs.zip

@@ -1,35 +1,9 @@
-using HarmonyLib;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Reflection.Emit;
+using System;
 
 namespace QModManager.Checks
 {
     internal static class NitroxCheck
     {
-        internal static bool IsRunning { get; set; } = false;
-
-        
-        [HarmonyPatch(typeof(GameInput), nameof(GameInput.Awake))]
-        internal static class AwakePatch
-        {
-            internal static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
-            {
-                foreach (CodeInstruction instruction in instructions)
-                {
-                    if (instruction.opcode == OpCodes.Call)
-                    {
-                        MethodInfo method = (MethodInfo)instruction.operand;
-
-                        if (method.DeclaringType.Name == "Main" && method.Name == "Execute")
-                        {
-                            IsRunning = true;
-                        }
-                    }
-                }
-
-                return instructions;
-            }
-        }
+        internal static bool IsRunning => Environment.GetEnvironmentVariable("NITROX_LAUNCHER_PATH") is not null;
     }
 }

BepinexPackages/Both_Packages/UnityAudioEnabler/UnityAudioEnabler.zip

@@ -1,15 +1,18 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using Logger = QModManager.Utility.Logger;
 
 namespace QModManager.Checks
 {
     internal static class PirateCheck
     {
-        internal static void PirateDetected()
-        {
-            Logger.Warn("Ahoy, matey! Ye be a pirate!");
-        }
+        internal static string Steamapi => "steam_api64.dll";
+        internal static int Steamapilengh => 220000;
+
+
+        internal static string folder = Environment.CurrentDirectory;
+        internal static bool PirateDetected;
 
         internal static readonly HashSet<string> CrackedFiles = new HashSet<string>()
         {
@@ -27,28 +30,32 @@ internal static void PirateDetected()
             "chuj.cdx",
         };
 
-        internal static void IsPirate(string folder)
+        internal static void IsPirate()
         {
-            string steamDll = Path.Combine(folder, "steam_api64.dll");
-            if (File.Exists(steamDll))
+            string steamDll = Path.Combine(folder, Steamapi);
+            bool steamStore = File.Exists(steamDll);
+            if (steamStore)
             {
                 FileInfo fileInfo = new FileInfo(steamDll);
-
-                if (fileInfo.Length > 220000)
+                if (fileInfo.Length > Steamapilengh)
                 {
-                    PirateDetected();
-                    return;
+                    PirateDetected = true;
                 }
             }
 
-            foreach (string file in CrackedFiles)
+            if (!PirateDetected)
             {
-                if (File.Exists(Path.Combine(folder, file)))
+                foreach (string file in CrackedFiles)
                 {
-                    PirateDetected();
-                    return;
+                    if (File.Exists(Path.Combine(folder, file)))
+                    {
+                        PirateDetected = true;
+                        break;
+                    }
                 }
             }
+
+            Logger.Info(PirateDetected? "Ahoy, matey! Ye be a pirate!":"Seems Legit.");
         }
     }
 }

BepinexPackages/Subnautica_Packages/BepInExPack_Subnautica.zip

@@ -12,13 +12,13 @@ internal static class DevConsole_Awake_Patch
         [HarmonyPostfix]
         internal static void Postfix()
         {
-#if BELOWZERO || SUBNAUTICA_EXP
+#if !SUBNAUTICA_STABLE
             if (PlatformUtils.GetDevToolsEnabled() != Config.EnableConsole)
 #else
             if (DevConsole.disableConsole != !Config.EnableConsole)
 #endif
             {
-#if BELOWZERO || SUBNAUTICA_EXP
+#if !SUBNAUTICA_STABLE
                 PlatformUtils.SetDevToolsEnabled(Config.EnableConsole);
 #else
                 DevConsole.disableConsole = !Config.EnableConsole;