From cb2c4f9bad86225b41d6e7adff6411395c12e8ea Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 5 Sep 2014 17:46:00 +0800 Subject: [PATCH] Now we have a Frank'N'Zombie --- resources/assets/enderio/lang/en_US.lang | 1 + .../textures/blocks/blockSoulBinder.png | Bin 1073 -> 0 bytes .../textures/blocks/blockSoulBinderOn.png | Bin 1552 -> 0 bytes .../textures/blocks/blockSoulBinderSide.png | Bin 1177 -> 0 bytes .../textures/blocks/blockSoulMachineBack.png | Bin 0 -> 962 bytes .../textures/blocks/blockSoulMachineBlank.png | Bin 0 -> 1026 bytes .../textures/blocks/blockSoulMachineSide.png | Bin 0 -> 886 bytes .../textures/blocks/blockSoulMachineTop.png | Bin 0 -> 973 bytes .../textures/blocks/sliceAndSpliceFront.png | Bin 892 -> 770 bytes .../textures/blocks/sliceAndSpliceFrontOn.png | Bin 1384 -> 1287 bytes .../textures/items/skullZombieController.png | Bin 461 -> 461 bytes .../crazypants/enderio/config/Config.java | 6 + .../enderio/machine/MachineRecipes.java | 3 +- .../slicensplice/BlockSliceAndSplice.java | 13 +++ .../enderio/machine/soul/BlockSoulBinder.java | 16 +-- .../soul/SoulBinderReanimationRecipe.java | 103 ++++++++++++++++++ .../machine/soul/SoulBinderRenderer.java | 2 +- .../enderio/machine/soul/TileSoulBinder.java | 34 +++++- .../enderio/material/FrankenSkull.java | 15 ++- .../enderio/material/ItemFrankenSkull.java | 11 ++ 20 files changed, 189 insertions(+), 15 deletions(-) delete mode 100644 resources/assets/enderio/textures/blocks/blockSoulBinder.png delete mode 100644 resources/assets/enderio/textures/blocks/blockSoulBinderOn.png delete mode 100644 resources/assets/enderio/textures/blocks/blockSoulBinderSide.png create mode 100644 resources/assets/enderio/textures/blocks/blockSoulMachineBack.png create mode 100644 resources/assets/enderio/textures/blocks/blockSoulMachineBlank.png create mode 100644 resources/assets/enderio/textures/blocks/blockSoulMachineSide.png create mode 100644 resources/assets/enderio/textures/blocks/blockSoulMachineTop.png create mode 100644 src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 4ff483ab..7b4d6734 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -412,6 +412,7 @@ item.itemSoulVessel.tooltip.detailed.line3=Click again to release it skullZombieElectrode.name=Zombie Electrode skullZombieController.name=Zombie Controller +skullZombieFrankenstien.name=Frank'N'Zombie //Dark Steel item.darkSteel_helmet.name=Dark Helm diff --git a/resources/assets/enderio/textures/blocks/blockSoulBinder.png b/resources/assets/enderio/textures/blocks/blockSoulBinder.png deleted file mode 100644 index e6a64902a77e42868224b5de824b98ae1461d2d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1073 zcmV-11kU@3P)N2bPDNB8 zb~7$DE-^4L^m3s900XT_L_t(YOTCuqQX4T4g!3M$$`8O`Y;3RrV?ywK-xnA|^8T-p zZ`4|OckQGqKS))VOA@2**33xDms<7YQ}Mq9rv1WVc)c3mtf!^TtQ^3U#l^5V8x%XW z^XAi8 ztsfZ$BQqNm0_MY_fRE+KTmq&F_5v(H1mpIAeKRd1u$tTi0S19lq=A=6JNmTDih{iW ze}FEc_UsB3drBZq&EZ6?^x_Gu#w7)N0hV^F``x<2F9Kp`gKax1kaQhqXD?ty!Cru+ z_w~ca=3%$0>;)of5U&9Pu?JqGo|$nrDh*5(923|i1c)X-qQ);s3rwu#f@QFE?C+}z zc%9!VIG&=)`?~UGDRS)Y1c9BBHlOwap`H*C|K@sc=h#2i5BzRZ0+?0*g!1ApZl6Bp z1}K<85WtEP*s}|10XFEc!8jdd8YCl^B4xyZ28ESt-*O$}Y6^jJ4o-#_HfFxkhZ)Ot$uxM}y z31A#vtE%hwS--&IUv`C__5$_CQwoOt0VND?N?(O%kXj2+g2MsAYh-pC^^J&A=tpJ2F<9X1mk*d+_`q_7Q7e~Id`vqq2QQ6E9*Y0mKoUjO55#o zdzK>;2#rBijQtojph(m1fdHGyKI~AF8L>P2#|2zkZalT)HEK@ma72JT*f-WY5A3220_hX<8W-4? z@j$J|N8QZ;;|fMV?B2f92<(hWQM!w$Fqsj%ckQU{9=WT;I3*Czz9~gnLJt|9TLpUo z8r1a+-eZ~3H*4nqHHr&(`+?M*z%uL(VJAolFt>Zl=?HZ$lrAGO*pxca&AMg01k?<0 rV+DHx+*@GdW;R{q&%-ARR8M{b)nn9}L*9-m00000NkvXXu0mjfupa4{ diff --git a/resources/assets/enderio/textures/blocks/blockSoulBinderOn.png b/resources/assets/enderio/textures/blocks/blockSoulBinderOn.png deleted file mode 100644 index edcec250ab0cce04cbf5c1e1d06c6880d5bcc356..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1552 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 diff --git a/resources/assets/enderio/textures/blocks/blockSoulMachineBack.png b/resources/assets/enderio/textures/blocks/blockSoulMachineBack.png new file mode 100644 index 0000000000000000000000000000000000000000..91abf4a6e3f85fb5c403888fa51d780a582cbdbb GIT binary patch literal 962 zcmV;z13mnSP)N2bPDNB8 zb~7$DE-^4L^m3s900TZrL_t(YORbh|cG@ryMcD}nr9k3fAUF_*K+|^rd+MEe@<{$5 zzk1GVYD?q$Mx(LJtghy}m&g6~@qp?Ddfoj9X(UTwTZNO8hu(RrOA9RUndqn2)w$VxoSrV{=gYb3#Pu_S?c3(P*${AU*5~8; zbX*ZX)N#dB3V2kT4U*q;78uT&45}n4GZqqr>XEr2H`Q1jWbJ_R?lB~kasem zWDJq7=-FVn0;$IpnlMtacwe`BJhKh-!i-JFfH>wr|Gw^IFqOX4%eq7>Ezj(Q015+q zXb>wA($K}Ijq@1u>L4anW;j^2eBxw^qo2HIqMz@xvV zXM-|*asS-*C>gYc0lUGbch3ypfRVcN-5{rb%LZQ~gC%Xt!#pVkT5XPke$N2(-`fF= z4APst<_!!`a7)QR8JIzT1C+j2z#uUg*d}vasF8TT<6TE~B*bms0Q%TK9=c$h$ke7f z?6%eXzY7D%GY)QT1NZqvO!9-w7cp2t*+N=Gh(TfqPDcetHrv2jWJ|5=G&U!SW*+wq ztVHgSY!J8N@JOS>E|xt;FG3TF8#;@fS@7T7lB<=u-v` zMK(x-d4H1@1Wr2p;PBa;Si!yY3xh0194)#yKwwT71YOlH=}O-Wjv|T`qQxcXq)S^u2X60y7D1t~!P(9XKQ@N)ab_*XfB%-^@vQ!@>p554+v_Hk kp%Y4B#7_!T(Ccdc4;O7tazsU8J^%m!07*qoM6N<$f{yycwEzGB literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/blockSoulMachineBlank.png b/resources/assets/enderio/textures/blocks/blockSoulMachineBlank.png new file mode 100644 index 0000000000000000000000000000000000000000..049a1a3baeca87d7c4babfb68ba9a76828ecfd67 GIT binary patch literal 1026 zcmV+d1pWJoP)N2bPDNB8 zb~7$DE-^4L^m3s900VwWL_t(YOO2KZQrkcfMRgbgm|%>xSTbI)jUmbXFO=8)XOkiz zRlh)L&Ai{;Ga9+7pKhAx+jf21)pvd4YVWf=vZ-Co9b=?+E!o7V^64$idi4W%#Xmw& zhRtHzKfLrmCnAW3&BM?wdNlUVN^yTgHrN2K_{aTjcs#r;Py1(dJ|wMA`xTMb{pzq= zGGM=T4UdeUh+ufSU2;oiDy8Bdxr=@|t}n0k+bM`^A~?xdPRHGo%tqQRiStw~C zuV^kEAPVbxZr(5L$ED*h;x^g169r|nu_$zvN+*IJEd^fTLpg+Cf&TSo;zBmTpzw$` zB3gaOp87D2mj`(RHv?Kmhyn(-)2WSAMWQv+3C{ZS%`9???X4kbEGx4Fj}tQ!<9(x6fLfnF*%JsB9IsNywM_dqOZZKdc1p}WWMYIvMVajb|2LGflx(u)! z8L*$&w#?VeG1?M$$>7uefd2Dtni|-f+%0(Vc-IP6;+8T4qkmU{wJ5EDokhNpc)y{f z*PWWmw|`{d%QG?18l)m8m+`ZU)XOMI@r>AtRaP2L46kyKDxrMH6~V-{>KI;S#q%pF=A4MFU0B zZr~NDMWH$0(&y1eXSJBc^zG&$8E6e`7g_GZ%+C35y1kxwObxV6tvNHf&(eJ{oGx_C z-ClkKCmS@+W}yD?fX8vpCyAp`?wS6nfmWC(i5Iy?dbw4c&ZCsOPswN+!1bs_>8SAB zOM^)T;)XAeQV~>KNm&vZx=D+=+#*eO8*_@X+r$+sXpn4wvk4LD_w52K*~eWJ&mtx$ z7o{dYU8EdE6f4MoD@xE=QMM&m;NjObZd8N~q8dcgCQ=+}7>KdLuV5Mu4LZHyB{Ktj w@F2tkb4tJ0N2bPDNB8 zb~7$DE-^4L^m3s900Qz!L_t(YOTCusQX(-Bh4)P?S66XifDr@-biBU*Gws)XlAa{6 z?k~6M6xF$%uhYpye{}PUZ`J<-JU+~h``=HG^Kn>=hi=lapp&6tcgLLlcDCQ#?lw2O z`F7+c6Vran1$4Xe8QZB5X}l; zxgR?m0}$@xVFAGR5lR>#)hSb{qx0i2Ea;8CAT*BC`+!4xlifWfaLyaBBs9r@ImJF`CBbM z*Md<14(WtdpGaRjV5kD{fZ%Ap?#Qzf3Wfl3F9D}#K+I?b;Hlz;dgPHZx?8R-;mr4drW>$dv)s^1cNiZDqHJ}tXM`DyE z6`)`KWE1hS3l;#}+Y$kAhDmXVd$^yse-GB(go&tYc;Jn`ILNF zx^tF(zJIb-ENjK&bOz9OmzMq}0d)5jmjFvY1AI@(l&q2B1D_{=Wdm4VT4lEB=v5iT zs*K_a;AK&aDN;Q6zZCZkfHnZgYL;1-Wzk_M_Bj&(U&R8nCF0OYpTyO)th15sqT&`% zlqCQvQG1IxVckeIap8t2)~BRc*G6#(Aczu?B`^%tOaM-}yzN2bPDNB8 zb~7$DE-^4L^m3s900T)$L_t(YOTCrba@s%;MDru5%7bmdF*kt_*y3WqU?>0oKRGkK z8r^WJ^59f;QLACLyLV<*`j$=Zz7+pUVD~aPl(XY*emZ35*F}Iwf`@XtFQ>&~u$(_E zW)G{y;AQ>vT>R{SV7VEW&*Sa$m_M9#R2iHsS z1j@C&1~#il3oeE@Rei#~PCyx20VgyaLDP5P-QVwI(@!G%a-z1wPD|8eE84+8ZxU$Lc1}rK0vPEEFfbeYbeNY< z#+1S)MzC`*iav)hv;;V82;g1zVaG26s)NT+v9QQ;$d)EGw?`L<4z2U{6or7X+pwE` zeMf=4726N#+{=-YTLMvcv3t3#;<|$|7<9$hZ&3qw-4I|i_QlTM z6}$G_5b&}DwR}L$F2fB0_L%(^yWs35P=C>q0N$OQ1Kg(B_kmA%D!m?J8O(~r-%;opV*V@=J(d` zQAeOzeOF3VLJullw@OX|blC0Vy-^weW`X_*D*Hid-qk-XaIEC|1e8dB10CG0)uo_M vOf%q?@g|^WKzCEXbu79~{yKcIz~t@^6&-WAS{cLg00000NkvXXu0mjf>QuM` literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/sliceAndSpliceFront.png b/resources/assets/enderio/textures/blocks/sliceAndSpliceFront.png index 625366efe018e51f31b2028ebae4b82e31f6a691..3c56b415f075c956234e2ad2b117198fd79554f1 100644 GIT binary patch delta 658 zcmV;D0&V^L27(5Ve1CCCL_t(YOTCs|Q=32(hQ0No-q@MWcu^apDJdU;Ku8F>8r%Q> zoBC{CSlunXh!8XHIIx^O&-q&LB8_j)s?P%KHc`9%^|*^olbC(_rY2#LM@_xNW?Mzu z@@HKx>h)q%JOpBqr`rlyGY^0Z+&#D1%VTzUT1i~9V%qenfq!8!XkRZ;vx%Ivf{q3; z0U>TZfQ`LPW#NqQYm;b6CE*&`^`6w?6z{#7D%w@{FTx%t9)QgR%eJd8mq^~feZ4{g ze80Iy7PE_WErx6a(_Ug{3m!ZGO9!*!nT(V~2iVh<4q!7F0w{wHu!)G3P&@!jucjc! z9$;&w%{H4}0)J2?SEzphT+lxv9sn=^GE&F1*=FOq;xIkK0bGdyyqX+`A>d&02>~ww zfGRVT47iLKdCea#j`9Ew(?7M%K-vrGw<$sZ)>Ms?A|p}}!vTgFeI8N=sFwo(9@BT7 z#^ZrpT%7oG7*YWc_Mi_o=9HJ&yxVl*FOPpPKYyMJ0Ds{WQ4`)aWJeoD0`P9fbf0(t zibL$21L`vdKzig6~0|&IC{oKEPm$06H1C`Y%A|pv>;pQaUS~l6Q)&a4H?AygLWfr^@dK z0JxsyB!4rFprc)pG$OtcEKKfK5oFY2xUZ`&^{pi0f2!|ek4o?WM83X|CHT!Nr-_59%R(Ql_ sEUB`NB#}Ac#9f3WW2K)w)e1GdnL_t(YOTCuMcG@ryhVvSIfv)=yT{I~%zTmqh%U5iJ^Zv_z zvVb5rn-r%$|KSKR(l?`-k$L**IA5y&1qe%-)OFUjMc;{Ie-mG`wn^$LQYtLVgOt7~ z{37>?%+0ULF7oo+FN#14ZB`T(Agyb*ljESKu{upgjLUHl!+$aF+7wJvqZnAFB2~Vt zQt=}ENE^It5MM0-Q*t;Ggtln3MNTxGjz$tn-!U$_mdTu7F{`RnsiZ7#ilvOChmd9${3j- z%wo~&2+XD$e18R)AdHQPz^rA=!QzSq!2M>PLn$ss%W0a$?1grv3hEvj7l7Y-xNZmZEVYC3W7=QKd<(V-$2w@mWr3~OB#(Od} zqqzPmT_T*upAlh7UU+01)u|TQEmj#5v%}QcHDGSC;tx#g=FYL zT51$gQD%mpLMb^+ZUR5ceHxSIUqlh&HJ^H%B)e6TzfNBaaGXD*en@^c>(kKy0000< LMFvhpu0mjfj6Hcr diff --git a/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png b/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png index f13d3168b18741d3954b98f7641bdd42cc1a3ac9..b734a486eef97b761fe839031fefbbc7943e2fff 100644 GIT binary patch delta 1173 zcmV;G1Zw-}3Wo}if`4#HL_t(oN9~v0YZO-$zz-CJJ~%Tw5eq&TV`AL6AKBe(HrZ@4 zaW#U1V46%l z&iS3MJG)nEmGMKB{|m4a1-7osLP zCIC|_H8$BKq5!Jo3bhx&g8mV40e}HeCGD6Rn`~TH9428nfGZJz3sD1yc|bpE3=wcX z2cXIfB?GQXjJ(btF05n#4wF1J%|O%^(#5Em2cS*WIDaXsL@LT~fMQ0Hhe{0S%oG54 zOyBi1+5gEzMlZREdwx5(Rmo6A2uqdn4h)PCV>1DQ4`)aWJenS zybyUQ@_$<7jmTS(_aYy~{9QXfhOqb~^1<%&6dg3tR{-A4m@ZW_0E$EGoCE6P0I#g^ zy8!@bDuB{6LICJi2GDL!5j%N68ZZNP_5uhT?+hdb&j4DpliFbg{FBN+0mPdFXa?k$ z1~6140fwe#0L}VolEAwH?uVgia%h_T#7vQy8GjnP?P-(E+D=jM#5B3IVVYb5K;RKC zU4|w1ebA^)C_sCFI6yo_2H@{_W=wZ{J4OC308LC3peF-YUj!tK(=CVu6c;pM-4=~IdP6wzV#LfviYzx~;Q;4lNA!$Sm^ z3~~TI>+HJ$P0gqg-Qf|&Xi{Z8l0@bNCvK5%^5Mw{u&=}bdP^r6lF|LZ3i>$705B$4 z%!cx+zyuE&09&K`LH6f64)cJ~{otVYgMYrrC6Oy4-;4Yxa$V#Xky|3SMQ)1xY&#vMI79^4$LT zT|M#*!s0Kx!~SEdvu^bjFwp(rj>z2v@SAn?Y(D_{00zAu03agFG=o2i0PO4q5Pvw{ z_rD)#i4>q26qX1ufQ?j%7^;Ep2T{^wog$h^OKEJn$v>ryacfCpdA7ujYPG8UGA977IfpsSc(800000NkvXXu0mjf4`~(^ delta 1270 zcmVb$2qB~NYp zmD;}r=*5wnre2l>(@8j+=EhGi8@uVKpCr9F?naRl22S9&1AnjO@66j;+xMLy=tQA% z3xX10n5Ik@E#}E`F1` z^BF-XkFoObiDsgri3nvnp&d*zI(?qvHX03+#Es+J22s?HBEGR;I%S>`fbsES!4lro zA2rb=drNA0_B6xz7?>IBCJAe0h7y3TbiEoRiE%PPn8D#xMPMdX z;2ppOVSG#kW-M(smZg*cEPuS&^rCRe4~s{5kOCOcve_i_MF~KOq4&1$8K-U-8iqSc4B#QgT{0A7v{fJ~ z(tvUVRDeI7w7ek<$M-sczpB?SYPFAR)tA-kRkeC;SzlPzjaB)kQn{&AXn$60NBrgTI@KbT)R=&>a=H1YO8u}3#b`Dl}T?cYX_)YD}Z{6&qW>o`iFKS zU9F}U7ujY_^^^deFyyqM=t%>B??k>A`BCI2k)K6=75QD%r}@ScjK&`#zv+IS;)5st z01#-l*^E~!s;30t%wp}`IAV)(zz=%xF9!hdG=BiL9*u$_TP1+)x~#nu2BhJ@2kfb?LjWLCX6L&-^h$tdPFn$Xb)Xndt7)v=vfItAwe0iUn&(&p zvl|#g@;VsAadR+u0Kn{~8vkJ>^X9Sp{e1vAIM!Lz4@0}(D*?_rPHX5M>oiq>UK#Mb zu(Fza@`Vu3Q(dv z5S33Z>11GLETsR&{os9(4@AyHS|VMMfq#fE z5{slFk%*^z=x>NT6M0I{4nru9-w)mqF#rYw=!m!)z|=(m{W$=C{@ERRKVX)b$Xeth zkt>mFk+1Zh-}hdB4Wse3?xFt^?X%MU01mw$j76q9z^8hmFCPQo58%-I0RUFSFcZP& z4*}@84>Z5nuq9g>NlFR0rJ;-rXhHsEA~eQW9HCa=(ydJWZ0((xLZ* zqKb@6nKYLviYfw75kmkVQ)cJ;k^2F4@OSSA#X30M4;0L-{Vz__)BV7-&DI+q8u=ET g?g#(3`+;r$2@XvVSf@VpmjD0&07*qoM6N<$f=oYKUH||9 diff --git a/resources/assets/enderio/textures/items/skullZombieController.png b/resources/assets/enderio/textures/items/skullZombieController.png index 3ccb86abdeee308976ed4e507cd47c904762e859..d36fb1c73d0821e17832322620bbee028d04dcbe 100644 GIT binary patch delta 339 zcmV-Z0j&Pb1I+`FgMZyp-%G+^6cwWXBecyDLam(h=XCQYk!9c>X6&KnhRG-ipGE|O z@JTSpzxU+5ZbdA8uLFn6cev+pzx#c$e}<}@K%*+6sU*2-6%qB4u;w9GwJbm>BoMSm zL59{$g68IMG0UUkWFVUEh9fsGz(}#h+S7vs#)b<_F zg4n#j$DAy#*&LoJlolMcN1@1Z^gIdnqKD_D0r^H`PF4e4zUEOJ9rNo1?NQJK-DwV; z*(sFK33_gZDNGpx8q+LmT1D6%P%9>IrpJ*T9I%NKav;qmHU&Lupg5u>N53{J==6KBK>4-ZS5b+oYI%sO~{chH;Fn6UwL zL2TaLVUCv { protected void init() { super.init(); MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderSpawnerRecipe.instance); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderReanimationRecipe.instance); } @Override @@ -101,18 +102,17 @@ public class BlockSoulBinder extends AbstractMachineBlock { } @Override - protected String getMachineFrontIconKey(boolean active) { - if(active) { - return "enderio:blockSoulBinderOn"; - } - return "enderio:blockSoulBinder"; + protected String getMachineFrontIconKey(boolean active) { + return "enderio:blockSoulMachineBlank"; } - - @Override protected String getSideIconKey(boolean active) { - return "enderio:blockSoulBinderSide"; + return "enderio:blockSoulMachineBlank"; + } + + protected String getTopIconKey(boolean active) { + return "enderio:blockSoulMachineTop"; } @Override diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java new file mode 100644 index 00000000..ee7deda7 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java @@ -0,0 +1,103 @@ +package crazypants.enderio.machine.soul; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.ItemSoulVessel; +import crazypants.enderio.machine.IMachineRecipe; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.IMachineRecipe.ResultStack; +import crazypants.enderio.material.FrankenSkull; + +public class SoulBinderReanimationRecipe implements IMachineRecipe { + + public static SoulBinderReanimationRecipe instance = new SoulBinderReanimationRecipe(); + + @Override + public String getUid() { + return "SoulBinderReanimationRecipe"; + } + + @Override + public int getEnergyRequired(MachineRecipeInput... inputs) { + return Config.soulBinderReanimationRF; + } + + @Override + public boolean isRecipe(MachineRecipeInput... inputs) { + int validCount = 0; + for(MachineRecipeInput input : inputs) { + if(isValidInput(input)) { + validCount++; + } else { + return false; + } + } + return validCount == 2; + } + + @Override + public ResultStack[] getCompletedResult(float randomChance, MachineRecipeInput... inputs) { + String mobType = null; + for(MachineRecipeInput input : inputs) { + if(input != null && EnderIO.itemSoulVessel.containsSoul(input.item)) { + mobType = EnderIO.itemSoulVessel.getMobTypeFromStack(input.item); + } + } + if(!isZombie(mobType)) { + return new ResultStack[0]; + } + ItemStack frankenZombie = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.FRANKEN_ZOMBIE.ordinal()); + ItemStack soulVessel = new ItemStack(EnderIO.itemSoulVessel); + return new ResultStack[] {new ResultStack(soulVessel), new ResultStack(frankenZombie)}; + } + + @Override + public float getExperianceForOutput(ItemStack output) { + return 0; + } + + @Override + public boolean isValidInput(MachineRecipeInput input) { + if(input == null || input.item == null) { + return false; + } + int slot = input.slotNumber; + ItemStack item = input.item; + if(slot == 0) { + return isZombie(EnderIO.itemSoulVessel.getMobTypeFromStack(item)); + } + if(slot == 1) { + return item.getItem() == EnderIO.itemFrankenSkull && item.getItemDamage() == FrankenSkull.ZOMBIE_CONTROLLER.ordinal(); + } + return false; + } + + @Override + public String getMachineName() { + return ModObject.blockSoulBinder.unlocalisedName; + } + + @Override + public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { + List result = new ArrayList(inputs.length); + for(MachineRecipeInput input : inputs) { + if(input != null && input.item != null) { + ItemStack resStack = input.item.copy(); + resStack.stackSize = 1; + MachineRecipeInput mri = new MachineRecipeInput(input.slotNumber, resStack); + result.add(mri); + } + } + return result; + } + + boolean isZombie(String mobType) { + return mobType != null && mobType.equals("Zombie"); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java index 068fe132..3361ec09 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java @@ -58,7 +58,7 @@ public class SoulBinderRenderer implements ISimpleBlockRenderingHandler { float slabWidth = 0.15f; bb= BoundingBox.UNIT_CUBE.scale(1, slabWidth, 1); bb = bb.translate(0, 0.5f - (slabWidth/2), 0); - setIcons(EnderIO.blockSoulFuser.getIcon(ForgeDirection.SOUTH.ordinal(), 0), ForgeDirection.UP); + setIcons(EnderIO.blockSoulFuser.getIcon(ForgeDirection.UP.ordinal(), 0), ForgeDirection.UP); CubeRenderer.render(bb, icons, true); bb= BoundingBox.UNIT_CUBE.scale(1, slabWidth, 1); diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java index 765c2eb2..9642826f 100644 --- a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java @@ -1,12 +1,16 @@ package crazypants.enderio.machine.soul; +import java.util.List; + import scala.xml.persistent.SetStorage; import net.minecraft.item.ItemStack; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPoweredTaskEntity; +import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; @@ -38,10 +42,38 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity { public String getMachineName() { return ModObject.blockSoulBinder.unlocalisedName; } + + @Override + public int getInventoryStackLimit() { + return 1; + } @Override protected boolean isMachineItemValidForSlot(int slot, ItemStack item) { - return SoulBinderSpawnerRecipe.instance.isValidInput(new MachineRecipeInput(slot, item)); + if(!slotDefinition.isInputSlot(slot)) { + return false; + } + MachineRecipeInput newInput = new MachineRecipeInput(slot, item); + int otherSlot = slot == 0 ? 1 : 0; + if(inventory[otherSlot] == null) { + List recipes = MachineRecipeRegistry.instance.getRecipesForInput(getMachineName(), newInput); + if(recipes.isEmpty()) { + return false; + } + for(IMachineRecipe rec : recipes) { + if(rec != null && rec.isValidInput(newInput)) { + return true; + } + } + } else { + MachineRecipeInput[] inputs = new MachineRecipeInput[] { + newInput, + new MachineRecipeInput(otherSlot, inventory[otherSlot]) + }; + return MachineRecipeRegistry.instance.getRecipeForInputs(getMachineName(), inputs) != null; + } + return false; + //return SoulBinderSpawnerRecipe.instance.isValidInput(new MachineRecipeInput(slot, item)); } public void setCapacitor(Capacitors capacitorType) { diff --git a/src/main/java/crazypants/enderio/material/FrankenSkull.java b/src/main/java/crazypants/enderio/material/FrankenSkull.java index 2b5b41c4..e99ce025 100644 --- a/src/main/java/crazypants/enderio/material/FrankenSkull.java +++ b/src/main/java/crazypants/enderio/material/FrankenSkull.java @@ -2,15 +2,22 @@ package crazypants.enderio.material; public enum FrankenSkull { - ZOMBIE_ELECTRODE("skullZombieElectrode"), - ZOMBIE_CONTROLLER("skullZombieController"); + ZOMBIE_ELECTRODE("skullZombieElectrode", false), + ZOMBIE_CONTROLLER("skullZombieController", false), + FRANKEN_ZOMBIE("skullZombieFrankenstien", "enderio:skullZombieController", true); public final String unlocalisedName; public final String iconKey; + public final boolean isAnimated; - private FrankenSkull(String unlocalisedName) { + private FrankenSkull(String unlocalisedName, String iconKey, boolean isAnimated) { this.unlocalisedName = unlocalisedName; - this.iconKey = "enderio:" + unlocalisedName; + this.iconKey = iconKey; + this.isAnimated = isAnimated; + } + + private FrankenSkull(String unlocalisedName, boolean isAnimated) { + this(unlocalisedName, "enderio:" + unlocalisedName, isAnimated); } public String getUnlocalisedName() { diff --git a/src/main/java/crazypants/enderio/material/ItemFrankenSkull.java b/src/main/java/crazypants/enderio/material/ItemFrankenSkull.java index b439e353..b0573024 100644 --- a/src/main/java/crazypants/enderio/material/ItemFrankenSkull.java +++ b/src/main/java/crazypants/enderio/material/ItemFrankenSkull.java @@ -9,6 +9,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; @@ -61,4 +63,13 @@ public class ItemFrankenSkull extends Item { } } + @Override + @SideOnly(Side.CLIENT) + public boolean hasEffect(ItemStack par1ItemStack, int pass) { + int meta = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, FrankenSkull.values().length - 1); + return FrankenSkull.values()[meta].isAnimated; + } + + + }