From b8067eee6688fc0b1e18595f9d2adb7995d394d1 Mon Sep 17 00:00:00 2001 From: Vaern Date: Sat, 25 Dec 2021 19:32:55 -0800 Subject: [PATCH] radium rtg pellet --- .../java/com/hbm/crafting/MineralRecipes.java | 1 + .../java/com/hbm/hazard/HazardRegistry.java | 9 ++++- src/main/java/com/hbm/items/ModItems.java | 9 +++-- .../com/hbm/items/machine/ItemRTGPellet.java | 1 + .../com/hbm/items/special/ItemCustomLore.java | 32 ------------------ src/main/resources/assets/hbm/lang/en_US.lang | 12 ++++++- .../hbm/textures/items/pellet_rtg_radium.png | Bin 0 -> 236 bytes 7 files changed, 27 insertions(+), 37 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/items/pellet_rtg_radium.png diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index 2fa962c2b..d9931f20c 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -183,6 +183,7 @@ public class MineralRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_balefire_gold, 1), new Object[] { ModItems.billet_au198, ModItems.cell_antimatter, ModItems.pellet_charged }); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg), new Object[] { ModItems.billet_pu238, ModItems.billet_pu238, ModItems.billet_pu238, "plateIron" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_radium), new Object[] { ModItems.billet_ra226, ModItems.billet_ra226, ModItems.billet_ra226, "plateIron" })); 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_polonium), new Object[] { ModItems.billet_polonium, ModItems.billet_polonium, ModItems.billet_polonium, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_gold), new Object[] { ModItems.billet_au198, ModItems.billet_au198, ModItems.billet_au198, "plateIron" })); diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index 4a86fc9ad..95e60fbba 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -278,7 +278,14 @@ public class HazardRegistry { HazardSystem.register(billet_po210be, makeData(RADIATION, pobe * billet)); 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 * billet * 3).addEntry(HOT, 5F)); + HazardSystem.register(pellet_rtg_radium, makeData(RADIATION, ra226 * billet * 3)); + HazardSystem.register(pellet_rtg_weak, makeData(RADIATION, (pu238 + (u238 * 2)) * billet)); + HazardSystem.register(pellet_rtg_polonium, new HazardData().addEntry(RADIATION, po210 * billet * 3).addEntry(HOT, 5F)); + HazardSystem.register(pellet_rtg_gold, new HazardData().addEntry(RADIATION, au198 * billet * 3).addEntry(HOT, 5F)); + HazardSystem.register(pellet_rtg_americium, makeData(RADIATION, am241 * billet * 3)); + registerRodRadiation(rod_th232, rod_dual_th232, rod_quad_th232, th232); registerRodRadiation(rod_uranium, rod_dual_uranium, rod_quad_uranium, u); registerRodRadiation(rod_u233, rod_dual_u233, rod_quad_u233, u233); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 4441b27cb..d424192a6 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -697,6 +697,7 @@ public class ModItems { public static Item limiter; public static Item pellet_rtg; + public static Item pellet_rtg_radium; public static Item pellet_rtg_weak; public static Item pellet_rtg_polonium; public static Item pellet_rtg_actinium; @@ -3124,10 +3125,11 @@ public class ModItems { wiring_red_copper = new ItemWiring().setUnlocalizedName("wiring_red_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wiring_red_copper"); - pellet_rtg = new ItemRTGPellet(5).setUnlocalizedName("pellet_rtg").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg"); - pellet_rtg_weak = new ItemRTGPellet(2).setUnlocalizedName("pellet_rtg_weak").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_weak"); + pellet_rtg = new ItemRTGPellet(10).setUnlocalizedName("pellet_rtg").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg"); + pellet_rtg_radium = new ItemRTGPellet(3).setUnlocalizedName("pellet_rtg_radium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_radium"); + pellet_rtg_weak = new ItemRTGPellet(5).setUnlocalizedName("pellet_rtg_weak").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_weak"); 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(15).setUnlocalizedName("pellet_rtg_actinium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_actinium"); + 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_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"); @@ -6224,6 +6226,7 @@ public class ModItems { //Pellets GameRegistry.registerItem(pellet_rtg, pellet_rtg.getUnlocalizedName()); + GameRegistry.registerItem(pellet_rtg_radium, pellet_rtg_radium.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_weak, pellet_rtg_weak.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_polonium, pellet_rtg_polonium.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_strontium, pellet_rtg_strontium.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/machine/ItemRTGPellet.java b/src/main/java/com/hbm/items/machine/ItemRTGPellet.java index 24f1cb8ec..895fa3267 100644 --- a/src/main/java/com/hbm/items/machine/ItemRTGPellet.java +++ b/src/main/java/com/hbm/items/machine/ItemRTGPellet.java @@ -96,6 +96,7 @@ public class ItemRTGPellet extends Item implements IRadioisotopeFuel { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { super.addInformation(stack, player, list, bool); + list.add(I18nUtil.resolveKey(this.getUnlocalizedName() + ".desc")); IRadioisotopeFuel.addTooltip(list, stack, bool); } diff --git a/src/main/java/com/hbm/items/special/ItemCustomLore.java b/src/main/java/com/hbm/items/special/ItemCustomLore.java index 4124dcf9d..70274f8e5 100644 --- a/src/main/java/com/hbm/items/special/ItemCustomLore.java +++ b/src/main/java/com/hbm/items/special/ItemCustomLore.java @@ -62,38 +62,6 @@ public class ItemCustomLore extends Item { list.add("That one's my favourite!"); } - if(this == ModItems.pellet_rtg) - { - if(MainRegistry.polaroidID == 11) - list.add("Contains ~100% Pu238 oxide."); - else - list.add("RTG fuel pellet for infinite energy! (almost)"); - } - - if(this == ModItems.pellet_rtg_weak) - { - if(MainRegistry.polaroidID == 11) - list.add("Meh."); - else - list.add("Cheaper and weaker pellet, now with more U238!"); - } - - if(this == ModItems.pellet_rtg_polonium) - { - if(MainRegistry.polaroidID == 11) - list.add("Polonium 4 U and me."); - else - list.add("More powderful RTG pellet, made from finest polonium!"); - } - - if(this == ModItems.pellet_rtg_gold) - { - if(MainRegistry.polaroidID == 11) - list.add("it's that spicy gold"); - else - list.add("Made from a rare, highly unstable gold isotope."); - } - if(this == ModItems.pellet_cluster) { list.add("Used in multi purpose bombs:"); diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 882380755..d941386ae 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -2140,13 +2140,23 @@ 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.desc=RTG fuel pellet for infinite energy! (almost) item.pellet_rtg_actinium.name=Actinium Fuel Pellet +item.pellet_rtg_actinium.desc= item.pellet_rtg_americium.name=Americium-241 Fuel Pellet +item.pellet_rtg_americium.desc=Rare and reliable, good old Americium! item.pellet_rtg_berkelium.name=Berkelium Fuel Pellet +item.pellet_rtg_berkelium.desc= item.pellet_rtg_gold.name=Gold-198 Fuel 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_weak.name=Weak Uranium RTG Pellet +item.pellet_rtg_strontium.desc= +item.pellet_rtg_radium.name=Radium-226 Fuel Pellet +item.pellet_rtg_radium.desc=Great starter pellet, sourced from all-natural radium! +item.pellet_rtg_weak.name=Weak Uranium Fuel Pellet +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 item.pile_rod_boron.name=Chicago Pile Control Rod diff --git a/src/main/resources/assets/hbm/textures/items/pellet_rtg_radium.png b/src/main/resources/assets/hbm/textures/items/pellet_rtg_radium.png new file mode 100644 index 0000000000000000000000000000000000000000..cfc788ada533753a6ef6bc001a2ec94c634c9cf1 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|-o?I(}C{Ppes|Nk>rEIEAT!sa6ffHJqln#zC_dr6RAFi;8z7^J+J z-GD-z1s;*b3=DjSL74G){)!Z!ps%NkV~9p@?+H&X21Op1i%X2|{6CSFb0kz;=uiKj zn+!*vg||yM1kXDabM&g}&t(jC4T`*0oUsp-wsI$>{gRFmTf`ls;