Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-03-02 11:21:15 +01:00
Code Issues Projects Releases Wiki Activity

Added NBTConsumer for custom item nbt

Browse Source
This commit is contained in:
Felix Cravic 2020-07-09 15:51:39 +02:00
parent 83b6665702
commit d1b159d174
3 changed files with 81 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package net.minestom.server.item;
import com.google.gson.JsonObject;
import net.minestom.server.chat.ColoredText;
import net.minestom.server.data.Data;
import net.minestom.server.data.DataContainer;
@ -40,6 +41,8 @@ public class ItemStack implements DataContainer {
private StackingRule stackingRule;
private Data data;
private NBTConsumer nbtConsumer;
{
if (defaultStackingRule == null)
defaultStackingRule = DEFAULT_STACKING_RULE;
@ -513,6 +516,29 @@ public class ItemStack implements DataContainer {
return itemStack;
}
/**
* Convert the item into a readable Json object
* <p>
* Mainly used to show an item in a message hover
*
* @return a {@link JsonObject} containing the item data
*/
public synchronized JsonObject toJsonObject() {
JsonObject object = new JsonObject();
object.addProperty("id", getMaterialId());
object.addProperty("Damage", getDamage());
object.addProperty("Count", getAmount());
if (hasDisplayName() || hasLore()) {
JsonObject tagObject = new JsonObject();
if (hasDisplayName()) {
tagObject.addProperty("display", getDisplayName().toString());
}
}
return object;
}
@Override
public Data getData() {
return data;
@ -523,6 +549,24 @@ public class ItemStack implements DataContainer {
this.data = data;
}
/**
* Get the nbt consumer called when the item is serialized into a packet
*
* @return the item nbt consumer, null if not any
*/
public NBTConsumer getNBTConsumer() {
return nbtConsumer;
}
/**
* Change the item nbt consumer
*
* @param nbtConsumer the new item nbt consumer
*/
public void setNBTConsumer(NBTConsumer nbtConsumer) {
this.nbtConsumer = nbtConsumer;
}
/**
* Get the item stacking rule
*

8
src/main/java/net/minestom/server/item/NBTConsumer.java Normal file
View File

@ -0,0 +1,8 @@
package net.minestom.server.item;
import org.jglrxavpok.hephaistos.nbt.NBTCompound;
import java.util.function.Consumer;
public interface NBTConsumer extends Consumer<NBTCompound> {
}

47
src/main/java/net/minestom/server/utils/NBTUtils.java
View File

@ -8,6 +8,7 @@ import net.minestom.server.inventory.Inventory;
import net.minestom.server.item.Enchantment;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.minestom.server.item.NBTConsumer;
import net.minestom.server.item.attribute.AttributeSlot;
import net.minestom.server.item.attribute.ItemAttribute;
import net.minestom.server.network.packet.PacketReader;
@ -28,18 +29,19 @@ public class NBTUtils {
/**
* Loads all the items from the 'items' list into the given inventory
*
* @param items
* @param destination
*/
public static void loadAllItems(NBTList<NBTCompound> items, Inventory destination) {
destination.clear();
for(NBTCompound tag : items) {
for (NBTCompound tag : items) {
Material item = Registries.getMaterial(tag.getString("id"));
if(item == Material.AIR) {
if (item == Material.AIR) {
item = Material.STONE;
}
ItemStack stack = new ItemStack(item, tag.getByte("Count"));
if(tag.containsKey("tag")) {
if (tag.containsKey("tag")) {
loadDataIntoItem(stack, tag.getCompound("tag"));
}
destination.setItemStack(tag.getByte("Slot"), stack);
@ -96,7 +98,7 @@ public class NBTUtils {
try {
NBT itemNBT = reader.readTag();
if(itemNBT instanceof NBTCompound) { // can also be a TAG_End if no data
if (itemNBT instanceof NBTCompound) { // can also be a TAG_End if no data
NBTCompound nbt = (NBTCompound) itemNBT;
loadDataIntoItem(item, nbt);
}
@ -108,30 +110,30 @@ public class NBTUtils {
}
private static void loadDataIntoItem(ItemStack item, NBTCompound nbt) {
if(nbt.containsKey("Damage")) item.setDamage(nbt.getInt("Damage"));
if(nbt.containsKey("Unbreakable")) item.setUnbreakable(nbt.getInt("Unbreakable") == 1);
if(nbt.containsKey("HideFlags")) item.setHideFlag(nbt.getInt("HideFlags"));
if(nbt.containsKey("Potion")) item.addPotionType(Registries.getPotionType(nbt.getString("Potion")));
if(nbt.containsKey("display")) {
if (nbt.containsKey("Damage")) item.setDamage(nbt.getInt("Damage"));
if (nbt.containsKey("Unbreakable")) item.setUnbreakable(nbt.getInt("Unbreakable") == 1);
if (nbt.containsKey("HideFlags")) item.setHideFlag(nbt.getInt("HideFlags"));
if (nbt.containsKey("Potion")) item.addPotionType(Registries.getPotionType(nbt.getString("Potion")));
if (nbt.containsKey("display")) {
NBTCompound display = nbt.getCompound("display");
if(display.containsKey("Name")) item.setDisplayName(ChatParser.toColoredText(display.getString("Name")));
if(display.containsKey("Lore")) {
if (display.containsKey("Name")) item.setDisplayName(ChatParser.toColoredText(display.getString("Name")));
if (display.containsKey("Lore")) {
NBTList<NBTString> loreList = display.getList("Lore");
ArrayList<ColoredText> lore = new ArrayList<>();
for(NBTString s : loreList) {
for (NBTString s : loreList) {
lore.add(ChatParser.toColoredText(s.getValue()));
}
item.setLore(lore);
}
}
if(nbt.containsKey("Enchantments")) {
if (nbt.containsKey("Enchantments")) {
loadEnchantments(nbt.getList("Enchantments"), item::setEnchantment);
}
if(nbt.containsKey("StoredEnchantments")) {
if (nbt.containsKey("StoredEnchantments")) {
loadEnchantments(nbt.getList("StoredEnchantments"), item::setStoredEnchantment);
}
if(nbt.containsKey("AttributeModifiers")) {
if (nbt.containsKey("AttributeModifiers")) {
NBTList<NBTCompound> attributes = nbt.getList("AttributeModifiers");
for (NBTCompound attributeNBT : attributes) {
// TODO: 1.16 changed how UUIDs are stored, is this part affected?
@ -166,14 +168,14 @@ public class NBTUtils {
}
private static void loadEnchantments(NBTList<NBTCompound> enchantments, EnchantmentSetter setter) {
for(NBTCompound enchantment : enchantments) {
for (NBTCompound enchantment : enchantments) {
short level = enchantment.getShort("lvl");
String id = enchantment.getString("id");
Enchantment enchant = Registries.getEnchantment(id);
if(enchant != null) {
if (enchant != null) {
setter.applyEnchantment(enchant, level);
} else {
LOGGER.warn("Unknown enchantment type: "+id);
LOGGER.warn("Unknown enchantment type: " + id);
}
}
}
@ -192,7 +194,16 @@ public class NBTUtils {
}
NBTCompound itemNBT = new NBTCompound();
// Vanilla compound
saveDataIntoNBT(itemStack, itemNBT);
// Custom item nbt
NBTConsumer nbtConsumer = itemStack.getNBTConsumer();
if (nbtConsumer != null) {
nbtConsumer.accept(itemNBT);
}
// End custom model data
packet.writeNBT("", itemNBT);
}