From 64caebe63c44582b8164aa7c2a4c72eed3559c1f Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Tue, 17 Mar 2026 21:21:26 +0000 Subject: [PATCH] Skip processing vanilla classes in RuntimeDistCleaner when running on a client Backport of #10682 to 1.20.1. Also bumped ASM to 9.9.1 for Java 26 support --- build.gradle | 2 +- buildSrc/build.gradle | 6 +++--- .../fml/loading/RuntimeDistCleaner.java | 11 +++++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index aae78a11a4..31f568fef7 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ ext { MODLAUNCHER_VERSION = '10.0.9' SECUREJARHANDLER_VERSION = '2.1.10' BOOTSTRAPLAUNCHER_VERSION = '1.1.2' - ASM_VERSION = '9.8' + ASM_VERSION = '9.9.1' INSTALLER_VERSION = '2.2.+' MIXIN_VERSION = '0.8.5' TERMINALCONSOLEAPPENDER_VERSION = '1.2.0' diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 7faf142df1..f99dfb7c72 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -4,9 +4,9 @@ repositories { } dependencies { - implementation 'org.ow2.asm:asm:9.5' - implementation 'org.ow2.asm:asm-tree:9.5' - implementation 'net.minecraftforge:srgutils:0.5.+' + implementation 'org.ow2.asm:asm:9.9.1' + implementation 'org.ow2.asm:asm-tree:9.9.1' + implementation 'net.minecraftforge:srgutils:0.6.2' implementation 'commons-io:commons-io:2.12.0' implementation 'com.google.code.gson:gson:2.10.1' implementation 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r' diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/RuntimeDistCleaner.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/RuntimeDistCleaner.java index 37a477b39b..a3d2f3fd87 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/RuntimeDistCleaner.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/RuntimeDistCleaner.java @@ -34,8 +34,7 @@ import org.slf4j.Logger; import org.slf4j.Marker; import org.slf4j.MarkerFactory; -public class RuntimeDistCleaner implements ILaunchPluginService -{ +public final class RuntimeDistCleaner implements ILaunchPluginService { private static final Logger LOGGER = LogUtils.getLogger(); private static final Marker DISTXFORM = MarkerFactory.getMarker("DISTXFORM"); private static String DIST; @@ -61,7 +60,7 @@ public class RuntimeDistCleaner implements ILaunchPluginService { unpack(classNode.visibleAnnotations).stream() .filter(ann->Objects.equals(ann.desc, ONLYIN)) - .filter(ann->ann.values.indexOf("_interface") != -1) + .filter(ann-> ann.values.contains("_interface")) .filter(ann->!Objects.equals(((String[])ann.values.get(ann.values.indexOf("value") + 1))[1], DIST)) .map(ann -> ((Type)ann.values.get(ann.values.indexOf("_interface") + 1)).getInternalName()) .forEach(intf -> { @@ -151,7 +150,7 @@ public class RuntimeDistCleaner implements ILaunchPluginService { return unpack(anns).stream(). filter(ann->Objects.equals(ann.desc, ONLYIN)). - filter(ann->ann.values.indexOf("_interface") == -1). + filter(ann-> !ann.values.contains("_interface")). anyMatch(ann -> !Objects.equals(((String[])ann.values.get(ann.values.indexOf("value")+1))[1], side)); } @@ -177,6 +176,10 @@ public class RuntimeDistCleaner implements ILaunchPluginService if (internalName.startsWith("net/minecraftforge/")) return NAY; + // No Vanilla classes use @OnlyIn(Dist.SERVER), so we can skip them entirely when we're running on a client + if (FMLEnvironment.dist.isClient() && (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/"))) + return NAY; + return YAY; }