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>

2 files changed, 52 insertions, 53 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
index ae3a40cff9..6344632a6b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
@@ -45,7 +45,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
         mInit = init();
     }
 
-    private final boolean init() {
+    private boolean init() {
         if (mInit) {
             return false;
         }
@@ -165,7 +165,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
         }
     }
 
-    private final boolean renderCapeOnPlayer(RenderPlayerEvent.Specials.Pre aEvent, AbstractClientPlayer aPlayer) {
+    private boolean renderCapeOnPlayer(RenderPlayerEvent.Specials.Pre aEvent, AbstractClientPlayer aPlayer) {
         float aPartialTicks = aEvent.partialRenderTick;
         try {
             if (tResource == null && CORE.DEVENV) {
@@ -174,7 +174,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
 
             // If player is invisible, don't render.
             if (GT_Utility.getFullInvisibility(aPlayer) || aPlayer.isInvisible()
-                    || GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id).intValue())) {
+                    || GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id))) {
                 aEvent.setCanceled(true);
                 return false;
             }
@@ -235,13 +235,13 @@ public class GTPP_CapeRenderer extends RenderPlayer {
         private static AES sAES;
 
         // UUID - Username
-        private static final AutoMap<Pair<String, String>> mOrangeCapes = new AutoMap<Pair<String, String>>();
-        private static final AutoMap<Pair<String, String>> mMiscCapes = new AutoMap<Pair<String, String>>();
-        private static final AutoMap<Pair<String, String>> mBetaTestCapes = new AutoMap<Pair<String, String>>();
-        private static final AutoMap<Pair<String, String>> mPatreonCapes = new AutoMap<Pair<String, String>>();
-        private static final AutoMap<Pair<String, String>> mDevCapes = new AutoMap<Pair<String, String>>();
+        private static final AutoMap<Pair<String, String>> mOrangeCapes = new AutoMap<>();
+        private static final AutoMap<Pair<String, String>> mMiscCapes = new AutoMap<>();
+        private static final AutoMap<Pair<String, String>> mBetaTestCapes = new AutoMap<>();
+        private static final AutoMap<Pair<String, String>> mPatreonCapes = new AutoMap<>();
+        private static final AutoMap<Pair<String, String>> mDevCapes = new AutoMap<>();
 
-        private static final boolean init() {
+        private static boolean init() {
             CapeUtils.handleOldCapeCache();
             if (CORE.DEVENV) {
                 return true;
@@ -267,7 +267,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
             return false;
         }
 
-        private static final boolean isCapeCacheWeekOld() {
+        private static boolean isCapeCacheWeekOld() {
             if (!doesCapeCacheExistLocally()) {
                 return true;
             } else {
@@ -281,7 +281,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
             return false;
         }
 
-        private static final void downloadCapeList() {
+        private static void downloadCapeList() {
             try {
                 File dat = getCapeCache();
                 File temp = allocateTempFile();
@@ -297,7 +297,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
             }
         }
 
-        private static final boolean isDownloadedCapeListBigger(File aFile) {
+        private static boolean isDownloadedCapeListBigger(File aFile) {
             double aExistingFileSize = (doesCapeCacheExistLocally() ? getCapeCache().length() : 0);
             double aNewFileSize = aFile.length();
             if (aNewFileSize > aExistingFileSize) {
@@ -313,7 +313,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
             }
         }
 
-        private static final boolean doesCapeCacheExistLocally() {
+        private static boolean doesCapeCacheExistLocally() {
             File aCacheFile = FileUtils.getFile("CapeCache", "dat");
             if (FileUtils.doesFileExist(aCacheFile)) {
                 return true;
@@ -321,7 +321,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
             return false;
         }
 
-        private static final File getCapeCache() {
+        private static File getCapeCache() {
             File aCacheFile = FileUtils.getFile("CapeCache", "dat");
             if (FileUtils.doesFileExist(aCacheFile)) {
                 FileUtils.createFile(aCacheFile);
@@ -335,10 +335,10 @@ public class GTPP_CapeRenderer extends RenderPlayer {
             if (aCache != null && !aCache.isEmpty()) {
                 return aCache;
             }
-            return new AutoMap<String>();
+            return new AutoMap<>();
         }
 
-        private static final File allocateTempFile() {
+        private static File allocateTempFile() {
             File tempFile = null;
             try {
                 tempFile = File.createTempFile("gtpp-", null);
@@ -359,16 +359,16 @@ public class GTPP_CapeRenderer extends RenderPlayer {
                 if (sAES == null) {
                     sAES = new AES();
                 }
-                AutoMap<String> aDecodedData = new AutoMap<String>();
+                AutoMap<String> aDecodedData = new AutoMap<>();
                 for (String aToDecode : aCacheData) {
                     aDecodedData.put(sAES.decode(aToDecode));
                 }
                 if (!aDecodedData.isEmpty()) {
-                    AutoMap<Pair<String, String>> aCapeType1 = new AutoMap<Pair<String, String>>();
-                    AutoMap<Pair<String, String>> aCapeType2 = new AutoMap<Pair<String, String>>();
-                    AutoMap<Pair<String, String>> aCapeType3 = new AutoMap<Pair<String, String>>();
-                    AutoMap<Pair<String, String>> aCapeType4 = new AutoMap<Pair<String, String>>();
-                    AutoMap<Pair<String, String>> aCapeType5 = new AutoMap<Pair<String, String>>();
+                    AutoMap<Pair<String, String>> aCapeType1 = new AutoMap<>();
+                    AutoMap<Pair<String, String>> aCapeType2 = new AutoMap<>();
+                    AutoMap<Pair<String, String>> aCapeType3 = new AutoMap<>();
+                    AutoMap<Pair<String, String>> aCapeType4 = new AutoMap<>();
+                    AutoMap<Pair<String, String>> aCapeType5 = new AutoMap<>();
                     boolean didProcessStringData = false;
                     Logger.INFO("Decoded String Count: " + aDecodedData.size());
                     for (String aToSplit : aDecodedData) {
@@ -378,55 +378,54 @@ public class GTPP_CapeRenderer extends RenderPlayer {
                                 Integer aCapeTypeID2 = Integer.parseInt(aSplitData[0]);
                                 if (aCapeTypeID2 != null) {
                                     int aCapeTypeID = aCapeTypeID2;
-                                    Pair<String, String> aFinalString = new Pair<String, String>(
+                                    Pair<String, String> aFinalString = new Pair<>(
                                             "UUID: " + aSplitData[1],
                                             "Username: " + (aSplitData[2] != null && aSplitData[0].length() > 0
                                                     ? aSplitData[2]
                                                     : "Not Specified"));
                                     Logger.INFO("Cape Type: " + aCapeTypeID);
                                     switch (aCapeTypeID) {
-                                        case 0:
+                                        case 0 -> {
                                             aCapeType1.add(aFinalString);
                                             Logger.INFO(
                                                     "Added user to map " + aCapeTypeID
                                                             + ", map now holds "
                                                             + aCapeType1.size()
                                                             + " users.");
-                                            break;
-                                        case 1:
+                                        }
+                                        case 1 -> {
                                             aCapeType2.add(aFinalString);
                                             Logger.INFO(
                                                     "Added user to map " + aCapeTypeID
                                                             + ", map now holds "
                                                             + aCapeType2.size()
                                                             + " users.");
-                                            break;
-                                        case 2:
+                                        }
+                                        case 2 -> {
                                             aCapeType3.add(aFinalString);
                                             Logger.INFO(
                                                     "Added user to map " + aCapeTypeID
                                                             + ", map now holds "
                                                             + aCapeType3.size()
                                                             + " users.");
-                                            break;
-                                        case 3:
+                                        }
+                                        case 3 -> {
                                             aCapeType4.add(aFinalString);
                                             Logger.INFO(
                                                     "Added user to map " + aCapeTypeID
                                                             + ", map now holds "
                                                             + aCapeType4.size()
                                                             + " users.");
-                                            break;
-                                        case 4:
+                                        }
+                                        case 4 -> {
                                             aCapeType5.add(aFinalString);
                                             Logger.INFO(
                                                     "Added user to map " + aCapeTypeID
                                                             + ", map now holds "
                                                             + aCapeType5.size()
                                                             + " users.");
-                                            break;
-                                        default:
-                                            break;
+                                        }
+                                        default -> {}
                                     }
                                 }
                             }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java
index b3fe3dd935..9b4962fea7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java
@@ -1079,9 +1079,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
         }
 
         if (aIcon != null) {
-            for (int i = 0; i < aIcon.length; ++i) {
-                if (aIcon[i] != null) {
-                    aIcon[i].renderYNeg(aRenderer, aBlock, aX, aY, aZ);
+            for (ITexture iTexture : aIcon) {
+                if (iTexture != null) {
+                    iTexture.renderYNeg(aRenderer, aBlock, aX, aY, aZ);
                 }
             }
         }
@@ -1101,9 +1101,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
         }
 
         if (aIcon != null) {
-            for (int i = 0; i < aIcon.length; ++i) {
-                if (aIcon[i] != null) {
-                    aIcon[i].renderYPos(aRenderer, aBlock, aX, aY, aZ);
+            for (ITexture iTexture : aIcon) {
+                if (iTexture != null) {
+                    iTexture.renderYPos(aRenderer, aBlock, aX, aY, aZ);
                 }
             }
         }
@@ -1124,9 +1124,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
 
         aRenderer.flipTexture = !aFullBlock;
         if (aIcon != null) {
-            for (int i = 0; i < aIcon.length; ++i) {
-                if (aIcon[i] != null) {
-                    aIcon[i].renderZNeg(aRenderer, aBlock, aX, aY, aZ);
+            for (ITexture iTexture : aIcon) {
+                if (iTexture != null) {
+                    iTexture.renderZNeg(aRenderer, aBlock, aX, aY, aZ);
                 }
             }
         }
@@ -1146,9 +1146,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
         }
 
         if (aIcon != null) {
-            for (int i = 0; i < aIcon.length; ++i) {
-                if (aIcon[i] != null) {
-                    aIcon[i].renderZPos(aRenderer, aBlock, aX, aY, aZ);
+            for (ITexture iTexture : aIcon) {
+                if (iTexture != null) {
+                    iTexture.renderZPos(aRenderer, aBlock, aX, aY, aZ);
                 }
             }
         }
@@ -1168,9 +1168,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
         }
 
         if (aIcon != null) {
-            for (int i = 0; i < aIcon.length; ++i) {
-                if (aIcon[i] != null) {
-                    aIcon[i].renderXNeg(aRenderer, aBlock, aX, aY, aZ);
+            for (ITexture iTexture : aIcon) {
+                if (iTexture != null) {
+                    iTexture.renderXNeg(aRenderer, aBlock, aX, aY, aZ);
                 }
             }
         }
@@ -1191,9 +1191,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
 
         aRenderer.flipTexture = !aFullBlock;
         if (aIcon != null) {
-            for (int i = 0; i < aIcon.length; ++i) {
-                if (aIcon[i] != null) {
-                    aIcon[i].renderXPos(aRenderer, aBlock, aX, aY, aZ);
+            for (ITexture iTexture : aIcon) {
+                if (iTexture != null) {
+                    iTexture.renderXPos(aRenderer, aBlock, aX, aY, aZ);
                 }
             }
         }