Cleaning up (#767)

* Kill playerAPI

* Gut more events and compat that is now obsolete

* Remove commented out code

* Remove final modifier from methods

* Make more stuff final

* Remove slow building ring

* Protected -> private in final classes

* More cleaning

* More cleaning v2

* Purging

* Clean DevHelper

* Clean DevHelper 2

* delete DevHelper

* remove useless IFMLLoadingPlugin.MCVersion annotation from @Mod files

* check for obfuscation only once in the IFMLloadingPlugin.injectData

* don't instantiate the static class ASMConfig

* delete unused and empty implementation of IFMLCallHook

* delete empty class

* delete ClassesToTransform class that just holds the class names constants

* delete unused methods and unsless logging in dummymod container

* delete unused transformer ClassTransformer_TT_ThaumicRestorer

* spotless

* Clean

* Clean utils

* Build checkpoint

* Purge

* Stage 2

* Stage 3

* Stage 4

* Stage 5

* Stage 6

* Spotless

* Imports

* Stage idk

* Stage 1

* Fix issue

* Spotless

* Format numbers

---------

Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com>
Co-authored-by: Connor Colenso <colen@CONNORSPC>

10 files changed, 32 insertions, 38 deletions

diff --git a/src/main/java/gtPlusPlus/api/objects/Logger.java b/src/main/java/gtPlusPlus/api/objects/Logger.java
index 9b6591abd2..0178bb141a 100644
--- a/src/main/java/gtPlusPlus/api/objects/Logger.java
+++ b/src/main/java/gtPlusPlus/api/objects/Logger.java
@@ -10,7 +10,7 @@ import gtPlusPlus.preloader.asm.AsmConfig;
 
 public class Logger {
 
-    public Logger(String string) {}
+    public Logger() {}
 
     // Logging Functions
     public static final org.apache.logging.log4j.Logger modLogger = Logger.makeLogger();
diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java
index f4b2550b5a..aedd6c6073 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java
@@ -27,7 +27,7 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
     private static final long serialVersionUID = 3771412318075131790L;
 
     public AutoMap() {
-        this(new LinkedHashMap<Integer, V>());
+        this(new LinkedHashMap<>());
     }
 
     public Map<Integer, V> getMap() {
@@ -36,7 +36,7 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
 
     public AutoMap(Map<Integer, V> defaultMapType) {
         mInternalMap = defaultMapType;
-        mInternalNameMap = new LinkedHashMap<String, Integer>();
+        mInternalNameMap = new LinkedHashMap<>();
     }
 
     /**
@@ -45,8 +45,8 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
      * @param aList - Data to be inserted into the AutoMap.
      */
     public AutoMap(List<V> aList) {
-        mInternalMap = new LinkedHashMap<Integer, V>();
-        mInternalNameMap = new LinkedHashMap<String, Integer>();
+        mInternalMap = new LinkedHashMap<>();
+        mInternalNameMap = new LinkedHashMap<>();
         if (aList != null && aList.size() > 0) {
             for (V obj : aList) {
                 add(obj);
@@ -60,8 +60,8 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
      * @param aList - Data to be inserted into the AutoMap.
      */
     public AutoMap(Set<V> aList) {
-        mInternalMap = new LinkedHashMap<Integer, V>();
-        mInternalNameMap = new LinkedHashMap<String, Integer>();
+        mInternalMap = new LinkedHashMap<>();
+        mInternalNameMap = new LinkedHashMap<>();
         if (aList != null && aList.size() > 0) {
             for (V obj : aList) {
                 add(obj);
@@ -75,8 +75,8 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
      * @param aList - Data to be inserted into the AutoMap.
      */
     public AutoMap(Collection<V> aList) {
-        mInternalMap = new LinkedHashMap<Integer, V>();
-        mInternalNameMap = new LinkedHashMap<String, Integer>();
+        mInternalMap = new LinkedHashMap<>();
+        mInternalNameMap = new LinkedHashMap<>();
         if (aList != null && aList.size() > 0) {
             for (V obj : aList) {
                 add(obj);
@@ -90,8 +90,8 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
      * @param aArray - Data to be inserted into the AutoMap.
      */
     public AutoMap(V[] aArray) {
-        mInternalMap = new LinkedHashMap<Integer, V>();
-        mInternalNameMap = new LinkedHashMap<String, Integer>();
+        mInternalMap = new LinkedHashMap<>();
+        mInternalNameMap = new LinkedHashMap<>();
         if (aArray != null && aArray.length > 0) {
             for (V obj : aArray) {
                 add(obj);
@@ -244,7 +244,7 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
 
     @Override
     public boolean retainAll(Collection<?> c) {
-        AutoMap<?> aTempAllocation = new AutoMap<Object>();
+        AutoMap<?> aTempAllocation = new AutoMap<>();
         boolean aTrue = false;
         aTempAllocation = this;
         aTempAllocation.removeAll(c);
@@ -346,7 +346,7 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
 
     @Override
     public List<V> subList(int fromIndex, int toIndex) {
-        AutoMap<V> aNewSubList = new AutoMap<V>();
+        AutoMap<V> aNewSubList = new AutoMap<>();
         for (int slot = fromIndex; slot <= toIndex; slot++) {
             V obj = mInternalMap.get(slot);
             if (obj == null) {
diff --git a/src/main/java/gtPlusPlus/api/objects/data/Quad.java b/src/main/java/gtPlusPlus/api/objects/data/Quad.java
index 54839ac930..a2597061e0 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/Quad.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/Quad.java
@@ -34,7 +34,7 @@ public class Quad<K, V, C, R> {
     }
 
     public final List values() {
-        List<Object> aVals = new ArrayList<Object>();
+        List<Object> aVals = new ArrayList<>();
         aVals.add(key);
         aVals.add(value);
         aVals.add(value2);
diff --git a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java
index e4b4e0db88..ea12972af4 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java
@@ -10,7 +10,7 @@ import gtPlusPlus.api.objects.Logger;
 
 public class TypeCounter<V> implements Set<V> {
 
-    private Map<String, InternalTypeCounterObject<V>> mInternalMap = new LinkedHashMap<String, InternalTypeCounterObject<V>>();
+    private Map<String, InternalTypeCounterObject<V>> mInternalMap = new LinkedHashMap<>();
     private String mHighestValueKey;
     private int mHighestValue = 0;
     private final Class mClass;
@@ -55,7 +55,7 @@ public class TypeCounter<V> implements Set<V> {
         String aKey = aKeyName != null ? aKeyName : arg0.toString();
         InternalTypeCounterObject<V> aValue = mInternalMap.get(aKey);
         if (aValue == null) {
-            aValue = new InternalTypeCounterObject<V>((V) arg0);
+            aValue = new InternalTypeCounterObject<>((V) arg0);
             Logger.WARNING("Adding new key to map: " + aKey);
         }
         aValue.add();
@@ -152,7 +152,7 @@ public class TypeCounter<V> implements Set<V> {
         for (String k : this.mInternalMap.keySet()) {
             if (k != null) {
                 InternalTypeCounterObject<V> aVal = this.mInternalMap.get(k);
-                aArray[aPos++] = new Pair<String, InternalTypeCounterObject<V>>(k, aVal);
+                aArray[aPos++] = new Pair<>(k, aVal);
             }
         }
         return aArray;
diff --git a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java
index 9d9201066b..ae1f28f0c9 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java
@@ -11,7 +11,7 @@ import gregtech.api.objects.XSTR;
 
 public class WeightedCollection<E> implements Map<Integer, E> {
 
-    private NavigableMap<Integer, E> map = new TreeMap<Integer, E>();
+    private NavigableMap<Integer, E> map = new TreeMap<>();
     private Random random;
     private int total = 0;
 
diff --git a/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java
index c9176c00c5..199d20e06a 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java
@@ -9,6 +9,6 @@ public class WeakAutoMap<T> extends AutoMap<T> {
     private static final long serialVersionUID = 8328345351801363386L;
 
     public WeakAutoMap() {
-        super(new WeakHashMap<Integer, T>());
+        super(new WeakHashMap<>());
     }
 }
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java
index cd6edf5411..686c0e7667 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java
@@ -87,10 +87,9 @@ public class BlockPos implements Serializable {
         if (other == this) {
             return true;
         }
-        if (!(other instanceof BlockPos)) {
+        if (!(other instanceof BlockPos otherPoint)) {
             return false;
         }
-        BlockPos otherPoint = (BlockPos) other;
         return this.xPos == otherPoint.xPos && this.yPos == otherPoint.yPos
                 && this.zPos == otherPoint.zPos
                 && this.dim == otherPoint.dim;
@@ -153,7 +152,7 @@ public class BlockPos implements Serializable {
     }
 
     public AutoMap<BlockPos> getSurroundingBlocks() {
-        AutoMap<BlockPos> sides = new AutoMap<BlockPos>();
+        AutoMap<BlockPos> sides = new AutoMap<>();
         sides.put(getUp());
         sides.put(getDown());
         sides.put(getXPos());
@@ -219,7 +218,7 @@ public class BlockPos implements Serializable {
      * @return - Does this block have a neighbour that is the same?
      */
     public AutoMap<BlockPos> getSimilarNeighbour(boolean strict) {
-        AutoMap<BlockPos> sides = new AutoMap<BlockPos>();
+        AutoMap<BlockPos> sides = new AutoMap<>();
         for (BlockPos g : getSurroundingBlocks().values()) {
             if (getBlockAtPos(g) == getBlockAtPos()) {
                 if (!strict) {
@@ -237,7 +236,7 @@ public class BlockPos implements Serializable {
     public Set<BlockPos> getValidNeighboursAndSelf() {
         AutoMap<BlockPos> h = getSimilarNeighbour(true);
         h.put(this);
-        Set<BlockPos> result = new HashSet<BlockPos>();
+        Set<BlockPos> result = new HashSet<>();
         for (BlockPos f : h.values()) {
             result.add(f);
         }
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java
index 6fe2f9ddb5..d68ef1a93f 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java
@@ -33,7 +33,7 @@ public abstract class ItemPackage implements RunnableWithInfo<String> {
 
     public abstract boolean generateRecipes();
 
-    private final void init() {
+    private void init() {
         items();
         blocks();
         fluids();
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java
index 84f5fe5fba..58a7affa90 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java
@@ -18,18 +18,18 @@ import gtPlusPlus.core.util.Utils;
 public class SafeTexture implements Runnable {
 
     @SideOnly(Side.CLIENT)
-    private static final HashMap<Integer, IIcon> mHashToIconCache = new HashMap<Integer, IIcon>();
+    private static final HashMap<Integer, IIcon> mHashToIconCache = new HashMap<>();
 
     @SideOnly(Side.CLIENT)
-    private static final HashMap<String, Integer> mPathToHashCash = new HashMap<String, Integer>();
+    private static final HashMap<String, Integer> mPathToHashCash = new HashMap<>();
 
-    private static final HashMap<String, SafeTexture> mTextureObjectCache = new HashMap<String, SafeTexture>();
+    private static final HashMap<String, SafeTexture> mTextureObjectCache = new HashMap<>();
 
     private final int mHash;
 
     private final String mTextureName;
 
-    private static final String getKey(String aTexPath) {
+    private static String getKey(String aTexPath) {
         String aNameKey = Utils.sanitizeString(aTexPath);
         aNameKey = aNameKey.replace('/', ' ');
         aNameKey = aNameKey.toLowerCase();
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
index 12916af64b..db9599e130 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
@@ -72,15 +72,10 @@ public class ShapedRecipe {
                                     + " has incorrect number of inputs. Size: "
                                     + aInputs.length
                                     + ".");
-                    // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(1));
-                    // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(2));
-                    // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(3));
-                    // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(4));
-                    // Logger.RECIPE("Reciped exists at location: "+ReflectionUtils.getMethodName(1));
                 }
 
                 // Build a Pair for each slot
-                AutoMap<Pair<Character, Object>> aRecipePairs = new AutoMap<Pair<Character, Object>>();
+                AutoMap<Pair<Character, Object>> aRecipePairs = new AutoMap<>();
                 int aCharSlot = 0;
                 int aMemSlot = 0;
                 int aInfoSlot = 0;
@@ -95,7 +90,7 @@ public class ShapedRecipe {
                             }
                             mInfo = ((ItemStack) stack).getDisplayName();
                         }
-                        aRecipePairs.put(new Pair<Character, Object>(CHARS.charAt(aCharSlot), stack));
+                        aRecipePairs.put(new Pair<>(CHARS.charAt(aCharSlot), stack));
                         Logger.RECIPE(
                                 "Storing '" + CHARS.charAt(aCharSlot)
                                         + "' with an object of type "
@@ -106,7 +101,7 @@ public class ShapedRecipe {
                         aCharSlot++;
                         aLoggingInfo[aInfoSlot++] = mInfo;
                     } else {
-                        aRecipePairs.put(new Pair<Character, Object>(' ', (ItemStack) null));
+                        aRecipePairs.put(new Pair<>(' ', (ItemStack) null));
                         Logger.RECIPE("Storing ' ' with an object of type null");
                         aChar[aMemSlot++] = ' ';
                         aLoggingInfo[aInfoSlot++] = "Empty";
@@ -158,7 +153,7 @@ public class ShapedRecipe {
                                 }
                                 mInfo = ((ItemStack) stack).getDisplayName();
                             }
-                            aRecipePairs.put(new Pair<Character, Object>(CHARS.charAt(aCharSlot), stack));
+                            aRecipePairs.put(new Pair<>(CHARS.charAt(aCharSlot), stack));
                             Logger.RECIPE(
                                     "Registering Pair of '" + CHARS.charAt(aCharSlot)
                                             + "' and a "