From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Sat, 6 Jun 2020 18:13:42 +0200 Subject: [PATCH] Support components in ItemMeta diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java index 568d6fab743039b20715d8181555f52baa05f0f3..7ae3cdb80335cbeb0ff695eb719a170651586722 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -976,11 +976,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { return CraftChatMessage.fromComponent(this.displayName); } + // Paper start + @Override + public net.md_5.bungee.api.chat.BaseComponent[] getDisplayNameComponent() { + return displayName == null ? new net.md_5.bungee.api.chat.BaseComponent[0] : net.md_5.bungee.chat.ComponentSerializer.parse(CraftChatMessage.toJSON(displayName)); + } + // Paper end @Override public final void setDisplayName(String name) { this.displayName = CraftChatMessage.fromStringOrNull(name); } + // Paper start + @Override + public void setDisplayNameComponent(net.md_5.bungee.api.chat.BaseComponent[] component) { + this.displayName = CraftChatMessage.fromJSON(net.md_5.bungee.chat.ComponentSerializer.toString(component)); + } + // Paper end @Override public boolean hasDisplayName() { return this.displayName != null; @@ -1154,6 +1166,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { return this.lore == null ? null : new ArrayList(Lists.transform(this.lore, CraftChatMessage::fromComponent)); } + // Paper start + @Override + public List getLoreComponents() { + return this.lore == null ? null : new ArrayList<>(this.lore.stream().map(entry -> + net.md_5.bungee.chat.ComponentSerializer.parse(CraftChatMessage.toJSON(entry)) + ).collect(java.util.stream.Collectors.toList())); + } + // Paper end @Override public void setLore(List lore) { if (lore == null || lore.isEmpty()) { @@ -1168,6 +1188,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { } } + // Paper start + @Override + public void setLoreComponents(List lore) { + if (lore == null) { + this.lore = null; + } else { + if (this.lore == null) { + safelyAdd(lore, this.lore = new ArrayList<>(lore.size()), false); + } else { + this.lore.clear(); + safelyAdd(lore, this.lore, false); + } + } + } + // Paper end @Override public boolean hasCustomModelData() { return this.customModelData != null; @@ -1880,6 +1915,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { } for (Object object : addFrom) { + // Paper start - support components + if(object instanceof net.md_5.bungee.api.chat.BaseComponent[] baseComponentArr) { + addTo.add(CraftChatMessage.fromJSON(net.md_5.bungee.chat.ComponentSerializer.toString(baseComponentArr))); + } else + // Paper end if (!(object instanceof String)) { if (object != null) { // SPIGOT-7399: Null check via if is important,