From 5ea80b8752910b66f5525fae0383e5133649c1af Mon Sep 17 00:00:00 2001 From: TBPig <147127248+TBPig@users.noreply.github.com> Date: Wed, 26 Nov 2025 07:46:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E7=BA=A2=E7=9F=B3?= =?UTF-8?q?=E4=BC=A0=E5=AF=BC=E5=9D=97=E6=9D=90=E8=B4=A8=EF=BC=9B=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=B9=BD=E5=8C=BF=E8=90=83=E5=8F=96=E5=99=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../block/entity/SculkExtractorBlockEntity.java | 6 ++++-- .../models/block/cauldron_output.json | 4 +++- .../block/redstone_conduit_block_01.png | Bin 557 -> 561 bytes .../block/redstone_conduit_block_02.png | Bin 564 -> 576 bytes .../block/redstone_conduit_block_03.png | Bin 613 -> 563 bytes .../block/redstone_conduit_block_04.png | Bin 564 -> 559 bytes .../block/redstone_conduit_block_05.png | Bin 571 -> 572 bytes .../block/redstone_conduit_block_06.png | Bin 571 -> 563 bytes .../block/redstone_conduit_block_07.png | Bin 576 -> 572 bytes .../block/redstone_conduit_block_08.png | Bin 561 -> 566 bytes .../block/redstone_conduit_block_09.png | Bin 569 -> 631 bytes .../block/redstone_conduit_block_10.png | Bin 555 -> 563 bytes .../block/redstone_conduit_block_11.png | Bin 552 -> 550 bytes .../block/redstone_conduit_block_12.png | Bin 561 -> 567 bytes .../block/redstone_conduit_block_13.png | Bin 560 -> 564 bytes .../block/redstone_conduit_block_14.png | Bin 540 -> 548 bytes .../block/redstone_conduit_block_15.png | Bin 543 -> 559 bytes 17 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/entity/SculkExtractorBlockEntity.java b/src/main/java/dev/anvilcraft/pigsplus/block/entity/SculkExtractorBlockEntity.java index 42ef1d4..c810a69 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/block/entity/SculkExtractorBlockEntity.java +++ b/src/main/java/dev/anvilcraft/pigsplus/block/entity/SculkExtractorBlockEntity.java @@ -61,12 +61,14 @@ public void tick() { return true; } else if ( state.is(AddonBlocks.ECHO_CLUSTER)) { + level.setBlockAndUpdate(blockPos, Blocks.AIR.defaultBlockState()); sculkValue.getAndAdd(50); return true; - } else if (state.is(AddonBlocks.BUDDING_ECHO_SHARD)) { + } else if (state.is(AddonBlocks.BUDDING_ECHO_SHARD) || + state.is(AddonBlocks.SCULK_EXTRACTOR)) { return true; } else { - return state.is(AddonBlocks.SCULK_EXTRACTOR); + return false; } } ); diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/cauldron_output.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/cauldron_output.json index 3546d0e..0f689b3 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/cauldron_output.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/cauldron_output.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "minecraft:block/cube", "render_type": "minecraft:cutout", @@ -36,7 +37,8 @@ "translation": [0, 1, 7] }, "gui": { - "translation": [0, 2.5, 0] + "rotation": [30, -135, 0], + "translation": [-6.25, 3.75, 0] }, "fixed": { "translation": [0, 0, 6.5] diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/redstone_conduit_block_01.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/redstone_conduit_block_01.png index 61850fc761ec598a1f4be30968ec2442e80718ac..b37ade32c03b5d25a9a900e34cc2f14c415936b5 100644 GIT binary patch delta 485 zcmV z=)laxe}KfqKf%fl1OGvnZpdq^N<~%LB$ACB*GZGqDY3%P+~ph?`bj72?)iK7-uJ$% z{K?BO7++2QL9DjcK2Eb@|i{n}VxPhg9 z945CaF5$QqM`0gBX1)(Ox|%35Kr5&tbn@$upD8Bi0L%s*s?9d$#x}*|oY|nmIEqQS z5xuhvH?WAqDI&Y*sf^RhL-t;LqAE=O2WL_6=G{IocYRfv@SZ+~FvSfl#!*aFnCw&v z1TdFEF28;OzJF&c^6%^hL-zcr-Jr46QiM5hP~0sYX_hNZHoY2#99h3JrrKg6l-Lqg*F94C(j0*68Y^i!$GmqLAD@AEp#7@qZpQC6Zmefs!SmGp1ISTuFgI)r2@% b#U=g%6bt26kkaTg00000NkvXXu0mjfGllJ0 delta 481 zcmV<70UrLb1g!*+R)4}tL_t(Ijg6B(Z__{+#(%L-j*|x4a!gZ+f1zC}p$+Cm@AE!a`;~n! z*0WO-^7tIPbEx;idB%EnN*zOM z3XW@W5{@xc=DU!itA!>5bb=?0SKtR_9?QA{$77+qwz zfkhlH5m|qvGcE_mynOzNx-j`4oI>*U-78)k`MNUUJ$VRWiW^wWqnNrdIjl(puvS8D zR$qee*_!+_yMMt@JwNESXzg`0VGZ;p3}m&6G|ROnyIuoBjcnYTQ*U>n^zuQe6Lsc$ zc13VwTWtja$StzgqBI4gOkPcTm7e<&ip{FdR10daV^@7R;BEJd{F)aW$)kRV~Mjcd3$b zQb#scz5x;wUxJk#2{Cl<(hYfSRjH^-n?%^iah)_tosdTu;`izRL(lT`-t{^6+&`}U z%D*iaqhlnB z?<~g+O_FGekze$b;`H*6y{GT74W0kNSqfgg-s9P>ubdg)qX!UWxS`27POuG~otnS^ z7P67$83^z_OMj7n<~OUD8=Bm2H)w3N6k!4E3($byz(Hv$%L@X#!Du+A>Dg#bR9w>WDK~wxw4FHdI_))nhX>GX&5@|Q)&D-aE@8jbu;%5q$jz;3MBuI_;*$+9uk-M`C^Wt>DAM^T?vSSN|5 qO1bITz-m-m!%gC=2}ybzm-qw!r{q2A7Ea~>0000IaY$yRz!#asbZ+qiLnDC zd$+Fr4=Q!)Khd>&{|FYg$}0#7iV~6tyGo1`lHkys(xJKI+;-qC*4_Di_rCYNvwr2@ zSIfyM3PpNOwY8_$!h6MXa!Qe&1CV$7`s^&uuD9Zuo_6;=5uthaHf5H_u|AV)Z9KAc>&3>qriD3H$#2J3%FilciVY6pR1h7;_ zuD=ZlVNliNpMUv171i_ecAffGOB0qrM?zP^5BaDf%M0yEGjOS>kqtUiHX3a(Zr-(_ zz3xWsg+aAsxKgKODG1uv)jG_EZaM)WXccG)V!FfNk8Y zWdhkt}`%igT;w;WMi3hZz8fiS&m79SJ{2A5Oc$4II eMml^vSNIJ$W#)=Tq-4Mu diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/redstone_conduit_block_03.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/redstone_conduit_block_03.png index 7be6943b82a6427bfab42aa62335345d38dacc72..3c0b9bf31fc33e096f18f918da28d3cf9ed08c5b 100644 GIT binary patch delta 524 zcmV+n0`vXl1hWK?GJkVINmK|32nc)#WQYI&010qNS#tmYTv-4BTv-7tPW_Pp00GEJ zL_t(Ijg6DBZqrZ{hQHXB>$oA;a;&5hAfir1s0(6(je!LrF(dH;JOL6DFTu*r#1nMs zhP<|_R8+Z5BH74sois_EQo9WCy}eZ!`b(B|eEpyEpL71(_07PJ`A1CRRI+th*oBeQvAv52H z9G}k>8K4)qSUUO5=dYCW69AUuh>cDkb90+=e!_AbF^dz@LCo+tM+7!WxWLL!hbrUZ zY>!vZzu=k%|9^w1D&Bs0$%|cIDYLvMk08ttfz2#Va7}}!jS3SeYob}d1HktjMgEgt zV#uB!_FJ^JdWuj2@5|MrBg+dlldjjqkSiNSGd4PX&?^6|OTQ~`zxkeXXW*(?DNDix z8d?$^Yg>@yS;W1my&fGJj`5O+f$vv5yPy}LV}lD{*d6ye9nCDmmgz)`H6sM2J>EnK0kLC3BIT= zB{_Ix5_PgBUwPVx>dUHtxGl2v_XAcIC@E7AnsNuvb=jC`zxagcXp0!CuNn#h%5#AeL9|TT z2v?;^V>drmFf8OEBwY$uLQBkcr{U+iL@4w#Sl^ejcO;Ro&-QfS9|LJcC9R3Bm;e9( M07*qoM6N<$g3aFqHvj+t diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/redstone_conduit_block_04.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/redstone_conduit_block_04.png index af34a4c732a55f3048882a34d5c7376b99eead7b..e0ae25487b0c227b1454bcf37f87968141215de4 100644 GIT binary patch delta 483 zcmV<90UZ9c1g`{;R)54vL_t(Ijg6B(Puoxw#ee=IX+!+y;CK27PiVOh>8jYl1O&t7$+pbp~Q4(-s>~Xz*(&4>vMe1z2|Aa z^Y8a}!(#-Bs84c7v|4J`TL zAib4!fre{w6!p-B@?*&H)mV}N!oa~)$=my%n2pZ?nD*N&HCq_VYs|*yO#5v{aYEXO z>7M1dfkhHcF!PJ9RGeHM@^14Zj-j&%URm;f_bqQWeA$`ly?hQ)h8tLn;snRgd99Tg zz-&%5=Fg`Z_)d&2>|7Twhsgw$gYb@ zPGk-Qys{+J7P?_wgCEK{N#{8bNINmRdt3bM@rhHKHR)p0lc|Hv{2>K#zC|CozqokhiUh0#({1l8qeKNt4tmiNm6qshzUu+02Zu&z*DcJ)`{1 zek^9g69n@33^Uk~XWiaqHasDZ&j83Sx-xberYJX;-xfz-zkdTT9Nc0%1^|w4$R7vE zt&9uUj=^!*Llv1HLyoS-k_-^|7J8Zd{?ixc<8uI}{WfcjCffQI^YJ;;ew$GglXN1w ztqjLEh{FkbcF~m?CznSYy!ni!sr(OaQSjk#pSOFSRHnNxpF^19_y(gW#?n+?D+L-b zUlO(D`cwhWHGd`fPj-VUYJS$NQ{N0EVGjJB-R)bmdlhMx%bskwHB>ROUVFq^qY0&( zmC|0Uo@-VbuCI1mKm!&_6{{#uK`oP~{dT41Z5>|e)jo(4#HcGi7)3Dv#ft20sT0!c zyy6q-0|B=v2$YAi0d^JmSvtqb(gy-bC*ttqJAQRCykRFMo@+|k>2+QqOCN|2wqww3 zWo*5$Xw-CBmhBicYIU4F?*Uo*p!^2P-ha%)(oe&b| diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/redstone_conduit_block_05.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/redstone_conduit_block_05.png index 4a6dc6e6fa2efa3559c91150973d0e31296c4a58..21687c1bfa63230fcd326fe923fcf8041b17ddb7 100644 GIT binary patch delta 496 zcmV0R)5h+L_t(Ijg6BrZ__{+h9Ae4>!c=UIi{`zh^P|+RY<540|P@B z1T*3%@C%Tb_!F$`j3Cx7-H<1wR+Wk>w@DJ`0Mg^G+S?Bjw2PB3SARR7zXC8C&S?r00O6VH z#bJN0_NAJ_WH;zhlbvq^M`sfS1NdG8qY7_-_{3sz1i)+%veIg!uWqoI95EY&jH8%- zC!%|pB0Q5gm|~>IUDa`VvcrpKAF=fs|C7jbw%P}ctQU@1 zX|geW||$v*GT2S)}~{0000nD&}%RBKq9JIqGsOnXg+QB1cL z(Qc$TzD*pC5$Q!+MI2uq@%G>|Wy|C)IC;+Dhc~?5^HgTSefk)}1jn}-Mlof}>v{(?fM{)w*LyLZi!t<{BT_qodgM$o6E1u!+$T|0GNz#u^kft$2aAV zwY3)qgyQ7}Xkl^;V6uV#`A(DrK>D*5%t&*Zan02ZSj8_h2I<`((voW-ceG>nM* zA%n9N$2WU%1h*)7_5LM$JD%*!aGyVgAi?oXreQ=w*VwKU z=s;c)^>S@#;D5Q6B>zrt(1hkE-8%J7TM}~MZNB<0lrEAqlXuc`t7u|m!`_sQW*3x` z0p8@GDLK!z)-GI%6>Z(ecYRevg*pXIB`-$3HO-VV)SQqYMs27*n1&IQn)UMZ`vsHh z3}?ravGjp}TNHF2o+7(T_^HHET>3yD?uWelaKNvAieT5U@LWr_om^*YWa$HuupN`Z zS<2S48qKO9W!a8Nvszzk`#&G3Z$S0_V;+`q5+oc2L)w0gD45I2Ew>7+M%5W_5?;-S d;(z-Be*xGl;uTh_IPw4h002ovPDHLkV1lv_@G<}Z delta 495 zcmVgXDtiMpUsO~cxoRNkX03_EP*)PpMi40G4N{hy7@( z{1R2m;MDJ;$;b~O2e%_d2B>=_M4o*7@iX($6#$c7iygO#zPrbKbj76CVi<%(?SRf@ zg5?>6{uq&5cT~jj%?WP~KT**&w!zLaj^4lK)q$fb6ZX@`;Kx{=!7vD^=o}!S zi2CZRY2esJMSuR2+%H?OJcCEgGUY~H5$3?J**g16u{`4>#Wl+e`crDQi6&RpZ4KFR zn~=*4@LVj(^3Jh~8v_^rPg_Ek{c}~tGqLvNx1i<8lU{3sye(jyq{y}bL|zBOAOs)- zv|QGF!1yl3I&hS&bRc188IA2*SBt*hN)#e3x#J zl@8=Z)iUT@ChR>a;hI9VRkaLUv%FDuUI&^a%faNe|B#O*&i$BEzf0XK5&B~lxn`Td la#fA~F2U`HFk1U1{sF%$-#QYyzpwxR002ovPDHLkV1iKX^m70J diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/redstone_conduit_block_07.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/redstone_conduit_block_07.png index a966d1fc40dd7f9f6653d26a36266d82467bc755..c5f3c8d21001c808aaf8fde519b0d452dd178c2c 100644 GIT binary patch delta 496 zcmV0R)5h+L_t(Ijg6DPYTHm4#ebHBA~~+4$ig;tzGA5g4`D0M+55E1+Z|VSra3R3fgfXgI+Gy8QWaiT za#SE&6V>&%p?`ww7?OOI%vTm{Pv>d7My=J9gbetQ-JgEAR*938x>;j9TGDV#6fv?v zcfv-!4TX~rRXA7^#h&XJr3;s4MOy;JE`*3caSBS2ycl*%p8pjT7KCk}oP$Xa0+1Jo z2WnX`zDY|tkvS09%5z!|wE(=!p;K6g(K-hLQ7_=*=V^U@_Y&ME2Ciesw&R<$M3y-a z8RBkvX muo_isv`KJ1C5-Ot0)GLKtl_WOYFH8g0000hi`9V>|hh^Pw@r3*qrVyYN; z07f2xCqQE2C0N;ch%VWX*H)2=s4GlY_$OS#dOd(AvzJvk!@x&Xvi0~tH_B1((v@7vRFKYsw2j8~YJ4uIwA^2c$w zl5ru^(&>0Z6p{HMuzx#~FhIktpylEBpTDx1T>`Ki_1LSmQ1=hn%r04udQAO*uUxqvVVkc;>E57%hh?@s#0w>B(MRxYbavIVXaYD_gG8wO^+XjlbvSDw^ zUabYWlaDlLXQ24z*yX~&WwW9zAr(loDxPb_S>$g)$-~Q0uh6psZ2y`=6eozbfuawl zegN6YqU^SI4+BJZNx>)52SNvFN;6O7^d^N)ZXbl14{e0PzR!nG@A%b^aUPX%?6NF7 zx=RYM^g(_wgNvBMrxj|3CfhPCotja_I(GhnZ{o#ni1{~=_x?j3mUiw%bi5%Aw?g2} qW#+nV0K2Pdj`#6zX9VGWT<8yg7vcsWgR2Yx0000Xh1LsPC<jkA48B}dj``m!VwxT z8U+H#OQI-OUw?q>n2P*2Jx7y0KkBw=ulb6Qm+QM6-sVaKNt&rQS#_Fda%98al%-A= zDmPalW3FS?9$YmmWl0FGZ~iH`h3XWvDtR&L)p~{-`7$P3kfYYCKA46P07WV7hp3YQ zlCunZ!&Q6b1BsQQ;Ncyz0X7TxRoO>z=>v(lAM*a=Yh(WOQ``q8u45|M$yrt-D<8;! zWg83*Q`Vof=rncJmSr1sn(dnGTRy1%fvWfK^Re{(AYnHc;(INkV6G~!I!)kuRBPj9 g!qXX1e3O^>55J`00lIJ)#{d8T07*qoM6N<$f=({%%>V!Z delta 485 zcmVfkeIj$R(7rdb?Jt@K})5gDs2+Ut{m4%lhi4W!$8idT^RZ<);XV_Pw)40YQNKO zi+pr|R2Cg!`cKqZSkK5u2V~I^0O@H@#SVjn+SS?T#onhc0Dp{z*I2dzfbALT$67vupji%WahiT;l)J30KV5il;PL!KQf=305BVLSZTG-EU|Fl*Vym-6I&bF(Z3Fq-c2oh}1U>rs`y2e(mKnLba zP+xw19bCs$@PB!Fg(ho$&~DP)@D(88pE>-g3;0?(NAYqGq~dPKn|H7H)lG5lnO?Y#sca{gSp`;mATKQ2pm&_I z`KUpwE>u~TZP2PWE4KgHgYp|F@BUpLmN*O&_JcmY*B}a}D)YKi2mX#~W4KCqF(Ha? b;!=MA*s0?ej@2S6Yg z(2|1sAY~mt8Q9D^eT?*!Py1h%19X@iVtadE0c*$CNCueiCx2ZE zaN_;s)JTUumvj1PWwcWgysrdN?)7adQ-W0mw;~<7F$UmXluG#cYlVvz;h7mVc-cMn0Hr66j7w2 z!D{#s?L~WeMsyq1n;;@oSHe|Esv<59x9cZs0ySMAcqVEnVY^tcr8CLDs=@B#RUy?xrI3ABi(+vETJ0p%mU8}rL}O8$%6`#cAz zKm`s{gGnqA*B?oClI`k^iW0000vqcb~p+Ke+^8KIpLNwkU7yazD9bKIkwGLZWU!?;^qS3_^d3o?P{0#_9Dj zM{hr~UDkLAPJfnj@Zo^{wj-74_RHts$5@`hI0)G;YrG*x1M(G7q-$S zg5?=JYt^VV8T?qHe(Zk4OCOCOA(_9NUz#ZHc|Zps`nrBvGg-P=EU#Q@T!FVRA%0>E5LG8&EXco?SwE|#|8cZ?Zx2z URhoLx01E&B07*qoM6N<$f*e-@g$zA#`Y<(5)>k z^cngHeSt!!zC_pV9r^-=EZK@yhd@ejVjH9&E3#udwqv6X%Ds_;2Y<`exkumOeCK>u zyUqUQ^Fb4dNqmA?f1zT--eW#!GKo(B$j&<|cO0f@Hy1zi!+#&Y02uUV*p2|e355Ew zpUhNV!gd5lVHaIiUWXiAjT9N69#k>PqnM-} z(K*d<0zn*(F|zZHsyMzlJ*<#vRI=YN`te3{)85}ZKrq*0@`T?gR9q9FXK+ zse9!E34fmRSgc;-+uNMqr8rLRd?1muBR+k3$G>)l_h87xb4}HDdOcYpD<8-U+Yxk5 zGj^X<@hwBivK@hM)t1^W`#_guIheBd*LhgRahP%xcBuzd;&7}gZ@CswtZKWzNpv+L dPVVy({{e?R;k`Tqo!|ff002ovPDHLkV1mFY?MeUu delta 479 zcmV<50U-Xf1giv)R)4@rL_t(Ijg6DdZqq;%g+Du%>!cyJY^y1MBI*hW1r{J7u>&L| zo`FZ;1&~c??% zuKW@$*JdXgV#>(3A;%{(MFwbx4J@7f?$Z}8XNLeRMm^So4z=|yE@y`-(MnrS0>}a4O&X2cw`}{M0&0rORqU7a=SG?%@sxr%a^Z=q1H?*0?0>5VPj1mJV zuZS|-UE9F-9Dharo1J0Gp6_>>G&kFd@T*voeizqgfHce1Og6kard-*uH)Sp8z>3WJ zo$oo7ftxp{%?i>@=vy##@?zAhWY#N?XW4>WwWaG|8Vi;AskQuet!kk3G{^1w%2qm% z2#S(>_Ubjhz9{*j*&?~pfke`edH?YZfBG5z9S7fYR9M;RX33F^&C+5hQ4e*?PqZ}YIMy(ncT8qy9Mh-j`NZ+LZJxvI_aI`PR2kzD&F{sBeH V;xD8oR@?vp002ovPDHLkV1i9h@?-!2 diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/redstone_conduit_block_11.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/redstone_conduit_block_11.png index c841a5bd74be0f2621f89de3221730c20a63a302..923173c2f989047e27983fe1e7cf7aa4022126ef 100644 GIT binary patch delta 474 zcmV<00VV#Z1f~R#R)4!mL_t(Ijg6DBPTNozg+Du%aY7nfwnb=5)rhGQLJTl5qQXn` z5&8m^n0SeR|;-C-40@U^=`6VBBr85Hu()t}-27GVV4R#Db(1)4s@X zLmLr|u(GSR>NvVSW_NR+pky!)!K7g8+csP4zEWm+pI0DCaYLIyEC@;l8x$Bo@kEsE z-rEMA=P2?`c7Km4Xa3lzQeCbC@O271Q(m0`(kxe=EO}*2xw1}kz(UXf;CJcy&+;tQ z_?|OkxcSm;9fc-ehrR_LC41f|`UrB>mY#z_EYt{dO$5@r9CzJUYE%v+f=R&# zd;S`C9}AAOyGWjLAd$3U_P+1%x0T_)bMQS!$xiR`8B?;#fo@FuB4hPag`jMyv1+bO zP_E9%ew73L4d~f_%fqtHqLh=ULp`h@qLJ#ni2~KQ-PLUPau^l;4P>1FmAGsd#F4E!C^XdC}k8zv* zD2wqCQn@(6X}?rwtM!Uvd_*oz0Lae!Ds~*D7}pnH%Y!f90e={eZfLnS0B&fj4@b$3 zic7Uzo5N^;DKkF=jxVPQ255&3EFIqe_?f%u836NPm$jfnZGDTo=^683mq{#0dNKXe z3^%k9(F`j)@2iZniv#xFd?KhBtWr>v?7n}??zXQgv%DA2AWCsVn@KDPY6d%$7(jUs z%5;xy1J835{C_9A#*{rj?KEj_wiWQRSirxEMHOk5tC?(gbxgUkL3hGh(1E2t%Xj(o zJ*P5ob9veuz`qXD)WX{2mY;UbF@x;IYlIkxYS=)4dW{g S$>A9Q0000II#^Nin$_F0UtnfBX^qL`!;(Y?xW z0-ZRVpk+5*sW`c9aeDNHKvmd=U|#U{<2#NIJXx9MzIp*+iWBIJqL@HcIHW)UiWO1F zJ+CTQt|7^Pvww$W3r?WZXj)i%bpTElOF~Osp8{PYitZ$dpzwjibvHnR`=yCRLbOOzrE2yxqNX>vmDVjfL8XwD2nB4TZagw z_c_jiCxxXC1cG@%qq=>KAEpIAN^zX5d?1i?BHn*G;bc!I!+U1nxrQt|z0Wtu(g)(g zc67Q|8T&75_@*Y?vK<}Yv^L5v`=BDoVlZXzKjp{LF2a z@6bo!1&~&bf1c&S?MQ z-&s03K_UsxFq`j{E$SagM<*n~836HRPx(&02<`6bM|SxA7k>bw;XQTB0Kjq$b#WNp zE5AhDGC1=3=rZz4$o|blkpY@+6_F?J?tkN9asj|>(4pLDQCivHVRFH2&|&Ncgk7KB zd5q;61l|-8U-neQ>D3{-9}jR#8qdK^Gq%2N^J&vjnF;&d8}K45*I?`ixFwA?85)o+ zh%(&kvPR7|6@U3UzC)KaueWN{)|!g&C!Ldy)8!r@iWAk7Rl9;NN7nC*DK}d19_B2fbikfRoP9gO`zy}TvnYg;VI0MTuN zwdp8Z=|I9wGuF$`kMYYa<7dte!i5eb!miKfy&e8`V_uwBCXQ{Yw4>XkKvp`)H>P(U zv+=e{qasvUb<3bpsTI=xPY3xwkk|f8K9)H3B96R1O}9$mO;zMoy8_HdwKiPAznKt( bOTWY;N;~EedE)4R00000NkvXXu0mjfdQ|dm diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/redstone_conduit_block_13.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/redstone_conduit_block_13.png index bf30914827c8a6dc23ecb6a2bbee785a4f0eefe9..9333abc85168e796187fc3c4cccf010eb4ca95e5 100644 GIT binary patch delta 488 zcmVOB$5X?u9GIIQxcg)JX42c(YNt@Gk$NrKX0_Z z>F<0xI6@*5Cs@rVDmLm*nGTM~#0dcDMMs?-2MOBE<@fyH>wgab2K`&=jtPL{o9f4Y ze5=kS>W;}_(4``k??aBRMv4s3^s5+U^4m{en2pW>nDj!{8ZGqoU1pT**P7p&W+d0y0$KT> z+?dX3%I>2o4cky<)g5zQb1Cg5AC%uf+57i-SjKUXa2RxH`c*_QR?3^M4a`Ti)n6yN e8X@AlbBTXs!{*xRrkyeX0000c?Jm zr}7e2+u+depiAYakb~=?A_LUDGNMS{`|^#4;W+@~Zj+^2gVOQ_55sfD-6n$|Bx(h; z&k}6UAoNFwVNwrf1p8(SjD_szuQUgCJBlZ;Q!yOH2g;;+qtE z(^awZfrOXktecD1_$kf#QHaCn(FYPyE8xTDUH-Nb++AlTu4AgQwuT1EVl=7-$0h3j&^_B^)hlJ5I aFYymP1f&FzR)4ukL_t(Ijg6DRYTG~*MUQ1wksQYovWNn4smUskWKqbfix#>l z-Sr3h3H^XVSN(-9vhBVf5ir>mZ4&|s!H#Xv6j_lS+mYiKcj3--OdQCCK^i^XH}}1F zr!dWa&mRV-NaW%iJKR-!v$Ds-;FMgP1CX^kDs~p76z;Bn&VP@OegQD(-&1id0NlV* zKlYP*6_=>E7AH{`LuP&sIldVwGC&xVFm>{Wuiu%Ct^k z(vIm|WVnHah{l*%tD`cGuaEh7_>ItDC4wpJe}2Q^fv=RA-m4l!DQ;jfj0K?quUGS_ zIR##Lwj%$@?td_3&D-@d<*g8aceBNk@A@;%a@CVf&%ux*>o$k1RqFsWicd%Ye9vBL zxT;plS_OH!ggymBCr^6KN3t8mWks?CIcih)!7vt2me43d4M=Zu+yh^IS3Zykri*T` z!l!)B4{a}!e?E{%+A(jxyyvo=;cwXZo~>l3xA_uT`B6Y`Oy?qF=VghiW2&+$u0_=; zFUfx71N{!@-ha-;GS8xvlc-A=ln~KaW#050U@@w#{yOo^2$B4cOZ)}Vw%@_#^3w(Y O00000Wbcf1e^qrR)4WcL_t(Ijg6DPPTNovhrhV4u|sNGj)jp*)rbiR7%FAz(4j-s ztuN3==mQ`z@d^yA-TM$MY?W6K5)}$0k$jP3oR9>E1cf2oiw&;CCt240^E>yPdw#bv zP5;hkgJUF_IK>P$)L6GSnGKG~#3=yjMMtfjgb9_~%ir_EgMU8&4ElH2jsbw<8){=e zzEkTG+c7u_yJ#}@kdV0}O5yzK@d~fa&Xq4hlVe98-n%kbrOm{!7L73q92E#}YXz;0A&ze=? zt!parReFmiYkz*YbxBKCW!a8F-KybidoRSw2l+RU z_x@`hmVOc@9EDv1zlsRQD)NeJ0gG0x_LqsSM~L`oUGe}#uiFNNg-)XY0000Eq6=iBwWvMc?%F>}y z=dS$;{Q;3Ob?)A^dw)b0w#sXwNU2gMfMi$3F$9Q#ATl`bVIm^sOup~FbA8Xf=M`qj zpT+Iq7>P7I#jL$nv2MNPc5qA@o&u0ubX4xdiz(b({#qRU{C^F=pg+YD1^~h})Wv=@ zRe1?Z7__`Dnyma3a&R?LWPqAmM$eN!9eig#ItO6V^Vz62DQ@mCADuJl`3!@Qs2$Kb zOAxL>=#9~ni;k)|zC7ad-XV33wb+`$o3HQL+jUfDy8WsFUW{-JhCxVOgLmusG|B}u z+f?NL$xS9fxPJyOniVSb8UXwAjL<4BzXAR|gE&d4mMRSTQ?~6Anp|1eAF@$xD&j-P zGsiYp2ChGx_G85TdDa1}*@7fbdj5)peEY2;G+0Uyt^q#ic^?de@KFg8@pX#WbyTc; zAh9*ero9ed#tVMr;xM}Rfke~}`0(u`f7=Ppa}&olvs}L>De-l>LRLPI2bM7CoF(kM zEK@D%N|q&zOmnX7ybm-Mje Z5_dd`;Q+-(DgOWf002ovPDHLkV1lv@=~4gy delta 467 zcmV;^0WAKn1fK+uR)4ffL_t(Ijg6BrPuoxwg}=C#aYAZajv%WkV}AJkCw~Bg{w=FFKNOe0j*H-F+Gch1i(Ft1s`^-SI`4>Al#3Fu@HhhLNISz?)(|Ta^-q zXAAjndV`^Bet*`iQf<`b@bB5;tJeTYnn_PKy)uR#S+_N0t=25O`K`HF`<}hjaH&?y zDkA3x$<9oKqPOh^hviLy%a9oSdSxn0I^9r@HDP=jXMXg+2lD*=C z{2R!7|1l5CJP8wy!Y=iof(plydDANc_oHg`*NLu1sCcoj@ehlO+~=;8Z-4**002ov JPDHLkV1jHn>qh_p From 5e2c529dc6cfbd74134b438a532d834d9ef4f960 Mon Sep 17 00:00:00 2001 From: TBPig <147127248+TBPig@users.noreply.github.com> Date: Wed, 26 Nov 2025 08:54:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=BA=E7=82=BC=E8=8D=AF=E9=94=85?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=A7=BD=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recipe/cauldron_output.json | 2 +- .../entity/CauldronOutputBlockEntity.java | 53 +++++++++++++++++-- .../anvilcraft/pigsplus/init/AddonBlocks.java | 2 +- .../en_us/entries/prop/cauldron_output.json | 2 +- 4 files changed, 53 insertions(+), 6 deletions(-) diff --git a/src/generated/resources/data/anvilcraft_pigsplus/recipe/cauldron_output.json b/src/generated/resources/data/anvilcraft_pigsplus/recipe/cauldron_output.json index 708ae7a..90c7e06 100644 --- a/src/generated/resources/data/anvilcraft_pigsplus/recipe/cauldron_output.json +++ b/src/generated/resources/data/anvilcraft_pigsplus/recipe/cauldron_output.json @@ -15,7 +15,7 @@ " A " ], "result": { - "count": 1, + "count": 4, "id": "anvilcraft_pigsplus:cauldron_output" } } \ No newline at end of file diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/entity/CauldronOutputBlockEntity.java b/src/main/java/dev/anvilcraft/pigsplus/block/entity/CauldronOutputBlockEntity.java index 6d88fb6..f10b655 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/block/entity/CauldronOutputBlockEntity.java +++ b/src/main/java/dev/anvilcraft/pigsplus/block/entity/CauldronOutputBlockEntity.java @@ -2,15 +2,24 @@ import dev.anvilcraft.pigsplus.block.CauldronOutputBlock; import dev.anvilcraft.pigsplus.init.AddonBlocks; +import dev.dubhe.anvilcraft.api.itemhandler.ItemHandlerUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.tags.BlockTags; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.AbstractCauldronBlock; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; +import net.neoforged.neoforge.items.IItemHandler; +import net.neoforged.neoforge.items.ItemStackHandler; public class CauldronOutputBlockEntity extends BlockEntity { public CauldronOutputBlockEntity(BlockEntityType type, BlockPos pos, BlockState blockState) { @@ -19,6 +28,7 @@ public CauldronOutputBlockEntity(BlockEntityType type, BlockPos pos, BlockSta public void tick() { if (level == null) return; + if (level.hasNeighborSignal(getBlockPos())) return; BlockState state = getBlockState(); if (!state.is(AddonBlocks.CAULDRON_OUTPUT.get())) return; @@ -26,14 +36,24 @@ public void tick() { Direction facing = state.getValue(CauldronOutputBlock.FACING); BlockPos cauldronPos = getBlockPos().relative(facing.getOpposite()); BlockState cauldronState = level.getBlockState(cauldronPos); - if (!cauldronState.is(BlockTags.CAULDRONS)) return; + if (cauldronState.is(BlockTags.CAULDRONS)) { + extractItemFromCauldron(cauldronPos, facing, level); + extractFluidFromCauldron(cauldronPos, level); + } else { + IItemHandler source = ItemHandlerUtil.getSourceItemHandler(cauldronPos, facing, level); + if (source == null) return; + extractItemFromSource(facing, level, source); + } + } + + private void extractItemFromCauldron(BlockPos cauldronPos, Direction facing, Level level) { AABB searchBox = new AABB(cauldronPos); - level.getEntities(EntityType.ITEM, searchBox, (e)->!e.anvilcraft$isAdsorbable()) + level.getEntities(EntityType.ITEM, searchBox, (e) -> !e.anvilcraft$isAdsorbable()) .forEach(entity -> { Vec3 targetPos = getBlockPos().getCenter().add( -facing.getStepX() * 0.2, - 0, + -0.3, -facing.getStepZ() * 0.2 ); entity.teleportTo(targetPos.x, targetPos.y, targetPos.z); @@ -42,4 +62,31 @@ public void tick() { entity.setDeltaMovement(Vec3.ZERO); }); } + + private void extractFluidFromCauldron(BlockPos cauldronPos, Level level) { + BlockPos outputPos = getBlockPos().below(); + BlockState inputState = level.getBlockState(cauldronPos); + BlockState outputState = level.getBlockState(outputPos); + + if (outputState.is(Blocks.CAULDRON) && + inputState.getBlock() instanceof AbstractCauldronBlock cauldron && + cauldron.isFull(inputState)) { + level.setBlock(outputPos, inputState, Block.UPDATE_ALL); + level.setBlock(cauldronPos, outputState, Block.UPDATE_ALL); + } + } + + private void extractItemFromSource(Direction facing, Level level, IItemHandler source) { + ItemStackHandler itemHandler = new ItemStackHandler(); + ItemHandlerUtil.importFromTarget(itemHandler, 64, stack -> true, source); + // 将itemHandler的物品输出到世界中 + for (int i = 0; i < itemHandler.getSlots(); i++) { + ItemStack stack = itemHandler.getStackInSlot(i); + if (stack.isEmpty()) continue; + Vec3 targetPos = getBlockPos().getCenter() + .add(-facing.getStepX() * 0.2, -0.3, -facing.getStepZ() * 0.2); + ItemEntity itemEntity = new ItemEntity(level, targetPos.x, targetPos.y, targetPos.z, stack.copy(), 0, 0, 0); + level.addFreshEntity(itemEntity); + } + } } \ No newline at end of file diff --git a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java index e6df737..ab22333 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java +++ b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java @@ -63,7 +63,7 @@ public class AddonBlocks { .blockstate(DataGenUtil::noExtraModelOrState) .simpleItem() .tag(BlockTags.MINEABLE_WITH_PICKAXE) - .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get()) + .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get(), 4) .pattern(" A ") .pattern("ABA") .pattern(" A ") diff --git a/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/prop/cauldron_output.json b/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/prop/cauldron_output.json index bd39954..7643ac0 100644 --- a/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/prop/cauldron_output.json +++ b/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/prop/cauldron_output.json @@ -5,7 +5,7 @@ "sortnum": 14101, "entry_color": "DD6666", "pages": [ - "贴在$(item)炼药锅$()上以使用,可以直接输出制作完成的物品", + "贴在$(item)炼药锅$()上以使用 $(li)输出制作完成的物品 $(li)如果炼药锅装满了流体,输出流体至下方的空锅 $(li)如果贴在容器上,可以输出物品 $(li)可以被红石信号关闭", { "type": "patchouli:crafting", "recipe": "anvilcraft_pigsplus:cauldron_output"