From 9b6858563b88aa1c26e8af15c6b7503fae8e3c76 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 22 Jul 2018 21:58:35 +0200 Subject: [PATCH] Made the Crafting Preview window bigger --- CHANGELOG.md | 1 + .../gui/GuiCraftingPreview.java | 28 +++++++++--------- .../textures/gui/crafting_preview.png | Bin 1767 -> 1730 bytes 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea109819c..091750194 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### 1.6.1 - Added fluid autocrafting (raoulvdberge) +- Made the Crafting Preview window bigger (raoulvdberge) - Updated Russian translation (kellixon) ### 1.6 diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java index 1791f9298..02c11ed81 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java @@ -31,13 +31,13 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -// TODO: Make bigger/resizeable and allow more space? public class GuiCraftingPreview extends GuiBase { public class CraftingPreviewElementDrawers extends ElementDrawers { private IElementDrawer overlayDrawer = (x, y, colour) -> { GlStateManager.color(1, 1, 1, 1); GlStateManager.disableLighting(); - drawRect(x, y, x + 67, y + 29, colour); + + drawRect(x, y, x + 73, y + 29, colour); }; @Override @@ -46,7 +46,7 @@ public class GuiCraftingPreview extends GuiBase { } } - private static final int VISIBLE_ROWS = 4; + private static final int VISIBLE_ROWS = 5; private List stacks; private GuiScreen parent; @@ -70,7 +70,7 @@ public class GuiCraftingPreview extends GuiBase { public boolean canInteractWith(EntityPlayer player) { return false; } - }, 168, 171); + }, 254, 201); this.stacks = new ArrayList<>(stacks); this.parent = parent; @@ -79,13 +79,13 @@ public class GuiCraftingPreview extends GuiBase { this.quantity = quantity; this.fluids = fluids; - this.scrollbar = new Scrollbar(149, 20, 12, 119); + this.scrollbar = new Scrollbar(235, 20, 12, 168); } @Override public void init(int x, int y) { - cancelButton = addButton(x + 16, y + 144, 50, 20, t("gui.cancel")); - startButton = addButton(x + 85, y + 144, 50, 20, t("misc.refinedstorage:start")); + cancelButton = addButton(x + 55, y + 201 - 20 - 7, 50, 20, t("gui.cancel")); + startButton = addButton(x + 129, y + 201 - 20 - 7, 50, 20, t("misc.refinedstorage:start")); startButton.enabled = stacks.stream().noneMatch(ICraftingPreviewElement::hasMissing) && getErrorType() == null; } @@ -117,7 +117,7 @@ public class GuiCraftingPreview extends GuiBase { drawTexture(x, y, 0, 0, screenWidth, screenHeight); if (getErrorType() != null) { - drawRect(x + 7, y + 20, x + 142, y + 139, 0xFFDBDBDB); + drawRect(x + 7, y + 20, x + 228, y + 169, 0xFFDBDBDB); } } @@ -186,7 +186,7 @@ public class GuiCraftingPreview extends GuiBase { this.hoveringStack = null; this.hoveringFluid = null; - for (int i = 0; i < 8; ++i) { + for (int i = 0; i < 3 * 5; ++i) { if (slot < stacks.size()) { ICraftingPreviewElement stack = stacks.get(slot); @@ -201,17 +201,17 @@ public class GuiCraftingPreview extends GuiBase { } } - if (i % 2 == 1) { - x -= 68; + if ((i + 1) % 3 == 0) { + x = 7; y += 30; } else { - x += 68; + x += 74; } slot++; } - if (!startButton.enabled && inBounds(85, 144, 50, 20, mouseX, mouseY)) { + if (!startButton.enabled && inBounds(startButton.x - guiLeft, startButton.y - guiTop, startButton.width, startButton.height, mouseX, mouseY)) { drawTooltip(mouseX, mouseY, t("gui.refinedstorage:crafting_preview.force_start")); } } @@ -257,7 +257,7 @@ public class GuiCraftingPreview extends GuiBase { } private int getRows() { - return Math.max(0, (int) Math.ceil((float) stacks.size() / 2F)); + return Math.max(0, (int) Math.ceil((float) stacks.size() / 3F)); } private void close() { diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_preview.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_preview.png index 0a9c64f19d025f091a2d1538a14bf01b16f81bbb..29227bc9bcc90d5e4ff339164ae11aa95ab79c74 100755 GIT binary patch delta 487 zcmaFPdx&>K2n*L%1_r*ZjLC&FPE3wtF{(E*{HTyQm4Sgt#M8wwq$2L^&4XTt10-55 zMy#&=uip2pY{IKmAH2n9epc+!bllN?%y(Pu{ixgh+iG`j-Nv%*-sk&ve2uIhF5Y~) z=^x{jdGZW!&=7N-m4Tr_zF~WCdF=DENB2Hn9M3TS|JCZUd;k9~{aya&?XL?T1?%DJ z!Hg4YKQp8}XFPF^87ltdjW(F|f#XBnvw4giS8e(o%H$f}*g)kS&h2A@GLfhW(I7Lb zbsg?4p0_!jA<6W-@`SnU3fBBkH4`?khq5L{@F+jIR>`pGa~$`C?<=0ak!*-K`vxs{?cH;o>51(t%W5`-u+KJ3H$fU<_FDetf-w=aLmtT9_e&YB-(DHbu>brI z_60@=*`4dS;T(r`uc1DvV$@^2(Rbg=nqgmk(bel^>=yf2=hm{$uVoBjpWM%8Ke>TT dTw>|l-{P-&mt?(i`BDfn!_(EzWt~$(696|6s`dZ? delta 511 zcmX@a`-XxbM`piQe9q|9X4;^=j~_^}A2_aLd;a%X`}cj*>lhxKub6+c ze&W6P$NHad@0*TL24pcXD6mU#I+Uq^*$fO0@BZ>YnIN+q80@aUuxqesoLIxUNtqEU zQ}jL^%4(QXUIk?`FjyY&U;rz6pw{rms=E9;;}g!FC)yKaIe|**LCPjn+k+en0#J8@ z*(Vs?m>{am8J}FgxqCOif`5WaeB&Drur$zjcYaGknF`P6%0Zb74txee4PZq(*dP3i zS|a@5|K&d%2Oa_42~+k&i<=#&e@?j-*qswr>&O6g7u|aa@{7Z|O$7`LCCoN@tT+0; z$M1X1@bB+aDedjCoCP&pVee~iXz%*4w%&bmBb(;r32ahGSU_^xw)gdnJ5MfrvgWhi QRFH!_UHx3vIVCg!01pzbJOBUy