From df8e6c7eb3e482b9b738cacd37d639c3f51c6dff Mon Sep 17 00:00:00 2001 From: Vaern Date: Sat, 15 Jan 2022 11:37:02 -0800 Subject: [PATCH] actinium funnies --- src/main/java/com/hbm/blocks/ModBlocks.java | 2 +- .../java/com/hbm/crafting/MineralRecipes.java | 3 +++ src/main/java/com/hbm/crafting/RodRecipes.java | 2 ++ .../java/com/hbm/hazard/HazardRegistry.java | 4 ++++ .../java/com/hbm/inventory/OreDictManager.java | 4 ++-- .../hbm/inventory/recipes/BreederRecipes.java | 1 + src/main/java/com/hbm/items/ModItems.java | 12 +++++++++--- .../com/hbm/items/machine/ItemBreedingRod.java | 5 ++++- src/main/resources/assets/hbm/lang/en_US.lang | 16 ++++++++++++---- .../hbm/textures/items/billet_actinium.png | Bin 0 -> 5927 bytes .../hbm/textures/items/ingot_actinium.png | Bin 329 -> 258 bytes .../hbm/textures/items/nugget_actinium.png | Bin 0 -> 1801 bytes .../hbm/textures/items/powder_actinium.png | Bin 369 -> 266 bytes .../hbm/textures/items/powder_actinium_tiny.png | Bin 199 -> 232 bytes .../assets/hbm/textures/items/rod.ac227.png | Bin 0 -> 255 bytes .../assets/hbm/textures/items/rod.ra226.png | Bin 0 -> 236 bytes .../hbm/textures/items/rod_dual.ac227.png | Bin 0 -> 278 bytes .../hbm/textures/items/rod_dual.ra226.png | Bin 0 -> 274 bytes .../hbm/textures/items/rod_quad.ac227.png | Bin 0 -> 326 bytes .../hbm/textures/items/rod_quad.ra226.png | Bin 0 -> 312 bytes 20 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/items/billet_actinium.png create mode 100644 src/main/resources/assets/hbm/textures/items/nugget_actinium.png create mode 100644 src/main/resources/assets/hbm/textures/items/rod.ac227.png create mode 100644 src/main/resources/assets/hbm/textures/items/rod.ra226.png create mode 100644 src/main/resources/assets/hbm/textures/items/rod_dual.ac227.png create mode 100644 src/main/resources/assets/hbm/textures/items/rod_dual.ra226.png create mode 100644 src/main/resources/assets/hbm/textures/items/rod_quad.ac227.png create mode 100644 src/main/resources/assets/hbm/textures/items/rod_quad.ra226.png diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 9617283a8..5c5f42eee 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -1424,7 +1424,7 @@ public class ModBlocks { block_boron = new BlockBeaconable(Material.iron).setBlockName("block_boron").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_boron"); block_lanthanium = new BlockBeaconable(Material.iron).setBlockName("block_lanthanium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_lanthanium"); block_ra226 = new BlockHazard().makeBeaconable().setBlockName("block_ra226").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_ra226"); - block_actinium = new BlockBeaconable(Material.iron).setBlockName("block_actinium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_actinium"); + block_actinium = new BlockHazard().makeBeaconable().setBlockName("block_actinium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_actinium"); block_tritium = new BlockRotatablePillar(Material.glass, RefStrings.MODID + ":block_tritium_top").setBlockName("block_tritium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGlass).setHardness(3.0F).setResistance(2.0F).setBlockTextureName(RefStrings.MODID + ":block_tritium_side"); block_semtex = new BlockSemtex(Material.tnt).setBlockName("block_semtex").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(2.0F).setBlockTextureName(RefStrings.MODID + ":block_semtex"); block_smore = new BlockPillar(Material.rock, RefStrings.MODID + ":block_smore_top").setBlockName("block_smore").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(900.0F).setBlockTextureName(RefStrings.MODID + ":block_smore_side"); diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index 9d1e6ff7b..aac036426 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -60,6 +60,7 @@ public class MineralRecipes { add1To9Pair(ModItems.ingot_au198, ModItems.nugget_au198); add1To9Pair(ModItems.ingot_pb209, ModItems.nugget_pb209); add1To9Pair(ModItems.ingot_ra226, ModItems.nugget_ra226); + add1To9Pair(ModItems.ingot_actinium, ModItems.nugget_actinium); add1To9Pair(ModItems.ingot_pu241, ModItems.nugget_pu241); add1To9Pair(ModItems.ingot_am241, ModItems.nugget_am241); @@ -106,6 +107,7 @@ public class MineralRecipes { addBillet(ModItems.billet_au198, ModItems.ingot_au198, ModItems.nugget_au198, AU198.allNuggets()); addBillet(ModItems.billet_pb209, ModItems.ingot_pb209, ModItems.nugget_pb209, PB209.allNuggets()); //and so forth addBillet(ModItems.billet_ra226, ModItems.ingot_ra226, ModItems.nugget_ra226, "nuggetRa226"); + addBillet(ModItems.billet_actinium, ModItems.ingot_actinium, ModItems.nugget_actinium, "nuggetActinium227", "tinyAc227"); addBillet(ModItems.billet_schrabidium, ModItems.ingot_schrabidium, ModItems.nugget_schrabidium, "nuggetSchrabidium"); addBillet(ModItems.billet_solinium, ModItems.ingot_solinium, ModItems.nugget_solinium, "nuggetSolinium"); addBillet(ModItems.billet_uranium_fuel, ModItems.ingot_uranium_fuel, ModItems.nugget_uranium_fuel); @@ -204,6 +206,7 @@ public class MineralRecipes { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_radium), new Object[] { ModItems.billet_ra226, ModItems.billet_ra226, ModItems.billet_ra226, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_weak), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_pu238, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_strontium), new Object[] { ModItems.billet_sr90, ModItems.billet_sr90, ModItems.billet_sr90, "plateIron" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_actinium), new Object[] { ModItems.billet_actinium, ModItems.billet_actinium, ModItems.billet_actinium, "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_pb209, ModItems.billet_pb209, ModItems.billet_pb209, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_gold), new Object[] { ModItems.billet_au198, ModItems.billet_au198, ModItems.billet_au198, "plateIron" })); diff --git a/src/main/java/com/hbm/crafting/RodRecipes.java b/src/main/java/com/hbm/crafting/RodRecipes.java index 28c4b717d..23734ac63 100644 --- a/src/main/java/com/hbm/crafting/RodRecipes.java +++ b/src/main/java/com/hbm/crafting/RodRecipes.java @@ -62,6 +62,8 @@ public class RodRecipes { addBreedingRod(CO, ModItems.billet_cobalt, BreedingRodType.CO); addBreedingRod(CO60, ModItems.billet_co60, BreedingRodType.CO60); + addBreedingRod(RA226, ModItems.billet_ra226, BreedingRodType.RA226); + addBreedingRod(AC227, ModItems.billet_actinium, BreedingRodType.AC227); addBreedingRod(TH232, ModItems.billet_th232, BreedingRodType.TH232); addBreedingRod(ModItems.billet_thorium_fuel, BreedingRodType.THF); addBreedingRod(U235, ModItems.billet_u235, BreedingRodType.U235); diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index b8b71b314..053cb62d2 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; public class HazardRegistry { //CO60 5a β− 030.00Rad/s Spicy + //SR90 29a β− 015.00Rad/s Spicy //TC99 211,000a β− 002.75Rad/s Spicy //I181 192h β− 150.00Rad/s 2 much spice :( //XE135 9h β− aaaaaaaaaaaaaaaa @@ -30,6 +31,7 @@ public class HazardRegistry { //AT209 5h β+ like 2k or sth idk bruv //PO210 138d α 075.00Rad/s Spicy //RA226 1,600a α 007.50Rad/s + //AC227 22a β− 030.00Rad/s Spicy //TH232 14,000,000,000a α 000.10Rad/s //U233 160,000a α 005.00Rad/s //U235 700,000,000a α 001.00Rad/s @@ -70,6 +72,7 @@ public class HazardRegistry { public static final float at209 = 2000.0F; public static final float po210 = 75.0F; public static final float ra226 = 7.5F; + public static final float ac227 = 30.0F; public static final float th232 = 0.1F; public static final float thf = 1.75F; public static final float u = 0.35F; @@ -315,6 +318,7 @@ public class HazardRegistry { registerRTGPellet(pellet_rtg_radium, ra226 * rtg, 0); registerRTGPellet(pellet_rtg_weak, (pu238 + (u238 * 2)) * billet, 0); registerRTGPellet(pellet_rtg_strontium, sr90 * rtg, 0); + registerRTGPellet(pellet_rtg_actinium, ac227 * rtg, 0); registerRTGPellet(pellet_rtg_polonium, po210 * rtg, 0, 3F); registerRTGPellet(pellet_rtg_lead, pb209 * rtg, 0, 7F, 5F); registerRTGPellet(pellet_rtg_gold, au198 * rtg, 0, 5F); diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index 1d0c9c461..9a86ac03f 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -109,6 +109,7 @@ public class OreDictManager { public static final DictFrame PO210 = new DictFrame("Polonium210", "Po210", "Polonium"); public static final DictFrame TC99 = new DictFrame("Technetium99", "Tc99"); public static final DictFrame RA226 = new DictFrame("Radium226", "Ra226"); + public static final DictFrame AC227 = new DictFrame("Actinium227", "Ac227"); public static final DictFrame CO60 = new DictFrame("Cobalt60", "Co60"); public static final DictFrame AU198 = new DictFrame("Gold198", "Au198"); public static final DictFrame PB209 = new DictFrame("Lead209", "Pb209"); @@ -180,7 +181,6 @@ public class OreDictManager { * RARE EARTHS */ public static final DictFrame LA = new DictFrame("Lanthanum"); - public static final DictFrame AC = new DictFrame("Actinium"); public static final DictFrame ZR = new DictFrame("Zirconium"); public static final DictFrame ND = new DictFrame("Neodymium"); public static final DictFrame CE = new DictFrame("Cerium"); @@ -244,6 +244,7 @@ public class OreDictManager { PO210 .rad(HazardRegistry.po210) .hot(3) .nugget(nugget_polonium) .billet(billet_polonium) .ingot(ingot_polonium) .dust(powder_polonium) .block(block_polonium); TC99 .rad(HazardRegistry.tc99) .nugget(nugget_technetium) .billet(billet_technetium) .ingot(ingot_technetium); RA226 .rad(HazardRegistry.ra226) .nugget(nugget_ra226) .billet(billet_ra226) .ingot(ingot_ra226) .dust(powder_ra226) .block(block_ra226); + AC227 .rad(HazardRegistry.ac227) .nugget(nugget_actinium) .billet(billet_actinium) .ingot(ingot_actinium) .dust(powder_actinium) .block(block_actinium) .dustSmall(powder_actinium_tiny); 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); PB209 .rad(HazardRegistry.pb209) .blinding(3F) .hot(7) .nugget(nugget_pb209) .billet(billet_pb209) .ingot(ingot_pb209); @@ -321,7 +322,6 @@ public class OreDictManager { * RARE EARTHS */ LA .nugget(fragment_lanthanium) .ingot(ingot_lanthanium) .dustSmall(powder_lanthanium_tiny) .dust(powder_lanthanium) .block(block_lanthanium); - AC .nugget(fragment_actinium) .ingot(ingot_actinium) .dustSmall(powder_actinium_tiny) .dust(powder_actinium) .block(block_actinium); ZR .nugget(nugget_zirconium) .ingot(ingot_zirconium) .billet(billet_zirconium) .dust(powder_zirconium) .block(block_zirconium) .ore(ore_depth_zirconium); ND .nugget(fragment_neodymium) .dustSmall(powder_neodymium_tiny) .dust(powder_neodymium) .ore(ore_depth_nether_neodymium); CE .nugget(fragment_cerium) .dustSmall(powder_cerium_tiny) .dust(powder_cerium); diff --git a/src/main/java/com/hbm/inventory/recipes/BreederRecipes.java b/src/main/java/com/hbm/inventory/recipes/BreederRecipes.java index 55172f90b..75eba61a3 100644 --- a/src/main/java/com/hbm/inventory/recipes/BreederRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/BreederRecipes.java @@ -24,6 +24,7 @@ public class BreederRecipes { setRecipe(BreedingRodType.LITHIUM, BreedingRodType.TRITIUM, 200); setRecipe(BreedingRodType.CO, BreedingRodType.CO60, 100); + setRecipe(BreedingRodType.RA226, BreedingRodType.AC227, 400); setRecipe(BreedingRodType.TH232, BreedingRodType.THF, 500); setRecipe(BreedingRodType.U235, BreedingRodType.NP237, 300); setRecipe(BreedingRodType.NP237, BreedingRodType.PU238, 200); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index eb64c1fd0..2cf79d067 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -197,6 +197,7 @@ public class ModItems { public static Item billet_au198; public static Item billet_pb209; public static Item billet_ra226; + public static Item billet_actinium; public static Item billet_schrabidium; public static Item billet_solinium; public static Item billet_australium; @@ -247,6 +248,7 @@ public class ModItems { public static Item nugget_au198; public static Item nugget_pb209; public static Item nugget_ra226; + public static Item nugget_actinium; public static Item plate_titanium; public static Item plate_aluminium; public static Item wire_red_copper; @@ -2609,6 +2611,7 @@ public class ModItems { billet_au198 = new Item().setUnlocalizedName("billet_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_au198"); billet_pb209 = new Item().setUnlocalizedName("billet_pb209").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pb209"); billet_ra226 = new Item().setUnlocalizedName("billet_ra226").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_ra226"); + billet_actinium = new Item().setUnlocalizedName("billet_actinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_actinium"); 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"); billet_australium = new Item().setUnlocalizedName("billet_australium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_australium"); @@ -2721,6 +2724,7 @@ public class ModItems { nugget_au198 = new Item().setUnlocalizedName("nugget_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_au198"); nugget_pb209 = new Item().setUnlocalizedName("nugget_pb209").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pb209"); nugget_ra226 = new Item().setUnlocalizedName("nugget_ra226").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_ra226"); + nugget_actinium = new Item().setUnlocalizedName("nugget_actinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_actinium"); 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"); wire_red_copper = new Item().setUnlocalizedName("wire_red_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_red_copper"); @@ -3069,12 +3073,12 @@ public class ModItems { pellet_rtg = new ItemRTGPellet(10).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(87.7F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg"); pellet_rtg_radium = new ItemRTGPellet(3).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(16.0F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_radium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_radium"); pellet_rtg_weak = new ItemRTGPellet(5).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(1.0F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_weak").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_weak"); - pellet_rtg_polonium = new ItemRTGPellet(30).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(138.0F, HalfLifeType.SHORT, false) * 1.5)).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_polonium = new ItemRTGPellet(35).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(138.0F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_polonium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_polonium"); + pellet_rtg_actinium = new ItemRTGPellet(20).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(21.7F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg_actinium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_actinium"); pellet_rtg_strontium = new ItemRTGPellet(15).setDecays(DepletedRTGMaterial.ZIRCONIUM, (long) (RTGUtil.getLifespan(29.0F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg_strontium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_strontium"); pellet_rtg_lead = new ItemRTGPellet(MachineConfig.doRTGsDecay ? 600 : 200).setDecays(DepletedRTGMaterial.BISMUTH, (long) (RTGUtil.getLifespan(0.3F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_lead").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_lead"); pellet_rtg_gold = new ItemRTGPellet(MachineConfig.doRTGsDecay ? 300 : 100).setDecays(DepletedRTGMaterial.MERCURY, (long) (RTGUtil.getLifespan(2.7F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_gold").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_gold"); - pellet_rtg_americium = new ItemRTGPellet(15).setDecays(DepletedRTGMaterial.NEPTUNIUM, (long) (RTGUtil.getLifespan(4.7F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_americium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_americium"); + pellet_rtg_americium = new ItemRTGPellet(20).setDecays(DepletedRTGMaterial.NEPTUNIUM, (long) (RTGUtil.getLifespan(4.7F, HalfLifeType.LONG, false) * 1.5)).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"); tritium_deuterium_cake = new ItemCustomLore().setUnlocalizedName("tritium_deuterium_cake").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":tritium_deuterium_cake"); @@ -5584,6 +5588,7 @@ public class ModItems { GameRegistry.registerItem(billet_au198, billet_au198.getUnlocalizedName()); GameRegistry.registerItem(billet_pb209, billet_pb209.getUnlocalizedName()); GameRegistry.registerItem(billet_ra226, billet_ra226.getUnlocalizedName()); + GameRegistry.registerItem(billet_actinium, billet_actinium.getUnlocalizedName()); GameRegistry.registerItem(billet_schrabidium, billet_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(billet_solinium, billet_solinium.getUnlocalizedName()); GameRegistry.registerItem(billet_australium, billet_australium.getUnlocalizedName()); @@ -5805,6 +5810,7 @@ public class ModItems { GameRegistry.registerItem(nugget_au198, nugget_au198.getUnlocalizedName()); GameRegistry.registerItem(nugget_pb209, nugget_pb209.getUnlocalizedName()); GameRegistry.registerItem(nugget_ra226, nugget_ra226.getUnlocalizedName()); + GameRegistry.registerItem(nugget_actinium, nugget_actinium.getUnlocalizedName()); GameRegistry.registerItem(nugget_lead, nugget_lead.getUnlocalizedName()); GameRegistry.registerItem(nugget_bismuth, nugget_bismuth.getUnlocalizedName()); GameRegistry.registerItem(nugget_tantalium, nugget_tantalium.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/machine/ItemBreedingRod.java b/src/main/java/com/hbm/items/machine/ItemBreedingRod.java index 76efdb7e6..c8c36ca03 100644 --- a/src/main/java/com/hbm/items/machine/ItemBreedingRod.java +++ b/src/main/java/com/hbm/items/machine/ItemBreedingRod.java @@ -25,6 +25,9 @@ public class ItemBreedingRod extends ItemEnumMulti { //Required for prototype LEAD, - URANIUM + URANIUM, + + RA226, + AC227 } } diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 028e5b89a..60db07731 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -898,6 +898,7 @@ item.battery_su_l.name=Large SU-Battery item.battery_trixite.name=Off-Brand Spark Battery item.beta.name=Beta Features item.big_sword.name=Great Sword +item.billet_actinium.name=Actinium-227 Billet item.billet_am_mix.name=Reactor Grade Americium Billet item.billet_am241.name=Americium-241 Billet item.billet_am242.name=Americium-242 Billet @@ -1411,7 +1412,7 @@ item.folly_bullet_du.name=12.8cm DU-Shell item.folly_bullet_nuclear.name=12.8cm Nuclear Shell item.folly_shell.name=Silver Bullet Casing item.fooditem.name=food item -item.fragment_actinium.name=Actinium Fragment +item.fragment_actinium.name=Actinium-227 Fragment item.fragment_boron.name=Boron Fragment item.fragment_cerium.name=Cerium Fragment item.fragment_cobalt.name=Cobalt Fragment @@ -1660,7 +1661,7 @@ item.inf_sulfur.name=Infinite Sulfur Tank item.inf_tritium.name=Infinite Tritium Tank item.inf_water.name=Infinite Water Tank item.inf_water_mk2.name=Heavy Infinite Water Tank -item.ingot_actinium.name=Semi-Stable Actinium Ingot +item.ingot_actinium.name=Actinium-227 Ingot item.ingot_advanced_alloy.name=Advanced Alloy Ingot item.ingot_aluminium.name=Aluminium Ingot item.ingot_am_mix.name=Reactor Grade Americium Ingot @@ -2039,6 +2040,7 @@ item.nuclear_waste_short_depleted_tiny.name=Tiny Pile of Decayed Short-Lived Nuc item.nuclear_waste_vitrified.name=Vitrified Nuclear Waste item.nuclear_waste_vitrified_tiny.name=Tiny Pile of Vitrified Nuclear Waste item.nugget.name=Chicken Nugget +item.nugget_actinium.name=Actinium-227 Nugget item.nugget_am_mix.name=Reactor Grade Americium Nugget item.nugget_am241.name=Americium-241 Nugget item.nugget_am242.name=Americium-242 Nugget @@ -2161,8 +2163,8 @@ item.pellet_meteorite.name=Meteorite Rounds item.pellet_neptunium.name=Neptunium Watz 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 RTG Pellet -item.pellet_rtg_actinium.desc= +item.pellet_rtg_actinium.name=Actinium-227 RTG Pellet +item.pellet_rtg_actinium.desc=A glow of blue light and beta rays. item.pellet_rtg_americium.name=Americium-241 RTG Pellet item.pellet_rtg_americium.desc=Rare and reliable, good old Americium! item.pellet_rtg_berkelium.name=Berkelium RTG Pellet @@ -2437,6 +2439,8 @@ item.rod.lithium.name=Lithium Rod item.rod.tritium.name=Tritium Rod item.rod.co.name=Cobalt Rod item.rod.co60.name=Cobalt-60 Rod +item.rod.ra226.name=Radium-226 Rod +item.rod.ac227.name=Actinium-227 Rod item.rod.th232.name=Thorium-232 Rod item.rod.thf.name=Thorium Fuel Rod item.rod.u235.name=Uranium-235 Rod @@ -2453,6 +2457,8 @@ item.rod_dual.lithium.name=Lithium Dual Rod item.rod_dual.tritium.name=Tritium Dual Rod item.rod_dual.co.name=Cobalt Dual Rod item.rod_dual.co60.name=Cobalt-60 Dual Rod +item.rod_dual.ra226.name=Radium-226 Dual Rod +item.rod_dual.ac227.name=Actinium-227 Dual Rod item.rod_dual.th232.name=Thorium-232 Dual Rod item.rod_dual.thf.name=Thorium Fuel Dual Rod item.rod_dual.u235.name=Uranium-235 Dual Rod @@ -2469,6 +2475,8 @@ item.rod_quad.lithium.name=Lithium Quad Rod item.rod_quad.tritium.name=Tritium Quad Rod item.rod_quad.co.name=Cobalt Quad Rod item.rod_quad.co60.name=Cobalt-60 Quad Rod +item.rod_quad.ra226.name=Radium-226 Quad Rod +item.rod_quad.ac227.name=Actinium-227 Quad Rod item.rod_quad.th232.name=Thorium-232 Quad Rod item.rod_quad.thf.name=Thorium Fuel Quad Rod item.rod_quad.u235.name=Uranium-235 Quad Rod diff --git a/src/main/resources/assets/hbm/textures/items/billet_actinium.png b/src/main/resources/assets/hbm/textures/items/billet_actinium.png new file mode 100644 index 0000000000000000000000000000000000000000..4b910cdc53c29c1654ded6d9e83e9c5b02eb8034 GIT binary patch literal 5927 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 E0DV_bSO5S3 delta 285 zcmV+&0pk9G0?7i983+ad001BJ|6!3KAb$yPNLh0L01m?d01m?e$8V@)0002qNklgbLJc{RRAc}#ha5@7IF4LTXVbh+(*(=1 z_`xs?q-o0i8j^~lK-;$Hx(@fg*L1NC-h%J@R2Gm_Rh5{)l4uz@&^BDx<&ZqjcO{j@ j2Zap7!2O=|O8`&W^KsmC_?P1V015yANkvXXu0mjfdK!M= diff --git a/src/main/resources/assets/hbm/textures/items/nugget_actinium.png b/src/main/resources/assets/hbm/textures/items/nugget_actinium.png new file mode 100644 index 0000000000000000000000000000000000000000..e53e6a52e60cfe1788f07b31ce5da67c84d66e36 GIT binary patch literal 1801 zcmV+k2ln`hP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-_rjwUAz{Ld+J1h4^{9Hx&Z^Gs4~!||MllEf8ZgTyzxOarWh?ApM0W>g4+G0^>x;-@2S|U@XBuP27-x^ z^R7xh{WI+0WxzFuE3fTFPYdaBba_4wdCp8Iv`3Jz)3!T*9HqVsF{wO4EwuA`IxZ;Z zjn2w(w#TAw9t~c=QVW=fi8?#B>#MsD&)0FD_Vp$7bL>%OP6nChbdZ3MSIfHzw2uV6 zBKazrx9s1gH{?@3c7DTUJRG6$VS@`FlfNi_n3!)w^txf_BJ3@6}}=!Du`Y zWzEITaxz*0<-CSPB*7a{mX#8c+H5N%Z?@WkR9$ie_J?uaHJ9CRedX0vK=jl}kP}r1 zHEqg5i7IcMklY~Q#ElhNR_X@Qd8QkSTl1zhUv-L^n?qM}a0bCYPv%FB&m=QOofJ8% zH&?(#GeiMnDmTCA1wq_6x`jpXm5%)OA$}05P%tc-6${L^Y!@ZCm)PQ^GoxQXzPFGw z(vAaAgt-I2IEDh)KpfoMMMUBpcvJ|Kft=V=fdVcBY5+-|Ig$}lnsZ}}xYd^eMVe-u zO%Nh*WPvt`GsN;fAb!LvVkid=K70vl)o3X-`^l{utVZN= z;pTA?re;u#yo2I06__X3)Xb{$o~CkBGn)vTA`n1^sf}rFDh3ICcNB)ZwR=(SOS+k$ zU($_!rkt75{SM^}qa-i4D>%h-Kr@0ty1o|jtw)%<@){~bp~d~iNs zr{E%AMeKfwX%%sY_0tpgDL?Dnd<%t?9u|_S+)|%COpe&*DQ~+rKU|puDf{*mLi0=f zNUOURoT>E@Pvr#%CzA4EPJ4*UhsP0esKptO^sszP<|;g&i;V4+Bu6nV>}p6gK4R(P&fDVR?^>8PwLLJpu|jlP83t{ z9AEeF@%1jwv%Js!IeL`5$pD`~Jj-;$BHkdL-n4Yi`@~UJk`&@|;xU6RNc_lk+2uFR zMTh-7Giqeg^TbhNq1eH42eXo)5>FAw6jh^qf7WG%^A=~dQe&-q@)t((+R8H5X$~QY zMJz#t02wuuQGtaxtr{sN(zKuO@DDnEkz6vl%3$PJKou$^#}EDozq>UHlM`-IBms22 z*!IUT5ZVQrb=&?vw(aH#5O@Zzw6?$60A@Z(ueY_>5zxC0TwJ#`c@MbU0S2CQ$&ef= zK+|6+0Pkn?O*x?d76`Aoy|wmn`T%68tJDo}a0rYPDSO@H-QAtN{d=a>-w!-na*<*n zXpaB@00v@9M??Vs06hRbNBl-100009a7bBm000ic000ic0Tn1pfB*mh2XskIMF-^y z3=$_X9)d#20002kNkl8OB79dR{ufXIt$?0~g_wlOL>UXh&b%PeC)9+O59v9+ug3;ZCEkFHQR=5~&)B~20lT*vwB4g4Sw&vi+o zh{N%SKbz6?JSm()Y%SaM8i0Pc%QOs&0n#L4x7koQg{#`eXc=_W>(OwWmmUOA(5s#x rwOa1*LyRZT(gphauY3Z%??vhic&}7*0`yXr00000NkvXXu0mjf3@S_s literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/powder_actinium.png b/src/main/resources/assets/hbm/textures/items/powder_actinium.png index 6359b8cde03ac612d3ca4ea96fabb3028270fe12..8fad081c2b22a4ce4ee208aed1975183646b0760 100644 GIT binary patch delta 221 zcmey!)WtMGl7pFnfk8u;KX{^|LcMf=Pl&6bs_L5u5038KsU#*gwX-umI5^bP^FL4( z14BZ?9X=q%SrX(I{2vM!g8eImK!ODxk;M!QdR{fNdbP?Mvq2il1jf z5;CwX@9FH!4!ROT&@Whb{cHSxz+tx&sO~riGFYm;X^MN(h)b4&bpd?A8eWanMprEU#i(`mJ@Y-I-06qo9uF{`@~K)b7^nUM{he)A7$Ke?{&hhRHWH zF1WlC%`nknU6rTgqf%I6Gc*6l*`5Hq)$07*qoM6N<$g3k_0-~a#s diff --git a/src/main/resources/assets/hbm/textures/items/rod.ac227.png b/src/main/resources/assets/hbm/textures/items/rod.ac227.png new file mode 100644 index 0000000000000000000000000000000000000000..f366e0dde708d097aa91730a3f9ae0f7ade41058 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|&0G|+77Z(>(Q`6|^=%YJ#ZdkH(>CBn?Hf@^O+q-e;(#h@Z|AERF80^mc z{tKjdN`m}?|04i{(EW4gfa0759+AZi419+`m{C;2s{ttJXft|r?aNS%G}H0G|+77Z(>(Q`6|^=r6y2-g*1-!o#~Se|4?fML@ao%29Z&H|6fVg?4jLmtgMvY`+M5+8#dVnWMXtKf$(ZV{8Q1XLnE!=2dxD77 RhJ2u544$rjF6*2UngD8!Q0@Q# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/rod_dual.ac227.png b/src/main/resources/assets/hbm/textures/items/rod_dual.ac227.png new file mode 100644 index 0000000000000000000000000000000000000000..e335a2a0dd93a3267fcfb45279677097bdd71a1e GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|&0G|+77Z(>(Q`6|^=%YJ#Zd|%_>CBn?Hf@^O+dH|v{XYZ4#I|;z!s%?$ z>_CdAB*-uLKLRia-9L8@D9%~n5n0T@z;_6Q8AUa`8i0byo-U3d8o{~!oO}lqI9L`Y z>3;qH|Lq~KNS%G|&0G|+77Z(>(Q`6|^=r6y2-g*1-!o#~Se|E zL$h!H`M>|JjMsvY0-nju8mE*sp4c9Fl+bbQCrhk{^dXy_M=Tj6f@{(?%t-v;?<0Op z;IGlcGYbmdKI;Vst E0DzZi!TNS%G}Z0G|+7DJdxl2?-Y$7gJMHSy|cW=;$*C4s2h&X2+T}tLHCRvtYr|ojVsy znKG-dZ)R`b)XvWT3=H!pPXX#a*NJAMbkd@#e9(# zl}vV6|D%21Wy2}=Hv0HJFg__UTUKu8^VziwMR^=^HBaVb0iD3$>FVdQ&MBb@0K!Iu AEdT%j literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/rod_quad.ra226.png b/src/main/resources/assets/hbm/textures/items/rod_quad.ra226.png new file mode 100644 index 0000000000000000000000000000000000000000..9770f1712b133d30c81b96ade6da8778d343c175 GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}B0G|+7DJdxl2?-Y$7gJMHSy|cW=;$xMe_nm|=;Wsa>Z}Y(H^i+wsFdt-OktJ%E%@NswRge{{g`X#aj8pe$#BM`SSr1K%MKW)#)% zY5)r6db&7K&!|+~fA*K9AgL4PTv^ mw;q1sw4GcsYsPu;N=Cs+>^maX{L}?n%;4$j=d#Wzp$P!+PJJQ( literal 0 HcmV?d00001