made more methods use MapIterator

Author: EnderCrypt

src/main/java/net/ddns/endercypt/cs2dmap/library/map/sub/extra/map/MapArray.java

@@ -94,36 +94,32 @@ public void circle(int x1, int y1, int x2, int y2, TileAction tileAction)
 		double rxc = x1 + xc;
 		double ryc = y1 + yc;
 
-		for (int x = x1; x < x2 + 1; x++)
+		iterate(x1, y1, x2, y2, new MapIterator()
 		{
-			for (int y = y1; y < y2 + 1; y++)
+			@Override
+			public void process(int x, int y, Tile tile)
 			{
-				if (isInBounds(x, y))
+				double xoffset = 1.0 / xc * Math.abs(x - rxc);
+				double yoffset = 1.0 / yc * Math.abs(y - ryc);
+				double dist = Math.hypot(xoffset, yoffset);
+				if (dist <= 1.0)
 				{
-					double xoffset = 1.0 / xc * Math.abs(x - rxc);
-					double yoffset = 1.0 / yc * Math.abs(y - ryc);
-					double dist = Math.hypot(xoffset, yoffset);
-					if (dist <= 1.0)
-					{
-						tileAction.process(tile(x, y));
-					}
+					tileAction.process(tile(x, y));
 				}
 			}
-		}
+		});
 	}
 
 	public void rectangle(int x1, int y1, int x2, int y2, TileAction tileAction)
 	{
-		for (int x = x1; x < x2 + 1; x++)
+		iterate(x1, y1, x2, y2, new MapIterator()
 		{
-			for (int y = y1; y < y2 + 1; y++)
+			@Override
+			public void process(int x, int y, Tile tile)
 			{
-				if (isInBounds(x, y))
-				{
-					tileAction.process(tile(x, y));
-				}
+				tileAction.process(tile(x, y));
 			}
-		}
+		});
 	}
 
 	public void fill(TileAction tileAction)

src/main/java/net/ddns/endercypt/cs2dmap/library/map/sub/extra/map/MapIterator.java

@@ -2,6 +2,7 @@
 
 import net.ddns.endercypt.cs2dmap.library.map.obj.tile.Tile;
 
+@FunctionalInterface
 public interface MapIterator
 {
 	public void process(int x, int y, Tile tile);

src/main/java/test/CreateMap.java

@@ -10,13 +10,11 @@
 import net.ddns.endercypt.cs2dmap.library.map.obj.entity.type.info.Info_Hostage;
 import net.ddns.endercypt.cs2dmap.library.map.obj.entity.type.info.Info_T;
 import net.ddns.endercypt.cs2dmap.library.map.obj.entity.type.info.Info_Hostage.HostageLooks;
-import net.ddns.endercypt.cs2dmap.library.map.obj.tile.Tile;
 import net.ddns.endercypt.cs2dmap.library.map.obj.tile.modifier.ColorTileModifier;
 import net.ddns.endercypt.cs2dmap.library.map.sub.Cs2dBackground;
 import net.ddns.endercypt.cs2dmap.library.map.sub.Cs2dEntities;
 import net.ddns.endercypt.cs2dmap.library.map.sub.Cs2dMapArray;
 import net.ddns.endercypt.cs2dmap.library.map.sub.Cs2dTiles;
-import net.ddns.endercypt.cs2dmap.library.map.sub.extra.map.MapIterator;
 import net.ddns.endercypt.cs2dmap.library.map.sub.extra.map.MapSection;
 import net.ddns.endercypt.cs2dmap.library.map.sub.extra.tile.TileMode;
 import net.ddns.endercypt.cs2dmap.library.map.sub.extra.tile.action.TileActions;
@@ -50,15 +48,6 @@ public static void main(String[] args) throws IOException
 			map.tile(2, 9).setFrame(5);
 			map.tile(5, 8).setTileModifier(new ColorTileModifier(255, 0, 0, 1));
 
-			map.iterate(new MapIterator()
-			{
-				@Override
-				public void process(int x, int y, Tile tile)
-				{
-					tile.setFrame(15);
-				}
-			});
-
 			MapSection copy = map.copy(0, 0, 5, 5);
 			copy.pasteInto(map, -1, -1);