From 47fd2e8604e2c6c80292c84c5e29146ae6f14354 Mon Sep 17 00:00:00 2001 From: Marc Hermans Date: Sun, 10 Jul 2022 17:07:55 +0200 Subject: [PATCH] Update to the latest JarJar to fix a collision issue where multiple jars could provide an exact match. (#8847) --- build.gradle | 2 +- .../fml/loading/moddiscovery/JarInJarDependencyLocator.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a09a25d296..bc9a75869a 100644 --- a/build.gradle +++ b/build.gradle @@ -65,7 +65,7 @@ ext { APACHE_COMMONS_LANG3_VERSION = '3.12.0' JOPT_SIMPLE_VERSION = '5.0.4' COMMONS_IO_VERSION = '2.11.0' - JARJAR_VERSION = '0.2.26' + JARJAR_VERSION = '0.3.0' GIT_INFO = gradleutils.gitInfo VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION) diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java index 4c0c4e6569..a1cd4a5520 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java @@ -96,7 +96,9 @@ public class JarInJarDependencyLocator extends AbstractJarFileDependencyLocator @NotNull private Stream getModWithVersionRangeStream(final JarSelector.SourceWithRequestedVersionRange file) { - return file.source().getModFileInfo().getMods().stream().map(modInfo -> new ModWithVersionRange(modInfo, file.requestedVersionRange(), file.includedVersion())); + return file.sources().stream().map(IModFile::getModFileInfo) + .flatMap(modFileInfo -> modFileInfo.getMods().stream()) + .map(modInfo -> new ModWithVersionRange(modInfo, file.requestedVersionRange(), file.includedVersion())); } @NotNull