From 7c0eb67215d22ab2229a097cf0d93eba0d1704df Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Sun, 29 Nov 2020 21:10:20 +0100 Subject: [PATCH] This is why i should init submodules. --- .../api/recipes/IRecipeManager.java | 4 ++-- .../mc1710/recipes/MCRecipeManager.java | 21 +++---------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/IRecipeManager.java b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/IRecipeManager.java index 08ed052..8adba79 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/IRecipeManager.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/IRecipeManager.java @@ -42,7 +42,7 @@ public interface IRecipeManager { @ZenMethod int remove(IIngredient output, @Optional boolean nbtMatch); - int remove(IIngredient output, boolean nbtMatch); + int remove(IIngredient output); /** * Adds a shaped recipe. @@ -71,7 +71,7 @@ public interface IRecipeManager { void addShapedMirrored(IItemStack output, IIngredient[][] ingredients, IRecipeFunction function); - void addShapedMirrored(IItemStack output, IIngredient[][] ingredients, IRecipeFunction function); + void addShapedMirrored(IItemStack output, IIngredient[][] ingredients, IRecipeAction action); void addShapedMirrored(IItemStack output, IIngredient[][] ingredients); /** diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java index 56a263a..274a2be 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java @@ -154,29 +154,14 @@ public final class MCRecipeManager implements IRecipeManager { recipesToAdd.add(new ActionAddShapedRecipe(output, ingredients, null, null, true)); } - @Override - public void addShaped(IItemStack output, IIngredient[][] ingredients, IRecipeAction action) { - recipesToAdd.add(new ActionAddShapedRecipe(output, ingredients, null, action, false)); - } - - @Override - public void addShapedMirrored(IItemStack output, IIngredient[][] ingredients, IRecipeFunction function, IRecipeAction action) { - recipesToAdd.add(new ActionAddShapedRecipe(output, ingredients, function, action, true)); - } - @Override public void addShapedMirrored(IItemStack output, IIngredient[][] ingredients, IRecipeAction action) { recipesToAdd.add(new ActionAddShapedRecipe(output, ingredients, null, action, true)); } @Override - public void addShapedMirrored(IItemStack output, IIngredient[][] ingredients, IRecipeFunction function) { - recipesToAdd.add(new ActionAddShapedRecipe(output, ingredients, function, null, true)); - } - - @Override - public void addShapedMirrored(IItemStack output, IIngredient[][] ingredients) { - recipesToAdd.add(new ActionAddShapedRecipe(output, ingredients, null, null, true)); + public void addShapedMirrored(IItemStack output, IIngredient[][] ingredients, IRecipeFunction function, IRecipeAction action) { + recipesToAdd.add(new ActionAddShapedRecipe(output, ingredients, function, action, true)); } @Override @@ -221,7 +206,7 @@ public final class MCRecipeManager implements IRecipeManager { } @Override - public int removeShaped(IIngredient output, IIngredient[][] ingredients) { + public int removeShaped(IIngredient output) { return removeShaped(output, null); }