Cleanup the codebase (#3311)

Co-authored-by: boubou19 <miisterunknown@gmail.com>

5 files changed, 18 insertions, 22 deletions

diff --git a/src/main/java/bartworks/util/MurmurHash3.java b/src/main/java/bartworks/util/MurmurHash3.java
index 825c83cca2..e32356bae1 100644
--- a/src/main/java/bartworks/util/MurmurHash3.java
+++ b/src/main/java/bartworks/util/MurmurHash3.java
@@ -128,11 +128,11 @@ public final class MurmurHash3 {
                 /***
                  * // optimized ascii implementation (currently slower!!! code size?) if (shift == 24) { k1 = k1 | (code
                  * << 24);
-                 *
+                 * <p>
                  * k1 *= c1; k1 = (k1 << 15) | (k1 >>> 17); // ROTL32(k1,15); k1 *= c2;
-                 *
+                 * <p>
                  * h1 ^= k1; h1 = (h1 << 13) | (h1 >>> 19); // ROTL32(h1,13); h1 = h1*5+0xe6546b64;
-                 *
+                 * <p>
                  * shift = 0; nBytes += 4; k1 = 0; } else { k1 |= code << shift; shift += 8; } continue;
                  ***/
             } else if (code < 0x800) {
diff --git a/src/main/java/bartworks/util/NoiseUtil/SimplexNoise.java b/src/main/java/bartworks/util/NoiseUtil/SimplexNoise.java
index ea2e571910..c6418d2213 100644
--- a/src/main/java/bartworks/util/NoiseUtil/SimplexNoise.java
+++ b/src/main/java/bartworks/util/NoiseUtil/SimplexNoise.java
@@ -11,11 +11,11 @@ import bartworks.util.MathUtils;
 
 public class SimplexNoise { // Simplex noise in 2D, 3D and 4D
 
-    private static Grad[] grad3 = { new Grad(1, 1, 0), new Grad(-1, 1, 0), new Grad(1, -1, 0), new Grad(-1, -1, 0),
-        new Grad(1, 0, 1), new Grad(-1, 0, 1), new Grad(1, 0, -1), new Grad(-1, 0, -1), new Grad(0, 1, 1),
-        new Grad(0, -1, 1), new Grad(0, 1, -1), new Grad(0, -1, -1) };
+    private static final Grad[] grad3 = { new Grad(1, 1, 0), new Grad(-1, 1, 0), new Grad(1, -1, 0),
+        new Grad(-1, -1, 0), new Grad(1, 0, 1), new Grad(-1, 0, 1), new Grad(1, 0, -1), new Grad(-1, 0, -1),
+        new Grad(0, 1, 1), new Grad(0, -1, 1), new Grad(0, 1, -1), new Grad(0, -1, -1) };
 
-    private static Grad[] grad4 = { new Grad(0, 1, 1, 1), new Grad(0, 1, 1, -1), new Grad(0, 1, -1, 1),
+    private static final Grad[] grad4 = { new Grad(0, 1, 1, 1), new Grad(0, 1, 1, -1), new Grad(0, 1, -1, 1),
         new Grad(0, 1, -1, -1), new Grad(0, -1, 1, 1), new Grad(0, -1, 1, -1), new Grad(0, -1, -1, 1),
         new Grad(0, -1, -1, -1), new Grad(1, 0, 1, 1), new Grad(1, 0, 1, -1), new Grad(1, 0, -1, 1),
         new Grad(1, 0, -1, -1), new Grad(-1, 0, 1, 1), new Grad(-1, 0, 1, -1), new Grad(-1, 0, -1, 1),
@@ -25,20 +25,20 @@ public class SimplexNoise { // Simplex noise in 2D, 3D and 4D
         new Grad(1, -1, -1, 0), new Grad(-1, 1, 1, 0), new Grad(-1, 1, -1, 0), new Grad(-1, -1, 1, 0),
         new Grad(-1, -1, -1, 0) };
 
-    private static short[] p = { 151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, 7, 225, 140, 36, 103,
-        30, 69, 142, 8, 99, 37, 240, 21, 10, 23, 190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, 117,
-        35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, 136, 171, 168, 68, 175, 74, 165, 71, 134, 139, 48,
-        27, 166, 77, 146, 158, 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, 46, 245, 40, 244, 102,
-        143, 54, 65, 25, 63, 161, 1, 216, 80, 73, 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, 188,
-        159, 86, 164, 100, 109, 198, 173, 186, 3, 64, 52, 217, 226, 250, 124, 123, 5, 202, 38, 147, 118, 126, 255, 82,
-        85, 212, 207, 206, 59, 227, 47, 16, 58, 17, 182, 189, 28, 42, 223, 183, 170, 213, 119, 248, 152, 2, 44, 154,
+    private static final short[] p = { 151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, 7, 225, 140, 36,
+        103, 30, 69, 142, 8, 99, 37, 240, 21, 10, 23, 190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203,
+        117, 35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, 136, 171, 168, 68, 175, 74, 165, 71, 134, 139,
+        48, 27, 166, 77, 146, 158, 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, 46, 245, 40, 244,
+        102, 143, 54, 65, 25, 63, 161, 1, 216, 80, 73, 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116,
+        188, 159, 86, 164, 100, 109, 198, 173, 186, 3, 64, 52, 217, 226, 250, 124, 123, 5, 202, 38, 147, 118, 126, 255,
+        82, 85, 212, 207, 206, 59, 227, 47, 16, 58, 17, 182, 189, 28, 42, 223, 183, 170, 213, 119, 248, 152, 2, 44, 154,
         163, 70, 221, 153, 101, 155, 167, 43, 172, 9, 129, 22, 39, 253, 19, 98, 108, 110, 79, 113, 224, 232, 178, 185,
         112, 104, 218, 246, 97, 228, 251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, 51, 145, 235, 249,
         14, 239, 107, 49, 192, 214, 31, 181, 199, 106, 157, 184, 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254, 138,
         236, 205, 93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215, 61, 156, 180 };
     // To remove the need for index wrapping, double the permutation table length
-    private static short[] perm = new short[512];
-    private static short[] permMod12 = new short[512];
+    private static final short[] perm = new short[512];
+    private static final short[] permMod12 = new short[512];
 
     static {
         for (int i = 0; i < 512; i++) {
diff --git a/src/main/java/bartworks/util/NonNullWrappedHashMap.java b/src/main/java/bartworks/util/NonNullWrappedHashMap.java
index a11cb6a6af..650c4e5c18 100644
--- a/src/main/java/bartworks/util/NonNullWrappedHashMap.java
+++ b/src/main/java/bartworks/util/NonNullWrappedHashMap.java
@@ -21,7 +21,7 @@ import java.util.Optional;
 public class NonNullWrappedHashMap<K, V> extends HashMap<K, V> {
 
     private static final long serialVersionUID = 46345163103910175L;
-    private V defaultValue;
+    private final V defaultValue;
 
     public NonNullWrappedHashMap(int initialCapacity, float loadFactor, V defaultValue) {
         super(initialCapacity, loadFactor);
diff --git a/src/main/java/bartworks/util/Pair.java b/src/main/java/bartworks/util/Pair.java
index 1361460e31..32c55da91c 100644
--- a/src/main/java/bartworks/util/Pair.java
+++ b/src/main/java/bartworks/util/Pair.java
@@ -34,9 +34,7 @@ public class Pair<A, B> implements Map.Entry<A, B> {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (!(o instanceof Pair)) return false;
-
-        Pair<?, ?> pair1 = (Pair<?, ?>) o;
+        if (!(o instanceof Pair<?, ?>pair1)) return false;
 
         // Probably incorrect - comparing Object[] arrays with Arrays.equals
         return Arrays.equals(this.pair, pair1.pair);
diff --git a/src/main/java/bartworks/util/accessprioritylist/AccessPriorityList.java b/src/main/java/bartworks/util/accessprioritylist/AccessPriorityList.java
index 7a41b712b5..fa5df08d56 100644
--- a/src/main/java/bartworks/util/accessprioritylist/AccessPriorityList.java
+++ b/src/main/java/bartworks/util/accessprioritylist/AccessPriorityList.java
@@ -72,7 +72,6 @@ public class AccessPriorityList<E> implements List<E>, Deque<E>, Set<E> {
         this.head = node.getNext();
         this.head.setBefore(null);
         node.destroy();
-        node = null;
         this.size--;
         return first;
     }
@@ -84,7 +83,6 @@ public class AccessPriorityList<E> implements List<E>, Deque<E>, Set<E> {
         this.tail = node.getBefore();
         this.tail.setNext(null);
         node.destroy();
-        node = null;
         this.size--;
         return last;
     }