Replace iterator.remove with more efficient removal, and other refactors (#5751)

Author: MukjepScarlet

src/main/java/meteordevelopment/meteorclient/gui/GuiThemes.java

@@ -15,8 +15,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
 
 public class GuiThemes {
     private static final File FOLDER = new File(MeteorClient.FOLDER, "gui");
@@ -50,12 +50,13 @@ public static void postInit() {
     }
 
     public static void add(GuiTheme theme) {
-        for (Iterator<GuiTheme> it = themes.iterator(); it.hasNext();) {
+        for (ListIterator<GuiTheme> it = themes.listIterator(); it.hasNext();) {
             if (it.next().name.equals(theme.name)) {
-                it.remove();
+                // Replace the old one with same name
+                it.set(theme);
 
                 MeteorClient.LOG.error("Theme with the name '{}' has already been added.", theme.name);
-                break;
+                return;
             }
         }
 

src/main/java/meteordevelopment/meteorclient/systems/modules/combat/ArrowDodge.java

@@ -111,7 +111,7 @@ public ArrowDodge() {
 
     @EventHandler
     private void onTick(TickEvent.Pre event) {
-        for (Vector3d point : points) vec3s.free(point);
+        vec3s.freeAll(points);
         points.clear();
 
         for (Entity e : mc.world.getEntities()) {

src/main/java/meteordevelopment/meteorclient/systems/modules/render/Breadcrumbs.java

@@ -67,7 +67,7 @@ public void onActivate() {
 
     @Override
     public void onDeactivate() {
-        for (Section section : sections) sectionPool.free(section);
+        sectionPool.freeAll(sections);
         sections.clear();
     }
 
@@ -76,7 +76,7 @@ private void onTick(TickEvent.Post event) {
         if (!mc.player.isLoaded()) return;
 
         if (lastDimension != mc.world.getDimension()) {
-            for (Section sec : sections) sectionPool.free(sec);
+            sectionPool.freeAll(sections);
             sections.clear();
         }
 

src/main/java/meteordevelopment/meteorclient/systems/modules/render/HoleESP.java

@@ -168,7 +168,7 @@ public HoleESP() {
 
     @EventHandler
     private void onTick(TickEvent.Pre event) {
-        for (Hole hole : holes) holePool.free(hole);
+        holePool.freeAll(holes);
         holes.clear();
 
         // Probe for holes

src/main/java/meteordevelopment/meteorclient/systems/modules/render/LightOverlay.java

@@ -85,7 +85,7 @@ public LightOverlay() {
 
     @EventHandler
     private void onTick(TickEvent.Pre event) {
-        for (Cross cross : crosses) crossPool.free(cross);
+        crossPool.freeAll(crosses);
         crosses.clear();
 
         BlockIterator.register(horizontalRange.get(), verticalRange.get(), (blockPos, blockState) -> {

src/main/java/meteordevelopment/meteorclient/systems/modules/render/Trajectories.java

@@ -230,7 +230,7 @@ private class Path {
         public Vector3d lastPoint;
 
         public void clear() {
-            for (Vector3d point : points) vec3s.free(point);
+            vec3s.freeAll(points);
             points.clear();
 
             hitQuad = false;

src/main/java/meteordevelopment/meteorclient/systems/modules/world/PacketMine.java

@@ -136,7 +136,7 @@ public void onActivate() {
 
     @Override
     public void onDeactivate() {
-        for (MyBlock block : blocks) blockPool.free(block);
+        blockPool.freeAll(blocks);
         blocks.clear();
 
         if (shouldUpdateSlot) {

src/main/java/meteordevelopment/meteorclient/systems/modules/world/SpawnProofer.java

@@ -115,7 +115,7 @@ private void onTickPre(TickEvent.Pre event) {
         }
 
         // Find spawn locations
-        for (BlockPos.Mutable blockPos : spawns) spawnPool.free(blockPos);
+        spawnPool.freeAll(spawns);
         spawns.clear();
 
         BlockIterator.register((int) Math.ceil(placeRange.get()), (int) Math.ceil(placeRange.get()), (blockPos, blockState) -> {

src/main/java/meteordevelopment/meteorclient/systems/modules/world/VeinMiner.java

@@ -140,7 +140,7 @@ public VeinMiner() {
 
     @Override
     public void onDeactivate() {
-        for (MyBlock block : blocks) blockPool.free(block);
+        blockPool.freeAll(blocks);
         blocks.clear();
         foundBlockPositions.clear();
     }

src/main/java/meteordevelopment/meteorclient/systems/waypoints/Waypoints.java

@@ -24,6 +24,7 @@
 import net.minecraft.client.texture.NativeImageBackedTexture;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
@@ -32,13 +33,16 @@
 import java.io.InputStream;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 public class Waypoints extends System<Waypoints> implements Iterable<Waypoint> {
+    private static final String PNG = ".png";
+
     public static final String[] BUILTIN_ICONS = {"square", "circle", "triangle", "star", "diamond", "skull"};
 
     public final Map<String, AbstractTexture> icons = new ConcurrentHashMap<>();
 
-    private final List<Waypoint> waypoints = Collections.synchronizedList(new ArrayList<>());
+    private final List<Waypoint> waypoints = new CopyOnWriteArrayList<>();
 
     public Waypoints() {
         super(null);
@@ -54,18 +58,18 @@ public void init() {
         iconsFolder.mkdirs();
 
         for (String builtinIcon : BUILTIN_ICONS) {
-            File iconFile = new File(iconsFolder, builtinIcon + ".png");
+            File iconFile = new File(iconsFolder, builtinIcon + PNG);
             if (!iconFile.exists()) copyIcon(iconFile);
         }
 
         File[] files = iconsFolder.listFiles();
         if (files == null) return;
 
         for (File file : files) {
-            if (file.getName().endsWith(".png")) {
-                try {
-                    String name = file.getName().replace(".png", "");
-                    AbstractTexture texture = new NativeImageBackedTexture(null, NativeImage.read(new FileInputStream(file)));
+            if (file.getName().endsWith(PNG)) {
+                try (FileInputStream inputStream = new FileInputStream(file)) {
+                    String name = StringUtils.removeEnd(file.getName(), PNG);
+                    AbstractTexture texture = new NativeImageBackedTexture(() -> name, NativeImage.read(inputStream));
                     icons.put(name, texture);
                 }
                 catch (IOException e) {