Merge branch 'master' into new-block-api

This commit is contained in:
TheMode 2021-07-20 22:18:43 +02:00
commit cb21b0baf5

View File

@ -26,13 +26,13 @@ import java.util.function.UnaryOperator;
*/
public final class ItemStack implements TagReadable, HoverEventSource<HoverEvent.ShowItem> {
private static final @NotNull VanillaStackingRule DEFAULT_STACKING_RULE = new VanillaStackingRule();
/**
* Constant AIR item. Should be used instead of 'null'.
*/
public static final @NotNull ItemStack AIR = ItemStack.of(Material.AIR);
private static final @NotNull VanillaStackingRule DEFAULT_STACKING_RULE = new VanillaStackingRule();
private final StackingRule stackingRule;
private final Material material;