Cleanup the codebase (#3311)

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

6 files changed, 26 insertions, 42 deletions

diff --git a/src/main/java/gtnhlanth/common/tileentity/MTELINAC.java b/src/main/java/gtnhlanth/common/tileentity/MTELINAC.java
index b7902c5d24..652529c303 100644
--- a/src/main/java/gtnhlanth/common/tileentity/MTELINAC.java
+++ b/src/main/java/gtnhlanth/common/tileentity/MTELINAC.java
@@ -69,8 +69,8 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> implements ISu
 
     private int machineTemp = 0; // Coolant temperature
 
-    private ArrayList<MTEHatchInputBeamline> mInputBeamline = new ArrayList<>();
-    private ArrayList<MTEHatchOutputBeamline> mOutputBeamline = new ArrayList<>();
+    private final ArrayList<MTEHatchInputBeamline> mInputBeamline = new ArrayList<>();
+    private final ArrayList<MTEHatchOutputBeamline> mOutputBeamline = new ArrayList<>();
 
     private static final int CASING_INDEX = GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings5, 14);
 
@@ -276,7 +276,7 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> implements ISu
         outputRate = 0;
 
         ArrayList<FluidStack> tFluidInputs = this.getStoredFluids();
-        if (tFluidInputs.size() == 0) {
+        if (tFluidInputs.isEmpty()) {
             this.doRandomMaintenanceDamage(); // Penalise letting coolant run dry
             this.stopMachine(SimpleShutDownReason.ofCritical("gtnhlanth.nocoolant"));
             return false;
@@ -490,7 +490,7 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> implements ISu
                 + StatCollector.translateToLocal("GT5U.multiblock.efficiency")
                 + ": "
                 + EnumChatFormatting.YELLOW
-                + Float.toString(mEfficiency / 100.0F)
+                + mEfficiency / 100.0F
                 + EnumChatFormatting.RESET
                 + " %",
 
@@ -569,9 +569,7 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> implements ISu
     }
 
     private static float calculateTemperatureFactor(int fluidTemp) {
-
-        float factor = (float) Math.pow(1.1, 0.2 * fluidTemp);
-        return factor;
+        return (float) Math.pow(1.1, 0.2 * fluidTemp);
     }
 
     /*
@@ -612,7 +610,7 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> implements ISu
                     return false;
                 }
                 break;
-            } ;
+            }
 
             length += 2;
         }
@@ -678,7 +676,7 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> implements ISu
 
         }
 
-        int finalOutput = survivialBuildPiece(
+        return survivialBuildPiece(
             STRUCTURE_PIECE_END,
             stackSize,
             3,
@@ -688,8 +686,6 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> implements ISu
             env,
             false,
             true);
-
-        return finalOutput;
     }
 
     @Override
diff --git a/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java b/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java
index cec44a111a..3c1984171f 100644
--- a/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java
+++ b/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java
@@ -53,7 +53,7 @@ public class MTESourceChamber extends MTEEnhancedMultiBlockBase<MTESourceChamber
 
     private static final IStructureDefinition<MTESourceChamber> STRUCTURE_DEFINITION;
 
-    private ArrayList<MTEHatchOutputBeamline> mOutputBeamline = new ArrayList<>();
+    private final ArrayList<MTEHatchOutputBeamline> mOutputBeamline = new ArrayList<>();
 
     private static final int CASING_INDEX = GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings5, 14);
 
@@ -316,7 +316,7 @@ public class MTESourceChamber extends MTEEnhancedMultiBlockBase<MTESourceChamber
                 + StatCollector.translateToLocal("GT5U.multiblock.efficiency")
                 + ": "
                 + EnumChatFormatting.YELLOW
-                + Float.toString(mEfficiency / 100.0F)
+                + mEfficiency / 100.0F
                 + EnumChatFormatting.RESET
                 + " %",
             EnumChatFormatting.BOLD + StatCollector.translateToLocal("beamline.out_pre")
diff --git a/src/main/java/gtnhlanth/common/tileentity/MTESynchrotron.java b/src/main/java/gtnhlanth/common/tileentity/MTESynchrotron.java
index e5778f0efc..0aae0f0f7b 100644
--- a/src/main/java/gtnhlanth/common/tileentity/MTESynchrotron.java
+++ b/src/main/java/gtnhlanth/common/tileentity/MTESynchrotron.java
@@ -68,8 +68,8 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> im
     public static final int CONSUMED_FLUID = 32_000; // Fluid consumed per processed recipe, maybe increase with EU
     public static final int MIN_INPUT_FOCUS = 25; // Inclusive
 
-    private ArrayList<MTEHatchInputBeamline> mInputBeamline = new ArrayList<>();
-    private ArrayList<MTEHatchOutputBeamline> mOutputBeamline = new ArrayList<>();
+    private final ArrayList<MTEHatchInputBeamline> mInputBeamline = new ArrayList<>();
+    private final ArrayList<MTEHatchOutputBeamline> mOutputBeamline = new ArrayList<>();
 
     public ArrayList<BlockAntennaCasing> mAntennaCasings = new ArrayList<>();
 
@@ -624,12 +624,10 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> im
         }
         IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null) return false;
-        if (aMetaTileEntity instanceof MTEHatchEnergy) {
-
-            MTEHatchEnergy hatch = (MTEHatchEnergy) aMetaTileEntity;
+        if (aMetaTileEntity instanceof MTEHatchEnergy hatch) {
 
             // First energy hatch added
-            if (this.mEnergyHatches.size() == 0) this.energyHatchTier = hatch.mTier;
+            if (this.mEnergyHatches.isEmpty()) this.energyHatchTier = hatch.mTier;
 
             // Disallow any hatches that don't match the tier of the first hatch added
             if (hatch.mTier != this.energyHatchTier) return false;
@@ -645,14 +643,12 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> im
 
         if (block == null) return false;
 
-        if (!(block instanceof BlockAntennaCasing)) return false;
-
-        BlockAntennaCasing antennaBlock = (BlockAntennaCasing) block;
+        if (!(block instanceof BlockAntennaCasing antennaBlock)) return false;
 
         int antennaTier = antennaBlock.getTier();
 
         // First antenna casing added
-        if (this.mAntennaCasings.size() == 0) this.antennaeTier = antennaTier;
+        if (this.mAntennaCasings.isEmpty()) this.antennaeTier = antennaTier;
 
         if (antennaTier != this.antennaeTier) return false;
 
@@ -687,7 +683,7 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> im
 
         ArrayList<FluidStack> fluidList = this.getStoredFluids();
 
-        if (fluidList.size() == 0) {
+        if (fluidList.isEmpty()) {
 
             this.stopMachine(SimpleShutDownReason.ofCritical("gtnhlanth.nocoolant"));
 
@@ -857,16 +853,12 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> im
     }
 
     private static float getVoltageFactor(long mEU, int antennaTier) {
-
         // float factor = (float) Math.pow(1.00004, -mEU * Math.pow(antennaTier, 1.0/3.0) + 80000);
         // float factor = (float) -Math.pow(1.1, -mEU / 2000 * Math.pow(antennaTier, 2.0 / 3.0)) + 1; // Strictly
         // improves
         // with higher tier
         // antenna
-        float factor = (float) (Math.sqrt(mEU) / 1500);
-
-        return factor;
-
+        return (float) (Math.sqrt(mEU) / 1500);
     }
 
     /*
@@ -886,11 +878,10 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> im
          * \ +\ \frac{l^{1.11t^{\frac{1}{3}}}}{40000000}
          */
 
-        double energy = (Math.pow(inputParticleEnergy, 1.13 * Math.pow(antennaTier, 4.0 / 9.0)) / 40_000_000)
-            * (-Math.pow(Math.pow(0.15, 2.0 / (Math.pow(antennaTier, 5.0 / 2.0))), voltage / 60768.0) + 1); // In
-                                                                                                            // keV
+        // keV
 
-        return energy;
+        return (Math.pow(inputParticleEnergy, 1.13 * Math.pow(antennaTier, 4.0 / 9.0)) / 40_000_000)
+            * (-Math.pow(Math.pow(0.15, 2.0 / (Math.pow(antennaTier, 5.0 / 2.0))), voltage / 60768.0) + 1);
 
     }
 
@@ -971,7 +962,7 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> im
                 + StatCollector.translateToLocal("GT5U.multiblock.efficiency")
                 + ": "
                 + EnumChatFormatting.YELLOW
-                + Float.toString(mEfficiency / 100.0F)
+                + mEfficiency / 100.0F
                 + EnumChatFormatting.RESET
                 + " %",
 
diff --git a/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java b/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java
index cd598f1bd0..12be87754b 100644
--- a/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java
+++ b/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java
@@ -56,9 +56,9 @@ public class MTETargetChamber extends MTEEnhancedMultiBlockBase<MTETargetChamber
 
     private static final IStructureDefinition<MTETargetChamber> STRUCTURE_DEFINITION;
 
-    private ArrayList<MTEHatchInputBeamline> mInputBeamline = new ArrayList<>();
+    private final ArrayList<MTEHatchInputBeamline> mInputBeamline = new ArrayList<>();
 
-    private ArrayList<MTEBusInputFocus> mInputFocus = new ArrayList<>();
+    private final ArrayList<MTEBusInputFocus> mInputFocus = new ArrayList<>();
 
     private static final int CASING_INDEX_FRONT = GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings3, 10); // Grate
     private static final int CASING_INDEX_CENTRE = GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings5, 14); // Shielded
@@ -447,7 +447,7 @@ public class MTETargetChamber extends MTEEnhancedMultiBlockBase<MTETargetChamber
                 + StatCollector.translateToLocal("GT5U.multiblock.efficiency")
                 + ": "
                 + EnumChatFormatting.YELLOW
-                + Float.toString(mEfficiency / 100.0F)
+                + mEfficiency / 100.0F
                 + EnumChatFormatting.RESET
                 + " %",
 
diff --git a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeSC.java b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeSC.java
index 979cb6a8bb..162b94b75e 100644
--- a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeSC.java
+++ b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeSC.java
@@ -35,13 +35,11 @@ public class RecipeSC extends GTRecipe {
     @Override
     public ItemStack getRepresentativeOutput(int aIndex) {
 
-        ArrayList<ItemStack> mOutputsWithParticle = new ArrayList<>();
-
         ItemStack particleStack = new ItemStack(LanthItemList.PARTICLE_ITEM);
 
         Items.ender_pearl.setDamage(particleStack, this.particleId);
 
-        mOutputsWithParticle.addAll(Arrays.asList(mOutputs));
+        ArrayList<ItemStack> mOutputsWithParticle = new ArrayList<>(Arrays.asList(mOutputs));
         mOutputsWithParticle.add(particleStack);
 
         ItemStack[] mOutputsWithParticleArray = mOutputsWithParticle.toArray(new ItemStack[0]);
diff --git a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/TargetChamberFrontend.java b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/TargetChamberFrontend.java
index 87852381e6..a61084204b 100644
--- a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/TargetChamberFrontend.java
+++ b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/TargetChamberFrontend.java
@@ -81,8 +81,7 @@ public class TargetChamberFrontend extends RecipeMapFrontend {
          * posList.add(posParticle); posList.addAll(UIHelper.getGridPositions(itemInputCount - 1, 36, 28, 3));
          */
 
-        List<Pos2d> posList = Util.getGridPositions(itemInputCount, 8, 20, 3, 1, 20);
-        return posList;
+        return Util.getGridPositions(itemInputCount, 8, 20, 3, 1, 20);
     }
 
     private String getEUtDisplay(OverclockCalculator calculator) {