[Fix] - Load order issues

RL2-API · Aug 4, 2024 · f007733 · f007733
1 parent bf4e764
commit f007733
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/RL2.ModLoader/DataStructures/ModManifest.cs b/RL2.ModLoader/DataStructures/ModManifest.cs
@@ -53,6 +53,6 @@ public int CompareTo(ModManifest comparedObject) {
 			return SemVersion.CompareTo(comparedObject.SemVersion);
 		}
 
-		return LoadAfter.Contains(comparedObject.Name) ? 1 : 0;
+		return LoadAfter.Contains(comparedObject.Name) ? 1 : -1;
 	}
 }
diff --git a/RL2.ModLoader/ModLoader.cs b/RL2.ModLoader/ModLoader.cs
@@ -94,15 +94,15 @@ public static void LoadModManifests() {
 			ModManifest currentManifest = JsonParser.FromJson<ModManifest>(File.ReadAllText(fileInfos[i].FullName));
 			ModManifestToPath[currentManifest] = fileInfos[i].Directory.FullName;
 		}
-
-		ModManifestToPath = ModManifestToPath.OrderBy(obj => obj.Key).ToDictionary(obj => obj.Key, obj => obj.Value);
 	}
 
 	/// <summary>
 	/// Loads mods
 	/// </summary>
 	public static void LoadMods() {
-		foreach (ModManifest manifest in ModManifestToPath.Keys.Where(entry => !ModList.Disabled.Contains(entry.Name)).ToArray()) {
+		ModManifest[] manifests = ModManifestToPath.Keys.Where(entry => !ModList.Disabled.Contains(entry.Name)).ToArray();
+		Array.Sort<ModManifest>(manifests, new Comparison<ModManifest>((e1, e2) => e1.CompareTo(e2)));
+		foreach (ModManifest manifest in manifests) {
 			if (LoadedModNamesToVersions.Keys.Contains(manifest.Name)) {
 				continue;
 			}