diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java index 50777928..7a21147d 100644 --- a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java +++ b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java @@ -20,6 +20,7 @@ import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.util.BlockCoord; import crazypants.util.InventoryWrapper; import crazypants.util.ItemUtil; +import crazypants.util.RoundRobinIterator; public class NetworkedInventory { @@ -30,7 +31,7 @@ public class NetworkedInventory { int inventorySide; List sendPriority = new ArrayList(); - RoundRobinIterable rrIter = new RoundRobinIterable(); + RoundRobinIterator rrIter = new RoundRobinIterator(sendPriority); private int extractFromSlot = -1; @@ -353,43 +354,6 @@ public class NetworkedInventory { public void setInventorySide(int inventorySide) { this.inventorySide = inventorySide; } - - - - class RoundRobinIterable implements Iterable, Iterator { - - int index = -1; - int currentCount = 0; - - @Override - public Iterator iterator() { - currentCount = 0; - return this; - } - - @Override - public boolean hasNext() { - return !sendPriority.isEmpty() && currentCount <= sendPriority.size(); - } - - @Override - public Target next() { - if(sendPriority.isEmpty()) { - return null; - } - currentCount++; - index++; - if(index >= sendPriority.size()) { - index = 0; - } - return sendPriority.get(index); - } - - @Override - public void remove() { - } - - } static class Target implements Comparable { NetworkedInventory inv; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java index 83fe937d..2472e799 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java @@ -16,6 +16,7 @@ import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.ConnectionMode; import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; +import crazypants.util.RoundRobinIterator; public class EnderLiquidConduitNetwork extends AbstractConduitNetwork { @@ -24,7 +25,7 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork tanks = new ArrayList(); - Map iterators; + Map> iterators; public EnderLiquidConduitNetwork() { super(EnderLiquidConduit.class); @@ -93,11 +94,11 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork getIteratorForTank(NetworkTank tank) { if(iterators == null) { - iterators = new HashMap(); + iterators = new HashMap>(); } - RoundRobinIterable res = iterators.get(tank); + RoundRobinIterator res = iterators.get(tank); if(res == null) { - res = new RoundRobinIterable(); + res = new RoundRobinIterator(tanks); iterators.put(tank, res); } return res; @@ -168,40 +169,5 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork, Iterator { - - int index = -1; - int currentCount = 0; - - @Override - public Iterator iterator() { - currentCount = 0; - return this; - } - - @Override - public boolean hasNext() { - return !tanks.isEmpty() && currentCount <= tanks.size(); - } - - @Override - public NetworkTank next() { - if(tanks.isEmpty()) { - return null; - } - currentCount++; - index++; - if(index >= tanks.size()) { - index = 0; - } - return tanks.get(index); - } - - @Override - public void remove() { - } - - } } diff --git a/src/main/java/crazypants/util/RoundRobinIterator.java b/src/main/java/crazypants/util/RoundRobinIterator.java new file mode 100644 index 00000000..ae7f6410 --- /dev/null +++ b/src/main/java/crazypants/util/RoundRobinIterator.java @@ -0,0 +1,44 @@ +package crazypants.util; + +import java.util.Iterator; +import java.util.List; + +public class RoundRobinIterator implements Iterable, Iterator { + + private int index = -1; + private int currentCount = 0; + private final List itOver; + + public RoundRobinIterator(List itOver) { + this.itOver = itOver; + } + + @Override + public Iterator iterator() { + currentCount = 0; + return this; + } + + @Override + public boolean hasNext() { + return !itOver.isEmpty() && currentCount <= itOver.size(); + } + + @Override + public T next() { + if(itOver.isEmpty()) { + return null; + } + currentCount++; + index++; + if(index >= itOver.size()) { + index = 0; + } + return itOver.get(index); + } + + @Override + public void remove() { + } + +}