diff --git a/src/main/java/modtweaker2/mods/tfcraft/handlers/Anvil.java b/src/main/java/modtweaker2/mods/tfcraft/handlers/Anvil.java index e5a0b66..271878f 100644 --- a/src/main/java/modtweaker2/mods/tfcraft/handlers/Anvil.java +++ b/src/main/java/modtweaker2/mods/tfcraft/handlers/Anvil.java @@ -1,5 +1,6 @@ package modtweaker2.mods.tfcraft.handlers; +import static modtweaker2.helpers.StackHelper.areEqual; import static modtweaker2.helpers.InputHelper.toStack; import static com.bioxx.tfc.api.Crafting.AnvilReq.getReqFromInt; @@ -66,7 +67,7 @@ public class Anvil { public void apply() { ArrayList toRemove = new ArrayList(); for (AnvilRecipe recipe : AnvilManager.getInstance().getRecipeList()){ - if (recipe.getCraftingResult() != null && recipe.getCraftingResult() == stack){ + if (recipe.getCraftingResult() != null && areEqual(recipe.getCraftingResult(), stack)){ toRemove.add(recipe); } } diff --git a/src/main/java/modtweaker2/mods/tfcraft/handlers/Barrel.java b/src/main/java/modtweaker2/mods/tfcraft/handlers/Barrel.java index 800c02e..e161284 100644 --- a/src/main/java/modtweaker2/mods/tfcraft/handlers/Barrel.java +++ b/src/main/java/modtweaker2/mods/tfcraft/handlers/Barrel.java @@ -2,6 +2,7 @@ package modtweaker2.mods.tfcraft.handlers; import static modtweaker2.helpers.InputHelper.toFluid; import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import java.util.ArrayList; @@ -81,12 +82,12 @@ public class Barrel { public void apply() { ArrayList toRemove = new ArrayList(); for (BarrelRecipe recipe : BarrelManager.getInstance().getRecipes()){ - if (recipe.getRecipeOutIS() != null && recipe.getRecipeOutIS() == stack){ + if (recipe.getRecipeOutIS() != null && areEqual(recipe.getRecipeOutIS(), stack)){ toRemove.add(recipe); } } for (BarrelRecipe recipe : BarrelManager.getInstance().getRecipes()){ - if (recipe.getRecipeOutFluid() != null && recipe.getRecipeOutFluid() == fluid){ + if (recipe.getRecipeOutFluid() != null && recipe.getRecipeOutFluid().isFluidEqual(fluid)){ toRemove.add(recipe); } } diff --git a/src/main/java/modtweaker2/mods/tfcraft/handlers/Kiln.java b/src/main/java/modtweaker2/mods/tfcraft/handlers/Kiln.java index 70c36c1..51416ee 100644 --- a/src/main/java/modtweaker2/mods/tfcraft/handlers/Kiln.java +++ b/src/main/java/modtweaker2/mods/tfcraft/handlers/Kiln.java @@ -1,6 +1,7 @@ package modtweaker2.mods.tfcraft.handlers; import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import java.util.ArrayList; @@ -19,11 +20,15 @@ import com.bioxx.tfc.api.Crafting.KilnRecipe; @ZenClass("mods.tfcraft.Kiln") public class Kiln { + /** Deprecated, since pottery kiln will check x instanceof ItemPotteryBase + *

If you have a such item, you might consider to use it + */ + @Deprecated @ZenMethod public static void add(IItemStack input, int lv, IItemStack output){ MineTweakerAPI.apply(new AddRecipe(new KilnRecipe(toStack(input), lv, toStack(output)))); } - + @ZenMethod public static void remove(IItemStack stack){ MineTweakerAPI.apply(new RemoveRecipe(toStack(stack))); @@ -44,7 +49,7 @@ public class Kiln { public void apply() { ArrayList toRemove = new ArrayList(); for (KilnRecipe recipe : KilnCraftingManager.getInstance().getRecipeList()){ - if (recipe.getCraftingResult() != null && recipe.getCraftingResult() == stack){ + if (recipe.getCraftingResult() != null && areEqual(recipe.getCraftingResult(), stack)){ toRemove.add(recipe); } } diff --git a/src/main/java/modtweaker2/mods/tfcraft/handlers/Quern.java b/src/main/java/modtweaker2/mods/tfcraft/handlers/Quern.java index e16157b..4a00480 100644 --- a/src/main/java/modtweaker2/mods/tfcraft/handlers/Quern.java +++ b/src/main/java/modtweaker2/mods/tfcraft/handlers/Quern.java @@ -1,6 +1,7 @@ package modtweaker2.mods.tfcraft.handlers; import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import java.util.ArrayList; @@ -45,7 +46,7 @@ public class Quern { public void apply() { ArrayList toRemove = new ArrayList(); for (QuernRecipe recipe : QuernManager.getInstance().getRecipes()){ - if (recipe.getResult() !=null && recipe.getResult() == stack){ + if (recipe.getResult() !=null && areEqual(recipe.getResult(), stack)){ toRemove.add(recipe); } }