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

31 files changed, 238 insertions, 336 deletions

diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java
index 00f1700d98..60500310e0 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java
@@ -48,8 +48,7 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil
     public void clickTypeIcon(boolean aRightClick, ItemStack aHandStack) {
         if (!aRightClick) {
             IMetaTileEntity mte = GT_Item_Machines.getMetaTileEntity(aHandStack);
-            if (mte instanceof GT_MetaTileEntity_BasicMachine) {
-                GT_MetaTileEntity_BasicMachine machine = (GT_MetaTileEntity_BasicMachine) mte;
+            if (mte instanceof GT_MetaTileEntity_BasicMachine machine) {
                 GT_Recipe.GT_Recipe_Map recipeList = machine.getRecipeList();
                 if (recipeList != null) {
                     mInventory[SPECIAL_SLOT_INDEX] = machine.getStackForm(1);
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
index b6b293d8d1..0f03f6bee4 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
@@ -192,8 +192,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
         if (fillableAmount <= 0) return null;
 
         final Item containerItem = SourceItemStack.getItem();
-        if (containerItem instanceof IFluidContainerItem) {
-            IFluidContainerItem equippedIFluidContainerItem = (IFluidContainerItem) containerItem;
+        if (containerItem instanceof IFluidContainerItem equippedIFluidContainerItem) {
             destinationIFluidTank.fill(equippedIFluidContainerItem.drain(SourceItemStack, fillableAmount, true), true);
             return null;
         } else {
@@ -341,22 +340,22 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
                 y = oY + XSTR_INSTANCE.nextFloat() * 6D / 16D;
 
                 switch (frontDirection) {
-                    case WEST:
+                    case WEST -> {
                         x = oX - offset;
                         z = oZ + horizontal;
-                        break;
-                    case EAST:
+                    }
+                    case EAST -> {
                         x = oX + offset;
                         z = oZ + horizontal;
-                        break;
-                    case NORTH:
+                    }
+                    case NORTH -> {
                         x = oX + horizontal;
                         z = oZ - offset;
-                        break;
-                    default: // case SOUTH:
+                    }
+                    default -> { // case SOUTH:
                         x = oX + horizontal;
                         z = oZ + offset;
-                        break;
+                    }
                 }
 
                 ParticleEventBuilder particleEventBuilder = (new ParticleEventBuilder()).setMotion(0D, 0D, 0D)
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
index 42e0fc6117..67e821f636 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
@@ -24,7 +24,7 @@ public class GT_MetaTileEntity_Boiler_Steel extends GT_MetaTileEntity_Boiler_Bro
                 aName,
                 aNameRegional,
                 new String[] { "Faster than the Bronze Boiler", "Produces 300L of Steam per second",
-                        "Causes " + Integer.toString(GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond)
+                        "Causes " + GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond
                                 + " Pollution per second" });
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
index 491eeea306..391a212115 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
@@ -658,7 +658,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
         MagicalEnergyBB(GT_MetaTileEntity_MagicalEnergyAbsorber aAbsorber, int aDefaultTier, int aMaxTier) {
             mAbsorber = aAbsorber;
             mListener = aAbsorber;
-            mMaxTier = Math.max(aMaxTier > 0 ? aMaxTier : 0, aDefaultTier > 0 ? aDefaultTier : 0);
+            mMaxTier = Math.max(Math.max(aMaxTier, 0), Math.max(aDefaultTier, 0));
             mDefaultTier = Math.min(aDefaultTier, mMaxTier);
             mTier = mDefaultTier;
             if (THAUMCRAFT_LOADED) mAvailableAspects = new ArrayList<>(Aspect.aspects.size());
@@ -676,11 +676,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
          */
         int setTier(int aTier) {
             if (aTier >= 0) {
-                if (aTier <= mMaxTier) {
-                    mTier = aTier;
-                } else {
-                    mTier = mMaxTier;
-                }
+                mTier = Math.min(aTier, mMaxTier);
             } else {
                 mTier = 0;
             }
@@ -730,9 +726,9 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
             World tWorld = mAbsorber.getBaseMetaTileEntity()
                                     .getWorld();
             mLivingCrystalIDs.clear();
-            for (Object o : tWorld.getEntitiesWithinAABB(EntityEnderCrystal.class, getAxisAlignedBB())) {
-                if (((EntityEnderCrystal) o).isEntityAlive()) {
-                    mLivingCrystalIDs.add(((EntityEnderCrystal) o).getPersistentID());
+            for (EntityEnderCrystal o : tWorld.getEntitiesWithinAABB(EntityEnderCrystal.class, getAxisAlignedBB())) {
+                if (o.isEntityAlive()) {
+                    mLivingCrystalIDs.add(o.getPersistentID());
                 }
             }
         }
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java
index 615f512ff0..b81b0b956b 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java
@@ -47,29 +47,23 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe
     public GT_Recipe.GT_Recipe_Map getRecipes() {
         GT_Recipe.GT_Recipe_Map ret;
         switch (mTier) {
-            case 4: {
+            case 4 -> {
                 ret = GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels;
-                break;
             }
-            case 5: {
+            case 5 -> {
                 ret = GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels;
-                break;
             }
-            case 6: {
+            case 6 -> {
                 ret = GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels;
-                break;
             }
-            case 7: {
+            case 7 -> {
                 ret = GT_Recipe.GT_Recipe_Map.sExtremeNaquadahReactorFuels;
-                break;
             }
-            case 8: {
+            case 8 -> {
                 ret = GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels;
-                break;
             }
-            default: {
+            default -> {
                 ret = null;
-                break;
             }
         }
         return ret;
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