From 2370bf8930dbf67635164c137611b34887f42ab5 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sat, 16 May 2020 20:24:21 +0200 Subject: [PATCH] better rad item tooltips, WP ammo, mercury, cobalt --- assets/hbm/lang/de_DE.lang | 25 ++ assets/hbm/lang/en_US.lang | 25 ++ assets/hbm/textures/armor/cobalt_1.png | Bin 0 -> 1231 bytes assets/hbm/textures/armor/cobalt_2.png | Bin 0 -> 588 bytes .../hbm/textures/blocks/block_aluminium.png | Bin 348 -> 477 bytes assets/hbm/textures/blocks/block_cobalt.png | Bin 0 -> 479 bytes assets/hbm/textures/blocks/block_lithium.png | Bin 0 -> 444 bytes .../textures/entity/ModelRocketPhosphorus.png | Bin 0 -> 322 bytes assets/hbm/textures/gui/potions.png | Bin 3376 -> 3336 bytes .../gui/reactors/gui_fusion_multiblock.png | Bin 0 -> 3871 bytes .../hbm/textures/items/ammo_44_phosphorus.png | Bin 0 -> 302 bytes .../textures/items/ammo_50bmg_phosphorus.png | Bin 0 -> 399 bytes .../items/ammo_grenade_phosphorus.png | Bin 0 -> 392 bytes .../textures/items/ammo_rocket_phosphorus.png | Bin 0 -> 321 bytes assets/hbm/textures/items/bottle_mercury.png | Bin 0 -> 410 bytes assets/hbm/textures/items/cobalt_axe.png | Bin 0 -> 326 bytes assets/hbm/textures/items/cobalt_boots.png | Bin 0 -> 285 bytes assets/hbm/textures/items/cobalt_helmet.png | Bin 0 -> 295 bytes assets/hbm/textures/items/cobalt_hoe.png | Bin 0 -> 317 bytes assets/hbm/textures/items/cobalt_leggings.png | Bin 0 -> 290 bytes assets/hbm/textures/items/cobalt_plate.png | Bin 0 -> 361 bytes assets/hbm/textures/items/cobalt_shovel.png | Bin 0 -> 305 bytes assets/hbm/textures/items/cobalt_sword.png | Bin 0 -> 406 bytes assets/hbm/textures/items/ingot_cobalt.png | Bin 345 -> 397 bytes .../hbm/textures/items/ingot_phosphorus.png | Bin 0 -> 336 bytes assets/hbm/textures/items/lithium.png | Bin 361 -> 406 bytes assets/hbm/textures/items/nugget_mercury.png | Bin 0 -> 268 bytes assets/hbm/textures/items/record_glass.png | Bin 0 -> 244 bytes assets/hbm/textures/models/iter/glass.png | Bin 0 -> 210 bytes assets/hbm/textures/models/iter/microwave.png | Bin 0 -> 4780 bytes assets/hbm/textures/models/iter/motor.png | Bin 0 -> 277 bytes assets/hbm/textures/models/iter/plasma.png | Bin 0 -> 364 bytes assets/hbm/textures/models/iter/rails.png | Bin 0 -> 148 bytes assets/hbm/textures/models/iter/solenoid.png | Bin 0 -> 558 bytes assets/hbm/textures/models/iter/toroidal.png | Bin 0 -> 309 bytes assets/hbm/textures/models/iter/torus.png | Bin 0 -> 831 bytes assets/hbm/textures/models/reactor.zip | Bin 4660 -> 0 bytes .../hbm/textures/models/reactor_body_new.png | Bin 645 -> 0 bytes .../hbm/textures/models/reactor_rods_new.png | Bin 220 -> 0 bytes .../hbm/textures/models/soyuz_lander_rust.png | Bin 0 -> 8316 bytes com/hbm/blocks/ModBlocks.java | 6 + com/hbm/blocks/generic/BlockLithium.java | 60 +++ com/hbm/blocks/generic/BlockOre.java | 6 +- com/hbm/blocks/machine/BlockMachineBase.java | 123 ++++++ .../entity/projectile/EntityBulletBase.java | 2 +- com/hbm/entity/projectile/EntityModBeam.java | 2 +- com/hbm/entity/projectile/EntityShrapnel.java | 9 +- com/hbm/handler/BulletConfigSyncingUtil.java | 257 ++++++----- .../handler/guncfg/BulletConfigFactory.java | 51 +++ .../handler/guncfg/Gun44MagnumFactory.java | 46 ++ com/hbm/handler/guncfg/Gun4GaugeFactory.java | 4 + com/hbm/handler/guncfg/Gun50BMGFactory.java | 46 ++ com/hbm/handler/guncfg/GunGrenadeFactory.java | 18 + com/hbm/handler/guncfg/GunRocketFactory.java | 18 + com/hbm/interfaces/IBulletImpactBehavior.java | 1 + com/hbm/inventory/MachineRecipes.java | 40 +- com/hbm/items/ModItems.java | 406 ++++++++++-------- com/hbm/items/block/ItemBlockLore.java | 5 + com/hbm/items/bomb/ItemBoy.java | 5 + com/hbm/items/bomb/ItemFleija.java | 5 + com/hbm/items/bomb/ItemGadget.java | 5 + com/hbm/items/bomb/ItemMan.java | 1 + com/hbm/items/bomb/ItemManMike.java | 5 + com/hbm/items/bomb/ItemMike.java | 5 + com/hbm/items/bomb/ItemSolinium.java | 5 + com/hbm/items/bomb/ItemTsar.java | 5 + com/hbm/items/gear/ArmorFSB.java | 151 +++++++ com/hbm/items/special/ItemFuelRod.java | 3 +- com/hbm/items/special/ItemRadioactive.java | 275 ++---------- com/hbm/items/special/WatzFuel.java | 3 +- com/hbm/items/weapon/ItemAmmo.java | 27 ++ com/hbm/main/ClientProxy.java | 18 + com/hbm/main/CraftingManager.java | 7 + com/hbm/main/MainRegistry.java | 14 + com/hbm/main/ModEventHandler.java | 103 ++++- com/hbm/main/ResourceManager.java | 3 +- com/hbm/potion/HbmPotion.java | 8 +- .../entity/projectile/RenderBullet.java | 2 + com/hbm/render/tileentity/RenderCapsule.java | 6 +- .../tileentity/bomb/TileEntityBombMulti.java | 2 +- .../tileentity/bomb/TileEntityNukeBoy.java | 2 +- .../tileentity/bomb/TileEntityNukeCustom.java | 2 +- .../tileentity/bomb/TileEntityNukeFleija.java | 2 +- .../tileentity/bomb/TileEntityNukeGadget.java | 2 +- .../tileentity/bomb/TileEntityNukeMan.java | 2 +- .../tileentity/bomb/TileEntityNukeMike.java | 2 +- com/hbm/tileentity/bomb/TileEntityNukeN2.java | 2 +- .../tileentity/bomb/TileEntityNukeN45.java | 2 +- .../bomb/TileEntityNukePrototype.java | 2 +- .../bomb/TileEntityNukeSolinium.java | 2 +- .../tileentity/bomb/TileEntityNukeTsar.java | 2 +- .../tileentity/bomb/TileEntityTestNuke.java | 2 +- .../machine/TileEntityDiFurnace.java | 1 + ...eEntityMachineSchrabidiumTransmutator.java | 5 +- 94 files changed, 1211 insertions(+), 627 deletions(-) create mode 100644 assets/hbm/textures/armor/cobalt_1.png create mode 100644 assets/hbm/textures/armor/cobalt_2.png create mode 100644 assets/hbm/textures/blocks/block_cobalt.png create mode 100644 assets/hbm/textures/blocks/block_lithium.png create mode 100644 assets/hbm/textures/entity/ModelRocketPhosphorus.png create mode 100644 assets/hbm/textures/gui/reactors/gui_fusion_multiblock.png create mode 100644 assets/hbm/textures/items/ammo_44_phosphorus.png create mode 100644 assets/hbm/textures/items/ammo_50bmg_phosphorus.png create mode 100644 assets/hbm/textures/items/ammo_grenade_phosphorus.png create mode 100644 assets/hbm/textures/items/ammo_rocket_phosphorus.png create mode 100644 assets/hbm/textures/items/bottle_mercury.png create mode 100644 assets/hbm/textures/items/cobalt_axe.png create mode 100644 assets/hbm/textures/items/cobalt_boots.png create mode 100644 assets/hbm/textures/items/cobalt_helmet.png create mode 100644 assets/hbm/textures/items/cobalt_hoe.png create mode 100644 assets/hbm/textures/items/cobalt_leggings.png create mode 100644 assets/hbm/textures/items/cobalt_plate.png create mode 100644 assets/hbm/textures/items/cobalt_shovel.png create mode 100644 assets/hbm/textures/items/cobalt_sword.png create mode 100644 assets/hbm/textures/items/ingot_phosphorus.png create mode 100644 assets/hbm/textures/items/nugget_mercury.png create mode 100644 assets/hbm/textures/items/record_glass.png create mode 100644 assets/hbm/textures/models/iter/glass.png create mode 100644 assets/hbm/textures/models/iter/microwave.png create mode 100644 assets/hbm/textures/models/iter/motor.png create mode 100644 assets/hbm/textures/models/iter/plasma.png create mode 100644 assets/hbm/textures/models/iter/rails.png create mode 100644 assets/hbm/textures/models/iter/solenoid.png create mode 100644 assets/hbm/textures/models/iter/toroidal.png create mode 100644 assets/hbm/textures/models/iter/torus.png delete mode 100644 assets/hbm/textures/models/reactor.zip delete mode 100644 assets/hbm/textures/models/reactor_body_new.png delete mode 100644 assets/hbm/textures/models/reactor_rods_new.png create mode 100644 assets/hbm/textures/models/soyuz_lander_rust.png create mode 100644 com/hbm/blocks/generic/BlockLithium.java create mode 100644 com/hbm/blocks/machine/BlockMachineBase.java create mode 100644 com/hbm/items/gear/ArmorFSB.java diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 58fa00865..fd6d26f1d 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -66,6 +66,7 @@ potion.hbm_radx=Rad-X potion.hbm_lead=Bleivergiftung potion.hbm_radaway=Radaway potion.hbm_telekinesis=! ! ! +potion.hbm_phosphorus=Phosphorverbrennung hbmfluid.none=Nichts hbmfluid.water=Wasser @@ -624,6 +625,7 @@ item.ingot_pu238.name=Pu238-Barren item.ingot_pu239.name=Pu239-Barren item.ingot_pu240.name=Pu240-Barren item.ingot_titanium.name=Titanbarren +item.ingot_cobalt.name=Kobaltbarren item.sulfur.name=Schwefel item.niter.name=Salpeter @@ -648,6 +650,7 @@ item.coil_advanced_torus.name=Supraleitende Ringspule item.coil_gold.name=Goldspule item.coil_gold_torus.name=Goldene Ringspule item.lithium.name=Lithiumwürfel +item.ingot_phosphorus.name=Weiße Phosphortafel item.ingot_magnetized_tungsten.name=Magnetisierter Wolframbarren item.ingot_combine_steel.name=CMB-Stahlbarren item.plate_combine_steel.name=CMB-Stahlplatte @@ -805,6 +808,22 @@ tile.block_yellowcake.name=Yellowcakeblock tile.block_starmetal.name=Sternenmetallblock tile.block_fiberglass.name=Fiberglasrolle tile.block_asbestos.name=Asbestblock +tile.block_cobalt.name=Kobaltblock +tile.block_lithium.name=Lithiumblock + +tile.block_u233.name=U233-Block +tile.block_u235.name=U235-Block +tile.block_u238.name=U238-Block +tile.block_neptunium.name=NeptuniumBlock +tile.block_uranium_fuel.name=Urankernbrennstoffblock +tile.block_plutonium.name=Plutoniumblock +tile.block_pu238.name=Pu238-Block +tile.block_pu239.name=Pu239-Block +tile.block_pu240.name=Pu240-Block +tile.block_plutonium_fuel.name=Plutoniumkernbrennstoffblock +tile.block_thorium_fuel.name=Thoriumkernbrennstoffblock +tile.block_solinium.name=Soliniumblock +tile.block_schrabidium_fuel.name=Schrabidiumkernbrennstoffblock tile.ore_aluminium.name=Aluminiumerz tile.ore_copper.name=Kupfererz @@ -1279,6 +1298,8 @@ item.waste_plutonium_hot.name=Erschöpfter Plutoniumkernbrennstoff (Heiß) item.waste_mox_hot.name=Erschöpfter MOX-Kernbrennstoff (Heiß) item.waste_schrabidium_hot.name=Erschöpfter Schrabidiumkernbrennstoff (Heiß) item.scrap.name=Schrott +item.nugget_mercury.name=Quecksilbertropfen +item.bottle_mercury.name=Quecksilberflasche item.ingot_uranium_fuel.name=Urankernbrennstoffbarren item.ingot_thorium_fuel.name=Thoriumkernbrennstoffbarren @@ -1523,6 +1544,7 @@ item.ammo_50ae_du.name=.50 AE Patrone (DU) item.ammo_50ae_star.name=.50 AE Patrone (Sternenmetall) item.ammo_50bmg.name=.50 BMG Patrone item.ammo_50bmg_incendiary.name=.50 BMG Patrone (Brand) +item.ammo_50bmg_phosphorus.name=.50 BMG Patrone (WP) item.ammo_50bmg_explosive.name=.50 BMG Patrone (Explosiv) item.ammo_50bmg_du.name=.50 BMG Patrone (DU) item.ammo_50bmg_star.name=.50 BMG Patrone (Sternenmetall) @@ -1539,6 +1561,7 @@ item.ammo_357_desh.name=.357 Magnum Deshkugel item.ammo_44.name=.44 Magnum Patrone item.ammo_44_ap.name=.44 Magnum Patrone (Panzerbrechend) item.ammo_44_du.name=.44 Magnum Patrone (DU) +item.ammo_44_phosphorus.name=.44 Magnum Patrone (WP) item.ammo_44_star.name=.44 Magnum Patrone (Sternenmetall) item.ammo_44_pip.name=.44 Magnum Patrone (Güterwagon) item.ammo_44_bj.name=.44 Magnum Patrone (Boot) @@ -1547,6 +1570,7 @@ item.ammo_44_rocket.name=.44 Magnum Rakete item.ammo_rocket.name=84mm Rakete item.ammo_rocket_he.name=84mm Rakete (HE) item.ammo_rocket_incendiary.name=84mm Rakete (Brand) +item.ammo_rocket_phosphorus.name=84mm Rakete (WP) item.ammo_rocket_shrapnel.name=84mm Rakete (Schrapnell) item.ammo_rocket_emp.name=84mm Rakete (Impuls) item.ammo_rocket_glare.name=84mm Rakete (Roter Schein) @@ -1557,6 +1581,7 @@ item.ammo_rocket_rpc.name=84mm Raketengetriebene Kettensäge item.ammo_grenade.name=40mm Granate item.ammo_grenade_he.name=40mm Granate (HE) item.ammo_grenade_incendiary.name=40mm Granate (Brand) +item.ammo_grenade_phosphorus.name=40mm Granate (WP) item.ammo_grenade_toxic.name=40mm Granate (Chemisch) item.ammo_grenade_concussion.name=40mm Granate (Erschütterung) item.ammo_grenade_finned.name=40mm Granate (Geflügelt) diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 93a3cb50e..c192497c6 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -66,6 +66,7 @@ potion.hbm_radx=Rad-X potion.hbm_lead=Lead Poisoning potion.hbm_radaway=Radaway potion.hbm_telekinesis=! ! ! +potion.hbm_phosphorus=Phosphorus Burns hbmfluid.none=None hbmfluid.water=Water @@ -624,6 +625,7 @@ item.ingot_pu238.name=Pu238 Ingot item.ingot_pu239.name=Pu239 Ingot item.ingot_pu240.name=Pu240 Ingot item.ingot_titanium.name=Titanium Ingot +item.ingot_cobalt.name=Cobalt Ingot item.sulfur.name=Sulfur item.niter.name=Niter @@ -648,6 +650,7 @@ item.coil_advanced_torus.name=Super Conducting Ring Coil item.coil_gold.name=Gold Coil item.coil_gold_torus.name=Golden Ring Coil item.lithium.name=Lithium Cube +item.ingot_phosphorus.name=Bar of White Phosphorus item.ingot_magnetized_tungsten.name=Magnetized Tungsten Ingot item.ingot_combine_steel.name=CMB Steel Ingot item.plate_combine_steel.name=CMB Steel Plate @@ -805,6 +808,22 @@ tile.block_yellowcake.name=Block of Yellowcake tile.block_starmetal.name=Block of Starmetal tile.block_fiberglass.name=Roll of Fiberglass tile.block_asbestos.name=Block of Asbestos +tile.block_cobalt.name=Block of Cobalt +tile.block_lithium.name=Block of Lithium + +tile.block_u233.name=Block of U233 +tile.block_u235.name=Block of U235 +tile.block_u238.name=Block of U238 +tile.block_neptunium.name=Block of Neptunium +tile.block_uranium_fuel.name=Block of Uranium Fuel +tile.block_plutonium.name=Block of Plutonium +tile.block_pu238.name=Block of Pu238 +tile.block_pu239.name=Block of Pu239 +tile.block_pu240.name=Block of Pu240 +tile.block_plutonium_fuel.name=Block of Plutonium Fuel +tile.block_thorium_fuel.name=Block of Thorium Fuel +tile.block_solinium.name=Block of Solinium +tile.block_schrabidium_fuel.name=Block of Schrabidium Fuel tile.ore_aluminium.name=Aluminium Ore tile.ore_copper.name=Copper Ore @@ -1279,6 +1298,8 @@ item.waste_plutonium_hot.name=Depleted Plutonium Fuel (Hot) item.waste_mox_hot.name=Depleted MOX Fuel (Hot) item.waste_schrabidium_hot.name=Depleted Schrabidium Fuel (Hot) item.scrap.name=Scrap +item.nugget_mercury.name=Small Drop of Mercury +item.bottle_mercury.name=Bottle of Mercury item.ingot_uranium_fuel.name=Ingot of Uranium Fuel item.ingot_thorium_fuel.name=Ingot of Thorium Fuel @@ -1523,6 +1544,7 @@ item.ammo_50ae_du.name=.50 AE Round (DU) item.ammo_50ae_star.name=.50 AE Round (Starmetal) item.ammo_50bmg.name=.50 BMG Round item.ammo_50bmg_incendiary.name=.50 BMG Round (Incendiary) +item.ammo_50bmg_phosphorus.name=.50 BMG Round (WP) item.ammo_50bmg_explosive.name=.50 BMG Round (Explosive) item.ammo_50bmg_du.name=.50 BMG Round (DU) item.ammo_50bmg_star.name=.50 BMG Round (Starmetal) @@ -1539,6 +1561,7 @@ item.ammo_357_desh.name=.357 Magnum Desh Bullet item.ammo_44.name=.44 Magnum Bullet item.ammo_44_ap.name=.44 Magnum Bullet (Armor Piercing) item.ammo_44_du.name=.44 Magnum Bullet (DU) +item.ammo_44_phosphorus.name=.44 Magnum Bullet (WP) item.ammo_44_star.name=.44 Magnum Bullet (Starmetal) item.ammo_44_pip.name=.44 Magnum Bullet (Boxcar) item.ammo_44_bj.name=.44 Magnum Bullet (Boat) @@ -1547,6 +1570,7 @@ item.ammo_44_rocket.name=.44 Magnum Rocket item.ammo_rocket.name=84mm Rocket item.ammo_rocket_he.name=84mm Rocket (HE) item.ammo_rocket_incendiary.name=84mm Rocket (Incendiary) +item.ammo_rocket_phosphorus.name=84mm Rocket (WP) item.ammo_rocket_shrapnel.name=84mm Rocket (Shrapnel) item.ammo_rocket_emp.name=84mm Rocket (Pulse) item.ammo_rocket_glare.name=84mm Rocket (Red Glare) @@ -1557,6 +1581,7 @@ item.ammo_rocket_rpc.name=84mm Rocket Propelled Chainsaw item.ammo_grenade.name=40mm Grenade item.ammo_grenade_he.name=40mm Grenade (HE) item.ammo_grenade_incendiary.name=40mm Grenade (Incendiary) +item.ammo_grenade_phosphorus.name=40mm Grenade (WP) item.ammo_grenade_toxic.name=40mm Grenade (Chemical) item.ammo_grenade_concussion.name=40mm Grenade (Concussion) item.ammo_grenade_finned.name=40mm Grenade (Finned) diff --git a/assets/hbm/textures/armor/cobalt_1.png b/assets/hbm/textures/armor/cobalt_1.png new file mode 100644 index 0000000000000000000000000000000000000000..6d8934f912618074569acd25cd5d518986f619d1 GIT binary patch literal 1231 zcmV;=1Tg!FP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1Y}7>K~!i%<(R=w zQ$Y~M_Z3huK#33_#K1)$LC}Z+<3&#-h8UtoZ+hcq{2$PxSFheYdhH(uM zHHst%hS0*Hg;t6JwZE}b*Js;TETt`eWYe8}-!8kevokyE3=9mITsU?9W+J{BmwN5t zTKNUq_VLvtM=BKxU+Om}u3ot;rLV6~N@r)M>FMtILm`!lyc7VYrk={F!lNQ1yfg7XEruA(&eBiA#V#%w6(QKX>4pv`+-VEUJ8gtqp8|&)YsSlA3i`A z$&Paj0E-6)!2EWS(b0=Z z^FCr48XAn>@0U_jQ)A-sxJ+_v?2_5s{B9h_5%Z@c5(yLg7Bkh=)uyGT#k97zO26jj zX4BQxWrl{%nAzFS@=qAQyZd-@%tO*oxv^Nx1i!qyBcu|+#{vm+#P?t@D1{K$(b19K z&B@6p=F{va@dJdw<=}EsA)E3I4qWUrIau;gk!+3F^cE3k!$CX6DU| z$e8Qf7Y`jwwZFel+NjeeLK1N4qe@{c#ssQh+Vp<_6lN=^RQSsW|LZQhNO5g}-2xalKm)Z#yT>%O#qny0I zV&4={uJBaAg|XWSbzYp|=a27~bm#P92KK^|Jg>s`6}Vi$y@Gd%Y?rOwz*7M@EtEh8 zSPo#<39EB+bE%fX;Hdz-^}@n}T!e`AU9cNITswk* zT(VvF@)4dEkPkSM_8TGR(_R1}kat8yCO#bcP^iPv#p!z_pwHmxK^a43{jQ5wACV8L z3O(CR?Y$EuQmd=0>E!9$xwDe^{HQuQ(Q@p>1QQH}R!k)F%WQ2vAaSA%XG@YqG8G7X zFwt04k}byKY8{S*Mdljq^HrI}uZtqDtgM>#_4PC#ITQ*RC;8`#p*O z#4fX2@81WcO~2cG3b0?DG&h0Ecjc>$qG(fD!?el(j@ENwPmTalg2Dsj<%SLLm(Et&N8_D)&`^y7I)5&U$B1i(n4a_akMN7a^PwcYdzD0P`j+*=N@Nu6(Yf*(Qk+QdPlz tEaqPz7NDl<-T@o#HtkdDC#}L@%uiC;Q85wORe1ma002ovPDHLkV1fYtPnrM# literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/armor/cobalt_2.png b/assets/hbm/textures/armor/cobalt_2.png new file mode 100644 index 0000000000000000000000000000000000000000..31fbc105847d1bdf42a7f6f602a3013b9761e704 GIT binary patch literal 588 zcmV-S0<-;zP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0pUqRK~!i%?Uz4K z!cY{&9|#I2gb-w95+aL<41NO>!|dqj=I&_J(cR6_(Qn{Ka5KaKM@B>fr34fH$hqM( z&(c9dI<(wh(!6(iZ=0Um_g-I(q9}@@D2k#eilQhRM`GD}oL}D0(T=~zCbN?Ii1;G72>@|gR8>j3+}ub&^U zBfUn*2!NSfE+;2o5PfQZerd1dnYUw6C&@PnXs}Qy$N`NwHTu+cL843&CSZoZV6WGc z1AWA)ZNn%+9FQqszhRo}e0Bm2+XaaOG6k^e+lF8s`v8DA@P8SQ69>F0z&8%VFb~7_ zh_E+C$i+3(QAR$4T-6=Nk(S0-5CFrBGvA&j_B9|#^M3Yy83+Ct2>Ua;b$EPoGjIlG zHl4`{K13>&5I;n_{tO`u)CK!~E`7 z*VC2CzFd<|Z%cuZkNds7zTC=9Lt^dfo?YC{Ic50v>PL0cZnq`QwZfie<#PE?`519w z|BMB0h5rLgzzo*}=;3fEMr<>HhM7-bJ}4i#VY7At_>g>fXnav%0)_$2*@pZ&D4#k! ajQIhbw>nN8xbW)$0000D0dh%1K~y+TZBp4z z!!Qu^I!^fukWdQ<6#DfD2_!&*@KX9f3A9rGfunU3=du|eaw#xc*}L{wnanO-KTKp< zCB(#FPY96?Qo&fq0+4@7iPgjKg!1Rb;lVx%PMn0m%ih?#x~c89i^c03*G9DQX!D|04YY`I&k9}cQhJ>0|$}XuK59JRb@AL00|Vb!1@795MAZduCu=w#|Z^ygr`Cf@7$QEDm+dXhPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0dz@3K~y+TWm4Nt z!axvZJ1zAIkyk@v0-E@2xcD3TCW(o>850wKLEkj-!LL#x{sIyBftFsjmu)?CmKNb; zvYpvEyFD|r;%fZtI<7%R}DWffNMnT$hmA=)pp)}qqtVb(3hd|!gAfK)Sbyj9N)k>- zam3dEdDYtrYe~WoEC~iuX_~SJYM)kJD#gSFN=e)zrPORT6QhT>%i&NT-vH;e_h08^ z@{MMa<2pMAQfZo7AkQ*7?p!pRhuj|qDo9fm$q16%Vro1%8Op_SDQ+L%`@J6YVP2M{ z-x5O9v;RQ8J|_lp(7^L5C2`+0YYXU}xE{YGNx}i|W(scuf2$MWx(qwM=W)s)`U5Ax VbiX<9YtR4y002ovPDHLkV1lAC#-0EG literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/block_lithium.png b/assets/hbm/textures/blocks/block_lithium.png new file mode 100644 index 0000000000000000000000000000000000000000..3df64188475482cd309ec771fefaaf9c1c873c52 GIT binary patch literal 444 zcmV;t0YmPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Z~arK~y+TZIZE) zgD?z4ZC^-$FbNG61^@puG!zt+FvADH1PBoB8F9W$?zZqq)~>t~=%Og5X;Mm^PN%OO zTI+4wxB@adc6ig(DyxY+qSwa%Ph-iPlD3Yl_E995b%@?HjX1{(=_&$p`8b)oUjRi z=XvY8N=aalB9KMd{D(>al|b&X$GU*=egAg5MNuS$cPdU?d!}L%$cAmcTLR)6s<7FI z+zSkEJ)ciBvKinS%dX|Cu_ZY8H}J3&$1zIrv#TuIepjt!3_M?U*fKh%K}loE(jE|h z_yN|E-O+C8d_Loc6VQwi1@N#$Q)t%G{eH(4ByrR)Of2!QSgCJ%Nh@M2-Xt&p0000+-vRh*ZCMsU1BaG}dmyZ}F$LEgxV7iM zPCVU#dx=V^sI`v8eKP`x=j$y2NGSnu&NVe&&LN4ox5A#up;CED974c*pY~ihP+9NF zF9(b<(HPU^%uCW&@SRj^jg*oQ0(|uc0PDK)2oVB)Y%l43-c?d^rBuwvHDNtDrsUrH zi)xdINAr4rLalYot1si;Jl%m~ZPI%$@~ZQ=?3GrkFUz~%IVZ}vr+~p=Fc=I5pX}m| UImPg1kN^Mx07*qoM6N<$f>RZZ_y7O^ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/gui/potions.png b/assets/hbm/textures/gui/potions.png index 1eaab1652b1c208c2b03d0bea29cb8e9f4fef536..b9c1dd0d12adea086b09533cb60f8717c85808c2 100644 GIT binary patch delta 3028 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 Wj-%L31|rM=00007g4{LNpeesz{ODyr^{! zSt+s;R3R&+6$Fsrkdl{1JwV{nqS+zk5+n}DO(69FYN8aiX>e0S9T%}KB1BFg+nlng z2oVU?5z5P2ij)#rPY=7#WOjCDcXsVH>-hVTR^FYLXP5yNS?l`9W(fZCT3Yz%M>D z9l5$w<%;23st9c02ZR1Ee|X9K{Fkk*1dQt%$MYN;XwRI9*>G)XeX9ennfw^ZI8+FC zgo-b5w_Y=nbU-_6ez|qGb32T@X%){%e;wc17`e&xl?ipOmE?A`O>aOdRSdK32^`$F z$w<=YUruZPq0@d^#f6%2q8ydsr&n4*r|Ep$D}~%ak%( zv?Fo{yDqq`-xCM~e^TjmS{J+ve|F!h9*NDzd3`KN=7_RRcwL#lu8!aj(6Pba)6-*q z`>S6xJPvU2%V{0lx5?~!;eAJv4!*d_{PWZ`eg0+jp^sbYI+y#>o(irjDOWT7bUH2X z!UegKu{{AB{Dne6&p!LChKGmE`1p9_{{8*^RomL0KqL7nT)0sF5T)Kie=t8m!2o|; zSsgA1f7EMy`}`ij5qY|)8#<+9vVrvvz3y*lpJ(($#kRJ`5NFlq|0Y@%77qR&=qK8$ zy?(2|MLTSzp!51zTeUa3M{=7{bxUgU`Mm$)cfbF0-FyY@df|QNblM4a|ASW9e+ts`q&G6v>l2jE`t|FT&*wEfJS-dh{r&y^di#86XsBXa z+hb@XKl=Ve>96Z*)sZ80^Y%DFzF;hoO2_g?ly%~Q-#Q{slC)KObxOzl{UkNj`di^c zfpGBOr`5Wt8fAnx*U|_)f`_eM~ z^Sb%QP-d?;}B>KD$;Owox8erx^u^^&BKkr53K5BvKy zl%I&;uXSjGg=I;tmDe<-o4TQ!x>3>6hhNuH7+WE!)T-H*%`U6Q2E8O*(m7qyxybG8 z@|b-2!7oXU6WznNf0aN!pHF-U(BI#0`uh6R*Vm^F8#ZX)8~;nXtEB3nYqWgAip8P| zg@Ou&LPblT&*vjs{(AXowB^UbQ&9of;JK+AeoJd@)n32lZB(#Jo1}Yd*}%S}b4saO zDRox_d(`qM^@87OCiqjSls@|CBTY?B>Fck*)@NVM=((rYeQZ)+^k~O<%d7&f}%$w&!8H_BVAyQ~Jyg_TXzP_&lJ|E~-(2 z^V=uZtT87ye{4`HmD16pN7dcktyC%{Njm!Or_RGa{gHX@>2)T2C=gdZtJ3MxAX{J{ zE~v}BI2*tz z!S)b)A&?FBA8TvHYe|W_|5jmaMMK@&sER11?y8^-#hi=`{o2iuEdFP#q9>m43W)i1aDj)fkfYf-aYlD6J_U#p~B_-t3f2!a=`tGOB(RV*>=uHb_D=NF+bp{5lVzH=vKCj8iNlA+Rn@BMDpUO3rpE$M$ zz-hqt64?VdrDJ~gJ27wC=~Ra)J~UBvHCgz$wz@kxq0ZygR|Fo=PUo7Y%!Aq`DY_Ss zQg^N3_fK;tR5NG?1_sRQw{Gd_8ZCbuPja+Yf99Dpb;>7jIAB}e=_?a@Wo`Twfy2YY zTD`il@2e_5;Q>E8=GR1ig2LAUpuPANfIWR?FY?Lht%^Z7+wI>bSNCbPmMN9!vf;Sv z0Fw3w%7N`y0%5gU{<*gI$`z@jL*3oo+Is4g_8&j4Yy$&_Q6kGH9CQy&RBdA~@3j~C zf9%<_N9WF!zOQrV&Z$@|>cbB|)a2x(T_1nhaGlZqB>9OF(d|c@sW=3%!EaBe9nen4 zKFY`C6=MTcV*%c@(|No@(^r!HK&1HAKj?_E&U-powLD?)Ck@b=+x7SNoBQv%NB^0g z*3V9#Rz9D120rxl^<^Pe>L>W zm)~oifBr=izQ#Z4Ho>&#B0oWo$TfeHsd#WNK>Mkxg>7KPwXF5l`&|Ea-?;TEuWzU& zNc{fsD((enGL2cYSJ8R#>s4M~^Y&XC*ionXlB^Hk4m{iZ1cig0R=@qU{tIdI2|>PX zahKC38DMLLcFPZ1YtFvZNw3TQf8nfmuQ!x#*OQa}z9&`=_{$edI^m!T2irpZT#cl2 z{mu1MFbi3*0tm}wGA8(l+pg=$NmDDGq}n;1;IXqS8CNpl^0CY3BR}nu&TP{_bLvhB zHk%n;Y_MOyem!z|E|*(WwZ4%|dGZaD^*l{vGLovx$1ZnsxyXC&fw>aPq13*kEb>HBTFVn3ERCe-GT1%tR(5T`r$gi>U;{<-_C~XqB21f}n-Ym;cu32>`7$ zrxifB_0PU4jh^h0RBF}Ej+K7sy_-j+Wu;ay`)kSFE$I$#;cV+)Q9irNE6bHYt@5E4 zfL56Me++WXQ})%$MSho7(qLb?Qi#}YQ3!qR-ku(v&FB3aZ3g@De~Y_(Ft1`OfM#cO z>3y^((HmE9*WlDu3shwJTy~}JmL}iGx~@hwx@gM>^DA)=U^X+l^ll#2U|;FEJtV+w zy_-ihxLe8|Q0Z_W!6`yuE+ifUNHU{KE|+t zL2UWBs;mSS!slu>o!O>==ENQXlt=hyJEMyuN#22~U|;mzSx>q>3(tYdb-~$pJe6)B zay-u=P%zi#ED&cixkK=WJ#g`azkIQzQ*T0$h5ES~NvF}tL@+m&wqz!s1~U=-5iQ1a z>J9KM)X&vOW;%`UjXBY7GsBS1;!J0@X`ngW4F~`L00000000000000000000EEMfF zGYsi0&U9v*2Aad&fWRWQRJz>@n9YnXq(eHhO$Pt~00000t?_?|CF#@&_=dm$0000< KMNUMnLSTaU$57P( diff --git a/assets/hbm/textures/gui/reactors/gui_fusion_multiblock.png b/assets/hbm/textures/gui/reactors/gui_fusion_multiblock.png new file mode 100644 index 0000000000000000000000000000000000000000..3a3737e7fd2df77dc89faabb31de51069a184337 GIT binary patch literal 3871 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 XPc-L0=T)1{eiLqpG$^^?^4EU@Nx4%^ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/ammo_44_phosphorus.png b/assets/hbm/textures/items/ammo_44_phosphorus.png new file mode 100644 index 0000000000000000000000000000000000000000..eb8bd54a98a2241ea58a36b727510c6e5ff2e3a2 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf?J7B=$Xf`WB#(hcop}4jSG2wM7F1amewKK)h^?I8 zGBkAI)?=3JHmp1K-M`$MZ+)L{$MVgM`;XSwegAb|<$nFWDa$mKoB~D8e3r?5$e^Hf x=wou7h>OdXYZA!@#{#Z@?Z3n_`OnUKjBEH@*B^7%-VXFIgQu&X%Q~loCIDW@dPx8P literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/ammo_50bmg_phosphorus.png b/assets/hbm/textures/items/ammo_50bmg_phosphorus.png new file mode 100644 index 0000000000000000000000000000000000000000..ca7a3d6903f635b86287c1f09344a78b89ed07bc GIT binary patch literal 399 zcmV;A0dW3_P)3mZb#seOPBu8Sw73aQ_5t(* z)aX`UAcz*5bg`hRB0BI3co0_f52_)0Te42`gsf+Id3oOF$MeE}NYgaYG);!d`T*MP zHkM`m2?QYNbXrW){1wFKUL40kRaJCdr&5d!)kI9wlu9us*GC)DEU3~fr~^U1o?Wq~ zFPMu>F@9Vl5!Xq?2e;`3uv0?`o!Z>qKO=811lHHcW|E$e9{{%=Ru;h@CSquwkdc1D z-Al@kW3Q#jP=Mh39TT(js6ih_bOs}QQ>vakl{>ei?x2W>q9{t|6|e`7KB3dO`Atdv+lEhc;(+i>vbn_`~cS)X8R&vNFTYIdqHw3L|U8D t6?Qie5pg&0g7ovhns}O@kU{=X`T%WMl+F$`u?GME002ovPDHLkV1lQxsW1Ql literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/ammo_grenade_phosphorus.png b/assets/hbm/textures/items/ammo_grenade_phosphorus.png new file mode 100644 index 0000000000000000000000000000000000000000..2881d2f4ccc91eccd2a4245479d66d8c9eb3bf56 GIT binary patch literal 392 zcmV;30eAk1P)B1qYiUAOTAqN*ywYLm&YsXTL%4 zn>afa6cofEOQuSOEFJ2a!rNMEg7gDCrfbC@j0h2T=k#*u&P&CORcpB>(_iUU^tk8c>u5UZSKDG3tj<1w-JB77(<@t2*VJ~W)pE7qup-*E*&D`-ENl?(ITBn7M3A~ mVSq7)G)*h-36MW6ey0yxhIi%HBjg6h#l4wFuIn7SqvnB>V;r*Q811y0Lg9e^3hvNt59( zsIP3`2U+O*xlJI)by&klXp+v%!U7!w>XPZ3V^=vJ@@#f_Dho_3D#NwSqs@M zjkT6>90`H|t+lM(VkwE^Sn9f#uIuFEc(@7Kop~>cB8Fk$-aHY8A-5pTcfLR0iSPT& z^UUYtD^1f-mZfv{d;HGBg3YuKr80_Jv8 Tf6R)Q00000NkvXXu0mjfRcMMO literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/bottle_mercury.png b/assets/hbm/textures/items/bottle_mercury.png new file mode 100644 index 0000000000000000000000000000000000000000..da7982dd9106b473b774159b43f5eb85ee59a993 GIT binary patch literal 410 zcmV;L0cHM)P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TF9YdtOGKL{I zy>R~idxpPzmV)u8&2yllSOCZcxbU(AcYxG?hOAkqz%(|DHxQq`{=o3|?OXiOgw0eC z-gD;e|6jj;{eSc3&HpP`uKdU43al;w1)!atEW?^(kDww94BpbO8M0@e#&8WrEPymi zaC~RD^oE1MO-F#?#fujV4<9}R%e{N|j^X%sb%v>_rtsLn>H?Ssbj_bXe`Zh=MAd>} zz^gC+!HW66-bB&-fxL56_%AOMUJhWqdTf!Q#C)eBcxOu(8z z7^LZ|s2RhL8`~M4i@QTrAOOy!j4i~G0}lo$%+3r90EH>@Au>?B)Bpeg07*qoM6N<$ Eg06eA{r~^~ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/cobalt_axe.png b/assets/hbm/textures/items/cobalt_axe.png new file mode 100644 index 0000000000000000000000000000000000000000..453d4a20ae00ab7dff8d1875dddc9e73bd2fe8e3 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@V2LmV~B-+@&fJ+1wFs{4+ZFDGA#Lc;b?h6 z&shO6jb70PlM>$<2R79F^jg88me6uZf?Rr1`M zyQd3&eUaJ_H%E_wae|WIvF3#I_wiv&*L;LNmh9$UoPF z%ABMKMvsRJyWjuwkE(dEe`O{|jIdszKtj`{f`W&KR5iFo8;;!HTh0Ddk)e%Ip}|+t z%uwKf0mF2s7>3o{arn3OJ``ton#eR`q1w4~JSP}A%@`t$JsvLipMM}H zg+Ykm4s1W?6cWVOeBw@Z^IhPc}MwcyMSP zK5*dp@#729vQ8yrNi{vP5@B{=Nc-H%Jze77-fH%={WU*@e42S2*>wV>SQ|{<-Ppo- zDmmfD@2Ao?%5vBeb}+Cw%(`!1&2)Ue-CpM3^3n&g81z28ysWOl&1k^G@KgLr$|gn) mwF}NtEDlLGj<_>2Gc&xbcFA7bu5k?L4+c+HKbLh*2~7az^Jwt^ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/cobalt_hoe.png b/assets/hbm/textures/items/cobalt_hoe.png new file mode 100644 index 0000000000000000000000000000000000000000..59ebd2144eb2b30d73a4aeefa27198efa8761ea4 GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@RFyCV~B-+@&XY9r_4164jI0)pK`Jw>A%vR zEJFs5&kMWXKajX-kkW8HB>1wxhGjSA$gnXp+qUi7$H`;A-amc9^am+3Hog>$&<{Mv zB>6;E^r(W0%8?I$BdiYpdFwBcXY-5e+G&28THe@;-W0}ht)FN$Qz`*dab&CG+1XBs1?-)E? L{an^LB{Ts5nNxa{ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/cobalt_leggings.png b/assets/hbm/textures/items/cobalt_leggings.png new file mode 100644 index 0000000000000000000000000000000000000000..f9769ba6a3f42d4dcd70c7c3ca669008fa5cfd8c GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!R?+djv*HQ$r1$zIF>#M526=h;DXk0C;JZ6sIZD=&E{@!GG;^hv8Hbw*WW|O8rT!$3uA2UV7 zHoVJ8lhf1S7Jl%R$&leNLrx=GSA9%l=T+AEcC}5L0vOE-MVKATCN7d>F^FN{D$H5f g=Uuaak(rsH=1|hbHFJZFfL>tmboFyt=akR{09HF?4gdfE literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/cobalt_plate.png b/assets/hbm/textures/items/cobalt_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..d637d3a17ddb4b5e6f5dfe045ea637531e9a007f GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!GE4Ejv*HQMWob!z9ah+-k_a|w>A*}2(H&N@$7Ohk^{kUTT{&7{AK+QR!;X3U-Wy=>;v{g)4C zTiw69Cum2kf6U~PuU}k!j$14{`_G~KsaHzQttzQzo!!Ba(`5S9jdR_PoLFf)sqse^ z>;3PpE;&papI1(kFk!2lH~F!}9SIiYbDqkf5hARip{ikz#P6LKx4krld)@0#fs8HB z*1d4lH*uIm>Glxvt~S!clg3s^ReZA&q?)1z>r|@boFyt=akR{ E0EhF7#sB~S literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/cobalt_shovel.png b/assets/hbm/textures/items/cobalt_shovel.png new file mode 100644 index 0000000000000000000000000000000000000000..d9c84584a20e40aa2f80ac62efacda9a65318bda GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@R+BIV~B-+vP8iFj-{PUVts}G7y7gb{}!LP zM10N93rEWfas=B8x0v(YxA}zBwRjw6Ef$(2u`Yi9xdkg%p4?Dz zN~G=b^6L#>g-jTh+&rw`@bKyB={%1fJ>rR;uG^f=#%RI3M8IYKjr|<1XD-~C^zi5B z=R9}r+~L{oH{b0d50geC$0p7+0mE6246Y1IIGP13DfaXx*N`tFXM;#5+6F@PH7n*#QpjQs#Ti31`jaYF#(-E|Z+D xeSpp5gr-1=mfiuD%RStG{{NTf|975&;q$!huF5Pg>wsa&;OXk;vd$@?2>=mdnk4`L literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/ingot_cobalt.png b/assets/hbm/textures/items/ingot_cobalt.png index 82d26fe44a3312c9de28f61c312c6de76597973b..4aa7710840bf02a7b135e2f2767bed3ab4f3e899 100644 GIT binary patch delta 333 zcmV-T0kZzt0*wQZNq@fp01m$aI0aKA0003ZNkl0bASND0BoAX#l^w&%a<>~G_oOJ18`{)5)uNl zVc^}ncVHT15X=xp3&*(sQ3**5*RNj(OM*0l6u@jnHpIX{4}Z#HV3;{`HpADiUl~|H z9FXS7$Z&=W7cPM%kpa3U5CCbEl$2z+b^0^|*aga(+F*(F^i;4RxHQ24H#au}A0HpX znZ0`<2EhCc0w9-Q(*yz_TVdeSr%zxPfV}|XfJ_7dkPAR;P$0no%tn|d7&vumH6u6{ z0u$>0!xU+1YDO}gJb4mqJ4g%!&^1AsU;s}C$cA9E3ChF(C3}J-Q2!N!(J|%_0z`y{?Lx71nISdS+4}$eV3?M=iI)E9%2+}-l_il!pH*Z3v za07L9btsF0Vdct|33=HSbGB7i+D>VG#;b9OK76wbOva&K9I&=ukMh75GUk)8$_;MR)_>1R2 zkqf{;1OcEcB<<`N)YR0#F|caYDzGpJz-&T*3n)>K;2;@t@W27Qnvemi1Smax{s`sZ f)-;#^0|NlFp%Q2^6O(qt00000NkvXXu0mjf3~_Wh diff --git a/assets/hbm/textures/items/ingot_phosphorus.png b/assets/hbm/textures/items/ingot_phosphorus.png new file mode 100644 index 0000000000000000000000000000000000000000..a2d5d19c8b97496e730098bb19e7bc83e479cfd7 GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sEXgD|57Yp@DX@TsSZV~B-+@||t#dK-lfuq-{v<|3`2xAK#G z%fc9o1KA8d!W`V4r;JW$OE(`~a4DfdknIGQ!>o#*M;6$yR8)M|IehwgxrAfR2F4>9 zPV5HG66fXOzs5VCpZW0jb^ZX&I}MYg8BQf7RDAs-cKCApbj3u5M+)9b%o8klny=XI zs+Q`hulda}t({$IlVXdBBJ-4p21zFmVU9n4e{=gZ^E!mFaB6<(T}vy$L_Q zeB@OY)==4B``2ZXngrX)=Gcau6VLtEb7VQOeK2T{Wa^S~nl*vZOQDHJ(M{OM!LXs^ czySsZ%~J=@6?Iu`0D73g)78&qol`;+0I~IVx&QzG literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/lithium.png b/assets/hbm/textures/items/lithium.png index 0a8355982f49b4227aa790d04e4bd783a06f64ba..e7d23fcaf63c69a48b0f5782ec4555132a11666b 100644 GIT binary patch delta 342 zcmV-c0jd7!0+s`iNq@fp01m$aI0aKA0003iNkl;yBuQp7bAmT=~!X5l|Gx ziMW<;QhvhI5XUj+VHhY$5{(xR-2j!zbzR!`oeaaEWm%LE27kburYUXP#zh!mK!yN; zu>T!$-$CE^6h#r4rpX2|i!cRhVHi?XRrjzaZf;ATK1u(oZR1Bd9kenW1+ zx~`nNuH#0S07GDnIs%6r$3bn|a{tQ&2!I6gG@(9C6PtbCzg&t51Tu~zX9P?L2;)D+ zfGo>2Gzdflm`@lXnB@S`%R|D&NR#6@{AU1=T3MD?CsCf~{43vHqCh;)qj{dGX_{;2 o%k-4;DFY(6tTH{N1pHn^pMQGB3ugNq@rt01m?e$8V@)0002tNklAq#|15QP1?7K>oeVzHR) zRy7D>6A>(CF)X{r!fE!p*6v^4#OgKrBXZVNmycbSsN&EaK v`X>MY002ovP9j9ELSTXb000qmMObuAZ)9a`08eyiWpXb=Xk~MB(ZMHRDPw}% diff --git a/assets/hbm/textures/items/nugget_mercury.png b/assets/hbm/textures/items/nugget_mercury.png new file mode 100644 index 0000000000000000000000000000000000000000..d309c9d884a192cee3d6b8dc454aacb4e9d38112 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enaG|G*V~By;8Jb>%FR7 zO+4>3m%1c*ab~aWoznkrah;~egT4ECgO^lYi0Yp6+1V=H&-%u9*`yu;r;LfO4$dhK z_tjxL-g`hIJL!3hGOysuaIcrAIxh>g3h38QH%yCsw!L2YfT&2o!Zo)$r-FRM;OXk; Jvd$@?2>|eWV1WPt literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/record_glass.png b/assets/hbm/textures/items/record_glass.png new file mode 100644 index 0000000000000000000000000000000000000000..03387b6cd38ec09f0b7521c3574e9f14f7eb501d GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf`3>Q5|S28s7C>TGO0$ac)ZnCGzT*X!&4 z+W-0g|Nr6tf)73bX;~SWfFp@HDbtM-KVKKr`1|lMd&u+z#sX%&yL&np-E3=YeE8?* z=YoyO8Ltu;-c3K^-2QKNN9RG+FITQU%t`T0kK3CxBR`$}db^NBXFK1)zil};W`?hS mkdty&g6)A3PwZs_W`>_XQcOkKTD*YHX7F_Nb6Mw<&;$S=>SwtC literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/iter/glass.png b/assets/hbm/textures/models/iter/glass.png new file mode 100644 index 0000000000000000000000000000000000000000..5df87687e5029b74f57eaf4df82caddc60a1f7f8 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6icy_X9x!n)NrJ90QsGsE{-7{ zooARMa5JrsS^4P<@#7;@Mcep>aPI?2-Hbelop zrLj@?jUtn$DxOBhuNhxx)^+Q;uVjk5U0)FP|I&dEuc~=lT)zk(xz8YzCTzgvI4^Y8O0x(0xqwJ@dAW5`TD~*Dx{}b+%~Qod&vzfx*+&&t;uc GLK6Uuk4*Le literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/iter/microwave.png b/assets/hbm/textures/models/iter/microwave.png new file mode 100644 index 0000000000000000000000000000000000000000..cddfb5b6fc0e6243efb8bca0fb9f32aaa4e41ec7 GIT binary patch literal 4780 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 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/iter/motor.png b/assets/hbm/textures/models/iter/motor.png new file mode 100644 index 0000000000000000000000000000000000000000..fdfde0dd2e2f9efe8d745c84a9c0a64f9d368f1c GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^20$#q!3HGv{H?nKq*#ibJVQ8upoSx*1IRz)>Eaj? z(VCp1z`(=9^G`U)nR7?MLndX_Uy%tsp`oE7?f3T8&Q@xE$@)OMmKhL_C20Y54ZDwDdLW7XqDnS z63TEvxpI?0n3GI|+JC85`L6*}qTC*{hMZ+Cdh=iM$&HuM6&r!>dJt-$^ofDT=9lOH zXTn!MG3>o$W0jzIrA1+xisXq?1t-E&7W;NKvN`XQko{$7aKm|qfW$9Dhu*3L1xAL5 XRYv~>J}Kw{{l(zv>gTe~DWM4fUHWDR literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/iter/plasma.png b/assets/hbm/textures/models/iter/plasma.png new file mode 100644 index 0000000000000000000000000000000000000000..e2ea712717c365e00f7395fe67a0bfc4edf808a8 GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^IzXJj!3HGLkdt|u$#jgCiwKSfJ%(q#PqipGFL9U7h7bd=Bd}N;#u~*#Q2os zo4T(LUa*>_<+n~Rzh-R$6!Exyl@>6{8)ml{DtT-2?He>6e;%kf6UR<-y zZSyTD+1%c=t){cCUdt$Jiqy7B*S#fmHY?j?_1cRUuVsWqFOCGttJ7S|P3_DV`crSc SGOYv#AA_f>pUXO@geCw<5vYy; literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/iter/rails.png b/assets/hbm/textures/models/iter/rails.png new file mode 100644 index 0000000000000000000000000000000000000000..fb2de65e4f82b634bbcfd420de9b9c897ef470f1 GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^T0kts!3HFCU-`@iQY^(zo*^7SP{WbZ0pxpox;Tb- zbSBr_nEY>kA_s$5+x~jCTf8oficc=oJ0D%>tme|*=lq{;D_8#Z|yuD{w7=nUTR^4xWbskMAZSk1qQBch@@e|F;*^O`qeVws%W)^-qDgd-FeT)H|0rq0#YXTgtkf2HRJE zjLitUU%&g0%<9{fLDi|J*6rS(S5>(0bH(Og9(kt~Ij3qy*KA2`b!20clt@VcYD_(~ z&o4I;WJL3>J;os)ORcndHXRZ=B5oGz?ZoGa@YhzA6eMlyR28)mzAe(_1RDW0HQN*D z1!!QDzjv85@A0dsqSMcJd|ME+{`&HF&hLZXhgrW`Jhk}FXIZBcb>~y>o|~MXSmyEV zfd9!8`Ij#j?Yy%`E+nDwcu`f@|Jx9^p%IW7J|B=cBw8v`gEFnGH9xvXx;TbZ z%z1lzWA0%C5eG-hf~S%u&SDD*#7sjp9L?s6iDLX`3D-e_09=gX^azvgdUZoLpgFEIj_Sq=Bs?#q7r(r*R2{qOiU XZIzzlq%utw=x+v3S3j3^P6ct9au7K7@!a9w2TJS#Cj{?Q{pWtd(PZhM&!qQ!tyRXngfn~2uk!j|zdA8N zjaPHkZhPxxo-^j0e=h&p@XXiR`+I)X-rn}^*sS7t$98R&=`jEO_g)o8w=5s~YsEjx z&u#wxIbI-h!+?uh=vi>$?QQniw|`mmX)gVG`H)4Q|7)f{_9Z$VGs@S@DgM0UMf6X5 zyMNOCyI1KN>g#By{`!*}7_E7lVf_p)#lYO-U41g#p^G*sI3_wSx@CH8b?nu@b>ieFfMzruYI50{y+&jA>J??zo=@7fZu6d+SHJIl`4zo&^SxA;Qxj}DE@eh0gX{_m zxn_Ju=t;zcg<#v0#8am?M!blaU~qn;O-D(Q$tj-85%WE4=K4*W&L0|b{qge0D z&2op5E(0a4`+j~8x@dWC^SoHQgHqf=SD!~roRGY*N<>U$*-C>;hXnpz+^FzSE$_g# zkp0?Q{QlVsX6`%`!qNH4I&8_2`7+#BmGc@{WVwZo@J?6&^un*$M3srx4g!Pv!bYaf zDakuKrIl*8G<^pKEYOgSFBiG)Elvi9$k*M6JZ7`K=DnuA>V3r1&W!iJ_T@kG@2{R( zoOkC4?=+=c8KsoSn)B8vK;8{8D=`%f9ghHD;MyJUQakl-?hZzwk~Im7o0BxMxy(y)3{z02@Ak+ap({4>WJgN zYk|%`WOMwGmE8N=j{`N}?t&<4l6md8B$)5s``hu0Jl~yaJs7+gm?IcGUHx3vIVCg! E0CxV7g8%>k literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/reactor.zip b/assets/hbm/textures/models/reactor.zip deleted file mode 100644 index 53f90620d55754c51214ae489df512bcccfbd175..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4660 zcmcIodpMN&9v@~9Mx5B=+L)BFv#XdCDs8Nd&R}vXNnu=ORGZ8&V-d>avWM7Qip0=L zYBQZWbsp^&Hbc^ybUW2qmvRZ~7P%(3^LuC1`_6dBd3w%sJkR%;Xa4wp=JUOOe%xKK zI2|kovjjt7yVJ~GIj&8^U@)hF=>wzC16W)x>o7eam=$vJ6$o@Y35U0B{vpvAi zuXSvct*ZD$ktnKCUe&o}ZaZ#=`CVGU3L|^>>Wn7}ucsn!*(U87CFSYqP1_FMIg@@S zJ)KA-o@<@?g-`e8J-{qsn5!9(Qt~@HI;JehD^^fCYDnY;0y$oQ)x_&{C7UrCp8J=T zPPSc3%kxhmTy6TMGf`+5WUM^%jb#~3~bF_8BjpE?D&p9QA7Fb2*+2J;gm zP&u+#1OZ94PQOREl7;+Kv(YC;7YE6ab;ZFE<6DcGoI-7URS9JYrXq*J-*4#^+O@@a zJdUg`;pOlgM$6(}d|f-aPe1O?(`OHv{GDHGBLZ0u0?8!2-I)RcNC)=kg@JHc>`#p2 zcC;jp9334*B~}%`o{5T>j84|qHh=Z1Dcbf<)%lAz9`|5&h6(puSFg%w(eMb~984{; zTXx%EyX9vm1{i*IU;g8(DeAgarxlji`OJ7f-(b2<0l_{5u%9!yYsdhsgMsNG*)zfe zxr=s^x44s{(;5bqq&w+Li2pWMx2~Sv$=H`X=c?5dVkfPl(WLNo0xmh%JCk3ogkO8x z7H>*wX{y2C3jTg{O<(@9vj}Df0JB$(?b|#7BRVjtyo#C0?+-hBkr1?a#7`}KilHfd zJ4f5Nb4e>NVC!^8xS{yAGr6Lt&qk)ou{)1vmik{&7ka!j*(G8Xu-o?_w`i&P8 zNC+yCfXdco-tTt<8ot1!lEh|(EuJKSBuOLB3KYrN0cH=imJ%v*-y7NUvvHe_6J>ijUqqG(g3U zzcB z8I6f@^K2%I8$(JG{&{2RK_4p<&tH!$)7$9WbfGhi8g%O}>?YbQLg7m^_q4bn5-$Ql7*m(v_wA-4oiJY>{Z7sjgn| zIlI->=6u1^oB@HLd3Cu1IeOHF;$*$9r&3F>cBj_ZOi{#ya-J|_^}X-PFU4M)7^00| zA>UnXRU_ILf05#GQZqj; znfc%VzoCv8Y&||%9gkNgq-IT?N*J_49WpIIVuQ-68EDA-fJr)gK4bFdi)gK_Vwmpg zI$D7#-Xld}0zsi1>vB9Zk7%W3x$CN5zV~<5QA${?$XoA!5pbvn6cMRVk*S*&U_znK zv-tFz@_#JaHZV-77l&zk=kui|W*Wv~aL{W77Ev{*RY&(st~yGlGR~Z}V+s?DyAA)X zL7-);h7U2Bt-%4QbLD+O+UU8O=D5?YpSN&>+QtW%q+$?*MLXP8JkTe~-d@JY>}EU3 zZqAA6o{gHtXc_tYG1I*syzBCQJ$npY(Yyl`B3^{PgpO4ZFv&&{Q;^>>M)m@zYqQLQ znq^i>{rrqU48V10X>DWVy2pE{u2Au`d}e7`{)PXON+Zwadeq~&8x%y3V0_vO@bCks z4va$QaKpmoY_|Vik^YXsxw#nZ?W*egYkyo?DZn$UT)!%9Nex626o)GTq)9 z#D2$Gzi*(m%Uqc_#2w>!b)R~KLrk9^2q3hJcB%xB7XZ@%Mxnz2$gioQy*Z>l_GOM| zW2L()3%dB`N3z`T_@ns|ey;2ow-Vd`k9pmK={pO{6m5_3{?(vi0KbncfH7kMi zW@k0EmNuODOZyRus&lqWqwl`AKd(>siuYg`DeEYbG=eHfXw9mt1z@w*2tZ^vH!o-o%|;UC$zuh>)(OvAvW1b-9V|~~Xhs6S`UVMrrbb`@e-#7+wB(`5 z2-v+F>5kHlXr~?a&R7Ed_=iJ}B#m~EVLxrv4}OUAjC4mkrm%Z9?2Z;O+Vz8-O@KN< z+(P89q8%;Ru~_T~Z%WBOTp)#m#6Y_nFa{G`VzeuQL_pinFv4cMG{VQ4DS=Lc&Xf*D L8+5d~2K4PeLmjPp diff --git a/assets/hbm/textures/models/reactor_body_new.png b/assets/hbm/textures/models/reactor_body_new.png deleted file mode 100644 index f369bb6683fbd86cd49d6503bc65103390890691..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 645 zcmV;00($+4P)=Ojyuwoob1Jzfd9vz7t4f zpy0rDa|Ol<{9)r4(71qToO*NUy7@;S0swyb8SGv-XXJlk77`k>kkFWggvKl+G-e^8 zF$)Qe!xcO3GFRIMzNld(Zi;GMZ(rLyL=hH?1-9F5W1D3e0Uc%hSg_8uFxAIov)MSG zrQ(@V2q{&!qS{Y?IxS9?M-3;;*9Kb-ngkf)ICjp6p)w=sv#vPB--`C7YFw@BZ`S`9 zbj(Bi_eyPP?K;^sAGTP-XNmwOv};X9hAyj zSz413B3@eQ*Lq(i|Jd90dOsmk6VjF^hF~YqT@;#Yv$9gKZFRlu^i%_ukfw|s1U-t^ zQb^l~1c5_RWW4Z~ETK0LvN7r%`MH)bPsxxu5TrTq;Twja)812m7 zb@sM}3}rMSaU26^pOGt}eQ!d%>`ns2LW=y*nGj8k>^h63=6{T~k`x zvRITMsfSJf(w@p6qPKz$zWKZBquu?T2U-fWPG$*BJaUzy_} zb8i>2_|v%06Kwcq&%9akd-I2Sp@UoA-rITn-Fhd}PM!NFWd5Gd(T@WV@Hmi3yx)+xZUkUN`%0H zz(>R%;Afnl!9M`y8@PikKtWLiP9kuGVu*4>38A~sWnXI7W!>kTe3+MA$95cyB6nJ1 zN!wjMRcqB+bBythcf4cF5^ul#wwF?(lmeitD(bpMDaEh-+OG-z|M55a5MTJh7rZeB zV+>MC+O|bXiE|F;9Md#W6a~{XF$@F77y!Di!&*z*wp3MxQi^YU;~PJ8gMaNypY=ir zoO9qkQYoyp2qBPCqP50*kF^#lB~nU^G4y?p5CZQ#LI}S8&2N7somHRypA?13IL^6j zG^G^IImU6!pKsfi&1Qp&i}qn0Qc9E%Aiz0`wKGN;toHyc%K`*s8HRzb>u8z=DdmT9 zzkl6_EX$Gcs%~4hB3y_wk-gM!-2!$@WZ_CeAs27>kb$Nl~IiSk#X#C z&f%jGkH;f@-?J-8Fd{eF*gE=T4^_0VnGVy(p(gL95~p0U>EXe^3?s;cs55?oqq zvDRiIS5@_)Jb(~TS0!WL(=;_7d-83^O;gAvfYv%kSc<|#aHNzB!@zF0V;BaCqR0mSVIP;5m+ZE8 z)NM;q6m-ML@BZOm;JxSlo85PP-sAbwXFr)EZ&? z@7>%3@VkHTXMFxspJ2USv)}JC)P58XnV@ixo6vc;d`(!7&-|hLmKY1@l+4npC{Mil5yzu!?zX9;k&Vi}sE6ef~ zg5sRZuT$-p2oCTHJ2l48G|h+d007>5cDo(kyC3L0Ddj8A^ie!y%6CdB%Ch_}I5~w@ z;JY3+MQeiG591I*aCUa~1D%tEi&R2=R1e+vJ;N|?I2(|z&MVSWeJd9r|3&ebeblVQYfVu zh9Oh&Wb6;)*zIWrWL)EhX0L#9&dqj<>o-g}SR+gsj! z_g!&)ea-Xd&w2OVcg2erFSxtA<2QfvH-(gvvMl-5x4tFnx<&}WZ~fM92_Xc=7=Gh7 zenV`xTi$;AZ4dCyJMZ}P`m104s((Uz8EWTw&Jx;g_fRw+4u{NKPwT@| zxh=_c=`-o`(==rx?DzXzWS`b+rxIUL6qIGjIF49r`NEI?DB_R)0)*hb>+LHK`=gJ~ zkOJQR%Nx)98g%AiKn5GE`YK;&ge=f1t zl$X5s-?PTjT4&WK5eW!nBuQP~d!&>>3bQumIED9~aU63Fe!Uo9k^a(q0KfMq|2yAP zSrq*IXWpPvAO%=2Sdbit8L2e?`al2vM^cW_X>n41OU8r;hMA(zdyi5ow`kIPUDu(t z&U$KE=tR@C*16V7hSpl=*V8niwPv1Y5-cZ2ndh0JC|H&ypO>5>eaEsaIOnnh6h(m$ zg3o{I4N|K~D~a=r^ZS>zoccR^O9Dpl%i>x zeD1PX9FqG(&+YEOt{W(-nzF3^x^tk2fAZw@|I0Pf`QP`@Y4L|)$csBo6IE4ZCR!9l zUf|T=O%c>I4a>4*4fPa0+qTVm=`>9lo|8P6oFqkP%6DDYLjO-G7VD_%hQ8|&N;1w1!}O4gf4~JkHI6^|6M%|;9&mt7 z@BjKg|Jl=XJ>b9gFTUl!=l_tIh}vHL&$;rjyMpZ@aC`Tc%R+qUfYd!&^4`~Jz> zf5#^_DTQEO7XI5G{aN+FZXAF0t)KS0-Hs^Xa^;A-_S+BU??V0A8 zZ~T`(6afF=@BV~O%9pj4v$He))qnV%e4e!yDFiZdj$i+s{~;vArs(ki-XTSHt5?Ez z97n3EO1Z2ccJoi`zs+U?U_QPni_nJ)d9N%>&d<;D=eFA|%d&7h9sypV{)r&rgF_pw zxmp>?jWeNC1RxFGlomd9=A%bSfW99P!1eV@E%|x`)P**zd?CdPxdtKKFIRqdR!Q1cm-zD-}YdJqV$2*T880xAu8jwb7 z?(S|Vj1G<#uCD-r5O@#cGy#H(%gYA?dheO1nYwA1rx_9MUje47svI$0*QKzY09%+4 zVV`*Y<0vWUgV#^Mtdzo8$JL`N5P8uQF_IE&N-25#_;G%~d7e>Hay%R|E4V&Rf*397 zNRXZuO$d=7{M0Fy@OYkKoN&%3&`F0#j5-2Tps6`99O1 ze{f!(jIE8K>wD@tIB`>`ye=2#7u;OmP*r7mJ_*R<@rd)Dq9{R#hxJPjJk2xHG~!B!!Vvs z3W(G-TCB~b6tIK{M4+_c`sS9!I?m3{A>=ue^3M7B`Dwmd0GFUh#kw(il>J|K!?HMs zM}Uxc54-!*9Jg2dC@^62Uj>-8EB^uxdq#ux>0dLR)ODJ2&d7wMWsa*ESMOvnCk zL}^3Qu4z}Rly_daW~yIf9{0&$N-4gFbEpKZNrOE-QXjSNdp4U*I==)=*L4Uf*>3My zti_mu-4L$-#*e(gi|cEw^C%sRl?<;`m?Bt~g%jen$g~(9xVU_j7A!9|1o%s%7pJ+b zX&an}ei)HT)AbKILQ07?25TMqq32c*rvOeRvkyM_Abp>@zP{nu_1xd@kkP<^Nk&SB zNnU`tT1rP?$RnFzzNni8)#LNtT`JMqu{-k1G-{BXMAR3whhZ-@y;<$6PwMN7cXAYG)?a0 z_kGWsZ@$U1XU|@_zLb*d>uWA9E;u_o6)|$tUAG6(V z15rH5vEDhB6G`#JD0z+gzGs>y*6VdBRibB|K9jmAd0JH!$Kx?~9vhXa?F7Ywn_xGW3aIohU1E6F$v=r|D|5O^Nyt9hO& z3xigYN9X6<-`^voWSV9+n+^BdZ7yYm3^Sk}GVuUj86jM)Ryl|4c0202##&1m_12^e zrFoz9oTmmz3_3YLUDr70xVpN^ot4uWp>!`H=LKP1N`Vv!r7TxhS9$s`88rzD5XuLo zVpCn~JV7YW&(AqKJ7cw4Wn)xT6&Ak?2D`brM#-?yQVMkR?lg*#N{ADh9T#rFxrJdk zvb*0Ryk+Q)lt!V1L*XzIj07b-%RC_jnYqpLOjU-$)h!eI-4-Q7LEd-AOw)I}Jsz+& zz+{S|(`bL~wb$~(?smIe*9jpgjNy1ZprmA)CYEKP>pCtkFS)(F<>KNTV+@D=KFfN^ zuqii5Dd~;}w2}RM`TV{lJ z7_Bf$;hbe3o7e#Ar~dYjJWU?vz0Y2k;BH=Kq*Qd>k)kL#Kie>jBTA~E2ng8T-R6gK zDZIUBo(Af&psj0!cW9+hQgGbw&{EP=B{FC%Xl-J|2PnC|zUJ}ctK2H8s)}iz5fR$f zs})iOO;sC%cRuF0BXwOr>FY^PJ43+mxYv6Wku7}bX|}4AeEv!9vBu&QC9TR zL}@hekTa^Pf_M$@Y&Kw9*BBj`)M6c8NEYj`9;|a{6CmWtlP9tM>~Y=)RtqR8gO@6e zvkrG6z$d6uN}{Ad$A~SA!Fk8c%?(}G(=<)K&)j>IF?wwf&=+et3^UU_V~PTkL=K-z z3UCf7g34o*pei&~VbD@gl_n#=Y;D#s6H1t(;QaiIWwF_rq=01_nZ|+hvvoub!!$2w zZBW`|q*Ou#c9Rpl2vU<0paf_s*lbp;nmX1kK?QKJsk&}kG;m&P)H34ZVx*+L+wE}( zc84QfKhcj9v-OO#WpRRjTG;N76lIO|0_!|o-v^e~w%p#{vfm%VzbzK$VVq_b8}r;W zv0ASloQ0sfmPLWH7A*x@3KSkYj}%(*`09#P+vfWOaNeV}p(;z10HXjqQz(g&@cL_y zFd{ftS(eyHZi16L3MIKb+aU1~2}1ADm?9cDwjNH}U@n$tH#fIfYeV`GA^(?k!!$2U zi(^_W<7|;iqfL>Kq0l-+_fLNEji=swo;-PtaTvfmv=od(Pgxk2dBQqJ*Y~*Ke5}`N z?6RPQ$9qCcMrgEBm^c{hy=T2yV;75(ifNwFroeevtVIY#S=R`u(M6G!lCrE$N`(N6 zr+q}N6~oY@wZbFV?+@9_6X^*^65+}@gj66UQzST2=^S+l3YU2fi)?3<@F*GRR5wiQ zj{~>&JJxNBjU~{2zo)J$qyVi$^i1;{P{e~nFwF}df%T!*p5nco?n^waYZIfDLQvIp zDB7*VI**hpv*LN0Fog+$_VKgo>G62v_U4AFESbli&3c7aB8(nbi?a(-#j(BEHWJ>` zHWhUtDYc}kN*p44r?oaLh!4t#HU&i3urB1f#agU$Ow&wRmU+z2M<_oWk2$yc*j3jO z>e8UK3Z;c9$Qr-*91n+_Z>5r)ou9Km9PvKDwGauaLKK|tZG7_DYjlS|M0WT0GKi# zT9zdU=0#B;5Y$bR+doRFFgv3(UI@Br;e6F{>_^(BW{IpZ?ICHJ8UfsI?|Aa~3hx$- zQfQ;|$VVDDPU9oiT8!3VEo3m1mVtLD30in6Ez!bLXcfs5YC9rN0o89V*pZnC) zmoHz^#>B3q#M%WZJovCjUP%>494vizM8;ePf@422TaQwbQYpr9peo8dn_?G>iwl=> zn0G!#s=|5Cd+)u+YPF)Ns}LF9b2#k79F5j^ps7RAFH;j#NKBNajMiwakTQ61+qR6; zj6)z~Fi3I`r4&tFb9Z-((Hgvqh*R+5#mm4DrDR?#)&>%BzweMr;q5{Z;p=eNQ#%5#udWz|9w7)=>_V<;o0_W7G=)LLwvls=rmh&L2@%zXQ0zw` zQAx_OV4UWx+NTb_l7jti%c@<4rhJ6cuIo_RAf#eiEM?QOI~;K?5QJkaHTL@>NEMi% zBTjA4%(3&KwPqX!&Q>dwfT}F;&f>hM9|o$b<zA)JQyM>s83VI>7Vg#W~)_nH&K| z2j=daV{twcm#S_Ur#UmvB!i_W#0TMfu@)EMSpr%~rZK2f)_XSR=iKkRkjgxHHpn@L z`t&CrKTSCZ2qZuVgpf?jfec>l9-uM6C}qr_KxRcl(GChO@KHE3K(S^y;Rj??(_a4u22_jRn?w9E$sW zkI;dsC*3-+SM}p>y!O;N$K~ZE^EA;9JylsERG{gp)l}9ELTQ`_>pZK~ihi8v#tH9X zT^9_Kr6_`cUDplHS(e3eb8{0suP_L21Ift3w$7Vr4*NYy2QffMiBhi$)2aCV(?9*6 zRCSGr^;SQO`CgreqAZa@(DyygTBLedv_zl;X#g3VhuJ!;_gEJclf?#sV&C;l^TN6* zk;Vjx%oKR%S)4<~G%(EzQX8BXcp>o!E+0K2^hHD6?0nFbSL<~i$86h%VHm?RE0rU7 z@u8kvoM3jIX||bwrQ9td^u~hnhIv_N+g0eZ#G-Rv7N%G{r%CMne#iCoHS;{PX{zvV z{T%X*3q|p6w__9gd`X9Fn;InrQ-7pTu)ThPw-aOEg*;SMEY=Zf;jl1LN|vbXryA(T z{??ngWkv~@qMn$_h^A>m6nT#jlB%lHgaNlVH!RD-I8H1Mro|ymi9=#zuQrWF3L)r+ ziSt#9RFZu^(j7ab4Cvx~s8jFvd#v-UH)o+d@}8TUo7@EVkaN8d5+Nn`_xG9QzyJOR zc;}E(u*?hd;wb8t$qG!prkgCzOOy_BVak26tBm^0kACdwX0u_x--lv3d8iPqS1p^> zie(DW!lvXhiFZD5=8 zvY@oV6lGMGh;1bkAlC)RElp?<85O>(Dh;dEDwi5*fH-ZlTd&u-YteNbOHd{Y|l4%@6 zeq5HAXT!C;5Nr=U$74s^He8;qbIU1->`KZoG#oqSQ`BLd4TMZdk@a9H71nv?D4kVR zjf)zw6hQ>>Kv@O?csLv}5i$em2}S?ot1F(rcmbXVEmZLELj|XjRACGk7w17*5+V!K zRiUYjM95U5|5SwJC7JCaL#5CJ;9Fm zAcW-6qeslv;k;m+g23Ay4;Trh7D(@?jKWA*H5HfVXV|EK6h#qPo?zXUFb^m@QELIq zh!Nq(f|PLBc|Z%#<4w(aRU-wV({Qry!#js_mN{(j|B!K19c~AasF4 zGFp%I5951Mik#QFK6F3orlu$hrg_FA*zOM?HHUtrS#9t_(RDp_RU(B)#@@x<-5uJP zJXoxxKzNItMmBBD&>b;ag~*HPqb^G}ZB3~K$9|yH3MD*EQ*(d6jrHxqvdoCsLBNN} zfF$J!97+bk-P+Xg2+&_DL8T?DQggnlsEnkk3{6$glm&JkbIqHC4UV%@k#wTQyoK93sxth)gIV{(G;4dEGV?ZI!{%% z!O4_DEB)|85b=2*J$l5k>u@eGTA?&WRWmP^DT)JO&=|m{!6l}}vcz*-6vKJQkOCIq8SZDnd#Y>ruMEA{b}O{qDfwctk0UDFWltMrUz*nx;Iukj52^ zF+p6PCWKT-rIAXrI~+g+FO^c|Hce{d%=1E3*BtwS*}*tlbXhaTMINUa5Nx;im@+Wq zq70uGLcY?;$n7B)82jOHKxs`?*LWmeNT%8H!L#So%_?+7rkTZsHS|KVID+wfaJo5m zO@xrFH*4l;LPdqgMb*gK&=rx>JjeD5%*)LA*@pgj#5;@dVYK!WuYVkY=i=f#FGAN3 zI0XGTVLd#5`7$J00o}37v_3Jsx(R}KQPwyw7^WFys5P}QtT&rb#{q}K5k$}zMU>7? z_8;VNi8M8EcDBhnV?T~G?HZ(Fe>etW5S5i>3GJD2w%i|jhQ;Hh!AZ@uScY*5_fu5N z4w}t5)=N}Tap;HOym2r}Yt74-FJqTQBBVlVgH)QuI+Q6H=Y=WGqF!D-X7SLE3$myw z+BJt^;W%3M{ltR8ddWCje7xSgEbMmsI3W-Q$A)2K7$2NjefkquPs7891V2xGn8k1p z=SX-(6FX5=xpf=;K?M6BsZavWj8y6^k^8#Q^c z=b5^0@~Fh=v=|YRQ$KBp!^PIR6WDiou=a2`U`!|xocH;U#Qb9Zd*h8a@)%(1GNgW- z&))wqhL}b(hH*qI9s8W2-Iki#sW+O4Vcj$wyN+=TFnqV&(ymsyNu3}$@rct6vjEx{ zR;!l24|_24-iWaukiyfHMQ&pV0nblOYpj=-G!Lw)2a{f<@Jmv1R`E<2fkv77la-xj6G|5{{)6g^xziE010000dNkl>_w 0) { + + int j1 = world.rand.nextInt(21) + 10; + + if (j1 > itemstack.stackSize) + j1 = itemstack.stackSize; + + itemstack.stackSize -= j1; + EntityItem entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage())); + + if (itemstack.hasTagCompound()) + entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); + + float f3 = 0.05F; + entityitem.motionX = (float)world.rand.nextGaussian() * f3; + entityitem.motionY = (float)world.rand.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float)world.rand.nextGaussian() * f3; + world.spawnEntityInWorld(entityitem); + } + } + } + + world.func_147453_f(x, y, z, block); + } + } + + super.breakBlock(world, x, y, z, block, meta); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { + + if(!rotatable) + return; + + int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + + if(i == 0) + { + world.setBlockMetadataWithNotify(x, y, z, 2, 2); + } + if(i == 1) + { + world.setBlockMetadataWithNotify(x, y, z, 5, 2); + } + if(i == 2) + { + world.setBlockMetadataWithNotify(x, y, z, 3, 2); + } + if(i == 3) + { + world.setBlockMetadataWithNotify(x, y, z, 4, 2); + } + } + +} diff --git a/com/hbm/entity/projectile/EntityBulletBase.java b/com/hbm/entity/projectile/EntityBulletBase.java index 7cfea514a..52fd752b6 100644 --- a/com/hbm/entity/projectile/EntityBulletBase.java +++ b/com/hbm/entity/projectile/EntityBulletBase.java @@ -495,7 +495,7 @@ public class EntityBulletBase extends Entity implements IProjectile { if(e instanceof EntityLivingBase && config.effects != null && !config.effects.isEmpty() && !worldObj.isRemote) { for(PotionEffect effect : config.effects) { - ((EntityLivingBase)e).addPotionEffect(effect); + ((EntityLivingBase)e).addPotionEffect(new PotionEffect(effect)); } } diff --git a/com/hbm/entity/projectile/EntityModBeam.java b/com/hbm/entity/projectile/EntityModBeam.java index 31ec77dcc..2bcddb3eb 100644 --- a/com/hbm/entity/projectile/EntityModBeam.java +++ b/com/hbm/entity/projectile/EntityModBeam.java @@ -312,7 +312,7 @@ public class EntityModBeam extends Entity implements IProjectile float f2; if (movingobjectposition != null) { - if (movingobjectposition.entityHit != null) + if (movingobjectposition.entityHit != null && movingobjectposition.entityHit != this.shootingEntity) { f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); int k = MathHelper.ceiling_double_int(f2 * this.damage); diff --git a/com/hbm/entity/projectile/EntityShrapnel.java b/com/hbm/entity/projectile/EntityShrapnel.java index 4b451d72e..e6afdbd35 100644 --- a/com/hbm/entity/projectile/EntityShrapnel.java +++ b/com/hbm/entity/projectile/EntityShrapnel.java @@ -1,6 +1,5 @@ package com.hbm.entity.projectile; -import com.hbm.entity.particle.EntitySSmokeFX; import com.hbm.lib.ModDamageSource; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -32,11 +31,9 @@ public class EntityShrapnel extends EntityThrowable { @Override public void onUpdate() { super.onUpdate(); - if(!worldObj.isRemote) - if(this.dataWatcher.getWatchableObjectByte(16) == 1) { - worldObj.spawnEntityInWorld(new EntitySSmokeFX(worldObj, this.posX, this.posY - 0.5, this.posZ, 0.0, 0.0, 0.0)); - worldObj.spawnEntityInWorld(new EntitySSmokeFX(worldObj, this.posX - this.motionX, this.posY - 0.5 - this.motionY, this.posZ - this.motionZ, 0.0, 0.0, 0.0)); - } + + if(worldObj.isRemote && this.dataWatcher.getWatchableObjectByte(16) == 1) + worldObj.spawnParticle("flame", posX, posY, posZ, 0.0, 0.0, 0.0); } @Override diff --git a/com/hbm/handler/BulletConfigSyncingUtil.java b/com/hbm/handler/BulletConfigSyncingUtil.java index ed5cf14db..c1b8da650 100644 --- a/com/hbm/handler/BulletConfigSyncingUtil.java +++ b/com/hbm/handler/BulletConfigSyncingUtil.java @@ -1,26 +1,13 @@ package com.hbm.handler; -import java.util.ArrayList; -import java.util.List; +import java.util.HashMap; +import java.util.Map.Entry; + import com.hbm.handler.guncfg.*; public class BulletConfigSyncingUtil { - private static List configSet = new ArrayList(); - - /// it's like a hashmap, but easier /// - public static class ConfigKeyPair { - - BulletConfiguration config; - int key; - - public ConfigKeyPair() { } - - public ConfigKeyPair(BulletConfiguration c, int i) { - config = c; - key = i; - } - } + private static HashMap configSet = new HashMap(); static int i = 0; @@ -57,6 +44,7 @@ public class BulletConfigSyncingUtil { public static int ROCKET_NUKE = i++; public static int ROCKET_CHAINSAW = i++; public static int ROCKET_TOXIC = i++; + public static int ROCKET_PHOSPHORUS = i++; public static int GRENADE_NORMAL = i++; public static int GRENADE_HE = i++; @@ -66,6 +54,7 @@ public class BulletConfigSyncingUtil { public static int GRENADE_CONCUSSION = i++; public static int GRENADE_FINNED = i++; public static int GRENADE_NUCLEAR = i++; + public static int GRENADE_PHOSPHORUS = i++; public static int G12_NORMAL = i++; public static int G12_INCENDIARY = i++; @@ -86,6 +75,7 @@ public class BulletConfigSyncingUtil { public static int M44_BJ = i++; public static int M44_SILVER = i++; public static int M44_ROCKET = i++; + public static int M44_PHOSPHORUS = i++; public static int P9_NORMAL = i++; public static int P9_AP = i++; @@ -97,6 +87,7 @@ public class BulletConfigSyncingUtil { public static int BMG50_EXPLOSIVE = i++; public static int BMG50_DU = i++; public static int BMG50_STAR = i++; + public static int BMG50_PHOSPHORUS = i++; public static int R5_NORMAL = i++; public static int R5_EXPLOSIVE = i++; @@ -136,133 +127,131 @@ public class BulletConfigSyncingUtil { public static void loadConfigsForSync() { - configSet.add(new ConfigKeyPair(BulletConfigFactory.getTestConfig(), TEST_CONFIG)); + configSet.put(TEST_CONFIG, BulletConfigFactory.getTestConfig()); - configSet.add(new ConfigKeyPair(Gun357MagnumFactory.getRevIronConfig(), IRON_REVOLVER)); - configSet.add(new ConfigKeyPair(Gun357MagnumFactory.getRevSteelConfig(), STEEL_REVOLVER)); - configSet.add(new ConfigKeyPair(Gun357MagnumFactory.getRevLeadConfig(), LEAD_REVOLVER)); - configSet.add(new ConfigKeyPair(Gun357MagnumFactory.getRevGoldConfig(), GOLD_REVOLVER)); - configSet.add(new ConfigKeyPair(Gun357MagnumFactory.getRevCursedConfig(), CURSED_REVOLVER)); - configSet.add(new ConfigKeyPair(Gun357MagnumFactory.getRevSchrabidiumConfig(), SCHRABIDIUM_REVOLVER)); - configSet.add(new ConfigKeyPair(Gun357MagnumFactory.getRevNightmareConfig(), NIGHT_REVOLVER)); - configSet.add(new ConfigKeyPair(Gun357MagnumFactory.getRevNightmare2Config(), NIGHT2_REVOLVER)); - configSet.add(new ConfigKeyPair(Gun357MagnumFactory.getRevSteelConfig().setToFire(3), SATURNITE_REVOLVER)); - configSet.add(new ConfigKeyPair(Gun357MagnumFactory.getRevDeshConfig(), DESH_REVOLVER)); - - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeConfig(), G20_NORMAL)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeSlugConfig(), G20_SLUG)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeFlechetteConfig(), G20_FLECHETTE)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeFireConfig(), G20_FIRE)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeShrapnelConfig(), G20_SHRAPNEL)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeExplosiveConfig(), G20_EXPLOSIVE)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeCausticConfig(), G20_CAUSTIC)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeShockConfig(), G20_SHOCK)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeWitherConfig(), G20_WITHER)); - - configSet.add(new ConfigKeyPair(GunRocketFactory.getRocketConfig(), ROCKET_NORMAL)); - configSet.add(new ConfigKeyPair(GunRocketFactory.getRocketHEConfig(), ROCKET_HE)); - configSet.add(new ConfigKeyPair(GunRocketFactory.getRocketIncendiaryConfig(), ROCKET_INCENDIARY)); - configSet.add(new ConfigKeyPair(GunRocketFactory.getRocketShrapnelConfig(), ROCKET_SHRAPNEL)); - configSet.add(new ConfigKeyPair(GunRocketFactory.getRocketEMPConfig(), ROCKET_EMP)); - configSet.add(new ConfigKeyPair(GunRocketFactory.getRocketGlareConfig(), ROCKET_GLARE)); - configSet.add(new ConfigKeyPair(GunRocketFactory.getRocketSleekConfig(), ROCKET_SLEEK)); - configSet.add(new ConfigKeyPair(GunRocketFactory.getRocketNukeConfig(), ROCKET_NUKE)); - configSet.add(new ConfigKeyPair(GunRocketFactory.getRocketRPCConfig(), ROCKET_CHAINSAW)); - configSet.add(new ConfigKeyPair(GunRocketFactory.getRocketChlorineConfig(), ROCKET_TOXIC)); - - configSet.add(new ConfigKeyPair(GunGrenadeFactory.getGrenadeConfig(), GRENADE_NORMAL)); - configSet.add(new ConfigKeyPair(GunGrenadeFactory.getGrenadeHEConfig(), GRENADE_HE)); - configSet.add(new ConfigKeyPair(GunGrenadeFactory.getGrenadeIncendirayConfig(), GRENADE_INCENDIARY)); - configSet.add(new ConfigKeyPair(GunGrenadeFactory.getGrenadeChlorineConfig(), GRENADE_CHEMICAL)); - configSet.add(new ConfigKeyPair(GunGrenadeFactory.getGrenadeSleekConfig(), GRENADE_SLEEK)); - configSet.add(new ConfigKeyPair(GunGrenadeFactory.getGrenadeConcussionConfig(), GRENADE_CONCUSSION)); - configSet.add(new ConfigKeyPair(GunGrenadeFactory.getGrenadeFinnedConfig(), GRENADE_FINNED)); - configSet.add(new ConfigKeyPair(GunGrenadeFactory.getGrenadeNuclearConfig(), GRENADE_NUCLEAR)); - - configSet.add(new ConfigKeyPair(Gun12GaugeFactory.get12GaugeConfig(), G12_NORMAL)); - configSet.add(new ConfigKeyPair(Gun12GaugeFactory.get12GaugeFireConfig(), G12_INCENDIARY)); - configSet.add(new ConfigKeyPair(Gun12GaugeFactory.get12GaugeShrapnelConfig(), G12_SHRAPNEL)); - configSet.add(new ConfigKeyPair(Gun12GaugeFactory.get12GaugeDUConfig(), G12_DU)); - configSet.add(new ConfigKeyPair(Gun12GaugeFactory.get12GaugeAMConfig(), G12_AM)); - - configSet.add(new ConfigKeyPair(Gun22LRFactory.get22LRConfig(), LR22_NORMAL)); - configSet.add(new ConfigKeyPair(Gun22LRFactory.get22LRAPConfig(), LR22_AP)); - configSet.add(new ConfigKeyPair(Gun22LRFactory.get22LRConfig().setToFire(3), LR22_NORMAL_FIRE)); - configSet.add(new ConfigKeyPair(Gun22LRFactory.get22LRAPConfig().setToFire(3), LR22_AP_FIRE)); - - configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getNoPipConfig(), M44_NORMAL)); - configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getNoPipAPConfig(), M44_AP)); - configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getNoPipDUConfig(), M44_DU)); - configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getNoPipStarConfig(), M44_STAR)); - configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getPipConfig(), M44_PIP)); - configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getBJConfig(), M44_BJ)); - configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getSilverStormConfig(), M44_SILVER)); - configSet.add(new ConfigKeyPair(Gun44MagnumFactory.getRocketConfig(), M44_ROCKET)); - - configSet.add(new ConfigKeyPair(Gun9mmFactory.get9mmConfig(), P9_NORMAL)); - configSet.add(new ConfigKeyPair(Gun9mmFactory.get9mmAPConfig(), P9_AP)); - configSet.add(new ConfigKeyPair(Gun9mmFactory.get9mmDUConfig(), P9_DU)); - configSet.add(new ConfigKeyPair(Gun9mmFactory.get9mmRocketConfig(), P9_ROCKET)); - - configSet.add(new ConfigKeyPair(Gun50BMGFactory.get50BMGConfig(), BMG50_NORMAL)); - configSet.add(new ConfigKeyPair(Gun50BMGFactory.get50BMGFireConfig(), BMG50_INCENDIARY)); - configSet.add(new ConfigKeyPair(Gun50BMGFactory.get50BMGExplosiveConfig(), BMG50_EXPLOSIVE)); - configSet.add(new ConfigKeyPair(Gun50BMGFactory.get50BMGDUConfig(), BMG50_DU)); - configSet.add(new ConfigKeyPair(Gun50BMGFactory.get50BMGStarConfig(), BMG50_STAR)); - - configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmConfig(), R5_NORMAL)); - configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmExplosiveConfig(), R5_EXPLOSIVE)); - configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmDUConfig(), R5_DU)); - configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmStarConfig(), R5_STAR)); - configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmConfig().setToBolt(BulletConfiguration.BOLT_LACUNAE), R5_NORMAL_BOLT)); - configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmExplosiveConfig().setToBolt(BulletConfiguration.BOLT_LACUNAE), R5_EXPLOSIVE_BOLT)); - configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmDUConfig().setToBolt(BulletConfiguration.BOLT_LACUNAE), R5_DU_BOLT)); - configSet.add(new ConfigKeyPair(Gun5mmFactory.get5mmStarConfig().setToBolt(BulletConfiguration.BOLT_LACUNAE), R5_STAR_BOLT)); - - configSet.add(new ConfigKeyPair(Gun50AEFactory.get50AEConfig(), AE50_NORMAL)); - configSet.add(new ConfigKeyPair(Gun50AEFactory.get50APConfig(), AE50_AP)); - configSet.add(new ConfigKeyPair(Gun50AEFactory.get50DUConfig(), AE50_DU)); - configSet.add(new ConfigKeyPair(Gun50AEFactory.get50StarConfig(), AE50_STAR)); - - configSet.add(new ConfigKeyPair(Gun4GaugeFactory.get4GaugeConfig(), G4_NORMAL)); - configSet.add(new ConfigKeyPair(Gun4GaugeFactory.get4GaugeSlugConfig(), G4_SLUG)); - configSet.add(new ConfigKeyPair(Gun4GaugeFactory.get4GaugeExplosiveConfig(), G4_EXPLOSIVE)); - - configSet.add(new ConfigKeyPair(GunOSIPRFactory.getPulseConfig(), SPECIAL_OSIPR)); - configSet.add(new ConfigKeyPair(GunGaussFactory.getGaussConfig(), SPECIAL_GAUSS)); - configSet.add(new ConfigKeyPair(GunGaussFactory.getAltConfig(), SPECIAL_GAUSS_CHARGED)); - - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeConfig().setToFire(3), G20_NORMAL_FIRE)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeShrapnelConfig().setToFire(3), G20_SHRAPNEL_FIRE)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeSlugConfig().setToFire(3), G20_SLUG_FIRE)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeFlechetteConfig().setToFire(3), G20_FLECHETTE_FIRE)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeExplosiveConfig().setToFire(3), G20_EXPLOSIVE_FIRE)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeCausticConfig().setToFire(3), G20_CAUSTIC_FIRE)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeShockConfig().setToFire(3), G20_SHOCK_FIRE)); - configSet.add(new ConfigKeyPair(Gun20GaugeFactory.get20GaugeWitherConfig().setToFire(3), G20_WITHER_FIRE)); - - configSet.add(new ConfigKeyPair(GunFatmanFactory.getNukeConfig(), NUKE_NORMAL)); - configSet.add(new ConfigKeyPair(GunFatmanFactory.getNukeProtoConfig(), NUKE_PROTO)); - configSet.add(new ConfigKeyPair(GunFatmanFactory.getBalefireConfig(), NUKE_AMAT)); + configSet.put(IRON_REVOLVER, Gun357MagnumFactory.getRevIronConfig()); + configSet.put(STEEL_REVOLVER, Gun357MagnumFactory.getRevSteelConfig()); + configSet.put(LEAD_REVOLVER, Gun357MagnumFactory.getRevLeadConfig()); + configSet.put(GOLD_REVOLVER, Gun357MagnumFactory.getRevGoldConfig()); + configSet.put(CURSED_REVOLVER, Gun357MagnumFactory.getRevCursedConfig()); + configSet.put(SCHRABIDIUM_REVOLVER, Gun357MagnumFactory.getRevSchrabidiumConfig()); + configSet.put(NIGHT_REVOLVER, Gun357MagnumFactory.getRevNightmareConfig()); + configSet.put(NIGHT2_REVOLVER, Gun357MagnumFactory.getRevNightmare2Config()); + configSet.put(SATURNITE_REVOLVER, Gun357MagnumFactory.getRevSteelConfig().setToFire(3)); + configSet.put(DESH_REVOLVER, Gun357MagnumFactory.getRevDeshConfig()); + + configSet.put(G20_NORMAL, Gun20GaugeFactory.get20GaugeConfig()); + configSet.put(G20_SLUG, Gun20GaugeFactory.get20GaugeSlugConfig()); + configSet.put(G20_FLECHETTE, Gun20GaugeFactory.get20GaugeFlechetteConfig()); + configSet.put(G20_FIRE, Gun20GaugeFactory.get20GaugeFireConfig()); + configSet.put(G20_SHRAPNEL, Gun20GaugeFactory.get20GaugeShrapnelConfig()); + configSet.put(G20_EXPLOSIVE, Gun20GaugeFactory.get20GaugeExplosiveConfig()); + configSet.put(G20_CAUSTIC, Gun20GaugeFactory.get20GaugeCausticConfig()); + configSet.put(G20_SHOCK, Gun20GaugeFactory.get20GaugeShockConfig()); + configSet.put(G20_WITHER, Gun20GaugeFactory.get20GaugeWitherConfig()); + + configSet.put(ROCKET_NORMAL, GunRocketFactory.getRocketConfig()); + configSet.put(ROCKET_HE, GunRocketFactory.getRocketHEConfig()); + configSet.put(ROCKET_INCENDIARY, GunRocketFactory.getRocketIncendiaryConfig()); + configSet.put(ROCKET_PHOSPHORUS, GunRocketFactory.getRocketPhosphorusConfig()); + configSet.put(ROCKET_SHRAPNEL, GunRocketFactory.getRocketShrapnelConfig()); + configSet.put(ROCKET_EMP, GunRocketFactory.getRocketEMPConfig()); + configSet.put(ROCKET_GLARE, GunRocketFactory.getRocketGlareConfig()); + configSet.put(ROCKET_SLEEK, GunRocketFactory.getRocketSleekConfig()); + configSet.put(ROCKET_NUKE, GunRocketFactory.getRocketNukeConfig()); + configSet.put(ROCKET_CHAINSAW, GunRocketFactory.getRocketRPCConfig()); + configSet.put(ROCKET_TOXIC, GunRocketFactory.getRocketChlorineConfig()); + + configSet.put(GRENADE_NORMAL, GunGrenadeFactory.getGrenadeConfig()); + configSet.put(GRENADE_HE, GunGrenadeFactory.getGrenadeHEConfig()); + configSet.put(GRENADE_INCENDIARY, GunGrenadeFactory.getGrenadeIncendirayConfig()); + configSet.put(GRENADE_PHOSPHORUS, GunGrenadeFactory.getGrenadePhosphorusConfig()); + configSet.put(GRENADE_CHEMICAL, GunGrenadeFactory.getGrenadeChlorineConfig()); + configSet.put(GRENADE_SLEEK, GunGrenadeFactory.getGrenadeSleekConfig()); + configSet.put(GRENADE_CONCUSSION, GunGrenadeFactory.getGrenadeConcussionConfig()); + configSet.put(GRENADE_FINNED, GunGrenadeFactory.getGrenadeFinnedConfig()); + configSet.put(GRENADE_NUCLEAR, GunGrenadeFactory.getGrenadeNuclearConfig()); + + configSet.put(G12_NORMAL, Gun12GaugeFactory.get12GaugeConfig()); + configSet.put(G12_INCENDIARY, Gun12GaugeFactory.get12GaugeFireConfig()); + configSet.put(G12_SHRAPNEL, Gun12GaugeFactory.get12GaugeShrapnelConfig()); + configSet.put(G12_DU, Gun12GaugeFactory.get12GaugeDUConfig()); + configSet.put(G12_AM, Gun12GaugeFactory.get12GaugeAMConfig()); + + configSet.put(LR22_NORMAL, Gun22LRFactory.get22LRConfig()); + configSet.put(LR22_AP, Gun22LRFactory.get22LRAPConfig()); + configSet.put(LR22_NORMAL_FIRE, Gun22LRFactory.get22LRConfig().setToFire(3)); + configSet.put(LR22_AP_FIRE, Gun22LRFactory.get22LRAPConfig().setToFire(3)); + + configSet.put(M44_NORMAL, Gun44MagnumFactory.getNoPipConfig()); + configSet.put(M44_AP, Gun44MagnumFactory.getNoPipAPConfig()); + configSet.put(M44_DU, Gun44MagnumFactory.getNoPipDUConfig()); + configSet.put(M44_PHOSPHORUS, Gun44MagnumFactory.getPhosphorusConfig()); + configSet.put(M44_STAR, Gun44MagnumFactory.getNoPipStarConfig()); + configSet.put(M44_PIP, Gun44MagnumFactory.getPipConfig()); + configSet.put(M44_BJ, Gun44MagnumFactory.getBJConfig()); + configSet.put(M44_SILVER, Gun44MagnumFactory.getSilverStormConfig()); + configSet.put(M44_ROCKET, Gun44MagnumFactory.getRocketConfig()); + + configSet.put(P9_NORMAL, Gun9mmFactory.get9mmConfig()); + configSet.put(P9_AP, Gun9mmFactory.get9mmAPConfig()); + configSet.put(P9_DU, Gun9mmFactory.get9mmDUConfig()); + configSet.put(P9_ROCKET, Gun9mmFactory.get9mmRocketConfig()); + + configSet.put(BMG50_NORMAL, Gun50BMGFactory.get50BMGConfig()); + configSet.put(BMG50_INCENDIARY, Gun50BMGFactory.get50BMGFireConfig()); + configSet.put(BMG50_PHOSPHORUS, Gun50BMGFactory.get50BMGPhosphorusConfig()); + configSet.put(BMG50_EXPLOSIVE, Gun50BMGFactory.get50BMGExplosiveConfig()); + configSet.put(BMG50_DU, Gun50BMGFactory.get50BMGDUConfig()); + configSet.put(BMG50_STAR, Gun50BMGFactory.get50BMGStarConfig()); + + configSet.put(R5_NORMAL, Gun5mmFactory.get5mmConfig()); + configSet.put(R5_EXPLOSIVE, Gun5mmFactory.get5mmExplosiveConfig()); + configSet.put(R5_DU, Gun5mmFactory.get5mmDUConfig()); + configSet.put(R5_STAR, Gun5mmFactory.get5mmStarConfig()); + configSet.put(R5_NORMAL_BOLT, Gun5mmFactory.get5mmConfig().setToBolt(BulletConfiguration.BOLT_LACUNAE)); + configSet.put(R5_EXPLOSIVE_BOLT, Gun5mmFactory.get5mmExplosiveConfig().setToBolt(BulletConfiguration.BOLT_LACUNAE)); + configSet.put(R5_DU_BOLT, Gun5mmFactory.get5mmDUConfig().setToBolt(BulletConfiguration.BOLT_LACUNAE)); + configSet.put(R5_STAR_BOLT, Gun5mmFactory.get5mmStarConfig().setToBolt(BulletConfiguration.BOLT_LACUNAE)); + + configSet.put(AE50_NORMAL, Gun50AEFactory.get50AEConfig()); + configSet.put(AE50_AP, Gun50AEFactory.get50APConfig()); + configSet.put(AE50_DU, Gun50AEFactory.get50DUConfig()); + configSet.put(AE50_STAR, Gun50AEFactory.get50StarConfig()); + + configSet.put(G4_NORMAL, Gun4GaugeFactory.get4GaugeConfig()); + configSet.put(G4_SLUG, Gun4GaugeFactory.get4GaugeSlugConfig()); + configSet.put(G4_EXPLOSIVE, Gun4GaugeFactory.get4GaugeExplosiveConfig()); + + configSet.put(SPECIAL_OSIPR, GunOSIPRFactory.getPulseConfig()); + configSet.put(SPECIAL_GAUSS, GunGaussFactory.getGaussConfig()); + configSet.put(SPECIAL_GAUSS_CHARGED, GunGaussFactory.getAltConfig()); + + configSet.put(G20_NORMAL_FIRE, Gun20GaugeFactory.get20GaugeConfig().setToFire(3)); + configSet.put(G20_SHRAPNEL_FIRE, Gun20GaugeFactory.get20GaugeShrapnelConfig().setToFire(3)); + configSet.put(G20_SLUG_FIRE, Gun20GaugeFactory.get20GaugeSlugConfig().setToFire(3)); + configSet.put(G20_FLECHETTE_FIRE, Gun20GaugeFactory.get20GaugeFlechetteConfig().setToFire(3)); + configSet.put(G20_EXPLOSIVE_FIRE, Gun20GaugeFactory.get20GaugeExplosiveConfig().setToFire(3)); + configSet.put(G20_CAUSTIC_FIRE, Gun20GaugeFactory.get20GaugeCausticConfig().setToFire(3)); + configSet.put(G20_SHOCK_FIRE, Gun20GaugeFactory.get20GaugeShockConfig().setToFire(3)); + configSet.put(G20_WITHER_FIRE, Gun20GaugeFactory.get20GaugeWitherConfig().setToFire(3)); + + configSet.put(NUKE_NORMAL, GunFatmanFactory.getNukeConfig()); + configSet.put(NUKE_PROTO, GunFatmanFactory.getNukeProtoConfig()); + configSet.put(NUKE_AMAT, GunFatmanFactory.getBalefireConfig()); } public static BulletConfiguration pullConfig(int key) { - for(int i = 0; i < configSet.size(); i++) { - - if(configSet.get(i).key == key) - return configSet.get(i).config; - } - - return null;//configSet.get(TEST_CONFIG).config; + return configSet.get(key); } public static int getKey(BulletConfiguration config) { - for(int i = 0; i < configSet.size(); i++) { + for(Entry e : configSet.entrySet()) { - if(configSet.get(i).config == config) - return configSet.get(i).key; + if(e.getValue() == config) + return e.getKey(); } return -1; diff --git a/com/hbm/handler/guncfg/BulletConfigFactory.java b/com/hbm/handler/guncfg/BulletConfigFactory.java index e1e102763..ac2069808 100644 --- a/com/hbm/handler/guncfg/BulletConfigFactory.java +++ b/com/hbm/handler/guncfg/BulletConfigFactory.java @@ -1,7 +1,22 @@ package com.hbm.handler.guncfg; +import java.util.List; + +import com.hbm.entity.projectile.EntityBulletBase; import com.hbm.handler.BulletConfiguration; +import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.items.ModItems; +import com.hbm.lib.Library; +import com.hbm.packet.AuxParticlePacketNT; +import com.hbm.packet.PacketDispatcher; +import com.hbm.potion.HbmPotion; + +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.AxisAlignedBB; public class BulletConfigFactory { @@ -164,5 +179,41 @@ public class BulletConfigFactory { return bullet; } + + public static IBulletImpactBehavior getPhosphorousEffect(final int radius, final int duration) { + + IBulletImpactBehavior impact = new IBulletImpactBehavior() { + + @Override + public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { + + List hit = bullet.worldObj.getEntitiesWithinAABBExcludingEntity(bullet, AxisAlignedBB.getBoundingBox(bullet.posX - radius, bullet.posY - radius, bullet.posZ - radius, bullet.posX + radius, bullet.posY + radius, bullet.posZ + radius)); + + for(Entity e : hit) { + + if(!Library.isObstructed(bullet.worldObj, bullet.posX, bullet.posY, bullet.posZ, e.posX, e.posY + e.getEyeHeight(), e.posZ)) { + e.setFire(5); + + if(e instanceof EntityLivingBase) { + + PotionEffect eff = new PotionEffect(HbmPotion.phosphorus.id, duration, 0, true); + eff.getCurativeItems().clear(); + ((EntityLivingBase)e).addPotionEffect(eff); + } + } + } + + NBTTagCompound data = new NBTTagCompound(); + data.setString("type", "vanillaburst"); + data.setString("mode", "flame"); + data.setInteger("count", 100); + data.setDouble("motion", 0.5D); + + PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, bullet.posX, bullet.posY, bullet.posZ), new TargetPoint(bullet.dimension, bullet.posX, bullet.posY, bullet.posZ, 50)); + } + }; + + return impact; + } } diff --git a/com/hbm/handler/guncfg/Gun44MagnumFactory.java b/com/hbm/handler/guncfg/Gun44MagnumFactory.java index c38890259..4c2a97b7c 100644 --- a/com/hbm/handler/guncfg/Gun44MagnumFactory.java +++ b/com/hbm/handler/guncfg/Gun44MagnumFactory.java @@ -11,10 +11,17 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.interfaces.IBulletHitBehavior; +import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.items.ModItems; +import com.hbm.packet.AuxParticlePacketNT; +import com.hbm.packet.PacketDispatcher; +import com.hbm.potion.HbmPotion; import com.hbm.render.util.RenderScreenOverlay.Crosshair; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraft.entity.Entity; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.PotionEffect; public class Gun44MagnumFactory { @@ -57,6 +64,7 @@ public class Gun44MagnumFactory { config.config.add(BulletConfigSyncingUtil.M44_NORMAL); config.config.add(BulletConfigSyncingUtil.M44_AP); config.config.add(BulletConfigSyncingUtil.M44_DU); + config.config.add(BulletConfigSyncingUtil.M44_PHOSPHORUS); config.config.add(BulletConfigSyncingUtil.M44_STAR); config.config.add(BulletConfigSyncingUtil.M44_ROCKET); @@ -78,6 +86,7 @@ public class Gun44MagnumFactory { config.config.add(BulletConfigSyncingUtil.M44_NORMAL); config.config.add(BulletConfigSyncingUtil.M44_AP); config.config.add(BulletConfigSyncingUtil.M44_DU); + config.config.add(BulletConfigSyncingUtil.M44_PHOSPHORUS); config.config.add(BulletConfigSyncingUtil.M44_STAR); config.config.add(BulletConfigSyncingUtil.M44_ROCKET); @@ -100,6 +109,7 @@ public class Gun44MagnumFactory { config.config.add(BulletConfigSyncingUtil.M44_NORMAL); config.config.add(BulletConfigSyncingUtil.M44_AP); config.config.add(BulletConfigSyncingUtil.M44_DU); + config.config.add(BulletConfigSyncingUtil.M44_PHOSPHORUS); config.config.add(BulletConfigSyncingUtil.M44_STAR); config.config.add(BulletConfigSyncingUtil.M44_ROCKET); @@ -123,6 +133,7 @@ public class Gun44MagnumFactory { config.config.add(BulletConfigSyncingUtil.M44_NORMAL); config.config.add(BulletConfigSyncingUtil.M44_AP); config.config.add(BulletConfigSyncingUtil.M44_DU); + config.config.add(BulletConfigSyncingUtil.M44_PHOSPHORUS); config.config.add(BulletConfigSyncingUtil.M44_STAR); config.config.add(BulletConfigSyncingUtil.M44_ROCKET); @@ -145,6 +156,7 @@ public class Gun44MagnumFactory { config.config.add(BulletConfigSyncingUtil.M44_NORMAL); config.config.add(BulletConfigSyncingUtil.M44_AP); config.config.add(BulletConfigSyncingUtil.M44_DU); + config.config.add(BulletConfigSyncingUtil.M44_PHOSPHORUS); config.config.add(BulletConfigSyncingUtil.M44_STAR); config.config.add(BulletConfigSyncingUtil.M44_PIP); config.config.add(BulletConfigSyncingUtil.M44_BJ); @@ -191,6 +203,40 @@ public class Gun44MagnumFactory { return bullet; } + public static BulletConfiguration getPhosphorusConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); + + bullet.ammo = ModItems.ammo_44_phosphorus; + bullet.dmgMin = 5; + bullet.dmgMax = 7; + bullet.wear = 15; + bullet.incendiary = 5; + bullet.doesPenetrate = false; + + PotionEffect eff = new PotionEffect(HbmPotion.phosphorus.id, 20 * 20, 0, true); + eff.getCurativeItems().clear(); + bullet.effects = new ArrayList(); + bullet.effects.add(new PotionEffect(eff)); + + bullet.bImpact = new IBulletImpactBehavior() { + + @Override + public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { + + NBTTagCompound data = new NBTTagCompound(); + data.setString("type", "vanillaburst"); + data.setString("mode", "flame"); + data.setInteger("count", 15); + data.setDouble("motion", 0.05D); + + PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, bullet.posX, bullet.posY, bullet.posZ), new TargetPoint(bullet.dimension, bullet.posX, bullet.posY, bullet.posZ, 50)); + } + }; + + return bullet; + } + public static BulletConfiguration getNoPipStarConfig() { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); diff --git a/com/hbm/handler/guncfg/Gun4GaugeFactory.java b/com/hbm/handler/guncfg/Gun4GaugeFactory.java index 576d34a41..552965fd4 100644 --- a/com/hbm/handler/guncfg/Gun4GaugeFactory.java +++ b/com/hbm/handler/guncfg/Gun4GaugeFactory.java @@ -61,6 +61,8 @@ public class Gun4GaugeFactory { bullet.ammo = ModItems.ammo_4gauge; bullet.dmgMin = 3; bullet.dmgMax = 6; + bullet.bulletsMin *= 2; + bullet.bulletsMax *= 2; return bullet; } @@ -72,6 +74,8 @@ public class Gun4GaugeFactory { bullet.ammo = ModItems.ammo_4gauge_slug; bullet.dmgMin = 15; bullet.dmgMax = 20; + bullet.bulletsMin *= 2; + bullet.bulletsMax *= 2; bullet.wear = 7; bullet.style = BulletConfiguration.STYLE_NORMAL; diff --git a/com/hbm/handler/guncfg/Gun50BMGFactory.java b/com/hbm/handler/guncfg/Gun50BMGFactory.java index b61314d27..af9bd2530 100644 --- a/com/hbm/handler/guncfg/Gun50BMGFactory.java +++ b/com/hbm/handler/guncfg/Gun50BMGFactory.java @@ -2,12 +2,21 @@ package com.hbm.handler.guncfg; import java.util.ArrayList; +import com.hbm.entity.projectile.EntityBulletBase; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; +import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.items.ModItems; +import com.hbm.packet.AuxParticlePacketNT; +import com.hbm.packet.PacketDispatcher; +import com.hbm.potion.HbmPotion; import com.hbm.render.util.RenderScreenOverlay.Crosshair; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.PotionEffect; + public class Gun50BMGFactory { public static GunConfiguration getCalamityConfig() { @@ -39,6 +48,7 @@ public class Gun50BMGFactory { config.config = new ArrayList(); config.config.add(BulletConfigSyncingUtil.BMG50_NORMAL); config.config.add(BulletConfigSyncingUtil.BMG50_INCENDIARY); + config.config.add(BulletConfigSyncingUtil.BMG50_PHOSPHORUS); config.config.add(BulletConfigSyncingUtil.BMG50_EXPLOSIVE); config.config.add(BulletConfigSyncingUtil.BMG50_DU); config.config.add(BulletConfigSyncingUtil.BMG50_STAR); @@ -74,6 +84,7 @@ public class Gun50BMGFactory { config.config = new ArrayList(); config.config.add(BulletConfigSyncingUtil.BMG50_NORMAL); config.config.add(BulletConfigSyncingUtil.BMG50_INCENDIARY); + config.config.add(BulletConfigSyncingUtil.BMG50_PHOSPHORUS); config.config.add(BulletConfigSyncingUtil.BMG50_EXPLOSIVE); config.config.add(BulletConfigSyncingUtil.BMG50_DU); config.config.add(BulletConfigSyncingUtil.BMG50_STAR); @@ -108,6 +119,41 @@ public class Gun50BMGFactory { return bullet; } + public static BulletConfiguration get50BMGPhosphorusConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); + + bullet.ammo = ModItems.ammo_50bmg_phosphorus; + bullet.spread *= inaccuracy; + bullet.dmgMin = 15; + bullet.dmgMax = 18; + bullet.wear = 15; + bullet.incendiary = 5; + bullet.doesPenetrate = false; + + PotionEffect eff = new PotionEffect(HbmPotion.phosphorus.id, 20 * 20, 0, true); + eff.getCurativeItems().clear(); + bullet.effects = new ArrayList(); + bullet.effects.add(new PotionEffect(eff)); + + bullet.bImpact = new IBulletImpactBehavior() { + + @Override + public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { + + NBTTagCompound data = new NBTTagCompound(); + data.setString("type", "vanillaburst"); + data.setString("mode", "flame"); + data.setInteger("count", 15); + data.setDouble("motion", 0.05D); + + PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, bullet.posX, bullet.posY, bullet.posZ), new TargetPoint(bullet.dimension, bullet.posX, bullet.posY, bullet.posZ, 50)); + } + }; + + return bullet; + } + public static BulletConfiguration get50BMGExplosiveConfig() { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); diff --git a/com/hbm/handler/guncfg/GunGrenadeFactory.java b/com/hbm/handler/guncfg/GunGrenadeFactory.java index dabe9ede7..506c91f48 100644 --- a/com/hbm/handler/guncfg/GunGrenadeFactory.java +++ b/com/hbm/handler/guncfg/GunGrenadeFactory.java @@ -40,6 +40,7 @@ public class GunGrenadeFactory { config.config.add(BulletConfigSyncingUtil.GRENADE_NORMAL); config.config.add(BulletConfigSyncingUtil.GRENADE_HE); config.config.add(BulletConfigSyncingUtil.GRENADE_INCENDIARY); + config.config.add(BulletConfigSyncingUtil.GRENADE_PHOSPHORUS); config.config.add(BulletConfigSyncingUtil.GRENADE_CHEMICAL); config.config.add(BulletConfigSyncingUtil.GRENADE_CONCUSSION); config.config.add(BulletConfigSyncingUtil.GRENADE_FINNED); @@ -94,6 +95,23 @@ public class GunGrenadeFactory { return bullet; } + public static BulletConfiguration getGrenadePhosphorusConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); + + bullet.ammo = ModItems.ammo_grenade_phosphorus; + bullet.velocity = 2.0F; + bullet.dmgMin = 15; + bullet.dmgMax = 15; + bullet.wear = 15; + bullet.trail = 0; + bullet.incendiary = 2; + + bullet.bImpact = BulletConfigFactory.getPhosphorousEffect(10, 60 * 20); + + return bullet; + } + public static BulletConfiguration getGrenadeChlorineConfig() { BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); diff --git a/com/hbm/handler/guncfg/GunRocketFactory.java b/com/hbm/handler/guncfg/GunRocketFactory.java index 7eca84df1..8525b9c75 100644 --- a/com/hbm/handler/guncfg/GunRocketFactory.java +++ b/com/hbm/handler/guncfg/GunRocketFactory.java @@ -46,6 +46,7 @@ public class GunRocketFactory { config.config.add(BulletConfigSyncingUtil.ROCKET_NORMAL); config.config.add(BulletConfigSyncingUtil.ROCKET_HE); config.config.add(BulletConfigSyncingUtil.ROCKET_INCENDIARY); + config.config.add(BulletConfigSyncingUtil.ROCKET_PHOSPHORUS); config.config.add(BulletConfigSyncingUtil.ROCKET_SHRAPNEL); config.config.add(BulletConfigSyncingUtil.ROCKET_EMP); config.config.add(BulletConfigSyncingUtil.ROCKET_GLARE); @@ -263,5 +264,22 @@ public class GunRocketFactory { return bullet; } + + public static BulletConfiguration getRocketPhosphorusConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); + + bullet.ammo = ModItems.ammo_rocket_phosphorus; + bullet.dmgMin = 10; + bullet.dmgMax = 15; + bullet.wear = 15; + bullet.explosive = 4F; + bullet.incendiary = 5; + bullet.trail = 9; + + bullet.bImpact = BulletConfigFactory.getPhosphorousEffect(10, 60 * 20); + + return bullet; + } } diff --git a/com/hbm/interfaces/IBulletImpactBehavior.java b/com/hbm/interfaces/IBulletImpactBehavior.java index cc92dbee2..30c067d79 100644 --- a/com/hbm/interfaces/IBulletImpactBehavior.java +++ b/com/hbm/interfaces/IBulletImpactBehavior.java @@ -5,6 +5,7 @@ import com.hbm.entity.projectile.EntityBulletBase; public interface IBulletImpactBehavior { //block is hit, bullet dies + //also called when an entity is hit but with -1 coords, so beware public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z); } diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index e85a8b849..0565c2de5 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -204,13 +204,13 @@ public class MachineRecipes { new ItemStack(ModItems.powder_beryllium, 1), new ItemStack(ModItems.powder_emerald, 1), new ItemStack(Blocks.gravel, 1) }; ItemStack[] redstone = new ItemStack[] { new ItemStack(Items.redstone, 3), - new ItemStack(Items.redstone, 3), new ItemStack(ModItems.powder_lithium_tiny, 1), + new ItemStack(Items.redstone, 3), new ItemStack(ModItems.nugget_mercury, 1), new ItemStack(Blocks.gravel, 1) }; ItemStack[] tikite = new ItemStack[] { new ItemStack(ModItems.powder_plutonium, 2), new ItemStack(ModItems.powder_cobalt, 2), new ItemStack(ModItems.powder_nitan_mix, 1), new ItemStack(Blocks.end_stone, 1) }; ItemStack[] lapis = new ItemStack[] { new ItemStack(ModItems.powder_lapis, 3), - new ItemStack(ModItems.powder_lapis, 3), new ItemStack(ModItems.powder_cobalt, 1), + new ItemStack(ModItems.powder_lapis, 3), new ItemStack(ModItems.powder_cobalt_tiny, 1), new ItemStack(Blocks.gravel, 1) }; ItemStack[] starmetal = new ItemStack[] { new ItemStack(ModItems.powder_dura_steel, 3), new ItemStack(ModItems.powder_astatine, 1), new ItemStack(ModItems.powder_cobalt, 2), @@ -374,6 +374,15 @@ public class MachineRecipes { return euphCluster; } + if (item.getItem() == Item.getItemFromBlock(ModBlocks.ore_nether_fire)) { + return new ItemStack[] { + new ItemStack(Items.blaze_powder), + new ItemStack(Items.blaze_powder), + new ItemStack(ModItems.ingot_phosphorus), + new ItemStack(Blocks.netherrack), + }; + } + return null; } @@ -1236,6 +1245,7 @@ public class MachineRecipes { fuels.add(new ItemStack(ModItems.powder_lignite)); fuels.add(new ItemStack(ModItems.briquette_lignite)); fuels.add(new ItemStack(ModItems.coke)); + fuels.add(new ItemStack(ModItems.solid_fuel)); fuels.add(new ItemStack(ModItems.powder_coal)); return fuels; } @@ -1246,30 +1256,6 @@ public class MachineRecipes { recipes.put(new ItemStack(Item.getItemFromBlock(ModBlocks.test_render)), getCentrifugeOutput(new ItemStack(ModBlocks.test_render))); } - //recipes.put(new ItemStack(ModItems.rod_uranium_fuel_depleted), - // getCentrifugeOutput(new ItemStack(ModItems.rod_uranium_fuel_depleted))); - //recipes.put(new ItemStack(ModItems.rod_dual_uranium_fuel_depleted), - // getCentrifugeOutput(new ItemStack(ModItems.rod_dual_uranium_fuel_depleted))); - //recipes.put(new ItemStack(ModItems.rod_quad_uranium_fuel_depleted), - // getCentrifugeOutput(new ItemStack(ModItems.rod_quad_uranium_fuel_depleted))); - //recipes.put(new ItemStack(ModItems.rod_plutonium_fuel_depleted), - // getCentrifugeOutput(new ItemStack(ModItems.rod_plutonium_fuel_depleted))); - //recipes.put(new ItemStack(ModItems.rod_dual_plutonium_fuel_depleted), - // getCentrifugeOutput(new ItemStack(ModItems.rod_dual_plutonium_fuel_depleted))); - //recipes.put(new ItemStack(ModItems.rod_quad_plutonium_fuel_depleted), - // getCentrifugeOutput(new ItemStack(ModItems.rod_quad_plutonium_fuel_depleted))); - //recipes.put(new ItemStack(ModItems.rod_mox_fuel_depleted), - // getCentrifugeOutput(new ItemStack(ModItems.rod_mox_fuel_depleted))); - //recipes.put(new ItemStack(ModItems.rod_dual_mox_fuel_depleted), - // getCentrifugeOutput(new ItemStack(ModItems.rod_dual_mox_fuel_depleted))); - //recipes.put(new ItemStack(ModItems.rod_quad_mox_fuel_depleted), - // getCentrifugeOutput(new ItemStack(ModItems.rod_quad_mox_fuel_depleted))); - //recipes.put(new ItemStack(ModItems.rod_schrabidium_fuel_depleted), - // getCentrifugeOutput(new ItemStack(ModItems.rod_schrabidium_fuel_depleted))); - //recipes.put(new ItemStack(ModItems.rod_dual_schrabidium_fuel_depleted), - // getCentrifugeOutput(new ItemStack(ModItems.rod_dual_schrabidium_fuel_depleted))); - //recipes.put(new ItemStack(ModItems.rod_quad_schrabidium_fuel_depleted), - // getCentrifugeOutput(new ItemStack(ModItems.rod_quad_schrabidium_fuel_depleted))); recipes.put(new ItemStack(ModItems.powder_cloud), getCentrifugeOutput(new ItemStack(ModItems.powder_cloud))); recipes.put(new ItemStack(Blocks.coal_ore), @@ -1326,6 +1312,8 @@ public class MachineRecipes { getCentrifugeOutput(new ItemStack(ModBlocks.ore_meteor_starmetal))); recipes.put(new ItemStack(ModBlocks.block_euphemium_cluster), getCentrifugeOutput(new ItemStack(ModBlocks.block_euphemium_cluster))); + recipes.put(new ItemStack(ModBlocks.ore_nether_fire), + getCentrifugeOutput(new ItemStack(ModBlocks.ore_nether_fire))); return recipes; } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 0bb13237c..7eb8a5f5a 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -70,6 +70,7 @@ public class ModItems { public static Item ingot_pu240; public static Item ingot_neptunium; public static Item ingot_titanium; + public static Item ingot_cobalt; public static Item sulfur; public static Item coke; @@ -105,6 +106,7 @@ public class ModItems { public static Item ingot_combine_steel; public static Item ingot_solinium; public static Item nugget_solinium; + public static Item ingot_phosphorus; public static Item ingot_australium; public static Item ingot_weidanium; @@ -131,6 +133,8 @@ public class ModItems { public static Item ingot_saturnite; public static Item plate_saturnite; public static Item ingot_electronium; + public static Item nugget_mercury; + public static Item bottle_mercury; public static Item nugget_th232; public static Item nugget_uranium; @@ -1061,6 +1065,7 @@ public class ModItems { public static Item ammo_44; public static Item ammo_44_ap; public static Item ammo_44_du; + public static Item ammo_44_phosphorus; public static Item ammo_44_star; public static Item ammo_44_pip; public static Item ammo_44_bj; @@ -1082,6 +1087,7 @@ public class ModItems { public static Item ammo_50ae_star; public static Item ammo_50bmg; public static Item ammo_50bmg_incendiary; + public static Item ammo_50bmg_phosphorus; public static Item ammo_50bmg_explosive; public static Item ammo_50bmg_du; public static Item ammo_50bmg_star; @@ -1091,6 +1097,7 @@ public class ModItems { public static Item ammo_rocket; public static Item ammo_rocket_he; public static Item ammo_rocket_incendiary; + public static Item ammo_rocket_phosphorus; public static Item ammo_rocket_shrapnel; public static Item ammo_rocket_emp; public static Item ammo_rocket_glare; @@ -1101,6 +1108,7 @@ public class ModItems { public static Item ammo_grenade; public static Item ammo_grenade_he; public static Item ammo_grenade_incendiary; + public static Item ammo_grenade_phosphorus; public static Item ammo_grenade_toxic; public static Item ammo_grenade_concussion; public static Item ammo_grenade_finned; @@ -1843,29 +1851,30 @@ public class ModItems { test_nuke_tier2_target = new Item().setUnlocalizedName("test_nuke_tier2_target").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_tier2_target"); ingot_th232 = new Item().setUnlocalizedName("ingot_th232").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_th232"); - ingot_uranium = new ItemRadioactive().setUnlocalizedName("ingot_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_uranium"); - ingot_u233 = new ItemRadioactive().setUnlocalizedName("ingot_u233").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_u233"); - ingot_u235 = new ItemRadioactive().setUnlocalizedName("ingot_u235").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_u235"); - ingot_u238 = new ItemRadioactive().setUnlocalizedName("ingot_u238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_u238"); + ingot_uranium = new ItemRadioactive(0.5F).setUnlocalizedName("ingot_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_uranium"); + ingot_u233 = new ItemRadioactive(5F).setUnlocalizedName("ingot_u233").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_u233"); + ingot_u235 = new ItemRadioactive(5F).setUnlocalizedName("ingot_u235").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_u235"); + ingot_u238 = new ItemRadioactive(0.5F).setUnlocalizedName("ingot_u238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_u238"); ingot_u238m2 = new ItemUnstable(350, 200).setUnlocalizedName("ingot_u238m2").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ingot_u238m2"); - ingot_plutonium = new ItemRadioactive().setUnlocalizedName("ingot_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_plutonium"); - ingot_pu238 = new ItemRadioactive().setUnlocalizedName("ingot_pu238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu238"); - ingot_pu239 = new ItemRadioactive().setUnlocalizedName("ingot_pu239").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu239"); - ingot_pu240 = new ItemRadioactive().setUnlocalizedName("ingot_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu240"); - ingot_neptunium = new ItemRadioactive().setUnlocalizedName("ingot_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_neptunium"); + ingot_plutonium = new ItemRadioactive(2.5F).setUnlocalizedName("ingot_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_plutonium"); + ingot_pu238 = new ItemRadioactive(2.5F).setUnlocalizedName("ingot_pu238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu238"); + ingot_pu239 = new ItemRadioactive(5F).setUnlocalizedName("ingot_pu239").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu239"); + ingot_pu240 = new ItemRadioactive(5F).setUnlocalizedName("ingot_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu240"); + ingot_neptunium = new ItemRadioactive(2.5F).setUnlocalizedName("ingot_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_neptunium"); ingot_titanium = new Item().setUnlocalizedName("ingot_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_titanium"); + ingot_cobalt = new Item().setUnlocalizedName("ingot_cobalt").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_cobalt"); sulfur = new Item().setUnlocalizedName("sulfur").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":sulfur"); - ingot_uranium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_uranium_fuel"); - ingot_plutonium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_plutonium_fuel"); - ingot_mox_fuel = new ItemRadioactive().setUnlocalizedName("ingot_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_mox_fuel"); - ingot_schrabidium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidium_fuel"); - ingot_thorium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_thorium_fuel"); - nugget_uranium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_uranium_fuel"); - nugget_thorium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_thorium_fuel"); - nugget_plutonium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_plutonium_fuel"); - nugget_mox_fuel = new ItemRadioactive().setUnlocalizedName("nugget_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_mox_fuel"); - nugget_schrabidium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_schrabidium_fuel"); + ingot_uranium_fuel = new ItemRadioactive(3.5F).setUnlocalizedName("ingot_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_uranium_fuel"); + ingot_plutonium_fuel = new ItemRadioactive(3.5F).setUnlocalizedName("ingot_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_plutonium_fuel"); + ingot_mox_fuel = new ItemRadioactive(3.5F).setUnlocalizedName("ingot_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_mox_fuel"); + ingot_schrabidium_fuel = new ItemRadioactive(5F).setUnlocalizedName("ingot_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidium_fuel"); + ingot_thorium_fuel = new ItemRadioactive(0.5F).setUnlocalizedName("ingot_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_thorium_fuel"); + nugget_uranium_fuel = new ItemRadioactive(1F).setUnlocalizedName("nugget_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_uranium_fuel"); + nugget_thorium_fuel = new ItemRadioactive(0.025F).setUnlocalizedName("nugget_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_thorium_fuel"); + nugget_plutonium_fuel = new ItemRadioactive(1F).setUnlocalizedName("nugget_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_plutonium_fuel"); + nugget_mox_fuel = new ItemRadioactive(1F).setUnlocalizedName("nugget_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_mox_fuel"); + nugget_schrabidium_fuel = new ItemRadioactive(7.5F).setUnlocalizedName("nugget_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_schrabidium_fuel"); ingot_advanced_alloy = new Item().setUnlocalizedName("ingot_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_advanced_alloy"); niter = new Item().setUnlocalizedName("niter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":salpeter"); @@ -1880,12 +1889,13 @@ public class ModItems { plate_iron = new Item().setUnlocalizedName("plate_iron").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_iron"); ingot_lead = new Item().setUnlocalizedName("ingot_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_lead"); plate_lead = new Item().setUnlocalizedName("plate_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_lead"); - ingot_schrabidium = new ItemRadioactive().setUnlocalizedName("ingot_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidium"); - plate_schrabidium = new ItemRadioactive().setUnlocalizedName("plate_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_schrabidium"); + ingot_schrabidium = new ItemRadioactive(7.5F, false, true).setUnlocalizedName("ingot_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidium"); + plate_schrabidium = new ItemRadioactive(7.5F, false, true).setUnlocalizedName("plate_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_schrabidium"); plate_copper = new Item().setUnlocalizedName("plate_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_copper"); plate_gold = new Item().setUnlocalizedName("plate_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_gold"); plate_advanced_alloy = new Item().setUnlocalizedName("plate_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_advanced_alloy"); lithium = new Item().setUnlocalizedName("lithium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":lithium"); + ingot_phosphorus = new ItemRadioactive(0F, true).setUnlocalizedName("ingot_phosphorus").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_phosphorus"); wire_advanced_alloy = new Item().setUnlocalizedName("wire_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_advanced_alloy"); coil_advanced_alloy = new Item().setUnlocalizedName("coil_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_advanced_alloy"); coil_advanced_torus = new Item().setUnlocalizedName("coil_advanced_torus").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_advanced_torus"); @@ -1905,8 +1915,8 @@ public class ModItems { plate_kevlar = new Item().setUnlocalizedName("plate_kevlar").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_kevlar"); plate_dineutronium = new Item().setUnlocalizedName("plate_dineutronium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_dineutronium"); plate_desh = new Item().setUnlocalizedName("plate_desh").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_desh"); - ingot_solinium = new ItemRadioactive().setUnlocalizedName("ingot_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_solinium"); - nugget_solinium = new ItemRadioactive().setUnlocalizedName("nugget_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_solinium"); + ingot_solinium = new ItemRadioactive(7.5F, false, true).setUnlocalizedName("ingot_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_solinium"); + nugget_solinium = new ItemRadioactive(2.5F, false, true).setUnlocalizedName("nugget_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_solinium"); photo_panel = new Item().setUnlocalizedName("photo_panel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":photo_panel"); sat_base = new Item().setUnlocalizedName("sat_base").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":sat_base"); thruster_nuclear = new Item().setUnlocalizedName("thruster_nuclear").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":thruster_nuclear"); @@ -1924,6 +1934,8 @@ public class ModItems { ingot_fiberglass = new ItemCustomLore().setUnlocalizedName("ingot_fiberglass").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_fiberglass"); ingot_asbestos = new ItemCustomLore().setUnlocalizedName("ingot_asbestos").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_asbestos"); ingot_electronium = new ItemCustomLore().setUnlocalizedName("ingot_electronium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_electronium"); + nugget_mercury = new ItemCustomLore().setUnlocalizedName("nugget_mercury").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_mercury"); + bottle_mercury = new ItemCustomLore().setUnlocalizedName("bottle_mercury").setContainerItem(Items.glass_bottle).setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":bottle_mercury"); ingot_lanthanium = new ItemCustomLore().setUnlocalizedName("ingot_lanthanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_lanthanium"); ingot_actinium = new ItemCustomLore().setUnlocalizedName("ingot_actinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_actinium"); @@ -1949,37 +1961,37 @@ public class ModItems { nugget_verticium = new ItemCustomLore().setUnlocalizedName("nugget_verticium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_verticium"); nugget_th232 = new Item().setUnlocalizedName("nugget_th232").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_th232"); - nugget_uranium = new ItemRadioactive().setUnlocalizedName("nugget_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_uranium"); - nugget_u233 = new ItemRadioactive().setUnlocalizedName("nugget_u233").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_u233"); - nugget_u235 = new ItemRadioactive().setUnlocalizedName("nugget_u235").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_u235"); - nugget_u238 = new ItemRadioactive().setUnlocalizedName("nugget_u238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_u238"); - nugget_plutonium = new ItemRadioactive().setUnlocalizedName("nugget_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_plutonium"); - nugget_pu238 = new ItemRadioactive().setUnlocalizedName("nugget_pu238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu238"); - nugget_pu239 = new ItemRadioactive().setUnlocalizedName("nugget_pu239").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu239"); - nugget_pu240 = new ItemRadioactive().setUnlocalizedName("nugget_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu240"); - nugget_neptunium = new ItemRadioactive().setUnlocalizedName("nugget_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_neptunium"); + nugget_uranium = new ItemRadioactive(0.25F).setUnlocalizedName("nugget_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_uranium"); + nugget_u233 = new ItemRadioactive(1.5F).setUnlocalizedName("nugget_u233").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_u233"); + nugget_u235 = new ItemRadioactive(1.5F).setUnlocalizedName("nugget_u235").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_u235"); + nugget_u238 = new ItemRadioactive(0.25F).setUnlocalizedName("nugget_u238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_u238"); + nugget_plutonium = new ItemRadioactive(1.5F).setUnlocalizedName("nugget_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_plutonium"); + nugget_pu238 = new ItemRadioactive(0.25F).setUnlocalizedName("nugget_pu238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu238"); + nugget_pu239 = new ItemRadioactive(1.5F).setUnlocalizedName("nugget_pu239").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu239"); + nugget_pu240 = new ItemRadioactive(1.5F).setUnlocalizedName("nugget_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu240"); + nugget_neptunium = new ItemRadioactive(1.5F).setUnlocalizedName("nugget_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_neptunium"); plate_titanium = new Item().setUnlocalizedName("plate_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_titanium"); plate_aluminium = new Item().setUnlocalizedName("plate_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_aluminium"); wire_red_copper = new Item().setUnlocalizedName("wire_red_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_red_copper"); wire_tungsten = new ItemCustomLore().setUnlocalizedName("wire_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_tungsten"); neutron_reflector = new Item().setUnlocalizedName("neutron_reflector").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":neutron_reflector"); nugget_lead = new Item().setUnlocalizedName("nugget_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_lead"); - nugget_schrabidium = new ItemRadioactive().setUnlocalizedName("nugget_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_schrabidium"); + nugget_schrabidium = new ItemRadioactive(2.5F, false, true).setUnlocalizedName("nugget_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_schrabidium"); nugget_beryllium = new Item().setUnlocalizedName("nugget_beryllium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_beryllium"); hazmat_cloth = new Item().setUnlocalizedName("hazmat_cloth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":hazmat_cloth"); hazmat_cloth_red = new Item().setUnlocalizedName("hazmat_cloth_red").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":hazmat_cloth_red"); hazmat_cloth_grey = new Item().setUnlocalizedName("hazmat_cloth_grey").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":hazmat_cloth_grey"); asbestos_cloth = new Item().setUnlocalizedName("asbestos_cloth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":asbestos_cloth"); filter_coal = new Item().setUnlocalizedName("filter_coal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":filter_coal"); - ingot_hes = new ItemRadioactive().setUnlocalizedName("ingot_hes").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_hes"); - ingot_les = new ItemRadioactive().setUnlocalizedName("ingot_les").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_les"); - nugget_hes = new ItemRadioactive().setUnlocalizedName("nugget_hes").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_hes"); - nugget_les = new ItemRadioactive().setUnlocalizedName("nugget_les").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_les"); + ingot_hes = new ItemRadioactive(7.5F, false, true).setUnlocalizedName("ingot_hes").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_hes"); + ingot_les = new ItemRadioactive(2.5F, false, true).setUnlocalizedName("ingot_les").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_les"); + nugget_hes = new ItemRadioactive(2.5F, false, true).setUnlocalizedName("nugget_hes").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_hes"); + nugget_les = new ItemRadioactive(0.5F, false, true).setUnlocalizedName("nugget_les").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_les"); plate_combine_steel = new Item().setUnlocalizedName("plate_combine_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_combine_steel"); powder_lead = new Item().setUnlocalizedName("powder_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_lead"); - powder_neptunium = new ItemRadioactive().setUnlocalizedName("powder_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_neptunium"); - powder_schrabidium = new ItemRadioactive().setUnlocalizedName("powder_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_schrabidium"); + powder_neptunium = new ItemRadioactive(2.5F, true).setUnlocalizedName("powder_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_neptunium"); + powder_schrabidium = new ItemRadioactive(7.5F, true, true).setUnlocalizedName("powder_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_schrabidium"); powder_aluminium = new Item().setUnlocalizedName("powder_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_aluminium"); powder_beryllium = new Item().setUnlocalizedName("powder_beryllium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_beryllium"); powder_copper = new Item().setUnlocalizedName("powder_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_copper"); @@ -1987,8 +1999,8 @@ public class ModItems { powder_iron = new Item().setUnlocalizedName("powder_iron").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_iron"); powder_titanium = new Item().setUnlocalizedName("powder_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_titanium"); powder_tungsten = new Item().setUnlocalizedName("powder_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_tungsten"); - powder_uranium = new ItemRadioactive().setUnlocalizedName("powder_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_uranium"); - powder_plutonium = new ItemRadioactive().setUnlocalizedName("powder_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_plutonium"); + powder_uranium = new ItemRadioactive(0.5F, true).setUnlocalizedName("powder_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_uranium"); + powder_plutonium = new ItemRadioactive(2.5F, true).setUnlocalizedName("powder_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_plutonium"); dust = new ItemCustomLore().setUnlocalizedName("dust").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":dust"); powder_advanced_alloy = new Item().setUnlocalizedName("powder_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_advanced_alloy"); powder_coal = new Item().setUnlocalizedName("powder_coal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_coal"); @@ -2038,7 +2050,7 @@ public class ModItems { powder_lanthanium_tiny = new Item().setUnlocalizedName("powder_lanthanium_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_lanthanium_tiny"); powder_actinium_tiny = new Item().setUnlocalizedName("powder_actinium_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_actinium_tiny"); powder_meteorite_tiny = new Item().setUnlocalizedName("powder_meteorite_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_meteorite_tiny"); - powder_yellowcake = new ItemRadioactive().setUnlocalizedName("powder_yellowcake").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_yellowcake"); + powder_yellowcake = new ItemRadioactive(0.5F).setUnlocalizedName("powder_yellowcake").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_yellowcake"); powder_magic = new Item().setUnlocalizedName("powder_magic").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_magic"); powder_cloud = new Item().setUnlocalizedName("powder_cloud").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_cloud"); @@ -2069,7 +2081,7 @@ public class ModItems { wire_aluminium = new Item().setUnlocalizedName("wire_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_aluminium"); wire_copper = new Item().setUnlocalizedName("wire_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_copper"); wire_gold = new Item().setUnlocalizedName("wire_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_gold"); - wire_schrabidium = new ItemRadioactive().setUnlocalizedName("wire_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_schrabidium"); + wire_schrabidium = new ItemRadioactive(0.5F, false, true).setUnlocalizedName("wire_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_schrabidium"); wire_magnetized_tungsten = new Item().setUnlocalizedName("wire_magnetized_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_magnetized_tungsten"); coil_magnetized_tungsten = new Item().setUnlocalizedName("coil_magnetized_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_magnetized_tungsten"); coil_gold = new Item().setUnlocalizedName("coil_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_gold"); @@ -2209,8 +2221,8 @@ public class ModItems { wiring_red_copper = new ItemWiring().setUnlocalizedName("wiring_red_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wiring_red_copper"); - pellet_rtg = new ItemRadioactive().setUnlocalizedName("pellet_rtg").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg"); - pellet_rtg_weak = new ItemRadioactive().setUnlocalizedName("pellet_rtg_weak").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_weak"); + pellet_rtg = new ItemRadioactive(0.25F).setUnlocalizedName("pellet_rtg").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg"); + pellet_rtg_weak = new ItemRadioactive(0.1F).setUnlocalizedName("pellet_rtg_weak").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_weak"); tritium_deuterium_cake = new ItemCustomLore().setUnlocalizedName("tritium_deuterium_cake").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":tritium_deuterium_cake"); piston_selenium = new Item().setUnlocalizedName("piston_selenium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":piston_selenium"); @@ -2247,8 +2259,8 @@ public class ModItems { cell_puf6 = new Item().setUnlocalizedName("cell_puf6").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_puf6"); cell_antimatter = new ItemDrop().setUnlocalizedName("cell_antimatter").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_antimatter"); cell_deuterium = new Item().setUnlocalizedName("cell_deuterium").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_deuterium"); - cell_tritium = new ItemRadioactive().setUnlocalizedName("cell_tritium").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_tritium"); - cell_sas3 = new ItemRadioactive().setUnlocalizedName("cell_sas3").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_sas3"); + cell_tritium = new ItemRadioactive(0.5F).setUnlocalizedName("cell_tritium").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_tritium"); + cell_sas3 = new ItemRadioactive(10F, false, true).setUnlocalizedName("cell_sas3").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_sas3"); cell_anti_schrabidium = new ItemDrop().setUnlocalizedName("cell_anti_schrabidium").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_anti_schrabidium"); singularity = new ItemDrop().setUnlocalizedName("singularity").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity"); singularity_counter_resonant = new ItemDrop().setUnlocalizedName("singularity_counter_resonant").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity_alt"); @@ -2431,18 +2443,18 @@ public class ModItems { rod_empty = new Item().setUnlocalizedName("rod_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_empty"); rod_th232 = new ItemCustomLore().setUnlocalizedName("rod_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_th232"); - rod_uranium = new ItemRadioactive().setUnlocalizedName("rod_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium"); - rod_u233 = new ItemRadioactive().setUnlocalizedName("rod_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u233"); - rod_u235 = new ItemRadioactive().setUnlocalizedName("rod_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u235"); - rod_u238 = new ItemRadioactive().setUnlocalizedName("rod_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u238"); - rod_plutonium = new ItemRadioactive().setUnlocalizedName("rod_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium"); - rod_pu238 = new ItemRadioactive().setUnlocalizedName("rod_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu238"); - rod_pu239 = new ItemRadioactive().setUnlocalizedName("rod_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu239"); - rod_pu240 = new ItemRadioactive().setUnlocalizedName("rod_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu240"); - rod_neptunium = new ItemRadioactive().setUnlocalizedName("rod_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_neptunium"); + rod_uranium = new ItemRadioactive(0.5F).setUnlocalizedName("rod_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium"); + rod_u233 = new ItemRadioactive(5F).setUnlocalizedName("rod_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u233"); + rod_u235 = new ItemRadioactive(5F).setUnlocalizedName("rod_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u235"); + rod_u238 = new ItemRadioactive(0.5F).setUnlocalizedName("rod_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u238"); + rod_plutonium = new ItemRadioactive(5F).setUnlocalizedName("rod_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium"); + rod_pu238 = new ItemRadioactive(0.5F).setUnlocalizedName("rod_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu238"); + rod_pu239 = new ItemRadioactive(5F).setUnlocalizedName("rod_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu239"); + rod_pu240 = new ItemRadioactive(5F).setUnlocalizedName("rod_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu240"); + rod_neptunium = new ItemRadioactive(5F).setUnlocalizedName("rod_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_neptunium"); rod_lead = new Item().setUnlocalizedName("rod_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_lead"); - rod_schrabidium = new ItemRadioactive().setUnlocalizedName("rod_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium"); - rod_solinium = new ItemRadioactive().setUnlocalizedName("rod_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_solinium"); + rod_schrabidium = new ItemRadioactive(7.5F, false, true).setUnlocalizedName("rod_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium"); + rod_solinium = new ItemRadioactive(7.5F, false, true).setUnlocalizedName("rod_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_solinium"); rod_euphemium = new ItemCustomLore().setUnlocalizedName("rod_euphemium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_euphemium"); rod_australium = new ItemCustomLore().setUnlocalizedName("rod_australium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_australium"); rod_weidanium = new ItemCustomLore().setUnlocalizedName("rod_weidanium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_weidanium"); @@ -2453,49 +2465,49 @@ public class ModItems { rod_dual_empty = new Item().setUnlocalizedName("rod_dual_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_dual_empty"); rod_dual_th232 = new ItemCustomLore().setUnlocalizedName("rod_dual_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_th232"); - rod_dual_uranium = new ItemRadioactive().setUnlocalizedName("rod_dual_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium"); - rod_dual_u233 = new ItemRadioactive().setUnlocalizedName("rod_dual_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u233"); - rod_dual_u235 = new ItemRadioactive().setUnlocalizedName("rod_dual_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u235"); - rod_dual_u238 = new ItemRadioactive().setUnlocalizedName("rod_dual_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u238"); - rod_dual_plutonium = new ItemRadioactive().setUnlocalizedName("rod_dual_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium"); - rod_dual_pu238 = new ItemRadioactive().setUnlocalizedName("rod_dual_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu238"); - rod_dual_pu239 = new ItemRadioactive().setUnlocalizedName("rod_dual_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu239"); - rod_dual_pu240 = new ItemRadioactive().setUnlocalizedName("rod_dual_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu240"); - rod_dual_neptunium = new ItemRadioactive().setUnlocalizedName("rod_dual_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_neptunium"); + rod_dual_uranium = new ItemRadioactive(1F).setUnlocalizedName("rod_dual_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium"); + rod_dual_u233 = new ItemRadioactive(10F).setUnlocalizedName("rod_dual_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u233"); + rod_dual_u235 = new ItemRadioactive(10F).setUnlocalizedName("rod_dual_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u235"); + rod_dual_u238 = new ItemRadioactive(1F).setUnlocalizedName("rod_dual_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u238"); + rod_dual_plutonium = new ItemRadioactive(10F).setUnlocalizedName("rod_dual_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium"); + rod_dual_pu238 = new ItemRadioactive(1F).setUnlocalizedName("rod_dual_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu238"); + rod_dual_pu239 = new ItemRadioactive(10F).setUnlocalizedName("rod_dual_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu239"); + rod_dual_pu240 = new ItemRadioactive(10F).setUnlocalizedName("rod_dual_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu240"); + rod_dual_neptunium = new ItemRadioactive(10F).setUnlocalizedName("rod_dual_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_neptunium"); rod_dual_lead = new Item().setUnlocalizedName("rod_dual_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_lead"); - rod_dual_schrabidium = new ItemRadioactive().setUnlocalizedName("rod_dual_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium"); - rod_dual_solinium = new ItemRadioactive().setUnlocalizedName("rod_dual_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_solinium"); + rod_dual_schrabidium = new ItemRadioactive(15F, false, true).setUnlocalizedName("rod_dual_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium"); + rod_dual_solinium = new ItemRadioactive(15F, false, true).setUnlocalizedName("rod_dual_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_solinium"); rod_quad_empty = new Item().setUnlocalizedName("rod_quad_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_quad_empty"); rod_quad_th232 = new ItemCustomLore().setUnlocalizedName("rod_quad_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_th232"); - rod_quad_uranium = new ItemRadioactive().setUnlocalizedName("rod_quad_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium"); - rod_quad_u233 = new ItemRadioactive().setUnlocalizedName("rod_quad_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u233"); - rod_quad_u235 = new ItemRadioactive().setUnlocalizedName("rod_quad_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u235"); - rod_quad_u238 = new ItemRadioactive().setUnlocalizedName("rod_quad_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u238"); - rod_quad_plutonium = new ItemRadioactive().setUnlocalizedName("rod_quad_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium"); - rod_quad_pu238 = new ItemRadioactive().setUnlocalizedName("rod_quad_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu238"); - rod_quad_pu239 = new ItemRadioactive().setUnlocalizedName("rod_quad_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu239"); - rod_quad_pu240 = new ItemRadioactive().setUnlocalizedName("rod_quad_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu240"); - rod_quad_neptunium = new ItemRadioactive().setUnlocalizedName("rod_quad_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_neptunium"); + rod_quad_uranium = new ItemRadioactive(2F).setUnlocalizedName("rod_quad_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium"); + rod_quad_u233 = new ItemRadioactive(20F).setUnlocalizedName("rod_quad_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u233"); + rod_quad_u235 = new ItemRadioactive(20F).setUnlocalizedName("rod_quad_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u235"); + rod_quad_u238 = new ItemRadioactive(2F).setUnlocalizedName("rod_quad_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u238"); + rod_quad_plutonium = new ItemRadioactive(20F).setUnlocalizedName("rod_quad_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium"); + rod_quad_pu238 = new ItemRadioactive(2F).setUnlocalizedName("rod_quad_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu238"); + rod_quad_pu239 = new ItemRadioactive(20F).setUnlocalizedName("rod_quad_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu239"); + rod_quad_pu240 = new ItemRadioactive(20F).setUnlocalizedName("rod_quad_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu240"); + rod_quad_neptunium = new ItemRadioactive(20F).setUnlocalizedName("rod_quad_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_neptunium"); rod_quad_lead = new Item().setUnlocalizedName("rod_quad_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_lead"); - rod_quad_schrabidium = new ItemRadioactive().setUnlocalizedName("rod_quad_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium"); - rod_quad_solinium = new ItemRadioactive().setUnlocalizedName("rod_quad_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_solinium"); + rod_quad_schrabidium = new ItemRadioactive(30F, false, true).setUnlocalizedName("rod_quad_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium"); + rod_quad_solinium = new ItemRadioactive(30F, false, true).setUnlocalizedName("rod_quad_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_solinium"); - rod_thorium_fuel = new ItemFuelRod(100000, 10).setUnlocalizedName("rod_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_thorium_fuel"); - rod_dual_thorium_fuel = new ItemFuelRod(100000, 20).setUnlocalizedName("rod_dual_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_thorium_fuel"); - rod_quad_thorium_fuel = new ItemFuelRod(100000, 40).setUnlocalizedName("rod_quad_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_thorium_fuel"); - rod_uranium_fuel = new ItemFuelRod(100000, 15).setUnlocalizedName("rod_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium_fuel"); - rod_dual_uranium_fuel = new ItemFuelRod(100000, 30).setUnlocalizedName("rod_dual_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium_fuel"); - rod_quad_uranium_fuel = new ItemFuelRod(100000, 60).setUnlocalizedName("rod_quad_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium_fuel"); - rod_plutonium_fuel = new ItemFuelRod(75000, 25).setUnlocalizedName("rod_plutonium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium_fuel"); - rod_dual_plutonium_fuel = new ItemFuelRod(75000, 50).setUnlocalizedName("rod_dual_plutonium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium_fuel"); - rod_quad_plutonium_fuel = new ItemFuelRod(75000, 100).setUnlocalizedName("rod_quad_plutonium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium_fuel"); - rod_mox_fuel = new ItemFuelRod(150000, 10).setUnlocalizedName("rod_mox_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_mox_fuel"); - rod_dual_mox_fuel = new ItemFuelRod(150000, 20).setUnlocalizedName("rod_dual_mox_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_mox_fuel"); - rod_quad_mox_fuel = new ItemFuelRod(150000, 40).setUnlocalizedName("rod_quad_mox_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_mox_fuel"); - rod_schrabidium_fuel = new ItemFuelRod(500000, 250).setUnlocalizedName("rod_schrabidium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium_fuel"); - rod_dual_schrabidium_fuel = new ItemFuelRod(500000, 500).setUnlocalizedName("rod_dual_schrabidium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium_fuel"); - rod_quad_schrabidium_fuel = new ItemFuelRod(500000, 1000).setUnlocalizedName("rod_quad_schrabidium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium_fuel"); + rod_thorium_fuel = new ItemFuelRod(0.5F, false, 100000, 10).setUnlocalizedName("rod_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_thorium_fuel"); + rod_dual_thorium_fuel = new ItemFuelRod(1.5F, false, 100000, 20).setUnlocalizedName("rod_dual_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_thorium_fuel"); + rod_quad_thorium_fuel = new ItemFuelRod(3F, false, 100000, 40).setUnlocalizedName("rod_quad_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_thorium_fuel"); + rod_uranium_fuel = new ItemFuelRod(3.5F, false, 100000, 15).setUnlocalizedName("rod_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium_fuel"); + rod_dual_uranium_fuel = new ItemFuelRod(7F, false, 100000, 30).setUnlocalizedName("rod_dual_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium_fuel"); + rod_quad_uranium_fuel = new ItemFuelRod(10.5F, false, 100000, 60).setUnlocalizedName("rod_quad_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium_fuel"); + rod_plutonium_fuel = new ItemFuelRod(3.5F, false, 75000, 25).setUnlocalizedName("rod_plutonium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium_fuel"); + rod_dual_plutonium_fuel = new ItemFuelRod(7F, false, 75000, 50).setUnlocalizedName("rod_dual_plutonium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium_fuel"); + rod_quad_plutonium_fuel = new ItemFuelRod(10.5F, false, 75000, 100).setUnlocalizedName("rod_quad_plutonium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium_fuel"); + rod_mox_fuel = new ItemFuelRod(3.5F, false, 150000, 10).setUnlocalizedName("rod_mox_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_mox_fuel"); + rod_dual_mox_fuel = new ItemFuelRod(7F, false, 150000, 20).setUnlocalizedName("rod_dual_mox_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_mox_fuel"); + rod_quad_mox_fuel = new ItemFuelRod(10.5F, false, 150000, 40).setUnlocalizedName("rod_quad_mox_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_mox_fuel"); + rod_schrabidium_fuel = new ItemFuelRod(5F, true, 500000, 250).setUnlocalizedName("rod_schrabidium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium_fuel"); + rod_dual_schrabidium_fuel = new ItemFuelRod(10F, true, 500000, 500).setUnlocalizedName("rod_dual_schrabidium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium_fuel"); + rod_quad_schrabidium_fuel = new ItemFuelRod(15F, true, 500000, 1000).setUnlocalizedName("rod_quad_schrabidium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium_fuel"); rod_water = new ItemCustomLore().setUnlocalizedName("rod_water").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_water"); rod_dual_water = new ItemCustomLore().setUnlocalizedName("rod_dual_water").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_water"); @@ -2509,43 +2521,43 @@ public class ModItems { rod_dual_lithium = new ItemCustomLore().setUnlocalizedName("rod_dual_lithium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_lithium"); rod_quad_lithium = new ItemCustomLore().setUnlocalizedName("rod_quad_lithium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_lithium"); - rod_tritium = new ItemRadioactive().setUnlocalizedName("rod_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_tritium"); - rod_dual_tritium = new ItemRadioactive().setUnlocalizedName("rod_dual_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_tritium"); - rod_quad_tritium = new ItemRadioactive().setUnlocalizedName("rod_quad_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_tritium"); + rod_tritium = new ItemRadioactive(0.5F).setUnlocalizedName("rod_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_tritium"); + rod_dual_tritium = new ItemRadioactive(1F).setUnlocalizedName("rod_dual_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_tritium"); + rod_quad_tritium = new ItemRadioactive(2F).setUnlocalizedName("rod_quad_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_tritium"); - trinitite = new ItemRadioactive().setUnlocalizedName("trinitite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":trinitite_new"); - nuclear_waste = new ItemRadioactive().setUnlocalizedName("nuclear_waste").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste"); - nuclear_waste_tiny = new ItemRadioactive().setUnlocalizedName("nuclear_waste_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_tiny"); - waste_uranium = new ItemRadioactive().setUnlocalizedName("waste_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium"); - waste_thorium = new ItemRadioactive().setUnlocalizedName("waste_thorium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium"); - waste_plutonium = new ItemRadioactive().setUnlocalizedName("waste_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium"); - waste_mox = new ItemRadioactive().setUnlocalizedName("waste_mox").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox"); - waste_schrabidium = new ItemRadioactive().setUnlocalizedName("waste_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium"); - waste_uranium_hot = new ItemRadioactive().setUnlocalizedName("waste_uranium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium_hot"); - waste_thorium_hot = new ItemRadioactive().setUnlocalizedName("waste_thorium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium_hot"); - waste_plutonium_hot = new ItemRadioactive().setUnlocalizedName("waste_plutonium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium_hot"); - waste_mox_hot = new ItemRadioactive().setUnlocalizedName("waste_mox_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox_hot"); - waste_schrabidium_hot = new ItemRadioactive().setUnlocalizedName("waste_schrabidium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium_hot"); + trinitite = new ItemRadioactive(5F).setUnlocalizedName("trinitite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":trinitite_new"); + nuclear_waste = new ItemRadioactive(15F).setUnlocalizedName("nuclear_waste").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste"); + nuclear_waste_tiny = new ItemRadioactive(2F).setUnlocalizedName("nuclear_waste_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_tiny"); + waste_uranium = new ItemRadioactive(15F).setUnlocalizedName("waste_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium"); + waste_thorium = new ItemRadioactive(10F).setUnlocalizedName("waste_thorium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium"); + waste_plutonium = new ItemRadioactive(15F).setUnlocalizedName("waste_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium"); + waste_mox = new ItemRadioactive(15F).setUnlocalizedName("waste_mox").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox"); + waste_schrabidium = new ItemRadioactive(40F, false, true).setUnlocalizedName("waste_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium"); + waste_uranium_hot = new ItemRadioactive(15F, true).setUnlocalizedName("waste_uranium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_uranium_hot"); + waste_thorium_hot = new ItemRadioactive(10F, true).setUnlocalizedName("waste_thorium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_thorium_hot"); + waste_plutonium_hot = new ItemRadioactive(15F, true).setUnlocalizedName("waste_plutonium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plutonium_hot"); + waste_mox_hot = new ItemRadioactive(15F, true).setUnlocalizedName("waste_mox_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_mox_hot"); + waste_schrabidium_hot = new ItemRadioactive(40F, true, true).setUnlocalizedName("waste_schrabidium_hot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_schrabidium_hot"); scrap = new Item().setUnlocalizedName("scrap").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":scrap"); containment_box = new ItemLeadBox().setUnlocalizedName("containment_box").setCreativeTab(null).setTextureName(RefStrings.MODID + ":containment_box"); - rod_thorium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_thorium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_thorium_fuel_depleted"); - rod_dual_thorium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_dual_thorium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_thorium_fuel_depleted"); - rod_quad_thorium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_quad_thorium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_thorium_fuel_depleted"); - rod_uranium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium_fuel_depleted"); - rod_dual_uranium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_dual_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium_fuel_depleted"); - rod_quad_uranium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_quad_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium_fuel_depleted"); - rod_plutonium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_plutonium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium_fuel_depleted"); - rod_dual_plutonium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_dual_plutonium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium_fuel_depleted"); - rod_quad_plutonium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_quad_plutonium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium_fuel_depleted"); - rod_mox_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_mox_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_mox_fuel_depleted"); - rod_dual_mox_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_dual_mox_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_mox_fuel_depleted"); - rod_quad_mox_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_quad_mox_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_mox_fuel_depleted"); - rod_schrabidium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_schrabidium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium_fuel_depleted"); - rod_dual_schrabidium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_dual_schrabidium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium_fuel_depleted"); - rod_quad_schrabidium_fuel_depleted = new ItemRadioactive().setUnlocalizedName("rod_quad_schrabidium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium_fuel_depleted"); - rod_waste = new ItemRadioactive().setUnlocalizedName("rod_waste").setMaxStackSize(1).setCreativeTab(null).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_waste"); - rod_dual_waste = new ItemRadioactive().setUnlocalizedName("rod_dual_waste").setMaxStackSize(1).setCreativeTab(null).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_waste"); - rod_quad_waste = new ItemRadioactive().setUnlocalizedName("rod_quad_waste").setMaxStackSize(1).setCreativeTab(null).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_waste"); + rod_thorium_fuel_depleted = new ItemRadioactive(10F, true).setUnlocalizedName("rod_thorium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_thorium_fuel_depleted"); + rod_dual_thorium_fuel_depleted = new ItemRadioactive(20F, true).setUnlocalizedName("rod_dual_thorium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_thorium_fuel_depleted"); + rod_quad_thorium_fuel_depleted = new ItemRadioactive(40F, true).setUnlocalizedName("rod_quad_thorium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_thorium_fuel_depleted"); + rod_uranium_fuel_depleted = new ItemRadioactive(15F, true).setUnlocalizedName("rod_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium_fuel_depleted"); + rod_dual_uranium_fuel_depleted = new ItemRadioactive(30F, true).setUnlocalizedName("rod_dual_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium_fuel_depleted"); + rod_quad_uranium_fuel_depleted = new ItemRadioactive(60F, true).setUnlocalizedName("rod_quad_uranium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium_fuel_depleted"); + rod_plutonium_fuel_depleted = new ItemRadioactive(15F, true).setUnlocalizedName("rod_plutonium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium_fuel_depleted"); + rod_dual_plutonium_fuel_depleted = new ItemRadioactive(30F, true).setUnlocalizedName("rod_dual_plutonium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium_fuel_depleted"); + rod_quad_plutonium_fuel_depleted = new ItemRadioactive(60F, true).setUnlocalizedName("rod_quad_plutonium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium_fuel_depleted"); + rod_mox_fuel_depleted = new ItemRadioactive(15F, true).setUnlocalizedName("rod_mox_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_mox_fuel_depleted"); + rod_dual_mox_fuel_depleted = new ItemRadioactive(30F, true).setUnlocalizedName("rod_dual_mox_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_mox_fuel_depleted"); + rod_quad_mox_fuel_depleted = new ItemRadioactive(60F, true).setUnlocalizedName("rod_quad_mox_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_mox_fuel_depleted"); + rod_schrabidium_fuel_depleted = new ItemRadioactive(40F, true).setUnlocalizedName("rod_schrabidium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium_fuel_depleted"); + rod_dual_schrabidium_fuel_depleted = new ItemRadioactive(80F, true).setUnlocalizedName("rod_dual_schrabidium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium_fuel_depleted"); + rod_quad_schrabidium_fuel_depleted = new ItemRadioactive(160F, true).setUnlocalizedName("rod_quad_schrabidium_fuel_depleted").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium_fuel_depleted"); + rod_waste = new ItemRadioactive(15F).setUnlocalizedName("rod_waste").setMaxStackSize(1).setCreativeTab(null).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_waste"); + rod_dual_waste = new ItemRadioactive(30F).setUnlocalizedName("rod_dual_waste").setMaxStackSize(1).setCreativeTab(null).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_waste"); + rod_quad_waste = new ItemRadioactive(60F).setUnlocalizedName("rod_quad_waste").setMaxStackSize(1).setCreativeTab(null).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_waste"); pellet_cluster = new ItemCustomLore().setUnlocalizedName("pellet_cluster").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellet_cluster"); powder_fire = new ItemCustomLore().setUnlocalizedName("powder_fire").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_fire"); @@ -2559,14 +2571,14 @@ public class ModItems { pellet_buckshot = new Item().setUnlocalizedName("pellet_buckshot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellets_lead"); pellet_flechette = new Item().setUnlocalizedName("pellet_flechette").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellets_flechette"); - pellet_schrabidium = new WatzFuel(50000, 140000, 0.975F, 200, 1.05F, 1.05F).setUnlocalizedName("pellet_schrabidium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_schrabidium").setMaxStackSize(1); - pellet_hes = new WatzFuel(108000, 65000, 1F, 85, 1, 1.025F).setUnlocalizedName("pellet_hes").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_hes").setMaxStackSize(1); - pellet_mes = new WatzFuel(216000, 23000, 1.025F, 50, 1, 1F).setUnlocalizedName("pellet_mes").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_mes").setMaxStackSize(1); - pellet_les = new WatzFuel(432000, 7000, 1.05F, 15, 1, 0.975F).setUnlocalizedName("pellet_les").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_les").setMaxStackSize(1); - pellet_beryllium = new WatzFuel(864000, 50, 1.05F, 0, 0.95F, 1.025F).setUnlocalizedName("pellet_beryllium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_beryllium").setMaxStackSize(1); - pellet_neptunium = new WatzFuel(216000, 3000, 1.1F, 25, 1.1F, 1.005F).setUnlocalizedName("pellet_neptunium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_neptunium").setMaxStackSize(1); - pellet_lead = new WatzFuel(1728000, 0, 0.95F, 0, 0.95F, 0.95F).setUnlocalizedName("pellet_lead").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_lead").setMaxStackSize(1); - pellet_advanced = new WatzFuel(216000, 1000, 1.1F, 0, 0.995F, 0.99F).setUnlocalizedName("pellet_advanced").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_advanced").setMaxStackSize(1); + pellet_schrabidium = new WatzFuel(25F, true, 50000, 140000, 0.975F, 200, 1.05F, 1.05F).setUnlocalizedName("pellet_schrabidium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_schrabidium").setMaxStackSize(1); + pellet_hes = new WatzFuel(20F, true, 108000, 65000, 1F, 85, 1, 1.025F).setUnlocalizedName("pellet_hes").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_hes").setMaxStackSize(1); + pellet_mes = new WatzFuel(15F, true, 216000, 23000, 1.025F, 50, 1, 1F).setUnlocalizedName("pellet_mes").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_mes").setMaxStackSize(1); + pellet_les = new WatzFuel(10F, true, 432000, 7000, 1.05F, 15, 1, 0.975F).setUnlocalizedName("pellet_les").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_les").setMaxStackSize(1); + pellet_beryllium = new WatzFuel(0F, false, 864000, 50, 1.05F, 0, 0.95F, 1.025F).setUnlocalizedName("pellet_beryllium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_beryllium").setMaxStackSize(1); + pellet_neptunium = new WatzFuel(10F, false, 216000, 3000, 1.1F, 25, 1.1F, 1.005F).setUnlocalizedName("pellet_neptunium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_neptunium").setMaxStackSize(1); + pellet_lead = new WatzFuel(0F, false, 1728000, 0, 0.95F, 0, 0.95F, 0.95F).setUnlocalizedName("pellet_lead").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_lead").setMaxStackSize(1); + pellet_advanced = new WatzFuel(0F, false, 216000, 1000, 1.1F, 0, 0.995F, 0.99F).setUnlocalizedName("pellet_advanced").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_advanced").setMaxStackSize(1); designator = new ItemDesingator().setUnlocalizedName("designator").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":designator"); designator_range = new ItemDesingatorRange().setUnlocalizedName("designator_range").setFull3D().setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":designator_range_alt"); @@ -2792,6 +2804,7 @@ public class ModItems { ammo_50ae_star = new ItemAmmo().setUnlocalizedName("ammo_50ae_star").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50ae_star"); ammo_50bmg = new ItemAmmo().setUnlocalizedName("ammo_50bmg").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg"); ammo_50bmg_incendiary = new ItemAmmo().setUnlocalizedName("ammo_50bmg_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_incendiary"); + ammo_50bmg_phosphorus = new ItemAmmo().setUnlocalizedName("ammo_50bmg_phosphorus").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_phosphorus"); ammo_50bmg_explosive = new ItemAmmo().setUnlocalizedName("ammo_50bmg_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_explosive"); ammo_50bmg_du = new ItemAmmo().setUnlocalizedName("ammo_50bmg_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_du"); ammo_50bmg_star = new ItemAmmo().setUnlocalizedName("ammo_50bmg_star").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_star"); @@ -2799,6 +2812,7 @@ public class ModItems { ammo_44 = new ItemAmmo().setUnlocalizedName("ammo_44").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44"); ammo_44_ap = new ItemAmmo().setUnlocalizedName("ammo_44_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_ap"); ammo_44_du = new ItemAmmo().setUnlocalizedName("ammo_44_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_du"); + ammo_44_phosphorus = new ItemAmmo().setUnlocalizedName("ammo_44_phosphorus").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_phosphorus"); ammo_44_star = new ItemAmmo().setUnlocalizedName("ammo_44_star").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_star"); ammo_44_pip = new ItemAmmo().setUnlocalizedName("ammo_44_pip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_pip"); ammo_44_bj = new ItemAmmo().setUnlocalizedName("ammo_44_bj").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_bj"); @@ -2812,6 +2826,7 @@ public class ModItems { ammo_rocket = new ItemAmmo().setUnlocalizedName("ammo_rocket").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket"); ammo_rocket_he = new ItemAmmo().setUnlocalizedName("ammo_rocket_he").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_he"); ammo_rocket_incendiary = new ItemAmmo().setUnlocalizedName("ammo_rocket_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_incendiary"); + ammo_rocket_phosphorus = new ItemAmmo().setUnlocalizedName("ammo_rocket_phosphorus").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_phosphorus"); ammo_rocket_shrapnel = new ItemAmmo().setUnlocalizedName("ammo_rocket_shrapnel").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_shrapnel"); ammo_rocket_emp = new ItemAmmo().setUnlocalizedName("ammo_rocket_emp").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_emp"); ammo_rocket_glare = new ItemAmmo().setUnlocalizedName("ammo_rocket_glare").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_glare"); @@ -2822,6 +2837,7 @@ public class ModItems { ammo_grenade = new ItemAmmo().setUnlocalizedName("ammo_grenade").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade"); ammo_grenade_he = new ItemAmmo().setUnlocalizedName("ammo_grenade_he").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade_he"); ammo_grenade_incendiary = new ItemAmmo().setUnlocalizedName("ammo_grenade_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade_incendiary"); + ammo_grenade_phosphorus = new ItemAmmo().setUnlocalizedName("ammo_grenade_phosphorus").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade_phosphorus"); ammo_grenade_toxic = new ItemAmmo().setUnlocalizedName("ammo_grenade_toxic").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade_toxic"); ammo_grenade_concussion = new ItemAmmo().setUnlocalizedName("ammo_grenade_concussion").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade_concussion"); ammo_grenade_finned = new ItemAmmo().setUnlocalizedName("ammo_grenade_finned").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade_finned"); @@ -2846,7 +2862,7 @@ public class ModItems { gun_revolver_gold = new ItemGunBase(Gun357MagnumFactory.getRevolverGoldConfig()).setUnlocalizedName("gun_revolver_gold").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_gold"); gun_revolver_lead_ammo = new Item().setUnlocalizedName("gun_revolver_lead_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_lead_ammo"); gun_revolver_lead = new ItemGunBase(Gun357MagnumFactory.getRevolverLeadConfig()).setUnlocalizedName("gun_revolver_lead").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_lead"); - gun_revolver_schrabidium_ammo = new ItemRadioactive().setUnlocalizedName("gun_revolver_schrabidium_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_schrabidium_ammo"); + gun_revolver_schrabidium_ammo = new ItemRadioactive(1.5F).setUnlocalizedName("gun_revolver_schrabidium_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_schrabidium_ammo"); gun_revolver_schrabidium = new ItemGunBase(Gun357MagnumFactory.getRevolverSchrabidiumConfig()).setUnlocalizedName("gun_revolver_schrabidium").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_schrabidium"); gun_revolver_cursed_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_cursed_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_cursed_ammo"); gun_revolver_cursed = new ItemGunBase(Gun357MagnumFactory.getRevolverCursedConfig()).setUnlocalizedName("gun_revolver_cursed").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_cursed"); @@ -3009,34 +3025,34 @@ public class ModItems { flame_opinion = new ItemCustomLore().setUnlocalizedName("flame_opinion").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":flame_opinion"); gadget_explosive = new Item().setUnlocalizedName("gadget_explosive").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_explosive"); - gadget_explosive8 = new ItemGadget().setUnlocalizedName("gadget_explosive8").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_explosive8"); - gadget_wireing = new ItemGadget().setUnlocalizedName("gadget_wireing").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_wireing"); - gadget_core = new ItemGadget().setUnlocalizedName("gadget_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_core"); + gadget_explosive8 = new ItemGadget(0F).setUnlocalizedName("gadget_explosive8").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_explosive8"); + gadget_wireing = new ItemGadget(0F).setUnlocalizedName("gadget_wireing").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_wireing"); + gadget_core = new ItemGadget(5F).setUnlocalizedName("gadget_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_core"); - boy_igniter = new ItemBoy().setUnlocalizedName("boy_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_igniter"); - boy_propellant = new ItemBoy().setUnlocalizedName("boy_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_propellant"); - boy_bullet = new ItemBoy().setUnlocalizedName("boy_bullet").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_bullet"); - boy_target = new ItemBoy().setUnlocalizedName("boy_target").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_target"); - boy_shielding = new ItemBoy().setUnlocalizedName("boy_shielding").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_shielding"); + boy_igniter = new ItemBoy(0F).setUnlocalizedName("boy_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_igniter"); + boy_propellant = new ItemBoy(0F).setUnlocalizedName("boy_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_propellant"); + boy_bullet = new ItemBoy(1.5F).setUnlocalizedName("boy_bullet").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_bullet"); + boy_target = new ItemBoy(5.0F).setUnlocalizedName("boy_target").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_target"); + boy_shielding = new ItemBoy(0F).setUnlocalizedName("boy_shielding").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_shielding"); man_explosive = new Item().setUnlocalizedName("man_explosive").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_explosive"); - man_explosive8 = new ItemManMike().setUnlocalizedName("man_explosive8").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_explosive8"); + man_explosive8 = new ItemManMike(0F).setUnlocalizedName("man_explosive8").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_explosive8"); man_igniter = new ItemMan().setUnlocalizedName("man_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_igniter"); - man_core = new ItemManMike().setUnlocalizedName("man_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_core"); + man_core = new ItemManMike(5.0F).setUnlocalizedName("man_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_core"); - mike_core = new ItemMike().setUnlocalizedName("mike_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":mike_core"); - mike_deut = new ItemMike().setUnlocalizedName("mike_deut").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setContainerItem(ModItems.tank_steel).setTextureName(RefStrings.MODID + ":mike_deut"); - mike_cooling_unit = new ItemMike().setUnlocalizedName("mike_cooling_unit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":mike_cooling_unit"); + mike_core = new ItemMike(2.5F).setUnlocalizedName("mike_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":mike_core"); + mike_deut = new ItemMike(0F).setUnlocalizedName("mike_deut").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setContainerItem(ModItems.tank_steel).setTextureName(RefStrings.MODID + ":mike_deut"); + mike_cooling_unit = new ItemMike(0F).setUnlocalizedName("mike_cooling_unit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":mike_cooling_unit"); - tsar_core = new ItemTsar().setUnlocalizedName("tsar_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":tsar_core"); + tsar_core = new ItemTsar(10F).setUnlocalizedName("tsar_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":tsar_core"); - fleija_igniter = new ItemFleija().setUnlocalizedName("fleija_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":fleija_igniter"); - fleija_propellant = new ItemFleija().setUnlocalizedName("fleija_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":fleija_propellant"); - fleija_core = new ItemFleija().setUnlocalizedName("fleija_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":fleija_core"); + fleija_igniter = new ItemFleija(0F, false).setUnlocalizedName("fleija_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":fleija_igniter"); + fleija_propellant = new ItemFleija(15F, true).setUnlocalizedName("fleija_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":fleija_propellant"); + fleija_core = new ItemFleija(10F, false).setUnlocalizedName("fleija_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":fleija_core"); - solinium_igniter = new ItemSolinium().setUnlocalizedName("solinium_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_igniter"); - solinium_propellant = new ItemSolinium().setUnlocalizedName("solinium_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_propellant"); - solinium_core = new ItemSolinium().setUnlocalizedName("solinium_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_core"); + solinium_igniter = new ItemSolinium(0F, false).setUnlocalizedName("solinium_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_igniter"); + solinium_propellant = new ItemSolinium(0F, false).setUnlocalizedName("solinium_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_propellant"); + solinium_core = new ItemSolinium(15F, true).setUnlocalizedName("solinium_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":solinium_core"); n2_charge = new ItemN2().setUnlocalizedName("n2_charge").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":n2_charge"); @@ -3282,40 +3298,40 @@ public class ModItems { chainsaw = new ModAxe(MainRegistry.enumToolMaterialChainsaw).setUnlocalizedName("chainsaw").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":chainsaw"); - schrabidium_helmet = new ArmorSchrabidium(MainRegistry.enumArmorMaterialSchrabidium, 7, 0).setUnlocalizedName("schrabidium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_helmet"); - schrabidium_plate = new ArmorSchrabidium(MainRegistry.enumArmorMaterialSchrabidium, 7, 1).setUnlocalizedName("schrabidium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_plate"); - schrabidium_legs = new ArmorSchrabidium(MainRegistry.enumArmorMaterialSchrabidium, 7, 2).setUnlocalizedName("schrabidium_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_legs"); - schrabidium_boots = new ArmorSchrabidium(MainRegistry.enumArmorMaterialSchrabidium, 7, 3).setUnlocalizedName("schrabidium_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_boots"); - titanium_helmet = new ModArmor(MainRegistry.enumArmorMaterialTitanium, 7, 0).setUnlocalizedName("titanium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_helmet"); - titanium_plate = new ModArmor(MainRegistry.enumArmorMaterialTitanium, 7, 1).setUnlocalizedName("titanium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_plate"); - titanium_legs = new ModArmor(MainRegistry.enumArmorMaterialTitanium, 7, 2).setUnlocalizedName("titanium_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_legs"); - titanium_boots = new ModArmor(MainRegistry.enumArmorMaterialTitanium, 7, 3).setUnlocalizedName("titanium_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_boots"); - steel_helmet = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 0).setUnlocalizedName("steel_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steel_helmet"); - steel_plate = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 1).setUnlocalizedName("steel_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steel_plate"); - steel_legs = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 2).setUnlocalizedName("steel_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steel_legs"); - steel_boots = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 3).setUnlocalizedName("steel_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steel_boots"); - alloy_helmet = new ModArmor(MainRegistry.enumArmorMaterialAlloy, 7, 0).setUnlocalizedName("alloy_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":alloy_helmet"); - alloy_plate = new ModArmor(MainRegistry.enumArmorMaterialAlloy, 7, 1).setUnlocalizedName("alloy_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":alloy_plate"); - alloy_legs = new ModArmor(MainRegistry.enumArmorMaterialAlloy, 7, 2).setUnlocalizedName("alloy_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":alloy_legs"); - alloy_boots = new ModArmor(MainRegistry.enumArmorMaterialAlloy, 7, 3).setUnlocalizedName("alloy_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":alloy_boots"); - cmb_helmet = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 0).setUnlocalizedName("cmb_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cmb_helmet"); - cmb_plate = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 1).setUnlocalizedName("cmb_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cmb_plate"); - cmb_legs = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 2).setUnlocalizedName("cmb_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cmb_legs"); - cmb_boots = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 3).setUnlocalizedName("cmb_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cmb_boots"); - paa_plate = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 1).setUnlocalizedName("paa_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":paa_plate"); - paa_legs = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 2).setUnlocalizedName("paa_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":paa_legs"); - paa_boots = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 3).setUnlocalizedName("paa_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":paa_boots"); - asbestos_helmet = new ArmorAsbestos(MainRegistry.enumArmorMaterialSteel, 7, 0).setUnlocalizedName("asbestos_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":asbestos_helmet"); - asbestos_plate = new ArmorAsbestos(MainRegistry.enumArmorMaterialSteel, 7, 1).setUnlocalizedName("asbestos_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":asbestos_plate"); - asbestos_legs = new ArmorAsbestos(MainRegistry.enumArmorMaterialSteel, 7, 2).setUnlocalizedName("asbestos_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":asbestos_legs"); - asbestos_boots = new ArmorAsbestos(MainRegistry.enumArmorMaterialSteel, 7, 3).setUnlocalizedName("asbestos_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":asbestos_boots"); - security_helmet = new ModArmor(MainRegistry.enumArmorMaterialSecurity, 7, 0).setUnlocalizedName("security_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":security_helmet"); - security_plate = new ModArmor(MainRegistry.enumArmorMaterialSecurity, 7, 1).setUnlocalizedName("security_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":security_plate"); - security_legs = new ModArmor(MainRegistry.enumArmorMaterialSecurity, 7, 2).setUnlocalizedName("security_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":security_legs"); - security_boots = new ModArmor(MainRegistry.enumArmorMaterialSecurity, 7, 3).setUnlocalizedName("security_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":security_boots"); + schrabidium_helmet = new ArmorFSB(MainRegistry.enumArmorMaterialSchrabidium, 7, 0, RefStrings.MODID + ":textures/armor/schrabidium_1.png").setCap(4F).setMod(0.1F).setUnlocalizedName("schrabidium_helmet").setTextureName(RefStrings.MODID + ":schrabidium_helmet"); + schrabidium_plate = new ArmorFSB(MainRegistry.enumArmorMaterialSchrabidium, 7, 1, RefStrings.MODID + ":textures/armor/schrabidium_1.png").cloneStats((ArmorFSB) schrabidium_helmet).setUnlocalizedName("schrabidium_plate").setTextureName(RefStrings.MODID + ":schrabidium_plate"); + schrabidium_legs = new ArmorFSB(MainRegistry.enumArmorMaterialSchrabidium, 7, 2, RefStrings.MODID + ":textures/armor/schrabidium_2.png").cloneStats((ArmorFSB) schrabidium_helmet).setCap(4F).setMod(0.1F).setUnlocalizedName("schrabidium_legs").setTextureName(RefStrings.MODID + ":schrabidium_legs"); + schrabidium_boots = new ArmorFSB(MainRegistry.enumArmorMaterialSchrabidium, 7, 3, RefStrings.MODID + ":textures/armor/schrabidium_1.png").cloneStats((ArmorFSB) schrabidium_helmet).setCap(4F).setMod(0.1F).setUnlocalizedName("schrabidium_boots").setTextureName(RefStrings.MODID + ":schrabidium_boots"); + titanium_helmet = new ArmorFSB(MainRegistry.enumArmorMaterialTitanium, 7, 0, RefStrings.MODID + ":textures/armor/titanium_1.png").setMod(0.75F).setUnlocalizedName("titanium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_helmet"); + titanium_plate = new ArmorFSB(MainRegistry.enumArmorMaterialTitanium, 7, 1, RefStrings.MODID + ":textures/armor/titanium_1.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_plate"); + titanium_legs = new ArmorFSB(MainRegistry.enumArmorMaterialTitanium, 7, 2, RefStrings.MODID + ":textures/armor/titanium_2.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_legs"); + titanium_boots = new ArmorFSB(MainRegistry.enumArmorMaterialTitanium, 7, 3, RefStrings.MODID + ":textures/armor/titanium_1.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_boots").setTextureName(RefStrings.MODID + ":titanium_boots"); + steel_helmet = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 0).setUnlocalizedName("steel_helmet").setTextureName(RefStrings.MODID + ":steel_helmet"); + steel_plate = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 1).setUnlocalizedName("steel_plate").setTextureName(RefStrings.MODID + ":steel_plate"); + steel_legs = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 2).setUnlocalizedName("steel_legs").setTextureName(RefStrings.MODID + ":steel_legs"); + steel_boots = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 3).setUnlocalizedName("steel_boots").setTextureName(RefStrings.MODID + ":steel_boots"); + alloy_helmet = new ModArmor(MainRegistry.enumArmorMaterialAlloy, 7, 0).setUnlocalizedName("alloy_helmet").setTextureName(RefStrings.MODID + ":alloy_helmet"); + alloy_plate = new ModArmor(MainRegistry.enumArmorMaterialAlloy, 7, 1).setUnlocalizedName("alloy_plate").setTextureName(RefStrings.MODID + ":alloy_plate"); + alloy_legs = new ModArmor(MainRegistry.enumArmorMaterialAlloy, 7, 2).setUnlocalizedName("alloy_legs").setTextureName(RefStrings.MODID + ":alloy_legs"); + alloy_boots = new ModArmor(MainRegistry.enumArmorMaterialAlloy, 7, 3).setUnlocalizedName("alloy_boots").setTextureName(RefStrings.MODID + ":alloy_boots"); + cmb_helmet = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 0).setUnlocalizedName("cmb_helmet").setTextureName(RefStrings.MODID + ":cmb_helmet"); + cmb_plate = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 1).setUnlocalizedName("cmb_plate").setTextureName(RefStrings.MODID + ":cmb_plate"); + cmb_legs = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 2).setUnlocalizedName("cmb_legs").setTextureName(RefStrings.MODID + ":cmb_legs"); + cmb_boots = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 3).setUnlocalizedName("cmb_boots").setTextureName(RefStrings.MODID + ":cmb_boots"); + paa_plate = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 1).setUnlocalizedName("paa_plate").setTextureName(RefStrings.MODID + ":paa_plate"); + paa_legs = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 2).setUnlocalizedName("paa_legs").setTextureName(RefStrings.MODID + ":paa_legs"); + paa_boots = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 3).setUnlocalizedName("paa_boots").setTextureName(RefStrings.MODID + ":paa_boots"); + asbestos_helmet = new ArmorFSB(MainRegistry.enumArmorMaterialAsbestos, 7, 0, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setOverlay(RefStrings.MODID + ":textures/misc/overlay_asbestos.png").setUnlocalizedName("asbestos_helmet").setTextureName(RefStrings.MODID + ":asbestos_helmet"); + asbestos_plate = new ArmorFSB(MainRegistry.enumArmorMaterialAsbestos, 7, 1, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setUnlocalizedName("asbestos_plate").setTextureName(RefStrings.MODID + ":asbestos_plate"); + asbestos_legs = new ArmorFSB(MainRegistry.enumArmorMaterialAsbestos, 7, 2, RefStrings.MODID + ":textures/armor/asbestos_2.png").setFireproof(true).setUnlocalizedName("asbestos_legs").setTextureName(RefStrings.MODID + ":asbestos_legs"); + asbestos_boots = new ArmorFSB(MainRegistry.enumArmorMaterialAsbestos, 7, 3, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setUnlocalizedName("asbestos_boots").setTextureName(RefStrings.MODID + ":asbestos_boots"); + security_helmet = new ModArmor(MainRegistry.enumArmorMaterialSecurity, 7, 0).setUnlocalizedName("security_helmet").setTextureName(RefStrings.MODID + ":security_helmet"); + security_plate = new ModArmor(MainRegistry.enumArmorMaterialSecurity, 7, 1).setUnlocalizedName("security_plate").setTextureName(RefStrings.MODID + ":security_plate"); + security_legs = new ModArmor(MainRegistry.enumArmorMaterialSecurity, 7, 2).setUnlocalizedName("security_legs").setTextureName(RefStrings.MODID + ":security_legs"); + security_boots = new ModArmor(MainRegistry.enumArmorMaterialSecurity, 7, 3).setUnlocalizedName("security_boots").setTextureName(RefStrings.MODID + ":security_boots"); - jackt = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 1).setUnlocalizedName("jackt").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jackt"); - jackt2 = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 1).setUnlocalizedName("jackt2").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jackt2"); + jackt = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 1).setUnlocalizedName("jackt").setTextureName(RefStrings.MODID + ":jackt"); + jackt2 = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 1).setUnlocalizedName("jackt2").setTextureName(RefStrings.MODID + ":jackt2"); schrabidium_sword = new SwordSchrabidium(MainRegistry.enumToolMaterialSchrabidium).setUnlocalizedName("schrabidium_sword").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_sword"); schrabidium_pickaxe = new PickaxeSchrabidium(MainRegistry.enumToolMaterialSchrabidium).setUnlocalizedName("schrabidium_pickaxe").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_pickaxe"); @@ -3613,6 +3629,7 @@ public class ModItems { GameRegistry.registerItem(ingot_steel, ingot_steel.getUnlocalizedName()); GameRegistry.registerItem(ingot_lead, ingot_lead.getUnlocalizedName()); GameRegistry.registerItem(ingot_beryllium, ingot_beryllium.getUnlocalizedName()); + GameRegistry.registerItem(ingot_cobalt, ingot_cobalt.getUnlocalizedName()); GameRegistry.registerItem(ingot_dura_steel, ingot_dura_steel.getUnlocalizedName()); GameRegistry.registerItem(ingot_polymer, ingot_polymer.getUnlocalizedName()); GameRegistry.registerItem(ingot_schrabidium, ingot_schrabidium.getUnlocalizedName()); @@ -3642,11 +3659,14 @@ public class ModItems { GameRegistry.registerItem(ingot_electronium, ingot_electronium.getUnlocalizedName()); //Dusts & Other + GameRegistry.registerItem(ingot_phosphorus, ingot_phosphorus.getUnlocalizedName()); GameRegistry.registerItem(lithium, lithium.getUnlocalizedName()); GameRegistry.registerItem(solid_fuel, solid_fuel.getUnlocalizedName()); GameRegistry.registerItem(rocket_fuel, rocket_fuel.getUnlocalizedName()); GameRegistry.registerItem(ingot_fiberglass, ingot_fiberglass.getUnlocalizedName()); GameRegistry.registerItem(ingot_asbestos, ingot_asbestos.getUnlocalizedName()); + GameRegistry.registerItem(nugget_mercury, nugget_mercury.getUnlocalizedName()); + GameRegistry.registerItem(bottle_mercury, bottle_mercury.getUnlocalizedName()); GameRegistry.registerItem(coke, coke.getUnlocalizedName()); GameRegistry.registerItem(lignite, lignite.getUnlocalizedName()); GameRegistry.registerItem(briquette_lignite, briquette_lignite.getUnlocalizedName()); @@ -4756,6 +4776,7 @@ public class ModItems { GameRegistry.registerItem(ammo_44, ammo_44.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_ap, ammo_44_ap.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_du, ammo_44_du.getUnlocalizedName()); + GameRegistry.registerItem(ammo_44_phosphorus, ammo_44_phosphorus.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_star, ammo_44_star.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_pip, ammo_44_pip.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_bj, ammo_44_bj.getUnlocalizedName()); @@ -4777,12 +4798,14 @@ public class ModItems { GameRegistry.registerItem(ammo_50ae_star, ammo_50ae_star.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg, ammo_50bmg.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg_incendiary, ammo_50bmg_incendiary.getUnlocalizedName()); + GameRegistry.registerItem(ammo_50bmg_phosphorus, ammo_50bmg_phosphorus.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg_explosive, ammo_50bmg_explosive.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg_du, ammo_50bmg_du.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg_star, ammo_50bmg_star.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket, ammo_rocket.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket_he, ammo_rocket_he.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket_incendiary, ammo_rocket_incendiary.getUnlocalizedName()); + GameRegistry.registerItem(ammo_rocket_phosphorus, ammo_rocket_phosphorus.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket_shrapnel, ammo_rocket_shrapnel.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket_emp, ammo_rocket_emp.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket_glare, ammo_rocket_glare.getUnlocalizedName()); @@ -4793,6 +4816,7 @@ public class ModItems { GameRegistry.registerItem(ammo_grenade, ammo_grenade.getUnlocalizedName()); GameRegistry.registerItem(ammo_grenade_he, ammo_grenade_he.getUnlocalizedName()); GameRegistry.registerItem(ammo_grenade_incendiary, ammo_grenade_incendiary.getUnlocalizedName()); + GameRegistry.registerItem(ammo_grenade_phosphorus, ammo_grenade_phosphorus.getUnlocalizedName()); GameRegistry.registerItem(ammo_grenade_toxic, ammo_grenade_toxic.getUnlocalizedName()); GameRegistry.registerItem(ammo_grenade_concussion, ammo_grenade_concussion.getUnlocalizedName()); GameRegistry.registerItem(ammo_grenade_finned, ammo_grenade_finned.getUnlocalizedName()); diff --git a/com/hbm/items/block/ItemBlockLore.java b/com/hbm/items/block/ItemBlockLore.java index 05f5773b9..1420fcbc6 100644 --- a/com/hbm/items/block/ItemBlockLore.java +++ b/com/hbm/items/block/ItemBlockLore.java @@ -56,6 +56,11 @@ public class ItemBlockLore extends ItemBlock { list.add("You weren't supposed to mine that."); list.add("Come on, get a derrick you doofus."); } + + if(this.field_150939_a == ModBlocks.block_lithium) { + list.add("It's not my fault you didn't pay"); + list.add("attention in chemistry class."); + } } @Override diff --git a/com/hbm/items/bomb/ItemBoy.java b/com/hbm/items/bomb/ItemBoy.java index 4ad96fd3c..83b8efd52 100644 --- a/com/hbm/items/bomb/ItemBoy.java +++ b/com/hbm/items/bomb/ItemBoy.java @@ -9,11 +9,16 @@ import net.minecraft.item.ItemStack; public class ItemBoy extends ItemRadioactive { + public ItemBoy(float radiation) { + super(radiation); + } + @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { list.add("Used in:"); list.add("Little Boy"); + super.addInformation(itemstack, player, list, bool); } } diff --git a/com/hbm/items/bomb/ItemFleija.java b/com/hbm/items/bomb/ItemFleija.java index 8b4376e8f..5a94d56f8 100644 --- a/com/hbm/items/bomb/ItemFleija.java +++ b/com/hbm/items/bomb/ItemFleija.java @@ -11,11 +11,16 @@ import net.minecraft.item.ItemStack; public class ItemFleija extends ItemRadioactive { + public ItemFleija(float radiation, boolean blinding) { + super(radiation, false, blinding); + } + @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { list.add("Used in:"); list.add("F.L.E.I.J.A."); + super.addInformation(itemstack, player, list, bool); } @Override diff --git a/com/hbm/items/bomb/ItemGadget.java b/com/hbm/items/bomb/ItemGadget.java index db4e71028..272a654ef 100644 --- a/com/hbm/items/bomb/ItemGadget.java +++ b/com/hbm/items/bomb/ItemGadget.java @@ -9,11 +9,16 @@ import net.minecraft.item.ItemStack; public class ItemGadget extends ItemRadioactive { + public ItemGadget(float radiation) { + super(radiation); + } + @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { list.add("Used in:"); list.add("The Gadget"); + super.addInformation(itemstack, player, list, bool); } } diff --git a/com/hbm/items/bomb/ItemMan.java b/com/hbm/items/bomb/ItemMan.java index c458c1b50..1d51867a8 100644 --- a/com/hbm/items/bomb/ItemMan.java +++ b/com/hbm/items/bomb/ItemMan.java @@ -13,6 +13,7 @@ public class ItemMan extends Item { { list.add("Used in:"); list.add("Fat Man"); + super.addInformation(itemstack, player, list, bool); } } diff --git a/com/hbm/items/bomb/ItemManMike.java b/com/hbm/items/bomb/ItemManMike.java index d83ddb257..abebe78ae 100644 --- a/com/hbm/items/bomb/ItemManMike.java +++ b/com/hbm/items/bomb/ItemManMike.java @@ -9,6 +9,10 @@ import net.minecraft.item.ItemStack; public class ItemManMike extends ItemRadioactive { + public ItemManMike(float radiation) { + super(radiation); + } + @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { @@ -16,6 +20,7 @@ public class ItemManMike extends ItemRadioactive { list.add("Fat Man"); list.add("Ivy Mike"); list.add("Tsar Bomba"); + super.addInformation(itemstack, player, list, bool); } } diff --git a/com/hbm/items/bomb/ItemMike.java b/com/hbm/items/bomb/ItemMike.java index 3581f1ade..202f74db2 100644 --- a/com/hbm/items/bomb/ItemMike.java +++ b/com/hbm/items/bomb/ItemMike.java @@ -9,6 +9,11 @@ import net.minecraft.item.ItemStack; public class ItemMike extends ItemRadioactive { + public ItemMike(float radiation) { + super(radiation); + // TODO Auto-generated constructor stub + } + @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { diff --git a/com/hbm/items/bomb/ItemSolinium.java b/com/hbm/items/bomb/ItemSolinium.java index 5e536920a..652162bf8 100644 --- a/com/hbm/items/bomb/ItemSolinium.java +++ b/com/hbm/items/bomb/ItemSolinium.java @@ -9,10 +9,15 @@ import net.minecraft.item.ItemStack; public class ItemSolinium extends ItemRadioactive { + public ItemSolinium(float radiation, boolean blinding) { + super(radiation, false, blinding); + } + @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { list.add("Used in:"); list.add("Solinium Bomb"); + super.addInformation(itemstack, player, list, bool); } } diff --git a/com/hbm/items/bomb/ItemTsar.java b/com/hbm/items/bomb/ItemTsar.java index 26fd2bac4..118d4f722 100644 --- a/com/hbm/items/bomb/ItemTsar.java +++ b/com/hbm/items/bomb/ItemTsar.java @@ -9,11 +9,16 @@ import net.minecraft.item.ItemStack; public class ItemTsar extends ItemRadioactive { + public ItemTsar(float radiation) { + super(radiation); + } + @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { list.add("Used in:"); list.add("Tsar Bomba"); + super.addInformation(itemstack, player, list, bool); } } diff --git a/com/hbm/items/gear/ArmorFSB.java b/com/hbm/items/gear/ArmorFSB.java new file mode 100644 index 000000000..0132b4f2b --- /dev/null +++ b/com/hbm/items/gear/ArmorFSB.java @@ -0,0 +1,151 @@ +package com.hbm.items.gear; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map.Entry; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; + +//Armor with full set bonus +public class ArmorFSB extends ItemArmor { + + private String texture = ""; + private ResourceLocation overlay = null; + public List effects = new ArrayList(); + public HashMap resistance = new HashMap(); + public float blastProtection = -1; + public float damageCap = -1; + public float damageMod = -1; + public boolean fireproof = false; + + public ArmorFSB(ArmorMaterial material, int layer, int slot, String texture) { + super(material, layer, slot); + this.texture = texture; + } + + public ArmorFSB addEffect(PotionEffect effect) { + effects.add(effect); + return this; + } + + public ArmorFSB addResistance(String damage, float mod) { + resistance.put(damage, mod); + return this; + } + + public ArmorFSB setCap(float cap) { + this.damageCap = cap; + return this; + } + + public ArmorFSB setMod(float mod) { + this.damageMod = mod; + return this; + } + + public ArmorFSB setFireproof(boolean fire) { + this.fireproof = fire; + return this; + } + + public ArmorFSB setOverlay(String path) { + this.overlay = new ResourceLocation(path); + return this; + } + + public ArmorFSB cloneStats(ArmorFSB original) { + + //lists aren't being modified after instantiation, so there's no need to dereference + this.effects = original.effects; + this.resistance = original.resistance; + this.damageCap = original.damageCap; + this.damageMod = original.damageMod; + this.fireproof = original.fireproof; + //overlay doesn't need to be copied because it's helmet exclusive + return this; + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String layer) { + return texture; + } + + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { + + list.add(EnumChatFormatting.GOLD + "Full set bonus:"); + + if(!effects.isEmpty()) { + + for(PotionEffect effect : effects) { + list.add(" " + I18n.format(Potion.potionTypes[effect.getPotionID()].getName())); + } + } + + if(!resistance.isEmpty()) { + + for(Entry struct : resistance.entrySet()) { + list.add(" Damage modifier of " + struct.getValue() + " against " + I18n.format(struct.getKey())); + } + } + + if(blastProtection != -1) { + + list.add(" Damage modifier of " + blastProtection + " against explosions"); + } + + if(damageCap != -1) { + list.add(" Hard damage cap of " + damageCap); + } + + if(damageMod != -1) { + list.add(" General damage modifier of " + damageMod); + } + + if(fireproof) { + list.add(" Fireproof"); + } + } + + @SideOnly(Side.CLIENT) + public void renderHelmetOverlay(ItemStack stack, EntityPlayer player, ScaledResolution resolution, float partialTicks, boolean hasScreen, int mouseX, int mouseY){ + + if(overlay == null) + return; + + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDepthMask(false); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glDisable(GL11.GL_ALPHA_TEST); + Minecraft.getMinecraft().getTextureManager().bindTexture(overlay); + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(0.0D, (double)resolution.getScaledHeight(), -90.0D, 0.0D, 1.0D); + tessellator.addVertexWithUV((double)resolution.getScaledWidth(), (double)resolution.getScaledHeight(), -90.0D, 1.0D, 1.0D); + tessellator.addVertexWithUV((double)resolution.getScaledWidth(), 0.0D, -90.0D, 1.0D, 0.0D); + tessellator.addVertexWithUV(0.0D, 0.0D, -90.0D, 0.0D, 0.0D); + tessellator.draw(); + GL11.glDepthMask(true); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + } +} diff --git a/com/hbm/items/special/ItemFuelRod.java b/com/hbm/items/special/ItemFuelRod.java index 8dc6bb214..da11b8a6d 100644 --- a/com/hbm/items/special/ItemFuelRod.java +++ b/com/hbm/items/special/ItemFuelRod.java @@ -11,7 +11,8 @@ public class ItemFuelRod extends ItemRadioactive { public int lifeTime; public int heat; - public ItemFuelRod(int life, int heat) { + public ItemFuelRod(float radiation, boolean blinding, int life, int heat) { + super(radiation, false, blinding); this.lifeTime = life; this.heat = heat; this.setMaxDamage(100); diff --git a/com/hbm/items/special/ItemRadioactive.java b/com/hbm/items/special/ItemRadioactive.java index 2659c6f1c..3e98ca044 100644 --- a/com/hbm/items/special/ItemRadioactive.java +++ b/com/hbm/items/special/ItemRadioactive.java @@ -2,7 +2,6 @@ package com.hbm.items.special; import java.util.List; -import com.hbm.items.ModItems; import com.hbm.lib.Library; import net.minecraft.entity.Entity; @@ -16,6 +15,25 @@ import net.minecraft.world.World; public class ItemRadioactive extends ItemCustomLore { + float radiation; + boolean fire; + boolean blinding; + + public ItemRadioactive(float radiation) { + this.radiation = radiation; + } + + public ItemRadioactive(float radiation, boolean fire) { + this.radiation = radiation; + this.fire = fire; + } + + public ItemRadioactive(float radiation, boolean fire, boolean blinding) { + this.radiation = radiation; + this.fire = fire; + this.blinding = blinding; + } + @Override public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean b) { @@ -23,249 +41,17 @@ public class ItemRadioactive extends ItemCustomLore { } public void doRadiationDamage(Entity entity, float mod) { - - //Ultra Deadly: Watz Fuel - //Strong: U235, Pu239, Pu240, all fuels except Schrabidium - //Medium: Plutonium, Neptunium, Pu238, RTG Pellet - //Weak: Uranium, U238 - //Incendiary: All radioactive powders - //Schrabidic: All Schrabidium related materials if (entity instanceof EntityLivingBase) { - - EntityLivingBase living = (EntityLivingBase)entity; - - //Ultra Deadly - if (this == ModItems.pellet_hes || - this == ModItems.pellet_les || - this == ModItems.pellet_mes || - this == ModItems.pellet_neptunium || - this == ModItems.pellet_schrabidium) { - //Library.applyRadiation(living, 80, 24, 60, 19); - Library.applyRadData(living, 50F/20F * mod); - } - - //Strong + if(this.radiation > 0) + Library.applyRadData(entity, this.radiation / 20F); - if (this == ModItems.ingot_u233 || - this == ModItems.ingot_u235 || - this == ModItems.ingot_pu239 || - this == ModItems.ingot_pu239 || - this == ModItems.ingot_pu240 || - this == ModItems.ingot_uranium_fuel || - this == ModItems.ingot_plutonium_fuel || - this == ModItems.ingot_mox_fuel || - this == ModItems.rod_quad_u233 || - this == ModItems.rod_dual_u233 || - this == ModItems.rod_quad_u235 || - this == ModItems.rod_dual_u235 || - this == ModItems.rod_quad_pu239 || - this == ModItems.rod_dual_pu239 || - this == ModItems.rod_quad_pu240 || - this == ModItems.rod_dual_pu240 || - this == ModItems.rod_quad_uranium_fuel || - this == ModItems.rod_dual_uranium_fuel || - this == ModItems.rod_quad_plutonium_fuel || - this == ModItems.rod_dual_plutonium_fuel || - this == ModItems.rod_quad_mox_fuel || - this == ModItems.rod_dual_mox_fuel || - this == ModItems.rod_quad_uranium_fuel_depleted || - this == ModItems.rod_dual_uranium_fuel_depleted || - this == ModItems.rod_quad_plutonium_fuel_depleted || - this == ModItems.rod_dual_plutonium_fuel_depleted || - this == ModItems.rod_quad_mox_fuel_depleted || - this == ModItems.rod_dual_mox_fuel_depleted || - this == ModItems.boy_bullet || - this == ModItems.boy_target || - this == ModItems.gadget_core || - this == ModItems.man_core || - this == ModItems.nuclear_waste || - this == ModItems.waste_uranium || - this == ModItems.waste_plutonium || - this == ModItems.waste_mox || - this == ModItems.waste_schrabidium) { - //Library.applyRadiation(living, 60, 19, 40, 14); - Library.applyRadData(living, 5F/20F * mod); - } - - //Strong Fire + if(this.fire) + entity.setFire(5); - if (this == ModItems.waste_uranium_hot || - this == ModItems.waste_plutonium_hot || - this == ModItems.waste_mox_hot || - this == ModItems.waste_schrabidium_hot) { - //Library.applyRadiation(living, 60, 19, 40, 14); - Library.applyRadData(living, 5F/20F * mod); - living.setFire(5); - } - - //Strong Nuggets - - if (this == ModItems.nugget_u233 || - this == ModItems.nugget_u235 || - this == ModItems.nugget_pu239 || - this == ModItems.nugget_pu240 || - this == ModItems.nugget_uranium_fuel || - this == ModItems.nugget_plutonium_fuel || - this == ModItems.nugget_mox_fuel || - this == ModItems.rod_u233 || - this == ModItems.rod_u235 || - this == ModItems.rod_pu239 || - this == ModItems.rod_pu240 || - this == ModItems.rod_uranium_fuel || - this == ModItems.rod_plutonium_fuel || - this == ModItems.rod_mox_fuel || - this == ModItems.rod_uranium_fuel_depleted || - this == ModItems.rod_plutonium_fuel_depleted || - this == ModItems.rod_mox_fuel_depleted || - this == ModItems.ingot_thorium_fuel || - this == ModItems.nuclear_waste_tiny) { - //Library.applyRadiation(living, 45, 19, 30, 14); - Library.applyRadData(living, 3.5F/20F * mod); - } - - //Medium - - if (this == ModItems.ingot_neptunium || - this == ModItems.ingot_pu238 || - this == ModItems.ingot_plutonium || - this == ModItems.pellet_rtg || - this == ModItems.rod_quad_neptunium || - this == ModItems.rod_dual_neptunium || - this == ModItems.rod_quad_pu238 || - this == ModItems.rod_dual_pu238 || - this == ModItems.rod_quad_plutonium || - this == ModItems.rod_dual_plutonium || - this == ModItems.mike_core || - this == ModItems.tsar_core || - this == ModItems.trinitite) { - //Library.applyRadiation(living, 30, 14, 15, 9); - Library.applyRadData(living, 2.5F/20F * mod); - } - - //Medium Nuggets - - if (this == ModItems.nugget_neptunium || - this == ModItems.nugget_pu238 || - this == ModItems.nugget_plutonium || - this == ModItems.rod_neptunium || - this == ModItems.rod_pu238 || - this == ModItems.rod_plutonium || - this == ModItems.pellet_rtg_weak || - this == ModItems.waste_thorium) { - //Library.applyRadiation(living, 20, 14, 5, 9); - Library.applyRadData(living, 1F/20F * mod); - } - - //Weak - - if (this == ModItems.ingot_uranium || - this == ModItems.ingot_u238 || - this == ModItems.rod_quad_uranium || - this == ModItems.rod_dual_uranium || - this == ModItems.rod_quad_u238 || - this == ModItems.rod_dual_u238 || - this == ModItems.rod_quad_pu238 || - this == ModItems.rod_dual_pu238) { - //Library.applyRadiation(living, 20, 4, 5, 0); - Library.applyRadData(living, 0.5F/20F * mod); - } - - //Weak Nuggets - - if (this == ModItems.nugget_uranium || - this == ModItems.nugget_u238 || - this == ModItems.rod_uranium || - this == ModItems.rod_u238 || - this == ModItems.powder_yellowcake) { - //Library.applyRadiation(living, 10, 4, 0, 0); - Library.applyRadData(living, 0.25F/20F * mod); - } - - //Tritium - - if (this == ModItems.cell_tritium || - this == ModItems.rod_tritium || - this == ModItems.rod_dual_tritium || - this == ModItems.rod_quad_tritium || - this == ModItems.nugget_thorium_fuel) { - //Library.applyRadiation(living, 10, 4, 0, 0); - Library.applyRadData(living, 0.75F/20F * mod); - } - - //Powder - - if (this == ModItems.powder_neptunium || - this == ModItems.powder_plutonium) { - //Library.applyRadiation(living, 60, 19, 45, 14); - Library.applyRadData(living, 2F/20F * mod); - - if(living instanceof EntityPlayer && !Library.checkForHazmat((EntityPlayer)living)) - living.setFire(5); - } - - if (this == ModItems.powder_uranium) { - //Library.applyRadiation(living, 20, 4, 0, 0); - Library.applyRadData(living, 1F/20F * mod); - - if(living instanceof EntityPlayer && !Library.checkForHazmat((EntityPlayer)living)) - living.setFire(5); - } - - //Schrabidic - - if (this == ModItems.ingot_schrabidium || - this == ModItems.ingot_solinium || - this == ModItems.ingot_schrabidium_fuel || - this == ModItems.ingot_hes || - this == ModItems.ingot_les || - this == ModItems.cell_sas3 || - this == ModItems.fleija_propellant || - this == ModItems.solinium_core || - this == ModItems.rod_schrabidium || - this == ModItems.rod_dual_schrabidium || - this == ModItems.rod_quad_schrabidium || - this == ModItems.rod_solinium || - this == ModItems.rod_dual_solinium || - this == ModItems.rod_quad_solinium || - this == ModItems.rod_schrabidium_fuel || - this == ModItems.rod_dual_schrabidium_fuel || - this == ModItems.rod_quad_schrabidium_fuel) { - - if(living instanceof EntityPlayer && !Library.checkForHazmat((EntityPlayer)living)) - living.addPotionEffect(new PotionEffect(Potion.blindness.id, 60 * 20, 0)); - - //Library.applyRadiation(living, 100, 29, 75, 24); - Library.applyRadData(living, 7.5F/20F * mod); - } - - if (this == ModItems.nugget_schrabidium || - this == ModItems.nugget_solinium || - this == ModItems.nugget_schrabidium_fuel || - this == ModItems.nugget_hes || - this == ModItems.nugget_les) { - //living.addPotionEffect(new PotionEffect(Potion.blindness.id, 60 * 20, 0)); - Library.applyRadData(living, 5F/20F * mod); - //Library.applyRadiation(living, 75, 29, 60, 24); - } - - if (this == ModItems.plate_schrabidium || - this == ModItems.wire_schrabidium) { - //living.addPotionEffect(new PotionEffect(Potion.blindness.id, 60 * 20, 0)); - Library.applyRadData(living, 7.5F/20F * mod); - //Library.applyRadiation(living, 80, 29, 60, 24); - } - - if (this == ModItems.powder_schrabidium) { - //Library.applyRadiation(living, 100, 29, 75, 24); - Library.applyRadData(living, 7.5F/20F * mod); - - if(living instanceof EntityPlayer && !Library.checkForHazmat((EntityPlayer)living)) { - living.addPotionEffect(new PotionEffect(Potion.blindness.id, 60 * 20, 0)); - living.setFire(5); - } - } + if(this.blinding) + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.blindness.id, 100, 0)); } } @@ -274,6 +60,15 @@ public class ItemRadioactive extends ItemCustomLore { super.addInformation(stack, player, list, bool); - list.add(EnumChatFormatting.GREEN + "[Radioactive]"); + if(radiation > 0) { + list.add(EnumChatFormatting.GREEN + "[Radioactive]"); + list.add(EnumChatFormatting.YELLOW + (radiation + "RAD/s")); + } + + if(fire) + list.add(EnumChatFormatting.GOLD + "[Pyrophyric / Hot]"); + + if(blinding) + list.add(EnumChatFormatting.DARK_AQUA + "[Blinding]"); } } diff --git a/com/hbm/items/special/WatzFuel.java b/com/hbm/items/special/WatzFuel.java index af15e42da..1d6ba23e3 100644 --- a/com/hbm/items/special/WatzFuel.java +++ b/com/hbm/items/special/WatzFuel.java @@ -25,7 +25,8 @@ public class WatzFuel extends ItemRadioactive { * @param decayMultiplier */ - public WatzFuel(int lifeTime, int power, float powerMultiplier, int heat, float heatMultiplier, float decayMultiplier) { + public WatzFuel(float radiation, boolean blinding, int lifeTime, int power, float powerMultiplier, int heat, float heatMultiplier, float decayMultiplier) { + super(radiation, false, blinding); this.lifeTime = lifeTime * 100; this.power = power/10; this.powerMultiplier = powerMultiplier; diff --git a/com/hbm/items/weapon/ItemAmmo.java b/com/hbm/items/weapon/ItemAmmo.java index bea3149ad..60f706ceb 100644 --- a/com/hbm/items/weapon/ItemAmmo.java +++ b/com/hbm/items/weapon/ItemAmmo.java @@ -110,6 +110,12 @@ public class ItemAmmo extends Item { list.add(EnumChatFormatting.YELLOW + "* Heavy metal"); list.add(EnumChatFormatting.RED + "- Highly increased wear"); } + if(this == ModItems.ammo_44_phosphorus) { + list.add(EnumChatFormatting.BLUE + "+ Induces phosphorus burns"); + list.add(EnumChatFormatting.YELLOW + "* Technically a warcrime"); + list.add(EnumChatFormatting.RED + "- Increased wear"); + list.add(EnumChatFormatting.RED + "- Not penetrating"); + } if(this == ModItems.ammo_44_pip) { list.add(EnumChatFormatting.BLUE + "+ Boxcar"); list.add(EnumChatFormatting.RED + "- Highly decreased damage"); @@ -171,10 +177,21 @@ public class ItemAmmo extends Item { } //.50 BMG + if(this == ModItems.ammo_50bmg) { + list.add(EnumChatFormatting.YELLOW + "12.7mm anti-materiel round"); + list.add(EnumChatFormatting.YELLOW + "You shoot down planes with these, using"); + list.add(EnumChatFormatting.YELLOW + "them against people would be nasty."); + } if(this == ModItems.ammo_50bmg_incendiary) { list.add(EnumChatFormatting.BLUE + "+ Incendiary"); list.add(EnumChatFormatting.RED + "- Increased wear"); } + if(this == ModItems.ammo_50bmg_phosphorus) { + list.add(EnumChatFormatting.BLUE + "+ Induces phosphorus burns"); + list.add(EnumChatFormatting.YELLOW + "* Technically a warcrime"); + list.add(EnumChatFormatting.RED + "- Increased wear"); + list.add(EnumChatFormatting.RED + "- Not penetrating"); + } if(this == ModItems.ammo_50bmg_explosive) { list.add(EnumChatFormatting.BLUE + "+ Explosive"); list.add(EnumChatFormatting.BLUE + "+ Increased damage"); @@ -216,6 +233,11 @@ public class ItemAmmo extends Item { list.add(EnumChatFormatting.BLUE + "+ Incendiary explosion"); list.add(EnumChatFormatting.RED + "- Increased wear"); } + if(this == ModItems.ammo_rocket_phosphorus) { + list.add(EnumChatFormatting.BLUE + "+ Phosphorus splash"); + list.add(EnumChatFormatting.YELLOW + "* Technically a warcrime"); + list.add(EnumChatFormatting.RED + "- Increased wear"); + } if(this == ModItems.ammo_rocket_shrapnel) { list.add(EnumChatFormatting.BLUE + "+ Shrapnel"); } @@ -261,6 +283,11 @@ public class ItemAmmo extends Item { list.add(EnumChatFormatting.BLUE + "+ Incendiary explosion"); list.add(EnumChatFormatting.RED + "- Increased wear"); } + if(this == ModItems.ammo_grenade_phosphorus) { + list.add(EnumChatFormatting.BLUE + "+ Phosphorus splash"); + list.add(EnumChatFormatting.YELLOW + "* Technically a warcrime"); + list.add(EnumChatFormatting.RED + "- Increased wear"); + } if(this == ModItems.ammo_grenade_toxic) { list.add(EnumChatFormatting.BLUE + "+ Chlorine gas"); list.add(EnumChatFormatting.RED + "- No explosion"); diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index 51ec49f3b..608d093c0 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -2,6 +2,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityCloudFX; +import net.minecraft.client.particle.EntityFlameFX; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.player.EntityPlayer; @@ -753,6 +754,23 @@ public class ClientProxy extends ServerProxy } } + if("vanillaburst".equals(type)) { + + double motion = data.getDouble("motion"); + + for(int i = 0; i < data.getInteger("count"); i++) { + + double mX = rand.nextGaussian() * motion; + double mY = rand.nextGaussian() * motion; + double mZ = rand.nextGaussian() * motion; + + if("flame".equals(data.getString("mode"))) { + EntityFlameFX fx = new EntityFlameFX(world, x, y, z, mX, mY, mZ); + Minecraft.getMinecraft().effectRenderer.addEffect(fx); + } + } + } + if("vanilla".equals(type)) { double mX = data.getDouble("mX"); diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index c83408cd7..f2060d31f 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -255,6 +255,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.nugget_solinium, 9), new Object[] { "#", '#', ModItems.ingot_solinium }); GameRegistry.addRecipe(new ItemStack(ModItems.nuclear_waste, 1), new Object[] { "###", "###", "###", '#', ModItems.nuclear_waste_tiny }); GameRegistry.addRecipe(new ItemStack(ModItems.nuclear_waste_tiny, 9), new Object[] { "#", '#', ModItems.nuclear_waste }); + GameRegistry.addRecipe(new ItemStack(ModItems.bottle_mercury, 1), new Object[] { "###", "#B#", "###", '#', ModItems.nugget_mercury, 'B', Items.glass_bottle }); + GameRegistry.addRecipe(new ItemStack(ModItems.nugget_mercury, 8), new Object[] { "#", '#', ModItems.bottle_mercury }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.rod_empty, 16), new Object[] { "SSS", "L L", "SSS", 'S', "plateSteel", 'L', "plateLead" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_th232, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_th232, ModItems.nugget_th232, ModItems.nugget_th232, ModItems.nugget_th232, ModItems.nugget_th232, ModItems.nugget_th232 }); @@ -923,6 +925,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_wither, 4), new Object[] { "BCB", "CAC", "BCB", 'B', ModItems.ammo_20gauge, 'A', Blocks.soul_sand, 'C', "dustCoal" })); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.ingot_u238 }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_phosphorus, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.ingot_phosphorus }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_star, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_44_du, 'A', ModItems.ingot_starmetal }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_pip, 1), new Object[] { " B ", "BAB", " B ", 'A', ModItems.ammo_44, 'B', ModItems.powder_magic }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_44_bj, 1), new Object[] { " C ", "BAB", " C ", 'A', ModItems.ammo_44, 'B', ModItems.powder_magic, 'C', "dustDesh" })); @@ -934,6 +937,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.ammo_9mm_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_9mm, 'A', ModItems.ingot_u238 }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_22lr_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_22lr, 'A', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_incendiary, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', ModItems.powder_fire }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_phosphorus, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', ModItems.ingot_phosphorus }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_explosive, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', Blocks.tnt }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', ModItems.ingot_u238 }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_star, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_50bmg_du, 'A', ModItems.ingot_starmetal }); @@ -953,6 +957,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket, 2), new Object[] { " T ", "GCG", " P ", 'T', Blocks.tnt, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50 }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_he, 1), new Object[] { "G", "R", "G", 'G', Items.gunpowder, 'R', ModItems.ammo_rocket }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_incendiary, 1), new Object[] { "G", "R", 'G', ModItems.powder_fire, 'R', ModItems.ammo_rocket }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_phosphorus, 1), new Object[] { "G", "R", 'G', ModItems.ingot_phosphorus, 'R', ModItems.ammo_rocket }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_rocket_emp, 1), new Object[] { "G", "R", 'G', "dustDiamond", 'R', ModItems.ammo_rocket })); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_shrapnel, 1), new Object[] { "G", "R", 'G', ModItems.pellet_buckshot, 'R', ModItems.ammo_rocket }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_glare, 1), new Object[] { "GGG", "GRG", "GGG", 'G', Items.redstone, 'R', ModItems.ammo_rocket }); @@ -966,6 +971,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_grenade, 2), new Object[] { " T ", "GCI", " P ", 'T', Items.gunpowder, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'I', "plateIron" })); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_grenade_he, 2), new Object[] { "GIG", 'G', ModItems.ammo_grenade, 'I', Blocks.tnt }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_grenade_incendiary, 2), new Object[] { "GIG", 'G', ModItems.ammo_grenade, 'I', ModItems.powder_fire }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_grenade_phosphorus, 2), new Object[] { "GIG", 'G', ModItems.ammo_grenade, 'I', ModItems.ingot_phosphorus }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_grenade_toxic, 2), new Object[] { "GIG", 'G', ModItems.ammo_grenade, 'I', ModItems.powder_poison }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_grenade_concussion, 2), new Object[] { "GIG", 'G', ModItems.ammo_grenade, 'I', Items.glowstone_dust }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_grenade_nuclear, 2), new Object[] { " P ", "GIG", " P ", 'G', ModItems.ammo_grenade, 'I', ModItems.neutron_reflector, 'P', ModItems.nugget_pu239 }); @@ -1780,6 +1786,7 @@ public class CraftingManager { GameRegistry.addSmelting(ModItems.powder_gold, new ItemStack(Items.gold_ingot), 1.0F); GameRegistry.addSmelting(ModItems.powder_iron, new ItemStack(Items.iron_ingot), 1.0F); GameRegistry.addSmelting(ModItems.powder_titanium, new ItemStack(ModItems.ingot_titanium), 1.0F); + GameRegistry.addSmelting(ModItems.powder_cobalt, new ItemStack(ModItems.ingot_cobalt), 1.0F); GameRegistry.addSmelting(ModItems.powder_tungsten, new ItemStack(ModItems.ingot_tungsten), 1.0F); GameRegistry.addSmelting(ModItems.powder_uranium, new ItemStack(ModItems.ingot_uranium), 1.0F); GameRegistry.addSmelting(ModItems.powder_thorium, new ItemStack(ModItems.ingot_th232), 1.0F); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 0071eff35..378b0ca60 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -118,6 +118,7 @@ public class MainRegistry public static ArmorMaterial enumArmorMaterialHazmat3 = EnumHelper.addArmorMaterial("HAZMAT3", 60, new int[] {2, 5, 4, 1}, 5); public static ArmorMaterial enumArmorMaterialT45 = EnumHelper.addArmorMaterial("T45", 1000, new int[] {2, 5, 4, 1}, 0); public static ArmorMaterial enumArmorMaterialSteel = EnumHelper.addArmorMaterial("STEEL", 20, new int[] {2, 6, 5, 2}, 5); + public static ArmorMaterial enumArmorMaterialAsbestos = EnumHelper.addArmorMaterial("ASBESTOS", 20, new int[] {1, 4, 3, 1}, 5); public static ArmorMaterial enumArmorMaterialTitanium = EnumHelper.addArmorMaterial("TITANIUM", 25, new int[] {3, 8, 6, 3}, 9); public static ArmorMaterial enumArmorMaterialAlloy = EnumHelper.addArmorMaterial("ALLOY", 40, new int[] {3, 8, 6, 3}, 12); public static ArmorMaterial enumArmorMaterialPaa = EnumHelper.addArmorMaterial("PAA", 75, new int[] {3, 8, 6, 3}, 25); @@ -332,6 +333,7 @@ public class MainRegistry public static int leadID = 67; public static int radawayID = 68; public static int telekinesisID = 69; + public static int phosphorusID = 70; public static int x; public static int y; @@ -385,6 +387,7 @@ public class MainRegistry enumArmorMaterialT45.customCraftingMaterial = ModItems.plate_titanium; enumArmorMaterialTitanium.customCraftingMaterial = ModItems.ingot_titanium; enumArmorMaterialSteel.customCraftingMaterial = ModItems.ingot_steel; + enumArmorMaterialAsbestos.customCraftingMaterial = ModItems.asbestos_cloth; enumArmorMaterialAlloy.customCraftingMaterial = ModItems.ingot_advanced_alloy; enumArmorMaterialPaa.customCraftingMaterial = ModItems.plate_paa; enumArmorMaterialCmb.customCraftingMaterial = ModItems.ingot_combine_steel; @@ -1112,6 +1115,7 @@ public class MainRegistry OreDictionary.registerOre("ingotTungsten", ModItems.ingot_tungsten); OreDictionary.registerOre("ingotAluminum", ModItems.ingot_aluminium); OreDictionary.registerOre("ingotBeryllium", ModItems.ingot_beryllium); + OreDictionary.registerOre("ingotCobalt", ModItems.ingot_cobalt); OreDictionary.registerOre("ingotNeptunium", ModItems.ingot_neptunium); OreDictionary.registerOre("ingotLead", ModItems.ingot_lead); OreDictionary.registerOre("ingotLithium", ModItems.lithium); @@ -1443,11 +1447,20 @@ public class MainRegistry HazmatRegistry.instance.registerHazmat(ModItems.t45_legs, 0.6F); HazmatRegistry.instance.registerHazmat(ModItems.t45_boots, 0.2F); + HazmatRegistry.instance.registerHazmat(ModItems.paa_plate, 0.8F); + HazmatRegistry.instance.registerHazmat(ModItems.paa_legs, 0.6F); + HazmatRegistry.instance.registerHazmat(ModItems.paa_boots, 0.2F); + HazmatRegistry.instance.registerHazmat(ModItems.hazmat_paa_helmet, 0.6F); HazmatRegistry.instance.registerHazmat(ModItems.hazmat_paa_plate, 1.2F); HazmatRegistry.instance.registerHazmat(ModItems.hazmat_paa_legs, 0.9F); HazmatRegistry.instance.registerHazmat(ModItems.hazmat_paa_boots, 0.3F); + HazmatRegistry.instance.registerHazmat(ModItems.security_helmet, 0.2F); + HazmatRegistry.instance.registerHazmat(ModItems.security_plate, 0.4F); + HazmatRegistry.instance.registerHazmat(ModItems.security_legs, 0.3F); + HazmatRegistry.instance.registerHazmat(ModItems.security_boots, 0.1F); + HazmatRegistry.instance.registerHazmat(ModItems.jackt, 0.3F); HazmatRegistry.instance.registerHazmat(ModItems.jackt2, 0.3F); @@ -1809,6 +1822,7 @@ public class MainRegistry leadID = createConfigInt(config, CATEGORY_POTION, "8.05_leadPotionID", "What potion ID the lead poisoning effect will have", 67); radawayID = createConfigInt(config, CATEGORY_POTION, "8.06_radawayPotionID", "What potion ID the radaway effect will have", 68); telekinesisID = createConfigInt(config, CATEGORY_POTION, "8.07_telekinesisPotionID", "What potion ID the telekinesis effect will have", 69); + phosphorusID = createConfigInt(config, CATEGORY_POTION, "8.08_phosphorusPotionID", "What potion ID the phosphorus effect will have", 70); final String CATEGORY_MACHINE = "09_machines"; templateBlacklist = Arrays.asList(createConfigStringList(config, CATEGORY_MACHINE, "9.00_templateBlacklist", "Which machine templates should be prohibited from being created (args: enum names)")); diff --git a/com/hbm/main/ModEventHandler.java b/com/hbm/main/ModEventHandler.java index b829cb480..1d288deff 100644 --- a/com/hbm/main/ModEventHandler.java +++ b/com/hbm/main/ModEventHandler.java @@ -12,6 +12,7 @@ import com.hbm.entity.mob.EntityNuclearCreeper; import com.hbm.entity.projectile.EntityBurningFOEQ; import com.hbm.entity.projectile.EntityMeteor; import com.hbm.items.ModItems; +import com.hbm.items.gear.ArmorFSB; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; import com.hbm.lib.RefStrings; @@ -50,6 +51,7 @@ import net.minecraftforge.event.ServerChatEvent; import net.minecraftforge.event.entity.EntityEvent.EnteringChunk; import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; @@ -354,7 +356,7 @@ public class ModEventHandler } @SubscribeEvent - public void onEntityHurt(LivingAttackEvent event) { + public void onEntityAttacked(LivingAttackEvent event) { EntityLivingBase e = event.entityLiving; @@ -362,13 +364,108 @@ public class ModEventHandler e.worldObj.playSoundAtEntity(e, "random.break", 5F, 1.0F + e.getRNG().nextFloat() * 0.5F); event.setCanceled(true); } + + if(e instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer)e; + + ItemStack helmet = player.inventory.armorInventory[3]; + ItemStack plate = player.inventory.armorInventory[2]; + ItemStack legs = player.inventory.armorInventory[1]; + ItemStack boots = player.inventory.armorInventory[0]; + + if(helmet != null && plate != null && legs != null && boots != null) { + + if(plate.getItem() instanceof ArmorFSB && + ((ArmorFSB)helmet.getItem()).getArmorMaterial() == ((ArmorFSB)plate.getItem()).getArmorMaterial() && + ((ArmorFSB)helmet.getItem()).getArmorMaterial() == ((ArmorFSB)legs.getItem()).getArmorMaterial() && + ((ArmorFSB)helmet.getItem()).getArmorMaterial() == ((ArmorFSB)boots.getItem()).getArmorMaterial()) { + + ArmorFSB armor = (ArmorFSB)plate.getItem(); + + if(armor.fireproof && event.source.isFireDamage()) { + player.extinguish(); + event.setCanceled(true); + } + } + } + } + } + + @SubscribeEvent + public void onEntityDamaged(LivingHurtEvent event) { + + EntityLivingBase e = event.entityLiving; + + if(e instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer)e; + + ItemStack helmet = player.inventory.armorInventory[3]; + ItemStack plate = player.inventory.armorInventory[2]; + ItemStack legs = player.inventory.armorInventory[1]; + ItemStack boots = player.inventory.armorInventory[0]; + + if(helmet != null && plate != null && legs != null && boots != null) { + + if(plate.getItem() instanceof ArmorFSB && + ((ArmorFSB)helmet.getItem()).getArmorMaterial() == ((ArmorFSB)plate.getItem()).getArmorMaterial() && + ((ArmorFSB)helmet.getItem()).getArmorMaterial() == ((ArmorFSB)legs.getItem()).getArmorMaterial() && + ((ArmorFSB)helmet.getItem()).getArmorMaterial() == ((ArmorFSB)boots.getItem()).getArmorMaterial()) { + + ArmorFSB armor = (ArmorFSB)plate.getItem(); + + if(armor.damageMod != -1) { + event.ammount *= armor.damageMod; + } + + if(armor.resistance.get(event.source.getDamageType()) != null) { + event.ammount *= armor.resistance.get(event.source); + } + + if(armor.blastProtection != -1 && event.source.isExplosion()) { + event.ammount *= armor.blastProtection; + } + + if(armor.damageCap != -1) { + event.ammount = Math.min(event.ammount, armor.damageCap); + } + } + } + } } @SubscribeEvent public void onPlayerTick(TickEvent.PlayerTickEvent event) { - if(!event.player.worldObj.isRemote && event.player.getUniqueID().toString().equals("c874fd4e-5841-42e4-8f77-70efd5881bc1")) - event.player.getEntityData().setFloat("hfr_radiation", event.player.getEntityData().getFloat("hfr_radiation" + 0.05F)); + EntityPlayer player = event.player; + + if(!player.worldObj.isRemote && player.getUniqueID().toString().equals("c874fd4e-5841-42e4-8f77-70efd5881bc1")) + player.getEntityData().setFloat("hfr_radiation", player.getEntityData().getFloat("hfr_radiation" + 0.05F)); + + if(!player.worldObj.isRemote && event.phase == TickEvent.Phase.START) { + + ItemStack helmet = player.inventory.armorInventory[3]; + ItemStack plate = player.inventory.armorInventory[2]; + ItemStack legs = player.inventory.armorInventory[1]; + ItemStack boots = player.inventory.armorInventory[0]; + + if (helmet != null && plate != null && legs != null && boots != null) { + + if (plate.getItem() instanceof ArmorFSB + && ((ArmorFSB) helmet.getItem()).getArmorMaterial() == ((ArmorFSB) plate.getItem()).getArmorMaterial() + && ((ArmorFSB) helmet.getItem()).getArmorMaterial() == ((ArmorFSB) legs.getItem()).getArmorMaterial() + && ((ArmorFSB) helmet.getItem()).getArmorMaterial() == ((ArmorFSB) boots.getItem()).getArmorMaterial()) { + + ArmorFSB armor = (ArmorFSB)plate.getItem(); + + if(!armor.effects.isEmpty()) { + + for(PotionEffect i : armor.effects) { + player.addPotionEffect(new PotionEffect(i.getPotionID(), i.getDuration(), i.getAmplifier(), i.getIsAmbient())); + } + } + } + } + } } @SubscribeEvent diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index ceeb6c02e..75b530945 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -501,8 +501,9 @@ public class ResourceManager { public static final ResourceLocation soyuz_authentic_booster = new ResourceLocation(RefStrings.MODID, "textures/models/soyuz_authentic/booster.png"); public static final ResourceLocation soyuz_authentic_boosterside = new ResourceLocation(RefStrings.MODID, "textures/models/soyuz_authentic/boosterside.png"); public static final ResourceLocation soyuz_memento = new ResourceLocation(RefStrings.MODID, "textures/items/polaroid_memento.png"); - + public static final ResourceLocation soyuz_lander_tex = new ResourceLocation(RefStrings.MODID, "textures/models/soyuz_lander.png"); + public static final ResourceLocation soyuz_lander_rust_tex = new ResourceLocation(RefStrings.MODID, "textures/models/soyuz_lander_rust.png"); public static final ResourceLocation soyuz_chute_tex = new ResourceLocation(RefStrings.MODID, "textures/models/soyuz_chute.png"); public static final ResourceLocation soyuz_launcher_legs_tex = new ResourceLocation(RefStrings.MODID, "textures/models/soyuz_launcher/launcher_leg.png"); diff --git a/com/hbm/potion/HbmPotion.java b/com/hbm/potion/HbmPotion.java index b6d889bf5..24c6ba899 100644 --- a/com/hbm/potion/HbmPotion.java +++ b/com/hbm/potion/HbmPotion.java @@ -30,6 +30,7 @@ public class HbmPotion extends Potion { public static HbmPotion lead; public static HbmPotion radaway; public static HbmPotion telekinesis; + public static HbmPotion phosphorus; public HbmPotion(int id, boolean isBad, int color) { super(id, isBad, color); @@ -44,6 +45,7 @@ public class HbmPotion extends Potion { lead = registerPotion(MainRegistry.leadID, true, 0x767682, "potion.hbm_lead", 6, 0); radaway = registerPotion(MainRegistry.radawayID, false, 0xBB4B00, "potion.hbm_radaway", 7, 0); telekinesis = registerPotion(MainRegistry.telekinesisID, true, 0x00F3FF, "potion.hbm_telekinesis", 0, 1); + phosphorus = registerPotion(MainRegistry.phosphorusID, true, 0xFFFF00, "potion.hbm_phosphorus", 1, 1); } public static HbmPotion registerPotion(int id, boolean isBad, int color, String name, int x, int y) { @@ -143,6 +145,10 @@ public class HbmPotion extends Potion { entity.fallDistance = 50; } } + if(this == phosphorus && !entity.worldObj.isRemote) { + + entity.setFire(1); + } } public boolean isReady(int par1, int par2) { @@ -151,7 +157,7 @@ public class HbmPotion extends Potion { return par1 % 2 == 0; } - if(this == radiation || this == radaway || this == telekinesis) { + if(this == radiation || this == radaway || this == telekinesis || this == phosphorus) { return true; } diff --git a/com/hbm/render/entity/projectile/RenderBullet.java b/com/hbm/render/entity/projectile/RenderBullet.java index f0b7f4fbd..42751660e 100644 --- a/com/hbm/render/entity/projectile/RenderBullet.java +++ b/com/hbm/render/entity/projectile/RenderBullet.java @@ -113,6 +113,8 @@ public class RenderBullet extends Render { bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelRocketSleek.png")); break; case 7: bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelRocketNuclear.png")); break; + case 9: + bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelRocketPhosphorus.png")); break; } if(type == 8) { diff --git a/com/hbm/render/tileentity/RenderCapsule.java b/com/hbm/render/tileentity/RenderCapsule.java index b4c9de24a..6e9af7e1c 100644 --- a/com/hbm/render/tileentity/RenderCapsule.java +++ b/com/hbm/render/tileentity/RenderCapsule.java @@ -20,9 +20,13 @@ public class RenderCapsule extends TileEntitySpecialRenderer { GL11.glRotatef(-25, 0, 1, 0); GL11.glRotatef(15, 0, 0, 1); + if(te.getBlockMetadata() == 3) + bindTexture(ResourceManager.soyuz_lander_rust_tex); + else + bindTexture(ResourceManager.soyuz_lander_tex); + GL11.glEnable(GL11.GL_CULL_FACE); GL11.glShadeModel(GL11.GL_SMOOTH); - bindTexture(ResourceManager.soyuz_lander_tex); ResourceManager.soyuz_lander.renderPart("Capsule"); GL11.glShadeModel(GL11.GL_FLAT); diff --git a/com/hbm/tileentity/bomb/TileEntityBombMulti.java b/com/hbm/tileentity/bomb/TileEntityBombMulti.java index 069c067e5..7728952aa 100644 --- a/com/hbm/tileentity/bomb/TileEntityBombMulti.java +++ b/com/hbm/tileentity/bomb/TileEntityBombMulti.java @@ -123,7 +123,7 @@ public class TileEntityBombMulti extends TileEntity implements ISidedInventory { @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return null; + return new int[0]; } @Override diff --git a/com/hbm/tileentity/bomb/TileEntityNukeBoy.java b/com/hbm/tileentity/bomb/TileEntityNukeBoy.java index 224430dd1..8aaad9be4 100644 --- a/com/hbm/tileentity/bomb/TileEntityNukeBoy.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeBoy.java @@ -121,7 +121,7 @@ public class TileEntityNukeBoy extends TileEntity implements ISidedInventory { @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return null; + return new int[0]; } @Override diff --git a/com/hbm/tileentity/bomb/TileEntityNukeCustom.java b/com/hbm/tileentity/bomb/TileEntityNukeCustom.java index 01f5b7eab..2512ecdda 100644 --- a/com/hbm/tileentity/bomb/TileEntityNukeCustom.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeCustom.java @@ -140,7 +140,7 @@ public class TileEntityNukeCustom extends TileEntity implements ISidedInventory @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return null; + return new int[0]; } @Override diff --git a/com/hbm/tileentity/bomb/TileEntityNukeFleija.java b/com/hbm/tileentity/bomb/TileEntityNukeFleija.java index 11c67d48d..ad4bbd823 100644 --- a/com/hbm/tileentity/bomb/TileEntityNukeFleija.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeFleija.java @@ -121,7 +121,7 @@ public class TileEntityNukeFleija extends TileEntity implements ISidedInventory @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return null; + return new int[0]; } @Override diff --git a/com/hbm/tileentity/bomb/TileEntityNukeGadget.java b/com/hbm/tileentity/bomb/TileEntityNukeGadget.java index 951acc4c1..adcb48d52 100644 --- a/com/hbm/tileentity/bomb/TileEntityNukeGadget.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeGadget.java @@ -121,7 +121,7 @@ public class TileEntityNukeGadget extends TileEntity implements ISidedInventory @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return null; + return new int[0]; } @Override diff --git a/com/hbm/tileentity/bomb/TileEntityNukeMan.java b/com/hbm/tileentity/bomb/TileEntityNukeMan.java index 14a90b82e..8ec6010d9 100644 --- a/com/hbm/tileentity/bomb/TileEntityNukeMan.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeMan.java @@ -121,7 +121,7 @@ public class TileEntityNukeMan extends TileEntity implements ISidedInventory { @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return null; + return new int[0]; } @Override diff --git a/com/hbm/tileentity/bomb/TileEntityNukeMike.java b/com/hbm/tileentity/bomb/TileEntityNukeMike.java index bbe8a867c..f4299b6a4 100644 --- a/com/hbm/tileentity/bomb/TileEntityNukeMike.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeMike.java @@ -121,7 +121,7 @@ public class TileEntityNukeMike extends TileEntity implements ISidedInventory { @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return null; + return new int[0]; } @Override diff --git a/com/hbm/tileentity/bomb/TileEntityNukeN2.java b/com/hbm/tileentity/bomb/TileEntityNukeN2.java index fc12a1bf6..4139108d1 100644 --- a/com/hbm/tileentity/bomb/TileEntityNukeN2.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeN2.java @@ -121,7 +121,7 @@ public class TileEntityNukeN2 extends TileEntity implements ISidedInventory { @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return null; + return new int[0]; } @Override diff --git a/com/hbm/tileentity/bomb/TileEntityNukeN45.java b/com/hbm/tileentity/bomb/TileEntityNukeN45.java index be7bbe35d..7c65720e6 100644 --- a/com/hbm/tileentity/bomb/TileEntityNukeN45.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeN45.java @@ -138,7 +138,7 @@ public class TileEntityNukeN45 extends TileEntity implements ISidedInventory { @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return null; + return new int[0]; } @Override diff --git a/com/hbm/tileentity/bomb/TileEntityNukePrototype.java b/com/hbm/tileentity/bomb/TileEntityNukePrototype.java index fb4ac7464..eb5f9fd7f 100644 --- a/com/hbm/tileentity/bomb/TileEntityNukePrototype.java +++ b/com/hbm/tileentity/bomb/TileEntityNukePrototype.java @@ -121,7 +121,7 @@ public class TileEntityNukePrototype extends TileEntity implements ISidedInvento @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return null; + return new int[0]; } @Override diff --git a/com/hbm/tileentity/bomb/TileEntityNukeSolinium.java b/com/hbm/tileentity/bomb/TileEntityNukeSolinium.java index 39414114c..c3606d4a9 100644 --- a/com/hbm/tileentity/bomb/TileEntityNukeSolinium.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeSolinium.java @@ -121,7 +121,7 @@ public class TileEntityNukeSolinium extends TileEntity implements ISidedInventor @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return null; + return new int[0]; } @Override diff --git a/com/hbm/tileentity/bomb/TileEntityNukeTsar.java b/com/hbm/tileentity/bomb/TileEntityNukeTsar.java index d65e70075..0975f5817 100644 --- a/com/hbm/tileentity/bomb/TileEntityNukeTsar.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeTsar.java @@ -121,7 +121,7 @@ public class TileEntityNukeTsar extends TileEntity implements ISidedInventory { @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return null; + return new int[0]; } @Override diff --git a/com/hbm/tileentity/bomb/TileEntityTestNuke.java b/com/hbm/tileentity/bomb/TileEntityTestNuke.java index 7ce11d2f0..8aa17c9ad 100644 --- a/com/hbm/tileentity/bomb/TileEntityTestNuke.java +++ b/com/hbm/tileentity/bomb/TileEntityTestNuke.java @@ -120,7 +120,7 @@ public class TileEntityTestNuke extends TileEntity implements ISidedInventory { @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return null; + return new int[0]; } @Override diff --git a/com/hbm/tileentity/machine/TileEntityDiFurnace.java b/com/hbm/tileentity/machine/TileEntityDiFurnace.java index c1777d87c..a0ad126a9 100644 --- a/com/hbm/tileentity/machine/TileEntityDiFurnace.java +++ b/com/hbm/tileentity/machine/TileEntityDiFurnace.java @@ -130,6 +130,7 @@ public class TileEntityDiFurnace extends TileEntity implements ISidedInventory { if(item == ModItems.powder_coal) return 200; if(item == ModItems.briquette_lignite) return 200; if(item == ModItems.coke) return 400; + if(item == ModItems.solid_fuel) return 400; return 0; } diff --git a/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java b/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java index 69a2ad1a8..79d1ebc89 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java +++ b/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java @@ -3,6 +3,7 @@ package com.hbm.tileentity.machine; import java.util.Random; import com.hbm.interfaces.IConsumer; +import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; @@ -107,7 +108,7 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntity impleme public boolean isItemValidForSlot(int i, ItemStack stack) { switch (i) { case 0: - if (stack.getItem() == ModItems.ingot_uranium) + if (MachineRecipes.mODE(stack, "ingotUranium")) return true; break; case 2: @@ -215,7 +216,7 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntity impleme } public boolean canProcess() { - if (power >= 4990000 && slots[0] != null && slots[0].getItem() == ModItems.ingot_uranium && slots[2] != null + if (power >= 4990000 && slots[0] != null && MachineRecipes.mODE(slots[0], "ingotUranium") && slots[2] != null && slots[2].getItem() == ModItems.redcoil_capacitor && slots[2].getItemDamage() < slots[2].getMaxDamage() && (slots[1] == null || (slots[1] != null && slots[1].getItem() == ModItems.ingot_schrabidium