Jabel, Generic injection and mostly automatic code cleanup (#1829)

* Enable Jabel&Generic injection, fix type error caused by this

* add missing <>

* Infer generic types automatically

* Parametrize cast types

* Use enhanced for loops

* Unnecessary boxing

* Unnecessary unboxing

* Use Objects.equals

* Explicit type can be replaced with `<>`

* Collapse identical catch blocks

* Add SafeVarargs where applicable

* Anonymous type can be replaced with lambda

* Use List.sort directly

* Lambda can be a method reference

* Statement lambda can be an expression lambda

* Use string switches

* Instanceof pattern matching

* Text block can be used

* Migrate to enhanced switch

* Java style array declarations

* Unnecessary toString()

* More unnecessary String conversions

* Unnecessary modifiers

* Unnecessary semicolons

* Fix duplicate conditions

* Extract common code from if branches

* Replace switches with ifs for 1-2 cases

* Inner class may be static

* Minor performance issues

* Replace string appending in loops with string builders

* Fix IntelliJ using the wrong empty list method

* Use Long.compare

* Generic arguments: getSubItems

* Generic arguments: getSubBlocks

* Raw types warnings

* Fix remaining missing generics

* Too weak variable type leads to unnecessary cast

* Redundant type casts

* Redundant array length check

* Redundant vararg arrays

* Manual min/max implementations

* A couple missed inspections

* Goodbye explosion power ternary ladder

* Apply spotless

* Get rid of the other two big ternary ladders

* Binary search explosion power

* Don't overcomplicate things

24 files changed, 177 insertions, 230 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
index 70a03a9f03..606c0b8157 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
@@ -238,8 +238,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
                          .storage()
                          .createItemStack(GT_Utility.loadItem((NBTTagCompound) t)));
             t = aNBT.getTag("cachedItems");
-            if (t instanceof NBTTagList) {
-                NBTTagList l = (NBTTagList) t;
+            if (t instanceof NBTTagList l) {
                 for (int i = 0; i < l.tagCount(); ++i) {
                     NBTTagCompound tag = l.getCompoundTagAt(i);
                     if (!tag.hasKey("itemStack")) { // legacy #868
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java
index edcbd21b16..780a6c03de 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java
@@ -252,8 +252,7 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O
         super.loadNBTData(aNBT);
         if (GregTech_API.mAE2) {
             NBTBase t = aNBT.getTag("cachedFluids");
-            if (t instanceof NBTTagList) {
-                NBTTagList l = (NBTTagList) t;
+            if (t instanceof NBTTagList l) {
                 for (int i = 0; i < l.tagCount(); ++i) {
                     NBTTagCompound tag = l.getCompoundTagAt(i);
                     NBTTagCompound tagFluidStack = tag.getCompoundTag("fluidStack");
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
index 28caaef181..f273197026 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
@@ -59,8 +59,7 @@ public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuf
             super.onPostTick(aBaseMetaTileEntity, aTick);
             if (this.getBaseMetaTileEntity() instanceof BaseMetaTileEntity) {
                 BaseMetaTileEntity mBaseMetaTileEntity = (BaseMetaTileEntity) getBaseMetaTileEntity();
-                if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) {
-                    MetaTileEntity mMetaTileEntity = (MetaTileEntity) mBaseMetaTileEntity.getMetaTileEntity();
+                if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity mMetaTileEntity) {
                     // for (int t = 0; t < 6; t++) {
                     if (mMetaTileEntity.dechargerSlotCount() > 0
                             && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java
index 71b01f4cc2..444121cc79 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java
@@ -47,7 +47,7 @@ public class GT_MetaTileEntity_Printer extends GT_MetaTileEntity_BasicMachine {
                         tList.add(tList.get(0));
                         int i = 0;
                         for (int j = tList.size() - 1; i < j; i++) {
-                            if (GT_Utility.areStacksEqual(getInputAt(0), (ItemStack) tList.get(i))) {
+                            if (GT_Utility.areStacksEqual(getInputAt(0), tList.get(i))) {
                                 this.mOutputItems[0] = GT_Utility.copyAmount(1L, tList.get(i + 1));
                                 calculateOverclockedNess(1, 32);
                                 // In case recipe is too OP for that machine
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
index 18929fcb55..021511032b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
@@ -154,7 +154,7 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic
                     && aStack.getItem() == ItemList.Tool_DataStick.getItem()) {
                         this.ready = false;
                         GT_Utility.ItemNBT.setBookTitle(aPlayer.getCurrentEquippedItem(), "Raw Prospection Data");
-                        List<String> tStringList = new ArrayList<String>();
+                        List<String> tStringList = new ArrayList<>();
 
                         // range by tier
                         int min = -range();
@@ -238,26 +238,20 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic
     }
 
     private int range() {
-        switch (mTier) {
-            case 1:
-                return 16;
-            case 2:
-                return 32;
-            case 3:
-                return 48;
-        }
-        return 0;
+        return switch (mTier) {
+            case 1 -> 16;
+            case 2 -> 32;
+            case 3 -> 48;
+            default -> 0;
+        };
     }
 
     private int step() {
-        switch (mTier) {
-            case 1:
-                return 1;
-            case 2:
-                return 3;
-            case 3:
-                return 4;
-        }
-        return 1;
+        return switch (mTier) {
+            case 1 -> 1;
+            case 2 -> 3;
+            case 3 -> 4;
+            default -> 1;
+        };
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
index 210c55578f..08b5897298 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
@@ -111,8 +111,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
         if ((aEntity instanceof EntityWeatherEffect)) {
             return -1.0F;
         }
-        if ((aEntity instanceof EntityPlayer)) {
-            EntityPlayer tPlayer = (EntityPlayer) aEntity;
+        if ((aEntity instanceof EntityPlayer tPlayer)) {
             int tCount = 64;
             for (int i = 0; i < 36; i++) {
                 if (tPlayer.inventory.getStackInSlot(i) != null) {
@@ -366,32 +365,31 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
                             }
                         }
                     }
-                    List entities_in_box = getBaseMetaTileEntity().getWorld()
-                                                                  .getEntitiesWithinAABB(
-                                                                          Entity.class,
-                                                                          AxisAlignedBB.getBoundingBox(
-                                                                                  getBaseMetaTileEntity().getOffsetX(
-                                                                                          getBaseMetaTileEntity().getFrontFacing(),
-                                                                                          2) - 1,
-                                                                                  getBaseMetaTileEntity().getOffsetY(
-                                                                                          getBaseMetaTileEntity().getFrontFacing(),
-                                                                                          2) - 1,
-                                                                                  getBaseMetaTileEntity().getOffsetZ(
-                                                                                          getBaseMetaTileEntity().getFrontFacing(),
-                                                                                          2) - 1,
-                                                                                  getBaseMetaTileEntity().getOffsetX(
-                                                                                          getBaseMetaTileEntity().getFrontFacing(),
-                                                                                          2) + 2,
-                                                                                  getBaseMetaTileEntity().getOffsetY(
-                                                                                          getBaseMetaTileEntity().getFrontFacing(),
-                                                                                          2) + 2,
-                                                                                  getBaseMetaTileEntity().getOffsetZ(
-                                                                                          getBaseMetaTileEntity().getFrontFacing(),
-                                                                                          2) + 2));
+                    List<Entity> entities_in_box = getBaseMetaTileEntity().getWorld()
+                                                                          .getEntitiesWithinAABB(
+                                                                                  Entity.class,
+                                                                                  AxisAlignedBB.getBoundingBox(
+                                                                                          getBaseMetaTileEntity().getOffsetX(
+                                                                                                  getBaseMetaTileEntity().getFrontFacing(),
+                                                                                                  2) - 1,
+                                                                                          getBaseMetaTileEntity().getOffsetY(
+                                                                                                  getBaseMetaTileEntity().getFrontFacing(),
+                                                                                                  2) - 1,
+                                                                                          getBaseMetaTileEntity().getOffsetZ(
+                                                                                                  getBaseMetaTileEntity().getFrontFacing(),
+                                                                                                  2) - 1,
+                                                                                          getBaseMetaTileEntity().getOffsetX(
+                                                                                                  getBaseMetaTileEntity().getFrontFacing(),
+                                                                                                  2) + 2,
+                                                                                          getBaseMetaTileEntity().getOffsetY(
+                                                                                                  getBaseMetaTileEntity().getFrontFacing(),
+                                                                                                  2) + 2,
+                                                                                          getBaseMetaTileEntity().getOffsetZ(
+                                                                                                  getBaseMetaTileEntity().getFrontFacing(),
+                                                                                                  2) + 2));
 
                     for (Object tObject : entities_in_box) {
-                        if (((tObject instanceof Entity)) && (!((Entity) tObject).isDead)) {
-                            Entity tEntity = (Entity) tObject;
+                        if (((tObject instanceof Entity tEntity)) && (!((Entity) tObject).isDead)) {
                             // GT_FML_LOGGER.info("teleport"+(Math.pow(tDistance, 1.5)));
                             if (getBaseMetaTileEntity().decreaseStoredEnergyUnits(
                                     (long) (Math.pow(tDistance, 1.5) * weightCalculation(tEntity) * sFPowerMultiplyer),
diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java
index 7d8ae980cd..898d819109 100644
--- a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java
@@ -240,8 +240,7 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
                     // It's not a block - let's see if it's a tile entity
                     TileEntity tTileEntity = world.getTileEntity(aCoords.posX, aCoords.posY, aCoords.posZ);
                     if (tTileEntity != gtTile && tTileEntity instanceof BaseMetaTileEntity
-                            && ((BaseMetaTileEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaTileEntity_LongDistancePipelineBase) {
-                        final GT_MetaTileEntity_LongDistancePipelineBase tGtTile = (GT_MetaTileEntity_LongDistancePipelineBase) ((BaseMetaTileEntity) tTileEntity).getMetaTileEntity();
+                            && ((BaseMetaTileEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaTileEntity_LongDistancePipelineBase tGtTile) {
                         if (isSameClass(tGtTile) && tWires.contains(
                                 tGtTile.getFacingOffset(
                                         (BaseMetaTileEntity) tTileEntity,
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
index 54551473f3..dbd24fb012 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
@@ -379,9 +379,7 @@ public class GT_MetaTileEntity_AssemblyLine extends
                 if (!isValidMetaTileEntity(mInputHatches.get(i))) {
                     continue nextDataStick;
                 } else {
-                    if (mInputHatches.get(i) instanceof GT_MetaTileEntity_Hatch_MultiInput) {
-                        GT_MetaTileEntity_Hatch_MultiInput tMultiHatch = (GT_MetaTileEntity_Hatch_MultiInput) mInputHatches.get(
-                                i);
+                    if (mInputHatches.get(i) instanceof GT_MetaTileEntity_Hatch_MultiInput tMultiHatch) {
                         if (!tMultiHatch.hasFluid(tRecipe.mFluidInputs[i])
                                 || tMultiHatch.getFluidAmount(tRecipe.mFluidInputs[i])
                                         < tRecipe.mFluidInputs[i].amount) {
@@ -437,9 +435,7 @@ public class GT_MetaTileEntity_AssemblyLine extends
         }
 
         for (int i = 0; i < tFluids.length; i++) {
-            if (mInputHatches.get(i) instanceof GT_MetaTileEntity_Hatch_MultiInput) {
-                GT_MetaTileEntity_Hatch_MultiInput tMultiHatch = (GT_MetaTileEntity_Hatch_MultiInput) mInputHatches.get(
-                        i);
+            if (mInputHatches.get(i) instanceof GT_MetaTileEntity_Hatch_MultiInput tMultiHatch) {
                 tMultiHatch.getFluid(tFluidSlot[i]).amount -= tFluids[i];
                 if (tMultiHatch.getFluid(tFluidSlot[i]).amount <= 0) {
                     tMultiHatch.setFluid(null, tFluidSlot[i]);
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
index f445d5fea1..7e6ff95da1 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
@@ -46,7 +46,7 @@ public class GT_MetaTileEntity_DieselEngine extends
         GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_DieselEngine> implements ISurvivalConstructable {
 
     private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_DieselEngine>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_DieselEngine>>() {
+    private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_DieselEngine>> STRUCTURE_DEFINITION = new ClassValue<>() {
 
         @Override
         protected IStructureDefinition<GT_MetaTileEntity_DieselEngine> computeValue(Class<?> type) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
index eb5adfbd3c..716634998f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
@@ -268,30 +268,28 @@ public class GT_MetaTileEntity_DistillationTower
         long tVoltage = getMaxInputVoltage();
         byte tTier = (byte) Math.max(0, GT_Utility.getTier(tVoltage));
         FluidStack[] tFluids = tFluidList.toArray(new FluidStack[0]);
-        if (tFluids.length > 0) {
-            for (FluidStack tFluid : tFluids) {
-                tRecipe = GT_Recipe.GT_Recipe_Map.sDistillationRecipes.findRecipe(
-                        getBaseMetaTileEntity(),
-                        false,
-                        gregtech.api.enums.GT_Values.V[tTier],
-                        new FluidStack[] { tFluid },
-                        inputs);
-                if (tRecipe != null) {
-                    if (tRecipe.isRecipeInputEqual(true, tFluids, inputs)) {
-                        this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
-                        this.mEfficiencyIncrease = 10000;
-                        calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage);
-                        // In case recipe is too OP for that machine
-                        if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) return false;
-                        if (this.mEUt > 0) {
-                            this.mEUt = (-this.mEUt);
-                        }
-                        this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
-                        this.mOutputItems = new ItemStack[] { tRecipe.getOutput(0) };
-                        this.mOutputFluids = tRecipe.mFluidOutputs.clone();
-                        updateSlots();
-                        return true;
+        for (FluidStack tFluid : tFluids) {
+            tRecipe = GT_Recipe.GT_Recipe_Map.sDistillationRecipes.findRecipe(
+                    getBaseMetaTileEntity(),
+                    false,
+                    gregtech.api.enums.GT_Values.V[tTier],
+                    new FluidStack[] { tFluid },
+                    inputs);
+            if (tRecipe != null) {
+                if (tRecipe.isRecipeInputEqual(true, tFluids, inputs)) {
+                    this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
+                    this.mEfficiencyIncrease = 10000;
+                    calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage);
+                    // In case recipe is too OP for that machine
+                    if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) return false;
+                    if (this.mEUt > 0) {
+                        this.mEUt = (-this.mEUt);
                     }
+                    this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
+                    this.mOutputItems = new ItemStack[] { tRecipe.getOutput(0) };
+                    this.mOutputFluids = tRecipe.mFluidOutputs.clone();
+                    updateSlots();
+                    return true;
                 }
             }
         }
@@ -316,10 +314,9 @@ public class GT_MetaTileEntity_DistillationTower
 
     protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
         if (aTileEntity == null || aTileEntity.isDead()
-                || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output))
+                || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output tHatch))
             return false;
         while (mOutputHatchesByLayer.size() < mHeight) mOutputHatchesByLayer.add(new ArrayList<>());
-        GT_MetaTileEntity_Hatch_Output tHatch = (GT_MetaTileEntity_Hatch_Output) aTileEntity.getMetaTileEntity();
         tHatch.updateTexture(aBaseCasingIndex);
         return mOutputHatchesByLayer.get(mHeight - 1)
                                     .add(tHatch);
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
index a0c62ae2a7..f7993fd2f4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
@@ -58,7 +58,7 @@ public abstract class GT_MetaTileEntity_DrillerBase
     private static final Block miningPipeBlock = GT_Utility.getBlockFromStack(miningPipe);
     private static final Block miningPipeTipBlock = GT_Utility.getBlockFromStack(miningPipeTip);
     protected static final String STRUCTURE_PIECE_MAIN = "main";
-    protected static final ClassValue<IStructureDefinition<GT_MetaTileEntity_DrillerBase>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_DrillerBase>>() {
+    protected static final ClassValue<IStructureDefinition<GT_MetaTileEntity_DrillerBase>> STRUCTURE_DEFINITION = new ClassValue<>() {
 
         @Override
         protected IStructureDefinition<GT_MetaTileEntity_DrillerBase> computeValue(Class<?> type) {
@@ -252,7 +252,7 @@ public abstract class GT_MetaTileEntity_DrillerBase
 
     /**
      * Added for compability reasons
-     * 
+     *
      * @return true if the state is 0 false otherwise.
      * @deprecated compatibility reason
      */
@@ -274,10 +274,12 @@ public abstract class GT_MetaTileEntity_DrillerBase
     protected int tryLowerPipeState(boolean isSimulating) {
         if (!isHasMiningPipes()) return 2;
         switch (canLowerPipe()) {
-            case 1:
+            case 1 -> {
                 return 1;
-            case 2:
+            }
+            case 2 -> {
                 return 3;
+            }
         }
 
         Block b = getBaseMetaTileEntity().getBlock(xPipe, yHead - 1, zPipe);
@@ -375,30 +377,32 @@ public abstract class GT_MetaTileEntity_DrillerBase
     protected boolean workingDownward(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe,
             int yHead, int oldYHead) {
         switch (tryLowerPipeState()) {
-            case 2:
+            case 2 -> {
                 mMaxProgresstime = 0;
                 return false;
-            case 3:
+            }
+            case 3 -> {
                 workState = STATE_UPWARD;
                 return true;
-            case 1:
+            }
+            case 1 -> {
                 workState = STATE_AT_BOTTOM;
                 return true;
-            default:
+            }
+            default -> {
                 return true;
+            }
         }
     }
 
     protected boolean workingAtBottom(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe,
             int yHead, int oldYHead) {
-        switch (tryLowerPipeState(true)) {
-            case 0:
-                workState = STATE_DOWNWARD;
-                return true;
-            default:
-                workState = STATE_UPWARD;
-                return true;
+        if (tryLowerPipeState(true) == 0) {
+            workState = STATE_DOWNWARD;
+            return true;
         }
+        workState = STATE_UPWARD;
+        return true;
     }
 
     protected boolean workingUpward(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe,
@@ -422,16 +426,12 @@ public abstract class GT_MetaTileEntity_DrillerBase
             return false;
         }
         putMiningPipesFromInputsInController();
-        switch (workState) {
-            case STATE_DOWNWARD:
-                return workingDownward(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead);
-            case STATE_AT_BOTTOM:
-                return workingAtBottom(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead);
-            case STATE_UPWARD:
-                return workingUpward(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead);
-            default:
-                return false;
-        }
+        return switch (workState) {
+            case STATE_DOWNWARD -> workingDownward(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead);
+            case STATE_AT_BOTTOM -> workingAtBottom(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead);
+            case STATE_UPWARD -> workingUpward(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead);
+            default -> false;
+        };
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
index 869e1b53f8..73b26c6a59 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
@@ -62,7 +62,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
     protected FusionPower power;
 
     public static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_FusionComputer>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_FusionComputer>>() {
+    private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_FusionComputer>> STRUCTURE_DEFINITION = new ClassValue<>() {
 
         @Override
         protected IStructureDefinition<GT_MetaTileEntity_FusionComputer> computeValue(Class<?> type) {
@@ -239,8 +239,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
     private boolean addEnergyInjector(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) {
         IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy)) return false;
-        GT_MetaTileEntity_Hatch_Energy tHatch = (GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity;
+        if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy tHatch)) return false;
         if (tHatch.mTier < tier()) return false;
         tHatch.updateTexture(aBaseCasingIndex);
         return mEnergyHatches.add(tHatch);
@@ -249,8 +248,7 @@ public abstract class GT_MetaTileEntity_FusionComputer
     private boolean addInjector(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) {
         IMetaTileEntity a