From 3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3 Mon Sep 17 00:00:00 2001
From: Alexdoru <57050655+Alexdoru@users.noreply.github.com>
Date: Wed, 2 Oct 2024 07:31:08 +0200
Subject: Cleanup the codebase (#3311)

Co-authored-by: boubou19 <miisterunknown@gmail.com>
---
 .../java/gregtech/api/metatileentity/implementations/MTECable.java  | 2 +-
 .../metatileentity/implementations/MTEEnhancedMultiBlockBase.java   | 2 +-
 .../java/gregtech/api/metatileentity/implementations/MTEFluid.java  | 2 +-
 .../api/metatileentity/implementations/MTEHatchMaintenance.java     | 1 -
 .../gregtech/api/metatileentity/implementations/MTEHatchOutput.java | 2 +-
 .../api/metatileentity/implementations/MTEMultiBlockBase.java       | 6 ++----
 6 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/main/java/gregtech/api/metatileentity/implementations')

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTECable.java b/src/main/java/gregtech/api/metatileentity/implementations/MTECable.java
index b56769c59b..ef1a3fe96b 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTECable.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTECable.java
@@ -210,7 +210,7 @@ public class MTECable extends MetaPipeEntity implements IMetaTileEntityCable {
 
     @Override
     public int getProgresstime() {
-        return (int) mTransferredAmperage * 64;
+        return mTransferredAmperage * 64;
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java
index 2cf4398e87..a576295f07 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java
@@ -164,7 +164,7 @@ public abstract class MTEEnhancedMultiBlockBase<T extends MTEEnhancedMultiBlockB
      * current {@link #getAlignmentLimits()}, this method will be called to retrieve a corrected version. This method
      * is currently only intended to be used as a mean to migrate alignment limits, so if you never change the alignment
      * limit then you can probably just use the default implementation.
-     *
+     * <p>
      * The returned new facing must be able to pass the test of {@link #isNewExtendedFacingValid(ExtendedFacing)}
      */
     protected ExtendedFacing getCorrectedAlignment(ExtendedFacing aOldFacing) {
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java
index 2613aa23c0..bfd40ee0b6 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java
@@ -561,7 +561,7 @@ public class MTEFluid extends MetaPipeEntity {
 
                     wasActionPerformed = true;
 
-                    currentPipeBase = (IGregTechTileEntity) nextPipeBase;
+                    currentPipeBase = nextPipeBase;
                     currentPipe = nextPipe;
 
                 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMaintenance.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMaintenance.java
index 3a715a541a..b617c954f7 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMaintenance.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMaintenance.java
@@ -272,7 +272,6 @@ public class MTEHatchMaintenance extends MTEHatch implements IAddUIWidgets, IAli
                                 aStack.stackSize = 0;
                             } else {
                                 aStack.stackSize -= amt;
-                                amt = 0;
                                 break;
                             }
                         }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutput.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutput.java
index 3a9dd0dc96..00101bf5ad 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutput.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutput.java
@@ -143,7 +143,7 @@ public class MTEHatchOutput extends MTEHatch implements IFluidStore, IFluidLocka
     public void saveNBTData(NBTTagCompound aNBT) {
         super.saveNBTData(aNBT);
         aNBT.setByte("mMode", mMode);
-        if (isFluidLocked() && lockedFluidName != null && lockedFluidName.length() != 0)
+        if (isFluidLocked() && lockedFluidName != null && !lockedFluidName.isEmpty())
             aNBT.setString("lockedFluidName", lockedFluidName);
         else aNBT.removeTag("lockedFluidName");
     }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java
index 5da5bff57d..0eb0d770c9 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java
@@ -133,7 +133,7 @@ public abstract class MTEMultiBlockBase extends MetaTileEntity
     public int damageFactorLow = 5;
     public float damageFactorHigh = 0.6f;
     public int machineMode = 0;
-    public List<UITexture> machineModeIcons = new ArrayList<UITexture>();
+    public List<UITexture> machineModeIcons = new ArrayList<>();
 
     public boolean mLockedToSingleRecipe = getDefaultRecipeLockingMode();
     protected boolean inputSeparation = getDefaultInputSeparationMode();
@@ -1323,7 +1323,6 @@ public abstract class MTEMultiBlockBase extends MetaTileEntity
         }
 
         boolean outputSuccess = true;
-        // noinspection DataFlowIssue
         final List<MTEHatchOutput> filteredHatches = filterValidMTEs(mOutputHatches);
         while (outputSuccess && aStack.stackSize > 0) {
             outputSuccess = false;
@@ -1511,8 +1510,7 @@ public abstract class MTEMultiBlockBase extends MetaTileEntity
                     if (items == null) {
                         continue;
                     }
-                    for (int i = 0; i < items.length; i++) {
-                        ItemStack item = items[i];
+                    for (ItemStack item : items) {
                         if (item != null) {
                             rList.add(item);
                         }
-- 
cgit