修正部分内容

- 声音包调用的 tips - 删除语言文件冲突
TartaricAcid · Oct 31, 2023 · 4ffa708 · 4ffa708
1 parent e17488a
commit 4ffa708
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/...va/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/model/AbstractModelGui.java b/...va/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/model/AbstractModelGui.java
@@ -443,6 +443,8 @@ private void drawTooltips(PoseStack poseStack, int mouseX, int mouseY, int middl
                 str.addAll(modelItem.getDescription());
                 // 转换为 ITextComponent
                 List<Component> tooltips = ParseI18n.parse(str);
+                // 添加额外的提示
+                addModelCustomTips(modelItem, tooltips);
                 // 塞入提示语
                 if (!modelItem.getName().equals(ENCRYPT_EGG_NAME) && !modelItem.getName().equals(NORMAL_EGG_NAME)) {
                     tooltips.add(new TranslatableComponent("gui.touhou_little_maid.skin.tooltips.show_details")

diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/resource/CustomPackLoader.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/resource/CustomPackLoader.java
@@ -781,6 +781,7 @@ private static void readLanguageFile(ZipFile zipFile, String namespace) throws I
         String currentLangPath = String.format("assets/%s/lang/%s.lang", namespace, language.getCode());
         getLanguageMap(zipFile, newLangData, defaultLangPath);
         getLanguageMap(zipFile, newLangData, currentLangPath);
+        removeOldLanguageKey(newLangData);
 
         languageMapMerge(oldLangData, newLangData);
         if (Language.getInstance() instanceof ClientLanguage) {
@@ -798,6 +799,7 @@ private static void readLanguageFile(Path rootPath, String namespace) throws IOE
         String currentLangPath = String.format("assets/%s/lang/%s.lang", namespace, language.getCode());
         getLanguageMap(rootPath, newLangData, defaultLangPath);
         getLanguageMap(rootPath, newLangData, currentLangPath);
+        removeOldLanguageKey(newLangData);
 
         languageMapMerge(oldLangData, newLangData);
         if (Language.getInstance() instanceof ClientLanguage) {
@@ -848,4 +850,8 @@ private static void languageMapMerge(Map<String, String> oldLangData, Map<String
             }
         }
     }
+
+    private static void removeOldLanguageKey(Map<String, String> langData) {
+        langData.remove("subtitle.touhou_little_maid.other.credit");
+    }
 }