From 2f5d798753d1642eb5ee5f15270b6fe73bfdce3c Mon Sep 17 00:00:00 2001 From: mDiyo Date: Sat, 9 Mar 2013 03:49:04 -0800 Subject: [PATCH] Last commit for 1.4.7 --- .../blocks/castingtable_bottom.png | Bin 0 -> 273 bytes .../blocks/castingtable_side.png | Bin 0 -> 373 bytes .../blocks/castingtable_top.png | Bin 0 -> 255 bytes .../blocks/compressed_alubrass.png | Bin 0 -> 232 bytes .../blocks/compressed_aluminum.png | Bin 0 -> 445 bytes .../blocks/compressed_alumite.png | Bin 0 -> 423 bytes .../blocks/compressed_ardite.png | Bin 0 -> 362 bytes .../blocks/compressed_bronze.png | Bin 0 -> 380 bytes .../blocks/compressed_cobalt.png | Bin 0 -> 460 bytes .../blocks/compressed_copper.png | Bin 0 -> 449 bytes .../blocks/compressed_manyullyn.png | Bin 0 -> 443 bytes .../blocks/compressed_steel.png | Bin 0 -> 481 bytes .../tinkertextures/blocks/compressed_tin.png | Bin 0 -> 473 bytes .../tinkertextures/blocks/drain_basin.png | Bin 0 -> 381 bytes resources/tinkertextures/blocks/drain_out.png | Bin 0 -> 336 bytes .../tinkertextures/blocks/drain_side.png | Bin 0 -> 406 bytes resources/tinkertextures/blocks/faucet.png | Bin 0 -> 293 bytes resources/tinkertextures/blocks/grout.png | Bin 0 -> 547 bytes .../tinkertextures/blocks/lavatank_side.png | Bin 0 -> 379 bytes .../tinkertextures/blocks/lavatank_top.png | Bin 0 -> 417 bytes .../tinkertextures/blocks/nether_ardite.png | Bin 0 -> 719 bytes .../tinkertextures/blocks/nether_cobalt.png | Bin 0 -> 628 bytes .../tinkertextures/blocks/nether_slag.png | Bin 0 -> 624 bytes .../tinkertextures/blocks/ore_aluminum.png | Bin 0 -> 334 bytes .../tinkertextures/blocks/ore_copper.png | Bin 0 -> 267 bytes resources/tinkertextures/blocks/ore_slag.png | Bin 0 -> 930 bytes resources/tinkertextures/blocks/ore_tin.png | Bin 0 -> 272 bytes .../blocks/partbuilder_birch_bottom.png | Bin 0 -> 742 bytes .../blocks/partbuilder_birch_side.png | Bin 0 -> 675 bytes .../blocks/partbuilder_birch_top.png | Bin 0 -> 319 bytes .../blocks/partbuilder_jungle_bottom.png | Bin 0 -> 609 bytes .../blocks/partbuilder_jungle_side.png | Bin 0 -> 569 bytes .../blocks/partbuilder_jungle_top.png | Bin 0 -> 319 bytes .../blocks/partbuilder_oak_bottom.png | Bin 0 -> 528 bytes .../blocks/partbuilder_oak_side.png | Bin 0 -> 510 bytes .../blocks/partbuilder_oak_top.png | Bin 0 -> 319 bytes .../blocks/partbuilder_spruce_bottom.png | Bin 0 -> 451 bytes .../blocks/partbuilder_spruce_side.png | Bin 0 -> 461 bytes .../blocks/partbuilder_spruce_top.png | Bin 0 -> 319 bytes .../blocks/patternchest_bottom.png | Bin 0 -> 410 bytes .../blocks/patternchest_side.png | Bin 0 -> 391 bytes .../blocks/patternchest_top.png | Bin 0 -> 410 bytes .../tinkertextures/blocks/searedbrick.png | Bin 0 -> 404 bytes .../blocks/searedgague_bottom.png | Bin 0 -> 236 bytes .../blocks/searedgague_side.png | Bin 0 -> 264 bytes .../tinkertextures/blocks/searedgague_top.png | Bin 0 -> 258 bytes .../blocks/searedwindow_bottom.png | Bin 0 -> 231 bytes .../blocks/searedwindow_side.png | Bin 0 -> 304 bytes .../blocks/searedwindow_top.png | Bin 0 -> 218 bytes resources/tinkertextures/blocks/slimesand.png | Bin 0 -> 771 bytes .../tinkertextures/blocks/smeltery_active.png | Bin 0 -> 433 bytes .../blocks/smeltery_inactive.png | Bin 0 -> 411 bytes .../tinkertextures/blocks/smeltery_side.png | Bin 0 -> 404 bytes .../blocks/stenciltable_birch_bottom.png | Bin 0 -> 265 bytes .../blocks/stenciltable_birch_side.png | Bin 0 -> 314 bytes .../blocks/stenciltable_jungle_bottom.png | Bin 0 -> 263 bytes .../blocks/stenciltable_jungle_side.png | Bin 0 -> 302 bytes .../blocks/stenciltable_jungle_top.png | Bin 0 -> 321 bytes .../blocks/stenciltable_oak_bottom.png | Bin 0 -> 247 bytes .../blocks/stenciltable_oak_side.png | Bin 0 -> 257 bytes .../blocks/stenciltable_oak_top.png | Bin 0 -> 321 bytes .../blocks/stenciltable_spruce_bottom.png | Bin 0 -> 254 bytes .../blocks/stenciltable_spruce_side.png | Bin 0 -> 298 bytes .../blocks/stenciltable_spruce_top.png | Bin 0 -> 321 bytes .../blocks/toolstation_bottom.png | Bin 0 -> 247 bytes .../blocks/toolstation_side.png | Bin 0 -> 273 bytes .../tinkertextures/blocks/toolstation_top.png | Bin 0 -> 304 bytes resources/tinkertextures/mob/crystalwater.png | Bin 0 -> 1636 bytes tinker/tconstruct/AbilityHelper.java | 55 +--- tinker/tconstruct/PHConstruct.java | 9 + tinker/tconstruct/TConstruct.java | 34 ++- tinker/tconstruct/TContent.java | 8 +- tinker/tconstruct/TControls.java | 120 +++++++++ tinker/tconstruct/TEventHandler.java | 9 + tinker/tconstruct/TPacketHandler.java | 11 +- tinker/tconstruct/TProxyCommon.java | 2 + tinker/tconstruct/client/TKeyHandler.java | 126 +++++++++ tinker/tconstruct/client/TProxyClient.java | 64 ++++- .../client/entityrender/CrystalModel.java | 54 ++++ .../client/entityrender/CrystalRender.java | 164 +++++++++++ .../client/entityrender/SkylaRender.java | 102 +------ .../container/SmelteryContainer.java | 18 +- tinker/tconstruct/entity/Crystal.java | 21 ++ tinker/tconstruct/entity/Skyla.java | 255 ++---------------- tinker/tconstruct/items/ToolPart.java | 2 +- tinker/tconstruct/player/TPlayerHandler.java | 162 +++++++++++ tinker/tconstruct/player/TPlayerStats.java | 15 ++ 87 files changed, 818 insertions(+), 413 deletions(-) create mode 100644 resources/tinkertextures/blocks/castingtable_bottom.png create mode 100644 resources/tinkertextures/blocks/castingtable_side.png create mode 100644 resources/tinkertextures/blocks/castingtable_top.png create mode 100644 resources/tinkertextures/blocks/compressed_alubrass.png create mode 100644 resources/tinkertextures/blocks/compressed_aluminum.png create mode 100644 resources/tinkertextures/blocks/compressed_alumite.png create mode 100644 resources/tinkertextures/blocks/compressed_ardite.png create mode 100644 resources/tinkertextures/blocks/compressed_bronze.png create mode 100644 resources/tinkertextures/blocks/compressed_cobalt.png create mode 100644 resources/tinkertextures/blocks/compressed_copper.png create mode 100644 resources/tinkertextures/blocks/compressed_manyullyn.png create mode 100644 resources/tinkertextures/blocks/compressed_steel.png create mode 100644 resources/tinkertextures/blocks/compressed_tin.png create mode 100644 resources/tinkertextures/blocks/drain_basin.png create mode 100644 resources/tinkertextures/blocks/drain_out.png create mode 100644 resources/tinkertextures/blocks/drain_side.png create mode 100644 resources/tinkertextures/blocks/faucet.png create mode 100644 resources/tinkertextures/blocks/grout.png create mode 100644 resources/tinkertextures/blocks/lavatank_side.png create mode 100644 resources/tinkertextures/blocks/lavatank_top.png create mode 100644 resources/tinkertextures/blocks/nether_ardite.png create mode 100644 resources/tinkertextures/blocks/nether_cobalt.png create mode 100644 resources/tinkertextures/blocks/nether_slag.png create mode 100644 resources/tinkertextures/blocks/ore_aluminum.png create mode 100644 resources/tinkertextures/blocks/ore_copper.png create mode 100644 resources/tinkertextures/blocks/ore_slag.png create mode 100644 resources/tinkertextures/blocks/ore_tin.png create mode 100644 resources/tinkertextures/blocks/partbuilder_birch_bottom.png create mode 100644 resources/tinkertextures/blocks/partbuilder_birch_side.png create mode 100644 resources/tinkertextures/blocks/partbuilder_birch_top.png create mode 100644 resources/tinkertextures/blocks/partbuilder_jungle_bottom.png create mode 100644 resources/tinkertextures/blocks/partbuilder_jungle_side.png create mode 100644 resources/tinkertextures/blocks/partbuilder_jungle_top.png create mode 100644 resources/tinkertextures/blocks/partbuilder_oak_bottom.png create mode 100644 resources/tinkertextures/blocks/partbuilder_oak_side.png create mode 100644 resources/tinkertextures/blocks/partbuilder_oak_top.png create mode 100644 resources/tinkertextures/blocks/partbuilder_spruce_bottom.png create mode 100644 resources/tinkertextures/blocks/partbuilder_spruce_side.png create mode 100644 resources/tinkertextures/blocks/partbuilder_spruce_top.png create mode 100644 resources/tinkertextures/blocks/patternchest_bottom.png create mode 100644 resources/tinkertextures/blocks/patternchest_side.png create mode 100644 resources/tinkertextures/blocks/patternchest_top.png create mode 100644 resources/tinkertextures/blocks/searedbrick.png create mode 100644 resources/tinkertextures/blocks/searedgague_bottom.png create mode 100644 resources/tinkertextures/blocks/searedgague_side.png create mode 100644 resources/tinkertextures/blocks/searedgague_top.png create mode 100644 resources/tinkertextures/blocks/searedwindow_bottom.png create mode 100644 resources/tinkertextures/blocks/searedwindow_side.png create mode 100644 resources/tinkertextures/blocks/searedwindow_top.png create mode 100644 resources/tinkertextures/blocks/slimesand.png create mode 100644 resources/tinkertextures/blocks/smeltery_active.png create mode 100644 resources/tinkertextures/blocks/smeltery_inactive.png create mode 100644 resources/tinkertextures/blocks/smeltery_side.png create mode 100644 resources/tinkertextures/blocks/stenciltable_birch_bottom.png create mode 100644 resources/tinkertextures/blocks/stenciltable_birch_side.png create mode 100644 resources/tinkertextures/blocks/stenciltable_jungle_bottom.png create mode 100644 resources/tinkertextures/blocks/stenciltable_jungle_side.png create mode 100644 resources/tinkertextures/blocks/stenciltable_jungle_top.png create mode 100644 resources/tinkertextures/blocks/stenciltable_oak_bottom.png create mode 100644 resources/tinkertextures/blocks/stenciltable_oak_side.png create mode 100644 resources/tinkertextures/blocks/stenciltable_oak_top.png create mode 100644 resources/tinkertextures/blocks/stenciltable_spruce_bottom.png create mode 100644 resources/tinkertextures/blocks/stenciltable_spruce_side.png create mode 100644 resources/tinkertextures/blocks/stenciltable_spruce_top.png create mode 100644 resources/tinkertextures/blocks/toolstation_bottom.png create mode 100644 resources/tinkertextures/blocks/toolstation_side.png create mode 100644 resources/tinkertextures/blocks/toolstation_top.png create mode 100644 resources/tinkertextures/mob/crystalwater.png create mode 100644 tinker/tconstruct/TControls.java create mode 100644 tinker/tconstruct/client/TKeyHandler.java create mode 100644 tinker/tconstruct/client/entityrender/CrystalModel.java create mode 100644 tinker/tconstruct/client/entityrender/CrystalRender.java create mode 100644 tinker/tconstruct/entity/Crystal.java create mode 100644 tinker/tconstruct/player/TPlayerHandler.java create mode 100644 tinker/tconstruct/player/TPlayerStats.java diff --git a/resources/tinkertextures/blocks/castingtable_bottom.png b/resources/tinkertextures/blocks/castingtable_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..f6f554ad89493cd98a5e0b9a5dd4d0860f04d354 GIT binary patch literal 273 zcmV+s0q*{ZP)HM?KBo`_bo5@ z8Dm^?&IR^bgWmh?thKiC0YySV5&_+`)@8n2@MhYFI;yI7@i;{|^Wy&kK2uI|CRqdY z2^OO0-30bNx8lSW17>!rN|JCMcd@}@AYpQ6hl}jYZXyB_UG=J~1NQMI+SmLV@nIxC z)L!(xvp;ztM7C!|Ul$(FSlKgE6`RWTQQ5PaS?`{0AC*0`kZMrbJ}P_auPkc|Su5}Z XT@AFBWD3(g00000NkvXXu0mjf;V^cB literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/castingtable_side.png b/resources/tinkertextures/blocks/castingtable_side.png new file mode 100644 index 0000000000000000000000000000000000000000..c428b6480b3d34c40f7a6fc46d1e59465430e021 GIT binary patch literal 373 zcmV-*0gC>KP) zb&C}0Oe7~~&_}N-ih{y0WJ*BAu7_n=hq&EtT!$X?s%_h7nkIU^UYuy#mX>AV+%OD> znCF@LzNh#5P2)Injat`r7cU3`D$A18$wHIpfe}~(d}LlEtExH$cs`#84Hy7VAqxAx z|1;MG0}*ovKvL9460`n`0Y0Ju7;y4}fsBh>X5&&M&t;`HC0w^H>z;m4}7)KWohGJScAOOIqCkv+2tqe^*C1p*B T6(dQ^00000NkvXXu0mjf3lyGc literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/castingtable_top.png b/resources/tinkertextures/blocks/castingtable_top.png new file mode 100644 index 0000000000000000000000000000000000000000..cd18bc6681d5fd8d6e3f7a05963df00211d3f038 GIT binary patch literal 255 zcmVC=_1+D&R$H^Yg2!6x z-g}3ba~|Jg49f>l#0nsYL_puU87nuj8Ppfi@Ln>}1?=XmdZNIa^z5P%< zo5174Q%g1(bTQiB*E!a8(R8oHY?k8{ya$%P{KzP8aV(Qz*Rk~Wy@4i&KD>&`^kJT0 znsk}vutKc{+k)G_3ijK7WP9*Q*{E*IdH%lj`CFYO7`Ql+Ob(hHGKga?$aFg9uBI&6 zaC+J7+j|a5#2TL{6Jg$<>2zGdbb|`dC7w&{<_z=Qo^0X2#Bo@HEg`styZOrki3Z<~?^?EHq5QwAO z^Z8UBkH^>be!r^;1_nRLE0Cqmi^)t+#=7GH$n9 z6nnSZ=}eddU|=(8x7%+6Uu<0w({;64Y2+{r6*Iy>6R@#?+3?Qivl<{qL=BUt8Sn)- zYXbfxGD3#Lg!lWsivRm`fKjbh`%PejA})e&AVlP&229u9XmRP*?RHf}RNf1XMni?w zYE{zdv^X~QE?W^=+-9?>#fT7duGj0j&*gIB^7(x9F6&5<-_1HgrBaCuv)QaTesBbH zFO^DBp%t^1%jFMJsg$^6GAYGkQ3{2E3jMur#GZRg!8wsgh|6R$>c)kw6oP-o*i5ZS nJRW}=_>c%^gCd_;EcU?&5WoXdbZi6N{n;GxeycZA*GIbgxkGOh2hgnrUymROt5*6xgl(~x6+zE}>OY|JC zDmJUUA4Q7v6fQ8Ml|1kHT&{@8>LekpB`;tGwJBx|aJ z3ryfKT2|(@yc-}*3vuesZ)sG3oIsBmvV1|N*;(B7nE@Jzm&CEYF9LArME1xDTY+7> zb1_{x0C$HGBg5DaWrK|YZ~)9OVqA1ZfWEUP9YD&RV8+vVFJeBO*9c9p{{hwv8JLKu Rnd1Ne002ovPDHLkV1l3Ow_pGO literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/compressed_ardite.png b/resources/tinkertextures/blocks/compressed_ardite.png new file mode 100644 index 0000000000000000000000000000000000000000..dea374356f853e101ef2bf3ebdf1ad22fb8d6036 GIT binary patch literal 362 zcmV-w0hRuVP)4?!~}r{h5yrc^aKnd zeE4}M9}RHg&naz= z ztN(%t!k1>*i-Q4e{&YrslCJ%P_Ie3}SoGEIwM~bJm;-36bLeZJ;^#(L9=E!ctq}$n z%R}M_NLG;rv2B@RaJ^<`z)ux(SE|0Xx|Qv-Awa0lhtb)h>A(&ueslZwh%DYfr)%4# z+SO`4R8-EFdg9h(S{#AiOIL*2t`!hl+S3_votaE<*NXg%#mdQiPEHqcKHi%e6vroa zCdnpRvBh7(8gO_#mzAU0Y$6dOR?ans+Gwh45Id7-O^7j$^MZjwOU;S2G{y%4^|4d} aM3!Hr5fOSps8&T*Lq(&=u>py@z9DarNf+DA;*A&;=j@Ss}7!5C$n!ZiLYCb*R{SGSC3q zDIYORM%D~cC|COqP9tNG8n6NAwt+CRO<)Zb@BYh{zy2>@{1A*)i>`zD3?Kz6`4|4H zEY_Ym%1kO3e;p0I8Ixq{YXwUxKZW0I0L!7&!ou0upQh-l&7d2y)cHEdp8s;sXE>IbKlLz*)Nh0000 literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/compressed_copper.png b/resources/tinkertextures/blocks/compressed_copper.png new file mode 100644 index 0000000000000000000000000000000000000000..64fe9e0e8dbfb94ec8080d79d56da61ab98d0e5e GIT binary patch literal 449 zcmV;y0Y3hTP)pWqwW{@iw zKGdlF|4^d`Q3$26X@q$Xq!H$o%khHPT>vr^?rfk&SeSq?$N*TFTmgpxC=jvO3eya- z73O4^W*EL02Xq0*dGG*(1s>2)kO9a}28BE*RzMi!cMu=!0j(^?+luh=r@>{r@}evI41^fXftp{(28`R$}gl) z!s2%0s`rGJJq1Oy9nm9lV>Nb_Km@jjEpdFP#0C&8_UzL__nv|cuz_52qwm^gq>H1y z1)CUPfXD`))O}&VQ~hOH^A%mE&Ufvq$OgDOgjkt{UU#7zYydHYSQk@apw`wtm=n~k lD|GmE@{j1hP7cBlsi z2n>=9?{qq;0AxtGkvwLAKR~Y=Ai&BH4~K&$yxne<{NJww2xYU`?+t8FlgUI0e*q#S zCscrR?HlQ>TeVtM604Fp$mjD)%w#g+_xr_Auui>R|GW<(J>){6pqC**rqAVaT8G17 zF_B2*^DgViC8wKp1gTU?(&@C$LZOhDU@)kPz^W$_iO)sr&Y4Umf57MSiSc^95|76v z7KodJ1|BDuN(_q9782Hd{apM2)gdG(8IDT4K{l@_0rR^i;B^C5^(#>MgPS|Ho_th0I?KXV)9L3oCIQi z=`p@2|Mf&}@x)CJ`wk|e6||vmjZ_6195Z1vHsT^B=D;un4AOlRUy$DahG)va16> z3DiM>@Ebq`Nd*glBzrXD8gAGAG1Czf2lDGfCOI+JMgj%m;7w(JAYu)oN|U0ToCDWeHreqRE19w1yNtaSy<0 P00000NkvXXu0mjfm<__8 literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/drain_basin.png b/resources/tinkertextures/blocks/drain_basin.png new file mode 100644 index 0000000000000000000000000000000000000000..3c58c524f91a4e94a20deefcdfc1a9ecc93ab32a GIT binary patch literal 381 zcmV-@0fPRCP)&4SF?eKoTxounS`<}b5W7l<=5M0;whN38T`y@%YswxBA$+|2{zTfXm z$cPJpkVqhaGrb3C7=~=yHWNyfEILq=3N&FH$Lu%`6M8!f)@>Zy!8%RTUj^eh{>c(W z5nGnE1I~11K@j|AfT=#8PtNn)u%a|PAfg>`_INxD5#sR15TJ}Bt_VEOGtvR*-?V@k zV2}dHdPRV0;Ti20(!I-&t_aT5A#ETK;QQYYMTL#vXc+N==qyeJxpt*gLucA!?fbqN zlKAAxV03nYOdxpJlr$B~C&IANY=uIrlHw&kX2*s?4pY%a@EAxRSUJdb_fS3nHpd9ILU8QZqa zgo-$%>-r^tC;>oXDnXj2$0WkhyDgmNK#nhf z4Zi>dswn0_z5^@(_=hq8)nrbt7e#T*K~+^^uF(^mg){&g-XZf)jJ=NIFhPc47$Sfv i=bYkF6*2m+K z9LFJpjJOa8i39>T(|eGv*K4vYiwsJYEILq=3N+znv!T^$MFzdi1?x7Z?O>fG$-9Ef z#Cu>uv{)j4@~d=0CJb86)-Zp0RR9107*qoM6N<$f_8GU A1poj5 literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/faucet.png b/resources/tinkertextures/blocks/faucet.png new file mode 100644 index 0000000000000000000000000000000000000000..87be63622d6435625ab1aab17081708545495efe GIT binary patch literal 293 zcmV+=0owkFP)4%!UgW2`NmMVz}GAb#`Z5bsPuQb;Ws} z*!LadILf&!3+8!#!?tbcx(>rIpznLQt_#KDwryXis_HGy^Bhgn2>7P&bzQ^rJScYL zgN7#2g#>eEOwuTdVB0nnN7Y@-LX%X(ButV7j^jX4+oxhv##IjQMNvE_n5OAB59sP$ z4}^dd-1R^ta1ZW!@Y;iGm#c0<=X4x~;a}~+Pabd&vMfVcmcq)>OfW~JX^J2S5XZ5^ r{6+{k#y41&B`1r0-C z8*8-2R&S0hm8n@a|7hds+S;9|HQQqghEv)(Cr=GI7rV>rV={ZOZvV*+jzX4rs92@m z7cdPs@q*$~wW~FoZ!Lab7NGMJU{HG;3an6W+e5ng-%xD~EMIKtoVr$fV&O{qt*^*AEL^B^8%zJ$b-l05TnhafKX`05Df*3Xr0UU{dj2vZQMbhVCUR zbe$5A^QO=UO%^n10My5<;rLlGc}&ME2W99n$!p_&@dQQ`aT`1)*fMOj-pemMaZK9o zK5e)El4%s;0rc>ObM744i|04p1PmB(avC!S(tNR15xRMm04-O0ndcvrzX|I7qeF&+ zE+5=GNk0L4$N`WB^kXJ9Oh+!UqnQLiOz@9}-Ml3aSl%CA@E;W%>h_;}k1_xN002ovPDHLkV1n+}>=gh2 literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/lavatank_side.png b/resources/tinkertextures/blocks/lavatank_side.png new file mode 100644 index 0000000000000000000000000000000000000000..c88512578f5292f3356b874ee552fb1ab7e17528 GIT binary patch literal 379 zcmV->0fhdEP)JE_W0s`ET)U01rUi;m-< zaUAt?Sr(e-`3Kv!QP*`e3dtKM$c^)Y! z;)1~>NLGIb-#8HfX%t0w3`%7c4wT7!AjAZSOOk{f$03E@WCd?^K5wBs&+oWtntqc1 zs{leg2Otc?dj^p0|S0tCOIdwU%SeLf$(Ish?R2&JJv z2G(k-VBdG`0eD9GMakZINZKHVA<7vrlr#_s@HDjmHMz!zKpI3k(6j~VO0Gt|T?pvu z8n$3;L9#KRBuS9WE|vca;#3d>#DE825bPPgz}k?E-4{incaIo=bClexg!F}N+m8p{ ZcV8RbS2-%r+&2IK002ovPDHLkV1jvYo}2&x literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/lavatank_top.png b/resources/tinkertextures/blocks/lavatank_top.png new file mode 100644 index 0000000000000000000000000000000000000000..886e11afd8003e063a56bea279114ce2552937f1 GIT binary patch literal 417 zcmV;S0bc%zP)mlM1Earyv3WN)g`w5%%=?G{Hb|SBz}0o!Ob)jqAG3 zZnv8~pHFMs)=sCBU$57zHBIw|$Kzr9{oanpqa6+h8;wThc)Z)~dTcfuo6TmnTrPWX z2HWknM_HCO9*@nDk&gz0!M^}emSvXbxj#Fkl7$0yI193ZGWG!3SXixA7RRwUyiKRm zo&a{qL>V9k$Swk@cIWfCSAd-~O>MDQ*nB>>BuTtf03q+9DDp}m^fjQWQb0F&$j6~? zh>4>>1nc$smmsWx6o>$itoQr9w-6F|3!wsaqMaK!K9_InaNg2@EHXY>Mf= zs;bu<)OGC#1y58KX+XY1D2`&@P9_s`$QTZX{yJphPbh&bJLlo)ApvDI!%X8oh?%==|v)m{1S;^L5T&u zP!SCJ(AQw!>`w$m`7^HWbLR6fKb+m%d#-bx>pJJ$;`oCHU!GpX$8;L6;&GJrRFN1GVnC$|CJtvfpp&=A4jO+93pK-#DiwcyWRMl z%|a0K{;ekLj*X$!XhfvB8805Wa6i|GLQ2Jav;lFSnH5m9)zx9Pt4qI&yZ!wbaJf)l zQ^Oy=PERA>-Ho?1Gbpa7QAns9lYJHpbQ;cBV1j>t4q5KA>pi-!=ZOS|^OW>uG>XkR zJC>3PmZAzqeI_jW6#gbE*|Z?AW<#@>8n9q|$by53eq=g3VXCdgC4&Ki8bki6^TasS z-VRk(9=>A4sNckWAd;1g!sq&e%HO!Ll33`?kqu19ZHbA>y|^ly-C;IE2!Y?FL;U^q8e%&X;$@+# zg`kQ)XB|AMiuH_&m4t$mlXut&hw%_D-yazwGwy-lYqQ8N)2^HJ93%C(!C`+HP;YrMiZ_CSP z_T@n^$asB>E?K3R%OT`Ek5#Xi)m-x!ST=1Q-RU76q*B-&97Ko7R9 z6ReVq9u4_?FB9lZ3^g@jFV+jMqQEbwFCf0j1$Q7-If--SzJ`V-qwbV;CVa@hjEzC z!z{~z83_*b^x&4y=VWv*|9}Zq(I=!kGc!tHV^Ja6OD17T@i?yg{pf3N$Nlkfd=+W- zk@2mooxQq?3te5f;_*1&FN7>NItp|8>6K>NyM0Xww5}TXoRB(XwOD*`5JwvsY&AFQ zdy|mb_tR-SnV9$|Gqcd_+4_S!an0hjbS45f1^zOAmJvao;$ zp%C0cV1b&Yrl>wMG3f9WH zF4x}@?5|7}Q(iA}-ZSVIGLjPbQ2+$r92&ywWDJpk0Yu$yMC89<`F{Yyu+SL^VVbW1 O0000B2^|m%_1TW!HD1@V8 z5$2w37?I#WZ!c~Q4?7WGjE*AK*N1)~-I<@a1nP?j(SAA&Q;ElM-S0<#dpjOXPve_N z(?=6sUDmQ54@SGYan!SnBruVC07?fY{f zXe4r9!KIrVk zk5b8Y;C-QRKGJh@n4p67sVN)PFHuj{)^J}gpM=A<&y>l0xt?t1?MFIXUdG1RwnEn|}cDY~971wJ30000< KMNUMnLSTaS0V|^b literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/ore_aluminum.png b/resources/tinkertextures/blocks/ore_aluminum.png new file mode 100644 index 0000000000000000000000000000000000000000..332a9dbd4f501ca86a859f88719ad3234ec04d45 GIT binary patch literal 334 zcmV-U0kQsxP)XLh!@q9}Zx=PzI@ z%Q7I#vhe=r=Xlrv!8%$y2^GUxNPv;G?|XQUAJ5`qfuw=ikD@p&= zLW*{bxJ9+&Y&Oe)%Ch6w_r1UG`$;G*oU$qKJWsEM7D`HjrfI$mI9!&+AII^RK8~sW z9}VVt4wN->IY>+jbX^xF5bNOnDGV4Z7>2=b+ZK{wXV3TNB5_DHI~7_(3j$2lRwgfMpyQ gq-LJ#J8o6BA75s&sb({kJpcdz07*qoM6N<$f{}`iCIA2c literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/ore_copper.png b/resources/tinkertextures/blocks/ore_copper.png new file mode 100644 index 0000000000000000000000000000000000000000..1bd21a297bd46b80340b2d1baca8a8494f6242ab GIT binary patch literal 267 zcmV+m0rdWfP)M)B*P}GuUn774%l%}Fb8M(yA~?h8M#H;39kmW z&%LwbSD^a@R0h>N@%y}Xc(2%l0%tyw??cXtgJFq*oqGVPsu>7z#>^H#9_nyNdXN&| z3i6%R+YY}h)VS?QC>n-%wtpp6+bIvp8N9I1AS?U3#;TRwDOWqMhLs8M{QzO#cUcn{ RF9QGo002ovPDHLkV1k8NbI$+( literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/ore_slag.png b/resources/tinkertextures/blocks/ore_slag.png new file mode 100644 index 0000000000000000000000000000000000000000..cc33964833e58b48edeb00479c8b423d6d239e82 GIT binary patch literal 930 zcmV;T16}-yP)7(m}2saiEsi;}2SH*JY%8e)bvU<~hh0D}z%PY*ocf#(5(V=#jmJz!#^!~_g6 z2?=Eo6qH0tP&eIV)&FyPmv?dR{m%K0lwVlJ>NMdPb#Zd|3Tx0sAna#MHgQnjCHHoT zQMV7DI)TGJhS%yQ6PclLddT_dB~sAg$3EobrtykTpWhP-1qrBOHfjw@+f`QPGyHq~ zg~PooQmF)eLke5v3KoNj^+^rM(%nt9`ix{U&C<*ot}z!6TUt0ge#h;{f2eJhQHBO^ zdJ_!y^kN(uBs}4u^5z^ZF^kmIGk`_Wlg<^$mrCSP8iT`jip$FcLeo?V+njv3qF-FJ zt0NSP1$t$fTp~ex+e4&Oa)HLt8+!Cc#yrD#$5omi{7g8JBOIATHuPgu6mD*AxV*d~ zpWngn@so6_0^NZ0?yn0XT99ly&ZnDe=5tvtZ>}&|%_y>-Cmn5^pB=MbdrrtUNVT+q z-=7j5O4#iqNK;yj*>sF=zW$18eTTVZggf8fAsW4p85HAxwJ&>ma$sDnH!4&+n!-4012qA2)>H7~$+99*&PIvJ&1aGQ*y*c>j}JKNA3jjXS4&}TIwEiKPrwGT6&S*4IKplT@; zqe6T-N^M^}oR~u~E4W=M<@g$(Z*MtxU8h5*VY#3^`1a_1d2CCpORXyZ1i8ZR@%Q zT5IwCqPWI&tx zwMbm5667nZsx#dz)aW?}p=fC0(fsLAH66?Ufv%}0q6b;o;TWq@hE=X+UNtKdVEX{L W6I>V>M+r^<00002NN6!bp;YPtd9AE;C(ahKmkLfHsika*^$G>e^hi{t(J+BZon-iNVEt8%0(-#Eu} z&Y78`4Msi4YK2n9*laRXD#F$62uh}K{TbG-g+wNJ9Yvm_R0;ayFVG&V1bG?5cJJZN zEqGH4*)~R2CXnkG`6h-?E95dm$y~V&Q1QP9v4UVx&9ZHXU5-3UptdPHStD}hOitlj z_waaktR?a)#+cm-c9xbAY-<76o(SJ)(n>{ca)&UNV-a_kkb*!B`IOZL~Yz;v|Z?C9K>cM5D zDV4C@Ikq)u9$_>bVw=ZQA|WtG$cqp+!(M}4$rV40;Cgec921#%;^*gekE)P|ZQlI$ zmjw0aSdd)Jn~-I1iq*_~X;aV-5ArEl1_6B%W2Z8xC`U}CpxCa+6Q5ZG?fY#H)h>av_)T4B2<&;IM#Xkt z4o7d;j$#-FF3(Tt1Ip+wCs>fk>M_8kO!<+E zObL7&e#Mf21$UrKLWm^7dHWQ`={Y{UZ{hIZ4Yd8%5zaa~PR{hkJcV5Uw|Od08(DST zK!@(DC3k!W$Ddj_+B<|Mvb1rUWaTy!?7*a~CL(W1*YQ2gqEvy!gsbhF@VG?J@rPUc Y7Xw^n1|Z?cC;$Ke07*qoM6N<$f}QSIC;$Ke literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/partbuilder_birch_side.png b/resources/tinkertextures/blocks/partbuilder_birch_side.png new file mode 100644 index 0000000000000000000000000000000000000000..a9d1a495652fadc5cea18e0b983b9709f61cb6a8 GIT binary patch literal 675 zcmV;U0$lxxP)V|5WW8ZGdM3`Qt$%|%viRSM-3en1w}e)T1q~El8!%Ml-LCFn4zW#B-X=vS(dI| z_ezQrhW@Y;SeVRkXO6vlwR`UFo@K9Ibn)`p!v?keKP+Ny#b4A4l&O-L>3cq z0+xvo$3v}QFXfaHBeOSOOC55MHOY>B0+f_(I?+&G#c-@|aP2VyTW{1TsoWOS+TzGOM9jlKb`Dm*Tu`qm z4Th5vLPR({96~$VZ%`F6fx`&vlE=;6=->dpLvsi`FfQ_zy`-`%D%+(NEUuH3G`J!{ zCIaO2tss@^Aq#3nRaNY6(<&<@qdPf=MT0DV1h^~`N^+4_IX(_QU_ykVB+23sc^qN8 z*M-{M#=W~8tgYSxTj{K0tFPekmeMSbkbf7dS)43sWK|RuecHZSa>sYDvDv};oi(sL zO`1)U^m2~^?7$#d4Mg6AwvO&;S*l9FIv-=^8}Ll4CI30+_yt$C6!Dy?;AW#TG>cEi-3=Rya3IqE7M$O}8`K zqS_9d{dy3fbr-1dwS_jnXW6{2%Lwf`v+HlYiF+Xs=%M8MGEbm$U1-bcr8-v(1Y%R- zwCgwb!zh3v2*@cW1bhNTz;{p|XMsR5Bhcn^TgA&N;?qQKb0VSZgutuJxw`N!KpsUz zRj;yj#yXO@;1m9Wh=Hw1Y_x;(1FRCT(a(W*A&#>3 z+IOHrwapMQNVpRRN%34xGOKtKRuZ#0XtN6uy-T(>VC{eD#kiMr@&_TTM!_^c RMnKqvZ&+4}2JMPL`E>$T zvzoy1TY*qJmc#NJp)9dcG?Yp8qLISy(Jq#Y9F}tjGj9*eTeG%?u8m&{2bVn?cQ+1J z^8&&j2dcwg@A-zl?`|tg&rQSoWN)GsoMkaOOJmSV;;OxcZ>KgcKiH@gj9}H5hDj|F zkn4DVEqATu=ow;A@p8ea9#9Xd8crNNqoC9C9fW~nFfq{@HIpEC$V+r()Jo}Et&FO2 z@3(FEowSJ}uG+|oj}g;mWZ$%omps}kl;gRn9~xMGcU%2rworY}VeP-rxv0G}w)HnN_sU&pS#nka#!S$LcnZKR+F{jrI|PUK*971O{Iu zLA7Y8P*L`!m!p0syZ7>ljv&!QHWJ&tehW~28qOtowy+gFgk%6eB00000NkvXXu0mjfj))*O literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/partbuilder_jungle_side.png b/resources/tinkertextures/blocks/partbuilder_jungle_side.png new file mode 100644 index 0000000000000000000000000000000000000000..7c581780da2017e41077630229b8e67371adcc76 GIT binary patch literal 569 zcmV-90>=G`P)!4Xwq|f|4I$Mwr@iTOGv;UikoCdgn`c>AM~G zY!ZyjcyaRW=F9Hcb2jFE-^Hl&K*9Kb$iA8X)-d_~V}PIES~D=u-sR(8-=kShXahd- z#rYx@SkvW2}(3%hp&6$`aWnpghj zZ=}|I>fS_#M%BWO6xQW3_LmU}>$Kkfx^XFCdc6WKo^ZR&~T!&dcFC#-rQ#_)dHnZD1Ib z6rENP?v{nli8R=)CZo_%>eAv=Z?AO&p}dcdWmA%KZS{MWVq0XocSQonpF|GY>FT%% z8s|N{t}!=qxSbFXYPy)rN!7&6)gD(Q`m-PBYrmYVDt$)+Hs0U5rg7jc>b+q?*Lle} z1OEYnzGMw}k~wQYXallS1{-l?vg8|ZN{&x&_^lFFlXd?A%M;lM%Dr(800000NkvXX Hu0mjfM?(?;AW#TG>cEi-3=Rya3IqE7M$O}8`K zqS_9d{dy3fbr-1dwS_jnXW6{2%Lwf`v+HlYiF+Xs=%M8MGEbm$U1-bcr8-v(1Y%R- zwCgwb!zh3v2*@cW1bhNTz;{p|XMsR5Bhcn^TgA&N;?qQKb0VSZgutuJxw`N!KpsUz zRj;yj#yXO@;1m9Wh=Hw1Y_x;(1FRCT(a(W*A&#>3 z+IOHrwapMQNVpRRN%34xGOKtKRuZ#0XtN6uy-T(>VC{eD#kiMr@&_TTM!_^c RMq z*G@x03`F-Y=w0Li0x3Wmgp$w`dJRZCgx-4(;u8?Pi%&H=M!w?VYByecW;}LWf7~aV z(=DA0T`i~LNXvPX9Fsm-Jms0{<$6Za%eLhsry?ba}`Mxvyt=< z8z6i?OT1>v#&B!ZpHbBMbiMAZFVmZ|je2DwD2*($-;RZJS3|j`?)5aHTLVS%Z}AsOouV)i z@k_(=)UK zqdpl8lRq!UYz<>}H&zIcGOi+t=2YB~`C;Q9s>v0AkMj}n#u&{w0I6nQffOPWgN&&( z!UpitnBO*$T0N@e6F{a|fAq=3RzyL7b?OwNl z!iHMZa1NL}B$y2=4H(DGkTch4o;8n%KRE;R1Gs5C8xG07*qoM6N<$g2S=r A)&Kwi literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/partbuilder_oak_top.png b/resources/tinkertextures/blocks/partbuilder_oak_top.png new file mode 100644 index 0000000000000000000000000000000000000000..5469402fd15044af739d4195a66ff13dd1ec5522 GIT binary patch literal 319 zcmV-F0l@x=P)?;AW#TG>cEi-3=Rya3IqE7M$O}8`K zqS_9d{dy3fbr-1dwS_jnXW6{2%Lwf`v+HlYiF+Xs=%M8MGEbm$U1-bcr8-v(1Y%R- zwCgwb!zh3v2*@cW1bhNTz;{p|XMsR5Bhcn^TgA&N;?qQKb0VSZgutuJxw`N!KpsUz zRj;yj#yXO@;1m9Wh=Hw1Y_x;(1FRCT(a(W*A&#>3 z+IOHrwapMQNVpRRN%34xGOKtKRuZ#0XtN6uy-T(>VC{eD#kiMr@&_TTM!_^c RM1qN&5QGPIy)`Pz#x))og%Hf4tGVAma*^ZxAEm?BQp1uTL(le6)!kDYMxE4dXD!<< zI`;iIwLv|xVsT>c`;iTssa;PR9>1A3?d4+NF)Tjv14&nBbt}$$)~zI7^m#vy#oPg< z;Ok*x(_X~^u#kj)HL=UQVe4_ti%3)vtmV53Wr+n^%G$>+03gT_Yqt1QdcmKr@m2ahKaVuXzEi+^k7_=k-Q1Du0QO0x& tm~`Mmf?2FMSsdTxXOyfF5f-0-{s2}3Rq*V~q9y~!x8`h literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/partbuilder_spruce_side.png b/resources/tinkertextures/blocks/partbuilder_spruce_side.png new file mode 100644 index 0000000000000000000000000000000000000000..59d867d658821fae2218794e8fb7c2e7b1d04b02 GIT binary patch literal 461 zcmV;;0W$uHP))z_yZC;;e_GLAZApb8E6UQ1BKc8#+^}ck$T5Ep({qf}1gb?uYoBbvl{B=AK zH~yG!>uWcn=J8`Ju6F+%#SFUzTgwG@)GOMfcFtbzRV8#i>6c_5-2GY0Rx=6r2WJ58 zH?q=j*viW0aVIZ1P1FHXn-6QQ5mE#U8x-2*q=0Wv8g|e~O9SBfD0EFbVak?*D5u7B zGJ%dn{&3!QW1@0*+O(Ba!ig}MP9Ov*0irPNm+f-0DLHljPhCX_YT^L^RO`j)Oyk~$ zBf$fL32vr!XSU`-5EcSA5@1LG&@^bKMHQ1DFS-tcV3-dCXX37ox6AJQ{7cD*U^VNw zBVaT+M5dCC3_}rv)KnVvjT~%cToW~JNewn6oLk?5f33L89t2FM1bBoxqJ|HfD5yzF zK*M4jTD>Wzg-qXpJS3D=l_JKm_ODT&HIIltH6{85`azJ80YdrQ00000NkvXXu0mjf D&4?;AW#TG>cEi-3=Rya3IqE7M$O}8`K zqS_9d{dy3fbr-1dwS_jnXW6{2%Lwf`v+HlYiF+Xs=%M8MGEbm$U1-bcr8-v(1Y%R- zwCgwb!zh3v2*@cW1bhNTz;{p|XMsR5Bhcn^TgA&N;?qQKb0VSZgutuJxw`N!KpsUz zRj;yj#yXO@;1m9Wh=Hw1Y_x;(1FRCT(a(W*A&#>3 z+IOHrwapMQNVpRRN%34xGOKtKRuZ#0XtN6uy-T(>VC{eD#kiMr@&_TTM!_^c RMFH~ZzdEVNlo zV)J^UE%)P4qA&6?JCp%i4{5*w4sifJXK5=qV~Mb-XuukOu6BiwX9L(Ev_*$w7&kP4q7;x>FuDux z@D;=X>Oddh72F=6hy>?yXWa*|X=ngp08^}Yr}Rl)2HU)XR<;i)5Me7bZPyw0VQW8= z`)S}E)aR(1YuHEz{#Hk70mDD=Hvs26%hu~8+}wePzsi*6eto$i761SM07*qoM6N<$ Ef)6>iJ^%m! literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/patternchest_side.png b/resources/tinkertextures/blocks/patternchest_side.png new file mode 100644 index 0000000000000000000000000000000000000000..ae5ac71641d61bf492c8e5761e17d0ea7bba19fd GIT binary patch literal 391 zcmV;20eJq2P)S6ovCBr3xmKpQdT*S~0drBP#f}@GZnmi=rEmb|-@1PC<0%BaS&IJ!w*cTMJ(^ z$;`d?+%wm4{{81|c5Od!8w`6sNh8yEUuUb^u?`lG2cezqn+A)+*k13r(4e)uMw1Pdgh!`qJ1CRZv$DgZh@^RKDUl&OQzRM59AeIWA^RVjk{WSg) zor4E#0e?~eR2`DPF9)RFMqNR}1NHWH95G2-btFcxJYWL!0Y_z^RH%9#ozX2+9$*e| z3-uY0i30mPvz!COl($fft2}@)KoZxdlXH@l#dr%vY-0{&kkBYgc0E}&2ku6Py?|lC lAT&g4?WN22*k7H2iNDqjs@Ks2=c@n!002ovPDHLkV1iFH~ZzdEVNlo zV)J^UE%)P4qA&6?JCp%i4{5*w4sifJXK5=qV~Mb-XuukOu6BiwX9L(Ev_*$w7&kP4q7;x>FuDux z@D;=X>Oddh72F=6hy>?yXWa*|X=ngp08^}Yr}Rl)2HU)XR<;i)5Me7bZPyw0VQW8= z`)S}E)aR(1YuHEz{#Hk70mDD=Hvs26%hu~8+}wePzsi*6eto$i761SM07*qoM6N<$ Ef)6>iJ^%m! literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/searedbrick.png b/resources/tinkertextures/blocks/searedbrick.png new file mode 100644 index 0000000000000000000000000000000000000000..e593617748c1d8cf3f2d9ad15a18744728c168b5 GIT binary patch literal 404 zcmV;F0c-w=P)sAgHk1n4%DOqO}N=?Xti3AL2q-xx{YZ&SSLyHuHbUH zd}W#T4ak}7gCKa%08@>kh_WnWR+OfJGhnydk>`07h9U3qh6zx{FDw=d{vz0QU6u|& z|J(v*fI$i%D{#BrIA|CKdOn|Yzu(yd@Qn70`LFlwcFP%%;Fmf^8wdoVz<$5yQc;!m zfT%DMOfMvx=qyeJxvo&EF>~5u?fd@Nf;Q1t3v(C91OiMRKGBuw{{?XdfdZ5bgFt8a y0R{a_03oBf2Gt3ZK2CTx7mU8$MQupO%OtmWm#m~Hc2Vnp81X8oYOep zz4x-NtJGQrF-FNb%NRp??|N^o;Zt0jA!m>wi&Ba%5T1c2%?)sDB4oiM5uO?GtC)lg zS+Ew?jhEsn$byD^tNBS}$bxReC}q_Mqb?Jz36y1nSQ9AAi`7I;z;?9$Ms4N48|f(F mRV$zKaCu-Irke-Waoz#grkLH}9D-Q@0000oe~finBPZ_8o}(tz?3uN`z2rC!tm}&NJhAUPhGEe6 zvMiXU=~dgdp>13AeUGl|FwZlD&0>6_D1vZfS(aMA9%OG_*T}LALa9lTIIF0t3Sk)j zXCX~f2;sQMf7i~s#GjO%QGoI&N3@i|N^*Vsj zv|1>N;>rPU!5kzD11@|quv*Xo%s~(Y$n#u-@%*Ml78_ajKNH9xk--ORXOBuaf2d&q O0000P(efl{r}I%I>q&c%T_xO3o%J2(}bpJVp!kzJkK+adhMjY4tz|->G3IE5lP-W?Yt2_Px?RV5L*Z#Bt731 z$U!b)s@{rN*Y*C4N~z@JqA2!f%pRodQNCHGTTOm0Q|>x{0D;rL8d&L#+W-In07*qo IM6N<$g8pl5=>Px# literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/searedwindow_bottom.png b/resources/tinkertextures/blocks/searedwindow_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..9598a94ff7e99eda5d744b1ed8c80ea746d43b01 GIT binary patch literal 231 zcmV1(Un$E3EZb$F+w4I4WBH<)CWtXg2tj)9l5@U1^BcoCr?KC? z_fl(><2VE6AVU_dHC-Ugz>T=U-h?c8B!bL{AGJ?Q7OaJJ zNL@sKv_13HG#6cSWVOfY)9*F)K>nxk#-4BT6xdI h>49~aE*@CN`2`{^sLf5a@u&a*002ovPDHLkV1h5zV*mgE literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/searedwindow_side.png b/resources/tinkertextures/blocks/searedwindow_side.png new file mode 100644 index 0000000000000000000000000000000000000000..96877677a60a8705840d0ee6c17ae675da97633e GIT binary patch literal 304 zcmV-00nh%4P)bgeTwrH9L<2XV{D$DW_lIOYnES?cj6rm^zMGyoKb~G;( z=1~5sqk%R{k_0kM6RfJ7ERy-Xx!(5`C~{VSWOCv-h77}?^bZx_R)40H;;~Mw4b_S$0~4?$bo&e3FBwAXyKNe4mOk z1)e;xi*zLH*JZMMbN9gJz^t%(aXi0WXO2ufdhi9F0kCvW*{kIM0000~q4L;4qtjKdlyz6zYn}XsbvXk^dyAWZE^v*pj1Zk5)6wgC;@*@?n;PD@hOSk+81?&rah~|4GR^$@Wq05IVcNa>_%791 S)s;ZUGI+ZBxvX?loNh3E=$QKz^npJtQ>tDw@watg(j3Il*}m?;eyNHO&5|5FZfQ zzYS1srXtcN*lPp!#*gfX5bqO?8ie{zMR8;z*;di}k&?h!21$!EmxSK;0jU3F!s_W5 ze}`f3b>!y?;@5=ZCgF7ELGI3jaEoyH(?ovkMT#pYxIpqo>;*xE1tB$bDGuMG$WHis zpdft3GPYg>ncY#HD^C;@=0XNPw;IAMtFk3feQQWGd*$bf3i2Zzr$Zghogbw;11bK` zEECQi6lA*0aO%PF1ZKh zQQ9y-nSZK$u(9z-%|VB7!uk)Zgcy5q!ukWupt%m9xjMn=R7H*%I?o2m3k`Js>V-8` z7{n*n1Ya^ME{MH5lv)ppu5rSvWKV%LP$iqj%Et^=IucB?u?nEFFktmngxI*4qoTTG z3Cy54^CErAdmZFSq>c#jb667s@j2F=e&nkWn_KkCR1y;4@x zQQ&aPt7~RZUF*n=Rb=ltS=?*Uk^IO&ur7d@#ll2pXdv2BP+6%+a1m$gm!Kk8R9JG0 zn4&e&P~UJH?^PKj!A4|4&=fJ{BsijRrWEgbB)Xv5|2Sq@ew6P6avn+#?8C%m zBV<%L8`RnxGF@RYP%n)B9^l}RG|>_sa9pjid#SKg#-R`Txjfh z!rl@P#tOG@zJe$|s@&dyJ3Jpg)YfipESQv}d_J#2@Mtu8q0{Lk&h>g-2ZMnD zpMUrJeT||>g^DCX-P?s#hW4=ZX0AXXD`hcDtFfa=EOzTuz1FLItrW zJrmKop!IAhu8_Jl=p;t<`GUZnuqqfN!8WIYy99r}aOi zQYo{Hj0E}y*=*MCh1u@+`xh>ki-GYHbid#AdcErTd{)|JZ}2adOS8f}!EiX#X0vG) zRI631;LGFp9`CR>030B|a^|6siYiZbc)St3JG@$@Qn410$sOdOLRTZ9oKOv8@)o?s zk1c$1PzeHFezVymlz9PHB?LN<&5pNPE$#JsHa7meQmLffZrA2d4DcKY=Ncm11yAjkw__`?=3Frs@zI$hL*$Opu62p zkH@2?X{yWR((HD-)%AM)f+R_FHk;{UvC#Q^uEksbH@zd&~0Sb!*s^c%9-tXW3J1L_9(eBSPb+3xrIC(h@y zf$>7R-EMlhT=aB0Ddn;^_&1x4Sz(@FGMQ+n(=iJgjfQ3Lct;c#eUsAgHk1n4%DOqO}N=?Xti3AL2q-xx{YZ&SSLyHuHbUH zd}W#T4ak}7gCKa%08@>kh_WnWR+OfJGhnydk>`07h9U3qh6zx{FDw=d{vz0QU6u|& z|J(v*fI$i%D{#BrIA|CKdOn|Yzu(yd@Qn70`LFlwcFP%%;Fmf^8wdoVz<$5yQc;!m zfT%DMOfMvx=qyeJxvo&EF>~5u?fd@Nf;Q1t3v(C91OiMRKGBuw{{?XdfdZ5bgFt8a y0w4Ep5bQqf8JkFJ#2HJu5nIdi@ zz0F*JV}UkelnpqV2Einx#nEfh)xbl$c|R~UGlg*8bco}if%VS^L5G$v7`XuWMO^>+ zp{W6AU<%NLZCs`Rp3#_Kq?QLX7QTh50B+^F8y_gH$3@|Xf6sqE&Wr|Mm2mO0=2tdw P00000NkvXXu0mjfW65-m literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/stenciltable_birch_side.png b/resources/tinkertextures/blocks/stenciltable_birch_side.png new file mode 100644 index 0000000000000000000000000000000000000000..bf990d5629b6b306d72711d726c32569ffaccea7 GIT binary patch literal 314 zcmV-A0mc4_P)dJgO(ChhBX;CzN9;6oP6A})}=1~(@;<}B^F z5n*c?-FCy1Ld9oo-nXd-jxiqR%*g!xG%>|%`9qnbe@ROqVujP)(u}N N002ovPDHLkV1jt8Z&m;R literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/stenciltable_jungle_side.png b/resources/tinkertextures/blocks/stenciltable_jungle_side.png new file mode 100644 index 0000000000000000000000000000000000000000..c152884c47d1f196fb514017db5d68ae543aa7b7 GIT binary patch literal 302 zcmV+}0nz@6P)Nkl|KHLd6cfc%md&vrtQ~#8GOJOz@d|M5)!m;f##yeJe9*RB5f;U zHfTmtz?OT066(aqJWM8wwbUSz(hTPZlF0rKmeO@>j&gg zJmZq83PSI~O4AdH)x^YP$To zKT_@wASNlzwg7qCJ^Ba0vFHbVw5|SWyAkc+3#8jnEG1lhO8@`>07*qoM6N<$g141~ Ao&W#< literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/stenciltable_jungle_top.png b/resources/tinkertextures/blocks/stenciltable_jungle_top.png new file mode 100644 index 0000000000000000000000000000000000000000..9003c07714c24e96ddb6dfc616b4f6589d95b67c GIT binary patch literal 321 zcmV-H0lxl;P)w6U-_L=a9a>_h}XK?K208}TJ9eK+L`OxW9~#oQ&?&Fsu3 zsjMcg_k36nVEhZp@wpWyuUr0p><1CdwPwf9%Q((KAmBsrSo9KH*I9&Jrzm^)2Ljj> z*iD-O#i*7*>m>qNpo)UO{E~B8^il#QB9J10XWNJSHVZ10lMpDVjUEuF2=mxPSrCCb z?z;{F7PKcJkUxKnR)Ot7a*W8^7Q6y$T3Dox3KvB)duN`J}|W~1vPJeq-Zo6s0!6yWI+x56xVv&&z*!RpcOTy xo*qah|Am}@m#W+Y$74GF_~D-UpAJLNUWUc@J literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/stenciltable_oak_side.png b/resources/tinkertextures/blocks/stenciltable_oak_side.png new file mode 100644 index 0000000000000000000000000000000000000000..cbeb34a7983d5b3fb3e4a7e0902acc50792de9d3 GIT binary patch literal 257 zcmV+c0sj7pP)0@#=sI&@=ZW#j>jYv7_nZA=i zKazkIfwNdUq;5qn7OE*XNiU*+>qE50K**^7vP%#BEVoB8YZ0A00000NkvXX Hu0mjfk^65t literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/stenciltable_oak_top.png b/resources/tinkertextures/blocks/stenciltable_oak_top.png new file mode 100644 index 0000000000000000000000000000000000000000..9003c07714c24e96ddb6dfc616b4f6589d95b67c GIT binary patch literal 321 zcmV-H0lxl;P)w6U-_L=a9a>_h}XK?K208}TJ9eK+L`OxW9~#oQ&?&Fsu3 zsjMcg_k36nVEhZp@wpWyuUr0p><1CdwPwf9%Q((KAmBsrSo9KH*I9&Jrzm^)2Ljj> z*iD-O#i*7*>m>qNpo)UO{E~B8^il#QB9J10XWNJSHVZ10lMpDVjUEuF2=mxPSrCCb z?z;{F7PKcJkUxKnR)Ot7a*W8^7Q6y$Jfw6Ds$j^(6bk*6h!*EKPIJWQ3mCt)v=czZ) zGsW^8%(sW$2?xJ!hu?~a9yr&vNDu`hDHka^xSn<^a39+g9LKRz(*S#%KQ8;NGjt=h zOQw=(Bg`q{$OR%NB;)8cscPV%)%-j#HRD3$H$RGK6dFVovbper3iw4_|II_Hf%jhn zxfA08T8V6`>49Y7zu*(_P^ELAn9kkC4|~slJT^vyFWiOWr%Wx}h5!Hn07*qoM6N<$ Eg5?fu2><{9 literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/stenciltable_spruce_side.png b/resources/tinkertextures/blocks/stenciltable_spruce_side.png new file mode 100644 index 0000000000000000000000000000000000000000..2a1c0d18d5030115b0b6f614d5e1b573713a9e7b GIT binary patch literal 298 zcmV+_0oDGAP); wU@`GD+XDJiwf+MjpO2zG+E#xy>D6}d2h>sf1u?_Jt^fc407*qoM6N<$f`s6Mga7~l literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/stenciltable_spruce_top.png b/resources/tinkertextures/blocks/stenciltable_spruce_top.png new file mode 100644 index 0000000000000000000000000000000000000000..9003c07714c24e96ddb6dfc616b4f6589d95b67c GIT binary patch literal 321 zcmV-H0lxl;P)w6U-_L=a9a>_h}XK?K208}TJ9eK+L`OxW9~#oQ&?&Fsu3 zsjMcg_k36nVEhZp@wpWyuUr0p><1CdwPwf9%Q((KAmBsrSo9KH*I9&Jrzm^)2Ljj> z*iD-O#i*7*>m>qNpo)UO{E~B8^il#QB9J10XWNJSHVZ10lMpDVjUEuF2=mxPSrCCb z?z;{F7PKcJkUxKnR)Ot7a*W8^7Q6y$T3Dox3KvB)duN`J}|W~1vPJeq-Zo6s0!6yWI+x56xVv&&z*!RpcOTy xo*qah|Am}@m#W+Y$74GF_~D-UpAJLNUWUc@J literal 0 HcmV?d00001 diff --git a/resources/tinkertextures/blocks/toolstation_side.png b/resources/tinkertextures/blocks/toolstation_side.png new file mode 100644 index 0000000000000000000000000000000000000000..542f0e970d26d3acd4d6f678148f9b94cb8cddd5 GIT binary patch literal 273 zcmV+s0q*{ZP)`Tzu?PC%NjV}H6f_v#AKP0h{&R+h_&O|7)c?gz>d8!)&~~H$nKmyt>#CC zM8zqf?PIsrERfdGaQ@Br8JQz2Cc0%m06DOst#k+9+aj*73XG_6X1e?Kuai%P$v_50D`{mD-lO;SD91L1}c#+2PHst z_7?gcjNdEXgVJL{7PS@GTOc5fS-AEp7Sn?FwSCh-7LBsh|l4>_O}ToDplDF^=r z$WkO*-1d?~A|x(*MAk}3D^_sgzyU5vF1v}%F2Rc*Gk(nUJi5BOy1TkLvJtnzdxGz+ zZr>{X>Z2dQ*RrwsL@c{^ww$WBUK9yQWQbC0R2ny6IUa`Ruam?5Pj-H{`{8q3QrOoI zi)z^rEvGXxzw)5s339N%hv4)zX69`8%{olJ8Y%gMXTXQ}MhalQjY_Qn#}z~+not6u zPzWbEQZFv>l`#(XNgf{1vAxC}W+CrX3Ff9hl26Q$-6lxO5 zbMf%uuN}*hC2)w{U0(r@i>V7NyJ8DBR@Xh|kdf-qgI6!^)@PUCHEXmet=lUbZbukQ9lb=26?|k$OQ_aNY=BI)gjCa~gKYRd`gvlzrnH97aZjoH2 zaH>9pn8%gt--a$3Cc%jIkCV=g+jrpAUA*~X7;(G%Y}(r&s6&G>W+9ddDe{mQl%g~& zP-?@pEATPE$w7)JA}EU-D(Vvz570dc5G54--ag{V+0--92EYt%sj|#vt-*=b6tN_t z)TbdfEbk`%cO1N_#tthEKoh?h}4@cy5E|I0sK);FYYF@O%{+Be|W zD=;k&1Oz|68tSlM_Y9{%XN^sj$8LSzr@>WD1IK7)E0g~thjk#}u zSnt4gJVcWK!t+IKZgH!BasH?*0$f{KNq&+1edjlr&Vh~1CxTh7--#7}AlzBv`3~~D z4o(~*ECIu;p*VNJxrJ(@0by6El0m0ZtpkRItFw0GCGOM?Ftu#3)thVZotO;5GorH; zgc_*&O{lbhK{W)^sJH~Vrby(36omo5c@+jN5G#T-&8K#t)9HZq&O@9PV{oD|94pvn zf$=zm$$?aHa9To6MrdD|!TB%)qa_ySIEIrH$GvleVL0^wo^%0LaXAF9VK|aVlN8*l zz~u(wXaY-c1VIW*aGVV!#=`)mj^Ky|5F#+>50J>=)CK0-02_@X#YrZm$_UC5dOQ+3 zPgqe$wco{TtAV3`elB}QpS}O$&%gR+Bt*LdW_n0d3Da)CFa(Ms zht@fQ;RF|_U*NLCu(BZ*lG_vjDu!hn+%!}Y!g5APWDjXF!1>8@aH|Ow_en`DF+cx- zLupU~z|qm#f3*>jwe_Fx*ww{#CaNTnXH=)7d%|taltoH(9s}SoxC;O%a;Z({%FCk2 zE^;*jAvB3(Z)fktM^j0-va%tV*SOiK&E0)a79f%zK*fFd&D+GZ8!#wAaIpu@eHdmH z8;5Mi;NP%RGA;%45=Ke;>#r1j9oBfCeB3pJC+g z!S$AqYXv0-NW1`Y{3Yz_HEp}CsU0{v+Ew^}{^#=_%f!aU6H&Q+g(fl}=>D5%0I-5L i= stackDamage && toolDamage < 100) - //stack.damageItem(toolDamage - stackDamage, entity); - stack.setItemDamage(damage * 100 / maxDamage + 1); + stack.setItemDamage(damage * 100 / maxDamage); } //stack.setItemDamage(1 + (maxDamage - damage) * (stack.getMaxDamage() - 1) / maxDamage); @@ -441,11 +405,8 @@ public class AbilityHelper tags.getCompoundTag("InfiTool").setBoolean("Broken", false); tags.getCompoundTag("InfiTool").setInteger("Damage", 0); } - - /* Entities */ - public static DamageSource causePiercingDamage (EntityLiving mob) { return new PiercingEntityDamage("mob", mob); @@ -521,4 +482,14 @@ public class AbilityHelper } } } + + public static void spawnItemAtPlayer(EntityPlayer player, ItemStack stack) + { + if (!player.worldObj.isRemote) + { + EntityItem entityitem = new EntityItem(player.worldObj, player.posX + 0.5D, player.posY + 0.5D, player.posZ + 0.5D, stack); + entityitem.delayBeforeCanPickup = 10; + player.worldObj.spawnEntityInWorld(entityitem); + } + } } diff --git a/tinker/tconstruct/PHConstruct.java b/tinker/tconstruct/PHConstruct.java index 94ab9cf8..1fc9ebc4 100644 --- a/tinker/tconstruct/PHConstruct.java +++ b/tinker/tconstruct/PHConstruct.java @@ -39,6 +39,10 @@ public class PHConstruct { * Avoid values below 4096 for items and in the 250-450 range for blocks */ + removeToolRecipes = config.get("Diffuclty Changes", "Remove vanilla tool recipes", false).getBoolean(false); + keepHunger = config.get("Diffuclty Changes", "Keep hunger on death", true).getBoolean(true); + keepLevels = config.get("Diffuclty Changes", "Keep levels on death", true).getBoolean(true); + woodCrafter = config.getBlock("Wood Tool Station", 1471).getInt(1471); heldItemBlock = config.getBlock("Held Item Block", 1472).getInt(1472); @@ -211,4 +215,9 @@ public class PHConstruct { public static int aluminumHeight; public static int aluminumRange; public static int netherDensity; + + //Difficulty modifiers + public static boolean removeToolRecipes; + public static boolean keepHunger; + public static boolean keepLevels; } \ No newline at end of file diff --git a/tinker/tconstruct/TConstruct.java b/tinker/tconstruct/TConstruct.java index 49252645..c0a89b01 100644 --- a/tinker/tconstruct/TConstruct.java +++ b/tinker/tconstruct/TConstruct.java @@ -1,20 +1,9 @@ package tinker.tconstruct; -import java.util.ArrayList; import java.util.Random; -import net.minecraft.block.material.Material; -import net.minecraft.entity.passive.EntityCow; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumMovingObjectType; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.Event.Result; -import net.minecraftforge.event.ForgeSubscribe; -import net.minecraftforge.event.entity.player.FillBucketEvent; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; -import tinker.tconstruct.crafting.PatternBuilder; +import tinker.tconstruct.player.TPlayerHandler; import tinker.tconstruct.worldgen.TBaseWorldGenerator; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Init; @@ -50,7 +39,8 @@ public class TConstruct public TConstruct() { //Take that, any mod that does ore dictionary registration in preinit! - MinecraftForge.EVENT_BUS.register(new TEventHandler()); + events = new TEventHandler(); + MinecraftForge.EVENT_BUS.register(events); } @PreInit @@ -62,25 +52,31 @@ public class TConstruct blockTab = new TabTools("TConstructBlocks"); content = new TContent(); - NetworkRegistry.instance().registerGuiHandler(instance, new TGuiHandler()); } @Init - public void load (FMLInitializationEvent evt) + public void init (FMLInitializationEvent evt) { GameRegistry.registerWorldGenerator(new TBaseWorldGenerator()); - content.oreRegistry(); + playerTracker = new TPlayerHandler(); + MinecraftForge.EVENT_BUS.register(playerTracker); + GameRegistry.registerPlayerTracker(playerTracker); + NetworkRegistry.instance().registerGuiHandler(instance, new TGuiHandler()); + proxy.addNames(); + proxy.registerRenderer(); + proxy.readManuals(); + proxy.registerKeys(); } @PostInit public void postInit (FMLPostInitializationEvent evt) { - proxy.addNames(); - proxy.registerRenderer(); - proxy.readManuals(); content.modIntegration(); + content.oreRegistry(); } + public static TEventHandler events; + public static TPlayerHandler playerTracker; public static TContent content; public static Random tRand = new Random(); diff --git a/tinker/tconstruct/TContent.java b/tinker/tconstruct/TContent.java index 41f5d6ed..44470425 100644 --- a/tinker/tconstruct/TContent.java +++ b/tinker/tconstruct/TContent.java @@ -116,9 +116,11 @@ public class TContent implements IFuelHandler void createEntities () { - EntityRegistry.registerModEntity(CartEntity.class, "Small Wagon", 0, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity(Skyla.class, "Skyla", 1, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity(FancyEntityItem.class, "Fancy Item", 1, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(FancyEntityItem.class, "Fancy Item", 0, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(CartEntity.class, "Small Wagon", 1, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(Crystal.class, "Crystal", 2, TConstruct.instance, 32, 5, true); + + EntityRegistry.registerModEntity(Skyla.class, "Skyla", 10, TConstruct.instance, 32, 5, true); } void registerBlocks() diff --git a/tinker/tconstruct/TControls.java b/tinker/tconstruct/TControls.java new file mode 100644 index 00000000..9f2a4b14 --- /dev/null +++ b/tinker/tconstruct/TControls.java @@ -0,0 +1,120 @@ +package tinker.tconstruct; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.util.EnumSet; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.settings.KeyBinding; +import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.potion.Potion; +import cpw.mods.fml.client.registry.KeyBindingRegistry.KeyHandler; +import cpw.mods.fml.common.TickType; +import cpw.mods.fml.common.network.PacketDispatcher; + +public class TControls extends KeyHandler +{ + static KeyBinding grabKey = new KeyBinding("key.grab", 29); + static KeyBinding jumpKey; + Minecraft mc; + EntityClientPlayerMP player; + boolean jumping; + boolean doubleJump = true; + boolean climbing = false; + boolean onGround = false; + + public TControls() + { + super(new KeyBinding[] { Minecraft.getMinecraft().gameSettings.keyBindJump, grabKey }, new boolean[] { false, false }); + mc = Minecraft.getMinecraft(); + jumpKey = mc.gameSettings.keyBindJump; + System.out.println("Controls registered"); + } + + //I will be wanting these later + /*@Override + public void tickStart(EnumSet type, Object... tickData) + { + super.tickStart(type, tickData); + } + + @Override + public void tickEnd(EnumSet type, Object... tickData) + { + super.tickEnd(type, tickData); + }*/ + + @Override + public String getLabel () + { + return null; + } + + @Override + public void keyDown (EnumSet types, KeyBinding kb, boolean tickEnd, boolean isRepeat) + { + if (kb == jumpKey && tickEnd) //Double jump + { + if (jumping && !doubleJump) + { + if (player == null) + player = mc.thePlayer; + + player.motionY = 0.42D; + player.fallDistance = 0; + + if (player.isPotionActive(Potion.jump)) + { + player.motionY += (double) ((float) (player.getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.1F); + } + + doubleJump = true; + updateServer(mc.thePlayer.username); + } + + if (!jumping) + jumping = mc.thePlayer.isAirBorne; + } + } + + @Override + public void keyUp (EnumSet types, KeyBinding kb, boolean tickEnd) + { + //landOnGround(); + } + + @Override + public EnumSet ticks () + { + return EnumSet.of(TickType.CLIENT); + } + + public void landOnGround () + { + doubleJump = false; + jumping = false; + } + + void updateServer (String name) + { + ByteArrayOutputStream bos = new ByteArrayOutputStream(8); + DataOutputStream outputStream = new DataOutputStream(bos); + try + { + outputStream.writeByte(10); + outputStream.writeUTF(name); + } + catch (Exception ex) + { + ex.printStackTrace(); + } + + Packet250CustomPayload packet = new Packet250CustomPayload(); + packet.channel = "TConstruct"; + packet.data = bos.toByteArray(); + packet.length = bos.size(); + + PacketDispatcher.sendPacketToServer(packet); + } +} diff --git a/tinker/tconstruct/TEventHandler.java b/tinker/tconstruct/TEventHandler.java index d3b1d79b..d95eeddb 100644 --- a/tinker/tconstruct/TEventHandler.java +++ b/tinker/tconstruct/TEventHandler.java @@ -1,19 +1,28 @@ package tinker.tconstruct; +import java.util.HashMap; + +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumMovingObjectType; import net.minecraftforge.event.Event.Result; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.entity.player.FillBucketEvent; +import net.minecraftforge.event.entity.player.PlayerDropsEvent; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; import tinker.tconstruct.crafting.PatternBuilder; import tinker.tconstruct.crafting.Smeltery; import tinker.tconstruct.logic.LiquidTextureLogic; +import tinker.tconstruct.player.TPlayerStats; +import cpw.mods.fml.common.IPlayerTracker; public class TEventHandler { + + /* Ore Dictionary */ @ForgeSubscribe public void registerOre (OreRegisterEvent evt) { diff --git a/tinker/tconstruct/TPacketHandler.java b/tinker/tconstruct/TPacketHandler.java index b776ceb5..d8a29ff4 100644 --- a/tinker/tconstruct/TPacketHandler.java +++ b/tinker/tconstruct/TPacketHandler.java @@ -4,6 +4,7 @@ import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet250CustomPayload; @@ -109,9 +110,17 @@ public class TPacketHandler implements IPacketHandler int rowPos = inputStream.readInt(); String user = inputStream.readUTF(); SmelteryContainer container = (SmelteryContainer) TGuiHandler.openContainers.get(user); - System.out.println("Recieved a scroll packet for row "+rowPos); + //System.out.println("Recieved a scroll packet for row "+rowPos); container.updateRows(rowPos); } + + else if (packetID == 10) //Double jump + { + String user = inputStream.readUTF(); + //EntityPlayer player = FMLCommonHandler.instance().getSidedDelegate().getServer().getConfigurationManager().getPlayerForUsername(user); + EntityPlayer player = TConstruct.playerTracker.getEntityPlayer(user); + player.fallDistance = 0; + } } catch (IOException e) { diff --git a/tinker/tconstruct/TProxyCommon.java b/tinker/tconstruct/TProxyCommon.java index 856ce884..81500d21 100644 --- a/tinker/tconstruct/TProxyCommon.java +++ b/tinker/tconstruct/TProxyCommon.java @@ -16,6 +16,8 @@ public class TProxyCommon public void readManuals() {} + public void registerKeys() {} + public File getLocation() { return new File("."); diff --git a/tinker/tconstruct/client/TKeyHandler.java b/tinker/tconstruct/client/TKeyHandler.java new file mode 100644 index 00000000..c85d81b2 --- /dev/null +++ b/tinker/tconstruct/client/TKeyHandler.java @@ -0,0 +1,126 @@ +package tinker.tconstruct.client; + +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.Set; + +import net.minecraft.client.settings.GameSettings; +import net.minecraft.client.settings.KeyBinding; + +import org.lwjgl.input.Keyboard; +import org.lwjgl.input.Mouse; + +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; + +import cpw.mods.fml.client.registry.KeyBindingRegistry; +import cpw.mods.fml.common.ITickHandler; +import cpw.mods.fml.common.TickType; + +public abstract class TKeyHandler implements ITickHandler +{ + protected KeyBinding[] keyBindings; + protected boolean[] keyDown; + protected boolean[] repeatings; + private boolean isDummy; + + /** + * Pass an array of keybindings and a repeat flag for each one + * + * @param keyBindings + * @param repeatings + */ + public TKeyHandler(KeyBinding[] keyBindings, boolean[] repeatings) + { + assert keyBindings.length == repeatings.length : "You need to pass two arrays of identical length"; + this.keyBindings = keyBindings; + this.repeatings = repeatings; + this.keyDown = new boolean[keyBindings.length]; + } + + + /** + * Register the keys into the system. You will do your own keyboard management elsewhere. No events will fire + * if you use this method + * + * @param keyBindings + */ + public TKeyHandler(KeyBinding[] keyBindings) + { + this.keyBindings = keyBindings; + this.isDummy = true; + } + + public KeyBinding[] getKeyBindings() + { + return this.keyBindings; + } + + @Override + public void tickStart(EnumSet type, Object... tickData) + { + keyTick(type, false); + } + + @Override + public void tickEnd(EnumSet type, Object... tickData) + { + keyTick(type, true); + } + + private void keyTick(EnumSet type, boolean tickEnd) + { + for (int i = 0; i < keyBindings.length; i++) + { + KeyBinding keyBinding = keyBindings[i]; + int keyCode = keyBinding.keyCode; + boolean state = (keyCode < 0 ? Mouse.isButtonDown(keyCode + 100) : Keyboard.isKeyDown(keyCode)); + if (state != keyDown[i] || (state && repeatings[i])) + { + if (state) + { + keyDown(type, keyBinding, tickEnd, state!=keyDown[i]); + } + else + { + keyUp(type, keyBinding, tickEnd); + } + if (tickEnd) + { + keyDown[i] = state; + } + } + + } + } + + /** + * Called when the key is first in the down position on any tick from the {@link #ticks()} + * set. Will be called subsequently with isRepeat set to true + * + * @see #keyUp(EnumSet, KeyBinding, boolean) + * + * @param types the type(s) of tick that fired when this key was first down + * @param tickEnd was it an end or start tick which fired the key + * @param isRepeat is it a repeat key event + */ + public abstract void keyDown(EnumSet types, KeyBinding kb, boolean tickEnd, boolean isRepeat); + /** + * Fired once when the key changes state from down to up + * + * @see #keyDown(EnumSet, KeyBinding, boolean, boolean) + * + * @param types the type(s) of tick that fired when this key was first down + * @param tickEnd was it an end or start tick which fired the key + */ + public abstract void keyUp(EnumSet types, KeyBinding kb, boolean tickEnd); + + + /** + * This is the list of ticks for which the key binding should trigger. The only + * valid ticks are client side ticks, obviously. + * + * @see cpw.mods.fml.common.ITickHandler#ticks() + */ + public abstract EnumSet ticks(); +} diff --git a/tinker/tconstruct/client/TProxyClient.java b/tinker/tconstruct/client/TProxyClient.java index 016fe7f0..dd699ec6 100644 --- a/tinker/tconstruct/client/TProxyClient.java +++ b/tinker/tconstruct/client/TProxyClient.java @@ -16,15 +16,57 @@ import org.w3c.dom.Document; import tinker.common.fancyitem.FancyEntityItem; import tinker.common.fancyitem.FancyItemRender; -import tinker.tconstruct.*; -import tinker.tconstruct.client.entityrender.*; +import tinker.tconstruct.TConstruct; +import tinker.tconstruct.TConstructRegistry; +import tinker.tconstruct.TContent; +import tinker.tconstruct.TControls; +import tinker.tconstruct.TProxyCommon; +import tinker.tconstruct.client.entityrender.CartRender; +import tinker.tconstruct.client.entityrender.CrystalRender; +import tinker.tconstruct.client.entityrender.SkylaRender; import tinker.tconstruct.client.gui.ToolGuiElement; -import tinker.tconstruct.client.liquidrender.*; -import tinker.tconstruct.entity.*; -import tinker.tconstruct.logic.*; -import tinker.tconstruct.tools.*; +import tinker.tconstruct.client.liquidrender.LiquidAlBrassFX; +import tinker.tconstruct.client.liquidrender.LiquidAlBrassFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidAluminumFX; +import tinker.tconstruct.client.liquidrender.LiquidAluminumFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidAlumiteFX; +import tinker.tconstruct.client.liquidrender.LiquidAlumiteFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidAngmallenFX; +import tinker.tconstruct.client.liquidrender.LiquidAngmallenFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidArditeFX; +import tinker.tconstruct.client.liquidrender.LiquidArditeFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidBronzeFX; +import tinker.tconstruct.client.liquidrender.LiquidBronzeFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidCobaltFX; +import tinker.tconstruct.client.liquidrender.LiquidCobaltFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidCopperFX; +import tinker.tconstruct.client.liquidrender.LiquidCopperFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidDamascusSteelFX; +import tinker.tconstruct.client.liquidrender.LiquidDamascusSteelFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidGoldFX; +import tinker.tconstruct.client.liquidrender.LiquidGoldFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidHeptazionFX; +import tinker.tconstruct.client.liquidrender.LiquidHeptazionFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidIronFX; +import tinker.tconstruct.client.liquidrender.LiquidIronFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidManganeseFX; +import tinker.tconstruct.client.liquidrender.LiquidManganeseFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidManyullynFX; +import tinker.tconstruct.client.liquidrender.LiquidManyullynFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidObsidianFX; +import tinker.tconstruct.client.liquidrender.LiquidObsidianFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidSteelFX; +import tinker.tconstruct.client.liquidrender.LiquidSteelFlowFX; +import tinker.tconstruct.client.liquidrender.LiquidTinFX; +import tinker.tconstruct.client.liquidrender.LiquidTinFlowFX; +import tinker.tconstruct.entity.CartEntity; +import tinker.tconstruct.entity.Crystal; +import tinker.tconstruct.entity.Skyla; +import tinker.tconstruct.logic.CastingTableLogic; +import tinker.tconstruct.tools.ToolCore; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.KeyBindingRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; @@ -98,6 +140,7 @@ public class TProxyClient extends TProxyCommon RenderingRegistry.registerEntityRenderingHandler(CartEntity.class, new CartRender()); RenderingRegistry.registerEntityRenderingHandler(Skyla.class, new SkylaRender()); RenderingRegistry.registerEntityRenderingHandler(FancyEntityItem.class, new FancyItemRender()); + RenderingRegistry.registerEntityRenderingHandler(Crystal.class, new CrystalRender()); //RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class, new PlayerArmorRender()); // <-- Works, woo! addRenderMappings(); @@ -383,4 +426,13 @@ public class TProxyClient extends TProxyCommon tool.effectTextures.put(materialID, tool.getToolTextureFile() + partialLocation); } } + + /* Keybindings */ + public static TControls controlInstance; + + public void registerKeys() + { + controlInstance = new TControls(); + KeyBindingRegistry.registerKeyBinding(controlInstance); + } } diff --git a/tinker/tconstruct/client/entityrender/CrystalModel.java b/tinker/tconstruct/client/entityrender/CrystalModel.java new file mode 100644 index 00000000..0793ff0a --- /dev/null +++ b/tinker/tconstruct/client/entityrender/CrystalModel.java @@ -0,0 +1,54 @@ +package tinker.tconstruct.client.entityrender; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; +import tinker.tconstruct.client.tmt.ModelRendererTurbo; + +public class CrystalModel extends ModelBase +{ + ModelRenderer body; + ModelRendererTurbo top; + ModelRendererTurbo bottom; + + public CrystalModel() + { + textureWidth = 32; + textureHeight = 32; + + body = new ModelRenderer(this, 0, 8); + body.addBox(-2F, 0F, -2F, 4, 6, 4); + body.setRotationPoint(0F, 0F, 0F); + setRotation(body, 0, 0.7853982F, 0); + top = new ModelRendererTurbo(this, 0, 0, 32, 32); + top.addCone(0, 0, 0, 2.8F, 4, 4, 0, ModelRendererTurbo.MR_BOTTOM, 4, 4); + top.setRotationPoint(0F, -4F, 0F); + setRotation(top, 0F, 0F, 0F); + bottom = new ModelRendererTurbo(this, 0, 18, 32, 32); + top.addCone(0, 10, 0, 2.8F, 4, 4, 0, ModelRendererTurbo.MR_TOP, 4, 4); + bottom.setRotationPoint(0F, 6F, 0F); + //setRotation(bottom, 0F, 0F, 0F); + } + + public void render (Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); + body.render(f5); + top.render(f5); + bottom.render(f5); + } + + private void setRotation (ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + public void setRotationAngles (float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + { + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + } + +} diff --git a/tinker/tconstruct/client/entityrender/CrystalRender.java b/tinker/tconstruct/client/entityrender/CrystalRender.java new file mode 100644 index 00000000..2018ba20 --- /dev/null +++ b/tinker/tconstruct/client/entityrender/CrystalRender.java @@ -0,0 +1,164 @@ +package tinker.tconstruct.client.entityrender; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.entity.EntityLiving; +import net.minecraft.util.MathHelper; + +import org.lwjgl.opengl.GL11; + +import tinker.tconstruct.entity.Crystal; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class CrystalRender extends RenderLiving +{ + /** The creeper model. */ + private ModelBase creeperModel = new SkylaModel(); + + public CrystalRender() + { + super(new CrystalModel(), 0.5F); + } + + /** + * Updates creeper scale in prerender callback + */ + protected void updateCreeperScale(Crystal par1EntityCreeper, float par2) + { + float var4 = par1EntityCreeper.getCreeperFlashIntensity(par2); + float var5 = 1.0F + MathHelper.sin(var4 * 100.0F) * var4 * 0.01F; + + if (var4 < 0.0F) + { + var4 = 0.0F; + } + + if (var4 > 1.0F) + { + var4 = 1.0F; + } + + var4 *= var4; + var4 *= var4; + float var6 = (1.0F + var4 * 0.4F) * var5; + float var7 = (1.0F + var4 * 0.1F) / var5; + GL11.glScalef(var6, var7, var6); + } + + /** + * Updates color multiplier based on creeper state called by getColorMultiplier + */ + protected int updateCreeperColorMultiplier(Crystal par1EntityCreeper, float par2, float par3) + { + float var5 = par1EntityCreeper.getCreeperFlashIntensity(par3); + + if ((int)(var5 * 10.0F) % 2 == 0) + { + return 0; + } + else + { + int var6 = (int)(var5 * 0.2F * 255.0F); + + if (var6 < 0) + { + var6 = 0; + } + + if (var6 > 255) + { + var6 = 255; + } + + short var7 = 255; + short var8 = 255; + short var9 = 255; + return var6 << 24 | var7 << 16 | var8 << 8 | var9; + } + } + + /** + * A method used to render a creeper's powered form as a pass model. + */ + protected int renderCreeperPassModel(Crystal par1EntityCreeper, int par2, float par3) + { + if (par1EntityCreeper.getPowered()) + { + if (par1EntityCreeper.getHasActivePotion()) + { + GL11.glDepthMask(false); + } + else + { + GL11.glDepthMask(true); + } + + if (par2 == 1) + { + float var4 = (float)par1EntityCreeper.ticksExisted + par3; + this.loadTexture("/armor/power.png"); + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glLoadIdentity(); + float var5 = var4 * 0.01F; + float var6 = var4 * 0.01F; + GL11.glTranslatef(var5, var6, 0.0F); + this.setRenderPassModel(this.creeperModel); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glEnable(GL11.GL_BLEND); + float var7 = 0.5F; + GL11.glColor4f(var7, var7, var7, 1.0F); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); + return 1; + } + + if (par2 == 2) + { + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glLoadIdentity(); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_BLEND); + } + } + + return -1; + } + + protected int func_77061_b(Crystal par1EntityCreeper, int par2, float par3) + { + return -1; + } + + /** + * Allows the render to do any OpenGL state modifications necessary before the model is rendered. Args: + * entityLiving, partialTickTime + */ + protected void preRenderCallback(EntityLiving par1EntityLiving, float par2) + { + this.updateCreeperScale((Crystal)par1EntityLiving, par2); + } + + /** + * Returns an ARGB int color back. Args: entityLiving, lightBrightness, partialTickTime + */ + protected int getColorMultiplier(EntityLiving par1EntityLiving, float par2, float par3) + { + return this.updateCreeperColorMultiplier((Crystal)par1EntityLiving, par2, par3); + } + + /** + * Queries whether should render the specified pass or not. + */ + protected int shouldRenderPass(EntityLiving par1EntityLiving, int par2, float par3) + { + return this.renderCreeperPassModel((Crystal)par1EntityLiving, par2, par3); + } + + protected int inheritRenderPass(EntityLiving par1EntityLiving, int par2, float par3) + { + return this.func_77061_b((Crystal)par1EntityLiving, par2, par3); + } +} diff --git a/tinker/tconstruct/client/entityrender/SkylaRender.java b/tinker/tconstruct/client/entityrender/SkylaRender.java index 0d57b1d1..d556f1de 100644 --- a/tinker/tconstruct/client/entityrender/SkylaRender.java +++ b/tinker/tconstruct/client/entityrender/SkylaRender.java @@ -22,107 +22,11 @@ public class SkylaRender extends RenderLiving super(new SkylaModel(), 0.5F); } - /** - * Updates creeper scale in prerender callback - */ - protected void updateCreeperScale(Skyla par1EntityCreeper, float par2) - { - float var4 = par1EntityCreeper.getCreeperFlashIntensity(par2); - float var5 = 1.0F + MathHelper.sin(var4 * 100.0F) * var4 * 0.01F; - - if (var4 < 0.0F) - { - var4 = 0.0F; - } - - if (var4 > 1.0F) - { - var4 = 1.0F; - } - - var4 *= var4; - var4 *= var4; - float var6 = (1.0F + var4 * 0.4F) * var5; - float var7 = (1.0F + var4 * 0.1F) / var5; - GL11.glScalef(var6, var7, var6); - } - - /** - * Updates color multiplier based on creeper state called by getColorMultiplier - */ - protected int updateCreeperColorMultiplier(Skyla par1EntityCreeper, float par2, float par3) - { - float var5 = par1EntityCreeper.getCreeperFlashIntensity(par3); - - if ((int)(var5 * 10.0F) % 2 == 0) - { - return 0; - } - else - { - int var6 = (int)(var5 * 0.2F * 255.0F); - - if (var6 < 0) - { - var6 = 0; - } - - if (var6 > 255) - { - var6 = 255; - } - - short var7 = 255; - short var8 = 255; - short var9 = 255; - return var6 << 24 | var7 << 16 | var8 << 8 | var9; - } - } - /** * A method used to render a creeper's powered form as a pass model. */ protected int renderCreeperPassModel(Skyla par1EntityCreeper, int par2, float par3) { - if (par1EntityCreeper.getPowered()) - { - if (par1EntityCreeper.getHasActivePotion()) - { - GL11.glDepthMask(false); - } - else - { - GL11.glDepthMask(true); - } - - if (par2 == 1) - { - float var4 = (float)par1EntityCreeper.ticksExisted + par3; - this.loadTexture("/armor/power.png"); - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glLoadIdentity(); - float var5 = var4 * 0.01F; - float var6 = var4 * 0.01F; - GL11.glTranslatef(var5, var6, 0.0F); - this.setRenderPassModel(this.creeperModel); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glEnable(GL11.GL_BLEND); - float var7 = 0.5F; - GL11.glColor4f(var7, var7, var7, 1.0F); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); - return 1; - } - - if (par2 == 2) - { - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glLoadIdentity(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); - } - } return -1; } @@ -136,17 +40,17 @@ public class SkylaRender extends RenderLiving * Allows the render to do any OpenGL state modifications necessary before the model is rendered. Args: * entityLiving, partialTickTime */ - protected void preRenderCallback(EntityLiving par1EntityLiving, float par2) + /*protected void preRenderCallback(EntityLiving par1EntityLiving, float par2) { this.updateCreeperScale((Skyla)par1EntityLiving, par2); - } + }*/ /** * Returns an ARGB int color back. Args: entityLiving, lightBrightness, partialTickTime */ protected int getColorMultiplier(EntityLiving par1EntityLiving, float par2, float par3) { - return this.updateCreeperColorMultiplier((Skyla)par1EntityLiving, par2, par3); + return super.getColorMultiplier(par1EntityLiving, par2, par3); } /** diff --git a/tinker/tconstruct/container/SmelteryContainer.java b/tinker/tconstruct/container/SmelteryContainer.java index 69c3960c..f761e8d5 100644 --- a/tinker/tconstruct/container/SmelteryContainer.java +++ b/tinker/tconstruct/container/SmelteryContainer.java @@ -148,6 +148,7 @@ public class SmelteryContainer extends Container return logic.isUseableByPlayer(entityplayer); } + @Override public ItemStack transferStackInSlot (EntityPlayer player, int slotID) { ItemStack stack = null; @@ -183,14 +184,15 @@ public class SmelteryContainer extends Container return stack; } - /*protected boolean mergeItemStack (ItemStack inputStack, int par2, int par3, boolean flag) + @Override + protected boolean mergeItemStack (ItemStack inputStack, int startSlot, int endSlot, boolean flag) { boolean merged = false; - int slotPos = par2; + int slotPos = startSlot; if (flag) { - slotPos = par3 - 1; + slotPos = endSlot - 1; } Slot slot; @@ -198,7 +200,7 @@ public class SmelteryContainer extends Container if (inputStack.isStackable()) { - while (inputStack.stackSize > 0 && (!flag && slotPos < par3 || flag && slotPos >= par2)) + while (inputStack.stackSize > 0 && (!flag && slotPos < endSlot || flag && slotPos >= startSlot)) { slot = (Slot)this.inventorySlots.get(slotPos); slotStack = slot.getStack(); @@ -242,14 +244,14 @@ public class SmelteryContainer extends Container //System.out.println("Boom"); if (flag) { - slotPos = par3 - 1; + slotPos = endSlot - 1; } else { - slotPos = par2; + slotPos = startSlot; } - while (!flag && slotPos < par3 || flag && slotPos >= par2) + while (!flag && slotPos < endSlot || flag && slotPos >= startSlot) { slot = (Slot)this.inventorySlots.get(slotPos); slotStack = slot.getStack(); @@ -277,5 +279,5 @@ public class SmelteryContainer extends Container } return merged; - }*/ + } } diff --git a/tinker/tconstruct/entity/Crystal.java b/tinker/tconstruct/entity/Crystal.java new file mode 100644 index 00000000..567b32b2 --- /dev/null +++ b/tinker/tconstruct/entity/Crystal.java @@ -0,0 +1,21 @@ +package tinker.tconstruct.entity; + +import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.world.World; + +public class Crystal extends EntityCreeper +{ + + public Crystal(World par1World) + { + super(par1World); + this.texture = "/tinkertextures/mob/crystalwater.png"; + } + + @Override + public int getMaxHealth () + { + return 100; + } + +} diff --git a/tinker/tconstruct/entity/Skyla.java b/tinker/tconstruct/entity/Skyla.java index 970a3f13..f5aaf281 100644 --- a/tinker/tconstruct/entity/Skyla.java +++ b/tinker/tconstruct/entity/Skyla.java @@ -17,248 +17,35 @@ import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class Skyla extends EntityMob +public class Skyla extends EntityPlayer { - /** - * Time when this creeper was last in an active state (Messed up code here, probably causes creeper animation to go - * weird) - */ - private int lastActiveTime; - /** - * The amount of time since the creeper was close enough to the player to ignite - */ - private int timeSinceIgnited; - private int fuseTime = 30; + public Skyla(World par1World) + { + super(par1World); + username = "Skyla"; + texture = "/tinkertextures/mob/skyla.png"; + } - /** Explosion radius for this creeper. */ - private int explosionRadius = 10; + @Override + public void sendChatToPlayer (String var1) {} - public Skyla(World par1World) - { - super(par1World); - System.out.println("Hello!"); - this.texture = "/tinkertextures/mob/skyla.png"; - this.tasks.addTask(1, new EntityAISwimming(this)); - //this.tasks.addTask(2, new EntityAICreeperSwell(this)); - this.tasks.addTask(3, new EntityAIAvoidEntity(this, EntityOcelot.class, 6.0F, 0.25F, 0.3F)); - this.tasks.addTask(4, new EntityAIAttackOnCollide(this, 0.25F, false)); - this.tasks.addTask(5, new EntityAIWander(this, 0.2F)); - this.tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F)); - this.tasks.addTask(6, new EntityAILookIdle(this)); - this.targetTasks.addTask(1, new EntityAINearestAttackableTarget(this, EntityPlayer.class, 16.0F, 0, true)); - this.targetTasks.addTask(2, new EntityAIHurtByTarget(this, false)); - } + @Override + public boolean canCommandSenderUseCommand (int var1, String var2) + { + return false; + } - /** - * Returns true if the newer Entity AI code should be run - */ - public boolean isAIEnabled() - { - return true; - } - - public int func_82143_as() - { - return this.getAttackTarget() == null ? 3 : 3 + (this.health - 1); - } - - /** - * Called when the mob is falling. Calculates and applies fall damage. - */ - protected void fall(float par1) - { - super.fall(par1); - this.timeSinceIgnited = (int)((float)this.timeSinceIgnited + par1 * 1.5F); - - if (this.timeSinceIgnited > this.fuseTime - 5) - { - this.timeSinceIgnited = this.fuseTime - 5; - } - } - - public int getMaxHealth() - { - return 20; - } - - protected void entityInit() - { - super.entityInit(); - this.dataWatcher.addObject(16, Byte.valueOf((byte) - 1)); - this.dataWatcher.addObject(17, Byte.valueOf((byte)0)); - } - - /** - * (abstract) Protected helper method to write subclass entity data to NBT. - */ - public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) - { - super.writeEntityToNBT(par1NBTTagCompound); - - if (this.dataWatcher.getWatchableObjectByte(17) == 1) - { - par1NBTTagCompound.setBoolean("powered", true); - } - - par1NBTTagCompound.setShort("Fuse", (short)this.fuseTime); - par1NBTTagCompound.setByte("ExplosionRadius", (byte)this.explosionRadius); - } - - /** - * (abstract) Protected helper method to read subclass entity data from NBT. - */ - public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) - { - super.readEntityFromNBT(par1NBTTagCompound); - this.dataWatcher.updateObject(17, Byte.valueOf((byte)(par1NBTTagCompound.getBoolean("powered") ? 1 : 0))); - - if (par1NBTTagCompound.hasKey("Fuse")) - { - this.fuseTime = par1NBTTagCompound.getShort("Fuse"); - } - - if (par1NBTTagCompound.hasKey("ExplosionRadius")) - { - this.explosionRadius = par1NBTTagCompound.getByte("ExplosionRadius"); - } - } - - /** - * Called to update the entity's position/logic. - */ - public void onUpdate() - { - if (this.isEntityAlive()) - { - this.lastActiveTime = this.timeSinceIgnited; - int var1 = this.getCreeperState(); - - if (var1 > 0 && this.timeSinceIgnited == 0) - { - this.playSound("random.fuse", 1.0F, 0.5F); - } - - this.timeSinceIgnited += var1; - - if (this.timeSinceIgnited < 0) - { - this.timeSinceIgnited = 0; - } - - if (this.timeSinceIgnited >= this.fuseTime) - { - this.timeSinceIgnited = this.fuseTime; - - if (!this.worldObj.isRemote) - { - boolean var2 = this.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing"); - - if (this.getPowered()) - { - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float)(this.explosionRadius * 2), var2); - } - else - { - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float)this.explosionRadius, var2); - } - - this.setDead(); - } - } - } - - super.onUpdate(); - } - - /** - * Returns the sound this mob makes when it is hurt. - */ - protected String getHurtSound() - { - return "mob.creeper.say"; - } - - /** - * Returns the sound this mob makes on death. - */ - protected String getDeathSound() - { - return "mob.creeper.death"; - } - - /** - * Called when the mob's health reaches 0. - */ - public void onDeath(DamageSource par1DamageSource) - { - super.onDeath(par1DamageSource); - - if (par1DamageSource.getEntity() instanceof EntitySkeleton) - { - int var2 = Item.record13.itemID + this.rand.nextInt(Item.recordWait.itemID - Item.record13.itemID + 1); - this.dropItem(var2, 1); - } - } - - public boolean attackEntityAsMob(Entity par1Entity) - { - return true; - } - - /** - * Returns true if the creeper is powered by a lightning bolt. - */ - public boolean getPowered() - { - return this.dataWatcher.getWatchableObjectByte(17) == 1; - } - - @SideOnly(Side.CLIENT) - - /** - * Params: (Float)Render tick. Returns the intensity of the creeper's flash when it is ignited. - */ - public float getCreeperFlashIntensity(float par1) - { - return ((float)this.lastActiveTime + (float)(this.timeSinceIgnited - this.lastActiveTime) * par1) / (float)(this.fuseTime - 2); - } - - /** - * Returns the item ID for the item the mob drops on death. - */ - protected int getDropItemId() - { - return Item.gunpowder.itemID; - } - - /** - * Returns the current state of creeper, -1 is idle, 1 is 'in fuse' - */ - public int getCreeperState() - { - return this.dataWatcher.getWatchableObjectByte(16); - } - - /** - * Sets the state of creeper, -1 to idle and 1 to be 'in fuse' - */ - public void setCreeperState(int par1) - { - this.dataWatcher.updateObject(16, Byte.valueOf((byte)par1)); - } - - /** - * Called when a lightning bolt hits the entity. - */ - public void onStruckByLightning(EntityLightningBolt par1EntityLightningBolt) - { - super.onStruckByLightning(par1EntityLightningBolt); - this.dataWatcher.updateObject(17, Byte.valueOf((byte)1)); - } + @Override + public ChunkCoordinates getPlayerCoordinates () + { + return null; + } + } diff --git a/tinker/tconstruct/items/ToolPart.java b/tinker/tconstruct/items/ToolPart.java index 4f319c66..462b7427 100644 --- a/tinker/tconstruct/items/ToolPart.java +++ b/tinker/tconstruct/items/ToolPart.java @@ -20,7 +20,7 @@ public class ToolPart extends CraftingItem public String getItemNameIS(ItemStack stack) { - int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, 15); + int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, 16); return getItemName() + "." +toolMaterialNames[arr]; } diff --git a/tinker/tconstruct/player/TPlayerHandler.java b/tinker/tconstruct/player/TPlayerHandler.java new file mode 100644 index 00000000..c9137868 --- /dev/null +++ b/tinker/tconstruct/player/TPlayerHandler.java @@ -0,0 +1,162 @@ +package tinker.tconstruct.player; + +import java.util.HashMap; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.event.ForgeSubscribe; +import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +import net.minecraftforge.event.entity.living.LivingFallEvent; +import net.minecraftforge.event.entity.player.PlayerDropsEvent; +import tinker.tconstruct.AbilityHelper; +import tinker.tconstruct.PHConstruct; +import tinker.tconstruct.TContent; +import tinker.tconstruct.client.TProxyClient; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.IPlayerTracker; +import cpw.mods.fml.relauncher.Side; + +public class TPlayerHandler implements IPlayerTracker +{ + /* Player */ + //public int hunger; + public HashMap playerStats = new HashMap(); + + @Override + public void onPlayerLogin (EntityPlayer entityplayer) + { + //Lookup player + NBTTagCompound tags = entityplayer.getEntityData(); + if (!tags.hasKey("TConstruct")) + { + tags.setCompoundTag("TConstruct", new NBTTagCompound()); + } + TPlayerStats stats = new TPlayerStats(); + stats.player = entityplayer; + stats.level = entityplayer.experienceLevel; + stats.health = 20; //More hp in the future + stats.hunger = entityplayer.getFoodStats().getFoodLevel(); + stats.diary = tags.getCompoundTag("TConstruct").getBoolean("diary"); + if (!stats.diary) + { + tags.getCompoundTag("TConstruct").setBoolean("diary", true); + ItemStack diary = new ItemStack(TContent.manualBook); + if (!entityplayer.inventory.addItemStackToInventory(diary)) + { + AbilityHelper.spawnItemAtPlayer(entityplayer, diary); + } + } + playerStats.put(entityplayer.username, stats); + } + + @Override + public void onPlayerLogout (EntityPlayer entityplayer) + { + //Save player? + playerStats.remove(entityplayer.username); + } + + @Override + public void onPlayerChangedDimension (EntityPlayer entityplayer) + { + //Nothing? + + } + + @Override + public void onPlayerRespawn (EntityPlayer entityplayer) + { + //Boom! + TPlayerStats stats = getPlayerStats(entityplayer.username); + stats.player = entityplayer; + if (PHConstruct.keepLevels) + entityplayer.experienceLevel = stats.level; + if (PHConstruct.keepHunger) + entityplayer.getFoodStats().setFoodLevel(stats.hunger); + NBTTagCompound tags = entityplayer.getEntityData().getCompoundTag("TConstruct"); + tags.getCompoundTag("TConstruct").setBoolean("diary", stats.diary); + } + + @ForgeSubscribe + public void playerDrops (PlayerDropsEvent evt) + { + TPlayerStats stats = getPlayerStats(evt.entityPlayer.username); + stats.level = evt.entityPlayer.experienceLevel / 2; + //stats.health = 20; + int hunger = evt.entityPlayer.getFoodStats().getFoodLevel(); + if (hunger < 6) + stats.hunger = 6; + else + stats.hunger = evt.entityPlayer.getFoodStats().getFoodLevel(); + } + + TPlayerStats getPlayerStats (String username) //Not sure if needed + { + TPlayerStats stats = playerStats.get(username); + if (stats == null) + { + stats = new TPlayerStats(); + playerStats.put(username, stats); + } + return stats; + } + + public EntityPlayer getEntityPlayer (String username) + { + TPlayerStats stats = playerStats.get(username); + if (stats == null) + { + return null; + } + else + { + return stats.player; + } + } + + @ForgeSubscribe + public void livingFall (LivingFallEvent evt) //Only for negating fall damage + { + if (evt.entityLiving instanceof EntityPlayer) + { + Side side = FMLCommonHandler.instance().getEffectiveSide(); + if (side == Side.CLIENT) + { + TProxyClient.controlInstance.landOnGround(); + + //System.out.println("Client side: "+evt.entityLiving.motionY); + } + else + System.out.println("Server side"); + + evt.distance -= 1; + //evt.distance = 0; + //TPlayerStats stats = playerStats.get(((EntityPlayer)evt.entityLiving).username); + //stats.prevMotionY = evt.entityLiving.motionY; + //evt.entityLiving.motionY = 10.2; + } + } + + /*@ForgeSubscribe + public void livingUpdate (LivingUpdateEvent evt) + { + Side side = FMLCommonHandler.instance().getEffectiveSide(); + if (side == Side.CLIENT && evt.entityLiving instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) evt.entityLiving; + TPlayerStats stats = playerStats.get(player.username); + if (player.onGround != stats.prevOnGround) + { + if (player.onGround)// && -stats.prevMotionY > 0.1) + //player.motionY = 0.5; + player.motionY = -stats.prevMotionY * 0.8; + //player.motionY *= -1.2; + stats.prevOnGround = player.onGround; + //if () + + //System.out.println("Fall: "+player.fallDistance); + } + } + }*/ +} diff --git a/tinker/tconstruct/player/TPlayerStats.java b/tinker/tconstruct/player/TPlayerStats.java new file mode 100644 index 00000000..7e2c1120 --- /dev/null +++ b/tinker/tconstruct/player/TPlayerStats.java @@ -0,0 +1,15 @@ +package tinker.tconstruct.player; + +import net.minecraft.entity.player.EntityPlayer; + +public class TPlayerStats +{ + public EntityPlayer player; + public int level; + public int health; + public int hunger; + public boolean diary; + + //public boolean prevOnGround; + //public double prevMotionY; +}