start updating item meta

Things to note:
- JukeboxPlayableComponent#isShowInTooltip/setShowInTooltip are deprecated since
no longer available on the component. The alternative is either keep supporting item flag (by adding a new one)
or migrate to use the new data component API
- ItemFlag#HIDE_ADDITIONAL_TOOLTIP is deprecated, the new component tooltip_display allow to hide
component individually, using the flag on an item now will do exactly like mojang data fixer
providing backward compatibility by adding the components that would be hidden in a previous version
in the tooltip_display component

Author: Lulu13022002

paper-api/src/main/java/com/destroystokyo/paper/entity/ai/GoalKey.java

@@ -1,6 +1,6 @@
 package com.destroystokyo.paper.entity.ai;
 
-import com.google.common.base.Objects;
+import java.util.Objects;
 import java.util.StringJoiner;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Mob;
@@ -36,13 +36,13 @@ public boolean equals(@Nullable Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
         GoalKey<?> goalKey = (GoalKey<?>) o;
-        return Objects.equal(this.entityClass, goalKey.entityClass) &&
-            Objects.equal(this.namespacedKey, goalKey.namespacedKey);
+        return Objects.equals(this.entityClass, goalKey.entityClass) &&
+            Objects.equals(this.namespacedKey, goalKey.namespacedKey);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(this.entityClass, this.namespacedKey);
+        return Objects.hash(this.entityClass, this.namespacedKey);
     }
 
     @Override

paper-api/src/main/java/org/bukkit/command/defaults/VersionCommand.java

@@ -1,6 +1,5 @@
 package org.bukkit.command.defaults;
 
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Resources;
@@ -11,6 +10,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -25,14 +25,12 @@
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
-// Paper start - version command 2.0
 import com.destroystokyo.paper.util.VersionFetcher;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-// Paper end - version command 2.0
 
 public class VersionCommand extends BukkitCommand {
     private VersionFetcher versionFetcher; // Paper - version command 2.0
@@ -283,8 +281,8 @@ private void setVersionMessage(final @NotNull Component msg) {
     private static int getDistance(@NotNull String repo, @NotNull String hash) {
         try {
             BufferedReader reader = Resources.asCharSource(
-                    new URL("https://hub.spigotmc.org/stash/rest/api/1.0/projects/SPIGOT/repos/" + repo + "/commits?since=" + URLEncoder.encode(hash, "UTF-8") + "&withCounts=true"),
-                    Charsets.UTF_8
+                    new URL("https://hub.spigotmc.org/stash/rest/api/1.0/projects/SPIGOT/repos/" + repo + "/commits?since=" + URLEncoder.encode(hash, StandardCharsets.UTF_8) + "&withCounts=true"),
+                    StandardCharsets.UTF_8
             ).openBufferedStream();
             try {
                 JsonObject obj = new Gson().fromJson(reader, JsonObject.class);

paper-api/src/main/java/org/bukkit/configuration/file/FileConfiguration.java

@@ -1,6 +1,5 @@
 package org.bukkit.configuration.file;
 
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.google.common.io.Files;
 import java.io.BufferedReader;
@@ -13,6 +12,7 @@
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import org.bukkit.configuration.Configuration;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.MemoryConfiguration;
@@ -64,7 +64,7 @@ public void save(@NotNull File file) throws IOException {
 
         String data = saveToString();
 
-        Writer writer = new OutputStreamWriter(new FileOutputStream(file), Charsets.UTF_8);
+        Writer writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8);
 
         try {
             writer.write(data);
@@ -125,7 +125,7 @@ public void load(@NotNull File file) throws FileNotFoundException, IOException,
 
         final FileInputStream stream = new FileInputStream(file);
 
-        load(new InputStreamReader(stream, Charsets.UTF_8));
+        load(new InputStreamReader(stream, StandardCharsets.UTF_8));
     }
 
     /**

paper-api/src/main/java/org/bukkit/inventory/ItemFlag.java

@@ -30,8 +30,11 @@ public enum ItemFlag {
     /**
      * Setting to show/hide potion effects, book and firework information, map
      * tooltips, patterns of banners.
+     *
      * @see #HIDE_STORED_ENCHANTS HIDE_STORED_ENCHANTS for hiding stored enchants (like on enchanted books)
+     * @deprecated each component can now be hidden individually in the {@code tooltip_display} component
      */
+    @Deprecated(since = "1.21.5", forRemoval = true)
     HIDE_ADDITIONAL_TOOLTIP,
     /**
      * Setting to show/hide dyes from colored leather armor.
@@ -65,9 +68,9 @@ public enum ItemFlag {
      *     <li>Shulker box contents</li>
      *     <li>Spawner descriptions</li>
      * </ul>
-     * @deprecated use {@link #HIDE_ADDITIONAL_TOOLTIP}
+     * @deprecated each component can now be hidden individually in the {@code tooltip_display} component
      */
-    @Deprecated(since = "1.20.5")
+    @Deprecated(since = "1.20.5", forRemoval = true)
     public static final ItemFlag HIDE_ITEM_SPECIFICS = HIDE_ADDITIONAL_TOOLTIP;
     // Paper end
 }

paper-api/src/main/java/org/bukkit/inventory/ItemStack.java

@@ -369,21 +369,21 @@ public int hashCode() {
     /**
      * Checks if this ItemStack contains the given {@link Enchantment}
      *
-     * @param ench Enchantment to test
+     * @param enchant Enchantment to test
      * @return True if this has the given enchantment
      */
-    public boolean containsEnchantment(@NotNull Enchantment ench) {
-        return this.craftDelegate.containsEnchantment(ench); // Paper - delegate
+    public boolean containsEnchantment(@NotNull Enchantment enchant) {
+        return this.craftDelegate.containsEnchantment(enchant); // Paper - delegate
     }
 
     /**
      * Gets the level of the specified enchantment on this item stack
      *
-     * @param ench Enchantment to check
+     * @param enchant Enchantment to check
      * @return Level of the enchantment, or 0
      */
-    public int getEnchantmentLevel(@NotNull Enchantment ench) {
-        return this.craftDelegate.getEnchantmentLevel(ench); // Paper - delegate
+    public int getEnchantmentLevel(@NotNull Enchantment enchant) {
+        return this.craftDelegate.getEnchantmentLevel(enchant); // Paper - delegate
     }
 
     /**
@@ -423,21 +423,21 @@ public void addEnchantments(@NotNull Map<Enchantment, Integer> enchantments) {
      * If this item stack already contained the given enchantment (at any
      * level), it will be replaced.
      *
-     * @param ench Enchantment to add
+     * @param enchant Enchantment to add
      * @param level Level of the enchantment
      * @throws IllegalArgumentException if enchantment null, or enchantment is
      *     not applicable
      */
     @Utility
-    public void addEnchantment(@NotNull Enchantment ench, int level) {
-        Preconditions.checkArgument(ench != null, "Enchantment cannot be null");
-        if ((level < ench.getStartLevel()) || (level > ench.getMaxLevel())) {
-            throw new IllegalArgumentException("Enchantment level is either too low or too high (given " + level + ", bounds are " + ench.getStartLevel() + " to " + ench.getMaxLevel() + ")");
-        } else if (!ench.canEnchantItem(this)) {
+    public void addEnchantment(@NotNull Enchantment enchant, int level) {
+        Preconditions.checkArgument(enchant != null, "Enchantment cannot be null");
+        if ((level < enchant.getStartLevel()) || (level > enchant.getMaxLevel())) {
+            throw new IllegalArgumentException("Enchantment level is either too low or too high (given " + level + ", bounds are " + enchant.getStartLevel() + " to " + enchant.getMaxLevel() + ")");
+        } else if (!enchant.canEnchantItem(this)) {
             throw new IllegalArgumentException("Specified enchantment cannot be applied to this itemstack");
         }
 
-        addUnsafeEnchantment(ench, level);
+        addUnsafeEnchantment(enchant, level);
     }
 
     /**
@@ -465,22 +465,22 @@ public void addUnsafeEnchantments(@NotNull Map<Enchantment, Integer> enchantment
      * This method is unsafe and will ignore level restrictions or item type.
      * Use at your own discretion.
      *
-     * @param ench Enchantment to add
+     * @param enchant Enchantment to add
      * @param level Level of the enchantment
      */
-    public void addUnsafeEnchantment(@NotNull Enchantment ench, int level) {
-        this.craftDelegate.addUnsafeEnchantment(ench, level); // Paper - delegate
+    public void addUnsafeEnchantment(@NotNull Enchantment enchant, int level) {
+        this.craftDelegate.addUnsafeEnchantment(enchant, level); // Paper - delegate
     }
 
     /**
      * Removes the specified {@link Enchantment} if it exists on this
      * ItemStack
      *
-     * @param ench Enchantment to remove
+     * @param enchant Enchantment to remove
      * @return Previous level, or 0
      */
-    public int removeEnchantment(@NotNull Enchantment ench) {
-        return this.craftDelegate.removeEnchantment(ench); // Paper - delegate
+    public int removeEnchantment(@NotNull Enchantment enchant) {
+        return this.craftDelegate.removeEnchantment(enchant); // Paper - delegate
     }
 
     /**
@@ -494,7 +494,7 @@ public void removeEnchantments() {
     @NotNull
     @Utility
     public Map<String, Object> serialize() {
-        Map<String, Object> result = new LinkedHashMap<String, Object>();
+        Map<String, Object> result = new LinkedHashMap<>();
 
         result.put("v", Bukkit.getUnsafe().getDataVersion()); // Include version to indicate we are using modern material names (or LEGACY prefix)
         result.put("type", getType().name());

paper-api/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java

@@ -22,19 +22,19 @@ public interface EnchantmentStorageMeta extends ItemMeta {
     /**
      * Checks for storage of the specified enchantment.
      *
-     * @param ench enchantment to check
+     * @param enchant enchantment to check
      * @return true if this enchantment is stored in this meta
      */
-    boolean hasStoredEnchant(@NotNull Enchantment ench);
+    boolean hasStoredEnchant(@NotNull Enchantment enchant);
 
     /**
      * Checks for the level of the stored enchantment.
      *
-     * @param ench enchantment to check
+     * @param enchant enchantment to check
      * @return The level that the specified stored enchantment has, or 0 if
      *     none
      */
-    int getStoredEnchantLevel(@NotNull Enchantment ench);
+    int getStoredEnchantLevel(@NotNull Enchantment enchant);
 
     /**
      * Gets a copy the stored enchantments in this ItemMeta.
@@ -47,34 +47,34 @@ public interface EnchantmentStorageMeta extends ItemMeta {
     /**
      * Stores the specified enchantment in this item meta.
      *
-     * @param ench Enchantment to store
+     * @param enchant Enchantment to store
      * @param level Level for the enchantment
      * @param ignoreLevelRestriction this indicates the enchantment should be
      *     applied, ignoring the level limit
      * @return true if the item meta changed as a result of this call, false
      *     otherwise
      * @throws IllegalArgumentException if enchantment is null
      */
-    boolean addStoredEnchant(@NotNull Enchantment ench, int level, boolean ignoreLevelRestriction);
+    boolean addStoredEnchant(@NotNull Enchantment enchant, int level, boolean ignoreLevelRestriction);
 
     /**
      * Remove the specified stored enchantment from this item meta.
      *
-     * @param ench Enchantment to remove
+     * @param enchant Enchantment to remove
      * @return true if the item meta changed as a result of this call, false
      *     otherwise
      * @throws IllegalArgumentException if enchantment is null
      */
-    boolean removeStoredEnchant(@NotNull Enchantment ench) throws IllegalArgumentException;
+    boolean removeStoredEnchant(@NotNull Enchantment enchant) throws IllegalArgumentException;
 
     /**
      * Checks if the specified enchantment conflicts with any enchantments in
      * this ItemMeta.
      *
-     * @param ench enchantment to test
+     * @param enchant enchantment to test
      * @return true if the enchantment conflicts, false otherwise
      */
-    boolean hasConflictingStoredEnchant(@NotNull Enchantment ench);
+    boolean hasConflictingStoredEnchant(@NotNull Enchantment enchant);
 
     @Override
     @NotNull

paper-api/src/main/java/org/bukkit/inventory/meta/ItemMeta.java

@@ -400,18 +400,18 @@ default void displayName(final net.kyori.adventure.text.@Nullable Component disp
     /**
      * Checks for existence of the specified enchantment.
      *
-     * @param ench enchantment to check
+     * @param enchant enchantment to check
      * @return true if this enchantment exists for this meta
      */
-    boolean hasEnchant(@NotNull Enchantment ench);
+    boolean hasEnchant(@NotNull Enchantment enchant);
 
     /**
      * Checks for the level of the specified enchantment.
      *
-     * @param ench enchantment to check
+     * @param enchant enchantment to check
      * @return The level that the specified enchantment has, or 0 if none
      */
-    int getEnchantLevel(@NotNull Enchantment ench);
+    int getEnchantLevel(@NotNull Enchantment enchant);
 
     /**
      * Returns a copy the enchantments in this ItemMeta. <br>
@@ -425,23 +425,23 @@ default void displayName(final net.kyori.adventure.text.@Nullable Component disp
     /**
      * Adds the specified enchantment to this item meta.
      *
-     * @param ench Enchantment to add
+     * @param enchant Enchantment to add
      * @param level Level for the enchantment
      * @param ignoreLevelRestriction this indicates the enchantment should be
      *     applied, ignoring the level limit
      * @return true if the item meta changed as a result of this call, false
      *     otherwise
      */
-    boolean addEnchant(@NotNull Enchantment ench, int level, boolean ignoreLevelRestriction);
+    boolean addEnchant(@NotNull Enchantment enchant, int level, boolean ignoreLevelRestriction);
 
     /**
      * Removes the specified enchantment from this item meta.
      *
-     * @param ench Enchantment to remove
+     * @param enchant Enchantment to remove
      * @return true if the item meta changed as a result of this call, false
      *     otherwise
      */
-    boolean removeEnchant(@NotNull Enchantment ench);
+    boolean removeEnchant(@NotNull Enchantment enchant);
 
     /**
      * Removes all enchantments from this item meta.
@@ -452,10 +452,10 @@ default void displayName(final net.kyori.adventure.text.@Nullable Component disp
      * Checks if the specified enchantment conflicts with any enchantments in
      * this ItemMeta.
      *
-     * @param ench enchantment to test
+     * @param enchant enchantment to test
      * @return true if the enchantment conflicts, false otherwise
      */
-    boolean hasConflictingEnchant(@NotNull Enchantment ench);
+    boolean hasConflictingEnchant(@NotNull Enchantment enchant);
 
     /**
      * Set itemflags which should be ignored when rendering a ItemStack in the Client. This Method does silently ignore double set itemFlags.

paper-api/src/main/java/org/bukkit/inventory/meta/components/JukeboxPlayableComponent.java

@@ -4,6 +4,7 @@
 import org.bukkit.NamespacedKey;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -47,13 +48,21 @@ public interface JukeboxPlayableComponent extends ConfigurationSerializable {
      * Gets if the song will show in the item tooltip.
      *
      * @return if the song will show in the tooltip
+     * @deprecated no longer available on the component directly
      */
-    boolean isShowInTooltip();
+    @Deprecated(since = "1.21.5", forRemoval = true)
+    @Contract("-> true") // todo add new item flag for compat? or just tell people to use the new data component api
+    default boolean isShowInTooltip() {
+        return true;
+    }
 
     /**
      * Sets if the song will show in the item tooltip.
      *
      * @param show true if the song will show in the tooltip
+     * @deprecated no longer available on the component directly
      */
-    void setShowInTooltip(boolean show);
+    @Deprecated(since = "1.21.5", forRemoval = true)
+    default void setShowInTooltip(boolean show) {
+    }
 }