implement unit commands

Author: JasperGeurtz

src/main/java/JavaBWAPIBackend/Client.java

@@ -18,6 +18,16 @@ public class Client {
     private ByteBuffer sharedMemory;
     private LittleEndianPipe pipe;
 
+    public static class UnitCommand {
+        public int type, unit, target, x, y, extra;
+        private static final int SIZE = 24;
+    }
+
+    public static class Command {
+        public int type, value1, value2;
+        private static final int SIZE = 12;
+    }
+
     public final class GameData {
         private String parseString(int offset, int maxLen) {
             byte[] buf = new byte[maxLen];
@@ -433,13 +443,6 @@ public void addShape(Shape shape) {
 
         private static final int CommandOffset = 0x1ebfbcc;
 
-        public class Command {
-            int type, value1, value2;
-            public Command(int type, int value1, int value2) { this.type = type; this.value1 = value1; this.value2 = value2; }
-
-            private static final int SIZE = 12;
-        }
-
         public void addCommand(Command command) {
             int at = sharedMemory.getInt(CommandOffset);
             sharedMemory.putInt(CommandOffset + at * Command.SIZE + 4, command.type);
@@ -450,15 +453,6 @@ public void addCommand(Command command) {
 
         private static final int UnitCommandOffset = 0x1efa550;
 
-
-        public class UnitCommand {
-            int type, unit, target, x, y, extra;
-            public UnitCommand(int type, int unit, int target, int x, int y, int extra)
-            { this.type = type; this.unit = unit; this.target = target; this.x = x; this.y = y; this.extra = extra; }
-
-            private static final int SIZE = 24;
-        }
-
         public void addUnitCommand(UnitCommand command) {
             int at = sharedMemory.getInt(UnitCommandOffset);
             sharedMemory.putInt(UnitCommandOffset + at * UnitCommand.SIZE + 4, command.type);

src/main/java/bwapi/Game.java

@@ -1,5 +1,6 @@
 package bwapi;
 
+import JavaBWAPIBackend.Client;
 import JavaBWAPIBackend.Client.GameData;
 import bwapi.point.Position;
 import bwapi.point.TilePosition;
@@ -70,6 +71,14 @@ void unitHide(final int id) {
         visibleUnits.remove(id);
     }
 
+    void addUnitCommand(final Client.UnitCommand unitCommand) {
+        gameData.addUnitCommand(unitCommand);
+    }
+
+    void addCommand(final Client.Command command) {
+        gameData.addCommand(command);
+    }
+
     private void init() {
         for (int id=0; id < gameData.getForceCount(); id++) {
             forces.put(id, new Force(gameData.getForce(id), this));
@@ -172,9 +181,6 @@ public Unit getUnit(final int unitID) {
         return units.get(unitID);
     }
 
-    //TODO
-    //public Unit indexToUnit(int unitIndex);
-
     public Region getRegion(final int regionID) {
         return regions.get(regionID);
     }
@@ -836,7 +842,6 @@ public boolean isLatComEnabled() {
         return gameData.hasLatCom();
     }
 
-
     public void setLatCom(final boolean isEnabled) {
         gameData.setLatcom(isEnabled);
     }