From 8e5e42d7bffe841d67e92fa66e69d73efc145d52 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Mon, 29 Jul 2013 02:45:14 -0400 Subject: [PATCH] finished up revised NetworkSharedPower --- .../core/tile/network/NetworkSharedPower.java | 42 ++++++++++++++++++- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/src/dark/core/tile/network/NetworkSharedPower.java b/src/dark/core/tile/network/NetworkSharedPower.java index 41d0ce3a9..15387b1ee 100644 --- a/src/dark/core/tile/network/NetworkSharedPower.java +++ b/src/dark/core/tile/network/NetworkSharedPower.java @@ -2,6 +2,7 @@ package dark.core.tile.network; import net.minecraft.tileentity.TileEntity; import universalelectricity.core.block.IElectricalStorage; +import dark.api.INetworkEnergyPart; import dark.api.INetworkPart; import dark.api.IPowerLess; @@ -11,7 +12,7 @@ import dark.api.IPowerLess; * @author DarkGuardsman */ public class NetworkSharedPower extends NetworkTileEntities implements IElectricalStorage, IPowerLess { - private float energy; + private float energy, energyMax; private boolean runPowerLess; public NetworkSharedPower(INetworkPart... parts) @@ -25,6 +26,12 @@ public class NetworkSharedPower extends NetworkTileEntities implements IElectric return new NetworkSharedPower(); } + @Override + public boolean isValidMember(INetworkPart part) + { + return super.isValidMember(part) && part instanceof INetworkEnergyPart; + } + public float dumpPower(TileEntity source, float power, boolean doFill) { float room = (this.getMaxEnergyStored() - this.getEnergyStored()); @@ -101,7 +108,38 @@ public class NetworkSharedPower extends NetworkTileEntities implements IElectric @Override public float getMaxEnergyStored() { - return Integer.MAX_VALUE; + return this.energyMax; + } + + @Override + public void writeDataToTiles() + { + this.cleanUpMembers(); + float energyRemaining = this.getEnergyStored(); + for (INetworkPart part : this.getNetworkMemebers()) + { + float watts = energyRemaining / this.getNetworkMemebers().size(); + if (part instanceof INetworkEnergyPart) + { + ((INetworkEnergyPart) part).setEnergyStored(Math.min(watts, ((INetworkEnergyPart) part).getMaxEnergyStored())); + energyRemaining -= Math.min(watts, ((INetworkEnergyPart) part).getMaxEnergyStored()); + } + } + } + + @Override + public void readDataFromTiles() + { + this.energy = 0; + this.cleanUpMembers(); + for (INetworkPart part : this.getNetworkMemebers()) + { + if (part instanceof INetworkEnergyPart) + { + this.energy += ((INetworkEnergyPart) part).getPartEnergy(); + this.energyMax += ((INetworkEnergyPart) part).getPartMaxEnergy(); + } + } } }