From 40b100f3456231b5c4ca7838dfa4be2f4b9c16ff Mon Sep 17 00:00:00 2001 From: mDiyo Date: Fri, 9 Aug 2013 08:47:40 -0700 Subject: [PATCH] Added early essence extractor, liquid ender, updated lang files --- assets/tinker/lang/en_US.xml | 33 ++++++++++++++++++ assets/tinker/manuals/smeltery.xml | 5 +++ .../textures/blocks/compressed_ender.png | Bin 0 -> 570 bytes .../textures/blocks/extractor_bottom.png | Bin 0 -> 665 bytes .../tinker/textures/blocks/extractor_side.png | Bin 0 -> 567 bytes mods/tinker/textures/blocks/extractor_top.png | Bin 0 -> 427 bytes mods/tinker/textures/blocks/liquid_ender.png | Bin 0 -> 8594 bytes mods/tinker/textures/blocks/liquid_ender.txt | 32 +++++++++++++++++ .../textures/blocks/liquid_ender_flow.png | Bin 0 -> 8468 bytes .../textures/blocks/liquid_ender_flow.txt | 0 .../items/materials/bucket_electrum.png | Bin 0 -> 299 bytes .../textures/items/materials/bucket_ender.png | Bin 0 -> 539 bytes .../textures/items/materials/bucket_invar.png | Bin 0 -> 516 bytes .../textures/items/materials/bucket_lead.png | Bin 0 -> 481 bytes .../items/materials/bucket_nickel.png | Bin 0 -> 551 bytes .../textures/items/materials/bucket_shiny.png | Bin 0 -> 566 bytes .../items/materials/bucket_silver.png | Bin 0 -> 547 bytes tconstruct/blocks/logic/SmelteryLogic.java | 12 +++++++ tconstruct/client/TProxyClient.java | 1 + tconstruct/common/TContent.java | 19 ++++++---- tconstruct/items/CraftingItem.java | 2 +- tconstruct/items/MaterialItem.java | 18 ++++++++++ tconstruct/items/blocks/MetalItemBlock.java | 2 +- 23 files changed, 115 insertions(+), 9 deletions(-) create mode 100644 mods/tinker/textures/blocks/compressed_ender.png create mode 100644 mods/tinker/textures/blocks/extractor_bottom.png create mode 100644 mods/tinker/textures/blocks/extractor_side.png create mode 100644 mods/tinker/textures/blocks/extractor_top.png create mode 100644 mods/tinker/textures/blocks/liquid_ender.png create mode 100644 mods/tinker/textures/blocks/liquid_ender.txt create mode 100644 mods/tinker/textures/blocks/liquid_ender_flow.png create mode 100644 mods/tinker/textures/blocks/liquid_ender_flow.txt create mode 100644 mods/tinker/textures/items/materials/bucket_electrum.png create mode 100644 mods/tinker/textures/items/materials/bucket_ender.png create mode 100644 mods/tinker/textures/items/materials/bucket_invar.png create mode 100644 mods/tinker/textures/items/materials/bucket_lead.png create mode 100644 mods/tinker/textures/items/materials/bucket_nickel.png create mode 100644 mods/tinker/textures/items/materials/bucket_shiny.png create mode 100644 mods/tinker/textures/items/materials/bucket_silver.png diff --git a/assets/tinker/lang/en_US.xml b/assets/tinker/lang/en_US.xml index 84c75bc2..3bd9bd27 100644 --- a/assets/tinker/lang/en_US.xml +++ b/assets/tinker/lang/en_US.xml @@ -173,6 +173,8 @@ ======= >>>>>>> Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat:mods/tinker/resources/lang/en_US.xml + Essence Crystal + Smeltery Controller Smeltery Drain Seared Bricks @@ -201,12 +203,16 @@ Spruce Barricade Birch Barricade Jungle Barricade +<<<<<<< HEAD:assets/tinker/lang/en_US.xml <<<<<<< HEAD:assets/tinker/lang/en_US.xml Essence Extractor ======= >>>>>>> Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat:mods/tinker/resources/lang/en_US.xml ======= >>>>>>> Crafting Station Start:mods/tinker/resources/lang/en_US.xml +======= + Essence Extractor +>>>>>>> Added early essence extractor, liquid ender, updated lang files:mods/tinker/resources/lang/en_US.xml Block of Cobalt Block of Ardite @@ -336,6 +342,7 @@ Bowstring Enchanted Bowstring +<<<<<<< HEAD:assets/tinker/lang/en_US.xml Molten Iron Molten Gold Molten Copper @@ -360,6 +367,32 @@ Molten Invar Molten Electrum Liquified Ender +======= + Molten Iron + Molten Gold + Molten Copper + Liquid Tin + Molten Aluminum + Molten Cobalt + Molten Ardite + Molten Bronze + Molten Aluminum Brass + Molten Manyullyn + Molten Alumite + Molten Obsidian + Molten Steel + Molten Glass + Seared Stone + Liquified Emerald + Blood + Molten Nickel + Molten Silver + Molten Lead + Molten Shiny + Molten Invar + Molten Electrum + Liquified Ender +>>>>>>> Added early essence extractor, liquid ender, updated lang files:mods/tinker/resources/lang/en_US.xml Jeweled Apple Gelatinous Slime diff --git a/assets/tinker/manuals/smeltery.xml b/assets/tinker/manuals/smeltery.xml index 6a6f9cc6..75011e28 100644 --- a/assets/tinker/manuals/smeltery.xml +++ b/assets/tinker/manuals/smeltery.xml @@ -240,6 +240,11 @@ Part casts must be created by pouring metal around existing parts, like a pickax searedstone + +Endstone +endstone + + Drawbridge diff --git a/mods/tinker/textures/blocks/compressed_ender.png b/mods/tinker/textures/blocks/compressed_ender.png new file mode 100644 index 0000000000000000000000000000000000000000..b7e9bbbc9380acb18444f220b7ef26366e8ac197 GIT binary patch literal 570 zcmV-A0>%A_P)p1*4;0j{VE~`kD@)TY7)%qq~b=e1rDw;Z!xP+esB@UQN z7Gn%4z0#4deb1RWGw1pZ-@b0yt?U`x8b>R=gKP!yyQ3oqfXNK94FoO>Z}lAgRfaJz zPGN8k#)4`^-&`BQW&x0GAm6}hEy&4(y0I*{U#cK`hAb7p@&N|#0kFifhQ}uu&!OLi z`vqM87V~lmfe+J#NPG{XuJ)ybm4WL-heK3Ut$@iTV>&D3;T~E3aT~uFaXb0Lca&`Ieh=Imlp)(_(&#&`1B6q9>fmJXAngY zHr2&sCXP<1o9KJsR^>%-df;B;1Rirp{=mgY=rrJGQncC=qhAL<(Eg%bdScOO>ksrC zxcmg+iP$|KT5YjKks?0Z8|>N#9k?|`@~07*qo IM6N<$f-kiElK=n! literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/extractor_bottom.png b/mods/tinker/textures/blocks/extractor_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..a7755c878b87092c6e106be358728e33be41c821 GIT binary patch literal 665 zcmV;K0%rY*P)R({%!rEda8DuPG>yW7N<_fVK5AZ znz#r-f+js+lX7-XJG<|_eednA^y%Y=fF}$YKsSwWA)8NAJ=_iF0O|A!>GTS^Y4F^9 z34p380L%fLAD^LC6!51a8F@l><5dB&)-6_Cq^u!mg)X#MG@{t6P{(&5TsTV>~@EKAc#p4x@m-DX(7P9 z9#Y!ciX6l{>dNOH4))o9`7Z1Q^fzYa8o`|*Ui#rbK*jU3g(U0g?my(Bjaj2*$7 zckdB?o5t~3)IqVN5%?1TYKDpM+r%V^cqYYuy^g9Wj2%H`V-MlCIe#RF4o1P4>dq^G z8Gx!OxN$*wL#OZGgnQY18gJk+7`V|p_?P$f!2xPTp?lfG6C=9K9u}>c=Pt{zw7L)p z03?&k$V+oL{tekep33?j_Jc*j5sbwxcDqBikVma3OolG=%kd~eCYQju9!xDef{A;F zEq5puHR9PtUaJN3WV>U%oPlP00000NkvXXu0mjf6qqQ- literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/extractor_side.png b/mods/tinker/textures/blocks/extractor_side.png new file mode 100644 index 0000000000000000000000000000000000000000..b9f52414d8756aa81d265a4cac39012b1a7af88b GIT binary patch literal 567 zcmV-70?7S|P)fihH0V1a=P0HNLqOK%`|!H5uCLMB=y zq)H4OC@k2D(k8JQ+r-%U!3jfDhpH74JKuJ6-skz=qXYjZvi17OG$E#ECppEVz4w0w zjy^qy?f`(%rB5s&rg>3)i4k;Y_Ada?r2MV0VfIk&lqi<(qD5DD_wg+PfDv>s0~>&Y zMjgZK-3lKx>HwI5jS+MJ5Rg+e`xgv6pF>??@A0!6k}G(tcArCCVc_|*wsMNdhemz+ z=O$T`P>UL$k4|{=^i|j@x0oTjR-mu9v28cZ$F87X!!faBoRQ;`D2Y_6+hJvZ>{@}L z<*>0+!S)s6`F^+ZP}n2BMJ&mFhOjLJqz8m7(QOF6~}}LxDdXQdxfha4jHf z5?;n(wY15Pi5=eMl^i2?gzI`U!P)UC(P$Kahx_};Wr^;0lab@oHB4GG*{tn^TLl49 zi;1}aAe&7iq+(bTn|wi`d~cUt&|<-I7&?7==WX%@1-UFS{^=178kHC-C1SJ zVeAd)32jtWBa=@eh%2<31^~&WC05l90J?^G^BezlegjRd#!lt5Z%_aL002ovPDHLk FV1lnk^Z5V( literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/extractor_top.png b/mods/tinker/textures/blocks/extractor_top.png new file mode 100644 index 0000000000000000000000000000000000000000..1eaf2fa1531b834d8780544c034e6ff1d00635cc GIT binary patch literal 427 zcmV;c0aX5pP)}W*O$uISkLeO;bsoAtGsyPW^Jg?vxMF4tCmU{j*mxG;sJfp}1pl$n|e*j8~ VgHTT`olpP(002ovPDHLkV1jG(s*L~u literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/liquid_ender.png b/mods/tinker/textures/blocks/liquid_ender.png new file mode 100644 index 0000000000000000000000000000000000000000..bbc90b395ba1e19a4559508e67f3cd1fad9bc1d1 GIT binary patch literal 8594 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 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/liquid_ender.txt b/mods/tinker/textures/blocks/liquid_ender.txt new file mode 100644 index 00000000..d8fe765a --- /dev/null +++ b/mods/tinker/textures/blocks/liquid_ender.txt @@ -0,0 +1,32 @@ +0*2 +1*2 +2*2 +3*2 +4*2 +5*2 +6*2 +7*2 +8*2 +9*2 +10*2 +11*2 +12*2 +13*2 +14*2 +15*2 +16*2 +17*2 +18*2 +19*2 +20*2 +21*2 +22*2 +23*2 +24*2 +25*2 +26*2 +27*2 +28*2 +29*2 +30*2 +31*2 diff --git a/mods/tinker/textures/blocks/liquid_ender_flow.png b/mods/tinker/textures/blocks/liquid_ender_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..2612655ccf82d3518d010d1c400bb11a293e3dab GIT binary patch literal 8468 zcma)iXIN8P*KI2I9gwP@#?ncjf@Av+>_j~3O5_WjPUTe-d#+YN}Ia*JXftHOH1OhQ=q0|k5 zXKoPa6zB{!@G2zvb}#TmZF5so9dvvWctY-L;0ld9%G?tKqGLLFfI%r~tiVO6mzJ&u zbnFZb<9T}Hp3;SrPtsCXG4>r^N!RrpMR|n34x>u#V#$YVze_B<#GocM9COKk(8sxH zkMx>Yw^P4QdR;P|U|-3cs(bcjffHBx`Q+31>xT28FWh-;Y=nI3xzSw7`U2<8p=-F{ zA=MFZZ9Vm~bNB*KE#wRh$@-XvBy$aXv>&{tOa|3LL7-bQpyPEi=$JBr@AY?32w7%l z<&>a$`b^Nx;wbRU!R8@b1s2LP`K?3ksKyWEz;>h}6e_Emf?n%FL1!Ti8<(sC2WNvAKohlp6A6uU=q1jID*d?+8y#S@ zuV;iZE@SQs-`-{>@NtymAFi!kKd4>nCP5I8?~f2uGPk;O^pTo`w%XBD0AnmK3~$~Q zSTLZla08SyKf472Kz_~TrHo+Bz<^s24z4K2 zoPGrdHblEk%iCR{;9Xb6jFED=<&$+4`iE>vg_O?byq%+^NnP8x^OX!Di6|u-lDRKS zC%M3Ty)BQpKzOC5LU{B{lvK}>rE)B-kqGs`u9>Wpt!m+C*Im0{UpfoIG6VHXQ@=FP zwN;x2;$o9T<`=&pS_{IH6&8|x*puh0}+>b5{Z^iz2 z(Q)N)(!cfztEcCDjW?rWx?v0gIoDTJR^_Y^qT6bu^NYL(uE4^05*m>Gf&$XnU65e0 z!vJm2=PNx+tqAe071&jF=5lxGuApR6=(T|uzmPqHz0I8DU-QTN;EFv7Seq>ud`FeA z9`ZXHm?lGUK`k)bjD9c4jd>Tdz0HnEtr9n2_tx5=RP9|W6`lO}*uW9*1;~=~=>#kt z`c}x_RLs=;e}V;H3JN|bAs$6?uXnnePT+U%xu0K z;LvKi(j1p-f%3DowhcCe1Ir_mc4Q$MtouJ%LF0sE>d5Mrld^bsW^J>pa>#~J%uB9; zTVKx;dkC^n)KhcfT@-37Djtz+;Lhz`p#_rmpmXsH6NE~D!jo(yuVum$D@0)wBSIfy zC35Sr(R1;ucWauJQNNB3uRBl{qSI}YEc_%=G&bYVY^nSHKnf=~j1U*8hF68@1Vhy` zHQ}+PLNPhbuL8>35=9ek9NK{`6hDP*kqP>^x4x{8qn@XxuA(wEF#(TEf1L}QbnP+| zC5$WzXZY5fE`ryPe7n;w*B>0QmB>C_Wa`Z`Ti|?uJH+f-?tbjvs!i*>H-m*@%9M+Z zRmt-CGBqTGcR%{CgQ4@lGKxiZ;UE$zWPNdigET~??}fF9p27fWXl1Fa;o@Tgg=_{q zu#A{^?kD2S9`YG@W1Ar5=g|Ak^xF>{CiUm!MhI05OUVk5H}oLrGgs$1`K|dGQ?-WI zGP>}PhdoQl&~W>>$8?sA;yt9{W{Cfi<)qlYAm?))&#{epkJ586VBa!uTE zow@y|kO#MAgdb>2A$y#{72ag}RiQRY7rM50e#{94y0(dYD6`XgG^+{Z;?;z=^aI=T zs^Jk0<`OPu)x&1<_-{2qyE@~A1>*hrzM6Ppg4JMIyU9}7X;nMJZ=e)fQZ!)BJs zWzIex>&dt-&BfICn|VD7sL=GLSO*)cyXw7OPpuE-k-4obJF6p(1?fb0#%s6);ln8N zD z)LZG7klS&uHQw%yx=K#CAPY6&J8RqP5U8VGdvcFgma-29W0H#3CbBqBF6bo+)(i&wFL64ngVoM+a89K+halHe5e<2B>a;sU*2nY!hWa%61vfrz z`ZP^J(5R6ntZP9<8KF;`jK4n@c`waC_kH)mOI;c2I7JFQzmZlx$YDhZiuyHB0~fMk zgPgwqH$&)SMq0Gc)+O!JXnq6DmixpTr)cGAvb{vM80R)U@NLt}W1kTi=vZP$#Gcy+`up0B1t8sfy&x{R` z-GA{W8pilF6ZKo$b7zP&gij-VA1H_U{p>JS*xie$U@^^=9JO;aXTGS}0KK{Xyj?7K z+{Hb^h^rr!Ta!J7p;g>y(C2D7y0f=Z7h`+rE;o?9F(F_6)Yt<#lOcbHo54Z#)I~vG zAv4XYHo-xguk^LMDiPqF5dau%;duy6*_;EvV2pw`BJ| zE9Wfu6F~SE`oXl*p{;YF7dz9QPL~TEyYgVSl zWd>%lM^S8>yUO<{C*605qIj&19ouS~`eE|<@9FZ#1*d4MH|visRba=pFP~!W;3#Ef zy^#|=E9^jlf4|z0_2nqbr5;sUeJwQ0u~g3Np`L}&QZOg#y9*8T%(n7HRFFnJJ8EGy z9LaNhEX=*DqxcB~4tp9|+(_@>Bu`t^c2r9os-Pt-Yl<2~a;VQ=GeF))=6|~NRUqTY zhrxmXiW7YglY`1qi@B<~t8~@8VFF67Nu%O;Z)>r{rC7a|1ZO*%WP;UEq`! zJ>-*p#q#ry7XU`h=WeQ8!RgwQ&g(TA=phSw_+V)n8|`g4;sd|Jyy7(ZzSFrNi$8P? zV)?7)wry}P)svsq^rGme(?gHBWSgAP%-8^%KIvHm18+A@)%-~Aau6wYq%mtV=UFb@6g-4HOVoM6Y+sf*$5Gvn+&B?Me;IO@&&KEn9djeEHzMIZIlGZ>(~C z)#;)j85qLZJ+{h88NQ=KSZ`n=g=!MH#JMGaDEo)jPFNA5jYv&T@LPo6*Oy==1Kp))&`qKiCC20~l` zzCAPvShJpvVyxs0Ae$!Y;PFpJtcgfTW-d;uJ65IWpbXXIt3^F;g^$)Te?O+F&B`(* z>fcP-U!tnl{Fca!)p5$sW|A1`709r*Lw$e!kZG3@v*ob9A{p#6=3pw29gQYk{+1K*2QMG4a&1z5cnO*PeLE#-_ ze){sq{>;aOMZK^o={wugf1RPBi*usaCn|W2B2cf8)l;K17!zBdBpUcDp!+rz!=~zl zH6WIJa;EwU9#jg)jk4ZkX&yErH`I9aqFU5*Y&(xJoFy-;tsk4Z{Uf-l3>&Occ3fxdVm-lejCkpaDv=0ZHMvhSfig6`eP1IwBJC-r|M!hcX<{T&taxM#=9?b^d9+iC1b;?V=9Ay5B>F*_x9?X-Y74;wZY z2(RV(%2fvnom>0B&Jw7;)?H8Zj@vqH6N7J5d0A$8rOcfQ7zzFZhvQJy|J%N zXmrVJDt;k+@6~y>vXX1Bc5T!PKX)+?-1jUP@L%n05WXdGPvB~S+y&li%`isReEW>S z2!On5>sw&+o}Wy4?&3JV&(``}u=&=-89g_B+JRCGrA_A3>vwz;r$rYzD^+(pJ0tX6 zG5B%bmA|?MUC#>H*e$)Hw8Ud4YBcLPA7R-R^C&Pjym#9ay=;Sa0`I%_rw3f_rJXT@Z4S5+j_S?Hrz{k zBXiS5fl*zA!f3j^`!cWLC~Z{Oh3<;=9mkqGxKDo*6R;EYr?o-_QizAE@BLEI8@`!y zxAdRkzmZ9yXj3cx{;Dw><(AsfoFuCYSmi~c+WBkm=jK&R!i=IbE&#U%fzci^wQ>D8 z&Ah#Bi(ilvuebgL2n@Fqy!d|=&7I>r%JiT7K_nOC_p4CW4BS-320T5|ko*^KyK7+@ zA3xJz3N`s)%)~G0M86{T2q=#bmDO5RaJX*kM~(1&tp9@LD~RbJN_yk|ZAXVW8eYw8lF;Dq?h5vj&G)hAdDBjT^^{Ck~ zRw0MmrPFe3skkrPcGsUz>jphVlvkL#&nS6-r$myH;neFh2Hj0(H_U zKoBt!Ohhb2z#8@Xjz*UYJ9^&_>}v&&`^+-IsvDsOn60r3u2Ka9`kNrRB;nu;-u=yQ zz)<`L-cNqcgt{8-ZF1Wj%pioSy&r`K$I?d|lJ^^BbXR+6PNk+W2ot zh_jz;vm9k+-zMp=H^BDA7>>q8wwWi6bc3&1$49LU)cgw#BV)3NcUe9dYCd9pjwxYNBqP{*d?pt*2LJZanF$9V2 z>Stoy-9x4d{&rMPok6!p^W7VaVU&p3s+)YTl?~sd$qmU`>0nm$5YmkrGD>A6bpg{9 z=fSFz{OPDqVQg>-HwLxjGN53RxpEyDVYKa9Jt%NjAu!l(PXt=2OPqPVH)bN{5r-_i zhVjUB)Id%uni($NBy_oh&Ot;dx6<_`6)b1lsWfGg#nl3%Ke@(veT)=E!p1LDWmI%; zMsEx7C5ePSUX^F`*&0?OODOt-qQ|E%*82%WveK;aXK9_-0WyVm#;+tGAC)&u;5d>t z{UvPo>s(JA?tq{onwH8RBIHffs^1W9#+3Y;91izQ(qN`h83sZm*g0ydG z0jNP=eH4iMAaDeXP+*Cf_Wu973*63CdC$Er7hcbJ;f%%k@f%9A42=QWJqSzG{cwd( zdye*SO%Yb%4Uqnojl;aVG}kXAti~=MyEY!@D2gy+&EAh?f6NMWnrayA-)=t;p}3YC z>*Mxcb=0az-tdTE0cO<0iyC!<0QT-Dec!(L;Qsj$fYRR$I)4U?jGdq}0%FZHxgT;f zp63;Vt1^7s_V7HpQvHi0LsYKZZd^!e|sNrXE+bm zuf{A?HsS`eX4p->X@mET@-cy3d6^H33Kn~H1!+gV2Fnwk1RwFm^u_1c25smS(2|J3 zUmfoNzRh{m!u;Fa9~FJ$-VbhaAS)Ep49T>byvfllDI4miSWB$$<5^|16t{}kj0^o; zTi#TzjlH*@E^mAI_nXc=V6;C9l1j&FwnunT`g+cyr2)=`2i0}Sh0<_WOy_%IBXxC? z`?`~ELjg`uI{0dxQ%GTap0lwdb($Mc7NLH~d`%$%H-W>d08)=nwsJ`t37kHDvDmP9 z+X#eWf^np<)N6j%&!6ams2HQ!mE7^#&iCjn4qf36GBy|M#8-$T3=S0BT!^ff>8FAAsg?n}%mcH9{AO}gAclRYW{ z{H=!0l3GY%NpB?xUzEcu7|(PA2d+I9@Na0i9WK08TV`Q0$%2$*ccK+?HBHOeulZdz zi`$5-Z2a=hDvMNiY}6~cYwCbkQh%wt=VM=xMx&q33r%WNek;ox+7BIL!wz9ag9}4P zd%3kHx2TH7FRY<1dz@j8bJFt+6sF;)4NNu=mYSVKb4viQf7Cuca*(pTeW%Bx4Ea!VGx1>eFa;=vZ4IQkUiRxSUlMn( z{5srZ;3utO_v8G}myJkuB5Ca*(D*$^IR4zKAq_LG6Jm|$+6a^jc-|s$A~&Kuu5w zdZM{uHe-*u);Q&xP=Tm0r5F$&^vs9ksUO+JgVQffF6@W2efP^F8lSXw^fe2-4j6&Ko|rcC?#zcxJPao{q@7Q+(A0w8Q74jsLpFj zWq`2&h9Q!J%H-b6`!8_bAxw&Bdt~24@=P!($TyJ>N31t2omC3wpZ>K-OrP#5wHuH+ z^>cIo`h2_yr3KOgv4t-*;Vr%b6XU|Fy!4IqGxb+aS~efb$OC>)ZmP4FKb&6=0RUjG zBMMltQobtrFTic^s@|~a`h3q{?_`ebNAyhh+Xr}H zpcx<-0(%q!ehz;A+cG{ekyvAa0BYd3tNc6t>kV%=k?fWFDJ-ePsx;V*>7PmB2DYx= zfNk}p#Cq~>W`d4(Km29%TQ!|8+@q#TRdn_d*~;6DBq3|L!*K=CfW8V}Xu`r5MM@h4 zID#l!>ycXp@w(EM z%|=nHbFN*i#RL92W%8^M=5~)>EA5K9Ul7wCGFciEdUIBA1L=ro*p^E8_~6$7-?^6? zp`N^1g_8A}H~59u>IVT#E-rzo?OHb;#nI93y`9m^KfZt+HGOesc~Mw_NlW2D=hvY8 zuT1GgfY=EoK8!}vj`v4=`k!8r86?O;fYILA$mBk+siaE=o?*KG1KVQ%>M(uYo!*j4#Z!sHvsq7-7*dAyoo7x`%%4;Kf#HQJqlnwtTaE| zgG3Pr$U(D4^0E9jNa1=Z5n%UlK_1#IPrnugJSkY|a8XOZ&V{l`H|9PaY_!{8nEKn}v4ay~9LO!tjv;Zv)uhx}^@BV4 z81X{Cl1oF*6>D$g69o~az>sKtRqoqmh7gX--lbDzR)`tjQI`f7>*beAL>lu<4h4P7asw zGk3r?g!ku<2q6toA1zGjn56xnx1Qd>q688=Cfh*b)aR3|+KNybpK2pNytz`c{n|_n zYDhZ`f?VGQ3V5H2z&_+ilPE}6dy_Zytr|7G*<`vfh0$JarI<+bvVW4<>2L0FuBzQL zfU?Q+E+;v{QGv}@4VE7I09TfaOijQ6`ziaS^>2+Cx&1Va8BPDgv1Uv<_J^9SU&l(et&2w{x)HJq+~m|LEaAr%NG!+B{MdhHkq` z3YYZ`y742a?Srx))BAxW8hSgz0>ALR?$-84H0(x{mR|!&=i)jy%Z1xRo?bN@ebpt$ zb*mDPG~$dNNg46JAkOc#0?!aak90G+TA$f@6Le(=Q*!1c&g|#>bJqr@rPGML;yvHF z31b;;G!!^#EJ0{Jv)`7kNAF5wq2<_vtaE~LN-bjw&rSnnBMeTfPrH#{EVBQy2Wy(N zmfyn{+eRyI^sOTNZTemcN1STR{V&6=pXC&9^Sbw$iVM&6rkCcuG9=#}i|&6Ep=3#= z@l~1$(lATcv-Aqe^5IdW5`&l|za65sRRJHTtW8*c*zr?aC(v8sjQA<(67QGZ4nRdm znCCppS*Z+P78d(7vgP_U28{UK|8>5AfS`#lM=TOlD8c%$NGAC6R^#oEY z1qg>D?9y!fgJcIG4YM3aY>ad6z#r;7flgnq+~qO_itA@(4CCQ$7boDSq}Xq(MU-;x zdqy62LRn}DX_^){=bm8fo)T)2j_(}i?sqh(4@M3N`>F0mzv#1Y_!FrfJ zX~5+PJpePHM*+*l?Zo^26aRh21Dy1nFt&TM60=&;o`?CWGSBO?aF4z?L-JllLB5~1 zxxtJNa1h*`cN7bZLk9xZRXXZAG^FOZvZ&&Wjg~VgU`t}q|2QCz~@@u}a~;+F2Zs&WN*ADaL*mVX1w%hy#0d#b>(#JEtqK zI^^R4NCd_$hf9{DYdtjV

>aq-Fh~d>_u}*{srF8hw@QC)H!%Fz@KKKH_qy>eqE^ tf18a&WcVy+BX%DEu^e;5WThU2L4Xol+YItEWSFNUh}YJ>qG z6G4W+G+jKM{{P{lIxvQ@K{U)DklK|iS7I0dR&;1v$p3q%E&jiG?DPN6pJXrwu|Z-m zgFtGFii%LZ0W}${5LqL-AxPfCG~oI3=WqoeO)!^$FiafibTEw(!XN`~+_(WY1lb^T z1A$J*ZvY5`07&tvQ>Wk<<8)l#d006@CWqi7l7y1AI002ovPDHLkV1ikQb7cSk literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/materials/bucket_ender.png b/mods/tinker/textures/items/materials/bucket_ender.png new file mode 100644 index 0000000000000000000000000000000000000000..d957a2c2e5195885d238cbdc717b1c7719e810c4 GIT binary patch literal 539 zcmV+$0_6RPP)@4P843;*h!1 z!A(v<$ddCFJqVP(QBbeFB2rw=;e69XuT;=ydfw-GzTfxx33n82@L^dN#bOZv z+qQ26XZbbd$e%uB{A>dA(M!bRcA`KE05GPHYqL+Ev%9xLxm@Pc=a1x7P)Nw{$zO?} z&Hj@Ij25N=*zX-OTA1cf?}$Zal5amcocui2=3c)7NC~baQNYukHcXDdtO11=&<&t> z!1jDf^b8W$b+w@$RIAk_3`4|40F}3?u^Xf$O7BQ4-RSpE2tjVJNsi-S=?2!OObs2G z0=og0Jjc=vYPA{wLWmnB5XUi&;{Z^pR6sXCo~M8%6S@Je>kdsOe|=PO9Ala$;v!&s z!|B@>zO1nJW*Oi2vk7e5)_|m5uLJP?>lU8p{f+EM{3)MStA!Av-@9Dac1bBQO_Nfo z1V9u;tiAh?xrw>kuI&5u)&H-u8mB4)!1Fw!C<36-Xbh$Q&kUN)W?xs}TOHHD(Ii>+ d>%ZTNTmpZ>pkiAU+7JK$002ovPDHLkV1m8_?fd`$ literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/materials/bucket_invar.png b/mods/tinker/textures/items/materials/bucket_invar.png new file mode 100644 index 0000000000000000000000000000000000000000..c8e0f24bc2e91a83df8d6a95b785f628875f7bee GIT binary patch literal 516 zcmV+f0{i`mP)F{p$mRgw<6Z8G)w?cA*=XqF`1%Oft z%d${Pv0N^T&tE>Fz9z=&H?IJG68u8pc^-$ufh^0Y*X!7}O|#h~NfNRwV>le5lwvlU z6=4_}7d;pZ21OjlxUNg9)dC<%5^USnwo;14VxjvdrMyr;5Cru5eE@vlM=7OalgR{t z(P+ecK1WJfc>-yg5(EK&CMx0kKAX*kFbpsJwcDdg(-g;Xa9x*nyRH5E{hmC}E2Gr} zLI?vWrqd|^yu`BxRJRx54)PJU&X&X%UQ%YXa!|AHTcfT)+-UKaKM0000S(9jf3FO zr4E)r$xtY10}l1SC2gcqT#SneiKZeV_)K>X?>+b2aWDKggeX!`6xWLriGo3Ul!!09TJq=Hf}N9-9oLyDvgwuz0~$h&i)#ulwAZPmDcGvE;6CYd+Dv?z8xs zVYEFHawrC^wgjD#=LuG4*O`x{uzGa>=3^P$+~1MuLgsIB1#%KrWX92|6?Y*m&FJ;^vHMwK`nD6Om<^mHsB% zM;V_#+&Uqu^W~xu00000NkvXXu0mjfnYP7e literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/materials/bucket_nickel.png b/mods/tinker/textures/items/materials/bucket_nickel.png new file mode 100644 index 0000000000000000000000000000000000000000..ff248756b2db455c77f0ad71ab074895e8682af8 GIT binary patch literal 551 zcmV+?0@(eDP)fAxkPWT+w2*5Q&Sv;U#%K-wh58R=$fx3 zhcxP|B$7)2_=7%)VO0x);I!ST^i=y>^tORv|X z)oLN747rO;+pcc6i)orPS-J z#&pRo;?kvqG_T?jjY&yy@Gfbu9M`*sfq>09(7UvyMiP0Z=Y4*?&+~o05B#S{y^mBX zMJyHrKv9%S!NdHL?+71{5;++|9)F0K*!BD*KLOz8jfgb&V4l6NpGhPVtQXb@`#}Z< z?c0tg*d@7HU@AHdfZ3`u6`jUx)oH$Z>-{+RhSfTf7LtzvE(&zTOKui8c8}N}KW8#> z%H3P{VCD{cj*j*FoM#*Bn5{a-ixsa@sYrboq|<57FbqbvS9x^*2>=a8zbMkxt#*@6 zCKuo*gdo%llB%k7GCB62E&^b+n=~AqhNELHzNC}MkGVypE0Nb`%-Z>n~#L!hK`~La-zp3o6(;ovs z(==?`2B26h_O<`l4oam`p!>;JI;NhZ@rKz4f4>&_1DIs5V@QQ2;1RcEP&h$-AB8PN1hc;(^i3NS8_kEu4^E}_@7yP4Wf^-qF5~Q^!XD~Bany3_v?dL za)iCNi=i6;1S-JL4FVM)U%ie$d^(}m|EAr&cL(4+z=g#2-Y)(ADPPZq{P=klL(h;- z-{6b#QD;LoA3h*Z0p8;mvFp0pL=SA+jy=y~y|TmFt=vU+A4AV1Z#C%AdiFBupOkWf z0gmHfSr#o|>tG)>=q0u{l}7-S%Vp~II#SA+5(vW($8i9#ENfx{TL=4m{QMsGtvjJl zO^+%JLrl|Ty|TmhN-ohKDxbU`(VfC40fZ155Z7uo0Pg2DXt&!5P%TD8-7d{$6DeiV zyM=k%)#-FFO_M^QaPF)Wc|V%Fi3^uq*^|uD-vbCCv}(1Quo#!TAI;GJBZEex@w;}V lE`Lm8M-$J}PiOxx@(UVlsy>=Ms_*~+002ovPDHLkV1iMb><<6{ literal 0 HcmV?d00001 diff --git a/tconstruct/blocks/logic/SmelteryLogic.java b/tconstruct/blocks/logic/SmelteryLogic.java index d143c31b..164ebf69 100644 --- a/tconstruct/blocks/logic/SmelteryLogic.java +++ b/tconstruct/blocks/logic/SmelteryLogic.java @@ -19,6 +19,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -317,6 +318,17 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } } } + else if (o instanceof EntityEnderman) + { + EntityEnderman villager = (EntityEnderman) o; + if (villager.attackEntityFrom(new SmelteryDamageSource(), 1)) + { + if (currentLiquid + 25 < maxLiquid) + { + this.addMoltenMetal(new FluidStack(TContent.moltenEnder.blockID, 25), false); + } + } + } else if (o instanceof EntityLiving) { EntityLiving living = (EntityLiving) o; diff --git a/tconstruct/client/TProxyClient.java b/tconstruct/client/TProxyClient.java index d7b21faf..5540ba67 100644 --- a/tconstruct/client/TProxyClient.java +++ b/tconstruct/client/TProxyClient.java @@ -673,6 +673,7 @@ public class TProxyClient extends TProxyCommon TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TContent.speedBlock), new ItemStack(TContent.moltenTin, 1), new ItemStack(Block.gravel)); TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TContent.clearGlass), new ItemStack(TContent.moltenGlass, 1), null); TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TContent.smeltery, 1, 4), new ItemStack(TContent.moltenStone, 1), null); + TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Block.whiteStone), new ItemStack(TContent.moltenEnder, 1), new ItemStack(Block.obsidian)); } diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java index c2e4effe..7ece1c94 100644 --- a/tconstruct/common/TContent.java +++ b/tconstruct/common/TContent.java @@ -14,10 +14,7 @@ import net.minecraft.block.material.MaterialLiquid; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.item.crafting.RecipesTools; -import net.minecraft.item.crafting.RecipesWeapons; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; @@ -121,10 +118,8 @@ import tconstruct.items.TitleIcon; import tconstruct.items.ToolPart; import tconstruct.items.ToolPartHidden; import tconstruct.items.ToolShard; -import tconstruct.items.armor.Glove; import tconstruct.items.armor.HeartCanister; import tconstruct.items.armor.Knapsack; -import tconstruct.items.armor.TArmorBase; import tconstruct.items.blocks.BarricadeItem; import tconstruct.items.blocks.CraftedSoilItemBlock; import tconstruct.items.blocks.CraftingSlabItemBlock; @@ -596,6 +591,10 @@ public class TContent implements IFuelHandler GameRegistry.registerTileEntity(DrawbridgeLogic.class, "Drawbridge"); GameRegistry.registerTileEntity(FirestarterLogic.class, "Firestarter"); + essenceExtractor = new EssenceExtractor(PHConstruct.essenceExtractor).setHardness(12f).setUnlocalizedName("extractor.essence"); + GameRegistry.registerBlock(essenceExtractor, "extractor.essence"); + GameRegistry.registerTileEntity(EssenceExtractorLogic.class, "extractor.essence"); + //Traps landmine = new BlockLandmine(PHConstruct.landmine).setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(TConstructRegistry.blockTab).setUnlocalizedName("landmine"); GameRegistry.registerBlock(landmine, ItemBlockLandmine.class, "Redstone.Landmine"); @@ -1069,9 +1068,12 @@ public class TContent implements IFuelHandler //Wearables //heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, 0).setUnlocalizedName("tconstruct.HeavyHelmet"); heartCanister = new HeartCanister(PHConstruct.heartCanister).setUnlocalizedName("tconstruct.canister"); - heavyBoots = new TArmorBase(PHConstruct.heavyBoots, 3).setUnlocalizedName("tconstruct.HeavyBoots"); - glove = new Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove"); + //heavyBoots = new TArmorBase(PHConstruct.heavyBoots, 3).setUnlocalizedName("tconstruct.HeavyBoots"); + //glove = new Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove"); knapsack = new Knapsack(PHConstruct.knapsack).setUnlocalizedName("tconstruct.storage"); + + //Crystalline + essenceCrystal = new EssenceCrystal(PHConstruct.essenceCrystal).setUnlocalizedName("tconstruct.crystal.essence"); goldHead = new GoldenHead(PHConstruct.goldHead, 4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead"); essenceCrystal = new EssenceCrystal(PHConstruct.essenceCrystal).setUnlocalizedName("tconstruct.crystal.essence"); @@ -1883,6 +1885,8 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 12)); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 13)); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 5), "b", 'b', new ItemStack(toolForge, 1, Short.MAX_VALUE)); + + GameRegistry.addRecipe(new ItemStack(essenceExtractor, 1, 0), " b ", "eme", "mmm", 'b', Item.book, 'e', Item.emerald, 'm', Block.whiteStone); } void setupToolTabs () @@ -1986,6 +1990,7 @@ public class TContent implements IFuelHandler "blueslime" }; for (int i = 0; i < matNames.length; i++) OreDictionary.registerOre(matNames[i] + "Rod", new ItemStack(toolRod, 1, i)); + String[] glassTypes = { "glassBlack", "glassRed", "glassGreen", "glassBrown", "glassBlue", "glassPurple", "glassCyan", "glassLightGray", "glassGray", "glassPink", "glassLime", "glassYellow", "glassLightBlue", "glassMagenta", "glassOrange", "glassWhite" }; for (int i = 0; i < 16; i++) diff --git a/tconstruct/items/CraftingItem.java b/tconstruct/items/CraftingItem.java index 3e2e32c2..09ad26d8 100644 --- a/tconstruct/items/CraftingItem.java +++ b/tconstruct/items/CraftingItem.java @@ -39,8 +39,8 @@ public class CraftingItem extends Item return icons[arr]; } - @SideOnly(Side.CLIENT) @Override + @SideOnly(Side.CLIENT) public void registerIcons (IconRegister iconRegister) { this.icons = new Icon[textureNames.length]; diff --git a/tconstruct/items/MaterialItem.java b/tconstruct/items/MaterialItem.java index ecc1c49e..3b0fbb48 100644 --- a/tconstruct/items/MaterialItem.java +++ b/tconstruct/items/MaterialItem.java @@ -1,5 +1,6 @@ package tconstruct.items; + public class MaterialItem extends CraftingItem { @@ -26,4 +27,21 @@ public class MaterialItem extends CraftingItem "nugget_copper", "nugget_tin", "nugget_aluminum", "essencecrystal", "nugget_alubrass", "silkycloth", "silkyjewel", "nugget_obsidian", "nugget_cobalt", "nugget_ardite", "nugget_manyullyn", "nugget_bronze", "nugget_alumite", "nugget_steel" }; + /*@Override + @SideOnly(Side.CLIENT) + public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) + { + if (stack.getItemDamage() == 23) + { + if (stack.hasTagCompound()) + { + int amount = stack.getTagCompound().getInteger("Essence"); + list.add("Stored Levels: " + EssenceExtractorLogic.getEssencelevels(amount)); + } + else + { + list.add("Stored Levels: 0"); + } + } + }*/ } diff --git a/tconstruct/items/blocks/MetalItemBlock.java b/tconstruct/items/blocks/MetalItemBlock.java index d93e89b6..6960a314 100644 --- a/tconstruct/items/blocks/MetalItemBlock.java +++ b/tconstruct/items/blocks/MetalItemBlock.java @@ -9,7 +9,7 @@ import net.minecraft.util.MathHelper; public class MetalItemBlock extends ItemBlock { - public static final String blockType[] = { "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Tin", "Aluminum", "AlBrass", "Alumite", "Steel" }; + public static final String blockType[] = { "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Tin", "Aluminum", "AlBrass", "Alumite", "Steel", "Ender" }; public MetalItemBlock(int id) {