From c79ddf869c757ea1498afa2a10a7721ebfb056f3 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Mon, 30 Jun 2014 18:59:13 -0800 Subject: [PATCH] Change FluidType to a more appropriate class --- .../tinker/textures/armor/leather_1.png | Bin 0 -> 1851 bytes .../tinker/textures/armor/leather_1_b.png | Bin 0 -> 1722 bytes .../tinker/textures/armor/leather_2.png | Bin 0 -> 868 bytes .../tinker/textures/armor/leather_2_b.png | Bin 0 -> 868 bytes .../assets/tinker/textures/armor/travel_1.png | Bin 0 -> 1741 bytes .../assets/tinker/textures/armor/travel_2.png | Bin 0 -> 645 bytes .../tinker/textures/armor/travel_wings.png | Bin 0 -> 663 bytes .../tinker/textures/items/armor/dirthand.png | Bin 177 -> 0 bytes .../tinker/textures/items/redstoneball.png | Bin 172 -> 0 bytes .../items/travelgear/boots_doublejump.png | Bin 0 -> 773 bytes .../items/travelgear/boots_leadweight.png | Bin 0 -> 810 bytes .../items/travelgear/boots_slimysole.png | Bin 0 -> 795 bytes .../items/travelgear/boots_waterwalk.png | Bin 0 -> 767 bytes .../textures/items/travelgear/glove_guard.png | Bin 0 -> 213 bytes .../items/travelgear/glove_speedaura.png | Bin 0 -> 220 bytes .../items/travelgear/glove_spines.png | Bin 0 -> 224 bytes .../items/travelgear/glove_sticky.png | Bin 0 -> 255 bytes .../items/travelgear/goggles_nightvision.png | Bin 0 -> 510 bytes .../textures/items/travelgear/travel_belt.png | Bin 0 -> 294 bytes .../items/travelgear/travel_boots.png | Bin 0 -> 294 bytes .../items/travelgear/travel_glove.png | Bin 0 -> 323 bytes .../items/travelgear/travel_gloves.png | Bin 0 -> 651 bytes .../items/travelgear/travel_goggles.png | Bin 0 -> 526 bytes .../textures/items/travelgear/travel_vest.png | Bin 0 -> 271 bytes .../items/travelgear/travel_wings.png | Bin 0 -> 699 bytes .../travelgear/travel_wings_slimewing.png | Bin 0 -> 759 bytes .../textures/items/travelgear/vest_dodge.png | Bin 0 -> 175 bytes .../items/travelgear/vest_stealth.png | Bin 0 -> 761 bytes .../items/travelgear/wings_doublejump.png | Bin 0 -> 770 bytes .../items/travelgear/wings_featherfall.png | Bin 0 -> 187 bytes .../tconstruct/library/armor/ArmorCore.java | 12 +- .../library/crafting/FluidType.java | 105 +++---- .../tconstruct/library/crafting/Smeltery.java | 87 +++--- .../tconstruct/smeltery/TinkerSmeltery.java | 263 ++++++++++-------- .../smeltery/logic/SmelteryLogic.java | 3 +- .../java/tconstruct/world/TinkerWorld.java | 2 + 36 files changed, 222 insertions(+), 250 deletions(-) create mode 100644 resources/assets/tinker/textures/armor/leather_1.png create mode 100644 resources/assets/tinker/textures/armor/leather_1_b.png create mode 100644 resources/assets/tinker/textures/armor/leather_2.png create mode 100644 resources/assets/tinker/textures/armor/leather_2_b.png create mode 100644 resources/assets/tinker/textures/armor/travel_1.png create mode 100644 resources/assets/tinker/textures/armor/travel_2.png create mode 100644 resources/assets/tinker/textures/armor/travel_wings.png delete mode 100644 resources/assets/tinker/textures/items/armor/dirthand.png delete mode 100644 resources/assets/tinker/textures/items/redstoneball.png create mode 100644 resources/assets/tinker/textures/items/travelgear/boots_doublejump.png create mode 100644 resources/assets/tinker/textures/items/travelgear/boots_leadweight.png create mode 100644 resources/assets/tinker/textures/items/travelgear/boots_slimysole.png create mode 100644 resources/assets/tinker/textures/items/travelgear/boots_waterwalk.png create mode 100644 resources/assets/tinker/textures/items/travelgear/glove_guard.png create mode 100644 resources/assets/tinker/textures/items/travelgear/glove_speedaura.png create mode 100644 resources/assets/tinker/textures/items/travelgear/glove_spines.png create mode 100644 resources/assets/tinker/textures/items/travelgear/glove_sticky.png create mode 100644 resources/assets/tinker/textures/items/travelgear/goggles_nightvision.png create mode 100644 resources/assets/tinker/textures/items/travelgear/travel_belt.png create mode 100644 resources/assets/tinker/textures/items/travelgear/travel_boots.png create mode 100644 resources/assets/tinker/textures/items/travelgear/travel_glove.png create mode 100644 resources/assets/tinker/textures/items/travelgear/travel_gloves.png create mode 100644 resources/assets/tinker/textures/items/travelgear/travel_goggles.png create mode 100644 resources/assets/tinker/textures/items/travelgear/travel_vest.png create mode 100644 resources/assets/tinker/textures/items/travelgear/travel_wings.png create mode 100644 resources/assets/tinker/textures/items/travelgear/travel_wings_slimewing.png create mode 100644 resources/assets/tinker/textures/items/travelgear/vest_dodge.png create mode 100644 resources/assets/tinker/textures/items/travelgear/vest_stealth.png create mode 100644 resources/assets/tinker/textures/items/travelgear/wings_doublejump.png create mode 100644 resources/assets/tinker/textures/items/travelgear/wings_featherfall.png diff --git a/resources/assets/tinker/textures/armor/leather_1.png b/resources/assets/tinker/textures/armor/leather_1.png new file mode 100644 index 0000000000000000000000000000000000000000..ee86359b168c5902425e26dda0febc5aa4296bb1 GIT binary patch literal 1851 zcmV-B2gLY^P)NcUa2D8-$KtNux)bm2~di!P+Q zmoB<2N?Rm^5L#`uiG(2xNoF!9$H`sXcMkq&Z+dxOukCvu5E66doOzyketf^*8DWTR zZ*LEL-)C%W3@Ih1X%a;dqobq5am?D<+Q_gyc6WCN`Fx&iHp|}L9smy>JfPd{QmIr} zUtb@($90)LY{B^WI7>@Q)a!Morlt@=;CUXd>r$yyh92*D)9i;Ii+zE88+LFd~8F1c&5bAR}ou<)f486wlJo5QGM@L6QQG}Ed&-1Wtn{v5~uImIr@aqPk z)oQ65jN_PozyI$Gb)8$cZVf$Pb93{?>icI*8@Axiojc@mIrY>{(*(e_ZT<;1Gy}Tb zE>g-XB_O3FpU?mE0}uoOA3uHs;PmvAMx%jk+tllI!Z7^p12FR9#fw3b;!;Xn*QM9% z5y!D|&~;rpoeqX!sHUZ98o6BVLRRRyuCnF)$kTNl+qRKXqU$={ZdYa0#>U2t_6Xgw zES8p*Eh-!h!*Lue%i_zIFE?KTx~^aT2fbd8e!ou?MVO{Zxm?CD3{t6-n*HT+8PhcB z^?E9Bx~`K>rwM|9Fbrunn`APX?;ae6A)e>md;p>-qSNW%`#z52P_0(!cDq=Xg=w0! zS}m2P)oPV$waVJs8UUqIX>fLS#=Cd#6il9)no<)Z323X;x^l2>+rPvl(M{8&TCD<5 zsZ@CO?AZ@%vRp1J#{ix_eR^f>&d$z2*L8GVC!5V8rBqpR*$l(D`6hVX2W)R|4*+Io zXNlt&Ap}xN8jS|2RO+Y5)NdVt^O<272AZZJgkW`b^_ND7|2H=DDg5!rAA>Lq>2x{( zH=eS)ySwyyJ#x7mrfKr%(WC3-0_}F2AP5u)x@r6R^()0OV%ToixFqD9ja1_HZNT<`paZIn*Q~IQ)Y1p>S z*x1+wh3WFXe@PMgfen731&(ZPZYpQuI3E0`O-iNGNW0xe*YyNG5B@}wBP%N_BuF#} z0>wS{_xF)f^6=q90N%cRi>~V|FE0b|{{8#E-UEI{@|u~M;r8v@ibWQSMS#Kc=g%pX zN&tgGp+GK|!*Lu6g#wmk(dl&PcDso~gY$pIVv%02r}|D11Y|N9g+zrAie)ChpNH2$ z5GeKPS~DP%$*2*TV1Iy>l@;E+c{2bg7K;cW2!a411h#D};*^N2i;IgFD0jjtGntHX z*7tp)C_)H9I-MqpB6V&;=@Y7*%jJGZ#QxR*BsZJXcfuAu&tqX>fr*I;eBVb(iInmJ z{=Ym{)9Exq2-@v7aUA2iF2~2mwA*dvOcIcUd?neCC{*VersFu*9{|HJ)Jv0u<^p81 zS*q14rfHH&rBtIzM3E$DNxCM1i=qfk)716ZY*sZj!!YRedU&2k6h(@9S1J{i8JecC zzrU~c9vXnxuU`+67Zk~jNhzt<>u8#WVHlXEiR-#ZDf#y88>VS0Nj#g)5(EKJ6cI&{ z`VO$Lu%KRk^!t6nFhtWdG)=?zeL9^Ej^kXQ&ga>tX_{B2$=^D!MPfv4nbVL}293CDbrNnU@GMNmzuA^xh z2L}f%EG($fn3$MA2*JU@0h*>=a6D0(G)*IpW6sXb6#lr@03075GchqizuzYa0ve45 zckkZCvMemiLen(r^*WYiU3glSWhM1|1xxJh?G5hVzt8;qJVFSfDB|+J08TyQFp(Y|NH(Au@q;qC41LDHNO5Ro*) pME*{!+wCgHecw+Y>~Ae>{0rT-gFz8jo9_Ss002ovPDHLkV1jAmgwp^3 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/armor/leather_1_b.png b/resources/assets/tinker/textures/armor/leather_1_b.png new file mode 100644 index 0000000000000000000000000000000000000000..8324626679b6b073800fadc7ad001080e1e8becd GIT binary patch literal 1722 zcmV;r21WUaP)^fA3FKb#={5&x~>GOl(lFgN?HQ5g`R3#Uk(#kPrf~NMxaq50f=Q zWD!{K6|a3)F33t<3q|q*m)KFWwrNCPY->&ENi=$9eg~3PzdZ>}CbPC`ftpdfS`|k1N?&)Mo}cD4L3n>)-bKRC%*ynHqb=@KvW?rB1-Np ztE246Z@|X5Aaj-|inA6hRE5V`!;`QM<$xwcMAPX<5uym9iYTmoN(6lEyI<57zIRR^ zD+F{w`1h?@BEGyO%mW`zBi`BJYCPx~uji;fTEuC7@Qw3iJ^?{Qsfvsc1wrXT+F(^= zG$HcGr-K>`U)lD?V#s{D8Uvh+Njw3}nvOOKxwBYfD09zWzl4e^&%GyRNvywk=l$bF zKylZc2k4@tyAE92ofB1gYHdUpg@3FrSj;*mWsb9!>w9y`+;e(T_9VHSmdfc#$&K3! z08Xxs0QgIsW1V4ZeT*pFnl;CN1)MoZX4V+GC`3^@5eo0P)(f7+N*a5+^Oi0OxxaG_ zx+qvgod``37Hwc$c&<-t+8~U)qwtP- z8wQxZ{+;K|&i;Zo-%axO)yo$URj%&rBcc@Eu{O@r5BF2T8NY=HbE0-_goyC~M{y+WAd;EVr3OeAhg0KJZ z`~l_i`(OU^ST*o#FJB@=A@i2PJKp&9pO4-S`@%7*9u4DjYu>Q6F~&Q~hrL2Q@&@FE zqg=}$i3ViOGHU{bcZ@RkaPolpv}HbR(Rlniew=&u<}J3@630FTUVHfx-WfvFBz8ow z7=HHl-wxEhdieqtgY5;<>L^QDLlCSrpO^~EsUeyaV^w5yQOKOdS%WHsD0Gs-8H-_* zC-HWBaYtbuHf{cA3|-noF3Y*w7ztoYLhH;2ufo{VXuP-dPJD+SIPcI%cl z2xm7d&YxQ2`DZrx>gP}J!m}qivstk>Z*kUgcC%t-l+ko)!%t7fRE1}^Zi%9N;lv87 zWybdIoOv6D`rW$a4_9|Sn@H^bX2Q~hJGOYK6wf`i#`j-5$GGrpZH$w*2+3oVxx*TR zw-)PD{h5u5CZrQyW-WqJcVX}v-Wf#g5Yahf$Z|jYzs&rAu%(~*%re3ILa5)cHR~a6NsW%V_3A2PNYw#44nvB{{z`z zy5jJ6X6?~8z&lIf?O=tM8A9$Y*QYgww-{r{y}_82EG@l&F@UDiT7Ex7>Fe#_Q5Ibs zd_!g}K@#5--rWgoRaq@FW=$C0tt|Y}Hz4aRaTk+)&hE0vTkBPy0O@cAtTz~AsM|mj zBIDfSti|;x@^@v8g?9)#aEo`A5QSOO5n_*mAY9+82V@xFgPSwV1Jb+y$+s_|dhldK zmA$&f^iV3iqbfX6mA!dO;T?O6b~y2DY;iW7P7@+oAD3(s*JM4 z*lk$mj0X{rIYSd7Zyj-Bfd!wc>$S~jYJB6Ezq!vNE|qsUzUvgrj!nM)@fgq^NIL>cEE z-)Dfv7`At3Y^_&VKn$$(&)MFcVM$Y9NuZ)BHCldFRTe#=9ccrWnZGfHsLEuNGp$?J z%ACnKXWj;?o=lugk(Ve0QR+6_6QV!*=5w6ctT?q+5+$KyXMb^D@Bia(eVM!`OAEC9 z2zwZTsn47pM#$+&$*oz-$<+~2lpD7jKDRO&GQIspN_xGul)dV@*Lv%n_qlTU;*cpG z7JM9MHsHG`T;18n0A(*KKAJ9uf}8sXliNv|6GXT%?FP|tul3(j_)%RS12s-urtHYT Q-T(jq07*qoM6N<$g0sU)Jpcdz literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/armor/leather_2.png b/resources/assets/tinker/textures/armor/leather_2.png new file mode 100644 index 0000000000000000000000000000000000000000..8d8bba6ccee7b494f672e1ac626c9098fcf52bf0 GIT binary patch literal 868 zcmV-q1DpJbP)+kP?@p$|$gdj;0y4@~i zS>kyfN-2yn05na5QVJn{HB21GBuRqSn$y$Mjdp~SrYZe?AJ6m1vJA&@*xlWw+wGEN z8O9if!y)teoag6fgb?)meVV3WHk)m}1FEXB@@tyLo=Yil90%X`ky6s@^?uzT#BayO zJD{#>JkPV@12D!=*EK~^0MP68Y#2%@T-UW>YH03IJ70hrBZ+}_@9egLlP+5m(QXsuC7StsOqj#3Jx z6qCt>D2k}-8Yv|^J3CxnUcPIs>2|x^-``V~B}tOd>2$0klu~$}$IHtLaU2tdA$46- zRTWVb+41@i>uR+^YmG66v$L}=U9-+)GC?UtRaH2S!_(6fT5Fo7A&Me|5L{hdk)|n0 zk|3qz_4SpyuJL`Js;W3XK1ORzQ51w>$Y?aO571iMV7Irosj7<6XvBOz=kD$fV+=<} zN58$)$0%l5_Vpcbet!Os5+0Ao?|GghrNkIx#kgE9S+Cb@ZEgLrF_z0E#u$pCV7*=g zP?jY^2)kjLrm;N|EO|aU5Hxd~BBwzc`LVnx^dS?a?$1 zT5G~E#291!MjxPNzsIIXpZBAPmDV58y9*rDF+&a3XL30000 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/armor/leather_2_b.png b/resources/assets/tinker/textures/armor/leather_2_b.png new file mode 100644 index 0000000000000000000000000000000000000000..834d6d18fb75a49201cf6297006af676bac21861 GIT binary patch literal 868 zcmV-q1DpJbP);rs4Mn*_Tkbn#!2_Xq787aSqfS*84jvSL(Scu3H zLb8xRtJB@CcW39LyNY1ecjkx?I>asWWYe0io_ee1?She!k&%&+k&%&+k&%&+k^dWV zec{Vb-XjJj1|h2Q)ptK0v;gt?f~s(DF(sSx`)YUa9iZ12CPe@ss8CJf!3*%04Eto9 z*BvPv+5GT5;ERvnK}0wzBgfN%x=q9&bjh&20EW{gyEKfdj2xAbWX9Kze!ATqFq;%C zs*)lI%XNdQFrStHEY}U$oqLOlrc11w9uZhnCGO5@mu~+r&}SRWKm@~4gh#Jz9N?o( zA&L-Hm{%q1rbiJ}zz{?Zzyne?iZEmnRe5~B_mc<5c<(%B>+k-I%%=rGg(4_z$^;bx zpxk~1;+rQkilDsgcivw;hzMm=f+}THj>?GcOCN*YegT&2hF9lPR3Mr0@L7}}*gC)m z&w^+avN_M2mW#T>%z5jzV~PVv9v~J`i8@rY48siY>3S~PHt}0qQv@Zba59?!u&O%% z*1MjwZFBnt2r7iV03wjhX_H;H_@?b?lhG#QqVAZ+K%bqU!ttcw!_VJ#vJ;OY&AKD) zGO-H8sM!7xONOe_?Rw%Qpi%Mccy?l`5QGpF5dj_Ex9nJUo_zbujT%k7s5`o3^w|g^ zteTEwhC57SK!9J*x6CHP-5*qF`b5e;ct`In-l(wbbakSfD~r?W@&L<&pSU}5rKDsm zPAgKIsV_RrU~xMA(?`A7Q=hjt-vQrz|MVXPc>l8p^mRglfPof6!E!P@`=w#NJap%M zh0`wMJ|x@kGNKG|0I@3}{?$?VZwIIb-|+0DHls=C>qLl(Whdi=sBD*4)wFJyD&u6> z+t+CyV~CTp6ZV4s=LNX`G|TJrVNO`@3e26mn}EA>w&^K?a%UEBpR#=3kg{>QP(lzk ujnk#f{OrX|(-TyF=i?HG$X#9x~#L76Cu)KyiJ zGBvP@4owh&KyY^vq|HTtb3o=kNx=j{Cc1FJ%O7*8`d`22lnsd#eMq$7(0J4bYHiw3UTP& z@$h|RbM?z50Dk=2KL8-a4Srk8gZ9{XmYkUfK#|fkHP%r&H!wUV!~xy|tWBC_M$jfr z5^)<~Y&;wC_+_(D76sm195itH8~`ip<;eT78$gjna#G3%DNCuyIo-M%i~cC!!DzTe zx9ArAf76_n9=ms|?a2$9kCpLplij=3QReC@wJd#|8edyqAL5_+`TGDYRCgi@v?8T_K*Hu@^mS?> zj|X{A@rJcccC*{m0K&lVSedf3-CJxx_?8-mSu*4kc&7wq;rx36GzoygXM!vuAff+?lG&c^`Qxc6j; zKXQDc45X`{x#}0@l7C*v&GdJKLU5+P!~dwcQeWp|HXzLBx$E`xllrAd0|1c`;2AHd z`-Yuh|DeWgYBs!i(XvdOJx|>Na&F_^lfpuPS5-{`aP3;P-_2E3!S}!QDB7gS;Xj@7 zW!qZTVO{J7B_XI$7xA(<=;NFNq%ITYYn7!m)FhdSc;@xvL$tN5 zTfAlPzeQfH*}Ug8)yYrz%?~#?Ilkir58cxkk_|?{qV@q9ahW}zz5BLJ_uBwRPyAJw z%ltxX&%w7Q9RM{;Y=GWB|9wHuteT6EETxd8)J^q%|DcAhMb{pH53<=s(UbUJ4gXi( z9%ThLvhL8?5q(_*=t=G`;rFs&(HK1ib%^qapO-mtdG zR$R;HTu&a@zmKQecV9Q>opU{>F5JDU0V8kG+}MC&78o7ZFs@j1?QTVsGyLk;M|on) zH`v|PjannJrm-GXN-;8i2_-EuFf@uPiKvo@l6Jo%Z(*3uH8QTn+N&fKNu*Y-VS0Lc zwgSI;h&O)L#nbJ(L&eWq3Kc1hXEY_SJgQQPoEzSvoS~)#cRiYU(o=G zV90ypAHDoC&$aFHbN+fYKu#wyttnrD2h1CPc(J@)EtT$1>&ZhS>W8*KmD=i zaU&uHJl-j+mLCxn4RASMVGd000McNliru-USB&5GAvfa!vpM0uo6? zK~!ko?U&C>8$lGuzY{bCGuffLJ!~%`q8`LUaws&IYcA$L$Y0T;e}Q-LPZ0FtRdVps zgF?VV3k{{vv;;5BA-g)evmRn_JS4O3<_EP2bXPK82$?+Id(3=h-no`Ayz*5AJc0Py>Vi9T#)S*0T<7uWckq?AZfB)WKu<>2rD4i5kT z7RwD67ldQw6ZIYSQ@;U_qqEPc2C$?Cju(XAT~EaDbUlHtC-6?~_NZ^f?-}Xq(Aac8 z?rcZ^Xf#_hE#+V1Q*#28R87ySdE*lY;BYZl!g=HM3HaZ4Ky|kuO@qeToN94V+sVZ> znO5_vZK^gHZKcXKEk5x(Kpk1f8}{*B7Ch*U*`~>j-24s~==ZY|ZK>`8d*y<3xq!(i z+&dBO-f{hs06?Wwl)mu6R zbg;Q zUxK5ml#22tC2)9JpXue8nmKhbaJ|m200000NkvXXu0mjf-US*9 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/armor/travel_wings.png b/resources/assets/tinker/textures/armor/travel_wings.png new file mode 100644 index 0000000000000000000000000000000000000000..7713450e0e7612a43a7dc92d3a45c4cc2b1afda5 GIT binary patch literal 663 zcmV;I0%-k-P)qZ6wT+-^saFduLGYXW-uELO#DW%a(W(FZ?vbPQdv1Y2cW4ks;8}q4}g_3fO{^c z02;qKQ?V!(PH_i#9w-6J+1TWlG$W_y03OCdD3pzf4}g`^a{w2{bew-yPU5_pE{qPA zv@ifbH|@R&JC_tc8*QhwDDc0`oTSyc5C9;PjJV&w+d7a&xiDUwr2Op4bXf8{{c-fi8{V%U%JR zD)aGoia4%YR|4>h$kEoE^H#w;gLR^f2!6-J*CRj$tR0%i%rF1{V@$ zC7x@~JocJ*hT06bl>N%dO?nRBjL-Zu_}_ek000McNliru-US*HB`K$cy4C;y0+LBY zK~y-)eUo2E(@_-1KX;oGb-JmWsA)MZrxAsrEi6(a5?>SydWfh8^C_f|3WDAP2}z`< zu!o4Cq8>z$Apch=;uemvYb2FzCy*>PLX-enm-1|M}!wGYc-1JGsYXU;R!G=LX6aXy1k3s!t-Vu0N{Og& zSUK)6#tK^B`2e_f-a>n)0zgx3HqU#505sQU#2_Q?s0MiZ;sS}5T(U}@kdc}~y4i$l zR-xvh_72_m-4y3#6Ifosr-u0XVU^m*1qwnA(Cm|o)O!FakpFQC&2JayHi)?dW?s*Cx}E#m!4xMme@ z)!CSv^z(ICWyZUOp&-i)tnQj^V0i_9?sYIuX4J%(+XSB>s*QD!#9@}04>Ru@YIlolp4 zI(n(qkk6*Af^TO)_sdExqw)WPa6MY5)F4+HBgt=xLjvr)@$T>EIyO4=u3DUQb+H948VMMOu=P{(yO3eQ0P%2q`7Q z!^84*`)!I2TL2iJ405^YG0j)11wiY|_xtJ{9Z$t?$+A36%sboM00000NkvXXu0mjf DIwW5D literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/travelgear/boots_leadweight.png b/resources/assets/tinker/textures/items/travelgear/boots_leadweight.png new file mode 100644 index 0000000000000000000000000000000000000000..68051e11c6174ded9614623bc36cedfc1bdc3b65 GIT binary patch literal 810 zcmV+_1J(SAP)000McNliru-US*HCKaQ{m68Ae0=G#- zK~y-)eUt4=Q(+j!e@EwOPHodnR4AraQ=%t^4pM!4|6@aVzJpjZ~1}=xpjTZ_4?VidNAV~;8N8?)FDk|MwwRv*i zXpl2)bySpC!+&b+o=PTWmn?uJNpyGB(o$DSC~8n$E;IcpL2;&xZ%KnGT*Z}60kErD*#PhL(Tse12+PJP7 zfXR>-fF}1c)?J9+fg$1h>ZIuNc?qBZAmi>AUayz>`g(c>hQ-`sh{c2ZC_l89*whTZ zvNGltL-Y&`=Y1J>zW}f`)Hu;J4NcQ9O%qMih-e9x-n=6=HA6;?l8r=(eAoZ-HPkq* z7mN*_l>&hPilPvBbx8_Gqbmz!BT;t9Hp0<3fmfIEzOlix5@2Nj@cPbiNsSq_ z)Rh7d(GslM9kWFl{s(Z_X? z50h2~E&dj!nFhd64FH07*qoM6N<$f;^LG8vp000McNliru-US*HCMAU)r9J=v0;owu zK~y-)eUt4=Q(+j!e@E8P&AH81s3iDOPTMeh`y!N5QusjygFt&BDxnvIj0pM*f{+NL zGD48(1%mouL?%lVp>M5_kvqCl@L;F8wH@7boh?rvPMtKP``hze*Zt#u9z3& zU%83@)ktuD%~|*j_}w@vMgX|l=msFZq~frcx$#N_pw8`D0}?b%qrP$zqhf^4<|2dK zGcd>5{iWnv_2$2|I=73F;JgkH1cA=xBD|%!$T5`yrPy8jS*c=t@D)^+Vu$r z?{y$a5~3&~4RsNYEwF2Gk(BtEAJG_l%_hRJ1*D-a!#8-ZL(jqK`f{v!%eWk7B5@UO zX)aP*llJEB7$4FB0ib4sS37uqA6uTh5CYQ)!<$^l(I)`N5@1h-4XLe3lPAOLA}mja zk=mNHJry>xgjG?tv|BinZ~*Ymxy4wFU|mQ^`BFOEl|{9(-OzT&Bmtl=H?Akqddy08 zLpJIM6;pwUjGSR5vcl5iB>*h#7P1?%S&>)B$QjHvW>UTs$wx^&2i}mE0098hhzfvb z%EONR5%R5OMnZN&2T1u+c&0pmmdWq;^R(v@m0R_v1VeF-cHZK0`(XfXK7RdAy|3>+ ZKLK=wM-Q&fn0^2N002ovPDHLkV1i!?YbpQ$ literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/travelgear/boots_waterwalk.png b/resources/assets/tinker/textures/items/travelgear/boots_waterwalk.png new file mode 100644 index 0000000000000000000000000000000000000000..d51f6f4c3ff95877d8105a8d0372c43cd376c15f GIT binary patch literal 767 zcmV000McNliru-US*HB{yA)hqV9z0*pyS zK~y-)eUr^gR8bg*pL4s6I*!h$ql}`VS&pXkg>3>q2ua*17__ixV;c)8B!d2eKth6{ zHsK~pD5!-95{M{5(8fwc9sDF~y3L1ooEgX4IL>J?c^NZ$SLeLH_xEt#bKWDQlw?M0 zZ886gsinZ7y*L0I7^l5K03LL>0SLzvIII>1$GrfwxSfYULP|+%Z86i{ApMNl<4=E+0 z#qH#b+hP_Bz4HTb^Rffas1Jbt&N5z1h5;DpE-@i<-b5Pk_GKGZM+K$lpHfngPm$fm z;)aioN9lVQf9R#IvW(Dn48I=X$EQ2Q!<$^aF@XxO>Rq5ZT}zSO#;FPy05jSp0O~5E ze{vdrJwiOZ$*Ok&fMbX0#hPGn_CO;6KTVyY&vmeq4?HWgBqPok%$QqZr;b_Cq=sEh>IJ!eDPXdUTIWk9t7U^u&=X++<`I%;CXL;kf xN9{=m081-juJu1*pr;*xp^^9h)Q5+k^Bbh2FE@?^d3FE*002ovPDHLkV1mNlPl5md literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/travelgear/glove_guard.png b/resources/assets/tinker/textures/items/travelgear/glove_guard.png new file mode 100644 index 0000000000000000000000000000000000000000..d69b88baecd760b91f69b7151500038adcafc110 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPq3qOmA;QR?v8-PMdo-U3d7N?UFBv_gGB|dt#t?2&S zzVZ5XZ#An+_LAtB*M|5=4OY!0IT(t(^CW$$^Lr%&Rzqmbe( z(fL*TjCGus63^{-dmDGRv_>#b$oXqOt7HWagOH_SdXMY=uRz-vJYD@<);T3K0RRrW BM#BIA literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/travelgear/glove_speedaura.png b/resources/assets/tinker/textures/items/travelgear/glove_speedaura.png new file mode 100644 index 0000000000000000000000000000000000000000..ad87de4fd79cd9b238de5b99d287df67abec0719 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPq3qOmAa=5#<0Z=H@)5S5w;`H9hXZacoIGXLnD*w07 z$=~Q~n^|IiY~v9*X|63S5)KRA=qc^sW-azjV_m6MRzB_HwxdC2dlfZr{Y?CN{mN`@ zm*9M(8Lf@6*A|W;2_V&#@6=#>Ds+LD!U(ioB8*@{hr#+ zM@oD25`duL7R%<3^+3gkcYTeP@F?Tl)m^Z&Wlh7<`YU{X3=H860l(+$5M=~f%;4$j K=d#Wzp$P!Y?@Z?a literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/travelgear/glove_sticky.png b/resources/assets/tinker/textures/items/travelgear/glove_sticky.png new file mode 100644 index 0000000000000000000000000000000000000000..bc2aa0c990a1171092261eb95a79f9d3dc0d0327 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPq3qOmA;gWw=6+odLPZ!4!i_^&o60FLMF5iCq?|;Yp zr{8-X=lo|c?j88g_|J}~tIUf>^YfzrlT#d0`v2Ga$LqJfxBqWoQ1kz+g2K_`52oaH zCvtH6EjKhYyi-@*`|$eu{XBE-yy1zr|CjRP|9km1E4P}s6A=?X%y*wL`{DO~d!F;_ vY||rR_jOKu;!xtT`Pcgid0*=#mJ2hi&CtCN5}hdvbQgoCtDnm{r-UW|-^*gw literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/travelgear/goggles_nightvision.png b/resources/assets/tinker/textures/items/travelgear/goggles_nightvision.png new file mode 100644 index 0000000000000000000000000000000000000000..aca8b47f852a680082f464699a440ea592b3e310 GIT binary patch literal 510 zcmVe+7-&PdZw)pxIuQWA|u zDOViEN1o#QKF`%B9DZ*E%dE2^x++kFW(0O}nG}kWrdoHAQUb8OV+KR5-||jgiraQV zM5oh1N=c{vC&cfTj)}+Pp{(qt6%O&^(!q66m;~U{@(}#k zE|a=>HOLRQ$+M(N$*hG19*gl8T7Lrn@0jkx64t5ppZ(nVILYqBZ978NlC%<|3E^PsefnflL z8*f5F!a>!IMgPA1Kk?_o5g)fbYzwkCTntXG`2CWb83>vU^f4+0(@_#Nu>vg2bl=!B~gTs4w_pm{C$5C zT&5={BqUhWJ~gv3o3SDD7~6!S6O)@+XEUYTPAvTY@A32h%XYoGAv|f-mKXI;D%`L2 i@Lc%Y?|oN*nPHh-;gSuukp@8LGkCiCxvX4kn|f&@CE3p$ncajv*GO&raIN)odWqqQ7+a zltmFa3p*@43X5JmcwGMCfy&W^9UMzFx;pkb>@snjY*PB-!tGC!e;4g!`H}6~=)L&B z(p|RMb1nI5w=H3qkir_tlc2R)EO-J(r0!lm=Fad-OzXDC%sRS||N6!kN(X*ES@^C^ za>bgcQud@Rdv`t*n6~U4+l}aCHifQZ>C0uxpXJ1rGta7X`Iy7u{~>Rh^D?!-Z`T|y z_ZM|~hE4FUy1uW;>&a>MNoO+uJ@`14fuTUQyX~IitnO$13~Ykwi+-wCF;-lUIri|) S`c$Cb7(8A5T-G@yGywoZFMkFA literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/travelgear/travel_gloves.png b/resources/assets/tinker/textures/items/travelgear/travel_gloves.png new file mode 100644 index 0000000000000000000000000000000000000000..a0f7d1850ed4836fbd5180be55c1eb3f9c97de01 GIT binary patch literal 651 zcmV;60(AX}P)000McNliru-UJZ{7$G^Nn0f#J0vJg| zK~y-)eUr~?6G0TmKhwqn3d2&?-qKF9wZ_Kk^BSRa*#q% zPYU&H&mM|ck%G5U1k=_^8iX9Q*_vO1Dd~7fcABl=_p z-2Lf^g=^pnKkOX=P+YJ8`1QL>Xnc&)+dTlXR@iGKrBvj3+`DBcqw~mGVWgCdxLKE0 z=Kxq*og=qwaw&8H{qh)2r>l7POm5j!f9e~qId8{dy@_#pO619PN)NY{cznI7&Qyo` z<#WXcFB)z)MR2r3gpkVU7m{kdMWZ(XAlc{v2%v9pGj&yF(iTpm#n#TgbU;Lawc{h0 z1?rF)h?B7y^q|%^>NUkkXEdP1!&vJK#2OItHqdFb$fPa4w@0MUB?^y<#Nr8x5Au`` zYclg15l!|>sFt@?_R_Og9Ddv7`O^}r1b|pP!F0^TX|}nd2Pju+()sjJ47O#`n89hb znU0y>LCV{4HovxHCOwPOYy(iP)Br^J@kN+|WbuzO0nh^zZ0+o0o0<@LJ5IIUqT(<- z)55qD^kk~MY4jU6fT1IzlUjd}Tq3ZzB5YF=h7Q(APKm9P9EJ|IsfobiiZFD9=Plg5 zeT{0}dkgPA|M0}Q8&jS*I;rvU{XxHp{?t6tFB=|{;(~?K>8f$A9Ctioe`@~hF%=5; lJzsa7wZder@IUug zK~y-)y_2zP6JZ#}fA8gz4AvA{hzAXd7!K?WQXITFSVzIlLjM4lE`ozPtDrcEi-U`$ zQ^8G8p{|F6g7k`>fg)x|LpZ#%iuum;b!c;N7^M*Cv%Meh^L)?yeD5c!$|SIu5Qh@j zetP+zHf7uhzSq<^NdcIdu5owyB&SbIvGj0@I7x{*JsI`dhy3MbsdRVMY2Pjr1XE|sf`XYoCUsM8bQYicgw zHtM=>drz+~pBG~cmSyoF>f+8FM^%}v9pmlCetuaHw#9AK)%Lw+ZpZf=Y}@AZ*92n> z0BbM9ob>&t`71Ab6xIlX!2n|ngI~W3=dXiLl*{EpR#B%Xg%E=WEd_Y?0s(mc=#l~~ zth^F{N~J=URn_;J1YuhM+Y;8`sR!tVGz z*toav;MVGv1YtL?TQ@hv_nd>SDdHq$X1YcYw#P5hVc|CFlL;K%XZj!h07oFWcDFb* Q5dZ)H07*qoM6N<$f-cPK0ssI2 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/travelgear/travel_vest.png b/resources/assets/tinker/textures/items/travelgear/travel_vest.png new file mode 100644 index 0000000000000000000000000000000000000000..24ad2477bafb71acf82e0abbd0540e367d3a9f0e GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=DkBK$x-p&dPkCAbW|YuPggK7EwkG{$1_-^MFEgJY5_^EKa|ju$QaZK%~{)Tb+|l za0v^Sp6sW8{EsKN3aE%IS<T$mdKI;Vst01>!k2><{9 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/travelgear/travel_wings.png b/resources/assets/tinker/textures/items/travelgear/travel_wings.png new file mode 100644 index 0000000000000000000000000000000000000000..0d49f350b7683b9144f137f46f780a6cf8a92dca GIT binary patch literal 699 zcmV;s0!00ZP)000McNliru-UJl^CnFEXf3g4o0!T?j zK~y-)eUm**Q&AMhf49;iA1}1@@vR}0gl7yAqRf_97+i30RGAzUBw;Wn4o+@{!32qu zldhV`!hnqsR$~Z~h6j=c8%XH~uh>Vm?_sXPOP_t#c$a(b`G4GVPVN;_N~+iBg*N`T zR<^R9v#1zUgsXZEfJfIg0173GU}J!1OF95iP4yTFDJ7#9+E~?d%uIB<<;*W0h`U$& zXl-)De`8TiWo0Yt7ziPlndp{-ea)l|i_TDh&7?_#t%#!&i-usi2Af|zaI{fPWk?Hn z2>ZD*M$u+|@jw8~OmxeT;-^Qg_n2(xmJm@**%&;}>lg3I6fEphiBYu4j&}%v zw&g<^QvCSq1nt29cOKlJR7i32_6Jc1u&XEN*J>xe^w=5P7)f3JTqnb)= z*e^Re75DZYwVutS$(hC>0r0D|AqV@K+0T{TDh|^{;_J5X^>?+n&eh_A9TAm$!H$T{ zq)CrjkA3>*-Sl_0-~-71aJWX%cEO!gn*6az{@7$Em3H$LPDN8!0n&!$=`(+90_m#Q z$G^C)flt85fWoKkB8lXw$QULW=^pmJJup|g6)U0<}Zv5bvUKQo^yHq348e>@h=%qOR-Ds^oA8a4?iUwpQSgf z@ap4N$6$K;K0g!7?B$ED;L5oWM<*7oO#zNhERx2Fi}i*T&R!g6Vc{i6DVdtO=h-W9 hR8xs+YE8a6{ta*CGjfj*m<9j<002ovPDHLkV1nVmLk<7{ literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/travelgear/travel_wings_slimewing.png b/resources/assets/tinker/textures/items/travelgear/travel_wings_slimewing.png new file mode 100644 index 0000000000000000000000000000000000000000..a419f018af0c7efcd91f5d148c11f7dbd84db3f1 GIT binary patch literal 759 zcmV000McNliru-UJjEBQCWKeyjih0)$CK zK~y-)eUjfxlTjGQKWB~EOxx61DjJ5=s}@3HH$hGMi8l&%B}6xNk%b0b2>AyTc+rhS zS6viAbWs-)bdi=K2t^o)I$zN?v)0=?w==h?>m7Q!SX*0zo}2SM&-p$dzMOM}Qi|Ma zZ>;2hHL)1V+lve!GdQWQ12EX30TA7?a2Gomeys!G)jWA1p_HP%v64xBo&L_6EO}%! z$h9+vDc_eK{`btQd6-xXr2#?+`a5elez*ifT2z%enDZxarb>xyS~%Um3eHAGgD9mC zUd=;`=ExfEzcc~3de+UzXb^z@&KjP)jRJ7H`#=^lt6OQni>K!)cGppT;sFQB_EX_1 z!50Y9aW8!jukYwI)z=W-NMOnsKR(@LE4s$zD`VIJR`dlL(q1ZDB^;@%0$|EG1wd1M z{7=uolrgrVYpm!C0PLyv6tf#k^7TuE=0ioidjAufO|aH=iL&mC7|&nveP@@VPy}Bf z$gQqQzAcCNJR|WNyVx75UBFh}+lDt1gx*dQo%NAgm+XWk;q7F>pJ=FdVFL(l3jkz1 z#c*#eri{@VkCW8DuoIS?bl5RvjN#r|WIRRgj6Fj$q*ajOq^l&Wb1TKjJ3k2~6f|xSKz*wJ}^CxIKT8d5lg=G_%(!!J$?x7xKESVg;d|Wx*QUGj6 z%apNXQZ>}0KHhyMa?{u!y<6sd%R#nV>(#lw(-=!8^W!?xk3ZxZ1)u<`hI-Wa!zmh9 z!{X7q<#Yn=bT`R`H)8zZlmc+h1jJy6Mr6~Xe4m5JriFhdAm%~MkLxt9hQ;3I3u&}c piW@hs=dBs-)jW7LPeDId{{}|RNA2vki6j63002ovPDHLkV1mFFRsjG2 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/travelgear/vest_dodge.png b/resources/assets/tinker/textures/items/travelgear/vest_dodge.png new file mode 100644 index 0000000000000000000000000000000000000000..6c2232307f04250e455d38d4033f90aa1a613911 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=DkBK$x-p&dPkCAbW|YuPggKRw-d=rNT)S%0M9-PZ!4!i_^&o60C=LJ;KxfKmS(x ztKWZKq%Y%g8|K+dAJ)&^EWJ@mDR%DP_~&oj{;(b3IjHI$@L5Abfq|joj;Qs`_WL0F O7(8A5T-G@yGywo#lQ-c2 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/travelgear/vest_stealth.png b/resources/assets/tinker/textures/items/travelgear/vest_stealth.png new file mode 100644 index 0000000000000000000000000000000000000000..c3b8a259b3ad6d6be6a9dd632b4bdd59997dbe58 GIT binary patch literal 761 zcmV000McNliru-UJjEBO<)JGKT;F0)|OM zK~y-)eUnc}lVKdkKd;W2y0y(sQ}NGKYAPjZdg;(4t?;5?$HI#pN|7WY=nxbg0+9$r zI(3OI9r7T8htd=w=wfD}zNJpH=Gxrexqr@g&bPzM*4CgOJUqYW`F+11ems8!MNvqN zwz?wz7qhFLw6%}`B#d+7E&%sBZ29u*)60)t&;oUYd4l4MFuTE03$Tg&k7g>Xv&c0LUd@o#hW`a3iL>*6xCsur_B$H|Hk0Onoi6@Yqc zP*C?=xTOFQ|2FI5G630DOFl<|C_grQG*sp?`SCYdSpwVLR}@pvWn8Z(`4vBUnCtO9 zTG@1RySs>=YaTu?NH|fgF;l?AnuiD)oKK{6kxco94Qzh)uTz!T#}s8MXNz4B=Xcq)n+$Y z3(@8tqRY#szA~T1^$*?E z%?M`45Z8Kp5p$*iu*KRD=f|0^8G&ziGyg(I;|aCx_GdINK48lmWcrIcP1t^>m@2cL zg|m+_PY+RL*7M^1nhF>gxJ7jNEnD7T(r~WagfA>pSfIrhmT^eoWUb1q=UBrf#>Sq5 rqA2wD-%Ohmx!q>LZnI?Ur{;eEwG2YX2IdBt00000NkvXXu0mjfUAt7e literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/travelgear/wings_doublejump.png b/resources/assets/tinker/textures/items/travelgear/wings_doublejump.png new file mode 100644 index 0000000000000000000000000000000000000000..50414ba1a2811130932cb7541cff68e9f7624077 GIT binary patch literal 770 zcmV+d1O5DoP)000McNliru-US*I3oy;54Zi>Y0*^^V zK~y-)jgwDE(_t9LKfmRl=G19A(c%B0QxQS&6f8&7!Gi`yohn2-gd#~q(!rY$h;)&T zB1FgPAc2Q6m7O}QG-Nvb^II-{te%lo{~^L;+=!}GqcB!u9! zIU6ke%NEu`XZF$w;G}TTy92uWQySpin;Ya5R8ZFXiju;7 zip;sJ`V=}}Xmgl-?xnHXN_a0$FrxD7+aQUkpWF97kpZyj^hA0UE2V ze`5iH5tT&L&!*P{z@_Tq9Mb9m+grOdRc7}RJBxLHfK{Ku z<69PfZiHC=8bJ=EG1$t?7w$T|7yqxAt;~!8Ae58mlKH{ak?hsgcgXTbaG{lO@yN%2?F}*l{Gd2htheiL3bo*ug_yej?>)S%$@sv zV%4Xx>Qm?+92O>%i4{3cdwm`T>C{v1bJ{TFC-s1&7 zSAADGMc)cgh>`52FUjH`Bnwxv-GZ|V0n2Ni$(h$Ly;{ zrsg-a8Q2{?9C$v$+%P|YSmGziWD-SDP*oLKmdVV_Bz6#^Xl|IQqC74)-PGC;LNGA! z=*;SNyTwSaLrjl#iRrN}G1BW0Zns;U)|~i%0AIgEpx|IR%m4rY07*qoM6N<$g6nN& A2LJ#7 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/travelgear/wings_featherfall.png b/resources/assets/tinker/textures/items/travelgear/wings_featherfall.png new file mode 100644 index 0000000000000000000000000000000000000000..6089f53a85926c2e3acfd482847b79dbfa4166c4 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=DkBK$x-p&dPkCAbW|YuPggKRw)sFp_)~l@jxLDPZ!4!i_^&o60D0ExGVnu`&%FM zWX1$b^SnDh{7*2InEJd}R{#H>?DDi3GMl_-Oi-O~TYXGHRrP4cX$DPA&1323=RMq- cqQb-w$D@Axd++pvKr fluidTypes = new HashMap(); - FluidType(Block b, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) + public FluidType(Block block, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) { - this.renderBlock = b; + this.renderBlock = block; this.renderMeta = meta; this.baseTemperature = baseTemperature; this.fluid = fluid; this.isToolpart = isToolpart; } + + public static void registerFluidType(String name, FluidType type) + { + fluidTypes.put(name, type); + } + + public static void registerFluidType(String name, Block block, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) + { + FluidType type = new FluidType(block, meta, baseTemperature, fluid, isToolpart); + registerFluidType(name, type); + } + + public static FluidType getFluidType(String typeName) + { + return fluidTypes.get(typeName); + } public static FluidType getFluidType (Fluid searchedFluid) { - for (FluidType ft : values()) + Iterator iter = fluidTypes.entrySet().iterator(); + while (iter.hasNext()) { - if (ft.fluid == searchedFluid) - return ft; + Map.Entry pairs = (Map.Entry) iter.next(); + if (((FluidType)pairs.getValue()).fluid.equals(searchedFluid)) + return (FluidType) pairs.getValue(); } return null; } public static int getTemperatureByFluid (Fluid searchedFluid) { - for (FluidType ft : values()) + Iterator iter = fluidTypes.entrySet().iterator(); + while (iter.hasNext()) { - if (ft.fluid == searchedFluid) - return ft.baseTemperature; + Map.Entry pairs = (Map.Entry) iter.next(); + if (((FluidType)pairs.getValue()).fluid.equals(searchedFluid)) + return ((FluidType) pairs.getValue()).baseTemperature; } return 800; } diff --git a/src/main/java/tconstruct/library/crafting/Smeltery.java b/src/main/java/tconstruct/library/crafting/Smeltery.java index c7a0df07..6918f9fe 100644 --- a/src/main/java/tconstruct/library/crafting/Smeltery.java +++ b/src/main/java/tconstruct/library/crafting/Smeltery.java @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; @@ -25,13 +26,9 @@ public class Smeltery * Smeltery.addMelting(Block.oreIron, 0, 600, new * FluidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0)); * - * @param stack - * The itemstack to liquify - * @param temperature - * How hot the block should be before liquifying. Max temp in the - * Smeltery is 800, other structures may vary - * @param output - * The result of the process in liquid form + * @param stack The itemstack to liquify + * @param temperature How hot the block should be before liquifying. Max temp in the Smeltery is 800, other structures may vary + * @param output The result of the process in liquid form */ public static void addMelting0 (ItemStack stack, int temperature, FluidStack output) { @@ -43,15 +40,10 @@ public class Smeltery * Smeltery.addMelting(Block.oreIron, 0, 600, new * FluidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0)); * - * @param blockID - * The ID of the block to liquify and render - * @param metadata - * The metadata of the block to liquify and render - * @param temperature - * How hot the block should be before liquifying. Max temp in the - * Smeltery is 800, other structures may vary - * @param output - * The result of the process in liquid form + * @param blockID The ID of the block to liquify and render + * @param metadata The metadata of the block to liquify and render + * @param temperature How hot the block should be before liquifying. Max temp in the Smeltery is 800, other structures may vary + * @param output The result of the process in liquid form */ public static void addMelting (Block block, int metadata, int temperature, FluidStack output) { @@ -64,16 +56,11 @@ public class Smeltery * 0, 600, new FluidStack(liquidMetalStill.blockID, * TConstruct.ingotLiquidValue * 2, 0)); * - * @param input - * The item to liquify - * @param blockID - * The ID of the block to render - * @param metadata - * The metadata of the block to render - * @param temperature - * How hot the block should be before liquifying - * @param liquid - * The result of the process + * @param input The item to liquify + * @param blockID The ID of the block to render + * @param metadata The metadata of the block to render + * @param temperature How hot the block should be before liquifying + * @param liquid The result of the process */ public static void addMelting (ItemStack input, Block blockID, int metadata, int temperature, FluidStack liquid) { @@ -88,11 +75,8 @@ public class Smeltery * FluidStack(tinID, 1, 0)); The example mixes 3 copper with 1 tin to make 2 * bronze * - * @param result - * The output of the combination of mixers. The quantity is used - * for amount of a successful mix - * @param mixers - * the liquids to be mixed. Quantities are used as ratios + * @param result The output of the combination of mixers. The quantity is used for amount of a successful mix + * @param mixers the liquids to be mixed. Quantities are used as ratios */ public static void addAlloyMixing (FluidStack result, FluidStack... mixers) { @@ -106,8 +90,7 @@ public class Smeltery /** * Used to get the resulting temperature from a source ItemStack * - * @param item - * The Source ItemStack + * @param item The Source ItemStack * @return The result temperature */ public static Integer getLiquifyTemperature (ItemStack item) @@ -125,8 +108,7 @@ public class Smeltery /** * Used to get the resulting temperature from a source Block * - * @param item - * The Source ItemStack + * @param item The Source ItemStack * @return The result ItemStack */ public static Integer getLiquifyTemperature (int blockID, int metadata) @@ -137,8 +119,7 @@ public class Smeltery /** * Used to get the resulting ItemStack from a source ItemStack * - * @param item - * The Source ItemStack + * @param item The Source ItemStack * @return The result ItemStack */ public static FluidStack getSmelteryResult (ItemStack item) @@ -155,8 +136,7 @@ public class Smeltery /** * Used to get the resulting ItemStack from a source Block * - * @param item - * The Source ItemStack + * @param item The Source ItemStack * @return The result ItemStack */ public static FluidStack getSmelteryResult (int blockID, int metadata) @@ -209,14 +189,10 @@ public class Smeltery * * @author samtrion * - * @param type - * Type of Fluid - * @param input - * The item to liquify - * @param temperatureDifference - * Difference between FluidType BaseTemperature - * @param fluidAmount - * Amount of Fluid + * @param type Type of Fluid + * @param input The item to liquify + * @param temperatureDifference Difference between FluidType BaseTemperature + * @param fluidAmount Amount of Fluid */ public static void addMelting (FluidType type, ItemStack input, int temperatureDifference, int fluidAmount) { @@ -224,7 +200,10 @@ public class Smeltery if (temp <= 20) temp = type.baseTemperature; - addMelting(input, type.renderBlock, type.renderMeta, type.baseTemperature + temperatureDifference, new FluidStack(type.fluid, fluidAmount)); + if (input.getItem() instanceof ItemBlock) + addMelting(input, ((ItemBlock) input.getItem()).field_150939_a, type.renderMeta, type.baseTemperature + temperatureDifference, new FluidStack(type.fluid, fluidAmount)); + else + addMelting(input, type.renderBlock, type.renderMeta, type.baseTemperature + temperatureDifference, new FluidStack(type.fluid, fluidAmount)); } /** @@ -232,14 +211,10 @@ public class Smeltery * * @author samtrion * - * @param oreName - * oreDictionary name e.g. oreIron - * @param type - * Type of Fluid - * @param temperatureDifference - * Difference between FluidType BaseTemperature - * @param fluidAmount - * Amount of Fluid + * @param oreName oreDictionary name e.g. oreIron + * @param type Type of Fluid + * @param temperatureDifference Difference between FluidType BaseTemperature + * @param fluidAmount Amount of Fluid */ public static void addDictionaryMelting (String oreName, FluidType type, int temperatureDifference, int fluidAmount) { diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index 1bcaf2e8..f3c81420 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -2,7 +2,9 @@ package tconstruct.smeltery; import java.util.ArrayList; import java.util.Arrays; +import java.util.Iterator; import java.util.List; +import java.util.Map; import mantle.blocks.BlockUtils; import mantle.blocks.abstracts.MultiServantLogic; @@ -77,11 +79,9 @@ import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @@ -467,6 +467,34 @@ public class TinkerSmeltery implements IPulse //TODO: Remove IPulse implementati TinkerSmeltery.moltenObsidian, TinkerSmeltery.moltenSteel, TinkerSmeltery.moltenGlass, TinkerSmeltery.moltenStone, TinkerSmeltery.moltenEmerald, TinkerSmeltery.blood, TinkerSmeltery.moltenNickel, TinkerSmeltery.moltenLead, TinkerSmeltery.moltenSilver, TinkerSmeltery.moltenShiny, TinkerSmeltery.moltenInvar, TinkerSmeltery.moltenElectrum, TinkerSmeltery.moltenEnder, TinkerSmeltery.glueFluidBlock }; + + FluidType.registerFluidType("Water", Blocks.snow, 0, 20, FluidRegistry.getFluid("water"), false); //TODO: Too much reliance on World. + FluidType.registerFluidType("Iron", Blocks.iron_block, 0, 600, TinkerSmeltery.moltenIronFluid, true); + FluidType.registerFluidType("Gold", Blocks.gold_block, 0, 400, TinkerSmeltery.moltenGoldFluid, false); + FluidType.registerFluidType("Tin", TinkerWorld.metalBlock, 5, 400, TinkerSmeltery.moltenTinFluid, false); + FluidType.registerFluidType("Copper", TinkerWorld.metalBlock, 3, 550, TinkerSmeltery.moltenCopperFluid, true); + FluidType.registerFluidType("Aluminum", TinkerWorld.metalBlock, 6, 350, TinkerSmeltery.moltenAluminumFluid, false); + FluidType.registerFluidType("NaturalAluminum", TinkerWorld.oreSlag, 6, 350, TinkerSmeltery.moltenAluminumFluid, false); + FluidType.registerFluidType("Cobalt", TinkerWorld.metalBlock, 0, 650, TinkerSmeltery.moltenCobaltFluid, true); + FluidType.registerFluidType("Ardite", TinkerWorld.metalBlock, 1, 650, TinkerSmeltery.moltenArditeFluid, true); + FluidType.registerFluidType("AluminumBrass", TinkerWorld.metalBlock, 7, 350, TinkerSmeltery.moltenAlubrassFluid, false); + FluidType.registerFluidType("Alumite", TinkerWorld.metalBlock, 8, 800, TinkerSmeltery.moltenAlumiteFluid, true); + FluidType.registerFluidType("Manyullyn", TinkerWorld.metalBlock, 2, 750, TinkerSmeltery.moltenManyullynFluid, true); + FluidType.registerFluidType("Bronze", TinkerWorld.metalBlock, 4, 500, TinkerSmeltery.moltenBronzeFluid, true); + FluidType.registerFluidType("Steel", TinkerWorld.metalBlock, 9, 700, TinkerSmeltery.moltenSteelFluid, true); + FluidType.registerFluidType("Nickel", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenNickelFluid, false); + FluidType.registerFluidType("Lead", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenLeadFluid, false); + FluidType.registerFluidType("Silver", TinkerWorld.metalBlock, 0, 400, TinkerSmeltery.moltenSilverFluid, false); + 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("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); + FluidType.registerFluidType("Stone", Blocks.stone, 0, 800, TinkerSmeltery.moltenStoneFluid, true); + FluidType.registerFluidType("Emerald", Blocks.emerald_block, 0, 575, TinkerSmeltery.moltenEmeraldFluid, false); + FluidType.registerFluidType("PigIron", TinkerWorld.meatBlock, 0, 610, TinkerSmeltery.pigIronFluid, true); + FluidType.registerFluidType("Glue", TinkerSmeltery.glueBlock, 0, 125, TinkerSmeltery.glueFluid, false); TinkerSmeltery.speedBlock = new SpeedBlock().setBlockName("SpeedBlock"); @@ -545,6 +573,7 @@ public class TinkerSmeltery implements IPulse //TODO: Remove IPulse implementati public void postInit (FMLPostInitializationEvent evt) { craftingTableRecipes(); + addRecipesForSmeltery(); addOreDictionarySmelteryRecipes(); addRecipesForTableCasting(); } @@ -621,73 +650,80 @@ public class TinkerSmeltery implements IPulse //TODO: Remove IPulse implementati public void addOreDictionarySmelteryRecipes () { - List exceptions = Arrays.asList(new FluidType[] { FluidType.Water, FluidType.Stone, FluidType.Ender, FluidType.Glass, FluidType.Slime, FluidType.Obsidian }); - for (FluidType ft : FluidType.values()) + List exceptions = Arrays.asList(new FluidType[] { FluidType.getFluidType("Water"), FluidType.getFluidType("Stone"), FluidType.getFluidType("Ender"), + FluidType.getFluidType("Glass"), FluidType.getFluidType("Slime"), FluidType.getFluidType("Obsidian") }); + Iterator iter = FluidType.fluidTypes.entrySet().iterator(); + while (iter.hasNext()) { + Map.Entry pairs = (Map.Entry) iter.next(); + FluidType ft = (FluidType) pairs.getValue(); if (exceptions.contains(ft)) continue; + String fluidTypeName = (String) pairs.getKey(); // Nuggets - Smeltery.addDictionaryMelting("nugget" + ft.toString(), ft, -100, TConstruct.nuggetLiquidValue); + Smeltery.addDictionaryMelting("nugget" + fluidTypeName, ft, -100, TConstruct.nuggetLiquidValue); // Ingots, Dust - registerIngotCasting(ft); - Smeltery.addDictionaryMelting("ingot" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); - Smeltery.addDictionaryMelting("dust" + ft.toString(), ft, -75, TConstruct.ingotLiquidValue); + registerIngotCasting(ft, fluidTypeName); + Smeltery.addDictionaryMelting("ingot" + fluidTypeName, ft, -50, TConstruct.ingotLiquidValue); + Smeltery.addDictionaryMelting("dust" + fluidTypeName, ft, -75, TConstruct.ingotLiquidValue); // Factorization support - Smeltery.addDictionaryMelting("crystalline" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); + Smeltery.addDictionaryMelting("crystalline" + fluidTypeName, ft, -50, TConstruct.ingotLiquidValue); // Ores - Smeltery.addDictionaryMelting("ore" + ft.toString(), ft, 0, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre)); + Smeltery.addDictionaryMelting("ore" + fluidTypeName, ft, 0, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre)); // NetherOres support - Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 2)); + Smeltery.addDictionaryMelting("oreNether" + fluidTypeName, ft, 75, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 2)); // Blocks - Smeltery.addDictionaryMelting("block" + ft.toString(), ft, 100, TConstruct.blockLiquidValue); + Smeltery.addDictionaryMelting("block" + fluidTypeName, ft, 100, TConstruct.blockLiquidValue); if (ft.isToolpart) { - TinkerTools.registerPatternMaterial("ingot" + ft.toString(), 2, ft.toString()); - TinkerTools.registerPatternMaterial("block" + ft.toString(), 18, ft.toString()); + TinkerTools.registerPatternMaterial("ingot" + fluidTypeName, 2, fluidTypeName); + TinkerTools.registerPatternMaterial("block" + fluidTypeName, 18, fluidTypeName); } } // Obsidian, different dust amount { - FluidType ft = FluidType.Obsidian; - Smeltery.addDictionaryMelting("nugget" + ft.toString(), ft, -100, TConstruct.nuggetLiquidValue); + FluidType ft = FluidType.getFluidType("Obsidian"); + System.out.println("Obsidian fluid? "+ft); + String fluidTypeName = "Obsidian"; + Smeltery.addDictionaryMelting("nugget" + fluidTypeName, ft, -100, TConstruct.nuggetLiquidValue); // Ingots, Dust - registerIngotCasting(ft); - Smeltery.addDictionaryMelting("ingot" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); - Smeltery.addDictionaryMelting("dust" + ft.toString(), ft, -75, TConstruct.ingotLiquidValue / 4); + registerIngotCasting(ft, fluidTypeName); + Smeltery.addDictionaryMelting("ingot" + fluidTypeName, ft, -50, TConstruct.ingotLiquidValue); + Smeltery.addDictionaryMelting("dust" + fluidTypeName, ft, -75, TConstruct.ingotLiquidValue / 4); // Factorization support - Smeltery.addDictionaryMelting("crystalline" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); + Smeltery.addDictionaryMelting("crystalline" + fluidTypeName, ft, -50, TConstruct.ingotLiquidValue); // Ores - Smeltery.addDictionaryMelting("ore" + ft.toString(), ft, 0, ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre)); + Smeltery.addDictionaryMelting("ore" + fluidTypeName, ft, 0, ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre)); // NetherOres support - Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre * 2)); + Smeltery.addDictionaryMelting("oreNether" + fluidTypeName, ft, 75, ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre * 2)); // Blocks - Smeltery.addDictionaryMelting("block" + ft.toString(), ft, 100, TConstruct.blockLiquidValue); + Smeltery.addDictionaryMelting("block" + fluidTypeName, ft, 100, TConstruct.blockLiquidValue); if (ft.isToolpart) { - TinkerTools.registerPatternMaterial("ingot" + ft.toString(), 2, ft.toString()); - TinkerTools.registerPatternMaterial("block" + ft.toString(), 18, ft.toString()); + TinkerTools.registerPatternMaterial("ingot" + fluidTypeName, 2, fluidTypeName); + TinkerTools.registerPatternMaterial("block" + fluidTypeName, 18, fluidTypeName); } } // Compressed materials for (int i = 1; i <= 8; i++) { - Smeltery.addDictionaryMelting("compressedCobblestone" + i + "x", FluidType.Stone, 0, TConstruct.ingotLiquidValue / 18 * (9 ^ i)); + Smeltery.addDictionaryMelting("compressedCobblestone" + i + "x", FluidType.getFluidType("Stone"), 0, TConstruct.ingotLiquidValue / 18 * (9 ^ i)); } - Smeltery.addDictionaryMelting("compressedSand1x", FluidType.Glass, 175, FluidContainerRegistry.BUCKET_VOLUME * 9); + Smeltery.addDictionaryMelting("compressedSand1x", FluidType.getFluidType("Glass"), 175, FluidContainerRegistry.BUCKET_VOLUME * 9); } private void addRecipesForTableCasting () @@ -841,65 +877,70 @@ public class TinkerSmeltery implements IPulse //TODO: Remove IPulse implementati protected static void addRecipesForSmeltery () { // Alloy Smelting - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenBronzeFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsBronzeAlloy)), new FluidStack(TinkerSmeltery.moltenCopperFluid, - TConstruct.ingotLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.ingotLiquidValue)); // Bronze - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenAlubrassFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsAluminumBrassAlloy)), new FluidStack( - TinkerSmeltery.moltenAluminumFluid, TConstruct.ingotLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.ingotLiquidValue * 1)); // Aluminum Brass - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenAlumiteFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsAlumiteAlloy)), new FluidStack( - TinkerSmeltery.moltenAluminumFluid, TConstruct.ingotLiquidValue * 5), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack( - TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); // Alumite - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenManyullynFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsManyullynAlloy)), new FluidStack( - TinkerSmeltery.moltenCobaltFluid, TConstruct.ingotLiquidValue), new FluidStack(TinkerSmeltery.moltenArditeFluid, TConstruct.ingotLiquidValue)); // Manyullyn - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.pigIronFluid, (int) (TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy)), new FluidStack(TinkerSmeltery.moltenIronFluid, - TConstruct.ingotLiquidValue), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), new FluidStack(TinkerSmeltery.bloodFluid, 80)); // Pigiron + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenBronzeFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsBronzeAlloy)), new FluidStack(TinkerSmeltery.moltenCopperFluid, + TConstruct.nuggetLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.nuggetLiquidValue)); // Bronze + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenAlubrassFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsAluminumBrassAlloy)), new FluidStack( + TinkerSmeltery.moltenAluminumFluid, TConstruct.nuggetLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.nuggetLiquidValue * 1)); // Aluminum Brass + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenAlumiteFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsAlumiteAlloy)), new FluidStack( + TinkerSmeltery.moltenAluminumFluid, TConstruct.nuggetLiquidValue * 5), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.nuggetLiquidValue * 2), new FluidStack( + TinkerSmeltery.moltenObsidianFluid, TConstruct.nuggetLiquidValue * 2)); // Alumite + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenManyullynFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsManyullynAlloy)), new FluidStack( + TinkerSmeltery.moltenCobaltFluid, TConstruct.nuggetLiquidValue), new FluidStack(TinkerSmeltery.moltenArditeFluid, TConstruct.nuggetLiquidValue)); // Manyullyn + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.pigIronFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsPigironAlloy)), new FluidStack(TinkerSmeltery.moltenIronFluid, + TConstruct.nuggetLiquidValue), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), new FluidStack(TinkerSmeltery.bloodFluid, 80)); // Pigiron Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.oreLiquidValue), new FluidStack(FluidRegistry.LAVA, 1000), new FluidStack(FluidRegistry.WATER, 1000)); //Obsidian // Stone parts + FluidType stone = FluidType.getFluidType("Stone"); for (int sc = 0; sc < TinkerTools.patternOutputs.length; sc++) { if (TinkerTools.patternOutputs[sc] != null) { - Smeltery.addMelting(FluidType.Stone, new ItemStack(TinkerTools.patternOutputs[sc], 1, 1), 1, + Smeltery.addMelting(stone, new ItemStack(TinkerTools.patternOutputs[sc], 1, 1), 1, (8 * ((IPattern) TinkerTools.woodPattern).getPatternCost(new ItemStack(TinkerTools.woodPattern, 1, sc + 1))) / 2); } - } + } + FluidType iron = FluidType.getFluidType("Iron"); + FluidType gold = FluidType.getFluidType("Gold"); + FluidType steel = FluidType.getFluidType("Steel"); + // Chunks - Smeltery.addMelting(FluidType.Stone, new ItemStack(TinkerTools.toolShard, 1, 1), 0, 4); - Smeltery.addMelting(FluidType.Iron, new ItemStack(TinkerTools.toolShard, 1, 2), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Obsidian, new ItemStack(TinkerTools.toolShard, 1, 6), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Cobalt, new ItemStack(TinkerTools.toolShard, 1, 10), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Ardite, new ItemStack(TinkerTools.toolShard, 1, 11), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Manyullyn, new ItemStack(TinkerTools.toolShard, 1, 12), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Copper, new ItemStack(TinkerTools.toolShard, 1, 13), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Bronze, new ItemStack(TinkerTools.toolShard, 1, 14), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Alumite, new ItemStack(TinkerTools.toolShard, 1, 15), 0, TConstruct.chunkLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(TinkerTools.toolShard, 1, 16), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("Stone"), new ItemStack(TinkerTools.toolShard, 1, 1), 0, 4); + Smeltery.addMelting(iron, new ItemStack(TinkerTools.toolShard, 1, 2), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("Obsidian"), new ItemStack(TinkerTools.toolShard, 1, 6), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("Cobalt"), new ItemStack(TinkerTools.toolShard, 1, 10), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("Ardite"), new ItemStack(TinkerTools.toolShard, 1, 11), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("Manyullyn"), new ItemStack(TinkerTools.toolShard, 1, 12), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("Copper"), new ItemStack(TinkerTools.toolShard, 1, 13), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("Bronze"), new ItemStack(TinkerTools.toolShard, 1, 14), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("Alumite"), new ItemStack(TinkerTools.toolShard, 1, 15), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(steel, new ItemStack(TinkerTools.toolShard, 1, 16), 0, TConstruct.chunkLiquidValue); // Items + Smeltery.addMelting(FluidType.getFluidType("AluminumBrass"), new ItemStack(TinkerTools.blankPattern, 4, 1), -50, TConstruct.ingotLiquidValue); + Smeltery.addMelting(gold, new ItemStack(TinkerTools.blankPattern, 4, 2), -50, TConstruct.ingotLiquidValue * 2); + Smeltery.addMelting(FluidType.getFluidType("Gold"), new ItemStack(TinkerTools.materials, 1, 36), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.AluminumBrass, new ItemStack(TinkerTools.blankPattern, 4, 1), -50, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(TinkerTools.blankPattern, 4, 2), -50, TConstruct.ingotLiquidValue * 2); - Smeltery.addMelting(FluidType.Glue, new ItemStack(TinkerTools.materials, 1, 36), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("Ender"), new ItemStack(Items.ender_pearl, 4), 0, 250); + Smeltery.addMelting(TinkerWorld.metalBlock, 10, 50, new FluidStack(moltenEnderFluid, 1000)); + Smeltery.addMelting(FluidType.getFluidType("Water"), new ItemStack(Items.snowball, 1, 0), 0, 125); + Smeltery.addMelting(iron, new ItemStack(Items.flint_and_steel, 1, 0), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(iron, new ItemStack(Items.compass, 1, 0), 0, TConstruct.ingotLiquidValue * 4); + Smeltery.addMelting(iron, new ItemStack(Items.bucket), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(iron, new ItemStack(Items.minecart), 0, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(iron, new ItemStack(Items.chest_minecart), 0, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(iron, new ItemStack(Items.furnace_minecart), 0, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(iron, new ItemStack(Items.hopper_minecart), 50, TConstruct.ingotLiquidValue * 10); + Smeltery.addMelting(iron, new ItemStack(Items.iron_door), 0, TConstruct.ingotLiquidValue * 6); + Smeltery.addMelting(iron, new ItemStack(Items.cauldron), 0, TConstruct.ingotLiquidValue * 7); + Smeltery.addMelting(iron, new ItemStack(Items.shears), 0, TConstruct.ingotLiquidValue * 2); + Smeltery.addMelting(FluidType.getFluidType("Emerald"), new ItemStack(Items.emerald), -50, 640); - Smeltery.addMelting(FluidType.Ender, new ItemStack(Items.ender_pearl, 4), 0, 250); - Smeltery.addMelting(TinkerWorld.metalBlock, 10, 50, new FluidStack(TinkerSmeltery.moltenEnderFluid, 1000)); - Smeltery.addMelting(FluidType.Water, new ItemStack(Items.snowball, 1, 0), 0, 125); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.flint_and_steel, 1, 0), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.compass, 1, 0), 0, TConstruct.ingotLiquidValue * 4); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.bucket), 0, TConstruct.ingotLiquidValue * 3); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.minecart), 0, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.chest_minecart), 0, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.hopper_minecart), 50, TConstruct.ingotLiquidValue * 10); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_door), 0, TConstruct.ingotLiquidValue * 6); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.cauldron), 0, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.shears), 0, TConstruct.ingotLiquidValue * 2); - Smeltery.addMelting(FluidType.Emerald, new ItemStack(Items.emerald), -50, 640); - - Smeltery.addMelting(FluidType.Ardite, new ItemStack(TinkerTools.materials, 1, 38), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Cobalt, new ItemStack(TinkerTools.materials, 1, 39), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Aluminum, new ItemStack(TinkerTools.materials, 1, 40), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Manyullyn, new ItemStack(TinkerTools.materials, 1, 41), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.AluminumBrass, new ItemStack(TinkerTools.materials, 1, 42), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("Ardite"), new ItemStack(TinkerTools.materials, 1, 38), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("Cobalt"), new ItemStack(TinkerTools.materials, 1, 39), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("Aluminum"), new ItemStack(TinkerTools.materials, 1, 40), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("Manyullyn"), new ItemStack(TinkerTools.materials, 1, 41), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("AluminumBrass"), new ItemStack(TinkerTools.materials, 1, 42), 0, TConstruct.ingotLiquidValue); // Blocks melt as themselves! // Ore @@ -942,59 +983,59 @@ public class TinkerSmeltery implements IPulse //TODO: Remove IPulse implementati Smeltery.addMelting(TinkerTools.multiBrickFancy, 0, 800, new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); // Vanilla blocks - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.iron_bars), 0, TConstruct.ingotLiquidValue * 6 / 16); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.heavy_weighted_pressure_plate), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Blocks.light_weighted_pressure_plate, 4), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.rail), 0, TConstruct.ingotLiquidValue * 6 / 16); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Blocks.golden_rail), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.detector_rail), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.activator_rail), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Obsidian, new ItemStack(Blocks.enchanting_table), 0, TConstruct.ingotLiquidValue * 4); - // Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.cauldron), + Smeltery.addMelting(iron, new ItemStack(Blocks.iron_bars), 0, TConstruct.ingotLiquidValue * 6 / 16); + Smeltery.addMelting(iron, new ItemStack(Blocks.heavy_weighted_pressure_plate), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(gold, new ItemStack(Blocks.light_weighted_pressure_plate, 4), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(iron, new ItemStack(Blocks.rail), 0, TConstruct.ingotLiquidValue * 6 / 16); + Smeltery.addMelting(gold, new ItemStack(Blocks.golden_rail), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(iron, new ItemStack(Blocks.detector_rail), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(iron, new ItemStack(Blocks.activator_rail), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.getFluidType("Obsidian"), new ItemStack(Blocks.enchanting_table), 0, TConstruct.ingotLiquidValue * 4); + // Smeltery.addMelting(iron, new ItemStack(Blocks.cauldron), // 0, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.anvil, 1, 0), 200, TConstruct.ingotLiquidValue * 31); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.anvil, 1, 1), 200, TConstruct.ingotLiquidValue * 31); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.anvil, 1, 2), 200, TConstruct.ingotLiquidValue * 31); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.hopper), 0, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(iron, new ItemStack(Blocks.anvil, 1, 0), 200, TConstruct.ingotLiquidValue * 31); + Smeltery.addMelting(iron, new ItemStack(Blocks.anvil, 1, 1), 200, TConstruct.ingotLiquidValue * 31); + Smeltery.addMelting(iron, new ItemStack(Blocks.anvil, 1, 2), 200, TConstruct.ingotLiquidValue * 31); + Smeltery.addMelting(iron, new ItemStack(Blocks.hopper), 0, TConstruct.ingotLiquidValue * 5); // Vanilla Armor - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_helmet, 1, 0), 50, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_chestplate, 1, 0), 50, TConstruct.ingotLiquidValue * 8); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_leggings, 1, 0), 50, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_boots, 1, 0), 50, TConstruct.ingotLiquidValue * 4); + Smeltery.addMelting(iron, new ItemStack(Items.iron_helmet, 1, 0), 50, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(iron, new ItemStack(Items.iron_chestplate, 1, 0), 50, TConstruct.ingotLiquidValue * 8); + Smeltery.addMelting(iron, new ItemStack(Items.iron_leggings, 1, 0), 50, TConstruct.ingotLiquidValue * 7); + Smeltery.addMelting(iron, new ItemStack(Items.iron_boots, 1, 0), 50, TConstruct.ingotLiquidValue * 4); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_helmet, 1, 0), 50, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_chestplate, 1, 0), 50, TConstruct.ingotLiquidValue * 8); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_leggings, 1, 0), 50, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_boots, 1, 0), 50, TConstruct.ingotLiquidValue * 4); + Smeltery.addMelting(gold, new ItemStack(Items.golden_helmet, 1, 0), 50, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(gold, new ItemStack(Items.golden_chestplate, 1, 0), 50, TConstruct.ingotLiquidValue * 8); + Smeltery.addMelting(gold, new ItemStack(Items.golden_leggings, 1, 0), 50, TConstruct.ingotLiquidValue * 7); + Smeltery.addMelting(gold, new ItemStack(Items.golden_boots, 1, 0), 50, TConstruct.ingotLiquidValue * 4); - Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_helmet, 1, 0), 25, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_chestplate, 1, 0), 50, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_leggings, 1, 0), 50, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.chainmail_boots, 1, 0), 25, TConstruct.ingotLiquidValue); + Smeltery.addMelting(steel, new ItemStack(Items.chainmail_helmet, 1, 0), 25, TConstruct.ingotLiquidValue); + Smeltery.addMelting(steel, new ItemStack(Items.chainmail_chestplate, 1, 0), 50, TConstruct.oreLiquidValue); + Smeltery.addMelting(steel, new ItemStack(Items.chainmail_leggings, 1, 0), 50, TConstruct.oreLiquidValue); + Smeltery.addMelting(steel, new ItemStack(Items.chainmail_boots, 1, 0), 25, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_horse_armor, 1), 100, TConstruct.ingotLiquidValue * 8); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_horse_armor, 1), 100, TConstruct.ingotLiquidValue * 8); + Smeltery.addMelting(iron, new ItemStack(Items.iron_horse_armor, 1), 100, TConstruct.ingotLiquidValue * 8); + Smeltery.addMelting(gold, new ItemStack(Items.golden_horse_armor, 1), 100, TConstruct.ingotLiquidValue * 8); // Vanilla tools - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_hoe, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_sword, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_shovel, 1, 0), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_pickaxe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_axe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(iron, new ItemStack(Items.iron_hoe, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(iron, new ItemStack(Items.iron_sword, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(iron, new ItemStack(Items.iron_shovel, 1, 0), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(iron, new ItemStack(Items.iron_pickaxe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(iron, new ItemStack(Items.iron_axe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_hoe, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_sword, 1, 0), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_shovel, 1, 0), 0, TConstruct.ingotLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_pickaxe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.golden_axe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(gold, new ItemStack(Items.golden_hoe, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(gold, new ItemStack(Items.golden_sword, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(gold, new ItemStack(Items.golden_shovel, 1, 0), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(gold, new ItemStack(Items.golden_pickaxe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(gold, new ItemStack(Items.golden_axe, 1, 0), 0, TConstruct.ingotLiquidValue * 3); } - private void registerIngotCasting (FluidType ft) + private void registerIngotCasting (FluidType ft, String name) { ItemStack pattern = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); - for (ItemStack ore : OreDictionary.getOres("ingot" + ft.toString())) + for (ItemStack ore : OreDictionary.getOres(name)) { tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); tableCasting.addCastingRecipe(pattern, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.oreLiquidValue), new ItemStack(ore.getItem(), 1, ore.getItemDamage()), false, 50); diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index 9eecc1f0..c1a55b5c 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -301,8 +301,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci if (tick == 60) { tick = 0; - if (validStructure) - detectEntities(); + detectEntities(); } } diff --git a/src/main/java/tconstruct/world/TinkerWorld.java b/src/main/java/tconstruct/world/TinkerWorld.java index bbf27791..ca41b529 100644 --- a/src/main/java/tconstruct/world/TinkerWorld.java +++ b/src/main/java/tconstruct/world/TinkerWorld.java @@ -36,6 +36,7 @@ import tconstruct.blocks.traps.Punji; import tconstruct.client.StepSoundSlime; import tconstruct.common.itemblocks.MetadataItemBlock; import tconstruct.library.TConstructRegistry; +import tconstruct.library.crafting.FluidType; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.blocks.MetalOre; import tconstruct.smeltery.itemblocks.MetalItemBlock; @@ -281,6 +282,7 @@ public class TinkerWorld implements IPulse //TODO: Remove IPulse implementation, TinkerWorld.metalBlock = new TMetalBlock(Material.iron, 10.0F).setBlockName("tconstruct.metalblock"); TinkerWorld.metalBlock.stepSound = Block.soundTypeMetal; GameRegistry.registerBlock(TinkerWorld.metalBlock, MetalItemBlock.class, "MetalBlock"); + FluidType.registerFluidType("Slime", TinkerWorld.slimeGel, 0, 250, TinkerWorld.blueSlimeFluid, false); } @EventHandler