Fix wrong type on new methods, fix IngredientSet.removeAll

mezz · Nov 22, 2017 · e50e505 · e50e505
1 parent be435cb
commit e50e505
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/src/api/java/mezz/jei/api/ingredients/IIngredientRegistry.java b/src/api/java/mezz/jei/api/ingredients/IIngredientRegistry.java
@@ -62,22 +62,22 @@ public interface IIngredientRegistry {
 	 *
 	 * @since JEI 4.8.2
 	 */
-	<V> void addIngredientsAtRuntime(Class<V> ingredientClass, Set<V> ingredients);
+	<V> void addIngredientsAtRuntime(Class<V> ingredientClass, Collection<V> ingredients);
 
 	/**
 	 * Remove ingredients from JEI at runtime.
 	 * Used by mods that have items created while the game is running, or use the server to define items.
 	 *
 	 * @since JEI 4.8.2
 	 */
-	<V> void removeIngredientsAtRuntime(Class<V> ingredientClass, Set<V> ingredients);
+	<V> void removeIngredientsAtRuntime(Class<V> ingredientClass, Collection<V> ingredients);
 
 	/**
 	 * Add new ingredients to JEI at runtime.
 	 * Used by mods that have items created while the game is running, or use the server to define items.
 	 *
 	 * @since JEI 4.0.2
-	 * @deprecated since JEI 4.7.3. Use {@link #addIngredientsAtRuntime(Class, Set)}
+	 * @deprecated since JEI 4.7.3. Use {@link #addIngredientsAtRuntime(Class, Collection)}
 	 */
 	@Deprecated
 	<V> void addIngredientsAtRuntime(Class<V> ingredientClass, List<V> ingredients);
@@ -87,7 +87,7 @@ public interface IIngredientRegistry {
 	 * Used by mods that have items created while the game is running, or use the server to define items.
 	 *
 	 * @since JEI 4.3.5
-	 * @deprecated since JEI 4.7.3. Use {@link #removeIngredientsAtRuntime(Class, Set)}
+	 * @deprecated since JEI 4.7.3. Use {@link #removeIngredientsAtRuntime(Class, Collection)}
 	 */
 	@Deprecated
 	<V> void removeIngredientsAtRuntime(Class<V> ingredientClass, List<V> ingredients);

diff --git a/src/main/java/mezz/jei/ingredients/IngredientRegistry.java b/src/main/java/mezz/jei/ingredients/IngredientRegistry.java
@@ -161,7 +161,7 @@ public <V> void addIngredientsAtRuntime(Class<V> ingredientClass, List<V> ingred
 	}
 
 	@Override
-	public <V> void addIngredientsAtRuntime(Class<V> ingredientClass, Set<V> ingredients) {
+	public <V> void addIngredientsAtRuntime(Class<V> ingredientClass, Collection<V> ingredients) {
 		ErrorUtil.assertMainThread();
 		addIngredientsAtRuntime(ingredientClass, ingredients, Internal.getIngredientFilter());
 	}
@@ -196,7 +196,7 @@ public <V> void removeIngredientsAtRuntime(Class<V> ingredientClass, List<V> ing
 	}
 
 	@Override
-	public <V> void removeIngredientsAtRuntime(Class<V> ingredientClass, Set<V> ingredients) {
+	public <V> void removeIngredientsAtRuntime(Class<V> ingredientClass, Collection<V> ingredients) {
 		ErrorUtil.assertMainThread();
 		removeIngredientsAtRuntime(ingredientClass, ingredients, Internal.getIngredientFilter());
 	}

diff --git a/src/main/java/mezz/jei/util/IngredientSet.java b/src/main/java/mezz/jei/util/IngredientSet.java
@@ -6,9 +6,11 @@
 import net.minecraft.item.ItemStack;
 
 import java.util.AbstractSet;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 
 public class IngredientSet<V> extends AbstractSet<V> {
@@ -44,6 +46,19 @@ public boolean remove(Object o) {
 		return ingredients.remove(uid) != null;
 	}
 
+	@Override
+	public boolean removeAll(Collection<?> c) {
+		if (c instanceof IngredientSet) {
+			return super.removeAll(c);
+		}
+		Objects.requireNonNull(c);
+		boolean modified = false;
+		for (Object aC : c) {
+			modified |= remove(aC);
+		}
+		return modified;
+	}
+
 	@Override
 	public boolean contains(Object o) {
 		//noinspection unchecked