From 40f7fbd390ad02186cf638ca29d811197de6a29c Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 1 Oct 2024 11:22:52 +0900 Subject: [PATCH] Close #3786 Add support for naming tag categories instead of registries --- .../src/main/resources/assets/jei/lang/en_us.json | 6 +++--- .../src/main/resources/assets/jei/lang/ja_jp.json | 6 +++--- .../src/main/resources/assets/jei/lang/pt_pt.json | 6 +++--- .../src/main/resources/assets/jei/lang/sv_se.json | 6 +++--- .../src/main/resources/assets/jei/lang/zh_cn.json | 6 +++--- .../src/main/resources/assets/jei/lang/zh_tw.json | 6 +++--- .../plugins/jei/tags/TagInfoRecipeCategory.java | 15 ++++++++++----- 7 files changed, 28 insertions(+), 23 deletions(-) diff --git a/Common/src/main/resources/assets/jei/lang/en_us.json b/Common/src/main/resources/assets/jei/lang/en_us.json index 173f15b04..5ae503f5a 100644 --- a/Common/src/main/resources/assets/jei/lang/en_us.json +++ b/Common/src/main/resources/assets/jei/lang/en_us.json @@ -174,10 +174,10 @@ "gui.jei.category.compostable": "Composting", "gui.jei.category.compostable.chance": "Chance: %s%%", "gui.jei.category.itemInformation": "Information", - "gui.jei.category.registry.block": "Block", - "gui.jei.category.registry.item": "Item", - "gui.jei.category.registry.fluid": "Fluid", "gui.jei.category.tagInformation": "%s Tags", + "gui.jei.category.tagInformation.block": "Block Tags", + "gui.jei.category.tagInformation.fluid": "Fluid Tags", + "gui.jei.category.tagInformation.item": "Item Tags", "gui.jei.category.recipe.crashed": "This recipe crashed. Please see the client logs for details.", "_comment": "Messages", diff --git a/Common/src/main/resources/assets/jei/lang/ja_jp.json b/Common/src/main/resources/assets/jei/lang/ja_jp.json index 0ad728168..5f647ef5c 100644 --- a/Common/src/main/resources/assets/jei/lang/ja_jp.json +++ b/Common/src/main/resources/assets/jei/lang/ja_jp.json @@ -174,10 +174,10 @@ "gui.jei.category.compostable": "堆肥化", "gui.jei.category.compostable.chance": "確率：%s%%", "gui.jei.category.itemInformation": "説明", - "gui.jei.category.registry.block": "ブロック", - "gui.jei.category.registry.item": "アイテム", - "gui.jei.category.registry.fluid": "流体", "gui.jei.category.tagInformation": "%sタグ", + "gui.jei.category.tagInformation.block": "ブロックタグ", + "gui.jei.category.tagInformation.fluid": "流体タグ", + "gui.jei.category.tagInformation.item": "アイテムタグ", "_comment": "Messages", "jei.message.configured": "ゲーム内で設定にアクセスするには、\n\"Configured\" Modをインストールしてください", diff --git a/Common/src/main/resources/assets/jei/lang/pt_pt.json b/Common/src/main/resources/assets/jei/lang/pt_pt.json index b95f7a9f7..a10242c09 100644 --- a/Common/src/main/resources/assets/jei/lang/pt_pt.json +++ b/Common/src/main/resources/assets/jei/lang/pt_pt.json @@ -78,9 +78,9 @@ "gui.jei.category.compostable": "Compostável", "gui.jei.category.compostable.chance": "Probabilidade: %s%%", "gui.jei.category.itemInformation": "Informação", - "gui.jei.category.registry.block": "Bloco", - "gui.jei.category.registry.item": "Item", - "gui.jei.category.registry.fluid": "Fluído", + "gui.jei.category.tagInformation.block": "Bloco Etiquetas", + "gui.jei.category.tagInformation.fluid": "Fluído Etiquetas", + "gui.jei.category.tagInformation.item": "Item Etiquetas", "gui.jei.category.tagInformation": "%s Etiquetas", "_comment": "Key Names", diff --git a/Common/src/main/resources/assets/jei/lang/sv_se.json b/Common/src/main/resources/assets/jei/lang/sv_se.json index 216a2fe98..0d25679d1 100644 --- a/Common/src/main/resources/assets/jei/lang/sv_se.json +++ b/Common/src/main/resources/assets/jei/lang/sv_se.json @@ -171,9 +171,9 @@ "gui.jei.category.compostable": "Kompostering", "gui.jei.category.compostable.chance": "Chans: %s %%", "gui.jei.category.itemInformation": "Information", - "gui.jei.category.registry.block": "Block", - "gui.jei.category.registry.item": "Föremål", - "gui.jei.category.registry.fluid": "Vätska", + "gui.jei.category.tagInformation.block": "Block taggar", + "gui.jei.category.tagInformation.fluid": "Vätska taggar", + "gui.jei.category.tagInformation.item": "Föremål taggar", "gui.jei.category.tagInformation": "%s taggar", "_comment": "Messages", diff --git a/Common/src/main/resources/assets/jei/lang/zh_cn.json b/Common/src/main/resources/assets/jei/lang/zh_cn.json index a31bfccc5..d472942af 100644 --- a/Common/src/main/resources/assets/jei/lang/zh_cn.json +++ b/Common/src/main/resources/assets/jei/lang/zh_cn.json @@ -173,9 +173,9 @@ "gui.jei.category.compostable": "堆肥", "gui.jei.category.compostable.chance": "概率：%s%%", "gui.jei.category.itemInformation": "信息", - "gui.jei.category.registry.block": "方块", - "gui.jei.category.registry.item": "物品", - "gui.jei.category.registry.fluid": "液体", + "gui.jei.category.tagInformation.block": "方块 标签", + "gui.jei.category.tagInformation.fluid": "液体 标签", + "gui.jei.category.tagInformation.item": "物品 标签", "gui.jei.category.tagInformation": "%s 标签", "_comment": "Messages", diff --git a/Common/src/main/resources/assets/jei/lang/zh_tw.json b/Common/src/main/resources/assets/jei/lang/zh_tw.json index 85eb23e02..344af0928 100644 --- a/Common/src/main/resources/assets/jei/lang/zh_tw.json +++ b/Common/src/main/resources/assets/jei/lang/zh_tw.json @@ -171,9 +171,9 @@ "gui.jei.category.compostable": "可堆肥", "gui.jei.category.compostable.chance": "機率：%s%%", "gui.jei.category.itemInformation": "資訊", - "gui.jei.category.registry.block": "方塊", - "gui.jei.category.registry.item": "物品", - "gui.jei.category.registry.fluid": "流體", + "gui.jei.category.tagInformation.block": "方塊 標籤", + "gui.jei.category.tagInformation.fluid": "流體 標籤", + "gui.jei.category.tagInformation.item": "物品 標籤", "gui.jei.category.tagInformation": "%s 標籤", "_comment": "Messages", diff --git a/Library/src/main/java/mezz/jei/library/plugins/jei/tags/TagInfoRecipeCategory.java b/Library/src/main/java/mezz/jei/library/plugins/jei/tags/TagInfoRecipeCategory.java index 3db5f1817..ecb686d2b 100644 --- a/Library/src/main/java/mezz/jei/library/plugins/jei/tags/TagInfoRecipeCategory.java +++ b/Library/src/main/java/mezz/jei/library/plugins/jei/tags/TagInfoRecipeCategory.java @@ -17,6 +17,7 @@ import mezz.jei.library.util.ResourceLocationUtil; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.navigation.ScreenRectangle; +import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; import net.minecraft.resources.ResourceLocation; @@ -50,11 +51,15 @@ public TagInfoRecipeCategory(IGuiHelper guiHelper, T recipeType, ResourceLocatio } private static Component createTitle(ResourceLocation registryLocation) { - Component registryName = Component.translatableWithFallback( - "gui.jei.category.registry." + ResourceLocationUtil.sanitizePath(registryLocation.getPath()), - StringUtils.capitalize(registryLocation.getPath()) - ); - return Component.translatable("gui.jei.category.tagInformation", registryName); + String registryName = ResourceLocationUtil.sanitizePath(registryLocation.getPath()); + String registryNameTranslationKey = "gui.jei.category.tagInformation." + registryName; + + Language language = Language.getInstance(); + if (language.has(registryNameTranslationKey)) { + return Component.translatable(registryNameTranslationKey); + } + + return Component.translatable("gui.jei.category.tagInformation", StringUtils.capitalize(registryLocation.getPath())); } @Override