Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-25 05:54:53 +02:00
Code Issues Projects Releases Wiki Activity

Initial ItemStore support

Browse Source
This commit is contained in:
themode 2021-04-03 19:08:07 +02:00
parent e4936b4a53
commit dfa7d712c2
5 changed files with 126 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/net/minestom/server/item/ItemStack.java
View File

@ -32,15 +32,20 @@ public class ItemStack {
private final int amount;
private final ItemMeta meta;
protected ItemStack(@NotNull Material material, int amount, @NotNull ItemMeta meta) {
private final ItemStore store;
protected ItemStack(@NotNull Material material, int amount,
@NotNull ItemMeta meta,
@NotNull ItemStore store) {
this.material = material;
this.amount = amount;
this.meta = meta;
this.store = store;
}
@Contract(value = "_ -> new", pure = true)
public static @NotNull ItemBuilder builder(@NotNull Material material) {
return new ItemBuilder(material);
public static @NotNull ItemStackBuilder builder(@NotNull Material material) {
return new ItemStackBuilder(material);
}
@Contract(value = "_ ,_ -> new", pure = true)
@ -64,7 +69,7 @@ public class ItemStack {
}
@Contract(value = "_, -> new", pure = true)
public @NotNull ItemStack with(@NotNull Consumer<@NotNull ItemBuilder> builderConsumer) {
public @NotNull ItemStack with(@NotNull Consumer<@NotNull ItemStackBuilder> builderConsumer) {
var builder = builder();
builderConsumer.accept(builder);
return builder.build();
@ -135,6 +140,11 @@ public class ItemStack {
return meta;
}
@Contract(pure = true)
public @NotNull ItemStore getStore() {
return store;
}
@Contract(pure = true)
public boolean isAir() {
return material.equals(Material.AIR);
@ -170,8 +180,8 @@ public class ItemStack {
}
@Contract(value = "-> new", pure = true)
protected @NotNull ItemBuilder builder() {
return new ItemBuilder(material, meta.builder())
protected @NotNull ItemStackBuilder builder() {
return new ItemStackBuilder(material, meta.builder(), store.builder())
.amount(amount);
}
}

38
src/main/java/net/minestom/server/item/ItemBuilder.java → src/main/java/net/minestom/server/item/ItemStackBuilder.java
View File

@ -10,68 +10,82 @@ import java.util.List;
import java.util.function.Consumer;
import java.util.function.UnaryOperator;
public class ItemBuilder {
public class ItemStackBuilder {
private final Material material;
private int amount;
protected ItemMetaBuilder metaBuilder;
protected ItemStoreBuilder storeBuilder;
protected ItemBuilder(@NotNull Material material, @NotNull ItemMetaBuilder metaBuilder) {
protected ItemStackBuilder(@NotNull Material material, @NotNull ItemMetaBuilder metaBuilder, @NotNull ItemStoreBuilder storeBuilder) {
this.material = material;
this.amount = 1;
this.metaBuilder = metaBuilder;
this.storeBuilder = storeBuilder;
}
protected ItemBuilder(@NotNull Material material) {
protected ItemStackBuilder(@NotNull Material material) {
// TODO: meta depends on material
this(material, new CompassMeta.Builder());
this(material, new CompassMeta.Builder(), new ItemStoreBuilder());
}
@Contract(value = "_ -> this")
public @NotNull ItemBuilder amount(int amount) {
public @NotNull ItemStackBuilder amount(int amount) {
this.amount = amount;
return this;
}
@Contract(value = "_ -> this")
public @NotNull ItemBuilder meta(@NotNull ItemMeta itemMeta) {
public @NotNull ItemStackBuilder meta(@NotNull ItemMeta itemMeta) {
this.metaBuilder = itemMeta.builder();
return this;
}
@Contract(value = "_ -> this")
public @NotNull ItemBuilder meta(@NotNull UnaryOperator<@NotNull ItemMetaBuilder> itemMetaConsumer) {
public @NotNull ItemStackBuilder meta(@NotNull UnaryOperator<@NotNull ItemMetaBuilder> itemMetaConsumer) {
this.metaBuilder = itemMetaConsumer.apply(metaBuilder);
return this;
}
@Contract(value = "_, _ -> this")
public <T extends ItemMetaBuilder, U extends ItemMetaBuilder.Provider<T>> @NotNull ItemBuilder meta(@NotNull Class<U> metaType, @NotNull Consumer<@NotNull T> itemMetaConsumer) {
public <T extends ItemMetaBuilder, U extends ItemMetaBuilder.Provider<T>> @NotNull ItemStackBuilder meta(@NotNull Class<U> metaType, @NotNull Consumer<@NotNull T> itemMetaConsumer) {
itemMetaConsumer.accept((T) metaBuilder);
return this;
}
@Contract(value = "_ -> this")
public @NotNull ItemBuilder displayName(@Nullable Component displayName) {
public @NotNull ItemStackBuilder displayName(@Nullable Component displayName) {
this.metaBuilder.displayName(displayName);
return this;
}
@Contract(value = "_ -> this")
public @NotNull ItemBuilder lore(List<@NotNull Component> lore) {
public @NotNull ItemStackBuilder lore(List<@NotNull Component> lore) {
this.metaBuilder.lore(lore);
return this;
}
@Contract(value = "_ -> this")
public @NotNull ItemBuilder lore(Component... lore) {
public @NotNull ItemStackBuilder lore(Component... lore) {
this.metaBuilder.lore(lore);
return this;
}
@Contract(value = "_ -> this")
public @NotNull ItemStackBuilder store(@NotNull ItemStore store) {
this.storeBuilder = store.builder();
return this;
}
@Contract(value = "_ -> this")
public @NotNull ItemStackBuilder store(@NotNull Consumer<@NotNull ItemStoreBuilder> consumer) {
consumer.accept(storeBuilder);
return this;
}
@Contract(value = "-> new", pure = true)
public @NotNull ItemStack build() {
return new ItemStack(material, amount, metaBuilder.build());
return new ItemStack(material, amount, metaBuilder.build(), storeBuilder.build());
}
}

30
src/main/java/net/minestom/server/item/ItemStore.java Normal file
View File

@ -0,0 +1,30 @@
package net.minestom.server.item;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
public class ItemStore {
private final Map<String, ItemStoreBuilder.Entry<?>> entryMap;
protected ItemStore(@NotNull Map<String, ItemStoreBuilder.Entry<?>> entryMap) {
this.entryMap = Collections.unmodifiableMap(entryMap);
}
public <T> T get(@NotNull String key) {
if (entryMap.containsKey(key)) {
return (T) entryMap.get(key).value;
}
return null;
}
@Contract(value = "-> new", pure = true)
protected @NotNull ItemStoreBuilder builder() {
return new ItemStoreBuilder(new ConcurrentHashMap<>(entryMap));
}
}

46
src/main/java/net/minestom/server/item/ItemStoreBuilder.java Normal file
View File

@ -0,0 +1,46 @@
package net.minestom.server.item;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
public class ItemStoreBuilder {
private final Map<String, Entry<?>> entryMap;
protected ItemStoreBuilder(@NotNull Map<String, Entry<?>> entryMap) {
this.entryMap = entryMap;
}
protected ItemStoreBuilder() {
this(new ConcurrentHashMap<>());
}
public <T> void set(@NotNull String key, T value, MergingRule<T> mergingRule) {
this.entryMap.put(key, new Entry<>(value, mergingRule));
}
@Contract(value = "-> new", pure = true)
public @NotNull ItemStore build() {
return new ItemStore(new HashMap<>(entryMap));
}
public interface MergingRule<T> {
@Nullable T apply(@NotNull T value1, @NotNull T value2);
}
protected static class Entry<T> {
protected final T value;
protected final MergingRule<T> mergingRule;
private Entry(@NotNull T value, @NotNull MergingRule<T> mergingRule) {
this.value = value;
this.mergingRule = mergingRule;
}
}
}

9
src/test/java/demo/PlayerInit.java
View File

@ -27,6 +27,7 @@ import net.minestom.server.inventory.Inventory;
import net.minestom.server.inventory.InventoryType;
import net.minestom.server.inventory.PlayerInventory;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.ItemStore;
import net.minestom.server.item.ItemTag;
import net.minestom.server.item.Material;
import net.minestom.server.item.meta.CompassMeta;
@ -74,8 +75,14 @@ public class PlayerInit {
builder.lodestonePosition(new Position(0, 0, 0));
builder.set(ItemTag.Integer("int"), 25);
})
.store(store -> {
store.set("key", 5, Integer::sum);
})
.build();
ItemStore store = itemStack.getStore();
System.out.println("value: " + store.get("key"));
itemStack = itemStack.with(itemBuilder -> itemBuilder
.amount(10)
.meta(CompassMeta.class, builder -> {
@ -225,7 +232,7 @@ public class PlayerInit {
PlayerInventory inventory = player.getInventory();
ItemStack itemStack = ItemStack.of(Material.STONE, 64);
inventory.addItemStack(itemStack.withMeta(metaBuilder -> metaBuilder.set(ItemTag.Integer("int"), 25)));
//inventory.replaceItemStack(0, i -> i.withAmount(32));
inventory.replaceItemStack(0, i -> i.withAmount(32));
{
ItemStack item = ItemStack.builder(Material.DIAMOND_CHESTPLATE)