Update mappings to 09/21 snapshots.

Conflict with getMatrix in ITransformation, so renamed to getMatrixVec.
This commit is contained in:
LexManos committed 2018-09-22 03:40:22 -07:00
1 parent 5ed03945a0
commit 94e1a8e0a4
210 files changed
+1052 -978

No files matched your search

@@ -54,10 +54,10 @@ public class ItemHandlerHelper
public static boolean canItemStacksStack(@Nonnull ItemStack a, @Nonnull ItemStack b)
{
if (a.isEmpty() || !a.isItemEqual(b) || a.hasTagCompound() != b.hasTagCompound())
if (a.isEmpty() || !a.isItemEqual(b) || a.hasTag() != b.hasTag())
return false;
return (!a.hasTagCompound() || a.getTagCompound().equals(b.getTagCompound())) && a.areCapsCompatible(b);
return (!a.hasTag() || a.getTag().equals(b.getTag())) && a.areCapsCompatible(b);
}
/**
@@ -79,10 +79,10 @@ public class ItemHandlerHelper
if (a.getHasSubtypes() && a.getMetadata() != b.getMetadata())
return false;
*/
if (a.hasTagCompound() != b.hasTagCompound())
if (a.hasTag() != b.hasTag())
return false;
return (!a.hasTagCompound() || a.getTagCompound().equals(b.getTagCompound())) && a.areCapsCompatible(b);
return (!a.hasTag() || a.getTag().equals(b.getTag())) && a.areCapsCompatible(b);
}
@Nonnull