From 5547ac4914f5f0c61eb6b305a42e27a6bf0b631e Mon Sep 17 00:00:00 2001 From: Vaern Date: Sun, 2 Jan 2022 09:42:10 -0800 Subject: [PATCH] aaaaa --- .../java/com/hbm/crafting/MineralRecipes.java | 12 +- .../java/com/hbm/crafting/RodRecipes.java | 69 ++++++++- .../com/hbm/crafting/SmeltingRecipes.java | 1 + .../java/com/hbm/hazard/HazardRegistry.java | 2 + .../com/hbm/inventory/OreDictManager.java | 4 +- .../hbm/inventory/recipes/BreederRecipes.java | 70 +++------ .../inventory/recipes/CentrifugeRecipes.java | 12 +- .../hbm/inventory/recipes/SILEXRecipes.java | 135 ++++++++++-------- src/main/java/com/hbm/items/ModItems.java | 47 +++++- .../hbm/items/machine/ItemBreedingRod.java | 31 ++++ src/main/resources/assets/hbm/lang/en_US.lang | 59 +++++++- .../hbm/textures/items/billet_cobalt.png | Bin 0 -> 253 bytes .../assets/hbm/textures/items/billet_sr90.png | Bin 0 -> 1808 bytes .../assets/hbm/textures/items/dust_tiny.png | Bin 0 -> 318 bytes .../assets/hbm/textures/items/ingot_sr90.png | Bin 0 -> 1810 bytes .../assets/hbm/textures/items/nugget_sr90.png | Bin 0 -> 1829 bytes .../assets/hbm/textures/items/powder_sr90.png | Bin 0 -> 1942 bytes .../hbm/textures/items/powder_sr90_tiny.png | Bin 0 -> 1607 bytes .../assets/hbm/textures/items/rod.co.png | Bin 0 -> 237 bytes .../assets/hbm/textures/items/rod.co60.png | Bin 0 -> 250 bytes .../items/{rod_lead.png => rod.lead.png} | Bin .../{rod_lithium.png => rod.lithium.png} | Bin .../{rod_neptunium.png => rod.np237.png} | Bin .../items/{rod_pu238.png => rod.pu238.png} | Bin .../items/{rod_pu239.png => rod.pu239.png} | Bin .../assets/hbm/textures/items/rod.rgp.png | Bin 0 -> 250 bytes .../items/{rod_th232.png => rod.th232.png} | Bin .../{rod_thorium_fuel.png => rod.thf.png} | Bin .../{rod_tritium.png => rod.tritium.png} | Bin .../items/{rod_u235.png => rod.u235.png} | Bin .../items/{rod_u238.png => rod.u238.png} | Bin .../{rod_uranium.png => rod.uranium.png} | Bin .../items/{rod_waste.png => rod.waste.png} | Bin .../assets/hbm/textures/items/rod_dual.co.png | Bin 0 -> 263 bytes .../hbm/textures/items/rod_dual.co60.png | Bin 0 -> 272 bytes .../{rod_dual_lead.png => rod_dual.lead.png} | Bin ..._dual_lithium.png => rod_dual.lithium.png} | Bin ..._dual_neptunium.png => rod_dual.np237.png} | Bin ...{rod_dual_pu238.png => rod_dual.pu238.png} | Bin ...{rod_dual_pu239.png => rod_dual.pu239.png} | Bin .../hbm/textures/items/rod_dual.rgp.png | Bin 0 -> 272 bytes ...{rod_dual_th232.png => rod_dual.th232.png} | Bin ...dual_thorium_fuel.png => rod_dual.thf.png} | Bin ..._dual_tritium.png => rod_dual.tritium.png} | Bin .../{rod_dual_u235.png => rod_dual.u235.png} | Bin .../{rod_dual_u238.png => rod_dual.u238.png} | Bin ..._dual_uranium.png => rod_dual.uranium.png} | Bin ...{rod_dual_waste.png => rod_dual.waste.png} | Bin .../assets/hbm/textures/items/rod_quad.co.png | Bin 0 -> 284 bytes .../hbm/textures/items/rod_quad.co60.png | Bin 0 -> 297 bytes .../{rod_quad_lead.png => rod_quad.lead.png} | Bin ..._quad_lithium.png => rod_quad.lithium.png} | Bin ..._quad_neptunium.png => rod_quad.np237.png} | Bin ...{rod_quad_pu238.png => rod_quad.pu238.png} | Bin ...{rod_quad_pu239.png => rod_quad.pu239.png} | Bin .../hbm/textures/items/rod_quad.rgp.png | Bin 0 -> 297 bytes ...{rod_quad_th232.png => rod_quad.th232.png} | Bin ...quad_thorium_fuel.png => rod_quad.thf.png} | Bin ..._quad_tritium.png => rod_quad.tritium.png} | Bin .../{rod_quad_u235.png => rod_quad.u235.png} | Bin .../{rod_quad_u238.png => rod_quad.u238.png} | Bin ..._quad_uranium.png => rod_quad.uranium.png} | Bin ...{rod_quad_waste.png => rod_quad.waste.png} | Bin .../textures/items/rod_waste_overlay_heat.png | Bin 353 -> 0 bytes 64 files changed, 309 insertions(+), 133 deletions(-) create mode 100644 src/main/java/com/hbm/items/machine/ItemBreedingRod.java create mode 100644 src/main/resources/assets/hbm/textures/items/billet_cobalt.png create mode 100644 src/main/resources/assets/hbm/textures/items/billet_sr90.png create mode 100644 src/main/resources/assets/hbm/textures/items/dust_tiny.png create mode 100644 src/main/resources/assets/hbm/textures/items/ingot_sr90.png create mode 100644 src/main/resources/assets/hbm/textures/items/nugget_sr90.png create mode 100644 src/main/resources/assets/hbm/textures/items/powder_sr90.png create mode 100644 src/main/resources/assets/hbm/textures/items/powder_sr90_tiny.png create mode 100644 src/main/resources/assets/hbm/textures/items/rod.co.png create mode 100644 src/main/resources/assets/hbm/textures/items/rod.co60.png rename src/main/resources/assets/hbm/textures/items/{rod_lead.png => rod.lead.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_lithium.png => rod.lithium.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_neptunium.png => rod.np237.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_pu238.png => rod.pu238.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_pu239.png => rod.pu239.png} (100%) create mode 100644 src/main/resources/assets/hbm/textures/items/rod.rgp.png rename src/main/resources/assets/hbm/textures/items/{rod_th232.png => rod.th232.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_thorium_fuel.png => rod.thf.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_tritium.png => rod.tritium.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_u235.png => rod.u235.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_u238.png => rod.u238.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_uranium.png => rod.uranium.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_waste.png => rod.waste.png} (100%) create mode 100644 src/main/resources/assets/hbm/textures/items/rod_dual.co.png create mode 100644 src/main/resources/assets/hbm/textures/items/rod_dual.co60.png rename src/main/resources/assets/hbm/textures/items/{rod_dual_lead.png => rod_dual.lead.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_dual_lithium.png => rod_dual.lithium.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_dual_neptunium.png => rod_dual.np237.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_dual_pu238.png => rod_dual.pu238.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_dual_pu239.png => rod_dual.pu239.png} (100%) create mode 100644 src/main/resources/assets/hbm/textures/items/rod_dual.rgp.png rename src/main/resources/assets/hbm/textures/items/{rod_dual_th232.png => rod_dual.th232.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_dual_thorium_fuel.png => rod_dual.thf.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_dual_tritium.png => rod_dual.tritium.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_dual_u235.png => rod_dual.u235.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_dual_u238.png => rod_dual.u238.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_dual_uranium.png => rod_dual.uranium.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_dual_waste.png => rod_dual.waste.png} (100%) create mode 100644 src/main/resources/assets/hbm/textures/items/rod_quad.co.png create mode 100644 src/main/resources/assets/hbm/textures/items/rod_quad.co60.png rename src/main/resources/assets/hbm/textures/items/{rod_quad_lead.png => rod_quad.lead.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_quad_lithium.png => rod_quad.lithium.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_quad_neptunium.png => rod_quad.np237.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_quad_pu238.png => rod_quad.pu238.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_quad_pu239.png => rod_quad.pu239.png} (100%) create mode 100644 src/main/resources/assets/hbm/textures/items/rod_quad.rgp.png rename src/main/resources/assets/hbm/textures/items/{rod_quad_th232.png => rod_quad.th232.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_quad_thorium_fuel.png => rod_quad.thf.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_quad_tritium.png => rod_quad.tritium.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_quad_u235.png => rod_quad.u235.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_quad_u238.png => rod_quad.u238.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_quad_uranium.png => rod_quad.uranium.png} (100%) rename src/main/resources/assets/hbm/textures/items/{rod_quad_waste.png => rod_quad.waste.png} (100%) delete mode 100644 src/main/resources/assets/hbm/textures/items/rod_waste_overlay_heat.png diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index d9931f20c..b58cf4fb6 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -21,7 +21,8 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; public class MineralRecipes { public static void register() { - + + add1To9Pair(ModItems.dust, ModItems.dust_tiny); add1To9Pair(ModItems.powder_coal, ModItems.powder_coal_tiny); add1To9Pair(ModBlocks.sand_gold, ModItems.powder_gold); @@ -47,13 +48,15 @@ public class MineralRecipes { addMineralSet(ModItems.nugget_tantalium, ModItems.ingot_tantalium, ModBlocks.block_tantalium); addMineralSet(ModItems.nugget_zirconium, ModItems.ingot_zirconium, ModBlocks.block_zirconium); addMineralSet(ModItems.nugget_dineutronium, ModItems.ingot_dineutronium, ModBlocks.block_dineutronium); - + + add1To9Pair(ModItems.powder_sr90, ModItems.powder_sr90_tiny); add1To9Pair(ModItems.powder_xe135, ModItems.powder_xe135_tiny); add1To9Pair(ModItems.powder_cs137, ModItems.powder_cs137_tiny); add1To9Pair(ModItems.powder_i131, ModItems.powder_i131_tiny); add1To9Pair(ModItems.ingot_technetium, ModItems.nugget_technetium); add1To9Pair(ModItems.ingot_co60, ModItems.nugget_co60); + add1To9Pair(ModItems.ingot_sr90, ModItems.nugget_sr90); add1To9Pair(ModItems.ingot_au198, ModItems.nugget_au198); add1To9Pair(ModItems.ingot_ra226, ModItems.nugget_ra226); @@ -78,7 +81,9 @@ public class MineralRecipes { addMineralSet(ModItems.nugget_pu_mix, ModItems.ingot_pu_mix, ModBlocks.block_pu_mix); add1To9Pair(ModItems.ingot_neptunium_fuel, ModItems.nugget_neptunium_fuel); - + + addBillet(ModItems.billet_cobalt, ModItems.ingot_cobalt, ModItems.fragment_cobalt, CO.nugget()); + addBillet(ModItems.billet_sr90, ModItems.ingot_sr90, ModItems.nugget_sr90, "nuggetStrontium90", "tinySr90"); addBillet(ModItems.billet_uranium, ModItems.ingot_uranium, ModItems.nugget_uranium, "nuggetUranium"); addBillet(ModItems.billet_u233, ModItems.ingot_u233, ModItems.nugget_u233, "nuggetUranium233", "tinyU233"); addBillet(ModItems.billet_u235, ModItems.ingot_u235, ModItems.nugget_u235, "nuggetUranium235", "tinyU235"); @@ -185,6 +190,7 @@ public class MineralRecipes { 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" })); 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_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/crafting/RodRecipes.java b/src/main/java/com/hbm/crafting/RodRecipes.java index bd521348c..b65920aa0 100644 --- a/src/main/java/com/hbm/crafting/RodRecipes.java +++ b/src/main/java/com/hbm/crafting/RodRecipes.java @@ -2,6 +2,7 @@ package com.hbm.crafting; import static com.hbm.inventory.OreDictManager.*; import com.hbm.items.ModItems; +import com.hbm.items.machine.ItemBreedingRod.*; import com.hbm.main.CraftingManager; import cpw.mods.fml.common.registry.GameRegistry; @@ -109,7 +110,37 @@ public class RodRecipes { CraftingManager.addShapelessAuto(new ItemStack(ModItems.waste_u233, 2, 1), new Object[] { ModItems.rod_zirnox_u233_fuel_depleted }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.waste_u235, 2, 1), new Object[] { ModItems.rod_zirnox_u235_fuel_depleted }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.waste_schrabidium, 2, 1), new Object[] { ModItems.rod_zirnox_les_fuel_depleted }); - + + //Breeding Rods + CraftingManager.addRecipeAuto(new ItemStack(ModItems.rod_empty, 16), new Object[] { "SSS", "L L", "SSS", 'S', STEEL.plate(), 'L', PB.plate() }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_empty, 2), new Object[] { ModItems.rod_dual_empty }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_dual_empty, 1), new Object[] { ModItems.rod_empty, ModItems.rod_empty }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_empty, 4), new Object[] { ModItems.rod_quad_empty }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_quad_empty, 1), new Object[] { ModItems.rod_empty, ModItems.rod_empty, ModItems.rod_empty, ModItems.rod_empty }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_quad_empty, 1), new Object[] { ModItems.rod_dual_empty, ModItems.rod_dual_empty }); + + addBreedingRod(LI, ModItems.lithium, BreedingRodType.LITHIUM); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.cell_tritium, 1), new Object[] { new ItemStack(ModItems.rod_empty, 1, BreedingRodType.TRITIUM.ordinal()), ModItems.cell_empty }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.cell_tritium, 2), new Object[] { new ItemStack(ModItems.rod_dual_empty, 1, BreedingRodType.TRITIUM.ordinal()), ModItems.cell_empty, ModItems.cell_empty }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.cell_tritium, 4), new Object[] { new ItemStack(ModItems.rod_quad_empty, 1, BreedingRodType.TRITIUM.ordinal()), ModItems.cell_empty, ModItems.cell_empty, ModItems.cell_empty, ModItems.cell_empty }); + addBreedingRod(CO, ModItems.billet_cobalt, BreedingRodType.CO); + addBreedingRod(CO60, ModItems.billet_co60, BreedingRodType.CO60); + addBreedingRod(TH232, ModItems.billet_th232, BreedingRodType.TH232); + addBreedingRod(ModItems.billet_thorium_fuel, BreedingRodType.THF); + addBreedingRod(U235, ModItems.billet_u235, BreedingRodType.U235); + addBreedingRod(NP237, ModItems.billet_neptunium, BreedingRodType.NP237); + addBreedingRod(U238, ModItems.billet_u238, BreedingRodType.U238); + addBreedingRod(PU238, ModItems.billet_pu238, BreedingRodType.PU238); + addBreedingRod(PU239, ModItems.billet_pu239, BreedingRodType.PU239); + addBreedingRod(ModItems.billet_pu_mix, BreedingRodType.RGP); + addBreedingRod(ModItems.billet_nuclear_waste, BreedingRodType.WASTE); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod, 1, BreedingRodType.LEAD.ordinal()), new Object[] { ModItems.rod_empty, PB.nugget(), PB.nugget(), PB.nugget(), PB.nugget(), PB.nugget(), PB.nugget() }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.nugget_lead, 6), new Object[] { new ItemStack(ModItems.rod_empty, 1, BreedingRodType.LEAD.ordinal()) }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_dual, 1, BreedingRodType.LEAD.ordinal()), new Object[] { ModItems.rod_dual_empty, PB.ingot(), PB.nugget(), PB.nugget(), PB.nugget() }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.nugget_lead, 12), new Object[] { new ItemStack(ModItems.rod_dual_empty, 1, BreedingRodType.LEAD.ordinal()) }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_quad, 1, BreedingRodType.LEAD.ordinal()), new Object[] { ModItems.rod_quad_empty, PB.ingot(), PB.ingot(), PB.nugget(), PB.nugget(), PB.nugget(), PB.nugget(), PB.nugget(), PB.nugget() }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.nugget_lead, 24), new Object[] { new ItemStack(ModItems.rod_quad_empty, 1, BreedingRodType.LEAD.ordinal()) }); + addBreedingRod(U, ModItems.billet_uranium, BreedingRodType.URANIUM); //Pile fuel @@ -204,6 +235,42 @@ public class RodRecipes { CraftingManager.addShapelessAuto(new ItemStack(billet, 4), new Object[] { out }); } + /** Single, dual, quad rod loading + unloading **/ + public static void addBreedingRod(Item billet, BreedingRodType type) { + addBreedingRodLoad(billet, type); + addBreedingRodUnload(billet, type); + } + /** Single, dual, quad rod loading + unloading + oredict **/ + public static void addBreedingRod(DictFrame mat, Item billet, BreedingRodType type) { + addBreedingRodLoad(mat, billet, type); + addBreedingRodUnload(mat, billet, type); + } + + /** Single, dual, quad rod loading **/ + public static void addBreedingRodLoad(Item billet, BreedingRodType type) { + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod, 1, type.ordinal()), new Object[] { ModItems.rod_empty, billet}); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_dual, 1, type.ordinal()), new Object[] { ModItems.rod_dual_empty, billet, billet}); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_quad, 1, type.ordinal()), new Object[] { ModItems.rod_quad_empty, billet, billet, billet, billet}); + } + /** Single, dual, quad rod unloading **/ + public static void addBreedingRodUnload(Item billet, BreedingRodType type) { + CraftingManager.addShapelessAuto(new ItemStack(billet, 1), new Object[] { new ItemStack(ModItems.rod, 1, type.ordinal()) }); + CraftingManager.addShapelessAuto(new ItemStack(billet, 2), new Object[] { new ItemStack(ModItems.rod_dual, 1, type.ordinal()) }); + CraftingManager.addShapelessAuto(new ItemStack(billet, 4), new Object[] { new ItemStack(ModItems.rod_quad, 1, type.ordinal()) }); + } + /** Single, dual, quad rod loading with OreDict **/ + public static void addBreedingRodLoad(DictFrame mat, Item billet, BreedingRodType type) { + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod, 1, type.ordinal()), new Object[] { ModItems.rod_empty, mat.billet()}); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_dual, 1, type.ordinal()), new Object[] { ModItems.rod_dual_empty, mat.billet(), mat.billet()}); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_quad, 1, type.ordinal()), new Object[] { ModItems.rod_quad_empty, mat.billet(), mat.billet(), mat.billet(), mat.billet()}); + } + /** Single, dual, quad rod unloading with OreDict **/ + public static void addBreedingRodUnload(DictFrame mat, Item billet, BreedingRodType type) { + CraftingManager.addShapelessAuto(new ItemStack(billet, 1), new Object[] { new ItemStack(ModItems.rod, 1, type.ordinal()) }); + CraftingManager.addShapelessAuto(new ItemStack(billet, 2), new Object[] { new ItemStack(ModItems.rod_dual, 1, type.ordinal()) }); + CraftingManager.addShapelessAuto(new ItemStack(billet, 4), new Object[] { new ItemStack(ModItems.rod_quad, 1, type.ordinal()) }); + } + //Fill rods with 8 billets public static void addRBMKRod(DictFrame mat, Item out) { CraftingManager.addShapelessAuto(new ItemStack(out), new Object[] { ModItems.rbmk_fuel_empty, mat.billet(), mat.billet(), mat.billet(), mat.billet(), mat.billet(), mat.billet(), mat.billet(), mat.billet() }); diff --git a/src/main/java/com/hbm/crafting/SmeltingRecipes.java b/src/main/java/com/hbm/crafting/SmeltingRecipes.java index 883cd9b5a..7d1cc87aa 100644 --- a/src/main/java/com/hbm/crafting/SmeltingRecipes.java +++ b/src/main/java/com/hbm/crafting/SmeltingRecipes.java @@ -88,6 +88,7 @@ public class SmeltingRecipes { GameRegistry.addSmelting(ModItems.powder_zirconium, new ItemStack(ModItems.ingot_zirconium), 1.0F); GameRegistry.addSmelting(ModItems.powder_tcalloy, new ItemStack(ModItems.ingot_tcalloy), 1.0F); GameRegistry.addSmelting(ModItems.powder_au198, new ItemStack(ModItems.ingot_au198), 1.0F); + GameRegistry.addSmelting(ModItems.powder_sr90, new ItemStack(ModItems.ingot_sr90), 1.0F); GameRegistry.addSmelting(ModItems.powder_ra226, new ItemStack(ModItems.ingot_ra226), 1.0F); GameRegistry.addSmelting(ModItems.powder_tantalium, new ItemStack(ModItems.ingot_tantalium), 1.0F); GameRegistry.addSmelting(ModItems.powder_niobium, new ItemStack(ModItems.ingot_niobium), 1.0F); diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index af19f345c..7e56c45d7 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -57,6 +57,7 @@ public class HazardRegistry { public static final float gen_10B = 0.1F; public static final float co60 = 30.0F; + public static final float sr90 = 15.0F; public static final float tc99 = 2.75F; public static final float i131 = 150.0F; public static final float xe135 = 1250.0F; @@ -292,6 +293,7 @@ public class HazardRegistry { HazardSystem.register(pellet_rtg, new HazardData().addEntry(RADIATION, pu238 * rtg).addEntry(HOT, 5F)); HazardSystem.register(pellet_rtg_radium, makeData(RADIATION, ra226 * rtg)); 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, 5F)); 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 45970845f..5a1b2bac8 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -197,6 +197,7 @@ public class OreDictManager { /* * FISSION FRAGMENTS */ + public static final DictFrame SR90 = new DictFrame("Strontium90", "Sr90"); public static final DictFrame I131 = new DictFrame("Iodine131", "I131"); public static final DictFrame XE135 = new DictFrame("Xenon135", "Xe135"); public static final DictFrame CS137 = new DictFrame("Caesium137", "Cs137"); @@ -267,7 +268,7 @@ public class OreDictManager { COLTAN .ingot(fragment_coltan) .dust(powder_coltan_ore) .block(block_coltan) .ore(ore_coltan); NB .nugget(fragment_niobium) .ingot(ingot_niobium) .dustSmall(powder_niobium_tiny) .dust(powder_niobium) .block(block_niobium); BE .nugget(nugget_beryllium) .billet(billet_beryllium) .ingot(ingot_beryllium) .dust(powder_beryllium) .block(block_beryllium) .ore(ore_beryllium); - CO .nugget(fragment_cobalt) .ingot(ingot_cobalt) .dustSmall(powder_cobalt_tiny) .dust(powder_cobalt) .block(block_cobalt) .ore(ore_cobalt, ore_nether_cobalt); + CO .nugget(fragment_cobalt) .billet(billet_cobalt) .ingot(ingot_cobalt) .dustSmall(powder_cobalt_tiny) .dust(powder_cobalt) .block(block_cobalt) .ore(ore_cobalt, ore_nether_cobalt); B .nugget(fragment_boron) .ingot(ingot_boron) .dustSmall(powder_boron_tiny) .dust(powder_boron) .block(block_boron); GRAPHITE .ingot(ingot_graphite) .block(block_graphite); DURA .ingot(ingot_dura_steel) .dust(powder_dura_steel) .block(block_dura_steel); @@ -337,6 +338,7 @@ public class OreDictManager { /* * FISSION FRAGMENTS */ + SR90 .rad(HazardRegistry.sr90) .hot(1F) .hydro(1F) .dustSmall(powder_sr90_tiny) .dust(powder_sr90) .ingot(ingot_sr90) .billet(billet_sr90) .nugget(nugget_sr90); I131 .rad(HazardRegistry.i131) .hot(1F) .dustSmall(powder_i131_tiny) .dust(powder_i131); XE135 .rad(HazardRegistry.xe135) .hot(10F) .dustSmall(powder_xe135_tiny) .dust(powder_xe135); CS137 .rad(HazardRegistry.cs137) .hot(3F) .hydro(3F) .dustSmall(powder_cs137_tiny) .dust(powder_cs137); diff --git a/src/main/java/com/hbm/inventory/recipes/BreederRecipes.java b/src/main/java/com/hbm/inventory/recipes/BreederRecipes.java index 01056cfa9..ddd05da74 100644 --- a/src/main/java/com/hbm/inventory/recipes/BreederRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/BreederRecipes.java @@ -9,6 +9,8 @@ import com.hbm.blocks.ModBlocks; import com.hbm.inventory.RecipesCommon; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import com.hbm.items.machine.ItemBreedingRod.*; + import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -20,64 +22,26 @@ public class BreederRecipes { private static HashMap recipes = new HashMap(); public static void registerRecipes() { - - //lithium and impure rods - recipes.put(new ComparableStack(ModItems.rod_lithium), new BreederRecipe(ModItems.rod_tritium, 100)); - recipes.put(new ComparableStack(ModItems.rod_dual_lithium), new BreederRecipe(ModItems.rod_dual_tritium, 200)); - recipes.put(new ComparableStack(ModItems.rod_quad_lithium), new BreederRecipe(ModItems.rod_quad_tritium, 400)); - recipes.put(new ComparableStack(ModItems.rod_uranium), new BreederRecipe(ModItems.rod_plutonium, 1000)); - recipes.put(new ComparableStack(ModItems.rod_dual_uranium), new BreederRecipe(ModItems.rod_dual_plutonium, 2000)); - recipes.put(new ComparableStack(ModItems.rod_quad_uranium), new BreederRecipe(ModItems.rod_quad_plutonium, 4000)); - recipes.put(new ComparableStack(ModItems.rod_plutonium), new BreederRecipe(ModItems.rod_waste, 500)); - recipes.put(new ComparableStack(ModItems.rod_dual_plutonium), new BreederRecipe(ModItems.rod_dual_waste, 1000)); - recipes.put(new ComparableStack(ModItems.rod_quad_plutonium), new BreederRecipe(ModItems.rod_quad_waste, 2000)); - //isotopes - recipes.put(new ComparableStack(ModItems.rod_th232), new BreederRecipe(ModItems.rod_u233, 1000)); - recipes.put(new ComparableStack(ModItems.rod_dual_th232), new BreederRecipe(ModItems.rod_dual_u233, 2000)); - recipes.put(new ComparableStack(ModItems.rod_quad_th232), new BreederRecipe(ModItems.rod_quad_u233, 4000)); - recipes.put(new ComparableStack(ModItems.rod_u233), new BreederRecipe(ModItems.rod_u235, 1000)); - recipes.put(new ComparableStack(ModItems.rod_dual_u233), new BreederRecipe(ModItems.rod_dual_u235, 2000)); - recipes.put(new ComparableStack(ModItems.rod_quad_u233), new BreederRecipe(ModItems.rod_quad_u235, 4000)); - recipes.put(new ComparableStack(ModItems.rod_u235), new BreederRecipe(ModItems.rod_neptunium, 500)); - recipes.put(new ComparableStack(ModItems.rod_dual_u235), new BreederRecipe(ModItems.rod_dual_neptunium, 1000)); - recipes.put(new ComparableStack(ModItems.rod_quad_u235), new BreederRecipe(ModItems.rod_quad_neptunium, 2000)); - recipes.put(new ComparableStack(ModItems.rod_u238), new BreederRecipe(ModItems.rod_pu239, 1000)); - recipes.put(new ComparableStack(ModItems.rod_dual_u238), new BreederRecipe(ModItems.rod_dual_pu239, 2000)); - recipes.put(new ComparableStack(ModItems.rod_quad_u238), new BreederRecipe(ModItems.rod_quad_pu239, 4000)); - recipes.put(new ComparableStack(ModItems.rod_neptunium), new BreederRecipe(ModItems.rod_pu238, 250)); - recipes.put(new ComparableStack(ModItems.rod_dual_neptunium), new BreederRecipe(ModItems.rod_dual_pu238, 500)); - recipes.put(new ComparableStack(ModItems.rod_quad_neptunium), new BreederRecipe(ModItems.rod_quad_pu238, 1000)); - recipes.put(new ComparableStack(ModItems.rod_pu238), new BreederRecipe(ModItems.rod_pu239, 1000)); - recipes.put(new ComparableStack(ModItems.rod_dual_pu238), new BreederRecipe(ModItems.rod_dual_pu239, 2000)); - recipes.put(new ComparableStack(ModItems.rod_quad_pu238), new BreederRecipe(ModItems.rod_quad_pu239, 4000)); - recipes.put(new ComparableStack(ModItems.rod_pu239), new BreederRecipe(ModItems.rod_pu240, 500)); - recipes.put(new ComparableStack(ModItems.rod_dual_pu239), new BreederRecipe(ModItems.rod_dual_pu240, 1000)); - recipes.put(new ComparableStack(ModItems.rod_quad_pu239), new BreederRecipe(ModItems.rod_quad_pu240, 2000)); - recipes.put(new ComparableStack(ModItems.rod_pu240), new BreederRecipe(ModItems.rod_waste, 500)); - recipes.put(new ComparableStack(ModItems.rod_dual_pu240), new BreederRecipe(ModItems.rod_dual_waste, 1000)); - recipes.put(new ComparableStack(ModItems.rod_quad_pu240), new BreederRecipe(ModItems.rod_quad_waste, 2000)); - - //advanced - recipes.put(new ComparableStack(ModItems.rod_schrabidium), new BreederRecipe(ModItems.rod_solinium, 2000)); - recipes.put(new ComparableStack(ModItems.rod_dual_schrabidium), new BreederRecipe(ModItems.rod_dual_solinium, 4000)); - recipes.put(new ComparableStack(ModItems.rod_quad_schrabidium), new BreederRecipe(ModItems.rod_quad_solinium, 8000)); - recipes.put(new ComparableStack(ModItems.rod_quad_solinium), new BreederRecipe(ModItems.rod_quad_euphemium, 2000)); - recipes.put(new ComparableStack(ModItems.rod_balefire), new BreederRecipe(ModItems.rod_balefire_blazing, 2000)); - recipes.put(new ComparableStack(ModItems.rod_dual_balefire), new BreederRecipe(ModItems.rod_dual_balefire_blazing, 4000)); - recipes.put(new ComparableStack(ModItems.rod_quad_balefire), new BreederRecipe(ModItems.rod_quad_balefire_blazing, 8000)); - - //rocks - recipes.put(new ComparableStack(Blocks.stone), new BreederRecipe(new ItemStack(ModBlocks.sellafield_0), 250)); - recipes.put(new ComparableStack(ModBlocks.sellafield_0), new BreederRecipe(new ItemStack(ModBlocks.sellafield_1), 250)); - recipes.put(new ComparableStack(ModBlocks.sellafield_1), new BreederRecipe(new ItemStack(ModBlocks.sellafield_2), 500)); - recipes.put(new ComparableStack(ModBlocks.sellafield_2), new BreederRecipe(new ItemStack(ModBlocks.sellafield_3), 500)); - recipes.put(new ComparableStack(ModBlocks.sellafield_3), new BreederRecipe(new ItemStack(ModBlocks.sellafield_4), 1000)); - recipes.put(new ComparableStack(ModBlocks.sellafield_4), new BreederRecipe(new ItemStack(ModBlocks.sellafield_core), 1000)); + setRecipe(BreedingRodType.LITHIUM, BreedingRodType.TRITIUM, 200); + setRecipe(BreedingRodType.CO, BreedingRodType.CO60, 100); + setRecipe(BreedingRodType.TH232, BreedingRodType.THF, 500); + setRecipe(BreedingRodType.U235, BreedingRodType.NP237, 300); + setRecipe(BreedingRodType.NP237, BreedingRodType.PU238, 200); + setRecipe(BreedingRodType.PU238, BreedingRodType.PU239, 1000); + setRecipe(BreedingRodType.U238, BreedingRodType.RGP, 500); + setRecipe(BreedingRodType.URANIUM, BreedingRodType.RGP, 200); + setRecipe(BreedingRodType.RGP, BreedingRodType.WASTE, 200); recipes.put(new ComparableStack(ModItems.meteorite_sword_etched), new BreederRecipe(new ItemStack(ModItems.meteorite_sword_bred), 1000)); } + public static void setRecipe(BreedingRodType inputType, BreedingRodType outputType, int flux) { + recipes.put(new ComparableStack(new ItemStack(ModItems.rod, 1, inputType.ordinal())), new BreederRecipe(new ItemStack(ModItems.rod, 1, outputType.ordinal()), flux)); + recipes.put(new ComparableStack(new ItemStack(ModItems.rod_dual, 1, inputType.ordinal())), new BreederRecipe(new ItemStack(ModItems.rod_dual, 1, outputType.ordinal()), flux * 2)); + recipes.put(new ComparableStack(new ItemStack(ModItems.rod_quad, 1, inputType.ordinal())), new BreederRecipe(new ItemStack(ModItems.rod_quad, 1, outputType.ordinal()), flux * 3)); + } + public static HashMap getAllRecipes() { HashMap map = new HashMap(); diff --git a/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java b/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java index ce212cd0d..050c8f58f 100644 --- a/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java @@ -72,16 +72,16 @@ public class CentrifugeRecipes { new ItemStack(ModItems.nuclear_waste_tiny, 2) }); recipes.put(new ComparableStack(ModItems.waste_plate_mox), new ItemStack[] { - new ItemStack(ModItems.nugget_technetium, 1), //strontium-90 here + new ItemStack(ModItems.powder_sr90_tiny, 1), new ItemStack(ModItems.nugget_pu_mix, 3), new ItemStack(ModItems.powder_cs137_tiny, 1), new ItemStack(ModItems.nuclear_waste_tiny, 4) }); recipes.put(new ComparableStack(ModItems.waste_plate_pu239), new ItemStack[] { - new ItemStack(ModItems.nugget_pu240), + new ItemStack(ModItems.nugget_pu240, 2), new ItemStack(ModItems.nugget_technetium, 1), - new ItemStack(ModItems.powder_cs137_tiny, 2), - new ItemStack(ModItems.nuclear_waste_tiny, 2) }); + new ItemStack(ModItems.powder_cs137_tiny, 1), + new ItemStack(ModItems.nuclear_waste_tiny, 5) }); recipes.put(new ComparableStack(ModItems.waste_plate_ra226be), new ItemStack[] { new ItemStack(ModItems.nugget_beryllium, 2), @@ -91,14 +91,14 @@ public class CentrifugeRecipes { recipes.put(new ComparableStack(ModItems.waste_plate_sa326), new ItemStack[] { new ItemStack(ModItems.nugget_solinium, 1), - new ItemStack(ModItems.powder_neodymium_tiny,1), + new ItemStack(ModItems.powder_neodymium_tiny, 1), new ItemStack(ModItems.nugget_tantalium, 1), new ItemStack(ModItems.nuclear_waste_tiny, 6) }); recipes.put(new ComparableStack(ModItems.waste_plate_u233), new ItemStack[] { new ItemStack(ModItems.nugget_u235, 1), new ItemStack(ModItems.powder_i131_tiny, 1), - new ItemStack(ModItems.nugget_technetium, 1), //strontium-90 here + new ItemStack(ModItems.powder_sr90_tiny, 1), new ItemStack(ModItems.nuclear_waste_tiny, 6) }); recipes.put(new ComparableStack(ModItems.waste_plate_u235), new ItemStack[] { diff --git a/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java index f79bf9d70..5c6ffefb6 100644 --- a/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java @@ -361,35 +361,37 @@ public class SILEXRecipes { } recipes.put(new ComparableStack(ModItems.nuclear_waste_long, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_neptunium), 25)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_neptunium), 20)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu239), 45)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu240), 15)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 15)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu240), 20)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_technetium), 15)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_long_depleted, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), new SILEXRecipe(900, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 65)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 15)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 20)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 20)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.dust_tiny), 15)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_technetium), 30)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_ra226), 20)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 5)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 5)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 40)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu238), 12)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_sr90_tiny), 10)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 10)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 12)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 56)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_short_depleted, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_neptunium), 15)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 25)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_zirconium), 10)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.dust_tiny), 32)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 22)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 5)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 15)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 45)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 16)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_long, 1, ItemWasteLong.WasteClass.URANIUM233.ordinal()), new SILEXRecipe(900, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u235), 15)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_neptunium), 25)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu239), 45)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 15)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_technetium), 15)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_long_depleted, 1, ItemWasteLong.WasteClass.URANIUM233.ordinal()), new SILEXRecipe(900, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 65)) @@ -397,58 +399,67 @@ public class SILEXRecipes { .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 20)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.URANIUM233.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u235), 30)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_ra226), 20)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 5)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 5)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 40)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu238), 4)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_sr90_tiny), 12)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 10)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 14)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 60)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_short_depleted, 1, ItemWasteShort.WasteClass.URANIUM233.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u235), 15)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 25)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 15)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 45)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_zirconium), 12)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.dust_tiny), 34)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 13)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 2)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 10)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 29)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), new SILEXRecipe(900, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu240), 10)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu241), 25)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_ra226), 15)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_sr90_tiny), 2)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 5)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 5)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 40)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 6)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 53)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_short_depleted, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 20)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 35)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 45)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_zirconium), 2)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.dust_tiny), 16)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 40)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 3)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 39)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), new SILEXRecipe(900, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu241), 15)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 20)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_ra226), 15)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_neptunium), 5)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_sr90_tiny), 2)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 5)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 5)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 40)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 7)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 66)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_short_depleted, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 20)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 35)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 45)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_zirconium), 2)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.dust_tiny), 22)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 20)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 17)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 3)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 36)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.PLUTONIUM241.ordinal()), new SILEXRecipe(900, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_am241), 25)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_am242), 35)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 5)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 5)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 30)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_technetium), 5)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 3)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 7)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 25)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_short_depleted, 1, ItemWasteShort.WasteClass.PLUTONIUM241.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_neptunium), 20)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 55)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 25)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 60)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.dust_tiny), 20)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 15)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 5)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_long, 1, ItemWasteLong.WasteClass.THORIUM.ordinal()), new SILEXRecipe(900, 100) @@ -457,39 +468,47 @@ public class SILEXRecipes { .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 25)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_long_depleted, 1, ItemWasteLong.WasteClass.THORIUM.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 75)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 15)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 35)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 40)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.dust_tiny), 15)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 10)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_long, 1, ItemWasteLong.WasteClass.NEPTUNIUM.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 20)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 15)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu239), 40)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 40)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu240), 15)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_technetium), 15)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 15)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_long_depleted, 1, ItemWasteLong.WasteClass.NEPTUNIUM.ordinal()), new SILEXRecipe(900, 100) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 16)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 55)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 45)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.dust_tiny), 20)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 9)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.NEPTUNIUM.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_polonium), 10)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu238), 25)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu239), 15)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu238), 40)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_sr90_tiny), 7)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 5)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 5)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 8)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 40)) ); recipes.put(new ComparableStack(ModItems.nuclear_waste_short_depleted, 1, ItemWasteShort.WasteClass.NEPTUNIUM.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u235), 20)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 35)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 45)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_zirconium), 7)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.dust_tiny), 29)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 2)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 45)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 17)) ); - recipes.put(new ComparableStack(ModItems.fallout, 1), new SILEXRecipe(100, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.dust), 90)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_co60), 6)) + recipes.put(new ComparableStack(ModItems.fallout, 1), new SILEXRecipe(900, 100) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.dust_tiny), 90)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_co60), 2)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_sr90_tiny), 3)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 1)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 3)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_au198), 1)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_ra226), 3)) ); recipes.put(new ComparableStack(Blocks.gravel, 1), new SILEXRecipe(1000, 250) diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index d928c0ecf..42d58720d 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -82,6 +82,7 @@ public class ModItems { public static Item ingot_polonium; public static Item ingot_technetium; public static Item ingot_co60; + public static Item ingot_sr90; public static Item ingot_au198; public static Item ingot_ra226; public static Item ingot_titanium; @@ -185,7 +186,9 @@ public class ModItems { public static Item billet_neptunium; public static Item billet_polonium; public static Item billet_technetium; + public static Item billet_cobalt; public static Item billet_co60; + public static Item billet_sr90; public static Item billet_au198; public static Item billet_ra226; public static Item billet_schrabidium; @@ -233,6 +236,7 @@ public class ModItems { public static Item nugget_polonium; public static Item nugget_technetium; public static Item nugget_co60; + public static Item nugget_sr90; public static Item nugget_au198; public static Item nugget_ra226; public static Item plate_titanium; @@ -355,6 +359,8 @@ public class ModItems { public static Item powder_neptunium; public static Item powder_polonium; public static Item powder_co60; + public static Item powder_sr90; + public static Item powder_sr90_tiny; public static Item powder_au198; public static Item powder_ra226; public static Item powder_i131; @@ -377,6 +383,7 @@ public class ModItems { public static Item powder_uranium; public static Item powder_plutonium; public static Item dust; + public static Item dust_tiny; public static Item fallout; public static Item powder_power; @@ -952,8 +959,14 @@ public class ModItems { public static Item coin_worm; public static Item coin_ufo; public static Item coin_siege; - + public static Item rod_empty; + public static Item rod; + public static Item rod_dual_empty; + public static Item rod_dual; + public static Item rod_quad_empty; + public static Item rod_quad; + public static Item rod_uranium; public static Item rod_th232; public static Item rod_u233; @@ -978,7 +991,6 @@ public class ModItems { public static Item rod_balefire; public static Item rod_balefire_blazing; - public static Item rod_dual_empty; public static Item rod_dual_uranium; public static Item rod_dual_th232; public static Item rod_dual_u233; @@ -996,7 +1008,6 @@ public class ModItems { public static Item rod_dual_balefire; public static Item rod_dual_balefire_blazing; - public static Item rod_quad_empty; public static Item rod_quad_uranium; public static Item rod_quad_th232; public static Item rod_quad_u233; @@ -2559,6 +2570,7 @@ public class ModItems { ingot_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.ingot, true).setUnlocalizedName("ingot_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_polonium"); ingot_technetium = new ItemHazard().addRadiation(ItemHazard.tc99 * ItemHazard.ingot).toItem().setUnlocalizedName("ingot_technetium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_technetium"); ingot_co60 = new ItemHazard().addRadiation(ItemHazard.co60 * ItemHazard.ingot).addFire(5).toItem().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 ItemHazard().addRadiation(ItemHazard.au198 * ItemHazard.ingot).addFire(15).toItem().setUnlocalizedName("ingot_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_au198"); ingot_ra226 = new ItemHazard().addRadiation(ItemHazard.ra226 * ItemHazard.ingot).toItem().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"); @@ -2652,7 +2664,9 @@ public class ModItems { billet_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.billet).setUnlocalizedName("billet_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_neptunium"); billet_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.billet, true).setUnlocalizedName("billet_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_polonium"); billet_technetium = new ItemHazard().addRadiation(ItemHazard.tc99 * ItemHazard.billet).toItem().setUnlocalizedName("billet_technetium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_technetium"); + billet_cobalt = new Item().setUnlocalizedName("billet_cobalt").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_cobalt"); billet_co60 = new ItemHazard().addRadiation(ItemHazard.co60 * ItemHazard.billet).addFire(5).toItem().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 ItemHazard().addRadiation(ItemHazard.au198 * ItemHazard.billet).addFire(15).toItem().setUnlocalizedName("billet_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_au198"); billet_ra226 = new ItemHazard().addRadiation(ItemHazard.ra226 * ItemHazard.billet).toItem().setUnlocalizedName("billet_ra226").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_ra226"); billet_schrabidium = new ItemHazard(ItemHazard.sa326 * ItemHazard.billet, false, true).setUnlocalizedName("billet_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_schrabidium"); @@ -2762,6 +2776,7 @@ public class ModItems { nugget_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.nugget, true).setUnlocalizedName("nugget_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_polonium"); nugget_technetium = new ItemHazard().addRadiation(ItemHazard.tc99 * ItemHazard.nugget).toItem().setUnlocalizedName("nugget_technetium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_technetium"); nugget_co60 = new ItemHazard().addRadiation(ItemHazard.co60 * ItemHazard.nugget).addFire(5).toItem().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 ItemHazard().addRadiation(ItemHazard.au198 * ItemHazard.nugget).addFire(15).toItem().setUnlocalizedName("nugget_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_au198"); nugget_ra226 = new ItemHazard().addRadiation(ItemHazard.ra226 * ItemHazard.nugget).toItem().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"); @@ -2829,6 +2844,8 @@ public class ModItems { powder_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.powder, true).setUnlocalizedName("powder_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_neptunium"); powder_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.powder, true).setUnlocalizedName("powder_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_polonium"); powder_co60 = new ItemHazard().addRadiation(ItemHazard.co60 * ItemHazard.powder).addFire(5).toItem().setUnlocalizedName("powder_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_co60"); + powder_sr90 = new Item().setUnlocalizedName("powder_sr90").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_sr90"); + powder_sr90_tiny = new Item().setUnlocalizedName("powder_sr90_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_sr90_tiny"); powder_i131 = new ItemHazard().addRadiation(ItemHazard.i131 * ItemHazard.powder).addFire(15).toItem().setUnlocalizedName("powder_i131").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_i131"); powder_i131_tiny = new ItemHazard().addRadiation(ItemHazard.i131 * ItemHazard.powder_tiny).addFire(15).toItem().setUnlocalizedName("powder_i131_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_i131_tiny"); powder_xe135 = new ItemHazard().addRadiation(ItemHazard.xe135 * ItemHazard.powder).addFire(15).toItem().setUnlocalizedName("powder_xe135").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_xe135"); @@ -2850,6 +2867,7 @@ public class ModItems { powder_uranium = new ItemHazard().addRadiation(ItemHazard.u * ItemHazard.ingot).addFire(5).toItem().setUnlocalizedName("powder_uranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_uranium"); powder_plutonium = new ItemHazard().addRadiation(ItemHazard.pu * ItemHazard.ingot).addFire(5).toItem().setUnlocalizedName("powder_plutonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_plutonium"); dust = new ItemCustomLore().setUnlocalizedName("dust").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":dust"); + dust_tiny = new Item().setUnlocalizedName("dust_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":dust_tiny"); fallout = new ItemHazard().addRadiation(ItemHazard.fo * ItemHazard.powder).toItem().setUnlocalizedName("fallout").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fallout"); powder_advanced_alloy = new Item().setUnlocalizedName("powder_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_advanced_alloy"); powder_tcalloy = new Item().setUnlocalizedName("powder_tcalloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_tcalloy"); @@ -3470,8 +3488,14 @@ public class ModItems { recycled_electronic = new Item().setUnlocalizedName("recycled_electronic").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_electronic"); recycled_nuclear = new Item().setUnlocalizedName("recycled_nuclear").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_nuclear"); recycled_misc = new Item().setUnlocalizedName("recycled_misc").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_misc"); - + rod_empty = new Item().setUnlocalizedName("rod_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_empty"); + rod = (ItemEnumMulti) new ItemBreedingRod().setUnlocalizedName("rod").setMaxStackSize(1).setContainerItem(ModItems.rod_empty).setCreativeTab(MainRegistry.controlTab); + rod_dual_empty = new Item().setUnlocalizedName("rod_dual_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_dual_empty"); + rod_dual = (ItemEnumMulti) new ItemBreedingRod().setUnlocalizedName("rod_dual").setMaxStackSize(1).setContainerItem(ModItems.rod_dual_empty).setCreativeTab(MainRegistry.controlTab); + rod_quad_empty = new Item().setUnlocalizedName("rod_quad_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_quad_empty"); + rod_quad = (ItemEnumMulti) new ItemBreedingRod().setUnlocalizedName("rod_quad").setMaxStackSize(1).setContainerItem(ModItems.rod_quad_empty).setCreativeTab(MainRegistry.controlTab); + rod_th232 = new ItemHazard().addRadiation(ItemHazard.th232 * ItemHazard.rod).toItem().setUnlocalizedName("rod_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_th232"); rod_uranium = new ItemHazard(ItemHazard.u * ItemHazard.rod).setUnlocalizedName("rod_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium"); rod_u233 = new ItemHazard(ItemHazard.u233 * ItemHazard.rod).setUnlocalizedName("rod_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u233"); @@ -3496,7 +3520,6 @@ public class ModItems { rod_balefire = new ItemHazard(150000F).setUnlocalizedName("rod_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_balefire"); rod_balefire_blazing = new ItemHazard(250000F, true).setUnlocalizedName("rod_balefire_blazing").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_balefire_blazing"); - rod_dual_empty = new Item().setUnlocalizedName("rod_dual_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_dual_empty"); rod_dual_th232 = new ItemHazard(ItemHazard.th232 * ItemHazard.rod_dual).setUnlocalizedName("rod_dual_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_th232"); rod_dual_uranium = new ItemHazard(ItemHazard.u * ItemHazard.rod_dual).setUnlocalizedName("rod_dual_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium"); rod_dual_u233 = new ItemHazard(ItemHazard.u233 * ItemHazard.rod_dual).setUnlocalizedName("rod_dual_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u233"); @@ -3514,7 +3537,6 @@ public class ModItems { rod_dual_balefire = new ItemHazard(300000F).setUnlocalizedName("rod_dual_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_balefire"); rod_dual_balefire_blazing = new ItemHazard(500000F, true).setUnlocalizedName("rod_dual_balefire_blazing").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_balefire_blazing"); - rod_quad_empty = new Item().setUnlocalizedName("rod_quad_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_quad_empty"); rod_quad_th232 = new ItemHazard(ItemHazard.th232 * ItemHazard.rod_quad).setUnlocalizedName("rod_quad_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_th232"); rod_quad_uranium = new ItemHazard(ItemHazard.u * ItemHazard.rod_quad).setUnlocalizedName("rod_quad_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium"); rod_quad_u233 = new ItemHazard(ItemHazard.u233 * ItemHazard.rod_quad).setUnlocalizedName("rod_quad_u233").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u233"); @@ -5591,6 +5613,7 @@ public class ModItems { GameRegistry.registerItem(ingot_polonium, ingot_polonium.getUnlocalizedName()); GameRegistry.registerItem(ingot_technetium, ingot_technetium.getUnlocalizedName()); GameRegistry.registerItem(ingot_co60, ingot_co60.getUnlocalizedName()); + GameRegistry.registerItem(ingot_sr90, ingot_sr90.getUnlocalizedName()); GameRegistry.registerItem(ingot_au198, ingot_au198.getUnlocalizedName()); GameRegistry.registerItem(ingot_ra226, ingot_ra226.getUnlocalizedName()); GameRegistry.registerItem(ingot_titanium, ingot_titanium.getUnlocalizedName()); @@ -5682,7 +5705,9 @@ public class ModItems { GameRegistry.registerItem(billet_neptunium, billet_neptunium.getUnlocalizedName()); GameRegistry.registerItem(billet_polonium, billet_polonium.getUnlocalizedName()); GameRegistry.registerItem(billet_technetium, billet_technetium.getUnlocalizedName()); + GameRegistry.registerItem(billet_cobalt, billet_cobalt.getUnlocalizedName()); GameRegistry.registerItem(billet_co60, billet_co60.getUnlocalizedName()); + GameRegistry.registerItem(billet_sr90, billet_sr90.getUnlocalizedName()); GameRegistry.registerItem(billet_au198, billet_au198.getUnlocalizedName()); GameRegistry.registerItem(billet_ra226, billet_ra226.getUnlocalizedName()); GameRegistry.registerItem(billet_schrabidium, billet_schrabidium.getUnlocalizedName()); @@ -5736,6 +5761,8 @@ public class ModItems { GameRegistry.registerItem(powder_neptunium, powder_neptunium.getUnlocalizedName()); GameRegistry.registerItem(powder_polonium, powder_polonium.getUnlocalizedName()); GameRegistry.registerItem(powder_co60, powder_co60.getUnlocalizedName()); + GameRegistry.registerItem(powder_sr90, powder_sr90.getUnlocalizedName()); + GameRegistry.registerItem(powder_sr90_tiny, powder_sr90_tiny.getUnlocalizedName()); GameRegistry.registerItem(powder_i131, powder_i131.getUnlocalizedName()); GameRegistry.registerItem(powder_i131_tiny, powder_i131_tiny.getUnlocalizedName()); GameRegistry.registerItem(powder_xe135, powder_xe135.getUnlocalizedName()); @@ -5818,6 +5845,7 @@ public class ModItems { GameRegistry.registerItem(powder_dineutronium, powder_dineutronium.getUnlocalizedName()); GameRegistry.registerItem(redstone_depleted, redstone_depleted.getUnlocalizedName()); GameRegistry.registerItem(dust, dust.getUnlocalizedName()); + GameRegistry.registerItem(dust_tiny, dust_tiny.getUnlocalizedName()); GameRegistry.registerItem(fallout, fallout.getUnlocalizedName()); //Powders @@ -5896,6 +5924,7 @@ public class ModItems { GameRegistry.registerItem(nugget_neptunium, nugget_neptunium.getUnlocalizedName()); GameRegistry.registerItem(nugget_polonium, nugget_polonium.getUnlocalizedName()); GameRegistry.registerItem(nugget_co60, nugget_co60.getUnlocalizedName()); + GameRegistry.registerItem(nugget_sr90, nugget_sr90.getUnlocalizedName()); GameRegistry.registerItem(nugget_technetium, nugget_technetium.getUnlocalizedName()); GameRegistry.registerItem(nugget_au198, nugget_au198.getUnlocalizedName()); GameRegistry.registerItem(nugget_ra226, nugget_ra226.getUnlocalizedName()); @@ -6540,11 +6569,15 @@ public class ModItems { GameRegistry.registerItem(fusion_shield_chlorophyte, fusion_shield_chlorophyte.getUnlocalizedName()); GameRegistry.registerItem(fusion_shield_vaporwave, fusion_shield_vaporwave.getUnlocalizedName()); - //Fuel Rods + //Breeding Rods GameRegistry.registerItem(rod_empty, rod_empty.getUnlocalizedName()); + GameRegistry.registerItem(rod, rod.getUnlocalizedName()); GameRegistry.registerItem(rod_dual_empty, rod_dual_empty.getUnlocalizedName()); + GameRegistry.registerItem(rod_dual, rod_dual.getUnlocalizedName()); GameRegistry.registerItem(rod_quad_empty, rod_quad_empty.getUnlocalizedName()); + GameRegistry.registerItem(rod_quad, rod_quad.getUnlocalizedName()); + //Fuel Rods GameRegistry.registerItem(rod_uranium, rod_uranium.getUnlocalizedName()); GameRegistry.registerItem(rod_dual_uranium, rod_dual_uranium.getUnlocalizedName()); GameRegistry.registerItem(rod_quad_uranium, rod_quad_uranium.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/machine/ItemBreedingRod.java b/src/main/java/com/hbm/items/machine/ItemBreedingRod.java new file mode 100644 index 000000000..669f60693 --- /dev/null +++ b/src/main/java/com/hbm/items/machine/ItemBreedingRod.java @@ -0,0 +1,31 @@ +package com.hbm.items.machine; + +import com.hbm.items.ItemEnumMulti; + +public class ItemBreedingRod extends ItemEnumMulti { + + public ItemBreedingRod() { + super(BreedingRodType.class, true, true); + } + + //TODO: Remove old rods + public static enum BreedingRodType { + LITHIUM, + TRITIUM, + CO, + CO60, + TH232, + THF, + U235, + NP237, + U238, + PU238, + PU239, + RGP, + WASTE, + + //Required for prototype + LEAD, + URANIUM + } +} diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 320f68387..b2354bacb 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -922,6 +922,7 @@ item.billet_ra226be.name=Ra226Be Billet item.billet_schrabidium.name=Schrabidium Billet item.billet_schrabidium_fuel.name=Schrabidium Fuel Billet item.billet_solinium.name=Solinium Billet +item.billet_sr90.name=Strontium-90 Billet item.billet_technetium.name=Technetium-99 Billet item.billet_th232.name=Thorium-232 Billet item.billet_thorium_fuel.name=Thorium Fuel Billet @@ -1329,6 +1330,7 @@ item.drax_mk2.name=Hardened Terra Drill item.drax_mk3.name=Schrabidic Terra Drill item.ducttape.name=Duct Tape item.dust.name=Dust +item.dust_tiny.name=Tiny Pile of Dust item.dynosphere_base.name=Blank Dynosphere item.dynosphere_desh.name=Desh Dynosphere item.dynosphere_desh_charged.name=Desh Dynosphere (Charged) @@ -1707,6 +1709,7 @@ item.ingot_schraranium.name=Schraranium Ingot item.ingot_semtex.name=Bar of Semtex item.ingot_smore.name=S'more Ingot item.ingot_solinium.name=Solinium Ingot +item.ingot_sr90.name=Strontium-90 Ingot item.ingot_starmetal.name=§9Starmetal Ingot§r item.ingot_steel.name=Steel Ingot item.ingot_steel_dusted.name=Dusted Steel Ingot @@ -2060,6 +2063,7 @@ item.nugget_reiium.name=Reiium Nugget item.nugget_schrabidium.name=Schrabidium Nugget item.nugget_schrabidium_fuel.name=Nugget of Schrabidium Fuel item.nugget_solinium.name=Solinium Nugget +item.nugget_sr90.name=Strontium-90 Nugget item.nugget_tantalium.name=Tantalium Nugget item.nugget_technetium.name=Technetium-99 Nugget item.nugget_th232.name=Thorium-232 Nugget @@ -2154,7 +2158,7 @@ item.pellet_rtg_gold.desc=Made from a rare, highly unstable gold isotope. item.pellet_rtg_polonium.name=Polonium-210 Fuel Pellet item.pellet_rtg_polonium.desc=More powderful RTG pellet, made from finest polonium! item.pellet_rtg_strontium.name=Strontium-90 Fuel Pellet -item.pellet_rtg_strontium.desc= +item.pellet_rtg_strontium.desc=Known to the State of California... item.pellet_rtg_radium.name=Radium-226 Fuel Pellet item.pellet_rtg_radium.desc=Great starter pellet, sourced from all-natural radium! item.pellet_rtg_weak.name=Weak Uranium Fuel Pellet @@ -2283,6 +2287,8 @@ item.powder_schrabidate.name=Ferric Schrabidate Powder item.powder_schrabidium.name=Schrabidium Powder item.powder_semtex_mix.name=Semtex Blend item.powder_spark_mix.name=Spark Blend +item.powder_sr90.name=Strontium-90 Powder +item.powder_sr90_tiny.name=Tiny Pile of Strontium-90 Powder item.powder_steel.name=Steel Powder item.powder_steel_tiny.name=Tiny Pile of Steel Powder item.powder_strontium.name=Strontium Powder @@ -2404,6 +2410,54 @@ item.robes_helmet.name=Casual Hoodie item.robes_legs.name=Casual Pants item.robes_plate.name=Casual Sweater item.rocket_fuel.name=Solid Fuel (Rocket Propellant) +item.rod_empty.name=Empty Rod +item.rod.lithium.name=Lithium Rod +item.rod.tritium.name=Tritium Rod +item.rod.co.name=Cobalt Rod +item.rod.co60.name=Cobalt-60 Rod +item.rod.th232.name=Thorium-232 Rod +item.rod.thf.name=Thorium Fuel Rod +item.rod.u235.name=Uranium-235 Rod +item.rod.np237.name=Neptunium-237 Rod +item.rod.u238.name=Uranium-238 Rod +item.rod.pu238.name=Plutonium-238 Rod +item.rod.pu239.name=Plutonium-239 Rod +item.rod.rgp.name=Reactor-Grade Plutonium Rod +item.rod.waste.name=Nuclear Waste Rod +item.rod.lead.name=Lead Rod +item.rod.uranium.name=Uranium Rod +item.rod_dual_empty.name=Empty Dual Rod +item.rod_dual.lithium.name=Lithium Dual Rod +item.rod_dual.tritium.name=Tritium Dual Rod +item.rod_dual.co.name=Cobalt Dual Rod +item.rod_dual.co60.name=Cobalt-60 Dual Rod +item.rod_dual.th232.name=Thorium-232 Dual Rod +item.rod_dual.thf.name=Thorium Fuel Dual Rod +item.rod_dual.u235.name=Uranium-235 Dual Rod +item.rod_dual.np237.name=Neptunium-237 Dual Rod +item.rod_dual.u238.name=Uranium-238 Dual Rod +item.rod_dual.pu238.name=Plutonium-238 Dual Rod +item.rod_dual.pu239.name=Plutonium-239 Dual Rod +item.rod_dual.rgp.name=Reactor-Grade Plutonium Dual Rod +item.rod_dual.waste.name=Nuclear Waste Dual Rod +item.rod_dual.lead.name=Lead Dual Rod +item.rod_dual.uranium.name=Uranium Dual Rod +item.rod_quad_empty.name=Empty Quad Rod +item.rod_quad.lithium.name=Lithium Quad Rod +item.rod_quad.tritium.name=Tritium Quad Rod +item.rod_quad.co.name=Cobalt Quad Rod +item.rod_quad.co60.name=Cobalt-60 Quad Rod +item.rod_quad.th232.name=Thorium-232 Quad Rod +item.rod_quad.thf.name=Thorium Fuel Quad Rod +item.rod_quad.u235.name=Uranium-235 Quad Rod +item.rod_quad.np237.name=Neptunium-237 Quad Rod +item.rod_quad.u238.name=Uranium-238 Quad Rod +item.rod_quad.pu238.name=Plutonium-238 Quad Rod +item.rod_quad.pu239.name=Plutonium-239 Quad Rod +item.rod_quad.rgp.name=Reactor-Grade Plutonium Quad Rod +item.rod_quad.waste.name=Nuclear Waste Quad Rod +item.rod_quad.lead.name=Lead Quad Rod +item.rod_quad.uranium.name=Uranium Quad Rod item.rod_australium.name=Australium Rod item.rod_balefire.name=Balefire Rod item.rod_balefire_blazing.name=Blazing Balefire Rod @@ -2412,7 +2466,6 @@ item.rod_daffergon.name=Daffergon Rod item.rod_dual_balefire.name=Balefire Dual Rod item.rod_dual_balefire_blazing.name=Blazing Balefire Dual Rod item.rod_dual_coolant.name=Dual Coolant Cell -item.rod_dual_empty.name=Empty Dual Rod item.rod_dual_lead.name=Lead Dual Rod item.rod_dual_lithium.name=Dual Lithium Rod item.rod_dual_mox_fuel.name=MOX Dual Fuel Rod @@ -2441,7 +2494,6 @@ item.rod_dual_uranium_fuel.name=Uranium Dual Fuel Rod item.rod_dual_uranium_fuel_depleted.name=Depleted Uranium Dual Fuel Rod item.rod_dual_waste.name=Nuclear Waste Dual Rod item.rod_dual_water.name=Dual Water Cell -item.rod_empty.name=Empty Rod item.rod_euphemium.name=Euphemium Rod item.rod_lead.name=Lead Rod item.rod_lithium.name=Lithium Rod @@ -2459,7 +2511,6 @@ item.rod_pu240.name=Plutonium-240 Rod item.rod_quad_balefire.name=Balefire Quad Rod item.rod_quad_balefire_blazing.name=Blazing Balefire Quad Rod item.rod_quad_coolant.name=Quad Coolant Cell -item.rod_quad_empty.name=Empty Quad Rod item.rod_quad_euphemium.name=Burned Out Quad Schrabidium Rod item.rod_quad_lead.name=Lead Quad Rod item.rod_quad_lithium.name=Quad Lithium Rod diff --git a/src/main/resources/assets/hbm/textures/items/billet_cobalt.png b/src/main/resources/assets/hbm/textures/items/billet_cobalt.png new file mode 100644 index 0000000000000000000000000000000000000000..5f2e78e5b2bdc6c2a9ed67682bf83aa71d55cee7 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}%0G|+73&*(3is=pg>n1HcaOmQ@fcQF7(~#(_PN4k9#`XF@inAohFZe$c zFa-No2!R9(JR*x382Ao@Fyrz36)8Z$Fi#i95RKs8(}7$E3^ zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-_bvg;-g{AU$e0yDgZzZD{A{$56AaPo7w4U{o%iiQ@5aTijs}Ly zpf>9)nBH@`X3@Hw$L5b?F4mp#-o$-P(Uy{*wD>%pksX4E8` z_Auy}LAjZ)d6a<5!49)T6wyf+NM3c(8KqDphALf=rAmo9wOJP`fM~gKK+Rkr)bNQ3 z9JxRxf<`FRIY6;$1Y#9#${4u$z(O-`ocRg~GFL)ZCIlO@zb)#k#-9|`!7eBwEeBV? z#baIr#!znD(F=l5-*j`6;Js|}>(l%hQ`Mr|pjj}$r1J`q9X;ljnK~QvbEwx6A{FWu z02Cp&0~j(;KzlNdJn6t3h`^&jpakS>EN3V{&T$1uw#Il?frUqIyc1~lWyhX}8+#Lk zaK@VeZLp>wmbDJ^Cs@H8O3pazobxU?Q7*dVjkn%;?}HzkTnZ-G;DQe!NQfbc5i3r- z1QCgnB1eNg&_y3Zlo(@5tP&C>#7gL&;K`g#w%KK$LzWzKDwsaS7FT=;MM^BGay1p( zMD;aPsj;R;s$r*Swz=k8XwqU!9doUlZoBKghb}$#bf~te`c!_P8f~iaRBH4KhidSu z5cUu>wi7orgJNt6iie@V*ujQoTF6=+$_>qQWGo8D0O^J{s?tyl652-WIvv_Ql>3%$ z%E`BM<4?+|A>Hp#PC>e7-Cn3x$9Jww#nvhuoN9yBhxR5(v83@)OMkciKhVDwsHLW+ z*;#6N+siGhJ6qm|R6o!CoVs-{YM2(M9EU%SSGMjJK2w{e-L$Y9r}-*QAa+{0KAh@k z{ZyNj*V`pw3FkT=aO`pu1de{yZ07EwD!Wxey|tB6cZ-&- z6%Gql)A*!SUVw4jJxQ4I6|Oo^9?-gpPXpj-xhzt6O`=?iJ(Hxqvv<_BLNm^$vio|V z<KX?$-8M6+q?pUEh@n@6 zY4#(Egv=~sR+7^29bfkd@ck~%v;6D+9DQoRVn9G7o?(V*6R#5|Hf@9RK5>MVWtI4x zc+8{=5os_B$37drCxPx4$N3lmLc2h-?l|Aaj?+8=g3rK}-u7=afay=t>uoJ|1Pp8g7uRh~ z*#j|5JVq{b5J@}BvpGt?COWY( z#&fbY7>0qq?>7V|c0#2T%X09HryAR~YaP-|N~!hsdgAfS6cJbhH*G=tBLmFyjMh`& yq>W?=O;f!0PW85tQsEA<$u}r}@)vSf_!KWM(^@4>IE(WD00001poj5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/ingot_sr90.png b/src/main/resources/assets/hbm/textures/items/ingot_sr90.png new file mode 100644 index 0000000000000000000000000000000000000000..8a866399ebea2709be26091a5ec0641fe7d65ecb GIT binary patch literal 1810 zcmV+t2krQYP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ccI+q&{AU%j1SAlMD1_?dydh*LqYP%4U#%rh>?|oSlCzN%S zHceYv&c?I3R``f0RlzLB+#J;Nt~&xZE^--t!kwMRJVKwHcVwn2EF=iX&GOCw+Uo$_ z1o@E6ee_T1F8G|6-rdDAtQbLfIzaL~_%p;;j@^lfZwI;@rXGXbd)40CzPjuKA{tgk zS#v~Z8tHXI$lZJ`pha8)InI{Q)Mi^id9}rEXoV6nSm}m5Rm#+<&Aw0pM9+;QdgcP6 zhE84N#KjGs{AkoUg1zb#WEF14IjH%>Lep=W{t78PSHe^#7#mc-Z06nIcbe(Fj1ZC4 zGgiRGBXa>`FgNa)1wyDV-ed;&Xp4S(l|M*TFeo$3iUnr7?It#%OK!Qzv%@?=zi%Nj zu`UA$5qt~4kOKoYkP`}IBXcA|92Ep*ARl{U0|O+&6(HF=7uZBr9=`ETq&b&`0}nN7 z6NnHOTm(1RUm(kSLHxF2F$uFdDZ?c3g5zT1anE9TUwpJolmZXU@$B?0$smmi{YruROo%-yx!Onzhd$wH}Uq z^7THCa3o$Z)o&!YdF9#8_2Zj(_0I0;+&WI;LzlNHZ6!Ms-B!=d=8i>O%1smZg1`{# z5k=nfNH*2`&0Ki*wUy$(sz}|JS!#J}!T0+3LifvB#X(5oG#yJ)zYjz@<7AE{s7%BW z2lR@u|7c^-|T3j3j z*Mfr|i&X~~XI&j!1wrrw#Ldk~(M3x9Us7lhCCFw^@<*ZFn|$6Wo8+3l9Yhw__~LWuXhoi<$dnY(WhoD2KYqcS!S3O;tk^I&5FT! zpE$@0vPyhTJZ{nji66PHxctUB@36o#gJvo@PaGr`^KGoOF)NrFag;c$YC7c$X_r;b zTb#90l{N3lUl_>hE6ZG`IgB_Ku>=Vs6jV_}2^BgpF2XskIMF-^x7!WBNz~#v20002ZNklyJP}qf}=oyQ5+0({L0qpy|Z-(f0J4vwL*S^YK82& zR?KNTkz_IGeqJtHs;ZiZSF1JVd}Fgup*cxjE2Qs_SZk9|S(b#2#?3);0IfAm(?lg9 zq_xI5_fpTp;$4!0qJmJ8f&jetPl0oeq9_2c*3QD-dxqisxZ4X^ejCRiz(bOPCVL<} z$GGoWj4^Ma=pqToLcutup=iQae3Qu+GQR741pz~H34);oy8r+H07*qoM6N<$g85Td AW&i*H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/nugget_sr90.png b/src/main/resources/assets/hbm/textures/items/nugget_sr90.png new file mode 100644 index 0000000000000000000000000000000000000000..5b3567ea898b38838262ab445ca842faba5743e2 GIT binary patch literal 1829 zcmV+=2io|FP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|KlH@iFyz>=)0s(LVpTjl6Kk)ONT%@k5p7GR7 z&%qIPu_Zzv1*S5=rA`0q&td++kFBb4K59rISo~aai8Bnf`@cWM!t}&=Q`;DF!))VN8d;-cGnPId?knr>NlRJS@-$qCpAE6fBbv+#y zlye2L@dVrN;@LbpTm(zaV<2JfLSollcORJ-Nyf$dj(%1WY!Nl6ti*!^ggkxTO`v@w z=!xXZGOz64)(iQZk6&K642L5a-)tcNZSohz4+G1Mh@TqG!Ig6Mh5qMMxl!2VZae)HlJvV@4Clc61R-R+yok*)Mdk#F^ zSeqb(mmm?^U`|0S=REQ!Iz?;UdKqUqXpRODee{eX6Uzh8nBZRCD7d z4a-CeEjDeb9aTS-pHPjCYP^)1{o<_} zye7sg1kL5dPtBkhJA&eIDlk{DshL%Bj;C@{Gn*Kb!ZSensf}qg6@!GX6Z=88b|1>U zrJM2kmTvqb<;;}scPM8d-Dlmtp<0{!TwRLoSvWbhg4u`muGz5WxvAx^*8d0k?*wXX z)?Bd5=9MQreq$aU55JwGM{Y*p?XEV&<=_<9pi%Ii|WW1 zq=FQvvhx8e`IOi^;rjwC^MvmKUXVp77_9YHF>Dn>XC519;~1&tnUE7U=)TmqzgU}B z2VrAaV?oN2THk2Yg2E%do|MAYId`4OS(0M(RmWfC$^1~)58iNES`6W&+jVCrc02&E zm^o9mDf>MKplf+M#haX&jh$9Tq)#1cJwULR58J;V$nIRKZW!lk+J3HIq08Kk;p+al z9^7acL*zUs9aZ%0Kwqr?jfh^6ymovO+1C*boSpDLy!ji3FX<(QFnu`y00D$)LqkwW zLqi~Na&Km7Y-Iodc$|HaJxIeq7>3`bN=2#;c97zbp*mR*mEx#XC_;r$E41oha_Jv5 zF(fH2j)H5!!JoydgNw7S4z7YA_ygkR=A`H%C4QF_TEuwAaS!i(@5|kHfY7Ki&FUHl zG~G5csic_8uZW>nglYC8iiFH8V^)&V@Eu?G2=M(b&a?dM{v3U3!D2u_B%Wc0X%nv# zCpK+^^FDEem1ULqoOsNn3lcwaUGeyhbIE0aXGY9yW{x;QES5T0>0nkiHR37an5yZN zFXTK{Id5^+sx{WSCx2nMpf4|Roz^f?SimAAh)_^N1y$IH)2@?ZAw%a$AAi*KOXO0> zRRJT%JT{;~cKzUg@VmEGadN^-3MYZ?7svS+0YbY#v+g+G$BxrH0fNuKmEQJmG=S+( z((7$4b_5J;0~gnAP1yr3cYvWMLpEhs3epmaMd1C6z9|n3-U7X=Uf){hIDG)J)T{Ij zaBv8WmMDA8=iNP>efzhj)xRH;SaP&;qa#89000JJOGiWibO37rJ?Z32;bR za{vGi!T z4d!!$4!5I$PR1L|!g_|yG}tqE14CIR@dlF#1`B3lwk8c`9U2+VUcfSt5mxMB1_QC+ z(=_$_SJ$s@5gv<#mlqhs5^n|tNK@GDiCZOiU=8}a`PRSVS{L)N4l`6D+-M8dTB@qT zImcu&CeJQ6>f}M1{@;fX0QfMbo4{_56vaEvIlT9*R$HcDrSzVH_x@UaF`MyoIP?<; zAyC(K`y8bO!wj_sU6v&yWA1VgKtUVa5CeAkX;=CoYeqS^LBpx{X1% TO+D)500000NkvXXu0mjfD2!M} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/powder_sr90.png b/src/main/resources/assets/hbm/textures/items/powder_sr90.png new file mode 100644 index 0000000000000000000000000000000000000000..08efa4eb2937c8f29daa5fb351e65d3cd86b798e GIT binary patch literal 1942 zcmV;H2Wj|;P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|clEfwq{O1%o0+M(hhi6r8kmIK@_%Y+zncZZo z@{?h0u#BaqTf$z|{`#}4Kk#F6S{dtui_U5MOf-=b20_nX+|H!Uc3u~HA3WIAaf4wJ z^fE7fTJsa^_IzNELHW_H!n(s@IodrhhcY5F2K5ROcAj=J%Ta7|;9~GssF`P9*2E3U zIvi=goXux(t*!>+!BVvdB+N}n^mYz&j*NpOp^rGT7|bK|NsN#}C*l?o5c06RgFt;H z=z-*Yq@LM7Mo;8(T6THj(k+fKczJ{DYw|aWFM;Ji#7{TkB=TW7>*&3P-rHPVG7gNo zl~G#l?2KnHF@tj19&>0OhsD@$EusaTbb;hm7oE`xMPjJZ6&b3Os8ieeLIn^FH}>e6 z3xpcBAf6)^89JHKsI!N9RRVM?+!Qo3!Uq=G;>Imrp@7JhFqH|;hSXm+_3q|Rn(Dm_ zib#ipE8yahqJS}!8)wXdAk>#`b|ZLiOMZRHAEYW2v>VL<3rsps7unL8Te9gam}k+? z5+dd6asY}D+X4&;6hHxqrBOx9o(Mb!2$X<))JBE^WGz>KWP{RRq&qyeT#2 z`9n2WmG`>~8rz8-nn5u(1jYSO013@QGabkn9?A{PbYv8TWq`Cp8&zp21_@0gww(^` zPUXI(o3i0sy74FF)R68slv9xIuGUhtUO|e;pgHtW2KFmoR6b`L%`nUc6j{Yl0 z(l~F!T$1?HTFtapD_=TOzkz0R^oT-QPTN(~REi~oKRvdUZD?}{J%==&Os%83PjBj1 z-~f&K2&eeEMtB#Gfpv|gHJ%UVQp^|t(fI5e#-H~c3*3ess#Rc_aqyaNCCoUQ;wMa% zr<0o;pkCHJTFl3v6FJzAoPf~Ms75g1V-w>wWGFVGbW?tc?L4Ai1{0Y*` zHL1aC>-j`^P+WG33r$RTYgs*e^g$DOs1l!2B%ljT9%3>-;>B`dy?*qEG zy?R@+S8`tRc%o7RmZ$rwpHO~us{Z*qEX>4Tx0C=2zkv&MmKpe$iQ^gM|3U(;s5U@H~5G~@URVYG*P%E_RU~=gfG-*g$ zTpR`0f`cE6RRx`&UicM+cDeeTcEr)Dh%_(bAaW|$S?4dUs| ziotoGILHdJN_D&>%a0@IUz7t(BXabdv%xp!3DHKSqJBU7%63?eAmTZkz!AXW&Y2`O9@+=9BbV zOA8+X{oBCBbxTwBfXf{q^km4U>_~o^LM{iqpV2pEfWcd!cg^jsxsTHaAVpmzZh(VB zU@TAB>mKj!Ztv~iGtK^f0KjZ=#xfu^bpQYW24YJ`L;(K){{a7>y{D4^000SaNLh0L z01mC!9w9}QSx}^q#H>Su*%MqrWhYybtx~mj&~Um=MY zg~506@%Rpt<807*qoM6N<$f>$1p(EtDd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/powder_sr90_tiny.png b/src/main/resources/assets/hbm/textures/items/powder_sr90_tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..5ce5ed4c99e764561555614d4d9ee5130530cadd GIT binary patch literal 1607 zcmV-N2Dtf&P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-_tlH?`~{m&_K1SBC4$H9D5p(02Wg--r7R7kgzFG+E3sdR!rg%mp3u=apAYKCF5__^b0|clQ9p zBxvP)Ol8k6u&rZyi9-$uFQQZ?4 zlzoRA*4fNw_hd+5sVM>pa~Bf7YC93gyh+Nmui7w=B%vQ9J2YO>b_PP8UhgK*KN9pr z^3`+i*}r@5$mg={@{Y^6IYQ^t0n&GNxx?^dV7U?T^FZyFtB)j)(QJ%>&li?5Kp`RWgpN|_k!4@ZF-6&lo6Td4wK;LZsxbA?dT zW|BB_m8nyhg$5_d(!`);n5u;ed``@6wciW{R&ipbl| z6>#y)YrvSw%^I^H2#u|qE`qPJ<@XQygH(lrx@b1MVDZQ4;!t|aEm=AX<|*293z180 zI{-z9tpGy;1$-n?isTb>A_9*FfeMhb1U{eusd58I4kD3VVr&`2#+pQHE-Oc#W}HnB zLM38985AlID+ERUq+rOQqM|`nqb4<{Sxb}{qQ)3goQGUVl0woHQ%aU{Dkc_8Em|_O zY$bCRoPnBSPT6wKrLZdqRN$*%eu3rSLymCh5s!4(k&jZ5J~dRWv8HM@*V4F2!!glf zOU+ttrIYJ8DSGJIV^7_B?qwj?hKw+D#F2)LJj$)wR`o-9K{eW{@ltBeOSfvUx|A*# zG>;RVnn5uR1jW--013@gGj9|EPvxd&J~K9jGC=Co#xZL1B$$OPM_YyZLj0=!lJnh!`WVLOKi6d*4Dis@{^X0`%_lA2Y5fg5S#ms4e{BII}`F@ z(syRjiD-m+uI@36_R+x*+2h$p75izg_NAlu$i4~5{{+#0Mzw*Dp6vbv?3>kK=vVin z0004nX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$iQ$;BiQ9Fn_WT;LSL`B3&t5Adr zp;l;o12rOimEM7-bHv;>vMmOE;VB@ zz$X&VGQ+fqH;AV;ZG-bZafsz*mH3=^)T9d%KXP61_>FVUWr1gg%w%GoI7BSwnpkOK zmNzxxN#d}o>69;|JXSexan_1uR=+2IVKAewEOVXa5Mo%w5+sOFP(}eo*oe@olVTx3 z`_UHu0oN~)OCeVQj2sInL4)l2!T;cQw^nvy+)D~Zf%X^2`4|Q|c7a;OalVfor*;DP zpMfjA;V)Hz=}*!t4J~{GbZ-L}*9}eC11@)f{wG5=Wmodk6tY?1{fxdT4fNdtfik24YJ`L;z#}TL3Mv z$M@C%000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jvP96)_0tmPtPV0056kL_t(I z%k7e}5yK!1MIT%SU;?+AA|tqEF-CBwmI-|Bya8<{U;|RPNY1vnOML0_O3;5uI^fT5 zk%1-y?d$M5r?$?iEAdu%ni8rCz&PHqB;E>(2r)(gYOSW^v;$S8l(Gp$2qBoG-u4IO zfg>-6mvUaVyB)5##Dn+*2heyGyNEXV)=002ovPDHLk FV1jl`@%sP( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/rod.co.png b/src/main/resources/assets/hbm/textures/items/rod.co.png new file mode 100644 index 0000000000000000000000000000000000000000..f3fdd2f2aaf4b330be92c5ca43606b2fe621b800 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}H0G|+77Z(>(Q`6|^=$R{yw@%qy*|B`m!UMTAv(w9_0+kdyJIw)7TqQw% z!T(`^Vbd9%^FUF~0*}aI1_r*vAk26?e?NS%G}T0G|+77Z(>(Q`6|^=$R{yw@%qy*|B`m!UMTAv(w9_{s*dIU^pbkHw8#> zmjw9*|AzwxFMq~QKw-`TkH}&M2EM}}%y>M1MG8>R+tbA{L?gJg-;wWt0tbuZQLg{> z1%_q9celkfa9VQ;t#&b76UM@_U|YJ=YPSW_t~WmJ`oSRHXcn>RzhL?NiDxHPzj!x8 fK{TD^z5AU|Ee?(KzNz{^V;MYM{an^LB{Ts55_D65 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/rod_lead.png b/src/main/resources/assets/hbm/textures/items/rod.lead.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/rod_lead.png rename to src/main/resources/assets/hbm/textures/items/rod.lead.png diff --git a/src/main/resources/assets/hbm/textures/items/rod_lithium.png b/src/main/resources/assets/hbm/textures/items/rod.lithium.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/rod_lithium.png rename to src/main/resources/assets/hbm/textures/items/rod.lithium.png diff --git a/src/main/resources/assets/hbm/textures/items/rod_neptunium.png b/src/main/resources/assets/hbm/textures/items/rod.np237.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/rod_neptunium.png rename to src/main/resources/assets/hbm/textures/items/rod.np237.png diff --git a/src/main/resources/assets/hbm/textures/items/rod_pu238.png b/src/main/resources/assets/hbm/textures/items/rod.pu238.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/rod_pu238.png rename to src/main/resources/assets/hbm/textures/items/rod.pu238.png diff --git a/src/main/resources/assets/hbm/textures/items/rod_pu239.png b/src/main/resources/assets/hbm/textures/items/rod.pu239.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/rod_pu239.png rename to src/main/resources/assets/hbm/textures/items/rod.pu239.png diff --git a/src/main/resources/assets/hbm/textures/items/rod.rgp.png b/src/main/resources/assets/hbm/textures/items/rod.rgp.png new file mode 100644 index 0000000000000000000000000000000000000000..41fde248dd08dc1c6f30f8e1187ac9fa1ed4045b GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}T0G|+77Z(>(Q`6|^=vj*wq~>J@MMqRL*17n4Svol|sQm}3+I|0}43Oe3 z3Gxg64+jih{*0f1!kh&jk;M!Qe1}1p@p%4<6riBDr;B5VMsR7rBi{i94i?9wT>t9} z49kS?Zi{K)wB{6A?P9nljD=;vwsfb}ZVRMcZ+zVKgF(E}EMnDv!SeYN&rYm<@ot8K eXgbS#_dB6l92)C=Q}uzyGI+ZBxvXNS%G}H0G|+77Z(>(Q`6|^=$R{yw@%qy*|B`m!UMTAv(w9_0+kdyJIw)7TqQw% z!T(`^Vbd9%^FUF~0*}aI1_r*vAk26?e?mfC2~0%~f0f{XZNV zVWP6OQ(2Pls@U{}6Mh@@yLMiy>`+|8n>_E%BRPgSns&xhv_!Roo*3YvQPkp~$#rRQ$b$Z#m=Vm~A7(8A5T-G@yGywppNS%G}T0G|+77Z(>(Q`6|^=$R{yw@%qy*|B`m!UMTAv(w9_{s*dIU^pbkHw8#> zmjw9*|AzwxFMq~QKw-`TkH}&M2EM}}%y>M1MG8NS%G}T0G|+77Z(>(Q`6|^=vj*wq~>J@MMqRL*17n4Svol|sQm}3+I|0}43Oe3 z3Gxg64+jih{*0f1!kh&jk;M!Qe1}1p@p%4<6rf@d6|7^7eU~{%sGjtwm6`LI)vTONQe)$NS%G}@0G|+7DJdxl2?-Y$7gJMHSy|cW=;)a%j<-(PT-mXF(!v9|HM7&prUKQL zo_b^tq8z*OYzUGR<6c%NS%G}50G|+7DJdxl2?-Y$7gJMHSy|cW=;)a%j<-(PT-mXF(!v9|HM7&prv3*i zW?)eE&N>F9_)3EOg8w4}2G;|3P5@;%3p^r=feH?TFyrz36)8Z$JWm(L5RKr{en+9h z3Ovl6Qy#QD`d`2Okk_)g=e}%eKe{RK^qFmq{J}~2><*U~$=fDO%aHxsa?iD!`?_b* z#fkT2=NbI(4oteEB%nV_wQO#R?$dG?^LHoa2pe9rKQe2ENS%G}50G|+7DJdxl2?-Y$7gJMHSy|cW=;&FC7o_H82SrCzG}gKJdRaO-FsS_p zDvxUF^#f9TB|(0{|B(TM>w!BbfHIr~9+AaB1&2YH@p%4<6rf<9r;B5VMsR7rqtIam z9_G#|4_Y4muit*iYuVg$UpBQL-4uBG%(h1U;G}$Zhs%rPZ4;(t$o_4)=i1GE-LvT8 z#QU=I4E}cqCf!jI(4VDRHaA80X}OE}yAyMS4X@cBnKi?4>GnmfS(8?;DcAV4a{f=Y Ywq~}I|6k;N2inZw>FVdQ&MBb@0O^WvuK)l5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/rod_quad_th232.png b/src/main/resources/assets/hbm/textures/items/rod_quad.th232.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/rod_quad_th232.png rename to src/main/resources/assets/hbm/textures/items/rod_quad.th232.png diff --git a/src/main/resources/assets/hbm/textures/items/rod_quad_thorium_fuel.png b/src/main/resources/assets/hbm/textures/items/rod_quad.thf.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/rod_quad_thorium_fuel.png rename to src/main/resources/assets/hbm/textures/items/rod_quad.thf.png diff --git a/src/main/resources/assets/hbm/textures/items/rod_quad_tritium.png b/src/main/resources/assets/hbm/textures/items/rod_quad.tritium.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/rod_quad_tritium.png rename to src/main/resources/assets/hbm/textures/items/rod_quad.tritium.png diff --git a/src/main/resources/assets/hbm/textures/items/rod_quad_u235.png b/src/main/resources/assets/hbm/textures/items/rod_quad.u235.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/rod_quad_u235.png rename to src/main/resources/assets/hbm/textures/items/rod_quad.u235.png diff --git a/src/main/resources/assets/hbm/textures/items/rod_quad_u238.png b/src/main/resources/assets/hbm/textures/items/rod_quad.u238.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/rod_quad_u238.png rename to src/main/resources/assets/hbm/textures/items/rod_quad.u238.png diff --git a/src/main/resources/assets/hbm/textures/items/rod_quad_uranium.png b/src/main/resources/assets/hbm/textures/items/rod_quad.uranium.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/rod_quad_uranium.png rename to src/main/resources/assets/hbm/textures/items/rod_quad.uranium.png diff --git a/src/main/resources/assets/hbm/textures/items/rod_quad_waste.png b/src/main/resources/assets/hbm/textures/items/rod_quad.waste.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/rod_quad_waste.png rename to src/main/resources/assets/hbm/textures/items/rod_quad.waste.png diff --git a/src/main/resources/assets/hbm/textures/items/rod_waste_overlay_heat.png b/src/main/resources/assets/hbm/textures/items/rod_waste_overlay_heat.png deleted file mode 100644 index e45f44f0cad7d2839e3a8344041891e838808316..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Ec@}jv*HQTZ2#Y9x~wB8r*2Hfhk?>K}STh zV_=aJavhQ~ZBRykF-R{H2jHBN7e znR@WM@V>JRb8pQ5`0?Gv^+5~W1uo2->$X!QsfF8BSc-{HuxO_B0;QybGEz>uQcVTZ wxA&iWGU<#qv)$9>YyY+W_YuFpj&UNt_yng#+?&3|0z-ho)78&qol`;+0QYW*q5uE@