From f57aa44a417727f9d16f22814b855bc20191491e Mon Sep 17 00:00:00 2001 From: Vaern Date: Mon, 10 Jan 2022 19:13:03 -0800 Subject: [PATCH] Fixes + Lead-200 --- .../java/com/hbm/crafting/MineralRecipes.java | 15 ++++++- .../java/com/hbm/crafting/RodRecipes.java | 18 ++++++-- .../java/com/hbm/hazard/HazardRegistry.java | 6 ++- .../com/hbm/inventory/OreDictManager.java | 2 + .../hbm/inventory/gui/GUIReactorResearch.java | 2 +- .../hbm/inventory/recipes/BreederRecipes.java | 2 +- .../inventory/recipes/CentrifugeRecipes.java | 8 ++-- .../hbm/inventory/recipes/SILEXRecipes.java | 17 +++++--- .../inventory/recipes/anvil/AnvilRecipes.java | 40 +++++++++++------- src/main/java/com/hbm/items/ModItems.java | 12 ++++++ .../com/hbm/items/weapon/ItemMissile.java | 1 + .../machine/TileEntityMachineGasCent.java | 2 +- .../machine/TileEntityMachineIGenerator.java | 5 +++ .../machine/TileEntityMachineRTG.java | 2 +- .../machine/TileEntityStorageDrum.java | 2 +- src/main/resources/assets/hbm/lang/en_US.lang | 25 ++++++----- .../hbm/textures/items/billet_pb200.png | Bin 0 -> 264 bytes .../assets/hbm/textures/items/ingot_pb200.png | Bin 0 -> 280 bytes .../hbm/textures/items/nugget_pb200.png | Bin 0 -> 248 bytes .../hbm/textures/items/pellet_rtg_lead.png | Bin 0 -> 2544 bytes 20 files changed, 111 insertions(+), 48 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/items/billet_pb200.png create mode 100644 src/main/resources/assets/hbm/textures/items/ingot_pb200.png create mode 100644 src/main/resources/assets/hbm/textures/items/nugget_pb200.png create mode 100644 src/main/resources/assets/hbm/textures/items/pellet_rtg_lead.png diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index a92ce03e5..fe321ebed 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -58,6 +58,7 @@ public class MineralRecipes { add1To9Pair(ModItems.ingot_co60, ModItems.nugget_co60); add1To9Pair(ModItems.ingot_sr90, ModItems.nugget_sr90); add1To9Pair(ModItems.ingot_au198, ModItems.nugget_au198); + add1To9Pair(ModItems.ingot_pb200, ModItems.nugget_pb200); add1To9Pair(ModItems.ingot_ra226, ModItems.nugget_ra226); add1To9Pair(ModItems.ingot_pu241, ModItems.nugget_pu241); @@ -103,6 +104,7 @@ public class MineralRecipes { addBillet(ModItems.billet_polonium, ModItems.ingot_polonium, ModItems.nugget_polonium, "nuggetPolonium"); addBillet(ModItems.billet_technetium, ModItems.ingot_technetium, ModItems.nugget_technetium, "nuggetTechnetium"); addBillet(ModItems.billet_au198, ModItems.ingot_au198, ModItems.nugget_au198, "nuggetGold198"); + addBillet(ModItems.billet_pb200, ModItems.ingot_pb200, ModItems.nugget_pb200, "nuggetLead200"); addBillet(ModItems.billet_ra226, ModItems.ingot_ra226, ModItems.nugget_ra226, "nuggetRa226"); addBillet(ModItems.billet_schrabidium, ModItems.ingot_schrabidium, ModItems.nugget_schrabidium, "nuggetSchrabidium"); addBillet(ModItems.billet_solinium, ModItems.ingot_solinium, ModItems.nugget_solinium, "nuggetSolinium"); @@ -120,10 +122,12 @@ public class MineralRecipes { addBillet(ModItems.billet_nuclear_waste, ModItems.nuclear_waste, ModItems.nuclear_waste_tiny); addBillet(ModItems.billet_beryllium, ModItems.ingot_beryllium, ModItems.nugget_beryllium, BE.nugget()); addBillet(ModItems.billet_zirconium, ModItems.ingot_zirconium, ModItems.nugget_zirconium, ZR.nugget()); + addBillet(ModItems.billet_bismuth, ModItems.ingot_bismuth, ModItems.nugget_bismuth); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_thorium_fuel, 3), new Object[] { ModItems.billet_th232, ModItems.billet_th232, ModItems.billet_u233 }); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_thorium_fuel, 1), new Object[] { "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetUranium233", "nuggetUranium233" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_thorium_fuel, 1), new Object[] { "tinyTh232", "tinyTh232", "tinyTh232", "tinyTh232", "tinyU233", "tinyU233" })); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_uranium_fuel, 6), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u235 }); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_uranium_fuel, 1), new Object[] { "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium235" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_uranium_fuel, 1), new Object[] { "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU235" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_plutonium_fuel, 3), new Object[] { ModItems.billet_u238, ModItems.billet_pu_mix, ModItems.billet_pu_mix }); @@ -146,13 +150,21 @@ public class MineralRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_schrabidium_fuel, 3), new Object[] { ModItems.billet_schrabidium, ModItems.billet_neptunium, ModItems.billet_beryllium }); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_schrabidium_fuel, 1), new Object[] { ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, "nuggetNeptunium237", "nuggetNeptunium237", ModItems.nugget_beryllium, ModItems.nugget_beryllium })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_schrabidium_fuel, 1), new Object[] { ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, "tinyNp237", "tinyNp237", ModItems.nugget_beryllium, ModItems.nugget_beryllium })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_po210be, 1), new Object[] { "nuggetPolonium210", "nuggetPolonium210", "nuggetPolonium210", 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.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_po210be, 6), new Object[] { ModItems.billet_polonium, ModItems.billet_polonium, ModItems.billet_polonium, ModItems.billet_beryllium, ModItems.billet_beryllium, ModItems.billet_beryllium })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_pu238be, 6), new Object[] { ModItems.billet_pu238, ModItems.billet_pu238, ModItems.billet_pu238, ModItems.billet_beryllium, ModItems.billet_beryllium, ModItems.billet_beryllium })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_ra226be, 6), new Object[] { ModItems.billet_ra226, ModItems.billet_ra226, ModItems.billet_ra226, ModItems.billet_beryllium, ModItems.billet_beryllium, ModItems.billet_beryllium })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_zfb_bismuth, 1), new Object[] { "nuggetZirconium", "nuggetZirconium", "nuggetZirconium", "nuggetUranium", "nuggetPlutonium241", ModItems.nugget_bismuth })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_zfb_pu241, 1), new Object[] { "nuggetZirconium", "nuggetZirconium", "nuggetZirconium", "nuggetUranium235", "nuggetPlutonium240", "nuggetPlutonium241" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_zfb_am_mix, 1), new Object[] { "nuggetZirconium", "nuggetZirconium", "nuggetZirconium", "nuggetPlutonium241", "nuggetPlutonium241", "nuggetAmericiumRG" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_zfb_bismuth, 6), new Object[] { ModItems.billet_zirconium, ModItems.billet_zirconium, ModItems.billet_zirconium, ModItems.billet_uranium, ModItems.billet_pu241, ModItems.billet_bismuth })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_zfb_pu241, 6), new Object[] { ModItems.billet_zirconium, ModItems.billet_zirconium, ModItems.billet_zirconium, ModItems.billet_u235, ModItems.billet_pu240, ModItems.billet_pu241 })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_zfb_am_mix, 6), new Object[] { ModItems.billet_zirconium, ModItems.billet_zirconium, ModItems.billet_zirconium, ModItems.billet_pu241, ModItems.billet_pu241, ModItems.billet_am_mix })); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_uranium, 2), new Object[] { ModItems.billet_uranium_fuel, ModItems.billet_u238 }); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_uranium, 2), new Object[] { ModItems.billet_u238, "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium235" })); @@ -193,6 +205,7 @@ public class MineralRecipes { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_weak), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_pu238, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_strontium), new Object[] { ModItems.billet_sr90, ModItems.billet_sr90, ModItems.billet_sr90, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_polonium), new Object[] { ModItems.billet_polonium, ModItems.billet_polonium, ModItems.billet_polonium, "plateIron" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_lead), new Object[] { ModItems.billet_pb200, ModItems.billet_pb200, ModItems.billet_pb200, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_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 9ec4aa659..28c4b717d 100644 --- a/src/main/java/com/hbm/crafting/RodRecipes.java +++ b/src/main/java/com/hbm/crafting/RodRecipes.java @@ -49,7 +49,17 @@ public class RodRecipes { 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.rod, 1, BreedingRodType.LITHIUM.ordinal()), new Object[] { ModItems.rod_empty, LI.ingot() }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.lithium, 1), new Object[] { new ItemStack(ModItems.rod, 1, BreedingRodType.LITHIUM.ordinal()) }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_dual, 1, BreedingRodType.LITHIUM.ordinal()), new Object[] { ModItems.rod_dual_empty, LI.ingot(), LI.ingot() }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.lithium, 2), new Object[] { new ItemStack(ModItems.rod_dual, 1, BreedingRodType.LITHIUM.ordinal()) }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_quad, 1, BreedingRodType.LITHIUM.ordinal()), new Object[] { ModItems.rod_quad_empty, LI.ingot(), LI.ingot(), LI.ingot(), LI.ingot() }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.lithium, 4), new Object[] { new ItemStack(ModItems.rod_quad, 1, BreedingRodType.LITHIUM.ordinal()) }); + + CraftingManager.addShapelessAuto(new ItemStack(ModItems.cell_tritium, 1), new Object[] { new ItemStack(ModItems.rod, 1, BreedingRodType.TRITIUM.ordinal()), ModItems.cell_empty }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.cell_tritium, 2), new Object[] { new ItemStack(ModItems.rod_dual, 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, 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); @@ -62,11 +72,11 @@ public class RodRecipes { 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.nugget_lead, 6), new Object[] { new ItemStack(ModItems.rod, 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.nugget_lead, 12), new Object[] { new ItemStack(ModItems.rod_dual, 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()) }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.nugget_lead, 24), new Object[] { new ItemStack(ModItems.rod_quad, 1, BreedingRodType.LEAD.ordinal()) }); addBreedingRod(U, ModItems.billet_uranium, BreedingRodType.URANIUM); diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index d9c59f15d..909caa30e 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -64,6 +64,7 @@ public class HazardRegistry { public static final float xe135 = 1250.0F; public static final float cs137 = 20.0F; public static final float au198 = 500.0F; + public static final float pb200 = 1500.0F; public static final float at209 = 2000.0F; public static final float po210 = 75.0F; public static final float ra226 = 7.5F; @@ -307,11 +308,12 @@ public class HazardRegistry { HazardSystem.register(billet_ra226be, makeData(RADIATION, rabe * billet)); HazardSystem.register(billet_pu238be, makeData(RADIATION, pube * billet)); - HazardSystem.register(pellet_rtg, new HazardData().addEntry(RADIATION, pu238 * rtg).addEntry(HOT, 5F)); + HazardSystem.register(pellet_rtg, new HazardData().addEntry(RADIATION, pu238 * rtg).addEntry(HOT, 4F)); 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_polonium, new HazardData().addEntry(RADIATION, po210 * rtg).addEntry(HOT, 3F)); + HazardSystem.register(pellet_rtg_lead, new HazardData().addEntry(RADIATION, pb200 * rtg).addEntry(HOT, 7F)); HazardSystem.register(pellet_rtg_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 4e1dd3d35..e69742a4a 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -114,6 +114,7 @@ public class OreDictManager { public static final DictFrame RA226 = new DictFrame("Radium226", "Ra226"); public static final DictFrame CO60 = new DictFrame("Cobalt60", "Co60"); public static final DictFrame AU198 = new DictFrame("Gold198", "Au198"); + public static final DictFrame PB200 = new DictFrame("Lead200", "Pb200"); public static final DictFrame SA326 = new DictFrame("Schrabidium"); public static final DictFrame SA327 = new DictFrame("Solinium"); public static final DictFrame SBD = new DictFrame("Schrabidate"); @@ -248,6 +249,7 @@ public class OreDictManager { RA226 .rad(HazardRegistry.ra226) .nugget(nugget_ra226) .billet(billet_ra226) .ingot(ingot_ra226) .dust(powder_ra226) .block(block_ra226); CO60 .rad(HazardRegistry.co60) .hot(1) .nugget(nugget_co60) .billet(billet_co60) .ingot(ingot_co60) .dust(powder_co60); AU198 .rad(HazardRegistry.au198) .hot(5) .nugget(nugget_au198) .billet(billet_au198) .ingot(ingot_au198) .dust(powder_au198); + PB200 .rad(HazardRegistry.pb200) .hot(7) .nugget(nugget_pb200) .billet(billet_pb200) .ingot(ingot_pb200); SA326 .rad(HazardRegistry.sa326) .blinding(3F) .nugget(nugget_schrabidium) .billet(billet_schrabidium) .ingot(ingot_schrabidium) .dust(powder_schrabidium) .plate(plate_schrabidium) .block(block_schrabidium) .ore(ore_schrabidium, ore_gneiss_schrabidium, ore_nether_schrabidium); SA327 .rad(HazardRegistry.sa327) .blinding(3F) .nugget(nugget_solinium) .billet(billet_solinium) .ingot(ingot_solinium) .block(block_solinium); SBD .rad(HazardRegistry.sb) .blinding(1F) .ingot(ingot_schrabidate) .dust(powder_schrabidate) .block(block_schrabidate); diff --git a/src/main/java/com/hbm/inventory/gui/GUIReactorResearch.java b/src/main/java/com/hbm/inventory/gui/GUIReactorResearch.java index bb5ca372a..8ec3650aa 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIReactorResearch.java +++ b/src/main/java/com/hbm/inventory/gui/GUIReactorResearch.java @@ -52,7 +52,7 @@ public class GUIReactorResearch extends GuiInfoContainer { this.field.setEnableBackgroundDrawing(false); this.field.setMaxStringLength(3); - //this.field.setText((int) (reactor.level * 100) + ""); + this.field.setText(String.valueOf((int)(reactor.level * 100))); } @Override diff --git a/src/main/java/com/hbm/inventory/recipes/BreederRecipes.java b/src/main/java/com/hbm/inventory/recipes/BreederRecipes.java index 2d4af394f..55172f90b 100644 --- a/src/main/java/com/hbm/inventory/recipes/BreederRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/BreederRecipes.java @@ -28,7 +28,7 @@ public class BreederRecipes { 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.U238, BreedingRodType.RGP, 300); setRecipe(BreedingRodType.URANIUM, BreedingRodType.RGP, 200); setRecipe(BreedingRodType.RGP, BreedingRodType.WASTE, 200); diff --git a/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java b/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java index 050c8f58f..3a35e56f8 100644 --- a/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java @@ -30,7 +30,7 @@ public class CentrifugeRecipes { new ItemStack(ModItems.nuclear_waste_tiny, 2) }); recipes.put(new ComparableStack(ModItems.waste_uranium), new ItemStack[] { - new ItemStack(ModItems.nugget_pu_mix, 1), + new ItemStack(ModItems.nugget_pu_mix, 2), new ItemStack(ModItems.nugget_plutonium, 1), new ItemStack(ModItems.nugget_technetium, 1), new ItemStack(ModItems.nuclear_waste_tiny, 2) }); @@ -85,9 +85,9 @@ public class CentrifugeRecipes { recipes.put(new ComparableStack(ModItems.waste_plate_ra226be), new ItemStack[] { new ItemStack(ModItems.nugget_beryllium, 2), - new ItemStack(ModItems.nugget_polonium, 3), - new ItemStack(ModItems.powder_coal_tiny, 2), - new ItemStack(ModItems.nugget_lead, 2) }); + new ItemStack(ModItems.nugget_polonium, 2), + new ItemStack(ModItems.powder_coal_tiny, 1), + new ItemStack(ModItems.nugget_lead, 1) }); recipes.put(new ComparableStack(ModItems.waste_plate_sa326), new ItemStack[] { new ItemStack(ModItems.nugget_solinium, 1), diff --git a/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java index 3ffbf8da8..b14675639 100644 --- a/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java @@ -92,9 +92,9 @@ public class SILEXRecipes { recipes.put(new ComparableStack(ModItems.rbmk_pellet_ueu, 1, i + 5), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 88 - i * 6)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u235), 7 - i * 2)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u235), 8 - i * 2)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), 2 + 3 * i)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 2 + 5 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 1 + 5 * i)) ); // MEU // recipes.put(new ComparableStack(ModItems.rbmk_pellet_meu, 1, i), new SILEXRecipe(600, 100) @@ -217,24 +217,27 @@ public class SILEXRecipes { // LEAUS // recipes.put(new ComparableStack(ModItems.rbmk_pellet_leaus, 1, i), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_australium_lesser), 90 - i * 20)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 10 + 20 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pb200), 10 + 20 * i)) ); recipes.put(new ComparableStack(ModItems.rbmk_pellet_leaus, 1, i + 5), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_australium_lesser), 89 - i * 20)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 10 + 20 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pb200), 10 + 20 * i)) ); // HEAUS // recipes.put(new ComparableStack(ModItems.rbmk_pellet_heaus, 1, i), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_australium_lesser), 90 - i * 20)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_au198), 5 + 10 * i)) - .addOut(new WeightedRandomObject(new ItemStack(Items.gold_nugget), 5 + 10 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(Items.gold_nugget), 3 + 6 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pb200), 2 + 4 * i)) ); + recipes.put(new ComparableStack(ModItems.rbmk_pellet_heaus, 1, i + 5), new SILEXRecipe(600, 100) .addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_australium_lesser), 89 - i * 20)) .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_au198), 5 + 10 * i)) - .addOut(new WeightedRandomObject(new ItemStack(Items.gold_nugget), 5 + 10 * i)) ); + .addOut(new WeightedRandomObject(new ItemStack(Items.gold_nugget), 3 + 6 * i)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pb200), 2 + 4 * i)) ); // BALEFIRE // recipes.put(new ComparableStack(ModItems.rbmk_pellet_balefire, 1, i), new SILEXRecipe(400, 100) @@ -420,7 +423,7 @@ public class SILEXRecipes { .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), 6)) - .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 53)) + .addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 52)) ); 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_zirconium), 2)) diff --git a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java index 5654e6ee7..f56fbef3e 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -536,6 +536,7 @@ public class AnvilRecipes { new AnvilOutput(new ItemStack(Items.stick, 2)) }).setTier(2)); + //RBMK constructionRecipes.add(new AnvilConstructionRecipe( new ComparableStack(ModBlocks.rbmk_moderator), new AnvilOutput[] { new AnvilOutput(new ItemStack(ModBlocks.rbmk_blank, 1)), @@ -587,6 +588,12 @@ public class AnvilRecipes { new AnvilOutput(new ItemStack(ModItems.tank_steel, 1)), new AnvilOutput(new ItemStack(Blocks.hopper, 1)) }).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.rbmk_storage), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModBlocks.rbmk_blank, 1)), + new AnvilOutput(new ItemStack(ModBlocks.crate_steel, 2)) + }).setTier(4)); + if(!GeneralConfig.enable528) { @@ -607,23 +614,26 @@ public class AnvilRecipes { new AnvilOutput(new ItemStack(ModItems.board_copper, 6)), new AnvilOutput(new ItemStack(ModItems.pipes_steel, 2)) }).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.rbmk_cooler), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModBlocks.rbmk_blank, 1)), + new AnvilOutput(new ItemStack(ModBlocks.steel_grate, 4)), + new AnvilOutput(new ItemStack(ModItems.plate_polymer, 4)) + }).setTier(4)); constructionRecipes.add(new AnvilConstructionRecipe( new ComparableStack(ModBlocks.reactor_research), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.ingot_steel, 6)), - new AnvilOutput(new ItemStack(ModItems.ingot_polymer, 1)), - new AnvilOutput(new ItemStack(ModItems.ingot_polymer, 1), 0.75F), - new AnvilOutput(new ItemStack(ModItems.scrap, 1)), - new AnvilOutput(new ItemStack(ModItems.plate_lead, 4)), - new AnvilOutput(new ItemStack(ModItems.plate_lead, 2), 0.75F), - new AnvilOutput(new ItemStack(ModItems.plate_lead, 2), 0.5F), - new AnvilOutput(new ItemStack(ModItems.plate_copper, 3)), - new AnvilOutput(new ItemStack(ModItems.plate_copper, 1), 0.5F), - new AnvilOutput(new ItemStack(ModItems.ingot_lead, 8)), - new AnvilOutput(new ItemStack(ModItems.ingot_lead, 4), 0.75F), - new AnvilOutput(new ItemStack(ModItems.ingot_lead, 4), 0.5F), - new AnvilOutput(new ItemStack(ModItems.ingot_red_copper, 6)), - new AnvilOutput(new ItemStack(ModItems.circuit_copper, 8)), - new AnvilOutput(new ItemStack(ModItems.circuit_red_copper, 4)), + new AnvilOutput(new ItemStack(ModItems.ingot_steel, 8)), + new AnvilOutput(new ItemStack(ModItems.ingot_tcalloy, 4)), + new AnvilOutput(new ItemStack(ModItems.motor_desh, 2)), + new AnvilOutput(new ItemStack(ModItems.ingot_boron, 5)), + new AnvilOutput(new ItemStack(ModItems.ingot_lead, 12)), + new AnvilOutput(new ItemStack(ModItems.plate_lead, 2)), + new AnvilOutput(new ItemStack(ModItems.plate_aluminium, 3)), + new AnvilOutput(new ItemStack(ModItems.plate_aluminium, 1), 0.5F), + new AnvilOutput(new ItemStack(ModItems.crt_display, 2)), + new AnvilOutput(new ItemStack(ModItems.crt_display, 1), 0.5F), + new AnvilOutput(new ItemStack(ModItems.circuit_copper, 1)), + new AnvilOutput(new ItemStack(ModItems.circuit_copper, 1), 0.5F), }).setTier(4)); constructionRecipes.add(new AnvilConstructionRecipe( new ComparableStack(ModItems.pile_rod_plutonium), new AnvilOutput[] { diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 13c15073e..c379435d1 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -84,6 +84,7 @@ public class ModItems { public static Item ingot_co60; public static Item ingot_sr90; public static Item ingot_au198; + public static Item ingot_pb200; public static Item ingot_ra226; public static Item ingot_titanium; public static Item ingot_cobalt; @@ -190,6 +191,7 @@ public class ModItems { public static Item billet_co60; public static Item billet_sr90; public static Item billet_au198; + public static Item billet_pb200; public static Item billet_ra226; public static Item billet_schrabidium; public static Item billet_solinium; @@ -239,6 +241,7 @@ public class ModItems { public static Item nugget_co60; public static Item nugget_sr90; public static Item nugget_au198; + public static Item nugget_pb200; public static Item nugget_ra226; public static Item plate_titanium; public static Item plate_aluminium; @@ -712,6 +715,7 @@ public class ModItems { public static Item pellet_rtg_polonium; public static Item pellet_rtg_actinium; public static Item pellet_rtg_strontium; + public static Item pellet_rtg_lead; public static Item pellet_rtg_gold; public static Item pellet_rtg_americium; public static Item pellet_rtg_berkelium; @@ -2496,6 +2500,7 @@ public class ModItems { ingot_co60 = new Item().setUnlocalizedName("ingot_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_co60"); ingot_sr90 = new Item().setUnlocalizedName("ingot_sr90").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_sr90"); ingot_au198 = new Item().setUnlocalizedName("ingot_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_au198"); + ingot_pb200 = new Item().setUnlocalizedName("ingot_pb200").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pb200"); ingot_ra226 = new Item().setUnlocalizedName("ingot_ra226").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_ra226"); ingot_titanium = new Item().setUnlocalizedName("ingot_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_titanium"); ingot_cobalt = new Item().setUnlocalizedName("ingot_cobalt").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_cobalt"); @@ -2592,6 +2597,7 @@ public class ModItems { billet_co60 = new Item().setUnlocalizedName("billet_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_co60"); billet_sr90 = new Item().setUnlocalizedName("billet_sr90").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_sr90"); billet_au198 = new Item().setUnlocalizedName("billet_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_au198"); + billet_pb200 = new Item().setUnlocalizedName("billet_pb200").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pb200"); billet_ra226 = new Item().setUnlocalizedName("billet_ra226").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_ra226"); billet_schrabidium = new Item().setUnlocalizedName("billet_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_schrabidium"); billet_solinium = new Item().setUnlocalizedName("billet_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_solinium"); @@ -2703,6 +2709,7 @@ public class ModItems { nugget_co60 = new Item().setUnlocalizedName("nugget_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_co60"); nugget_sr90 = new Item().setUnlocalizedName("nugget_sr90").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_sr90"); nugget_au198 = new Item().setUnlocalizedName("nugget_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_au198"); + nugget_pb200 = new Item().setUnlocalizedName("nugget_pb200").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pb200"); nugget_ra226 = new Item().setUnlocalizedName("nugget_ra226").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_ra226"); plate_titanium = new Item().setUnlocalizedName("plate_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_titanium"); plate_aluminium = new Item().setUnlocalizedName("plate_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_aluminium"); @@ -3052,6 +3059,7 @@ public class ModItems { pellet_rtg_polonium = new ItemRTGPellet(25).setUnlocalizedName("pellet_rtg_polonium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_polonium"); pellet_rtg_actinium = new ItemRTGPellet(20).setUnlocalizedName("pellet_rtg_actinium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_actinium"); pellet_rtg_strontium = new ItemRTGPellet(15).setUnlocalizedName("pellet_rtg_strontium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_strontium"); + pellet_rtg_lead = new ItemRTGPellet(200).setUnlocalizedName("pellet_rtg_lead").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_lead"); pellet_rtg_gold = new ItemRTGPellet(150).setUnlocalizedName("pellet_rtg_gold").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_gold"); pellet_rtg_americium = new ItemRTGPellet(15).setUnlocalizedName("pellet_rtg_americium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_americium"); pellet_rtg_berkelium = new ItemRTGPellet(20).setUnlocalizedName("pellet_rtg_berkelium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_berkelium"); @@ -5462,6 +5470,7 @@ public class ModItems { GameRegistry.registerItem(ingot_co60, ingot_co60.getUnlocalizedName()); GameRegistry.registerItem(ingot_sr90, ingot_sr90.getUnlocalizedName()); GameRegistry.registerItem(ingot_au198, ingot_au198.getUnlocalizedName()); + GameRegistry.registerItem(ingot_pb200, ingot_pb200.getUnlocalizedName()); GameRegistry.registerItem(ingot_ra226, ingot_ra226.getUnlocalizedName()); GameRegistry.registerItem(ingot_titanium, ingot_titanium.getUnlocalizedName()); GameRegistry.registerItem(ingot_copper, ingot_copper.getUnlocalizedName()); @@ -5556,6 +5565,7 @@ public class ModItems { GameRegistry.registerItem(billet_co60, billet_co60.getUnlocalizedName()); GameRegistry.registerItem(billet_sr90, billet_sr90.getUnlocalizedName()); GameRegistry.registerItem(billet_au198, billet_au198.getUnlocalizedName()); + GameRegistry.registerItem(billet_pb200, billet_pb200.getUnlocalizedName()); GameRegistry.registerItem(billet_ra226, billet_ra226.getUnlocalizedName()); GameRegistry.registerItem(billet_schrabidium, billet_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(billet_solinium, billet_solinium.getUnlocalizedName()); @@ -5775,6 +5785,7 @@ public class ModItems { GameRegistry.registerItem(nugget_sr90, nugget_sr90.getUnlocalizedName()); GameRegistry.registerItem(nugget_technetium, nugget_technetium.getUnlocalizedName()); GameRegistry.registerItem(nugget_au198, nugget_au198.getUnlocalizedName()); + GameRegistry.registerItem(nugget_pb200, nugget_pb200.getUnlocalizedName()); GameRegistry.registerItem(nugget_ra226, nugget_ra226.getUnlocalizedName()); GameRegistry.registerItem(nugget_lead, nugget_lead.getUnlocalizedName()); GameRegistry.registerItem(nugget_bismuth, nugget_bismuth.getUnlocalizedName()); @@ -6064,6 +6075,7 @@ public class ModItems { GameRegistry.registerItem(pellet_rtg_polonium, pellet_rtg_polonium.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_strontium, pellet_rtg_strontium.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_actinium, pellet_rtg_actinium.getUnlocalizedName()); + GameRegistry.registerItem(pellet_rtg_lead, pellet_rtg_lead.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_gold, pellet_rtg_gold.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_americium, pellet_rtg_americium.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_berkelium, pellet_rtg_berkelium.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/weapon/ItemMissile.java b/src/main/java/com/hbm/items/weapon/ItemMissile.java index 8252739b4..ec4b49b2f 100644 --- a/src/main/java/com/hbm/items/weapon/ItemMissile.java +++ b/src/main/java/com/hbm/items/weapon/ItemMissile.java @@ -295,6 +295,7 @@ public class ItemMissile extends Item { } //am i retarded? + /* yes */ public ItemMissile copy() { ItemMissile part = new ItemMissile(); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java index 75ce85173..68b46de63 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java @@ -113,7 +113,7 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I } private boolean canEnrich() { - if(power > 0 && this.inputTank.getFill() >= inputTank.getTankType().getFluidConsumed() && this.outputTank.getFill() <= outputTank.getMaxFill()) { + if(power > 0 && this.inputTank.getFill() >= inputTank.getTankType().getFluidConsumed() && this.outputTank.getFill() + this.inputTank.getTankType().getFluidProduced() <= outputTank.getMaxFill()) { ItemStack[] list = inputTank.getTankType().getOutput(); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java index f01f7cb0e..041ebd41d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java @@ -129,6 +129,11 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement ItemRTGPellet pellet = (ItemRTGPellet) slots[i].getItem(); this.spin += pellet.getHeat() * 10; this.hasRTG = true; + + if(slots[i].getItem() == ModItems.pellet_rtg_gold || slots[i].getItem() == ModItems.pellet_rtg_lead) { + if(worldObj.rand.nextInt(60*60*20) == 0) + slots[i] = null; + } } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java index 1314bfd00..11879d478 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java @@ -221,7 +221,7 @@ public class TileEntityMachineRTG extends TileEntity implements ISidedInventory, heat += ((ItemRTGPellet)slots[i].getItem()).getHeat(); - if(slots[i].getItem() == ModItems.pellet_rtg_gold) { + if(slots[i].getItem() == ModItems.pellet_rtg_gold || slots[i].getItem() == ModItems.pellet_rtg_lead) { if(worldObj.rand.nextInt(60*60*20) == 0) slots[i] = null; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java b/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java index bb7aab4fe..4a068d500 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java @@ -98,7 +98,7 @@ public class TileEntityStorageDrum extends TileEntityMachineBase implements IFlu slots[i] = new ItemStack(ModItems.nuclear_waste_short_depleted_tiny, 1, meta); } - if(item == ModItems.ingot_au198 && worldObj.rand.nextInt(VersatileConfig.getShortDecayChance() / 100) == 0) { + if((item == ModItems.ingot_au198 || item == ModItems.ingot_pb200) && worldObj.rand.nextInt(VersatileConfig.getShortDecayChance() / 100) == 0) { slots[i] = new ItemStack(ModItems.nugget_mercury, 1, meta); } } diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 0bbd7ac6b..d643fc06b 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -915,6 +915,7 @@ item.billet_mox_fuel.name=MOX Fuel Billet item.billet_neptunium.name=Neptunium Billet item.billet_neptunium_fuel.name=Neptunium Fuel Billet item.billet_nuclear_waste.name=Nuclear Waste Billet +item.billet_pb200.name=Lead-200 Billet item.billet_po210be.name=Po210Be Billet item.billet_polonium.name=Polonium-210 Billet item.billet_pu_mix.name=Reactor Grade Plutonium Billet @@ -1696,6 +1697,7 @@ item.ingot_neptunium.name=Neptunium Ingot item.ingot_neptunium_fuel.name=Neptunium Fuel Ingot item.ingot_niobium.name=Niobium Ingot item.ingot_osmiridium.name=Osmiridium Ingot +item.ingot_pb200.name=Lead-200 Ingot item.ingot_phosphorus.name=Bar of White Phosphorus item.ingot_plutonium.name=Plutonium Ingot item.ingot_plutonium_fuel.name=Ingot of Plutonium Fuel @@ -2059,6 +2061,7 @@ item.nugget_mox_fuel.name=Nugget of MOX Fuel item.nugget_neptunium.name=Neptunium Nugget item.nugget_neptunium_fuel.name=Neptunium Fuel Nugget item.nugget_osmiridium.name=Osmiridium Nugget +item.nugget_pb200.name=Lead-200 Nugget item.nugget_plutonium.name=Plutonium Nugget item.nugget_plutonium_fuel.name=Nugget of Plutonium Fuel item.nugget_polonium.name=Polonium-210 Nugget @@ -2154,23 +2157,25 @@ item.pellet_mercury.name=Mercury Rounds item.pellet_mes.name=MES Watz Pellet item.pellet_meteorite.name=Meteorite Rounds item.pellet_neptunium.name=Neptunium Watz Pellet -item.pellet_rtg.name=Plutonium-238 Fuel Pellet +item.pellet_rtg.name=Plutonium-238 RTG Pellet item.pellet_rtg.desc=RTG fuel pellet for infinite energy! (almost) -item.pellet_rtg_actinium.name=Actinium Fuel Pellet +item.pellet_rtg_actinium.name=Actinium RTG Pellet item.pellet_rtg_actinium.desc= -item.pellet_rtg_americium.name=Americium-241 Fuel Pellet +item.pellet_rtg_americium.name=Americium-241 RTG Pellet item.pellet_rtg_americium.desc=Rare and reliable, good old Americium! -item.pellet_rtg_berkelium.name=Berkelium Fuel Pellet +item.pellet_rtg_berkelium.name=Berkelium RTG Pellet item.pellet_rtg_berkelium.desc= -item.pellet_rtg_gold.name=Gold-198 Fuel Pellet +item.pellet_rtg_lead.name=Lead-200 RTG Pellet +item.pellet_rtg_lead.desc=EXTREMELY DEADLY - LIMIT EXPOSURE +item.pellet_rtg_gold.name=Gold-198 RTG Pellet item.pellet_rtg_gold.desc=Made from a rare, highly unstable gold isotope. -item.pellet_rtg_polonium.name=Polonium-210 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_polonium.name=Polonium-210 RTG Pellet +item.pellet_rtg_polonium.desc=More powerful RTG pellet, made from finest polonium! +item.pellet_rtg_strontium.name=Strontium-90 RTG Pellet item.pellet_rtg_strontium.desc=Known to the State of California... -item.pellet_rtg_radium.name=Radium-226 Fuel Pellet +item.pellet_rtg_radium.name=Radium-226 RTG Pellet item.pellet_rtg_radium.desc=Great starter pellet, sourced from all-natural radium! -item.pellet_rtg_weak.name=Weak Uranium Fuel Pellet +item.pellet_rtg_weak.name=Weak Uranium RTG Pellet item.pellet_rtg_weak.desc=Cheaper and weaker pellet, now with more U238! item.pellet_schrabidium.name=Pure Schrabidium Watz Pellet item.photo_panel.name=Photovoltaic Panel diff --git a/src/main/resources/assets/hbm/textures/items/billet_pb200.png b/src/main/resources/assets/hbm/textures/items/billet_pb200.png new file mode 100644 index 0000000000000000000000000000000000000000..a5c0e92b80fe74a71f75adf30ac28f9f8bcbfeac GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}H0G|+7At5Ealo5!`z^kney32Xlaf%g+C;*Ok1d zrOIdbY~-I<^VFQ<()wL4SHB48he@+pDa^R#;8kI;bVg+J=7OWrSGw<{i=^lXXjMD9 sy@)ct!C0MtY2{buzZ3aaOtqdVUctt;_FrvRF3=(dPgg&ebxsLQ0OgQY0ssI2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/ingot_pb200.png b/src/main/resources/assets/hbm/textures/items/ingot_pb200.png new file mode 100644 index 0000000000000000000000000000000000000000..9852d1996606cee65f3b73f7a4d735c167e4d54b GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}T0G|+7At5jba4#P2(ImO6lzf5VfJ32`QbnN z?65Bn4$j#mEwSP6$@v>z^&4!yHsR^gd#7(KTbFDQUR}ZOuS~r>b+3L`0^3usRYKQ+mNIy{ L`njxgN@xNAFYRSB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/nugget_pb200.png b/src/main/resources/assets/hbm/textures/items/nugget_pb200.png new file mode 100644 index 0000000000000000000000000000000000000000..a8e996dc7a696860085a57f0ced5fbe23cb164cc GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}T0G|+7At5<4GpCf4f@RA#m6bIG1jINv`1txpGBfl42dZIU(Ei(c97u7O z1o;L3hXV#Lf5uNhVa@`N$YKTtzJnmlxMO1WTcDt)r;B5VM)2Izo_q%kIG7!-E&1`E zKQE*sWYN4=lWmy}P5ke0B$CVHiWk?FBf&xuXOBxCFj}7@T_a<#llfbmfZ)~nYr41X dU$B?K{B#MYu;1pjeLzDQJYD@<);T3K0RS$CQtAKz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/pellet_rtg_lead.png b/src/main/resources/assets/hbm/textures/items/pellet_rtg_lead.png new file mode 100644 index 0000000000000000000000000000000000000000..ccf1a118a90ec3daaa88f3c5fc82e60562b11632 GIT binary patch literal 2544 zcma)8Ym5_B6fUVec9DQQcNc_Vi1Lu>JUVT6hL)wY#jWmc%eLUc0y3Ss?GCgv!_1Vn zARrq+L#0~*N&U4nOJ+qxpiHko$rx!?Kj zIp==o-aZ?yd$eC^MXAMN=@+c_*Tdfd#?!|NzsF(yBNj`KX3^&h2Yo&ytjcjQ3E;%Z z*Ir_(t=_WLRhJ$d?2W8#*tvCPFMnX7qZA#ts_gIwN`~L|;@l(B7j5->hD>x<>~3wF z-PpI$JHS2V%9WjiQ~vK)I9J{`y4iZO80Z_Vb3+^p2}IkCN?#$S+syE%PP`Ni37 zgTL(aNW;&cjk@0Z^8@KuKK1N>r=?GH^3roldq?FX?Hhku_F(Q@JNatW;q7y;?H9FCy!zyFMFQ6c-C?B)0?@rs~e8>pYV;kj{1G-3Aiak!Zp#rz=0z}p~e*}p4+iw zuhrVWy!;_JlXz>rv46ew`nt$1^JA%a+&T@KN|fqZn#Iz0kn!}eY~E4^VXMVxgWgbE z!}4;<#tCu^*s>`FqAeD8RaW8ng+NDQAR$T~^y-1nQA89x=o5}wqE_*NCb4>n3L;DD zqWqGDJR_i0llzsrvn*st0i8p#sidT_Sr2Lwv+&(8<0xW6^o1U@p*D>8WECK^jkXb3 zAS*7WP)LFxZdHi0_5Nvj5;*dpO}ehIIG)L5Y#F;vRueeMFbqymI7ML)foVBO=dzfj zjp-!G)A)hLtD>TdvV<74Tue^u9u&r51_)>PKo%PE{KnX1*K`37!T}8vf&iQ%h)Rs0 zFp4p9=u9r9)YcX~B`se=SWP_3DL82(@KmaZ*7U&Qf7ZDpT8risfY$>}POCf!EC!N3 zrm&cjOlw`&N^8I{nXx8?I1a-!S1jNk4c3N>c%y0wF{PMj16e=`d=aCh)ucHu@Hj|< z6kJ?`jARiD{fgi_hHsFDPM-9h?qUia=ftx9#rEN0|Ct&`6f9TlV(6-NxC%1`Sn4(u$H4 zf!d`2rnVqW7jifLKOSA!^2+W$+3gOUTs~RJ!R~I-Lm8=?q20x$ldnePfuzaZOY$~w zXH~o0GiGv~R(OfQ5v+3IUNlC}{- zy-IzTTKmWGsm-^hcQ~i)zwzDZp)WnW<*}U?e;Igi`~xGuNqy35W_aGbDZ-yUnauJv odsbg*Cah&GJx=H55BsghwWqDeZoJ*g_$Oxx2I~B~rp|Bv8-DXW?f?J) literal 0 HcmV?d00001