From 26e4d2fdfdeaa22ab248060416e28e8ae62ef301 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Thu, 4 Dec 2025 00:35:44 +0200 Subject: [PATCH] Disable workaround for Neo breakage on newer versions --- .../forge/minecraft/MinecraftPatchedProvider.java | 15 ++++++++++++--- .../integration/neoforge/NeoForge1210Test.groovy | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/dev/architectury/loom/forge/minecraft/MinecraftPatchedProvider.java b/src/main/java/dev/architectury/loom/forge/minecraft/MinecraftPatchedProvider.java index 69a4420b..db960003 100644 --- a/src/main/java/dev/architectury/loom/forge/minecraft/MinecraftPatchedProvider.java +++ b/src/main/java/dev/architectury/loom/forge/minecraft/MinecraftPatchedProvider.java @@ -105,7 +105,10 @@ public class MinecraftPatchedProvider { private static final String CURRENT_LOOM_PATCH_VERSION = "10"; private static final String NAME_MAPPING_SERVICE_PATH = "/inject/META-INF/services/cpw.mods.modlauncher.api.INameMappingService"; - private static final String NEOFORGE_MANUAL_CLEAR_JAR_CREATION_VERSION = "21.10.57-beta"; + // The version where the bug was introduced. + private static final String MIN_NEOFORGE_MANUAL_CLEAN_JAR_CREATION_VERSION = "21.10.57-beta"; + // The version where the bug was fixed. + private static final String MAX_NEOFORGE_MANUAL_CLEAN_JAR_CREATION_VERSION = "21.10.64"; private final Project project; private final Logger logger; @@ -194,8 +197,14 @@ public class MinecraftPatchedProvider { } Version currentVersion = Version.parse(getExtension().getForgeProvider().getVersion().getCombined()); - Version minVersion = Version.parse(NEOFORGE_MANUAL_CLEAR_JAR_CREATION_VERSION); - return currentVersion.compareTo(minVersion) >= 0; + Version minVersion = Version.parse(MIN_NEOFORGE_MANUAL_CLEAN_JAR_CREATION_VERSION); + + if (currentVersion.compareTo(minVersion) < 0) { + return false; // old enough to skip the workaround + } + + Version maxVersion = Version.parse(MAX_NEOFORGE_MANUAL_CLEAN_JAR_CREATION_VERSION); + return currentVersion.compareTo(maxVersion) < 0; } public void provide() throws Exception { diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/neoforge/NeoForge1210Test.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/neoforge/NeoForge1210Test.groovy index 50f40a6d..a05c831a 100644 --- a/src/test/groovy/net/fabricmc/loom/test/integration/neoforge/NeoForge1210Test.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/neoforge/NeoForge1210Test.groovy @@ -58,5 +58,6 @@ class NeoForge1210Test extends Specification implements GradleProjectTestTrait { '1.21' | '21.0.77-beta' | 'loom.officialMojangMappings()' | '' '1.21' | '21.0.77-beta' | "'net.fabricmc:yarn:1.21+build.1:v2'" | "'dev.architectury:yarn-mappings-patch-neoforge:1.21+build.4'" '1.21.10' | '21.10.63' | 'loom.officialMojangMappings()' | '' + '1.21.10' | '21.10.64' | 'loom.officialMojangMappings()' | '' } }