From 6928a1088deb90c2c23fc1030e3e1914fd60019a Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 1 May 2016 12:00:15 +0200 Subject: [PATCH] Increase crafting monitor height --- .../container/ContainerCraftingMonitor.java | 2 +- .../gui/GuiCraftingMonitor.java | 14 +++++++------- .../textures/gui/crafting_monitor.png | Bin 1835 -> 1841 bytes 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/refinedstorage/container/ContainerCraftingMonitor.java b/src/main/java/refinedstorage/container/ContainerCraftingMonitor.java index 1515b8a5c..c9864b0c9 100755 --- a/src/main/java/refinedstorage/container/ContainerCraftingMonitor.java +++ b/src/main/java/refinedstorage/container/ContainerCraftingMonitor.java @@ -6,6 +6,6 @@ public class ContainerCraftingMonitor extends ContainerBase { public ContainerCraftingMonitor(EntityPlayer player) { super(player); - addPlayerInventory(8, 99); + addPlayerInventory(8, 129); } } diff --git a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java index 9d833ded7..aacab45a8 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java +++ b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java @@ -10,14 +10,14 @@ import refinedstorage.tile.autocrafting.TileCraftingMonitor; import java.util.List; public class GuiCraftingMonitor extends GuiBase { - public static final int VISIBLE_ROWS = 2; + public static final int VISIBLE_ROWS = 3; private TileCraftingMonitor craftingMonitor; - private Scrollbar scrollbar = new Scrollbar(157, 20, 12, 59); + private Scrollbar scrollbar = new Scrollbar(157, 20, 12, 89); public GuiCraftingMonitor(ContainerCraftingMonitor container, TileCraftingMonitor craftingMonitor) { - super(container, 176, 181); + super(container, 176, 211); this.craftingMonitor = craftingMonitor; } @@ -52,7 +52,7 @@ public class GuiCraftingMonitor extends GuiBase { scrollbar.update(this, mouseX, mouseY); drawString(7, 7, t("gui.refinedstorage:crafting_monitor")); - drawString(7, 87, t("container.inventory")); + drawString(7, 114, t("container.inventory")); int ox = 11; int x = ox; @@ -64,7 +64,7 @@ public class GuiCraftingMonitor extends GuiBase { List tasks = craftingMonitor.getTasks(); - for (int i = 0; i < 4; ++i) { + for (int i = 0; i < 6; ++i) { if (slot < tasks.size()) { ItemStack task = tasks.get(slot); @@ -79,7 +79,7 @@ public class GuiCraftingMonitor extends GuiBase { GlStateManager.popMatrix(); } - if (i == 1) { + if (i == 1 || i == 3) { x = ox; y += 30; } else { @@ -91,7 +91,7 @@ public class GuiCraftingMonitor extends GuiBase { } public int getOffset() { - return (int) (scrollbar.getCurrentScroll() / 59f * (float) getRows()); + return (int) (scrollbar.getCurrentScroll() / 89f * (float) getRows()); } private int getRows() { diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png index b293e451bf2d85af5625bc1c7615d0eb60dbfbf5..cd9750197cc56f61f67f42d7f1eb06506b08cb48 100755 GIT binary patch literal 1841 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6`sfJr)Te4I{p%ZPh>_i4xa{lHmNb zlJdl&REC1Y%)Ao4ywnl}6Fmbx%N*l6KL!S-7Ec$)kczmscQ0lsISRC0j7+}vz5db7 z(Ek?P_c|^=^$UKk9B@HAxzd2es!`|lt}~ad_NB(^eGXCBaOTTD{ritu^BC@LF0tYj z-@)|cr7#NvL&FOkBFKl5Aq%7S<%R8L=fX!qPRYp46IV*KP;9r7cw?maN{ zzyM|qh!apg+4$8G35D-^(XHjyGo$tAhA=;w{B6aD!+-8!vtYqHwe%~Vh6iLI4t&k7 zP`*C8_4{t9&gEwpACk{_KNn&V1H-288(>U^S9!(mb48fX2r@A2W%N^JIQ@0!WfQpv z@5ATWI(xGo_!?~B{e7u>*oPB4nI_ycW0;xCObyC6`nrARwcumBv+jKdImOe}&t;uc GLK6T{^c&Ow literal 1835 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6`sfJr)Te4I{p%ZPh>_i4xa{lHmNb zlJdl&REC1Y%)Ao4ywnl}6Fmbx%N*l6KL!S-I!_nJkczmscP?h#b`Wt5JX-kb|NkV@ zP5x_|;(JWZzZP6yR*)b!<>Vnn1+QtPvClGP?{CtZUa2Jzk@oAKe*9zBbqw*FORRXs zZ!moN!pX$I;PB2?2b3sJTvq1*QaitI0Fni)KPon#0~C?=aA%3=KB5O+X4{Hjo0lKY)G0 z{>bg+=idE&J~^vlPt~6C%I(4+Ng#mv48(3Y{$Ke^p88RS%J-YXf8?p}{(i;N)WI(E zJD2^L^&oG7LDBm}P$>@vSN5KiEDhqB@LjLE^?li$22 zYyO|!oSw0g;f5XS=91lCPH@RthBIu+WuA~L-H>yeA>}rk!fi8#o7)&qY~yvP~ bEv0|CS6|89b2~;p9~1zdu6{1-oD!M