Merge pull request #190 from SubnauticaModding/fix-system-path-checks

Fix system path checks
SubnauticaModding · Sep 16, 2020 · cd63097 · cd63097
2 parents 609fce7 + b4789c9
commit cd63097
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 31 deletions.
diff --git a/Data/latest-version.txt b/Data/latest-version.txt
@@ -1 +1 @@
-4.0.2.3
+4.0.2.4
diff --git a/Executable/Properties/AssemblyInfo.cs b/Executable/Properties/AssemblyInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("4.0.2.3")]
-[assembly: AssemblyFileVersion("4.0.2.3")]
+[assembly: AssemblyVersion("4.0.2.4")]
+[assembly: AssemblyFileVersion("4.0.2.4")]
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.0.2.3")]
-[assembly: AssemblyFileVersion("4.0.2.3")]
+[assembly: AssemblyVersion("4.0.2.4")]
+[assembly: AssemblyFileVersion("4.0.2.4")]
diff --git a/Installer/QModsInstallerScript.iss b/Installer/QModsInstallerScript.iss
@@ -5,7 +5,7 @@
 #endif
 
 #define Name "QModManager" ; The name of the game will be added after it
-#define Version "4.0.2.3"
+#define Version "4.0.2.4"
 #define Author "QModManager"
 #define URL "https://github.com/QModManager/QModManager"
 #define SupportURL "https://discord.gg/UpWuWwq"

diff --git a/QMMHarmonyShimmer/Properties/AssemblyInfo.cs b/QMMHarmonyShimmer/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // 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.0.2.3")]
-[assembly: AssemblyFileVersion("4.0.2.3")]
+[assembly: AssemblyVersion("4.0.2.4")]
+[assembly: AssemblyFileVersion("4.0.2.4")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/QMMLoader/Properties/AssemblyInfo.cs b/QMMLoader/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // 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.0.2.3")]
-[assembly: AssemblyFileVersion("4.0.2.3")]
+[assembly: AssemblyVersion("4.0.2.4")]
+[assembly: AssemblyFileVersion("4.0.2.4")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/QModManager/Patching/Patcher.cs b/QModManager/Patching/Patcher.cs
@@ -12,16 +12,7 @@ internal static class Patcher
     {
         internal const string IDRegex = "[^0-9a-zA-Z_]";
 
-        internal static string QModBaseDir
-        {
-            get
-            {
-                if (Environment.CurrentDirectory.Contains("system32") && Environment.CurrentDirectory.Contains("Windows"))
-                    return null;
-                else
-                    return Path.Combine(Environment.CurrentDirectory, "QMods");
-            }
-        }
+        internal static string QModBaseDir => Path.Combine(Environment.CurrentDirectory, "QMods");
 
         private static bool Patched = false;
         internal static QModGame CurrentlyRunningGame { get; private set; } = QModGame.None;

diff --git a/QModManager/Properties/AssemblyInfo.cs b/QModManager/Properties/AssemblyInfo.cs
@@ -13,8 +13,8 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("4.0.2.3")]
-[assembly: AssemblyFileVersion("4.0.2.3")]
+[assembly: AssemblyVersion("4.0.2.4")]
+[assembly: AssemblyFileVersion("4.0.2.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.0.2.3")]
-[assembly: AssemblyFileVersion("4.0.2.3")]
+[assembly: AssemblyVersion("4.0.2.4")]
+[assembly: AssemblyFileVersion("4.0.2.4")]
 [assembly: NeutralResourcesLanguage("en")]
 
 [assembly: InternalsVisibleTo("QModManager.QMMLoader")]
diff --git a/QModPluginEmulator/QModPluginGenerator.cs b/QModPluginEmulator/QModPluginGenerator.cs
@@ -150,11 +150,6 @@ private static void SaveQMMAssemblyCache()
 
         private static void ClearBepInExCache()
         {
-            if (BepInExCachePath.Contains("system32") || BepInExCachePath.Contains("Windows"))
-            {
-                throw new InvalidOperationException($"BepInEx Cache Path invalid! ({BepInExCachePath})");
-            }
-
             if (!Directory.Exists(BepInExCachePath))
                 return;
 

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.0.2.3")]
-[assembly: AssemblyFileVersion("4.0.2.3")]
+[assembly: AssemblyVersion("4.0.2.4")]
+[assembly: AssemblyFileVersion("4.0.2.4")]