cleanup code and update dependencies

Author: JasperGeurtz

pom.xml

@@ -10,7 +10,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jmh.version>1.21</jmh.version>
+        <jmh.version>1.23</jmh.version>
     </properties>
 
     <build>
@@ -31,7 +31,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.2.0</version>
                 <configuration>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
@@ -101,37 +101,37 @@
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
-            <version>5.4.0</version>
+            <version>5.5.0</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform -->
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna-platform</artifactId>
-            <version>5.4.0</version>
+            <version>5.5.0</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/junit/junit -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13</version>
             <scope>test</scope>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.4</version>
             <scope>test</scope>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.13.2</version>
+            <version>3.15.0</version>
             <scope>test</scope>
         </dependency>
 

src/main/java/bwapi/Client.java

@@ -128,7 +128,7 @@ boolean connect() {
             return false;
         }
 
-        GameTable gameTable = null;
+        GameTable gameTable;
         try {
             gameTable = new GameTable(gameTableFileHandle);
         }

src/main/java/bwapi/CommandTemp.java

@@ -16,10 +16,10 @@ enum EventType {
         Finish
     }
 
-    UnitCommand command;
+    final UnitCommand command;
     EventType eventType = EventType.Resource;
     Player player = null;
-    Game game;
+    final Game game;
 
     CommandTemp(final UnitCommand command, Game game) {
         this.command = command;

src/main/java/bwapi/GameTable.java

@@ -27,7 +27,7 @@ class GameTable {
     static final int MAX_GAME_INSTANCES = 8;
     static final int SIZE = MAX_GAME_INSTANCES * GameInstance.SIZE;
 
-    GameInstance[] gameInstances;
+    final GameInstance[] gameInstances;
 
     GameTable(final ByteBuffer gameTableFileHandle) {
         gameInstances = new GameInstance[MAX_GAME_INSTANCES];

src/main/java/bwapi/PlayerSelf.java

@@ -3,12 +3,12 @@
 import java.util.stream.IntStream;
 
 class PlayerSelf {
-    IntegerCache minerals = new IntegerCache();
-    IntegerCache gas = new IntegerCache();
-    IntegerCache[] supplyUsed = new IntegerCache[3];
+    final IntegerCache minerals = new IntegerCache();
+    final IntegerCache gas = new IntegerCache();
+    final IntegerCache[] supplyUsed = new IntegerCache[3];
 
-    BooleanCache[] isResearching = new BooleanCache[TechType.idToEnum.length];
-    BooleanCache[] isUpgrading = new BooleanCache[UpgradeType.idToEnum.length];
+    final BooleanCache[] isResearching = new BooleanCache[TechType.idToEnum.length];
+    final BooleanCache[] isUpgrading = new BooleanCache[UpgradeType.idToEnum.length];
 
     PlayerSelf() {
         IntStream.range(0, supplyUsed.length).forEach(i -> supplyUsed[i] = new IntegerCache());

src/main/java/bwapi/Point.java

@@ -1,6 +1,6 @@
 package bwapi;
 
-public abstract class Point<T extends Point> implements Comparable<Point> {
+public abstract class Point<T extends Point<T>> implements Comparable<Point<T>> {
     static final int TILE_WALK_FACTOR = 4; // 32 / 8
 
     public final int x;

src/main/java/bwapi/UnitFilter.java

@@ -8,7 +8,7 @@ public interface UnitFilter extends Predicate<Unit> {
     UnitFilter CanAttack = u -> u.getType().canAttack();
     UnitFilter CanMove = u -> u.getType().canMove();
     UnitFilter IsFlyer = u -> u.getType().isFlyer();
-    UnitFilter IsFlying = u -> u.isFlying();
+    UnitFilter IsFlying = Unit::isFlying;
     UnitFilter RegeneratesHP = u -> u.getType().regeneratesHP();
     UnitFilter IsSpellcaster = u -> u.getType().isSpellcaster();
     UnitFilter HasPermanentCloak = u -> u.getType().hasPermanentCloak();
@@ -280,54 +280,54 @@ static UnitFilter GetBottom(Predicate<Integer> c) {
         return u -> c.test(u.getBottom());
     }
 
-    UnitFilter Exists = u -> u.exists();
-    UnitFilter IsAttacking = u -> u.isAttacking();
-    UnitFilter IsBeingConstructed = u -> u.isBeingConstructed();
-    UnitFilter IsBeingGathered = u -> u.isBeingGathered();
-    UnitFilter IsBeingHealed = u -> u.isBeingHealed();
-    UnitFilter IsBlind = u -> u.isBlind();
-    UnitFilter IsBraking = u -> u.isBraking();
-    UnitFilter IsBurrowed = u -> u.isBurrowed();
-    UnitFilter IsCarryingGas = u -> u.isCarryingGas();
-    UnitFilter IsCarryingMinerals = u -> u.isCarryingMinerals();
+    UnitFilter Exists = Unit::exists;
+    UnitFilter IsAttacking = Unit::isAttacking;
+    UnitFilter IsBeingConstructed = Unit::isBeingConstructed;
+    UnitFilter IsBeingGathered = Unit::isBeingGathered;
+    UnitFilter IsBeingHealed = Unit::isBeingHealed;
+    UnitFilter IsBlind = Unit::isBlind;
+    UnitFilter IsBraking = Unit::isBraking;
+    UnitFilter IsBurrowed = Unit::isBurrowed;
+    UnitFilter IsCarryingGas = Unit::isCarryingGas;
+    UnitFilter IsCarryingMinerals = Unit::isCarryingMinerals;
     UnitFilter IsCarryingSomething = u -> u.isCarryingMinerals() || u.isCarryingGas();
-    UnitFilter IsCloaked = u -> u.isCloaked();
-    UnitFilter IsCompleted = u -> u.isCompleted();
-    UnitFilter IsConstructing = u -> u.isConstructing();
-    UnitFilter IsDefenseMatrixed = u -> u.isDefenseMatrixed();
-    UnitFilter IsDetected = u -> u.isDetected();
-    UnitFilter IsEnsnared = u -> u.isEnsnared();
-    UnitFilter IsFollowing = u -> u.isFollowing();
-    UnitFilter IsGatheringGas = u -> u.isGatheringGas();
-    UnitFilter IsGatheringMinerals = u -> u.isGatheringMinerals();
-    UnitFilter IsHallucination = u -> u.isHallucination();
-    UnitFilter IsHoldingPosition = u -> u.isHoldingPosition();
-    UnitFilter IsIdle = u -> u.isIdle();
-    UnitFilter IsInterruptible = u -> u.isInterruptible();
-    UnitFilter IsInvincible = u -> u.isInvincible();
-    UnitFilter IsIrradiated = u -> u.isIrradiated();
-    UnitFilter IsLifted = u -> u.isLifted();
-    UnitFilter IsLoaded = u -> u.isLoaded();
-    UnitFilter IsLockedDown = u -> u.isLockedDown();
-    UnitFilter IsMaelstrommed = u -> u.isMaelstrommed();
-    UnitFilter IsMorphing = u -> u.isMorphing();
-    UnitFilter IsMoving = u -> u.isMoving();
-    UnitFilter IsParasited = u -> u.isParasited();
-    UnitFilter IsPatrolling = u -> u.isPatrolling();
-    UnitFilter IsPlagued = u -> u.isPlagued();
-    UnitFilter IsRepairing = u -> u.isRepairing();
-    UnitFilter IsResearching = u -> u.isResearching();
-    UnitFilter IsSieged = u -> u.isSieged();
-    UnitFilter IsStartingAttack = u -> u.isStartingAttack();
-    UnitFilter IsStasised = u -> u.isStasised();
-    UnitFilter IsStimmed = u -> u.isStimmed();
-    UnitFilter IsStuck = u -> u.isStuck();
-    UnitFilter IsTraining = u -> u.isTraining();
-    UnitFilter IsUnderAttack = u -> u.isUnderAttack();
-    UnitFilter IsUnderDarkSwarm = u -> u.isUnderDarkSwarm();
-    UnitFilter IsUnderDisruptionWeb = u -> u.isUnderDisruptionWeb();
-    UnitFilter IsUnderStorm = u -> u.isUnderStorm();
-    UnitFilter IsPowered = u -> u.isPowered();
-    UnitFilter IsVisible = u -> u.isVisible();
+    UnitFilter IsCloaked = Unit::isCloaked;
+    UnitFilter IsCompleted = Unit::isCompleted;
+    UnitFilter IsConstructing = Unit::isConstructing;
+    UnitFilter IsDefenseMatrixed = Unit::isDefenseMatrixed;
+    UnitFilter IsDetected = Unit::isDetected;
+    UnitFilter IsEnsnared = Unit::isEnsnared;
+    UnitFilter IsFollowing = Unit::isFollowing;
+    UnitFilter IsGatheringGas = Unit::isGatheringGas;
+    UnitFilter IsGatheringMinerals = Unit::isGatheringMinerals;
+    UnitFilter IsHallucination = Unit::isHallucination;
+    UnitFilter IsHoldingPosition = Unit::isHoldingPosition;
+    UnitFilter IsIdle = Unit::isIdle;
+    UnitFilter IsInterruptible = Unit::isInterruptible;
+    UnitFilter IsInvincible = Unit::isInvincible;
+    UnitFilter IsIrradiated = Unit::isIrradiated;
+    UnitFilter IsLifted = Unit::isLifted;
+    UnitFilter IsLoaded = Unit::isLoaded;
+    UnitFilter IsLockedDown = Unit::isLockedDown;
+    UnitFilter IsMaelstrommed = Unit::isMaelstrommed;
+    UnitFilter IsMorphing = Unit::isMorphing;
+    UnitFilter IsMoving = Unit::isMoving;
+    UnitFilter IsParasited = Unit::isParasited;
+    UnitFilter IsPatrolling = Unit::isPatrolling;
+    UnitFilter IsPlagued = Unit::isPlagued;
+    UnitFilter IsRepairing = Unit::isRepairing;
+    UnitFilter IsResearching = Unit::isResearching;
+    UnitFilter IsSieged = Unit::isSieged;
+    UnitFilter IsStartingAttack = Unit::isStartingAttack;
+    UnitFilter IsStasised = Unit::isStasised;
+    UnitFilter IsStimmed = Unit::isStimmed;
+    UnitFilter IsStuck = Unit::isStuck;
+    UnitFilter IsTraining = Unit::isTraining;
+    UnitFilter IsUnderAttack = Unit::isUnderAttack;
+    UnitFilter IsUnderDarkSwarm = Unit::isUnderDarkSwarm;
+    UnitFilter IsUnderDisruptionWeb = Unit::isUnderDisruptionWeb;
+    UnitFilter IsUnderStorm = Unit::isUnderStorm;
+    UnitFilter IsPowered = Unit::isPowered;
+    UnitFilter IsVisible = Unit::isVisible;
 }
 

src/main/java/bwapi/UnitSelf.java

@@ -3,40 +3,40 @@
 import java.util.stream.IntStream;
 
 class UnitSelf {
-    OrderCache order = new OrderCache();
-    IntegerCache targetPositionX = new IntegerCache();
-    IntegerCache targetPositionY = new IntegerCache();
-    IntegerCache orderTargetPositionX = new IntegerCache();
-    IntegerCache orderTargetPositionY = new IntegerCache();
-    IntegerCache target = new IntegerCache();
-    BooleanCache isConstructing = new BooleanCache();
-    BooleanCache isIdle = new BooleanCache();
-    UnitTypeCache buildType = new UnitTypeCache();
-    OrderCache secondaryOrder = new OrderCache();
-    IntegerCache remainingBuildTime = new IntegerCache();
-    IntegerCache buildUnit = new IntegerCache();
-    UnitTypeCache type = new UnitTypeCache();
-    BooleanCache isMorphing = new BooleanCache();
-    BooleanCache isCompleted = new BooleanCache();
-    IntegerCache remainingResearchTime = new IntegerCache();
-    TechTypeCache tech = new TechTypeCache();
-    BooleanCache isTraining = new BooleanCache();
-    IntegerCache remainingTrainTime = new IntegerCache();
-    UpgradeTypeCache upgrade = new UpgradeTypeCache();
-    IntegerCache remainingUpgradeTime = new IntegerCache();
-    BooleanCache isMoving = new BooleanCache();
-    BooleanCache isGathering = new BooleanCache();
-    IntegerCache rallyPositionX = new IntegerCache();
-    IntegerCache rallyPositionY = new IntegerCache();
-    IntegerCache rallyUnit = new IntegerCache();
-    IntegerCache stimTimer = new IntegerCache();
-    IntegerCache orderTarget = new IntegerCache();
+    final OrderCache order = new OrderCache();
+    final IntegerCache targetPositionX = new IntegerCache();
+    final IntegerCache targetPositionY = new IntegerCache();
+    final IntegerCache orderTargetPositionX = new IntegerCache();
+    final IntegerCache orderTargetPositionY = new IntegerCache();
+    final IntegerCache target = new IntegerCache();
+    final BooleanCache isConstructing = new BooleanCache();
+    final BooleanCache isIdle = new BooleanCache();
+    final UnitTypeCache buildType = new UnitTypeCache();
+    final OrderCache secondaryOrder = new OrderCache();
+    final IntegerCache remainingBuildTime = new IntegerCache();
+    final IntegerCache buildUnit = new IntegerCache();
+    final UnitTypeCache type = new UnitTypeCache();
+    final BooleanCache isMorphing = new BooleanCache();
+    final BooleanCache isCompleted = new BooleanCache();
+    final IntegerCache remainingResearchTime = new IntegerCache();
+    final TechTypeCache tech = new TechTypeCache();
+    final BooleanCache isTraining = new BooleanCache();
+    final IntegerCache remainingTrainTime = new IntegerCache();
+    final UpgradeTypeCache upgrade = new UpgradeTypeCache();
+    final IntegerCache remainingUpgradeTime = new IntegerCache();
+    final BooleanCache isMoving = new BooleanCache();
+    final BooleanCache isGathering = new BooleanCache();
+    final IntegerCache rallyPositionX = new IntegerCache();
+    final IntegerCache rallyPositionY = new IntegerCache();
+    final IntegerCache rallyUnit = new IntegerCache();
+    final IntegerCache stimTimer = new IntegerCache();
+    final IntegerCache orderTarget = new IntegerCache();
 
-    UnitTypeCache[] trainingQueue = new UnitTypeCache[5];
+    final UnitTypeCache[] trainingQueue = new UnitTypeCache[5];
 
-    IntegerCache hitPoints = new IntegerCache();
-    IntegerCache trainingQueueCount = new IntegerCache();
-    IntegerCache energy = new IntegerCache();
+    final IntegerCache hitPoints = new IntegerCache();
+    final IntegerCache trainingQueueCount = new IntegerCache();
+    final IntegerCache energy = new IntegerCache();
 
 
     UnitSelf() {

src/main/java/bwem/BWEM.java

@@ -23,7 +23,7 @@
  * By default BWEM throws when an invalid state is encountered.
  * But if you know what you are doing, you can skip these throws by setting
  * {@link #setFailOnError} to `false`.
- * These errors will then be outputted to {@link System.err}, but this can also be changed
+ * These errors will then be outputted to `System.err`, but this can also be changed
  * with {@link #setFailOutputStream} (if you set it to `null` the errors will be completely ignored).
  */
 public final class BWEM {