OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 17:01:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Support components in ItemMeta

Browse source
This commit is contained in:
MiniDigger | Martin 2020-06-06 18:13:42 +02:00
parent e92663406b
commit a4d805a4be
1 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
View file

@ -1120,11 +1120,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 hasCustomName() {
return this.displayName != null;
@ -1298,6 +1310,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
return this.lore == null ? null : new ArrayList<String>(Lists.transform(this.lore, CraftChatMessage::fromComponent));
}
// 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 ->
net.md_5.bungee.chat.ComponentSerializer.parse(CraftChatMessage.toJSON(entry))
).collect(java.util.stream.Collectors.toList()));
}
// Paper end
@Override
public void setLore(List<String> lore) {
if (lore == null || lore.isEmpty()) {
@ -1312,6 +1332,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
}
}
// 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() {
return this.customModelData != null;
@ -2209,6 +2244,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,