Merge pull request #31 from GTNewHorizons/small_bug_fixes

Too many ingredients, and apparently an empty fuel?

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

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));
     }
 

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);