From 15fa7022dd80a4a0f52d0fc935d315dc3bea5f8d Mon Sep 17 00:00:00 2001 From: alexbegt Date: Thu, 3 Oct 2019 19:52:44 -0400 Subject: [PATCH] Fix tooltips showing 'LB' instead of putting the new line on well a new line. --- .../slimeknights/mantle/item/EdibleItem.java | 2 +- .../slimeknights/mantle/item/TooltipItem.java | 25 ++++++++++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/main/java/slimeknights/mantle/item/EdibleItem.java b/src/main/java/slimeknights/mantle/item/EdibleItem.java index 2133d62..9d7671c 100644 --- a/src/main/java/slimeknights/mantle/item/EdibleItem.java +++ b/src/main/java/slimeknights/mantle/item/EdibleItem.java @@ -55,7 +55,7 @@ public class EdibleItem extends Item implements IGeneratedJson { if (this.displayEffectsTooltip) { for (Pair pair : stack.getItem().getFood().getEffects()) { if (pair.getLeft() != null) { - tooltip.add(new StringTextComponent(TextFormatting.GRAY.toString() + I18n.format(pair.getLeft().getEffectName()).trim())); + tooltip.add(new StringTextComponent(I18n.format(pair.getLeft().getEffectName()).trim()).applyTextStyle(TextFormatting.GRAY)); } } } diff --git a/src/main/java/slimeknights/mantle/item/TooltipItem.java b/src/main/java/slimeknights/mantle/item/TooltipItem.java index 86bb3c6..56ab646 100644 --- a/src/main/java/slimeknights/mantle/item/TooltipItem.java +++ b/src/main/java/slimeknights/mantle/item/TooltipItem.java @@ -1,15 +1,16 @@ package slimeknights.mantle.item; -import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import slimeknights.mantle.util.LocUtils; +import net.minecraftforge.fml.ForgeI18n; import javax.annotation.Nullable; import java.util.List; @@ -29,8 +30,24 @@ public class TooltipItem extends Item { } public static void addOptionalTooltip(ItemStack stack, List tooltip) { - if (I18n.hasKey(stack.getTranslationKey() + ".tooltip")) { - tooltip.addAll(LocUtils.getTooltips(TextFormatting.GRAY.toString() + LocUtils.translateRecursive(stack.getTranslationKey() + ".tooltip"))); + String translationKey = stack.getTranslationKey() + ".tooltip"; + + if (!ForgeI18n.getPattern(translationKey).equals(translationKey)) { + String translate = ForgeI18n.getPattern(translationKey); + if (!ForgeI18n.getPattern(translate).equals(translate)) { + String[] strings = new TranslationTextComponent(translate).getFormattedText().split("\n"); + + for (String string : strings) { + tooltip.add(new StringTextComponent(string).applyTextStyle(TextFormatting.GRAY)); + } + } + else { + String[] strings = new TranslationTextComponent(translationKey).getFormattedText().split("\n"); + + for (String string : strings) { + tooltip.add(new StringTextComponent(string).applyTextStyle(TextFormatting.GRAY)); + } + } } } }