itemi18n: Fix translation for trim pattern and handle item having desc

PotatoCraft-Studio · Jun 13, 2023 · c52d7e0 · c52d7e0
1 parent 87d0ce9
commit c52d7e0
Showing 1 changed file with 39 additions and 3 deletions.
diff --git a/src/main/java/org/maxgamer/quickshop/localization/game/game/MojangGameLanguageImpl.java b/src/main/java/org/maxgamer/quickshop/localization/game/game/MojangGameLanguageImpl.java
@@ -37,7 +37,11 @@
 import org.maxgamer.quickshop.util.MsgUtil;
 import org.maxgamer.quickshop.util.ReflectFactory;
 import org.maxgamer.quickshop.util.Util;
-import org.maxgamer.quickshop.util.mojangapi.*;
+import org.maxgamer.quickshop.util.mojangapi.MojangAPI;
+import org.maxgamer.quickshop.util.mojangapi.MojangApiBmclApiMirror;
+import org.maxgamer.quickshop.util.mojangapi.MojangApiMcbbsApiMirror;
+import org.maxgamer.quickshop.util.mojangapi.MojangApiMirror;
+import org.maxgamer.quickshop.util.mojangapi.MojangApiOfficialMirror;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -46,7 +50,11 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.Optional;
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
@@ -134,10 +142,38 @@ public void load() {
         if (!lang.isPresent()) {
             return super.getItem(material);
         }
-        JsonElement element = lang.get().get("item.minecraft." + material.name().toLowerCase());
+        JsonElement element;
+        String name = material.name().toLowerCase();
+        boolean isSmithingTemplate = false;
+        boolean hasDesc = false;
+        if (name.endsWith("_banner_pattern") || name.startsWith("music_disc")) {
+            hasDesc = true;
+            element = lang.get().get("item.minecraft." + name);
+        } else if (name.endsWith("_armor_trim_smithing_template")) {
+            isSmithingTemplate = true;
+            element = lang.get().get("trim_pattern.minecraft." + name.substring(0, name.length() - "_armor_trim_smithing_template".length()));
+        } else if (name.endsWith("_upgrade_smithing_template")) {
+            isSmithingTemplate = true;
+            element = lang.get().get("upgrade.minecraft." + name.substring(0, name.length() - "_smithing_template".length()));
+        } else {
+            element = lang.get().get("item.minecraft." + name);
+        }
         if (element == null) {
             return getBlock(material);
         } else {
+            if (isSmithingTemplate) {
+                JsonElement prefix = lang.get().get("item.minecraft.smithing_template");
+                if (prefix != null) {
+                    return prefix.getAsString() + ":" + element.getAsString();
+                }
+            }
+            if (hasDesc) {
+                JsonElement desc = lang.get().get("item.minecraft." + name + ".desc");
+                if (desc != null) {
+                    return element.getAsString() + ":" + desc.getAsString();
+                }
+            }
+
             return element.getAsString();
         }
     }