From 0b8ec37164ea2b8e6ca10d832f53ae14d2d6897f Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Mon, 21 Jul 2014 19:15:27 -0400 Subject: [PATCH] More work on upgrade GUI, also made SimpleGui packets send new window ID to client --- .../client/gui/GuiUpgradeManagement.java | 74 +++++++++++++++++- .../mekanism/client/gui/GuiUpgradeTab.java | 2 - .../container/ContainerChemicalInfuser.java | 2 +- .../inventory/container/ContainerFactory.java | 24 +++--- .../common/network/PacketSimpleGui.java | 13 ++- .../mekanism/gui/GuiUpgradeManagement.png | Bin 5019 -> 4715 bytes 6 files changed, 97 insertions(+), 18 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index d96e59221..5119b899a 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -1,8 +1,21 @@ package mekanism.client.gui; +import mekanism.api.Coord4D; +import mekanism.client.sound.SoundHandler; import mekanism.common.IUpgradeTile; +import mekanism.common.Mekanism; +import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.container.ContainerUpgradeManagement; +import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; +import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.tileentity.TileEntity; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -11,8 +24,65 @@ public class GuiUpgradeManagement extends GuiMekanism { public IUpgradeTile tileEntity; - public GuiUpgradeManagement(InventoryPlayer inventory, IUpgradeTile tileEntity) + public GuiUpgradeManagement(InventoryPlayer inventory, IUpgradeTile tile) { - super(new ContainerUpgradeManagement(inventory, tileEntity)); + super(new ContainerUpgradeManagement(inventory, tile)); + tileEntity = tile; + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiUpgradeManagement.png")); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) + { + drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176, 0, 14, 14); + } + else { + drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176, 14, 14, 14); + } + + int displayInt = tileEntity.getComponent().getScaledUpgradeProgress(14); + drawTexturedModalRect(guiWidth + 154, guiHeight + 26, 176, 28, 10, displayInt); + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + } + + @Override + protected void mouseClicked(int mouseX, int mouseY, int button) + { + super.mouseClicked(mouseX, mouseY, button); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + TileEntity tile = (TileEntity)tileEntity; + + if(button == 0) + { + if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) + { + int guiId = MachineType.get(tile.getBlockType(), tile.getBlockMetadata()).guiId; + SoundHandler.playSound("gui.button.press"); + Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tile), guiId)); + } + } } } diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeTab.java b/src/main/java/mekanism/client/gui/GuiUpgradeTab.java index 489fca465..3a5c7eefe 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeTab.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeTab.java @@ -51,8 +51,6 @@ public class GuiUpgradeTab extends GuiElement { mc.renderEngine.bindTexture(RESOURCE); - IUpgradeTile upgradeTile = (IUpgradeTile)tileEntity; - if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { displayTooltip(MekanismUtils.localize("gui.upgrades"), xAxis, yAxis); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java index 1b6c362e2..819f26cb8 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java @@ -33,7 +33,7 @@ public class ContainerChemicalInfuser extends Container } } - for(slotX = 0; slotX < 9; ++slotX) + for(slotX = 0; slotX < 9; slotX++) { addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java index dfba80122..5e5cc6b7a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java @@ -125,7 +125,7 @@ public class ContainerFactory extends Container if(isOutputSlot(slotID)) { - if(!mergeItemStack(slotStack, tileEntity.inventory.length, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, tileEntity.inventory.length-1, inventorySlots.size(), true)) { return null; } @@ -139,7 +139,7 @@ public class ContainerFactory extends Container } else if(slotID == 2) { - if(!mergeItemStack(slotStack, tileEntity.inventory.length, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, tileEntity.inventory.length-1, inventorySlots.size(), true)) { return null; } @@ -154,7 +154,7 @@ public class ContainerFactory extends Container } } else { - if(!mergeItemStack(slotStack, tileEntity.inventory.length, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, tileEntity.inventory.length-1, inventorySlots.size(), true)) { return null; } @@ -171,7 +171,7 @@ public class ContainerFactory extends Container } else if(slotID == 0) { - if(!mergeItemStack(slotStack, tileEntity.inventory.length, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, tileEntity.inventory.length-1, inventorySlots.size(), true)) { return null; } @@ -187,14 +187,14 @@ public class ContainerFactory extends Container } } else { - if(!mergeItemStack(slotStack, tileEntity.inventory.length, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, tileEntity.inventory.length-1, inventorySlots.size(), true)) { return null; } } } else { - int slotEnd = tileEntity.inventory.length; + int slotEnd = tileEntity.inventory.length-1; if(slotID >= slotEnd && slotID <= (slotEnd+26)) { @@ -253,11 +253,11 @@ public class ContainerFactory extends Container public boolean isInputSlot(int slot) { if(tileEntity.tier == Tier.FactoryTier.BASIC) - return slot >= 5 && slot <= 7; + return slot >= 4 && slot <= 6; if(tileEntity.tier == Tier.FactoryTier.ADVANCED) - return slot >= 5 && slot <= 9; + return slot >= 4 && slot <= 8; if(tileEntity.tier == Tier.FactoryTier.ELITE) - return slot >= 5 && slot <= 11; + return slot >= 4 && slot <= 10; return false; } @@ -265,11 +265,11 @@ public class ContainerFactory extends Container public boolean isOutputSlot(int slot) { if(tileEntity.tier == Tier.FactoryTier.BASIC) - return slot >= 8 && slot <= 10; + return slot >= 7 && slot <= 9; if(tileEntity.tier == Tier.FactoryTier.ADVANCED) - return slot >= 10 && slot <= 14; + return slot >= 9 && slot <= 13; if(tileEntity.tier == Tier.FactoryTier.ELITE) - return slot >= 12 && slot <= 18; + return slot >= 11 && slot <= 17; return false; } diff --git a/src/main/java/mekanism/common/network/PacketSimpleGui.java b/src/main/java/mekanism/common/network/PacketSimpleGui.java index 6775d5636..050c8b8d0 100644 --- a/src/main/java/mekanism/common/network/PacketSimpleGui.java +++ b/src/main/java/mekanism/common/network/PacketSimpleGui.java @@ -40,6 +40,7 @@ public class PacketSimpleGui implements IMessageHandleriS&R{6qq=Q3{L3dgeFCbln_obGzAe*L>vZ* zGKe%OLI4Rvq>oY+RH6_AN+JjeCDO@z=Hp%Ox@+Bg&!@fCUgv+F=lMNn@4`cKnzd>O zaF6NfQ?_n#@cD`MY~?W(n9z)~p7`!T>BHwvIz_jSb>#+LM*ZFwv?Y%nIa_q_h})B* z%s&p=D+cQ11nNAz?XOTM2k5@*tFOJJD*-3&bGnA<&Y%Qve&uw?Jhcg1AaTB~PZkb2 z#p2p0`^m)ureLstVNidcjjV-DwxUMFV^Cs$aATpUxjMXr(UO#9us!;r==pF>en@CN zAT2G;^{qA++B{j<#}#_51r6qE*w?jLjWfHuA2uh%w5@IWh>com%cAUn;dQd&mRliZ zp4~V#_LGmwX+VwAVEyV34afZ%)dPpRr(R)|M$^QJ>jHM($dU~GR&&yJ!tt;akma|} zgGf9wc;AY6`SNAAvTCl()sU!G4{Ou7dulRGVi9i&*G{f9H}UZHKCEh$;Hj7P8g^34 z=oTz`=S8=Z9l(tSBQBm*CSKHIFz)Y*4fj%g^A}SOxy)#a&FCe*=SJfmW__0H(=@w@rp{&dvT+V#)=U-%=D7eFaMBLEhY`~0{&C6Y7E-Ketm zWX9E5kH1`8<_*cKB?@f~*{bY>+0pV`#*-&cZn_K^Us?FjGSz?2rqwW$Vv9kwGpZbzzgCqlT+D-IZnSe^j~{Mn_K_^hLy zrOtOBh2btQ^OtrQ$_8>WC4kf|m_uw(27VQI5GCGNA$H5--c)3Xmqyj3RweQ!aXb4n z)RN*nEY}1j&$C#LW04y6Kei@x*kZkCLWa+Qjv{fSM?9%qhi9|-^~{wi`QD6QdT-vz z+*Uz4!S*DVX-7==WP#TyghE{1t2~9wOvj8nchtg#sU|d|QNnt*s+V3zwx1gwI3O~L z!2_-;Z9(H%u{;Y~0lBJf7Y}F?h zTT>F6H)Uz)t%ZVBX4b*DOvoUEqGrQHt{>vnW~sJlKj1ng*aJC zHbW?v7CHI+&7bY$D9K^YyMWhAO`IgMPbliGxHxg?^x`C0FdwpQU8MpI@Syfdf!?u-kbxh_^_?|nd#^N~{>@sY%G@k1Q)~GW# zz*Z@viiSA_7C-nAQaOos`w+qXt@r_B$VQwf`dlnDOBTAa(q+|DchZ!7ztf`b>ROn4 z((x45vAWJPOZn-W@aRW*pTxSgjk%ii*299W^y|~T*|NMA!~tWsc1>zVM;{Y0D0Bal z$-KI{*MgxYb!iV6uYI;%PbYle)s`V;kf800Q@*zu_L@ zoC&i3AQs;L@R3U%YpqE9I7?Sq3kyHBsQbYk&kH|d$`Q3m8~OMUYfz&WAce^|GaA^u zEC>TF>;ho(%qpuAmZf=O+u`Z(&9S=*950pvYr!;M^Wa&*mT2)*h1jj~i_FLJrPTo5 z=K3{3(i;W&*W6xvwkv3{E0Fi=Jd!s2{G~JPqB*(i$@dfX(Ax$^q#;N8+|Bml!lccM z0oK)4Tf`X2h_zqxyuRb*B3?Mdi`pi*Q!@0TyN$Bt)SEU$Urp-xhdlEX;1+(9?gX13 z$iwDjQ4u+=I>%G+WH^f6b`OK7->D&jurD-=Me2CR)f# z8d&%xxijCX4}0T*!0<;1+GT_$^|D>LI)W|z@6~|+D(8PyLu(Poe*EW%mN)S1lf3*U z4Ut}m3m^R1(+r5(TR;X*#LT)~+1?PfxLKEGMLOyJyj@=DOx@}F8FWUuK<4B$NoamH z?DsFVKP``@l#bzO_RQ9-Cy%AIXC+I#(B`C zp#g>-A1T8B0w7yaQttf`UtX2^0kuV6G7=xP=0zoE8{WR7I3bQf4Y!r+W1Ju^PTFpV z&(Qy&Nj^{1%((&ab$RTT2i*}E{OTiy6IKBNbMI`q4s8LVx!@X_i#LY0j31o)5tx8D zOcb&Y(k?;bFWHqoL_Cv+@_&YFv%vk#I3_1|1T*FAc0j(eM(+^ab zA=r?M|85NUuX7ZOr9PfMJ}@#9Wn?`-t~=(ylB1DEmrv12%?1?9y^qJuNkP*J_;(S= zOZ^|O;|3BEzkOSTc1sFM7vNodU1#hS$iO13!kTsfS~w6c0@tC`uS=a3p}HV(M-yIP zoID|nmedLY7UBtB8#$kkpMuOz!QCjpQD|}Femw#M{bv|i`mEeFh=Tu0o>opXL^=+3 zp%@P#N0*f8(YheMUArD{Ap9Zs2dsWYX&OLyU<78+O@rd(#h}T|(xX5Y0g*9YTaTF0 zs%0=tKdkihIIJn%^y|C<7{Ey>=WpP_J#>!ooFG z@neV35U&3h5%?cu^dCorpI(MpiWp|k68H3!#T(}LAma{4Kyec6S?6i3zr>=3i%RwP zI{g6UZ*b|b3*7>a0_hgcL~|HzX+;dXI+p2`Qb?6f_T#Y|LnJv%A2FOYtb)h;ooZ7xEf8O^T;NTI2$4-!4u6D_$L*gYK>tXEd1D#hZ8m&k}6mW zR-rjS2Uu>e9T0y=8q&IEfS;tjF$Z2FDiG*N-l{w2*uiDwrz5rd%-aZEpOt*|HExe! i>Tl;@Vh%(b3c>V}gtxi3=iFh?bK3rgQ%~%CfBQd194_Mk delta 3714 zcmb_fd010d7JqpLB%rL;1zBQPLIo03M1cgJhzO!2u7FiGgMgF-NfcyzNdZAyB#0GU zkhI!@h@j8`i3lhnWfKrLRtX^cny`c=$vm{vnfbn%Z`yuy|GMwobARXj&OPVc`-b&z z;2-FsVU&BoAvc!WzP(l_7(oPY8pFqz5Ec{+EDcha6*3L-WqD)6g1)9Rt-{E-Pa0Op zd`V2iVLz#`0?9bHeN^mDMu;zVE5V##hO<$`VzHzU+DWSe_71;oN5057e-U~D}2avrl^F&BMFe`vT$1VYT z`!LS1$T-}RrQgSAM_Bc=MU-Cn-YKMv+APJ#aRPd!OOm0YDk$WWVE37;3b`meJm~4hY_3 zReP}`G6ps|&F0-`CEQh_C39$BwpV6gp{slCyvLYCmY8o1s+ zr`*h^9EvwjPTm0Z@f>`suZE9T-Wk7Ry$3IJEbSea)0!0bOGFWu8j?vmTT)Am7Kn!X z)ck)bZ>NsC%$I8Cp2*_U_s!f=2`%&FZwDxA-VgUw!ZWqE1aGFas{N*?e=*NcFoPi_Pu0-E(Ojo?{u$#N7CU$sz`(%3>Nuq}mlG2cM;>g|dO9{XV(@Jy zyr3(RgvdN$muS)B*#fwLbF8}d@ z$+@ucR^IGjz>c({qM{5^M~71UW3|MuXO3%=ZLUW}9K}-k(Dr_cGhY<{Zt!L2u;~i* z=hq6pbsB$tmvtCk0QGhQ6*vhqN016v-BRxNtN2*+y>SK6+A?bJ)la?66x-3~?cyOz&Wm2iq>Z-}B%k3+eSAP8 z4a1Tz`Ns&Jr6fndGiv(q@H&fa+fq(vUiMy2IFRe{#Hz59+JCpQ=Z%(&#+CgrXODWh ze~O2iktcSfz05`yEu8N7TaM6^AbSWO=e;YN*p|9D)qGYcE~Ct^0W)Z|`}C_DTQrox zNyXSai5Xh7X} zadC6BfWdyHNP#2vieRVoU?#l!@&skw7hJ%BT$1gGW$bSF%HnQ>;9lwIXvfo8so(<-si-r z1l#N+&&bJ!-ln(PV&2TmZ<8ZM%$r|>qbnL-&d4rT{*>Adn4|WCX#jj;W(0jcbcEHf zazAd+9J9B1{=?g7+xnrm+UmiIX0hJ+M>(v1cu{;>T^e`!<-J0DM^L>Q6nf&r^<;SB z>GCQ~=k2nxsD-n_$tqplKnWp7AH~{Gvr_xS_I8yFv0uZj`tY@V>37_8yHSz`<2?5faJ0Ot(%=m&JFM z3Tup8l3@5*l)NC7-PYDtuj?2`z5;A~K6dJ$z#S0GE*6*wQpoM{i>-lq1|OnkJ9u}e zYT&TbeRbEKk}`p1=SOVSAqQ`tBcQPaKlfdPqvN&FI5gKoKuJQMrzpKrit{aOInUQ; zTi7?PRX*MUPrq?pzENaHc0 z?TucXtm?@*mA(vAFGr~odo;uYx0AYuSv$i`Q0Dro{L?<1+hsEA({DyUG)4iVNe|W3 z(~PjFy>}k6p#?d8_Dt1#1d&+1+7ag|%#AYO=8KtqEESRcCiNJsv$W5$~wEX(#A!zn1k4LqJ{^!6gL zj$iuAr}bgwxv09eZqr2cGv!;i6yLXaK6-8WQGw?oQ7#OsVjO8SV4tkKt??uoeO==u zhG+S(Q3L!QDa-Fu0=Wx!4?g`hq(2MHF(sbPp#ns{~rnb zI}moZ2)K9eUR=c4$?i&8RMc^@23owAea^;OjP(89Jlfy|xeyH~Yb%=PSR6h*ghgff zmEbZa34`rjJyo>34s&oic!iPe05&N&0!^`dc4Mv(v8ewcf&YlopVjHLQNb>rw_VhE z?7yEUg@Q2I;`%0jg4;1XKN~R0+2Kg_$9}g z=Zhq0EqH1>`e!7Ie{RYraIRt;0aK+cfohrq1g1IE^3g{Pv8Z26c;|O|X`(Qnf#AQ2 z#9bf(lC^@dj!;lDHEGX_9L6~_lK{KQ4cuK9@twWHla{Sj z$ZFz6lQS!M3AchU_DJ2?!#Yq0o@x()MnC#}1tufanY^4ji&=$`xH!;q73xK3^`c%! zfx8f*xbQ*)Rirjm&jDvLAT^{Cf5-XrFwmF?AWg!Cw*1KK$!bRBD;!u%L2o?pFbGq( z$15l(h&uh^g@br~XGIN0?k0Fs_2o%)D;5dhhKnztu2`fkVgz41@K%DwYf!GPu1ZM{ z>oO~H^YVrp&>RbE-N=m-Xt02S<=z17q6CSD?}QBnmFi^Njv{@r{X^ET2Qqo<8o5n9;TQxakl1_*F9GR7_6>z-98zsK72cSJ5e|!5)l^{0`4wrf zzb?yKKwm^s{S(e#gb9H&mUrDPnrr%aFp&~%e08SvU?y*USQ$5yg zX_pMl9;q3PC>%FY(IE|VKS;a=8FD)?;%a;bZHtOa$>fXm)y2$y<(D(p0VERnXw?^L zXQxhod@|eVOmBa*iJp88tzd7`Wy4O0$s9&sR764~7evAOAd&9w8noj4h(vn-jy8=1 zHwc6iwukXucv;YlDI}K19vgL4P#w4gT?L-aE|v}ryL2U9fm8?L9s?a}{q+#<2FRQp z>lhwkpmb~^(@I1yt)rD1>t{>%&&tVX0^Yj^d|Fythko<<__9Z5M~_;Fy6hi8;=UUU zotvXuQAm!{Fxc<(#*2XCslTK6q8n~`xhZ~Jto%F<{U$uO|7y6N0AG& zRonBn9@iL)>J_><@;bnlA^@>E2CdiToCe)Ng%6^IY=#!Xy4AQ*$@+f0a(VT