From 96cb48acddf5a496e8c4d5138a6fa24041366e73 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 4 Jul 2016 20:14:07 +0200 Subject: [PATCH] Final grid tweaks --- .../container/ContainerGrid.java | 14 +++++++------- .../slot/SlotGridCraftingResult.java | 2 +- src/main/java/refinedstorage/gui/GuiGrid.java | 12 ++++++------ .../refinedstorage/tile/grid/TileGrid.java | 8 ++------ .../textures/gui/crafting_grid.png | Bin 2092 -> 2089 bytes .../textures/gui/pattern_grid.png | Bin 2635 -> 2625 bytes 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java index 68530f797..be2bbc681 100755 --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -21,11 +21,11 @@ public class ContainerGrid extends ContainerBase { this.grid = grid; - addPlayerInventory(8, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 167 : 126); + addPlayerInventory(8, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 165 : 126); if (grid.getType() == EnumGridType.CRAFTING) { int x = 26; - int y = 98; + int y = 96; for (int i = 0; i < 9; ++i) { addSlotToContainer(new SlotGridCrafting(((TileGrid) grid).getMatrix(), i, x, y)); @@ -38,10 +38,10 @@ public class ContainerGrid extends ContainerBase { } } - addSlotToContainer(craftingResultSlot = new SlotGridCraftingResult(this, player, (TileGrid) grid, 0, 130 + 4, 112 + 4)); + addSlotToContainer(craftingResultSlot = new SlotGridCraftingResult(this, player, (TileGrid) grid, 0, 130 + 4, 110 + 4)); } else if (grid.getType() == EnumGridType.PATTERN) { int x = 8; - int y = 98; + int y = 96; for (int i = 0; i < 9; ++i) { addSlotToContainer(new SlotSpecimenLegacy(((TileGrid) grid).getMatrix(), i, x, y, false)); @@ -54,10 +54,10 @@ public class ContainerGrid extends ContainerBase { } } - addSlotToContainer(patternResultSlot = new SlotDisabled(((TileGrid) grid).getResult(), 0, 112 + 4, 112 + 4)); + addSlotToContainer(patternResultSlot = new SlotDisabled(((TileGrid) grid).getResult(), 0, 112 + 4, 110 + 4)); - addSlotToContainer(new SlotItemHandler(((TileGrid) grid).getPatterns(), 0, 152, 97)); - addSlotToContainer(new SlotOutput(((TileGrid) grid).getPatterns(), 1, 152, 137)); + addSlotToContainer(new SlotItemHandler(((TileGrid) grid).getPatterns(), 0, 152, 96)); + addSlotToContainer(new SlotOutput(((TileGrid) grid).getPatterns(), 1, 152, 132)); } } diff --git a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java index 9556d6caf..842adae4a 100755 --- a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java +++ b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java @@ -25,7 +25,7 @@ public class SlotGridCraftingResult extends SlotCrafting { onCrafting(stack); if (!player.worldObj.isRemote) { - grid.onCrafted(container); + grid.onCrafted(); container.sendCraftingSlots(); } diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index beaee0b5b..f05cbbf6d 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -74,7 +74,7 @@ public class GuiGrid extends GuiBase { private int slotNumber; public GuiGrid(ContainerGrid container, IGrid grid) { - super(container, 193, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 249 : 208); + super(container, 193, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 247 : 208); setScrollbar(new Scrollbar(174, 20, 12, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 70 : 88)); getScrollbar().setCanScroll(false); @@ -204,16 +204,16 @@ public class GuiGrid extends GuiBase { public boolean isOverClear(int mouseX, int mouseY) { switch (grid.getType()) { case CRAFTING: - return inBounds(82, 97, 7, 7, mouseX, mouseY); + return inBounds(82, 95, 7, 7, mouseX, mouseY); case PATTERN: - return inBounds(64, 97, 7, 7, mouseX, mouseY); + return inBounds(64, 95, 7, 7, mouseX, mouseY); default: return false; } } public boolean isOverCreatePattern(int mouseX, int mouseY) { - return grid.getType() == EnumGridType.PATTERN && inBounds(152, 117, 16, 16, mouseX, mouseY) && ((TileGrid) grid).canCreatePattern(); + return grid.getType() == EnumGridType.PATTERN && inBounds(152, 114, 16, 16, mouseX, mouseY) && ((TileGrid) grid).canCreatePattern(); } @Override @@ -239,7 +239,7 @@ public class GuiGrid extends GuiBase { ty = 2; } - drawTexture(x + 152, y + 117, 195, ty * 16, 16, 16); + drawTexture(x + 152, y + 114, 195, ty * 16, 16, 16); } searchField.drawTextBox(); @@ -248,7 +248,7 @@ public class GuiGrid extends GuiBase { @Override public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t(grid instanceof WirelessGrid ? "gui.refinedstorage:wireless_grid" : "gui.refinedstorage:grid")); - drawString(7, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 155 : 114, t("container.inventory")); + drawString(7, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 153 : 114, t("container.inventory")); int x = 8; int y = 20; diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index af1c3ed9a..8335446c1 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -126,7 +126,7 @@ public class TileGrid extends TileNode implements IGrid { result.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(matrix, worldObj)); } - public void onCrafted(ContainerGrid container) { + public void onCrafted() { ItemStack[] remainder = CraftingManager.getInstance().getRemainingItems(matrix, worldObj); for (int i = 0; i < matrix.getSizeInventory(); ++i) { @@ -146,10 +146,6 @@ public class TileGrid extends TileNode implements IGrid { } onCraftingMatrixChanged(); - - if (container != null) { - container.sendCraftingSlots(); - } } public void onCraftedShift(ContainerGrid container, EntityPlayer player) { @@ -158,7 +154,7 @@ public class TileGrid extends TileNode implements IGrid { ItemStack crafted = result.getStackInSlot(0); while (true) { - onCrafted(null); + onCrafted(); craftedItemsList.add(crafted.copy()); diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png index 42e4bd625da97160f53d600c47b7362c8b2153c5..8a4578e0a650ead38e2bc33bb7adc354bd1892ea 100755 GIT binary patch delta 962 zcmZ1@uu@<{2n*L<1_r*pjPAcDteqUkqF&$c>Eakt5%=~^ci$}o5!Z`6Jpccn)Kp}j zZ4)9{?5}pLdVA1|+~cLwE-l>ZCVQ+fW5>tGZG}5b?>uL6zWlxZ_uq&Ij2~|2Oh3Jx zNw`5Qd*f%un3&kF(mK|P2d-ZEr^m>^z;M?i7f3QNMCqt7Y`Om-igCxe|6ayR?kC** z$-r07*I>{vzcf6yxZdXGo1$4POfQOkUzKe;nKu103sBRA-YaZi-5^3>tM7e~U;$Ik z`A_G}44Gd{QBAkGebF@Bq>wq|>XeU(>t=%$>nsCPK%yaUi5ZC9kePYk)9=a=o(09z z=X}g@zaDe(2=9W>;QC|jJM)-8DmKgjQy}K9iMK!$!?LBd>Xw1R#tr9Ui;iuUjV*Q+ zHg5>?m6U(BixVV&Ac+e^fxrv5EM^crW7@a5Ph5Pr?dD<4Fk!G_-%-MD@L&D(`kxFX zQnR&fch9wVw)HDqeA##ZmzRJ4^E=ePH(PnheD&?eSI_V9%K0uGxAgXk^GpV{#f%yE z6D#L6{Qka!|AN7m_ZwhL28LJrWFDR9lyrEmXZiSM-@2WPI;9=_qfY%Wxb6#A^wwGj z&SpSQ1ogmFpst%*Gvl=yOcBiOV1C1U74@tnwhUz;&*3-UYt99muh02d6Ano~<+G=J ziUm llGAdu8A{%oA>l2Bf7n@VkGd_r@@O5%C{I^Emvv4FO#mjDZv6lN delta 965 zcmZ1}uts1*2n*Lf1_r);jIW$F9+(`*qFz7A)5S5QBJSCMtDXw@3R-HV5~8}{r20+ z0}Kl$Z@ux8AusOkSLrj>iU;nld>hKdz`(F;!Yv@lz))f|nc+g!*=*Jac6HOAO{ip^h>R zlaFi{B7^(Pi|?|46egIlf+!FuQQQi)lxO+3+b1{9S`(hhbs>X+g?&dWv&8?2Pct_% zlw6!_xA)&OhA;oQmXt_-{mZxDZ~c#$m+$`mkokJ+`1W%T{A+H?GyJMj4*m7?)Z?!& zvTeF^*D~* zq4ve9-eSfA6^Fm?{_ZPa-n`E;=^ zc)TTmA$qP@gY3f8Hyl%az8th>a**Gp#dYA<=M&a@4=?d%dcz5H)`eYX!2x>Vra0q* zY%fNJ2Dv2+J4_A)T02!+i9F~5g;ssk_DCSbz+hF)4B|t$2e=*d3r>jcm2o;g=kXC~ zhiI#ni~i16RtKvD5>S6bxDIzuEB4K?V9vO&`h3Us#mVb39`P=))_q!GeBBqOfnn`! z9XOj||6G~XoyHB{VvG9ftF5h`b*bHB*mXGw9;qOeFvo*+eE>zM1@jg`Aa6nG?5}JW z?q#1VtPejPa}nse^JbdI)wk>dc^M3VD&UEN;lcLV*`|eT8OjU{9lQm_j4#?gn@zSo z@Ok;UyH0c259k$$Z@IK1%O#YD;vq4HZ;t!n@cvuu3Ij<;b4Rik+c)a5xLa( z+a`A{spQ^nM@TOHa>+HhMB-pouBSNdHd8a_`{SMWoq68peZJ>uB|IhEcgHA-08kM@ z?AJ*OTtAF1r@+C+(*2y@?9k2jtYODgdb~hpX`NW5M_x_{qw7QBng<^^i`PWMtNi(trT|*})RJ6%78+?O zCZeV`W#6?V)-;sQY#%mYr0N^hh}g$qdQY1cRu!I65w3s9fPz^q^AiyYSm7(C=&WXR z5EFweGfdEH=-yRFJ&`>`v$IPfYi3_11$K@>dm<1)eN)TTa#< zyD3yjzXhzUD_i9nv-mMDth5xB05(<ZQnl5WbX z@t$e(kFH&&x|=@zQ0595bmPU&&R>h{f%zKk>BKS~nxxn>-e4Ogf1-<>Z_8s=OvMEW zv07B+$={ET;cvzbFKptO?&GnZWZCOyE$ZIoz+Vk?MD8&E zGt-E<6ILzgnKoW}yF~$UX}H~PY&HHh0?fq440^<%MS&%GnBa#|wOvC(w+PvwhN?>I z&`hiArXbr(5Jk>}lJghSMA~8j@88XgF81rhVf28UF**q4=~0^pyxA&sN|B-wn61qX7#h5@_s|_hQ*g^fVLZs-FeHJ%*Y&*uwd9-yfg)YNC!A#Fd z&8M2xl)MZuTurq!8DWJGCjtS3v(djDEDn0I+Q6c=Ixu3`Qh~X~=Y6bvGr)p??@k2} zDOK|g1MUaFE56oFhC=5#1Ms!0BB(16GUr z@XtS`$y_Cqu>QUbbx|fvgYUry;47jOw99#u&-FAsz)#_+A)Ianw1?T(Ap~zn?nWPPGP-r1q zJ0G-d4SLamA}E6?yaV8uNc<{%+w|STRW%II+y#l8(5KjTg&`ly8s%M*zX1#Z|AK~+ z)LNupA17(L!viI`;UJ_L*GX7|F%>6?`a|H+LV7Neg6QaT&nOT%6BeZMmj9>T{%F?~ zZnck$lulAygvmb#0Eg=~yC-ggmwY>^bF(g4`7VhXaIiPNsl})CXVO0;OIbvf+`!_$ zu~MxPsjYZP%v9XmyzBRU-d+cyR>%bRw1T>8ZFRn08|aY-fTY21M!9so7qHsUg%q=B zRo8KVJml*o?GH7?7Togy3_%}&y~`m`aSRREiNWP7TH9a8MaI-MCQ9x)*gDyiTKQl6 E4=7A#X#fBK delta 1502 zcmYjPdpOi-6#jl=#+{Wr85Dz%kr6U36T+Bv*(FMhQSQaKZI=zdpUc)Gw-y_@HJ-K} zcapo1-B3xUm=MJhJGm<|*jUEy+V79^ocBEEeb0B!^R`QNOIEp{1=|4-ZHF3uK0lX1 zMXSRP$X3T)E>q`5lEU9wOY+i23~<5D5fS7gc6d<>QlDB2O{>M|UV7m8pnjHd@%ydg z?25>n$xNSwYCe^hTU~@wh2hupT@?w21uj#c?GgzCLlm6$l)W!iz%I{;w&3yS$G)m# zm)@W?RygtX?zDx4*1LL<^D|$%QGia#4T0SRX7g9Cz6_N_$MZQ73CP5a&}QxgQVE>-(*3;IdbsASB%CgXiif%$WBhw5yRLJ3nTmZoeS4wbA}G+?gK)+f`9Ugoe&$JhlV1olr2CQe6_ zdgVld6Dc&G)7LK@E{z!cs1T{D0}WTVZcY`j<|4m2OgTu>)USy;BBCoo?^Gxh()Ql~ z26_Brc9T6b15J%hpD?ILpQ3)DY$b-khj>HP^AFXMLmH}IQ#=dh#!Q#+{>R7KoOsnS z5SuEYK3MnM4*$bXU~~Bq?Cc0}2%|)4{>3{vYXy~1)YcuZZLK98>NU#aI~2PGjiXJA#W^+zS$ zC4YkBxOjHs{8DcP(M&N7R-kyG;Kq4+oB2h@PW7$|t$oT;u)KRKpvi!jk&0%*xeu>d zA=a6G4?TysY*k72BCs)wzcwuiDx04SJ~N30Y4Y|s-TXTDx%JKRID#^^vjrQJ@uB1q z&sf>33#{MdoJtMNq#DpM%m{OIk>T{o!d2uA)B|pV6zkGrkP{>trM!=EZwk(gzD*co zlvCk+xVik+AdW$qZehyQV^AhR{WGte8ABoDC}BmH(t5Kpor7WwYI)3;HFZ`H=fIMG ztV=+^TD1^ZkOJI?2#z|W77G%LFc3O~on!Byrkr68? z!Ub&S&vPHLOLSo#W-CSfpFKi(n5QRn9j4CiYM&}W{YR9yeZ|cYv!grno(JJmP?`Eb zOq40bC-zmndq719;f+4LK-?_HFnShM|EOz_57pF99zPA3zUd#{m8KQgdar(~wh@iQ zx|!t5A{7$q3%MD}uu0S1UT-~L6ce`MDOx(m`?LVkjDy%ijP2?qL=yyT@i4$B-5Fjq z+KEC$c&rxW_0rd`gkOT#XWY__vo0gE!C}_O_|=se9G-O1$e(1~2w#n8xqt^NDygx! zo0BR+%9bSA$0dk9A_awkKHCFl5ro%L*=h%EOpA z@dRReD+GebOeZ=Hn#>BE|T&EAd8vIr=Okh37($jRxI76s`(}KngKcADNw0 z<5wpByC;_x`9&PPldKG%k_OB4DsuSOICL#pR%-+-JNxH(5G``cxQ*N}UH@PY0LcwZ zqP=T26flYtn0PN*OAbHT00rFd@XmYDvF8UQ!$?3Bjv^krulWMhETkud(XYQ%ZPXkA z`hDYjPT0{UeKnB&pMGn;g0qw#62AArn$?_yFgR|JBOsT>p(88pMH*O$6bxF z;hv)>y?HfkwxQ(^@RUYwn9&2zDw3j^jomi|`H%vPFS$Q3!`sNW5e0%ectQUS5l|$R av-TIv#-<-|uyh^TQ6isku&S`2#r+Lb&s`w^