From 9c94b045b36a01d6cf219501ba3948fdc8bb1c31 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 27 Jul 2015 19:40:00 +0100 Subject: [PATCH] Small re-factor to the RecipeRemover --- .../items/tools/ItemRockCutter.java | 2 +- .../java/techreborn/util/RecipeRemover.java | 40 +++++++++---------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 966ae86eb..81857670a 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -76,7 +76,7 @@ public class ItemRockCutter extends ItemPickaxe implements IElectricItem { public boolean canHarvestBlock(Block block, ItemStack stack){ return Items.diamond_pickaxe.canHarvestBlock(block, stack); } - + @Override public int getHarvestLevel(ItemStack stack, String toolClass) { diff --git a/src/main/java/techreborn/util/RecipeRemover.java b/src/main/java/techreborn/util/RecipeRemover.java index 8b6bb3a77..ee53ca398 100644 --- a/src/main/java/techreborn/util/RecipeRemover.java +++ b/src/main/java/techreborn/util/RecipeRemover.java @@ -17,33 +17,29 @@ public class RecipeRemover { public static void removeAnyRecipe(ItemStack resultItem) { List recipes = CraftingManager.getInstance().getRecipeList(); - for (int i = 0; i < recipes.size(); i++) - { - IRecipe tmpRecipe = recipes.get(i); - ItemStack recipeResult = tmpRecipe.getRecipeOutput(); - if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) - { - recipes.remove(i--); - } - } + for(IRecipe tmpRecipe : recipes){ + ItemStack recipeResult = tmpRecipe.getRecipeOutput(); + if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) + { + recipes.remove(tmpRecipe); + } + } } public static void removeShapedRecipe(ItemStack resultItem) { List recipes = CraftingManager.getInstance().getRecipeList(); - for (int i = 0; i < recipes.size(); i++) - { - IRecipe tmpRecipe = recipes.get(i); - if (tmpRecipe instanceof ShapedRecipes) - { - ShapedRecipes recipe = (ShapedRecipes) tmpRecipe; - ItemStack recipeResult = recipe.getRecipeOutput(); + for (IRecipe tmpRecipe : recipes){ + if (tmpRecipe instanceof ShapedRecipes) + { + ShapedRecipes recipe = (ShapedRecipes) tmpRecipe; + ItemStack recipeResult = recipe.getRecipeOutput(); - if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) - { - recipes.remove(i++); - } - } - } + if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) + { + recipes.remove(tmpRecipe); + } + } + } } }