diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index d2823ae2..e7701dbb 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -298,22 +298,6 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool return 0; } - // @Override - // public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - // if(world.isRemote) { - // return; - // } - // TileEntity te = world.getTileEntity(x, y, z); - // if(!(te instanceof TileCapBank)) { - // return; - // } - // - // TileCapBank cb = (TileCapBank) te; - // cb.addEnergy(PowerHandlerUtil.getStoredEnergyForItem(stack)); - // - // world.markBlockForUpdate(x, y, z); - // } - @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { super.onBlockPlacedBy(world, x, y, z, player, stack); @@ -470,7 +454,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool fmt.format(max), EnumChatFormatting.RESET)); - float change = nw.getAverageChangePerTick(); + int change = Math.round(nw.getAverageChangePerTick()); String color = EnumChatFormatting.WHITE.toString(); if(change > 0) { color = EnumChatFormatting.GREEN.toString() + "+"; diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index cf77c2c0..09c60a2e 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -10,6 +10,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.Entity; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.EnumChatFormatting; import org.lwjgl.opengl.GL11; @@ -94,7 +95,19 @@ public class GuiCapBank extends GuiContainerBase { protected void updateText() { text.clear(); text.add(PowerDisplayUtil.formatPower(network.getEnergyStored()) + " " + PowerDisplayUtil.ofStr()); - text.add(PowerDisplayUtil.formatPower(network.getMaxEnergyStored()) + " " + PowerDisplayUtil.abrevation()); + text.add(EnumChatFormatting.WHITE + PowerDisplayUtil.formatPower(network.getMaxEnergyStored()) + " " + EnumChatFormatting.GRAY + + PowerDisplayUtil.abrevation()); + + float change = network.getAverageChangePerTick(); + String color = EnumChatFormatting.WHITE.toString(); + if(change > 0) { + color = EnumChatFormatting.GREEN.toString() + "+"; + } else if(change < 0) { + color = EnumChatFormatting.RED.toString(); + } + text.add(String.format("%s%s%s" + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(), color, + PowerDisplayUtil.formatPower(Math.round(change)), " " + + EnumChatFormatting.GRAY.toString())); } });