Fix path split

Author: Wulian233

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

@@ -17,7 +17,7 @@
 import java.util.function.Predicate;
 
 @Mixin(NamespaceResourceManager.class)
-public abstract class NamespaceResourceManagerMixin {
+public abstract class NamespaceResourceManagerMixin implements ResourceManager{
 
     @Inject(method = "findResources", at = @At("RETURN"))
     private void onFindResources(String startingPath, Predicate<Identifier> allowedPathPredicate,
@@ -30,57 +30,51 @@ private void onFindResources(String startingPath, Predicate<Identifier> allowedP
         }
 
         Map<Identifier, Resource> originalResources = cir.getReturnValue();
-        if (originalResources.isEmpty()) return;
+        if (originalResources.isEmpty()) {
+            return;
+        }
 
         Map<Identifier, Resource> langSpecificResources = new HashMap<>();
-        String texturePrefix = "textures/";
 
         for (Map.Entry<Identifier, Resource> entry : originalResources.entrySet()) {
             Identifier originalId = entry.getKey();
+            String originalPath = originalId.getPath();
+
+            String[] parts = originalPath.split("/", 2);
 
-            if (!allowedPathPredicate.test(originalId)) {
+            if (parts.length < 2) {
                 continue;
             }
 
-            String originalPath = originalId.getPath();
-            int index = originalPath.indexOf(texturePrefix) + texturePrefix.length();
-
-            String before = originalPath.substring(0, index);
-            String after = originalPath.substring(index);
+            String topLevelDir = parts[0];
+            String subPath = parts[1];
 
             // 避免重复，如zh_cn/zh_cn
-            if (after.startsWith(currentLang + "/")) {
+            if (subPath.startsWith(currentLang + "/")) {
                 continue;
             }
 
-            String langSpecificPath = before + currentLang + '/' + after;
+            String langSpecificPath = topLevelDir + "/" + currentLang + "/" + subPath;
             Identifier langId = Identifier.of(originalId.getNamespace(), langSpecificPath);
 
             Boolean cache = LangTextureCache.get(langId);
             if (cache != null) {
                 if (cache) {
-                    try {
-                        ((ResourceManager) this).getResource(langId).ifPresent(resource -> {
-                            langSpecificResources.put(originalId, resource);
-                            TextureLocaleRedirector.LOGGER.info("Using cached localized texture: {}", langId);
-                        });
-                    } catch (Exception ignored) {}
+                    this.getResource(langId).ifPresent(resource -> {
+                        langSpecificResources.put(originalId, resource);
+                        TextureLocaleRedirector.LOGGER.info("Using cached localized resource: {}", langId);
+                    });
                 }
                 continue;
             }
 
-            try {
-                Optional<Resource> langResource = ((ResourceManager) this).getResource(langId);
-                if (langResource.isPresent()) {
-                    langSpecificResources.put(originalId, langResource.get());
-                    LangTextureCache.put(langId, true);
-                    TextureLocaleRedirector.LOGGER.info("Found and cached localized texture: {}", langId);
-                } else {
-                    LangTextureCache.put(langId, false);
-                }
-            } catch (Exception e) {
+            Optional<Resource> langResource = this.getResource(langId);
+            if (langResource.isPresent()) {
+                langSpecificResources.put(originalId, langResource.get());
+                LangTextureCache.put(langId, true);
+                TextureLocaleRedirector.LOGGER.info("Found and cached localized resource: {}", langId);
+            } else {
                 LangTextureCache.put(langId, false);
-                TextureLocaleRedirector.LOGGER.warn("Failed to load localized texture: {}", langId, e);
             }
         }
 

fabric/src/main/resources/fabric.mod.json

@@ -23,7 +23,6 @@
     "texturelocaleredirector.mixins.json"
   ],
   "depends": {
-    "fabric": "*",
     "minecraft": ">=1.20.5 <1.21"
   }
 }

gradle.properties

@@ -7,10 +7,10 @@ yarn_mappings=1.20.6+build.3
 yarn_patch=1.20.6+build.4
 
 archives_base_name=Texture-Locale-Redirector
-mod_version=1.3.0
+mod_version=1.4.0
 maven_group=com.wulian.texturelocaleredirector
 
-forge_version=50.2.1
+forge_version=50.2.2
 neoforge_version=20.6.138
 
 fabric_loader_version=0.17.2