From dccc32db8557294d5761cd2b71120d83afb68300 Mon Sep 17 00:00:00 2001 From: pupnewfster Date: Sat, 27 Apr 2019 14:55:34 -0400 Subject: [PATCH] Check NBT for factory sorting. Fixes #5436 --- src/main/java/mekanism/common/tile/TileEntityFactory.java | 7 ++++++- src/main/java/mekanism/common/util/StackUtils.java | 8 -------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 9c066c610..5f9273bc3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -67,6 +67,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.items.ItemHandlerHelper; public class TileEntityFactory extends TileEntityMachine implements IComputerIntegration, ISideConfiguration, IGasHandler, ISpecialConfigData, ITierUpgradeable, ISustainedData { @@ -404,7 +405,11 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt for (int j = i + 1; j < inputSlots.length; j++) { int checkSlotID = inputSlots[j]; ItemStack checkStack = inventory.get(checkSlotID); - if (StackUtils.diffIgnoreEmpty(stack, checkStack) || Math.abs(count - checkStack.getCount()) < 2) { + if (Math.abs(count - checkStack.getCount()) < 2) { + continue; + } + if (!stack.isEmpty() && !checkStack.isEmpty() && !ItemHandlerHelper + .canItemStacksStack(stack, checkStack)) { continue; } //Output/Input will not match diff --git a/src/main/java/mekanism/common/util/StackUtils.java b/src/main/java/mekanism/common/util/StackUtils.java index 899e08f40..95559a8c9 100644 --- a/src/main/java/mekanism/common/util/StackUtils.java +++ b/src/main/java/mekanism/common/util/StackUtils.java @@ -9,14 +9,6 @@ import net.minecraftforge.oredict.OreDictionary; public final class StackUtils { - //only used in factory - public static boolean diffIgnoreEmpty(ItemStack stack1, ItemStack stack2) { - if (stack1.isEmpty() || stack2.isEmpty()) { - return false; - } - return stack1.getItem() != stack2.getItem() || stack1.getItemDamage() != stack2.getItemDamage(); - } - //ignores count public static boolean equalsWildcard(ItemStack wild, ItemStack check) { if (wild.isEmpty() || check.isEmpty()) {