Refactoring of functional package

core/src/io/anuke/mindustry/ai/BlockIndexer.java

@@ -2,6 +2,7 @@ package io.anuke.mindustry.ai;
 
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
+import io.anuke.arc.func.*;
 import io.anuke.arc.function.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
@@ -163,11 +164,11 @@ public class BlockIndexer{
         set.add(entity.tile);
     }
 
-    public TileEntity findTile(Team team, float x, float y, float range, Predicate<Tile> pred){
+    public TileEntity findTile(Team team, float x, float y, float range, Boolf<Tile> pred){
         return findTile(team, x, y, range, pred, false);
     }
 
-    public TileEntity findTile(Team team, float x, float y, float range, Predicate<Tile> pred, boolean usePriority){
+    public TileEntity findTile(Team team, float x, float y, float range, Boolf<Tile> pred, boolean usePriority){
         TileEntity closest = null;
         float dst = 0;
 
@@ -182,7 +183,7 @@ public class BlockIndexer{
 
                         if(other == null) continue;
 
-                        if(other.entity == null || other.getTeam() != team || !pred.test(other) || !other.block().targetable)
+                        if(other.entity == null || other.getTeam() != team || !pred.get(other) || !other.block().targetable)
                             continue;
 
                         TileEntity e = other.entity;

core/src/io/anuke/mindustry/ai/Pathfinder.java

@@ -3,6 +3,7 @@ package io.anuke.mindustry.ai;
 import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
+import io.anuke.arc.func.*;
 import io.anuke.arc.function.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.*;
@@ -317,15 +318,15 @@ public class Pathfinder implements Runnable{
 
         public static final PathTarget[] all = values();
 
-        private final BiConsumer<Team, IntArray> targeter;
+        private final Cons2<Team, IntArray> targeter;
 
-        PathTarget(BiConsumer<Team, IntArray> targeter){
+        PathTarget(Cons2<Team, IntArray> targeter){
             this.targeter = targeter;
         }
 
         /** Get targets. This must run on the main thread.*/
         public IntArray getTargets(Team team, IntArray out){
-            targeter.accept(team, out);
+            targeter.get(team, out);
             return out;
         }
     }

core/src/io/anuke/mindustry/ai/WaveSpawner.java

@@ -2,7 +2,7 @@ package io.anuke.mindustry.ai;
 
 import io.anuke.arc.Events;
 import io.anuke.arc.collection.Array;
-import io.anuke.arc.function.PositionConsumer;
+import io.anuke.arc.func.Floatc2;
 import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Time;
@@ -99,17 +99,17 @@ public class WaveSpawner{
         }
     }
 
-    private void eachFlyerSpawn(PositionConsumer cons){
+    private void eachFlyerSpawn(Floatc2 cons){
         for(FlyerSpawn spawn : flySpawns){
             float trns = (world.width() + world.height()) * tilesize;
             float spawnX = Mathf.clamp(world.width() * tilesize / 2f + Angles.trnsx(spawn.angle, trns), -margin, world.width() * tilesize + margin);
             float spawnY = Mathf.clamp(world.height() * tilesize / 2f + Angles.trnsy(spawn.angle, trns), -margin, world.height() * tilesize + margin);
-            cons.accept(spawnX, spawnY);
+            cons.get(spawnX, spawnY);
         }
 
         if(state.rules.attackMode && state.teams.isActive(waveTeam)){
             for(Tile core : state.teams.get(waveTeam).cores){
-                cons.accept(core.worldx(), core.worldy());
+                cons.get(core.worldx(), core.worldy());
             }
         }
     }