use final int id everywhere and idToEnum name

Author: JasperGeurtz

src/main/java/bwapi/Bullet.java

@@ -4,15 +4,17 @@
 
 public class Bullet {
     private final BulletData bulletData;
+    private final int id;
     private final Game game;
 
-    Bullet(final BulletData bulletData, final Game game) {
+    Bullet(final BulletData bulletData, final int id, final Game game) {
         this.bulletData = bulletData;
+        this.id = id;
         this.game = game;
     }
 
     public int getID() {
-        return bulletData.getId();
+        return id;
     }
 
     public boolean exists() {
@@ -24,7 +26,7 @@ public Player getPlayer() {
     }
 
     public BulletType getType() {
-        return BulletType.bulletTypes[bulletData.getType()];
+        return BulletType.idToEnum[bulletData.getType()];
     }
 
     public Unit getSource() {

src/main/java/bwapi/BulletType.java

@@ -48,13 +48,13 @@ public enum BulletType {
     None(209),
     Unknown(210);
 
-    public static BulletType[] bulletTypes = new BulletType[210 + 1];
+    static final BulletType[] idToEnum = new BulletType[210 + 1];
 
     static {
-        Arrays.stream(BulletType.values()).forEach(v -> bulletTypes[v.id] = v);
+        Arrays.stream(BulletType.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
-    private int id;
+    final int id;
 
     BulletType(final int id) {
         this.id = id;

src/main/java/bwapi/CommandType.java

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

src/main/java/bwapi/CoordinateType.java

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

src/main/java/bwapi/DamageType.java

@@ -9,7 +9,7 @@ public enum DamageType {
     None(5),
     Unknown(6);
 
-    public final int id;
+    final int id;
 
     DamageType(final int id) {
         this.id = id;

src/main/java/bwapi/EventType.java

@@ -33,7 +33,6 @@ public enum EventType {
     final int id;
 
     EventType(int id) {
-
         this.id = id;
     }
 }

src/main/java/bwapi/ExplosionType.java

@@ -27,7 +27,7 @@ public enum ExplosionType {
     Air_Splash(23),
     Unknown(24);
 
-    public final int id;
+    final int id;
 
     ExplosionType(final int id) {
         this.id = id;

src/main/java/bwapi/Flag.java

@@ -4,9 +4,9 @@ public enum Flag {
     CompleteMapInformation(0),
     UserInput(1);
 
-    public final int value;
+    final int id;
 
-    Flag(final int value) {
-        this.value = value;
+    Flag(final int id) {
+        this.id = id;
     }
 }

src/main/java/bwapi/Game.java

@@ -3,7 +3,7 @@
 import bwapi.ClientData.Command;
 import bwapi.ClientData.GameData;
 import bwapi.ClientData.Shape;
-import bwapi.ClientData.UnitData;
+
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -141,13 +141,13 @@ void init() {
         final int bulletCount = 100;
         bullets = new Bullet[bulletCount];
         for (int id = 0; id < bulletCount; id++) {
-            bullets[id] = new Bullet(gameData.getBullets(id), this);
+            bullets[id] = new Bullet(gameData.getBullets(id), id,this);
         }
 
         final int regionCount = gameData.getRegionCount();
         regions = new Region[regionCount];
         for (int id = 0; id < regionCount; id++) {
-            regions[id] = new Region(gameData.getRegions(id), this);
+            regions[id] = new Region(gameData.getRegions(id),this);
         }
 
         for (final Region region : regions) {
@@ -373,7 +373,7 @@ public Region getRegion(final int regionID) {
     }
 
     public GameType getGameType() {
-        return GameType.gameTypes[gameData.getGameType()];
+        return GameType.idToEnum[gameData.getGameType()];
     }
 
     public int getLatency() {
@@ -429,11 +429,11 @@ public void pingMinimap(final Position p) {
     }
 
     public boolean isFlagEnabled(final Flag flag) {
-        return gameData.getFlags(flag.value);
+        return gameData.getFlags(flag.id);
     }
 
     public void enableFlag(final Flag flag) {
-        addCommand(EnableFlag, flag.value, 1);
+        addCommand(EnableFlag, flag.id, 1);
     }
 
     public List<Unit> getUnitsOnTile(final int tileX, final int tileY) {
@@ -1114,7 +1114,7 @@ public List<Player> observers() {
 
     public void drawText(final CoordinateType ctype, final int x, final int y, final String cstr_format) {
         final int stringId = client.addString(cstr_format);
-        addShape(ShapeType.Text, ctype, x, y, 0, 0, stringId, textSize.value, 0, false);
+        addShape(ShapeType.Text, ctype, x, y, 0, 0, stringId, textSize.id, 0, false);
     }
 
     public void drawTextMap(final int x, final int y, final String cstr_format) {

src/main/java/bwapi/GameType.java

@@ -24,14 +24,14 @@ public enum GameType {
     Pro_Gamer_League(32),  // Not valid
     Unknown(33);
 
-    public static GameType[] gameTypes = new GameType[33 + 1];
+    static final GameType[] idToEnum = new GameType[33 + 1];
 
     static {
-        Arrays.stream(GameType.values()).forEach(v -> gameTypes[v.id] = v);
+        Arrays.stream(GameType.values()).forEach(v -> idToEnum[v.id] = v);
     }
 
 
-    public final int id;
+    final int id;
 
     GameType(final int id) {
         this.id = id;