From 05c7e63c558fd1519077a3d77f0358c30138bcd7 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sat, 30 Aug 2014 02:36:10 +0100 Subject: [PATCH] Make shift not required to see contents of Portable Tanks. For convenience of NEI searching. --- .../java/mekanism/common/item/ItemBlockMachine.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index e64837c66..e514244bd 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -145,6 +145,15 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { + if(type == MachineType.PORTABLE_TANK) + { + FluidStack fluidStack = getFluidStack(itemstack); + if(fluidStack != null) + { + list.add(EnumColor.PINK + LangUtils.localizeFluidStack(fluidStack) + ": " + EnumColor.GREY + getFluidStack(itemstack).amount + "mB"); + } + } + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails") + "."); list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " and " + EnumColor.AQUA + Keyboard.getKeyName(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); } @@ -171,7 +180,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec list.add(EnumColor.BRIGHT_GREEN + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergyStored(itemstack))); } - if(hasTank(itemstack)) + if(hasTank(itemstack) && type != MachineType.PORTABLE_TANK) { FluidStack fluidStack = getFluidStack(itemstack); if(fluidStack != null)