diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index ea664bd8d..44d2ad568 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -19,6 +19,8 @@ public class MineralRecipes { public static void register() { + RecipesCommon.add1To9Pair(ModItems.powder_coal, ModItems.powder_coal_tiny); + RecipesCommon.add9To1(ModItems.ingot_aluminium, ModBlocks.block_aluminium); RecipesCommon.add1To9(ModBlocks.block_aluminium, ModItems.ingot_aluminium); @@ -58,13 +60,11 @@ public class MineralRecipes { RecipesCommon.add9To1(ModItems.powder_i131_tiny, ModItems.powder_i131); RecipesCommon.add1To9(ModItems.powder_i131, ModItems.powder_i131_tiny); - RecipesCommon.add9To1(ModItems.nugget_technetium, ModItems.ingot_technetium); - RecipesCommon.add1To9(ModItems.ingot_technetium, ModItems.nugget_technetium); - - RecipesCommon.add9To1(ModItems.ingot_bismuth, ModBlocks.block_bismuth); - RecipesCommon.add1To9(ModBlocks.block_bismuth, ModItems.ingot_bismuth); - RecipesCommon.add9To1(ModItems.nugget_bismuth, ModItems.ingot_bismuth); - RecipesCommon.add1To9(ModItems.ingot_bismuth, ModItems.nugget_bismuth); + RecipesCommon.add1To9Pair(ModItems.ingot_technetium, ModItems.nugget_technetium); + RecipesCommon.add1To9Pair(ModItems.ingot_au198, ModItems.nugget_au198); + + RecipesCommon.add1To9Pair(ModItems.ingot_bismuth, ModItems.nugget_bismuth); + RecipesCommon.add1To9Pair(ModBlocks.block_bismuth, ModItems.ingot_bismuth); for(int i = 0; i < ItemWasteLong.WasteClass.values().length; i++) { RecipesCommon.add9To1SameMeta(ModItems.nuclear_waste_long_tiny, ModItems.nuclear_waste_long, i); @@ -114,7 +114,9 @@ public class MineralRecipes { RecipesCommon.addBillet(ModItems.billet_plutonium_fuel, ModItems.nugget_plutonium_fuel); RecipesCommon.addBillet(ModItems.billet_neptunium_fuel, ModItems.nugget_neptunium_fuel); RecipesCommon.addBillet(ModItems.billet_mox_fuel, ModItems.nugget_mox_fuel); + RecipesCommon.addBillet(ModItems.billet_les, ModItems.nugget_les); RecipesCommon.addBillet(ModItems.billet_schrabidium_fuel, ModItems.nugget_schrabidium_fuel); + RecipesCommon.addBillet(ModItems.billet_hes, ModItems.nugget_hes); RecipesCommon.addBillet(ModItems.billet_australium, ModItems.nugget_australium); RecipesCommon.addBillet(ModItems.billet_australium_greater, ModItems.nugget_australium_greater); RecipesCommon.addBillet(ModItems.billet_australium_lesser, ModItems.nugget_australium_lesser); @@ -139,7 +141,13 @@ public class MineralRecipes { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_schrabidium_fuel, 1), new Object[] { ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, "tinyNp237", "tinyNp237", ModItems.nugget_beryllium, ModItems.nugget_beryllium })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_po210be, 1), new Object[] { "nuggetPolonium", "nuggetPolonium", "nuggetPolonium", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_pu238be, 1), new Object[] { "nuggetPlutonium238", "nuggetPlutonium238", "nuggetPlutonium238", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_ra226be, 1), new Object[] { "nuggetRadium226", "nuggetRadium226", "nuggetRadium226", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium })); + + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_uranium, 9), new Object[] { ModItems.billet_u235, ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u238 }); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_uranium, 1), new Object[] { "nuggetUranium235", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_uranium, 1), new Object[] { "tinyU235", "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU238" })); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_uranium, 2), new Object[] { ModItems.billet_uranium, ModItems.billet_uranium, ModItems.billet_uranium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_u233, 2), new Object[] { ModItems.billet_u233, ModItems.billet_u233, ModItems.billet_u233 }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_u235, 2), new Object[] { ModItems.billet_u235, ModItems.billet_u235, ModItems.billet_u235 }); @@ -158,7 +166,9 @@ public class MineralRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_technetium, 2), new Object[] { ModItems.billet_technetium, ModItems.billet_technetium, ModItems.billet_technetium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_schrabidium, 2), new Object[] { ModItems.billet_schrabidium, ModItems.billet_schrabidium, ModItems.billet_schrabidium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_solinium, 2), new Object[] { ModItems.billet_solinium, ModItems.billet_solinium, ModItems.billet_solinium }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_les, 2), new Object[] { ModItems.billet_les, ModItems.billet_les, ModItems.billet_les }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_schrabidium_fuel, 2), new Object[] { ModItems.billet_schrabidium_fuel, ModItems.billet_schrabidium_fuel, ModItems.billet_schrabidium_fuel }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_hes, 2), new Object[] { ModItems.billet_hes, ModItems.billet_hes, ModItems.billet_hes }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_balefire_gold, 1), new Object[] { ModItems.billet_au198, ModItems.cell_antimatter, ModItems.pellet_charged }); diff --git a/src/main/java/com/hbm/crafting/RecipesCommon.java b/src/main/java/com/hbm/crafting/RecipesCommon.java index 5d029e028..7d3c572c4 100644 --- a/src/main/java/com/hbm/crafting/RecipesCommon.java +++ b/src/main/java/com/hbm/crafting/RecipesCommon.java @@ -14,6 +14,17 @@ import net.minecraftforge.oredict.ShapedOreRecipe; * @author hbm */ public class RecipesCommon { + + //Bundled 1/9 recipes + public static void add1To9Pair(Item one, Item nine) { + add1To9(new ItemStack(one), new ItemStack(nine, 9)); + add9To1(new ItemStack(nine), new ItemStack(one)); + } + + public static void add1To9Pair(Block one, Item nine) { + add1To9(new ItemStack(one), new ItemStack(nine, 9)); + add9To1(new ItemStack(nine), new ItemStack(one)); + } //Decompress one item into nine public static void add1To9(Block one, Item nine) { diff --git a/src/main/java/com/hbm/crafting/RodRecipes.java b/src/main/java/com/hbm/crafting/RodRecipes.java index 51fe32723..b1a4b82c2 100644 --- a/src/main/java/com/hbm/crafting/RodRecipes.java +++ b/src/main/java/com/hbm/crafting/RodRecipes.java @@ -167,11 +167,14 @@ public class RodRecipes { RecipesCommon.addRBMKRod(ModItems.billet_pu241, ModItems.rbmk_fuel_hep241); RecipesCommon.addRBMKRod(ModItems.billet_neptunium_fuel, ModItems.rbmk_fuel_men); RecipesCommon.addRBMKRod(ModItems.billet_po210be, ModItems.rbmk_fuel_po210be); + RecipesCommon.addRBMKRod(ModItems.billet_ra226be, ModItems.rbmk_fuel_ra226be); RecipesCommon.addRBMKRod(ModItems.billet_pu238be, ModItems.rbmk_fuel_pu238be); RecipesCommon.addRBMKRod(ModItems.billet_australium_lesser, ModItems.rbmk_fuel_leaus); RecipesCommon.addRBMKRod(ModItems.billet_australium_greater, ModItems.rbmk_fuel_heaus); RecipesCommon.addRBMKRod(ModItems.egg_balefire_shard, ModItems.rbmk_fuel_balefire); + RecipesCommon.addRBMKRod(ModItems.billet_les, ModItems.rbmk_fuel_les); RecipesCommon.addRBMKRod(ModItems.billet_schrabidium_fuel, ModItems.rbmk_fuel_mes); + RecipesCommon.addRBMKRod(ModItems.billet_hes, ModItems.rbmk_fuel_hes); RecipesCommon.addRBMKRod(ModItems.billet_balefire_gold, ModItems.rbmk_fuel_balefire_gold); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rbmk_fuel_drx, 1), new Object[] { ModItems.rbmk_fuel_balefire, ModItems.particle_digamma }); diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index 701ed08b0..ddcfad2b8 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -60,6 +60,7 @@ public class OreDictManager { OreDictionary.registerOre("ingotZirconium", ModItems.ingot_zirconium); OreDictionary.registerOre("ingotBoron", ModItems.ingot_boron); OreDictionary.registerOre("ingotTcAlloy", ModItems.ingot_tcalloy); + OreDictionary.registerOre("ingotGold198", ModItems.ingot_au198); OreDictionary.registerOre("nuggetLead", ModItems.nugget_lead); OreDictionary.registerOre("nuggetBeryllium", ModItems.nugget_beryllium); @@ -81,6 +82,8 @@ public class OreDictManager { OreDictionary.registerOre("nuggetPolonium", ModItems.nugget_polonium); OreDictionary.registerOre("nuggetSchrabidium", ModItems.nugget_schrabidium); OreDictionary.registerOre("nuggetZirconium", ModItems.nugget_zirconium); + OreDictionary.registerOre("nuggetRadium226", ModItems.nugget_ra226); + OreDictionary.registerOre("nuggetGol198", ModItems.nugget_au198); OreDictionary.registerOre("tinyU233", ModItems.nugget_u233); OreDictionary.registerOre("tinyU235", ModItems.nugget_u235); OreDictionary.registerOre("tinyU238", ModItems.nugget_u238); @@ -91,6 +94,7 @@ public class OreDictManager { OreDictionary.registerOre("tinyPu241", ModItems.nugget_pu241); OreDictionary.registerOre("tinyNp237", ModItems.nugget_neptunium); OreDictionary.registerOre("tinyTc99", ModItems.nugget_technetium); + OreDictionary.registerOre("tinyRa226", ModItems.nugget_ra226); OreDictionary.registerOre("nuggetNeodymium", ModItems.fragment_neodymium); OreDictionary.registerOre("nuggetCobalt", ModItems.fragment_cobalt); @@ -143,6 +147,7 @@ public class OreDictManager { OreDictionary.registerOre("dustZirconium", ModItems.powder_zirconium); OreDictionary.registerOre("dustBoron", ModItems.powder_boron); OreDictionary.registerOre("dustTcAlloy", ModItems.powder_tcalloy); + OreDictionary.registerOre("dustGol198", ModItems.powder_au198); OreDictionary.registerOre("dustNeptunium", ModItems.powder_neptunium); OreDictionary.registerOre("dustIodine", ModItems.powder_iodine); diff --git a/src/main/java/com/hbm/inventory/SILEXRecipes.java b/src/main/java/com/hbm/inventory/SILEXRecipes.java index 874a8a1e0..1ccc700c5 100644 --- a/src/main/java/com/hbm/inventory/SILEXRecipes.java +++ b/src/main/java/com/hbm/inventory/SILEXRecipes.java @@ -112,22 +112,32 @@ public class SILEXRecipes { // LEP // recipes.put(new ComparableStack(ModItems.rbmk_pellet_lep, 1, i), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_plutonium_fuel), 90 - i * 15)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM.ordinal()), 10 + 15 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 10 + 15 * i)) ); recipes.put(new ComparableStack(ModItems.rbmk_pellet_lep, 1, i + 5), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_plutonium_fuel), 89 - i * 15)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM.ordinal()), 10 + 15 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 10 + 15 * i)) ); // MEP // recipes.put(new ComparableStack(ModItems.rbmk_pellet_mep, 1, i), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_plutonium_fuel), 85 - i * 20)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM.ordinal()), 15 + 20 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 15 + 20 * i)) ); recipes.put(new ComparableStack(ModItems.rbmk_pellet_mep, 1, i + 5), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu_mix), 84 - i * 20)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM.ordinal()), 15 + 20 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 15 + 20 * i)) ); + + // MEP // + recipes.put(new ComparableStack(ModItems.rbmk_pellet_hep239, 1, i), new SILEXRecipe(600, 100) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu239), 85 - i * 20)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 15 + 20 * i)) ); + + recipes.put(new ComparableStack(ModItems.rbmk_pellet_hep239, 1, i + 5), new SILEXRecipe(600, 100) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu239), 84 - i * 20)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 15 + 20 * i)) ); // MEN // recipes.put(new ComparableStack(ModItems.rbmk_pellet_men, 1, i), new SILEXRecipe(600, 100) @@ -146,14 +156,14 @@ public class SILEXRecipes { .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_mox_fuel), 90 - i * 20)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM.ordinal()), 2 + 4 * i)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM.ordinal()), 3 + 6 * i)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM.ordinal()), 5 + 10 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 5 + 10 * i)) ); recipes.put(new ComparableStack(ModItems.rbmk_pellet_mox, 1, i + 5), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_mox_fuel), 89 - i * 20)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM.ordinal()), 2 + 4 * i)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM.ordinal()), 3 + 6 * i)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM.ordinal()), 5 + 10 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 5 + 10 * i)) ); // LEAUS // recipes.put(new ComparableStack(ModItems.rbmk_pellet_leaus, 1, i), new SILEXRecipe(600, 100) @@ -197,6 +207,52 @@ public class SILEXRecipes { .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_au198), 8 - 2 * i)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_balefire), 1 + 2 * i)) ); + // 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)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_beryllium), 45 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 5 + 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_coal_tiny), 5 + 10 * i)) ); + + recipes.put(new ComparableStack(ModItems.rbmk_pellet_po210be, 1, i + 5), new SILEXRecipe(600, 100) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_polonium), 44 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_beryllium), 45 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 5 + 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_coal_tiny), 5 + 10 * i)) ); + + // PUBE // + recipes.put(new ComparableStack(ModItems.rbmk_pellet_pu238be, 1, i), new SILEXRecipe(600, 100) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu238), 45 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_beryllium), 45 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 3 + 5 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 2 + 5 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_coal_tiny), 5 + 10 * i)) ); + + recipes.put(new ComparableStack(ModItems.rbmk_pellet_pu238be, 1, i + 5), new SILEXRecipe(600, 100) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu238), 44 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_beryllium), 45 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 3 + 5 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 2 + 5 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_coal_tiny), 5 + 10 * i)) ); + + // RABE // + recipes.put(new ComparableStack(ModItems.rbmk_pellet_ra226be, 1, i), new SILEXRecipe(600, 100) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_ra226), 45 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_beryllium), 45 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 3 + 5 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_polonium), 2 + 5 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_coal_tiny), 5 + 10 * i)) ); + + recipes.put(new ComparableStack(ModItems.rbmk_pellet_ra226be, 1, i + 5), new SILEXRecipe(600, 100) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_ra226), 44 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_beryllium), 45 - 10 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 3 + 5 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_polonium), 2 + 5 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_coal_tiny), 5 + 10 * i)) ); + // FLASHGOLD // recipes.put(new ComparableStack(ModItems.rbmk_pellet_drx, 1, i), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.undefined), 1)) @@ -216,8 +272,8 @@ public class SILEXRecipes { } recipes.put(new ComparableStack(ModItems.nuclear_waste_long, 1, ItemWasteLong.WasteClass.URANIUM.ordinal()), new SILEXRecipe(900, 100) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_neptunium), 20)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu239), 40)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_neptunium), 25)) + .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)) ); @@ -240,7 +296,7 @@ public class SILEXRecipes { .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 45)) ); - recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.PLUTONIUM.ordinal()), new SILEXRecipe(900, 100) + recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), new SILEXRecipe(900, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu240), 15)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu241), 20)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_ra226), 15)) @@ -248,7 +304,7 @@ public class SILEXRecipes { .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 5)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 40)) ); - recipes.put(new ComparableStack(ModItems.nuclear_waste_short_depleted, 1, ItemWasteShort.WasteClass.PLUTONIUM.ordinal()), new SILEXRecipe(900, 100) + 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)) diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index e564644c6..6607a52be 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -65,6 +65,9 @@ public class ModItems { public static Item ingot_pu239; public static Item ingot_pu240; public static Item ingot_pu_mix; + public static Item ingot_am241; + public static Item ingot_am242; + public static Item ingot_am_mix; public static Item ingot_neptunium; public static Item ingot_polonium; public static Item ingot_technetium; @@ -95,6 +98,7 @@ public class ModItems { public static Item ingot_neptunium_fuel; public static Item ingot_uranium_fuel; public static Item ingot_mox_fuel; + public static Item ingot_americium_fuel; public static Item ingot_schrabidium_fuel; public static Item ingot_thorium_fuel; public static Item nugget_uranium_fuel; @@ -102,6 +106,7 @@ public class ModItems { public static Item nugget_plutonium_fuel; public static Item nugget_neptunium_fuel; public static Item nugget_mox_fuel; + public static Item nugget_americium_fuel; public static Item nugget_schrabidium_fuel; public static Item ingot_advanced_alloy; public static Item ingot_tcalloy; @@ -162,6 +167,9 @@ public class ModItems { public static Item billet_pu240; public static Item billet_pu241; public static Item billet_pu_mix; + public static Item billet_am241; + public static Item billet_am242; + public static Item billet_am_mix; public static Item billet_neptunium; public static Item billet_polonium; public static Item billet_technetium; @@ -177,8 +185,12 @@ public class ModItems { public static Item billet_plutonium_fuel; public static Item billet_neptunium_fuel; public static Item billet_mox_fuel; + public static Item billet_americium_fuel; + public static Item billet_les; public static Item billet_schrabidium_fuel; + public static Item billet_hes; public static Item billet_po210be; + public static Item billet_ra226be; public static Item billet_pu238be; public static Item billet_yharonite; public static Item billet_balefire_gold; @@ -194,6 +206,9 @@ public class ModItems { public static Item nugget_pu240; public static Item nugget_pu241; public static Item nugget_pu_mix; + public static Item nugget_am241; + public static Item nugget_am242; + public static Item nugget_am_mix; public static Item nugget_neptunium; public static Item nugget_polonium; public static Item nugget_technetium; @@ -341,6 +356,7 @@ public class ModItems { public static Item powder_advanced_alloy; public static Item powder_tcalloy; public static Item powder_coal; + public static Item powder_coal_tiny; public static Item powder_combine_steel; public static Item powder_diamond; public static Item powder_emerald; @@ -948,6 +964,7 @@ public class ModItems { public static ItemRBMKRod rbmk_fuel_leaus; public static ItemRBMKRod rbmk_fuel_heaus; public static ItemRBMKRod rbmk_fuel_po210be; + public static ItemRBMKRod rbmk_fuel_ra226be; public static ItemRBMKRod rbmk_fuel_pu238be; public static ItemRBMKRod rbmk_fuel_balefire_gold; public static ItemRBMKRod rbmk_fuel_balefire; @@ -957,6 +974,8 @@ public class ModItems { public static ItemRBMKPellet rbmk_pellet_thmeu; public static ItemRBMKPellet rbmk_pellet_lep; public static ItemRBMKPellet rbmk_pellet_mep; + public static ItemRBMKPellet rbmk_pellet_hep239; + public static ItemRBMKPellet rbmk_pellet_hep241; public static ItemRBMKPellet rbmk_pellet_men; public static ItemRBMKPellet rbmk_pellet_mox; public static ItemRBMKPellet rbmk_pellet_les; @@ -965,6 +984,7 @@ public class ModItems { public static ItemRBMKPellet rbmk_pellet_leaus; public static ItemRBMKPellet rbmk_pellet_heaus; public static ItemRBMKPellet rbmk_pellet_po210be; + public static ItemRBMKPellet rbmk_pellet_ra226be; public static ItemRBMKPellet rbmk_pellet_pu238be; public static ItemRBMKPellet rbmk_pellet_balefire_gold; public static ItemRBMKPellet rbmk_pellet_balefire; @@ -2351,6 +2371,9 @@ public class ModItems { ingot_pu239 = new ItemHazard(ItemHazard.pu239 * ItemHazard.ingot).setUnlocalizedName("ingot_pu239").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu239"); ingot_pu240 = new ItemHazard(ItemHazard.pu240 * ItemHazard.ingot).setUnlocalizedName("ingot_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu240"); ingot_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.ingot).setUnlocalizedName("ingot_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu_mix"); + ingot_am241 = new ItemHazard().setUnlocalizedName("ingot_am241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_am241"); + ingot_am242 = new ItemHazard().setUnlocalizedName("ingot_am242").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_am242"); + ingot_am_mix = new ItemHazard().setUnlocalizedName("ingot_am_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_am_mix"); ingot_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.ingot).setUnlocalizedName("ingot_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_neptunium"); 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"); @@ -2366,6 +2389,7 @@ public class ModItems { ingot_plutonium_fuel = new ItemHazard(ItemHazard.puf * ItemHazard.ingot).setUnlocalizedName("ingot_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_plutonium_fuel"); ingot_neptunium_fuel = new ItemHazard().addRadiation(ItemHazard.npf * ItemHazard.ingot).toItem().setUnlocalizedName("ingot_neptunium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_neptunium_fuel"); ingot_mox_fuel = new ItemHazard(ItemHazard.mox * ItemHazard.ingot).setUnlocalizedName("ingot_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_mox_fuel"); + ingot_americium_fuel = new ItemHazard().setUnlocalizedName("ingot_americium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_americium_fuel"); ingot_schrabidium_fuel = new ItemHazard(ItemHazard.saf * ItemHazard.ingot, false, true).setUnlocalizedName("ingot_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidium_fuel"); ingot_thorium_fuel = new ItemHazard(ItemHazard.thf * ItemHazard.ingot).setUnlocalizedName("ingot_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_thorium_fuel"); nugget_uranium_fuel = new ItemHazard(ItemHazard.uf * ItemHazard.nugget).setUnlocalizedName("nugget_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_uranium_fuel"); @@ -2373,6 +2397,7 @@ public class ModItems { nugget_plutonium_fuel = new ItemHazard(ItemHazard.puf * ItemHazard.nugget).setUnlocalizedName("nugget_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_plutonium_fuel"); nugget_neptunium_fuel = new ItemHazard().addRadiation(ItemHazard.npf * ItemHazard.nugget).toItem().setUnlocalizedName("nugget_neptunium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_neptunium_fuel"); nugget_mox_fuel = new ItemHazard(ItemHazard.mox * ItemHazard.nugget).setUnlocalizedName("nugget_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_mox_fuel"); + nugget_americium_fuel = new ItemHazard().setUnlocalizedName("nugget_americium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_americium_fuel"); nugget_schrabidium_fuel = new ItemHazard(ItemHazard.saf * ItemHazard.nugget, false, true).setUnlocalizedName("nugget_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_schrabidium_fuel"); ingot_advanced_alloy = new Item().setUnlocalizedName("ingot_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_advanced_alloy"); ingot_tcalloy = new Item().setUnlocalizedName("ingot_tcalloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_tcalloy"); @@ -2438,6 +2463,9 @@ public class ModItems { billet_pu240 = new ItemHazard(ItemHazard.pu240 * ItemHazard.billet).setUnlocalizedName("billet_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu240"); billet_pu241 = new ItemHazard().addRadiation(ItemHazard.pu241 * ItemHazard.billet).toItem().setUnlocalizedName("billet_pu241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu241"); billet_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.billet).setUnlocalizedName("billet_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu_mix"); + billet_am241 = new ItemHazard().setUnlocalizedName("billet_am241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_am241"); + billet_am242 = new ItemHazard().setUnlocalizedName("billet_am242").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_am242"); + billet_am_mix = new ItemHazard().setUnlocalizedName("billet_am_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_am_mix"); 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"); @@ -2453,9 +2481,13 @@ public class ModItems { billet_plutonium_fuel = new ItemHazard(ItemHazard.puf * ItemHazard.billet).setUnlocalizedName("billet_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_plutonium_fuel"); billet_neptunium_fuel = new ItemHazard().addRadiation(ItemHazard.npf * ItemHazard.billet).toItem().setUnlocalizedName("billet_neptunium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_neptunium_fuel"); billet_mox_fuel = new ItemHazard(ItemHazard.mox * ItemHazard.billet).setUnlocalizedName("billet_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_mox_fuel"); + billet_americium_fuel = new ItemHazard().setUnlocalizedName("billet_americium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_americium_fuel"); + billet_les = new ItemHazard().addRadiation(ItemHazard.saf * ItemHazard.billet).addBlinding().toItem().setUnlocalizedName("billet_les").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_les"); billet_schrabidium_fuel = new ItemHazard(ItemHazard.saf * ItemHazard.billet, false, true).setUnlocalizedName("billet_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_schrabidium_fuel"); - billet_po210be = new ItemHazard().setUnlocalizedName("billet_po210be").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_po210be"); - billet_pu238be = new ItemHazard().setUnlocalizedName("billet_pu238be").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu238be"); + billet_hes = new ItemHazard().addRadiation(ItemHazard.saf * ItemHazard.billet).addBlinding().toItem().setUnlocalizedName("billet_hes").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_hes"); + billet_po210be = new ItemHazard().addRadiation(ItemHazard.pobe * ItemHazard.billet).toItem().setUnlocalizedName("billet_po210be").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_po210be"); + billet_ra226be = new ItemHazard().addRadiation(ItemHazard.rabe * ItemHazard.billet).toItem().setUnlocalizedName("billet_ra226be").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_ra226be"); + billet_pu238be = new ItemHazard().addRadiation(ItemHazard.pube * ItemHazard.billet).toItem().setUnlocalizedName("billet_pu238be").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu238be"); billet_yharonite = new Item().setUnlocalizedName("billet_yharonite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_yharonite"); billet_balefire_gold = new ItemHazard().addRadiation(ItemHazard.au198 * ItemHazard.billet).toItem().setUnlocalizedName("billet_balefire_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_balefire_gold"); @@ -2528,6 +2560,9 @@ public class ModItems { nugget_pu240 = new ItemHazard(ItemHazard.pu240 * ItemHazard.nugget).setUnlocalizedName("nugget_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu240"); nugget_pu241 = new ItemHazard().addRadiation(ItemHazard.pu241 * ItemHazard.nugget).addFire(1).toItem().setUnlocalizedName("nugget_pu241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu241"); nugget_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.nugget).setUnlocalizedName("nugget_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu_mix"); + nugget_am241 = new ItemHazard().setUnlocalizedName("nugget_am241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_am241"); + nugget_am242 = new ItemHazard().setUnlocalizedName("nugget_am242").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_am242"); + nugget_am_mix = new ItemHazard().setUnlocalizedName("nugget_am_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_am_mix"); nugget_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.nugget).setUnlocalizedName("nugget_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_neptunium"); 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"); @@ -2609,6 +2644,7 @@ public class ModItems { 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"); powder_coal = new Item().setUnlocalizedName("powder_coal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_coal"); + powder_coal_tiny = new Item().setUnlocalizedName("powder_coal_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_coal_tiny"); powder_combine_steel = new Item().setUnlocalizedName("powder_combine_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_combine_steel"); powder_diamond = new Item().setUnlocalizedName("powder_diamond").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_diamond"); powder_emerald = new Item().setUnlocalizedName("powder_emerald").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_emerald"); @@ -3241,6 +3277,8 @@ public class ModItems { rbmk_pellet_thmeu = (ItemRBMKPellet) new ItemRBMKPellet("Thorium with MEU Driver Fuel").addRadiation(ItemHazard.thf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_thmeu").setTextureName(RefStrings.MODID + ":rbmk_pellet_thmeu"); rbmk_pellet_lep = (ItemRBMKPellet) new ItemRBMKPellet("Low Enriched Plutonium-239").addRadiation(ItemHazard.puf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_lep").setTextureName(RefStrings.MODID + ":rbmk_pellet_lep"); rbmk_pellet_mep = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Plutonium-239").addRadiation(ItemHazard.purg * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_mep").setTextureName(RefStrings.MODID + ":rbmk_pellet_mep"); + rbmk_pellet_hep239 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Plutonium-239").addRadiation(ItemHazard.pu239 * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_hep239").setTextureName(RefStrings.MODID + ":rbmk_pellet_hep239"); + rbmk_pellet_hep241 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Plutonium-241").addRadiation(ItemHazard.pu241 * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_hep241").setTextureName(RefStrings.MODID + ":rbmk_pellet_hep241"); rbmk_pellet_men = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Neptunium-237").addRadiation(ItemHazard.npf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_men").setTextureName(RefStrings.MODID + ":rbmk_pellet_men"); rbmk_pellet_mox = (ItemRBMKPellet) new ItemRBMKPellet("Mixed LEU & LEP Oxide").addRadiation(ItemHazard.mox * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_mox").setTextureName(RefStrings.MODID + ":rbmk_pellet_mox"); rbmk_pellet_les = (ItemRBMKPellet) new ItemRBMKPellet("Low Enriched Schrabidium-326").addRadiation(ItemHazard.saf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_les").setTextureName(RefStrings.MODID + ":rbmk_pellet_les"); @@ -3249,6 +3287,7 @@ public class ModItems { rbmk_pellet_leaus = (ItemRBMKPellet) new ItemRBMKPellet("Low Enriched Australium (Tasmanite)").setUnlocalizedName("rbmk_pellet_leaus").setTextureName(RefStrings.MODID + ":rbmk_pellet_leaus"); rbmk_pellet_heaus = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Australium (Ayerite)").setUnlocalizedName("rbmk_pellet_heaus").setTextureName(RefStrings.MODID + ":rbmk_pellet_heaus"); rbmk_pellet_po210be = (ItemRBMKPellet) new ItemRBMKPellet("Polonium-210 & Beryllium Neutron Source").addRadiation(ItemHazard.pobe * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_po210be").setTextureName(RefStrings.MODID + ":rbmk_pellet_po210be"); + rbmk_pellet_ra226be = (ItemRBMKPellet) new ItemRBMKPellet("Radium-226 & Beryllium Neutron Source").addRadiation(ItemHazard.rabe * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_ra226be").setTextureName(RefStrings.MODID + ":rbmk_pellet_ra226be"); rbmk_pellet_pu238be = (ItemRBMKPellet) new ItemRBMKPellet("Plutonium-238 & Beryllium Neutron Source").addRadiation(ItemHazard.pube * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_pu238be").setTextureName(RefStrings.MODID + ":rbmk_pellet_pu238be"); rbmk_pellet_balefire_gold = (ItemRBMKPellet) new ItemRBMKPellet("Antihydrogen in a Magnetized Gold-198 Lattice").addRadiation(ItemHazard.au198 * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_balefire_gold").setTextureName(RefStrings.MODID + ":rbmk_pellet_balefire_gold"); rbmk_pellet_balefire = (ItemRBMKPellet) new ItemRBMKPellet("Draconic Flames").addRadiation(100000).toItem().setUnlocalizedName("rbmk_pellet_balefire").setTextureName(RefStrings.MODID + ":rbmk_pellet_balefire"); @@ -3286,14 +3325,14 @@ public class ModItems { .setMeltingPoint(2744) .addRadiation(ItemHazard.purg * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_mep").setTextureName(RefStrings.MODID + ":rbmk_fuel_mep"); - rbmk_fuel_hep = (ItemRBMKRod) new ItemRBMKRod("Highly Enriched Plutonium-239") + rbmk_fuel_hep = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_hep239) .setYield(100000000D) .setStats(250) .setHeat(1.5D) .setMeltingPoint(2744) .addRadiation(ItemHazard.pu239 * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_hep").setTextureName(RefStrings.MODID + ":rbmk_fuel_hep"); - rbmk_fuel_hep241 = (ItemRBMKRod) new ItemRBMKRod("Highly Enriched Plutonium-241") + rbmk_fuel_hep241 = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_hep241) .setYield(100000000D) .setStats(280) .setHeat(1.75D) @@ -3353,6 +3392,14 @@ public class ModItems { .setMeltingPoint(1287) .addRadiation(ItemHazard.pobe * ItemHazard.rod_rbmk).toItem() .setUnlocalizedName("rbmk_fuel_po210be").setTextureName(RefStrings.MODID + ":rbmk_fuel_po210be"); + rbmk_fuel_ra226be = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_ra226be) + .setYield(100000000D) + .setStats(0D, 40) + .setHeat(0.1D) + .setDiffusion(0.5D) + .setMeltingPoint(700) + .addRadiation(ItemHazard.rabe * ItemHazard.rod_rbmk).toItem() + .setUnlocalizedName("rbmk_fuel_ra226be").setTextureName(RefStrings.MODID + ":rbmk_fuel_ra226be"); rbmk_fuel_pu238be = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_pu238be) .setYield(100000000D) .setStats(60, 35) @@ -5049,6 +5096,9 @@ public class ModItems { GameRegistry.registerItem(ingot_pu239, ingot_pu239.getUnlocalizedName()); GameRegistry.registerItem(ingot_pu240, ingot_pu240.getUnlocalizedName()); GameRegistry.registerItem(ingot_pu_mix, ingot_pu_mix.getUnlocalizedName()); + GameRegistry.registerItem(ingot_am241, ingot_am241.getUnlocalizedName()); + GameRegistry.registerItem(ingot_am242, ingot_am242.getUnlocalizedName()); + GameRegistry.registerItem(ingot_am_mix, ingot_am_mix.getUnlocalizedName()); GameRegistry.registerItem(ingot_neptunium, ingot_neptunium.getUnlocalizedName()); GameRegistry.registerItem(ingot_polonium, ingot_polonium.getUnlocalizedName()); GameRegistry.registerItem(ingot_technetium, ingot_technetium.getUnlocalizedName()); @@ -5081,6 +5131,7 @@ public class ModItems { GameRegistry.registerItem(ingot_plutonium_fuel, ingot_plutonium_fuel.getUnlocalizedName()); GameRegistry.registerItem(ingot_neptunium_fuel, ingot_neptunium_fuel.getUnlocalizedName()); GameRegistry.registerItem(ingot_mox_fuel, ingot_mox_fuel.getUnlocalizedName()); + GameRegistry.registerItem(ingot_americium_fuel, ingot_americium_fuel.getUnlocalizedName()); GameRegistry.registerItem(ingot_schrabidium_fuel, ingot_schrabidium_fuel.getUnlocalizedName()); GameRegistry.registerItem(ingot_hes, ingot_hes.getUnlocalizedName()); GameRegistry.registerItem(ingot_les, ingot_les.getUnlocalizedName()); @@ -5128,6 +5179,9 @@ public class ModItems { GameRegistry.registerItem(billet_pu240, billet_pu240.getUnlocalizedName()); GameRegistry.registerItem(billet_pu241, billet_pu241.getUnlocalizedName()); GameRegistry.registerItem(billet_pu_mix, billet_pu_mix.getUnlocalizedName()); + GameRegistry.registerItem(billet_am241, billet_am241.getUnlocalizedName()); + GameRegistry.registerItem(billet_am242, billet_am242.getUnlocalizedName()); + GameRegistry.registerItem(billet_am_mix, billet_am_mix.getUnlocalizedName()); GameRegistry.registerItem(billet_neptunium, billet_neptunium.getUnlocalizedName()); GameRegistry.registerItem(billet_polonium, billet_polonium.getUnlocalizedName()); GameRegistry.registerItem(billet_technetium, billet_technetium.getUnlocalizedName()); @@ -5143,8 +5197,12 @@ public class ModItems { GameRegistry.registerItem(billet_plutonium_fuel, billet_plutonium_fuel.getUnlocalizedName()); GameRegistry.registerItem(billet_neptunium_fuel, billet_neptunium_fuel.getUnlocalizedName()); GameRegistry.registerItem(billet_mox_fuel, billet_mox_fuel.getUnlocalizedName()); + GameRegistry.registerItem(billet_americium_fuel, billet_americium_fuel.getUnlocalizedName()); + GameRegistry.registerItem(billet_les, billet_les.getUnlocalizedName()); GameRegistry.registerItem(billet_schrabidium_fuel, billet_schrabidium_fuel.getUnlocalizedName()); + GameRegistry.registerItem(billet_hes, billet_hes.getUnlocalizedName()); GameRegistry.registerItem(billet_po210be, billet_po210be.getUnlocalizedName()); + GameRegistry.registerItem(billet_ra226be, billet_ra226be.getUnlocalizedName()); GameRegistry.registerItem(billet_pu238be, billet_pu238be.getUnlocalizedName()); GameRegistry.registerItem(billet_yharonite, billet_yharonite.getUnlocalizedName()); GameRegistry.registerItem(billet_balefire_gold, billet_balefire_gold.getUnlocalizedName()); @@ -5161,6 +5219,7 @@ public class ModItems { GameRegistry.registerItem(niter, niter.getUnlocalizedName()); GameRegistry.registerItem(fluorite, fluorite.getUnlocalizedName()); GameRegistry.registerItem(powder_coal, powder_coal.getUnlocalizedName()); + GameRegistry.registerItem(powder_coal_tiny, powder_coal_tiny.getUnlocalizedName()); GameRegistry.registerItem(powder_iron, powder_iron.getUnlocalizedName()); GameRegistry.registerItem(powder_gold, powder_gold.getUnlocalizedName()); GameRegistry.registerItem(powder_lapis, powder_lapis.getUnlocalizedName()); @@ -5310,6 +5369,9 @@ public class ModItems { GameRegistry.registerItem(nugget_pu240, nugget_pu240.getUnlocalizedName()); GameRegistry.registerItem(nugget_pu241, nugget_pu241.getUnlocalizedName()); GameRegistry.registerItem(nugget_pu_mix, nugget_pu_mix.getUnlocalizedName()); + GameRegistry.registerItem(nugget_am241, nugget_am241.getUnlocalizedName()); + GameRegistry.registerItem(nugget_am242, nugget_am242.getUnlocalizedName()); + GameRegistry.registerItem(nugget_am_mix, nugget_am_mix.getUnlocalizedName()); GameRegistry.registerItem(nugget_neptunium, nugget_neptunium.getUnlocalizedName()); GameRegistry.registerItem(nugget_polonium, nugget_polonium.getUnlocalizedName()); GameRegistry.registerItem(nugget_co60, nugget_co60.getUnlocalizedName()); @@ -5326,6 +5388,7 @@ public class ModItems { GameRegistry.registerItem(nugget_plutonium_fuel, nugget_plutonium_fuel.getUnlocalizedName()); GameRegistry.registerItem(nugget_neptunium_fuel, nugget_neptunium_fuel.getUnlocalizedName()); GameRegistry.registerItem(nugget_mox_fuel, nugget_mox_fuel.getUnlocalizedName()); + GameRegistry.registerItem(nugget_americium_fuel, nugget_americium_fuel.getUnlocalizedName()); GameRegistry.registerItem(nugget_schrabidium_fuel, nugget_schrabidium_fuel.getUnlocalizedName()); GameRegistry.registerItem(nugget_hes, nugget_hes.getUnlocalizedName()); GameRegistry.registerItem(nugget_les, nugget_les.getUnlocalizedName()); @@ -6072,6 +6135,7 @@ public class ModItems { GameRegistry.registerItem(rbmk_fuel_leaus, rbmk_fuel_leaus.getUnlocalizedName()); GameRegistry.registerItem(rbmk_fuel_heaus, rbmk_fuel_heaus.getUnlocalizedName()); GameRegistry.registerItem(rbmk_fuel_po210be, rbmk_fuel_po210be.getUnlocalizedName()); + 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_balefire, rbmk_fuel_balefire.getUnlocalizedName()); @@ -6082,6 +6146,8 @@ public class ModItems { GameRegistry.registerItem(rbmk_pellet_thmeu, rbmk_pellet_thmeu.getUnlocalizedName()); GameRegistry.registerItem(rbmk_pellet_lep, rbmk_pellet_lep.getUnlocalizedName()); GameRegistry.registerItem(rbmk_pellet_mep, rbmk_pellet_mep.getUnlocalizedName()); + GameRegistry.registerItem(rbmk_pellet_hep239, rbmk_pellet_hep239.getUnlocalizedName()); + GameRegistry.registerItem(rbmk_pellet_hep241, rbmk_pellet_hep241.getUnlocalizedName()); GameRegistry.registerItem(rbmk_pellet_men, rbmk_pellet_men.getUnlocalizedName()); GameRegistry.registerItem(rbmk_pellet_mox, rbmk_pellet_mox.getUnlocalizedName()); GameRegistry.registerItem(rbmk_pellet_les, rbmk_pellet_les.getUnlocalizedName()); @@ -6090,6 +6156,7 @@ public class ModItems { GameRegistry.registerItem(rbmk_pellet_leaus, rbmk_pellet_leaus.getUnlocalizedName()); GameRegistry.registerItem(rbmk_pellet_heaus, rbmk_pellet_heaus.getUnlocalizedName()); GameRegistry.registerItem(rbmk_pellet_po210be, rbmk_pellet_po210be.getUnlocalizedName()); + 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_balefire, rbmk_pellet_balefire.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/special/ItemHazard.java b/src/main/java/com/hbm/items/special/ItemHazard.java index 0a3c60b1e..9ce549be6 100644 --- a/src/main/java/com/hbm/items/special/ItemHazard.java +++ b/src/main/java/com/hbm/items/special/ItemHazard.java @@ -63,6 +63,7 @@ public class ItemHazard extends ItemCustomLore implements IItemHazard { public static final float sa327 = 17.5F; public static final float saf = 5.85F; public static final float pobe = 37.5F; + public static final float rabe = 3.75F; public static final float pube = 5.0F; public static final float sr = sa326 * 0.1F; diff --git a/src/main/java/com/hbm/items/special/ItemWasteShort.java b/src/main/java/com/hbm/items/special/ItemWasteShort.java index c33cba1b9..cf1c511e9 100644 --- a/src/main/java/com/hbm/items/special/ItemWasteShort.java +++ b/src/main/java/com/hbm/items/special/ItemWasteShort.java @@ -44,9 +44,11 @@ public class ItemWasteShort extends ItemHazard { public enum WasteClass { //all decayed versions include lead-types and classic nuclear waste - URANIUM("Uranium"), //fresh recycling makes iodine, caesium and technetium, depleted turns into neptunium - PLUTONIUM("Plutonium"), //funny fission fragments + pu240 and 241 / am241 + u238 (actually u236 but fuck you) - NEPTUNIUM("Neptunium"); //funny fission fragments + polonium and pu238 and 239 / u235 + URANIUM("Uranium"), //fresh recycling makes iodine, caesium and technetium, depleted turns into neptunium + NEPTUNIUM("Neptunium"), //funny fission fragments + polonium and pu238 and 239 / u235 + PLUTONIUM239("Plutonium-239"), //funny fission fragments + pu240 and 241 / u238 (actually u236 but fuck you) + PLUTONIUM240("Plutonium-240"), //funny fission fragments + pu241 / u238 + lead + PLUTONIUM241("Plutonium-241"); //funny fission fragments + am241 / 242 / np237 + bismuth String name; diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 73858484b..283403b5e 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -931,6 +931,7 @@ public class CraftingManager { GameRegistry.addSmelting(ModItems.powder_asbestos, new ItemStack(ModItems.ingot_asbestos), 1.0F); 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_coal, new ItemStack(ModItems.coke), 1.0F); GameRegistry.addSmelting(ModItems.briquette_lignite, new ItemStack(ModItems.coke), 1.0F); diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index 9362f216c..7aeeb9f77 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -47,6 +47,7 @@ import com.hbm.util.I18nUtil; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import com.hbm.sound.MovingSoundPlayerLoop.EnumHbmSound; +import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; @@ -67,6 +68,7 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraftforge.client.GuiIngameForge; import net.minecraftforge.client.event.MouseEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent; @@ -545,6 +547,53 @@ public class ModEventHandlerClient { } } + private static final ResourceLocation digammaStar = new ResourceLocation("hbm:textures/misc/star_digamma.png"); + + @SideOnly(Side.CLIENT) + @SubscribeEvent + public void onRenderDigammaStar(RenderWorldLastEvent event) { + + World world = Minecraft.getMinecraft().theWorld; + + if(world.provider.dimensionId != 0) + return; + + GL11.glPushMatrix(); + GL11.glDepthMask(false); + + GL11.glEnable(3553); + GL11.glEnable(GL11.GL_BLEND); + GL11.glDisable(GL11.GL_ALPHA_TEST); + OpenGlHelper.glBlendFunc(770, 1, 1, 0); + + float partialTicks = event.partialTicks; + + GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(140.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(-40.0F, 0.0F, 0.0F, 1.0F); + + FMLClientHandler.instance().getClient().renderEngine.bindTexture(digammaStar); + + float var12 = 2.5F; + double dist = 150D; + + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(-var12, dist, -var12, 0.0D, 0.0D); + tessellator.addVertexWithUV(var12, dist, -var12, 0.0D, 1.0D); + tessellator.addVertexWithUV(var12, dist, var12, 1.0D, 1.0D); + tessellator.addVertexWithUV(-var12, dist, var12, 1.0D, 0.0D); + tessellator.draw(); + + GL11.glDepthMask(true); + + GL11.glDisable(3042); + GL11.glEnable(GL11.GL_ALPHA_TEST); + + GL11.glPopMatrix(); + } + @SubscribeEvent(priority = EventPriority.HIGHEST) public void preRenderEventFirst(RenderLivingEvent.Pre event) { diff --git a/src/main/resources/assets/hbm/textures/items/billet_am241.png b/src/main/resources/assets/hbm/textures/items/billet_am241.png new file mode 100644 index 000000000..6e134fc9b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/billet_am241.png differ diff --git a/src/main/resources/assets/hbm/textures/items/billet_am242.png b/src/main/resources/assets/hbm/textures/items/billet_am242.png new file mode 100644 index 000000000..d28d806d6 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/billet_am242.png differ diff --git a/src/main/resources/assets/hbm/textures/items/billet_am_mix.png b/src/main/resources/assets/hbm/textures/items/billet_am_mix.png new file mode 100644 index 000000000..a5744a28b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/billet_am_mix.png differ diff --git a/src/main/resources/assets/hbm/textures/items/billet_americium_fuel.png b/src/main/resources/assets/hbm/textures/items/billet_americium_fuel.png new file mode 100644 index 000000000..c45a4a76e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/billet_americium_fuel.png differ diff --git a/src/main/resources/assets/hbm/textures/items/billet_ra226.png b/src/main/resources/assets/hbm/textures/items/billet_ra226.png new file mode 100644 index 000000000..22a998bd2 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/billet_ra226.png differ diff --git a/src/main/resources/assets/hbm/textures/items/billet_ra226be.png b/src/main/resources/assets/hbm/textures/items/billet_ra226be.png new file mode 100644 index 000000000..4d37bff3e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/billet_ra226be.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ingot_am241.png b/src/main/resources/assets/hbm/textures/items/ingot_am241.png new file mode 100644 index 000000000..0823ca332 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ingot_am241.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ingot_am242.png b/src/main/resources/assets/hbm/textures/items/ingot_am242.png new file mode 100644 index 000000000..0d4d56097 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ingot_am242.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ingot_am_mix.png b/src/main/resources/assets/hbm/textures/items/ingot_am_mix.png new file mode 100644 index 000000000..4273a1a83 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ingot_am_mix.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ingot_americium.png b/src/main/resources/assets/hbm/textures/items/ingot_americium.png new file mode 100644 index 000000000..5e38a4884 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ingot_americium.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ingot_americium_fuel.png b/src/main/resources/assets/hbm/textures/items/ingot_americium_fuel.png new file mode 100644 index 000000000..035205642 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ingot_americium_fuel.png differ diff --git a/src/main/resources/assets/hbm/textures/items/nugget_am241.png b/src/main/resources/assets/hbm/textures/items/nugget_am241.png new file mode 100644 index 000000000..eb87091d9 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/nugget_am241.png differ diff --git a/src/main/resources/assets/hbm/textures/items/nugget_am242.png b/src/main/resources/assets/hbm/textures/items/nugget_am242.png new file mode 100644 index 000000000..070d4ad54 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/nugget_am242.png differ diff --git a/src/main/resources/assets/hbm/textures/items/nugget_am_mix.png b/src/main/resources/assets/hbm/textures/items/nugget_am_mix.png new file mode 100644 index 000000000..9156435b5 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/nugget_am_mix.png differ diff --git a/src/main/resources/assets/hbm/textures/items/nugget_americium_fuel.png b/src/main/resources/assets/hbm/textures/items/nugget_americium_fuel.png new file mode 100644 index 000000000..9a570079b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/nugget_americium_fuel.png differ diff --git a/src/main/resources/assets/hbm/textures/items/powder_coal_tiny.png b/src/main/resources/assets/hbm/textures/items/powder_coal_tiny.png new file mode 100644 index 000000000..78f3d5880 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/powder_coal_tiny.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rbmk_fuel_hea.png b/src/main/resources/assets/hbm/textures/items/rbmk_fuel_hea.png new file mode 100644 index 000000000..0679a98a0 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/rbmk_fuel_hea.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rbmk_fuel_lea.png b/src/main/resources/assets/hbm/textures/items/rbmk_fuel_lea.png new file mode 100644 index 000000000..3f9c5e5e0 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/rbmk_fuel_lea.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rbmk_fuel_mea.png b/src/main/resources/assets/hbm/textures/items/rbmk_fuel_mea.png new file mode 100644 index 000000000..530bb153b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/rbmk_fuel_mea.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rbmk_fuel_ra226be.png b/src/main/resources/assets/hbm/textures/items/rbmk_fuel_ra226be.png new file mode 100644 index 000000000..4cf259e76 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/rbmk_fuel_ra226be.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rbmk_pellet_hep239.png b/src/main/resources/assets/hbm/textures/items/rbmk_pellet_hep239.png new file mode 100644 index 000000000..d04a51bba Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/rbmk_pellet_hep239.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rbmk_pellet_hep241.png b/src/main/resources/assets/hbm/textures/items/rbmk_pellet_hep241.png new file mode 100644 index 000000000..4bf5f5444 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/rbmk_pellet_hep241.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rbmk_pellet_ra226be.png b/src/main/resources/assets/hbm/textures/items/rbmk_pellet_ra226be.png new file mode 100644 index 000000000..82f7e324a Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/rbmk_pellet_ra226be.png differ