Merge pull request #77 from dgant/perf-and-bwem

Miscellaneous performance & QOL changes

Author: JasperGeurtz

src/main/java/bwapi/BulletType.java

@@ -59,7 +59,7 @@ public enum BulletType {
         Arrays.stream(BulletType.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
-    final int id;
+    public final int id;
 
     BulletType(final int id) {
         this.id = id;

src/main/java/bwapi/CommandType.java

@@ -32,7 +32,7 @@ public enum CommandType {
         Arrays.stream(CommandType.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
-    final int id;
+    public final int id;
 
     CommandType(final int id) {
         this.id = id;

src/main/java/bwapi/EventType.java

@@ -33,7 +33,7 @@ public enum EventType {
         Arrays.stream(EventType.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
-    final int id;
+    public final int id;
 
     EventType(int id) {
         this.id = id;

src/main/java/bwapi/Game.java

@@ -935,10 +935,7 @@ final public boolean isWalkable(final int walkX, final int walkY) {
     }
 
     final public boolean isWalkable(final WalkPosition position) {
-        if (!position.isValid(this)) {
-            return false;
-        }
-        return walkable[position.x][position.y];
+        return position.isValid(this) && walkable[position.x][position.y];
     }
 
     /**
@@ -955,15 +952,12 @@ final public boolean isWalkable(final WalkPosition position) {
      * - 5: Very high ground doodad
      * .
      */
-    public int getGroundHeight(final int tileX, final int tileY) {
-        return getGroundHeight(new TilePosition(tileX, tileY));
+    final public int getGroundHeight(final int tileX, final int tileY) {
+        return isValidTile(tileX, tileY) ? groundHeight[tileX][tileY] : 0;
     }
 
-    public int getGroundHeight(final TilePosition position) {
-        if (!position.isValid(this)) {
-            return 0;
-        }
-        return groundHeight[position.x][position.y];
+    final public int getGroundHeight(final TilePosition position) {
+        return getGroundHeight(position.x, position.y);
     }
 
     final public boolean isBuildable(final int tileX, final int tileY) {
@@ -1077,23 +1071,23 @@ final public boolean hasPowerPrecise(final Position position, final UnitType uni
         return hasPowerPrecise(position.x, position.y, unitType);
     }
 
-    final public boolean hasPower(final int tileX, final int tileY) {
-        return hasPower(new TilePosition(tileX, tileY));
+    final public boolean hasPower(final TilePosition position) {
+        return hasPower(position.x, position.y);
     }
 
-    final public boolean hasPower(final int tileX, final int tileY, final UnitType unitType) {
-        return hasPower(new TilePosition(tileX, tileY), unitType);
+    final public boolean hasPower(final int tileX, final int tileY) {
+        return hasPower(tileX, tileY, UnitType.None);
     }
 
-    final public boolean hasPower(final TilePosition position) {
-        return hasPower(position.x, position.y, UnitType.None);
+    final public boolean hasPower(final TilePosition position, final UnitType unitType) {
+        return hasPower(position.x, position.y, unitType);
     }
 
-    final public boolean hasPower(final TilePosition position, final UnitType unitType) {
+    final public boolean hasPower(final int tileX, final int tileY, final UnitType unitType) {
         if (unitType.id >= 0 && unitType.id < UnitType.None.id) {
-            return hasPowerPrecise(position.x * 32 + unitType.tileWidth() * 16, position.y * 32 + unitType.tileHeight() * 16, unitType);
+            return hasPowerPrecise(tileX * 32 + unitType.tileWidth() * 16, tileY * 32 + unitType.tileHeight() * 16, unitType);
         }
-        return hasPowerPrecise(position.x * 32, position.y * 32, UnitType.None);
+        return hasPowerPrecise(tileY * 32, tileY * 32, UnitType.None);
     }
 
     final public boolean hasPower(final int tileX, final int tileY, final int tileWidth, final int tileHeight) {

src/main/java/bwapi/GameType.java

@@ -35,8 +35,7 @@ public enum GameType {
         Arrays.stream(GameType.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
-
-    final int id;
+    public final int id;
 
     GameType(final int id) {
         this.id = id;

src/main/java/bwapi/Latency.java

@@ -23,7 +23,7 @@ public enum Latency {
         Arrays.stream(Latency.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
-    final int id;
+    public final int id;
 
     Latency(final int id) {
         this.id = id;

src/main/java/bwapi/Order.java

@@ -209,8 +209,7 @@ public enum Order {
         Arrays.stream(Order.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
-
-    final int id;
+    public final int id;
 
     Order(final int id) {
         this.id = id;

src/main/java/bwapi/PlayerType.java

@@ -26,7 +26,7 @@ public enum PlayerType {
         Arrays.stream(PlayerType.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
-    final int id;
+    public final int id;
 
     PlayerType(final int id) {
         this.id = id;

src/main/java/bwapi/Race.java

@@ -58,7 +58,7 @@ public enum Race {
         Arrays.stream(Race.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
-    final int id;
+    public final int id;
 
     Race(final int id) {
         this.id = id;

src/main/java/bwapi/ShapeType.java

@@ -21,7 +21,7 @@ enum ShapeType {
         Arrays.stream(ShapeType.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
-    final int id;
+    public final int id;
 
     ShapeType(final int id) {
         this.id = id;