diff --git a/common/crazypants/enderio/conduit/power/PowerConduit.java b/common/crazypants/enderio/conduit/power/PowerConduit.java index 620afab6..7c0e06bb 100644 --- a/common/crazypants/enderio/conduit/power/PowerConduit.java +++ b/common/crazypants/enderio/conduit/power/PowerConduit.java @@ -383,7 +383,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { @Override public int getMaxEnergyStored(ForgeDirection from) { - return getCapacitor().getMaxEnergyStored(); + return getCapacitor().getMaxEnergyStored() * 10; } @Override diff --git a/common/crazypants/enderio/machine/power/TileCapacitorBank.java b/common/crazypants/enderio/machine/power/TileCapacitorBank.java index 6ef53b3b..c07e554f 100644 --- a/common/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/common/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -501,12 +501,12 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep @Override public int getEnergyStored(ForgeDirection from) { - return getController().doGetEnergyStored(from); + return (int) (getController().doGetEnergyStored(from) * 10); } @Override public int getMaxEnergyStored(ForgeDirection from) { - return getController().doGetMaxEnergyStored(); + return getController().doGetMaxEnergyStored() * 10; } public int doReceiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { @@ -518,12 +518,12 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep return result * 10; } - public int doGetEnergyStored(ForgeDirection from) { - return (int) (storedEnergy * 10); + public float doGetEnergyStored(ForgeDirection from) { + return storedEnergy; } public int doGetMaxEnergyStored(ForgeDirection from) { - return maxStoredEnergy * 10; + return maxStoredEnergy; } // end rf power @@ -677,7 +677,6 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep } private void updatePowerHandler() { - //powerHandler = PowerHandlerUtil.createHandler(new BasicCapacitor(maxInput, maxStoredEnergy, maxOutput), this, Type.STORAGE); if(storedEnergy > maxStoredEnergy) { storedEnergy = maxStoredEnergy; }