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 000000000..6d8934f91 Binary files /dev/null and b/assets/hbm/textures/armor/cobalt_1.png differ diff --git a/assets/hbm/textures/armor/cobalt_2.png b/assets/hbm/textures/armor/cobalt_2.png new file mode 100644 index 000000000..31fbc1058 Binary files /dev/null and b/assets/hbm/textures/armor/cobalt_2.png differ diff --git a/assets/hbm/textures/blocks/block_aluminium.png b/assets/hbm/textures/blocks/block_aluminium.png index 893f1113c..e64be61c0 100644 Binary files a/assets/hbm/textures/blocks/block_aluminium.png and b/assets/hbm/textures/blocks/block_aluminium.png differ diff --git a/assets/hbm/textures/blocks/block_cobalt.png b/assets/hbm/textures/blocks/block_cobalt.png new file mode 100644 index 000000000..35f651c52 Binary files /dev/null and b/assets/hbm/textures/blocks/block_cobalt.png differ diff --git a/assets/hbm/textures/blocks/block_lithium.png b/assets/hbm/textures/blocks/block_lithium.png new file mode 100644 index 000000000..3df641884 Binary files /dev/null and b/assets/hbm/textures/blocks/block_lithium.png differ diff --git a/assets/hbm/textures/entity/ModelRocketPhosphorus.png b/assets/hbm/textures/entity/ModelRocketPhosphorus.png new file mode 100644 index 000000000..30a9c896d Binary files /dev/null and b/assets/hbm/textures/entity/ModelRocketPhosphorus.png differ diff --git a/assets/hbm/textures/gui/potions.png b/assets/hbm/textures/gui/potions.png index 1eaab1652..b9c1dd0d1 100644 Binary files a/assets/hbm/textures/gui/potions.png and b/assets/hbm/textures/gui/potions.png differ 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 000000000..3a3737e7f Binary files /dev/null and b/assets/hbm/textures/gui/reactors/gui_fusion_multiblock.png differ 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 000000000..eb8bd54a9 Binary files /dev/null and b/assets/hbm/textures/items/ammo_44_phosphorus.png differ 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 000000000..ca7a3d690 Binary files /dev/null and b/assets/hbm/textures/items/ammo_50bmg_phosphorus.png differ 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 000000000..2881d2f4c Binary files /dev/null and b/assets/hbm/textures/items/ammo_grenade_phosphorus.png differ diff --git a/assets/hbm/textures/items/ammo_rocket_phosphorus.png b/assets/hbm/textures/items/ammo_rocket_phosphorus.png new file mode 100644 index 000000000..5798976d4 Binary files /dev/null and b/assets/hbm/textures/items/ammo_rocket_phosphorus.png differ diff --git a/assets/hbm/textures/items/bottle_mercury.png b/assets/hbm/textures/items/bottle_mercury.png new file mode 100644 index 000000000..da7982dd9 Binary files /dev/null and b/assets/hbm/textures/items/bottle_mercury.png differ diff --git a/assets/hbm/textures/items/cobalt_axe.png b/assets/hbm/textures/items/cobalt_axe.png new file mode 100644 index 000000000..453d4a20a Binary files /dev/null and b/assets/hbm/textures/items/cobalt_axe.png differ diff --git a/assets/hbm/textures/items/cobalt_boots.png b/assets/hbm/textures/items/cobalt_boots.png new file mode 100644 index 000000000..eca5329c2 Binary files /dev/null and b/assets/hbm/textures/items/cobalt_boots.png differ diff --git a/assets/hbm/textures/items/cobalt_helmet.png b/assets/hbm/textures/items/cobalt_helmet.png new file mode 100644 index 000000000..99dea0181 Binary files /dev/null and b/assets/hbm/textures/items/cobalt_helmet.png differ diff --git a/assets/hbm/textures/items/cobalt_hoe.png b/assets/hbm/textures/items/cobalt_hoe.png new file mode 100644 index 000000000..59ebd2144 Binary files /dev/null and b/assets/hbm/textures/items/cobalt_hoe.png differ diff --git a/assets/hbm/textures/items/cobalt_leggings.png b/assets/hbm/textures/items/cobalt_leggings.png new file mode 100644 index 000000000..f9769ba6a Binary files /dev/null and b/assets/hbm/textures/items/cobalt_leggings.png differ diff --git a/assets/hbm/textures/items/cobalt_plate.png b/assets/hbm/textures/items/cobalt_plate.png new file mode 100644 index 000000000..d637d3a17 Binary files /dev/null and b/assets/hbm/textures/items/cobalt_plate.png differ diff --git a/assets/hbm/textures/items/cobalt_shovel.png b/assets/hbm/textures/items/cobalt_shovel.png new file mode 100644 index 000000000..d9c84584a Binary files /dev/null and b/assets/hbm/textures/items/cobalt_shovel.png differ diff --git a/assets/hbm/textures/items/cobalt_sword.png b/assets/hbm/textures/items/cobalt_sword.png new file mode 100644 index 000000000..5df9637ab Binary files /dev/null and b/assets/hbm/textures/items/cobalt_sword.png differ diff --git a/assets/hbm/textures/items/ingot_cobalt.png b/assets/hbm/textures/items/ingot_cobalt.png index 82d26fe44..4aa771084 100644 Binary files a/assets/hbm/textures/items/ingot_cobalt.png and b/assets/hbm/textures/items/ingot_cobalt.png differ diff --git a/assets/hbm/textures/items/ingot_phosphorus.png b/assets/hbm/textures/items/ingot_phosphorus.png new file mode 100644 index 000000000..a2d5d19c8 Binary files /dev/null and b/assets/hbm/textures/items/ingot_phosphorus.png differ diff --git a/assets/hbm/textures/items/lithium.png b/assets/hbm/textures/items/lithium.png index 0a8355982..e7d23fcaf 100644 Binary files a/assets/hbm/textures/items/lithium.png and b/assets/hbm/textures/items/lithium.png differ diff --git a/assets/hbm/textures/items/nugget_mercury.png b/assets/hbm/textures/items/nugget_mercury.png new file mode 100644 index 000000000..d309c9d88 Binary files /dev/null and b/assets/hbm/textures/items/nugget_mercury.png differ diff --git a/assets/hbm/textures/items/record_glass.png b/assets/hbm/textures/items/record_glass.png new file mode 100644 index 000000000..03387b6cd Binary files /dev/null and b/assets/hbm/textures/items/record_glass.png differ diff --git a/assets/hbm/textures/models/iter/glass.png b/assets/hbm/textures/models/iter/glass.png new file mode 100644 index 000000000..5df87687e Binary files /dev/null and b/assets/hbm/textures/models/iter/glass.png differ diff --git a/assets/hbm/textures/models/iter/microwave.png b/assets/hbm/textures/models/iter/microwave.png new file mode 100644 index 000000000..cddfb5b6f Binary files /dev/null and b/assets/hbm/textures/models/iter/microwave.png differ diff --git a/assets/hbm/textures/models/iter/motor.png b/assets/hbm/textures/models/iter/motor.png new file mode 100644 index 000000000..fdfde0dd2 Binary files /dev/null and b/assets/hbm/textures/models/iter/motor.png differ diff --git a/assets/hbm/textures/models/iter/plasma.png b/assets/hbm/textures/models/iter/plasma.png new file mode 100644 index 000000000..e2ea71271 Binary files /dev/null and b/assets/hbm/textures/models/iter/plasma.png differ diff --git a/assets/hbm/textures/models/iter/rails.png b/assets/hbm/textures/models/iter/rails.png new file mode 100644 index 000000000..fb2de65e4 Binary files /dev/null and b/assets/hbm/textures/models/iter/rails.png differ diff --git a/assets/hbm/textures/models/iter/solenoid.png b/assets/hbm/textures/models/iter/solenoid.png new file mode 100644 index 000000000..0559f1152 Binary files /dev/null and b/assets/hbm/textures/models/iter/solenoid.png differ diff --git a/assets/hbm/textures/models/iter/toroidal.png b/assets/hbm/textures/models/iter/toroidal.png new file mode 100644 index 000000000..51b1b3049 Binary files /dev/null and b/assets/hbm/textures/models/iter/toroidal.png differ diff --git a/assets/hbm/textures/models/iter/torus.png b/assets/hbm/textures/models/iter/torus.png new file mode 100644 index 000000000..34a9da80b Binary files /dev/null and b/assets/hbm/textures/models/iter/torus.png differ diff --git a/assets/hbm/textures/models/reactor.zip b/assets/hbm/textures/models/reactor.zip deleted file mode 100644 index 53f90620d..000000000 Binary files a/assets/hbm/textures/models/reactor.zip and /dev/null differ 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 f369bb668..000000000 Binary files a/assets/hbm/textures/models/reactor_body_new.png and /dev/null differ diff --git a/assets/hbm/textures/models/reactor_rods_new.png b/assets/hbm/textures/models/reactor_rods_new.png deleted file mode 100644 index 76589c533..000000000 Binary files a/assets/hbm/textures/models/reactor_rods_new.png and /dev/null differ diff --git a/assets/hbm/textures/models/soyuz_lander_rust.png b/assets/hbm/textures/models/soyuz_lander_rust.png new file mode 100644 index 000000000..65b5918af Binary files /dev/null and b/assets/hbm/textures/models/soyuz_lander_rust.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 6620490cd..7650a531f 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -133,6 +133,8 @@ public class ModBlocks { public static Block block_yellowcake; public static Block block_fiberglass; public static Block block_asbestos; + public static Block block_cobalt; + public static Block block_lithium; public static Block block_australium; public static Block block_weidanium; @@ -865,6 +867,8 @@ public class ModBlocks { block_yellowcake = new BlockFallingRad(Material.sand, 0.5F, 3F).setBlockName("block_yellowcake").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeSand).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_yellowcake"); block_fiberglass = new BlockReactor(Material.cloth).setBlockName("block_fiberglass").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeCloth).setHardness(5.0F).setResistance(10.0F); block_asbestos = new BlockGeneric(Material.cloth).setBlockName("block_asbestos").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeCloth).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_asbestos"); + block_cobalt = new BlockGeneric(Material.iron).setBlockName("block_cobalt").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_cobalt"); + block_lithium = new BlockLithium(Material.iron).setBlockName("block_lithium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_lithium"); block_australium = new BlockGeneric(Material.iron).setBlockName("block_australium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_australium"); block_weidanium = new BlockGeneric(Material.iron).setBlockName("block_weidanium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_weidanium"); @@ -1445,8 +1449,10 @@ public class ModBlocks { GameRegistry.registerBlock(block_aluminium, block_aluminium.getUnlocalizedName()); GameRegistry.registerBlock(block_fluorite, block_fluorite.getUnlocalizedName()); GameRegistry.registerBlock(block_beryllium, block_beryllium.getUnlocalizedName()); + GameRegistry.registerBlock(block_cobalt, block_cobalt.getUnlocalizedName()); GameRegistry.registerBlock(block_steel, block_steel.getUnlocalizedName()); GameRegistry.registerBlock(block_lead, block_lead.getUnlocalizedName()); + GameRegistry.registerBlock(block_lithium, ItemBlockLore.class, block_lithium.getUnlocalizedName()); GameRegistry.registerBlock(block_yellowcake, block_yellowcake.getUnlocalizedName()); GameRegistry.registerBlock(block_scrap, block_scrap.getUnlocalizedName()); GameRegistry.registerBlock(block_electrical_scrap, block_electrical_scrap.getUnlocalizedName()); diff --git a/com/hbm/blocks/generic/BlockLithium.java b/com/hbm/blocks/generic/BlockLithium.java new file mode 100644 index 000000000..282e07caa --- /dev/null +++ b/com/hbm/blocks/generic/BlockLithium.java @@ -0,0 +1,60 @@ +package com.hbm.blocks.generic; + +import java.util.Random; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.world.World; + +public class BlockLithium extends Block { + + public BlockLithium(Material material) { + super(material); + } + + private boolean touchesWater(World world, int x, int y, int z) { + + if(world.isRemote) + return false; + + return world.getBlock(x + 1, y, z).getMaterial() == Material.water || + world.getBlock(x - 1, y, z).getMaterial() == Material.water || + world.getBlock(x, y + 1, z).getMaterial() == Material.water || + world.getBlock(x, y - 1, z).getMaterial() == Material.water || + world.getBlock(x, y, z + 1).getMaterial() == Material.water || + world.getBlock(x, y, z - 1).getMaterial() == Material.water; + } + + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { + + if(touchesWater(world, x, y, z)) { + world.func_147480_a(x, y, z, false); + world.newExplosion(null, x + 0.5, y + 0.5, z + 0.5, 15, false, true); + } + } + + public int onBlockPlaced(World world, int x, int y, int z, int side, float fx, float fy, float fz, int meta) { + + if(touchesWater(world, x, y, z)) { + world.func_147480_a(x, y, z, false); + world.newExplosion(null, x + 0.5, y + 0.5, z + 0.5, 15, false, true); + } + + return meta; + } + + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + + if(world.canLightningStrikeAt(x, y + 1, z)) { + + float ox = rand.nextFloat(); + float oz = rand.nextFloat(); + + world.spawnParticle("largesmoke", x + ox, y + 1, z + oz, 0.0D, 0.0D, 0.0D); + } + } + +} diff --git a/com/hbm/blocks/generic/BlockOre.java b/com/hbm/blocks/generic/BlockOre.java index 2f764d4c3..ce9eef296 100644 --- a/com/hbm/blocks/generic/BlockOre.java +++ b/com/hbm/blocks/generic/BlockOre.java @@ -74,7 +74,7 @@ public class BlockOre extends Block { } if(this == ModBlocks.ore_nether_fire) { - return rand.nextInt(2) == 0 ? ModItems.powder_fire : Items.blaze_powder; + return rand.nextInt(3) == 0 ? ModItems.ingot_phosphorus : Items.blaze_powder; } if(this == ModBlocks.block_meteor) { @@ -195,10 +195,6 @@ public class BlockOre extends Block { { return 2 + p_149745_1_.nextInt(3); } - if(this == ModBlocks.ore_nether_fire) - { - return 2 + p_149745_1_.nextInt(3); - } if(this == ModBlocks.ore_rare) { return 4 + p_149745_1_.nextInt(8); diff --git a/com/hbm/blocks/machine/BlockMachineBase.java b/com/hbm/blocks/machine/BlockMachineBase.java new file mode 100644 index 000000000..e075737a9 --- /dev/null +++ b/com/hbm/blocks/machine/BlockMachineBase.java @@ -0,0 +1,123 @@ +package com.hbm.blocks.machine; + +import com.hbm.main.MainRegistry; + +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; + +public abstract class BlockMachineBase extends BlockContainer { + + int guiID = -1; + boolean rotatable = false; + + protected BlockMachineBase(Material p_i45386_1_, int guiID) { + super(p_i45386_1_); + this.guiID = guiID; + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + + if(guiID == -1) + return false; + + if(world.isRemote) + { + return true; + } else if(!player.isSneaking()) + { + FMLNetworkHandler.openGui(player, MainRegistry.instance, this.guiID, world, x, y, z); + return true; + + } else { + return false; + } + } + + private static boolean keepInventory; + + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { + + if (!keepInventory) { + + ISidedInventory tileentityfurnace = (ISidedInventory)world.getTileEntity(x, y, z); + + if (tileentityfurnace != null) { + + for (int i1 = 0; i1 < tileentityfurnace.getSizeInventory(); ++i1) { + + ItemStack itemstack = tileentityfurnace.getStackInSlot(i1); + + if (itemstack != null) { + + float f = world.rand.nextFloat() * 0.8F + 0.1F; + float f1 = world.rand.nextFloat() * 0.8F + 0.1F; + float f2 = world.rand.nextFloat() * 0.8F + 0.1F; + + while (itemstack.stackSize > 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