diff --git a/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadNodeChildIndexIterator.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadNodeChildIndexIterator.java index bc014863b..07b4a0736 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadNodeChildIndexIterator.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadNodeChildIndexIterator.java @@ -22,15 +22,12 @@ package com.seibel.distanthorizons.core.util.objects.quadTree.iterators; import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.util.objects.quadTree.QuadNode; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.NoSuchElementException; -import java.util.Queue; +import java.util.*; import java.util.function.Consumer; public class QuadNodeChildIndexIterator implements Iterator { - private final Queue iteratorQueue = new LinkedList<>(); + private final Queue iteratorQueue = new ArrayDeque<>(); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadTreeNodeIterator.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadTreeNodeIterator.java index 54fb3ae01..ca67ef7f5 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadTreeNodeIterator.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/quadTree/iterators/QuadTreeNodeIterator.java @@ -22,10 +22,7 @@ package com.seibel.distanthorizons.core.util.objects.quadTree.iterators; import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.util.objects.quadTree.QuadNode; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.NoSuchElementException; -import java.util.Queue; +import java.util.*; import java.util.function.Consumer; public class QuadTreeNodeIterator implements Iterator> @@ -34,8 +31,8 @@ public class QuadTreeNodeIterator implements Iterator> private final byte highestDetailLevel; - private final Queue> validNodesForDetailLevel = new LinkedList<>(); - private final Queue> iteratorNodeQueue = new LinkedList<>(); + private final Queue> validNodesForDetailLevel = new ArrayDeque<>(); + private final Queue> iteratorNodeQueue = new ArrayDeque<>(); private byte iteratorDetailLevel = 0; private final boolean onlyReturnLeafValues; @@ -64,7 +61,7 @@ public class QuadTreeNodeIterator implements Iterator> // but it is simple and functions well enough for now - Queue> parentNodeQueue = new LinkedList<>(); + Queue> parentNodeQueue = new ArrayDeque<>(); parentNodeQueue.add(rootNode); // walk through the whole tree and add each leaf node to the iterator queue