diff --git a/build.gradle b/build.gradle index 51176fa337..9892a51713 100644 --- a/build.gradle +++ b/build.gradle @@ -66,7 +66,7 @@ ext { APACHE_COMMONS_LANG3_VERSION = '3.12.0' JOPT_SIMPLE_VERSION = '5.0.4' COMMONS_IO_VERSION = '2.11.0' - JARJAR_VERSION = '0.3.9' + JARJAR_VERSION = '0.3.16' GIT_INFO = gradleutils.gitInfo VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION) @@ -262,6 +262,7 @@ def sharedDeps = { moduleonly "org.ow2.asm:asm-util:${ASM_VERSION}" moduleonly "org.ow2.asm:asm-analysis:${ASM_VERSION}" moduleonly "cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}" + moduleonly "net.minecraftforge:JarJarFileSystems:${JARJAR_VERSION}" installer "cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}" installer "org.ow2.asm:asm:${ASM_VERSION}" @@ -285,7 +286,8 @@ def sharedDeps = { installer "org.jline:jline-terminal:${JLINE_VERSION}" // Dep of TerminalConsoleAppender installer "org.spongepowered:mixin:${MIXIN_VERSION}" installer 'org.openjdk.nashorn:nashorn-core:15.3' - installer "net.minecraftforge:JarJar:${JARJAR_VERSION}" + installer "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}" + installer "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}" /* installer 'org.lwjgl:lwjgl:3.2.2' diff --git a/fmlloader/build.gradle b/fmlloader/build.gradle index d7a21c0200..fffb7f172f 100644 --- a/fmlloader/build.gradle +++ b/fmlloader/build.gradle @@ -28,7 +28,8 @@ dependencies { api("cpw.mods:modlauncher:${MODLAUNCHER_VERSION}") api("net.minecraftforge:coremods:${COREMODS_VERSION}") api("com.mojang:logging:${MOJANG_LOGGING_VERSION}") - api "net.minecraftforge:JarJar:${JARJAR_VERSION}" + api "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}" + api "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}" implementation("net.sf.jopt-simple:jopt-simple:${JOPT_SIMPLE_VERSION}") implementation("cpw.mods:securejarhandler:${SECUREJARHANDLER_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 295dae8624..10f26579f1 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 @@ -46,7 +46,6 @@ public class JarInJarDependencyLocator extends AbstractJarFileDependencyLocator final List sources = Lists.newArrayList(); loadedMods.forEach(sources::add); - final List dependenciesToLoad = JarSelector.detectAndSelect(sources, this::loadResourceFromModFile, this::loadModFileFrom, this::identifyMod, this::exception); if (dependenciesToLoad.isEmpty())