diff --git a/src/main/java/crazypants/enderio/enderface/BlockEio.java b/src/main/java/crazypants/enderio/enderface/BlockEio.java index 2863a43e..b17c59e3 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEio.java +++ b/src/main/java/crazypants/enderio/enderface/BlockEio.java @@ -59,4 +59,8 @@ public abstract class BlockEio extends Block { blockIcon = iIconRegister.registerIcon("enderio:" + name); } + public String getUnlocalizedNameForTooltip() { + return getUnlocalizedName(); + } + } diff --git a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java index 13b1dedc..51ba1c6c 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java +++ b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java @@ -137,4 +137,11 @@ public class BlockEnderIO extends BlockEio implements IResourceTooltipProvider { selectedOverlayIcon = iIconRegister.registerIcon("enderio:enderIOSelected"); } + @Override + public String getUnlocalizedNameForTooltip() { + return getUnlocalizedName(); + } + + + } diff --git a/src/main/java/crazypants/enderio/farm/BlockFarmStation.java b/src/main/java/crazypants/enderio/farm/BlockFarmStation.java index 70ec826d..8a86df2b 100644 --- a/src/main/java/crazypants/enderio/farm/BlockFarmStation.java +++ b/src/main/java/crazypants/enderio/farm/BlockFarmStation.java @@ -81,4 +81,9 @@ public class BlockFarmStation extends AbstractMachineBlock { public void randomDisplayTick(World world, int x, int y, int z, Random rand) { } + @Override + public String getUnlocalizedNameForTooltip() { + return getUnlocalizedName(); + } + } diff --git a/src/main/java/crazypants/enderio/gui/IResourceTooltipProvider.java b/src/main/java/crazypants/enderio/gui/IResourceTooltipProvider.java index 90d6e7b0..8ee09672 100644 --- a/src/main/java/crazypants/enderio/gui/IResourceTooltipProvider.java +++ b/src/main/java/crazypants/enderio/gui/IResourceTooltipProvider.java @@ -2,6 +2,6 @@ package crazypants.enderio.gui; public interface IResourceTooltipProvider { - String getUnlocalizedName(); + String getUnlocalizedNameForTooltip(); } diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index 0fd30422..b429e2c8 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -105,7 +105,7 @@ public class TooltipAddera { public static void addInformation(IResourceTooltipProvider item, ItemTooltipEvent evt) { if(showAdvancedTooltips()) { - addDetailedTooltipFromResources(evt.toolTip, item.getUnlocalizedName()); + addDetailedTooltipFromResources(evt.toolTip, item.getUnlocalizedNameForTooltip()); } else { addShowDetailsTooltip(evt.toolTip); } diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index 3f8d5454..83cc947f 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -87,4 +87,9 @@ public class ItemYetaWrench extends Item implements IToolWrench, IResourceToolti return true; } + @Override + public String getUnlocalizedNameForTooltip() { + return getUnlocalizedName(); + } + } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 055d53e5..87dd55da 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -319,4 +319,9 @@ public abstract class AbstractMachineBlock exte return false; } + @Override + public String getUnlocalizedNameForTooltip() { + return getUnlocalizedName(); + } + } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index fc3e2f23..f7055bea 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -291,4 +291,9 @@ public class BlockHyperCube extends BlockEio implements IGuiHandler, IResourceTo return null; } + @Override + public String getUnlocalizedNameForTooltip() { + return getUnlocalizedName(); + } + } diff --git a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java index efc1eb7e..78535c77 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java @@ -198,4 +198,9 @@ public class BlockElectricLight extends BlockEio implements IResourceTooltipProv } + @Override + public String getUnlocalizedNameForTooltip() { + return getUnlocalizedName(); + } + } diff --git a/src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java b/src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java index dee5c1d6..e37d9f6c 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java +++ b/src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java @@ -89,4 +89,9 @@ public class ItemConduitProbe extends Item implements IResourceTooltipProvider { itemIcon = IIconRegister.registerIcon("enderio:mJReader"); } + @Override + public String getUnlocalizedNameForTooltip() { + return getUnlocalizedName(); + } + } diff --git a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java index 192adaf4..79c36aa7 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java @@ -293,4 +293,9 @@ public class BlockReservoir extends BlockContainer implements IResourceTooltipPr } + @Override + public String getUnlocalizedNameForTooltip() { + return getUnlocalizedName(); + } + } diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java index d868f9f0..bd9f2aec 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java @@ -107,4 +107,9 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } + @Override + public String getUnlocalizedNameForTooltip() { + return getUnlocalizedName(); + } + } diff --git a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java index 3ddba3c7..dbbd33aa 100644 --- a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java +++ b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java @@ -257,4 +257,9 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IEnergyConta par3List.add(is); } + @Override + public String getUnlocalizedNameForTooltip() { + return getUnlocalizedName(); + } + }