From 2ac27fd9ce0208686ad08de89f3a4f40d1404b82 Mon Sep 17 00:00:00 2001 From: yueh Date: Fri, 24 Jul 2020 22:39:38 +0200 Subject: [PATCH] Fixes patterns always returning a recipe. (#4495) --- src/main/java/appeng/helpers/CraftingPatternDetails.java | 2 +- src/main/java/appeng/items/misc/EncodedPatternItem.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/appeng/helpers/CraftingPatternDetails.java b/src/main/java/appeng/helpers/CraftingPatternDetails.java index b92dcad17..b02de8b9e 100644 --- a/src/main/java/appeng/helpers/CraftingPatternDetails.java +++ b/src/main/java/appeng/helpers/CraftingPatternDetails.java @@ -109,7 +109,7 @@ public class CraftingPatternDetails implements ICraftingPatternDetails, Comparab this.standardRecipe = null; this.correctOutput = ItemStack.EMPTY; - for (int x = 0; x < 3; x++) { + for (int x = 0; x < products.size(); x++) { final IAEItemStack ais = products.get(x); final ItemStack gs = ais.createItemStack(); diff --git a/src/main/java/appeng/items/misc/EncodedPatternItem.java b/src/main/java/appeng/items/misc/EncodedPatternItem.java index 9009a35ff..b14916f66 100644 --- a/src/main/java/appeng/items/misc/EncodedPatternItem.java +++ b/src/main/java/appeng/items/misc/EncodedPatternItem.java @@ -226,7 +226,9 @@ public class EncodedPatternItem extends AEBaseItem { final CompoundNBT tag = itemStack.getTag(); Preconditions.checkArgument(tag != null, "itemStack missing a NBT tag"); - return new ResourceLocation(tag.getString(NBT_RECIPE_ID)); + return tag.contains(NBT_RECIPE_ID, Constants.NBT.TAG_STRING) + ? new ResourceLocation(tag.getString(NBT_RECIPE_ID)) + : null; } public List getIngredients(ItemStack itemStack) {