From e344d6bfaac3d1048eb4d27eae6f27daea7e31f4 Mon Sep 17 00:00:00 2001 From: glowredman <35727266+glowredman@users.noreply.github.com> Date: Tue, 23 May 2023 20:12:20 +0200 Subject: [PATCH] Replace Shuttle Tank with Copper Tamk --- src/main/java/de/katzenpapst/amunra/AmunRa.java | 2 ++ .../java/de/katzenpapst/amunra/crafting/RecipeHelper.java | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/katzenpapst/amunra/AmunRa.java b/src/main/java/de/katzenpapst/amunra/AmunRa.java index 7507fa94..f5ecfc1a 100755 --- a/src/main/java/de/katzenpapst/amunra/AmunRa.java +++ b/src/main/java/de/katzenpapst/amunra/AmunRa.java @@ -163,6 +163,7 @@ public class AmunRa { public static boolean isNHCoreLoaded; public static boolean isIronChestsLoaded; + public static boolean isIronTanksLoaded; public static boolean isASPLoaded; @SidedProxy( @@ -176,6 +177,7 @@ public class AmunRa { public void preInit(final FMLPreInitializationEvent event) { isNHCoreLoaded = Loader.isModLoaded("dreamcraft"); isIronChestsLoaded = Loader.isModLoaded("IronChest"); + isIronTanksLoaded = Loader.isModLoaded("irontank"); isASPLoaded = Loader.isModLoaded("AdvancedSolarPanel"); final Configuration configFile = new Configuration(event.getSuggestedConfigurationFile()); diff --git a/src/main/java/de/katzenpapst/amunra/crafting/RecipeHelper.java b/src/main/java/de/katzenpapst/amunra/crafting/RecipeHelper.java index c927158e..af2f2e85 100755 --- a/src/main/java/de/katzenpapst/amunra/crafting/RecipeHelper.java +++ b/src/main/java/de/katzenpapst/amunra/crafting/RecipeHelper.java @@ -1081,7 +1081,7 @@ public static void addRocketRecipeWithChestPermutations(final Item rocket, final int chestSlot3 = 21; ItemStack chest; - final ItemStack tank = ARItems.shuttleTank.getItemStack(1); + ItemStack tank; if (AmunRa.isIronChestsLoaded) { // Copper Chest @@ -1091,6 +1091,12 @@ public static void addRocketRecipeWithChestPermutations(final Item rocket, chest = new ItemStack(Blocks.chest); } + if (AmunRa.isIronTanksLoaded) { + tank = GameRegistry.findItemStack("irontank", "copperTank", 1); + } else { + tank = ARItems.shuttleTank.getItemStack(1); + } + /* * ItemStack numChests0 = new ItemStack(rocket, 1, 0); ItemStack numChests1 = new ItemStack(rocket, 1, 1); * ItemStack numChests2 = new ItemStack(rocket, 1, 2); ItemStack numChests3 = new ItemStack(rocket, 1, 3);