From f1d45e8bb47caf8e681ccfde5d57b5cfc664319a Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 1 May 2016 10:59:32 +0200 Subject: [PATCH] Add \n support for tooltips in our items --- .../mantle/item/ItemBlockMeta.java | 8 ++--- .../mantle/item/ItemMetaDynamic.java | 8 ++--- .../slimeknights/mantle/util/LocUtils.java | 33 +++++++++++++++++++ 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/src/main/java/slimeknights/mantle/item/ItemBlockMeta.java b/src/main/java/slimeknights/mantle/item/ItemBlockMeta.java index 1d539e1..e01c762 100644 --- a/src/main/java/slimeknights/mantle/item/ItemBlockMeta.java +++ b/src/main/java/slimeknights/mantle/item/ItemBlockMeta.java @@ -48,12 +48,12 @@ public class ItemBlockMeta extends ItemColored { @Override public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { if(I18n.canTranslate(this.getUnlocalizedName(stack) + ".tooltip")) { - tooltip.add(TextFormatting.GRAY.toString() + - LocUtils.translateRecursive(this.getUnlocalizedName(stack) + ".tooltip")); + tooltip.addAll(LocUtils.getTooltips(TextFormatting.GRAY.toString() + + LocUtils.translateRecursive(this.getUnlocalizedName(stack) + ".tooltip"))); } else if(I18n.canTranslate(super.getUnlocalizedName(stack) + ".tooltip")) { - tooltip.add( - TextFormatting.GRAY.toString() + LocUtils.translateRecursive(super.getUnlocalizedName(stack) + ".tooltip")); + tooltip.addAll(LocUtils.getTooltips( + TextFormatting.GRAY.toString() + LocUtils.translateRecursive(super.getUnlocalizedName(stack) + ".tooltip"))); } super.addInformation(stack, playerIn, tooltip, advanced); } diff --git a/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java b/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java index 700b92a..f9244b9 100644 --- a/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java +++ b/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java @@ -123,12 +123,12 @@ public class ItemMetaDynamic extends Item { @Override public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { if(I18n.canTranslate(this.getUnlocalizedName(stack) + ".tooltip")) { - tooltip.add(TextFormatting.GRAY.toString() + - LocUtils.translateRecursive(this.getUnlocalizedName(stack) + ".tooltip")); + tooltip.addAll(LocUtils.getTooltips(TextFormatting.GRAY.toString() + + LocUtils.translateRecursive(this.getUnlocalizedName(stack) + ".tooltip"))); } else if(I18n.canTranslate(super.getUnlocalizedName(stack) + ".tooltip")) { - tooltip.add( - TextFormatting.GRAY.toString() + LocUtils.translateRecursive(super.getUnlocalizedName(stack) + ".tooltip")); + tooltip.addAll(LocUtils.getTooltips( + TextFormatting.GRAY.toString() + LocUtils.translateRecursive(super.getUnlocalizedName(stack) + ".tooltip"))); } super.addInformation(stack, playerIn, tooltip, advanced); } diff --git a/src/main/java/slimeknights/mantle/util/LocUtils.java b/src/main/java/slimeknights/mantle/util/LocUtils.java index 2049011..95cfda2 100644 --- a/src/main/java/slimeknights/mantle/util/LocUtils.java +++ b/src/main/java/slimeknights/mantle/util/LocUtils.java @@ -1,7 +1,10 @@ package slimeknights.mantle.util; +import com.google.common.collect.Lists; + import net.minecraft.util.text.translation.I18n; +import java.util.List; import java.util.Locale; // localization utils @@ -20,4 +23,34 @@ public abstract class LocUtils { public static String translateRecursive(String key, Object... params) { return I18n.translateToLocal(I18n.translateToLocalFormatted(key, params)); } + + public static List getTooltips(String text) { + List list = Lists.newLinkedList(); + if(text == null) + return list; + int j = 0; + int k; + while((k = text.indexOf("\\n", j)) >= 0) + { + list.add(text.substring(j, k)); + j = k+2; + } + + list.add(text.substring(j, text.length())); + + return list; + } + + + public static String convertNewlines(String line) { + if(line == null) + return null; + int j; + while((j = line.indexOf("\\n")) >= 0) + { + line = line.substring(0, j) + '\n' + line.substring(j+2); + } + + return line; + } }