diff options
Diffstat (limited to 'src/main/java/gregtech/common/gui')
| -rw-r--r-- | src/main/java/gregtech/common/gui/modularui/UIHelper.java | 52 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java | 15 |
2 files changed, 24 insertions, 43 deletions
diff --git a/src/main/java/gregtech/common/gui/modularui/UIHelper.java b/src/main/java/gregtech/common/gui/modularui/UIHelper.java index 2135d3686a..1337ce18ca 100644 --- a/src/main/java/gregtech/common/gui/modularui/UIHelper.java +++ b/src/main/java/gregtech/common/gui/modularui/UIHelper.java @@ -83,46 +83,30 @@ public class UIHelper { * @return Display positions for GUI, including border (18x18 size) */ public static List<Pos2d> getItemInputPositions(int itemInputCount) { - switch (itemInputCount) { - case 0: - return Collections.emptyList(); - case 1: - return getGridPositions(itemInputCount, 52, 24, 1, 1); - case 2: - return getGridPositions(itemInputCount, 34, 24, 2, 1); - case 3: - return getGridPositions(itemInputCount, 16, 24, 3, 1); - case 4: - return getGridPositions(itemInputCount, 34, 15, 2, 2); - case 5: - case 6: - return getGridPositions(itemInputCount, 16, 15, 3, 2); - default: - return getGridPositions(itemInputCount, 16, 6, 3); - } + return switch (itemInputCount) { + case 0 -> Collections.emptyList(); + case 1 -> getGridPositions(itemInputCount, 52, 24, 1, 1); + case 2 -> getGridPositions(itemInputCount, 34, 24, 2, 1); + case 3 -> getGridPositions(itemInputCount, 16, 24, 3, 1); + case 4 -> getGridPositions(itemInputCount, 34, 15, 2, 2); + case 5, 6 -> getGridPositions(itemInputCount, 16, 15, 3, 2); + default -> getGridPositions(itemInputCount, 16, 6, 3); + }; } /** * @return Display positions for GUI, including border (18x18 size) */ public static List<Pos2d> getItemOutputPositions(int itemOutputCount) { - switch (itemOutputCount) { - case 0: - return Collections.emptyList(); - case 1: - return getGridPositions(itemOutputCount, 106, 24, 1, 1); - case 2: - return getGridPositions(itemOutputCount, 106, 24, 2, 1); - case 3: - return getGridPositions(itemOutputCount, 106, 24, 3, 1); - case 4: - return getGridPositions(itemOutputCount, 106, 15, 2, 2); - case 5: - case 6: - return getGridPositions(itemOutputCount, 106, 15, 3, 2); - default: - return getGridPositions(itemOutputCount, 106, 6, 3); - } + return switch (itemOutputCount) { + case 0 -> Collections.emptyList(); + case 1 -> getGridPositions(itemOutputCount, 106, 24, 1, 1); + case 2 -> getGridPositions(itemOutputCount, 106, 24, 2, 1); + case 3 -> getGridPositions(itemOutputCount, 106, 24, 3, 1); + case 4 -> getGridPositions(itemOutputCount, 106, 15, 2, 2); + case 5, 6 -> getGridPositions(itemOutputCount, 106, 15, 3, 2); + default -> getGridPositions(itemOutputCount, 106, 6, 3); + }; } /** diff --git a/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java index 13bcc12504..4f9f19d49a 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java @@ -209,8 +209,7 @@ public class FluidDisplaySlotWidget extends SlotWidget { if (tStackSizedOne == null || tStackHeld.stackSize == 0) return null; int tOriginalFluidAmount = tTankStack.amount; ItemStack tFilledContainer = GT_Utility.fillFluidContainer(tTankStack, tStackSizedOne, true, false); - if (tFilledContainer == null && tStackSizedOne.getItem() instanceof IFluidContainerItem) { - IFluidContainerItem tContainerItem = (IFluidContainerItem) tStackSizedOne.getItem(); + if (tFilledContainer == null && tStackSizedOne.getItem() instanceof IFluidContainerItem tContainerItem) { int tFilledAmount = tContainerItem.fill(tStackSizedOne, tTankStack, true); if (tFilledAmount > 0) { tFilledContainer = tStackSizedOne; @@ -260,9 +259,8 @@ public class FluidDisplaySlotWidget extends SlotWidget { tStackEmptied = GT_Utility.getContainerForFilledItem(tStackSizedOne, false); tAmountTaken = aFluidHeld.amount; } - if (tStackEmptied == null && tStackSizedOne.getItem() instanceof IFluidContainerItem) { + if (tStackEmptied == null && tStackSizedOne.getItem() instanceof IFluidContainerItem container) { // either partially accepted, or is IFluidContainerItem - IFluidContainerItem container = (IFluidContainerItem) tStackSizedOne.getItem(); FluidStack tDrained = container.drain(tStackSizedOne, tFreeSpace, true); if (tDrained != null && tDrained.amount > 0) { // something is actually drained - change the cell and drop it to player @@ -319,8 +317,7 @@ public class FluidDisplaySlotWidget extends SlotWidget { } protected void lockFluid(ItemStack cursorStack) { - if (!(iHasFluidDisplay instanceof IFluidLockable)) return; - IFluidLockable mteToLock = (IFluidLockable) iHasFluidDisplay; + if (!(iHasFluidDisplay instanceof IFluidLockable mteToLock)) return; if (cursorStack == null) { if (!mteToLock.allowChangingLockedFluid(null)) return; @@ -417,7 +414,7 @@ public class FluidDisplaySlotWidget extends SlotWidget { /** * Sets function called before {@link #executeRealClick}. - * + * * @param beforeRealClick (click data, this widget) -> if allow click */ public FluidDisplaySlotWidget setBeforeRealClick( @@ -428,7 +425,7 @@ public class FluidDisplaySlotWidget extends SlotWidget { /** * Sets function called before {@link #executeDragAndDrop}. - * + * * @param beforeDragAndDrop (click data, this widget) -> if allow click */ public FluidDisplaySlotWidget setBeforeDragAndDrop( @@ -439,7 +436,7 @@ public class FluidDisplaySlotWidget extends SlotWidget { /** * Sets function called before both of {@link #executeRealClick} and {@link #executeDragAndDrop}. - * + * * @param beforeClick (click data, this widget) -> if allow click */ public FluidDisplaySlotWidget setBeforeClick(BiFunction<ClickData, FluidDisplaySlotWidget, Boolean> beforeClick) { |