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>

13 files changed, 50 insertions, 85 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
index 6a8b3a9af6..68aaa75aa1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
@@ -150,7 +150,7 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE
     }
 
     public ArrayList<ItemStack> getInventory() {
-        ArrayList<ItemStack> aContents = new ArrayList<ItemStack>();
+        ArrayList<ItemStack> aContents = new ArrayList<>();
         for (int i = getBaseMetaTileEntity().getSizeInventory() - 2; i >= 0; i--) {
             if (getBaseMetaTileEntity().getStackInSlot(i) != null)
                 aContents.add(getBaseMetaTileEntity().getStackInSlot(i));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
index 1fca67d295..254c81a515 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
@@ -128,8 +128,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc
             fillStacksIntoFirstSlots();
         }
         if (aBaseMetaTileEntity.isServerSide()) {
-            if (aBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) {
-                MetaTileEntity mMetaTileEntity = (MetaTileEntity) aBaseMetaTileEntity.getMetaTileEntity();
+            if (aBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity mMetaTileEntity) {
                 if (mMetaTileEntity.rechargerSlotCount() > 0 && aBaseMetaTileEntity.getStoredEU() > 0) {
                     for (int i = mMetaTileEntity.rechargerSlotStartIndex(),
                             k = mMetaTileEntity.rechargerSlotCount() + i; i < k; i++) {
@@ -149,11 +148,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc
                             }
                         }
                     }
-                } else {
-                    // Utils.LOG_INFO("reCharger Slot Count = "+mMetaTileEntity.rechargerSlotCount());
-                    // Utils.LOG_INFO("getStoredEU = "+aBaseMetaTileEntity.getStoredEU());
-                    // Utils.LOG_INFO("getEUVar = "+mMetaTileEntity.getEUVar());
-                }
+                } else {}
             }
         }
         super.onPostTick(aBaseMetaTileEntity, aTimer);
@@ -202,14 +197,11 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc
 
     @Override
     public int rechargerSlotCount() {
-        switch (mTier) {
-            case 2:
-                return 4;
-            case 4:
-                return 16;
-            default:
-                return 16;
-        }
+        return switch (mTier) {
+            case 2 -> 4;
+            case 4 -> 16;
+            default -> 16;
+        };
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
index d8ec187fff..8c0ebe60e9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
@@ -195,10 +195,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
             // return;
         } else {
             // Logger.INFO("B2");
-            if (this.getInventoryStack() == null) {
-                // Logger.INFO("D1");
-                // Logger.INFO("Empty - "+this.mInventory.length);
-            } else {
+            if (this.getInventoryStack() == null) {} else {
                 // Logger.INFO("D2");
             }
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
index 502dd0ee0b..f70be9aa89 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
@@ -174,8 +174,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat
         }
 
         if (aBaseMetaTileEntity.isServerSide()) {
-            if (aBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) {
-                MetaTileEntity mMetaTileEntity = (MetaTileEntity) aBaseMetaTileEntity.getMetaTileEntity();
+            if (aBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity mMetaTileEntity) {
                 if (mMetaTileEntity.dechargerSlotCount() > 0
                         && mMetaTileEntity.getEUVar() < aBaseMetaTileEntity.getEUCapacity()) {
                     for (int i = mMetaTileEntity.dechargerSlotStartIndex(),
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
index e8ef0a454b..0d307f6e0f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
@@ -30,7 +30,6 @@ import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase;
@@ -172,7 +171,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
         }
     }
 
-    private final int getDamageToComponent(ItemStack aStack) {
+    private int getDamageToComponent(ItemStack aStack) {
         return 1;
     }
 
@@ -334,7 +333,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
                 PlayerUtils.messagePlayer(aPlayer, "Using: " + aMat.mLocalizedName + " " + aSize);
             }
         } else {
-            this.mUsingAnimation = Utils.invertBoolean(mUsingAnimation);
+            this.mUsingAnimation = !mUsingAnimation;
             if (this.mUsingAnimation) {
                 PlayerUtils.messagePlayer(aPlayer, "Using Animated Turbine Texture.");
             } else {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java
index 226086a1ff..e6cb5f8132 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java
@@ -20,7 +20,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input
 import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase;
@@ -64,20 +63,18 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H
         }
     }
 
-    private final void tryFindParentTurbine() {
+    private void tryFindParentTurbine() {
         Logger.INFO("This turbine housing has no parent, searching world.");
         IGregTechTileEntity T = this.getBaseMetaTileEntity();
         World W = T.getWorld();
         Chunk C = W.getChunkFromBlockCoords(T.getXCoord(), T.getZCoord());
         for (Object o : C.chunkTileEntityMap.values()) {
-            if (o instanceof IGregTechTileEntity) {
-                IGregTechTileEntity G = (IGregTechTileEntity) o;
+            if (o instanceof IGregTechTileEntity G) {
                 final IMetaTileEntity aMetaTileEntity = G.getMetaTileEntity();
                 if (aMetaTileEntity == null) {
                     continue;
                 }
-                if (aMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine) {
-                    GT_MetaTileEntity_LargeTurbine aTurb = (GT_MetaTileEntity_LargeTurbine) aMetaTileEntity;
+                if (aMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine aTurb) {
                     for (GT_MetaTileEntity_Hatch_InputBus ee : aTurb.mInputBusses) {
                         if (ee.equals(this)) {
                             mParent = aTurb;
@@ -90,7 +87,7 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H
         }
     }
 
-    private final void tryRefillTurbine() {
+    private void tryRefillTurbine() {
         if (mParent == null) {
             tryFindParentTurbine();
         }
@@ -166,7 +163,7 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H
     public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aPlayer != null) {
             if (KeyboardUtils.isCtrlKeyDown()) {
-                mDescending = Utils.invertBoolean(mDescending);
+                mDescending = !mDescending;
                 PlayerUtils.messagePlayer(aPlayer, "Direction: " + (mDescending ? "DOWN" : "UP"));
             } else {
                 int aAmount = 0;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java
index a9dd8d3a97..3701f5dd0f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java
@@ -12,7 +12,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 
 public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer {
@@ -108,11 +107,10 @@ public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer
 
     @Override
     public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        this.mHalfMode = Utils.invertBoolean(mHalfMode);
+        this.mHalfMode = !mHalfMode;
         if (this.mHalfMode) {
             PlayerUtils.messagePlayer(aPlayer, "Transformer is now running at 2A:8A in/out Ratio.");
         } else {
-
             PlayerUtils.messagePlayer(aPlayer, "Transformer is now running at 4A:16A in/out Ratio.");
         }
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index fe394238a6..01e0f731f6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -561,35 +561,29 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
     public boolean causeMaintenanceIssue() {
         boolean b = false;
         switch (this.getBaseMetaTileEntity().getRandomNumber(6)) {
-            case 0: {
+            case 0 -> {
                 this.mWrench = false;
                 b = true;
-                break;
             }
-            case 1: {
+            case 1 -> {
                 this.mScrewdriver = false;
                 b = true;
-                break;
             }
-            case 2: {
+            case 2 -> {
                 this.mSoftHammer = false;
                 b = true;
-                break;
             }
-            case 3: {
+            case 3 -> {
                 this.mHardHammer = false;
                 b = true;
-                break;
             }
-            case 4: {
+            case 4 -> {
                 this.mSolderingTool = false;
                 b = true;
-                break;
             }
-            case 5: {
+            case 5 -> {
                 this.mCrowbar = false;
                 b = true;
-                break;
             }
         }
         return b;
@@ -1018,8 +1012,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         if (aMetaTileEntity == null) {
             return false;
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) {
-            GT_MetaTileEntity_Hatch aHatch = (GT_MetaTileEntity_Hatch) aMetaTileEntity;
+        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch aHatch) {
             return mAllDynamoHatches.add(aHatch);
         }
         return false;
@@ -1072,8 +1065,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         if (aMetaTileEntity == null) {
             return false;
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) {
-            GT_MetaTileEntity_Hatch aHatch = (GT_MetaTileEntity_Hatch) aMetaTileEntity;
+        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch aHatch) {
             return mAllEnergyHatches.add(aHatch);
         }
         return false;
@@ -1209,7 +1201,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         tryTickWaitTimerDown();
     }
 
-    private final void tryTickWaitTimerDown() {
+    private void tryTickWaitTimerDown() {
         /*
          * if (mStartUpCheck > 10) { mStartUpCheck = 10; }
          */
@@ -1251,7 +1243,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
     public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiPredicate<T, Integer> aSetTheMeta,
             Function<T, Integer> aGetTheMeta, int minMeta, int maxMeta) {
 
-        return new IStructureElement<T>() {
+        return new IStructureElement<>() {
 
             @Override
             public boolean check(T t, World world, int x, int y, int z) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
index cd23f036da..d4db6b1350 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
@@ -32,9 +32,9 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEn
 public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMultiBase<T>>
         extends GregtechMeta_MultiBlockBase<T> {
 
-    public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput> mSteamInputs = new ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput>();
-    public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput> mSteamOutputs = new ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput>();
-    public ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mSteamInputFluids = new ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase>();
+    public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput> mSteamInputs = new ArrayList<>();
+    public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput> mSteamOutputs = new ArrayList<>();
+    public ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mSteamInputFluids = new ArrayList<>();
 
     protected static final String TT_steaminputbus = StatCollector.translateToLocal("GTPP.MBTT.SteamInputBus");
     protected static final String TT_steamoutputbus = StatCollector.translateToLocal("GTPP.MBTT.SteamOutputBus");
@@ -80,7 +80,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
     }
 
     public ArrayList<FluidStack> getAllSteamStacks() {
-        ArrayList<FluidStack> aFluids = new ArrayList<FluidStack>();
+        ArrayList<FluidStack> aFluids = new ArrayList<>();
         FluidStack aSteam = FluidUtils.getSteam(1);
         for (FluidStack aFluid : this.getStoredFluids()) {
             if (aFluid.isFluidEqual(aSteam)) {
@@ -231,7 +231,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
 
     @Override
     public ArrayList<FluidStack> getStoredFluids() {
-        ArrayList<FluidStack> rList = new ArrayList<FluidStack>();
+        ArrayList<FluidStack> rList = new ArrayList<>();
         for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : mSteamInputFluids) {
             if (isValidMetaTileEntity(tHatch) && tHatch.getFillableStack() != null) {
                 rList.add(tHatch.getFillableStack());
@@ -242,7 +242,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
 
     @Override
     public ArrayList<ItemStack> getStoredInputs() {
-        ArrayList<ItemStack> rList = new ArrayList<ItemStack>();
+        ArrayList<ItemStack> rList = new ArrayList<>();
         for (GT_MetaTileEntity_Hatch_Steam_BusInput tHatch : mSteamInputs) {
             tHatch.mRecipeMap = getRecipeMap();
             if (isValidMetaTileEntity(tHatch)) {
@@ -282,7 +282,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
 
     @Override
     public ArrayList<ItemStack> getStoredOutputs() {
-        ArrayList<ItemStack> rList = new ArrayList<ItemStack>();
+        ArrayList<ItemStack> rList = new ArrayList<>();
         for (GT_MetaTileEntity_Hatch_Steam_BusOutput tHatch : mSteamOutputs) {
             if (isValidMetaTileEntity(tHatch)) {
                 for (int i = tHatch.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
index 0200113e95..cab45a9a7b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
@@ -319,10 +319,6 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
                         // Logger.INFO("Found some fuel?");
                         int aperOp = this.consumedFluidPerOperation(tLiquid);
                         int aConsume = (int) (((long) tFuel.mSpecialValue * this.getEfficiency() * aperOp) / 100);
-                        // Logger.INFO("Fuel Value: "+tFuel.mSpecialValue);
-                        // Logger.INFO("Efficiency: "+getEfficiency());
-                        // Logger.INFO("Consumed per op: "+aperOp);
-                        // Logger.INFO("Consuming "+aConsume);
                         return aConsume;
                     }
                 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
index 9bf0ad3f53..b53e540044 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
@@ -56,7 +56,7 @@ public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_N
 
     @Override
     public AutoMap<ItemStack> getItemsValidForUsageSlots() {
-        return new AutoMap<ItemStack>();
+        return new AutoMap<>();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
index 240ed3624f..e3134f5812 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
@@ -56,7 +56,7 @@ public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatc
 
     @Override
     public AutoMap<ItemStack> getItemsValidForUsageSlots() {
-        return new AutoMap<ItemStack>();
+        return new AutoMap<>();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java
index 5555d1ff09..53c988676f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java
@@ -169,7 +169,7 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE
     }
 
     public final AutoMap<ItemStack> getContentUsageSlots() {
-        AutoMap<ItemStack> aItems = new AutoMap<ItemStack>();
+        AutoMap<ItemStack> aItems = new AutoMap<>();
         for (int i = mInputslotCount; i < mTotalSlotCount; i++) {
             if (mInventory[i] != null) {
                 aItems.add(mInventory[i]);
@@ -279,24 +279,19 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE
     @Override
     public void addGregTechLogo(ModularWindow.Builder builder) {
         switch (mTotalSlotCount) {
-            case 8:
-            case 18:
-                builder.widget(
-                        new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17)
-                                .setPos(152, 63));
-                break;
-            case 32:
-                builder.widget(
-                        new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17)
-                                .setPos(79, 35));
-                break;
+            case 8, 18 -> builder.widget(
+                    new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17)
+                            .setPos(152, 63));
+            case 32 -> builder.widget(
+                    new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17)
+                            .setPos(79, 35));
         }
     }
 
     @Override
     public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
         switch (mTotalSlotCount) {
-            case 8:
+            case 8 -> {
                 builder.widget(
                         SlotGroup.ofItemHandler(inventoryHandler, 2).startFromSlot(0).endAtSlot(3).build()
                                 .setPos(25, 25));
@@ -305,8 +300,8 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE
                                 .build().setPos(115, 25));
                 builder.widget(new TextWidget("Stock").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(25, 16))
                         .widget(new TextWidget("Active").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(115, 16));
-                break;
-            case 18:
+            }
+            case 18 -> {
                 builder.widget(
                         SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(0).endAtSlot(8).build()
                                 .setPos(25, 19));
@@ -315,15 +310,15 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE
                                 .build().setPos(97, 19));
                 builder.widget(new TextWidget("Stock").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(25, 14))
                         .widget(new TextWidget("Active").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(15, 14));
-                break;
-            case 32:
+            }
+            case 32 -> {
                 builder.widget(
                         SlotGroup.ofItemHandler(inventoryHandler, 4).startFromSlot(0).endAtSlot(15).build()
                                 .setPos(7, 7));
                 builder.widget(
                         SlotGroup.ofItemHandler(inventoryHandler, 4).startFromSlot(16).endAtSlot(31).canInsert(false)
                                 .build().setPos(96, 7));
-                break;
+            }
         }
     }
 }