From 08c95c654b7b7bd6fc0f4620ced40b1ab389e3e1 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Mon, 9 Feb 2015 22:48:18 +0100 Subject: [PATCH] Finish TE Integration: Molten Lumium, Signalum, Mithril/ManaInfused and Enderium. Also add alloys and the ability to create liquid red/glowstone in the smeltery with Pyrotheum as fuel --- resources/assets/tinker/lang/en_US.lang | 14 ++- .../textures/blocks/liquid_enderium.png | Bin 0 -> 11392 bytes .../blocks/liquid_enderium.png.mcmeta | 45 ++++++++ .../textures/blocks/liquid_enderium_flow.png | Bin 0 -> 11412 bytes .../blocks/liquid_enderium_flow.png.mcmeta | 5 + .../tinker/textures/blocks/liquid_lumium.png | Bin 0 -> 8131 bytes .../textures/blocks/liquid_lumium.png.mcmeta | 45 ++++++++ .../textures/blocks/liquid_lumium_flow.png | Bin 0 -> 8576 bytes .../blocks/liquid_lumium_flow.png.mcmeta | 5 + .../tinker/textures/blocks/liquid_mithril.png | Bin 0 -> 9507 bytes .../textures/blocks/liquid_mithril.png.mcmeta | 45 ++++++++ .../textures/blocks/liquid_mithril_flow.png | Bin 0 -> 9493 bytes .../blocks/liquid_mithril_flow.png.mcmeta | 5 + .../textures/blocks/liquid_signalum.png | Bin 0 -> 7613 bytes .../blocks/liquid_signalum.png.mcmeta | 45 ++++++++ .../textures/blocks/liquid_signalum_flow.png | Bin 0 -> 6649 bytes .../blocks/liquid_signalum_flow.png.mcmeta | 5 + .../items/materials/bucket_enderium.png | Bin 0 -> 507 bytes .../items/materials/bucket_lumium.png | Bin 0 -> 438 bytes .../items/materials/bucket_mithril.png | Bin 0 -> 460 bytes .../items/materials/bucket_signalum.png | Bin 0 -> 450 bytes src/main/java/tconstruct/TConstruct.java | 2 + .../plugins/te4/TinkersThermalFoundation.java | 103 ++++++++++++++++++ .../tconstruct/smeltery/TinkerSmeltery.java | 48 +++++--- .../smeltery/items/FilledBucket.java | 4 +- 25 files changed, 351 insertions(+), 20 deletions(-) create mode 100644 resources/assets/tinker/textures/blocks/liquid_enderium.png create mode 100644 resources/assets/tinker/textures/blocks/liquid_enderium.png.mcmeta create mode 100644 resources/assets/tinker/textures/blocks/liquid_enderium_flow.png create mode 100644 resources/assets/tinker/textures/blocks/liquid_enderium_flow.png.mcmeta create mode 100644 resources/assets/tinker/textures/blocks/liquid_lumium.png create mode 100644 resources/assets/tinker/textures/blocks/liquid_lumium.png.mcmeta create mode 100644 resources/assets/tinker/textures/blocks/liquid_lumium_flow.png create mode 100644 resources/assets/tinker/textures/blocks/liquid_lumium_flow.png.mcmeta create mode 100644 resources/assets/tinker/textures/blocks/liquid_mithril.png create mode 100644 resources/assets/tinker/textures/blocks/liquid_mithril.png.mcmeta create mode 100644 resources/assets/tinker/textures/blocks/liquid_mithril_flow.png create mode 100644 resources/assets/tinker/textures/blocks/liquid_mithril_flow.png.mcmeta create mode 100644 resources/assets/tinker/textures/blocks/liquid_signalum.png create mode 100644 resources/assets/tinker/textures/blocks/liquid_signalum.png.mcmeta create mode 100644 resources/assets/tinker/textures/blocks/liquid_signalum_flow.png create mode 100644 resources/assets/tinker/textures/blocks/liquid_signalum_flow.png.mcmeta create mode 100644 resources/assets/tinker/textures/items/materials/bucket_enderium.png create mode 100644 resources/assets/tinker/textures/items/materials/bucket_lumium.png create mode 100644 resources/assets/tinker/textures/items/materials/bucket_mithril.png create mode 100644 resources/assets/tinker/textures/items/materials/bucket_signalum.png create mode 100644 src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index a97adde56b2..784dc5f71f6 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -487,6 +487,10 @@ item.tconstruct.bucket.Silver.name=Molten Silver Bucket item.tconstruct.bucket.Shiny.name=Molten Shiny Bucket item.tconstruct.bucket.Invar.name=Molten Invar Bucket item.tconstruct.bucket.Electrum.name=Molten Electrum Bucket +item.tconstruct.bucket.Lumium.name=Molten Lumium Bucket +item.tconstruct.bucket.Signalum.name=Molten Signalum Bucket +item.tconstruct.bucket.Mithril.name=Molten Mana Infused Metal Bucket +item.tconstruct.bucket.Enderium.name=Molten Enderium Bucket item.tconstruct.bucket.Ender.name=Liquified Ender Bucket item.tconstruct.bucket.Slime.name=Liquid Slime Bucket item.tconstruct.bucket.PigIron.name=Molten Pig Iron Bucket @@ -519,6 +523,10 @@ tile.fluid.molten.lead.name=Molten Lead tile.fluid.molten.shiny.name=Molten Shiny tile.fluid.molten.invar.name=Molten Invar tile.fluid.molten.electrum.name=Molten Electrum +tile.fluid.molten.lumium.name=Molten Lumium +tile.fluid.molten.signalum.name=Molten Signalum +tile.fluid.molten.mithril.name=Molten Mana Infused Metal +tile.fluid.molten.enderium.name=Molten Enderium tile.fluid.ender.name=Liquified Ender tile.liquid.slime.name=Liquified Slime @@ -643,9 +651,13 @@ fluid.blood=Blood fluid.nickel.molten=Molten Nickel fluid.lead.molten=Molten Lead fluid.silver.molten=Molten Silver -fluid.shiny.molten=Molten Shiny +fluid.platinum.molten=Molten Shiny fluid.invar.molten=Molten Invar fluid.electrum.molten=Molten Electrum +fluid.lumium.molten=Molten Lumium +fluid.signalum.molten=Molten Signalum +fluid.mithril.molten=Molten Mana Infused Metal +fluid.enderium.molten=Molten Enderium fluid.ender=Liquid Ender fluid.slime.blue=Liquid Blueslime fluid.pigiron.molten=Pig Iron diff --git a/resources/assets/tinker/textures/blocks/liquid_enderium.png b/resources/assets/tinker/textures/blocks/liquid_enderium.png new file mode 100644 index 0000000000000000000000000000000000000000..b2b0e2df92442167f516d7f51af313362519c497 GIT binary patch literal 11392 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

D^~%UF)}1n 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 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/liquid_enderium_flow.png.mcmeta b/resources/assets/tinker/textures/blocks/liquid_enderium_flow.png.mcmeta new file mode 100644 index 00000000000..8e55e43bafe --- /dev/null +++ b/resources/assets/tinker/textures/blocks/liquid_enderium_flow.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/resources/assets/tinker/textures/blocks/liquid_lumium.png b/resources/assets/tinker/textures/blocks/liquid_lumium.png new file mode 100644 index 0000000000000000000000000000000000000000..aba987e27c56dd4f181678e4487ef1c4e1c42948 GIT binary patch literal 8131 zcmV;!A3WfRP)+q00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-vS8}CM?Gi>RtcBi z2|kSQ#_nK!MlA&;8N{ieqzLPKv}O>71G?Q4obNE7KB3hLKa6m@C)6C_jUC}TgS1@G zO2K@3L&*!Q3vj+iEeWk;RO3)ff^~EykH7mDT;G3z2RureP;)}76|GemW8uOG-|c`_ zv0Pu#YSCNh_s_V#{{plIUvos7&#*3_f&SQrfNp$%3q4Al;QKw$fRZKvK#mjQ^bY4c z_*x5K3;+Pez!;0rAK*fdRx;vz0ssvAXOyzTa{i3#`_BLxS}U-v6DG z_k_^xk<)~{oZ)jiA1Q-kFJCrm7#-P=L`TPkk^zhvdCC#wDgEax(_j?%Y z(C=SRYet^Wn9mlMubuiYU)q;3^ zMUGcGQs3#Z%JXimqSgX`dHpM_3z$wH0RX#)pWwO?r;q;^X}M77T8|R1c>T}+g_35y zg?N31x4s8jMdj%8{Q(A4) zUrR=g7qnKw_~is{rCSQ zcmR$#$_2CrV+@?{;lqH|8shbB#RKcn?_V&TK2e0$l984(Wm+u&0P6z6cn{}$lr+P4 zdy2fgz*vh~65{ohVxcwqqwPQ6AK-kCRtpm2K{r02))DdghU@#!Xsy8c9=6pAYdwXm z@8SCc`u!7SU0x_3oQLlZn%)2uFMVr*2a)ig-=iNNQA*V4%gY6``GlGm)RK_n1!xU0 z2HyDq-|di=3-WToa`^&dJ&ZBPX{OBM>?Fk6A*YFQ#Cmua1`dn?Q>*+TpJ82x94~Z) z09+XG@Z-OrwSxB#|EAB%8siu+_OOjNT0<=n z{qBkG-Fg^fk<&y--74bs4QW0j^n3VzPw7r!IRFNzB_quzibB2TJ-XozFc!<@Gtep> zdl*qlgtykgc01I(pdcd7C(b&0%B^OU5@A3Us-eJIhyBwZFr7Zp736rOAGS(Qo|DBo zk7ga>179wm#uB_pMoIFfN5{dkYOTu~BnALBfXaVQ#v1!+1`p7aM4 zjtyfitPdl67%|>`PcW_lb3&R=s3mFaA71{9!}Fi$kGWHl%+XQn_Cy!9Pwj+!(s46wdK zt$aF6Fnqs9yuJ}{+VX?l!|xHNcO{Y2=_Al8N?KryL8}!N8Qv45TiJKjz%ERG1 z#OV#jSi*xeqty)K0^tFFkP9PxzeAdis3jrIXZY#(3x%h#oTdjl#^m+fjdeh)aNP*! zdtkUjnor2_0$*!Ji4#Al8QpNNl%}Mau#$Nc{n11%!1#cM28#xwx!s6XE7RNSS}2V{ zH$I@-JyC%zbd2ER_h0jXyj-{*I7$}25{XDcYm42(?=YV?ctGsCuEmpyrIhko2}rCD z=*CCH>l@_)MIBWjNhlYFn|`6@1&;X=jD>Yx1JAZr_1+ry4!+;R`A++VS~G^jcL?J> zYF==C{~39?pq32V3IT~_JP7>({q7lIxYvHcx{i)^g9pZW#smJRRoM6FcMoW-DWNFw zN|)T2XqQZ(-WoiNMYnrI=6jvbpJ1$0q6uTrTD`%8nwOROy3ix^2Za7WG&f!`oqoOP z7o=+K9)Az(I-EcMe{D*gDP>sxE8r1^gTjI^8xZ7WgT z)+$PlFvd_Zv6kv5-;%^mH{KJh_q%75OfY?o7kY550><6of%QFnH*ydqq~#1hoj=lL zT1QW{+oQS;CC_MFbck4O@SruM<&2URYCKas(*1`Kq2B`r#EBUzT^P_xrc8|!y4@3o zFc6NSRV}6jDiI|uj0Kj<+8x4pk5&sa)hlYvtRFa!(BEnMo8y)Ev2}1^gfW&dvK1-*2BIZ^|@g>Gv-TsNZMJ;L{Ulr%Fx z2*lc~W1d`LEWy5)5+)qU`2pQ{k6JQ}<9;DcFw+q*oLsH0cp&w#q!}eIh}TzG>!@qx ztV3%^^O5`N9nnBzfmUIy?-2R}#`_fWtKe|XV?Grj*p5m*a+M?vOY=m}*xMV;&T z{wHp@_u3z&`E-j1VTA97dj<}Vk|R_3qz3^Yng0yYo%&Z3@Q<=FaogjMWqlTrTL^a(RCv#5}X-` z{xYPO94U=+M8AKggh~@dqVqiwtCCsOqbQU}bYXBFM)FF{5hX9m1=jv? z&w8p?!bw`w9y!gF{z`4*#7u?m+4`O<^Q8TP?{=s)Ge0=f(W*wmpKg7RZoDTdn`eC< z##(x)t)Z37%5H>}Kc>n=szf(FC?kh4jKmX+ad6!Tuq;IVf^~3yB;+j_X+C1+<12a5 zK+4ORZlm9!<^*FcU5T+C-EdDT9zUowpP1fUv|oTR2*Vvhf2WOzu^!%7OKm=9p%xSy z6kyOA45%GU%ZbYXOUKkJe57Bp4q>>1u^uJQFxFzc`vD~{Nb`yKB8yTkP~Gr85XBXs zBqm1fo^=7Hzk}~qF{Uu(ksR@ki)85bNb!O=y>la;R~^YfNtLmdf1Y5BfiG!BKR#06 z7(=}PXQ427V=Uk(PFy!?aOF6`%M*7TdDi!^Eog8_<&q2)c|`a%CDVLH!b#J*)fK{E zEPNP{S&XeYVmN$E!nKB+&>(LE&C?&2R&`Q?(6V&nD z4%T<1Zd#89!-75GK{^pKTf>q+HB?vaR*m&AFr=r|Og%*CQESF@`jyHX09*2`gc^n( z7^xSYWFUG_G`z4u@c=M{2WXA&pK5^h9p%F&vE+1IAc@@Y2R7kIo{zBBj2y2d!nQ_n z&%`UI3C2|0VT(8G&N%!4{8F%Ma`H`A0gt6w=Q7Vzrgo<)EqHizHom~ zIjLwCDYEz$=4we)+EToHquxrRA%vTr54HZj-&1umhRb`A9C)Qhf-j%OXryjYu{B(L zAGHzpq=jUp=^eEe7T7xN zoF-V`Bj?Kv{lTWhtL{wm#SGW&^foB4h$AL*)DLN`V7`35#RK2%X>NA~sash$t~nA9?)KF74tJbzB>f2a_F;r?eD>qvN5tzZO}Sg; zX8Vlk^kIVqG_+`~5r>Lb*f^hPQn8tA2;Gq=tvPDb;kzBx3BFBVxz(#Bvd~INq(F*Q zJCb{cu`4AOWRVWlSjWAzQ+)85|lX-IQ@gD*M4`3_;Y*HR{|oW^5;R6OgE zTScn{m$$#c`2i)*q$l==7aGQugz5MzB}%KHL0&+dPsq!e+F|ZwrKWn}JHo=8@96`K zMdtCD&R!|XR1T|%urNmPV7YujnvY7h^i((#N&f0F9KHh>BfNDTTFrF+!a{h~OpJA5 zWzWMjQauF^tP3k1wAS=fT{o&kNIL3@2hxPd&+V2}Dr5;BY?>@%Ec(L>hW!iaNzB}= z%v9uCTB}IQne#uccu)%oPyGSI{)I*+zF(zrog;zfO)d;5+(%1qK)plMxg6`tf!g^H z^qYLQL$`b6X7g2_QRAYr_E8SL8y^s_ub4L`mBQ8%=Q|u;{){vq6|J;tg^?T(VYq|q zMuhQRA7;%9=F_iyse#l^1{ww7R^h_{pSY0hAODE?^egcJ9*L&;NPYzV17j>23gJP# zB2MqHae8MZV*DoZjCF*}ED6ai%8BJP!?%(Zh4ONtV&S`0H~0zboZh)-T5x#z2Za6(^XXS=dBkH-(n5nf4p~ujI8K#}UB3KfH8oim z&>vpV@17YCK2SzB`U5x+`I=8G(6UI!4XNUR4&adI(_m=lI{r#sn=zy# z39(cL%2uknAza(5kjp0rM9pj^uxnwJ;WWd$1lD-}I~ZeFXCn^fNu6|naVm*rp7b@8 zn*vkP%(CHtwDeRL0ARfT5ypDz;)(0(uwI`&4|nr&Mp`Z_9*F-)2tzFiA<v&v0SD zeEL<7vG9PVhb!HRx9pa{t?~oaRXn}bezBZJ1%d3+t9qGU$R_2 z!!Fk^EN76=$xQfv%`N`$V1E!S!MeS!^PpRxa z*!0L>V%PvFqyx23d6%lQ9f^yr#9B`u;yi}Kcj$JHaA9PHr>#_1pj$hYnu)0i9{PbbCQw?1Zx|A7dxghj= zYAX6Yi4WUi%T5q0zO()FpEw_q+NE;5;_~G$m`|(X*%(ktnz3BpVAFh54~l1gD11@+ z#I@j1>#KN>=XKV0dHt*M15tM+e4D8oci2cHc6JdFKPVZ?`Lm7$M3AA#^yr5>oodj8 z^a;M-)AWDU4<0snuqkokE8VpG`82^^JZWq+Z@*J}?R@@3^xjyM65)K0v|Ln_l4KLH zLaVc=Q>5-uuiUs_xWNM#)>hd_I+yGzWfw2z#?ui1cIu;~rxiKsKcX$8* z%k@=l*`DfNR+&fKaAdFI+Q40n;K6pJ;3et|@u##Sp2fUN@o6xP&S`EIZCR{4UO7anXzy-hs@EoG9b{T|VI^(@QP zEZ0}PQULJ2KM?DfPlN~FuRS!+TT~|9&>h#&&wLmTY?rGl^H54x_27wcFZ0(Gxq4Xf z-RvL#z*e%T%zR5Uz7iE_z&pJY9zX`LoW`PB$^30QmzEi{JXA0LA?_B%1HN2(fGgb- zJTPoG@WKz2c{wU1@-1L1erDe?jm_@he2=)*6NMkNyiPgE^xtk&%~}%Xc!9MWJWvxO zfcf%Swf2%1IM?xXW4dLnta^LWOR~zn)_Rn-tat#%1F50bt$48I2jUE+v^L5G0HAQf z$q9AigJPsz8|&#NM8!@g#pWA4;NSNoyu=#~T@uB)4%PRlT(Pyo=ik$GR`yYg>S;AE zbad9ka_ENsZnc*bq5!^e$)dn9Y@NvZkhbaEYDVZE(0qrqT+z}*J`~@RQBByou_Q+8 z)8DwJa+;CjOyh%ANtBgrRO4b8bWl?ZIYhuGmF6SkB9DnezrUUCcya;IM7%>c-s`+k zo>xPGcjQm=zTYb%5e{S&MrzMui?Fn>@xX;Ekudz<;g*MG6 zcDM9w4dBAUgA2g}bC;JY1s7-0JSD)$(J9H|S&qppx2-IZBr#R;Tt?i^DQ0>_bUK_6Q;0XZ_C>M9v+CV zwYB=&c(C%|k*>@p-X>WUKgox0@qk5l%DhP>uv#;Gx7RmpdNYg5evM{e!Avqz-3n3+u6_FN1*g_$Ake7@4 zaD*QaCnTF~oF*k#vcC|9dkUnjv8$Gd8aH_0JMQW>>uV}X_VA@dc1Av`jb@7n8i^dn zVyzTs2;l)M)-w9p;(^dyVX5?cJ$H8tTWM z3Tev$M#VHE^m`R7g^YU9(^awOoR@Wr?ToqPs1`)U1A!^)0(=;BUyEcy=wd__OyFX3 zg9o){pjZ{yYN0YO+Pajurn^qv?d03E)rYdh19^ZorBxE-+ik57n{N!;wInz{Z2Trp zXN=qWNMglVZI?HApl*3J_wU(85p^*}kCa>Fukc{?VTxKM_iJ5R3yNHI`x*~K{^nbf z&Ry_8ysV~?JCf4*D?A`8rPmFj+v)c$V^usL$18NVD|CCbHX?}!ZMdVYs_C6%!Z4z6 za#`OILzis{L7p5ZWh%nl*Ugk7!@POe=O$u8);L{O2kaj@(1sM$~apL>dxpTz^4|d2r zdvm@g|3QuuOFLd^9t>75YUtQv{h*4MvrJDvZ16xzy%!_`FTbqpeg3<6AfhykA!nTU^OYO3sYy7(*1!N`sK~Oy zt9D}=k?q+H+;sUxrN0#rkmH4mYx{~HY&kPC5phr^-l&tSl{v!=9>`Eu)-YxEk^$I_ zmLQA}&Pi4qh0##K2Zy5r&@Q^bH=! zkl)jM*};cB>!lk!$WfQZ)oRHp-B=#~iXZgf-~o78Eul*r1_y|wu6Q6gx2kw+VNWK#z=xhj>^6!=3gEwPsjH zdK&p{XkcM|PwxiEQ8j1UK4d(g`^`X(KnEZUC?!(mm2_S%Bu=vzEiV@hdB%gapyV{8 z&QS-p&aW11vk7Yz=SA5zmfpybm$Tvlp|st!yqm6$MO!PHi09?;tuQTq+- zqoj$XFv+y-<~tlmKB|Q%^USf8jNDc{P$Di> zidR?3KCr<91G0&1S5d#g12%z*-fV?&iQ7krr|fxsg9l;)V+GiY;4Vh@ZO3ul4eZD514-g4+LaY(X?Dp z3>?c{J=@3<8rC&Mas!bq+uDHT@_8N7RIviy< zyuLu!Qech5*+}3(}fr66< zmzNtJEOU8%l}9Tu&Z?dYV`1eFXudGscv9E-bK8tYXmwwC;#SR;e_^->4Af@;yPCa1 z$C?Yj%Hmr*Fm|1MHYn+Uu{b>ciN*tJKTGr~kFW87_BMz!toli1-^D9RTG$cMn60yE z(|0>X;4K!&8(FUJKQl4U8vcIRzvv~&Hc`zHd294Uxxs^VnZ9R+V*Pq_0IdD*@jxcy zzTd;j(9OC)@3mk}UGU&*{Xj$;dL>l8#RF0FB@T8EKOs&>wc5(Ao3S*1j`In=vXZqO z#0to!`9w^O^IwCiH3&gn@qpXe#-~!!jLX~KbZbZh&TK3tEsLRvMHgrF56Fv@)m9*Q zV2srbgXQv>hcvD65Vk`%KA_(}vu~T0pzgl=GY&8Rpi-%Gotl1WA*xo?oKbxQuqQ=} z%exQ@^7s=^TCT6m6D{cnCCxB!H+UfBt>gvs>7%y(TRiY#Bqd9lEb%069f4A0ME;W3 zJ?Tof;Jpj0byRqw-AGuWrq%KaT#veSIg zH;~A~oYigfIqS zyvK0&1BE-#bZl&0hkpM=F9~4@JPdcZ|Nb9w_x(R{(@k3gvKJ|xC5uh*W^5=6(pP@L z2!W2ra{01Gq6;1r&4$--PiW;;i%gDJ)c16w_O{Ky%7>vxjuj=*nn9}Xx~m~mPzkEW zo0UH7wdmS3Ppn3Cj0g7b;sF43!#&2k@6{CVVH&KnFgBnS=vJ+@p6us*I>HZpw?mwd dNDI}4{{pUh{afD==0gAg002ovPDHLkV1mwLrnUe8 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/liquid_lumium.png.mcmeta b/resources/assets/tinker/textures/blocks/liquid_lumium.png.mcmeta new file mode 100644 index 00000000000..7ceb3639415 --- /dev/null +++ b/resources/assets/tinker/textures/blocks/liquid_lumium.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/resources/assets/tinker/textures/blocks/liquid_lumium_flow.png b/resources/assets/tinker/textures/blocks/liquid_lumium_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..3764226c220820cb25b0a07055e60d4eab2aa3c5 GIT binary patch literal 8576 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 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/liquid_lumium_flow.png.mcmeta b/resources/assets/tinker/textures/blocks/liquid_lumium_flow.png.mcmeta new file mode 100644 index 00000000000..8e55e43bafe --- /dev/null +++ b/resources/assets/tinker/textures/blocks/liquid_lumium_flow.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/resources/assets/tinker/textures/blocks/liquid_mithril.png b/resources/assets/tinker/textures/blocks/liquid_mithril.png new file mode 100644 index 0000000000000000000000000000000000000000..70f061497c6ef36307e073b1da8bb61507fcff48 GIT binary patch literal 9507 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 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/liquid_mithril.png.mcmeta b/resources/assets/tinker/textures/blocks/liquid_mithril.png.mcmeta new file mode 100644 index 00000000000..7ceb3639415 --- /dev/null +++ b/resources/assets/tinker/textures/blocks/liquid_mithril.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/resources/assets/tinker/textures/blocks/liquid_mithril_flow.png b/resources/assets/tinker/textures/blocks/liquid_mithril_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..d72d9bb21847c00c32f42b6f289b7792bd6524f3 GIT binary patch literal 9493 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 P6G&S_U%eLkB=Y|Np$b%) literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/liquid_mithril_flow.png.mcmeta b/resources/assets/tinker/textures/blocks/liquid_mithril_flow.png.mcmeta new file mode 100644 index 00000000000..8e55e43bafe --- /dev/null +++ b/resources/assets/tinker/textures/blocks/liquid_mithril_flow.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/resources/assets/tinker/textures/blocks/liquid_signalum.png b/resources/assets/tinker/textures/blocks/liquid_signalum.png new file mode 100644 index 0000000000000000000000000000000000000000..de04b4c9233a23d14fc1142e7caa1263e0675a2a GIT binary patch literal 7613 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 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/liquid_signalum.png.mcmeta b/resources/assets/tinker/textures/blocks/liquid_signalum.png.mcmeta new file mode 100644 index 00000000000..7ceb3639415 --- /dev/null +++ b/resources/assets/tinker/textures/blocks/liquid_signalum.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/resources/assets/tinker/textures/blocks/liquid_signalum_flow.png b/resources/assets/tinker/textures/blocks/liquid_signalum_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..dda0f78b0decd6dd203f2d35dbe0e6b894530400 GIT binary patch literal 6649 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 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/materials/bucket_lumium.png b/resources/assets/tinker/textures/items/materials/bucket_lumium.png new file mode 100644 index 0000000000000000000000000000000000000000..b15094cf7878c271b72638a67ac591d24e183243 GIT binary patch literal 438 zcmV;n0ZIOeP)KXh@> zZ&1*50OHW4py|Y+3$WfdQqq?P{RXSZ-#Dwq9g|h$qn0Yfp-ZzZ7>~yaKrX#%vn>En zOOx@IIMH;i=)XSh$Qv zBUxakg9NkL4AV5JR;vJbp0`cUBKOl5cX9Udy@3!y>GgVYi!_{RIkW!J4IIajv*&rg g`wMC8r~e7Q0JhJC3+%qa4gdfE07*qoM6N<$f@t)<%>V!Z literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/materials/bucket_mithril.png b/resources/assets/tinker/textures/items/materials/bucket_mithril.png new file mode 100644 index 0000000000000000000000000000000000000000..f572acbde6a9d49172abc2bcf9b359eb13734886 GIT binary patch literal 460 zcmV;-0WVa0a-~z zK~y-)#gj2h!%!53zZ6LoloA&!q@Yv4sfgJf>RRY;aB-?oBG|!6u!~ga=Aifwf?0(w zok}`%sZgjWq(c^837wLmacM$m8x#~g(|z~dd+y=9`{2JJtxD>;9!9aMs&U>l&87Oa zRgHSBg{owM5J&hFwzD|Grvl+3k(6xKYb{(a03e@}Q56{gNBFp2fWE)QcoJYYtJthndHH;ESv`e^Xd!$*9&kyeVmC;@9v!O z;{}Fcq!pprfC#TZ@E0&i1SZxKBd`!QQ9la zoedj}1^_q5JM{bgxX|@>Ss#t)bULwtOCCfR4u@!(MzL4~KnOu;HdwhxnV)Xl3kTm5 zn5HS!>-AVg5+}Sa$xl_#ZnxuD2=TkWki_EjKfxEvTZfqYxy9800000!cY{2zlceSA=FN-Ahc6Mhk}d$p_Aa+-{2Aur|yDKT-@z1sE{t5T%5!u zTd`!QlbupRP1hh1X5UYBD4xUP%u`vCO& s{Y?9NI~Wd!GERzr{TI^s?*1qE0?@mJD$E^PsQ>@~07*qoM6N<$f;~>bVgLXD literal 0 HcmV?d00001 diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index fdf8bf4a8d2..0d0c731b861 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -43,6 +43,7 @@ import tconstruct.plugins.TinkerThaumcraft; import tconstruct.plugins.mfr.TinkerMFR; import tconstruct.plugins.te4.TinkerTE4; +import tconstruct.plugins.te4.TinkersThermalFoundation; import tconstruct.plugins.ubc.TinkerUBC; import tconstruct.plugins.waila.TinkerWaila; import tconstruct.smeltery.TinkerSmeltery; @@ -139,6 +140,7 @@ public void preInit (FMLPreInitializationEvent event) pulsar.registerPulse(new TinkerMystcraft()); pulsar.registerPulse(new TinkerMFR()); pulsar.registerPulse(new TinkerTE4()); + pulsar.registerPulse(new TinkersThermalFoundation()); pulsar.registerPulse(new TinkerFMP()); pulsar.registerPulse(new TinkerUBC()); pulsar.registerPulse(new TinkerGears()); diff --git a/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java b/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java new file mode 100644 index 00000000000..f75baa5c850 --- /dev/null +++ b/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java @@ -0,0 +1,103 @@ +package tconstruct.plugins.te4; + +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import mantle.pulsar.pulse.Handler; +import mantle.pulsar.pulse.Pulse; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import tconstruct.TConstruct; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.crafting.LiquidCasting; +import tconstruct.library.crafting.Smeltery; +import tconstruct.smeltery.TinkerSmeltery; + +import java.util.ArrayList; + +@GameRegistry.ObjectHolder(TinkersThermalFoundation.TF_MOD_ID) +@Pulse(id = "Tinkers Thermal Foundation Compatibility", description = "Tinkers Construct compatibility for Thermal Foundation", modsRequired = TinkersThermalFoundation.TF_MOD_ID, forced = true) +public class TinkersThermalFoundation { + static final String TF_MOD_ID = "ThermalFoundation"; + + @Handler + public void init(FMLInitializationEvent event) { + // melt stuff in the smeltery + Fluid pyrotheumFluid = FluidRegistry.getFluid("pyrotheum"); + Fluid cryotheumFluid = FluidRegistry.getFluid("cryotheum"); + Fluid redstoneFluid = FluidRegistry.getFluid("redstone"); + Fluid glowstoneFluid = FluidRegistry.getFluid("glowstone"); + Fluid coalFluid = FluidRegistry.getFluid("coal"); + + //pyrotheum fuel + // register pyrotheum if it's present + Smeltery.addSmelteryFuel(pyrotheumFluid, 5000, 70); // pyrotheum lasts 3.5 seconds per 15 mb + + // liquid redstone + for(ItemStack stack : OreDictionary.getOres("blockRedstone")) + Smeltery.addMelting(stack, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 3000, new FluidStack(redstoneFluid, 900)); + for(ItemStack stack : OreDictionary.getOres("dustRedstone")) + Smeltery.addMelting(stack, Blocks.redstone_block, stack.getItemDamage(), 2500, new FluidStack(redstoneFluid, 100)); + + // liquid glowstone + for(ItemStack stack : OreDictionary.getOres("glowstone")) + Smeltery.addMelting(stack, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 3000, new FluidStack(glowstoneFluid, 1000)); + for(ItemStack stack : OreDictionary.getOres("dustGlowstone")) + Smeltery.addMelting(stack, Blocks.glowstone, stack.getItemDamage(), 2500, new FluidStack(glowstoneFluid, 250)); + + // liquid pyrotheum + for(ItemStack stack : OreDictionary.getOres("dustPyrotheum")) + Smeltery.addMelting(stack, Blocks.glowstone, stack.getItemDamage(), 4000, new FluidStack(pyrotheumFluid, 100)); + + // liquid cryotheum + for(ItemStack stack : OreDictionary.getOres("dustCryotheum")) + Smeltery.addMelting(stack, Blocks.snow, stack.getItemDamage(), 4000, new FluidStack(cryotheumFluid, 100)); + + // liquid coal + for(ItemStack stack : OreDictionary.getOres("dustCoal")) + Smeltery.addMelting(stack, Blocks.coal_block, stack.getItemDamage(), 4000, new FluidStack(coalFluid, 100)); + + // Alloying + int amount = TConstruct.ingotLiquidValue; + FluidStack result, part1, part2, part3; + + // Invar + result = new FluidStack(TinkerSmeltery.moltenInvarFluid, amount * 3); + part1 = new FluidStack(TinkerSmeltery.moltenIronFluid, amount * 2); + part2 = new FluidStack(TinkerSmeltery.moltenNickelFluid, amount); + Smeltery.addAlloyMixing(result, part1, part2); + + // Electrum + result = new FluidStack(TinkerSmeltery.moltenElectrumFluid, amount * 2); + part1 = new FluidStack(TinkerSmeltery.moltenGoldFluid, amount); + part2 = new FluidStack(TinkerSmeltery.moltenSilverFluid, amount); + Smeltery.addAlloyMixing(result, part1, part2); + + // Lumium + result = new FluidStack(TinkerSmeltery.moltenLumiumFluid, amount * 4); + part1 = new FluidStack(TinkerSmeltery.moltenSilverFluid, amount); + part2 = new FluidStack(TinkerSmeltery.moltenTinFluid, amount * 3); + part3 = new FluidStack(glowstoneFluid, amount); + Smeltery.addAlloyMixing(result, part1, part2, part3); + + // Signalum + result = new FluidStack(TinkerSmeltery.moltenSignalumFluid, amount * 4); + part1 = new FluidStack(TinkerSmeltery.moltenSilverFluid, amount); + part2 = new FluidStack(TinkerSmeltery.moltenCopperFluid, amount * 3); + part3 = new FluidStack(redstoneFluid, amount); + Smeltery.addAlloyMixing(result, part1, part2, part3); + + // Enderium + result = new FluidStack(TinkerSmeltery.moltenEnderiumFluid, amount * 4); + part1 = new FluidStack(TinkerSmeltery.moltenSilverFluid, amount); + part2 = new FluidStack(TinkerSmeltery.moltenTinFluid, amount * 2); + part3 = new FluidStack(TinkerSmeltery.moltenShinyFluid, amount); + Smeltery.addAlloyMixing(result, part1, part2, part3, new FluidStack(TinkerSmeltery.moltenEnderFluid, amount)); + } +} diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index e3a233885c3..02c85fca80b 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -99,6 +99,10 @@ public class TinkerSmeltery public static Fluid moltenShinyFluid; public static Fluid moltenInvarFluid; public static Fluid moltenElectrumFluid; + public static Fluid moltenLumiumFluid; + public static Fluid moltenSignalumFluid; + public static Fluid moltenMithrilFluid; + public static Fluid moltenEnderiumFluid; public static Fluid moltenEnderFluid; public static Block moltenIron; public static Block moltenGold; @@ -122,6 +126,10 @@ public class TinkerSmeltery public static Block moltenShiny; public static Block moltenInvar; public static Block moltenElectrum; + public static Block moltenLumium; + public static Block moltenSignalum; + public static Block moltenMithril; + public static Block moltenEnderium; public static Block moltenEnder; // Glue public static Fluid glueFluid; @@ -243,6 +251,18 @@ public void preInit (FMLPreInitializationEvent event) TinkerSmeltery.moltenEnderFluid = registerFluid("ender", "ender", "fluid.ender", "liquid_ender", 3000, 6000, 295, Material.water); TinkerSmeltery.moltenEnder = TinkerSmeltery.moltenEnderFluid.getBlock(); + TinkerSmeltery.moltenLumiumFluid = registerFluid("lumium"); + TinkerSmeltery.moltenLumium = TinkerSmeltery.moltenLumiumFluid.getBlock(); + + TinkerSmeltery.moltenSignalumFluid = registerFluid("signalum"); + TinkerSmeltery.moltenSignalum = TinkerSmeltery.moltenSignalumFluid.getBlock(); + + TinkerSmeltery.moltenMithrilFluid = registerFluid("mithril"); + TinkerSmeltery.moltenMithril = TinkerSmeltery.moltenMithrilFluid.getBlock(); + + TinkerSmeltery.moltenEnderiumFluid = registerFluid("enderium"); + TinkerSmeltery.moltenEnderium = TinkerSmeltery.moltenEnderiumFluid.getBlock(); + // Special liquids with different properties/blocks than the rest TinkerSmeltery.bloodFluid = new Fluid("blood").setDensity(3000).setViscosity(6000).setTemperature(1300); @@ -332,6 +352,10 @@ public void preInit (FMLPreInitializationEvent event) FluidType.registerFluidType("Platinum", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenShinyFluid, false); FluidType.registerFluidType("Invar", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenInvarFluid, false); FluidType.registerFluidType("Electrum", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenElectrumFluid, false); + FluidType.registerFluidType("Lumium", TinkerWorld.metalBlock, 0, 370, TinkerSmeltery.moltenLumiumFluid, false); + FluidType.registerFluidType("Signalum", TinkerWorld.metalBlock, 0, 450, TinkerSmeltery.moltenSignalumFluid, false); + FluidType.registerFluidType("Mithril", TinkerWorld.metalBlock, 0, 800, TinkerSmeltery.moltenMithrilFluid, false); + FluidType.registerFluidType("Enderium", TinkerWorld.metalBlock, 0, 1000, TinkerSmeltery.moltenEnderiumFluid, false); FluidType.registerFluidType("Obsidian", Blocks.obsidian, 0, 750, TinkerSmeltery.moltenObsidianFluid, true); FluidType.registerFluidType("Ender", TinkerWorld.metalBlock, 10, 500, TinkerSmeltery.moltenEnderFluid, false); FluidType.registerFluidType("Glass", Blocks.sand, 0, 625, TinkerSmeltery.moltenGlassFluid, false); @@ -753,10 +777,6 @@ protected static void addRecipesForSmeltery () { // Smeltery fuels Smeltery.addSmelteryFuel(FluidRegistry.LAVA, 1300, 80); // lava lasts 4 seconds per 15 mb - // register pyrotheum if it's present - Fluid pyrotheum = FluidRegistry.getFluid("pyrotheum"); - if (pyrotheum != null) - Smeltery.addSmelteryFuel(pyrotheum, 5000, 70); // pyrotheum lasts 3.5 seconds per 15 mb // BLOOD FOR THE BLOOD GOD if (TinkerWorld.meatBlock != null) @@ -975,17 +995,9 @@ public void modIntegration () if (taintedSoil != null && heatSand != null) GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 2, 6), Items.nether_wart, taintedSoil, heatSand); - ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); - LiquidCasting tableCasting = TConstructRegistry.getTableCasting(); LiquidCasting basinCasting = TConstructRegistry.getBasinCasting(); ArrayList ores; - // TE alloys - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenInvarFluid, TConstruct.ingotLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(TinkerSmeltery.moltenNickelFluid, TConstruct.ingotLiquidValue * 1)); // Invar - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue), new FluidStack(TinkerSmeltery.moltenSilverFluid, TConstruct.ingotLiquidValue)); // Electrum - - // TE is handled by the oredicted variant already - /* Extra Utilities */ ores = OreDictionary.getOres("compressedGravel1x"); if (ores.size() > 0) @@ -1009,15 +1021,17 @@ public void modIntegration () } } - public Fluid registerFluid(String name) { + + + public static Fluid registerFluid(String name) { return registerFluid(name, "liquid_" + name); } - public Fluid registerFluid(String name, String texture) { + public static Fluid registerFluid(String name, String texture) { return registerFluid(name, name + ".molten", "fluid.molten." + name, texture, 3000, 6000, 1300, Material.lava); } - public Fluid registerFluid(String name, String fluidName, String blockName, String texture, int density, int viscosity, int temperature, Material material) { + public static Fluid registerFluid(String name, String fluidName, String blockName, String texture, int density, int viscosity, int temperature, Material material) { // create the new fluid Fluid fluid = new Fluid(fluidName).setDensity(density).setViscosity(viscosity).setTemperature(temperature); @@ -1025,7 +1039,7 @@ public Fluid registerFluid(String name, String fluidName, String blockName, Stri fluid.setLuminosity(12); // register it if it's not already existing - boolean isElectrumPreReg = !FluidRegistry.registerFluid(fluid); + boolean isFluidPreRegistered = !FluidRegistry.registerFluid(fluid); // register our fluid block for the fluid // this constructor implicitly does fluid.setBlock to it, that's why it's not called separately @@ -1034,7 +1048,7 @@ public Fluid registerFluid(String name, String fluidName, String blockName, Stri GameRegistry.registerBlock(block, blockName); // if the fluid was already registered we use that one instead - if (isElectrumPreReg) + if (isFluidPreRegistered) { fluid = FluidRegistry.getFluid(fluidName); diff --git a/src/main/java/tconstruct/smeltery/items/FilledBucket.java b/src/main/java/tconstruct/smeltery/items/FilledBucket.java index 2ba78553b16..765ede54116 100644 --- a/src/main/java/tconstruct/smeltery/items/FilledBucket.java +++ b/src/main/java/tconstruct/smeltery/items/FilledBucket.java @@ -180,7 +180,7 @@ public String getUnlocalizedName (ItemStack stack) return getUnlocalizedName() + "." + materialNames[arr]; } - public static final String[] materialNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "AluBrass", "Manyullyn", "Alumite", "Obsidian", "Steel", "Glass", "Stone", "Villager", "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender", "Slime", "Glue", "PigIron" }; + public static final String[] materialNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "AluBrass", "Manyullyn", "Alumite", "Obsidian", "Steel", "Glass", "Stone", "Villager", "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender", "Slime", "Glue", "PigIron", "Lumium", "Signalum", "Mithril", "Enderium" }; - public static final String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", "glass", "stone", "emerald", "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender", "slime", "glue", "pigiron" }; + public static final String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", "glass", "stone", "emerald", "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender", "slime", "glue", "pigiron", "lumium", "signalum", "mithril", "enderium" }; }