Tile code cleanup

core/src/mindustry/ai/BlockIndexer.java

@@ -78,18 +78,14 @@ public class BlockIndexer{
             //create bitset for each team type that contains each quadrant
             structQuadrants = new GridBits[Team.all().length];
 
-            for(int x = 0; x < world.width(); x++){
-                for(int y = 0; y < world.height(); y++){
-                    Tile tile = world.tile(x, y);
+            for(Tile tile : world.tiles){
+                process(tile);
 
-                    process(tile);
-
-                    if(tile.entity != null && tile.entity.damaged()){
-                        notifyTileDamaged(tile.entity);
-                    }
-
-                    if(tile.drop() != null) allOres.add(tile.drop());
+                if(tile.entity != null && tile.entity.damaged()){
+                    notifyTileDamaged(tile.entity);
                 }
+
+                if(tile.drop() != null) allOres.add(tile.drop());
             }
 
             for(int x = 0; x < quadWidth(); x++){
@@ -119,14 +115,11 @@ public class BlockIndexer{
         if(structQuadrants == null) return;
 
         //go through every tile... ouch
-        for(int x = 0; x < world.width(); x++){
-            for(int y = 0; y < world.height(); y++){
-                Tile tile = world.tile(x, y);
-                if(tile.team() == team){
-                    int quadrantX = tile.x / quadrantSize;
-                    int quadrantY = tile.y / quadrantSize;
-                    structQuadrant(team).set(quadrantX, quadrantY);
-                }
+        for(Tile tile : world.tiles){
+            if(tile.team() == team){
+                int quadrantX = tile.x / quadrantSize;
+                int quadrantY = tile.y / quadrantSize;
+                structQuadrant(team).set(quadrantX, quadrantY);
             }
         }
     }
@@ -403,20 +396,16 @@ public class BlockIndexer{
             ores.put(item, new ObjectSet<>());
         }
 
-        for(int x = 0; x < world.width(); x++){
-            for(int y = 0; y < world.height(); y++){
-                int qx = (x / quadrantSize);
-                int qy = (y / quadrantSize);
+        for(Tile tile : world.tiles){
+            int qx = (tile.x / quadrantSize);
+            int qy = (tile.y / quadrantSize);
 
-                Tile tile = world.tile(x, y);
-
-                //add position of quadrant to list when an ore is found
-                if(tile.drop() != null && scanOres.contains(tile.drop()) && tile.block() == Blocks.air){
-                    ores.get(tile.drop()).add(world.tile(
-                    //make sure to clamp quadrant middle position, since it might go off bounds
-                    Mathf.clamp(qx * quadrantSize + quadrantSize / 2, 0, world.width() - 1),
-                    Mathf.clamp(qy * quadrantSize + quadrantSize / 2, 0, world.height() - 1)));
-                }
+            //add position of quadrant to list when an ore is found
+            if(tile.drop() != null && scanOres.contains(tile.drop()) && tile.block() == Blocks.air){
+                ores.get(tile.drop()).add(world.tile(
+                //make sure to clamp quadrant middle position, since it might go off bounds
+                Mathf.clamp(qx * quadrantSize + quadrantSize / 2, 0, world.width() - 1),
+                Mathf.clamp(qy * quadrantSize + quadrantSize / 2, 0, world.height() - 1)));
             }
         }
     }

core/src/mindustry/ai/Pathfinder.java

@@ -1,13 +1,13 @@
 package mindustry.ai;
 
 import arc.*;
-import mindustry.annotations.Annotations.*;
-import arc.struct.*;
 import arc.func.*;
 import arc.math.geom.*;
-import arc.util.*;
+import arc.struct.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import arc.util.async.*;
+import mindustry.annotations.Annotations.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.gen.*;
@@ -45,10 +45,8 @@ public class Pathfinder implements Runnable{
             created = new GridBits(Team.all().length, PathTarget.all.length);
             list = new Array<>();
 
-            for(int x = 0; x < world.width(); x++){
-                for(int y = 0; y < world.height(); y++){
-                    tiles[x][y] = packTile(world.rawTile(x, y));
-                }
+            for(Tile tile : world.tiles){
+                tiles[tile.x][tile.y] = packTile(tile);
             }
 
             //special preset which may help speed things up; this is optional

core/src/mindustry/ai/WaveSpawner.java

@@ -118,12 +118,9 @@ public class WaveSpawner{
         flySpawns.clear();
         groundSpawns.clear();
 
-        for(int x = 0; x < world.width(); x++){
-            for(int y = 0; y < world.height(); y++){
-
-                if(world.tile(x, y).overlay() == Blocks.spawn){
-                    addSpawns(x, y);
-                }
+        for(Tile tile : world.tiles){
+            if(tile.overlay() == Blocks.spawn){
+                addSpawns(tile.x, tile.y);
             }
         }
     }