Nestable set iteration

core/src/io/anuke/mindustry/content/Mechs.java

@@ -264,11 +264,6 @@ public class Mechs implements ContentList{
                     bullet = Bullets.standardCopper;
                 }};
             }
-
-            @Override
-            public boolean alwaysUnlocked(){
-                return true;
-            }
         };
 
         javelin = new Mech("javelin-ship", true){

core/src/io/anuke/mindustry/core/Logic.java

@@ -2,7 +2,6 @@ package io.anuke.mindustry.core;
 
 import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
-import io.anuke.arc.collection.ObjectSet.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.core.GameState.*;
@@ -175,7 +174,7 @@ public class Logic implements ApplicationListener{
             ui.hudfrag.showLaunch();
         }
 
-        for(Tile tile : new ObjectSetIterator<>(state.teams.get(defaultTeam).cores)){
+        for(Tile tile : state.teams.get(defaultTeam).cores){
             Effects.effect(Fx.launch, tile);
         }
 
@@ -184,7 +183,7 @@ public class Logic implements ApplicationListener{
         }
 
         Time.runTask(30f, () -> {
-            for(Tile tile : new ObjectSetIterator<>(state.teams.get(defaultTeam).cores)){
+            for(Tile tile : state.teams.get(defaultTeam).cores){
                 for(Item item : content.items()){
                     if(tile == null || tile.entity == null || tile.entity.items == null) continue;
                     data.addItem(item, tile.entity.items.get(item));

core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java

@@ -2,7 +2,6 @@ package io.anuke.mindustry.ui.dialogs;
 
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
-import io.anuke.arc.collection.ObjectSet.*;
 import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
@@ -153,7 +152,7 @@ public class DeployDialog extends FloatingDialog{
         for(ZoneNode node : nodes){
             node.allChildren.clear();
             node.allChildren.addAll(node.children);
-            for(ZoneNode other : new ObjectSetIterator<>(nodes)){
+            for(ZoneNode other : nodes){
                 if(other.zone.requirements.contains(req -> req.zone() == node.zone)){
                     node.allChildren.add(other);
                 }

core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java

@@ -3,7 +3,6 @@ package io.anuke.mindustry.world.blocks.storage;
 import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
-import io.anuke.arc.collection.ObjectSet.*;
 import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
@@ -157,7 +156,7 @@ public class CoreBlock extends StorageBlock{
             tile.entity.items.set(item, Math.min(tile.entity.items.get(item), max));
         }
 
-        for(Tile other : new ObjectSetIterator<>(state.teams.get(tile.getTeam()).cores)){
+        for(Tile other : state.teams.get(tile.getTeam()).cores){
             other.block().onProximityUpdate(other);
         }
     }