dont keep track of frames in eventhandler and make getPosition lazy

Author: JasperGeurtz

src/main/java/bwapi/EventHandler.java

@@ -5,7 +5,6 @@ class EventHandler implements Client.EventHandler {
     private final BWEventListener eventListener;
     private final Game game;
     private final Client client;
-    private int frames;
 
     public EventHandler(final BWEventListener eventListener, final Client client) {
         this.eventListener = eventListener;
@@ -18,7 +17,6 @@ public void operation(final ClientData.Event event) {
         final Unit u;
         switch (event.getType()) {
             case MatchStart:
-                frames = 0;
                 game.init();
                 game.setLatCom(false);
                 eventListener.onStart();
@@ -27,11 +25,10 @@ public void operation(final ClientData.Event event) {
                 eventListener.onEnd(event.getV1() != 0);
                 break;
             case MatchFrame:
-                game.onFrame(frames);
+                game.onFrame();
                 eventListener.onFrame();
-                frames += 1;
                 break;
-            //case 3: //MenuFrame
+            //case MenuFrame:
             case SendText:
                 eventListener.onSendText(client.eventString(event.getV1()));
                 break;
@@ -50,22 +47,19 @@ public void operation(final ClientData.Event event) {
             case UnitDiscover:
                 game.unitCreate(event.getV1());
                 u = game.getUnit(event.getV1());
-                u.updatePosition(frames);
-                u.updateType(frames);
-                u.updatePlayer(frames);
+                u.updateType();
+                u.updatePlayer();
                 eventListener.onUnitDiscover(u);
                 break;
             case UnitEvade:
                 u = game.getUnit(event.getV1());
-                u.updatePosition(frames);
                 eventListener.onUnitEvade(u);
                 break;
             case UnitShow:
                 game.unitShow(event.getV1());
                 u = game.getUnit(event.getV1());
-                u.updatePosition(frames);
-                u.updateType(frames);
-                u.updatePlayer(frames);
+                u.updateType();
+                u.updatePlayer();
                 eventListener.onUnitShow(u);
                 break;
             case UnitHide:
@@ -76,9 +70,8 @@ public void operation(final ClientData.Event event) {
             case UnitCreate:
                 game.unitCreate(event.getV1());
                 u = game.getUnit(event.getV1());
-                u.updatePosition(frames);
-                u.updateType(frames);
-                u.updatePlayer(frames);
+                u.updateType();
+                u.updatePlayer();
                 eventListener.onUnitCreate(u);
                 break;
             case UnitDestroy:
@@ -88,19 +81,18 @@ public void operation(final ClientData.Event event) {
                 break;
             case UnitMorph:
                 u = game.getUnit(event.getV1());
-                u.updatePosition(frames);
-                u.updateType(frames);
+                u.updateType();
                 eventListener.onUnitMorph(u);
                 break;
             case UnitRenegade:
                 u = game.getUnit(event.getV1());
-                u.updatePlayer(frames);
+                u.updatePlayer();
                 eventListener.onUnitRenegade(u);
                 break;
             case UnitComplete:
                 game.unitCreate(event.getV1());
                 u = game.getUnit(event.getV1());
-                u.updatePlayer(frames);
+                u.updatePlayer();
                 eventListener.onUnitComplete(u);
                 break;
         }

src/main/java/bwapi/Game.java

@@ -58,6 +58,8 @@ public class Game {
     private List<Region> regionSet;
     // CHANGING
     private Unit[] units;
+    private int frameCount = 0;
+
     //CACHED
     private int randomSeed;
     private int revision;
@@ -261,13 +263,14 @@ void unitHide(final int id) {
         visibleUnits.remove(id);
     }
 
-    void onFrame(final int frame) {
-        if (frame > 0) {
+    void onFrame() {
+        this.frameCount = gameData.getFrameCount();
+
+        if (getFrameCount() > 0) {
             allUnits = Collections.unmodifiableList(visibleUnits.stream()
                 .map(i -> units[i])
                 .collect(Collectors.toList()));
         }
-        getAllUnits().forEach(u -> u.updatePosition(frame));
     }
 
     void addUnitCommand(final int type, final int unit, final int target, final int x, final int y, final int extra) {
@@ -383,7 +386,7 @@ public int getLatency() {
     }
 
     public int getFrameCount() {
-        return gameData.getFrameCount();
+        return frameCount;
     }
 
     public int getReplayFrameCount() {

src/main/java/bwapi/Unit.java

@@ -42,9 +42,8 @@ public class Unit {
         this.unitData = unitData;
         this.game = game;
 
-        updateType(0);
-        updatePlayer(0);
-        updatePosition(0);
+        updateType();
+        updatePlayer();
 
         initialType = getType();
         initialResources = getResources();
@@ -87,6 +86,11 @@ public UnitType getType() {
     }
 
     public Position getPosition() {
+        final int frame = game.getFrameCount();
+        if (frame > lastPositionUpdate) {
+            lastPositionUpdate = frame;
+            position = new Position(unitData.getPositionX(), unitData.getPositionY());
+        }
         return position;
     }
 
@@ -4126,25 +4130,20 @@ public int hashCode() {
         return getID();
     }
 
-    void updateType(final int frame) {
+    void updateType() {
+        final int frame = game.getFrameCount();
         if (frame > lastTypeUpdate) {
             lastTypeUpdate = frame;
             position = new Position(unitData.getPositionX(), unitData.getPositionY());
         }
         unitType = UnitType.idToEnum[unitData.getType()];
     }
 
-    void updatePlayer(final int frame) {
+    void updatePlayer() {
+        final int frame = game.getFrameCount();
         if (frame > lastPlayerUpdate) {
             lastPlayerUpdate = frame;
             player = game.getPlayer(unitData.getPlayer());
         }
     }
-
-    void updatePosition(final int frame) {
-        if (frame > lastPositionUpdate) {
-            lastPositionUpdate = frame;
-            position = new Position(unitData.getPositionX(), unitData.getPositionY());
-        }
-    }
 }