filter interface

Author: JasperGeurtz

src/main/java/bwapi/BWClient.java

@@ -6,13 +6,13 @@
 
 
 public class BWClient {
-    private BWEventListener eventListener;
+    private BWListener eventListener;
 
     private Client client;
     private EventHandler handler;
 
 
-    public BWClient(final BWEventListener eventListener) {
+    public BWClient(final BWListener eventListener) {
         Objects.requireNonNull(eventListener);
         this.eventListener = eventListener;
     }

src/main/java/bwapi/BWEventListener.java src/main/java/bwapi/BWListener.javasrc/main/java/bwapi/BWEventListener.java renamed to src/main/java/bwapi/BWListener.java

@@ -3,7 +3,7 @@
 
 import bwapi.point.Position;
 
-public interface BWEventListener {
+public interface BWListener {
 
     void onStart();
 

src/main/java/bwapi/DefaultBWListener.java

@@ -2,7 +2,7 @@
 
 import bwapi.point.Position;
 
-public class DefaultBWListener implements BWEventListener {
+public class DefaultBWListener implements BWListener {
 
     public void onStart() {}
 

src/main/java/bwapi/EventHandler.java

@@ -5,11 +5,11 @@
 import bwapi.point.Position;
 
 class EventHandler implements Client.EventHandler {
-    private final BWEventListener eventListener;
+    private final BWListener eventListener;
     private final Client.GameData data;
     private Game game;
 
-    public EventHandler(final BWEventListener eventListener, final Client.GameData data) {
+    public EventHandler(final BWListener eventListener, final Client.GameData data) {
         this.eventListener = eventListener;
         this.data = data;
     }

src/main/java/bwapi/Game.java

@@ -1,7 +1,6 @@
 package bwapi;
 
 import JavaBWAPIBackend.Client.GameData;
-import bwapi.filter.UnitFilter;
 import bwapi.point.Position;
 import bwapi.point.TilePosition;
 import bwapi.point.WalkPosition;
@@ -404,14 +403,13 @@ else if (!builder.getType().isFlyingBuilding() && type != Zerg_Nydus_Canal && !t
          // Ground unit dimension check
          if (type != Special_Start_Location) {
              final Position targPos = lt.toPosition().add(type.tileSize().toPosition().divide(2));
-             Set<Unit> unitsInRect = getUnitsInRectangle(lt.toPosition(), rb.toPosition(), new UnitFilter(
-                     "!IsFlying    &&"
-                             + "!IsLoaded   &&"
-                             + " [&builder, &type](Unit u){ return u != builder || type == UnitTypes::Zerg_Nydus_Canal;} &&"
-                             + "GetLeft   <= targPos.x + type.dimensionRight()  &&"
-                             + " GetTop    <= targPos.y + type.dimensionDown()   &&"
-                             + "GetRight  >= targPos.x - type.dimensionLeft()   &&"
-                             + "GetBottom >= targPos.y - type.dimensionUp() )    "));
+             Set<Unit> unitsInRect = getUnitsInRectangle(lt.toPosition(), rb.toPosition(),
+                     (u -> !u.isFlying() && !u.isLoaded() && builder != null || type == Zerg_Nydus_Canal
+                             && u.getLeft() <= targPos.x + type.dimensionRight()
+                             && u.getTop() <= targPos.y + type.dimensionDown()
+                             && u.getRight() <= targPos.x + type.dimensionLeft()
+                             && u.getBottom() <= targPos.y + type.dimensionUp()));
+
              for (Unit u : unitsInRect){
                  // Addons can be placed over units that can move, pushing them out of the way
                  if ( !(type.isAddon() && u.getType().canMove()) )

src/main/java/bwapi/UnitFilter.java

@@ -0,0 +1,5 @@
+package bwapi;
+
+interface UnitFilter {
+    boolean operation(Unit unit);
+}