imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-28 04:07:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Disable workaround for Neo breakage on newer versions

Browse Source
This commit is contained in:
Juuz
2025-12-04 00:35:44 +02:00
parent 826297c56c
commit 26e4d2fdfd
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/dev/architectury/loom/forge/minecraft/MinecraftPatchedProvider.java
View File

@@ -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 {

1
src/test/groovy/net/fabricmc/loom/test/integration/neoforge/NeoForge1210Test.groovy
View File

@@ -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()' | ''
}
}