diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index fe321ebed..d50969699 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -58,7 +58,7 @@ public class MineralRecipes { add1To9Pair(ModItems.ingot_co60, ModItems.nugget_co60); add1To9Pair(ModItems.ingot_sr90, ModItems.nugget_sr90); add1To9Pair(ModItems.ingot_au198, ModItems.nugget_au198); - add1To9Pair(ModItems.ingot_pb200, ModItems.nugget_pb200); + add1To9Pair(ModItems.ingot_pb209, ModItems.nugget_pb209); add1To9Pair(ModItems.ingot_ra226, ModItems.nugget_ra226); add1To9Pair(ModItems.ingot_pu241, ModItems.nugget_pu241); @@ -104,7 +104,7 @@ public class MineralRecipes { addBillet(ModItems.billet_polonium, ModItems.ingot_polonium, ModItems.nugget_polonium, "nuggetPolonium"); addBillet(ModItems.billet_technetium, ModItems.ingot_technetium, ModItems.nugget_technetium, "nuggetTechnetium"); addBillet(ModItems.billet_au198, ModItems.ingot_au198, ModItems.nugget_au198, "nuggetGold198"); - addBillet(ModItems.billet_pb200, ModItems.ingot_pb200, ModItems.nugget_pb200, "nuggetLead200"); + addBillet(ModItems.billet_pb209, ModItems.ingot_pb209, ModItems.nugget_pb209, "nuggetLead200"); addBillet(ModItems.billet_ra226, ModItems.ingot_ra226, ModItems.nugget_ra226, "nuggetRa226"); addBillet(ModItems.billet_schrabidium, ModItems.ingot_schrabidium, ModItems.nugget_schrabidium, "nuggetSchrabidium"); addBillet(ModItems.billet_solinium, ModItems.ingot_solinium, ModItems.nugget_solinium, "nuggetSolinium"); @@ -205,7 +205,7 @@ public class MineralRecipes { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_weak), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_pu238, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_strontium), new Object[] { ModItems.billet_sr90, ModItems.billet_sr90, ModItems.billet_sr90, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_polonium), new Object[] { ModItems.billet_polonium, ModItems.billet_polonium, ModItems.billet_polonium, "plateIron" })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_lead), new Object[] { ModItems.billet_pb200, ModItems.billet_pb200, ModItems.billet_pb200, "plateIron" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_lead), new Object[] { ModItems.billet_pb209, ModItems.billet_pb209, ModItems.billet_pb209, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_gold), new Object[] { ModItems.billet_au198, ModItems.billet_au198, ModItems.billet_au198, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_americium), new Object[] { ModItems.billet_am241, ModItems.billet_am241, ModItems.billet_am241, "plateIron" })); diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index 909caa30e..fcf062d4d 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -25,6 +25,7 @@ public class HazardRegistry { //XE135 9h β− aaaaaaaaaaaaaaaa //CS137 30a β− 020.00Rad/s Spicy //AU198 64h β− 500.00Rad/s 2 much spice :( + //PB209 3h β− 5,000.00Rad/s mama mia my face is melting off //AT209 5h β+ like 2k or sth idk bruv //PO210 138d α 075.00Rad/s Spicy //RA226 1,600a α 007.50Rad/s @@ -64,7 +65,7 @@ public class HazardRegistry { public static final float xe135 = 1250.0F; public static final float cs137 = 20.0F; public static final float au198 = 500.0F; - public static final float pb200 = 1500.0F; + public static final float pb209 = 5000.0F; public static final float at209 = 2000.0F; public static final float po210 = 75.0F; public static final float ra226 = 7.5F; @@ -246,6 +247,7 @@ public class HazardRegistry { registerOtherFuel(plate_fuel_pu239, pu239 * ingot, pu239 * ingot * 100, false); registerOtherFuel(plate_fuel_sa326, sa326 * ingot, sa326 * ingot * 100, true); registerOtherFuel(plate_fuel_ra226be, rabe * ingot, po210 * nugget * 3, false); + registerOtherFuel(plate_fuel_pu238be, pube * ingot, pu238 * nugget, false); registerOtherWaste(waste_plate_u233, u233 * ingot * 100); registerOtherWaste(waste_plate_u235, u235 * ingot * 100); @@ -313,7 +315,7 @@ public class HazardRegistry { HazardSystem.register(pellet_rtg_weak, makeData(RADIATION, (pu238 + (u238 * 2)) * billet)); HazardSystem.register(pellet_rtg_strontium, makeData(RADIATION, sr90 * rtg)); HazardSystem.register(pellet_rtg_polonium, new HazardData().addEntry(RADIATION, po210 * rtg).addEntry(HOT, 3F)); - HazardSystem.register(pellet_rtg_lead, new HazardData().addEntry(RADIATION, pb200 * rtg).addEntry(HOT, 7F)); + HazardSystem.register(pellet_rtg_lead, new HazardData().addEntry(RADIATION, pb209 * rtg).addEntry(HOT, 7F)); HazardSystem.register(pellet_rtg_gold, new HazardData().addEntry(RADIATION, au198 * rtg).addEntry(HOT, 5F)); HazardSystem.register(pellet_rtg_americium, makeData(RADIATION, am241 * rtg)); diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index e69742a4a..5e5103594 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -114,7 +114,7 @@ public class OreDictManager { public static final DictFrame RA226 = new DictFrame("Radium226", "Ra226"); public static final DictFrame CO60 = new DictFrame("Cobalt60", "Co60"); public static final DictFrame AU198 = new DictFrame("Gold198", "Au198"); - public static final DictFrame PB200 = new DictFrame("Lead200", "Pb200"); + public static final DictFrame PB209 = new DictFrame("Lead200", "Pb200"); public static final DictFrame SA326 = new DictFrame("Schrabidium"); public static final DictFrame SA327 = new DictFrame("Solinium"); public static final DictFrame SBD = new DictFrame("Schrabidate"); @@ -249,7 +249,7 @@ public class OreDictManager { RA226 .rad(HazardRegistry.ra226) .nugget(nugget_ra226) .billet(billet_ra226) .ingot(ingot_ra226) .dust(powder_ra226) .block(block_ra226); CO60 .rad(HazardRegistry.co60) .hot(1) .nugget(nugget_co60) .billet(billet_co60) .ingot(ingot_co60) .dust(powder_co60); AU198 .rad(HazardRegistry.au198) .hot(5) .nugget(nugget_au198) .billet(billet_au198) .ingot(ingot_au198) .dust(powder_au198); - PB200 .rad(HazardRegistry.pb200) .hot(7) .nugget(nugget_pb200) .billet(billet_pb200) .ingot(ingot_pb200); + PB209 .rad(HazardRegistry.pb209) .hot(7) .nugget(nugget_pb209) .billet(billet_pb209) .ingot(ingot_pb209); SA326 .rad(HazardRegistry.sa326) .blinding(3F) .nugget(nugget_schrabidium) .billet(billet_schrabidium) .ingot(ingot_schrabidium) .dust(powder_schrabidium) .plate(plate_schrabidium) .block(block_schrabidium) .ore(ore_schrabidium, ore_gneiss_schrabidium, ore_nether_schrabidium); SA327 .rad(HazardRegistry.sa327) .blinding(3F) .nugget(nugget_solinium) .billet(billet_solinium) .ingot(ingot_solinium) .block(block_solinium); SBD .rad(HazardRegistry.sb) .blinding(1F) .ingot(ingot_schrabidate) .dust(powder_schrabidate) .block(block_schrabidate); diff --git a/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java b/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java index 3a35e56f8..924aac9c4 100644 --- a/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java @@ -77,6 +77,12 @@ public class CentrifugeRecipes { new ItemStack(ModItems.powder_cs137_tiny, 1), new ItemStack(ModItems.nuclear_waste_tiny, 4) }); + recipes.put(new ComparableStack(ModItems.waste_plate_pu238be), new ItemStack[] { + new ItemStack(ModItems.nugget_beryllium, 1), + new ItemStack(ModItems.nugget_pu238, 1), + new ItemStack(ModItems.powder_coal_tiny, 2), + new ItemStack(ModItems.nugget_lead, 2) }); + recipes.put(new ComparableStack(ModItems.waste_plate_pu239), new ItemStack[] { new ItemStack(ModItems.nugget_pu240, 2), new ItemStack(ModItems.nugget_technetium, 1), diff --git a/src/main/java/com/hbm/inventory/recipes/FuelPoolRecipes.java b/src/main/java/com/hbm/inventory/recipes/FuelPoolRecipes.java index ef3d35914..aeb2926d1 100644 --- a/src/main/java/com/hbm/inventory/recipes/FuelPoolRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/FuelPoolRecipes.java @@ -26,5 +26,6 @@ public class FuelPoolRecipes { recipes.put(new ComparableStack(new ItemStack(ModItems.waste_plate_pu239, 1, 1)), new ItemStack(ModItems.waste_plate_pu239)); recipes.put(new ComparableStack(new ItemStack(ModItems.waste_plate_sa326, 1, 1)), new ItemStack(ModItems.waste_plate_sa326)); recipes.put(new ComparableStack(new ItemStack(ModItems.waste_plate_ra226be, 1, 1)), new ItemStack(ModItems.waste_plate_ra226be)); + recipes.put(new ComparableStack(new ItemStack(ModItems.waste_plate_pu238be, 1, 1)), new ItemStack(ModItems.waste_plate_pu238be)); } } diff --git a/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java index b14675639..2a47758b3 100644 --- a/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java @@ -217,19 +217,21 @@ public class SILEXRecipes { // LEAUS // recipes.put(new ComparableStack(ModItems.rbmk_pellet_leaus, 1, i), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_australium_lesser), 90 - i * 20)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pb200), 10 + 20 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 5 + 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pb209), 5 + 10 * i)) ); recipes.put(new ComparableStack(ModItems.rbmk_pellet_leaus, 1, i + 5), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_australium_lesser), 89 - i * 20)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pb200), 10 + 20 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 5 + 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pb209), 5 + 10 * i)) ); // HEAUS // recipes.put(new ComparableStack(ModItems.rbmk_pellet_heaus, 1, i), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_australium_lesser), 90 - i * 20)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_au198), 5 + 10 * i)) .addOut(new WeightedRandomObject(new ItemStack(Items.gold_nugget), 3 + 6 * i)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pb200), 2 + 4 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pb209), 2 + 4 * i)) ); recipes.put(new ComparableStack(ModItems.rbmk_pellet_heaus, 1, i + 5), new SILEXRecipe(600, 100) @@ -237,7 +239,7 @@ public class SILEXRecipes { .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_australium_lesser), 89 - i * 20)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_au198), 5 + 10 * i)) .addOut(new WeightedRandomObject(new ItemStack(Items.gold_nugget), 3 + 6 * i)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pb200), 2 + 4 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pb209), 2 + 4 * i)) ); // BALEFIRE // recipes.put(new ComparableStack(ModItems.rbmk_pellet_balefire, 1, i), new SILEXRecipe(400, 100) diff --git a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java index f56fbef3e..623067584 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -280,6 +280,7 @@ public class AnvilRecipes { constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.ingot_pu239, 1), new AnvilOutput(new ItemStack(ModItems.plate_fuel_pu239))).setTier(4)); constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.ingot_schrabidium, 1), new AnvilOutput(new ItemStack(ModItems.plate_fuel_sa326))).setTier(4)); constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.billet_ra226be, 1), new AnvilOutput(new ItemStack(ModItems.plate_fuel_ra226be))).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.billet_pu238be, 1), new AnvilOutput(new ItemStack(ModItems.plate_fuel_pu238be))).setTier(4)); } public static void registerConstructionAmmo() { diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index c379435d1..3a81b446c 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -84,7 +84,7 @@ public class ModItems { public static Item ingot_co60; public static Item ingot_sr90; public static Item ingot_au198; - public static Item ingot_pb200; + public static Item ingot_pb209; public static Item ingot_ra226; public static Item ingot_titanium; public static Item ingot_cobalt; @@ -191,7 +191,7 @@ public class ModItems { public static Item billet_co60; public static Item billet_sr90; public static Item billet_au198; - public static Item billet_pb200; + public static Item billet_pb209; public static Item billet_ra226; public static Item billet_schrabidium; public static Item billet_solinium; @@ -241,7 +241,7 @@ public class ModItems { public static Item nugget_co60; public static Item nugget_sr90; public static Item nugget_au198; - public static Item nugget_pb200; + public static Item nugget_pb209; public static Item nugget_ra226; public static Item plate_titanium; public static Item plate_aluminium; @@ -1007,8 +1007,9 @@ public class ModItems { public static Item waste_plate_u235; public static Item waste_plate_mox; public static Item waste_plate_pu239; - public static Item waste_plate_ra226be; public static Item waste_plate_sa326; + public static Item waste_plate_ra226be; + public static Item waste_plate_pu238be; public static Item pile_rod_uranium; public static Item pile_rod_plutonium; @@ -1019,8 +1020,9 @@ public class ModItems { public static Item plate_fuel_u235; public static Item plate_fuel_mox; public static Item plate_fuel_pu239; - public static Item plate_fuel_ra226be; public static Item plate_fuel_sa326; + public static Item plate_fuel_ra226be; + public static Item plate_fuel_pu238be; public static Item rbmk_lid; public static Item rbmk_lid_glass; @@ -1810,6 +1812,7 @@ public class ModItems { public static Item battery_sc_polonium; public static Item battery_sc_gold; public static Item battery_sc_americium; + public static Item battery_sc_lead; public static Item battery_su; public static Item battery_su_l; @@ -2500,7 +2503,7 @@ public class ModItems { ingot_co60 = new Item().setUnlocalizedName("ingot_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_co60"); ingot_sr90 = new Item().setUnlocalizedName("ingot_sr90").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_sr90"); ingot_au198 = new Item().setUnlocalizedName("ingot_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_au198"); - ingot_pb200 = new Item().setUnlocalizedName("ingot_pb200").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pb200"); + ingot_pb209 = new Item().setUnlocalizedName("ingot_pb209").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pb209"); ingot_ra226 = new Item().setUnlocalizedName("ingot_ra226").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_ra226"); 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"); @@ -2597,7 +2600,7 @@ public class ModItems { billet_co60 = new Item().setUnlocalizedName("billet_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_co60"); billet_sr90 = new Item().setUnlocalizedName("billet_sr90").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_sr90"); billet_au198 = new Item().setUnlocalizedName("billet_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_au198"); - billet_pb200 = new Item().setUnlocalizedName("billet_pb200").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pb200"); + billet_pb209 = new Item().setUnlocalizedName("billet_pb209").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pb209"); billet_ra226 = new Item().setUnlocalizedName("billet_ra226").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_ra226"); billet_schrabidium = new Item().setUnlocalizedName("billet_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_schrabidium"); billet_solinium = new Item().setUnlocalizedName("billet_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_solinium"); @@ -2709,7 +2712,7 @@ public class ModItems { nugget_co60 = new Item().setUnlocalizedName("nugget_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_co60"); nugget_sr90 = new Item().setUnlocalizedName("nugget_sr90").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_sr90"); nugget_au198 = new Item().setUnlocalizedName("nugget_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_au198"); - nugget_pb200 = new Item().setUnlocalizedName("nugget_pb200").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pb200"); + nugget_pb209 = new Item().setUnlocalizedName("nugget_pb209").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pb209"); nugget_ra226 = new Item().setUnlocalizedName("nugget_ra226").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_ra226"); 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"); @@ -3059,7 +3062,7 @@ public class ModItems { pellet_rtg_polonium = new ItemRTGPellet(25).setUnlocalizedName("pellet_rtg_polonium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_polonium"); pellet_rtg_actinium = new ItemRTGPellet(20).setUnlocalizedName("pellet_rtg_actinium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_actinium"); pellet_rtg_strontium = new ItemRTGPellet(15).setUnlocalizedName("pellet_rtg_strontium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_strontium"); - pellet_rtg_lead = new ItemRTGPellet(200).setUnlocalizedName("pellet_rtg_lead").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_lead"); + pellet_rtg_lead = new ItemRTGPellet(250).setUnlocalizedName("pellet_rtg_lead").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_lead"); pellet_rtg_gold = new ItemRTGPellet(150).setUnlocalizedName("pellet_rtg_gold").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_gold"); pellet_rtg_americium = new ItemRTGPellet(15).setUnlocalizedName("pellet_rtg_americium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_americium"); pellet_rtg_berkelium = new ItemRTGPellet(20).setUnlocalizedName("pellet_rtg_berkelium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_berkelium"); @@ -3464,8 +3467,9 @@ public class ModItems { waste_plate_u235 = new ItemDepletedFuel().setUnlocalizedName("waste_plate_u235").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_uranium"); waste_plate_mox = new ItemDepletedFuel().setUnlocalizedName("waste_plate_mox").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_mox"); waste_plate_pu239 = new ItemDepletedFuel().setUnlocalizedName("waste_plate_pu239").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_mox"); - waste_plate_ra226be = new ItemDepletedFuel().setUnlocalizedName("waste_plate_ra226be").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_ra226be"); waste_plate_sa326 = new ItemDepletedFuel().setUnlocalizedName("waste_plate_sa326").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_sa326"); + waste_plate_ra226be = new ItemDepletedFuel().setUnlocalizedName("waste_plate_ra226be").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_ra226be"); + waste_plate_pu238be = new ItemDepletedFuel().setUnlocalizedName("waste_plate_pu238be").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":waste_plate_pu238be"); pile_rod_uranium = new ItemPileRod().setUnlocalizedName("pile_rod_uranium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pile_rod_uranium"); pile_rod_plutonium = new ItemPileRod().setUnlocalizedName("pile_rod_plutonium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pile_rod_plutonium"); @@ -3476,8 +3480,9 @@ public class ModItems { plate_fuel_u235 = new ItemPlateFuel(2200000).setFunction(FunctionEnum.SQUARE_ROOT, 40).setUnlocalizedName("plate_fuel_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_u235"); plate_fuel_mox = new ItemPlateFuel(2400000).setFunction(FunctionEnum.LOGARITHM, 50).setUnlocalizedName("plate_fuel_mox").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_mox"); plate_fuel_pu239 = new ItemPlateFuel(2000000).setFunction(FunctionEnum.NEGATIVE_QUADRATIC, 25).setUnlocalizedName("plate_fuel_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_pu239"); + plate_fuel_sa326 = new ItemPlateFuel(2000000).setFunction(FunctionEnum.LINEAR, 80).setUnlocalizedName("plate_fuel_sa326").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_sa326"); plate_fuel_ra226be = new ItemPlateFuel(1300000).setFunction(FunctionEnum.PASSIVE, 30).setUnlocalizedName("plate_fuel_ra226be").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_ra226be"); - plate_fuel_sa326 = new ItemPlateFuel(2000000).setFunction(FunctionEnum.LINEAR, 60).setUnlocalizedName("plate_fuel_sa326").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_sa326"); + plate_fuel_pu238be = new ItemPlateFuel(1000000).setFunction(FunctionEnum.PASSIVE, 50).setUnlocalizedName("plate_fuel_pu238be").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":plate_fuel_pu238be"); rbmk_lid = new ItemRBMKLid().setUnlocalizedName("rbmk_lid").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rbmk_lid"); rbmk_lid_glass = new ItemRBMKLid().setUnlocalizedName("rbmk_lid_glass").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rbmk_lid_glass"); @@ -4406,7 +4411,8 @@ public class ModItems { battery_sc_polonium = new ItemSelfcharger(500).setUnlocalizedName("battery_sc_polonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_polonium"); battery_sc_gold = new ItemSelfcharger(2500).setUnlocalizedName("battery_sc_gold").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_gold"); battery_sc_americium = new ItemSelfcharger(10000).setUnlocalizedName("battery_sc_americium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_americium"); - + battery_sc_lead = new ItemSelfcharger(20000).setUnlocalizedName("battery_sc_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_lead"); + battery_potato = new ItemBattery(1000, 0, 100).setUnlocalizedName("battery_potato").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_potato"); battery_potatos = new ItemPotatos(500000, 0, 100).setUnlocalizedName("battery_potatos").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_potatos"); battery_su = new ItemBattery(50000, 0, 1000).setUnlocalizedName("battery_su").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_su"); @@ -5470,7 +5476,7 @@ public class ModItems { GameRegistry.registerItem(ingot_co60, ingot_co60.getUnlocalizedName()); GameRegistry.registerItem(ingot_sr90, ingot_sr90.getUnlocalizedName()); GameRegistry.registerItem(ingot_au198, ingot_au198.getUnlocalizedName()); - GameRegistry.registerItem(ingot_pb200, ingot_pb200.getUnlocalizedName()); + GameRegistry.registerItem(ingot_pb209, ingot_pb209.getUnlocalizedName()); GameRegistry.registerItem(ingot_ra226, ingot_ra226.getUnlocalizedName()); GameRegistry.registerItem(ingot_titanium, ingot_titanium.getUnlocalizedName()); GameRegistry.registerItem(ingot_copper, ingot_copper.getUnlocalizedName()); @@ -5565,7 +5571,7 @@ public class ModItems { GameRegistry.registerItem(billet_co60, billet_co60.getUnlocalizedName()); GameRegistry.registerItem(billet_sr90, billet_sr90.getUnlocalizedName()); GameRegistry.registerItem(billet_au198, billet_au198.getUnlocalizedName()); - GameRegistry.registerItem(billet_pb200, billet_pb200.getUnlocalizedName()); + GameRegistry.registerItem(billet_pb209, billet_pb209.getUnlocalizedName()); GameRegistry.registerItem(billet_ra226, billet_ra226.getUnlocalizedName()); GameRegistry.registerItem(billet_schrabidium, billet_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(billet_solinium, billet_solinium.getUnlocalizedName()); @@ -5785,7 +5791,7 @@ public class ModItems { GameRegistry.registerItem(nugget_sr90, nugget_sr90.getUnlocalizedName()); GameRegistry.registerItem(nugget_technetium, nugget_technetium.getUnlocalizedName()); GameRegistry.registerItem(nugget_au198, nugget_au198.getUnlocalizedName()); - GameRegistry.registerItem(nugget_pb200, nugget_pb200.getUnlocalizedName()); + GameRegistry.registerItem(nugget_pb209, nugget_pb209.getUnlocalizedName()); GameRegistry.registerItem(nugget_ra226, nugget_ra226.getUnlocalizedName()); GameRegistry.registerItem(nugget_lead, nugget_lead.getUnlocalizedName()); GameRegistry.registerItem(nugget_bismuth, nugget_bismuth.getUnlocalizedName()); @@ -6235,6 +6241,7 @@ public class ModItems { GameRegistry.registerItem(battery_sc_polonium, battery_sc_polonium.getUnlocalizedName()); GameRegistry.registerItem(battery_sc_gold, battery_sc_gold.getUnlocalizedName()); GameRegistry.registerItem(battery_sc_americium, battery_sc_americium.getUnlocalizedName()); + GameRegistry.registerItem(battery_sc_lead, battery_sc_lead.getUnlocalizedName()); GameRegistry.registerItem(hev_battery, hev_battery.getUnlocalizedName()); GameRegistry.registerItem(fusion_core, fusion_core.getUnlocalizedName()); GameRegistry.registerItem(energy_core, energy_core.getUnlocalizedName()); @@ -6476,6 +6483,7 @@ public class ModItems { GameRegistry.registerItem(waste_plate_pu239, waste_plate_pu239.getUnlocalizedName()); GameRegistry.registerItem(waste_plate_ra226be, waste_plate_ra226be.getUnlocalizedName()); GameRegistry.registerItem(waste_plate_sa326, waste_plate_sa326.getUnlocalizedName()); + GameRegistry.registerItem(waste_plate_pu238be, waste_plate_pu238be.getUnlocalizedName()); //Pile parts GameRegistry.registerItem(pile_rod_uranium, pile_rod_uranium.getUnlocalizedName()); @@ -6488,8 +6496,9 @@ public class ModItems { GameRegistry.registerItem(plate_fuel_u235, plate_fuel_u235.getUnlocalizedName()); GameRegistry.registerItem(plate_fuel_mox, plate_fuel_mox.getUnlocalizedName()); GameRegistry.registerItem(plate_fuel_pu239, plate_fuel_pu239.getUnlocalizedName()); - GameRegistry.registerItem(plate_fuel_ra226be, plate_fuel_ra226be.getUnlocalizedName()); GameRegistry.registerItem(plate_fuel_sa326, plate_fuel_sa326.getUnlocalizedName()); + GameRegistry.registerItem(plate_fuel_ra226be, plate_fuel_ra226be.getUnlocalizedName()); + GameRegistry.registerItem(plate_fuel_pu238be, plate_fuel_pu238be.getUnlocalizedName()); //RBMK parts GameRegistry.registerItem(rbmk_lid, rbmk_lid.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 0c12ef230..260f129df 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -514,6 +514,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.battery_sc_polonium), new Object[] { "NBN", "PCP", "NBN", 'N', TC99.nugget(), 'B', PO210.billet(), 'P', POLYMER.ingot(), 'C', ModItems.battery_sc_plutonium }); addRecipeAuto(new ItemStack(ModItems.battery_sc_gold), new Object[] { "NBN", "PCP", "NBN", 'N', TA.nugget(), 'B', AU198.billet(), 'P', POLYMER.ingot(), 'C', ModItems.battery_sc_polonium }); addRecipeAuto(new ItemStack(ModItems.battery_sc_americium), new Object[] { "NBN", "PCP", "NBN", 'N', TA.nugget(), 'B', AM241.billet(), 'P', POLYMER.ingot(), 'C', ModItems.battery_sc_gold }); + addRecipeAuto(new ItemStack(ModItems.battery_sc_lead), new Object[] { "NBN", "PCP", "NBN", 'N', TA.nugget(), 'B', PB209.billet(), 'P', POLYMER.ingot(), 'C', ModItems.battery_sc_americium }); addRecipeAuto(new ItemStack(ModItems.wiring_red_copper, 1), new Object[] { "PPP", "PIP", "PPP", 'P', STEEL.plate(), 'I', STEEL.ingot() }); addRecipeAuto(new ItemStack(ModItems.tank_waste, 1), new Object[] { "PTP", "PTP", "PTP", 'T', ModItems.tank_steel, 'P', STEEL.plate() }); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java index 324fc2005..5950b7a9c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java @@ -67,6 +67,7 @@ public class TileEntityReactorResearch extends TileEntityMachineBase implements fuelMap.put(new ComparableStack(ModItems.plate_fuel_pu239), new ItemStack(ModItems.waste_plate_pu239, 1, 1)); fuelMap.put(new ComparableStack(ModItems.plate_fuel_sa326), new ItemStack(ModItems.waste_plate_sa326, 1, 1)); fuelMap.put(new ComparableStack(ModItems.plate_fuel_ra226be), new ItemStack(ModItems.waste_plate_ra226be, 1, 1)); + fuelMap.put(new ComparableStack(ModItems.plate_fuel_pu238be), new ItemStack(ModItems.waste_plate_pu238be, 1, 1)); } public String getName() { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java b/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java index 4a068d500..e26bdd442 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java @@ -98,9 +98,13 @@ public class TileEntityStorageDrum extends TileEntityMachineBase implements IFlu slots[i] = new ItemStack(ModItems.nuclear_waste_short_depleted_tiny, 1, meta); } - if((item == ModItems.ingot_au198 || item == ModItems.ingot_pb200) && worldObj.rand.nextInt(VersatileConfig.getShortDecayChance() / 100) == 0) { + if(item == ModItems.ingot_au198 && worldObj.rand.nextInt(VersatileConfig.getShortDecayChance() / 100) == 0) { slots[i] = new ItemStack(ModItems.nugget_mercury, 1, meta); } + + if(item == ModItems.nugget_pb209 && worldObj.rand.nextInt(VersatileConfig.getShortDecayChance() / 50) == 0) { + slots[i] = new ItemStack(ModItems.nugget_bismuth, 1, meta); + } } } diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index d643fc06b..dc7b32866 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -873,6 +873,7 @@ item.battery_red_cell_24.name=24-Fold Redstone Power Cell item.battery_red_cell_6.name=Sixfold Redstone Power Cell item.battery_sc_americium.name=Self-Charging Americium-241 Battery item.battery_sc_gold.name=Self-Charging Gold-198 Battery +item.battery_sc_lead.name=Self-Charging Lead-209 Battery item.battery_sc_plutonium.name=Self-Charging Plutonium-238 Battery item.battery_sc_polonium.name=Self-Charging Polonium-210 Battery item.battery_sc_technetium.name=Self-Charging Technetium-99 Battery @@ -915,7 +916,7 @@ item.billet_mox_fuel.name=MOX Fuel Billet item.billet_neptunium.name=Neptunium Billet item.billet_neptunium_fuel.name=Neptunium Fuel Billet item.billet_nuclear_waste.name=Nuclear Waste Billet -item.billet_pb200.name=Lead-200 Billet +item.billet_pb209.name=Lead-209 Billet item.billet_po210be.name=Po210Be Billet item.billet_polonium.name=Polonium-210 Billet item.billet_pu_mix.name=Reactor Grade Plutonium Billet @@ -1697,7 +1698,7 @@ item.ingot_neptunium.name=Neptunium Ingot item.ingot_neptunium_fuel.name=Neptunium Fuel Ingot item.ingot_niobium.name=Niobium Ingot item.ingot_osmiridium.name=Osmiridium Ingot -item.ingot_pb200.name=Lead-200 Ingot +item.ingot_pb209.name=Lead-209 Ingot item.ingot_phosphorus.name=Bar of White Phosphorus item.ingot_plutonium.name=Plutonium Ingot item.ingot_plutonium_fuel.name=Ingot of Plutonium Fuel @@ -2061,7 +2062,7 @@ item.nugget_mox_fuel.name=Nugget of MOX Fuel item.nugget_neptunium.name=Neptunium Nugget item.nugget_neptunium_fuel.name=Neptunium Fuel Nugget item.nugget_osmiridium.name=Osmiridium Nugget -item.nugget_pb200.name=Lead-200 Nugget +item.nugget_pb209.name=Lead-209 Nugget item.nugget_plutonium.name=Plutonium Nugget item.nugget_plutonium_fuel.name=Nugget of Plutonium Fuel item.nugget_polonium.name=Polonium-210 Nugget @@ -2165,8 +2166,8 @@ item.pellet_rtg_americium.name=Americium-241 RTG Pellet item.pellet_rtg_americium.desc=Rare and reliable, good old Americium! item.pellet_rtg_berkelium.name=Berkelium RTG Pellet item.pellet_rtg_berkelium.desc= -item.pellet_rtg_lead.name=Lead-200 RTG Pellet -item.pellet_rtg_lead.desc=EXTREMELY DEADLY - LIMIT EXPOSURE +item.pellet_rtg_lead.name=Lead-209 RTG Pellet +item.pellet_rtg_lead.desc=Exposure will result in imminient death. item.pellet_rtg_gold.name=Gold-198 RTG Pellet item.pellet_rtg_gold.desc=Made from a rare, highly unstable gold isotope. item.pellet_rtg_polonium.name=Polonium-210 RTG Pellet @@ -2204,7 +2205,8 @@ item.plate_dalekanium.name=Angry Metal item.plate_desh.name=Desh Compound Plate item.plate_dineutronium.name=Dineutronium Compound Plate item.plate_euphemium.name=Euphemium Compound Plate -item.plate_fuel_mox.name=HEMOX Plate Fuel +item.plate_fuel_mox.name=MOX Plate Fuel +item.plate_fuel_pu238be.name=Pu238Be Plate Fuel item.plate_fuel_pu239.name=HEP-239 Plate Fuel item.plate_fuel_ra226be.name=Ra226Be Plate Fuel item.plate_fuel_sa326.name=HES-326 Plate Fuel @@ -2858,7 +2860,8 @@ item.warhead_thermo_exo.name=Exothermic Warhead item.warhead_volcano.name=Tectonic Warhead item.waste_mox.name=Depleted MOX Fuel item.waste_natural_uranium.name=Depleted Natural Uranium Fuel -item.waste_plate_mox.name=Depleted HEMOX Plate Fuel +item.waste_plate_mox.name=Depleted MOX Plate Fuel +item.waste_plate_pu238be.name=Depleted Pu238Be Plate Fuel item.waste_plate_pu239.name=Depleted HEP-239 Plate Fuel item.waste_plate_ra226be.name=Depleted Ra226Be Plate Fuel item.waste_plate_sa326.name=Depleted HES-326 Plate Fuel diff --git a/src/main/resources/assets/hbm/textures/items/battery_sc_lead.png b/src/main/resources/assets/hbm/textures/items/battery_sc_lead.png new file mode 100644 index 000000000..1e1d8032c Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/battery_sc_lead.png differ diff --git a/src/main/resources/assets/hbm/textures/items/billet_pb200.png b/src/main/resources/assets/hbm/textures/items/billet_pb200.png deleted file mode 100644 index a5c0e92b8..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/billet_pb200.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/billet_pb209.png b/src/main/resources/assets/hbm/textures/items/billet_pb209.png new file mode 100644 index 000000000..bafc80a5f Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/billet_pb209.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ingot_pb200.png b/src/main/resources/assets/hbm/textures/items/ingot_pb200.png deleted file mode 100644 index 9852d1996..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/ingot_pb200.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/ingot_pb209.png b/src/main/resources/assets/hbm/textures/items/ingot_pb209.png new file mode 100644 index 000000000..da3866c49 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ingot_pb209.png differ diff --git a/src/main/resources/assets/hbm/textures/items/nugget_pb200.png b/src/main/resources/assets/hbm/textures/items/nugget_pb200.png deleted file mode 100644 index a8e996dc7..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/nugget_pb200.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/nugget_pb209.png b/src/main/resources/assets/hbm/textures/items/nugget_pb209.png new file mode 100644 index 000000000..10d702001 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/nugget_pb209.png differ diff --git a/src/main/resources/assets/hbm/textures/items/pellet_rtg_lead.png b/src/main/resources/assets/hbm/textures/items/pellet_rtg_lead.png index ccf1a118a..af923ffba 100644 Binary files a/src/main/resources/assets/hbm/textures/items/pellet_rtg_lead.png and b/src/main/resources/assets/hbm/textures/items/pellet_rtg_lead.png differ diff --git a/src/main/resources/assets/hbm/textures/items/plate_fuel_pu238be.png b/src/main/resources/assets/hbm/textures/items/plate_fuel_pu238be.png new file mode 100644 index 000000000..939726e38 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/plate_fuel_pu238be.png differ diff --git a/src/main/resources/assets/hbm/textures/items/waste_plate_pu238be.png b/src/main/resources/assets/hbm/textures/items/waste_plate_pu238be.png new file mode 100644 index 000000000..388adb906 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/waste_plate_pu238be.png differ