Fixed strings

Author: dgant

src/main/java/bwapi/BWClient.java

@@ -80,7 +80,7 @@ public void startGame(BWClientConfiguration configuration) {
                         break;
                     }
                     long frameDurationMillis = System.currentTimeMillis() - lastUpdateTimestampMillis;
-                    if (botWrapper.frameDurationMillis > configuration.asyncFrameDurationMillis && (client.clientData().gameData().getFrameCount() > 0 || ! configuration.asyncWaitOnFrameZero)) {
+                    if (frameDurationMillis > configuration.asyncFrameDurationMillis && (client.clientData().gameData().getFrameCount() > 0 || ! configuration.asyncWaitOnFrameZero)) {
                         System.out.println("Client: Proceeding because frame " + botWrapper.getGame().getFrameCount() + " lasted " + frameDurationMillis + "ms");
                         break;
                     }

src/main/java/bwapi/Game.java

@@ -1485,7 +1485,7 @@ static String formatString(final String string, final Text... colors) {
      */
     public void printf(final String string, final Text... colors) {
         final String formatted = formatString(string, colors);
-        addCommand(Printf, GameDataUtils.addString(gameData(), formatted), 0);
+        addCommand(Printf, formatted, 0);
     }
 
     /**
@@ -1510,7 +1510,7 @@ public void sendText(final String string, final Text... colors) {
      */
     public void sendTextEx(final boolean toAllies, final String string, final Text... colors) {
         final String formatted = formatString(string, colors);
-        addCommand(SendText, GameDataUtils.addString(gameData(), formatted), toAllies ? 1 : 0);
+        addCommand(SendText, formatted, toAllies ? 1 : 0);
     }
 
     /**
@@ -1719,8 +1719,7 @@ public List<Player> observers() {
 
     public void drawText(final CoordinateType ctype, final int x, final int y, final String string, final Text... colors) {
         final String formatted = formatString(string, colors);
-        final int stringId = GameDataUtils.addString(gameData(), formatted);
-        addShape(ShapeType.Text, ctype, x, y, 0, 0, stringId, textSize.id, 0, false);
+        addShape(ShapeType.Text, ctype, x, y, 0, 0, formatted, textSize.id, 0, false);
     }
 
     public void drawTextMap(final int x, final int y, final String string, final Text... colors) {
@@ -2335,7 +2334,7 @@ public boolean setMap(final String mapFileName) {
             return false;
         }
 
-        addCommand(CommandType.SetMap, GameDataUtils.addString(gameData(), mapFileName), 0);
+        addCommand(CommandType.SetMap, mapFileName, 0);
         return true;
     }
 
@@ -2674,10 +2673,25 @@ void addCommand(final CommandType type, final int value1, final int value2) {
         sideEffects.enqueue(SideEffect.addCommand(type, value1, value2));
     }
 
+
+    /**
+     * Convenience method for adding a game command from raw arguments.
+     */
+    void addCommand(final CommandType type, final String value1, final int value2) {
+        sideEffects.enqueue(SideEffect.addCommand(type, value1, value2));
+    }
+
     /**
      * Convenience method for adding a shape from raw arguments.
      */
     void addShape(final ShapeType type, final CoordinateType coordType, final int x1, final int y1, final int x2, final int y2, final int extra1, final int extra2, final int color, final boolean isSolid) {
         sideEffects.enqueue(SideEffect.addShape(type, coordType, x1, y1, x2, y2, extra1, extra2, color, isSolid));
     }
+
+    /**
+     * Convenience method for adding a shape from raw arguments.
+     */
+    void addShape(final ShapeType type, final CoordinateType coordType, final int x1, final int y1, final int x2, final int y2, final String text, final int extra2, final int color, final boolean isSolid) {
+        sideEffects.enqueue(SideEffect.addShape(type, coordType, x1, y1, x2, y2, text, extra2, color, isSolid));
+    }
 }

src/main/java/bwapi/GameDataUtils.java

@@ -29,10 +29,10 @@ of this software and associated documentation files (the "Software"), to deal
  * Static functions for modifying GameData.
  * These functions live outside GameData because GameData is auto-generated.
  */
-public class GameDataUtils {
+class GameDataUtils {
 
     static final int MAX_COUNT = 19999;
-    static final int MAX_STRING_SIZE = 1024;
+    private static final int MAX_STRING_SIZE = 1024;
 
     static int addString(ClientData.GameData gameData, final String string) {
         int stringCount = gameData.getStringCount();

src/main/java/bwapi/SideEffect.java

@@ -42,6 +42,17 @@ static SideEffect addCommand(final CommandType type, final int value1, final int
         return output;
     }
 
+    static SideEffect addCommand(final CommandType type, final String text, final int value2) {
+        SideEffect output = new SideEffect();
+        output.application = (ClientData clientData) -> {
+            ClientData.Command command = GameDataUtils.addCommand(clientData.gameData());
+            command.setType(type);
+            command.setValue1(GameDataUtils.addString(clientData.gameData(), text));
+            command.setValue2(value2);
+        };
+        return output;
+    }
+
     static SideEffect addShape(final ShapeType type, final CoordinateType coordType, final int x1, final int y1, final int x2, final int y2, final int extra1, final int extra2, final int color, final boolean isSolid) {
         SideEffect output = new SideEffect();
         output.application = (ClientData clientData) -> {
@@ -59,4 +70,22 @@ static SideEffect addShape(final ShapeType type, final CoordinateType coordType,
         };
         return output;
     }
+
+    static SideEffect addShape(final ShapeType type, final CoordinateType coordType, final int x1, final int y1, final int x2, final int y2, final String text, final int extra2, final int color, final boolean isSolid) {
+        SideEffect output = new SideEffect();
+        output.application = (ClientData clientData) -> {
+            ClientData.Shape shape = GameDataUtils.addShape(clientData.gameData());
+            shape.setType(type);
+            shape.setCtype(coordType);
+            shape.setX1(x1);
+            shape.setY1(y1);
+            shape.setX2(x2);
+            shape.setY2(y2);
+            shape.setExtra1(GameDataUtils.addString(clientData.gameData(), text));
+            shape.setExtra2(extra2);
+            shape.setColor(color);
+            shape.setIsSolid(isSolid);
+        };
+        return output;
+    }
 }

src/main/java/bwapi/SideEffectQueue.java

@@ -5,7 +5,7 @@
 /**
  * Queue of intended bot interactions with the game, to be flushed as JBWAPI returns control to StarCraft after a frame.
  */
-public class SideEffectQueue {
+class SideEffectQueue {
 
     private ArrayList<SideEffect> queue = new ArrayList<>();