From 943fb1db3d011895a88ad96682e2bc82982c63a1 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot <noreply+git-bukkit@papermc.io> Date: Fri, 13 Oct 2023 20:33:28 +1100 Subject: [PATCH] #914: Make use of ApiStatus.Internal reather than deprecation By: Doc <nachito94@msn.com> --- paper-api/src/main/java/org/bukkit/NamespacedKey.java | 7 ++++--- .../src/main/java/org/bukkit/inventory/ItemFactory.java | 5 +++-- .../src/main/java/org/bukkit/inventory/meta/ItemMeta.java | 5 +++-- .../main/java/org/bukkit/plugin/PluginDescriptionFile.java | 5 +++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/NamespacedKey.java b/paper-api/src/main/java/org/bukkit/NamespacedKey.java index c559f38fdb..ae7b51341f 100644 --- a/paper-api/src/main/java/org/bukkit/NamespacedKey.java +++ b/paper-api/src/main/java/org/bukkit/NamespacedKey.java @@ -4,6 +4,7 @@ import com.google.common.base.Preconditions; import java.util.Locale; import java.util.UUID; import org.bukkit.plugin.Plugin; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -76,9 +77,9 @@ public final class NamespacedKey { * * @param namespace namespace * @param key key - * @deprecated should never be used by plugins, for internal use only!! + * @apiNote should never be used by plugins, for internal use only!! */ - @Deprecated + @ApiStatus.Internal public NamespacedKey(@NotNull String namespace, @NotNull String key) { Preconditions.checkArgument(namespace != null && isValidNamespace(namespace), "Invalid namespace. Must be [a-z0-9._-]: %s", namespace); Preconditions.checkArgument(key != null && isValidKey(key), "Invalid key. Must be [a-z0-9/._-]: %s", key); @@ -158,7 +159,7 @@ public final class NamespacedKey { * @return new key * @deprecated should never be used by plugins, for internal use only!! */ - @Deprecated + @ApiStatus.Internal @NotNull public static NamespacedKey randomKey() { return new NamespacedKey(BUKKIT, UUID.randomUUID().toString()); diff --git a/paper-api/src/main/java/org/bukkit/inventory/ItemFactory.java b/paper-api/src/main/java/org/bukkit/inventory/ItemFactory.java index a66bec33ff..502a1fd398 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/paper-api/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -8,6 +8,7 @@ import org.bukkit.entity.EntityType; import org.bukkit.inventory.meta.BookMeta; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.SkullMeta; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -155,9 +156,9 @@ public interface ItemFactory { * @param material material * @return updated material * @throws IllegalArgumentException if bad material or data - * @deprecated for internal use only + * @apiNote for internal use only */ - @Deprecated + @ApiStatus.Internal @NotNull Material updateMaterial(@NotNull final ItemMeta meta, @NotNull final Material material) throws IllegalArgumentException; diff --git a/paper-api/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/ItemMeta.java index 2fbb0b7640..8ca9605fc1 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/paper-api/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -13,6 +13,7 @@ import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.meta.tags.CustomItemTagContainer; import org.bukkit.persistence.PersistentDataHolder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -392,9 +393,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste * Internal use only! Do not use under any circumstances! * * @param version version - * @deprecated internal use only + * @apiNote internal use only */ - @Deprecated + @ApiStatus.Internal void setVersion(int version); @SuppressWarnings("javadoc") diff --git a/paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java b/paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java index 539df5665a..f48bdeb628 100644 --- a/paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java +++ b/paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java @@ -21,6 +21,7 @@ import org.bukkit.permissions.Permissible; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; import org.bukkit.plugin.java.JavaPlugin; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.yaml.snakeyaml.DumperOptions; @@ -1267,9 +1268,9 @@ public final class PluginDescriptionFile { /** * @return internal use - * @deprecated Internal use + * @apiNote Internal use */ - @Deprecated + @ApiStatus.Internal @NotNull public String getRawName() { return rawName;