From b43a1eb5aaac0ce27a6e3270c002e7bb6c15dc4a Mon Sep 17 00:00:00 2001 From: HbmMods Date: Thu, 17 Mar 2016 18:59:25 +0100 Subject: [PATCH] Added plasma grenade, small fixes --- Factory1.png | Bin 0 -> 979 bytes Factory2.png | Bin 0 -> 1193 bytes Factory3.png | Bin 0 -> 979 bytes Fusion1.png | Bin 0 -> 3484 bytes Fusion2.png | Bin 0 -> 4395 bytes Fusion3.png | Bin 0 -> 4936 bytes Fusion4.png | Bin 0 -> 4395 bytes Fusion5.png | Bin 0 -> 3484 bytes Info.txt | 2 + Reachtor1.png | Bin 0 -> 1288 bytes Reachtor2.png | Bin 0 -> 2140 bytes Reachtor3.png | Bin 0 -> 2366 bytes Reachtor4.png | Bin 0 -> 2140 bytes Reachtor5.png | Bin 0 -> 1288 bytes assets/hbm/lang/de_DE.lang | 12 +- assets/hbm/lang/en_US.lang | 10 +- assets/hbm/textures/items/cape_gasmask.png | Bin 0 -> 295 bytes assets/hbm/textures/items/cape_radiation.png | Bin 0 -> 292 bytes .../hbm/textures/items/cape_schrabidium.png | Bin 0 -> 269 bytes assets/hbm/textures/items/cape_test.png | Bin 0 -> 251 bytes assets/hbm/textures/items/cape_unknown.png | Bin 0 -> 267 bytes assets/hbm/textures/items/grenade_plasma.png | Bin 0 -> 316 bytes assets/hbm/textures/models/CapeGasMask.png | Bin 0 -> 461 bytes assets/hbm/textures/models/CapeHbm.png | Bin 0 -> 509 bytes assets/hbm/textures/models/CapeLPkukin.png | Bin 0 -> 410 bytes assets/hbm/textures/models/CapeRadiation.png | Bin 0 -> 529 bytes .../hbm/textures/models/CapeSchrabidium.png | Bin 0 -> 422 bytes assets/hbm/textures/models/CapeTemplate.png | Bin 0 -> 398 bytes assets/hbm/textures/models/CapeUnknown.png | Bin 0 -> 442 bytes assets/hbm/textures/models/TestCape.png | Bin 0 -> 314 bytes com/hbm/blocks/ModBlocks.java | 3 +- com/hbm/blocks/TestEventTester.java | 4 +- com/hbm/blocks/TileEntityCoreAdvanced.java | 4 +- com/hbm/blocks/TileEntityCoreTitanium.java | 4 +- .../blocks/TileEntityMachineCentrifuge.java | 30 +-- com/hbm/entity/EntityGrenadePlasma.java | 56 ++++++ com/hbm/explosion/ExplosionChaos.java | 26 +++ com/hbm/gui/GUIMachineCentrifuge.java | 9 +- com/hbm/items/ArmorModel.java | 172 ++++++++++++------ com/hbm/items/ItemDesingator.java | 3 +- com/hbm/items/ItemGrenade.java | 15 ++ com/hbm/items/ItemModAxe.java | 11 -- com/hbm/items/ItemModPickaxe.java | 11 -- com/hbm/items/ItemPlasmaBlock.java | 20 ++ com/hbm/items/ItemStarterKit.java | 9 +- com/hbm/items/ModItems.java | 24 ++- com/hbm/lib/Library.java | 4 + com/hbm/lib/RefStrings.java | 2 +- com/hbm/main/ClientProxy.java | 2 + com/hbm/main/CraftingManager.java | 10 + com/hbm/main/MainRegistry.java | 2 + com/hbm/render/ModelCloak.java | 90 +++++++++ 52 files changed, 412 insertions(+), 123 deletions(-) create mode 100644 Factory1.png create mode 100644 Factory2.png create mode 100644 Factory3.png create mode 100644 Fusion1.png create mode 100644 Fusion2.png create mode 100644 Fusion3.png create mode 100644 Fusion4.png create mode 100644 Fusion5.png create mode 100644 Info.txt create mode 100644 Reachtor1.png create mode 100644 Reachtor2.png create mode 100644 Reachtor3.png create mode 100644 Reachtor4.png create mode 100644 Reachtor5.png create mode 100644 assets/hbm/textures/items/cape_gasmask.png create mode 100644 assets/hbm/textures/items/cape_radiation.png create mode 100644 assets/hbm/textures/items/cape_schrabidium.png create mode 100644 assets/hbm/textures/items/cape_test.png create mode 100644 assets/hbm/textures/items/cape_unknown.png create mode 100644 assets/hbm/textures/items/grenade_plasma.png create mode 100644 assets/hbm/textures/models/CapeGasMask.png create mode 100644 assets/hbm/textures/models/CapeHbm.png create mode 100644 assets/hbm/textures/models/CapeLPkukin.png create mode 100644 assets/hbm/textures/models/CapeRadiation.png create mode 100644 assets/hbm/textures/models/CapeSchrabidium.png create mode 100644 assets/hbm/textures/models/CapeTemplate.png create mode 100644 assets/hbm/textures/models/CapeUnknown.png create mode 100644 assets/hbm/textures/models/TestCape.png create mode 100644 com/hbm/entity/EntityGrenadePlasma.java delete mode 100644 com/hbm/items/ItemModAxe.java delete mode 100644 com/hbm/items/ItemModPickaxe.java create mode 100644 com/hbm/items/ItemPlasmaBlock.java create mode 100644 com/hbm/render/ModelCloak.java diff --git a/Factory1.png b/Factory1.png new file mode 100644 index 0000000000000000000000000000000000000000..c61802a140161fa6ba16e0ebf7ecf4807f269296 GIT binary patch literal 979 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 Z4kJ%3`DQ$lo2&RcX=~$%zi)jw@t=9X&4&O0 literal 0 HcmV?d00001 diff --git a/Fusion3.png b/Fusion3.png new file mode 100644 index 0000000000000000000000000000000000000000..e513765a9a62e9e2e93dd8c53fd3b82dad9a6ba8 GIT binary patch literal 4936 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 xTgduI_~ogkS$`G&$!KhWS zfQl7S5P}p%1S(ho6++4^LrNKs2;U)u!6xjtQGU5#W2_+nDah2 z8&Gd%W@cewfkvY(EiJKFEDnd;vuBT$m6f%%H2?s3Jl@8}X7Ap;1OkCbB-+~A+S%FJ z+uQHkx6i@B!O_vt+1Yvj{{7zG-oC!Retv%b{{8_00fB*mK|w)Bj~)#R3yX+|h>VPk zii#qW$tO;nh>nhqiHV_5C{!vnHa3<Gia_PsXd91c*T|q~Dv5jq7DYN1 z5p5K4BznDx(GH{CVY?C>VKDXcwscLLCCGYR~uqy}0CzzGjBmp<@uZXEj1kzipRarp)DYX5S1Sg3wLP&kw(? zOJJO+3ODPSdAcxWUd(x=egZJ+Gt*)eO?XP`oBLiFDg#~^C38HDI$uuviy|i=;JUxM zW_*r<7tqpReAiF}`T7VlF)LLq1hL@`E$xrOKjfwNMvy8fxK%nQVo2I`oekG@ z$-JtF*|+&lx#Q#G5x4|*&wyupR)5r@Y3|o{2EHZvcrfj2wvFsNnaAOzCR_*uqXB)PMCIW=KWFrgj<4$j2n)Fb{ ze9;rV*Tyd$u~j&z#-#)Tdxx}|-b#ErWR=$Yp&)qTw2|5Ob4Ep#>$czPmJ&;mAz;K{ z0ELjC2p<%Rx}|9$#0c4qBB%B)$(||9dyShq>}!nRF;|r7l6g8FWnd<6>BtWe_PVau z+pp2sge#ja(D9;PY#_J+LrrWjF`I_JC`hTYw3*VniEN$vrmc1)!&s`u)uh%8`&!Jp zvn^XVsNE@jo4J5wy$Nu81hf``!rc11NRIC9k`~k5#l){GYT7s`(hY_t8<|hH9_`Bd zjy-3;&g=7oe4KiH=D8;uei)Lu)ORGePv@TYCp!9`_pA`p<-6SgvKSs7f44bXFw6af zJZ2o@-2r;9kfxSn4_s~rkt(f>vRQYSw?;nq#CZjbpOy|I6@wjDNQj%$4^W#VuXe(D zv)wv*=%A~q&raH{4vHI54w&emEJ$;kmBSjh3T9q>fh(*1z!USZVD^Md47Zhi@e)^N zm(7w{5t$dEAzuQo+j;A-?8br7`TKJ9Re;@yp6B*vKS+%_XvxWz zHH=;Ks;2nMYt(W4pDb9JC4$h-o?tF@S>!qYln1e2(UJ|y2_C`Xb6Leck$INEBO2?0HCxaV4 zo-iIyudjL(!$=TATf_*CZx?%`H$qEaN^ZUCy#Mgsc6&!!?L#h=)2weGl=@~v-p_gjYn({4Ac?2 z6u^T^1Y9hfcUYml`7{R#3jBh&@cPh6x8=g$rI->Hq?z}@V+4cOOb55P5&nL@TY%J2 z;PnFM00MxB-w|^iqA+ehuj7XUe^UN%XlQx-qm94?G{% z64pj7-OL)$Ha2D*Ui0ZLoomwXN_m$j$cxu(&+O80@d(xh_t+YPon4C5Hpa3JyN}LS zGuCDxm(f%!T?EvHqu1B6*$Rv530!K38k%)@tWDZylWhfoiy5UumtTlUEb6A6gXTji zh&&y37U36>%1LZuJluc_@WJ{}KvV5knWwAjCcUQxe+ia46zj)0%f(Y#!romZgvCw;@n!W54mx|^<`6P1p%RCyYcNYVGbTXa_z5}$+Tp!VD7$z=1Ot_1@cT! zuiU#Q1QoIeiV~;g5<2GksSXy<@Nek`RD@9|nBg|e&1fte4Zn;^3rRCDEB>)(QMZMe zJhMS%O9gFlzlu~L80fOEx&KmyNNjGx88kA7M!txBm~`WW7;amN97uO5Y#BKNs`vnp zvnx5JpSQ}yAjf@=x%qFcaDDEnEw>eovMk07){7d~pB{}&Mm4T2Bv?^#8NJUyq6pRYwGA0liD-mlrKs1S? zd!PL~Hnp;HV9W0**MH$f2Q1dNAchTAzzrw`c_qr77+^oJ+zioCGJjaRj!Qic5l(zu z_1QLvd;iBWxppZ|PG3_1aaFLn5TVsKE%`Pf+jiCUYKo*rF8?CIKJ!X(g!$pJPd=Y2 zo%tk#&E_xm5^B6NtUr^L3Ubv`69p*vZfCKkRTH49q_2MzPBXd>h%-+qx$hM!VrqI! Z4kJ%3`DQ$lo2&RcX=~$%zi)jw@t=9X&4&O0 literal 0 HcmV?d00001 diff --git a/Fusion5.png b/Fusion5.png new file mode 100644 index 0000000000000000000000000000000000000000..6f528ffbca563ffd09c2aadad4c6bdd956eb27c1 GIT binary patch literal 3484 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 L>gTe~DWM4f7fN>z literal 0 HcmV?d00001 diff --git a/Reachtor2.png b/Reachtor2.png new file mode 100644 index 0000000000000000000000000000000000000000..b3cdd7005068af071e91ec79d5bba0dc26ee5813 GIT binary patch literal 2140 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVBSkfJR9T^xl_H+M9WMyDrW(e>J zaRrK-o10r%Sy@|K+uGXN+1c6K+uPW9I5;>sIyyQzIXOE!ySTWxy1Kf#xw*T$J2?0_ zIr({bczAkxdU<(ydwcu%`1tzz`uX{}xCFSm2D-Tgxw{8@c!YR*hI)C0`TIu)1Ox;I z1_lJg1O~>&#KgqK#l^?RhlVBsK~hpua&mG?N=j;KYFb)adU|?xc6LrqPF`MKetv#I zK|x_*VNp?0adB};Nl9sGX<1oWd3kw7MMY(0WmQ#GO-)U0ZEam$U44E1Ra=JZ_DnY% zm~T3=+;L%l)>L_?Cl6 zYq+W*3-hc8(YhTP35$ak3r2cuy&AS*+rBGO|NiT5ET24k!rdc5llkA4Se(~(r{CwTYcfZu2SAJLg7Dzv+t?ODsM=k{`&sx(^u{&*>7cW~J^ z*Z(@J)z3dEb9uk-Fl%e}h02N(uQ(-bZTs%bUuRu()2zt2dIwwJ#MYaZuEwX@5~rv} zPMhi}SKRo>=8l!sCjZ^bmrq-NNTuH~go*$355JIwIidFtWE(U*KO(O7(O`T2tWBBQ z9J4lGoN@B)`!Ju&ch+vXz4k8G=RY=XwyK{t+Ql>2kZrecTYgP)a#??v4zw;j5dmbr^@yTFwA zjb%6H@v(jId0c6Dp38FH(**I^mOu2TK1thran{M1w_h*&Sy#RHZcg5Ma@} zZhQ1)#p9f-*Gt|@YiOT)rleC?EXczHGFkqy;=Q8|pH%E8w$EC$;p>wtO{>lUf$yjP zto-%o?F;25@0(O9@i^Y|qe*}lXU&ln%f%}s9?uW@UshafER&VRByV{7ix7YEpVQLL zvDdrX=6OF*28QCNfG6`;o}ACV!24vzv7a3;4dli8Dm6Z>U%f8w`ugs}i_|vGRyvbx zbB4WDQ0~|d_3RC4-`KAk9CJ79Zw&+rgim5`UcLI@(p9P-0?+(zl>wR`{Oar0tBd}H zP8R;5@ocZtymrHXn#V2(-!?O}>#7XX_+W5sf6%|~DdCCP(}jR476v>?6#74>PTWQV zXsZ3whhKggG}d2!e%Suu!sRbNKb!$#??2#N!}}#mf6k15bu$jRbJfmU2+kExBzIl0 z)8VOTGuz6~92v&nx~bWi5rpnR9mkhCMs?y!-AupLaj^-Fx3T z@0H+jXlqM*O8@|@{V>R2qs4Ek`4;2cJ7(HsG@r!#1o{9#mvGy9j2QrI0r1!mlo9vv z@bL2TI&tCz1OkCVq2Au!Cr@HvFqn^z4;&6hAP`6-5`{wf`ud{LXc!C&hvP69jGv#M zzrTM#KmZnt4Gav#;c!SK9)%+K`Ua!XL<}ax&o9*9|J$IT2s|E7AQ13)5`hp&B9Wq^ zqR3=&XlRU4Vq;?|6v~-1XX4`Gs8nive0*YJVp394a&mHNYHC_q8jVIvPfyRt$e`2d z3gu|>y88P1 zhK2@-MAF>c+|kj|+1V+TO1rzedwP0q+_)i=$>egmLZMJ9m3@7E{r&wam1Cd>DK@`Dh-__`bCIA$>x^(c19Eh<|=-CqE4{L9iKXxVat>_FP+5#4MC zyGeBD%l-O`TLK?3BsSAEO**GYA#OVl-G8uIK(nw9(4>NPIUu4P{{pZ(HQ zHtyM)!>W06Yw>FJpEYau%xFqc0z(LLIDAd(cB?}t5pu3S(c)kdBeLMJA0g4-8L+a^ zoaF^Ic^g)KwDz=aTRy_On_K+yU_)DmDXmw(@TxH-D?(dNaZw*Pk*z-!xt)c!L*kur zXP=dK{16nzdz5EzxiC5*5Lyk=9xL{q{``t_USi~GYG>NDiOO3hnK<<1(ZY?{1^3~Z zR}HmC*ye4NQELnJ7ja_puhz3tkgyZjy?aARfH}}LqRQz$sQO3URPHY?>>-|tTk>8? z)?Fl_dF3k>K5teFN#>m*)5G z?pK_5ZgjnTn-{bQkhlqUmHg(gtM&x7sZ;fR>J@nBv9Qq4DbhjPclAG%m1cr7w~P6M zLrki6&!y{Pae!^9u%hby8)nhvuo>nwKx(HS> z6Wf9~ObyMx`o&oO-F;2ZvPWg%138)pHSqze(efC(QvdJ!7M%We#&sAVi%o1mW}Djs z51Qid&v(bh67tdJ;z)3+6ry$D9-Y*5HSV!weO?gRUOXLPU;Z*uJgc6>2ZxN4y?d6Rdoq z<7DVpqHjLLeo57gT-%HuJ!ihr)WC_)n)N1_StYHO7{RgC<_CtswXD?f`L&7H?5XSC z_l)FdmsKO%fvldXCH*XhkD}YRBD##ZF0R`!u_MKD;^L;)Z%0U!&ueKc2ipv2EX3}+ z&G@4$+MVcqubjtsP8uL?pv@W|DaoM_V#q$x%?MH#hZVW9}0)O29GZIH|l{i`~Uy| literal 0 HcmV?d00001 diff --git a/Reachtor4.png b/Reachtor4.png new file mode 100644 index 0000000000000000000000000000000000000000..b3cdd7005068af071e91ec79d5bba0dc26ee5813 GIT binary patch literal 2140 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVBSkfJR9T^xl_H+M9WMyDrW(e>J zaRrK-o10r%Sy@|K+uGXN+1c6K+uPW9I5;>sIyyQzIXOE!ySTWxy1Kf#xw*T$J2?0_ zIr({bczAkxdU<(ydwcu%`1tzz`uX{}xCFSm2D-Tgxw{8@c!YR*hI)C0`TIu)1Ox;I z1_lJg1O~>&#KgqK#l^?RhlVBsK~hpua&mG?N=j;KYFb)adU|?xc6LrqPF`MKetv#I zK|x_*VNp?0adB};Nl9sGX<1oWd3kw7MMY(0WmQ#GO-)U0ZEam$U44E1Ra=JZ_DnY% zm~T3=+;L%l)>L_?Cl6 zYq+W*3-hc8(YhTP35$ak3r2cuy&AS*+rBGO|NiT5ET24k!rdc5llkA4Se(~(r{CwTYcfZu2SAJLg7Dzv+t?ODsM=k{`&sx(^u{&*>7cW~J^ z*Z(@J)z3dEb9uk-Fl%e}h02N(uQ(-bZTs%bUuRu()2zt2dIwwJ#MYaZuEwX@5~rv} zPMhi}SKRo>=8l!sCjZ^bmrq-NNTuH~go*$355JIwIidFtWE(U*KO(O7(O`T2tWBBQ z9J4lGoN@B)`!Ju&ch+vXz4k8G=RY=XwyK{t+Ql>2kZrecTYgP)a#??v4zw;j5dmbr^@yTFwA zjb%6H@v(jId0c6Dp38FH(**I^mOu2TK1thran{M1w_h*&Sy#RHZcg5Ma@} zZhQ1)#p9f-*Gt|@YiOT)rleC?EXczHGFkqy;=Q8|pH%E8w$EC$;p>wtO{>lUf$yjP zto-%o?F;25@0(O9@i^Y|qe*}lXU&ln%f%}s9?uW@UshafER&VRByV{7ix7YEpVQLL zvDdrX=6OF*28QCNfG6`;o}ACV!24vzv7a3;4dli8Dm6Z>U%f8w`ugs}i_|vGRyvbx zbB4WDQ0~|d_3RC4-`KAk9CJ79Zw&+rgim5`UcLI@(p9P-0?+(zl>wR`{Oar0tBd}H zP8R;5@ocZtymrHXn#V2(-!?O}>#7XX_+W5sf6%|~DdCCP(}jR476v>?6#74>PTWQV zXsZ3whhKggG}d2!e%Suu!sRbNKb!$#??2#N!}}#mf6k15bu$jRbJfmU2+kExBzIl0 z)8VOTGuz6~92v&nx!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=La;W&C|s( zq$2L^jN4vcY$V+N&;EKs_PGmukyR}Tcv7lPGtIY_ipU}(C__$-TKzY9ro?p_wL^P`@g;C-gNcd$Mc5i z=a(;6ct3pjaKZd#OwX+v$*#sf-@jjo21m$A3S56m&nketr7n#>Skmz|H!t0x9pT6#oDDv*Z2#{rmZ5Z@==+`($%X zQPHD>hhGYwH!e?@JHhlv5K9UZOMHC%?$f7FKb&>GySw|{pFey0*WK$=r-@ku2^7!_f#sX{ZJ?E6+vd_EyZ6RBH*^-7c=TdG5uRJ<^ZnDB= zxeZru?-R-Tl$s!ZV$V4PhTA*e$}cvHZ%b0x-0^Gf%B#%Lwj17Gs`NfHJ(1feT~5q* zTUAPe!tBs1Z@d**X71)Y@l7Y?^R!#Fnw1m0uU}pxyon{gtHGy1VZG&Axf`z%GZTEr_9*Tqc!2?y~B(a+&5!-fLek+qj}-Uuboro>=$vGu=908&Uq)Ze4s^| zw)Ie-6#Fcjv0sGo=KtBBW*L{->P=tyOnxe73va1t<4S7PP!yaPFb?^Vug~WqN*Td^k`gDLKzt!y9 zsuBd_Pw7l6scJl!@%eg)Vg@u%EdZtA0wY*{0Vh4h;B)`q{$o!$c1ZkLmB(#hsm0*w L>gTe~DWM4f7fN>z literal 0 HcmV?d00001 diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 73a1c7a4c..f5cd94926 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -106,11 +106,13 @@ tile.book_guide.name=Hbm's Nuclear Tech Mod Handbuch tile.factory_titanium_hull.name=Einfache Fabrikshülle tile.factory_titanium_furnace.name=Einfache Fabrikzugriffsluke +tile.factory_titanium_conductor.name=Einfacher Fabriksstromanschluss tile.factory_titanium_core.name=Einfache Fabrikkernkomponente item.factory_core_titanium.name=Einfacher Fabrikenergiecluster container.factoryTitanium=Einfache Fabrik tile.factory_advanced_hull.name=Fortgeschrittene Fabrikshülle tile.factory_advanced_furnace.name=Fortgeschrittene Fabrikzugriffsluke +tile.factory_advanced_conductor.name=Fortgeschrittener Fabriksstromanschluss tile.factory_advanced_core.name=Fortgeschrittene Fabrikkernkomponente item.factory_core_advanced.name=Fortgeschrittener Fabrikenergiecluster container.factoryAdvanced=Fortgeschrittene Fabrik @@ -118,7 +120,7 @@ container.factoryAdvanced=Fortgeschrittene Fabrik tile.reactor_element.name=Reaktorkammer tile.reactor_control.name=Steuerstäbe tile.reactor_hatch.name=Kraftwerkszugriffsluke -tile.reactor_conductor.name=Stromanschluss +tile.reactor_conductor.name=Reaktorstromanschluss tile.reactor_computer.name=Reaktorsteuerung container.reactorMultiblock=Großer Atomreaktor @@ -389,6 +391,7 @@ item.grenade_flare.name=Blendgranate item.grenade_electric.name=Blitzbombe item.grenade_poison.name=Giftgranate item.grenade_gas.name=Gasgranate +item.grenade_plasma.name=Plasmagranate item.grenade_schrabidium.name=Schrabidiumgranate item.grenade_nuke.name=Mark VI Bohrgranate item.grenade_nuclear.name=Nuka-Granate @@ -618,4 +621,9 @@ item.alloy_shovel.name=Legierungsschaufel item.alloy_hoe.name=Legierungsfeldhacke tile.red_cable.name=Rotes Kupferkabel -tile.block_meteor.name=Meteoritenblock \ No newline at end of file +tile.block_meteor.name=Meteoritenblock + +item.cape_radiation.name=Cape (Radioaktiv) +item.cape_gasmask.name=Cape (Gasmaske) +item.cape_schrabidium.name=Cape (Schrabidisch) +item.cape_hbm.name=Hbms Cape \ No newline at end of file diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 6727a5e8d..f258c35f4 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -106,11 +106,13 @@ tile.book_guide.name=Hbm's Nuclear Tech Mod Manual tile.factory_titanium_hull.name=Basic Factory Casing tile.factory_titanium_furnace.name=Basic Factory Access Hatch +tile.factory_titanium_conductor.name=Basic Factory Electricity Port tile.factory_titanium_core.name=Basic Factory Core Component item.factory_core_titanium.name=Basic Factory Energy Cluster container.factoryTitanium=Basic Factory tile.factory_advanced_hull.name=Advanced Factory Casing tile.factory_advanced_furnace.name=Advanced Factory Access Hatch +tile.factory_advanced_conductor.name=Advanced Factory Electricity Port tile.factory_advanced_core.name=Advanced Factory Core Component item.factory_core_advanced.name=Advanced Factory Energy Cluster container.factoryAdvanced=Advanced Factory @@ -390,6 +392,7 @@ item.grenade_flare.name=Flare Grenade item.grenade_electric.name=Lightning Bomb item.grenade_poison.name=Poison Grenade item.grenade_gas.name=Gas Grenade +item.grenade_plasma.name=Plasma Grenade item.grenade_schrabidium.name=Schrabidium Grenade item.grenade_nuke.name=Mark VI Drill Grenade item.grenade_nuclear.name=Nuka Grenade @@ -619,4 +622,9 @@ item.alloy_shovel.name=Advanced Alloy Shovel item.alloy_hoe.name=Advanced Alloy Hoe tile.red_cable.name=Red Copper Cable -tile.block_meteor.name=Meteor Block \ No newline at end of file +tile.block_meteor.name=Meteor Block + +item.cape_radiation.name=Cape (Radiation) +item.cape_gasmask.name=Cape (Gas Mask) +item.cape_schrabidium.name=Cape (Schrabidic) +item.cape_hbm.name=Hbm's Cape \ No newline at end of file diff --git a/assets/hbm/textures/items/cape_gasmask.png b/assets/hbm/textures/items/cape_gasmask.png new file mode 100644 index 0000000000000000000000000000000000000000..e80702f1c7834bb77c0c73f4ab736c374b9afb9b GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb}?)YHW= z#KM2+1Vg?<1_CUfnY=Zos%E)NY@5}^{(;l(koc$M!y306) literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/cape_radiation.png b/assets/hbm/textures/items/cape_radiation.png new file mode 100644 index 0000000000000000000000000000000000000000..1a272b1eb7181ffaa588a5fc81c5cdfb1fd8229d GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb}?$kW9! z#KM2+1Vg@N2OgHY%O0`Yv|6$DJN#i>dWQeg)9$@#uJ7J(_=zaL6MLVaxO7VNl0^PW z4gcCLH${w;SvW!;_=vupBgoVeC3h_RXsTn_JFyxwMh&~LIrqC?oPKh@B|&__g4Dz3 z^g5zL#96cwX3h>M(%N9O->Xsl`CPw)fq#}x`y>9M;LZb=h65^AM~qIMnvu`^NNM`S ivSS>M`k57TmEvuzs;q=GXWRk0mci52&t;ucLK6UVb!OK9 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/cape_schrabidium.png b/assets/hbm/textures/items/cape_schrabidium.png new file mode 100644 index 0000000000000000000000000000000000000000..6cafe4881408d67b23809016e2556d843d6b3019 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33Jxw35k=DcEtlQS95AU9*ME>4rLy%}o#IpJEoW{{JGnNyK!L+c zTS4s8nPMP=TmQD%haC>B_M$4*kD|1{$Gp`!!``@Ed4WK^VNJk-1NU!zUwTJ;&cpkx z92zd2dLOnk?ccApz@d|OF5~&T!ZtduQrSQAa6HltvRl4X_Qb`N>&-=?dw|Yj@O1Ta JS?83{1OQ=xU19(L literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/cape_test.png b/assets/hbm/textures/items/cape_test.png new file mode 100644 index 0000000000000000000000000000000000000000..2b639100100cadc14d01589250f98fdcc6861bee GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJbP0l+XkKX~kJ! literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/cape_unknown.png b/assets/hbm/textures/items/cape_unknown.png new file mode 100644 index 0000000000000000000000000000000000000000..86035c3c412a101499dcf6d199d53bbe65861e11 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33JJp)78&q Iol`;+0O(;{@c;k- literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/grenade_plasma.png b/assets/hbm/textures/items/grenade_plasma.png new file mode 100644 index 0000000000000000000000000000000000000000..26b215610eef7ca2752d626264369292d363145e GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb}?%hSa% z#KM1R-$FhnLjl(J#vF<)vBk?)z4|BT+oXI@v4G=G(d8$xw{jbmJ2>wizr9oT%p3h( z5A{o&CkAcGob@dIe|<)i#Nyt^8Hy~Ads%AyLz=sEK6QHtrOs2E@MP!yr`i*4JeuK8Y`&|-8gpT91R@d!OEw8_&yk|KOy5OIC)9;w z`??oQ`JndwZx#cmSLd{F&IMC|63uD?Ivw|>yPC)J^Xf~+T)ue3#_BK77Yv@RelF{r G5}E)Bad>M0 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/CapeGasMask.png b/assets/hbm/textures/models/CapeGasMask.png new file mode 100644 index 0000000000000000000000000000000000000000..6b7d44edc7514ee02cee89c47a84b2b13c0b7a09 GIT binary patch literal 461 zcmV;;0W$uHP)N2bZe?^J zG%heMIczh2P5=M_OG!jQRA@u(ma$I6Fc3stp)^E7RFMz`1)`uqS5RC<4g3S5{U3Q@JKENc|l3sdvD`)$!cWzF1yZ&$G(|K=`if)&&3)TE|`x zFvow<02I)M7XU^9It5@1VQ610FRbU;B>>n9F96<4P@$^_z&BnH6x<$v?A-$v2Y{XC z;xpd)F#sD}WAy+O-ktypVG4kC)c^>;`#Am!=qe0^zW`{yIsk;50>GRHV9M13AgC-D zwq7&N2bZe?^J zG%heMIczh2P5=M_dr3q=RA@u(mNBk^KoExMX$d72&8s+q1)=m3oWu6j?+Tv9qgZ&2 zH9zv3aoz%J#1WJElF7IOA^soh#tdBc$8h>Ngx_ozEnLGrv1_p!9{Mfd3pY&@x~>~~ zRaN)GT3&;QJkOJAeEjx-0ER`-wrw9uig`sq2)B{!ETY#YKtNsBA^e>~S(d|A=MKP( zbKLVT0kLal@FySzpi=;XW449>9d>SJh7`cV5aAh|v$->%D2jix@$q+LNOoDA$!-D# z$hVBHXI28_+5{Q;2XN0C0%YK&wFz1P0^`pQif4cpAcM1~3Sf^FubDytc-s)r_x%u@ zB9;WmN)eQ`Ckq^B5f}5xpL+28Sm4#zTUNL>%D#ThCPk5U$1_X z+}8czV$AEezo+L)Y-nh&{L5i;>(!px|Bo1yO3H+IK2++rUsq)A@V7f>$hC{3XV|E)+`@WWVTtaxHr?<$iLN`%A8;t}IruvsJ$h)*$9*Y} zZX6U+dT_+Q>QmaBr2XeP?fESCSLDpO?YX`4omBmKt3Fk+4`c_qq>% zre-L9W@VVbYrM_e(Tb7bn7rM4{pq*1FmRtUjc;J}J*(a$?(pOM_UzW@x4b;KHuQ3H zDC)kranI!=6GuKPk7|v2!{JRA@bCQ>-K^I zr{xbGd-PwNqw#QdE!QTN1+JVk>{{ZNv}S=hSWA!dpBf`553cT70K*y~?vt5y8eS5w;X ztdjfjj@CpC>Gu~dZ@Zr3#o_UA-s@kyog0#DUYEakyDQsFx%80lAK0&xWpJ}$Jh0>V$_0IY?JSrseE(ma7Q)nU`PjTU|701K zd=RoKzsm4shx|_-2fl+nN(|dt&e}6xxpA7&BjYo}qovcEPHUO=%zMQcknrbgCqLth z2b-eU8>|@?J~h&@6=%$dW>sK}e{Vk9fBwGOD>5-^4|y8iL^C%ONIAqAv&6JX9hkV5 zX@M5&F_sJlBf+ms2RhstB91aCyp3gKn9cN{XlIPx^wUp4)b+C>hu9AUF!(&P?al&* ODTAl0pUXO@geCxhl%dZ6 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/CapeTemplate.png b/assets/hbm/textures/models/CapeTemplate.png new file mode 100644 index 0000000000000000000000000000000000000000..28b80b5684a9de9abf9b346ab1bde538cc42791a GIT binary patch literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5hd`K7RKu$QC@4|l8c`CQpH@`(hs&E6fDkP<8Q%=I8&)b+1( zp8uS)Of%cY+5i6c{y(y>Tsb-le($RfZ&_M+E&YXT+rx>MfBaf%-m~ELw%9cZvsgFi zoPIlXd1SJ`Ue3A9n!ipOdlRM7TiSN!%P|}->bJ_iF`c33amDJTAHQm|H$04Ibzr_6 zb@-MJ1KX7kQOX_h3_2|)`|1Q6wlY1u$CQxqo#Dsb?1+0-uU}-!F)%$o-mb@Z;X%w@ z=7b-QE%dY%r!cIDWlqRoO;G&9d|;O~14lR$!*hlyZ^RndwlNgsNipQzVB41d#fFh# pHWPQ6>&%;hyRH7%S)bKRfnq^^R|ot)@<3XgMxp z>D7=eyC!%c11}F_6_du3jZ6{~4w~95SfI+duVv$3rFEqn{92iu9$GGwiDz(rFY0h- z^&_qa?){0K^SIVnMmdOtFfcvt=g;Nn{1`ISV`@iy0XB4ude`@%$AjK*3F(E{-7?&Tso2xttw&oc{mSziYHqvPU?G zY4eH)%;JIKAAf$@rK7ou(Ol*5^M~;+`4^@p8f9IY`cUF(<-^ClO+IXOHQb5v`64Ms zA09_@{Jx`UBzb9q>+{z0bCo75@h($ literal 0 HcmV?d00001 diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index fd69f0976..0140faa45 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -1,5 +1,6 @@ package com.hbm.blocks; +import com.hbm.items.ItemPlasmaBlock; import com.hbm.items.ItemPrototypeBlock; import com.hbm.items.ItemSchrabidiumBlock; import com.hbm.lib.RefStrings; @@ -570,7 +571,7 @@ public class ModBlocks { GameRegistry.registerBlock(fusion_heater, fusion_heater.getUnlocalizedName()); GameRegistry.registerBlock(fusion_hatch, fusion_hatch.getUnlocalizedName()); GameRegistry.registerBlock(fusion_core, fusion_core.getUnlocalizedName()); - GameRegistry.registerBlock(plasma, plasma.getUnlocalizedName()); + GameRegistry.registerBlock(plasma, ItemPlasmaBlock.class, plasma.getUnlocalizedName()); //Launch Pads GameRegistry.registerBlock(launch_pad, launch_pad.getUnlocalizedName()); diff --git a/com/hbm/blocks/TestEventTester.java b/com/hbm/blocks/TestEventTester.java index fcc9a5b3f..e79986cf9 100644 --- a/com/hbm/blocks/TestEventTester.java +++ b/com/hbm/blocks/TestEventTester.java @@ -106,7 +106,9 @@ public class TestEventTester extends Block { //ExplosionChaos.anvil(par1World, par2, par3 + 2, par4, 1); //return true; - return false; + System.out.println(par5EntityPlayer.getCommandSenderName()); + System.out.println(par5EntityPlayer.getUniqueID()); + return true; } /*public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int i, float a, float b, float c) diff --git a/com/hbm/blocks/TileEntityCoreAdvanced.java b/com/hbm/blocks/TileEntityCoreAdvanced.java index e01078e48..cf6593642 100644 --- a/com/hbm/blocks/TileEntityCoreAdvanced.java +++ b/com/hbm/blocks/TileEntityCoreAdvanced.java @@ -179,7 +179,7 @@ public class TileEntityCoreAdvanced extends TileEntity implements ISidedInventor world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord - 1) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord + 1, this.yCoord - 1, this.zCoord - 1) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord - 1, this.yCoord - 1, this.zCoord) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_advanced_conductor && + (world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_advanced_conductor || world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_advanced_hull) && world.getBlock(this.xCoord + 1, this.yCoord - 1, this.zCoord) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord - 1, this.yCoord - 1, this.zCoord + 1) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord + 1) == ModBlocks.factory_advanced_hull && @@ -196,7 +196,7 @@ public class TileEntityCoreAdvanced extends TileEntity implements ISidedInventor world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord - 1) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord + 1, this.yCoord + 1, this.zCoord - 1) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord - 1, this.yCoord + 1, this.zCoord) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_advanced_conductor && + (world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_advanced_conductor || world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_advanced_hull) && world.getBlock(this.xCoord + 1, this.yCoord + 1, this.zCoord) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord - 1, this.yCoord + 1, this.zCoord + 1) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord + 1) == ModBlocks.factory_advanced_hull && diff --git a/com/hbm/blocks/TileEntityCoreTitanium.java b/com/hbm/blocks/TileEntityCoreTitanium.java index 4aa8142f1..c391eaa5a 100644 --- a/com/hbm/blocks/TileEntityCoreTitanium.java +++ b/com/hbm/blocks/TileEntityCoreTitanium.java @@ -180,7 +180,7 @@ public class TileEntityCoreTitanium extends TileEntity implements ISidedInventor world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord - 1) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord + 1, this.yCoord - 1, this.zCoord - 1) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord - 1, this.yCoord - 1, this.zCoord) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_titanium_conductor && + (world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_titanium_conductor || world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_titanium_hull) && world.getBlock(this.xCoord + 1, this.yCoord - 1, this.zCoord) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord - 1, this.yCoord - 1, this.zCoord + 1) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord + 1) == ModBlocks.factory_titanium_hull && @@ -197,7 +197,7 @@ public class TileEntityCoreTitanium extends TileEntity implements ISidedInventor world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord - 1) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord + 1, this.yCoord + 1, this.zCoord - 1) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord - 1, this.yCoord + 1, this.zCoord) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_titanium_conductor && + (world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_titanium_conductor || world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_titanium_hull) && world.getBlock(this.xCoord + 1, this.yCoord + 1, this.zCoord) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord - 1, this.yCoord + 1, this.zCoord + 1) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord + 1) == ModBlocks.factory_titanium_hull && diff --git a/com/hbm/blocks/TileEntityMachineCentrifuge.java b/com/hbm/blocks/TileEntityMachineCentrifuge.java index 0211d12ce..a931d1f67 100644 --- a/com/hbm/blocks/TileEntityMachineCentrifuge.java +++ b/com/hbm/blocks/TileEntityMachineCentrifuge.java @@ -280,34 +280,6 @@ public class TileEntityMachineCentrifuge extends TileEntity implements ISidedInv { slots[5].stackSize += itemStack[3].stackSize; } - /* - if(slots[2] == null && slots[3] == null && slots[4] == null && slots[5] == null) - { - if(itemStack[0] != null) - { - slots[2] = itemStack[0].copy(); - } - - if(itemStack[1] != null) - { - slots[3] = itemStack[1].copy(); - } - - if(itemStack[2] != null) - { - slots[4] = itemStack[2].copy(); - } - - if(itemStack[3] != null) - { - slots[5] = itemStack[3].copy(); - } - }else if(slots[2].isItemEqual(itemStack[0]) && slots[3].isItemEqual(itemStack[1]) && slots[4].isItemEqual(itemStack[2]) && slots[5].isItemEqual(itemStack[3])) { - slots[2].stackSize += itemStack[0].stackSize; - slots[3].stackSize += itemStack[1].stackSize; - slots[4].stackSize += itemStack[2].stackSize; - slots[5].stackSize += itemStack[3].stackSize; - }*/ for(int i = 0; i < 1; i++) { @@ -386,7 +358,7 @@ public class TileEntityMachineCentrifuge extends TileEntity implements ISidedInv { dualCookTime++; - if(this.dualCookTime == TileEntityMachineCentrifuge.processingSpeed) + if(this.dualCookTime >= TileEntityMachineCentrifuge.processingSpeed) { this.dualCookTime = 0; this.processItem(); diff --git a/com/hbm/entity/EntityGrenadePlasma.java b/com/hbm/entity/EntityGrenadePlasma.java new file mode 100644 index 000000000..85c618110 --- /dev/null +++ b/com/hbm/entity/EntityGrenadePlasma.java @@ -0,0 +1,56 @@ +package com.hbm.entity; + +import com.hbm.explosion.ExplosionChaos; +import com.hbm.explosion.ExplosionNukeGeneric; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.monster.EntityBlaze; +import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +public class EntityGrenadePlasma extends EntityThrowable +{ + private static final String __OBFID = "CL_00001722"; + + public EntityGrenadePlasma(World p_i1773_1_) + { + super(p_i1773_1_); + } + + public EntityGrenadePlasma(World p_i1774_1_, EntityLivingBase p_i1774_2_) + { + super(p_i1774_1_, p_i1774_2_); + } + + public EntityGrenadePlasma(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + + @Override + protected void onImpact(MovingObjectPosition p_70184_1_) + { + if (p_70184_1_.entityHit != null) + { + byte b0 = 0; + + if (p_70184_1_.entityHit instanceof EntityBlaze) + { + b0 = 3; + } + + p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0); + } + + if (!this.worldObj.isRemote) + { + this.setDead(); + this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.0F, true); + ExplosionChaos.plasma(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 7 ); + } + } +} diff --git a/com/hbm/explosion/ExplosionChaos.java b/com/hbm/explosion/ExplosionChaos.java index 02504f5c3..2bb90863b 100644 --- a/com/hbm/explosion/ExplosionChaos.java +++ b/com/hbm/explosion/ExplosionChaos.java @@ -732,4 +732,30 @@ public class ExplosionChaos { world.spawnEntityInWorld(mirv8); } + public static void plasma(World world, int x, int y, int z, int radius) + { + int r = radius; + int r2 = r*r; + int r22 = r2/2; + for (int xx = -r; xx < r; xx++) + { + int X = xx+x; + int XX = xx*xx; + for (int yy = -r; yy < r; yy++) + { + int Y = yy+y; + int YY = XX+yy*yy; + for (int zz = -r; zz < r; zz++) + { + int Z = zz+z; + int ZZ = YY+zz*zz; + if (ZZ 32.0F) + { + f5 = 32.0F; + } + + float f6 = (float)(d3 * d1 + d0 * d2) * 100.0F; + float f7 = (float)(d3 * d2 - d0 * d1) * 100.0F; + + if (f6 < 0.0F) + { + f6 = 0.0F; + } + + float f8 = player.prevCameraYaw + (player.cameraYaw - player.prevCameraYaw) * par7; + f5 += MathHelper.sin((player.prevDistanceWalkedModified + (player.distanceWalkedModified - player.prevDistanceWalkedModified) * par7) * 6.0F) * 32.0F * f8; + + if (player.isSneaking()) + { + f5 += 25.0F; + } + + GL11.glRotatef(6.0F + f6 / 2.0F + f5, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(f7 / 2.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(-f7 / 2.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); + this.bipedCloak.render(par7); + GL11.glPopMatrix(); + } + } +}