Checkstyle: Address various other suggestions

Author: flTobi

engine/src/main/java/org/destinationsol/game/chunk/ChunkManager.java

@@ -38,8 +38,8 @@ public class ChunkManager implements UpdateAwareSystem {
     private final RemoveController backgroundRemoveController;
     private final ChunkFiller filler;
 
-    private int X;
-    private int Y;
+    private int x;
+    private int y;
 
     public ChunkManager() {
         filledChunks = new HashSet<>();
@@ -62,11 +62,11 @@ public void update(SolGame game, float timeStep) {
     }
 
     private boolean updateCurrChunk(Vector2 position) {
-        int oldX = X;
-        int oldY = Y;
-        X = posToChunkIdx(position.x);
-        Y = posToChunkIdx(position.y);
-        return oldX != X || oldY != Y;
+        int oldX = x;
+        int oldY = y;
+        x = posToChunkIdx(position.x);
+        y = posToChunkIdx(position.y);
+        return oldX != x || oldY != y;
     }
 
     private int posToChunkIdx(float v) {
@@ -82,7 +82,7 @@ private void clearFarChunks(Set<Vector2> chunks, int dist) {
     }
 
     private boolean isChunkFar(int x, int y, int dist) {
-        return x <= X - dist || X + dist <= x || y <= Y - dist || Y + dist <= y;
+        return x <= this.x - dist || this.x + dist <= x || y <= this.y - dist || this.y + dist <= y;
     }
 
     private void addNewChunks(Set<Vector2> chunks, int dist, SolGame game) {
@@ -98,7 +98,7 @@ private void addNewChunks(Set<Vector2> chunks, int dist, SolGame game) {
     }
 
     private void maybeAddChunk(Set<Vector2> chunks, int oX, int oY, SolGame game) {
-        Vector2 v = SolMath.getVec(X + oX, Y + oY);
+        Vector2 v = SolMath.getVec(x + oX, y + oY);
         if (!chunks.contains(v)) {
             Vector2 chunk = new Vector2(v);
             chunks.add(chunk);

engine/src/main/java/org/destinationsol/game/input/Pilot.java

@@ -54,7 +54,7 @@ public interface Pilot {
 
     boolean isPlayer();
 
-    public static final class Utils {
+    final class Utils {
         public static boolean isIdle(Pilot p) {
             return !(p.isUp() || p.isShoot() || p.isShoot2() || p.isAbility());
         }

engine/src/main/java/org/destinationsol/game/ship/FarShip.java

@@ -211,6 +211,8 @@ public MercItem getMerc() {
         return this.mercItem;
     }
 
-    public boolean isMerc() { return this.isMerc; }
+    public boolean isMerc() {
+        return this.isMerc;
+    }
 
 }

engine/src/main/java/org/destinationsol/game/ship/SolShip.java

@@ -190,7 +190,7 @@ private boolean tryCollectLoot(SolObject obj, SolGame game) {
         boolean canAdd = c.canAdd(i);
         if (canAdd) {
             c.add(i);
-            if (c == myItemContainer && myPilot.getMapHint() == "Merc") {
+            if (c == myItemContainer && myPilot.getMapHint().equals("Merc")) {
                 //insert equip code here, if it's something we want to do
             }
         }