diff options
author | Alexdoru <57050655+Alexdoru@users.noreply.github.com> | 2024-10-02 07:31:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-02 05:31:08 +0000 |
commit | 3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3 (patch) | |
tree | 107d9d2442891990ef1cdef1d8bb2df6bb96952a /src/main/java/gregtech/common/covers | |
parent | bfc7b2b07f72d0903a70791ff96f9c837ddd5ff0 (diff) | |
download | GT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.tar.gz GT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.tar.bz2 GT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.zip |
Cleanup the codebase (#3311)
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gregtech/common/covers')
5 files changed, 11 insertions, 16 deletions
diff --git a/src/main/java/gregtech/common/covers/CoverConveyor.java b/src/main/java/gregtech/common/covers/CoverConveyor.java index cb2690d95b..582e0b4e0c 100644 --- a/src/main/java/gregtech/common/covers/CoverConveyor.java +++ b/src/main/java/gregtech/common/covers/CoverConveyor.java @@ -2,7 +2,7 @@ package gregtech.common.covers; import static gregtech.api.util.GTUtility.moveMultipleItemStacks; -import java.util.Arrays; +import java.util.Collections; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -226,7 +226,7 @@ public class CoverConveyor extends CoverBehavior { }) .dynamicTooltip(() -> { ISerializableObject.LegacyCoverData coverData = getCoverData(); - return Arrays.asList( + return Collections.singletonList( coverData == null || coverData.get() % 2 == 0 ? GTUtility.trans("314", "Allow Input") : GTUtility.trans("312", "Allow Output")); @@ -243,7 +243,7 @@ public class CoverConveyor extends CoverBehavior { }) .dynamicTooltip(() -> { ISerializableObject.LegacyCoverData coverData = getCoverData(); - return Arrays.asList( + return Collections.singletonList( coverData == null || coverData.get() % 2 == 0 ? GTUtility.trans("313", "Block Input") : GTUtility.trans("311", "Block Output")); diff --git a/src/main/java/gregtech/common/covers/CoverDoesWork.java b/src/main/java/gregtech/common/covers/CoverDoesWork.java index 1575f243ab..4998373a64 100644 --- a/src/main/java/gregtech/common/covers/CoverDoesWork.java +++ b/src/main/java/gregtech/common/covers/CoverDoesWork.java @@ -20,9 +20,9 @@ import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget; public class CoverDoesWork extends CoverBehavior { - private static int FLAG_INVERTED = 0x1; - private static int FLAG_PROGRESS = 0x2; - private static int FLAG_ENABLED = 0x4; + private static final int FLAG_INVERTED = 0x1; + private static final int FLAG_PROGRESS = 0x2; + private static final int FLAG_ENABLED = 0x4; public CoverDoesWork(ITexture coverTexture) { super(coverTexture); @@ -37,8 +37,7 @@ public class CoverDoesWork extends CoverBehavior { @Override public int doCoverThings(ForgeDirection side, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) { - if ((aTileEntity instanceof IMachineProgress)) { - IMachineProgress mProgress = (IMachineProgress) aTileEntity; + if ((aTileEntity instanceof IMachineProgress mProgress)) { boolean inverted = isFlagSet(aCoverVariable, FLAG_INVERTED); int signal = 0; diff --git a/src/main/java/gregtech/common/covers/CoverFluidRegulator.java b/src/main/java/gregtech/common/covers/CoverFluidRegulator.java index 1895df509d..98e881753a 100644 --- a/src/main/java/gregtech/common/covers/CoverFluidRegulator.java +++ b/src/main/java/gregtech/common/covers/CoverFluidRegulator.java @@ -91,17 +91,14 @@ public class CoverFluidRegulator extends CoverBehaviorBase<CoverFluidRegulator.F final IFluidHandler tTank1; final IFluidHandler tTank2; final ForgeDirection directionFrom; - final ForgeDirection directionTo; if (aCoverVariable.speed > 0) { tTank2 = aTileEntity.getITankContainerAtSide(side); tTank1 = (IFluidHandler) aTileEntity; directionFrom = side; - directionTo = side.getOpposite(); } else { tTank1 = aTileEntity.getITankContainerAtSide(side); tTank2 = (IFluidHandler) aTileEntity; directionFrom = side.getOpposite(); - directionTo = side; } if (tTank1 != null && tTank2 != null) { allowFluid = true; diff --git a/src/main/java/gregtech/common/covers/CoverPump.java b/src/main/java/gregtech/common/covers/CoverPump.java index 99d39dccad..15dd1fccfc 100644 --- a/src/main/java/gregtech/common/covers/CoverPump.java +++ b/src/main/java/gregtech/common/covers/CoverPump.java @@ -1,6 +1,6 @@ package gregtech.common.covers; -import java.util.Arrays; +import java.util.Collections; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.util.ForgeDirection; @@ -232,7 +232,7 @@ public class CoverPump extends CoverBehavior { }) .dynamicTooltip(() -> { ISerializableObject.LegacyCoverData coverData = getCoverData(); - return Arrays.asList( + return Collections.singletonList( coverData == null || coverData.get() % 2 == 0 ? GTUtility.trans("314", "Allow Input") : GTUtility.trans("312", "Allow Output")); @@ -249,7 +249,7 @@ public class CoverPump extends CoverBehavior { }) .dynamicTooltip(() -> { ISerializableObject.LegacyCoverData coverData = getCoverData(); - return Arrays.asList( + return Collections.singletonList( coverData == null || coverData.get() % 2 == 0 ? GTUtility.trans("313", "Block Input") : GTUtility.trans("311", "Block Output")); diff --git a/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java index ed55280b7f..54d71d2c8b 100644 --- a/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java @@ -43,8 +43,7 @@ public class CoverWirelessDoesWorkDetector private static byte computeSignalBasedOnActivity(ActivityTransmitterData coverVariable, ICoverable tileEntity) { - if (tileEntity instanceof IMachineProgress) { - IMachineProgress mProgress = (IMachineProgress) tileEntity; + if (tileEntity instanceof IMachineProgress mProgress) { boolean inverted = coverVariable.invert; int signal = 0; |