From 0fa36839f64e3731d6bb8d655152cfe33f2be7f2 Mon Sep 17 00:00:00 2001 From: Vaern Date: Tue, 14 Dec 2021 19:45:57 -0800 Subject: [PATCH] Revert "self-charging rgp battery!" This reverts commit 2499b7f8c11d84ce0354494410db15eae87af257. --- src/main/java/com/hbm/items/ModItems.java | 8 ++++---- src/main/java/com/hbm/main/CraftingManager.java | 6 +++--- src/main/resources/assets/hbm/lang/en_US.lang | 1 - .../textures/items/battery_sc_plutonium_mix.png | Bin 298 -> 0 bytes 4 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_sc_plutonium_mix.png diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 0fc6d71af..2a4cda75c 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1878,8 +1878,8 @@ public class ModItems { public static Item battery_spark_cell_power; public static Item cube_power; + public static Item battery_sc_uranium; public static Item battery_sc_technetium; - public static Item battery_sc_plutonium_mix; public static Item battery_sc_plutonium; public static Item battery_sc_polonium; public static Item battery_sc_gold; @@ -4551,8 +4551,8 @@ public class ModItems { battery_spark_cell_power = new ItemBattery(100000000L * 1000000L, 200000000, 200000000).setUnlocalizedName("battery_spark_cell_power").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_power"); cube_power = new ItemBattery(1000000000000000000L, 1000000000000000L, 1000000000000000L).setUnlocalizedName("cube_power").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":cube_power"); - battery_sc_technetium = new ItemSelfcharger(5).setUnlocalizedName("battery_sc_technetium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_technetium"); - battery_sc_plutonium_mix = new ItemSelfcharger(25).setUnlocalizedName("battery_sc_plutonium_mix").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_plutonium_mix"); + battery_sc_uranium = new ItemSelfcharger(5).setUnlocalizedName("battery_sc_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_uranium"); + battery_sc_technetium = new ItemSelfcharger(25).setUnlocalizedName("battery_sc_technetium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_technetium"); battery_sc_plutonium = new ItemSelfcharger(100).setUnlocalizedName("battery_sc_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_plutonium"); battery_sc_polonium = new ItemSelfcharger(500).setUnlocalizedName("battery_sc_polonium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_polonium"); battery_sc_gold = new ItemSelfcharger(2500).setUnlocalizedName("battery_sc_gold").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc_gold"); @@ -6357,8 +6357,8 @@ public class ModItems { GameRegistry.registerItem(battery_potatos, battery_potatos.getUnlocalizedName()); GameRegistry.registerItem(battery_steam, battery_steam.getUnlocalizedName()); GameRegistry.registerItem(battery_steam_large, battery_steam_large.getUnlocalizedName()); + GameRegistry.registerItem(battery_sc_uranium, battery_sc_uranium.getUnlocalizedName()); GameRegistry.registerItem(battery_sc_technetium, battery_sc_technetium.getUnlocalizedName()); - GameRegistry.registerItem(battery_sc_plutonium_mix, battery_sc_plutonium_mix.getUnlocalizedName()); GameRegistry.registerItem(battery_sc_plutonium, battery_sc_plutonium.getUnlocalizedName()); GameRegistry.registerItem(battery_sc_polonium, battery_sc_polonium.getUnlocalizedName()); GameRegistry.registerItem(battery_sc_gold, battery_sc_gold.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 3381df210..79aebfa06 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -499,9 +499,9 @@ public class CraftingManager { addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.battery_steam), new Object[] { "PMP", "ISI", "PCP", 'P', CU.plate(), 'M', ModItems.motor, 'C', ModItems.coil_tungsten, 'S', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.WATER.getID()), 'I', ModItems.plate_polymer }); addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.battery_steam_large), new Object[] { "MPM", "ISI", "CPC", 'P', ModItems.board_copper, 'M', ModItems.motor, 'C', ModItems.coil_tungsten, 'S', new ItemStack(ModItems.fluid_barrel_full, 1, FluidType.WATER.getID()), 'I', POLYMER.ingot() }); - addRecipeAuto(new ItemStack(ModItems.battery_sc_technetium), new Object[] { "NBN", "PCP", "NBN", 'N', GOLD.nugget(), 'B', TC99.billet(), 'P', PB.plate(), 'C', ModItems.thermo_element }); - addRecipeAuto(new ItemStack(ModItems.battery_sc_plutonium_mix), new Object[] { "NBN", "PCP", "NBN", 'N', GOLD.nugget(), 'B', PURG.billet(), 'P', PB.plate(), 'C', ModItems.battery_sc_technetium }); - addRecipeAuto(new ItemStack(ModItems.battery_sc_plutonium), new Object[] { "NBN", "PCP", "NBN", 'N', TC99.nugget(), 'B', PU238.billet(), 'P', PB.plate(), 'C', ModItems.battery_sc_plutonium_mix }); + addRecipeAuto(new ItemStack(ModItems.battery_sc_uranium), new Object[] { "NBN", "PCP", "NBN", 'N', GOLD.nugget(), 'B', U238.billet(), 'P', PB.plate(), 'C', ModItems.thermo_element }); + addRecipeAuto(new ItemStack(ModItems.battery_sc_technetium), new Object[] { "NBN", "PCP", "NBN", 'N', GOLD.nugget(), 'B', TC99.billet(), 'P', PB.plate(), 'C', ModItems.battery_sc_uranium }); + addRecipeAuto(new ItemStack(ModItems.battery_sc_plutonium), new Object[] { "NBN", "PCP", "NBN", 'N', TC99.nugget(), 'B', PU238.billet(), 'P', PB.plate(), 'C', ModItems.battery_sc_technetium }); addRecipeAuto(new ItemStack(ModItems.battery_sc_polonium), new Object[] { "NBN", "PCP", "NBN", 'N', TC99.nugget(), 'B', PO210.billet(), 'P', POLYMER.ingot(), 'C', ModItems.battery_sc_plutonium }); addRecipeAuto(new ItemStack(ModItems.battery_sc_gold), new Object[] { "NBN", "PCP", "NBN", 'N', TA.nugget(), 'B', AU198.billet(), 'P', POLYMER.ingot(), 'C', ModItems.battery_sc_polonium }); addRecipeAuto(new ItemStack(ModItems.battery_sc_americium), new Object[] { "NBN", "PCP", "NBN", 'N', TA.nugget(), 'B', AM241.billet(), 'P', POLYMER.ingot(), 'C', ModItems.battery_sc_gold }); diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 439f45caf..5efbd8e52 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -824,7 +824,6 @@ item.battery_red_cell_6.name=Sixfold Redstone Power Cell item.battery_sc_americium.name=Self-Charging Americium-241 Battery item.battery_sc_gold.name=Self-Charging Gold-198 Battery item.battery_sc_plutonium.name=Self-Charging Plutonium-238 Battery -item.battery_sc_plutonium_mix.name=Self-Charging Reactor-Grade Plutonium Battery item.battery_sc_polonium.name=Self-Charging Polonium-210 Battery item.battery_sc_technetium.name=Self-Charging Technetium-99 Battery item.battery_sc_uranium.name=Self-Charging Uranium-238 Battery diff --git a/src/main/resources/assets/hbm/textures/items/battery_sc_plutonium_mix.png b/src/main/resources/assets/hbm/textures/items/battery_sc_plutonium_mix.png deleted file mode 100644 index b37d3e2238d10249c88f046cfbb1a5721092871e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}Z0G|+7MMXs*Q$a!D|9=K!W8+z~W;HZ4EMC00qoc#!-F?lPH4`UJ^z-v` zaB#4+w4AkgK}BO-YF;)_%hi<^9|9@ik|4j}{}_N_Q|%oNpfqQJM`SSr1K(i~W;~w1 zA_XWI?djqeq7l6G{Ar;E1rF8=+*xV*Q~&?JAu`u%`^JO^JQhqB89J(#&g|W~tdnW_ zwh3KL*}|upKYZ=|I@jUGp4;}?9PSqD83mMkCtPB&^#4%py5pboZ@xoU&WZ12^jpp& UZ)Wti6=)5Er>mdKI;Vst054B*Pyhe`