From 611d84923d9f6246a06eb2fbbae3825d63295f12 Mon Sep 17 00:00:00 2001 From: Pierre Zhang Date: Wed, 29 Apr 2026 01:35:21 +0800 Subject: [PATCH] Dump button, dumps the grid to linked inventory (#228) --- .../tools/gui/CraftingStationGui.java | 64 ++++++++++++++++++ .../inventory/CraftingStationContainer.java | 17 +++++ .../network/CraftingStationDumpPacket.java | 30 ++++++++ .../util/network/PacketPipeline.java | 2 + .../resources/assets/tinker/lang/en_US.lang | 1 + .../assets/tinker/textures/gui/icons.png | Bin 4785 -> 4194 bytes 6 files changed, 114 insertions(+) create mode 100644 src/main/java/tconstruct/util/network/CraftingStationDumpPacket.java diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java index 2cb4928d..fd7ed55e 100644 --- a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java @@ -4,6 +4,8 @@ import java.awt.Rectangle; import java.util.Collections; import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -21,12 +23,14 @@ import codechicken.nei.VisiblityData; import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; import cpw.mods.fml.common.Optional; +import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolMaterial; import tconstruct.library.util.HarvestLevels; import tconstruct.tools.logic.CraftingStationLogic; +import tconstruct.util.network.CraftingStationDumpPacket; @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { @@ -121,6 +125,45 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { this.craftingTextLeft = this.craftingLeft - this.guiLeft; this.descTextLeft = this.descLeft - this.guiLeft; + + // Add dump button if chest is connected + this.buttonList.clear(); + if (logic.chest != null) { + int bothOffset = 0; + if (logic.slotCount > 54) bothOffset += 12; + bothOffset += 122; + this.buttonList.add(new GuiButtonDump(0, this.guiLeft + bothOffset + 161, this.guiTop + 5)); + } + } + + @Override + protected void actionPerformed(GuiButton button) { + if (button.id == 0 && logic.chest != null) { + TConstruct.packetPipeline.sendToServer(new CraftingStationDumpPacket()); + } + } + + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + super.drawScreen(mouseX, mouseY, partialTicks); + drawDumpButtonTooltip(mouseX, mouseY); + } + + private void drawDumpButtonTooltip(int mouseX, int mouseY) { + for (Object obj : this.buttonList) { + if (obj instanceof GuiButtonDump) { + GuiButtonDump button = (GuiButtonDump) obj; + if (button.func_146115_a()) { + this.drawHoveringText( + Collections.singletonList( + StatCollector.translateToLocal("craftingstation.dump_button.tooltip")), + mouseX, + mouseY, + this.fontRendererObj); + return; + } + } + } } @Override @@ -523,6 +566,27 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { } } + private static class GuiButtonDump extends GuiButton { + + private GuiButtonDump(int id, int x, int y) { + super(id, x, y, 10, 10, ""); + } + + @Override + public void drawButton(Minecraft mc, int mouseX, int mouseY) { + if (this.visible) { + this.field_146123_n = mouseX >= this.xPosition && mouseY >= this.yPosition + && mouseX < this.xPosition + this.width + && mouseY < this.yPosition + this.height; + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.getTextureManager().bindTexture(CraftingStationGui.icons); + int v = this.field_146123_n ? 213 : 223; + drawTexturedModalRect(this.xPosition, this.yPosition, 0, v, this.width, this.height); + } + } + } + /* * Hide the deprecated stuff at the bottom */ diff --git a/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java index 0189cc04..d774dcdc 100644 --- a/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java @@ -434,4 +434,21 @@ public class CraftingStationContainer extends Container { return didSomething; } + + // Dump crafting grid to connected chests + public void dumpCraftingGrid() { + if (logic.slotCount == 0) return; + + // 46 is the first slot index of the attached inventory + for (int i = 0; i < 9; i++) { + ItemStack stack = craftMatrix.getStackInSlot(i); + if (stack != null && stack.stackSize > 0) { + if (mergeItemStack(stack, 46, 46 + logic.slotCount, false)) { + craftMatrix.setInventorySlotContents(i, stack.stackSize > 0 ? stack : null); + } + } + } + + this.onCraftMatrixChanged(this.craftMatrix); + } } diff --git a/src/main/java/tconstruct/util/network/CraftingStationDumpPacket.java b/src/main/java/tconstruct/util/network/CraftingStationDumpPacket.java new file mode 100644 index 00000000..bfd174ed --- /dev/null +++ b/src/main/java/tconstruct/util/network/CraftingStationDumpPacket.java @@ -0,0 +1,30 @@ +package tconstruct.util.network; + +import net.minecraft.entity.player.EntityPlayer; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; +import tconstruct.tools.inventory.CraftingStationContainer; + +public class CraftingStationDumpPacket extends AbstractPacket { + + public CraftingStationDumpPacket() {} + + @Override + public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) {} + + @Override + public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) {} + + @Override + public void handleClientSide(EntityPlayer player) {} + + @Override + public void handleServerSide(EntityPlayer player) { + if (player.openContainer instanceof CraftingStationContainer) { + CraftingStationContainer container = (CraftingStationContainer) player.openContainer; + container.dumpCraftingGrid(); + } + } +} diff --git a/src/main/java/tconstruct/util/network/PacketPipeline.java b/src/main/java/tconstruct/util/network/PacketPipeline.java index 1a40fed8..454f19da 100644 --- a/src/main/java/tconstruct/util/network/PacketPipeline.java +++ b/src/main/java/tconstruct/util/network/PacketPipeline.java @@ -135,6 +135,8 @@ public class PacketPipeline extends MessageToMessageCodechz41rvCMaRf4<*ezW>1YdmfMbIM3%f=bn2X=brm|-FxO{2JASDjzeU2NPxHXMI@XLs?DxWs-Fcb6g z@i47Rw9uofgcogtQYs}J8F~=8XB6HmseL;S5{W0dYX$*k2p3qR#;dV z<915WB5QDP(A7xP(NHAdiljYS7^TQ_RZj?_5`$6YCtQ(u{rYvFjU>)QR7Z)&8!PT> zCBC(_WveTco}T{c)2GG7MZ{@NdJ&kIm{e3$#06L`T(~eiJnVm2;=_jzuEwG*EiEM_ zCFpa!BofKjQk+FxL;konKROC${J>1(sIYBmq*IHe-#an4b}?M*1N?}HUBz(%xg=~g zAt6CkRh34|@9*!Qo0}szsC!zem|Q${+eItyuIWNcP;IhpTb4^x+O;ojk*odjKf0m| zqp+A|vV8`Cjf&CJwhEr4 z61NPl~+lQEo|ut9>gRmRamw9`Qsx zMuVhyIRv}mqYoygezNIW`Ym8sZq{E&Bf}BVF3%B>sFQO$ zgUZjP)b9Z@GTS&79t!-ve!~ndFSrX`g@!P8rN7^}f9^_5$sYuINU9{o$Q>8^d;1Ld zh=0O48=*CLogif9U_gOe5wvz&c4GHlUQ%^HMMam z^Q;id{%?K<3Gqz0%?6o3KPWMD#i|C(919&x%G7aaT*jU-*c zWtyj+lrNwH4Lrw zE~#q9&pyu1UKuf4|M{umsAQ7$W48nOpe$>o@R)1JDYd>| zmaStITraZ6qBqOkAOmXg1&kR+3)l+ki|y@GB=!PYcXZIqD?g=oa(BwsB79a&(Zw#`nTf z-)jg^yQ0d=MeP&1$Sc^gZ#X!R!AIbnD5d^$_uA)H?@6OC6=>V6SoZO$?~JV25~kp3=LrQ@FL4 z{i+3zn1zo{_68Q_@qTRHuy|8Ut9T6mbUp*sq2MKKq5i;Cawp16VIgAayA)9hx?(5F2k@ko!?QMXWLfVE3YSa33lb_UZ zS`;zz%74+UT%N{TO^a#goEx(`Qcm7z7;4URR>3~1pYz);&p6DV?i)a8J-_ulE!M&Q zd1Z&RdiIEJ9sT!cv88$pRd4J4o%a41l6#k8X-XU|svX)O^Fi6d8@Uf%8mnSQ;-%XX z9}mB?&2X&ulB<}k%X0s|JwQ%6PE*m)32Z{d(@HKsS`xz~lQTKW*LYsi7l92L|LD<=MwDOkE+J*19sL(QvoP|fXHnkGv zpB-MeZ&EA|>syE_!55fnVbF0wug~@i{KHjL6|&QCOcYYV&Kapl%j}j|*BXc59(kq? zIdpTu<*4I@cj}%OAiZwZ&0i4Sf$%|^eCCT!uF;HDjVF4z#b<@Y3E6sh0<56(fX$m*uSM2(wB&R6Q7u6RXK~vwGjFP0(d2p zuH{wF#u*a!e~(-T8IdRg7s(K~@iB~AC;9zM;CjX~z06EPa0SN*TAYI{+vtaY6)HOSIby5aA85nG~o^gz+fOWaFZfB@NEXJIcdon2U2CG`|+sQCM zWdd^ZKu>DvE`}>C^?Xovrj=RLg1?^Gvdanh=pgIKKU%2PpZ?cZ=($|l$9jK`L266aO!>Fu;H8(? zq2S}Hc8-u?sbr_dMZ-21o$%uz-}hrd(3+yf`Q>C;L+xNq$TzY4O2Q|(*=olsCh&4} zt(UUrGI+ycMci5{($8r3PnnJt;&t+9jn&=JB;GBJCju&7oy;yPhL_EpDuk8{WNS0y zhMMp|;+D~aN|cjq5vnaBj@VX!XA~xJY{vqLY7@_#l9{vGuf{5oU1K-A0#*i2k3bX4HLKZVUCckrz{ z17=GVDO5ipRWPzwGc(~h!$~Sp^(UzvXpy>p5-Z^nKBauW^ntzP{ffwkyi1&b?GiCH z_L1`aM*f)EdJplM928APEGE_am*h+%9oytF?qS7>LjP70?t~k(t`P!M(L$JM&y+1Y z8#wf6gjviNJC-v;s6%35D4l^AVwcT#5Vtop^E-$Q%(os+bnrA-D{Eik6{`+Pd>B!F zoUe3t-Q6-jth4z?CInT~Ujj>}D2_s-N7Vd8J|)YFk@BzpSv5y$&32E0x3Hq_Z7(p0eB9)@Zvu z&`G7<r_*sfUz+NQ&T)>c<9%W{fM)s$_J$p|~7!%W-x z7L4D{D!ChWc#vQCde*_wZkDa4`fzdL8}#G!L1*a6FdWY|*M8ctfvx8e~ol+EzA->s~ zY^8S4E=iDH4RDIDQYdT4&@Eg?)hwPiUCccPezz0%gD(Yl9;Qhne;TahX+pI~YdcX1 z2jcWMCsjI$G+){|VXeYGqks;4BnO@T0BbLbV*YzfBtZWXpy|2n9{!98dW> zwHpr9`oI%2by8^&e9mBst>DMkjNb2$_&Y5-?z53#AMEd_;a#&@_t;**po*s?*M)(o z$wkr~Pewnkr=LByN!*`Vu*_{7V5C&EbMrLQ`jju6q(e%Tc*W=`t#%*iSLqP)t(Dmj zSI705LSiKEvyyI9{kE)nYe(rzxJp64pf>nyvie+`Oq3!`O8Ry%Qfh}g_FcGQy>BpP zpO|rAq?C1ad|*cLf%R92Z0NnC~LE zCH=NiiHq%{h7Vx4$b4hQURRWFq-%j;Z=;8OJ_~46f&`zmO4t>+uN%h%>K*h74`3#8 zz~eBD5LL=8)XZshr|jr(xQxzJ7Od8E+=*AOotbnZh0)>iyg%vdSN#LsUy&7D0dhKR zt2Oluq#Le`>l+JaQW%BXrF$Wyr+O$~us-^hbCMxSN-!AV=s;k0%C3-SVVoJcHn$`r zj4HEF<>YdkZYmXK;O=QnBa$~)RL<;mDK$4;~1s}rCH^uxO29zkq zc7cjNpG;qCe7A6DS_Ge-UVj5IfOegE!Xlg^BB^U564a&pNtm3JeCJ}sVBbGA+T;EE z!feBkD#bXc;{GvWYOd41^O9nh^OA@Cr8}0abM95C&b8&2(RJU@=4yY+FF(8Gu96C3 ers;j2weeeI;hrg;`+0&FpbG|VrdO@w6!l-yu!8yk literal 4785 zcmds4`9IX(_kRsO6Qaq^NFzy+vLz&D6v`HjJ&6=W$Xk{QGo!^eAt}7=gh-5C*0GGO z$(F6RZR|vhvCIr+`AqNc_aFHF`n~sY&OPTm?mhQB?mhQ;?~S&)aZQjP$`1g5pviSZ zBmjUoA_(9GbDG=!g&u#jC&+78fYQEWzc>n?-*v|)0B~634}pNxbV-i!P=JYr(V=O6 zNdc(#=kCK0jtT5$cFhoA|EbwcpArE;Sk1)Hz~<@rdWOpv86%ml_~r`)$!cV_)x--v zQvuU+Is9JqA>;5EWOQ{m9>Mp{P1cU(Y{6eBUk!PCop;diov~Z{%kt*yO@us!i}Dt# zKNTd7hijPDs6nUxybX;XU3q53^4%hMr!eSc47kb_Yg4Z6V>xB%cx z2X%d7%4&6Mr5)0s`h_~^27f}-4&D~L@iJ+7c6u32W=!n7ic}MA6)Zac!aWR0wXA){ z+FLGuy4|Z)eANF9f@tec)u1^zf1|Y;P(z;RaoE$ruSc}s+xj&`{`6R6bIt80>~Q&rRJiaXE|l{Qh1C>hurA|S-YN&L`JNWiPnlAmJ{Lv`$a?dZ>lrv-eHU@mDZ+am zt8D);aMwf=aPbxwoYV@Jq+E=KcK{39KRoi*>0Qn1d&%p&4S`N19({CApORnri|aUQ zQ`*Hijqu^=3D}Liycej8xv`2JJPhVh{|HUwXmi*>=Weu^Ng{n>V=PW(a=ze$N?=US zWZQN=*D;?xli}vqMGcLenISSkt7;UBnHrgXoALqh=FgLmx|Hie?A8N)&5aS8%ZhWo zLTKxlv`ef}^*nu@cBq~)GU+`fy1^y-+q)~}o>w0yf}-dy&%W20D98pTG83P7Koe6V zW8k9zY`e?v#H5t>#|SX4>OG4Oh(=(gQK3gR8O&xKS$!>nn&_#JVlh|IISJPVqOp}$Zo zYVYpAD7C5>(LpWE-(_81A#!W#QO77_BZ^&yj0+mo;gP#HMd-gf?63WOe^oyJF<0~E zleiB_H*3*Foeyt9gc>D*IhsHVdDc4Q;G&@J?{a@)`4?-L!VjA`>Qf&<*=ycP^h3>i z#PXHubp4LU&q^5;0Y4xVt<5?!`1}P^{`;vQ2fmW~{Vo;hHF|eS>CDV&h}qz-XPKQ$ zcbim8FX^k=I8VK3_hl->`J(@nU1yux)mX>%y_`iq#4DW8JwRM=0){^C)lUkvJUiE~ z3ChsDUKHs?eFwS@rb`DHvY+B}iu7S^zTae#k#|a#|t=jK9G% z@$4tdT*z|OcR5l&-V#Xfqw`WR{0`=_wk;LTr65^U$|DVa;x|Q{=Yc5b+eN6(!3U>^ zj=%n(N_Wdv!eCi?sd$y-_?6>TA5cBcCst-!U-reP`1F&Q(h{B7mJh#eulf)b%VW%) zUkYSdXYGWYf0v^fWcD#msFHmQzxY@A?NKx0z@b>A5x$~gE-5*=IORTY=*Tg@9J&_V zuOdb;nAPf2&&G}PFHib)3*KVroDN8heyRQ2NR|riKh6&T)_i&M3iI^Hj?kp=-#1~)-%T0yJjs{ygqT8)_gI#@!I27`w>&)8uS>Ng;}OZH-fVuDH-GwvBY=(EHQajKU{8f&+Hy?+3?)#pl)J}Cu;2Fo9U_y;i)&vzCZL+NO^){$(4!`|K z;wx;US=E9OSUOotFEP*V0~q-^SHs7o5ZXMOLnt=6$W8GStF)7m_)0k#7tOb_s#CGw zE6<%0G&b=inxqBd6Jq=5_66I!)Qmb}*`w=gL*Eh-Dd8oS@s{7L2#-e!!?+7Y&}jlK zUc57D>y23W?VT$GQYR20$6Bi`d2$f^xKA7ppHNYdowFC|7GgibH7!+ikhRQpbha+Z zQ!KqEeYz5x`RL$*pd*OW72}4|+*Xwtv`n}W!=hhoA%;CmzAbqQrHN_M)%yCV_Diog zT6^}>T=JWie(*TIO9z|joVL{ggChFiiUVbmcr8tTW?ao0aS!Vok-Ssj{GW&WmWV{T zQSart!A>3o?~W#VWt%l`1Y{_0zv&i`FvNMjyb-mtbq@^Rp`aQq{8uXa7n1z4xhCqgpNg z{r+Xzs{8=W(Y2*QP z!9YPM{^nj{Q1j+JX~({kWvrUnNo@YixFqIyJ5mq5K`r0CIf!RcCq9%%(-&!Z`@{Ev z@?9Zr-VnCmcic9}{`OXaog+pCrN%A7{qPpw#hSnN&19T*d@bh2_IrYRf(!EAixWLQ zDcg#To_^ryg|&@QuF%AeVA|A?t0$9xhEfhIf?ZFbG=aJ%d%J{DbxsmH#bIps(%UZu(D8o11(7h2o0 zuC<4`wO&Tl{%7=%9@X$xXkVZ_@7RzUvJ^Z%a zt8h_0zP~Ex)mdfM@Nf57!4@%Xgx&n@!y3}xj$uY(rRgIr+Kd-yLLIXK?>n_ZvRmZmK0o&8f zy1zaw4f529_<;qo5z;g1Do^j_3n>?X0K{GE#URgrmz2XW&lWiNU)%;L@W;+#`bM8Y z$G!JH?+^2$7%Wllhm|hpx3-%;1}j0QtL~$=j3p7}^S3H4Yhmh3g!6bq-QC@*8XIpn znRb&nFl{XSF$f}9N4Pf|aVC^abCkeqT%vDh{^gM7#YaiQf%Dt!%R_Q;)9~jz53Q%H zecOBQ%yg3fKG)%BKYck0?M4hNzKIbjU>rVs8}-nn_^ zTA{^6KbF2$Q?1m6loi+eD2;J2OMall+V(}|#2_~BL7$_Er@rM*d}#fA#pqk=>zyjx zGHrr7UAoMyP|Ziq1?Lk~;Fd!8*PfOk=9h@TQ8ZjHI&fd_m6+SPj|P?{VH$ zsFN}DO)7WgOPu4Fd+#ecj#T4Y6}%jwR6130(VkImhSgaMD{ZhDGbUgaSf2ALTB?J+ zP>qwQUwcM$@LYTkPmC1e%*^mKdb$HLm5L}bi*no@oW}P7!W|^4hR-xPz!8^2TBuyn zTUAcONMG0Mqt_{Nr^uqvS#G2D-ntN1CaE-6(6w;xP?>73ZLIDfU<&!*X5Kjr9EB?j zG}E05Sk5UTj^`2f;G=yEnk))fnE(_f7r23KFF=?V1_0tG4n)CR1C|JB(r>kq_B_yUw_X7E0SzTX z0z_3dVaJmTPz7%KGi6-E1v$SMFV45&Pf2vRb;}>+X9)0D{+g^z@2u*-^K9|MjgRj^ zjja7OTURbXMydtU+*B9Cd79?J!}bHj>c9i?zM7cD#YH7m5GGDwCR19=M#zJEd>*D7 z^d;sPx0M0z%a;pK%&RDNcfv_qR{)Sn!9=0^1J{bJM64+IogZelQJ}mil0;AyeWobUs7CG%FO=fB+0IsK4u_4K4x!(?$BSON2@PtYT!{;*}eNM%ebh!CI z{ofu~D$WKhoAbvNAE%2M{CVvlPyJE20$|kw$cN5GMse;r3-CZbT@3_W<=jn76NP~b zQcu^Dsxx9>A^@hG&rkH8c@xK$@!wg$=?s{GaBmpph0dX?w|04VuAPM{-@E^i}THLa^`Z_A~#j)=lMy~xQ zUApRmr2GMyp4-4qDzW{|*y?9kmFTgpasmR3X~J8K^9w5vtj z{}TnGVGkQorVLqX0Spnsky+!KEFIAt*nTsLlV|>G_j~}khtYWU28Gg}qe#youRS>U z4ovc#SWeO~y#V@tZ$=8Eq9B$_Y7fc)5k@}+fM>8yv8`lE}iU1iy94Iv)w_H?W(t6n8Q}3;Y98{QtP89uh@(P>c{cQEh5LlFdMgplq%F zC|LHz5hIznz4lGPyJx^N!i2PY!aneqe18J(nhTZ!AJu*Dmr%eXBaIkxxMW_fIdufi z3At`JA*|wy<9@7TgxN`Dx=iHLDHCrD5YcQNIhQ(@Y`EiNO1NEImj}1 zn}924f&yN(pdk1N(9PxHEnKG9L=BljUd2rAJ4hp@