Add Forge commit 519399f into Magma

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:[5.1.26,)'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:[5.1.39,5.2.0)'
         classpath "gradle.plugin.net.nemerosa:versioning:2.14.0"
         classpath "dev.vankka:gradle-plugin:1.2.1"
     }
@@ -54,12 +54,12 @@ ext {
     COREMODS_VERSION = '5.0.1'
     EVENTBUS_VERSION = '5.0.3'
     MODLAUNCHER_VERSION = '9.1.3'
-    SECUREJARHANDLER_VERSION = '1.0.5'
+    SECUREJARHANDLER_VERSION = '1.0.8'
     BOOTSTRAPLAUNCHER_VERSION = '1.0.0'
-    ASM_VERSION = '9.4'
+    ASM_VERSION = '9.5'
     INSTALLER_VERSION = '2.1.+'
     MIXIN_VERSION = '0.8.5'
-    JARJAR_VERSION = '0.3.0'
+    JARJAR_VERSION = '0.3.19'
 
     GIT_INFO = gradleutils.gitInfo
     FORGE_VERSION = '40.2.1'
@@ -70,7 +70,7 @@ ext {
     BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.0.12:fatjar'
     INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.3.0'
     JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.4'
-    FART = 'net.minecraftforge:ForgeAutoRenamingTool:0.1.22:all'
+    FART = 'net.minecraftforge:ForgeAutoRenamingTool:0.1.25:all'
     MIN_TAG_FOR_CHANGELOG = "39.0"
 
     BIN_PATCHER = BINPATCH_TOOL.substring(0, BINPATCH_TOOL.length() - 1 - BINPATCH_TOOL.split(':')[3].length())
@@ -202,6 +202,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}"
@@ -225,7 +226,8 @@ def sharedDeps = {
     installer 'org.jline:jline-terminal:3.21.0' //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'
@@ -407,6 +409,7 @@ def sharedFmlonlyForge = { Project prj ->
         run.jvmArgs '--add-modules', 'ALL-MODULE-PATH'
         // Additions to these JVM module args should be mirrored to server_files/args.txt and other similar blocks in the buildscript
         run.jvmArgs '--add-opens', 'java.base/java.util.jar=cpw.mods.securejarhandler'
+        run.jvmArgs '--add-opens', 'java.base/java.lang.invoke=cpw.mods.securejarhandler'
         run.jvmArgs '--add-exports', 'java.base/sun.security.util=cpw.mods.securejarhandler'
         run.jvmArgs '--add-exports', 'jdk.naming.dns/com.sun.jndi.dns=java.naming'
     }
@@ -592,6 +595,7 @@ project(':fmlonly') {
                           '--add-modules', 'ALL-MODULE-PATH',
                           // Additions to these JVM module args should be mirrored to server_files/args.txt and other similar blocks in the buildscript
                           '--add-opens', 'java.base/java.util.jar=cpw.mods.securejarhandler',
+                          '--add-opens', 'java.base/java.lang.invoke=cpw.mods.securejarhandler',
                           '--add-exports', 'java.base/sun.security.util=cpw.mods.securejarhandler',
                           '--add-exports', 'jdk.naming.dns/com.sun.jndi.dns=java.naming'
                     ]
@@ -1171,6 +1175,7 @@ project(':forge') {
                           '--add-modules', 'ALL-MODULE-PATH',
                           // Additions to these JVM module args should be mirrored to server_files/args.txt and other similar blocks in the buildscript
                           '--add-opens', 'java.base/java.util.jar=cpw.mods.securejarhandler',
+                          '--add-opens', 'java.base/java.lang.invoke=cpw.mods.securejarhandler',
                           '--add-exports', 'java.base/sun.security.util=cpw.mods.securejarhandler',
                           '--add-exports', 'jdk.naming.dns/com.sun.jndi.dns=java.naming'
                     ]

buildSrc/build.gradle

@@ -3,7 +3,8 @@ repositories {
 	mavenCentral()
 }
 dependencies {
-	implementation 'org.ow2.asm:asm:9.1'
-	implementation 'org.ow2.asm:asm-tree:9.1'
-    implementation 'net.minecraftforge:srgutils:0.4.+'
+	implementation 'org.ow2.asm:asm:9.5'
+	implementation 'org.ow2.asm:asm-tree:9.5'
+    implementation 'net.minecraftforge:srgutils:0.5.+'
+	implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r'
 }

fmlloader/build.gradle

@@ -26,7 +26,8 @@ dependencies {
     api('com.electronwill.night-config:toml:3.6.4')
     api('cpw.mods:modlauncher:9.0.+')
     api('net.minecraftforge:coremods:5.0.+')
-    api "net.minecraftforge:JarJar:${JARJAR_VERSION}"
+    api "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}"
+    api "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}"
     implementation("cpw.mods:securejarhandler:${SECUREJARHANDLER_VERSION}")
     implementation('org.apache.logging.log4j:log4j-core:2.17.0')
     annotationProcessor('org.apache.logging.log4j:log4j-core:2.17.0')

fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java

@@ -5,6 +5,7 @@
 
 package net.minecraftforge.fml.loading.moddiscovery;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import net.minecraftforge.fml.loading.EarlyLoadingException;
 import net.minecraftforge.forgespi.language.IModInfo;
@@ -16,10 +17,15 @@
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.jetbrains.annotations.NotNull;
 
+import java.net.URI;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -34,20 +40,16 @@ public String name()
     }
 
     @Override
-    public List<IModFile> scanMods(final Iterable<IModFile> loadedMods) {
+    public List<IModFile> scanMods(final Iterable<IModFile> loadedMods)
+    {
         final List<IModFile> sources = Lists.newArrayList();
         loadedMods.forEach(sources::add);
 
 
-        final List<IModFile> dependenciesToLoad = JarSelector.detectAndSelect(
-          sources,
-          this::loadResourceFromModFile,
-          this::loadModFileFrom,
-          this::identifyMod,
-          this::exception
-        );
+        final List<IModFile> dependenciesToLoad = JarSelector.detectAndSelect(sources, this::loadResourceFromModFile, this::loadModFileFrom, this::identifyMod, this::exception);
 
-        if (dependenciesToLoad.isEmpty()) {
+        if (dependenciesToLoad.isEmpty())
+        {
             LOGGER.info("No dependencies to load found. Skipping!");
             return Collections.emptyList();
         }
@@ -68,46 +70,87 @@ protected String getDefaultJarModType()
         return IModFile.Type.GAMELIBRARY.name();
     }
 
+    @SuppressWarnings("resource")
+    @Override
+    protected Optional<IModFile> loadModFileFrom(final IModFile file, final Path path)
+    {
+        try
+        {
+            final Path pathInModFile = file.findResource(path.toString());
+            final URI filePathUri = new URI("jij:" + (pathInModFile.toAbsolutePath().toUri().getRawSchemeSpecificPart())).normalize();
+            final Map<String, ?> outerFsArgs = ImmutableMap.of("packagePath", pathInModFile);
+            final FileSystem zipFS = FileSystems.newFileSystem(filePathUri, outerFsArgs);
+            final Path pathInFS = zipFS.getPath("/");
+            return createMod(pathInFS);
+        }
+        catch (Exception e)
+        {
+            LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName());
+
+            throw new RuntimeException("Failed to load mod file " + file.getFileName(), e);
+        }
+    }
+
     protected EarlyLoadingException exception(Collection<JarSelector.ResolutionFailureInformation<IModFile>> failedDependencies)
     {
 
         final List<EarlyLoadingException.ExceptionData> errors = failedDependencies.stream()
-                                                                   .filter(entry -> !entry.sources().isEmpty()) //Should never be the case, but just to be sure
-                                                                   .map(entry -> new EarlyLoadingException.ExceptionData(
-                                                                     getErrorTranslationKey(entry),
-                                                                     entry.identifier().group() + ":" + entry.identifier().artifact(),
-                                                                     entry.sources()
-                                                                       .stream()
-                                                                       .flatMap(this::getModWithVersionRangeStream)
-                                                                       .map(this::formatError)
-                                                                       .collect(Collectors.joining(", ")))).toList();
+                .filter(entry -> !entry.sources().isEmpty()) //Should never be the case, but just to be sure
+                .map(this::buildExceptionData)
+                .toList();
 
         return new EarlyLoadingException(failedDependencies.size() + " Dependency restrictions were not met.", null, errors);
     }
 
+    @NotNull
+    private EarlyLoadingException.ExceptionData buildExceptionData(final JarSelector.ResolutionFailureInformation<IModFile> entry)
+    {
+        return new EarlyLoadingException.ExceptionData(
+                getErrorTranslationKey(entry),
+                entry.identifier().group() + ":" + entry.identifier().artifact(),
+                entry.sources()
+                        .stream()
+                        .flatMap(this::getModWithVersionRangeStream)
+                        .map(this::formatError)
+                        .collect(Collectors.joining(", "))
+        );
+    }
+
     @NotNull
     private String getErrorTranslationKey(final JarSelector.ResolutionFailureInformation<IModFile> entry)
     {
-        return entry.failureReason() == JarSelector.FailureReason.VERSION_RESOLUTION_FAILED
-                 ? "fml.dependencyloading.conflictingdependencies"
-                 : "fml.dependencyloading.mismatchedcontaineddependencies";
+        return entry.failureReason() == JarSelector.FailureReason.VERSION_RESOLUTION_FAILED ?
+                "fml.dependencyloading.conflictingdependencies" :
+                "fml.dependencyloading.mismatchedcontaineddependencies";
     }
 
     @NotNull
     private Stream<ModWithVersionRange> getModWithVersionRangeStream(final JarSelector.SourceWithRequestedVersionRange<IModFile> file)
     {
-        return file.sources().stream().map(IModFile::getModFileInfo)
+        return file.sources()
+                .stream()
+                .map(IModFile::getModFileInfo)
                 .flatMap(modFileInfo -> modFileInfo.getMods().stream())
                 .map(modInfo -> new ModWithVersionRange(modInfo, file.requestedVersionRange(), file.includedVersion()));
     }
 
     @NotNull
     private String formatError(final ModWithVersionRange modWithVersionRange)
     {
-        return "\u00a7e" + modWithVersionRange.modInfo().getModId() + "\u00a7r - \u00a74"
-                 + modWithVersionRange.versionRange().toString() + "\u00a74 - \u00a72"
-                 + modWithVersionRange.artifactVersion().toString() + "\u00a72";
+        return "\u00a7e" + modWithVersionRange.modInfo().getModId() + "\u00a7r - \u00a74" + modWithVersionRange.versionRange().toString() + "\u00a74 - \u00a72" + modWithVersionRange.artifactVersion().toString() + "\u00a72";
+    }
+
+    @Override
+    protected String identifyMod(final IModFile modFile)
+    {
+        if (modFile.getModFileInfo() == null || modFile.getModInfos().isEmpty())
+        {
+            return modFile.getFileName();
+        }
+
+        return modFile.getModInfos().stream().map(IModInfo::getModId).collect(Collectors.joining());
     }
 
-    private record ModWithVersionRange(IModInfo modInfo, VersionRange versionRange, ArtifactVersion artifactVersion) {}
-}
+    private record ModWithVersionRange(IModInfo modInfo, VersionRange versionRange, ArtifactVersion artifactVersion)
+    {}
+}

server_files/args.txt

@@ -1,6 +1,7 @@
 -p @MODULE_PATH@
 --add-modules @MODULES@
 --add-opens java.base/java.util.jar=cpw.mods.securejarhandler
+--add-opens java.base/java.lang.invoke=cpw.mods.securejarhandler
 --add-exports java.base/sun.security.util=cpw.mods.securejarhandler
 --add-exports jdk.naming.dns/com.sun.jndi.dns=java.naming
 -Djava.net.preferIPv6Addresses=system