Big Rewrite 1.5.0

Author: Wulian233

build.gradle

@@ -30,10 +30,6 @@ allprojects {
     version = rootProject.mod_version
     group = rootProject.maven_group
 
-    repositories {
-        maven { url "https://maven.ftb.dev/releases" }
-    }
-
     tasks.withType(JavaCompile).configureEach {
         options.encoding = "UTF-8"
         options.release = 17

common/build.gradle

@@ -2,13 +2,8 @@ architectury {
     common(rootProject.enabled_platforms.split(","))
 }
 
-repositories {
-    maven { url = "https://maven.ftb.dev/releases" }
-}
-
 dependencies {
     // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
     // Do NOT use other classes from fabric loader
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    modImplementation "dev.ftb.mods:ftb-quests:${rootProject.ftb_quests_version}"
 }

common/src/main/java/com/wulian/texturelocaleredirector/LangTextureCache.java

@@ -31,4 +31,25 @@ public static void setCurrentLanguage(String lang) {
     public static String getCurrentLanguage() {
         return currentLanguage;
     }
-}
+
+    public static Identifier getLocalizedId(Identifier originalId) {
+        String lang = currentLanguage;
+
+        String originalPath = originalId.getPath();
+
+        String texturePrefix = "textures/";
+        int index = originalPath.indexOf(texturePrefix);
+        if (index == -1) return null;
+
+        String before = originalPath.substring(0, index + texturePrefix.length());
+        String after  = originalPath.substring(index + texturePrefix.length());
+
+        // Avoid duplicate redirection textures/zh_cn/zh_cn/...
+        if (after.startsWith(lang + "/")) {
+            return null;
+        }
+
+        String localizedPath = before + lang + "/" + after;
+        return Identifier.of(originalId.getNamespace(), localizedPath);
+    }
+}

common/src/main/java/com/wulian/texturelocaleredirector/TLRMixinPlugin.java

@@ -7,6 +7,7 @@
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -17,15 +18,13 @@
 import java.util.function.Predicate;
 
 @Mixin(NamespaceResourceManager.class)
-public abstract class NamespaceResourceManagerMixin implements ResourceManager{
+public abstract class NamespaceResourceManagerMixin implements ResourceManager {
 
     @Inject(method = "findResources", at = @At("RETURN"))
     private void onFindResources(String startingPath, Predicate<Identifier> allowedPathPredicate,
                                  CallbackInfoReturnable<Map<Identifier, Resource>> cir) {
 
-        String currentLang = LangTextureCache.getCurrentLanguage();
-
-        if ("en_us".equals(currentLang)) {
+        if ("en_us".equals(LangTextureCache.getCurrentLanguage())) {
             return;
         }
 
@@ -38,48 +37,56 @@ private void onFindResources(String startingPath, Predicate<Identifier> allowedP
 
         for (Map.Entry<Identifier, Resource> entry : originalResources.entrySet()) {
             Identifier originalId = entry.getKey();
-            String originalPath = originalId.getPath();
-
-            String[] parts = originalPath.split("/", 2);
+            Identifier langId = LangTextureCache.getLocalizedId(originalId);
 
-            if (parts.length < 2) {
+            if (langId == null) {
                 continue;
             }
 
-            String topLevelDir = parts[0];
-            String subPath = parts[1];
+            Optional<Resource> langResource = this.checkResourceAndCache(langId, originalId);
+            langResource.ifPresent(resource -> langSpecificResources.put(originalId, resource));
+        }
 
-            // 避免重复，如zh_cn/zh_cn
-            if (subPath.startsWith(currentLang + "/")) {
-                continue;
-            }
+        if (!langSpecificResources.isEmpty()) {
+            originalResources.putAll(langSpecificResources);
+        }
+    }
 
-            String langSpecificPath = topLevelDir + "/" + currentLang + "/" + subPath;
-            Identifier langId = new Identifier(originalId.getNamespace(), langSpecificPath);
-
-            Boolean cache = LangTextureCache.get(langId);
-            if (cache != null) {
-                if (cache) {
-                    this.getResource(langId).ifPresent(resource -> {
-                        langSpecificResources.put(originalId, resource);
-                        TextureLocaleRedirector.LOGGER.info("Using cached localized resource: {}", langId);
-                    });
-                }
-                continue;
-            }
+    @Inject(method = "getResource", at = @At("HEAD"), cancellable = true)
+    private void onGetResource(Identifier id, CallbackInfoReturnable<Optional<Resource>> cir) {
 
-            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);
+        Identifier langId = LangTextureCache.getLocalizedId(id);
+        if (langId == null) {
+            return;
+        }
+
+        Optional<Resource> langResource = this.checkResourceAndCache(langId, id);
+        if (langResource.isPresent()) {
+            cir.setReturnValue(langResource);
+        }
+    }
+
+    @Unique
+    public Optional<Resource> checkResourceAndCache(Identifier langId, Identifier originalId) {
+        Boolean cache = LangTextureCache.get(langId);
+
+        if (cache != null) {
+            if (cache) {
+                return this.getResource(langId);
             } else {
-                LangTextureCache.put(langId, false);
+                return Optional.empty();
             }
         }
 
-        if (!langSpecificResources.isEmpty()) {
-            originalResources.putAll(langSpecificResources);
+        Optional<Resource> langResource = this.getResource(langId);
+
+        if (langResource.isPresent()) {
+            LangTextureCache.put(langId, true);
+            TextureLocaleRedirector.LOGGER.info("Redirected resource {} -> {}", originalId, langId);
+            return langResource;
+        } else {
+            LangTextureCache.put(langId, false);
+            return Optional.empty();
         }
     }
 }

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

@@ -1,7 +1,6 @@
 {
   "required": true,
   "package": "com.wulian.texturelocaleredirector.mixin",
-  "plugin": "com.wulian.texturelocaleredirector.TLRMixinPlugin",
   "compatibilityLevel": "JAVA_17",
   "minVersion": "0.8",
   "injectors": {
@@ -11,8 +10,5 @@
     "LanguageManagerMixin",
     "NamespaceResourceManagerMixin",
     "ReloadableResourceManagerImplMixin"
-  ],
-  "mixins": [
-    "ftbquests.ChapterImageMixin"
   ]
 }

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

@@ -25,7 +25,6 @@ configurations {
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
-    modApi "dev.ftb.mods:ftb-quests-fabric:${rootProject.ftb_quests_version}"
 
     common(project(path: ":common", configuration: "namedElements")) {
         transitive = false

common/src/main/resources/texturelocaleredirector.mixins.json

@@ -29,13 +29,8 @@ loom {
     }
 }
 
-repositories {
-    maven { url = "https://maven.ftb.dev/releases" }
-}
-
 dependencies {
     forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
-    modApi "dev.ftb.mods:ftb-quests-forge:${rootProject.ftb_quests_version}"
 
     common(project(path: ":common", configuration: "namedElements")) {
         transitive = false

fabric/build.gradle

@@ -15,4 +15,3 @@ neoforge_version=20.4.251
 fabric_loader_version=0.18.1
 fabric_api_version=0.97.3+1.20.4
 
-ftb_quests_version=2004.2.3