From f6f8da28af16b79a4d1a1744bbf460ea97532de2 Mon Sep 17 00:00:00 2001 From: Gunther De Wachter Date: Thu, 13 Jul 2017 11:29:00 +0200 Subject: [PATCH] Fixed Recipe handler only giving out 1 item instead of the amount specified in the json. --- .../appeng/recipes/helpers/PartShapedCraftingFactory.java | 4 ++-- .../appeng/recipes/helpers/PartShapelessCraftingFactory.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/appeng/recipes/helpers/PartShapedCraftingFactory.java b/src/main/java/appeng/recipes/helpers/PartShapedCraftingFactory.java index 47e77914d..a7671bfdc 100644 --- a/src/main/java/appeng/recipes/helpers/PartShapedCraftingFactory.java +++ b/src/main/java/appeng/recipes/helpers/PartShapedCraftingFactory.java @@ -1,7 +1,6 @@ package appeng.recipes.helpers; import appeng.api.recipes.ResolverResult; -import appeng.api.recipes.ResolverResultSet; import appeng.core.AELog; import appeng.core.Api; import appeng.core.AppEng; @@ -95,6 +94,7 @@ public class PartShapedCraftingFactory extends ShapedOreRecipe throw new JsonSyntaxException( "Key defines symbols that aren't used in pattern: " + keys ); JsonObject resultObject = (JsonObject) json.get( "result" ); + int count = JsonUtils.getInt( resultObject, "count", 1); String ingredient = resultObject.get( "part" ).getAsString(); Object result = (Object) Api.INSTANCE.registries().recipes().resolveItem( AppEng.MOD_ID, ingredient ); @@ -105,7 +105,7 @@ public class PartShapedCraftingFactory extends ShapedOreRecipe Item item = Item.getByNameOrId( AppEng.MOD_ID + ":" + resolverResult.itemName ); if(item == null) AELog.warn( "item was null for " + resolverResult.itemName + " ( " + ingredient + " )!" ); - ItemStack itemStack = new ItemStack( item, 1, resolverResult.damageValue, resolverResult.compound ); + ItemStack itemStack = new ItemStack( item, count, resolverResult.damageValue, resolverResult.compound ); return new PartShapedCraftingFactory( group.isEmpty() ? null : new ResourceLocation( group ), itemStack, primer ); } diff --git a/src/main/java/appeng/recipes/helpers/PartShapelessCraftingFactory.java b/src/main/java/appeng/recipes/helpers/PartShapelessCraftingFactory.java index 97b30539c..7bd986b29 100644 --- a/src/main/java/appeng/recipes/helpers/PartShapelessCraftingFactory.java +++ b/src/main/java/appeng/recipes/helpers/PartShapelessCraftingFactory.java @@ -44,6 +44,7 @@ public class PartShapelessCraftingFactory extends ShapelessOreRecipe throw new JsonParseException("No ingredients for shapeless recipe"); JsonObject resultObject = (JsonObject) json.get( "result" ); + int count = JsonUtils.getInt( resultObject, "count", 1); String ingredient = resultObject.get( "part" ).getAsString(); Object result = (Object) Api.INSTANCE.registries().recipes().resolveItem( AppEng.MOD_ID, ingredient ); @@ -56,7 +57,7 @@ public class PartShapelessCraftingFactory extends ShapelessOreRecipe if( item == null ) AELog.warn( "item was null for " + resolverResult.itemName + " ( " + ingredient + " )!" ); - ItemStack itemStack = new ItemStack( item, 1, resolverResult.damageValue, resolverResult.compound ); + ItemStack itemStack = new ItemStack( item, count, resolverResult.damageValue, resolverResult.compound ); return new PartShapelessCraftingFactory(group.isEmpty() ? null : new ResourceLocation(group), ings, itemStack); }