From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MiniDigger | Martin Date: Sat, 6 Jun 2020 18:13:42 +0200 Subject: [PATCH] Support components in ItemMeta diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/IChatBaseComponent.java +++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java @@ -0,0 +0,0 @@ public interface IChatBaseComponent extends Message, IChatFormatted, Iterable(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(IChatBaseComponent.ChatSerializer.componentToJson(entry) + )).collect(java.util.stream.Collectors.toList())); + } + // Paper end @Override public void setLore(List lore) { // too tired to think if .clone is better if (lore == null) { @@ -0,0 +0,0 @@ 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()), Integer.MAX_VALUE); + } else { + this.lore.clear(); + safelyAdd(lore, this.lore, Integer.MAX_VALUE); + } + } + } + // Paper end @Override public boolean hasCustomModelData() { return customModelData != null; @@ -0,0 +0,0 @@ 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[]) { + addTo.add(IChatBaseComponent.ChatSerializer.jsonToComponent(net.md_5.bungee.chat.ComponentSerializer.toString((net.md_5.bungee.api.chat.BaseComponent[]) object))); + } else + // Paper end if (!(object instanceof String)) { if (object != null) { throw new IllegalArgumentException(addFrom + " cannot contain non-string " + object.getClass().getName());