diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index 3cf9d634..40140217 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -884,4 +884,9 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { public void securityBreak() { ; } + + @Override + public boolean displayPower() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index 6c3c1673..0982827f 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -535,4 +535,8 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { return getCapacitors()[subtype].getMaxEnergyStored(); } + @Override + public boolean displayPower() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 136823ae..9012e917 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -788,4 +788,8 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi redstoneStateDirty = true; } + @Override + public boolean displayPower() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java index 0b758ccd..edb240e0 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java @@ -889,7 +889,10 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept this.dir = dir; dirOp = dir.getOpposite(); } - } + @Override + public boolean displayPower() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index f8b634b0..73121a65 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -476,4 +476,9 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle WirelessChargerController.instance.chargePlayersItems(this); } } + + @Override + public boolean displayPower() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java index 5c7e78b2..939390f6 100644 --- a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java @@ -543,4 +543,8 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe } + @Override + public boolean displayPower() { + return isRequiresPower(); + } } diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index 1701dd13..56e66524 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -1142,4 +1142,9 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe public boolean isMaxSize() { return isMultiblock() && multiblock.length >= MAX_SIZE; } + + @Override + public boolean displayPower() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java index 1774baae..b1abf9f4 100644 --- a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java @@ -239,4 +239,9 @@ public class TileEntitySolarPanel extends TileEntity implements IInternalPowerRe public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { this.readFromNBT(pkt.func_148857_g()); } + + @Override + public boolean displayPower() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index a638a6d2..bfe33038 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -370,4 +370,8 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler { } } + @Override + public boolean displayPower() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java index b2d58dfd..7fb13864 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java @@ -159,7 +159,9 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower public World getWorld() { return getWorldObj(); } - - + @Override + public boolean displayPower() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/xp/TileExperienceOblisk.java b/src/main/java/crazypants/enderio/machine/xp/TileExperienceOblisk.java index 9710de78..0824174d 100644 --- a/src/main/java/crazypants/enderio/machine/xp/TileExperienceOblisk.java +++ b/src/main/java/crazypants/enderio/machine/xp/TileExperienceOblisk.java @@ -121,5 +121,9 @@ public class TileExperienceOblisk extends AbstractMachineEntity implements IFlui public ExperienceContainer getContainer() { return xpCont; } - + + @Override + public boolean displayPower() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java b/src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java index dc2e9eb9..555181b4 100644 --- a/src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java +++ b/src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java @@ -13,4 +13,9 @@ public interface IInternalPowerReceptor extends IEnergyHandler { void setEnergyStored(int stored); + /** + * Should the power be displayed in WAILA or other places + */ + boolean displayPower(); + } diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 13e677db..a399037c 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -142,18 +142,21 @@ public class WailaCompat implements IWailaDataProvider { } if(te instanceof IInternalPowerReceptor && accessor.getNBTData().hasKey("storedEnergyRF")) { - if(currenttip.size() > 4) { - currenttip.add(""); - } - IInternalPowerReceptor power = (IInternalPowerReceptor) te; - int stored = accessor.getTileEntity() instanceof TileCapacitorBank ? power.getEnergyStored() : accessor.getNBTData().getInteger("storedEnergyRF"); - int max = power.getMaxEnergyStored(); + if(power.displayPower()) { - currenttip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(stored), EnumChatFormatting.RESET, EnumChatFormatting.WHITE, fmt.format(max), - EnumChatFormatting.RESET)); + if(currenttip.size() > 4) { + currenttip.add(""); + } + int stored = accessor.getTileEntity() instanceof TileCapacitorBank ? power.getEnergyStored() : accessor.getNBTData().getInteger("storedEnergyRF"); + int max = power.getMaxEnergyStored(); + + currenttip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(stored), EnumChatFormatting.RESET, EnumChatFormatting.WHITE, + fmt.format(max), + EnumChatFormatting.RESET)); + } } else if(te instanceof IConduitBundle && itemStack != null && itemStack.getItem() == EnderIO.itemPowerConduit) { NBTTagCompound nbtRoot = accessor.getNBTData(); short nbtVersion = nbtRoot.getShort("nbtVersion");