diff --git a/src/main/java/net/minestom/server/item/ItemStack.java b/src/main/java/net/minestom/server/item/ItemStack.java index 07f92e228..ee04bd266 100644 --- a/src/main/java/net/minestom/server/item/ItemStack.java +++ b/src/main/java/net/minestom/server/item/ItemStack.java @@ -88,15 +88,15 @@ public sealed interface ItemStack extends TagReadable, HoverEventSource> @NotNull T meta(@NotNull Class metaClass); @Contract(value = "_, -> new", pure = true) - @NotNull ItemStack with(@NotNull Consumer<@NotNull Builder> builderConsumer); + @NotNull ItemStack with(@NotNull Consumer<@NotNull Builder> consumer); @Contract(value = "_, _ -> new", pure = true) @ApiStatus.Experimental > @NotNull ItemStack withMeta(@NotNull Class metaType, - @NotNull Consumer metaConsumer); + @NotNull Consumer consumer); @Contract(value = "_ -> new", pure = true) - @NotNull ItemStack withMeta(@NotNull UnaryOperator metaOperator); + @NotNull ItemStack withMeta(@NotNull Consumer consumer); @Contract(value = "_, -> new", pure = true) default @NotNull ItemStack withMaterial(@NotNull Material material) { @@ -204,7 +204,8 @@ public sealed interface ItemStack extends TagReadable, HoverEventSource consumer); + @NotNull Builder meta(@NotNull Consumer consumer); @Contract(value = "_, _ -> this") - > @NotNull Builder meta(@NotNull Class metaType, @NotNull Consumer<@NotNull V> itemMetaConsumer); + > @NotNull Builder meta(@NotNull Class metaType, + @NotNull Consumer<@NotNull V> itemMetaConsumer); @Contract(value = "-> new", pure = true) @NotNull ItemStack build(); diff --git a/src/main/java/net/minestom/server/item/ItemStackImpl.java b/src/main/java/net/minestom/server/item/ItemStackImpl.java index 8f44f4329..f5041c126 100644 --- a/src/main/java/net/minestom/server/item/ItemStackImpl.java +++ b/src/main/java/net/minestom/server/item/ItemStackImpl.java @@ -11,7 +11,6 @@ import org.jglrxavpok.hephaistos.nbt.NBTString; import java.util.Map; import java.util.function.Consumer; -import java.util.function.UnaryOperator; record ItemStackImpl(Material material, int amount, ItemMetaImpl meta) implements ItemStack { static final @NotNull StackingRule DEFAULT_STACKING_RULE; @@ -45,21 +44,21 @@ record ItemStackImpl(Material material, int amount, ItemMetaImpl meta) implement } @Override - public @NotNull ItemStack with(@NotNull Consumer builderConsumer) { + public @NotNull ItemStack with(@NotNull Consumer consumer) { ItemStack.Builder builder = builder(); - builderConsumer.accept(builder); + consumer.accept(builder); return builder.build(); } @Override public @NotNull > ItemStack withMeta(@NotNull Class metaType, - @NotNull Consumer metaConsumer) { - return builder().meta(metaType, metaConsumer).build(); + @NotNull Consumer consumer) { + return builder().meta(metaType, consumer).build(); } @Override - public @NotNull ItemStack withMeta(@NotNull UnaryOperator metaOperator) { - return builder().meta(metaOperator).build(); + public @NotNull ItemStack withMeta(@NotNull Consumer consumer) { + return builder().meta(consumer).build(); } @Override @@ -124,8 +123,8 @@ record ItemStackImpl(Material material, int amount, ItemMetaImpl meta) implement } @Override - public ItemStack.@NotNull Builder meta(@NotNull UnaryOperator consumer) { - this.metaBuilder = (ItemMetaImpl.Builder) consumer.apply(metaBuilder); + public ItemStack.@NotNull Builder meta(@NotNull Consumer consumer) { + consumer.accept(metaBuilder); return this; }