Remove Comparable from ItemStack, add Comparators for specific orderings