Make some classes comparable

Author: JasperGeurtz

src/main/java/bwapi/Bullet.java

@@ -4,7 +4,7 @@
 
 import java.util.Objects;
 
-public class Bullet {
+public class Bullet implements Comparable<Bullet> {
     private final BulletData bulletData;
     private final int id;
     private final Game game;
@@ -83,4 +83,9 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(id);
     }
+
+    @Override
+    public int compareTo(final Bullet other) {
+        return id - other.id;
+    }
 }

src/main/java/bwapi/Force.java

@@ -6,7 +6,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-public class Force {
+public class Force implements Comparable<Force>{
     private final Game game;
 
     private final int id;
@@ -44,4 +44,9 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(id);
     }
+
+    @Override
+    public int compareTo(final Force other) {
+        return id - other.id;
+    }
 }

src/main/java/bwapi/Player.java

@@ -10,7 +10,7 @@
 import static bwapi.UpgradeType.*;
 import static bwapi.WeaponType.*;
 
-public class Player {
+public class Player implements Comparable<Player>{
     private final PlayerData playerData;
     private final Game game;
     private final int id;
@@ -409,4 +409,9 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(id);
     }
+
+    @Override
+    public int compareTo(final Player other) {
+        return id - other.id;
+    }
 }

src/main/java/bwapi/Point.java

@@ -1,6 +1,6 @@
 package bwapi;
 
-class Point {
+class Point implements Comparable<Point>{
     static final int TILE_WALK_FACTOR = 4; // 32 / 8
 
     public final int x;
@@ -79,4 +79,12 @@ public boolean isValid(final Game game) {
     public int hashCode() {
         return (x << 16) ^ y;
     }
+
+    @Override
+    public int compareTo(Point o) {
+        if (scalar == o.scalar) {
+            return hashCode() - o.hashCode();
+        }
+        return scalar - o.scalar;
+    }
 }

src/main/java/bwapi/Region.java

@@ -4,7 +4,7 @@
 import bwapi.ClientData.RegionData;
 import java.util.*;
 
-public class Region {
+public class Region implements Comparable<Region> {
     private final RegionData regionData;
     private final Game game;
 
@@ -133,4 +133,9 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(id);
     }
+
+    @Override
+    public int compareTo(final Region other) {
+        return id - other.id;
+    }
 }