Backport to 1.20-1.20.4

Wulian233 · Wulian233 · commit d6c2210da6d8 · 2025-08-09T19:52:41.000+08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,11 +9,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 17
 
       - name: Cache
         uses: actions/cache@v4
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,6 @@ subprojects {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
         mappings loom.layered {
             mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-            mappings "dev.architectury:yarn-mappings-patch-neoforge:${project.yarn_patch}"
         }
     }
 }
@@ -32,7 +31,7 @@ allprojects {
 
     tasks.withType(JavaCompile).configureEach {
         options.encoding = "UTF-8"
-        options.release = 21
+        options.release = 17
     }
 
     java {
diff --git a/common/src/main/java/com/wulian/texturelocaleredirector/mixin/IdentifierAccessor.java b/common/src/main/java/com/wulian/texturelocaleredirector/mixin/IdentifierAccessor.java
diff --git a/common/src/main/java/com/wulian/texturelocaleredirector/mixin/NamespaceResourceManagerMixin.java b/common/src/main/java/com/wulian/texturelocaleredirector/mixin/NamespaceResourceManagerMixin.java
@@ -44,7 +44,7 @@ private void onFindResources(String startingPath, Predicate<Identifier> allowedP
             }
 
             String langSpecificPath = texturePrefix + currentLang + '/' + originalId.getPath().substring(prefixLength);
-            Identifier langId = IdentifierAccessor.create(originalId.getNamespace(), langSpecificPath);
+            Identifier langId = new Identifier(originalId.getNamespace(), langSpecificPath);
 
             Boolean cache = LangTextureCache.get(langId);
             if (cache != null) {
diff --git a/common/src/main/resources/texturelocaleredirector.mixins.json b/common/src/main/resources/texturelocaleredirector.mixins.json
@@ -1,13 +1,12 @@
 {
   "required": true,
   "package": "com.wulian.texturelocaleredirector.mixin",
-  "compatibilityLevel": "JAVA_21",
+  "compatibilityLevel": "JAVA_17",
   "minVersion": "0.8",
   "injectors": {
     "defaultRequire": 1
   },
   "client": [
-    "IdentifierAccessor",
     "LanguageManagerMixin",
     "NamespaceResourceManagerMixin",
     "ReloadableResourceManagerImplMixin"
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -24,6 +24,6 @@
   ],
   "depends": {
     "fabric": "*",
-    "minecraft": ">=1.20.5"
+    "minecraft": ">=1.20 <1.20.5"
   }
 }
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[49,)"
+loaderVersion = "[38,)"
 issueTrackerURL = "https://github.com/Wulian233/TextureLocaleRedirector/issues"
 license = "MIT"
 
@@ -20,6 +20,6 @@ config = "texturelocaleredirector.mixins.json"
 [[dependencies.texturelocaleredirector]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20.5,)"
+versionRange = "[1.20,1.20.5)"
 ordering = "NONE"
 side = "BOTH"
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "Texture-Locale-Redirector",
-    "pack_format": 34
+    "pack_format": 22
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,17 +1,16 @@
 org.gradle.jvmargs=-Xmx4g
 
-minecraft_version=1.21.1
+minecraft_version=1.20.4
 enabled_platforms=fabric,forge,neoforge
 
-yarn_mappings=1.21.1+build.3
-yarn_patch=1.21+build.4
+yarn_mappings=1.20.4+build.3
 
 archives_base_name=Texture-Locale-Redirector
 mod_version=1.0.0
 maven_group=com.wulian.texturelocaleredirector
 
-forge_version=52.1.3
-neoforge_version=21.1.197
+forge_version=49.2.0
+neoforge_version=20.4.247
 
 fabric_loader_version=0.17.2
-fabric_api_version=0.116.5+1.21.1
+fabric_api_version=0.97.3+1.20.4
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -33,7 +33,7 @@ dependencies {
 processResources {
     inputs.property "version", project.version
 
-    filesMatching("META-INF/neoforge.mods.toml") {
+    filesMatching("META-INF/mods.toml") {
         expand "version": project.version
     }
 }
diff --git a/neoforge/src/main/java/com/wulian/texturelocaleredirector/neoforge/TextureLocaleRedirectorClientNeoForge.java b/neoforge/src/main/java/com/wulian/texturelocaleredirector/neoforge/TextureLocaleRedirectorClientNeoForge.java
@@ -1,11 +1,15 @@
 package com.wulian.texturelocaleredirector.neoforge;
 
 import com.wulian.texturelocaleredirector.TextureLocaleRedirector;
-import net.neoforged.api.distmarker.Dist;
+import net.neoforged.fml.IExtensionPoint.DisplayTest;
+import net.neoforged.fml.ModContainer;
+import net.neoforged.fml.ModList;
 import net.neoforged.fml.common.Mod;
 
-@Mod(value = TextureLocaleRedirector.MOD_ID, dist = Dist.CLIENT)
+@Mod(value = TextureLocaleRedirector.MOD_ID)
 public class TextureLocaleRedirectorClientNeoForge {
     public TextureLocaleRedirectorClientNeoForge() {
+        ModContainer container = ModList.get().getModContainerById(TextureLocaleRedirector.MOD_ID).orElseThrow();
+        container.registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> DisplayTest.IGNORESERVERONLY, (a, b) -> true));
     }
 }
diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml
@@ -19,6 +19,6 @@ config = "texturelocaleredirector.mixins.json"
 [[dependencies.texturelocaleredirector]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.20.5,)"
+versionRange = "[1.20.2,1.20.5)"
 ordering = "NONE"
 side = "BOTH"
diff --git a/neoforge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "description": "Texture-Locale-Redirector",
+    "pack_format": 22
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ subprojects {`
`17`	`17`	`minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"`
`18`	`18`	`mappings loom.layered {`
`19`	`19`	`mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"`
`20`		`- mappings "dev.architectury:yarn-mappings-patch-neoforge:${project.yarn_patch}"`
`21`	`20`	`}`
`22`	`21`	`}`
`23`	`22`	`}`
`@@ -32,7 +31,7 @@ allprojects {`
`32`	`31`
`33`	`32`	`tasks.withType(JavaCompile).configureEach {`
`34`	`33`	`options.encoding = "UTF-8"`
`35`		`- options.release = 21`
	`34`	`+ options.release = 17`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`java {`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ private void onFindResources(String startingPath, Predicate<Identifier> allowedP`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`String langSpecificPath = texturePrefix + currentLang + '/' + originalId.getPath().substring(prefixLength);`
`47`		`- Identifier langId = IdentifierAccessor.create(originalId.getNamespace(), langSpecificPath);`
	`47`	`+ Identifier langId = new Identifier(originalId.getNamespace(), langSpecificPath);`
`48`	`48`
`49`	`49`	`Boolean cache = LangTextureCache.get(langId);`
`50`	`50`	`if (cache != null) {`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@`
`24`	`24`	`],`
`25`	`25`	`"depends": {`
`26`	`26`	`"fabric": "*",`
`27`		`- "minecraft": ">=1.20.5"`
	`27`	`+ "minecraft": ">=1.20 <1.20.5"`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"pack": {`
`3`	`3`	`"description": "Texture-Locale-Redirector",`
`4`		`- "pack_format": 34`
	`4`	`+ "pack_format": 22`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ dependencies {`
`33`	`33`	`processResources {`
`34`	`34`	`inputs.property "version", project.version`
`35`	`35`
`36`		`- filesMatching("META-INF/neoforge.mods.toml") {`
	`36`	`+ filesMatching("META-INF/mods.toml") {`
`37`	`37`	`expand "version": project.version`
`38`	`38`	`}`
`39`	`39`	`}`