From 6ecfecfe04acc036f76ec663cca8b19a949efb7b Mon Sep 17 00:00:00 2001 From: HbmMods Date: Tue, 9 Feb 2016 18:49:10 +0100 Subject: [PATCH] Added new textures and factory blocks --- assets/hbm/lang/de_DE.lang | 6 + assets/hbm/lang/en_US.lang | 6 + .../blocks/block_reinforced_alloy.png | Bin 0 -> 358 bytes assets/hbm/textures/blocks/code.png | Bin 0 -> 229 bytes .../textures/blocks/factory_advanced_core.png | Bin 0 -> 425 bytes .../blocks/factory_advanced_furnace.png | Bin 0 -> 435 bytes .../textures/blocks/factory_advanced_hull.png | Bin 0 -> 383 bytes .../textures/blocks/factory_titanium_core.png | Bin 0 -> 375 bytes .../blocks/factory_titanium_furnace.png | Bin 0 -> 414 bytes .../textures/blocks/factory_titanium_hull.png | Bin 0 -> 369 bytes assets/hbm/textures/gui/factory_titanium.png | Bin 0 -> 2204 bytes assets/hbm/textures/items/code.png | Bin 0 -> 229 bytes assets/hbm/textures/items/fuel_tank_large.png | Bin 253 -> 230 bytes .../hbm/textures/items/fuel_tank_medium.png | Bin 268 -> 277 bytes assets/hbm/textures/items/fuel_tank_small.png | Bin 279 -> 285 bytes assets/hbm/textures/items/stealth_boy.png | Bin 0 -> 301 bytes .../hbm/textures/items/syringe_metal_medx.png | Bin 0 -> 314 bytes .../textures/items/syringe_metal_psycho.png | Bin 0 -> 312 bytes assets/hbm/textures/items/syringe_poison.png | Bin 0 -> 297 bytes assets/hbm/textures/items/thruster_large.png | Bin 277 -> 288 bytes assets/hbm/textures/items/thruster_medium.png | Bin 261 -> 272 bytes assets/hbm/textures/items/thruster_small.png | Bin 261 -> 263 bytes .../textures/items/warhead_buster_large.png | Bin 268 -> 285 bytes .../textures/items/warhead_buster_medium.png | Bin 269 -> 286 bytes .../textures/items/warhead_buster_small.png | Bin 270 -> 287 bytes .../textures/items/warhead_cluster_large.png | Bin 268 -> 274 bytes .../textures/items/warhead_cluster_medium.png | Bin 269 -> 275 bytes .../textures/items/warhead_cluster_small.png | Bin 270 -> 274 bytes .../textures/items/warhead_generic_large.png | Bin 268 -> 261 bytes .../textures/items/warhead_generic_medium.png | Bin 269 -> 267 bytes .../textures/items/warhead_generic_small.png | Bin 270 -> 264 bytes .../items/warhead_incendiary_large.png | Bin 268 -> 291 bytes .../items/warhead_incendiary_medium.png | Bin 269 -> 286 bytes .../items/warhead_incendiary_small.png | Bin 270 -> 283 bytes assets/hbm/textures/items/warhead_mirv.png | Bin 248 -> 254 bytes assets/hbm/textures/items/warhead_mirvlet.png | Bin 248 -> 241 bytes assets/hbm/textures/items/warhead_nuclear.png | Bin 248 -> 244 bytes .../textures/items/warhead_thermo_endo.png | Bin 248 -> 231 bytes .../hbm/textures/items/warhead_thermo_exo.png | Bin 248 -> 231 bytes assets/hbm/textures/models/GasMask.png | Bin 523 -> 511 bytes com/hbm/blocks/DecoBlockAlt.java | 5 +- com/hbm/blocks/FactoryHatch.java | 127 ++++++++++++ com/hbm/blocks/ModBlocks.java | 25 ++- com/hbm/blocks/TileEntityYellowBarrel.java | 2 +- .../entity/EntityNukeExplosionAdvanced.java | 4 +- com/hbm/explosion/ExplosionNukeGeneric.java | 5 +- com/hbm/items/ArmorEuphemium.java | 30 +-- com/hbm/items/ArmorSchrabidium.java | 14 +- com/hbm/items/ArmorT45.java | 12 +- com/hbm/items/ItemStarterKit.java | 18 ++ com/hbm/items/ItemSyringe.java | 196 ++++++++++++++++++ com/hbm/items/ModItems.java | 15 ++ com/hbm/lib/HbmChestContents.java | 3 +- com/hbm/lib/Library.java | 6 +- com/hbm/main/CraftingManager.java | 8 +- com/hbm/render/ModelGasMask.java | 14 +- com/hbm/render/ModelGoggles.java | 10 +- com/hbm/render/ModelT45Helmet.java | 65 ++++-- 58 files changed, 513 insertions(+), 58 deletions(-) create mode 100644 assets/hbm/textures/blocks/block_reinforced_alloy.png create mode 100644 assets/hbm/textures/blocks/code.png create mode 100644 assets/hbm/textures/blocks/factory_advanced_core.png create mode 100644 assets/hbm/textures/blocks/factory_advanced_furnace.png create mode 100644 assets/hbm/textures/blocks/factory_advanced_hull.png create mode 100644 assets/hbm/textures/blocks/factory_titanium_core.png create mode 100644 assets/hbm/textures/blocks/factory_titanium_furnace.png create mode 100644 assets/hbm/textures/blocks/factory_titanium_hull.png create mode 100644 assets/hbm/textures/gui/factory_titanium.png create mode 100644 assets/hbm/textures/items/code.png create mode 100644 assets/hbm/textures/items/stealth_boy.png create mode 100644 assets/hbm/textures/items/syringe_metal_medx.png create mode 100644 assets/hbm/textures/items/syringe_metal_psycho.png create mode 100644 assets/hbm/textures/items/syringe_poison.png create mode 100644 com/hbm/blocks/FactoryHatch.java diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index c27e9ba55..8d71dd252 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -310,6 +310,7 @@ item.nuke_electric_kit.name=Kit des Elektronikingenieurs item.prototype_kit.name=Prototyp Kit item.missile_kit.name=Raketen Kit item.t45_kit.name=T45-Powerrüstungskit +item.euphemium_kit.name=Euphemium Kit tile.waste_earth.name=Totes Gras tile.waste_trinitite.name=Trinititerz @@ -409,9 +410,14 @@ item.plate_gold.name=Goldplatte item.syringe_empty.name=Leere Spritze item.syringe_antidote.name=Gegenmittel +item.syringe_poison.name=Giftspritze item.syringe_awesome.name=AWESOME item.syringe_metal_empty.name=Metallspritze item.syringe_metal_stimpak.name=Stimpak +item.syringe_metal_medx.name=Med-X +item.syringe_metal_psycho.name=Psycho + +item.stealth_boy.name=Mobile Tarnkappe entity.hbm.entity_bullet.name=Patrone entity.hbm.entity_rocket.name=Rakete diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 1b9dc5dfd..acd0bfaaa 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -310,6 +310,7 @@ item.nuke_electric_kit.name=Electronic Engineer's Kit item.prototype_kit.name=Prototype Kit item.missile_kit.name=Missile Kit item.t45_kit.name=T45 Power Armor Kit +item.euphemium_kit.name=Euphemium Kit tile.waste_earth.name=Dead Grass @@ -410,9 +411,14 @@ item.plate_gold.name=Gold Plate item.syringe_empty.name=Empty Syringe item.syringe_antidote.name=Antidote +item.syringe_poison.name=Poisnous Injection item.syringe_awesome.name=AWESOME item.syringe_metal_empty.name=Metal Syringe item.syringe_metal_stimpak.name=Stimpak +item.syringe_metal_medx.name=Med-X +item.syringe_metal_psycho.name=Psycho + +item.stealth_boy.name=Stealth Device entity.hbm.entity_bullet.name=Bullet entity.hbm.entity_rocket.name=Rocket diff --git a/assets/hbm/textures/blocks/block_reinforced_alloy.png b/assets/hbm/textures/blocks/block_reinforced_alloy.png new file mode 100644 index 0000000000000000000000000000000000000000..95ddf654fe6482557994ad29b2c392e7be0ad7f3 GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb~t#M8ww z#KM2+q?=ra3Kr{0#LT=By}Z;C1rt33 zJA!paN2bZe?^J zG%heMIczh2P5=M_CrLy>R5(v{lG|#+KoExQGYEYeLGc)EX_DF$Y4su~h!@(15b!_{ zp$Gb$y(y*7(E2SCb|qu*4-x0&*tg`5UgVM4%_wXDtbWV62-otb#TK z_%EK7FU#U2kY)9HL-r`JO*z*HcqtJ8bA*$r6A%G1%YPMQr9ZQd1&$Po%BXS#;Ved; T)L|o100000NkvXXu0mjfeUhu3 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/factory_advanced_furnace.png b/assets/hbm/textures/blocks/factory_advanced_furnace.png new file mode 100644 index 0000000000000000000000000000000000000000..32e5140d61c758992fa9ec960ceefc72591b3873 GIT binary patch literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ?lwdqxWzq6| z>0TYK{cbF4_dh%$TfVtz^K@(D=V#_vZf^Cwop`Ny#&=s2W*39L*ZbD-^JE5@{Fzh8 zWS6#7ERJ2;DeoBf3yJ!ecM^8%zwx{mk7i){ophD^((J=-%6ilLwWg-66$@Rx(1G7n zc|)PheBSo&2_{t@ldKoUz2BfROZdg5ob$x% z$!0aj6rtZ%jGmqhi(Y(L8!go@AAigBa)RgTI0yC#FJ+6=3wWm;ah&#ZW_>lgnONdA bZ5>8;X?NfK#w*?e!<50()z4*}Q$iB}S2Cpn literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/factory_advanced_hull.png b/assets/hbm/textures/blocks/factory_advanced_hull.png new file mode 100644 index 0000000000000000000000000000000000000000..85af5d0d6ff3fef2d284de47b6b2cb62af36e2b4 GIT binary patch literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ@1bm1_V1 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/factory_titanium_core.png b/assets/hbm/textures/blocks/factory_titanium_core.png new file mode 100644 index 0000000000000000000000000000000000000000..8806d7c0e0b39e95cbf79ff84fcd7b022de97dae GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb~t)zif> z#KOPyf_Gkv15eAtm>z)%Oo@z5(PyXmitY3+vy8CQh?{)okI=NYWiwyZ?Oc0Cd%pN3 zN45z?f;I6!c7E8unWJXc>WatN>8rn=)10vK_O{yUCS~Sto2s~Ed@h^t9Jc72v@G*p z`Kw*~gil-v4K0mLf0yjOPFb@{DY;u=df4rdX-{8w9SPH3pi-@1aPhmX_n!h$?@kl8 zZQk-s(Q_lkq&uw^#V&tv!iLqiW4`jFoloXIs8B698l9If682>3Kdu`F(=WQnHbp2s zsILy2sLFOC#?bG{!N6~NO!}gXf7ESs{2O^v*w0&~bTiy6Jli}qarN_`;%vt&r0=Ue Rz6A^b22WQ%mvv4FO#mwhklX+O literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/factory_titanium_furnace.png b/assets/hbm/textures/blocks/factory_titanium_furnace.png new file mode 100644 index 0000000000000000000000000000000000000000..8b0678e5a275f180b13e1e20f86dad6c644518d5 GIT binary patch literal 414 zcmV;P0b%}$P)N2bZe?^J zG%heMIczh2P5=M_97#k$R5(wCkwHqtFcgO80y4M}JWShZLE8>eT7)^%Y`byc9ZCxd zuG|e>^cW&;ggJv>^0!UuIO7Ki?$=V9wdDs;Vf8vMlc=k|beEWk#S! zlj8(Ip6BAkG;S=iqylCqV7`D8%#q)mR|^4VplKQ&xe$;K z!|-pH76Nj%KOfd~>8rTrxgXoBUtPlg*j8pN@nSkd9W7#390UO$r*n;fPDudVaNOPU z72l6H(r`l*McQ=&B9JAW%0J9E$dYQ183E{wbN|4>DyZxF2gl@{^34csa{vGU07*qo IM6N<$g2;%dl>h($ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/factory_titanium_hull.png b/assets/hbm/textures/blocks/factory_titanium_hull.png new file mode 100644 index 0000000000000000000000000000000000000000..f254b6dd6fcb60e6c19b14ff31e9752a97f9d72e GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJm3L_(U)GSwZ@H?+wWb8`A@x-G~+`2x}H^ zSa;^+(rW=q^6Xoyr(3=;=3$oKX*faubkn)L@s8HV!*5D>y^l}~ex{(D`v1?GIp5MY zRzKKp*0;F$&1{}+D(ufr89&dLi&X^qmci52 K&t;ucLK6UlxsTHT literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/gui/factory_titanium.png b/assets/hbm/textures/gui/factory_titanium.png new file mode 100644 index 0000000000000000000000000000000000000000..d48f427925883e7503b8cad0c3dd20a027d7fdd3 GIT binary patch literal 2204 zcmeHIX;c$e6uwD@MFf$y8jDJ8QLD6sSOpp(WZ0Adq9v>a3bX;EfuItDpd=A3TEPlp z0RdxrRJ2M_5do34R-|f7q)H`WQCxxxAO@ijAf1U~`@5(A>UYk(H}}5pzM1>YeRsZF z*ihu7|h^;9P{wrI30Il7E5?Ww4?H{BDDH8w6j6$V(8` z3@in>b;A)698ZB$0yw=9%HyGi4OQ!)+XWsihbQ*Xw*)k{FuVw~^Wkzh{1yx{7TjD7 zt=^zq0iABp5C!Q)u=fD$$%oubDA)y(9k4$Owo5ZIGMbv2bUGdOwr}xPf&WkeUj|Q& z9~8d79}6q6|1*F!Y_tHAcFG2?&_sY~jrc{V%I5ZB&RKlV5I!p*mY)>8DF!w~ujBD4 zycqtxWfUrf7PnOBhxHdC)5A4j%U8Ya>P>~{d+E^+20OQIOzAg!I$@VN>rcey?uS=t zFGBmZ6T6+cg%OhMthEb{ojCc?Asg+UlljMUcA(iUBXaX+2A1L-0ZP?U@(BWe5Fug@ zFXx@pfAW8r(;MPy{VP+iICq<^DYf6{fYbEgbj0GV?-dU8PJQm4!F52QVNyPqLV&oS|z0O{0v3u)8I5JL{ z7Mm>>k>PA2!jX{jRE>4bam99qEjFV9oz;&iw<<$v6l#s+T_Y+bYih#@)B(OBjzFgI zPDJtYPN|^Sb$dRH=5BT;h7wGtJTRcfl;)UHse!&?S#X^0^uWP1V#psiXwF}_fVGBA zqB^Xiz>#xoBGrXC6IRMB-a$o;!|}oju6NE*!Pmr|u!zEh*us{EY)2BxXg5IVco3N9HT+s291Y^_g-PN?IGCBz2FiyZH7TLV>#I z;ll9*d3A5%oB=~lX{Ap*Z;O@2Sic!INH-T^|C`sKJ{)IUaq2eBT7fylt?@H)zxaCz z`o=7Wlo@sMfggk&L#r$Y3>9_mdG}kJ1lBka$7IkeqwDEtko65vCOuAUSKW;7I%<&s z9lux4>A$Ypt7qWDWM+DY(24f%BGw^TJf^WNln*P_RrRM-bxi9{NU3l$<2Bd2)YY4haqHxwDupoUm`WcWK^1rDs@B&%Kx+5%Z>L zVuL8lh!LSIg1&)6^tI%`qSSCNy0pL8+0GQT5?Z&JMOE%n~Bk;LJI z_Uh#Rp$;dqU1YWJq4G8(vR~+$p00Li0#LT=By}Z;C1rt33 zJA!paY=>CY6*TL8Ta~9Ziym(Sa00000NkvXXu0mjf#*ase delta 175 zcmaFH_?K~l3KwH>kh>GZx^prwCn`#F9cEzQJIr`Ie?`hfH~D(AKRwC!85kJyJY5_^ zEc}=DFmfGG;9>szfBEiZ8b?e|-C{NRl9o5)=6bIkuMQsX|7EYGXw^P(w##7~J1-%Q z7e910xdo)YvCP@jpjvYO-a<~6ImuYKlNeG@X7+gP=z5sj7 delta 190 zcmbQr)WbAEg^RH`$lZxy-8q?;6BVVo4l^+D9cDb9zanL#n|!_5pPuCV3=9mlo-U3d z7XDj(8hH;W@O=8e-1?3uN)^36T{-6AX@%<23)F6xSX qZhYc?E!WgTEKJ(9D64MyR&I;WtBQ0dSk?nw!rRWM m*{v^@!h;CnIc%Hv*z*Ct;Ivj5tGMw100000#LT=By}Z;C1rt33 zJ(1tTH3k}Wi=WzF ztKjJJ<?^HTGD_Yi5GH}hvF@2#9<(l|BXi}xj7!wZMMH>&NBI=^E|kzjI-zC*B= zXVJM`O3f)>w4*+V@ZWp5^?;oW`;1!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb}?!_&nv z#KM2+#IwAI6?oikb{Z?E@cY@OGT#eXyJyABqze~S4=ZrJdzX4v`1QXFo=iV0UEM26 zHvPD9;Pm&clChh#oTq>A&^Fq`{J%RaV}5+<4{x*0ADB+~AL$md`|1Yt1B0ilpUXO@ GgeCxh+IYYK literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/syringe_metal_psycho.png b/assets/hbm/textures/items/syringe_metal_psycho.png new file mode 100644 index 0000000000000000000000000000000000000000..bc1667419ed0a23f2ad0b4c0f3c66718b8123a24 GIT binary patch literal 312 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;C1rt33JCq=~lf;mQI)Zk<~U@k5xGJC-YeCN}1tu@b2C!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb}?+|$J| z#KM2+#Dl!e20X4a8yT&*nF|sc&K+csRes)4e1vc2>9fm!9rSbdymHw4kEp%QOh=bp z9fr$ZpLw=%s({ljyRX-ix$jjou2{{hT5S~(%yQ21c0{vLp02R4*Qt|M!onsQ&o+H| z@=1B;g$0?nza>A?mz=?{Wsi>k%w>@q*39DZS#k35j~!DS^)%MMULDD%_Qgj{?L+w1 pQwrkcxA#4=*mCD|{H6|`{O#NR$XK2$t_C`p!PC{xWt~$(698mkZ@&Nl literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/thruster_large.png b/assets/hbm/textures/items/thruster_large.png index 6d5267ee7f7e704c8fa7a99fb8fa2227bc57e081..ee64287d35a35539afcad69ca9fee68497426ca1 100644 GIT binary patch delta 239 zcmVk-rE-XsyW@z083ep^sdkWf?+GTS)>Wq`;Q!FDzQSW#Al zBY;wh)LNzYen0&_grT171wY+@86b&<2S-5J4>6N$3x(l%NjAuBVT*_qEoQe!1s2MW p0)xsdvuTYz@DKn1002ovPDHLkV1fgW BQMv#C diff --git a/assets/hbm/textures/items/thruster_medium.png b/assets/hbm/textures/items/thruster_medium.png index 3af950484da48a1253a4c498c36929b24b9c06ad..b480e5999438a175c4008aa1d2b143f2549c903f 100644 GIT binary patch delta 223 zcmV<503iQ`0+0fbB#|)~f5HF&4#EKyC`y0;000ZU$4TJG zj*~>>6QKxl&QeM_pYdD?MetidYwg0$6(_({YrTMZj1h)RA2kCtRrlU+<5mD;10u8H z1Yl3Fa}bKyjs~mxiW3xU=LXvWyqz1YT1+3s25`t@09R-D3>)GC>~?MtwQvCu+YR0$ Z=>Q$#!MI#p4EO*5002ovPDHLkV1f@gROA2v delta 183 zcmV;o07(Ck0)+yQBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wAAdIdjAP#b004GL zL_t(IPpymr4!|G?1O5M}nIK&RI_Kg@PNlYOB60*3K_5N(lm9DJ1iuxmimH%8K*#Us z56cvAvkl&U-+q&_0CE8fD@6bZt-=ZyM ld@kp;V26;Im+wfs02CK`pM6xC|A+tp002ovPDHLkV1m_NMsxrG diff --git a/assets/hbm/textures/items/thruster_small.png b/assets/hbm/textures/items/thruster_small.png index 7560d4fcf3f84f07b349e77ed5be179b47f86f27..30c695f3093f974bc84294424ca52f9bedc742f3 100644 GIT binary patch delta 214 zcmV;{04e{40*3;SB#|)~f5HF&4#EKyC`y0;000_n-R8~OfozGjNsJ-;6_YX znH?#r>(>o%8DRhQAH)C-IRDV%4VdZ0OwNH~47^}kl>s-^X5<{GMh{Z4k#LxCGl0Mep%ae&xYcst lq&zf_gn=)VfqzJQ02H_!t8tQadUIU+7!Vu(~^{b;YXLDx>LkP9jDcafZVu44HQW5~k!rbpK z2T)4+E_+&Qy0Y#s2gtqmiI>M16JN3|AQWE+L-A(;;2(D- me2I0I0>UDT7s(?yL#`Y89k+spJ`nZ*0000i?g1+O*K9T{rG1MWBhuFH-S_RJ|e5td{{R30 diff --git a/assets/hbm/textures/items/warhead_buster_medium.png b/assets/hbm/textures/items/warhead_buster_medium.png index 9bf59091854bb55c69377a77856ea500de219174..e9fada741e78cdd9d80eeca410e65e1abeff297c 100644 GIT binary patch delta 237 zcmVZG4z-H100000NkvXXu0mjf!WLAmN=gVH6(Eoc zx{?=AXki!pSKzf>fW@w$DhY!E3o}5I;qnfH0$Z;1S%3vPEB!s0Fu0%(WR8ozA3C_j tPRjxX6IDfy$Ndaw1{}H|UBZ3KxBx0!#aD*`d@29{002ovPDHLkV1l#XN`(Lb diff --git a/assets/hbm/textures/items/warhead_buster_small.png b/assets/hbm/textures/items/warhead_buster_small.png index fb8d2badce9c85b71edefb7f28e7653f90830b7a..4b85efdc72a0b0ad026998088d7881317ba0a392 100644 GIT binary patch delta 238 zcmVUY6Qj(Ge zncV{}D5c19L~CuW?EBjRK+t=4i?g1;?&HX+b-`YL0}Nk5lYd(gNN7p4wRzds6c}AV>h|P7a>f$l5n3HUqaA~88*7#IbVX| uZOQ^6OuM3RpP5KpR2^eR_5qvl4>T@`vddA_XB6`Q0000<5qG4_AM7I25JC{Z*9mufS6>}KO6k39DWyDD z^nG=JTx;!ExwY1@k!65T{0u-Qs|aM`1}Ka%K*{@s8?aE^1^{1NMfj7^Q31lxh!x2+ boFUf@RRFj~o4F?500000NkvXXu0mjfK9N`2 delta 190 zcmV;v073tf0*nHXBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wAAdIdjAP#b004bS zL_t(IPo+!&62Kq`>i?g1+O*K9T{rG1MWBhuFH-S_RJ|eSecyzLy%IshdoLu z*GNC#Jpcr?)}h>5+Y=BJ$x?tau@aPt?hFE!v<#)$6;pwR<)r{{tCe`?gYKcBh}eJP chToCn1R7Mds(<{5SO5S307*qoM6N<$f-v$`OaK4? delta 191 zcmV;w06_nf0*wNYBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wAAdIdjAP#b004eT zL_t(IPo<0j4!|G?1O5M}nI&`s2F}bTRXJ&gh#a|u^c0TytpDK>!WLAmN=gVH6(Eoc zx{?=AXki!pSKzf>fW@w$DhY!E3o}5I;qnfH0$Z;1S%3vPEB!s0Fu0%(WR8ozA3C_j tPRjxX6IDfy$Ndaw1{}H|UBZ3KxBx0!#aD*`d@29{002ovPDHLkV1lcvN_qeQ diff --git a/assets/hbm/textures/items/warhead_cluster_small.png b/assets/hbm/textures/items/warhead_cluster_small.png index fb8d2badce9c85b71edefb7f28e7653f90830b7a..40ac78e98e7776bdd60422983d18e433791cb742 100644 GIT binary patch delta 225 zcmV<703QF20+IrdB#|)~f5HF&4#EKyC`y0;000-9{*aRkE80KKd>Y1D=ZN(TqUX;t- zgF{5N2t$%{7GQHt7?LdkhPBq4l_U(omVje?^}p=_7l4$~b2~w1S9`z(rIfoI(OSDI zbALJj2zu{sJjVDIaIC>lVqH$}+Y^n6euN00000NkvXXu0mjfB|lg6 delta 192 zcmV;x06+hd0*(TZBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wAAdIdjAP#b004hU zL_t(IPo+!&62Kq`>i?g1;?&HX+b-`YL0}Nk5lYd(gNN7p4wRzds6c}AV>h|P7a>f$l5n3HUqaA~88*7#IbVX| uZOQ^6OuM3RpP5KpR2^eR_5qvl4>T@`vddA_XB6`Q0000Q1%* diff --git a/assets/hbm/textures/items/warhead_generic_large.png b/assets/hbm/textures/items/warhead_generic_large.png index 705e70a861b02612182354b5a43b1cfb587f2477..f6c7e8efc2fd4e31ef6005049cf6b4ccf04231c0 100644 GIT binary patch delta 212 zcmV;_04x8D0)+yQB#|)~f5HF&4#EKyC`y0;0001-q#mIE-_+W6CQWM2!*Y$5Hy=&OB!J zi*URl9B&9msI{7ycTYHqQi}E7Ke9+TN^Y&0zLK-ZG9Uw2>>|UDN>IQ@ynGCJkr3kU zifsT8j{#oHB3$DmLjb|Y1X6TG7??p!1A-TK5iar05CB4+S%hV{!=4wXG|w-b=K0zH O0000i?g1+O*K9T{rG1MWBhuFH-S_RJ|eG9dxfKJI~AUtG-W z7hy$>1dz^jpjOT1(eu%t4SvK6U7VfiQkyy_*!WLAmN=gVH6(Eoc zx{?=AXki!pSKzf>fW@w$DhY!E3o}5I;qnfH0$Z;1S%3vPEB!s0Fu0%(WR8ozA3C_j tPRjxX6IDfy$Ndaw1{}H|UBZ3KxBx0!#aD*`d@29{002ovPDHLkV1lKxN^$@I diff --git a/assets/hbm/textures/items/warhead_generic_small.png b/assets/hbm/textures/items/warhead_generic_small.png index fb8d2badce9c85b71edefb7f28e7653f90830b7a..59c8c647056cd5eb00051ea8aa73e22c511ac24c 100644 GIT binary patch delta 215 zcmV;|04V>C0*C^TB#|)~f5HF&4#EKyC`y0;000QpF~&CmWxh~Jwm=|Y!I41aO-#U=cz-zv%7|2| zzOfwq%W(lj$tI{ItnrbpyS7&98n! R)cXJc002ovPDHLkV1ft0RZ{=} delta 192 zcmV;x06+hT0*(TZBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wAAdIdjAP#b004hU zL_t(IPo+!&62Kq`>i?g1;?&HX+b-`YL0}Nk5lYd(gNN7p4wRzds6c}AV>h|P7a>f$l5n3HUqaA~88*7#IbVX| uZOQ^6OuM3RpP5KpR2^eR_5qvl4>T@`vddA_XB6`Q0000@zt5xU&wF;8LlA1n=LOuy}OVhI9|?<&&f<8LzMS-F6R~HXqn^@uuM3`NYZS8 z_rBcR3s4RrXr#h(I{$w-1SkpdQK8DL3GAq71w sP6dEBjwGCi?g1+O*K9T{rG1MWBhuFH-S_RJ|ek3>1poj5 diff --git a/assets/hbm/textures/items/warhead_incendiary_medium.png b/assets/hbm/textures/items/warhead_incendiary_medium.png index 9bf59091854bb55c69377a77856ea500de219174..e85afe8ecbb5b90c8b9efcd2009246f0b1e3207d 100644 GIT binary patch delta 237 zcmV%7INE|8*o0L?S6wGS@OyaU zu&^)DiO4U^@T6Zqz`8pyLojzv=5gmrVuk>MY4|AErk8?-qzVAbV=P{6Q3XIxCyxc* z`*VFQfgpsiKFQx_2LM5gagzZ4MoQ_OfS^cj1t^nJf-=#aO2Cqqq14)%xv8$00000NkvXXu0mjffLdTO delta 191 zcmV;w06_nq0*wNYBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wAAdIdjAP#b004eT zL_t(IPo<0j4!|G?1O5M}nI&`s2F}bTRXJ&gh#a|u^c0TytpDK>!WLAmN=gVH6(Eoc zx{?=AXki!pSKzf>fW@w$DhY!E3o}5I;qnfH0$Z;1S%3vPEB!s0Fu0%(WR8ozA3C_j tPRjxX6IDfy$Ndaw1{}H|UBZ3KxBx0!#aD*`d@29{002ovPDHLkV1l#XN`(Lb diff --git a/assets/hbm/textures/items/warhead_incendiary_small.png b/assets/hbm/textures/items/warhead_incendiary_small.png index fb8d2badce9c85b71edefb7f28e7653f90830b7a..80e9fc11d742fecb3425b408e7188ba78ac7765f 100644 GIT binary patch delta 234 zcmV^7~z^IQ2 zVPS`3iZT8|4R4mT0PXBT4M~{O@>PIx*iJ?gH3Sgs>qo&|zP>P$U^D@sfD^nD7-RCw zwE&s5HeD(27aIV9b1oP71>n7Z7O*TqQBq49!AOE~S0IZN5f-&6R6z}kLjmB6Jqag~ kokBn;lGH`g1n-E`0rxP>*{ENU_5c6?07*qoM6N<$f~hfBvj6}9 delta 192 zcmV;x06+hm0*(TZBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wAAdIdjAP#b004hU zL_t(IPo+!&62Kq`>i?g1;?&HX+b-`YL0}Nk5lYd(gNN7p4wRzds6c}AV>h|P7a>f$l5n3HUqaA~88*7#IbVX| uZOQ^6OuM3RpP5KpR2^eR_5qvl4>T@`vddA_XB6`Q0000D;B9%F1HQi7`h#|-QuF9BkJk#Zo98CXT8HUm%rPztQZVD*b~ u0DJ}jA}U0e-%p1KLnPl5DNm5Hj<*L{^Q6yNZh*}I0000k=HI2M3Z03cB!cJY1)9*RhOC$ikf$_3_`dJo>q^?LvS002ovPDHLkV1h z4D>8>jO+Y>YEnI2978PplYjjGZ|^FxT7gG<7<5 zEsjfTvWz8rI3=4D84f8hC$t?fnViGmVcfx%sdAcCq&o3~gbsso$`uA7UWUX8iUvL2 i#vI9_DsunR85mYiT>bPxS5^wpMg~t;KbLh*2~7ZYAwL%Y delta 170 zcmV;b09F6z0r&xsBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wAAdIdjAP#b003!8 zL_t(IPwh-w4!|G`^8T0ZT358|%PjjH35Fsti0Bhj6J*H4GXEE*rcjF$-AHblGEj{~ zBPj#f$n$8*fFId{C0M~_;s9WSmVoNJw}c6t@DCIN^Wd`^GXJ|{k7a7m)8~Z2ct;u+ YWr6!4pjic600000Ne4wvM6N<$f~#LhOaK4? diff --git a/assets/hbm/textures/items/warhead_thermo_exo.png b/assets/hbm/textures/items/warhead_thermo_exo.png index 24a425030ea4f4b40aba4b9329754a8c02596b6a..b452b4c44a4848ff5919b7e79d2b9ae99a77826c 100644 GIT binary patch delta 182 zcmV;n07?J&0p|gbB#|)~f5HF&4#EKyC`y0;000KKX5XLG0WbcG1pfn&B#|)~f5HF&4#EKyC`y0;000wT zyk2zJ0H~08D9ZpKe{0l=^X`>we{m5z`kw21&!D0eVS9K~!i%?UXTY zg)k6Axkf}zK}7=v6j0D`qZDbPC{l{tmt@Ee*>9YMuix0lPa3giZRgKmr_j`Oy);d; zbX~U!HHBVPRi#1fZqOa~|aTudl%zDZ>Xwv^gDsW!?(F>IH`z0Od0eB^dzZ8g<2aXC>QbGNGgI zxxV*&%CvOR_nSemzT92r34j>Nr9yCj1GwBNa09r+3E;hlXqWA^~Sx#-9dsBb_0000 0) { - player.addPotionEffect(new PotionEffect(Potion.jump.id, 1, 0)); - player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 1, 1)); - player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 1, 2)); - player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 1, 0)); + player.addPotionEffect(new PotionEffect(Potion.jump.id, 5, 0, true)); + player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 5, 1, true)); + player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 5, 2, true)); + player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 5, 0, true)); } else { - player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 1, 1)); - player.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 1, 0)); + player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 5, 1, true)); + player.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 5, 0, true)); } } } diff --git a/com/hbm/items/ItemStarterKit.java b/com/hbm/items/ItemStarterKit.java index 391420db4..6c5734fc3 100644 --- a/com/hbm/items/ItemStarterKit.java +++ b/com/hbm/items/ItemStarterKit.java @@ -7,6 +7,8 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; public class ItemStarterKit extends Item { @@ -316,6 +318,22 @@ public class ItemStarterKit extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.fusion_core, 1)); } + if(this == ModItems.stealth_boy) + { + player.addPotionEffect(new PotionEffect(Potion.invisibility.id, 30 * 20, 0, true)); + } + + if(this == ModItems.euphemium_kit) + { + player.inventory.addItemStackToInventory(new ItemStack(ModItems.euphemium_helmet, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.euphemium_plate, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.euphemium_legs, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.euphemium_boots, 1)); + player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.statue_elb), 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_cursed, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.watch, 1)); + } + return stack; } diff --git a/com/hbm/items/ItemSyringe.java b/com/hbm/items/ItemSyringe.java index 7bd1707e6..dfc95fc75 100644 --- a/com/hbm/items/ItemSyringe.java +++ b/com/hbm/items/ItemSyringe.java @@ -2,6 +2,7 @@ package com.hbm.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; @@ -64,6 +65,28 @@ public class ItemSyringe extends Item { } } + if(this == ModItems.syringe_poison) + { + if (!world.isRemote) + { + player.addPotionEffect(new PotionEffect(Potion.poison.id, 30 * 20, 4)); + player.addPotionEffect(new PotionEffect(Potion.wither.id, 15 * 20, 2)); + player.addPotionEffect(new PotionEffect(Potion.confusion.id, 15 * 20, 0)); + + stack.stackSize--; + + if (stack.stackSize <= 0) + { + return new ItemStack(ModItems.syringe_empty); + } + + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_empty))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_empty, 1, 0), false); + } + } + } + if(this == ModItems.syringe_metal_stimpak) { if (!world.isRemote) @@ -84,6 +107,47 @@ public class ItemSyringe extends Item { } } + if(this == ModItems.syringe_metal_medx) + { + if (!world.isRemote) + { + player.addPotionEffect(new PotionEffect(Potion.resistance.id, 4 * 60 * 20, 2)); + + stack.stackSize--; + + if (stack.stackSize <= 0) + { + return new ItemStack(ModItems.syringe_metal_empty); + } + + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_metal_empty))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_metal_empty, 1, 0), false); + } + } + } + + if(this == ModItems.syringe_metal_psycho) + { + if (!world.isRemote) + { + player.addPotionEffect(new PotionEffect(Potion.resistance.id, 2 * 60 * 20, 0)); + player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 2 * 60 * 20, 0)); + + stack.stackSize--; + + if (stack.stackSize <= 0) + { + return new ItemStack(ModItems.syringe_metal_empty); + } + + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_metal_empty))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_metal_empty, 1, 0), false); + } + } + } + return stack; } @@ -109,4 +173,136 @@ public class ItemSyringe extends Item { return EnumRarity.common; } + + public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase entityPlayer) + { + World world = entity.worldObj; + + if(this == ModItems.syringe_antidote) + { + if (!world.isRemote) + { + entity.clearActivePotions(); + + stack.stackSize--; + + if(entityPlayer instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer)entityPlayer; + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_empty))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_empty, 1, 0), false); + } + } + } + } + + if(this == ModItems.syringe_awesome) + { + if (!world.isRemote) + { + entity.addPotionEffect(new PotionEffect(Potion.regeneration.id, 50 * 20, 9)); + entity.addPotionEffect(new PotionEffect(Potion.resistance.id, 50 * 20, 9)); + entity.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 50 * 20, 0)); + entity.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 50 * 20, 24)); + entity.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 50 * 20, 9)); + entity.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 50 * 20, 6)); + entity.addPotionEffect(new PotionEffect(Potion.jump.id, 50 * 20, 9)); + entity.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 50 * 20, 9)); + entity.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 50 * 20, 4)); + entity.addPotionEffect(new PotionEffect(Potion.confusion.id, 5 * 20, 4)); + + stack.stackSize--; + + if(entityPlayer instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer)entityPlayer; + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_empty))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_empty, 1, 0), false); + } + } + } + } + + if(this == ModItems.syringe_poison) + { + if (!world.isRemote) + { + entity.addPotionEffect(new PotionEffect(Potion.poison.id, 30 * 20, 4)); + entity.addPotionEffect(new PotionEffect(Potion.wither.id, 15 * 20, 2)); + entity.addPotionEffect(new PotionEffect(Potion.confusion.id, 15 * 20, 0)); + + stack.stackSize--; + + if(entityPlayer instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer)entityPlayer; + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_empty))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_empty, 1, 0), false); + } + } + } + } + + if(this == ModItems.syringe_metal_stimpak) + { + if (!world.isRemote) + { + entity.heal(5); + + stack.stackSize--; + + if(entityPlayer instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer)entityPlayer; + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_empty))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_metal_empty, 1, 0), false); + } + } + } + } + + if(this == ModItems.syringe_metal_medx) + { + if (!world.isRemote) + { + entity.addPotionEffect(new PotionEffect(Potion.resistance.id, 4 * 60 * 20, 2)); + + stack.stackSize--; + + if(entityPlayer instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer)entityPlayer; + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_empty))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_metal_empty, 1, 0), false); + } + } + } + } + + if(this == ModItems.syringe_metal_psycho) + { + if (!world.isRemote) + { + entity.addPotionEffect(new PotionEffect(Potion.resistance.id, 2 * 60 * 20, 0)); + entity.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 2 * 60 * 20, 0)); + + stack.stackSize--; + + if(entityPlayer instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer)entityPlayer; + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.syringe_empty))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.syringe_metal_empty, 1, 0), false); + } + } + } + } + return false; + } } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index ba351a697..660ba29d3 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -164,9 +164,13 @@ public class ModItems { public static Item syringe_empty; public static Item syringe_antidote; + public static Item syringe_poison; public static Item syringe_awesome; public static Item syringe_metal_empty; public static Item syringe_metal_stimpak; + public static Item syringe_metal_medx; + public static Item syringe_metal_psycho; + public static Item stealth_boy; public static Item rod_empty; public static Item rod_uranium; @@ -403,6 +407,7 @@ public class ModItems { public static Item prototype_kit; public static Item missile_kit; public static Item t45_kit; + public static Item euphemium_kit; public static Item igniter; @@ -564,9 +569,13 @@ public class ModItems { syringe_empty = new Item().setUnlocalizedName("syringe_empty").setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":syringe_empty"); syringe_antidote = new ItemSyringe().setUnlocalizedName("syringe_antidote").setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":syringe_antidote"); + syringe_poison = new ItemSyringe().setUnlocalizedName("syringe_poison").setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":syringe_poison"); syringe_awesome = new ItemSyringe().setUnlocalizedName("syringe_awesome").setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":syringe_awesome"); syringe_metal_empty = new Item().setUnlocalizedName("syringe_metal_empty").setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":syringe_metal_empty"); syringe_metal_stimpak = new ItemSyringe().setUnlocalizedName("syringe_metal_stimpak").setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":syringe_metal_stimpak"); + syringe_metal_medx = new ItemSyringe().setUnlocalizedName("syringe_metal_medx").setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":syringe_metal_medx"); + syringe_metal_psycho = new ItemSyringe().setUnlocalizedName("syringe_metal_psycho").setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":syringe_metal_psycho"); + stealth_boy = new ItemStarterKit().setUnlocalizedName("stealth_boy").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":stealth_boy"); rod_empty = new Item().setUnlocalizedName("rod_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":rod_empty"); rod_uranium = new ItemCustomLore().setUnlocalizedName("rod_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium"); @@ -754,6 +763,7 @@ public class ModItems { prototype_kit = new ItemStarterKit().setUnlocalizedName("prototype_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":prototype_kit"); missile_kit = new ItemStarterKit().setUnlocalizedName("missile_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":missile_kit"); t45_kit = new ItemStarterKit().setUnlocalizedName("t45_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":t45_kit"); + euphemium_kit = new ItemStarterKit().setUnlocalizedName("euphemium_kit").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":code"); igniter = new ItemCustomLore().setUnlocalizedName("igniter").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":trigger"); ingot_euphemium = new ItemCustomLore().setUnlocalizedName("ingot_euphemium").setTextureName(RefStrings.MODID + ":ingot_euphemium"); @@ -1133,9 +1143,13 @@ public class ModItems { //Syringes GameRegistry.registerItem(syringe_empty, syringe_empty.getUnlocalizedName()); GameRegistry.registerItem(syringe_antidote, syringe_antidote.getUnlocalizedName()); + GameRegistry.registerItem(syringe_poison, syringe_poison.getUnlocalizedName()); GameRegistry.registerItem(syringe_awesome, syringe_awesome.getUnlocalizedName()); GameRegistry.registerItem(syringe_metal_empty, syringe_metal_empty.getUnlocalizedName()); GameRegistry.registerItem(syringe_metal_stimpak, syringe_metal_stimpak.getUnlocalizedName()); + GameRegistry.registerItem(syringe_metal_medx, syringe_metal_medx.getUnlocalizedName()); + GameRegistry.registerItem(syringe_metal_psycho, syringe_metal_psycho.getUnlocalizedName()); + GameRegistry.registerItem(stealth_boy, stealth_boy.getUnlocalizedName()); //Food GameRegistry.registerItem(bomb_waffle, bomb_waffle.getUnlocalizedName()); @@ -1225,5 +1239,6 @@ public class ModItems { GameRegistry.registerItem(missile_kit, missile_kit.getUnlocalizedName()); GameRegistry.registerItem(grenade_kit, grenade_kit.getUnlocalizedName()); GameRegistry.registerItem(t45_kit, t45_kit.getUnlocalizedName()); + GameRegistry.registerItem(euphemium_kit, euphemium_kit.getUnlocalizedName()); } } diff --git a/com/hbm/lib/HbmChestContents.java b/com/hbm/lib/HbmChestContents.java index b1e3564af..48bee062a 100644 --- a/com/hbm/lib/HbmChestContents.java +++ b/com/hbm/lib/HbmChestContents.java @@ -40,7 +40,6 @@ public class HbmChestContents { private static WeightedRandomChestContent[] expensive = new WeightedRandomChestContent[] {new WeightedRandomChestContent(ModItems.nugget_schrabidium, 0, 1, 1, 1), - new WeightedRandomChestContent(ModItems.neutron_reflector, 0, 2, 3, 3), new WeightedRandomChestContent(ModItems.circuit_gold, 0, 1, 2, 3), new WeightedRandomChestContent(ModItems.circuit_schrabidium, 0, 1, 1, 1), new WeightedRandomChestContent(ModItems.nuke_starter_kit, 0, 1, 1, 2), @@ -56,7 +55,7 @@ public class HbmChestContents { new WeightedRandomChestContent(ModItems.battery_schrabidium, 1000, 1, 1, 1), new WeightedRandomChestContent(ModItems.syringe_awesome, 0, 1, 1, 1), new WeightedRandomChestContent(ModItems.fusion_core, 0, 1, 1, 4), - new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.float_bomb), 0, 1, 1, 1)}; + new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.red_barrel), 0, 1, 3, 1)}; private static WeightedRandomChestContent[] nukeTrash = new WeightedRandomChestContent[] {new WeightedRandomChestContent(ModItems.nugget_u238, 0, 3, 12, 5), diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index 8b55046fd..0a42fdaa0 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -127,7 +127,7 @@ public class Library { public static boolean checkForHazmat(EntityPlayer player) { - if(checkArmor(player, ModItems.hazmat_helmet, ModItems.hazmat_plate, ModItems.hazmat_legs, ModItems.hazmat_boots) || checkArmor(player, ModItems.t45_helmet, ModItems.t45_plate, ModItems.t45_legs, ModItems.t45_boots)) + if(checkArmor(player, ModItems.hazmat_helmet, ModItems.hazmat_plate, ModItems.hazmat_legs, ModItems.hazmat_boots) || checkArmor(player, ModItems.t45_helmet, ModItems.t45_plate, ModItems.t45_legs, ModItems.t45_boots) || checkArmor(player, ModItems.euphemium_helmet, ModItems.euphemium_plate, ModItems.euphemium_legs, ModItems.euphemium_boots)) { return true; } @@ -149,6 +149,10 @@ public class Library { { return true; } + if(checkArmorPiece(player, ModItems.euphemium_helmet, 3)) + { + return true; + } return false; } diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 8a44d30d4..7f608aae3 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -396,11 +396,15 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.syringe_antidote, 6), new Object[] { "SPS", "SMS", "SPS", 'S', ModItems.syringe_empty, 'P', Items.pumpkin_seeds, 'M', Items.milk_bucket }); GameRegistry.addRecipe(new ItemStack(ModItems.syringe_antidote, 6), new Object[] { "SSS", "PMP", "SSS", 'S', ModItems.syringe_empty, 'P', Items.pumpkin_seeds, 'M', Items.reeds }); GameRegistry.addRecipe(new ItemStack(ModItems.syringe_antidote, 6), new Object[] { "SPS", "SMS", "SPS", 'S', ModItems.syringe_empty, 'P', Items.pumpkin_seeds, 'M', Items.reeds }); + GameRegistry.addRecipe(new ItemStack(ModItems.syringe_poison, 1), new Object[] { "SLS", "LCL", "SLS", 'C', ModItems.syringe_empty, 'S', Items.spider_eye, 'L', ModItems.powder_lead }); GameRegistry.addRecipe(new ItemStack(ModItems.syringe_awesome, 1), new Object[] { "SPS", "NCN", "SPS", 'C', ModItems.syringe_empty, 'S', ModItems.sulfur, 'P', ModItems.nugget_pu239, 'N', ModItems.nugget_pu238 }); GameRegistry.addRecipe(new ItemStack(ModItems.syringe_awesome, 1), new Object[] { "SNS", "PCP", "SNS", 'C', ModItems.syringe_empty, 'S', ModItems.sulfur, 'P', ModItems.nugget_pu239, 'N', ModItems.nugget_pu238 }); GameRegistry.addRecipe(new ItemStack(ModItems.syringe_metal_empty, 6), new Object[] { "P", "C", "B", 'B', Item.getItemFromBlock(Blocks.iron_bars), 'C', ModItems.rod_empty, 'P', ModItems.plate_iron }); GameRegistry.addRecipe(new ItemStack(ModItems.syringe_metal_stimpak, 1), new Object[] { " N ", "NSN", " N ", 'N', Items.nether_wart, 'S', ModItems.syringe_metal_empty }); - + GameRegistry.addRecipe(new ItemStack(ModItems.syringe_metal_medx, 1), new Object[] { " N ", "NSN", " N ", 'N', Items.quartz, 'S', ModItems.syringe_metal_empty }); + GameRegistry.addRecipe(new ItemStack(ModItems.syringe_metal_psycho, 1), new Object[] { " N ", "NSN", " N ", 'N', Items.glowstone_dust, 'S', ModItems.syringe_metal_empty }); + + GameRegistry.addRecipe(new ItemStack(ModItems.stealth_boy, 1), new Object[] { " B", "LI", "LC", 'B', Item.getItemFromBlock(Blocks.stone_button), 'L', Items.leather, 'I', ModItems.ingot_steel, 'C', ModItems.circuit_red_copper }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_gadget), 1), new Object[] { "DGD", "FCF", "DPD", 'G', ModItems.wire_gold, 'F', ModItems.fins_flat, 'C', ModItems.sphere_steel, 'P', ModItems.pedestal_steel, 'D', new ItemStack(Items.dye, 1, 8) }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_boy), 1), new Object[] { "ADD", "HHF", "CDD", 'A', ModItems.wire_aluminium, 'H', ModItems.hull_small_steel, 'C', ModItems.circuit_aluminium, 'F', ModItems.fins_small_steel, 'D', new ItemStack(Items.dye, 1, 4) }); @@ -484,6 +488,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); + GameRegistry.addRecipe(new ItemStack(ModItems.chainsaw, 1), new Object[] { "TTG", "SSM", 'T', ModItems.plate_iron, 'S', ModItems.plate_steel, 'M', ModItems.motor, 'G', ModItems.circuit_gold }); + GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_helmet, 1), new Object[] { "EEE", "EIE", " P ", 'E', ModItems.hazmat_cloth, 'I', Item.getItemFromBlock(Blocks.glass_pane), 'P', ModItems.plate_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.hazmat_cloth }); GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.hazmat_cloth }); diff --git a/com/hbm/render/ModelGasMask.java b/com/hbm/render/ModelGasMask.java index 1600ee527..7b424bece 100644 --- a/com/hbm/render/ModelGasMask.java +++ b/com/hbm/render/ModelGasMask.java @@ -17,6 +17,7 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelBox; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; public class ModelGasMask extends ModelBiped { @@ -64,11 +65,16 @@ public class ModelGasMask extends ModelBiped @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { + EntityPlayer player = (EntityPlayer)entity; + if(player.isSneaking()) + { + this.isSneak = true; + } else { + this.isSneak = false; + } super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - this.bipedHead.rotationPointX = 0.0F; - this.bipedHead.rotationPointY = 0.0F; - this.mask.rotationPointX = 0.0F; - this.mask.rotationPointY = 0.0F; + this.mask.rotationPointX = bipedHead.rotationPointX; + this.mask.rotationPointY = bipedHead.rotationPointY; this.mask.rotateAngleX = bipedHead.rotateAngleX - 45; } @Override diff --git a/com/hbm/render/ModelGoggles.java b/com/hbm/render/ModelGoggles.java index 7ec51e794..964f3ac1a 100644 --- a/com/hbm/render/ModelGoggles.java +++ b/com/hbm/render/ModelGoggles.java @@ -16,6 +16,7 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; public class ModelGoggles extends ModelBiped { @@ -61,9 +62,14 @@ public class ModelGoggles extends ModelBiped @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { + EntityPlayer player = (EntityPlayer)entity; + if(player.isSneaking()) + { + this.isSneak = true; + } else { + this.isSneak = false; + } super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - this.bipedHead.rotationPointX = 0.0F; - this.bipedHead.rotationPointY = 0.0F; this.bipedHead.rotateAngleY = this.bipedHead.rotateAngleY; this.bipedHead.rotateAngleX = this.bipedHead.rotateAngleX; } diff --git a/com/hbm/render/ModelT45Helmet.java b/com/hbm/render/ModelT45Helmet.java index 47fc0a484..c3cc0a71d 100644 --- a/com/hbm/render/ModelT45Helmet.java +++ b/com/hbm/render/ModelT45Helmet.java @@ -11,6 +11,8 @@ package com.hbm.render; +import java.util.ArrayList; + import org.lwjgl.opengl.GL11; import net.minecraft.client.model.ModelBiped; @@ -22,21 +24,13 @@ public class ModelT45Helmet extends ModelBiped { //fields ModelRenderer helmet; - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; public ModelT45Helmet() { textureWidth = 64; textureHeight = 32; - helmet = new ModelRenderer(this, 0, 0); + /*helmet = new ModelRenderer(this, 0, 0); Shape1 = new ModelRenderer(this, 0, 0); Shape1.addBox(0F, 0F, 0F, 8, 8, 8); Shape1.setRotationPoint(-4F, 0F - 8 + 0.0625F / 4, -4F); @@ -84,7 +78,37 @@ public class ModelT45Helmet extends ModelBiped Shape8.setRotationPoint(0.5F, 5F - 8 + 0.0625F / 4, -4.5F); Shape8.setTextureSize(64, 32); Shape8.mirror = true; - setRotation(Shape8, -0.7853982F, 0F, 0F); + setRotation(Shape8, -0.7853982F, 0F, 0F);*/ + + bipedHead = new ModelRenderer(this, 0, 0); + bipedHead.addBox(-4F, 0F - 8 + 0.0625F / 4, -4F, 8, 8, 8); + + bipedHead.setTextureOffset(32, 0); + bipedHead.addBox(1F, 1F - 8 + 0.0625F / 4 + 1, -5F, 2, 2, 1); + + bipedHead.setTextureOffset(40, 6); + bipedHead.addBox(-5F, 1F - 8 + 0.0625F / 4, -5.466667F, 1, 1, 4); + + bipedHead.setTextureOffset(0, 16); + bipedHead.addBox(-5F, 6F - 8 + 0.0625F / 4, -4.5F, 10, 1, 9); + + helmet = bipedHeadwear; + helmet.cubeList = new ArrayList(); + + float yOffset = (float)Math.sqrt(2) * 3.5F; + float zOffset = - (float)Math.sqrt(2) * 0.5F; + + helmet.setTextureOffset(40, 0); + helmet.addBox(-2F, 5F - 8 + 0.0625F / 4 + yOffset, -4F + zOffset, 4, 2, 2); + + helmet.setTextureOffset(54, 0); + helmet.addBox(-1F, 5F - 8 + 0.0625F / 4 + 2 + yOffset, -4F + zOffset, 2, 1, 2); + + helmet.setTextureOffset(32, 7); + helmet.addBox(-1.5F, 5F - 8 + 0.0625F / 4 + 0.5F + yOffset, -4.5F + zOffset, 1, 1, 1); + + helmet.setTextureOffset(32, 5); + helmet.addBox(0.5F, 5F - 8 + 0.0625F / 4 + 0.5F + yOffset, -4.5F + zOffset, 1, 1, 1); } /*public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) @@ -119,11 +143,16 @@ public void setRotationAngles(float f, float f1, float f2, float f3, float f4, f this.isSneak = false; } + this.bipedHead.rotationPointX = 0.0F; + this.bipedHead.rotationPointY = 0.0F; + //this.helmet.rotationPointX = this.bipedHead.rotationPointX; + //this.helmet.rotationPointY = this.bipedHead.rotationPointY; + //this.helmet.rotateAngleY = this.bipedHead.rotateAngleY; + //this.helmet.rotateAngleX = this.bipedHead.rotateAngleX; super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - this.helmet.rotationPointX = this.bipedHead.rotationPointX; - this.helmet.rotationPointY = this.bipedHead.rotationPointY; - this.helmet.rotateAngleY = this.bipedHead.rotateAngleY; - this.helmet.rotateAngleX = this.bipedHead.rotateAngleX; + this.helmet.rotationPointX = bipedHead.rotationPointX; + this.helmet.rotationPointY = bipedHead.rotationPointY; + this.helmet.rotateAngleX = bipedHead.rotateAngleX - 45; } @Override @@ -131,9 +160,11 @@ public void render(Entity par1Entity, float par2, float par3, float par4, float { setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); GL11.glPushMatrix(); - //GL11.glScalef(1.125F, 1.125F, 1.125F); + GL11.glScalef(1.125F, 1.125F, 1.125F); GL11.glScalef(1.0625F, 1.0625F, 1.0625F); - this.helmet.addChild(Shape1); + bipedHead.render(par7); + helmet.render(par7); + /*this.helmet.addChild(Shape1); this.helmet.addChild(Shape2); this.helmet.addChild(Shape3); this.helmet.addChild(Shape4); @@ -141,7 +172,7 @@ public void render(Entity par1Entity, float par2, float par3, float par4, float this.helmet.addChild(Shape6); this.helmet.addChild(Shape7); this.helmet.addChild(Shape8); - this.helmet.render(par7); + this.helmet.render(par7);*/ GL11.glPopMatrix(); }