Fix #429 Crash when a recipeCategory is missing

mezz · Sep 16, 2016 · f5ff94b · f5ff94b
1 parent fb588d9
commit f5ff94b
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/main/java/mezz/jei/RecipeRegistry.java b/src/main/java/mezz/jei/RecipeRegistry.java
@@ -7,6 +7,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import com.google.common.collect.ArrayListMultimap;
@@ -73,14 +74,17 @@ public RecipeRegistry(
 
 		ImmutableMultimap.Builder<IRecipeCategory, ItemStack> craftItemsForCategoriesBuilder = ImmutableMultimap.builder();
 		ImmutableMultimap.Builder<String, String> categoriesForCraftItemKeysBuilder = ImmutableMultimap.builder();
-		for (String recipeCategoryUid : craftItemsForCategories.keySet()) {
+		for (Map.Entry<String, Collection<ItemStack>> recipeCategoryEntry : craftItemsForCategories.asMap().entrySet()) {
+			String recipeCategoryUid = recipeCategoryEntry.getKey();
 			IRecipeCategory recipeCategory = recipeCategoriesMap.get(recipeCategoryUid);
-			Collection<ItemStack> craftItems = craftItemsForCategories.get(recipeCategoryUid);
-			craftItemsForCategoriesBuilder.putAll(recipeCategory, craftItems);
-			for (ItemStack craftItem : craftItems) {
-				recipeInputMap.addRecipeCategory(recipeCategory, craftItem);
-				String craftItemKey = stackHelper.getUniqueIdentifierForStack(craftItem);
-				categoriesForCraftItemKeysBuilder.put(craftItemKey, recipeCategoryUid);
+			if (recipeCategory != null) {
+				Collection<ItemStack> craftItems = recipeCategoryEntry.getValue();
+				craftItemsForCategoriesBuilder.putAll(recipeCategory, craftItems);
+				for (ItemStack craftItem : craftItems) {
+					recipeInputMap.addRecipeCategory(recipeCategory, craftItem);
+					String craftItemKey = stackHelper.getUniqueIdentifierForStack(craftItem);
+					categoriesForCraftItemKeysBuilder.put(craftItemKey, recipeCategoryUid);
+				}
 			}
 		}