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 --- .../gregtech/api/multitileentity/multiblock/base/Controller.java | 7 ++----- .../api/multitileentity/multiblock/base/MultiBlockPart.java | 7 +++---- .../multiblock/base/StackableModularController.java | 2 +- .../api/multitileentity/multiblock/base/WallShareablePart.java | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) (limited to 'src/main/java/gregtech/api/multitileentity/multiblock/base') diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java index 1eaae5997d..d6b4ef7fe3 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java @@ -158,7 +158,7 @@ public abstract class Controller, P extends MuTEProce } protected void calculateTier() { - if (functionalCasings.size() == 0) { + if (functionalCasings.isEmpty()) { return; } double sum = 0; @@ -1018,10 +1018,7 @@ public abstract class Controller, P extends MuTEProce @Override public GTPacketMultiTileEntity getClientDataPacket() { - final GTPacketMultiTileEntity packet = super.getClientDataPacket(); - - return packet; - + return super.getClientDataPacket(); } @Override diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java index 2c3cafc67d..faf3f1ae8a 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java @@ -347,8 +347,8 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity if (te instanceof MultiBlockPart part) { final IMultiBlockController tController = part.getTarget(false); if (tController != null) tController.onStructureChange(); - } else if (te instanceof IMultiBlockController controller) { - controller.onStructureChange(); + } else if (te instanceof IMultiBlockController blockController) { + blockController.onStructureChange(); } } } @@ -675,8 +675,7 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity if (!canOpenControllerGui()) return guiProvider; if (uiContext.getPlayer() .isSneaking()) return guiProvider; - GUIProvider controllerGUI = controller.getGUI(uiContext); - return controllerGUI; + return controller.getGUI(uiContext); } @Override diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/StackableModularController.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/StackableModularController.java index 1dfd497151..5e7a928399 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/StackableModularController.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/StackableModularController.java @@ -49,7 +49,7 @@ public abstract class StackableModularController mucCounters = getMucMap(); - mucCounters.forEach((type, casingCount) -> { Arrays.fill(casingCount, 0); }); + mucCounters.forEach((type, casingCount) -> Arrays.fill(casingCount, 0)); } // Returns the cheapest MUC that is possible for the multi, which gets the minimum bonuses. diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/WallShareablePart.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/WallShareablePart.java index 238ce1eb2d..c736456437 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/WallShareablePart.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/WallShareablePart.java @@ -17,7 +17,7 @@ public class WallShareablePart extends MultiBlockPart { @Override public void setTarget(IMultiBlockController newController, int allowedModes) { - if (targets.size() >= 1) { + if (!targets.isEmpty()) { this.allowedModes = 0; setMode((byte) 0); controller.invalidate(); @@ -30,7 +30,7 @@ public class WallShareablePart extends MultiBlockPart { return; } - targets.add(new WeakTargetRef(IMultiBlockController.class, true)); + targets.add(new WeakTargetRef<>(IMultiBlockController.class, true)); } @Override -- cgit