Patch ModSorter to include forge mod in forgeAndMC list

Fixes MinecraftForge#7993, fixes MinecraftForge#8036
sciwhiz12 · Aug 31, 2021 · 220f2ac · 220f2ac
1 parent 19f470e
commit 220f2ac
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModSorter.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModSorter.java
@@ -161,6 +161,10 @@ private void buildUniqueList()
             forgeAndMC.add((ModFile) mc.get(0));
         else
             throw new IllegalStateException("Failed to find minecraft somehow?");
+        // TODO: remove this hardcoding and make it more flexible
+        var forge = modFilesByFirstId.get("forge");
+        if (forge != null && !forge.isEmpty())
+            forgeAndMC.add((ModFile) forge.get(0)); // Silently ignore if Forge isn't present
 
         // Select the newest by artifact version sorting of non-unique files thus identified
         this.modFiles = modFilesByFirstId.entrySet().stream()