From 05301699fa60be15f2eeeffe2d95ebcabc1d470a Mon Sep 17 00:00:00 2001 From: MJRLegends Date: Wed, 24 Apr 2024 22:52:54 +0100 Subject: [PATCH] Fixed issue #756 - Unable to Craft Electric Rocket using Tier 10 Rockets that have storage applied --- .../recipes/Tier10ElectricRocketRecipes.java | 138 +++++++++--------- 1 file changed, 71 insertions(+), 67 deletions(-) diff --git a/src/main/java/com/mjr/extraplanets/recipes/Tier10ElectricRocketRecipes.java b/src/main/java/com/mjr/extraplanets/recipes/Tier10ElectricRocketRecipes.java index ba248aa67..d3598d16f 100644 --- a/src/main/java/com/mjr/extraplanets/recipes/Tier10ElectricRocketRecipes.java +++ b/src/main/java/com/mjr/extraplanets/recipes/Tier10ElectricRocketRecipes.java @@ -46,72 +46,76 @@ public static void removeAllTier10ElectricRocketRecipes() { } public static void registerRocketCraftingRecipe() { - HashMap input = new HashMap(); - input.put(1, new ItemStack(ExtraPlanets_Items.TIER_10_NOSE_CONE)); // Cone - // Body - input.put(2, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); - input.put(3, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); - input.put(4, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); - input.put(5, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); - input.put(6, new ItemStack(ExtraPlanets_Items.TIER_10_ROCKET, 1)); - input.put(7, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); - input.put(8, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); - input.put(9, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); - input.put(10, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); - input.put(11, new ItemStack(ExtraPlanets_Items.TIER_10_ROCKET, 1)); - - input.put(12, new ItemStack(ExtraPlanets_Items.ELECTRIC_PARTS, 1, 1)); // Booster - input.put(13, new ItemStack(ExtraPlanets_Items.TIER_10_ITEMS, 1, 2)); // Fin - input.put(14, new ItemStack(ExtraPlanets_Items.TIER_10_ITEMS, 1, 2)); // Fin - input.put(15, new ItemStack(ExtraPlanets_Items.TIER_10_ITEMS, 1, 0)); // Engine - input.put(16, new ItemStack(ExtraPlanets_Items.ELECTRIC_PARTS, 1, 1)); // Booster - input.put(17, new ItemStack(ExtraPlanets_Items.TIER_10_ITEMS, 1, 2)); // Fin - input.put(18, new ItemStack(ExtraPlanets_Items.TIER_10_ITEMS, 1, 2)); // Fin - input.put(19, null); - input.put(20, null); - input.put(21, null); - Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 0), input)); - - HashMap input2 = new HashMap(input); - input2.put(19, new ItemStack(Blocks.CHEST)); - input2.put(20, null); - input2.put(21, null); - Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 1), input2)); - - input2 = new HashMap(input); - input2.put(19, null); - input2.put(20, new ItemStack(Blocks.CHEST)); - input2.put(21, null); - Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 1), input2)); - - input2 = new HashMap(input); - input2.put(19, null); - input2.put(20, null); - input2.put(21, new ItemStack(Blocks.CHEST)); - Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 1), input2)); - - input2 = new HashMap(input); - input2.put(19, new ItemStack(Blocks.CHEST)); - input2.put(20, new ItemStack(Blocks.CHEST)); - input2.put(21, null); - Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 2), input2)); - - input2 = new HashMap(input); - input2.put(19, new ItemStack(Blocks.CHEST)); - input2.put(20, null); - input2.put(21, new ItemStack(Blocks.CHEST)); - Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 2), input2)); - - input2 = new HashMap(input); - input2.put(19, null); - input2.put(20, new ItemStack(Blocks.CHEST)); - input2.put(21, new ItemStack(Blocks.CHEST)); - Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 2), input2)); - - input2 = new HashMap(input); - input2.put(19, new ItemStack(Blocks.CHEST)); - input2.put(20, new ItemStack(Blocks.CHEST)); - input2.put(21, new ItemStack(Blocks.CHEST)); - Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 3), input2)); + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + HashMap input = new HashMap(); + input.put(1, new ItemStack(ExtraPlanets_Items.TIER_10_NOSE_CONE)); // Cone + // Body + input.put(2, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); + input.put(3, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); + input.put(4, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); + input.put(5, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); + input.put(6, new ItemStack(ExtraPlanets_Items.TIER_10_ROCKET, 1, i)); + input.put(7, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); + input.put(8, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); + input.put(9, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); + input.put(10, new ItemStack(ExtraPlanets_Items.TIER_11_ITEMS, 1, 6)); + input.put(11, new ItemStack(ExtraPlanets_Items.TIER_10_ROCKET, 1, j)); + + input.put(12, new ItemStack(ExtraPlanets_Items.ELECTRIC_PARTS, 1, 1)); // Booster + input.put(13, new ItemStack(ExtraPlanets_Items.TIER_10_ITEMS, 1, 2)); // Fin + input.put(14, new ItemStack(ExtraPlanets_Items.TIER_10_ITEMS, 1, 2)); // Fin + input.put(15, new ItemStack(ExtraPlanets_Items.TIER_10_ITEMS, 1, 0)); // Engine + input.put(16, new ItemStack(ExtraPlanets_Items.ELECTRIC_PARTS, 1, 1)); // Booster + input.put(17, new ItemStack(ExtraPlanets_Items.TIER_10_ITEMS, 1, 2)); // Fin + input.put(18, new ItemStack(ExtraPlanets_Items.TIER_10_ITEMS, 1, 2)); // Fin + input.put(19, null); + input.put(20, null); + input.put(21, null); + Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 0), input)); + + HashMap input2 = new HashMap(input); + input2.put(19, new ItemStack(Blocks.CHEST)); + input2.put(20, null); + input2.put(21, null); + Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 1), input2)); + + input2 = new HashMap(input); + input2.put(19, null); + input2.put(20, new ItemStack(Blocks.CHEST)); + input2.put(21, null); + Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 1), input2)); + + input2 = new HashMap(input); + input2.put(19, null); + input2.put(20, null); + input2.put(21, new ItemStack(Blocks.CHEST)); + Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 1), input2)); + + input2 = new HashMap(input); + input2.put(19, new ItemStack(Blocks.CHEST)); + input2.put(20, new ItemStack(Blocks.CHEST)); + input2.put(21, null); + Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 2), input2)); + + input2 = new HashMap(input); + input2.put(19, new ItemStack(Blocks.CHEST)); + input2.put(20, null); + input2.put(21, new ItemStack(Blocks.CHEST)); + Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 2), input2)); + + input2 = new HashMap(input); + input2.put(19, null); + input2.put(20, new ItemStack(Blocks.CHEST)); + input2.put(21, new ItemStack(Blocks.CHEST)); + Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 2), input2)); + + input2 = new HashMap(input); + input2.put(19, new ItemStack(Blocks.CHEST)); + input2.put(20, new ItemStack(Blocks.CHEST)); + input2.put(21, new ItemStack(Blocks.CHEST)); + Tier10ElectricRocketRecipes.addTier10ElectricRocketRecipe(new NasaWorkbenchRecipe(new ItemStack(ExtraPlanets_Items.TIER_10_ELECTRIC_ROCKET, 1, 3), input2)); + } + } } }