diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index 35b651722..4d616804b 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -135,12 +135,12 @@ public class GasNetwork extends DynamicNetwork gasStored = null; } - public synchronized int getGasNeeded() + public int getGasNeeded() { return getCapacity()-(gasStored != null ? gasStored.amount : 0); } - public synchronized int tickEmit(GasStack stack) + public int tickEmit(GasStack stack) { List availableAcceptors = Arrays.asList(getAcceptors(stack.getGas()).toArray()); @@ -185,7 +185,7 @@ public class GasNetwork extends DynamicNetwork return sent; } - public synchronized int emit(GasStack stack) + public int emit(GasStack stack) { if(gasStored != null && gasStored.getGas() != stack.getGas()) { @@ -276,12 +276,12 @@ public class GasNetwork extends DynamicNetwork } @Override - public synchronized Set getAcceptors(Object... data) + public Set getAcceptors(Object... data) { Gas type = (Gas)data[0]; Set toReturn = new HashSet(); - for(IGasHandler acceptor : ((Map)possibleAcceptors.clone()).values()) + for(IGasHandler acceptor : possibleAcceptors.values()) { if(acceptorDirections.get(acceptor) == null) { @@ -298,35 +298,7 @@ public class GasNetwork extends DynamicNetwork } @Override - public synchronized void refresh() - { - Set> iterTubes = (Set>)transmitters.clone(); - Iterator> it = iterTubes.iterator(); - boolean networkChanged = false; - - while(it.hasNext()) - { - IGridTransmitter conductor = (IGridTransmitter)it.next(); - - if(conductor == null || conductor.getTile().isInvalid()) - { - it.remove(); - networkChanged = true; - transmitters.remove(conductor); - } - else { - conductor.setTransmitterNetwork(this); - } - } - - if(networkChanged) - { - updateCapacity(); - } - } - - @Override - public synchronized void refresh(IGridTransmitter transmitter) + public void refresh(IGridTransmitter transmitter) { IGasHandler[] acceptors = GasTransmission.getConnectedAcceptors(transmitter.getTile()); diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index 27194fa97..69e15ac30 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -2,6 +2,7 @@ package mekanism.api.transmitters; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -24,7 +25,7 @@ import cpw.mods.fml.common.eventhandler.Event; public abstract class DynamicNetwork> implements ITransmitterNetwork, IClientTicker, INetworkDataHandler { - public LinkedHashSet> transmitters = new LinkedHashSet>(); + public final Set> transmitters = Collections.synchronizedSet(new LinkedHashSet>()); public HashMap possibleAcceptors = new HashMap(); public HashMap acceptorDirections = new HashMap(); @@ -91,15 +92,46 @@ public abstract class DynamicNetwork> implemen { possibleAcceptors.clear(); acceptorDirections.clear(); - - for(IGridTransmitter transmitter : transmitters) + + synchronized(transmitters) { - refresh(transmitter); + for(IGridTransmitter transmitter : transmitters) + { + refresh(transmitter); + } } - + refresh(); } - + + @Override + public void refresh() + { + boolean networkChanged = false; + + synchronized(transmitters) + { + for(Iterator> it = transmitters.iterator(); it.hasNext();) + { + IGridTransmitter conductor = it.next(); + + if(conductor == null || conductor.getTile().isInvalid()) + { + it.remove(); + networkChanged = true; + } else + { + conductor.setTransmitterNetwork((N)this); + } + } + } + + if(networkChanged) + { + updateCapacity(); + } + } + public Range4D getPacketRange() { if(packetRange == null) @@ -116,7 +148,7 @@ public abstract class DynamicNetwork> implemen { return null; } - + return transmitters.iterator().next().getTile().getWorldObj(); } @@ -127,26 +159,31 @@ public abstract class DynamicNetwork> implemen deregister(); return null; } - - Coord4D initCoord = Coord4D.get(transmitters.iterator().next().getTile()); - + + Coord4D initCoord; + + initCoord = Coord4D.get(transmitters.iterator().next().getTile()); + int minX = initCoord.xCoord; int minY = initCoord.yCoord; int minZ = initCoord.zCoord; int maxX = initCoord.xCoord; int maxY = initCoord.yCoord; int maxZ = initCoord.zCoord; - - for(IGridTransmitter transmitter : transmitters) + + synchronized(transmitters) { - Coord4D coord = Coord4D.get(transmitter.getTile()); - - if(coord.xCoord < minX) minX = coord.xCoord; - if(coord.yCoord < minY) minY = coord.yCoord; - if(coord.zCoord < minZ) minZ = coord.zCoord; - if(coord.xCoord > maxX) maxX = coord.xCoord; - if(coord.yCoord > maxY) maxY = coord.yCoord; - if(coord.zCoord > maxZ) maxZ = coord.zCoord; + for(IGridTransmitter transmitter : transmitters) + { + Coord4D coord = Coord4D.get(transmitter.getTile()); + + if(coord.xCoord < minX) minX = coord.xCoord; + if(coord.yCoord < minY) minY = coord.yCoord; + if(coord.zCoord < minZ) minZ = coord.zCoord; + if(coord.xCoord > maxX) maxX = coord.xCoord; + if(coord.yCoord > maxY) maxY = coord.yCoord; + if(coord.zCoord > maxZ) maxZ = coord.zCoord; + } } return new Range4D(minX, minY, minZ, maxX, maxY, maxZ, getWorld().provider.dimensionId); @@ -175,8 +212,8 @@ public abstract class DynamicNetwork> implemen if(!((TileEntity)aTransmitter).getWorldObj().isRemote) { TransmitterNetworkRegistry.getInstance().registerNetwork(this); - } - else { + } else + { MinecraftForge.EVENT_BUS.post(new ClientTickUpdate(this, (byte)1)); } } @@ -209,7 +246,7 @@ public abstract class DynamicNetwork> implemen return possibleAcceptors.size(); } - public synchronized void updateCapacity() + public void updateCapacity() { updateMeanCapacity(); capacity = (int)meanCapacity * transmitters.size(); @@ -219,12 +256,12 @@ public abstract class DynamicNetwork> implemen * Override this if things can have variable capacity along the network. * @return An 'average' value of capacity. Calculate it how you will. */ - protected synchronized void updateMeanCapacity() + protected void updateMeanCapacity() { if(transmitters.size() > 0) { meanCapacity = transmitters.iterator().next().getCapacity(); - } + } else { meanCapacity = 0; } @@ -294,7 +331,7 @@ public abstract class DynamicNetwork> implemen } @Override - public synchronized void fixMessedUpNetwork(IGridTransmitter transmitter) + public void fixMessedUpNetwork(IGridTransmitter transmitter) { if(transmitter instanceof TileEntity) { @@ -321,7 +358,7 @@ public abstract class DynamicNetwork> implemen } @Override - public synchronized void split(IGridTransmitter splitPoint) + public void split(IGridTransmitter splitPoint) { if(splitPoint instanceof TileEntity) { diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index f12524520..97a3fcb66 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -80,15 +80,18 @@ public class EnergyNetwork extends DynamicNetwork } @Override - protected synchronized void updateMeanCapacity() + protected void updateMeanCapacity() { int numCables = transmitters.size(); double reciprocalSum = 0; - - for(IGridTransmitter cable : transmitters) - { - reciprocalSum += 1.0/(double)cable.getCapacity(); - } + + synchronized(transmitters) + { + for(IGridTransmitter cable : transmitters) + { + reciprocalSum += 1.0 / (double)cable.getCapacity(); + } + } meanCapacity = (double)numCables / reciprocalSum; } @@ -119,7 +122,7 @@ public class EnergyNetwork extends DynamicNetwork } } - public synchronized double getEnergyNeeded() + public double getEnergyNeeded() { if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { @@ -129,7 +132,7 @@ public class EnergyNetwork extends DynamicNetwork return getCapacity()-electricityStored; } - public synchronized double tickEmit(double energyToSend) + public double tickEmit(double energyToSend) { if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { @@ -153,7 +156,7 @@ public class EnergyNetwork extends DynamicNetwork return sent; } - public synchronized double emit(double energyToSend, boolean doEmit) + public double emit(double energyToSend, boolean doEmit) { double toUse = Math.min(getEnergyNeeded(), energyToSend); if(doEmit) @@ -166,7 +169,7 @@ public class EnergyNetwork extends DynamicNetwork /** * @return sent */ - public synchronized double doEmit(double energyToSend, boolean tryAgain) + public double doEmit(double energyToSend, boolean tryAgain) { double sent = 0; @@ -219,7 +222,7 @@ public class EnergyNetwork extends DynamicNetwork } @Override - public synchronized Set getAcceptors(Object... data) + public Set getAcceptors(Object... data) { Set toReturn = new HashSet(); @@ -228,7 +231,7 @@ public class EnergyNetwork extends DynamicNetwork return toReturn; } - for(TileEntity acceptor : ((Map)possibleAcceptors.clone()).values()) + for(TileEntity acceptor : possibleAcceptors.values()) { ForgeDirection side = acceptorDirections.get(acceptor); @@ -246,7 +249,6 @@ public class EnergyNetwork extends DynamicNetwork if(handler.getMaxEnergy() - handler.getEnergy() > 0) { toReturn.add(acceptor); - continue; } } } @@ -259,7 +261,6 @@ public class EnergyNetwork extends DynamicNetwork if(handler.receiveEnergy(side.getOpposite(), 1, true) > 0) { toReturn.add(acceptor); - continue; } } } @@ -276,7 +277,6 @@ public class EnergyNetwork extends DynamicNetwork if(Math.min(demanded, max) > 0) { toReturn.add(acceptor); - continue; } } } @@ -286,37 +286,15 @@ public class EnergyNetwork extends DynamicNetwork } @Override - public synchronized void refresh() + public void refresh() { - Set> iterCables = (Set>)transmitters.clone(); - Iterator> it = iterCables.iterator(); - boolean networkChanged = false; - - while(it.hasNext()) - { - IGridTransmitter conductor = (IGridTransmitter)it.next(); - - if(conductor == null || conductor.getTile().isInvalid()) - { - it.remove(); - transmitters.remove(conductor); - networkChanged = true; - } - else { - conductor.setTransmitterNetwork(this); - } - } - - if(networkChanged) - { - updateCapacity(); - } + super.refresh(); needsUpdate = true; } @Override - public synchronized void refresh(IGridTransmitter transmitter) + public void refresh(IGridTransmitter transmitter) { TileEntity[] acceptors = CableUtils.getConnectedEnergyAcceptors(transmitter.getTile()); diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 8612e15c8..cad8d6b00 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -99,14 +99,17 @@ public class FluidNetwork extends DynamicNetwork } @Override - protected synchronized void updateMeanCapacity() + protected void updateMeanCapacity() { int numCables = transmitters.size(); double sum = 0; - for(IGridTransmitter pipe : transmitters) + synchronized(transmitters) { - sum += pipe.getCapacity(); + for(IGridTransmitter pipe : transmitters) + { + sum += pipe.getCapacity(); + } } meanCapacity = sum / (double)numCables; @@ -148,12 +151,12 @@ public class FluidNetwork extends DynamicNetwork refFluid = null; } - public synchronized int getFluidNeeded() + public int getFluidNeeded() { return getCapacity()-(fluidStored != null ? fluidStored.amount : 0); } - public synchronized int tickEmit(FluidStack fluidToSend, boolean doTransfer) + public int tickEmit(FluidStack fluidToSend, boolean doTransfer) { List availableAcceptors = Arrays.asList(getAcceptors(fluidToSend).toArray()); @@ -197,7 +200,7 @@ public class FluidNetwork extends DynamicNetwork return fluidSent; } - public synchronized int emit(FluidStack fluidToSend, boolean doTransfer) + public int emit(FluidStack fluidToSend, boolean doTransfer) { if(fluidToSend == null || (fluidStored != null && fluidStored.getFluid() != fluidToSend.getFluid())) { @@ -294,12 +297,12 @@ public class FluidNetwork extends DynamicNetwork } @Override - public synchronized Set getAcceptors(Object... data) + public Set getAcceptors(Object... data) { FluidStack fluidToSend = (FluidStack)data[0]; Set toReturn = new HashSet(); - for(IFluidHandler acceptor : ((Map)possibleAcceptors.clone()).values()) + for(IFluidHandler acceptor : possibleAcceptors.values()) { if(acceptorDirections.get(acceptor) == null) { @@ -314,37 +317,9 @@ public class FluidNetwork extends DynamicNetwork return toReturn; } - - @Override - public synchronized void refresh() - { - Set> iterPipes = (Set>)transmitters.clone(); - Iterator it = iterPipes.iterator(); - boolean networkChanged = false; - - while(it.hasNext()) - { - IGridTransmitter conductor = (IGridTransmitter)it.next(); - - if(conductor == null || conductor.getTile().isInvalid()) - { - it.remove(); - networkChanged = true; - transmitters.remove(conductor); - } - else { - conductor.setTransmitterNetwork(this); - } - } - - if(networkChanged) - { - updateCapacity(); - } - } @Override - public synchronized void refresh(IGridTransmitter transmitter) + public void refresh(IGridTransmitter transmitter) { IFluidHandler[] acceptors = PipeUtils.getConnectedAcceptors(transmitter.getTile());