add ISoldererRegistry#removeRecipe, resolves #634

This commit is contained in:
way2muchnoise
2016-11-15 17:44:03 +01:00
parent d8e32913c3
commit 0b4f5f13ca
2 changed files with 39 additions and 0 deletions

View File

@@ -42,4 +42,13 @@ public interface ISoldererRegistry {
*/
@Nonnull
ISoldererRecipe createSimpleRecipe(@Nonnull ItemStack result, int duration, ItemStack... rows);
/**
* Remove existing recipes from the solderer
*
* @param result the result
* @param rows none or the three rows that give the result
* @return a list of removed {@link ISoldererRecipe}s
*/
List<ISoldererRecipe> removeRecipe(@Nonnull ItemStack result, ItemStack... rows);
}

View File

@@ -9,6 +9,8 @@ import net.minecraftforge.items.IItemHandler;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
public class SoldererRegistry implements ISoldererRegistry {
@@ -78,4 +80,32 @@ public class SoldererRegistry implements ISoldererRegistry {
}
};
}
@Override
public List<ISoldererRecipe> removeRecipe(@Nonnull ItemStack result, ItemStack... rows) {
if (!(rows.length == 0 || rows.length == 3)) {
throw new IllegalArgumentException("Removing a recipe requires either no rows or 3 rows, got " + rows.length + " rows");
}
Iterator<ISoldererRecipe> itr = recipes.iterator();
List<ISoldererRecipe> removed = new LinkedList<>();
while (itr.hasNext()) {
ISoldererRecipe recipe = itr.next();
if (API.instance().getComparer().isEqualNoQuantity(result, recipe.getResult())) {
if (rows.length == 0 || compareRows(recipe, rows)) {
itr.remove();
removed.add(recipe);
}
}
}
return removed;
}
private boolean compareRows(ISoldererRecipe recipe, ItemStack[] rows) {
for (int i = 0; i < 3; ++i) {
if(!API.instance().getComparer().isEqualNoQuantity(recipe.getRow(i), rows[i])) {
return false;
}
}
return true;
}
}