Fixed an issue where mods in the "Dependencies" section of the mod.js…

…on weren't being considered by the validator or the factory's ValidateDependencies method.
SubnauticaModding · Jul 23, 2020 · 2eb96fa · 2eb96fa
1 parent c456371
commit 2eb96fa
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/QModManager/Patching/ManifestValidator.cs b/QModManager/Patching/ManifestValidator.cs
@@ -46,7 +46,7 @@ public void ValidateManifest(QMod mod)
 
             if (ProhibitedModIDs.TryGetValue(mod.Id, out ModStatus reason))
             {
-                mod.Status = reason; 
+                mod.Status = reason;
                 return;
             }
 
@@ -62,10 +62,10 @@ public void ValidateManifest(QMod mod)
                     mod.SupportedGame = QModGame.Subnautica;
                     break;
                 default:
-                {
-                    mod.Status = ModStatus.FailedIdentifyingGame;
-                    return;
-                }
+                    {
+                        mod.Status = ModStatus.FailedIdentifyingGame;
+                        return;
+                    }
             }
 
             try
@@ -125,7 +125,7 @@ public void CheckRequiredMods(QMod mod)
             foreach (string item in mod.LoadAfter)
                 mod.LoadAfterPreferences.Add(item);
 
-            if (mod.VersionDependencies.Count > 0)
+            if (mod.VersionDependencies.Count > 0 || mod.RequiredDependencies.Count > 0)
             {
                 var versionedDependencies = new List<RequiredQMod>(mod.VersionDependencies.Count);
                 foreach (KeyValuePair<string, string> item in mod.VersionDependencies)
@@ -148,6 +148,14 @@ public void CheckRequiredMods(QMod mod)
                     mod.RequiredDependencies.Add(item.Key);
                 }
 
+                foreach (var id in mod.RequiredDependencies)
+                {
+                    if (!versionedDependencies.Any(x => x.Id == id))
+                    {
+                        versionedDependencies.Add(new RequiredQMod(id));
+                    }
+                }
+
                 mod.RequiredMods = versionedDependencies;
             }
         }