diff options
author | miozune <miozune@gmail.com> | 2023-11-16 22:27:17 +0900 |
---|---|---|
committer | Martin Robertz <dream-master@gmx.net> | 2023-11-19 15:02:26 +0100 |
commit | f285c0d2aafc83e6bd8ccc307646cc2b99c3c4fc (patch) | |
tree | 09a9edebc41a85caacbc5eef50bd1ca871a4ff4b /src/main/java/gregtech | |
parent | 0643c924b6afb6e8d501ad624b0f191300834270 (diff) | |
download | GT5-Unofficial-f285c0d2aafc83e6bd8ccc307646cc2b99c3c4fc.tar.gz GT5-Unofficial-f285c0d2aafc83e6bd8ccc307646cc2b99c3c4fc.tar.bz2 GT5-Unofficial-f285c0d2aafc83e6bd8ccc307646cc2b99c3c4fc.zip |
Fix recipe check once more
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r-- | src/main/java/gregtech/api/util/GT_Recipe.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 7ae355b1e0..1b4fb51bf5 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -583,11 +583,11 @@ public class GT_Recipe implements Comparable<GT_Recipe> { /*** * Dictates the ItemStacks displayed in the output slots of any NEI page handled by the default GT NEI handler. * Override to make shown items differ from a GT_Recipe's item output array - * + * * @see gregtech.nei.GT_NEI_DefaultHandler * @param i Slot index * @return ItemStack to be displayed in the slot - * + * */ // public ItemStack getRepresentativeOutput(int i) { @@ -802,14 +802,17 @@ public class GT_Recipe implements Comparable<GT_Recipe> { } for (ItemStack itemStack : aInputs) { if (itemStack == null) continue; + ItemStack unifiedStack = GT_OreDictUnificator.get_nocopy(false, itemStack); + if (unifiedStack == null) continue; if (isNBTSensitive) { - itemMap.merge(GT_Utility.ItemId.createNoCopy(itemStack), itemStack.stackSize, Integer::sum); + itemMap.merge(GT_Utility.ItemId.createNoCopy(unifiedStack), unifiedStack.stackSize, Integer::sum); } else { - itemMap.merge(GT_Utility.ItemId.createWithoutNBT(itemStack), itemStack.stackSize, Integer::sum); + itemMap + .merge(GT_Utility.ItemId.createWithoutNBT(unifiedStack), unifiedStack.stackSize, Integer::sum); } if (foundWildcard) { itemMapWildcard - .merge(GT_Utility.ItemId.createAsWildcard(itemStack), itemStack.stackSize, Integer::sum); + .merge(GT_Utility.ItemId.createAsWildcard(unifiedStack), unifiedStack.stackSize, Integer::sum); } } // Check how many parallels can it perform for each item |