mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Actually get it compiling again.
Seems to run ok, I think?
This commit is contained in:
1 parent
84336ec4d1
commit
78c2afb5ea
53 files changed
+290
-251
No files matched your search
@@ -539,4 +539,13 @@ public final class InventoryUtils
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/*TODO From CCLib -- go back to that version when we're using dependencies again*/
|
||||
public static boolean canStack(ItemStack stack1, ItemStack stack2) {
|
||||
return stack1 == null || stack2 == null ||
|
||||
(stack1.getItem() == stack2.getItem() &&
|
||||
(!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage()) &&
|
||||
ItemStack.areItemStackTagsEqual(stack2, stack1)) &&
|
||||
stack1.isStackable();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user