From 220f2ac619e7b1ff3aed193f9f8a140c39c3929c Mon Sep 17 00:00:00 2001 From: sciwhiz12 Date: Wed, 1 Sep 2021 00:09:19 +0800 Subject: [PATCH] Patch ModSorter to include forge mod in forgeAndMC list Fixes #7993, fixes #8036 --- .../main/java/net/minecraftforge/fml/loading/ModSorter.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModSorter.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModSorter.java index 31cd1da7b22..3f7056ab64d 100644 --- 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()