From 4a09a2420dca092f71f46587923dcfb2d30c2fdd Mon Sep 17 00:00:00 2001 From: cpw Date: Fri, 13 Nov 2020 19:12:33 -0500 Subject: [PATCH] Return the processed modlist data to the upstream system, not the raw unprocessed data. Should resolve the problem that mixin complains about missing info when it's in a "crashed" situation. Signed-off-by: cpw --- .../java/net/minecraftforge/fml/loading/FMLLoader.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLLoader.java b/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLLoader.java index d833f0178..bad4de6ed 100644 --- a/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLLoader.java +++ b/src/fmllauncher/java/net/minecraftforge/fml/loading/FMLLoader.java @@ -34,6 +34,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler; import net.minecraftforge.fml.loading.moddiscovery.ModDiscoverer; import net.minecraftforge.fml.loading.moddiscovery.ModFile; +import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo; import net.minecraftforge.fml.loading.progress.EarlyProgressVisualization; import net.minecraftforge.fml.loading.progress.StartupMessageManager; import net.minecraftforge.forgespi.Environment; @@ -53,6 +54,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.function.BiFunction; +import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -214,7 +216,7 @@ public class FMLLoader loadingModList = backgroundScanHandler.getLoadingModList(); commonLaunchHandler.addLibraries(backgroundScanHandler.getModFiles().getOrDefault(IModFile.Type.LIBRARY, Collections.emptyList())); progressWindowTick.run(); - return backgroundScanHandler.getModFiles(); + return loadingModList.getModFiles().stream().map(ModFileInfo::getFile).collect(Collectors.groupingBy(ModFile::getType)); } public static ICoreModProvider getCoreModProvider() {