From fddd3d15b31f622b19ce8d1579598c99a9017686 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Wed, 3 Feb 2016 19:57:36 +0100 Subject: [PATCH] change pattern gui a bit --- .../storagecraft/container/ContainerGrid.java | 10 +++++----- src/main/java/storagecraft/gui/GuiGrid.java | 6 +----- .../textures/gui/pattern_grid.png | Bin 2053 -> 2079 bytes 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/storagecraft/container/ContainerGrid.java b/src/main/java/storagecraft/container/ContainerGrid.java index 66094e812..abe2b7441 100644 --- a/src/main/java/storagecraft/container/ContainerGrid.java +++ b/src/main/java/storagecraft/container/ContainerGrid.java @@ -41,7 +41,7 @@ public class ContainerGrid extends ContainerBase } else if (grid.getType() == EnumGridType.PATTERN) { - int x = 8; + int x = 25; int y = 106; for (int i = 0; i < 9; ++i) @@ -53,14 +53,14 @@ public class ContainerGrid extends ContainerBase if ((i + 1) % 3 == 0) { y += 18; - x = 8; + x = 25; } } - addSlotToContainer(new SlotDisabled(grid.getPatternCraftingResultInventory(), 0, 116 + 4, 120 + 4)); + addSlotToContainer(new SlotDisabled(grid.getPatternCraftingResultInventory(), 0, 133 + 4, 120 + 4)); - addSlotToContainer(new SlotFiltered(grid.getPatternInventory(), 0, 152, 105, StorageCraftItems.PATTERN)); - addSlotToContainer(new SlotOutput(grid.getPatternInventory(), 1, 152, 142)); + addSlotToContainer(new SlotFiltered(grid.getPatternInventory(), 0, 137, 98, StorageCraftItems.PATTERN)); + addSlotToContainer(new SlotOutput(grid.getPatternInventory(), 1, 137, 150)); } } } diff --git a/src/main/java/storagecraft/gui/GuiGrid.java b/src/main/java/storagecraft/gui/GuiGrid.java index 8b736f058..4cd77e05a 100644 --- a/src/main/java/storagecraft/gui/GuiGrid.java +++ b/src/main/java/storagecraft/gui/GuiGrid.java @@ -114,14 +114,10 @@ public class GuiGrid extends GuiBase public boolean isHoveringOverClear(int mouseX, int mouseY) { - if (grid.getType() == EnumGridType.CRAFTING) + if (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) { return inBounds(81, 105, 7, 7, mouseX, mouseY); } - else if (grid.getType() == EnumGridType.PATTERN) - { - return inBounds(64, 105, 7, 7, mouseX, mouseY); - } return false; } diff --git a/src/main/resources/assets/storagecraft/textures/gui/pattern_grid.png b/src/main/resources/assets/storagecraft/textures/gui/pattern_grid.png index bcda278cf8b0d7eee4fa9f61627b9554dacc7e16..2e87756078aa3f6448602603015bb9fd33be7616 100644 GIT binary patch delta 781 zcmZn_m@lxQm8HJb)5S5QBJS<&#-c|G60Q$JUjMc)$~q%za)~ePU$)|$&DO%=*=+k4 znkJRcdcJc0vmeVUcYT@cnDFZ5&-i_hS@Rg~?=7)v<m)J%$gAHMv&SuV?&zE@<9RcWsH@ z+Fp=iFql;y0b?>Stgo(I+dG4C%lk>j@7}(cv0AE-Ib-S4$$6~GysGJUZeKJEH+{r* z!OMH{JXS^F3;Vp!?byCJd0o~K-UU;q8RtFg?#tgZYw_>|bzrA+7 zYTB z0kTln@ieScDO#G{<;?s-WaXuuKv9OX);b`HVea3Z{_i++P1!%ZWVrCzk8y#u95YbZ zvIb0!;i;Y?T~g@Z>IT}`_|-ztdiEVrA?FA zK*}VfAEYqOnD)6W*yh03_2=$7Pi9VtWZk>P&uU%eKgI=m%x4epS=Y%Q~lo FCIA5wL%sk2 delta 796 zcmbO)&?>N@m8Cx0)5S5QBJS<&#-c?ABCUz5zW$Y;$u&oPDL;UNkbynBxY#y;)_&)2> z+YDupVi0I}CMyPE0m%ceo*GzymdTCG2V^yp_AqdpB zpt7A6q*bo_$a85uOFL(`OatyC09b+#&6ty*4H0 z%x^c4IbZ-yB@oViKffy-k`BN1OdsFt>)X0a(7Yim>g0|Y-zN*QimU9KJ7u0~TQw!)FMIFQKZcIk%x6E$_u>W_=;`X`vd$@?2>@?=P1^tf