From b088958c9f6935d356b6c087c8e8106b400aa24f Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 1 Apr 2023 20:06:12 +0100 Subject: 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 --- .../common/covers/GT_Cover_ControlsWork.java | 5 +- .../gregtech/common/covers/GT_Cover_Conveyor.java | 101 +++++++++------------ .../gregtech/common/covers/GT_Cover_Crafting.java | 10 +- .../gregtech/common/covers/GT_Cover_DoesWork.java | 44 ++++----- .../gregtech/common/covers/GT_Cover_Drain.java | 24 ++--- .../gregtech/common/covers/GT_Cover_EUMeter.java | 62 ++++--------- .../common/covers/GT_Cover_FacadeBase.java | 36 +++----- .../common/covers/GT_Cover_FluidLimiter.java | 3 +- .../common/covers/GT_Cover_FluidRegulator.java | 3 +- .../covers/GT_Cover_FluidStorageMonitor.java | 6 +- .../common/covers/GT_Cover_Fluidfilter.java | 76 ++++++---------- .../gregtech/common/covers/GT_Cover_ItemMeter.java | 3 +- .../common/covers/GT_Cover_NeedMaintainance.java | 88 +++++++----------- .../common/covers/GT_Cover_PlayerDetector.java | 15 +-- .../java/gregtech/common/covers/GT_Cover_Pump.java | 101 +++++++++------------ .../common/covers/GT_Cover_RedstoneConductor.java | 28 ++---- .../covers/GT_Cover_RedstoneReceiverExternal.java | 4 +- .../common/covers/GT_Cover_RedstoneSignalizer.java | 22 ++--- .../GT_Cover_RedstoneTransmitterInternal.java | 4 +- .../covers/GT_Cover_RedstoneWirelessBase.java | 23 ++--- .../gregtech/common/covers/GT_Cover_Shutter.java | 16 +--- .../java/gregtech/common/covers/GT_Cover_Vent.java | 27 ++---- .../GT_Cover_AdvancedRedstoneReceiverInternal.java | 3 +- .../GT_Cover_AdvancedWirelessRedstoneBase.java | 19 ++-- .../GT_Cover_WirelessMaintenanceDetector.java | 20 ++-- 25 files changed, 276 insertions(+), 467 deletions(-) (limited to 'src/main/java/gregtech/common/covers') diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java index 6ed09dbf06..8349dde2ee 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java @@ -39,8 +39,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) { if (!makeSureOnlyOne(aSide, aTileEntity)) return 0; - if (aTileEntity instanceof IMachineProgress) { - IMachineProgress machine = (IMachineProgress) aTileEntity; + if (aTileEntity instanceof IMachineProgress machine) { if (aCoverVariable < 2) { if ((aInputRedstone > 0) == (aCoverVariable == 0)) { if (!machine.isAllowedToWork()) machine.enableWorking(); @@ -81,7 +80,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls /** * Make sure there is only one GT_Cover_ControlsWork on the aTileEntity TODO this is a migration thing. Remove this * after 2.3.0 is released. - * + * * @return true if the cover is the first (side) one **/ private boolean makeSureOnlyOne(byte aSide, ICoverable aTileEntity) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java index e056c1c02d..ac99e56005 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java @@ -91,42 +91,24 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior { aCoverVariable = 11; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("006", "Export")); - break; - case 1: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("007", "Import")); - break; - case 2: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("008", "Export (conditional)")); - break; - case 3: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("009", "Import (conditional)")); - break; - case 4: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("010", "Export (invert cond)")); - break; - case 5: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("011", "Import (invert cond)")); - break; - case 6: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("012", "Export allow Input")); - break; - case 7: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("013", "Import allow Output")); - break; - case 8: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("014", "Export allow Input (conditional)")); - break; - case 9: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("015", "Import allow Output (conditional)")); - break; - case 10: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("016", "Export allow Input (invert cond)")); - break; - case 11: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("017", "Import allow Output (invert cond)")); - break; + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("006", "Export")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("007", "Import")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("008", "Export (conditional)")); + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("009", "Import (conditional)")); + case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("010", "Export (invert cond)")); + case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("011", "Import (invert cond)")); + case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("012", "Export allow Input")); + case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("013", "Import allow Output")); + case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("014", "Export allow Input (conditional)")); + case 9 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("015", "Import allow Output (conditional)")); + case 10 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("016", "Export allow Input (invert cond)")); + case 11 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("017", "Import allow Output (invert cond)")); } return aCoverVariable; } @@ -321,46 +303,45 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior { private int getNewCoverVariable(int id, int coverVariable) { switch (id) { - case 0: + case 0 -> { return coverVariable & ~0x1; - case 1: + } + case 1 -> { return coverVariable | 0x1; - case 2: + } + case 2 -> { if (coverVariable > 5) return 0x6 | (coverVariable & ~0xE); return (coverVariable & ~0xE); - case 3: + } + case 3 -> { if (coverVariable > 5) return 0x8 | (coverVariable & ~0xE); return 0x2 | (coverVariable & ~0xE); - case 4: + } + case 4 -> { if (coverVariable > 5) return 0xA | (coverVariable & ~0xE); return (0x4 | (coverVariable & ~0xE)); - case 5: + } + case 5 -> { if (coverVariable <= 5) return coverVariable + 6; - break; - case 6: + } + case 6 -> { if (coverVariable > 5) return coverVariable - 6; + } } return coverVariable; } private boolean getClickable(int id, int coverVariable) { if (coverVariable < 0 | 11 < coverVariable) return false; - switch (id) { - case 0: - case 1: - return (0x1 & coverVariable) != id; - case 2: - return (coverVariable % 6) >= 2; - case 3: - return (coverVariable % 6) < 2 | 4 <= (coverVariable % 6); - case 4: - return (coverVariable % 6) < 4; - case 5: - return coverVariable < 6; - case 6: - return coverVariable >= 6; - } - return false; + return switch (id) { + case 0, 1 -> (0x1 & coverVariable) != id; + case 2 -> (coverVariable % 6) >= 2; + case 3 -> (coverVariable % 6) < 2 | 4 <= (coverVariable % 6); + case 4 -> (coverVariable % 6) < 4; + case 5 -> coverVariable < 6; + case 6 -> coverVariable >= 6; + default -> false; + }; } } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java b/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java index bcbf07798b..4a5c254ee1 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java @@ -36,9 +36,9 @@ public class GT_Cover_Crafting extends GT_CoverBehavior { ((EntityPlayerMP) aPlayer).getNextWindowId(); ((EntityPlayerMP) aPlayer).playerNetServerHandler.sendPacket( new S2DPacketOpenWindow(((EntityPlayerMP) aPlayer).currentWindowId, 1, "Crafting", 9, true)); - ((EntityPlayerMP) aPlayer).openContainer = new ContainerWorkbench( - ((EntityPlayerMP) aPlayer).inventory, - ((EntityPlayerMP) aPlayer).worldObj, + aPlayer.openContainer = new ContainerWorkbench( + aPlayer.inventory, + aPlayer.worldObj, aTileEntity.getXCoord(), aTileEntity.getYCoord(), aTileEntity.getZCoord()) { @@ -48,8 +48,8 @@ public class GT_Cover_Crafting extends GT_CoverBehavior { return true; } }; - ((EntityPlayerMP) aPlayer).openContainer.windowId = ((EntityPlayerMP) aPlayer).currentWindowId; - ((EntityPlayerMP) aPlayer).openContainer.addCraftingToCrafters((EntityPlayerMP) aPlayer); + aPlayer.openContainer.windowId = ((EntityPlayerMP) aPlayer).currentWindowId; + aPlayer.openContainer.addCraftingToCrafters((EntityPlayerMP) aPlayer); } return true; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java index c4d3364ba0..01d95f1664 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java @@ -71,18 +71,14 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior { aCoverVariable = 3; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("018", "Normal")); - break; // Progress scaled - case 1: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("019", "Inverted")); - break; // ^ inverted - case 2: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("020", "Ready to work")); - break; // Not Running - case 3: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("021", "Not ready to work")); - break; // Running + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("018", "Normal")); + // Progress scaled + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("019", "Inverted")); + // ^ inverted + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("020", "Ready to work")); + // Not Running + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("021", "Not ready to work")); + // Running } return aCoverVariable; } @@ -205,27 +201,27 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior { private int getNewCoverVariable(int id, int coverVariable) { switch (id) { - case 0: + case 0 -> { return coverVariable & ~0x2; - case 1: + } + case 1 -> { return coverVariable | 0x2; - case 2: + } + case 2 -> { if ((coverVariable & 0x1) > 0) return coverVariable & ~0x1; return coverVariable | 0x1; + } } return coverVariable; } private boolean isEnabled(int id, int coverVariable) { - switch (id) { - case 0: - return (coverVariable & 0x2) == 0; - case 1: - return (coverVariable & 0x2) > 0; - case 2: - return (coverVariable & 0x1) > 0; - } - return true; + return switch (id) { + case 0 -> (coverVariable & 0x2) == 0; + case 1 -> (coverVariable & 0x2) > 0; + case 2 -> (coverVariable & 0x1) > 0; + default -> true; + }; } } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java index 4a08925ca4..5f5381a141 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java @@ -123,24 +123,12 @@ public class GT_Cover_Drain extends GT_CoverBehavior { aCoverVariable = 5; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("022", "Import")); - break; - case 1: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("023", "Import (conditional)")); - break; - case 2: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("024", "Import (invert cond)")); - break; - case 3: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("025", "Keep Liquids Away")); - break; - case 4: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("026", "Keep Liquids Away (conditional)")); - break; - case 5: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("027", "Keep Liquids Away (invert cond)")); - break; + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("022", "Import")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("023", "Import (conditional)")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("024", "Import (invert cond)")); + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("025", "Keep Liquids Away")); + case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("026", "Keep Liquids Away (conditional)")); + case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("027", "Keep Liquids Away (invert cond)")); } return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java index 0ded299507..a57544e55c 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java @@ -97,46 +97,22 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("031", "Normal Universal Storage")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("032", "Inverted Universal Storage")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("033", "Normal Electricity Storage")); + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("034", "Inverted Electricity Storage")); + case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("035", "Normal Steam Storage")); + case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("036", "Inverted Steam Storage")); + case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("037", "Normal Average Electric Input")); + case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("038", "Inverted Average Electric Input")); + case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("039", "Normal Average Electric Output")); + case 9 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("040", "Inverted Average Electric Output")); + case 10 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("041", "Normal Electricity Storage(Including Batteries)")); + case 11 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("042", "Inverted Electricity Storage(Including Batteries)")); } aCoverVariable.setNum(num); return aCoverVariable; @@ -391,8 +367,7 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase { if (te instanceof IGregTechTileEntity) { IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity(); - if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer) { - GT_MetaTileEntity_BasicBatteryBuffer buffer = (GT_MetaTileEntity_BasicBatteryBuffer) mte; + if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer buffer) { return buffer.getStoredEnergy()[0]; } } @@ -400,8 +375,7 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase { if (te instanceof IGregTechTileEntity) { IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity(); - if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer) { - GT_MetaTileEntity_BasicBatteryBuffer buffer = (GT_MetaTileEntity_BasicBatteryBuffer) mte; + if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer buffer) { return buffer.getStoredEnergy()[1]; } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java index 80eeead660..66d5eae5e5 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java @@ -386,31 +386,23 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase coverVariable.mFlags ^ 0x1; + case 1 -> coverVariable.mFlags ^ 0x2; + case 2 -> coverVariable.mFlags ^ 0x4; + case 3 -> coverVariable.mFlags ^ 0x8; + default -> coverVariable.mFlags; + }; } private boolean isEnabled(int id, FacadeData coverVariable) { - switch (id) { - case 0: - return (coverVariable.mFlags & 0x1) > 0; - case 1: - return (coverVariable.mFlags & 0x2) > 0; - case 2: - return (coverVariable.mFlags & 0x4) > 0; - case 3: - return (coverVariable.mFlags & 0x8) > 0; - } - return false; + return switch (id) { + case 0 -> (coverVariable.mFlags & 0x1) > 0; + case 1 -> (coverVariable.mFlags & 0x2) > 0; + case 2 -> (coverVariable.mFlags & 0x4) > 0; + case 3 -> (coverVariable.mFlags & 0x8) > 0; + default -> false; + }; } } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java index 68bf59b5df..bf82af3ad2 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java @@ -152,8 +152,7 @@ public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase GT_Utility.trans("043", "Filter input, Deny output"); + case INVERT_INPUT_DENY_OUTPUT -> GT_Utility.trans("044", "Invert input, Deny output"); + case FILTER_INPUT_ANY_OUTPUT -> GT_Utility.trans("045", "Filter input, Permit any output"); + case INVERT_INPUT_ANY_OUTPUT -> GT_Utility.trans("046", "Invert input, Permit any output"); + case DENY_INPUT_FILTER_OUTPUT -> GT_Utility.trans("307", "Deny input, Filter output"); + case DENY_INPUT_INVERT_OUTPUT -> GT_Utility.trans("308", "Deny input, Invert output"); + case ANY_INPUT_FILTER_OUTPUT -> GT_Utility.trans("309", "Permit any input, Filter output"); + case ANY_INPUT_INVERT_OUTPUT -> GT_Utility.trans("310", "Permit any input, Invert output"); + default -> ("UNKNOWN"); + }; } @Override @@ -371,36 +362,24 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase (coverVariable.mFilterMode & 0x3); + case 1 -> (coverVariable.mFilterMode | 0x4); + case 2 -> (coverVariable.mFilterMode & 0x5); + case 3 -> (coverVariable.mFilterMode | 0x2); + case 4 -> (coverVariable.mFilterMode & 0x6); + case 5 -> (coverVariable.mFilterMode | 0x1); + default -> coverVariable.mFilterMode; + }; } private boolean getClickable(int id, FluidFilterData coverVariable) { - switch (id) { - case 0: - case 1: - return (coverVariable.mFilterMode >> 2 & 0x1) != (id & 0x1); - case 2: - case 3: - return (coverVariable.mFilterMode >> 1 & 0x1) != (id & 0x1); - case 4: - case 5: - return (coverVariable.mFilterMode & 0x1) != (id & 0x1); - } - return false; + return switch (id) { + case 0, 1 -> (coverVariable.mFilterMode >> 2 & 0x1) != (id & 0x1); + case 2, 3 -> (coverVariable.mFilterMode >> 1 & 0x1) != (id & 0x1); + case 4, 5 -> (coverVariable.mFilterMode & 0x1) != (id & 0x1); + default -> false; + }; } private ItemStack getFluidDisplayItem(FluidFilterData coverData) { @@ -445,8 +424,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("056", "Emit if 1 Maintenance Needed")); + case 1 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("057", "Emit if 1 Maintenance Needed(inverted)")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("058", "Emit if 2 Maintenance Needed")); + case 3 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("059", "Emit if 2 Maintenance Needed(inverted)")); + case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("060", "Emit if 3 Maintenance Needed")); + case 5 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("061", "Emit if 3 Maintenance Needed(inverted)")); + case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("062", "Emit if 4 Maintenance Needed")); + case 7 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("063", "Emit if 4 Maintenance Needed(inverted)")); + case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("064", "Emit if 5 Maintenance Needed")); + case 9 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("065", "Emit if 5 Maintenance Needed(inverted)")); + case 10 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("066", "Emit if rotor needs maintenance low accuracy mod")); + case 11 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("067", "Emit if rotor needs maintenance low accuracy mod(inverted)")); + case 12 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("068", "Emit if rotor needs maintenance high accuracy mod")); + case 13 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("069", "Emit if rotor needs maintenance high accuracy mod(inverted)")); } return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java index bbfe23eb30..466931d075 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java @@ -55,8 +55,7 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior { placer = ((IGregTechTileEntity) aTileEntity).getOwnerName(); } for (Object tObject : aTileEntity.getWorld().playerEntities) { - if ((tObject instanceof EntityPlayerMP)) { - EntityPlayerMP tEntity = (EntityPlayerMP) tObject; + if ((tObject instanceof EntityPlayerMP tEntity)) { int dist = Math.max( 1, (int) tEntity.getDistance( @@ -94,15 +93,9 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior { aCoverVariable = 2; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("068.1", "Emit if any Player is close")); - break; - case 1: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("069.1", "Emit if other Player is close")); - break; - case 2: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("070", "Emit if you are close")); - break; + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("068.1", "Emit if any Player is close")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("069.1", "Emit if other Player is close")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("070", "Emit if you are close")); } return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java index 2e23995fcf..f95c586427 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java @@ -111,42 +111,24 @@ public class GT_Cover_Pump extends GT_CoverBehavior { aCoverVariable = 11; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("006", "Export")); - break; - case 1: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("007", "Import")); - break; - case 2: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("008", "Export (conditional)")); - break; - case 3: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("009", "Import (conditional)")); - break; - case 4: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("010", "Export (invert cond)")); - break; - case 5: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("011", "Import (invert cond)")); - break; - case 6: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("012", "Export allow Input")); - break; - case 7: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("013", "Import allow Output")); - break; - case 8: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("014", "Export allow Input (conditional)")); - break; - case 9: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("015", "Import allow Output (conditional)")); - break; - case 10: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("016", "Export allow Input (invert cond)")); - break; - case 11: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("017", "Import allow Output (invert cond)")); - break; + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("006", "Export")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("007", "Import")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("008", "Export (conditional)")); + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("009", "Import (conditional)")); + case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("010", "Export (invert cond)")); + case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("011", "Import (invert cond)")); + case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("012", "Export allow Input")); + case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("013", "Import allow Output")); + case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("014", "Export allow Input (conditional)")); + case 9 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("015", "Import allow Output (conditional)")); + case 10 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("016", "Export allow Input (invert cond)")); + case 11 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("017", "Import allow Output (invert cond)")); } return aCoverVariable; } @@ -351,46 +333,45 @@ public class GT_Cover_Pump extends GT_CoverBehavior { private int getNewCoverVariable(int id, int coverVariable) { switch (id) { - case 0: + case 0 -> { return coverVariable & ~0x1; - case 1: + } + case 1 -> { return coverVariable | 0x1; - case 2: + } + case 2 -> { if (coverVariable > 5) return 0x6 | (coverVariable & ~0xE); return (coverVariable & ~0xE); - case 3: + } + case 3 -> { if (coverVariable > 5) return 0x8 | (coverVariable & ~0xE); return 0x2 | (coverVariable & ~0xE); - case 4: + } + case 4 -> { if (coverVariable > 5) return 0xA | (coverVariable & ~0xE); return (0x4 | (coverVariable & ~0xE)); - case 5: + } + case 5 -> { if (coverVariable <= 5) return coverVariable + 6; - break; - case 6: + } + case 6 -> { if (coverVariable > 5) return coverVariable - 6; + } } return coverVariable; } private boolean getClickable(int id, int coverVariable) { if (coverVariable < 0 | 11 < coverVariable) return false; - switch (id) { - case 0: - case 1: - return (0x1 & coverVariable) != id; - case 2: - return (coverVariable % 6) >= 2; - case 3: - return (coverVariable % 6) < 2 | 4 <= (coverVariable % 6); - case 4: - return (coverVariable % 6) < 4; - case 5: - return coverVariable < 6; - case 6: - return coverVariable >= 6; - } - return false; + return switch (id) { + case 0, 1 -> (0x1 & coverVariable) != id; + case 2 -> (coverVariable % 6) >= 2; + case 3 -> (coverVariable % 6) < 2 | 4 <= (coverVariable % 6); + case 4 -> (coverVariable % 6) < 4; + case 5 -> coverVariable < 6; + case 6 -> coverVariable >= 6; + default -> false; + }; } } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java index 733376f6e2..7b1adacff4 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java @@ -42,27 +42,13 @@ public class GT_Cover_RedstoneConductor extends GT_CoverBehavior { aCoverVariable = 6; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("071", "Conducts strongest Input")); - break; - case 1: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("072", "Conducts from bottom Input")); - break; - case 2: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("073", "Conducts from top Input")); - break; - case 3: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("074", "Conducts from north Input")); - break; - case 4: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("075", "Conducts from south Input")); - break; - case 5: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("076", "Conducts from west Input")); - break; - case 6: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("077", "Conducts from east Input")); - break; + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("071", "Conducts strongest Input")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("072", "Conducts from bottom Input")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("073", "Conducts from top Input")); + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("074", "Conducts from north Input")); + case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("075", "Conducts from south Input")); + case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("076", "Conducts from west Input")); + case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("077", "Conducts from east Input")); } return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java index 9cd9f7f5fb..8fe1bb5d13 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java @@ -29,8 +29,8 @@ public class GT_Cover_RedstoneReceiverExternal extends GT_Cover_RedstoneWireless long aTimer) { aTileEntity.setOutputRedstoneSignal( aSide, - GregTech_API.sWirelessRedstone.get(Integer.valueOf(aCoverVariable)) == null ? 0 - : ((Byte) GregTech_API.sWirelessRedstone.get(Integer.valueOf(aCoverVariable))).byteValue()); + GregTech_API.sWirelessRedstone.get(aCoverVariable) == null ? 0 + : GregTech_API.sWirelessRedstone.get(aCoverVariable)); return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java index d596b4ec15..bdb160f15e 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java @@ -27,19 +27,15 @@ public class GT_Cover_RedstoneSignalizer extends GT_CoverBehavior { EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = (aCoverVariable + 1) % 48; switch (aCoverVariable / 16) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("078", "Signal = ") + (aCoverVariable & 0xF)); - break; - case 1: - GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("079", "Conditional Signal = ") + (aCoverVariable & 0xF)); - break; - case 2: - GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("080", "Inverted Conditional Signal = ") + (aCoverVariable & 0xF)); - break; + case 0 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("078", "Signal = ") + (aCoverVariable & 0xF)); + case 1 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("079", "Conditional Signal = ") + (aCoverVariable & 0xF)); + case 2 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("080", "Inverted Conditional Signal = ") + (aCoverVariable & 0xF)); } return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java index 968ad3f815..42c20e9088 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java @@ -27,9 +27,7 @@ public class GT_Cover_RedstoneTransmitterInternal extends GT_Cover_RedstoneWirel @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) { - GregTech_API.sWirelessRedstone.put( - Integer.valueOf(aCoverVariable), - Byte.valueOf(aTileEntity.getOutputRedstoneSignal(aSide))); + GregTech_API.sWirelessRedstone.put(aCoverVariable, aTileEntity.getOutputRedstoneSignal(aSide)); return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java index 88a472797b..a2a6ea76c6 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java @@ -90,21 +90,14 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte) 0); float[] tCoords = GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ); - short tAdjustVal = 0; - - switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + 2 * (byte) (int) (tCoords[1] * 2.0F))) { - case 0: - tAdjustVal = -32; - break; - case 1: - tAdjustVal = 32; - break; - case 2: - tAdjustVal = -1024; - break; - case 3: - tAdjustVal = 1024; - } + short tAdjustVal = switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + + 2 * (byte) (int) (tCoords[1] * 2.0F))) { + case 0 -> -32; + case 1 -> 32; + case 2 -> -1024; + case 3 -> 1024; + default -> 0; + }; int tPublicChannel = (aCoverVariable & PUBLIC_MASK) + tAdjustVal; diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java index 81af7b06d4..1e70efc5b8 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java @@ -51,18 +51,10 @@ public class GT_Cover_Shutter extends GT_CoverBehavior { aCoverVariable = 3; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, trans("082", "Open if work enabled")); - break; - case 1: - GT_Utility.sendChatToPlayer(aPlayer, trans("083", "Open if work disabled")); - break; - case 2: - GT_Utility.sendChatToPlayer(aPlayer, trans("084", "Only Output allowed")); - break; - case 3: - GT_Utility.sendChatToPlayer(aPlayer, trans("085", "Only Input allowed")); - break; + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, trans("082", "Open if work enabled")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, trans("083", "Open if work disabled")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, trans("084", "Only Output allowed")); + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, trans("085", "Only Input allowed")); } if (aTileEntity instanceof BaseMetaPipeEntity) { ((BaseMetaPipeEntity) aTileEntity).reloadLocks(); diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Vent.java b/src/main/java/gregtech/common/covers/GT_Cover_Vent.java index 184ac5bb57..800d3822de 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Vent.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Vent.java @@ -84,27 +84,18 @@ public class GT_Cover_Vent extends GT_CoverBehavior { return 0; } if (blockAtSide == Blocks.water || blockAtSide == Blocks.flowing_water) { - switch (mEfficiency) { - case 2: - chances = 10000; // 100% chances for Diamond reactor vent with water - break; - case 1: - chances = 5000; // 50% chances for Gold and Overclocked reactor vents with water - break; - default: - chances = 2500; // 25% chances for Basic reactor vent with water - break; - } + chances = switch (mEfficiency) { + case 2 -> 10000; // 100% chances for Diamond reactor vent with water + case 1 -> 5000; // 50% chances for Gold and Overclocked reactor vents with water + default -> 2500; // 25% chances for Basic reactor vent with water + }; } else if (blockAtSide.isAir(world, offsetX, offsetY, offsetZ)) { switch (mEfficiency) { - case 2: - chances = 2500; // 25% chances for Diamond reactor vent with air - break; - case 1: - chances = 1250; // 12.5% chances for Gold and Overclocked reactor vents with air - break; - default: + case 2 -> chances = 2500; // 25% chances for Diamond reactor vent with air + case 1 -> chances = 1250; // 12.5% chances for Gold and Overclocked reactor vents with air + default -> { return 0; // Basic reactor vent cannot be used with air + } } } else { return 0; // Vent cover need water or air diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java index f80fdc8e65..0ceaaeb887 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java @@ -13,8 +13,7 @@ public class GT_Cover_AdvancedRedstoneReceiverInternal extends GT_Cover_Advanced @Override public ReceiverData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity, long aTimer) { - if (aTileEntity instanceof IMachineProgress) { - IMachineProgress machine = ((IMachineProgress) aTileEntity); + if (aTileEntity instanceof IMachineProgress machine) { if (getRedstoneInput(aSide, aInputRedstone, aCoverID, aCoverVariable, aTileEntity) > 0) { machine.enableWorking(); } else { diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java index e619d72723..fecb188214 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java @@ -43,37 +43,42 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase(); switch (mode) { - case AND: + case AND -> { return (byte) (signals.values() .stream() .map(signal -> signal > 0) .reduce(true, (signalA, signalB) -> signalA && signalB) ? 15 : 0); - case NAND: + } + case NAND -> { return (byte) (signals.values() .stream() .map(signal -> signal > 0) .reduce(true, (signalA, signalB) -> signalA && signalB) ? 0 : 15); - case OR: + } + case OR -> { return (byte) (signals.values() .stream() .map(signal -> signal > 0) .reduce(false, (signalA, signalB) -> signalA || signalB) ? 15 : 0); - case NOR: + } + case NOR -> { return (byte) (signals.values() .stream() .map(signal -> signal > 0) .reduce(false, (signalA, signalB) -> signalA || signalB) ? 0 : 15); - case SINGLE_SOURCE: + } + case SINGLE_SOURCE -> { if (signals.values() .isEmpty()) { return 0; } - return signals.values() .iterator() .next(); - default: + } + default -> { return 0; + } } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java index 515a196b65..d567ea0ae5 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java @@ -50,24 +50,15 @@ public class GT_Cover_WirelessMaintenanceDetector extends if (tileEntity instanceof IGregTechTileEntity) { IMetaTileEntity m