Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-06-24 14:00:04 +02:00
Code Issues Projects Releases Wiki Activity

Hopefully fixes ConcurrentModificationExceptions

Browse source
This commit is contained in:
Ellpeck 2015-10-28 22:38:00 +01:00
parent db31abb46b
commit cb22c4aa94
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/ellpeck/actuallyadditions/misc/LaserRelayConnectionHandler.java
View file

@ -68,8 +68,10 @@ public class LaserRelayConnectionHandler{
*/ */
public ArrayList<ConnectionPair> getConnectionsFor(WorldPos relay){ public ArrayList<ConnectionPair> getConnectionsFor(WorldPos relay){
ArrayList<ConnectionPair> allPairs = new ArrayList<ConnectionPair>(); ArrayList<ConnectionPair> allPairs = new ArrayList<ConnectionPair>();
for(ArrayList<ConnectionPair> aNetwork : this.networks){ ArrayList<ArrayList<ConnectionPair>> theNetworks = new ArrayList<ArrayList<ConnectionPair>>(this.networks);
for(ConnectionPair pair : aNetwork){ for(ArrayList<ConnectionPair> aNetwork : theNetworks){
ArrayList<ConnectionPair> pairs = new ArrayList<ConnectionPair>(aNetwork);
for(ConnectionPair pair : pairs){
if(pair.contains(relay)){ if(pair.contains(relay)){
allPairs.add(pair); allPairs.add(pair);
} }
@ -86,7 +88,8 @@ public class LaserRelayConnectionHandler{
if(network != null){ if(network != null){
//Setup new network (so that splitting a network will cause it to break into two) //Setup new network (so that splitting a network will cause it to break into two)
this.networks.remove(network); this.networks.remove(network);
for(ConnectionPair pair : network){ ArrayList<ConnectionPair> pairs = new ArrayList<ConnectionPair>(network);
for(ConnectionPair pair : pairs){
if(!pair.contains(relay)){ if(!pair.contains(relay)){
this.addConnection(pair.firstRelay, pair.secondRelay); this.addConnection(pair.firstRelay, pair.secondRelay);
} }
@ -99,8 +102,10 @@ public class LaserRelayConnectionHandler{
* Gets a Network for a Relay * Gets a Network for a Relay
*/ */
public ArrayList<ConnectionPair> getNetworkFor(WorldPos relay){ public ArrayList<ConnectionPair> getNetworkFor(WorldPos relay){
for(ArrayList<ConnectionPair> aNetwork : this.networks){ ArrayList<ArrayList<ConnectionPair>> theNetworks = new ArrayList<ArrayList<ConnectionPair>>(this.networks);
for(ConnectionPair pair : aNetwork){ for(ArrayList<ConnectionPair> aNetwork : theNetworks){
ArrayList<ConnectionPair> pairs = new ArrayList<ConnectionPair>(aNetwork);
for(ConnectionPair pair : pairs){
if(pair.contains(relay)){ if(pair.contains(relay)){
return aNetwork; return aNetwork;
} }
@ -156,7 +161,8 @@ public class LaserRelayConnectionHandler{
* (Actually puts everything from the second network into the first one and removes the second one) * (Actually puts everything from the second network into the first one and removes the second one)
*/ */
public void mergeNetworks(ArrayList<ConnectionPair> firstNetwork, ArrayList<ConnectionPair> secondNetwork){ public void mergeNetworks(ArrayList<ConnectionPair> firstNetwork, ArrayList<ConnectionPair> secondNetwork){
for(ConnectionPair secondPair : secondNetwork){ ArrayList<ConnectionPair> pairs = new ArrayList<ConnectionPair>(secondNetwork);
for(ConnectionPair secondPair : pairs){
firstNetwork.add(secondPair); firstNetwork.add(secondPair);
} }
this.networks.remove(secondNetwork); this.networks.remove(secondNetwork);
@ -167,7 +173,8 @@ public class LaserRelayConnectionHandler{
public int transferEnergyToReceiverInNeed(ArrayList<ConnectionPair> network, int maxTransfer, boolean simulate){ public int transferEnergyToReceiverInNeed(ArrayList<ConnectionPair> network, int maxTransfer, boolean simulate){
int transmitted = 0; int transmitted = 0;
//Go through all of the connections in the network //Go through all of the connections in the network
for(ConnectionPair pair : network){ ArrayList<ConnectionPair> pairs = new ArrayList<ConnectionPair>(network);
for(ConnectionPair pair : pairs){
WorldPos[] relays = new WorldPos[]{pair.firstRelay, pair.secondRelay}; WorldPos[] relays = new WorldPos[]{pair.firstRelay, pair.secondRelay};
//Go through both relays in the connection //Go through both relays in the connection
for(WorldPos relay : relays){ for(WorldPos relay : relays){