From 606a588a4ea0ded7bf3e90aa17524356254578df Mon Sep 17 00:00:00 2001 From: alexbegt Date: Fri, 16 Aug 2019 19:11:47 -0400 Subject: [PATCH] Ensure the tooltip actually is found by using the translate key instead of Display name to avoid issues with items that have been renamed. --- src/main/java/slimeknights/mantle/item/BlockTooltipItem.java | 5 +---- src/main/java/slimeknights/mantle/item/TooltipItem.java | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/slimeknights/mantle/item/BlockTooltipItem.java b/src/main/java/slimeknights/mantle/item/BlockTooltipItem.java index 9479b93..6aa5482 100644 --- a/src/main/java/slimeknights/mantle/item/BlockTooltipItem.java +++ b/src/main/java/slimeknights/mantle/item/BlockTooltipItem.java @@ -24,10 +24,7 @@ public class BlockTooltipItem extends BlockItem { @Override @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { - if (I18n.hasKey(stack.getDisplayName()+ ".tooltip")) { - tooltip.addAll(LocUtils.getTooltips(TextFormatting.GRAY.toString() + LocUtils.translateRecursive(stack.getDisplayName() + ".tooltip"))); - } - + TooltipItem.addOptionalTooltip(stack, tooltip); super.addInformation(stack, worldIn, tooltip, flagIn); } } diff --git a/src/main/java/slimeknights/mantle/item/TooltipItem.java b/src/main/java/slimeknights/mantle/item/TooltipItem.java index 0664959..86bb3c6 100644 --- a/src/main/java/slimeknights/mantle/item/TooltipItem.java +++ b/src/main/java/slimeknights/mantle/item/TooltipItem.java @@ -29,8 +29,8 @@ public class TooltipItem extends Item { } public static void addOptionalTooltip(ItemStack stack, List tooltip) { - if (I18n.hasKey(stack.getDisplayName() + ".tooltip")) { - tooltip.addAll(LocUtils.getTooltips(TextFormatting.GRAY.toString() + LocUtils.translateRecursive(stack.getDisplayName() + ".tooltip"))); + if (I18n.hasKey(stack.getTranslationKey() + ".tooltip")) { + tooltip.addAll(LocUtils.getTooltips(TextFormatting.GRAY.toString() + LocUtils.translateRecursive(stack.getTranslationKey() + ".tooltip"))); } } }