From 2b5bfd923cc13135b88effc2fead234553534142 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 13 Oct 2021 12:19:22 -0700 Subject: [PATCH] Fix mods with both a manifest and a mods.toml have mismatched module names. --- Jenkinsfile | 6 +++--- .../java/net/minecraftforge/fml/loading/LibraryFinder.java | 4 ++-- .../fml/loading/moddiscovery/AbstractJarFileLocator.java | 2 +- .../fml/loading/moddiscovery/ModFileInfo.java | 5 ----- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2f97372ae8..8f31333b67 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,9 +36,9 @@ pipeline { } stage('pull_cache') { steps { - sh 'cp -rv /home/gradle/.gradle_cache/jdks/ /home/gradle/.gradle/jdks/' - sh 'cp -rv /home/gradle/.gradle_cache/wrapper/ /home/gradle/.gradle/wrapper/' - sh 'cp -rv /home/gradle/.gradle_cache/caches/ /home/gradle/.gradle/caches/' + sh 'cp -r /home/gradle/.gradle_cache/jdks/ /home/gradle/.gradle/jdks/' + sh 'cp -r /home/gradle/.gradle_cache/wrapper/ /home/gradle/.gradle/wrapper/' + sh 'cp -r /home/gradle/.gradle_cache/caches/ /home/gradle/.gradle/caches/' } } stage('setup') { diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/LibraryFinder.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/LibraryFinder.java index 9b0d99e0fa..5bc4235f66 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/LibraryFinder.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/LibraryFinder.java @@ -45,7 +45,7 @@ public class LibraryFinder { } // Not used anywhere in Forge's codebase, scheduled for deletion unless a good need is expressed. - @Deprecated(forRemoval = true, since = "1.171.1") + @Deprecated(forRemoval = true, since = "1.17.1") public static Path findJarPathFor(final String className, final String jarName) { final URL resource = LibraryFinder.class.getClassLoader().getResource(className); return findJarPathFor(className, jarName, resource); @@ -55,7 +55,7 @@ public class LibraryFinder { * Only used in ClasspathLocator now, so moved too a private method and depreciated this. * Scheduled for deletion unless a good need is expressed. */ - @Deprecated(forRemoval = true, since = "1.171.1") + @Deprecated(forRemoval = true, since = "1.17.1") public static Path findJarPathFor(final String resourceName, final String jarName, final URL resource) { try { Path path; diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractJarFileLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractJarFileLocator.java index a74b355c27..ab00ba6eb9 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractJarFileLocator.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractJarFileLocator.java @@ -79,7 +79,7 @@ public abstract class AbstractJarFileLocator implements IModLocator { private Optional createMod(Path path) { var mjm = new ModJarMetadata(); var sj = SecureJar.from(() -> ModFile.DEFAULTMANIFEST, - jar -> jar.getManifest() == ModFile.DEFAULTMANIFEST ? mjm : JarMetadata.from(jar, path), + jar -> jar.findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path), (root, p) -> true, path ); diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java index f4227b52fe..9d64be29ef 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java @@ -21,17 +21,13 @@ package net.minecraftforge.fml.loading.moddiscovery; import com.google.common.base.Strings; import cpw.mods.modlauncher.api.LamdbaExceptionUtils; -import cpw.mods.util.LambdaExceptionUtils; import net.minecraftforge.fml.loading.StringUtils; import net.minecraftforge.forgespi.language.IConfigurable; import net.minecraftforge.forgespi.language.IModFileInfo; import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.MavenVersionAdapter; -import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.maven.artifact.versioning.VersionRange; - import javax.security.auth.x500.X500Principal; import java.net.URL; import java.security.CodeSigner; @@ -44,7 +40,6 @@ import java.security.cert.Certificate; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.*; -import java.util.jar.Manifest; import java.util.stream.Collectors; import java.util.stream.Stream;