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 --- .../gtPlusPlus/core/container/ContainerCircuitProgrammer.java | 4 ++-- .../java/gtPlusPlus/core/container/ContainerFishTrap.java | 4 ++-- .../java/gtPlusPlus/core/container/ContainerPestKiller.java | 11 ++++------- .../java/gtPlusPlus/core/container/ContainerProjectTable.java | 8 ++------ .../java/gtPlusPlus/core/container/ContainerSuperJukebox.java | 4 ++-- .../core/container/ContainerVolumetricFlaskSetter.java | 8 ++++---- 6 files changed, 16 insertions(+), 23 deletions(-) (limited to 'src/main/java/gtPlusPlus/core/container') diff --git a/src/main/java/gtPlusPlus/core/container/ContainerCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/container/ContainerCircuitProgrammer.java index 9afccfb0f4..6e1da7bc61 100644 --- a/src/main/java/gtPlusPlus/core/container/ContainerCircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerCircuitProgrammer.java @@ -137,7 +137,7 @@ public class ContainerCircuitProgrammer extends Container { @Override public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) { ItemStack var3 = null; - final Slot var4 = (Slot) this.inventorySlots.get(par2); + final Slot var4 = this.inventorySlots.get(par2); if ((var4 != null) && var4.getHasStack()) { final ItemStack var5 = var4.getStack(); @@ -153,7 +153,7 @@ public class ContainerCircuitProgrammer extends Container { */ if (var5.stackSize == 0) { - var4.putStack((ItemStack) null); + var4.putStack(null); } else { var4.onSlotChanged(); } diff --git a/src/main/java/gtPlusPlus/core/container/ContainerFishTrap.java b/src/main/java/gtPlusPlus/core/container/ContainerFishTrap.java index 1a9344c08c..08b6ee2ebb 100644 --- a/src/main/java/gtPlusPlus/core/container/ContainerFishTrap.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerFishTrap.java @@ -95,7 +95,7 @@ public class ContainerFishTrap extends Container { @Override public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) { ItemStack var3 = null; - final Slot var4 = (Slot) this.inventorySlots.get(par2); + final Slot var4 = this.inventorySlots.get(par2); if ((var4 != null) && var4.getHasStack()) { final ItemStack var5 = var4.getStack(); @@ -111,7 +111,7 @@ public class ContainerFishTrap extends Container { */ if (var5.stackSize == 0) { - var4.putStack((ItemStack) null); + var4.putStack(null); } else { var4.onSlotChanged(); } diff --git a/src/main/java/gtPlusPlus/core/container/ContainerPestKiller.java b/src/main/java/gtPlusPlus/core/container/ContainerPestKiller.java index 6f63a1d04e..546c367401 100644 --- a/src/main/java/gtPlusPlus/core/container/ContainerPestKiller.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerPestKiller.java @@ -83,10 +83,7 @@ public class ContainerPestKiller extends Container { @Override public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) { - boolean fluid = false; - if (aSlotIndex == 2) { - fluid = true; - } + boolean fluid = aSlotIndex == 2; if (!fluid) { return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer); } else { @@ -111,7 +108,7 @@ public class ContainerPestKiller extends Container { @Override public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) { ItemStack var3 = null; - final Slot var4 = (Slot) this.inventorySlots.get(par2); + final Slot var4 = this.inventorySlots.get(par2); if ((var4 != null) && var4.getHasStack()) { final ItemStack var5 = var4.getStack(); @@ -127,7 +124,7 @@ public class ContainerPestKiller extends Container { */ if (var5.stackSize == 0) { - var4.putStack((ItemStack) null); + var4.putStack(null); } else { var4.onSlotChanged(); } @@ -148,7 +145,7 @@ public class ContainerPestKiller extends Container { return super.func_94530_a(p_94530_1_, p_94530_2_); } - private class GT_Slot_Render extends Slot { + private static class GT_Slot_Render extends Slot { public final int mSlotIndex; public boolean mEnabled = true; diff --git a/src/main/java/gtPlusPlus/core/container/ContainerProjectTable.java b/src/main/java/gtPlusPlus/core/container/ContainerProjectTable.java index 306c6f0026..05f4182833 100644 --- a/src/main/java/gtPlusPlus/core/container/ContainerProjectTable.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerProjectTable.java @@ -178,15 +178,11 @@ public class ContainerProjectTable extends Container { } public ItemStack getOutputContent() { - ItemStack output = this.craftResult.getStackInSlot(0); - if (output != null) { - return output; - } - return null; + return this.craftResult.getStackInSlot(0); } public ItemStack[] getInputComponents() { - ItemStack inputs[] = new ItemStack[9]; + ItemStack[] inputs = new ItemStack[9]; for (int r = 0; r < this.craftMatrix.getSizeInventory(); r++) { ItemStack temp = this.craftMatrix.getStackInSlot(r); inputs[r] = temp; diff --git a/src/main/java/gtPlusPlus/core/container/ContainerSuperJukebox.java b/src/main/java/gtPlusPlus/core/container/ContainerSuperJukebox.java index 45782f1384..04ea296e35 100644 --- a/src/main/java/gtPlusPlus/core/container/ContainerSuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerSuperJukebox.java @@ -134,7 +134,7 @@ public class ContainerSuperJukebox extends Container { @Override public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) { ItemStack var3 = null; - final Slot var4 = (Slot) this.inventorySlots.get(par2); + final Slot var4 = this.inventorySlots.get(par2); if ((var4 != null) && var4.getHasStack()) { final ItemStack var5 = var4.getStack(); @@ -150,7 +150,7 @@ public class ContainerSuperJukebox extends Container { */ if (var5.stackSize == 0) { - var4.putStack((ItemStack) null); + var4.putStack(null); } else { var4.onSlotChanged(); } diff --git a/src/main/java/gtPlusPlus/core/container/ContainerVolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/container/ContainerVolumetricFlaskSetter.java index bf1f8c4133..1a517e6761 100644 --- a/src/main/java/gtPlusPlus/core/container/ContainerVolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerVolumetricFlaskSetter.java @@ -104,7 +104,7 @@ public class ContainerVolumetricFlaskSetter extends Container { @Override public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) { ItemStack var3 = null; - final Slot var4 = (Slot) this.inventorySlots.get(par2); + final Slot var4 = this.inventorySlots.get(par2); if ((var4 != null) && var4.getHasStack()) { final ItemStack var5 = var4.getStack(); @@ -120,7 +120,7 @@ public class ContainerVolumetricFlaskSetter extends Container { */ if (var5.stackSize == 0) { - var4.putStack((ItemStack) null); + var4.putStack(null); } else { var4.onSlotChanged(); } @@ -159,8 +159,8 @@ public class ContainerVolumetricFlaskSetter extends Container { @Override public void updateProgressBar(int par1, int par2) { super.updateProgressBar(par1, par2); - switch (par1) { - case 0 -> mCustomValue = (short) par2; + if (par1 == 0) { + mCustomValue = (short) par2; } } -- cgit