From db63dd8141fb60dba77929b68bf98c9e0eb58cf6 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 4 Jul 2014 13:37:04 +0800 Subject: [PATCH] Updated tooltips. --- resources/assets/enderio/lang/en_US.lang | 11 ++++++++--- .../enderio/machine/vacuum/BlockVacuumChest.java | 9 ++++++++- .../machine/wireless/BlockWirelessCharger.java | 9 ++++++++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 4a15b283..7c2c85e5 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -183,6 +183,8 @@ tile.blockCapacitorBank.tooltip.detailed.line2=Can charge RF powered items. tile.blockCapacitorBank.tooltipPrefix=Contains tile.blockWirelessCharger.name=Wireless Charger +tile.blockWirelessCharger.tooltip.detailed.line1=Charges items in nearby +tile.blockWirelessCharger.tooltip.detailed.line2=players inventories tile.blockSagMill.name=SAG Mill tile.blockSagMill.tooltip.detailed.line1=Grinds ore and other items @@ -232,8 +234,11 @@ tile.blockTank.tooltip.detailed.line3=fill fluid containers enderio.tank.tank=Tank tile.blockCrafter.name=Crafter +tile.blockCrafter.tooltip.detailed.line1=A powered auto-crafter tile.blockVacuumChest.name=Vacuum Chest +tile.blockVacuumChest.tooltip.detailed.line1=Pulls nearby items +tile.blockVacuumChest.tooltip.detailed.line2=into its inventory tile.blockPoweredSpawner.name=Powered Spawner tile.blockPoweredSpawner.tooltip.empty=Empty @@ -283,9 +288,9 @@ tile.blockPaintedDoubleSlab.name=Painted Slab tile.blockPaintedGlowstone.name=Painted Glowstone tile.blockPainter.tooltip.detailed.line1=Used to paint: -tile.blockPainter.tooltip.detailed.line2= Conduit Facades, Stairs, Fences -tile.blockPainter.tooltip.detailed.line3= Gates, Slabs, Cobblestone Walls -tile.blockPainter.tooltip.detailed.line3= Glass Frames +tile.blockPainter.tooltip.detailed.line2=Conduit Facades, Stairs, Fences, +tile.blockPainter.tooltip.detailed.line3=Gates, Slabs, Cobblestone Walls, +tile.blockPainter.tooltip.detailed.line4=Glass Frames, Glowstone and Carpets //Items item.itemYetaWrench.name=Yeta Wrench diff --git a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java index d00ce035..dfd62a50 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java @@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -14,12 +15,13 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.power.ContainerCapacitorBank; import crazypants.enderio.machine.power.GuiCapacitorBank; import crazypants.enderio.machine.power.TileCapacitorBank; -public class BlockVacuumChest extends BlockEio implements IGuiHandler { +public class BlockVacuumChest extends BlockEio implements IGuiHandler, IResourceTooltipProvider { public static BlockVacuumChest create() { BlockVacuumChest res = new BlockVacuumChest(); @@ -95,4 +97,9 @@ public class BlockVacuumChest extends BlockEio implements IGuiHandler { world.removeTileEntity(x, y, z); } + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } + } diff --git a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java index 2e3b0131..12fbdb68 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java @@ -3,6 +3,7 @@ package crazypants.enderio.machine.wireless; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -16,6 +17,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.power.PacketPowerStorage; import crazypants.enderio.machine.vacuum.BlockVacuumChest; import crazypants.enderio.machine.vacuum.ContainerVacuumChest; @@ -23,7 +25,7 @@ import crazypants.enderio.machine.vacuum.GuiVacuumChest; import crazypants.enderio.machine.vacuum.TileVacuumChest; import crazypants.enderio.network.PacketHandler; -public class BlockWirelessCharger extends BlockEio /*implements IGuiHandler*/ { +public class BlockWirelessCharger extends BlockEio implements IResourceTooltipProvider /*IGuiHandler*/ { public static BlockWirelessCharger create() { @@ -141,4 +143,9 @@ public class BlockWirelessCharger extends BlockEio /*implements IGuiHandler*/ { world.removeTileEntity(x, y, z); } +@Override +public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); +} + }