okaaay let's go

2024-10-22 18:23:19 +02:00 · 2024-10-22 18:23:19 +02:00 · 2ef589c820
commit 2ef589c820
parent d348cb88a9
1191 changed files with 411 additions and 358 deletions
--- a/patches/server/0026-Support-components-in-ItemMeta.patch
+++ b/patches/server/0026-Support-components-in-ItemMeta.patch
@ -1,83 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MiniDigger <admin@benndorf.dev>
-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 0c73854243f7fa21d1ffdb3b4c85ee0a69c9c5e4..f6ac13f91f08498a8adda7d34518a5cfe34c15b2 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -978,11 +978,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;
-@@ -1156,6 +1168,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()) {
-@@ -1170,6 +1190,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;
-@@ -1882,6 +1917,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,