From dc9c0d7e35f41a8ef91a07072eac4f811138dc18 Mon Sep 17 00:00:00 2001 From: Su5eD Date: Tue, 8 Nov 2022 21:17:48 +0100 Subject: [PATCH] Fix launch handler minecraft classpath locator (#9120) --- .../net/minecraftforge/fml/loading/FileUtils.java | 13 +++++++++++++ .../fml/loading/targets/CommonDevLaunchHandler.java | 12 ++++++++++-- .../loading/targets/CommonUserdevLaunchHandler.java | 6 ------ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/FileUtils.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/FileUtils.java index 7cc66b9dd3..fc62ab352d 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/FileUtils.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/FileUtils.java @@ -8,6 +8,7 @@ package net.minecraftforge.fml.loading; import com.mojang.logging.LogUtils; import org.slf4j.Logger; +import java.io.File; import java.io.IOException; import java.nio.file.FileAlreadyExistsException; import java.nio.file.Files; @@ -53,4 +54,16 @@ public class FileUtils return ""; } } + + public static boolean matchFileName(String path, String... matches) { + // Extract file name from path + String name = path.substring(Math.min(path.lastIndexOf(File.separatorChar) + 1, path.length())); + // Check if it contains any of the desired keywords + for (String match : matches) { + if (name.contains(match)) { + return true; + } + } + return false; + } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonDevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonDevLaunchHandler.java index d6a27282f7..bdc8e9f832 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonDevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonDevLaunchHandler.java @@ -6,6 +6,7 @@ package net.minecraftforge.fml.loading.targets; import cpw.mods.jarhandling.SecureJar; +import net.minecraftforge.fml.loading.FileUtils; import java.io.File; import java.nio.file.Path; @@ -29,7 +30,7 @@ public abstract class CommonDevLaunchHandler extends CommonLaunchHandler { // The extra jar is on the classpath, so try and pull it out of the legacy classpath var legacyCP = Objects.requireNonNull(System.getProperty("legacyClassPath"), "Missing legacyClassPath, cannot find client-extra").split(File.pathSeparator); - var extra = Paths.get(Arrays.stream(legacyCP).filter(e -> e.contains("client-extra")).findFirst().orElseThrow(() -> new IllegalStateException("Could not find client-extra in legacy classpath"))); + var extra = findJarOnClasspath(legacyCP, "client-extra"); mcstream.add(extra); // The MC code/Patcher edits are in exploded directories @@ -77,11 +78,18 @@ public abstract class CommonDevLaunchHandler extends CommonLaunchHandler { protected List getFmlStuff(String[] classpath) { // We also want the FML things, fmlcore, javafmllanguage, mclanguage, I don't like hard coding these, but hey whatever works for now. return Arrays.stream(classpath) - .filter(e -> e.contains("fmlcore") || e.contains("javafmllanguage") || e.contains("lowcodelanguage") || e.contains("mclanguage")) + .filter(e -> FileUtils.matchFileName(e, "fmlcore", "javafmllanguage", "lowcodelanguage", "mclanguage")) .map(Paths::get) .toList(); } + protected static Path findJarOnClasspath(String[] classpath, String match) { + return Paths.get(Arrays.stream(classpath) + .filter(e -> FileUtils.matchFileName(e, match)) + .findFirst() + .orElseThrow(() -> new IllegalStateException("Could not find " + match + " in classpath"))); + } + protected BiPredicate getMcFilter(Path extra, List minecraft, Stream.Builder> mods) { final var packages = getPackages(); final var extraPath = extra.toString().replace('\\', '/'); diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonUserdevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonUserdevLaunchHandler.java index 0b698c051f..cbc31398c2 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonUserdevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonUserdevLaunchHandler.java @@ -10,8 +10,6 @@ import net.minecraftforge.fml.loading.VersionInfo; import java.io.File; import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -41,8 +39,4 @@ public abstract class CommonUserdevLaunchHandler extends CommonDevLaunchHandler } protected abstract void processStreams(String[] classpath, VersionInfo versionInfo, Stream.Builder mc, Stream.Builder> mods); - - protected static Path findJarOnClasspath(String[] classpath, String match) { - return Paths.get(Arrays.stream(classpath).filter(e -> e.contains(match)).findFirst().orElseThrow(() -> new IllegalStateException("Could not find " + match + " in classpath"))); - } }