Cleanup the codebase (#3311)

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

2 files changed, 43 insertions, 47 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java
index 128e9c95d7..8208147236 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java
@@ -13,43 +13,43 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MT
 
 public class TexturesGrinderMultiblock {
 
-    private static CustomIcon GT8_1_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE1");
-    private static CustomIcon GT8_1 = new CustomIcon("iconsets/Grinder/GRINDER1");
-    private static CustomIcon GT8_2_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE2");
-    private static CustomIcon GT8_2 = new CustomIcon("iconsets/Grinder/GRINDER2");
-    private static CustomIcon GT8_3_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE3");
-    private static CustomIcon GT8_3 = new CustomIcon("iconsets/Grinder/GRINDER3");
-    private static CustomIcon GT8_4_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE4");
-    private static CustomIcon GT8_4 = new CustomIcon("iconsets/Grinder/GRINDER4");
-    private static CustomIcon GT8_5_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE5");
-    private static CustomIcon GT8_5 = new CustomIcon("iconsets/Grinder/GRINDER5");
-    private static CustomIcon GT8_6_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE6");
-    private static CustomIcon GT8_6 = new CustomIcon("iconsets/Grinder/GRINDER6");
-    private static CustomIcon GT8_7_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE7");
-    private static CustomIcon GT8_7 = new CustomIcon("iconsets/Grinder/GRINDER7");
-    private static CustomIcon GT8_8_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE8");
-    private static CustomIcon GT8_8 = new CustomIcon("iconsets/Grinder/GRINDER8");
-    private static CustomIcon GT8_9_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE9");
-    private static CustomIcon GT8_9 = new CustomIcon("iconsets/Grinder/GRINDER9");
+    private static final CustomIcon GT8_1_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE1");
+    private static final CustomIcon GT8_1 = new CustomIcon("iconsets/Grinder/GRINDER1");
+    private static final CustomIcon GT8_2_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE2");
+    private static final CustomIcon GT8_2 = new CustomIcon("iconsets/Grinder/GRINDER2");
+    private static final CustomIcon GT8_3_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE3");
+    private static final CustomIcon GT8_3 = new CustomIcon("iconsets/Grinder/GRINDER3");
+    private static final CustomIcon GT8_4_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE4");
+    private static final CustomIcon GT8_4 = new CustomIcon("iconsets/Grinder/GRINDER4");
+    private static final CustomIcon GT8_5_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE5");
+    private static final CustomIcon GT8_5 = new CustomIcon("iconsets/Grinder/GRINDER5");
+    private static final CustomIcon GT8_6_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE6");
+    private static final CustomIcon GT8_6 = new CustomIcon("iconsets/Grinder/GRINDER6");
+    private static final CustomIcon GT8_7_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE7");
+    private static final CustomIcon GT8_7 = new CustomIcon("iconsets/Grinder/GRINDER7");
+    private static final CustomIcon GT8_8_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE8");
+    private static final CustomIcon GT8_8 = new CustomIcon("iconsets/Grinder/GRINDER8");
+    private static final CustomIcon GT8_9_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE9");
+    private static final CustomIcon GT8_9 = new CustomIcon("iconsets/Grinder/GRINDER9");
 
-    private static CustomIcon frontFace_0 = (GT8_1);
-    private static CustomIcon frontFaceActive_0 = (GT8_1_Active);
-    private static CustomIcon frontFace_1 = (GT8_2);
-    private static CustomIcon frontFaceActive_1 = (GT8_2_Active);
-    private static CustomIcon frontFace_2 = (GT8_3);
-    private static CustomIcon frontFaceActive_2 = (GT8_3_Active);
-    private static CustomIcon frontFace_3 = (GT8_4);
-    private static CustomIcon frontFaceActive_3 = (GT8_4_Active);
-    private static CustomIcon frontFace_4 = (GT8_5);
-    private static CustomIcon frontFaceActive_4 = (GT8_5_Active);
-    private static CustomIcon frontFace_5 = (GT8_6);
-    private static CustomIcon frontFaceActive_5 = (GT8_6_Active);
-    private static CustomIcon frontFace_6 = (GT8_7);
-    private static CustomIcon frontFaceActive_6 = (GT8_7_Active);
-    private static CustomIcon frontFace_7 = (GT8_8);
-    private static CustomIcon frontFaceActive_7 = (GT8_8_Active);
-    private static CustomIcon frontFace_8 = (GT8_9);
-    private static CustomIcon frontFaceActive_8 = (GT8_9_Active);
+    private static final CustomIcon frontFace_0 = (GT8_1);
+    private static final CustomIcon frontFaceActive_0 = (GT8_1_Active);
+    private static final CustomIcon frontFace_1 = (GT8_2);
+    private static final CustomIcon frontFaceActive_1 = (GT8_2_Active);
+    private static final CustomIcon frontFace_2 = (GT8_3);
+    private static final CustomIcon frontFaceActive_2 = (GT8_3_Active);
+    private static final CustomIcon frontFace_3 = (GT8_4);
+    private static final CustomIcon frontFaceActive_3 = (GT8_4_Active);
+    private static final CustomIcon frontFace_4 = (GT8_5);
+    private static final CustomIcon frontFaceActive_4 = (GT8_5_Active);
+    private static final CustomIcon frontFace_5 = (GT8_6);
+    private static final CustomIcon frontFaceActive_5 = (GT8_6_Active);
+    private static final CustomIcon frontFace_6 = (GT8_7);
+    private static final CustomIcon frontFaceActive_6 = (GT8_7_Active);
+    private static final CustomIcon frontFace_7 = (GT8_8);
+    private static final CustomIcon frontFaceActive_7 = (GT8_8_Active);
+    private static final CustomIcon frontFace_8 = (GT8_9);
+    private static final CustomIcon frontFaceActive_8 = (GT8_9_Active);
 
     CustomIcon[] GRINDER = new CustomIcon[] { frontFace_0, frontFace_1, frontFace_2, frontFace_3, frontFace_4,
         frontFace_5, frontFace_6, frontFace_7, frontFace_8 };
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java
index dea287fde6..e0acc6666d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java
@@ -383,16 +383,12 @@ public class LargeTurbineTextureHandler {
 
     public static boolean isUsingAnimatedTexture(TileEntity tTileEntity) {
         boolean aVal = true;
-        IGregTechTileEntity aTile;
-        if (tTileEntity instanceof IGregTechTileEntity) {
-            aTile = (IGregTechTileEntity) tTileEntity;
-            if (aTile != null) {
-                final IMetaTileEntity aMetaTileEntity = aTile.getMetaTileEntity();
-                if (aMetaTileEntity != null && aMetaTileEntity instanceof MTEHatchTurbine) {
-                    aVal = ((MTEHatchTurbine) aMetaTileEntity).getBaseMetaTileEntity()
-                        .isActive();
-                    // Logger.INFO("Returning "+aVal+" as Rotor Assembly controller status");
-                }
+        if (tTileEntity instanceof IGregTechTileEntity aTile) {
+            final IMetaTileEntity aMetaTileEntity = aTile.getMetaTileEntity();
+            if (aMetaTileEntity instanceof MTEHatchTurbine) {
+                aVal = aMetaTileEntity.getBaseMetaTileEntity()
+                    .isActive();
+                // Logger.INFO("Returning "+aVal+" as Rotor Assembly controller status");
             }
         }
         return aVal;
@@ -401,7 +397,7 @@ public class LargeTurbineTextureHandler {
     public static MTEHatchTurbine isTurbineHatch(final IGregTechTileEntity aTileEntity) {
         if (aTileEntity != null) {
             final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-            if (aMetaTileEntity != null && aMetaTileEntity instanceof MTEHatchTurbine) {
+            if (aMetaTileEntity instanceof MTEHatchTurbine) {
                 return (MTEHatchTurbine) aMetaTileEntity;
             }
         }