diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index aac036426..11f595b65 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -201,6 +201,7 @@ public class MineralRecipes { addBilletToIngot(ModItems.ingot_australium, ModItems.billet_australium);*/ GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_balefire_gold, 1), new Object[] { ModItems.billet_au198, ModItems.cell_antimatter, ModItems.pellet_charged }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_flashlead, 2), new Object[] { ModItems.billet_balefire_gold, ModItems.billet_pb209, ModItems.cell_antimatter, ModItems.pellet_charged }); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg), new Object[] { ModItems.billet_pu238, ModItems.billet_pu238, ModItems.billet_pu238, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_radium), new Object[] { ModItems.billet_ra226, ModItems.billet_ra226, ModItems.billet_ra226, "plateIron" })); diff --git a/src/main/java/com/hbm/crafting/RodRecipes.java b/src/main/java/com/hbm/crafting/RodRecipes.java index 23734ac63..e98baed08 100644 --- a/src/main/java/com/hbm/crafting/RodRecipes.java +++ b/src/main/java/com/hbm/crafting/RodRecipes.java @@ -114,6 +114,7 @@ public class RodRecipes { addRBMKRod(ModItems.billet_schrabidium_fuel, ModItems.rbmk_fuel_mes); addRBMKRod(ModItems.billet_hes, ModItems.rbmk_fuel_hes); addRBMKRod(ModItems.billet_balefire_gold, ModItems.rbmk_fuel_balefire_gold); + addRBMKRod(ModItems.billet_flashlead, ModItems.rbmk_fuel_flashlead); addRBMKRod(ModItems.billet_zfb_bismuth, ModItems.rbmk_fuel_zfb_bismuth); addRBMKRod(ModItems.billet_zfb_pu241, ModItems.rbmk_fuel_zfb_pu241); addRBMKRod(ModItems.billet_zfb_am_mix, ModItems.rbmk_fuel_zfb_am_mix); diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index 6c5515a21..2c5342a1e 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -310,6 +310,7 @@ public class HazardRegistry { HazardSystem.register(ingot_les, makeData(RADIATION, saf * ingot)); HazardSystem.register(billet_balefire_gold, makeData(RADIATION, au198 * billet)); + HazardSystem.register(billet_flashlead, new HazardData().addEntry(RADIATION, pb209 * 1.25F * billet).addEntry(HOT, 7F)); HazardSystem.register(billet_po210be, makeData(RADIATION, pobe * billet)); HazardSystem.register(billet_ra226be, makeData(RADIATION, rabe * billet)); HazardSystem.register(billet_pu238be, makeData(RADIATION, pube * billet)); @@ -346,6 +347,7 @@ public class HazardRegistry { registerRBMKRod(rbmk_fuel_mep, purg * rod_rbmk, purg * rod_rbmk * 100); registerRBMKRod(rbmk_fuel_hep239, pu239 * rod_rbmk, pu239 * rod_rbmk * 100); registerRBMKRod(rbmk_fuel_hep241, pu241 * rod_rbmk, pu241 * rod_rbmk * 100); + registerRBMKRod(rbmk_fuel_flashlead, pb209 * 1.25F * rod_rbmk, pb209 * nugget * 0.05F * rod_rbmk); registerRBMKPellet(rbmk_pellet_ueu, u * billet, u * billet * 100); registerRBMKPellet(rbmk_pellet_meu, uf * billet, uf * billet * 100); @@ -356,6 +358,7 @@ public class HazardRegistry { registerRBMKPellet(rbmk_pellet_mep, purg * billet, purg * billet * 100); registerRBMKPellet(rbmk_pellet_hep239, pu239 * billet, pu239 * billet * 100); registerRBMKPellet(rbmk_pellet_hep241, pu241 * billet, pu241 * billet * 100); + registerRBMKPellet(rbmk_pellet_flashlead, pb209 * 1.25F * billet, pb209 * nugget * 0.05F); HazardSystem.register(powder_yellowcake, makeData(RADIATION, yc * powder)); HazardSystem.register(block_yellowcake, makeData(RADIATION, yc * block * powder_mult)); diff --git a/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java index 966ddbde4..d7717b74a 100644 --- a/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java @@ -261,6 +261,22 @@ public class SILEXRecipes { .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_au198), 89 - 20 * i)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_balefire), 10 + 20 * i)) ); + // FLASHLEAD // + recipes.put(new ComparableStack(ModItems.rbmk_pellet_flashlead, 1, i), new SILEXRecipe(600, 100) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_au198), 44 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pb209), 44 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 1 + 6 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_mercury), 1 + 6 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.flame_pony), 10 + 8 * i)) ); //Change to Pheo's Transschrabidic + + recipes.put(new ComparableStack(ModItems.rbmk_pellet_flashlead, 1, i + 5), new SILEXRecipe(600, 100) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 2)) //literal how + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_au198), 43 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pb209), 43 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 1 + 6 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_mercury), 1 + 6 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.flame_pony), 10 + 8 * i)) ); //Change to Pheo's Transschrabidic + // POBE // recipes.put(new ComparableStack(ModItems.rbmk_pellet_po210be, 1, i), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_polonium), 45 - 10 * i)) diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index e3ae3ec70..bcc92bb3d 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -217,6 +217,7 @@ public class ModItems { public static Item billet_pu238be; public static Item billet_yharonite; public static Item billet_balefire_gold; + public static Item billet_flashlead; public static Item billet_zfb_bismuth; public static Item billet_zfb_pu241; public static Item billet_zfb_am_mix; @@ -1061,6 +1062,7 @@ public class ModItems { public static ItemRBMKRod rbmk_fuel_ra226be; public static ItemRBMKRod rbmk_fuel_pu238be; public static ItemRBMKRod rbmk_fuel_balefire_gold; + public static ItemRBMKRod rbmk_fuel_flashlead; public static ItemRBMKRod rbmk_fuel_balefire; public static ItemRBMKRod rbmk_fuel_zfb_bismuth; public static ItemRBMKRod rbmk_fuel_zfb_pu241; @@ -1092,6 +1094,7 @@ public class ModItems { public static ItemRBMKPellet rbmk_pellet_ra226be; public static ItemRBMKPellet rbmk_pellet_pu238be; public static ItemRBMKPellet rbmk_pellet_balefire_gold; + public static ItemRBMKPellet rbmk_pellet_flashlead; public static ItemRBMKPellet rbmk_pellet_balefire; public static ItemRBMKPellet rbmk_pellet_zfb_bismuth; public static ItemRBMKPellet rbmk_pellet_zfb_pu241; @@ -2637,6 +2640,7 @@ public class ModItems { billet_zirconium = new Item().setUnlocalizedName("billet_zirconium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_zirconium"); billet_yharonite = new Item().setUnlocalizedName("billet_yharonite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_yharonite"); billet_balefire_gold = new Item().setUnlocalizedName("billet_balefire_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_balefire_gold"); + billet_flashlead = new Item().setUnlocalizedName("billet_flashlead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_flashlead"); billet_zfb_bismuth = new Item().setUnlocalizedName("billet_zfb_bismuth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_zfb_bismuth"); billet_zfb_pu241 = new Item().setUnlocalizedName("billet_zfb_pu241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_zfb_pu241"); billet_zfb_am_mix = new Item().setUnlocalizedName("billet_zfb_am_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_zfb_am_mix"); @@ -3531,6 +3535,7 @@ public class ModItems { rbmk_pellet_ra226be = (ItemRBMKPellet) new ItemRBMKPellet("Radium-226 & Beryllium Neutron Source").setUnlocalizedName("rbmk_pellet_ra226be").setTextureName(RefStrings.MODID + ":rbmk_pellet_ra226be"); rbmk_pellet_pu238be = (ItemRBMKPellet) new ItemRBMKPellet("Plutonium-238 & Beryllium Neutron Source").setUnlocalizedName("rbmk_pellet_pu238be").setTextureName(RefStrings.MODID + ":rbmk_pellet_pu238be"); rbmk_pellet_balefire_gold = (ItemRBMKPellet) new ItemRBMKPellet("Antihydrogen in a Magnetized Gold-198 Lattice").setUnlocalizedName("rbmk_pellet_balefire_gold").setTextureName(RefStrings.MODID + ":rbmk_pellet_balefire_gold"); + rbmk_pellet_flashlead = (ItemRBMKPellet) new ItemRBMKPellet("Antideuterons confined by a Magnetized Gold-198 and Lead-209 Lattice").setUnlocalizedName("rbmk_pellet_flashlead").setTextureName(RefStrings.MODID + ":rbmk_pellet_flashlead"); rbmk_pellet_balefire = (ItemRBMKPellet) new ItemRBMKPellet("Draconic Flames").setUnlocalizedName("rbmk_pellet_balefire").setTextureName(RefStrings.MODID + ":rbmk_pellet_balefire"); rbmk_pellet_zfb_bismuth = (ItemRBMKPellet) new ItemRBMKPellet("Zirconium Fast Breeder - LEU/HEP-241#Bi").setUnlocalizedName("rbmk_pellet_zfb_bismuth").setTextureName(RefStrings.MODID + ":rbmk_pellet_zfb_bismuth"); rbmk_pellet_zfb_pu241 = (ItemRBMKPellet) new ItemRBMKPellet("Zirconium Fast Breeder - HEU-235/HEP-240#Pu-241").setUnlocalizedName("rbmk_pellet_zfb_pu241").setTextureName(RefStrings.MODID + ":rbmk_pellet_zfb_pu241"); @@ -3709,6 +3714,12 @@ public class ModItems { .setFunction(EnumBurnFunc.ARCH) .setMeltingPoint(2000) .setUnlocalizedName("rbmk_fuel_balefire_gold").setTextureName(RefStrings.MODID + ":rbmk_fuel_balefire_gold"); + rbmk_fuel_flashlead = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_flashlead) + .setYield(250000000D) + .setStats(40, 50) + .setFunction(EnumBurnFunc.ARCH) + .setMeltingPoint(2050) + .setUnlocalizedName("rbmk_fuel_flashlead").setTextureName(RefStrings.MODID + ":rbmk_fuel_flashlead"); rbmk_fuel_balefire = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_balefire) .setYield(100000000D) .setStats(100, 35) @@ -5626,6 +5637,7 @@ public class ModItems { GameRegistry.registerItem(billet_zfb_am_mix, billet_zfb_am_mix.getUnlocalizedName()); GameRegistry.registerItem(billet_yharonite, billet_yharonite.getUnlocalizedName()); GameRegistry.registerItem(billet_balefire_gold, billet_balefire_gold.getUnlocalizedName()); + GameRegistry.registerItem(billet_flashlead, billet_flashlead.getUnlocalizedName()); GameRegistry.registerItem(billet_nuclear_waste, billet_nuclear_waste.getUnlocalizedName()); //Dusts & Other @@ -6560,6 +6572,7 @@ public class ModItems { GameRegistry.registerItem(rbmk_fuel_ra226be, rbmk_fuel_ra226be.getUnlocalizedName()); GameRegistry.registerItem(rbmk_fuel_pu238be, rbmk_fuel_pu238be.getUnlocalizedName()); GameRegistry.registerItem(rbmk_fuel_balefire_gold, rbmk_fuel_balefire_gold.getUnlocalizedName()); + GameRegistry.registerItem(rbmk_fuel_flashlead, rbmk_fuel_flashlead.getUnlocalizedName()); GameRegistry.registerItem(rbmk_fuel_balefire, rbmk_fuel_balefire.getUnlocalizedName()); GameRegistry.registerItem(rbmk_fuel_zfb_bismuth, rbmk_fuel_zfb_bismuth.getUnlocalizedName()); GameRegistry.registerItem(rbmk_fuel_zfb_pu241, rbmk_fuel_zfb_pu241.getUnlocalizedName()); @@ -6592,6 +6605,7 @@ public class ModItems { GameRegistry.registerItem(rbmk_pellet_ra226be, rbmk_pellet_ra226be.getUnlocalizedName()); GameRegistry.registerItem(rbmk_pellet_pu238be, rbmk_pellet_pu238be.getUnlocalizedName()); GameRegistry.registerItem(rbmk_pellet_balefire_gold, rbmk_pellet_balefire_gold.getUnlocalizedName()); + GameRegistry.registerItem(rbmk_pellet_flashlead, rbmk_pellet_flashlead.getUnlocalizedName()); GameRegistry.registerItem(rbmk_pellet_balefire, rbmk_pellet_balefire.getUnlocalizedName()); GameRegistry.registerItem(rbmk_pellet_zfb_bismuth, rbmk_pellet_zfb_bismuth.getUnlocalizedName()); GameRegistry.registerItem(rbmk_pellet_zfb_pu241, rbmk_pellet_zfb_pu241.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/machine/ItemRBMKRod.java b/src/main/java/com/hbm/items/machine/ItemRBMKRod.java index 7a4103ad3..1643dae67 100644 --- a/src/main/java/com/hbm/items/machine/ItemRBMKRod.java +++ b/src/main/java/com/hbm/items/machine/ItemRBMKRod.java @@ -239,7 +239,7 @@ public class ItemRBMKRod extends Item { case PASSIVE: return selfRate * enrichment; case LOG_TEN: return Math.log10(flux + 1) * 0.5D * reactivity; case PLATEU: return (1 - Math.pow(Math.E, -flux / 25D)) * reactivity; - case ARCH: return Math.max(flux - (flux * flux / 100000D) / 100D * reactivity, 0D); + case ARCH: return Math.max(flux - (flux * flux / 10000D) / 100D * reactivity, 0D); case SIGMOID: return reactivity / (1 + Math.pow(Math.E, -(flux - 50D) / 10D)); case SQUARE_ROOT: return Math.sqrt(flux) * reactivity / 10D; case LINEAR: return flux / 100D * reactivity; @@ -261,7 +261,7 @@ public class ItemRBMKRod extends Item { case PASSIVE: return EnumChatFormatting.RED + "" + selfRate; case LOG_TEN: return "log10(x + 1" + (selfRate > 0 ? (EnumChatFormatting.RED + " + " + selfRate) : "") + EnumChatFormatting.WHITE + ") * 0.5 * " + reactivity; case PLATEU: return "(1 - e^-" + x + " / 25)) * " + reactivity; - case ARCH: return "(" + x + " - " + x + "² / 100000) / 100 * " + reactivity + " [0;∞]"; + case ARCH: return "(" + x + " - " + x + "² / 10000) / 100 * " + reactivity + " [0;∞]"; case SIGMOID: return reactivity + " / (1 + e^(-(" + x + " - 50) / 10)"; case SQUARE_ROOT: return "sqrt(" + x + ") * " + reactivity + " / 10"; case LINEAR: return x + " / 100 * " + reactivity; diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index c5d239961..ad2e4744a 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -942,6 +942,7 @@ item.billet_beryllium.name=Beryllium Billet item.billet_bismuth.name=Bismuth Billet item.billet_co60.name=Cobalt-60 Billet item.billet_cobalt.name=Cobalt Billet +item.billet_flashlead.name=Flashlead Billet item.billet_hes.name=Highly Enriched Schrabidium Fuel Billet item.billet_les.name=Low Enriched Schrabidium Fuel Billet item.billet_mox_fuel.name=MOX Fuel Billet @@ -2383,6 +2384,7 @@ item.rbmk_fuel_balefire.name=Balefire RBMK Fuel Rod item.rbmk_fuel_balefire_gold.name=Flashgold RBMK Fuel Rod item.rbmk_fuel_drx.name=§cDigamma RBMK Fuel Rod§r item.rbmk_fuel_empty.name=Empty RBMK Fuel Rod +item.rbmk_fuel_flashlead.name=Flashlead RBMK Fuel Rod item.rbmk_fuel_hea241.name=HEA-241 RBMK Fuel Rod item.rbmk_fuel_hea242.name=HEA-242 RBMK Fuel Rod item.rbmk_fuel_heaus.name=HEAus RBMK Fuel Rod @@ -2415,6 +2417,7 @@ item.rbmk_lid_glass.name=RBMK Glass Cover Panel item.rbmk_pellet_balefire.name=Balefire Fuel Pellet item.rbmk_pellet_balefire_gold.name=Flashgold Fuel Pellet item.rbmk_pellet_drx.name=§cDigamma Fuel Pellet§r +item.rbmk_pellet_flashlead.name=Flashlead Fuel Pellet item.rbmk_pellet_hea241.name=HEA-241 Fuel Pellet item.rbmk_pellet_hea242.name=HEA-242 Fuel Pellet item.rbmk_pellet_heaus.name=HEAus Fuel Pellet diff --git a/src/main/resources/assets/hbm/textures/items/billet_flashlead.png b/src/main/resources/assets/hbm/textures/items/billet_flashlead.png new file mode 100644 index 000000000..2c98423c8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/billet_flashlead.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rbmk_fuel_flashlead.png b/src/main/resources/assets/hbm/textures/items/rbmk_fuel_flashlead.png new file mode 100644 index 000000000..4a7c5ed16 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/rbmk_fuel_flashlead.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rbmk_pellet_flashlead.png b/src/main/resources/assets/hbm/textures/items/rbmk_pellet_flashlead.png new file mode 100644 index 000000000..35bb337dc Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/rbmk_pellet_flashlead.png differ