Fix support for adding/hiding recipes at runtime

mezz · Jun 14, 2018 · a0d9af5 · a0d9af5
1 parent 3618092
commit a0d9af5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/main/java/mezz/jei/collect/MultiMap.java b/src/main/java/mezz/jei/collect/MultiMap.java
@@ -31,18 +31,17 @@ public boolean put(K key, V value) {
 	}
 
 	public boolean remove(K key, V value) {
-		if (map.containsKey(key)) {
-			return get(key).remove(value);
-		}
-		return false;
+		T collection = map.get(key);
+		return collection != null && collection.remove(value);
 	}
 
 	public boolean containsKey(K key) {
 		return map.containsKey(key);
 	}
 
 	public boolean contains(K key, V value) {
-		return get(key).contains(value);
+		T collection = map.get(key);
+		return collection != null && collection.contains(value);
 	}
 
 	public Set<Map.Entry<K, T>> entrySet() {

diff --git a/src/main/java/mezz/jei/recipes/RecipeRegistry.java b/src/main/java/mezz/jei/recipes/RecipeRegistry.java
@@ -198,7 +198,11 @@ public void addRecipe(IRecipeWrapper recipe, String recipeCategoryUid) {
 			return;
 		}
 
-		addRecipe(recipe, recipe, recipeCategory);
+		if (hiddenRecipes.contains(recipeCategoryUid, recipe)) {
+			unhideRecipe(recipe, recipeCategoryUid);
+		} else {
+			addRecipe(recipe, recipe, recipeCategory);
+		}
 	}
 
 	private void addRecipe(Object recipe, String recipeCategoryUid) {