修复kubejs环境下加载路径的问题

Author: Wulian233

.github/workflows/build.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -29,11 +29,6 @@ jobs:
           chmod +x gradlew
           ./gradlew build
 
-      - name: Merge Fabric & Neoforge JARs
-        run: |
-          chmod +x gradlew
-          ./gradlew fusejars
-
       - name: Upload fabric artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -51,9 +46,3 @@ jobs:
         with:
           name: neoforge-artifacts
           path: ${{ github.workspace }}/neoforge/build/libs
-
-      - name: Upload merged artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: merged
-          path: ${{ github.workspace }}/build/merged/*

build.gradle

@@ -2,7 +2,6 @@ plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
     id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
     id "com.gradleup.shadow" version "9.+" apply false
-    id "com.hypherionmc.modutils.modfusioner" version "1.+"
 }
 
 architectury {
@@ -38,25 +37,3 @@ allprojects {
         withSourcesJar()
     }
 }
-
-fusioner {
-    packageGroup = rootProject.maven_group
-    mergedJarName = "${rootProject.archives_base_name}.jar"
-    outputDirectory = "build/merged"
-    jarVersion = rootProject.version
-
-    fabric {
-        projectName = "fabric"
-        inputTaskName = "remapJar"
-    }
-
-    forge {
-        projectName = "forge"
-        inputTaskName = "remapJar"
-    }
-
-    neoforge {
-        projectName = "neoforge"
-        inputTaskName = "remapJar"
-    }
-}

common/src/main/java/com/wulian/texturelocaleredirector/mixin/NamespaceResourceManagerMixin.java

@@ -24,26 +24,38 @@ private void onFindResources(String startingPath, Predicate<Identifier> allowedP
                                  CallbackInfoReturnable<Map<Identifier, Resource>> cir) {
 
         String currentLang = LangTextureCache.getCurrentLanguage();
-
-        if ("en_us".equals(currentLang) || !startingPath.startsWith("textures/")) {
+        if ("en_us".equals(currentLang)) {
             return;
         }
 
         Map<Identifier, Resource> originalResources = cir.getReturnValue();
         if (originalResources.isEmpty()) return;
 
         Map<Identifier, Resource> langSpecificResources = new HashMap<>();
-        String texturePrefix = "textures/";
-        int prefixLength = texturePrefix.length();
+        String textureKey = "textures/";
 
         for (Map.Entry<Identifier, Resource> entry : originalResources.entrySet()) {
             Identifier originalId = entry.getKey();
 
-            if (originalId.getPath().endsWith(".mcmeta") || !allowedPathPredicate.test(originalId)) {
+            if (!allowedPathPredicate.test(originalId)) {
+                continue;
+            }
+
+            String path = originalId.getPath();
+            int idx = path.indexOf(textureKey);
+            if (idx == -1) {
+                continue; // 跳过不含 textures/ 的路径
+            }
+
+            String before = path.substring(0, idx + textureKey.length());
+            String after = path.substring(idx + textureKey.length());
+
+            // 避免重复，如zh_cn/zh_cn
+            if (after.startsWith(currentLang + "/")) {
                 continue;
             }
 
-            String langSpecificPath = texturePrefix + currentLang + '/' + originalId.getPath().substring(prefixLength);
+            String langSpecificPath = before + currentLang + '/' + after;
             Identifier langId = new Identifier(originalId.getNamespace(), langSpecificPath);
 
             Boolean cache = LangTextureCache.get(langId);
@@ -74,9 +86,8 @@ private void onFindResources(String startingPath, Predicate<Identifier> allowedP
             }
         }
 
-        //noinspection ConstantConditions
         if (!langSpecificResources.isEmpty()) {
             originalResources.putAll(langSpecificResources);
         }
     }
-}
+}

common/src/main/java/com/wulian/texturelocaleredirector/mixin/ftbquests/ChapterImageMixin.java

@@ -18,13 +18,18 @@ public abstract class ChapterImageMixin {
     )
     private Icon injectLocalizedImage(Icon image) {
         String currentLang = LangTextureCache.getCurrentLanguage();
-        if ("en_us".equals(currentLang)) {
+
+        if ("en_us".equals(currentLang) || image == null) {
             return image;
         }
 
         String path = image.toString();
-        if (path.startsWith("textures/")) {
-            String localizedPath = "textures/" + currentLang + "/" + path.substring(9);
+        int idx = path.indexOf("textures/");
+        if (idx != -1) {
+            String before = path.substring(0, idx + 9); // 包含 "textures/"
+            String after = path.substring(idx + 9);
+            String localizedPath = before + currentLang + "/" + after;
+
             Icon localizedIcon = Icon.getIcon(localizedPath);
 
             if (!localizedIcon.isEmpty()) {
@@ -35,4 +40,4 @@ private Icon injectLocalizedImage(Icon image) {
 
         return image;
     }
-}
+}

gradle.properties

@@ -6,7 +6,7 @@ enabled_platforms=fabric,forge,neoforge
 yarn_mappings=1.20.4+build.3
 
 archives_base_name=Texture-Locale-Redirector
-mod_version=1.2.0
+mod_version=1.3.0
 maven_group=com.wulian.texturelocaleredirector
 
 forge_version=49.2.0

settings.gradle

@@ -4,7 +4,6 @@ pluginManagement {
         maven { url "https://maven.fabricmc.net/" }
         maven { url "https://maven.minecraftforge.net/" }
         maven { url "https://maven.neoforged.net/releases/" }
-        maven { url "https://maven.firstdarkdev.xyz/releases/" }
         gradlePluginPortal()
     }
 }