From 6440c4715f8dcab9e665eea336a8aafc7b7b758e Mon Sep 17 00:00:00 2001 From: mDiyo Date: Sat, 9 Nov 2013 14:28:48 -0800 Subject: [PATCH] Adjust lots of block behavior, furnace slabs --- .../tinker/textures/blocks/chest_bottom.png | Bin 0 -> 543 bytes .../textures/blocks/chestslab_bottom.png | Bin 0 -> 541 bytes .../textures/blocks/chestslab_front.png | Bin 0 -> 587 bytes .../textures/blocks/furnacechest_front.png | Bin 0 -> 726 bytes .../blocks/furnacechest_front_active.png | Bin 0 -> 742 bytes .../textures/blocks/furnacechest_side.png | Bin 0 -> 709 bytes .../textures/blocks/furnaceslab_front.png | Bin 0 -> 431 bytes .../blocks/furnaceslab_front_active.png | Bin 0 -> 456 bytes .../textures/blocks/furnaceslab_side.png | Bin 0 -> 447 bytes .../textures/blocks/ham_bone_cooked.png | Bin 0 -> 807 bytes .../textures/blocks/ham_skin_cooked.png | Bin 0 -> 795 bytes .../tinker/textures/blocks/liquid_gray.png | Bin 0 -> 9604 bytes .../textures/blocks/liquid_gray.png.mcmeta | 3 + .../textures/blocks/liquid_gray_flow.png | Bin 0 -> 6133 bytes .../blocks/liquid_gray_flow.png.mcmeta | 5 + .../tinker/textures/blocks/noteslab_chest.png | Bin 0 -> 685 bytes .../tinker/textures/blocks/noteslab_side.png | Bin 0 -> 595 bytes .../blocks/partbuilder_slab_chest.png | Bin 0 -> 579 bytes .../blocks/stenciltable_slab_chest.png | Bin 0 -> 579 bytes .../textures/blocks/toolforge_slab_chest.png | Bin 0 -> 662 bytes .../blocks/toolstation_slab_chest.png | Bin 0 -> 579 bytes .../assets/tinker/textures/gui/minichest.png | Bin 0 -> 1227 bytes src/tconstruct/blocks/CraftingSlab.java | 59 +-- src/tconstruct/blocks/FurnaceSlab.java | 117 ++++++ src/tconstruct/blocks/MeatBlock.java | 5 + src/tconstruct/blocks/OreberryBush.java | 2 +- src/tconstruct/blocks/SoilBlock.java | 23 ++ src/tconstruct/blocks/logic/FurnaceLogic.java | 341 ++++++++++++++++++ src/tconstruct/blocks/slime/SlimeGel.java | 7 + src/tconstruct/client/TProxyClient.java | 2 + src/tconstruct/client/gui/FurnaceGui.java | 58 +++ src/tconstruct/common/TContent.java | 42 +-- src/tconstruct/common/TProxyCommon.java | 3 +- .../inventory/FurnaceContainer.java | 183 ++++++++++ .../items/blocks/HamboneItemBlock.java | 155 ++++++++ .../library/blocks/InventorySlab.java | 79 ++++ src/tconstruct/util/config/PHConstruct.java | 13 +- 37 files changed, 997 insertions(+), 100 deletions(-) create mode 100644 resources/assets/tinker/textures/blocks/chest_bottom.png create mode 100644 resources/assets/tinker/textures/blocks/chestslab_bottom.png create mode 100644 resources/assets/tinker/textures/blocks/chestslab_front.png create mode 100644 resources/assets/tinker/textures/blocks/furnacechest_front.png create mode 100644 resources/assets/tinker/textures/blocks/furnacechest_front_active.png create mode 100644 resources/assets/tinker/textures/blocks/furnacechest_side.png create mode 100644 resources/assets/tinker/textures/blocks/furnaceslab_front.png create mode 100644 resources/assets/tinker/textures/blocks/furnaceslab_front_active.png create mode 100644 resources/assets/tinker/textures/blocks/furnaceslab_side.png create mode 100644 resources/assets/tinker/textures/blocks/ham_bone_cooked.png create mode 100644 resources/assets/tinker/textures/blocks/ham_skin_cooked.png create mode 100644 resources/assets/tinker/textures/blocks/liquid_gray.png create mode 100644 resources/assets/tinker/textures/blocks/liquid_gray.png.mcmeta create mode 100644 resources/assets/tinker/textures/blocks/liquid_gray_flow.png create mode 100644 resources/assets/tinker/textures/blocks/liquid_gray_flow.png.mcmeta create mode 100644 resources/assets/tinker/textures/blocks/noteslab_chest.png create mode 100644 resources/assets/tinker/textures/blocks/noteslab_side.png create mode 100644 resources/assets/tinker/textures/blocks/partbuilder_slab_chest.png create mode 100644 resources/assets/tinker/textures/blocks/stenciltable_slab_chest.png create mode 100644 resources/assets/tinker/textures/blocks/toolforge_slab_chest.png create mode 100644 resources/assets/tinker/textures/blocks/toolstation_slab_chest.png create mode 100644 resources/assets/tinker/textures/gui/minichest.png create mode 100644 src/tconstruct/blocks/FurnaceSlab.java create mode 100644 src/tconstruct/blocks/logic/FurnaceLogic.java create mode 100644 src/tconstruct/client/gui/FurnaceGui.java create mode 100644 src/tconstruct/inventory/FurnaceContainer.java create mode 100644 src/tconstruct/items/blocks/HamboneItemBlock.java create mode 100644 src/tconstruct/library/blocks/InventorySlab.java diff --git a/resources/assets/tinker/textures/blocks/chest_bottom.png b/resources/assets/tinker/textures/blocks/chest_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..e700c604b27eb3856d0b711447691ac45fcd2631 GIT binary patch literal 543 zcmV+)0^t3LP)GzOOn$t5QaZVZOe~j zaG1%EMJQIo0#+P^vvLs*zyW4Kg~d4I#IY<(VqqsW(5o)h-`)R1>g(rEMUitYF&aoI zg_!34Z5_K_R(0|HTd@+agNw!jFK)O30 zX`b5_#$Bd^6hQPw=^#^x!0pw!aVF#3xGk$$$Dd0Nv@V;15i$C4T}qw86*|`p+GSem zyS>eU+$b?lQjFnpz9fK)TV(9A#ZVu_zxIn|11V}bUq(~DE7xfee184yZ`Rw@|q zl46WLnaSNW-0S}{S<>*yC`4&(Yb&({7rg~u7ja^y%l={_iIOBR&bYHw$E@7?EaMU0WRmZ39_ZqOgO9W+mLW#2~2_U857#zDku--J?Ydefd2mc!Pz;jbm+63p-*gz}EW}X9fD7@NpQv-0HNOZAa zYf@4r(8`VtVhH%=l@Ot^ZYaJ_--k;a*?Z^?~hTIgBCo zxsfp`l@R#YOd0H}6P@n?*e;i>ZHKkpFv6h7r0lB`@DGEPN%)W_1B2VbD_{?J+p#hk z&`%kJKBAl*7`&G$i5hv}+JQyrBT6u3UtVUOSa1;Pi6Vv7hdNYBMd^`zCw%~ zYH^tjHuDwx3d%ZRGoJyluTHE?#<9~JYB60VAp}2u)kqW`0kkM09*v;6q$(l~9~??T fxNNa_>pK4h1BKAd>5ZsQ00000NkvXXu0mjfq;lvI literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/chestslab_front.png b/resources/assets/tinker/textures/blocks/chestslab_front.png new file mode 100644 index 0000000000000000000000000000000000000000..ffb2bffb6858c908bf323cc9ff08f3482bb96edb GIT binary patch literal 587 zcmV-R0<`^!P)M6(ANVi$&v+69k@h4Axmc*wLZNDJT@Y-yBxS=Uo9xc> zuxZj7Ptv)~@aE0Td!JDv!p7PI2}7UDVT}erL@1q1=U2x?nsIb|qAWnP81k|mvZVSr z69CZ7hn$@B0a#s)0B8gu-F%2=>b&1`0O(GqBLL$v<-Cw8z_*NY!>c#%Xgzz)C^uDb znbQbDB0C14)9Hwf;~3|Joo@z|np|*5HW;xH$MkwVw)b;t3n2idt2P@2aU5flBtdJ% z)_RSia9CTt_q3}>k_3ReO9hYa8?+xxYw-DKK$0XV5#jOXLwV6IX*IoRKoIzBfB6l- z({^LJem2PHWgZ{*4SNSat0G#X@l1{5^Av#PdIY1Yc+2&OixHfreHuZC?>F#_!kS^# zF@Ut6@!_jOV<=I;5Q9)+Q4A($8-#+=6&MXpWR^fFO({@T-Nzb@pim-|ZstM(dO{*i z2eSk>;vlkPZr`%3Gz}|FGv}by^tcmMg`RUD&hd8FO&sI^a}GXzzjPpgyY4_~&DQ$D z|2ufnUX$mW1snGkuYH)m9h?m^0D76n&Vglj|A(4%LE)J?hrg~k;9m~vc)rCm3Z-ty Z!5_-36@$ia*N^}J002ovPDHLkV1l8J0&V~R literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/furnacechest_front.png b/resources/assets/tinker/textures/blocks/furnacechest_front.png new file mode 100644 index 0000000000000000000000000000000000000000..1112a3b20010c97f1951e38aa480d90ac0bac52c GIT binary patch literal 726 zcmV;{0xA88P)^E!BuTHQ7VlfIeBbBb;DDW-9sY&w?QNEqmuWN_Y;A2Z z91by^PKPiIQA&*l<2c6iJhaw0=g?Z?c^;>yr)aGym&>GS%G%l*CI|wC!y)y09cwKs zD=RE5Ez#|E5fPM9WLbuYu(7d$=Xvbz?vkcy-v8e>s=K$!5{CY7T8;Jq5D~1CQT->{ zogOAChCF@{5}6^MO>sH^;5bM0)_uPM1;; zQ}7J{1+7pjLEX7IE79d#Uv5*LNR41oC}gx%P*?}QzUoBy0XvO0dN$VE)Bpeg07*qo IM6N<$f_6wuuK)l5 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/furnacechest_front_active.png b/resources/assets/tinker/textures/blocks/furnacechest_front_active.png new file mode 100644 index 0000000000000000000000000000000000000000..cb21d85885c495a66d81b8776fc99279e4cbd8bb GIT binary patch literal 742 zcmV+9=itu=*00oQfe z-rnZ$@Q~-F5|c~tWdSCafCcyh+#edETCFlVI*R9cL{UU4lgV&!aDeN&?Ck8Y{@`Om z0ww|Gfu#h$+uUSsZjMT&!p6o1-EJ4%Xf*JBAEi{nn&*5yJDtrZ*l`^4`8-h+vAVj7 z_B@Ynw@bNP#u&rm;zMRK&*yn&iAJX;%Y~b`(m5sOwioCAgUQOJYhs(m^mN6mqszP#6n;uWCj3 Y1Mz$}^1S~oy8r+H07*qoM6N<$f)gf7A^-pY literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/furnacechest_side.png b/resources/assets/tinker/textures/blocks/furnacechest_side.png new file mode 100644 index 0000000000000000000000000000000000000000..163fbc786affb36252c258edbade79a0a8ec6881 GIT binary patch literal 709 zcmV;$0y_PPP)EgDwv*lEBBd0#WUgjc z-_Gnm|A^smXtmY=7-P^{W39y)1Hf{*WM^jwtuFaLjZ1WZs>NqxUP%Vn#E$lY&N6SY7s>dPLd={CKCpO0a=z2h9Se@kbb|9 zQi@)$M;yl-92_th3{XmOc6LTtmKbAjJkP@z!+1PqcXyZb^K-7RuPKUxMx#Mlmh}65 zuCA_#qKIm>O1s^r*XvOf1zxRIN1?zVGAvKKJ+cIF9o;w3Cw)lu}HmQ|9wIN-6H{?zp_X1i+C} zqLe}i0YIMTL{UT>#~dCWG8&D@vW#}S&3e5?O3D8IKBuRrSZfjgYomDma^EWD^E5oy z0l->|HumxScO>ZouU=EUf2#m!iVWjQ0Om#h1l|0wB^C1`r{XpM`1HkW7OC#7=+rgf zA*H+N9?|90O0+8({8sh#$b#gO;bLf57lawJkN0fhQlFAlHhqBr_+gAtwyKQ0U(MZ zn$0FsN{lhQUN4d)p_xprl zNDu@Z4hNRYC9dnb1VMmOirsF<<#Hj4BK}3I)#7@+((QKfJP)lkqFgR>KA%xavET36 zY&QIl^?J=@GU0eUvRbXkvJCg}cu*>pa2)6F(f56X5J)L0iUKJmLI`fR8&XPoy&hU? z=JPqO=XqpVMjXc&W0+2-jK^c1&nMPe9LFKgbF8&277K(BY`0sq)_?ZzY7~5v-wu96 Z2Va;OVgf#gBt-xK002ovPDHLkV1lHQwFLkG literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/furnaceslab_front_active.png b/resources/assets/tinker/textures/blocks/furnaceslab_front_active.png new file mode 100644 index 0000000000000000000000000000000000000000..d55de2adbfd7ec26b5ecc6122bb963e94067da6f GIT binary patch literal 456 zcmV;(0XP1MP)B&*9EP9235lSh zBGy4f%o3a&b?NBt?$Et-xuGA(p&Z;NaF?t0ZmKwi=-{B}5D-NZlYf3U*yZMKrO)*6 z!aKdM>h*e}wFV$fQ?%BI2x*!EaJgKl)oN(1(OMIRA=m4bVzEe)B$xo*ZkHekux*>o zW<#k|qF%29;CUX^Y8AsU&{}gop9zA1a=DD}`>1xiEw1a5&*!OBDu@W<@t8uPfQWE7 z9Iz~lFbrw6TDY!@<2bBVE2h&arfHfuj)P@cEEWrPyB$A0kIo3*AD}Y=9^f5#yt`w+ z-_vL`ux*j`4jTtu@cjKj`=SoK7bsD=4K%ekF(q yuYX>-zt1qA&xxW45kY-+#tfh2`v+g*2mb&FC}i>;+PlpF0000<9cbz7wr08P`Nl%j20nx+9D z&vWMUIZ7#%QWQl&RaK0~W4_-nJ%H2cL=;5`Aqawi$z+0MSpeK_H)gXL-EJ496razB zD2n*``N8u%v?NIgf&j;H$g&K}vT$7&+qRKXVwxs#9J5-ja2y9IC5OX-s;X$32CdiY z(KHRu=aa=^!SQ(Hdc9JXCBxy6s;aPUo6F^b=Xvz|eGJ3EG)>B~q&FB0*lafFx=xZL zwU3YGTQyKuTmEh_c}3bMj$CAhAacxgT);IqrCcu0-bcuXF0NFL=7WLM1`;9t9LD zsmz3KIFQEyGjWW&2ZWvwF5aS*MEh~12-y664#4rV7x>K$sxpLeAnymNqn75yYr<~F z)9w*~Qan~GWaS)ah5hsyP1AC?xg<%+*o_pWDRss8VZ-*_Tf85bEf%C45!Nw=fGi=B z#-81~KM{a1n&Kn9AL#Z64!$R7kh&rd9o_9U-TOnqx$ z6P|zl4Ps_l|NaNJ_t(^wLtBfT&PgGn5y+AvL{EtcsWrrcn;dcW-M3IOr4OvW{{eg? zeLWqH|+j0Hd8_LAM#BufJSF#TzACN*JoF(Q6C83q8v9lSf)Fde|?E=$I+1{+# z{`?cdC<=vkae}U=RL-&e=bWJ%sGB9)XiYVrBT_-cfZyFCm7l^lC$0uLDqG?)W z>IYOxC~IjJ3mzZt8GtcniZXOL(WlJA-M{R{o@h1gYQ@vVCDn3?w#$}9Q?tFhLODm{ z93@8jAs~&Ru4jbJ1IieTtdOpPl3AX;9e9!8%CY1c~=H{53 lJ{o9NCm3TXWHy&q{0EdhbU_SC32^`b002ovPDHLkV1l;&W+eas literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/ham_skin_cooked.png b/resources/assets/tinker/textures/blocks/ham_skin_cooked.png new file mode 100644 index 0000000000000000000000000000000000000000..df722ae2ea053a23e8e6eefe5c2e252e59bb835c GIT binary patch literal 795 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 T&DYY<00000NkvXXu0mjf#s)&! literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/noteslab_side.png b/resources/assets/tinker/textures/blocks/noteslab_side.png new file mode 100644 index 0000000000000000000000000000000000000000..5365815f43f395de703d2d3c9ed260ce8c307ede GIT binary patch literal 595 zcmV-Z0<8UsP)KO{DN?*hxZX(By9Y5B?!I3E-ZXB4)Z)bPs zp_xy;eD*|a`wq9QVOao(2&OD+|96{(a~i8F4tw1WZ7rxgLz-2xAWi-Va9a*Rn&7q^ z;!^SM<2AZ^us9x`Q8o?7!!v}0kvC<_U198pJb$>(*bljHYev^&ILJZLC`+RYV*sk^nXqoJ-~|x?(>Nnd)B4_D6igO# zu7Z#tO(={(y?Omg_PQPNJg$fJV08@uKMH?2yDf)iv#}hq;r(Y1_2TK4tU3+=3MiGT zh9g3$6iTE{EJ|TY!P3>AQc4<1X$(IMt1DxjCa08zO3M;x@Z@ag;;_ttEN z*Wc;54#P{2yDe%RdDDu6rM7j|bwf;v$%}gLqnjD=Z2ng+#zBlp3rt>C94Jd;w`~sk zJq8yO4tKZt@a3Gt-R+u-+q%EgWpH|h-L@+ZLPRIM^Is^;L4yIylJjkAh_ hD8Y|HMC3o<;0Fe+V3CW{pTONe0JLV zx#NHNzDB%x{nXxE&HvUI$3gEcPEYRJFzhEv-v_{2i#EpDH<4xqG8siYKhzv0Lxd1L z!kx$i;MbLLzCWt{UDbvUjF46vrqO_S;B(cq#FK-7?7Bu<%fJ)djoU(-3ZkUFg;dqp zb%PYXN8&?XH2~a>JW{ng+e*6;G4|ndt43*q#v&W7$+gEMlmJXZNp@Z13xV&oEorkW zk_4?9V=SPN()Zb1)f9~eAg?434?|K_(U|_wGTkO$<_cA}L20#NGL*!D+@7*v_k$6ZELP83(G!#@&Z%>_n#2=tSlr%tvsE~j(6q|;4L%gx$csH?!!Wm~B z1h=}6b7$_k=Zd|_t}cot07|+1%M8Yt!OEgo^5W?Z(^=9M$MFz==`88^!yv@>{TBD` z(>E-o+)neV4TG?)jpJdb*-Rz&CcD}sdeY(O5G%aSC|+SpiGmH@o{@T1v*8Fv+sx9E zJ-*ZV+2FtK&k(O(KGfHx`JaqRxgB5J+rFiJzuPEn3jnP(Rju3jy3Ml!8T5UgKWO9` zh@9H?061QhE6@snb|{X4iI9+6d2_~_VQ>j@ zaBTs29A-J|UWnsL032H&M2Wb&HP(S@RIq@GhMbM2LLj)JrV&&%7*%Vn`2(O@z4ZXR R;~xM3002ovPDHLkV1i>!03HAU literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/toolforge_slab_chest.png b/resources/assets/tinker/textures/blocks/toolforge_slab_chest.png new file mode 100644 index 0000000000000000000000000000000000000000..da728a4311126505f9a9b83c7bdd29ad2b3aa753 GIT binary patch literal 662 zcmV;H0%`q;P)+r309hHwvG4m)6s>(ky$SFc=IB!$^`O48t%C(=;6phcXC)gM$O$`ue)rY<9cd z)6>&Vr{g$IrBZ1$8vGAYsZ>g(Qud|H!SlR+zrVG$b#rrLS(fK{S>i&WFdB`-(X)Nq z&aD?n(*U&AsnQvLjBs`@UB`a=%68?0kuH^)2kw@OZZ`rN4Hu~9?Yrfonzy5s_4TKc zfGZ!i-4tX#Zvw-==KBv{&d<+hzds$-4M?|L3sNEgsg?TNQKkSPU-weqU9ZyLG$Iz#)mpOm6L#F3LzHa w<(^b literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/toolstation_slab_chest.png b/resources/assets/tinker/textures/blocks/toolstation_slab_chest.png new file mode 100644 index 0000000000000000000000000000000000000000..ae43516636a5dfde531ffb6841aca31961fca083 GIT binary patch literal 579 zcmV-J0=)f+P)*v_k$6ZELP83(G!#@&Z%>_n#2=tSlr%tvsE~j(6q|;4L%gx$csH?!!Wm~B z1h=}6b7$_k=Zd|_t}cot07|+1%M8Yt!OEgo^5W?Z(^=9M$MFz==`88^!yv@>{TBD` z(>E-o+)neV4TG?)jpJdb*-Rz&CcD}sdeY(O5G%aSC|+SpiGmH@o{@T1v*8Fv+sx9E zJ-*ZV+2FtK&k(O(KGfHx`JaqRxgB5J+rFiJzuPEn3jnP(Rju3jy3Ml!8T5UgKWO9` zh@9H?061QhE6@snb|{X4iI9+6d2_~_VQ>j@ zaBTs29A-J|UWnsL032H&M2Wb&HP(S@RIq@GhMbM2LLj)JrV&&%7*%Vn`2(O@z4ZXR R;~xM3002ovPDHLkV1j|A0WSam literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/gui/minichest.png b/resources/assets/tinker/textures/gui/minichest.png new file mode 100644 index 0000000000000000000000000000000000000000..bb74a0a0b7633d072709ac96ce466482ef457abf GIT binary patch literal 1227 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&6|H(?D8gCb z5n0T@z;_6Q8AUa`8i0cAC7!;n?0302g(WOkU%Ix5fq^B$)5S5Q;?~={2Xh}A2sm7P zsN~8TChe!lbf=wb;_HA@kK)3lk92=MC?b2QhW~_WJEy`;`AJOu!8IotYd!c5Ze%xl z{^qa0y8f*xE)Nv;@A>)i?6%x>5&V0Yeuy=kKkx6}x=i=9kf7k}UAu%V9&jC)EziOr zz~BIKKPJQK!?zxLqw~cddp`e^x&HdR9#EaQxJO2)Hc`~Qi<;w4>0_nzMbAq##FKp5g6x_J( z^*^a)PqiEVvIZVvoA>Y84UQ+0xDAEc$G=(d#GI_+jQhc6Oa~|CuoQ9Qa0%FThj;!i zd{8;B`@ci?{pftZ_~K=mpZxxIGQ3e=-~tt?@wuyu&sL5GXP|F+Uc9qw2>*Mps`%F| zXIo9BqH~r?kLDlcHe;H3`Ouu(y$+{0xwstJweENJ45@I2-<%qWk9#eb7U!^h;=vu{ zEDS6M6oHY!mZCht^6dGAa?*`wGVA(!9qdb3H_UGkGP^e;*y^~O!g=g528lxl1{o#+ zh6D$YOa92b+PPbhBMN9rdHekSe*XMB&3TOfZf$!T9r(P`E@l1i-@kWTKC`iT{_Xzd zyiopqtcbK2H{G9k7RVExf`b2ln>?^N-@b<u5*iDWnV&I5vXung-k)gf8QuoZxyIf}` zGl3#*+r3%9h&!B#H>)Tx@G){Q7$`(Hp3SV|`+9@Rr#y$X43eCA%730Wyr-lT= 0.5F) - return metadata | 8; - - return metadata; - } - - public int damageDropped (int meta) - { - return meta % 8; - } } diff --git a/src/tconstruct/blocks/FurnaceSlab.java b/src/tconstruct/blocks/FurnaceSlab.java new file mode 100644 index 00000000..895fdbe0 --- /dev/null +++ b/src/tconstruct/blocks/FurnaceSlab.java @@ -0,0 +1,117 @@ +package tconstruct.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import tconstruct.TConstruct; +import tconstruct.blocks.logic.AdvancedDrawbridgeLogic; +import tconstruct.blocks.logic.DrawbridgeLogic; +import tconstruct.blocks.logic.FurnaceLogic; +import tconstruct.common.TProxyCommon; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.blocks.InventorySlab; +import tconstruct.library.util.IActiveLogic; +import tconstruct.library.util.IFacingLogic; + +public class FurnaceSlab extends InventorySlab +{ + + public FurnaceSlab(int id, Material material) + { + super(id, material); + this.setCreativeTab(TConstructRegistry.blockTab); + this.setHardness(3.5f); + } + + @Override + public TileEntity createTileEntity (World world, int metadata) + { + switch (metadata % 8) + { + case 0: + return new FurnaceLogic(); + } + return null; + } + + @Override + public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) + { + return TProxyCommon.furnaceID; + } + + @Override + public Object getModInstance () + { + return TConstruct.instance; + } + + @Override + public String[] getTextureNames () + { + String[] textureNames = { "furnaceslab_front", "furnaceslab_front_active", "furnaceslab_side", "furnace_top" }; + + return textureNames; + } + + @Override + public Icon getIcon (int side, int meta) + { + return icons[(meta % 8) * 3 + getTextureIndex(side)]; + } + + public Icon getBlockTexture (IBlockAccess world, int x, int y, int z, int side) + { + TileEntity logic = world.getBlockTileEntity(x, y, z); + short direction = (logic instanceof IFacingLogic) ? ((IFacingLogic) logic).getRenderDirection() : 0; + int meta = world.getBlockMetadata(x, y, z) % 8; + + if (meta == 0) + { + if (side == direction) + { + if (((IActiveLogic) logic).getActive()) + return icons[1]; + else + return icons[0]; + } + else if (side > 1) + { + return icons[2]; + } + return icons[3]; + } + return icons[0]; + } + + public int getTextureIndex (int side) + { + if (side == 0 || side == 1) + return 3; + if (side == 3) + return 0; + + return 2; + } + + @Override + public void registerIcons (IconRegister iconRegister) + { + String[] textureNames = getTextureNames(); + this.icons = new Icon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + if (i == 3) + this.icons[i] = iconRegister.registerIcon("minecraft:" + textureNames[i]); + else + this.icons[i] = iconRegister.registerIcon("tinker:" + textureNames[i]); + } + } +} diff --git a/src/tconstruct/blocks/MeatBlock.java b/src/tconstruct/blocks/MeatBlock.java index ab4cb3db..96069db2 100644 --- a/src/tconstruct/blocks/MeatBlock.java +++ b/src/tconstruct/blocks/MeatBlock.java @@ -182,4 +182,9 @@ public class MeatBlock extends Block { return true; } + + public boolean isBeaconBase (World worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) + { + return true; + } } diff --git a/src/tconstruct/blocks/OreberryBush.java b/src/tconstruct/blocks/OreberryBush.java index 7cb41326..2955ccc3 100644 --- a/src/tconstruct/blocks/OreberryBush.java +++ b/src/tconstruct/blocks/OreberryBush.java @@ -206,7 +206,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable return true; world.setBlock(x, y, z, blockID, meta - 4, 3); - AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TContent.oreBerries, 1, meta % 4 + itemMeat)); + AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TContent.oreBerries, random.nextInt(3)+1, meta % 4 + itemMeat)); return true; } diff --git a/src/tconstruct/blocks/SoilBlock.java b/src/tconstruct/blocks/SoilBlock.java index 6d134a85..9b11e823 100644 --- a/src/tconstruct/blocks/SoilBlock.java +++ b/src/tconstruct/blocks/SoilBlock.java @@ -5,6 +5,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EnumCreatureAttribute; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; @@ -39,6 +42,21 @@ public class SoilBlock extends TConstructBlock } } + public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) + { + int meta = world.getBlockMetadata(x, y, z); + if (meta < 3) + { + entity.motionX *= 0.4; + entity.motionZ *= 0.4; + if (meta != 1 && entity instanceof EntityLivingBase) + { + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.weakness.id, 1)); + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 1, 1)); + } + } + } + public float getBlockHardness (World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -46,6 +64,11 @@ public class SoilBlock extends TConstructBlock return Block.dirt.blockHardness; return this.blockHardness; } + + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) + { + return Block.slowSand.getCollisionBoundingBoxFromPool(world, x, y, z); + } /*public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { diff --git a/src/tconstruct/blocks/logic/FurnaceLogic.java b/src/tconstruct/blocks/logic/FurnaceLogic.java new file mode 100644 index 00000000..40d63980 --- /dev/null +++ b/src/tconstruct/blocks/logic/FurnaceLogic.java @@ -0,0 +1,341 @@ +package tconstruct.blocks.logic; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemHoe; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.item.ItemTool; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.Packet132TileEntityData; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import tconstruct.inventory.FurnaceContainer; +import tconstruct.library.blocks.InventoryLogic; +import tconstruct.library.util.IActiveLogic; +import tconstruct.library.util.IFacingLogic; +import cpw.mods.fml.common.registry.GameRegistry; + +/* Slots + * 0: Input + * 1: Fuel + * 2: Output + * 3-16: Chest + */ + +public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacingLogic +{ + boolean active; + public int fuel; + public int fuelGague; + public int progress; + public int fuelScale = 200; + byte direction; + + public FurnaceLogic() + { + super(3); + active = false; + } + + @Override + public String getDefaultName () + { + return "container.furnace"; + } + + @Override + public boolean getActive () + { + return active; + } + + @Override + public void setActive (boolean flag) + { + active = flag; + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + + /* Fuel gauge */ + public int gaugeProgressScaled (int scale) + { + return (progress * scale) / fuelScale; + } + + public int gaugeFuelScaled (int scale) + { + if (fuelGague == 0) + { + fuelGague = fuel; + if (fuelGague == 0) + { + fuelGague = fuelScale; + } + } + return (fuel * scale) / fuelGague; + } + + /* Item cooking */ + public void updateEntity () + { + boolean burning = isBurning(); + boolean updateInventory = false; + if (fuel <= 0 && canSmelt()) + { + fuel = fuelGague = (int) (getItemBurnTime(inventory[1])); + if (fuel > 0) + { + if (inventory[1].getItem().hasContainerItem()) //Fuel slot + { + inventory[1] = new ItemStack(inventory[1].getItem().getContainerItem()); + } + else + { + inventory[1].stackSize--; + } + if (inventory[1].stackSize <= 0) + { + inventory[1] = null; + } + updateInventory = true; + } + } + if (isBurning() && canSmelt()) + { + progress++; + if (progress >= fuelScale) + { + progress = 0; + cookItems(); + updateInventory = true; + } + } + else + { + progress = 0; + } + if (fuel > 0) + { + fuel--; + } + if (burning != isBurning()) + { + setActive(isBurning()); + updateInventory = true; + } + if (updateInventory) + { + onInventoryChanged(); + } + } + + public void cookItems () + { + if (this.canSmelt()) + { + ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(this.inventory[0]); + + if (this.inventory[2] == null) + { + this.inventory[2] = itemstack.copy(); + } + else if (this.inventory[2].isItemEqual(itemstack)) + { + inventory[2].stackSize += itemstack.stackSize; + } + + --this.inventory[0].stackSize; + + if (this.inventory[0].stackSize <= 0) + { + this.inventory[0] = null; + } + } + + } + + public boolean canSmelt () + { + if (inventory[0] == null) //Nothing here! + return false; + else + { + ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(this.inventory[0]); + if (itemstack == null) + return false; + if (this.inventory[2] == null) + return true; + if (!this.inventory[2].isItemEqual(itemstack)) + return false; + int result = inventory[2].stackSize + itemstack.stackSize; + return (result <= getInventoryStackLimit() && result <= itemstack.getMaxStackSize()); + } + } + + public boolean isBurning () + { + return fuel > 0; + } + + public ItemStack getResultFor (ItemStack stack) + { + ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(stack); + if (result != null) //Only valid for food + return result.copy(); + + return null; + } + + public static int getItemBurnTime (ItemStack stack) + { + if (stack == null) + { + return 0; + } + else + { + int i = stack.getItem().itemID; + Item item = stack.getItem(); + + if (stack.getItem() instanceof ItemBlock && Block.blocksList[i] != null) + { + Block block = Block.blocksList[i]; + + if (block == Block.woodSingleSlab) + { + return 150; + } + + if (block == Block.wood) + { + return 1200; + } + + if (block.blockMaterial == Material.wood) + { + return 300; + } + + if (block == Block.coalBlock) + { + return 16000; + } + } + + if (item instanceof ItemTool && ((ItemTool) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD")) return 200; + if (i == Item.stick.itemID) return 100; + if (i == Item.coal.itemID) return 1600; + if (i == Item.bucketLava.itemID) return 20000; + if (i == Block.sapling.blockID) return 100; + if (i == Item.blazeRod.itemID) return 2400; + return GameRegistry.getFuelValue(stack); + } + } + + /* NBT */ + public void readFromNBT (NBTTagCompound tags) + { + super.readFromNBT(tags); + active = tags.getBoolean("Active"); + fuel = tags.getInteger("Fuel"); + fuelGague = tags.getInteger("FuelGague"); + readNetworkNBT(tags); + } + + public void writeToNBT (NBTTagCompound tags) + { + super.writeToNBT(tags); + tags.setBoolean("Active", active); + tags.setInteger("Fuel", fuel); + tags.setInteger("FuelGague", fuelGague); + writeNetworkNBT(tags); + } + + public void readNetworkNBT (NBTTagCompound tags) + { + direction = tags.getByte("Direction"); + } + + public void writeNetworkNBT (NBTTagCompound tags) + { + tags.setByte("Direction", direction); + } + + /* Packets */ + @Override + public Packet getDescriptionPacket () + { + NBTTagCompound tag = new NBTTagCompound(); + writeNetworkNBT(tag); + return new Packet132TileEntityData(xCoord, yCoord, zCoord, 1, tag); + } + + @Override + public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) + { + readNetworkNBT(packet.data); + worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); + } + + @Override + public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) + { + return new FurnaceContainer(inventoryplayer, this); + } + + @Override + public byte getRenderDirection () + { + return direction; + } + + @Override + public ForgeDirection getForgeDirection () + { + return ForgeDirection.VALID_DIRECTIONS[direction]; + } + + @Override + @Deprecated + public void setDirection (int side) + { + //Nope! + } + + @Override + @Deprecated + public void setDirection (float yaw, float pitch, EntityLivingBase player) + { + int facing = MathHelper.floor_double((double) (yaw / 360) + 0.5D) & 3; + switch (facing) + { + case 0: + direction = 2; + break; + + case 1: + direction = 5; + break; + + case 2: + direction = 3; + break; + + case 3: + direction = 4; + break; + } + } +} diff --git a/src/tconstruct/blocks/slime/SlimeGel.java b/src/tconstruct/blocks/slime/SlimeGel.java index 25fa7dd4..0e9f4bdc 100644 --- a/src/tconstruct/blocks/slime/SlimeGel.java +++ b/src/tconstruct/blocks/slime/SlimeGel.java @@ -6,7 +6,10 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import tconstruct.blocks.TConstructBlock; @@ -48,6 +51,10 @@ public class SlimeGel extends TConstructBlock world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.stepSound.getStepSound(), (var9.stepSound.getVolume()) / 2.0F, var9.stepSound.getPitch() * 0.65F); } entity.motionY *= -1.2F; + if (entity instanceof EntityLivingBase) + { + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 1, 4)); + } } entity.fallDistance = 0; } diff --git a/src/tconstruct/client/TProxyClient.java b/src/tconstruct/client/TProxyClient.java index f1011aac..7531b3a7 100644 --- a/src/tconstruct/client/TProxyClient.java +++ b/src/tconstruct/client/TProxyClient.java @@ -91,6 +91,8 @@ public class TProxyClient extends TProxyCommon return new CraftingStationGui(player.inventory, (CraftingStationLogic) world.getBlockTileEntity(x, y, z), x, y, z); if (ID == advDrawbridgeID) return new AdvDrawbridgeGui(player, (AdvancedDrawbridgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + if (ID == furnaceID) + return new FurnaceGui(player.inventory, (FurnaceLogic) world.getBlockTileEntity(x, y, z)); if (ID == manualGuiID) { diff --git a/src/tconstruct/client/gui/FurnaceGui.java b/src/tconstruct/client/gui/FurnaceGui.java new file mode 100644 index 00000000..15902873 --- /dev/null +++ b/src/tconstruct/client/gui/FurnaceGui.java @@ -0,0 +1,58 @@ +package tconstruct.client.gui; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + +import tconstruct.blocks.logic.FurnaceLogic; +import tconstruct.inventory.FurnaceContainer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class FurnaceGui extends GuiContainer +{ + private static final ResourceLocation furnaceGuiTextures = new ResourceLocation("textures/gui/container/furnace.png"); + private FurnaceLogic logic; + + public FurnaceGui(InventoryPlayer inventory, FurnaceLogic furnace) + { + super(new FurnaceContainer(inventory, furnace)); + this.logic = furnace; + } + + /** + * Draw the foreground layer for the GuiContainer (everything in front of the items) + */ + protected void drawGuiContainerForegroundLayer(int par1, int par2) + { + String s = this.logic.isInvNameLocalized() ? this.logic.getInvName() : I18n.getString(this.logic.getInvName()); + this.fontRenderer.drawString(s, this.xSize / 2 - this.fontRenderer.getStringWidth(s) / 2, 6, 4210752); + this.fontRenderer.drawString(I18n.getString("container.inventory"), 8, this.ySize - 96 + 2, 4210752); + } + + /** + * Draw the background layer for the GuiContainer (everything behind the items) + */ + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) + { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + this.mc.getTextureManager().bindTexture(furnaceGuiTextures); + int k = (this.width - this.xSize) / 2; + int l = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + int i1; + + if (this.logic.isBurning()) + { + i1 = this.logic.gaugeFuelScaled(12); + this.drawTexturedModalRect(k + 56, l + 36 + 12 - i1, 176, 12 - i1, 14, i1 + 2); + } + + i1 = this.logic.gaugeProgressScaled(24); + this.drawTexturedModalRect(k + 79, l + 34, 176, 14, i1 + 1, 16); + } +} diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 8f4d3347..8f5247b4 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -127,6 +127,7 @@ public class TContent implements IFuelHandler public static Block toolForge; public static Block craftingStationWood; public static Block craftingSlabWood; + public static Block furnaceSlab; public static Block heldItemBlock; public static Block craftedSoil; @@ -315,41 +316,6 @@ public class TContent implements IFuelHandler EntityRegistry.registerModEntity(BlueSlime.class, "EdibleSlime", 12, TConstruct.instance, 64, 5, true); //EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, TConstruct.instance, 64, 5, true); - - /*BiomeGenBase[] plains = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.PLAINS); - BiomeGenBase[] mountain = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.MOUNTAIN); - BiomeGenBase[] hills = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.HILLS); - BiomeGenBase[] swamp = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.SWAMP); - BiomeGenBase[] desert = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.DESERT); - BiomeGenBase[] frozen = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.FROZEN); - BiomeGenBase[] jungle = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.JUNGLE); - BiomeGenBase[] wasteland = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.WASTELAND); - - BiomeGenBase[] nether = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.NETHER);*/ - - /*if (PHConstruct.blueSlime) - { - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, plains); - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, mountain); - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, hills); - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, swamp); - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, desert); - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, frozen); - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, jungle); - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, wasteland); - } - - try - { - Class.forName("extrabiomes.api.BiomeManager"); - Collection ebxlCollection = BiomeManager.getBiomes(); - BiomeGenBase[] ebxlBiomes = (BiomeGenBase[]) ebxlCollection.toArray(); - EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, ebxlBiomes); - } - catch (Exception e) - { - - }*/ } public static Fluid[] fluids = new Fluid[25]; @@ -375,6 +341,10 @@ public class TContent implements IFuelHandler craftingSlabWood = new CraftingSlab(PHConstruct.woodCrafterSlab, Material.wood).setUnlocalizedName("CraftingSlab"); GameRegistry.registerBlock(craftingSlabWood, CraftingSlabItemBlock.class, "CraftingSlab"); + + furnaceSlab = new FurnaceSlab(PHConstruct.furnaceSlab, Material.rock).setUnlocalizedName("FurnaceSlab"); + GameRegistry.registerBlock(furnaceSlab, "FurnaceSlab"); + GameRegistry.registerTileEntity(FurnaceLogic.class, "TConstruct.Furnace"); heldItemBlock = new EquipBlock(PHConstruct.heldItemBlock, Material.wood).setUnlocalizedName("Frypan"); GameRegistry.registerBlock(heldItemBlock, "HeldItemBlock"); @@ -397,7 +367,7 @@ public class TContent implements IFuelHandler GameRegistry.registerBlock(metalBlock, MetalItemBlock.class, "MetalBlock"); meatBlock = new MeatBlock(PHConstruct.meatBlock).setUnlocalizedName("tconstruct.meatblock"); - GameRegistry.registerBlock(meatBlock, "MeatBlock"); + GameRegistry.registerBlock(meatBlock, HamboneItemBlock.class, "MeatBlock"); OreDictionary.registerOre("hambone", new ItemStack(meatBlock)); LanguageRegistry.addName(meatBlock, "Hambone"); diff --git a/src/tconstruct/common/TProxyCommon.java b/src/tconstruct/common/TProxyCommon.java index 4fa9f1c8..d7ca850f 100644 --- a/src/tconstruct/common/TProxyCommon.java +++ b/src/tconstruct/common/TProxyCommon.java @@ -26,8 +26,9 @@ public class TProxyCommon implements IGuiHandler public static int stencilTableID = 3; public static int frypanGuiID = 4; public static int toolForgeID = 5; - public static int smelteryGuiID = 7; + public static int smelteryGuiID = 7; + public static int furnaceID = 8; public static int drawbridgeID = 9; public static int landmineID = 10; public static int craftingStationID = 11; diff --git a/src/tconstruct/inventory/FurnaceContainer.java b/src/tconstruct/inventory/FurnaceContainer.java new file mode 100644 index 00000000..9ba49180 --- /dev/null +++ b/src/tconstruct/inventory/FurnaceContainer.java @@ -0,0 +1,183 @@ +package tconstruct.inventory; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.inventory.SlotFurnace; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.tileentity.TileEntityFurnace; +import tconstruct.blocks.logic.FurnaceLogic; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class FurnaceContainer extends Container +{ + private FurnaceLogic furnace; + private int lastCookTime; + private int lastBurnTime; + private int lastItemBurnTime; + + public FurnaceContainer(InventoryPlayer par1InventoryPlayer, FurnaceLogic par2TileEntityFurnace) + { + this.furnace = par2TileEntityFurnace; + this.addSlotToContainer(new Slot(par2TileEntityFurnace, 0, 56, 17)); + this.addSlotToContainer(new Slot(par2TileEntityFurnace, 1, 56, 53)); + this.addSlotToContainer(new SlotFurnace(par1InventoryPlayer.player, par2TileEntityFurnace, 2, 116, 35)); + int i; + + for (i = 0; i < 3; ++i) + { + for (int j = 0; j < 9; ++j) + { + this.addSlotToContainer(new Slot(par1InventoryPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + } + } + + for (i = 0; i < 9; ++i) + { + this.addSlotToContainer(new Slot(par1InventoryPlayer, i, 8 + i * 18, 142)); + } + } + + public void addCraftingToCrafters(ICrafting par1ICrafting) + { + super.addCraftingToCrafters(par1ICrafting); + par1ICrafting.sendProgressBarUpdate(this, 0, this.furnace.progress); + par1ICrafting.sendProgressBarUpdate(this, 1, this.furnace.fuel); + par1ICrafting.sendProgressBarUpdate(this, 2, this.furnace.fuelGague); + } + + /** + * Looks for changes made in the container, sends them to every listener. + */ + public void detectAndSendChanges() + { + super.detectAndSendChanges(); + + for (int i = 0; i < this.crafters.size(); ++i) + { + ICrafting icrafting = (ICrafting)this.crafters.get(i); + + if (this.lastCookTime != this.furnace.progress) + { + icrafting.sendProgressBarUpdate(this, 0, this.furnace.progress); + } + + if (this.lastBurnTime != this.furnace.fuel) + { + icrafting.sendProgressBarUpdate(this, 1, this.furnace.fuel); + } + + if (this.lastItemBurnTime != this.furnace.fuelGague) + { + icrafting.sendProgressBarUpdate(this, 2, this.furnace.fuelGague); + } + } + + this.lastCookTime = this.furnace.progress; + this.lastBurnTime = this.furnace.fuel; + this.lastItemBurnTime = this.furnace.fuelGague; + } + + @SideOnly(Side.CLIENT) + public void updateProgressBar(int par1, int par2) + { + if (par1 == 0) + { + this.furnace.progress = par2; + } + + if (par1 == 1) + { + this.furnace.fuel = par2; + } + + if (par1 == 2) + { + this.furnace.fuelGague = par2; + } + } + + public boolean canInteractWith(EntityPlayer par1EntityPlayer) + { + return this.furnace.isUseableByPlayer(par1EntityPlayer); + } + + /** + * Called when a player shift-clicks on a slot. You must override this or you will crash when someone does that. + */ + public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) + { + ItemStack itemstack = null; + Slot slot = (Slot)this.inventorySlots.get(par2); + + if (slot != null && slot.getHasStack()) + { + ItemStack itemstack1 = slot.getStack(); + itemstack = itemstack1.copy(); + + if (par2 == 2) + { + if (!this.mergeItemStack(itemstack1, 3, 39, true)) + { + return null; + } + + slot.onSlotChange(itemstack1, itemstack); + } + else if (par2 != 1 && par2 != 0) + { + if (FurnaceRecipes.smelting().getSmeltingResult(itemstack1) != null) + { + if (!this.mergeItemStack(itemstack1, 0, 1, false)) + { + return null; + } + } + else if (TileEntityFurnace.isItemFuel(itemstack1)) + { + if (!this.mergeItemStack(itemstack1, 1, 2, false)) + { + return null; + } + } + else if (par2 >= 3 && par2 < 30) + { + if (!this.mergeItemStack(itemstack1, 30, 39, false)) + { + return null; + } + } + else if (par2 >= 30 && par2 < 39 && !this.mergeItemStack(itemstack1, 3, 30, false)) + { + return null; + } + } + else if (!this.mergeItemStack(itemstack1, 3, 39, false)) + { + return null; + } + + if (itemstack1.stackSize == 0) + { + slot.putStack((ItemStack)null); + } + else + { + slot.onSlotChanged(); + } + + if (itemstack1.stackSize == itemstack.stackSize) + { + return null; + } + + slot.onPickupFromSlot(par1EntityPlayer, itemstack1); + } + + return itemstack; + } +} diff --git a/src/tconstruct/items/blocks/HamboneItemBlock.java b/src/tconstruct/items/blocks/HamboneItemBlock.java new file mode 100644 index 00000000..3a289786 --- /dev/null +++ b/src/tconstruct/items/blocks/HamboneItemBlock.java @@ -0,0 +1,155 @@ +package tconstruct.items.blocks; + +import java.util.List; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class HamboneItemBlock extends ItemBlock +{ + public HamboneItemBlock(int id) + { + super(id); + itemUseDuration = 32; + if (Loader.isModLoaded("HungerOverhaul")) + { + healAmount = 8; + saturationModifier = 0.8f; + } + else + { + healAmount = 20; + saturationModifier = 3.0f; + } + isWolfsFavoriteMeat = true; + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) + { + list.add("\u00A74Hambone!"); + list.add("Usable for Beacon bases"); + } + + /** Number of ticks to run while 'EnumAction'ing until result. */ + public final int itemUseDuration; + + /** The amount this food item heals the player. */ + private final int healAmount; + private final float saturationModifier; + + /** Whether wolves like this food (true for raw and cooked porkchop). */ + private final boolean isWolfsFavoriteMeat; + + /** + * If this field is true, the food can be consumed even if the player don't need to eat. + */ + private boolean alwaysEdible; + + /** + * represents the potion effect that will occurr upon eating this food. Set by setPotionEffect + */ + private int potionId; + + /** set by setPotionEffect */ + private int potionDuration; + + /** set by setPotionEffect */ + private int potionAmplifier; + + /** probably of the set potion effect occurring */ + private float potionEffectProbability; + + /*public ItemFood(int par1, int par2, float par3, boolean par4) + { + super(par1); + this.itemUseDuration = 32; + this.healAmount = par2; + this.isWolfsFavoriteMeat = par4; + this.saturationModifier = par3; + this.setCreativeTab(CreativeTabs.tabFood); + } + + public ItemFood(int par1, int par2, boolean par3) + { + this(par1, par2, 0.6F, par3); + }*/ + + public ItemStack onEaten (ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) + { + --par1ItemStack.stackSize; + par3EntityPlayer.getFoodStats().addStats(getHealAmount(), getSaturationModifier()); + par2World.playSoundAtEntity(par3EntityPlayer, "random.burp", 0.5F, par2World.rand.nextFloat() * 0.1F + 0.9F); + this.onFoodEaten(par1ItemStack, par2World, par3EntityPlayer); + return par1ItemStack; + } + + protected void onFoodEaten (ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) + { + if (!par2World.isRemote && this.potionId > 0 && par2World.rand.nextFloat() < this.potionEffectProbability) + { + par3EntityPlayer.addPotionEffect(new PotionEffect(this.potionId, this.potionDuration * 20, this.potionAmplifier)); + } + } + + /** + * How long it takes to use or consume an item + */ + public int getMaxItemUseDuration (ItemStack par1ItemStack) + { + return 32; + } + + /** + * returns the action that specifies what animation to play when the items is being used + */ + public EnumAction getItemUseAction (ItemStack par1ItemStack) + { + return EnumAction.eat; + } + + /** + * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer + */ + public ItemStack onItemRightClick (ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) + { + if (par3EntityPlayer.canEat(this.alwaysEdible)) + { + par3EntityPlayer.setItemInUse(par1ItemStack, this.getMaxItemUseDuration(par1ItemStack)); + } + + return par1ItemStack; + } + + public int getHealAmount () + { + return this.healAmount; + } + + /** + * gets the saturationModifier of the ItemFood + */ + public float getSaturationModifier () + { + return this.saturationModifier; + } + + /** + * Whether wolves like this food (true for raw and cooked porkchop). + */ + public boolean isWolfsFavoriteMeat () + { + return this.isWolfsFavoriteMeat; + } +} diff --git a/src/tconstruct/library/blocks/InventorySlab.java b/src/tconstruct/library/blocks/InventorySlab.java new file mode 100644 index 00000000..aa9f58df --- /dev/null +++ b/src/tconstruct/library/blocks/InventorySlab.java @@ -0,0 +1,79 @@ +package tconstruct.library.blocks; + +import java.util.List; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +public abstract class InventorySlab extends InventoryBlock +{ + public InventorySlab(int id, Material material) + { + super(id, material); + } + + /* Rendering */ + @Override + public boolean renderAsNormalBlock () + { + return false; + } + + @Override + public boolean isOpaqueCube () + { + return false; + } + + @Override + public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) + { + if (side > 1) + return super.shouldSideBeRendered(world, x, y, z, side); + + int meta = world.getBlockMetadata(x, y, z); + boolean top = (meta | 8) == 1; + if ((top && side == 0) || (!top && side == 1)) + return true; + + return super.shouldSideBeRendered(world, x, y, z, side); + } + + @Override + public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, Entity entity) + { + setBlockBoundsBasedOnState(world, x, y, z); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); + } + + public void setBlockBoundsForItemRender () + { + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); + } + + public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z) + { + int meta = world.getBlockMetadata(x, y, z) / 8; + float minY = meta == 1 ? 0.5F : 0.0F; + float maxY = meta == 1 ? 1.0F : 0.5F; + setBlockBounds(0.0F, minY, 0F, 1.0F, maxY, 1.0F); + } + + public int onBlockPlaced (World par1World, int blockX, int blockY, int blockZ, int side, float clickX, float clickY, float clickZ, int metadata) + { + if (side == 1) + return metadata; + if (side == 0 || clickY >= 0.5F) + return metadata | 8; + + return metadata; + } + + public int damageDropped (int meta) + { + return meta % 8; + } +} diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index 470ea88e..b45f070f 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -104,6 +104,8 @@ public class PHConstruct slimeChannel = config.getBlock("Slime Channel", 3190).getInt(3190); slimePad = config.getBlock("Slime Pad", 3191).getInt(3191); + + furnaceSlab = config.getBlock("Furnace Slab", 3192).getInt(3192); //Thermal Expansion moltenSilver = config.getBlock("Molten Silver", 3195).getInt(3195); @@ -131,9 +133,10 @@ public class PHConstruct blood = config.getBlock("Liquid Cow", 3217).getInt(3217); moltenEnder = config.getBlock("Molten Ender", 3218).getInt(3218); - //3221+ - //3221 - //3222 + + + signalBus = config.getBlock("Signal Bus", 3221).getInt(3221); + signalTerminal = config.getBlock("Signal Terminal", 3222).getInt(3222); glass = config.getBlock("Clear Glass", 3223).getInt(3223); stainedGlass = config.getBlock("Stained Glass", 3224).getInt(3224); stainedGlassClear = config.getBlock("Clear Stained Glass", 3225).getInt(3225); @@ -178,8 +181,7 @@ public class PHConstruct slimeExplosive = config.getBlock("SDX", 3247).getInt(3247); castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249); woodenRail = config.getBlock("Wooden Rail", 3250).getInt(3250); - signalBus = config.getBlock("Signal Bus", 3251).getInt(3251); - signalTerminal = config.getBlock("Signal Terminal", 3252).getInt(3252); + //3251+ belongs to Natura. Go backwards! manual = config.getItem("Patterns and Misc", "Tinker's Manual", 14018).getInt(14018); blankPattern = config.getItem("Patterns and Misc", "Blank Patterns", 14019).getInt(14019); @@ -397,6 +399,7 @@ public class PHConstruct public static int heldItemBlock; public static int woodCrafter; public static int woodCrafterSlab; + public static int furnaceSlab; public static int ores; public static int lavaTank;