mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
93 lines
3.1 KiB
Diff
93 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MiniDigger <admin@benndorf.dev>
|
|
Date: Sat, 6 Jun 2020 18:13:16 +0200
|
|
Subject: [PATCH] Support components in ItemMeta
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
|
|
index 1beedb446a9dd554d05d1d94dba8598e4b69eba6..c6b0fd783675cd019048e445d8e959637d90be7a 100644
|
|
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
|
|
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
|
|
@@ -5,6 +5,7 @@ import java.util.Collection;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
+import net.kyori.adventure.text.Component;
|
|
import org.bukkit.attribute.Attribute;
|
|
import org.bukkit.attribute.AttributeModifier;
|
|
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
|
@@ -62,6 +63,20 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
|
|
@NotNull
|
|
String getDisplayName();
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the display name that is set.
|
|
+ * <p>
|
|
+ * Plugins should check that hasDisplayName() returns <code>true</code>
|
|
+ * before calling this method.
|
|
+ *
|
|
+ * @return the display name that is set
|
|
+ * @deprecated use {@link #displayName()}
|
|
+ */
|
|
+ @NotNull
|
|
+ @Deprecated
|
|
+ net.md_5.bungee.api.chat.BaseComponent[] getDisplayNameComponent();
|
|
+ // Paper end
|
|
/**
|
|
* Sets the display name.
|
|
*
|
|
@@ -71,6 +86,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
|
|
@Deprecated // Paper
|
|
void setDisplayName(@Nullable String name);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Sets the display name.
|
|
+ *
|
|
+ * @param component the name component to set
|
|
+ * @deprecated use {@link #displayName(Component)}
|
|
+ */
|
|
+ @Deprecated
|
|
+ void setDisplayNameComponent(@Nullable net.md_5.bungee.api.chat.BaseComponent[] component);
|
|
+ // Paper end
|
|
/**
|
|
* Checks for existence of a localized name.
|
|
*
|
|
@@ -140,6 +165,19 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
|
|
@Nullable
|
|
List<String> getLore();
|
|
|
|
+ /**
|
|
+ * Gets the lore that is set.
|
|
+ * <p>
|
|
+ * Plugins should check if hasLore() returns <code>true</code> before
|
|
+ * calling this method.
|
|
+ *
|
|
+ * @return a list of lore that is set
|
|
+ * @deprecated use {@link #lore()}
|
|
+ */
|
|
+ @Nullable
|
|
+ @Deprecated
|
|
+ List<net.md_5.bungee.api.chat.BaseComponent[]> getLoreComponents();
|
|
+
|
|
/**
|
|
* Sets the lore for this item.
|
|
* Removes lore when given null.
|
|
@@ -150,6 +188,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
|
|
@Deprecated // Paper
|
|
void setLore(@Nullable List<String> lore);
|
|
|
|
+ /**
|
|
+ * Sets the lore for this item.
|
|
+ * Removes lore when given null.
|
|
+ *
|
|
+ * @param lore the lore that will be set
|
|
+ * @deprecated use {@link #lore(List)}
|
|
+ */
|
|
+ @Deprecated
|
|
+ void setLoreComponents(@Nullable List<net.md_5.bungee.api.chat.BaseComponent[]> lore);
|
|
+
|
|
/**
|
|
* Checks for existence of custom model data.
|
|
* <p>
|