We're going on an Adventure! (#4842)

Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
Co-authored-by: zml <zml@stellardrift.ca>
Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
This commit is contained in:
Riley Park
2021-02-21 11:45:33 -08:00
parent 1f2b6f865b
commit 2e419805ad
115 changed files with 6625 additions and 370 deletions

View File

@@ -8,6 +8,14 @@ diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/ja
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
@@ -0,0 +0,0 @@ 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;
@@ -0,0 +0,0 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
@NotNull
String getDisplayName();
@@ -20,15 +28,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * 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.
*
@@ -0,0 +0,0 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
*/
@Deprecated // Paper
void setDisplayName(@Nullable String name);
+ // Paper start
@@ -36,7 +46,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * 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
/**
@@ -53,15 +65,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * 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.
@@ -0,0 +0,0 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
*/
@Deprecated // Paper
void setLore(@Nullable List<String> lore);
+ /**
@@ -69,7 +83,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * 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);
+
/**