From a6d711019cf8b694f38776078aa2434b68d5d029 Mon Sep 17 00:00:00 2001 From: くぁーりぃ <39122497+Quarri6343@users.noreply.github.com> Date: Sat, 10 Sep 2022 01:30:36 +0900 Subject: Move GT Tank button position (#1363) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * move digital tank button position * spotless * spotlessApply (#1364) Co-authored-by: くぁーりぃ <39122497+Quarri6343@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../java/gregtech/api/gui/GT_Container_DigitalTank.java | 6 +++--- .../gregtech/api/gui/GT_GUIContainer_DigitalTank.java | 15 ++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'src/main/java/gregtech/api') diff --git a/src/main/java/gregtech/api/gui/GT_Container_DigitalTank.java b/src/main/java/gregtech/api/gui/GT_Container_DigitalTank.java index b4cdf698dc..59cc42fb61 100644 --- a/src/main/java/gregtech/api/gui/GT_Container_DigitalTank.java +++ b/src/main/java/gregtech/api/gui/GT_Container_DigitalTank.java @@ -31,9 +31,9 @@ public class GT_Container_DigitalTank extends GT_Container_BasicTank { addSlotToContainer(new GT_Slot_Render(mTileEntity, 2, 59, 42)); addSlotToContainer(new GT_Slot_Holo(mTileEntity, 3, 8, 64, false, true, 1)); addSlotToContainer(new GT_Slot_Holo(mTileEntity, 4, 26, 64, false, true, 1)); - addSlotToContainer(new GT_Slot_Holo(mTileEntity, 5, 44, 64, false, true, 1)); - addSlotToContainer(new GT_Slot_Holo(mTileEntity, 6, 62, 64, false, true, 1)); - addSlotToContainer(new GT_Slot_Holo(mTileEntity, 7, 80, 64, false, true, 1)); + addSlotToContainer(new GT_Slot_Holo(mTileEntity, 5, 152, 8, false, true, 1)); + addSlotToContainer(new GT_Slot_Holo(mTileEntity, 6, 152, 26, false, true, 1)); + addSlotToContainer(new GT_Slot_Holo(mTileEntity, 7, 44, 64, false, true, 1)); } @Override diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_DigitalTank.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_DigitalTank.java index c1e90ed68a..08248b5333 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_DigitalTank.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_DigitalTank.java @@ -50,16 +50,17 @@ public class GT_GUIContainer_DigitalTank extends GT_GUIContainerMetaTile_Machine list.add(StatCollector.translateToLocal("GT5U.machines.digitaltank.lockfluid.tooltip1")); } if (x >= 44 && x <= 60) { + list.add(StatCollector.translateToLocal("GT5U.machines.digitaltank.inputfromoutput.name")); + } + } else if (x >= 152 && x <= 168) { + if (y >= 12 && y <= 28) { list.add(StatCollector.translateToLocal("GT5U.machines.digitaltank.voidoverflow.name")); list.add(StatCollector.translateToLocal("GT5U.machines.digitaltank.voidoverflow.tooltip")); } - if (x >= 62 && x <= 78) { + if (y >= 30 && y <= 46) { list.add(StatCollector.translateToLocal("GT5U.machines.digitaltank.voidfull.name")); list.add(StatCollector.translateToLocal("GT5U.machines.digitaltank.voidfull.tooltip")); } - if (x >= 80 && x <= 96) { - list.add(StatCollector.translateToLocal("GT5U.machines.digitaltank.inputfromoutput.name")); - } } if (!list.isEmpty()) drawHoveringText(list, x2, y2, fontRendererObj); } @@ -91,13 +92,13 @@ public class GT_GUIContainer_DigitalTank extends GT_GUIContainerMetaTile_Machine drawTexturedModalRect(x + 7, y + 63, 176, 18, 18, 18); } if (((GT_Container_DigitalTank) mContainer).mVoidFluidPart) { - drawTexturedModalRect(x + 43, y + 63, 176, 36, 18, 18); + drawTexturedModalRect(x + 151, y + 7, 176, 36, 18, 18); } if (((GT_Container_DigitalTank) mContainer).mVoidFluidFull) { - drawTexturedModalRect(x + 61, y + 63, 176, 54, 18, 18); + drawTexturedModalRect(x + 151, y + 25, 176, 54, 18, 18); } if (((GT_Container_DigitalTank) mContainer).mAllowInputFromOutputSide) { - drawTexturedModalRect(x + 79, y + 63, 176, 72, 18, 18); + drawTexturedModalRect(x + 43, y + 63, 176, 72, 18, 18); } } } -- cgit