Simplify race/player defaults and extract hasValidId/MAX_VALID_ID

Author: Jasper Geurtz

src/main/java/bwapi/Bullet.java

@@ -181,19 +181,13 @@ public boolean isVisible() {
      * @return true if the {@link Bullet} is visible to the specified player, false if the {@link Bullet} is not visible to the specified player.
      */
     public boolean isVisible(Player player) {
-        if (player == null) {
-            player = game.self();
-        }
+        player = player == null ? game.self() : player;
         if (player != null) {
-            final int id = player.getID();
-            if (id >= 0 && id < 9) {
-                return bulletData.isVisible(id);
-            }
-        } else {
-            for (int i = 0; i < 9; ++i) {
-                if (bulletData.isVisible(i)) {
-                    return true;
-                }
+            return player.hasValidId() && bulletData.isVisible(player.getID());
+        }
+        for (int i = 0; i < Player.MAX_VALID_ID; ++i) {
+            if (bulletData.isVisible(i)) {
+                return true;
             }
         }
         return false;

src/main/java/bwapi/Player.java

@@ -19,6 +19,8 @@
  * @see Race
  */
 public class Player implements Comparable<Player> {
+    static final int MAX_VALID_ID = 9;
+
     private final PlayerData playerData;
     private final Game game;
     private final int id;
@@ -53,6 +55,10 @@ public int getID() {
         return id;
     }
 
+    boolean hasValidId() {
+        return id >= 0 && id < MAX_VALID_ID;
+    }
+
     /**
      * Retrieves the name of the player.
      *
@@ -340,13 +346,8 @@ public int supplyTotal() {
      * @see #supplyUsed
      */
     public int supplyTotal(Race race) {
-        if (race == Race.None) {
-            race = getRace();
-        }
-        if (race.id >= 0 && race.id < 3) {
-            return playerData.getSupplyTotal(race.id);
-        }
-        return 0;
+        race = race == Race.None ? getRace() : race;
+        return race.hasValidId() ? playerData.getSupplyTotal(race.id) : 0;
     }
 
     public int supplyUsed() {
@@ -361,10 +362,8 @@ public int supplyUsed() {
      * @see #supplyTotal
      */
     public int supplyUsed(Race race) {
-        if (race == Race.None) {
-            race = getRace();
-        }
-        if (race.id < 0 || race.id >= 3) {
+        race = race == Race.None ? getRace() : race;
+        if (!race.hasValidId()) {
             return 0;
         }
         int supplyUsed = playerData.getSupplyUsed(race.id);

src/main/java/bwapi/Race.java

@@ -58,12 +58,18 @@ public enum Race {
         Arrays.stream(Race.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
+    static final int MAX_VALID_ID = 3;
+
     public final int id;
 
     Race(final int id) {
         this.id = id;
     }
 
+    boolean hasValidId() {
+        return id >= 0 && id < MAX_VALID_ID;
+    }
+
     /**
      * Retrieves the default worker type for this {@link Race}.
      * <p>

src/main/java/bwapi/Unit.java

@@ -2094,19 +2094,13 @@ public boolean isVisible() {
      * @see #exists
      */
     public boolean isVisible(Player player) {
-        if (player == null) {
-            player = game.self();
-        }
+        player = player == null ? game.self() : player;
         if (player != null) {
-            final int id = player.getID();
-            if (id >= 0 && id < 9) {
-                return unitData.isVisible(id);
-            }
-        } else {
-            for (int i = 0; i < 9; ++i) {
-                if (unitData.isVisible(i)) {
-                    return true;
-                }
+            return player.hasValidId() && unitData.isVisible(player.getID());
+        }
+        for (int i = 0; i < Player.MAX_VALID_ID; ++i) {
+            if (unitData.isVisible(i)) {
+                return true;
             }
         }
         return false;