Auto-generate AsyncClientData via DumpToClient, remove SyncClientData, and reuse constants in FrameBuffer

Author: Jasper Geurtz

src/main/java/bwapi/AsyncClientData.java

@@ -21,7 +21,7 @@ class BotWrapper {
      */
     void startNewGame(WrappedBuffer liveData, PerformanceMetrics performanceMetrics) {
         this.performanceMetrics = performanceMetrics;
-        botGame = new Game(new SyncClientData());
+        botGame = new Game();
         botGame.setConfiguration(configuration);
         botGame.botClientData().setBuffer(liveData);
         gameOver = false;

src/main/java/bwapi/BotWrapper.java

@@ -6,7 +6,7 @@
  * Manages invocation of bot event handlers
  */
 class BotWrapperAsync extends BotWrapper {
-    private final ClientData liveClientData = new SyncClientData();
+    private final ClientData liveClientData = new ClientData();
     private final FrameBuffer frameBuffer;
     private WrappedBuffer liveData;
     private Thread botThread;

src/main/java/bwapi/BotWrapperAsync.java

@@ -45,7 +45,7 @@ class Client {
      * For test purposes only
      */
     Client(final WrappedBuffer buffer) {
-        clientData = new SyncClientData();
+        clientData = new ClientData();
         clientData.setBuffer(buffer);
         clientConnector = null;
     }
@@ -145,7 +145,7 @@ boolean connect() {
             return false;
         }
         try {
-            clientData = new SyncClientData();
+            clientData = new ClientData();
             clientData.setBuffer(mapShm);
         } catch (Exception e) {
             System.err.println("Unable to map game data.");

src/main/java/bwapi/Client.java

@@ -75,7 +75,7 @@ void setExtra(int value) {
     }
     class GameData {
         static final int SIZE = 33017048;
-        private int myOffset;
+        protected int myOffset;
         GameData(int myOffset) {
           this.myOffset = myOffset;
         }

src/main/java/bwapi/ClientData.java

@@ -11,25 +11,7 @@
  * Circular buffer of game states.
  */
 class FrameBuffer {
-    static final int STATICTILES_START = 3447004; // getGroundHeight, isWalkable, isBuildable
-    static final int STATICTILES_END = 4823260;
-    static final int REGION_START = 5085404; // getMapTileRegionId, ..., getRegions
-    static final int REGION_END = 10586480;
-    static final int STRINGSSHAPES_START = 10962632; // getStringCount, ... getShapes
-    static final int STRINGSHAPES_END = 32242636;
-    static final int UNITFINDER_START = 32962644;
-
-    static final int DYNAMIC_SLICE1_SIZE = STATICTILES_START; // 3447004
-    static final int DYNAMIC_SLICE2_SIZE = REGION_START - STATICTILES_END; // 262144
-    static final int DYNAMIC_SLICE3_SIZE = STRINGSSHAPES_START - REGION_END; // 376152
-    static final int DYNAMIC_SLICE4_SIZE = UNITFINDER_START - STRINGSHAPES_END; // 720008
-
-    static final int DEST_SLICE1_OFFSET = 0;
-    static final int DEST_SLICE2_OFFSET = DYNAMIC_SLICE1_SIZE; // 3447004
-    static final int DEST_SLICE3_OFFSET = DEST_SLICE2_OFFSET + DYNAMIC_SLICE2_SIZE; // 3709148
-    static final int DEST_SLICE4_OFFSET = DEST_SLICE3_OFFSET + DYNAMIC_SLICE3_SIZE; // 4085300
-
-    static final int BUFFER_SIZE = DEST_SLICE4_OFFSET + DYNAMIC_SLICE4_SIZE; // 4805308
+    static final int BUFFER_SIZE = AsyncClientData.BUFFER_SIZE;
     private static final Unsafe unsafe = UnsafeTools.getUnsafe();
 
     private WrappedBuffer liveData;
@@ -170,9 +152,9 @@ void dequeue() {
     }
 
     void copyBuffer(WrappedBuffer source, WrappedBuffer destination) {
-        unsafe.copyMemory(source.getAddress() + 0, destination.getAddress() + DEST_SLICE1_OFFSET, DYNAMIC_SLICE1_SIZE);
-        unsafe.copyMemory(source.getAddress() + STATICTILES_END, destination.getAddress() + DEST_SLICE2_OFFSET, DYNAMIC_SLICE2_SIZE);
-        unsafe.copyMemory(source.getAddress() + REGION_END, destination.getAddress() + DEST_SLICE3_OFFSET, DYNAMIC_SLICE3_SIZE);
-        unsafe.copyMemory(source.getAddress() + STRINGSHAPES_END, destination.getAddress() + DEST_SLICE4_OFFSET, DYNAMIC_SLICE4_SIZE);
+        unsafe.copyMemory(source.getAddress() + 0, destination.getAddress() + AsyncClientData.DEST_SLICE1_OFFSET, AsyncClientData.DYNAMIC_SLICE1_SIZE);
+        unsafe.copyMemory(source.getAddress() + AsyncClientData.STATICTILES_END, destination.getAddress() + AsyncClientData.DEST_SLICE2_OFFSET, AsyncClientData.DYNAMIC_SLICE2_SIZE);
+        unsafe.copyMemory(source.getAddress() + AsyncClientData.REGION_END, destination.getAddress() + AsyncClientData.DEST_SLICE3_OFFSET, AsyncClientData.DYNAMIC_SLICE3_SIZE);
+        unsafe.copyMemory(source.getAddress() + AsyncClientData.STRINGSHAPES_END, destination.getAddress() + AsyncClientData.DEST_SLICE4_OFFSET, AsyncClientData.DYNAMIC_SLICE4_SIZE);
     }
 }

src/main/java/bwapi/FrameBuffer.java

@@ -106,7 +106,7 @@ public final class Game {
     final SideEffectQueue sideEffects = new SideEffectQueue();
 
     Game() {
-        this(new SyncClientData());
+        this(new ClientData());
     }
 
     Game(ClientData clientData) {