From f0d0595c8f08cd3df5cfc7c8f66dc1e10c29d517 Mon Sep 17 00:00:00 2001
From: yueh <yueh@users.noreply.github.com>
Date: Tue, 1 Sep 2020 21:59:08 +0200
Subject: [PATCH] Fixes #4669: Take NBT into account for comparing. (#4675)

This only covers combining different items together.
Fuzzy filtering is still a bit too fuzzy for corner cases.
---
 src/main/java/appeng/util/item/AESharedItemStack.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/appeng/util/item/AESharedItemStack.java b/src/main/java/appeng/util/item/AESharedItemStack.java
index 9e5f2c8ee..0b587ad02 100644
--- a/src/main/java/appeng/util/item/AESharedItemStack.java
+++ b/src/main/java/appeng/util/item/AESharedItemStack.java
@@ -29,6 +29,7 @@ import net.minecraft.nbt.CompoundNBT;
 import appeng.api.config.FuzzyMode;
 
 final class AESharedItemStack implements Comparable<AESharedItemStack> {
+
     private final ItemStack itemStack;
     private final int itemId;
     private final int itemDamage;
@@ -97,7 +98,8 @@ final class AESharedItemStack implements Comparable<AESharedItemStack> {
             return damageValue;
         }
 
-        return 0;
+        return System.identityHashCode(this.getDefinition().getTag())
+                - System.identityHashCode(b.getDefinition().getTag());
     }
 
     private int makeHashCode() {
@@ -183,4 +185,5 @@ final class AESharedItemStack implements Comparable<AESharedItemStack> {
         }
 
     }
+
 }