Cleanup the codebase (#3311)

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

17 files changed, 71 insertions, 82 deletions

diff --git a/src/main/java/gtnhlanth/common/beamline/BeamInformation.java b/src/main/java/gtnhlanth/common/beamline/BeamInformation.java
index 3d2ff841c4..ff4ac33333 100644
--- a/src/main/java/gtnhlanth/common/beamline/BeamInformation.java
+++ b/src/main/java/gtnhlanth/common/beamline/BeamInformation.java
@@ -2,13 +2,13 @@ package gtnhlanth.common.beamline;
 
 public class BeamInformation {
 
-    private float energy; // in keV
-    private int rate;
+    private final float energy; // in keV
+    private final int rate;
 
-    private Particle particle;
-    private int particleId;
+    private final Particle particle;
+    private final int particleId;
 
-    private float focus;
+    private final float focus;
 
     public BeamInformation(float energy, int rate, int particleId, float focus) {
         this.energy = energy;
diff --git a/src/main/java/gtnhlanth/common/beamline/Particle.java b/src/main/java/gtnhlanth/common/beamline/Particle.java
index 856bb383db..22881fe026 100644
--- a/src/main/java/gtnhlanth/common/beamline/Particle.java
+++ b/src/main/java/gtnhlanth/common/beamline/Particle.java
@@ -10,21 +10,21 @@ public enum Particle {
     PROTON(true, 3, 938.27f, 15000, "proton", "p\u207A", 1, null),
     ALPHA(true, 4, 3727.38f, 8000, "alpha", "\u03B1", 2, null);
 
-    private boolean canAcc;
+    private final boolean canAcc;
 
-    private float restMass; // in MeV
+    private final float restMass; // in MeV
 
-    private float maxSourceEnergy; // in keV
+    private final float maxSourceEnergy; // in keV
 
-    private String name;
-    private String shortName;
+    private final String name;
+    private final String shortName;
 
-    private float charge; // in multiples of elemental charge
+    private final float charge; // in multiples of elemental charge
 
-    private String chargeSpecial;
+    private final String chargeSpecial;
 
-    private Particle(boolean canAcc, int id, float restMass, float maxSourceEnergy, String name, String shortName,
-        float charge, String chargeSpecial) { // ID
+    Particle(boolean canAcc, int id, float restMass, float maxSourceEnergy, String name, String shortName, float charge,
+        String chargeSpecial) { // ID
         // is
         // symbolic
         // only
diff --git a/src/main/java/gtnhlanth/common/block/BlockAntennaCasing.java b/src/main/java/gtnhlanth/common/block/BlockAntennaCasing.java
index d93d6a3494..a99a1c7556 100644
--- a/src/main/java/gtnhlanth/common/block/BlockAntennaCasing.java
+++ b/src/main/java/gtnhlanth/common/block/BlockAntennaCasing.java
@@ -2,7 +2,7 @@ package gtnhlanth.common.block;
 
 public class BlockAntennaCasing extends BlockCasing {
 
-    private int antennaTier;
+    private final int antennaTier;
 
     public BlockAntennaCasing(int tier) {
         super("antenna_t" + tier);
diff --git a/src/main/java/gtnhlanth/common/block/BlockCasing.java b/src/main/java/gtnhlanth/common/block/BlockCasing.java
index d51a4e79f5..6d45a6c352 100644
--- a/src/main/java/gtnhlanth/common/block/BlockCasing.java
+++ b/src/main/java/gtnhlanth/common/block/BlockCasing.java
@@ -18,7 +18,7 @@ public class BlockCasing extends Block {
     @SideOnly(Side.CLIENT)
     protected IIcon[] texture;
 
-    private String name;
+    private final String name;
 
     public BlockCasing(String name) {
         super(Material.iron);
diff --git a/src/main/java/gtnhlanth/common/hatch/MTEHatchOutputBeamline.java b/src/main/java/gtnhlanth/common/hatch/MTEHatchOutputBeamline.java
index 00772fb5e8..a5db1c2176 100644
--- a/src/main/java/gtnhlanth/common/hatch/MTEHatchOutputBeamline.java
+++ b/src/main/java/gtnhlanth/common/hatch/MTEHatchOutputBeamline.java
@@ -98,15 +98,15 @@ public class MTEHatchOutputBeamline extends MTEHatchBeamlineConnector<BeamLinePa
 
             IMetaTileEntity nextMeta = nextTE.getMetaTileEntity();
 
-            if (nextMeta == null || !(nextMeta instanceof IConnectsToBeamline)) { // Non-beamliney block
+            if (!(nextMeta instanceof IConnectsToBeamline)) { // Non-beamliney block
                 return;
             }
 
-            if (((IConnectsToBeamline) nextMeta) instanceof MTEHatchInputBeamline) {
+            if (nextMeta instanceof MTEHatchInputBeamline) {
                 ((MTEHatchInputBeamline) nextMeta).setContents(q); // Reached another multi
                 break;
 
-            } else if (((IConnectsToBeamline) nextMeta) instanceof MTEBeamlinePipe) { // Another pipe follows
+            } else if (nextMeta instanceof MTEBeamlinePipe) { // Another pipe follows
 
                 if (((MTEBeamlinePipe) nextMeta).isDataInputFacing(front.getOpposite())) { // Connected to previous pipe
                     ((MTEBeamlinePipe) nextMeta).markUsed();
diff --git a/src/main/java/gtnhlanth/common/item/ItemPhotolithographicMask.java b/src/main/java/gtnhlanth/common/item/ItemPhotolithographicMask.java
index d39c74b602..30cbac875b 100644
--- a/src/main/java/gtnhlanth/common/item/ItemPhotolithographicMask.java
+++ b/src/main/java/gtnhlanth/common/item/ItemPhotolithographicMask.java
@@ -10,8 +10,8 @@ import gtnhlanth.Tags;
 
 public class ItemPhotolithographicMask extends Item implements ICanFocus {
 
-    private String name;
-    private String descSpectrum;
+    private final String name;
+    private final String descSpectrum;
 
     public ItemPhotolithographicMask(String name, int maxDamage, String descSpectrum) {
         super();
diff --git a/src/main/java/gtnhlanth/common/register/BotWerkstoffMaterialPool.java b/src/main/java/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
index 0172b90655..e1b27c9ae2 100644
--- a/src/main/java/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
+++ b/src/main/java/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
@@ -11,7 +11,6 @@ import bartworks.util.Pair;
 /*
  * Originally authored by botn365 under the MIT License. See BotdustriesLICENSE
  */
-@SuppressWarnings("unchecked")
 public class BotWerkstoffMaterialPool implements Runnable {
 
     public static final Werkstoff TungsticAcid = new Werkstoff(
diff --git a/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java
index 41902bebc6..98d6cb01e4 100644
--- a/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java
+++ b/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java
@@ -11,7 +11,6 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TextureSet;
 
-@SuppressWarnings({ "unchecked" })
 public class WerkstoffMaterialPool implements Runnable {
 
     // Current highest ID = 11_499
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) {
diff --git a/src/main/java/gtnhlanth/loader/RecipeLoader.java b/src/main/java/gtnhlanth/loader/RecipeLoader.java
index 71d8eaa06c..bea4d231d8 100644
--- a/src/main/java/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/gtnhlanth/loader/RecipeLoader.java
@@ -377,15 +377,30 @@ public class RecipeLoader {
         // Target Holder
         GameRegistry.addShapedRecipe(
             new ItemStack(LanthItemList.TARGET_HOLDER),
-            new Object[] { "MCM", "MHM", "MCM", 'M', WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 1), 'H',
-                ItemList.Hull_LuV.get(1), 'C', ItemList.Conveyor_Module_LuV.get(1) });
+            "MCM",
+            "MHM",
+            "MCM",
+            'M',
+            WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 1),
+            'H',
+            ItemList.Hull_LuV.get(1),
+            'C',
+            ItemList.Conveyor_Module_LuV.get(1));
 
         GameRegistry.addShapedRecipe(
 
             new ItemStack(LanthItemList.FOCUS_HOLDER),
-            new Object[] { "MCM", "R R", "MHM", 'M', WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 1), 'C',
-                ItemList.Conveyor_Module_LuV.get(1), 'R', ItemList.Robot_Arm_LuV.get(1), 'H',
-                ItemList.Hull_LuV.get(1) });
+            "MCM",
+            "R R",
+            "MHM",
+            'M',
+            WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 1),
+            'C',
+            ItemList.Conveyor_Module_LuV.get(1),
+            'R',
+            ItemList.Robot_Arm_LuV.get(1),
+            'H',
+            ItemList.Hull_LuV.get(1));
 
         // Focus Input Bus
         GameRegistry.addShapedRecipe(
@@ -3376,7 +3391,7 @@ public class RecipeLoader {
         /**
          * 1/9 Ce + 3 Lu + 5 Sapphire = 8 LuAG Blend 1/9 Ce + 3 Lu + 10 Green Sapphire = 8 LuAG Blend 2/9 Ce + 6 Lu + 25
          * Alumina + 9 Oxygen = 12 LuAG Blend
-         *
+         * <p>
          * 1 Ce + 60 Lu + 100 Sapphire = 160 LuAG Blend 1 Ce + 60 Lu +200 Green Sapphire = 160 LuAG Blend
          *
          */
@@ -4094,7 +4109,6 @@ public class RecipeLoader {
 
     public static void removeCeriumChemicalBath() {
         HashSet<GTRecipe> remove = new HashSet<>(5000);
-        HashSet<GTRecipe> reAdd = new HashSet<>(5000);
 
         GTLog.out.println(Tags.MODID + ": marking recipes in chem bath for removal!");
         for (GTRecipe recipe : chemicalBathRecipes.getAllRecipes()) {
@@ -4122,13 +4136,9 @@ public class RecipeLoader {
         GTLog.out.println(Tags.MODID + ": regenerating chem bath recipes");
         chemicalBathRecipes.getBackend()
             .removeRecipes(remove);
-        reAdd.forEach(chemicalBathRecipes::add);
         chemicalBathRecipes.getBackend()
             .reInit();
 
-        remove.clear();
-        reAdd.clear();
-
         GTLog.out.println("Chemical Bath done!");
     }
 
diff --git a/src/main/java/gtnhlanth/loader/ZPMRubberChanges.java b/src/main/java/gtnhlanth/loader/ZPMRubberChanges.java
index a00b28ae9b..5d172421f9 100644
--- a/src/main/java/gtnhlanth/loader/ZPMRubberChanges.java
+++ b/src/main/java/gtnhlanth/loader/ZPMRubberChanges.java
@@ -40,7 +40,6 @@ import gtnhlanth.common.register.WerkstoffMaterialPool;
 
 public class ZPMRubberChanges implements Runnable {
 
-    @SuppressWarnings("unchecked")
     public void run() {
 
         HashSet<ItemStack> ZPMPlusComponents = new HashSet<>();
@@ -115,7 +114,7 @@ public class ZPMRubberChanges implements Runnable {
                     || customItemList.toString()
                         .contains("UEV"))
                     && (boolean) hasnotBeenSet.invoke(customItemList))
-                    ZPMPlusComponents.add((ItemStack) get.invoke(customItemList, 1, new Object[0]));
+                    ZPMPlusComponents.add(get.invoke(customItemList, 1, new Object[0]));
             }
         } catch (IllegalAccessException | ClassNotFoundException | InvocationTargetException e) {
             e.printStackTrace();
@@ -373,7 +372,7 @@ public class ZPMRubberChanges implements Runnable {
         boolean replaced = false;
         for (int i = 0; i < stacks.length; i++) {
             if (!GTUtility.isStackValid(stacks[i])) {
-                if (stacks[i] instanceof ArrayList && ((ArrayList) stacks[i]).size() > 0) {
+                if (stacks[i] instanceof ArrayList && !((ArrayList) stacks[i]).isEmpty()) {
                     if (GTUtility.areStacksEqual(stack, (ItemStack) ((ArrayList) stacks[i]).get(0), true))
                         if (!replace) return true;
                         else {
@@ -385,7 +384,7 @@ public class ZPMRubberChanges implements Runnable {
                             GTLog.out.print("Replaced recipe!: " + stack.getDisplayName() + " ");
                         }
 
-                } else continue;
+                }
             } else if (GTUtility.areStacksEqual(stack, (ItemStack) stacks[i], true)) if (!replace) return true;
             else {
                 int amount = ((ItemStack) stacks[i]).stackSize;
diff --git a/src/main/java/gtnhlanth/xmod/nei/NEIConfig.java b/src/main/java/gtnhlanth/xmod/nei/NEIConfig.java
index 839fa4fab2..137e7c7458 100644
--- a/src/main/java/gtnhlanth/xmod/nei/NEIConfig.java
+++ b/src/main/java/gtnhlanth/xmod/nei/NEIConfig.java
@@ -19,8 +19,6 @@ public class NEIConfig implements IConfigureNEI {
 
     @Override
     public void loadConfig() {
-        isAdded = false;
-
         isAdded = true;
     }
 }