修复游戏首次加载时currentLanguageCode未被设置的bug 优化代码

Author: Wulian233

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

@@ -9,7 +9,7 @@
 public class LangTextureCache {
 
     private static final Map<Identifier, SoftReference<Boolean>> existsCache = new ConcurrentHashMap<>();
-    private static volatile String currentLanguage = "en_us"; // 默认
+    private static volatile String currentLanguage = "en_us";
 
     public static Boolean get(Identifier id) {
         SoftReference<Boolean> ref = existsCache.get(id);

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

@@ -2,14 +2,27 @@
 
 import com.wulian.texturelocaleredirector.LangTextureCache;
 import net.minecraft.client.resource.language.LanguageManager;
+import net.minecraft.client.resource.language.TranslationStorage;
 import net.minecraft.resource.ResourceManager;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.util.function.Consumer;
+
 @Mixin(LanguageManager.class)
-public class LanguageManagerMixin {
+public abstract class LanguageManagerMixin {
+
+    @Shadow
+    private String currentLanguageCode;
+
+    @Inject(method = "<init>", at = @At("TAIL"))
+    private void onInit(String languageCode, Consumer<TranslationStorage> reloadCallback, CallbackInfo ci) {
+        LangTextureCache.setCurrentLanguage(languageCode);
+        LangTextureCache.clear();
+    }
 
     @Inject(method = "setLanguage", at = @At("HEAD"))
     private void onSetLanguage(String languageCode, CallbackInfo ci) {
@@ -19,8 +32,7 @@ private void onSetLanguage(String languageCode, CallbackInfo ci) {
 
     @Inject(method = "reload", at = @At("HEAD"))
     private void onReload(ResourceManager manager, CallbackInfo ci) {
-        LangTextureCache.setCurrentLanguage(((LanguageManager)(Object)this).getLanguage());
+        LangTextureCache.setCurrentLanguage(currentLanguageCode);
         LangTextureCache.clear();
     }
 }
-

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

@@ -5,29 +5,34 @@
 import dev.ftb.mods.ftblibrary.icon.Icon;
 import dev.ftb.mods.ftbquests.quest.ChapterImage;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 @Mixin(value = ChapterImage.class, remap = false)
 public abstract class ChapterImageMixin {
-    @Shadow private Icon image;
-    @Inject(method = "setImage(Ldev/ftb/mods/ftblibrary/icon/Icon;)Ldev/ftb/mods/ftbquests/quest/ChapterImage;", at = @At("HEAD"), cancellable = true)
-    private void injectLocalizedImage(Icon image, CallbackInfoReturnable<ChapterImage> cir) {
+
+    @ModifyVariable(
+            method = "setImage(Ldev/ftb/mods/ftblibrary/icon/Icon;)Ldev/ftb/mods/ftbquests/quest/ChapterImage;",
+            at = @At("HEAD"),
+            argsOnly = true
+    )
+    private Icon injectLocalizedImage(Icon image) {
         String currentLang = LangTextureCache.getCurrentLanguage();
         if ("en_us".equals(currentLang)) {
-            return;
+            return image;
         }
 
-        String originalPath = image.toString();
-        String localizedPath = "textures/" + currentLang + "/" + originalPath.replaceFirst("^textures/", "");
-        Icon localizedIcon = Icon.getIcon(localizedPath);
+        String path = image.toString();
+        if (path.startsWith("textures/")) {
+            String localizedPath = "textures/" + currentLang + "/" + path.substring(9);
+            Icon localizedIcon = Icon.getIcon(localizedPath);
 
-        if (!localizedIcon.isEmpty()) {
-            this.image = localizedIcon;
-            TextureLocaleRedirector.LOGGER.info("Redirected ChapterImage icon {} -> {}", originalPath, localizedPath);
-            cir.setReturnValue((ChapterImage) (Object) this);
+            if (!localizedIcon.isEmpty()) {
+                TextureLocaleRedirector.LOGGER.info("Redirected ChapterImage icon {} -> {}", path, localizedPath);
+                return localizedIcon;
+            }
         }
+
+        return image;
     }
 }

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

@@ -20,12 +20,8 @@ public String getRefMapperConfig() {
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
         if (mixinClassName.endsWith("ChapterImageMixin")) {
-            try {
-                Class.forName("dev.ftb.mods.ftbquests.quest.ChapterImage");
-                return true;
-            } catch (ClassNotFoundException e) {
-                return false;
-            }
+            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+            return classLoader.getResource("dev/ftb/mods/ftbquests/quest/ChapterImage.class") != null;
         }
         return true;
     }

gradle.properties

@@ -7,7 +7,7 @@ yarn_mappings=1.21.1+build.3
 yarn_patch=1.21+build.4
 
 archives_base_name=Texture-Locale-Redirector
-mod_version=1.1.0
+mod_version=1.2.0
 maven_group=com.wulian.texturelocaleredirector
 
 forge_version=52.1.3