From 5ef8e15c2140dbf9394b06cc309e125e8df0c7cb Mon Sep 17 00:00:00 2001 From: JAWolfe04 Date: Sun, 24 Apr 2016 19:31:06 -0500 Subject: [PATCH] Fix for MT methods for the Barrel and Squeezer --- builds/Minetweaker Instructions.zs | 6 +- builds/TerraFirmaPunkTweaks-1.7.10-1.13.jar | Bin 119642 -> 120705 bytes changelog.txt | 7 +++ .../terrafirmapunktweaks/items/MetalMold.java | 2 - .../minetweaker/Forestry/Squeezer.java | 36 +++++++++-- .../minetweaker/TFC/Barrel.java | 59 ++++++++++++++---- 6 files changed, 86 insertions(+), 24 deletions(-) diff --git a/builds/Minetweaker Instructions.zs b/builds/Minetweaker Instructions.zs index d5fe899..48c9a23 100644 --- a/builds/Minetweaker Instructions.zs +++ b/builds/Minetweaker Instructions.zs @@ -103,9 +103,9 @@ //Add Item Conversion Recipe //----------------------------------------------- -//OutputStack, InputStack, InputFluid(in mb), MinTechLevel (Default: 1), Sealed (Default: true), AllowAnyStack (Default: true) -//mods.tfptweaks.Barrel.addItemConversion( * 16, * 16, * 100, 0, true, true); -//mods.tfptweaks.Barrel.addItemConversion( * 16, * 16, * 100, 0, true); +//OutputStack, InputStack, InputFluid(in mb), MinTechLevel (Default: 1), Sealed (Default: true), SealedTime (Default: 8 in hours), AllowAnyStack (Default: true) +//mods.tfptweaks.Barrel.addItemConversion( * 16, * 16, * 100, 0, true, 4, true); +//mods.tfptweaks.Barrel.addItemConversion( * 16, * 16, * 100, 0, true, 4); //mods.tfptweaks.Barrel.addItemConversion( * 16, * 16, * 100, 0); //mods.tfptweaks.Barrel.addItemConversion( * 16, * 16, * 100); diff --git a/builds/TerraFirmaPunkTweaks-1.7.10-1.13.jar b/builds/TerraFirmaPunkTweaks-1.7.10-1.13.jar index 6b0c1a9d7e2c5a4f8b231e544bb076e5b4fed5b3..f2b4d28c5c33886d4ab9614748feea5143ee97bc 100644 GIT binary patch delta 16444 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 delta 15428 zcmZX*1yo#37A;H@BtR2fn&9s4mf-I0?(P=oV2!&p?he7-5*&g%1h?Q4Tmt#YeD9w( zGp|>#b=TRotL~|)Tl-d>svB5?_@e}|Ho_Hb=QgW}F0|-EzS0_>2E(+4(JRMIMNS<{ zG{zAK7nr1KpBTteU8OJ3l0c=^79*hSn>krJZY3NquDOU`lm!?qZ1nP+YMg_`OnQ^8wL4^p)P0YPZ>RNfLG;J>?Nrv|s==mEtRLm74zAONAR#D4TfxPovt%Hu#g zt*eLhRrwT-tf_JLk-ZsfWavu26a-uJ-V_swP?|Jox4F~4+qS&Z%5RUTpDcxE3_a!8 zG>J^_aiI{eWj<>{%MMOLUjc#ofF1myD?57vrv$q&XnknN6V9u6%grn1X|=RKkNu*} zB%^s>_$O+e3}>W`?I>Gu`j)n1AFZ5GYfRfm-sGY!Z&)+gCW`zyl*nHcrus-Aqo^%P zI)^4*^`NbK!=oX(60f%QsiJ9{XohQ!6+cyF8qmB~smgDiEVYarD|~fTg+Z`$0)VXu z1bOP?(l?#@wC>87+5X8(py|P5l;!FJ?Aedbd#*otApJpe*bjZi;W9Nl3Z}Bt1Y)UM zM_vatCXa434YPb6FC#3-ZCHZwy@#Y2HK1KI(lFRl5d&wdn4+;sMGd>TA3J_~24ZZA zk%m^%_XfhNR>S^_qzUV&%%k9Kr5V3!Fs@&RN@{ACNa=FhjHVp^-RkE-Bb`tY=bfhk z>$Jk+vb0ep5cRE;{5JF109zb9B>cySnqQK6_-vqNn|0NwbI8k30zWMrUmZ9Zf*IpI zqTgv`!h2_AoTNR-;=;IvamaT5MFmlnYO*;CXB1C!d<(|{|6NM>vnzP2%H`{^Omf$^ zmWLo`-iaw%@%(^by(aBi z2eP5c6y|Ez7(&q|(W+y#vF;*P2gE85X5bs;SWiI%?3;7iSe2~a_s9&t#czkE=%Y7= zE7`Bditq6K9ua6%OMmF34L7=w6_*}(hUWZeeZ+0R=p2lJ`lnnQQW5dERO-=TbPL2p z;nPeytR8AIxPzpOOn#jU7g?jxMLw~5ISVV@0*KEfA8z!N+0Ao9eg%^Nl;sfLP9FMt zH>`S)5rNh9+^~4CUv}-b?R%M~65&ddGaK3%r(98sis&5ikaQC8$rCI?5)rK&ws;coNf$6on%Io0?k0DlYO z_pM9)X7kcrb>eTaiwnWqOR!7}!1~^GzWBz_E+RlX)ua=xsb~kJDXgeZOaXjaR~crd zepV#Zpg41Y02@ANz3u<#(~r)_j_EK|+~dv25xvlSR+dNXhau*YcBPFj6=LW(P(R^( z=>Wcy%**JtIcS(-V}27W?VD+c{?y;256Noj@mGp>k$7a+HF1{f=yMI*z&7^BTZY5c$U27)P{`P`nfUv8{?N@stV@-7@$4GGMs^d=Eu z@OzDaihAm#Q%@Tr@5`x$x;R0%)c3mT9B&+kEKuGl#+f2n;VYidQ^wUuGimTm=j&N& z-*zz6RZsI}k@PLL=CS;o&3o6@8giXT-8IIlikDw%9#fyeIIhu5l4e^}v{9t^-4DFF z7#DeX7B<&Zr=$J+ZP&hlu3#mu+{?mX6jnJ0MR7QBwM`u&cyI;(bCVJ?+Ln?@{>F-(eR zkL23)x^Bw3=&NE+5Uh*R+4kJKO&`keS%6NjHE{rg>GS0S0K$73^ZxY7eNs#KCrvM8wb>9%2gj3`6kRnuu7vU$Or+x5?c z#b4QOfL0^)GdvO-V{-aqn@E;k_OB242~>MR1V!xF*FSUulMIFP_yGIKPWdw&%MF4dd9(Zua`!SQ{l(4NJao`5cz6GBw&Ub5_T#PM zrV?j$K>X4ZXFyaFTKFevzYm0INrL(rD2`V9b%b&?eqoS7kJsmfV86wMdrFgMJZ1D&ZOB@5+T2`ar`^F8YVl_2Nb8B^k zT)x*nn~d%IbokfTbnthFMgg@Z3^;a4|k|P&9r4wZkh7i zMKZ%zpK6r+Jr6~`uNSP1iZ{&HI%msvvdr0V%8D1J2F+Gd10bu^pVj=4UWN4Yds>d@ zq(AvI9QMU>RltUTd8^;8!NgsFz$TLtC6RU3gjxRQIAsf3_`0K^;C@!dB3YyX)fwyv zzPafc8Z`H`_Xezx0+C#7A4_qBx4Gzqb5$A4b-*t70V0_tnTJtYR4*2=*z>1*H_bxb zJ2K+KfXC$g%=+Ayjl!hrHQ~k6TX=d8xSH%`YBZ9wl$0>%@EmZ@itQQ9>poC2 z_bqYfiJTJ*OWw;kXgvi!QbLfQG|B?vYlc03sn)97M&K zDUDOLDV*=x8mqA+UN2oIJV=ABB$dm#TLbb>7}N!|TyU-Jjy!@1WX2DAK2JNT*Y4C1+ONBfl@2U3E&+Qku5OVC5*v9Dw~faWR=^;=OwjGs4C3z&ul-BEfH0 zgtOKA_3v0rT7{*7G(=_LGlDnVur#n=&bX-@w2|R-`<~K?s|;UU!=m zx)azB*w5;Cc+SlQ1DxL)u|{Vo>bxh)@{onEepvO03EE4Ik)6-E!vnXmo!eN9{#4zq z<`!bFLIqWi$~{GY3aA~vqA0FNA>s5Ntt&JJ>M_4ZfoQUy6mTbWj46DGq=rn)lRoMQ zoa47)8u2ZR)v|pY51$1}y;v!$G_v+DN)4hnoXE~Y=^@WL{ETGsqPHlqdb_$JCq5aR z>6fT(FZdFB>d#L@x?n-a)F-LZF(l z+cDYPSwAcMjKnSu`sREg$XkAO`;Z^V@JeM%*wRWB)_s;_9_33xUqpWtlM^3c0x|w1 z?y;FS#IZbyYjKkLM3x~(P}D7#smsa%Wwz+8__S(l1A6A7Bf-U}Q60MKbby02llKy5 zlG9>icx^Q+IZjK|)7gr*mhXiE=;EG|I!_p#S?mlFn$i>}xIW4_^O^3V=U`}0vfEQv)p0dtC?3VZ zdf-dJ%}vAD%7Sk{)|PLFenU+WWx$cn!+A#l!MhU<1SE7NsZ02rrB|m=M4zey?u=6D zHi`>(Ev32~%WP9F3m_0P-q3fDFToFjhggy-(cMW0Ha%~-Xf>!>B8FdfeOGU)MYY>s z7^dJaY5Te*RY4M|mr?^+9`c3e20ITfh4S(-X0#ACc`&Q{H6^1!LJ}ioD(?eEplWi> z%&2J60rdt_ud<6~mH@mjTtSIRRG7Lj;x(*9g)0U_q%MZJDtJgsyYf*}W>hyviN_li z5AJIXN8^{ZsBMLyU$oK@<&~`QE8$VBHVU=C(*pG)67Qg0+P59#BI|A+RBk*Xg+#~% z8!6PaTfvMKmN^xYo?T07D(@OSovGH|k!+a@tq1!`OTcTv1<6U&^3&TC_M&-Ks-sk& zFyTb?a8+ae!fivPS7YsSu8JMnL4{t!q#UL`GEO0y6*mVHI-)-MDWrGfP4U%zJg-mL zFMUw;Cka8yt3nm<`L3(4xg5QvyM4vagkU?%r~>9PWZG|iZ_B@s!K9%n&m(g*7%kfx ztH7tRxJ!|$UDod4=GAKMO?(%hhb99jPMmRA3g;h4`obN`;qSjIzd_75w3iV;I#t=6 zJs4+wgF|MY$CuC^K~&ytaUx#~olZY8l=P|)s*hePzx`=(@(^f`tzYUwT03MYNTq_c zBn5s+OU|K|Nl3g{qomprBB$E=3L;7Bj4Jq?C@Fp@RhcM~Szwas3L}sby!3^Tyz$u@ zjiU22ZbZ%l(&5T*mQ^`Pof@JcPAt(`qDweGQlvjtd^gMM6&LYgSk$>)T7K?AviVS4YlBHyARt)OXpu=@_2Rvy z=%JRmE$v#*@KKW+VwhHqkW0t=r4HQ|(rWKF4*mv|;O?jN;eF|V@ z{4dws`h_8p?ktc%sq&SLUIFYgnyq5k@fFGlxzl2G(P<0~NxC&1cZMC_a{12;R?1{+ zLF}PQBeAmkPK}Z-3D2Rux#}Fib75Y&^A98lajZaPNM zyP6qhe_;Qr@8F88pcOm}%pM91OcMTt7x?(E2LD-W#3yKmm!;E;lnfP~Nz}krSt&p- zM^L3N!Uh;+jw|>bTE0p!@&F!vx5sYgn_QS|7xyd-E7I_LQ+4O8Ur_9(?`zu?pCh^&Xay$FX9=!(GK>)Z%$WK+2}MWHN$B=b6ey>?qwnoCbBWwL6iCIM*_@m<4etv7Az%Sm+)nMdaD zLrGE58&>y)GVB3c3oq#OT$G7}zHt+v z&(`j}ppD46jXo0`@0vzK#bjL$AJJoV0S^j^{BsGKDG1VpDU&DYaXMoTdxrrDsz z?L@#Y1=B>(XhVwYtt#%=MTAks)<;#IgLUMdI)~9|j7XM}XnP%s$I7v|V+FK?>f1=Cj@PB5NB4JCM`$FFhhM znvS`$jz8Y@69`6R!xdZnvfmIpEJ{2p9drvenPx4ncaJ}kRjK3LQaDGAQ+}+Foj1C= zt}2btRyVLl_VJBY&uoMjW5^uMT5fSECG|U{()he3^8>t2KG||nel(3@r+}L1dO1fr zF5(wQP#yo_8^xuF9<|uRsxI@-*7rG$hW-u}oc>L0!{_lT$Pd~JbRECLSS9^t_+9K{>2scJGM1ehn3I)bZ_>&BC#UVTx$bPCVcXE{<5|&`#C% zM{vlU_5s7yOmpO)ZBjF$#p}Y_<0_wuOTgN~t9W>4A83xfS#p_cz_K=`neJa7!n_68 ztVR#y?_pf3lDmJ3P1&EWV{pl^&!wI%o%X~v@W8pA@j~@q)O6m6X8GM@ zr9B`_z5IND!X!V{)+yjj{H9~V)c-0NN04${JswP5;S*&F4LylBT@m$6BgV1+pkd){ z9J{5IU|uSnS{$FeW#~KFk?^Qg(MZwI7<{1)SKuomU;$9RUBlH-X3_HUf0ksw4aM>*g{W-;%Us1K@>W3{^SVTU)uPq z)d5$b^07%wbDzMPdTwg3GiA>VZW~`++5A0CGV&=-rkEgE3|*V3`H#p;sjxReG$V?B zo4Z-guBx<#DxHPf2Ay#%-S>GM3h3!BSuVRhAGT1PSRM;vp(^@*xmZ6+C~(6NuWIjp z*kw1}wsbe$u0LGYpb5j(A~><1NT(eRr&b%3ZO7+W~v%9MnF%e!TM{tF-2U# zatV3~J?lBrEw(!PM)}l9UA~HPw`qg;E%g~T?o{>!{>H$jr#UvRg33W@bH7g{N=w4Y zY>epy^zF0K8MgZS5-qL}dK%Bni@$Q6|FCJLeXn$n51WxNviznwV`;LMQ3hO`hYwYk=KEOaRZ6EU0Z#RF6^`#i3!+A3CbGdOB##hM0Y zf8tLLHoln|gMjG!X|iyUB}jH7rtwL3`28!7+I?zA@x8Xx?dO2wXXd=b?assvV!m{y z;$dNhedA(4i~OHt@F;b>Ff6IGWkIS)Xv}KL;9x#c-IBb81ZFMeQ|%gMRy+?;-Ew2% zpD5)rB3%?*4A#z7Ovt#r?ejoGKlM@e>mgOx4|SQ`xA}BT|86zahpmBZ_4Z@0i_eiIy538oWS^>6ij?_qI8l z^2y~4;s_g^%(B`9EC~X$vUJC*E%eY4Olc5D#U|@nRWI*Z0avI+8Q!zzqpa$%pL5Oq znXqVz=4pS~lHVj1UyWMJF}FfCxDw&i>jN?RxNow_8L$BjO$BLZ!c=j6c#nD(9+a}IOTvF?}Y64F>s@(8u zsp-tzuynbluo%ZHhpsJ+lpEiNe5Ju&G_K36Q=EpYn7FIk;^e;#p#jtGBgy&%xn}1T z(bOJMa!+H^8*?Z)z^_WH*#Y!yknw82e0~|}%qA3A>x6IrJa&V~&;KFO0Veot!b+N@ zTZp`wKUkrZt#O~ybN-ZWlRL2BGp~$?j1`FSBi88iglnjs!mRSgpKDRBhG)!C6L1Cg z$oCX#-*|>qe~a(_kuL&22aVt3;0E+n7BL|{1!DsdrT2E{WEh3;n>=qFSG-+-usw3sK&cZ)|+8)Na2osto|(+UeFVkiz!A* zXkT#)3C)w}rnY6$pV4+ZnvgfL5>^m+Q9mp8C$9|bzUs7F z6``p&X_BND4>!&2`)oi(OVdh)lYkV5yc& zRFw1=Y*$0qNc?iThbK3gH(;+Id^?oJ$bTAxyZ17$?gtdZ8M zvRx_n>?(V9gKtgf>&vfaG??2h?!H>b{l=c|+2(Yd3kTmb;A?QJ7NaaVQ_g4<&#I5PDZr%4m)xEmVe59Ik1HdhVon|zwZaNh#)x501SGBFRu zF7+eh|GJY5Igx4s_w#?N&8UUoYWPVpJ~-w1IxCCbJStPH(_PYN2%dNFjVVj*ZQB(G z*W2X zx#XEFu=NYTrkHB%G6-UQ+kEiq*;}yihbGh-yT)IFkPd^5K^f*<8r>3b5B!8}v4Zq` zXGdx?clTy|2`FnfE6sGR5-*Wy2?PA2wVor5ud;e=;&G%xi}`bpJqAE=m2tY~dw3=?8phT=(J3+u@?v0XlOrpckuOxbI9 z+A|v&>Ylp@_h0q!vYX-&836HJ^Qf8Rc#)FukPAN33MrVN=U#_>S|bJDh$uN_EzWlQ zyt%Fb`#k$P$>(yqi#g`qiV^rryq*K_+xDuXTNjQS{}tN)al}GPF9Wff{-cXJmK}0xZE3#rKfmDlpQy*Y9N&XQrWOcME5b@L$-eOF=ipvPw7nb z`i)v{4I0g^w}rIo%>{hUOi6B#9W74Ypk6Coj}DsbKW_(WNLHfNvt zKGWW?_UA*m3T9i8#xSy)Td2jm<4X{NnYP=<%tduE4y(Dk6F_x`$sDVFS%};zk6UUg z*L}eoH%wq|`&#Sr2^v8Mr;bk$Y@r%L%CZXK_=Z zFDXcC7QByu|GGDms;?yRPLJv?ve8vJt#_?QIg$nK^y}(8SC2B*d4_T=fda-Hc|{(v zERm?S=G5k-E;i?5!wsIOGNW+zrC|oq&tvQ62e>(W$$6HiYkTu z7THcCjngvX-@;+vQ9Wzp5dw@V-(G^V8fJh&$+lf8VBtH8OdM}`O))T~4zj3iA2L!I{&11c$vl$y?V}Gw_|G21FTb%{aW)R0N~ zb}mC`hF!>691b%?vg21Oal&a)lM*i&L#IFjl&d;E1Vl44AS}zVuhwQLS+zxG;Ko!M zew#F^H;b2Xs?Hw^-kDqrx26QVWhJ%q`N@`~h>R%FE7 z2+x#h$$SM=*a{%R;s-eJ4|Z<{C7p`m-ljYGcFQMj>A;M?281#Xgo8aIz&RY&3if=# z&9g;lTR6VdzlB->?*)r2(K3A+JTpQ&mnAdiH#IU^jN!j^i!wbCc$~cFtaqwQ^_Rls zDH!>Xev_DTeK|L@q%J9Fz%jS(|E>#ozUA%p#AlDXg+hpGnOk@cm-X=;_-wK25AZD( zbO)r5x*CD{BI2fW2cKzJ!P;#OJmrf%N8>3+Dyl6$M}ud#X8Cga7shXshD1-Eg&Bep)(?g1uXr$ye-h6LxHKlbB#{ zUHKGIV<8{;I7Jn!qO`Or&2hVTwjg-MpV(h*M(?oT`k3+ELb6K1AK2$y=ADB>`s-M# zZY~oyT3NeEqs(NyKP-5vx)I4Yjh;Xjjila+FVMvL1a~KI29wT16ZVY7Y5WJ2zq+k5 zd@Yyvs@os_rQ4wgW?%=k_Zrv%j-Q!Bm{<-`Z0llVGe3TAGG=o65^60=`Vk(vxO;Q_ zCjzs*Cr2hKQ@~m7MWxa2ZA5|Dk^+ucj@W<;8ot7t)wPg7^Ac7f1!}MJQNBr^3Ac&$ z-w%^YUt#b?0!`N3kq1|=+s*buw~!Y1d=7EF>+H{c){IL3wZFjr zMHQ8;BNOmcB-~_g-1&+NWNU5F>I$m>scnq1a2nY8$=tUGBzy3t4*dm`34plXPSV&d z2xIp(?JW2Vt${Hm4YN~#8$~}oEMe!XFPmunt>? zpidn0M!nO@>y=xfid!i$#*ev<^dtH||5+?I&}Hkbm^G7&?pIy5(PBk;h+v`z(;_9K*msSGTt z*%X~^ci{le7Mw{cVEsY)MkbvcLn*xGw8H2zkx&Je3*}CX zCN^c9+TADg0qB*hk6Ic*qG>;Sg>O|e`*5qj@s1mG(nVb;(GJ8Yi|BI zXUcr7BC-mKC1H}@Twa@mVP2#??G&Q7w9jCH&mx_8Lw7aulUw92p9lhfw|Z*BQc(#< z+m|za+nf47Q+Di#9Yolc5r%GBKl?kEY8JbHTtS8qe#9E)*uL~?tg5;010cO6ti9>Cek*b}R9-Yuek5ENQ`u@Ldi?{Rk`*57oJ z^pYIZylT(zHxBYkpb*X{?VdTF1LFbwc5$;`;Rbj#b-idfsf-A@zYIrfOI!=SXuw&bbZkz2Ut`N7%0d=ECV zCL2v0+BLMP`gQ3&YokHW-E-e81Pn&aei z*oG-g4YR4luuCgh;MqQQPjJj_`h*Rh4fYH{aCqC;?%wd&N_x4;Y;2dDWkrM5>jJ%wl^FMj0aNEG_MHMxfg&7W;U}oadR8j zdGNwo#Cgf78mCxJL}jO4A`MgU7GXqUmP`EM2onf|BUBTxF=mWA?U{*Akfe@p)XCtq zQNw)OXfsP~BeQ7qV>XBLer_$m#x;ZFk;J3zeEeX9V0no7=P>LHB2KvNdTV2G~fB93}rG-n_A!*4W)10>sEZV*@S68==#`j0~~MK0R}U`(^>ntNn$lWj{h!me2X~hYyw#*)?^j*AX#UE5SWCs@Q*t` z3X{&Jrk?Y}fW9baAuf&8nk2|TuI})39p`@aqrNv=a*dM!TAh9P=C~RIe2VXNgUMS*|JUexNzyHiQFeHnrY&Vqy zIzTgiFXk=UK*<7G_meW#g8bZHZrtB<#}}wo>+z%n5sch}1>^7$Y{yx4+fYnb8Rf0Z zUApxKl9w9U)e-sm)baY7_XIJ%IYLMiFvWm+Nq6Gp@j^?Lq@n)FG6r-?0gDl9;aN+~&w2I)~_wrDG}KB3lNY1)G<+ zE@m|#o1e0RmCA;Gg#-;G zsH$YFhw=qMKo3y)CD0Ku~4ZuEYJouGy;SLpJRN^M{A48W3?0%%WWG zL3t0((q*aKrR-AY)bk0xAF^t2%nIYTekCRP0m-ROMw%6DaPED8TD{-PtU~-{7Bn0` zfGotnJ;P}7){smjj2>@XXwqFUG8+(9<9utTdnJ4Rhu^V zJNe8D78)A|SM`ko+nU@G z-++lWHt{BTKqU*nw4vJ>-F%nYo0QIsn$kS}d_Ikybexh$%>DW0UD@k8@6)tqk4qwW z7Yz27MP{&Zd;)gB;5z^&YfCiR`c5>H*TEvioDIWR*no553MmSQ~@xV^kPa zw~hkwe%HW9|DhDi{ZO(V@Mw8`dfXZX9{*YhK_r>7S|aYpr95~NdmQ3ItO{Ffz`5ys zS0W5D_ChCb`J8Fcu;fwJ?T5P-mi%u0oyVmoZ}lgLvi<}1(+8=thYLnuaKx|HOQf9N zpC53>%QPZGaJPSNnZFY4Cbu^>O~h_<})DiS@;5ipA6eYjWET8*be< zcJOzBN8liAfk%R_2!THey(As2NoOqMAg%hiHxfZiXf1{oo1&QsM!)b3?ghF~LxiNR zjlugbOF^gDKOK>e3b7Z4YH?_4QNdO=?r;Lb-xYV`i=MjP@JvO-4U6&w{mDOsz!0P6 z4ZWEEX89ZpC^}IhMMpv;SIE4;^6gi8=Tz*}?S*x_j^GYGJ$$c_~#9(Gqw@b-jX4$x<*+f-w)ktYs3>ms@<%(}4A`~*;P;=cj zrOJkgtamR^^1PNBFuPO=cx1075xatxrI2Qfg44Y!LolrMbf{4(LV`tXgJm4Ni@1-9 zxI0zB?}f`z^{DU+==l^olB@HrS~b|?)_dvc8lq(X(*%vs5XU4+74A+ST$CBd#vA68 z_jH~Z=j0n2fZPBv)F;bSU{(fcJR}(pG8|?1_!pTIzCXaPP6+oNZWYHIvF2=&(~5#D>+^OvFV zpZL3X(@$X(23N(ri>0(UC;nbSoOpuO$U#G=N`j>F@Fz6Q&6FW<5F9_MME^ka0jzYW zp|mlg7*O*#a7u8n-D2nb?ijN3;>}7N?z3Xr-Qhj(t0(rR;nwX^Q2M(z&E5-j@kFAk zl}tj2u<2Fp#XL(jLqIY7!Hg}2A!6tv6S>H1RAt|0TqDCjkhu!a?vu~_FNtE67xCc< zVB(353pvI6 zI;Q$Mrj_nn*1h14Z;)p%uFOl=L zVpstEP7B9J;D>k2{+BuLIzHMy7o%0BN5`(HbIsy1|9ZPi+G#?lchq@`RAZ~`k@zv6 z%ktwP=f2~kbZuV&e}mGk{~Ti54$X>*?DWm9BSS!>L93X?_aWZ!+zu#2CQ1xo-J+z|J!x3C(#r5wtu8SkXz^srbu??$0BL@H^4aE;< z-Ee`P=$}r2FJaOu4J6?8D*)HmEiG}F|NJGVLNU4kACvy1AwXBU z0Q9gS8PKh-01haB_p7n@FM|)7+YJzheaicr!k1)J2!j4;2cScxz5)nf6^j3bLbJXC z#9)!D{u-ZQVe0>0KP1^U;{HP&{`N{WYW@cuY5hN_OwTKd-Srpcg=Y5va0&nOke>2? z`Uyih2sP;k@I#S$0knkwIv?^H4xk6Zz-av!4QcFOv?Rv~66m*n06O7+ZtQ9P7nN}4 z|ED5Dar*$2g#Qi>zm}@;U(|=Ce{LS%2Vf%ncP!$Sru$zs?v1~+k5EuQfRXV3t`1;e z4E~E|xc8UlMEHMu5(Y--zZfP*e;IsGssR8iEc(sg2IBbJ(=xE^PyZNi2LbZ1xqtpK zA_f7xu;=j5=@9@0bPDv^HMfHRQP?$<|3Dmu01~j4=>LJNVgrz&i;b^r!0>B7*y8+? z_Hh`X4lD8g-$Y#K+@4f{g*-yC1QBJOUDF&5E}Cx@D8?|;h(a;eFt#D!ZH41)N;JKzhD{IqJLdUl30ikpr{i74gfqfYa9TA8mqll z$avzlhARI7{Hunq^`VEYQHJhM0QlaVCd=l!05^)S z1_0)DacJT0#sUrOd~FQ;saFr`G@w0G0Ai@*)N66i|1v0`DSr(`&A%yHur=EMFwhME zNKldK*AzIN|3Hj$URxpaFKqljFe>zE8o&mFhaBbmyMVYcn3w9du{xnxz~Pt%Kl%%=-g|* zqTK(5v5Nqh(DwP)eCqSB`8e|bmykUVkb-S1_+OZ=6oB?mKK6yze9lGxO+bWxS^x;Z aUKRg0ECp*&{vU|)B7gzGqYCgkIR8H}JPYRl diff --git a/changelog.txt b/changelog.txt index 1aaa416..a4477af 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,13 @@ Changelog ================================================= ------------------------------------------------- +TFP Tweaks 1.13 +------------------------------------------------- +Bug Fixes ++Fixed Barrel Item conversion for minetweaker to handle input and output stacks sizes correctly ++Fixed Barrel Item conversion for minetweaker to set the length of sealed time ++Fixed minetweaker code for the Forestry Squeezer for the recipe to be undone +------------------------------------------------- TFP Tweaks 1.12 ------------------------------------------------- New Features diff --git a/src/main/java/com/JAWolfe/terrafirmapunktweaks/items/MetalMold.java b/src/main/java/com/JAWolfe/terrafirmapunktweaks/items/MetalMold.java index b3dcc35..558ecac 100644 --- a/src/main/java/com/JAWolfe/terrafirmapunktweaks/items/MetalMold.java +++ b/src/main/java/com/JAWolfe/terrafirmapunktweaks/items/MetalMold.java @@ -1,14 +1,12 @@ package com.JAWolfe.terrafirmapunktweaks.items; import com.JAWolfe.terrafirmapunktweaks.reference.References; -import com.bioxx.tfc.Reference; import com.bioxx.tfc.Items.ItemTerra; import com.bioxx.tfc.api.Enums.EnumSize; import com.bioxx.tfc.api.Enums.EnumWeight; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; public class MetalMold extends ItemTerra { diff --git a/src/main/java/com/JAWolfe/terrafirmapunktweaks/minetweaker/Forestry/Squeezer.java b/src/main/java/com/JAWolfe/terrafirmapunktweaks/minetweaker/Forestry/Squeezer.java index 69b30ce..9768cbf 100644 --- a/src/main/java/com/JAWolfe/terrafirmapunktweaks/minetweaker/Forestry/Squeezer.java +++ b/src/main/java/com/JAWolfe/terrafirmapunktweaks/minetweaker/Forestry/Squeezer.java @@ -1,6 +1,7 @@ package com.JAWolfe.terrafirmapunktweaks.minetweaker.Forestry; import forestry.api.recipes.RecipeManagers; +import forestry.factory.recipes.SqueezerRecipeManager; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; @@ -39,7 +40,7 @@ public class Squeezer private ItemStack byProduct; private FluidStack outputFluid; private int tickcount; - private int chance; + private int chance = 0; public addSqueezerAction(FluidStack output, int ticks, ItemStack[] inputs) { @@ -67,22 +68,45 @@ public class Squeezer @Override public String describe() { - return null; + String inputString = ""; + for(int i = 0; i < inputStacks.length; i++) + { + inputString.concat(inputStacks[i].getDisplayName() + " "); + } + + if(byProduct == null) + return "Adding items '" + inputString + "' to squeezer yeilding '" + outputFluid.getLocalizedName() + "'"; + else + return "Adding items '" + inputString + "' to squeezer yeilding '" + outputFluid.getLocalizedName() + + " with the byproduct " + byProduct.getDisplayName() + "'"; } @Override public boolean canUndo() { - return false; + return true; } @Override - public void undo() { + public void undo() + { + RecipeManagers.squeezerManager.removeRecipe(SqueezerRecipeManager.findMatchingRecipe(inputStacks)); } @Override - public String describeUndo() { - return null; + public String describeUndo() + { + String inputString = ""; + for(int i = 0; i < inputStacks.length; i++) + { + inputString = inputString.concat(inputStacks[i].getDisplayName() + " "); + } + + if(byProduct == null) + return "Removing items '" + inputString + "' from squeezer yeilding '" + outputFluid.getLocalizedName() + "'"; + else + return "Removing items '" + inputString + "' from squeezer yeilding '" + outputFluid.getLocalizedName() + + " with the byproduct " + byProduct.getDisplayName() + "'"; } @Override diff --git a/src/main/java/com/JAWolfe/terrafirmapunktweaks/minetweaker/TFC/Barrel.java b/src/main/java/com/JAWolfe/terrafirmapunktweaks/minetweaker/TFC/Barrel.java index 568c7be..f18f242 100644 --- a/src/main/java/com/JAWolfe/terrafirmapunktweaks/minetweaker/TFC/Barrel.java +++ b/src/main/java/com/JAWolfe/terrafirmapunktweaks/minetweaker/TFC/Barrel.java @@ -112,33 +112,46 @@ public class Barrel MineTweakerAPI.apply(new removeItemFluidConversionAction(inputStack, inputFluid)); } - //BarrelMultiItemRecipe - Better for converting items as the outputstack size can match the input @ZenMethod - public static void addItemConversion(IItemStack outputIS, IItemStack inputIS, ILiquidStack inputFS, int minTechLevel, boolean sealed, boolean allowAnyStack) + public static void addItemConversion(IItemStack outputIS, IItemStack inputIS, ILiquidStack inputFS, int minTechLevel, boolean sealed, int sealedTime, boolean allowAnyStack) { ItemStack inputStack = MineTweakerMC.getItemStack(inputIS); ItemStack outputStack = MineTweakerMC.getItemStack(outputIS); FluidStack inputFluid = MineTweakerMC.getLiquidStack(inputFS); - MineTweakerAPI.apply(new addItemConversionAction(inputStack, inputFluid, outputStack, sealed, minTechLevel, allowAnyStack)); + if(inputStack == null || inputStack.getItem() == null) + MineTweakerAPI.logError("Missing InputStack"); + else if(inputStack.stackSize < 1) + MineTweakerAPI.logError("InputStack must be at least 1 item"); + else if(inputFluid == null || inputFluid.getFluid() == null) + MineTweakerAPI.logError("Missing InputFluid"); + else if(inputFluid.amount <= 0) + MineTweakerAPI.logError("InputFluid must contain more than 0 mb of fluid"); + else if(outputStack == null || outputStack.getItem() == null) + MineTweakerAPI.logError("Missing OutputStack"); + else + { + inputFluid.amount = inputFluid.amount/inputStack.stackSize; + MineTweakerAPI.apply(new addItemConversionAction(inputStack, inputFluid, outputStack, sealed, sealedTime, minTechLevel, allowAnyStack)); + } } @ZenMethod - public static void addItemConversion(IItemStack outputIS, IItemStack inputIS, ILiquidStack inputFS, int minTechLevel, boolean sealed) + public static void addItemConversion(IItemStack outputIS, IItemStack inputIS, ILiquidStack inputFS, int minTechLevel, boolean sealed, int sealedTime) { - addItemConversion(outputIS, inputIS, inputFS, minTechLevel, sealed, true); + addItemConversion(outputIS, inputIS, inputFS, minTechLevel, sealed, sealedTime, true); } @ZenMethod public static void addItemConversion(IItemStack outputIS, IItemStack inputIS, ILiquidStack inputFS, int minTechLevel) { - addItemConversion(outputIS, inputIS, inputFS, minTechLevel, true, true); + addItemConversion(outputIS, inputIS, inputFS, minTechLevel, true, 8, true); } @ZenMethod public static void addItemConversion(IItemStack outputIS, IItemStack inputIS, ILiquidStack inputFS) { - addItemConversion(outputIS, inputIS, inputFS, 1, true, true); + addItemConversion(outputIS, inputIS, inputFS, 1, true, 8, true); } @ZenMethod @@ -263,8 +276,14 @@ public class Barrel { if (BarrelList.get(i) != null) { - if (BarrelList.get(i).matches(inputStack, inputFluid)) + ItemStack recipeIS = BarrelList.get(i).getInItem(); + FluidStack recipeFS = BarrelList.get(i).getInFluid(); + + if (recipeIS != null && inputStack != null && recipeIS.isItemEqual(inputStack) && + recipeFS != null && inputFluid != null && recipeFS.isFluidStackIdentical(inputFluid)) + { BarrelList.remove(i--); + } } } } @@ -301,9 +320,15 @@ public class Barrel for (int i = 0; i < BarrelList.size(); i++) { if (BarrelList.get(i) != null) - { - if (BarrelList.get(i).matches(inputStack, inputFluid)) + { + ItemStack recipeIS = BarrelList.get(i).getInItem(); + FluidStack recipeFS = BarrelList.get(i).getInFluid(); + + if (recipeIS != null && inputStack != null && recipeIS.isItemEqual(inputStack) && + recipeFS != null && inputFluid != null && recipeFS.isFluidStackIdentical(inputFluid)) + { BarrelList.remove(i--); + } } } } @@ -345,15 +370,17 @@ public class Barrel ItemStack outputStack; FluidStack inputFluid; boolean sealed; + int sealedTime; int minTechLevel; boolean allowAnyStack; - public addItemConversionAction(ItemStack inputIS, FluidStack inputFS, ItemStack outputIS, boolean sealed, int minTechLevel, boolean allowAnyStack) + public addItemConversionAction(ItemStack inputIS, FluidStack inputFS, ItemStack outputIS, boolean sealed, int sealedTime, int minTechLevel, boolean allowAnyStack) { this.inputStack = inputIS; this.inputFluid = inputFS; this.outputStack = outputIS; this.sealed = sealed; + this.sealedTime = sealedTime; this.minTechLevel = minTechLevel; this.allowAnyStack = allowAnyStack; @@ -362,7 +389,7 @@ public class Barrel @Override public void apply() { - BarrelManager.getInstance().addRecipe(new BarrelRecipe(inputStack, inputFluid, outputStack, inputFluid).setAllowAnyStack(allowAnyStack).setMinTechLevel(minTechLevel).setSealedRecipe(sealed)); + BarrelManager.getInstance().addRecipe(new BarrelRecipe(inputStack, inputFluid, outputStack, inputFluid, sealedTime).setAllowAnyStack(allowAnyStack).setMinTechLevel(minTechLevel).setSealedRecipe(sealed)); } @Override @@ -386,8 +413,14 @@ public class Barrel { if (BarrelList.get(i) != null) { - if (BarrelList.get(i).matches(inputStack, inputFluid)) + ItemStack recipeIS = BarrelList.get(i).getInItem(); + FluidStack recipeFS = BarrelList.get(i).getInFluid(); + + if (recipeIS != null && inputStack != null && recipeIS.isItemEqual(inputStack) && + recipeFS != null && inputFluid != null && recipeFS.isFluidStackIdentical(inputFluid)) + { BarrelList.remove(i--); + } } } }