From 6cd993a6190db29dffc986a04ba1a1c4a2b7b7b2 Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 20 Mar 2016 22:55:03 -0700 Subject: [PATCH] Re-add localization checks to tooltips --- src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java | 2 +- src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java | 2 +- .../java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java | 2 +- .../java/WayofTime/bloodmagic/util/helper/TextHelper.java | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index ef8456e3..9b5b7939 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -94,7 +94,7 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable { NBTHelper.checkNBT(stack); -// if (StatCollector.canTranslate("tooltip.BloodMagic.bound.sword.desc")) + if (TextHelper.canTranslate("tooltip.BloodMagic.bound.sword.desc")) tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.bound.sword.desc")); tooltip.add(TextHelper.localize("tooltip.BloodMagic." + (getActivated(stack) ? "activated" : "deactivated"))); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index 773d8f9b..0c48aea7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -181,7 +181,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { -// if (StatCollector.canTranslate(tooltipBase + "desc")) + if (TextHelper.canTranslate(tooltipBase + "desc")) tooltip.add(TextHelper.localizeEffect(tooltipBase + "desc")); tooltip.add(TextHelper.localize("tooltip.BloodMagic." + (getActivated(stack) ? "activated" : "deactivated"))); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index 033b11cf..8bfc5b5f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -56,7 +56,7 @@ public class ItemSigilBase extends ItemBindable implements ISigil, IVariantProvi @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { -// if (StatCollector.canTranslate(tooltipBase + "desc")) + if (TextHelper.canTranslate(tooltipBase + "desc")) tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(tooltipBase + "desc")))); super.addInformation(stack, player, tooltip, advanced); diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java index 509e954c..13ab6ba2 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java @@ -68,4 +68,8 @@ public class TextHelper { return cutLongString(string, 30); } + + public static boolean canTranslate(String key) { + return I18n.canTranslate(key); + } }