From bb28a6db48224fa677f289600bf87e513619dfb2 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Mon, 6 Mar 2017 19:55:12 +0100 Subject: [PATCH] Fix #1592 Carpenter recipe for Portable Analyzer asks for Magenta Stained Glass Pane --- .../forestry/core/utils/InventoryUtil.java | 4 +- .../forestry/core/utils/ItemStackUtil.java | 49 ++++++++++++++++--- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/src/main/java/forestry/core/utils/InventoryUtil.java b/src/main/java/forestry/core/utils/InventoryUtil.java index f0b792eb1..650395430 100644 --- a/src/main/java/forestry/core/utils/InventoryUtil.java +++ b/src/main/java/forestry/core/utils/InventoryUtil.java @@ -384,8 +384,8 @@ public abstract class InventoryUtil { return result; } for (int i = 0; i < oreDicts.length; i++) { - for (int d = 0; d < oreDicts.length; d++) { - result.set(i, oreDicts[i][d]); + for (int d = 0; d < oreDicts[i].length; d++) { + result.set(i * 3 + d, oreDicts[d][i]); } } return result; diff --git a/src/main/java/forestry/core/utils/ItemStackUtil.java b/src/main/java/forestry/core/utils/ItemStackUtil.java index 9690e92ed..8af52288b 100644 --- a/src/main/java/forestry/core/utils/ItemStackUtil.java +++ b/src/main/java/forestry/core/utils/ItemStackUtil.java @@ -11,6 +11,9 @@ package forestry.core.utils; import javax.annotation.Nullable; + +import org.apache.commons.lang3.tuple.Pair; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -207,6 +210,35 @@ public abstract class ItemStackUtil { return condensed; } + + public static Pair, NonNullList> condenseStacks(NonNullList stacks, NonNullList dicts) { + NonNullList condensed = NonNullList.create(); + NonNullList condensedDicts = NonNullList.create(); + + for (int i = 0;i < stacks.size();i++) { + ItemStack stack = stacks.get(i); + if (stack.isEmpty()) { + continue; + } + + boolean matched = false; + for (ItemStack cached : condensed) { + if (cached.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(cached, stack)) { + cached.grow(stack.getCount()); + matched = true; + } + } + + if (!matched) { + ItemStack cached = stack.copy(); + condensed.add(cached); + condensedDicts.add(dicts.get(i)); + } + + } + + return Pair.of(condensed, condensedDicts); + } public static boolean containsItemStack(Iterable list, ItemStack itemStack) { for (ItemStack listStack : list) { @@ -261,15 +293,18 @@ public abstract class ItemStackUtil { public static int containsSets(NonNullList set, NonNullList stock, NonNullList oreDicts, boolean craftingTools) { int totalSets = 0; - NonNullList condensedRequired = ItemStackUtil.condenseStacks(set); - NonNullList condensedOffered = ItemStackUtil.condenseStacks(stock); - - for (ItemStack req : condensedRequired) { + Pair, NonNullList> condensedRequired = ItemStackUtil.condenseStacks(set, oreDicts); + NonNullList condensedRequiredDicts= condensedRequired.getRight(); + NonNullList condensedRequiredStacks = condensedRequired.getLeft(); + NonNullList condensedOfferedStacks = ItemStackUtil.condenseStacks(stock); + for (int y = 0;y < condensedRequiredStacks.size();y++) { + ItemStack req = condensedRequiredStacks.get(y); + String offerDict = condensedRequiredDicts.get(y); int reqCount = 0; - for (int i = 0;i < condensedOffered.size();i++) { - ItemStack offer = condensedOffered.get(i); - if (isCraftingEquivalent(req, offer, oreDicts.get(i), craftingTools)) { + for (int i = 0;i < condensedOfferedStacks.size();i++) { + ItemStack offer = condensedOfferedStacks.get(i); + if (isCraftingEquivalent(req, offer, offerDict, craftingTools)) { int stackCount = (int) Math.floor(offer.getCount() / req.getCount()); reqCount = Math.max(reqCount, stackCount); }