Update to the latest JarJar to fix a collision issue where multiple jars could provide an exact match. (#8847)

This commit is contained in:
Marc Hermans authored and GitHub committed 2022-07-10 11:07:55 -04:00
1 parent 05297fd72f
commit 47fd2e8604
2 files changed
+4 -2

No files matched your search

+1 -1
View File
@@ -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)
@@ -96,7 +96,9 @@ public class JarInJarDependencyLocator extends AbstractJarFileDependencyLocator
@NotNull
private Stream<ModWithVersionRange> getModWithVersionRangeStream(final JarSelector.SourceWithRequestedVersionRange<IModFile> 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