dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better compare NBT

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-13 14:48:12 +02:00
parent 3e6d8ca02a
commit ef3fbf3cf8
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/refinedstorage/RefinedStorageUtils.java
View File

@@ -112,6 +112,10 @@ public final class RefinedStorageUtils {
return false; return false;
} }
if (left.getItem() != right.getItem()) {
return false;
}
if ((flags & CompareFlags.COMPARE_DAMAGE) == CompareFlags.COMPARE_DAMAGE) { if ((flags & CompareFlags.COMPARE_DAMAGE) == CompareFlags.COMPARE_DAMAGE) {
if (left.getMetadata() != right.getMetadata()) { if (left.getMetadata() != right.getMetadata()) {
return false; return false;
@@ -119,7 +123,7 @@ public final class RefinedStorageUtils {
} }
if ((flags & CompareFlags.COMPARE_NBT) == CompareFlags.COMPARE_NBT) { if ((flags & CompareFlags.COMPARE_NBT) == CompareFlags.COMPARE_NBT) {
if (!ItemStack.areItemStackTagsEqual(left, right)) { if (!compareNbt(left, right)) {
return false; return false;
} }
} }
@@ -130,7 +134,21 @@ public final class RefinedStorageUtils {
} }
} }
return left.getItem() == right.getItem(); return true;
}
public static boolean compareNbt(ItemStack left, ItemStack right) {
if (!ItemStack.areItemStackTagsEqual(left, right)) {
if (left.hasTagCompound() && !right.hasTagCompound() && left.getTagCompound().hasNoTags()) {
return true;
} else if (!left.hasTagCompound() && right.hasTagCompound() && right.getTagCompound().hasNoTags()) {
return true;
}
return false;
}
return true;
} }
public static boolean compareStackNoQuantity(ItemStack left, ItemStack right) { public static boolean compareStackNoQuantity(ItemStack left, ItemStack right) {