diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 10ac6012..bb702ad8 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -345,7 +345,7 @@ tile.blockVat.tooltip.detailed.line1=Used to brew EnderIO fluids tile.blockEnchanter.name=Enchanter tile.blockEnchanter.tooltip.detailed.line1=Uses XP to combine items tile.blockEnchanter.tooltip.detailed.line2=and a book and quill to -tile.blockEnchanter.tooltip.detailed.line2=created enchanted books +tile.blockEnchanter.tooltip.detailed.line3=created enchanted books tile.blockCombustionGenerator.name=Combustion Generator tile.blockCombustionGenerator.tooltip.detailed.line1=Burns liquid fuel to generate power diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index b211081c..417e3c9d 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -2,6 +2,7 @@ package crazypants.enderio.item; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; @@ -24,9 +25,9 @@ import crazypants.enderio.api.tool.ITool; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.ToolUtil; -import crazypants.util.Lang; public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdvancedTooltipProvider, InvocationHandler { @@ -116,26 +117,25 @@ public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdv /* IAdvancedTooltipProvider */ - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings("rawtypes") @Override public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - int line = 1; - String unloc = getUnlocalizedName() + ".tooltip.detailed.line", loc = null; - while (!(loc = Lang.localize(unloc + line, false)).equals(unloc + line++)) { - list.add(String.format(loc, Keyboard.getKeyName(KeyTracker.instance.getYetaWrenchMode().getKeyCode()))); - } } @SuppressWarnings("rawtypes") @Override public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - ; // none } - @SuppressWarnings("rawtypes") + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - ; // none + ArrayList tmp = new ArrayList(); + TooltipAddera.addDetailedTooltipFromResources(tmp, getUnlocalizedName()); + String keyName = Keyboard.getKeyName(KeyTracker.instance.getYetaWrenchMode().getKeyCode()); + for(String line : tmp) { + list.add(String.format(line, keyName)); + } } /* InvocationHandler */