2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2021-11-27 09:11:43 +01:00
|
|
|
From: MiniDigger <admin@benndorf.dev>
|
2021-06-11 14:02:28 +02:00
|
|
|
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
|
2024-10-22 19:28:57 +02:00
|
|
|
index 626fe2af05fecd41b777b5dd5decbedb2f17b43a..1c943638bfbda8281d2c9038e9024591823e2b5e 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
2024-10-22 19:28:57 +02:00
|
|
|
@@ -1114,11 +1114,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
|
2024-04-23 23:12:24 +02:00
|
|
|
return CraftChatMessage.fromComponent(this.displayName);
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
|
|
|
+ public net.md_5.bungee.api.chat.BaseComponent[] getDisplayNameComponent() {
|
2024-04-25 06:38:28 +02:00
|
|
|
+ return displayName == null ? new net.md_5.bungee.api.chat.BaseComponent[0] : net.md_5.bungee.chat.ComponentSerializer.parse(CraftChatMessage.toJSON(displayName));
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
@Override
|
|
|
|
public final void setDisplayName(String name) {
|
2024-04-23 23:12:24 +02:00
|
|
|
this.displayName = CraftChatMessage.fromStringOrNull(name);
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
|
|
|
+ public void setDisplayNameComponent(net.md_5.bungee.api.chat.BaseComponent[] component) {
|
2024-04-25 06:38:28 +02:00
|
|
|
+ this.displayName = CraftChatMessage.fromJSON(net.md_5.bungee.chat.ComponentSerializer.toString(component));
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
@Override
|
|
|
|
public boolean hasDisplayName() {
|
2021-06-14 11:46:59 +02:00
|
|
|
return this.displayName != null;
|
2024-10-22 19:28:57 +02:00
|
|
|
@@ -1292,6 +1304,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
|
2024-04-23 23:12:24 +02:00
|
|
|
return this.lore == null ? null : new ArrayList<String>(Lists.transform(this.lore, CraftChatMessage::fromComponent));
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
|
|
|
+ public List<net.md_5.bungee.api.chat.BaseComponent[]> getLoreComponents() {
|
|
|
|
+ return this.lore == null ? null : new ArrayList<>(this.lore.stream().map(entry ->
|
2024-04-25 06:38:28 +02:00
|
|
|
+ net.md_5.bungee.chat.ComponentSerializer.parse(CraftChatMessage.toJSON(entry))
|
2021-06-11 14:02:28 +02:00
|
|
|
+ ).collect(java.util.stream.Collectors.toList()));
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
@Override
|
|
|
|
public void setLore(List<String> lore) {
|
|
|
|
if (lore == null || lore.isEmpty()) {
|
2024-10-22 19:28:57 +02:00
|
|
|
@@ -1306,6 +1326,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
|
|
|
+ public void setLoreComponents(List<net.md_5.bungee.api.chat.BaseComponent[]> 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() {
|
2021-06-14 11:46:59 +02:00
|
|
|
return this.customModelData != null;
|
2024-10-22 19:28:57 +02:00
|
|
|
@@ -2188,6 +2223,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
for (Object object : addFrom) {
|
|
|
|
+ // Paper start - support components
|
2024-04-25 06:38:28 +02:00
|
|
|
+ if(object instanceof net.md_5.bungee.api.chat.BaseComponent[] baseComponentArr) {
|
|
|
|
+ addTo.add(CraftChatMessage.fromJSON(net.md_5.bungee.chat.ComponentSerializer.toString(baseComponentArr)));
|
2021-06-11 14:02:28 +02:00
|
|
|
+ } else
|
|
|
|
+ // Paper end
|
|
|
|
if (!(object instanceof String)) {
|
2023-06-18 13:03:18 +02:00
|
|
|
if (object != null) {
|
|
|
|
// SPIGOT-7399: Null check via if is important,
|