Revert API Changes

This commit is contained in:
Jason Mitchell committed 2020-11-29 11:31:33 -08:00
1 parent 449ce974f4
commit 94705aeacf
2 files changed
+12 -9

No files matched your search

@@ -40,7 +40,7 @@ public interface IRecipeManager {
* @return number of removed recipes
*/
@ZenMethod
void remove(IIngredient output, @Optional boolean nbtMatch);
int remove(IIngredient output, @Optional boolean nbtMatch);
/**
* Adds a shaped recipe.
@@ -81,7 +81,7 @@ public interface IRecipeManager {
* @return number of removed recipes
*/
@ZenMethod
void removeShaped(IIngredient output, @Optional IIngredient[][] ingredients);
int removeShaped(IIngredient output, @Optional IIngredient[][] ingredients);
/**
* Removes shapeless recipes.
@@ -94,7 +94,7 @@ public interface IRecipeManager {
* @return number of removed recipes
*/
@ZenMethod
void removeShapeless(IIngredient output, @Optional IIngredient[] ingredients, @Optional boolean wildcard);
int removeShapeless(IIngredient output, @Optional IIngredient[] ingredients, @Optional boolean wildcard);
/**
* Performs a crafting with the specified ingredients. Returns null if no
@@ -110,12 +110,13 @@ public final class MCRecipeManager implements IRecipeManager {
}
@Override
public void remove(IIngredient output, @Optional boolean nbtMatch) {
public int remove(IIngredient output, @Optional boolean nbtMatch) {
if(output == null) {
MineTweakerAPI.logError("Cannot remove recipes for a null item!");
return;
return 0;
}
actionRemoveRecipesNoIngredients.addOutput(output, nbtMatch);
return 1;
}
@Override
@@ -145,21 +146,23 @@ public final class MCRecipeManager implements IRecipeManager {
}
@Override
public void removeShaped(IIngredient output, IIngredient[][] ingredients) {
public int removeShaped(IIngredient output, IIngredient[][] ingredients) {
if(output == null) {
MineTweakerAPI.logError("Cannot remove recipes for a null item!");
return;
return 0;
}
recipesToRemove.add(new ActionRemoveShapedRecipes(output, ingredients));
return 1;
}
@Override
public void removeShapeless(IIngredient output, IIngredient[] ingredients, boolean wildcard) {
public int removeShapeless(IIngredient output, IIngredient[] ingredients, boolean wildcard) {
if(output == null) {
MineTweakerAPI.logError("Cannot remove recipes for a null item!");
return;
return 0;
}
recipesToRemove.add(new ActionRemoveShapelessRecipes(output, ingredients, wildcard));
return 1;
}
@Override