Fixed syncing of CapacitorBank storage energy with client.

Fixed case of ToolTipManager and renderer.

common/crazypants/enderio/machine/power/GuiCapacitorBank.java

@@ -3,27 +3,21 @@ package crazypants.enderio.machine.power;
 import java.awt.Rectangle;
 import java.util.List;
 
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.network.packet.Packet;
+
 import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.common.network.PacketDispatcher;
-
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.network.packet.Packet;
 import crazypants.enderio.PacketHandler;
 import crazypants.enderio.machine.AbstractMachineBlock;
 import crazypants.enderio.machine.GuiMachineBase;
 import crazypants.enderio.machine.RedstoneControlMode;
-import crazypants.render.GuiContainerBase;
 import crazypants.render.GuiScreenBase;
 import crazypants.render.GuiToolTip;
 import crazypants.render.IconButton;
 import crazypants.render.RenderUtil;
-import crazypants.render.ToolTipManager.TooltipRender;
 
 public class GuiCapacitorBank extends GuiScreenBase {
 

common/crazypants/enderio/machine/power/TileCapacitorBank.java

@@ -108,10 +108,11 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep
     storedEnergy = powerHandler.getEnergyStored();
 
     // Update if our power has changed by more than 0.5%
-    requiresClientSync |= lastSyncPowerStored != storedEnergy && worldObj.getWorldTime() % 21 == 0;
+    requiresClientSync |= lastSyncPowerStored != storedEnergy && worldObj.getTotalWorldTime() % 21 == 0;
 
     if (requiresClientSync) {
-      lastSyncPowerStored = powerHandler.getEnergyStored();
+      lastSyncPowerStored = storedEnergy;
+      
       // this will cause 'getPacketDescription()' to be called and its result
       // will be sent to the PacketHandler on the other end of
       // client/server connection

common/crazypants/render/GuiContainerBase.java

@@ -4,13 +4,13 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import crazypants.render.ToolTipManager.TooltipRender;
+import crazypants.render.ToolTipManager.ToolTipRenderer;
 
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Container;
 
-public abstract class GuiContainerBase extends GuiContainer implements TooltipRender {
+public abstract class GuiContainerBase extends GuiContainer implements ToolTipRenderer {
 
   protected ToolTipManager ttMan = new ToolTipManager();
 

common/crazypants/render/GuiScreenBase.java

@@ -6,14 +6,14 @@ import java.util.List;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import crazypants.render.ToolTipManager.TooltipRender;
+import crazypants.render.ToolTipManager.ToolTipRenderer;
 
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.inventory.Container;
 
-public abstract class GuiScreenBase extends GuiScreen implements TooltipRender {
+public abstract class GuiScreenBase extends GuiScreen implements ToolTipRenderer {
 
   protected ToolTipManager ttMan = new ToolTipManager();
 

common/crazypants/render/ToolTipManager.java

@@ -9,7 +9,7 @@ import net.minecraft.client.gui.GuiScreen;
 
 public class ToolTipManager {
 
-  public static interface TooltipRender {
+  public static interface ToolTipRenderer {
     int getGuiLeft();
     int getGuiTop();
     int getXSize();
@@ -23,7 +23,7 @@ public class ToolTipManager {
     toolTips.add(toolTip);
   }
 
-  protected final void drawTooltips(TooltipRender renderer, int mouseX, int mouseY) {
+  protected final void drawTooltips(ToolTipRenderer renderer, int mouseX, int mouseY) {
     for (GuiToolTip toolTip : toolTips) {
       toolTip.onTick(mouseX - renderer.getGuiLeft(), mouseY - renderer.getGuiTop());
       if (toolTip.shouldDraw()) {
@@ -32,7 +32,7 @@ public class ToolTipManager {
     }
   }
 
-  protected void drawTooltip(GuiToolTip toolTip, int mouseX, int mouseY, TooltipRender renderer) {
+  protected void drawTooltip(GuiToolTip toolTip, int mouseX, int mouseY, ToolTipRenderer renderer) {
     List<String> list = toolTip.getToolTipText();
     
     List<String> formatted = new ArrayList<String>(list.size());