From 005d70e3a6e3a57a42d4687c0701b2d7f712042b Mon Sep 17 00:00:00 2001 From: themode Date: Sun, 4 Apr 2021 17:54:05 +0200 Subject: [PATCH] Annotation + ItemStoreBuilder should be more like a builder --- src/main/java/net/minestom/server/item/ItemStack.java | 4 ++-- src/main/java/net/minestom/server/item/ItemStoreBuilder.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minestom/server/item/ItemStack.java b/src/main/java/net/minestom/server/item/ItemStack.java index f3936dea8..f236f019e 100644 --- a/src/main/java/net/minestom/server/item/ItemStack.java +++ b/src/main/java/net/minestom/server/item/ItemStack.java @@ -106,8 +106,8 @@ public class ItemStack { } @Contract(value = "_ -> new", pure = true) - public @NotNull ItemStack withStore(@NotNull Consumer<@NotNull ItemStoreBuilder> metaOperator) { - return builder().store(metaOperator).build(); + public @NotNull ItemStack withStore(@NotNull Consumer<@NotNull ItemStoreBuilder> storeConsumer) { + return builder().store(storeConsumer).build(); } @Contract(pure = true) diff --git a/src/main/java/net/minestom/server/item/ItemStoreBuilder.java b/src/main/java/net/minestom/server/item/ItemStoreBuilder.java index 6f516be2b..e1c430e7f 100644 --- a/src/main/java/net/minestom/server/item/ItemStoreBuilder.java +++ b/src/main/java/net/minestom/server/item/ItemStoreBuilder.java @@ -20,8 +20,10 @@ public class ItemStoreBuilder { this(new ConcurrentHashMap<>()); } - public void set(@NotNull String key, T value, MergingRule mergingRule) { + @Contract(value = "_, _, _ -> this") + public @NotNull ItemStoreBuilder set(@NotNull String key, T value, MergingRule mergingRule) { this.entryMap.put(key, new Entry<>(value, mergingRule)); + return this; } @Contract(value = "-> new", pure = true)