From 59534a05cf2dedee6adc73c01af43e78bdd754c6 Mon Sep 17 00:00:00 2001 From: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com> Date: Sat, 28 Sep 2024 01:33:47 -0400 Subject: [PATCH] Fix broken langs in ExtraTrees --- .../binnie/extratrees/item/ItemDictionary.java | 4 ++-- .../binnie/extratrees/item/ItemMothDatabase.java | 4 ++-- .../resources/assets/extratrees/lang/en_US.lang | 15 +++++++++------ .../resources/assets/extratrees/lang/zh_CN.lang | 12 ++++++------ 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/main/java/binnie/extratrees/item/ItemDictionary.java b/src/main/java/binnie/extratrees/item/ItemDictionary.java index ce1f8f6b..6a06e806 100644 --- a/src/main/java/binnie/extratrees/item/ItemDictionary.java +++ b/src/main/java/binnie/extratrees/item/ItemDictionary.java @@ -79,7 +79,7 @@ public class ItemDictionary extends Item { @Override public String getItemStackDisplayName(ItemStack i) { - return (i.getItemDamage() == 0) ? I18N.localise("extratrees.item.database") - : I18N.localise("extratrees.item.masterDatabase"); + return (i.getItemDamage() == 0) ? I18N.localise("extratrees.item.database.name") + : I18N.localise("extratrees.item.masterDatabase.name"); } } diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index 006119ca..d0825f0f 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -83,7 +83,7 @@ public class ItemMothDatabase extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return (stack.getItemDamage() == 0) ? I18N.localise("extratrees.item.mothDatabase") - : I18N.localise("extratrees.item.mothMasterDatabase"); + return (stack.getItemDamage() == 0) ? I18N.localise("extratrees.item.mothDatabase.name") + : I18N.localise("extratrees.item.mothMasterDatabase.name"); } } diff --git a/src/main/resources/assets/extratrees/lang/en_US.lang b/src/main/resources/assets/extratrees/lang/en_US.lang index 51f65498..09310a04 100644 --- a/src/main/resources/assets/extratrees/lang/en_US.lang +++ b/src/main/resources/assets/extratrees/lang/en_US.lang @@ -155,17 +155,17 @@ extratrees.block.planks.pinkivory.desc=What can I say. It's very pink.|Lumber Ja extratrees.block.tooltip.twoColors=%s and %s extratrees.block.tooltip.twoMaterials=%s and %s -< %1$s is name of wood used for door > +# %1$s is name of wood used for door extratrees.block.door.name=%1$s Wood Door -< %1$s is name of wood used for door, %2$s is type of door > +# %1$s is name of wood used for door, %2$s is type of door extratrees.block.door.name.adv=%2$s %1$s Wood Door extratrees.block.door.type.standard= extratrees.block.door.type.solid=Solid extratrees.block.door.type.double=Split extratrees.block.door.type.full=Full -< %1$s is name of the wood> +# %1$s is name of the wood extratrees.block.plank.name=%1$s Wood Planks extratrees.block.log.name=%1$s Wood extratrees.block.woodslab.name=%1$s Wood Slab @@ -173,12 +173,15 @@ extratrees.block.woodstairs.name=%1$s Stairs extratrees.block.woodfence.name=%1$s Fence extratrees.block.woodgate.name=%1$s Gate -< %1$s is the adjective for the fence type, %2$s is the name of the wood > +# %1$s is the fence type (may be empty), %2$s is the first wood, %3$s is the second +extratrees.block.woodslab.name2=%1$s%2$s/%3$s Wood Slab + +# %1$s is the adjective for the fence type, %2$s is the name of the wood extratrees.block.multifence.name=%2$s %1$s Gate -< %3$s is the name of the second wood > +# %3$s is the name of the second wood extratrees.block.multifence.name2=%2$s %1$s & $3$s Gate -< %1$s is name of the design > +# %1$s is name of the design extratrees.block.woodentile.name=%1$s Wooden Tile extratrees.block.woodenpanel.name=%1$s Wooden Panel extratrees.block.stainedglass.name=%1$s Stained Glass diff --git a/src/main/resources/assets/extratrees/lang/zh_CN.lang b/src/main/resources/assets/extratrees/lang/zh_CN.lang index 994461df..f1f5f62c 100644 --- a/src/main/resources/assets/extratrees/lang/zh_CN.lang +++ b/src/main/resources/assets/extratrees/lang/zh_CN.lang @@ -155,17 +155,17 @@ extratrees.block.planks.pinkivory.desc=我能说些什么呢.它的粉色太浓 extratrees.block.tooltip.twoColors=%s - %s extratrees.block.tooltip.twoMaterials=%s - %s -< %1$s is name of wood used for door > +# %1$s is name of wood used for door extratrees.block.door.name=%1$s木门 -< %1$s is name of wood used for door, %2$s is type of door > +# %1$s is name of wood used for door, %2$s is type of door extratrees.block.door.name.adv=%1$s%2$s木门 extratrees.block.door.type.standard= extratrees.block.door.type.solid=坚固 extratrees.block.door.type.double=分离 extratrees.block.door.type.full=完整 -< %1$s is name of the wood> +# %1$s is name of the wood extratrees.block.plank.name=%1$s木板 extratrees.block.log.name=%1$s原木 extratrees.block.woodslab.name=%1$s台阶 @@ -173,12 +173,12 @@ extratrees.block.woodstairs.name=%1$s楼梯 extratrees.block.woodfence.name=%1$s栅栏 extratrees.block.woodgate.name=%1$s栅栏门 -< %1$s is the adjective for the fence type, %2$s is the name of the wood > +# %1$s is the adjective for the fence type, %2$s is the name of the wood extratrees.block.multifence.name=%2$s %1$s 门 -< %3$s is the name of the second wood > +# %3$s is the name of the second wood extratrees.block.multifence.name2=%2$s %1$s & $3$s 门 -< %1$s is name of the design > +# %1$s is name of the design extratrees.block.woodentile.name=%1$s木砖 extratrees.block.woodenpanel.name=%1$s镶板 extratrees.block.stainedglass.name=%1$s染色玻璃