diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index b37665438..27acc5f4a 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -651,6 +651,7 @@ item.billet_u235.name=U235-Billet item.billet_u238.name=U238-Billet item.billet_uranium.name=Uranbillet item.billet_uranium_fuel.name=Urankernbrennstoffbillet +item.billet_yharonite.name=Yharonitbillet item.biomass.name=Biomasse item.biomass_compressed.name=Verdichtete Biomasse item.bj_boots.name=Lunare Beschlagene Stiefel @@ -1019,6 +1020,7 @@ item.fluid_identifier.name=Flüssigkeits-Kennzeichnung item.fluid_tank_empty.name=Leere universelle Flüssigkeitszelle item.fluid_tank_full.name=Universelle Flüssigkeitszelle: item.fluorite.name=Fluorit +item.fmn.name=Flunitrazepamtablette item.folly_bullet.name=12,8cm Sternenmetall-Hochenergiegeschoss item.folly_bullet_du.name=12,8cm DU-Geschoss item.folly_bullet_nuclear.name=12,8cm Atomares Geschoss @@ -2182,6 +2184,7 @@ item.wiring_red_copper.name=Kabeltrommel item.wood_gavel.name=Hölzerner Richterhammer item.wrench.name=Rohrzange item.wrench_flipped.name=Rohrzange mit Klinge +item.xanax.name=NAXA Anti-Digamma-Medikament itemGroup.tabBlocks=NTM Erze und Blöcke itemGroup.tabConsumable=NTM Verbrauchsgüter diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index 633f372f6..36fb423c5 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -651,6 +651,7 @@ item.billet_u235.name=U235 Billet item.billet_u238.name=U238 Billet item.billet_uranium.name=Uranium Billet item.billet_uranium_fuel.name=Uranium Fuel Billet +item.billet_yharonite.name=Yharonite Billet item.biomass.name=Biomass item.biomass_compressed.name=Compressed Biomass item.bj_boots.name=Lunar Studded Boots @@ -1019,6 +1020,7 @@ item.fluid_identifier.name=Fluid Identifier item.fluid_tank_empty.name=Empty Universal Fluid Tank item.fluid_tank_full.name=Universal Fluid Tank: item.fluorite.name=Fluorite +item.fmn.name=Flunitrazepam Tablet item.folly_bullet.name=12.8cm Starmetal High-Energy Shell item.folly_bullet_du.name=12.8cm DU-Shell item.folly_bullet_nuclear.name=12.8cm Nuclear Shell @@ -2182,6 +2184,7 @@ item.wiring_red_copper.name=Cable Drum item.wood_gavel.name=Wooden Gavel item.wrench.name=Pipe Wrench item.wrench_flipped.name=Blade on a Wrench +item.xanax.name=NAXA Anti-Digamma Medication itemGroup.tabBlocks=NTM Ores and Blocks itemGroup.tabConsumable=NTM Consumables and Gear diff --git a/src/main/java/assets/hbm/textures/items/billet_yharonite.png b/src/main/java/assets/hbm/textures/items/billet_yharonite.png new file mode 100644 index 000000000..27f0cfb0f Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/billet_yharonite.png differ diff --git a/src/main/java/com/hbm/crafting/ConsumableRecipes.java b/src/main/java/com/hbm/crafting/ConsumableRecipes.java index 758571ce8..9439e896a 100644 --- a/src/main/java/com/hbm/crafting/ConsumableRecipes.java +++ b/src/main/java/com/hbm/crafting/ConsumableRecipes.java @@ -139,6 +139,7 @@ public class ConsumableRecipes { GameRegistry.addRecipe(new ItemStack(ModItems.insert_sapi, 1), new Object[] { "PKP", "DPD", "PKP", 'P', ModItems.ingot_polymer, 'K', ModItems.insert_kevlar, 'D', ModItems.ducttape }); GameRegistry.addRecipe(new ItemStack(ModItems.insert_esapi, 1), new Object[] { "PKP", "DSD", "PKP", 'P', ModItems.ingot_polymer, 'K', ModItems.insert_sapi, 'D', ModItems.ducttape, 'S', ModItems.plate_saturnite }); GameRegistry.addRecipe(new ItemStack(ModItems.insert_xsapi, 1), new Object[] { "PKP", "DSD", "PKP", 'P', ModItems.ingot_asbestos, 'K', ModItems.insert_esapi, 'D', ModItems.ducttape, 'S', ModItems.ingot_meteorite_forged }); + GameRegistry.addRecipe(new ItemStack(ModItems.insert_yharonite, 1), new Object[] { "YIY", "IYI", "YIY", 'Y', ModItems.billet_yharonite, 'I', ModItems.insert_du }); //Servos GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.servo_set, 1), new Object[] { "MBM", "PBP", "MBM", 'M', ModItems.motor, 'B', ModItems.bolt_tungsten, 'P', "plateIron" })); diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index 92f10e978..efcb11ad6 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -52,12 +52,33 @@ public class MineralRecipes { RecipesCommon.addBillet(ModItems.billet_polonium, ModItems.nugget_polonium, "nuggetPolonium"); RecipesCommon.addBillet(ModItems.billet_schrabidium, ModItems.nugget_schrabidium); RecipesCommon.addBillet(ModItems.billet_solinium, ModItems.nugget_solinium); + RecipesCommon.addBillet(ModItems.billet_uranium_fuel, ModItems.nugget_uranium_fuel); + RecipesCommon.addBillet(ModItems.billet_thorium_fuel, ModItems.nugget_thorium_fuel); + RecipesCommon.addBillet(ModItems.billet_plutonium_fuel, ModItems.nugget_plutonium_fuel); + RecipesCommon.addBillet(ModItems.billet_mox_fuel, ModItems.nugget_mox_fuel); + RecipesCommon.addBillet(ModItems.billet_schrabidium_fuel, ModItems.nugget_schrabidium_fuel); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_thorium_fuel, 2), new Object[] { ModItems.billet_th232, ModItems.billet_th232, ModItems.billet_u233 }); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_thorium_fuel, 1), new Object[] { "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetUranium233", "nuggetUranium233" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_thorium_fuel, 1), new Object[] { "tinyTh232", "tinyTh232", "tinyTh232", "tinyTh232", "tinyU233", "tinyU233" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 2), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u233 }); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_uranium_fuel, 1), new Object[] { "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium233", "nuggetUranium233" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_uranium_fuel, 1), new Object[] { "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU233", "tinyU233" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 2), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u235 }); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_uranium_fuel, 1), new Object[] { "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium235", "nuggetUranium235" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_uranium_fuel, 1), new Object[] { "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU235", "tinyU235" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_plutonium_fuel, 2), new Object[] { ModItems.billet_u238, ModItems.billet_pu_mix, ModItems.billet_pu_mix }); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_plutonium_fuel, 1), new Object[] { ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, "nuggetUranium238", "nuggetUranium238" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_plutonium_fuel, 1), new Object[] { ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, "tinyU238", "tinyU238" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_mox_fuel, 2), new Object[] { ModItems.billet_u238, ModItems.billet_u235, ModItems.billet_pu_mix }); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_mox_fuel, 1), new Object[] { ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, "nuggetUranium238", "nuggetUranium238", "nuggetUranium235", "nuggetUranium235" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_mox_fuel, 1), new Object[] { ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, "tinyU238", "tinyU238", "tinyU235", "tinyU235" })); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_schrabidium_fuel, 2), new Object[] { ModItems.billet_schrabidium, ModItems.billet_neptunium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium }); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_schrabidium_fuel, 1), new Object[] { ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, "nuggetNeptunium", "nuggetNeptunium", ModItems.nugget_beryllium, ModItems.nugget_beryllium })); + + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.pellet_rtg), new Object[] { ModItems.billet_pu238, ModItems.billet_pu238, ModItems.billet_pu238 }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.pellet_rtg_weak), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_pu238 }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.pellet_rtg_polonium), new Object[] { ModItems.billet_polonium, ModItems.billet_polonium, ModItems.billet_polonium }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_copper), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_copper }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_fluorite), 1), new Object[] { "###", "###", "###", '#', ModItems.fluorite }); @@ -270,5 +291,7 @@ public class MineralRecipes { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_schrabidium_fuel, 1), new Object[] { "nuggetSchrabidium", "nuggetSchrabidium", "nuggetSchrabidium", "nuggetNeptunium", "nuggetNeptunium", "nuggetNeptunium", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_hes, 1), new Object[] { "nuggetSchrabidium", "nuggetSchrabidium", "nuggetSchrabidium", "nuggetSchrabidium", "nuggetSchrabidium", "nuggetNeptunium", "nuggetNeptunium", ModItems.nugget_beryllium, ModItems.nugget_beryllium })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_les, 1), new Object[] { "nuggetSchrabidium", "nuggetNeptunium", "nuggetNeptunium", "nuggetNeptunium", "nuggetNeptunium", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_pu_mix, 1), new Object[] { "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPluonium240", "nuggetPluonium240", "nuggetPluonium240", "nuggetPluonium240" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_pu_mix, 1), new Object[] { "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu240", "tinyPu240", "tinyPu240", "tinyPu240" })); } } diff --git a/src/main/java/com/hbm/crafting/RecipesCommon.java b/src/main/java/com/hbm/crafting/RecipesCommon.java index 42aa68369..dce0db141 100644 --- a/src/main/java/com/hbm/crafting/RecipesCommon.java +++ b/src/main/java/com/hbm/crafting/RecipesCommon.java @@ -68,6 +68,39 @@ public class RecipesCommon { public static void addQuadRod(Item ingot, Item nugget, Item out) { GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_quad_empty, ingot, ingot, nugget, nugget, nugget, nugget, nugget, nugget }); } + + //Fill rods with one billet + public static void addRodBillet(Item billet, Item out) { + GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_empty, billet }); + } + + //Fill rods with two billets + public static void addDualRodBillet(Item billet, Item out) { + GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_dual_empty, billet, billet }); + } + + //Fill rods with three billets + public static void addQuadRodBillet(Item billet, Item out) { + GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_quad_empty, billet, billet, billet, billet }); + } + + //Fill rods with one billet + unload + public static void addRodBilletUnload(Item billet, Item out) { + GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_empty, billet }); + GameRegistry.addShapelessRecipe(new ItemStack(billet, 1), new Object[] { out }); + } + + //Fill rods with two billets + unload + public static void addDualRodBilletUnload(Item billet, Item out) { + GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_dual_empty, billet, billet }); + GameRegistry.addShapelessRecipe(new ItemStack(billet, 2), new Object[] { out }); + } + + //Fill rods with three billets + unload + public static void addQuadRodBilletUnload(Item billet, Item out) { + GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_quad_empty, billet, billet, billet, billet }); + GameRegistry.addShapelessRecipe(new ItemStack(billet, 4), new Object[] { out }); + } //Sword public static void addSword(Item ingot, Item sword) { diff --git a/src/main/java/com/hbm/crafting/RodRecipes.java b/src/main/java/com/hbm/crafting/RodRecipes.java index 049c43d99..a47b49fb8 100644 --- a/src/main/java/com/hbm/crafting/RodRecipes.java +++ b/src/main/java/com/hbm/crafting/RodRecipes.java @@ -44,6 +44,26 @@ public class RodRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_daffergon, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_daffergon, ModItems.nugget_daffergon, ModItems.nugget_daffergon, ModItems.nugget_daffergon, ModItems.nugget_daffergon, ModItems.nugget_daffergon }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_verticium, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_verticium, ModItems.nugget_verticium, ModItems.nugget_verticium, ModItems.nugget_verticium, ModItems.nugget_verticium, ModItems.nugget_verticium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_balefire, 1), new Object[] { ModItems.rod_empty, ModItems.egg_balefire_shard }); + + //...with billets + RecipesCommon.addRodBilletUnload(ModItems.billet_uranium, ModItems.rod_uranium); + RecipesCommon.addRodBilletUnload(ModItems.billet_u233, ModItems.rod_u233); + RecipesCommon.addRodBilletUnload(ModItems.billet_u235, ModItems.rod_u235); + RecipesCommon.addRodBilletUnload(ModItems.billet_u238, ModItems.rod_u238); + RecipesCommon.addRodBilletUnload(ModItems.billet_th232, ModItems.rod_th232); + RecipesCommon.addRodBilletUnload(ModItems.billet_plutonium, ModItems.rod_plutonium); + RecipesCommon.addRodBilletUnload(ModItems.billet_pu238, ModItems.rod_pu238); + RecipesCommon.addRodBilletUnload(ModItems.billet_pu239, ModItems.rod_pu239); + RecipesCommon.addRodBilletUnload(ModItems.billet_pu240, ModItems.rod_pu240); + RecipesCommon.addRodBilletUnload(ModItems.billet_neptunium, ModItems.rod_neptunium); + RecipesCommon.addRodBilletUnload(ModItems.billet_polonium, ModItems.rod_polonium); + RecipesCommon.addRodBilletUnload(ModItems.billet_schrabidium, ModItems.rod_schrabidium); + RecipesCommon.addRodBilletUnload(ModItems.billet_solinium, ModItems.rod_solinium); + RecipesCommon.addRodBillet(ModItems.billet_uranium_fuel, ModItems.rod_uranium_fuel); + RecipesCommon.addRodBillet(ModItems.billet_thorium_fuel, ModItems.rod_thorium_fuel); + RecipesCommon.addRodBillet(ModItems.billet_plutonium_fuel, ModItems.rod_plutonium_fuel); + RecipesCommon.addRodBillet(ModItems.billet_mox_fuel, ModItems.rod_mox_fuel); + RecipesCommon.addRodBillet(ModItems.billet_schrabidium_fuel, ModItems.rod_schrabidium_fuel); //Dual rods GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_empty, 2), new Object[] { ModItems.rod_dual_empty }); @@ -68,6 +88,26 @@ public class RodRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_mox_fuel, 1), new Object[] { ModItems.rod_dual_empty, ModItems.ingot_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_schrabidium_fuel, 1), new Object[] { ModItems.rod_dual_empty, ModItems.ingot_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_balefire, 1), new Object[] { ModItems.rod_dual_empty, ModItems.egg_balefire_shard, ModItems.egg_balefire_shard }); + + //...with billets + RecipesCommon.addDualRodBilletUnload(ModItems.billet_uranium, ModItems.rod_dual_uranium); + RecipesCommon.addDualRodBilletUnload(ModItems.billet_u233, ModItems.rod_dual_u233); + RecipesCommon.addDualRodBilletUnload(ModItems.billet_u235, ModItems.rod_dual_u235); + RecipesCommon.addDualRodBilletUnload(ModItems.billet_u238, ModItems.rod_dual_u238); + RecipesCommon.addDualRodBilletUnload(ModItems.billet_th232, ModItems.rod_dual_th232); + RecipesCommon.addDualRodBilletUnload(ModItems.billet_plutonium, ModItems.rod_dual_plutonium); + RecipesCommon.addDualRodBilletUnload(ModItems.billet_pu238, ModItems.rod_dual_pu238); + RecipesCommon.addDualRodBilletUnload(ModItems.billet_pu239, ModItems.rod_dual_pu239); + RecipesCommon.addDualRodBilletUnload(ModItems.billet_pu240, ModItems.rod_dual_pu240); + RecipesCommon.addDualRodBilletUnload(ModItems.billet_neptunium, ModItems.rod_dual_neptunium); + RecipesCommon.addDualRodBilletUnload(ModItems.billet_polonium, ModItems.rod_dual_polonium); + RecipesCommon.addDualRodBilletUnload(ModItems.billet_schrabidium, ModItems.rod_dual_schrabidium); + RecipesCommon.addDualRodBilletUnload(ModItems.billet_solinium, ModItems.rod_dual_solinium); + RecipesCommon.addDualRodBillet(ModItems.billet_uranium_fuel, ModItems.rod_dual_uranium_fuel); + RecipesCommon.addDualRodBillet(ModItems.billet_thorium_fuel, ModItems.rod_dual_thorium_fuel); + RecipesCommon.addDualRodBillet(ModItems.billet_plutonium_fuel, ModItems.rod_dual_plutonium_fuel); + RecipesCommon.addDualRodBillet(ModItems.billet_mox_fuel, ModItems.rod_dual_mox_fuel); + RecipesCommon.addDualRodBillet(ModItems.billet_schrabidium_fuel, ModItems.rod_dual_schrabidium_fuel); //Lithium and tritium rods GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_lithium, 1), new Object[] { ModItems.rod_empty, ModItems.lithium }); @@ -101,6 +141,26 @@ public class RodRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_mox_fuel, 1), new Object[] { ModItems.rod_quad_empty, ModItems.ingot_mox_fuel, ModItems.ingot_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_schrabidium_fuel, 1), new Object[] { ModItems.rod_quad_empty, ModItems.ingot_schrabidium_fuel, ModItems.ingot_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_balefire, 1), new Object[] { ModItems.rod_quad_empty, ModItems.egg_balefire_shard, ModItems.egg_balefire_shard, ModItems.egg_balefire_shard, ModItems.egg_balefire_shard }); + + //...with billets + RecipesCommon.addQuadRodBilletUnload(ModItems.billet_uranium, ModItems.rod_quad_uranium); + RecipesCommon.addQuadRodBilletUnload(ModItems.billet_u233, ModItems.rod_quad_u233); + RecipesCommon.addQuadRodBilletUnload(ModItems.billet_u235, ModItems.rod_quad_u235); + RecipesCommon.addQuadRodBilletUnload(ModItems.billet_u238, ModItems.rod_quad_u238); + RecipesCommon.addQuadRodBilletUnload(ModItems.billet_th232, ModItems.rod_quad_th232); + RecipesCommon.addQuadRodBilletUnload(ModItems.billet_plutonium, ModItems.rod_quad_plutonium); + RecipesCommon.addQuadRodBilletUnload(ModItems.billet_pu238, ModItems.rod_quad_pu238); + RecipesCommon.addQuadRodBilletUnload(ModItems.billet_pu239, ModItems.rod_quad_pu239); + RecipesCommon.addQuadRodBilletUnload(ModItems.billet_pu240, ModItems.rod_quad_pu240); + RecipesCommon.addQuadRodBilletUnload(ModItems.billet_neptunium, ModItems.rod_quad_neptunium); + RecipesCommon.addQuadRodBilletUnload(ModItems.billet_polonium, ModItems.rod_quad_polonium); + RecipesCommon.addQuadRodBilletUnload(ModItems.billet_schrabidium, ModItems.rod_quad_schrabidium); + RecipesCommon.addQuadRodBilletUnload(ModItems.billet_solinium, ModItems.rod_quad_solinium); + RecipesCommon.addQuadRodBillet(ModItems.billet_uranium_fuel, ModItems.rod_quad_uranium_fuel); + RecipesCommon.addQuadRodBillet(ModItems.billet_thorium_fuel, ModItems.rod_quad_thorium_fuel); + RecipesCommon.addQuadRodBillet(ModItems.billet_plutonium_fuel, ModItems.rod_quad_plutonium_fuel); + RecipesCommon.addQuadRodBillet(ModItems.billet_mox_fuel, ModItems.rod_quad_mox_fuel); + RecipesCommon.addQuadRodBillet(ModItems.billet_schrabidium_fuel, ModItems.rod_quad_schrabidium_fuel); //Water rods GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_water, 1), new Object[] { ModItems.rod_empty, Items.water_bucket }); @@ -108,20 +168,7 @@ public class RodRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_water, 1), new Object[] { ModItems.rod_quad_empty, Items.water_bucket, Items.water_bucket, Items.water_bucket, Items.water_bucket }); //Rod recycling - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_th232, 6), new Object[] { ModItems.rod_th232 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium, 6), new Object[] { ModItems.rod_uranium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_u233, 6), new Object[] { ModItems.rod_u233 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_u235, 6), new Object[] { ModItems.rod_u235 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_u238, 6), new Object[] { ModItems.rod_u238 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_plutonium, 6), new Object[] { ModItems.rod_plutonium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_pu238, 6), new Object[] { ModItems.rod_pu238 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_pu239, 6), new Object[] { ModItems.rod_pu239 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_pu240, 6), new Object[] { ModItems.rod_pu240 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_neptunium, 6), new Object[] { ModItems.rod_neptunium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_polonium, 6), new Object[] { ModItems.rod_polonium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_lead, 6), new Object[] { ModItems.rod_lead }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium, 6), new Object[] { ModItems.rod_schrabidium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_solinium, 6), new Object[] { ModItems.rod_solinium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_australium, 6), new Object[] { ModItems.rod_australium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_weidanium, 6), new Object[] { ModItems.rod_weidanium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_reiium, 6), new Object[] { ModItems.rod_reiium }); @@ -132,37 +179,11 @@ public class RodRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.egg_balefire_shard, 1), new Object[] { ModItems.rod_balefire }); //Dual rod recycling - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_th232, 12), new Object[] { ModItems.rod_dual_th232 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium, 12), new Object[] { ModItems.rod_dual_uranium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_u233, 12), new Object[] { ModItems.rod_dual_u233 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_u235, 12), new Object[] { ModItems.rod_dual_u235 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_u238, 12), new Object[] { ModItems.rod_dual_u238 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_plutonium, 12), new Object[] { ModItems.rod_dual_plutonium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_pu238, 12), new Object[] { ModItems.rod_dual_pu238 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_pu239, 12), new Object[] { ModItems.rod_dual_pu239 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_pu240, 12), new Object[] { ModItems.rod_dual_pu240 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_neptunium, 12), new Object[] { ModItems.rod_dual_neptunium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_polonium, 12), new Object[] { ModItems.rod_dual_polonium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_lead, 12), new Object[] { ModItems.rod_dual_lead }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium, 12), new Object[] { ModItems.rod_dual_schrabidium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_solinium, 12), new Object[] { ModItems.rod_dual_solinium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.egg_balefire_shard, 2), new Object[] { ModItems.rod_dual_balefire }); //Quad rod recycling - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_th232, 24), new Object[] { ModItems.rod_quad_th232 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium, 24), new Object[] { ModItems.rod_quad_uranium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_u233, 24), new Object[] { ModItems.rod_quad_u233 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_u235, 24), new Object[] { ModItems.rod_quad_u235 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_u238, 24), new Object[] { ModItems.rod_quad_u238 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_plutonium, 24), new Object[] { ModItems.rod_quad_plutonium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_pu238, 24), new Object[] { ModItems.rod_quad_pu238 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_pu239, 24), new Object[] { ModItems.rod_quad_pu239 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_pu240, 24), new Object[] { ModItems.rod_quad_pu240 }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_neptunium, 24), new Object[] { ModItems.rod_quad_neptunium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_polonium, 24), new Object[] { ModItems.rod_quad_polonium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_lead, 24), new Object[] { ModItems.rod_quad_lead }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium, 24), new Object[] { ModItems.rod_quad_schrabidium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_solinium, 24), new Object[] { ModItems.rod_quad_solinium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.egg_balefire_shard, 4), new Object[] { ModItems.rod_quad_balefire }); //Waste rod recycling diff --git a/src/main/java/com/hbm/handler/EntityEffectHandler.java b/src/main/java/com/hbm/handler/EntityEffectHandler.java index 151b3f3f8..348e718c4 100644 --- a/src/main/java/com/hbm/handler/EntityEffectHandler.java +++ b/src/main/java/com/hbm/handler/EntityEffectHandler.java @@ -31,11 +31,8 @@ public class EntityEffectHandler { PacketDispatcher.wrapper.sendTo(new ExtPropPacket(data), (EntityPlayerMP) entity); } - if(HbmLivingProps.getRadiation(entity) > 0) - handleRadiation(entity); - - if(HbmLivingProps.getDigamma(entity) > 0) - handleDigamma(entity); + handleRadiation(entity); + handleDigamma(entity); } private static void handleRadiation(EntityLivingBase entity) { @@ -53,22 +50,19 @@ public class EntityEffectHandler { int iy = (int)MathHelper.floor_double(entity.posY); int iz = (int)MathHelper.floor_double(entity.posZ); - if(world.getTotalWorldTime() % 20 == 0) { + Chunk chunk = world.getChunkFromBlockCoords(ix, iz); + float rad = data.getRadNumFromCoord(chunk.xPosition, chunk.zPosition); - Chunk chunk = world.getChunkFromBlockCoords(ix, iz); - float rad = data.getRadNumFromCoord(chunk.xPosition, chunk.zPosition); - - if(world.provider.isHellWorld && RadiationConfig.hellRad > 0 && rad < RadiationConfig.hellRad) - rad = RadiationConfig.hellRad; - - if(rad > 0) { - ContaminationUtil.applyRadData(entity, rad); - } - - if(entity.worldObj.isRaining() && RadiationConfig.cont > 0 && AuxSavedData.getThunder(entity.worldObj) > 0 && entity.worldObj.canBlockSeeTheSky(ix, iy, iz)) { + if(world.provider.isHellWorld && RadiationConfig.hellRad > 0 && rad < RadiationConfig.hellRad) + rad = RadiationConfig.hellRad; - ContaminationUtil.applyRadData(entity, RadiationConfig.cont * 0.01F); - } + if(rad > 0) { + ContaminationUtil.applyRadData(entity, rad / 20F); + } + + if(entity.worldObj.isRaining() && RadiationConfig.cont > 0 && AuxSavedData.getThunder(entity.worldObj) > 0 && entity.worldObj.canBlockSeeTheSky(ix, iy, iz)) { + + ContaminationUtil.applyRadData(entity, RadiationConfig.cont * 0.0005F); } if(HbmLivingProps.getRadiation(entity) > 600 && world.getTotalWorldTime() % 600 == 0) { @@ -99,6 +93,9 @@ public class EntityEffectHandler { float digamma = HbmLivingProps.getDigamma(entity); + if(digamma == 0) + return; + int chance = Math.max(10 - (int)(digamma), 1); if(chance == 1 || entity.getRNG().nextInt(chance) == 0) { diff --git a/src/main/java/com/hbm/inventory/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/AssemblerRecipes.java index 1f5b52d69..8ba327a39 100644 --- a/src/main/java/com/hbm/inventory/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/AssemblerRecipes.java @@ -207,9 +207,6 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModItems.circuit_aluminium, 1), new AStack[] {new ComparableStack(ModItems.circuit_raw, 1), },50); makeRecipe(new ComparableStack(ModItems.circuit_copper, 1), new AStack[] {new ComparableStack(ModItems.circuit_aluminium, 1), new ComparableStack(ModItems.wire_copper, 4), new OreDictStack("dustNetherQuartz", 1), new OreDictStack("plateCopper", 1), },100); makeRecipe(new ComparableStack(ModItems.circuit_red_copper, 1), new AStack[] {new ComparableStack(ModItems.circuit_copper, 1), new ComparableStack(ModItems.wire_red_copper, 4), new OreDictStack("dustGold", 1), new ComparableStack(ModItems.plate_polymer, 1), },150); - makeRecipe(new ComparableStack(ModItems.pellet_rtg, 1), new AStack[] {new ComparableStack(ModItems.nugget_pu238, 5), new OreDictStack("plateIron", 2), },50); - makeRecipe(new ComparableStack(ModItems.pellet_rtg_weak, 1), new AStack[] {new ComparableStack(ModItems.nugget_u238, 4), new ComparableStack(ModItems.nugget_pu238, 1), new OreDictStack("plateIron", 2), },50); - makeRecipe(new ComparableStack(ModItems.pellet_rtg_polonium, 1), new AStack[] {new ComparableStack(ModItems.nugget_polonium, 5), new OreDictStack("plateIron", 2), }, 50); makeRecipe(new ComparableStack(ModItems.tritium_deuterium_cake, 1), new AStack[] {new ComparableStack(ModItems.cell_deuterium, 6), new ComparableStack(ModItems.cell_tritium, 2), new ComparableStack(ModItems.lithium, 4), },150); makeRecipe(new ComparableStack(ModItems.pellet_cluster, 1), new AStack[] {new OreDictStack("plateSteel", 4), new ComparableStack(Blocks.tnt, 1), }, 50); makeRecipe(new ComparableStack(ModItems.pellet_buckshot, 1), new AStack[] {new ComparableStack(ModItems.nugget_lead, 6), }, 50); diff --git a/src/main/java/com/hbm/inventory/CentrifugeRecipes.java b/src/main/java/com/hbm/inventory/CentrifugeRecipes.java index 66a3aa1d3..d44f74f65 100644 --- a/src/main/java/com/hbm/inventory/CentrifugeRecipes.java +++ b/src/main/java/com/hbm/inventory/CentrifugeRecipes.java @@ -22,8 +22,8 @@ public class CentrifugeRecipes { recipes.put(new ComparableStack(ModItems.waste_uranium), new ItemStack[] { new ItemStack(ModItems.nugget_u235, 1), - new ItemStack(ModItems.nugget_u238, 2), - new ItemStack(ModItems.nugget_pu239, 1), + new ItemStack(ModItems.nugget_u238, 1), + new ItemStack(ModItems.nugget_pu_mix, 2), new ItemStack(ModItems.nuclear_waste_tiny, 2) }); recipes.put(new ComparableStack(ModItems.waste_plutonium), new ItemStack[] { @@ -201,8 +201,9 @@ public class CentrifugeRecipes { new ItemStack(Blocks.netherrack) }); recipes.put(new ComparableStack(Items.blaze_rod), new ItemStack[] {new ItemStack(Items.blaze_powder, 1), new ItemStack(Items.blaze_powder, 1), new ItemStack(ModItems.powder_fire, 1), new ItemStack(ModItems.powder_fire, 1) }); - + recipes.put(new ComparableStack(ModItems.ingot_schraranium), new ItemStack[] { new ItemStack(ModItems.nugget_schrabidium, 2), new ItemStack(ModItems.nugget_schrabidium, 1), new ItemStack(ModItems.nugget_uranium, 3), new ItemStack(ModItems.nugget_plutonium, 2) }); + recipes.put(new ComparableStack(ModItems.ingot_pu_mix), new ItemStack[] { new ItemStack(ModItems.nugget_pu239, 2), new ItemStack(ModItems.nugget_pu239, 3), new ItemStack(ModItems.nugget_pu240, 2), new ItemStack(ModItems.nugget_pu240, 2) }); recipes.put(new ComparableStack(ModItems.crystal_iron), new ItemStack[] { new ItemStack(ModItems.powder_iron, 2), new ItemStack(ModItems.powder_iron, 2), new ItemStack(ModItems.powder_titanium, 1), new ItemStack(ModItems.powder_lithium_tiny, 1) }); recipes.put(new ComparableStack(ModItems.crystal_gold), new ItemStack[] { new ItemStack(ModItems.powder_gold, 2), new ItemStack(ModItems.powder_gold, 2), new ItemStack(ModItems.nugget_mercury, 1), new ItemStack(ModItems.powder_lithium_tiny, 1) }); diff --git a/src/main/java/com/hbm/inventory/MachineRecipes.java b/src/main/java/com/hbm/inventory/MachineRecipes.java index 6b14fb780..72033ce1e 100644 --- a/src/main/java/com/hbm/inventory/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/MachineRecipes.java @@ -162,16 +162,16 @@ public class MachineRecipes { switch(fluid) { case UF6: - list.add(new GasCentOutput(4, new ItemStack(ModItems.nugget_u238), 1)); - list.add(new GasCentOutput(4, new ItemStack(ModItems.nugget_u238), 2)); - list.add(new GasCentOutput(1, new ItemStack(ModItems.nugget_u235), 3)); - list.add(new GasCentOutput(1, new ItemStack(ModItems.fluorite), 4)); + list.add(new GasCentOutput(3, new ItemStack(ModItems.nugget_u238), 1)); + list.add(new GasCentOutput(3, new ItemStack(ModItems.nugget_u238), 2)); + list.add(new GasCentOutput(2, new ItemStack(ModItems.nugget_u238), 3)); + list.add(new GasCentOutput(1, new ItemStack(ModItems.nugget_u235), 4)); return list; case PUF6: - list.add(new GasCentOutput(3, new ItemStack(ModItems.nugget_pu238), 1)); - list.add(new GasCentOutput(2, new ItemStack(ModItems.nugget_pu239), 2)); - list.add(new GasCentOutput(4, new ItemStack(ModItems.nugget_pu240), 3)); - list.add(new GasCentOutput(1, new ItemStack(ModItems.fluorite), 4)); + list.add(new GasCentOutput(2, new ItemStack(ModItems.nugget_pu238), 1)); + list.add(new GasCentOutput(3, new ItemStack(ModItems.nugget_pu238), 2)); + list.add(new GasCentOutput(2, new ItemStack(ModItems.nugget_pu_mix), 3)); + list.add(new GasCentOutput(2, new ItemStack(ModItems.nugget_pu_mix), 4)); return list; case WATZ: list.add(new GasCentOutput(1, new ItemStack(ModItems.nugget_solinium), 1)); @@ -2189,10 +2189,10 @@ public class MachineRecipes { output[0] = new FluidStack(1000, FluidType.BIOFUEL); break; case UF6: - output[0] = new FluidStack(1000, FluidType.UF6); + output[0] = new FluidStack(900, FluidType.UF6); break; case PUF6: - output[0] = new FluidStack(1000, FluidType.PUF6); + output[0] = new FluidStack(900, FluidType.PUF6); break; case SAS3: output[0] = new FluidStack(1000, FluidType.SAS3); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 14f0cad4f..44cd42450 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -154,6 +154,7 @@ public class ModItems { public static Item billet_plutonium_fuel; public static Item billet_mox_fuel; public static Item billet_schrabidium_fuel; + public static Item billet_yharonite; public static Item nugget_th232; public static Item nugget_uranium; @@ -703,6 +704,8 @@ public class ModItems { public static Item radaway_strong; public static Item radaway_flush; public static Item radx; + public static Item xanax; + public static Item fmn; public static Item med_bag; public static Item pill_iodine; public static Item plan_c; @@ -2246,6 +2249,7 @@ public class ModItems { billet_plutonium_fuel = new ItemRadioactive(5.0F).setUnlocalizedName("billet_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_plutonium_fuel"); billet_mox_fuel = new ItemRadioactive(5.0F).setUnlocalizedName("billet_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_mox_fuel"); billet_schrabidium_fuel = new ItemRadioactive(7.5F, false, true).setUnlocalizedName("billet_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_schrabidium_fuel"); + billet_yharonite = new Item().setUnlocalizedName("billet_yharonite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_yharonite"); ingot_dura_steel = new ItemCustomLore().setUnlocalizedName("ingot_dura_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_dura_steel"); ingot_polymer = new ItemCustomLore().setUnlocalizedName("ingot_polymer").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_polymer"); @@ -2752,6 +2756,8 @@ public class ModItems { radaway_strong = new ItemSyringe().setUnlocalizedName("radaway_strong").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":radaway_strong"); radaway_flush = new ItemSyringe().setUnlocalizedName("radaway_flush").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":radaway_flush"); radx = new ItemPill(0).setUnlocalizedName("radx").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":radx"); + xanax = new ItemPill(0).setUnlocalizedName("xanax").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":xanax_2"); + fmn = new ItemPill(0).setUnlocalizedName("fmn").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":tablet"); pill_iodine = new ItemPill(0).setUnlocalizedName("pill_iodine").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pill_iodine"); plan_c = new ItemPill(0).setUnlocalizedName("plan_c").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":plan_c"); stealth_boy = new ItemStarterKit().setUnlocalizedName("stealth_boy").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":stealth_boy"); @@ -4576,6 +4582,7 @@ public class ModItems { GameRegistry.registerItem(billet_plutonium_fuel, billet_plutonium_fuel.getUnlocalizedName()); GameRegistry.registerItem(billet_mox_fuel, billet_mox_fuel.getUnlocalizedName()); GameRegistry.registerItem(billet_schrabidium_fuel, billet_schrabidium_fuel.getUnlocalizedName()); + GameRegistry.registerItem(billet_yharonite, billet_yharonite.getUnlocalizedName()); //Dusts % Other GameRegistry.registerItem(nugget_mercury, nugget_mercury.getUnlocalizedName()); @@ -6124,6 +6131,8 @@ public class ModItems { GameRegistry.registerItem(radaway_flush, radaway_flush.getUnlocalizedName()); GameRegistry.registerItem(radx, radx.getUnlocalizedName()); GameRegistry.registerItem(pill_iodine, pill_iodine.getUnlocalizedName()); + GameRegistry.registerItem(xanax, xanax.getUnlocalizedName()); + GameRegistry.registerItem(fmn, fmn.getUnlocalizedName()); GameRegistry.registerItem(plan_c, plan_c.getUnlocalizedName()); GameRegistry.registerItem(stealth_boy, stealth_boy.getUnlocalizedName()); GameRegistry.registerItem(gas_mask_filter, gas_mask_filter.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/food/ItemPill.java b/src/main/java/com/hbm/items/food/ItemPill.java index c4e9afb5c..97f971fb2 100644 --- a/src/main/java/com/hbm/items/food/ItemPill.java +++ b/src/main/java/com/hbm/items/food/ItemPill.java @@ -3,6 +3,7 @@ package com.hbm.items.food; import java.util.List; import java.util.Random; +import com.hbm.extprop.HbmLivingProps; import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; import com.hbm.potion.HbmPotion; @@ -18,42 +19,50 @@ public class ItemPill extends ItemFood { public ItemPill(int hunger) { super(hunger, false); - this.setAlwaysEdible(); + this.setAlwaysEdible(); } - + Random rand = new Random(); @Override - protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) - { - if (!world.isRemote) - { - if(this == ModItems.pill_iodine) { - player.removePotionEffect(Potion.blindness.id); - player.removePotionEffect(Potion.confusion.id); - player.removePotionEffect(Potion.digSlowdown.id); - player.removePotionEffect(Potion.hunger.id); - player.removePotionEffect(Potion.moveSlowdown.id); - player.removePotionEffect(Potion.poison.id); - player.removePotionEffect(Potion.weakness.id); - player.removePotionEffect(Potion.wither.id); - player.removePotionEffect(HbmPotion.radiation.id); - } + protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) { + if(!world.isRemote) { + if(this == ModItems.pill_iodine) { + player.removePotionEffect(Potion.blindness.id); + player.removePotionEffect(Potion.confusion.id); + player.removePotionEffect(Potion.digSlowdown.id); + player.removePotionEffect(Potion.hunger.id); + player.removePotionEffect(Potion.moveSlowdown.id); + player.removePotionEffect(Potion.poison.id); + player.removePotionEffect(Potion.weakness.id); + player.removePotionEffect(Potion.wither.id); + player.removePotionEffect(HbmPotion.radiation.id); + } - if(this == ModItems.plan_c) { - for(int i = 0; i < 10; i++) - player.attackEntityFrom(rand.nextBoolean() ? ModDamageSource.euthanizedSelf : ModDamageSource.euthanizedSelf2, 1000); - } + if(this == ModItems.plan_c) { + for(int i = 0; i < 10; i++) + player.attackEntityFrom(rand.nextBoolean() ? ModDamageSource.euthanizedSelf : ModDamageSource.euthanizedSelf2, 1000); + } + + if(this == ModItems.radx) { + player.addPotionEffect(new PotionEffect(HbmPotion.radx.id, 3 * 60 * 20, 0)); + } + + if(this == ModItems.xanax) { + float digamma = HbmLivingProps.getDigamma(player); + HbmLivingProps.setDigamma(player, Math.max(digamma - 0.5F, 0F)); + } + + if(this == ModItems.fmn) { + float digamma = HbmLivingProps.getDigamma(player); + HbmLivingProps.setDigamma(player, Math.min(digamma, 2F)); + player.addPotionEffect(new PotionEffect(Potion.blindness.id, 60, 0)); + } + } + } - if(this == ModItems.radx) { - player.addPotionEffect(new PotionEffect(HbmPotion.radx.id, 3 * 60 * 20, 0)); - } - } - } - @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) - { + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { if(this == ModItems.pill_iodine) { list.add("Removes negative effects"); } @@ -63,6 +72,12 @@ public class ItemPill extends ItemFood { if(this == ModItems.radx) { list.add("Increases radiation resistance by 0.4 for 3 minutes"); } + if(this == ModItems.xanax) { + list.add("Removes 500mDRX"); + } + if(this == ModItems.fmn) { + list.add("Removes all DRX above 2,000mDRX"); + } } @Override @@ -72,7 +87,7 @@ public class ItemPill extends ItemFood { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - + p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); return p_77659_1_; diff --git a/src/main/java/com/hbm/items/special/ItemCustomLore.java b/src/main/java/com/hbm/items/special/ItemCustomLore.java index db65597bb..b416a394c 100644 --- a/src/main/java/com/hbm/items/special/ItemCustomLore.java +++ b/src/main/java/com/hbm/items/special/ItemCustomLore.java @@ -391,6 +391,10 @@ public class ItemCustomLore extends Item { if(this == ModItems.nugget_mox_fuel) { list.add("Moxie says: " + EnumChatFormatting.BOLD + "TAX EVASION."); } + + if(this == ModItems.billet_mox_fuel) { + list.add(EnumChatFormatting.ITALIC + "Pocket-Moxie!"); + } } @Override diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 00cd74035..143cf85e0 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -573,8 +573,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.decon, 1), new Object[] { "BGB", "SAS", "BSB", 'B', "ingotBeryllium", 'G', Blocks.iron_bars, 'S', "ingotSteel", 'A', ModBlocks.absorber })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_amgen, 1), new Object[] { "ITI", "TAT", "ITI", 'I', "ingotAdvanced", 'T', ModItems.thermo_element, 'A', ModBlocks.absorber })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_geo, 1), new Object[] { "ITI", "PCP", "ITI", 'I', "ingotDuraSteel", 'T', ModItems.thermo_element, 'P', ModItems.board_copper, 'C', ModBlocks.red_wire_coated })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_minirtg, 1), new Object[] { "LLL", "PPP", "TRT", 'L', "plateLead", 'P', "Pu238", 'T', ModItems.thermo_element, 'R', ModItems.rtg_unit })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_powerrtg, 1), new Object[] { "SRS", "PTP", "SRS", 'S', ModItems.ingot_starmetal, 'R', ModItems.rtg_unit, 'P', "ingotPolonium", 'T', ModItems.powder_tennessine })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_minirtg, 1), new Object[] { "LLL", "PPP", "TRT", 'L', "plateLead", 'P', ModItems.billet_pu238, 'T', ModItems.thermo_element, 'R', ModItems.rtg_unit })); + GameRegistry.addRecipe(new ItemStack(ModBlocks.machine_powerrtg, 1), new Object[] { "SRS", "PTP", "SRS", 'S', ModItems.ingot_starmetal, 'R', ModItems.rtg_unit, 'P', ModItems.billet_polonium, 'T', ModItems.powder_tennessine }); GameRegistry.addRecipe(new ItemStack(ModBlocks.pink_planks, 4), new Object[] { "W", 'W', ModBlocks.pink_log }); GameRegistry.addRecipe(new ItemStack(ModBlocks.pink_slab, 6), new Object[] { "WWW", 'W', ModBlocks.pink_planks });