From 8c858b584276762b65d0a7f69fd03486781bca0a Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 13 Dec 2020 12:00:33 -0800 Subject: [PATCH] Too many ingredients, and apparently an empty fuel? --- build.properties | 2 +- src/codechicken/nei/recipe/FuelRecipeHandler.java | 2 +- src/codechicken/nei/recipe/ShapelessRecipeHandler.java | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.properties b/build.properties index 23019d20..1f9e9d8e 100644 --- a/build.properties +++ b/build.properties @@ -2,4 +2,4 @@ mc_version=1.7.10 forge_version=10.13.4.1614-1.7.10 ccl_version=1.1.3.138 ccc_version=1.0.7.+ -mod_version=2.0.5-GTNH +mod_version=2.0.6-GTNH diff --git a/src/codechicken/nei/recipe/FuelRecipeHandler.java b/src/codechicken/nei/recipe/FuelRecipeHandler.java index 2e30a91c..04f972a9 100644 --- a/src/codechicken/nei/recipe/FuelRecipeHandler.java +++ b/src/codechicken/nei/recipe/FuelRecipeHandler.java @@ -65,7 +65,7 @@ public class FuelRecipeHandler extends FurnaceRecipeHandler public void loadUsageRecipes(ItemStack ingredient) { for (FuelPair fuel : afuels) - if (fuel.stack.contains(ingredient)) + if (fuel.stack != null && fuel.stack.contains(ingredient)) arecipes.add(new CachedFuelRecipe(fuel)); } diff --git a/src/codechicken/nei/recipe/ShapelessRecipeHandler.java b/src/codechicken/nei/recipe/ShapelessRecipeHandler.java index 44040345..a37cc790 100644 --- a/src/codechicken/nei/recipe/ShapelessRecipeHandler.java +++ b/src/codechicken/nei/recipe/ShapelessRecipeHandler.java @@ -49,7 +49,12 @@ public class ShapelessRecipeHandler extends ShapedRecipeHandler public void setIngredients(List items) { ingredients.clear(); - for (int ingred = 0; ingred < items.size(); ingred++) { + int itemsSize = items.size(); + if (itemsSize > stackorder.length) { + NEIClientConfig.logger.error("RECIPE BUG: Too many items (" + itemsSize + ") for " + this.result.toString()); + itemsSize = stackorder.length; + } + for (int ingred = 0; ingred < itemsSize; ingred++) { PositionedStack stack = new PositionedStack(items.get(ingred), 25 + stackorder[ingred][0] * 18, 6 + stackorder[ingred][1] * 18); stack.setMaxSize(1); ingredients.add(stack);