aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/covers
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-01 20:06:12 +0100
committerGitHub <noreply@github.com>2023-04-01 19:06:12 +0000
commitb088958c9f6935d356b6c087c8e8106b400aa24f (patch)
treebe608fac08ba158f1226a4fb9f5b1ed459bac2a9 /src/main/java/gregtech/common/covers
parente52cd9c3458584e58073df5cd9cde1302994f266 (diff)
downloadGT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.tar.gz
GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.tar.bz2
GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.zip
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
Diffstat (limited to 'src/main/java/gregtech/common/covers')
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java5
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java101
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Crafting.java10
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java44
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Drain.java24
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java62
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java36
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java3
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java3
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java6
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java76
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java3
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java88
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java15
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Pump.java101
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java28
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java4
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java22
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java4
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java23
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Shutter.java16
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Vent.java27
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java3
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java19
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java20
25 files changed, 276 insertions, 467 deletions
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_Cover_EUMeter.EUMe
int num = (aCoverVariable.getNum() + (aPlayer.isSneaking() ? -1 : 1) + EnergyType.values().length * 2)
% (EnergyType.values().length * 2);
switch (num) {
- case 0:
- GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("031", "Normal Universal Storage"));
- break;
- case 1:
- GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("032", "Inverted Universal Storage"));
- break;
- case 2:
- GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("033", "Normal Electricity Storage"));
- break;
- case 3:
- GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("034", "Inverted Electricity Storage"));
- break;
- case 4:
- GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("035", "Normal Steam Storage"));
- break;
- case 5:
- GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("036", "Inverted Steam Storage"));
- break;
- case 6:
- GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("037", "Normal Average Electric Input"));
- break;
- case 7:
- GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("038", "Inverted Average Electric Input"));
- break;
- case 8:
- GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("039", "Normal Average Electric Output"));
- break;
- case 9:
- GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("040", "Inverted Average Electric Output"));
- break;
- case 10:
- GT_Utility.sendChatToPlayer(
- aPlayer,
- GT_Utility.trans("041", "Normal Electricity Storage(Including Batteries)"));
- break;
- case 11:
- GT_Utility.sendChatToPlayer(
- aPlayer,
- GT_Utility.trans("042", "Inverted Electricity Storage(Including Batteries)"));
- break;
+ case 0 -> 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<GT_Cover_EUMeter.EUMe
GT_Utility.trans("261", "Electricity Storage(Including Batteries)"), (te) -> {
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<GT_Cover_EUMeter.EUMe
}, (te) -> {
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<GT_Cover_
protected void addTitleToUI(ModularWindow.Builder builder) {}
private int getNewCoverVariable(int id, FacadeData coverVariable) {
- switch (id) {
- case 0:
- return coverVariable.mFlags ^ 0x1;
- case 1:
- return coverVariable.mFlags ^ 0x2;
- case 2:
- return coverVariable.mFlags ^ 0x4;
- case 3:
- return coverVariable.mFlags ^ 0x8;
- }
- return coverVariable.mFlags;
+ return switch (id) {
+ case 0 -> 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_Cover_FluidLi
@Override
public void loadDataFromNBT(NBTBase aNBT) {
- if (aNBT instanceof NBTTagCompound) {
- NBTTagCompound tag = (NBTTagCompound) aNBT;
+ if (aNBT instanceof NBTTagCompound tag) {
this.threshold = tag.getFloat("threshold");
}
}
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
index d02f098e3b..d233d741ae 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
@@ -557,8 +557,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
@Override
public void loadDataFromNBT(NBTBase aNBT) {
- if (!(aNBT instanceof NBTTagCompound)) return; // not very good...
- NBTTagCompound tag = (NBTTagCompound) aNBT;
+ if (!(aNBT instanceof NBTTagCompound tag)) return; // not very good...
speed = tag.getInteger("mSpeed");
tickRate = tag.getInteger("mTickRate");
condition = Conditional.VALUES[tag.getByte("mCondition")];
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java
index bb140b37a8..3457649957 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java
@@ -191,8 +191,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
return null;
}
- if (container.getItem() instanceof IFluidContainerItem) {
- final IFluidContainerItem containerItem = (IFluidContainerItem) container.getItem();
+ if (container.getItem() instanceof IFluidContainerItem containerItem) {
final int filled = tank.fill(side, fluidToFill, true);
if (filled == 0) {
return null;
@@ -218,8 +217,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
return null;
}
- if (container.getItem() instanceof IFluidContainerItem) {
- final IFluidContainerItem containerItem = (IFluidContainerItem) container.getItem();
+ if (container.getItem() instanceof IFluidContainerItem containerItem) {
final int filled = Math.min(
Optional.ofNullable(
tank.drain(
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
index 65e036a110..a067674322 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
@@ -92,26 +92,17 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
}
public String getFilterMode(int aFilterMode) {
- switch (aFilterMode) {
- case FILTER_INPUT_DENY_OUTPUT:
- return GT_Utility.trans("043", "Filter input, Deny output");
- case INVERT_INPUT_DENY_OUTPUT:
- return GT_Utility.trans("044", "Invert input, Deny output");
- case FILTER_INPUT_ANY_OUTPUT:
- return GT_Utility.trans("045", "Filter input, Permit any output");
- case INVERT_INPUT_ANY_OUTPUT:
- return GT_Utility.trans("046", "Invert input, Permit any output");
- case DENY_INPUT_FILTER_OUTPUT:
- return GT_Utility.trans("307", "Deny input, Filter output");
- case DENY_INPUT_INVERT_OUTPUT:
- return GT_Utility.trans("308", "Deny input, Invert output");
- case ANY_INPUT_FILTER_OUTPUT:
- return GT_Utility.trans("309", "Permit any input, Filter output");
- case ANY_INPUT_INVERT_OUTPUT:
- return GT_Utility.trans("310", "Permit any input, Invert output");
- default:
- return ("UNKNOWN");
- }
+ return switch (aFilterMode) {
+ case FILTER_INPUT_DENY_OUTPUT -> 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<GT_Cover_Fluidfil
}
private int getNewFilterMode(int id, FluidFilterData coverVariable) {
- switch (id) {
- case 0:
- return (coverVariable.mFilterMode & 0x3);
- case 1:
- return (coverVariable.mFilterMode | 0x4);
- case 2:
- return (coverVariable.mFilterMode & 0x5);
- case 3:
- return (coverVariable.mFilterMode | 0x2);
- case 4:
-