From 5f37e8af53d9483fa372f6aee9c8a9c7d23c525c Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 2 Apr 2026 19:18:23 -0700 Subject: [PATCH] Work around 3rd party launchers who build incorrect classpaths Closes #10797 --- build_forge.gradle | 10 +++++----- .../fml/loading/targets/ForgeProdLaunchHandler.java | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build_forge.gradle b/build_forge.gradle index 3df89c798d..27c950ac8b 100644 --- a/build_forge.gradle +++ b/build_forge.gradle @@ -88,7 +88,7 @@ ext { } final String MAVEN_PATH = ext.MAVEN_PATH -final String BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.2.0:fatjar' +final String BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.3.0:fatjar' final String INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.5' final String FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.6' final String S2S_TOOL = 'net.minecraftforge:Srg2Source:8.2.0:fatjar' @@ -459,14 +459,14 @@ tasks.register('applyClientBinPatches', ApplyBinPatches) { tool = BINPATCH_TOOL clean = downloadClientRaw.dest patch = genClientBinPatches.output - args.addAll(['--data', '--unpatched']) + args.addAll(['--data', '--unpatched', '--store', '--marker', '.forge_patched_minecraft']) } tasks.register('applyServerBinPatches', ApplyBinPatches) { dependsOn extractServer tool = BINPATCH_TOOL clean = extractServer.output patch = genServerBinPatches.output - args.addAll(['--data', '--unpatched']) + args.addAll(['--data', '--unpatched', '--store']) } tasks.register('applyJoinedBinPatches', ApplyBinPatches) { tool = BINPATCH_TOOL @@ -718,7 +718,7 @@ tasks.register('installerJson', InstallerJson) { '--clean', '{MC_UNPACKED}', '--output', '{PATCHED}', '--apply', '{BINPATCH}', - '--data', '--unpatched' + '--data', '--unpatched', '--store' ], outputs: [ '{PATCHED}': '{PATCHED_SHA}' @@ -731,7 +731,7 @@ tasks.register('installerJson', InstallerJson) { '--clean', '{MINECRAFT_JAR}', '--output', '{PATCHED}', '--apply', '{BINPATCH}', - '--data', '--unpatched' + '--data', '--unpatched', '--store', '--marker', '.forge_patched_minecraft' ], outputs: [ '{PATCHED}': '{PATCHED_SHA}' diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeProdLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeProdLaunchHandler.java index 1488be3a7a..ee622db88a 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeProdLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeProdLaunchHandler.java @@ -25,7 +25,9 @@ sealed abstract class ForgeProdLaunchHandler extends CommonLaunchHandler { @Override public List getMinecraftPaths() { - return List.of(getPathFromResource("net/minecraft/client/Minecraft.class")); + // We use a marker because 3rd party launcher don't build their class paths correctly + // https://github.com/MinecraftForge/MinecraftForge/issues/10797 + return List.of(getPathFromResource(".forge_patched_minecraft")); } }