From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sat, 7 Sep 2024 11:14:31 -0700 Subject: [PATCH] Deprecate for removal all OldEnum-related methods diff --git a/src/main/java/org/bukkit/Fluid.java b/src/main/java/org/bukkit/Fluid.java index dff295a4ca877b172f04c60de734c1551afdb5a7..a3ff4fefaf50f3e99a69ba68cbe8e30c95dac5df 100644 --- a/src/main/java/org/bukkit/Fluid.java +++ b/src/main/java/org/bukkit/Fluid.java @@ -43,7 +43,7 @@ public interface Fluid extends OldEnum, Keyed { * @deprecated only for backwards compatibility, use {@link Registry#get(NamespacedKey)} instead. */ @NotNull - @Deprecated(since = "1.21.3") + @Deprecated(since = "1.21.3", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Fluid valueOf(@NotNull String name) { Fluid fluid = Bukkit.getUnsafe().get(Registry.FLUID, NamespacedKey.fromString(name.toLowerCase(Locale.ROOT))); Preconditions.checkArgument(fluid != null, "No fluid found with the name %s", name); @@ -55,7 +55,7 @@ public interface Fluid extends OldEnum, Keyed { * @deprecated use {@link Registry#iterator()}. */ @NotNull - @Deprecated(since = "1.21.3") + @Deprecated(since = "1.21.3", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Fluid[] values() { return Lists.newArrayList(Registry.FLUID).toArray(new Fluid[0]); } diff --git a/src/main/java/org/bukkit/attribute/Attribute.java b/src/main/java/org/bukkit/attribute/Attribute.java index 21f9998b472dc18eb308554f5cdf467f6675f2f0..521f035409ee61a9ad73d39bec938f2938892570 100644 --- a/src/main/java/org/bukkit/attribute/Attribute.java +++ b/src/main/java/org/bukkit/attribute/Attribute.java @@ -156,7 +156,7 @@ public interface Attribute extends OldEnum, Keyed, Translatable, net. * @deprecated only for backwards compatibility, use {@link Registry#get(NamespacedKey)} instead. */ @NotNull - @Deprecated(since = "1.21.3") + @Deprecated(since = "1.21.3", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Attribute valueOf(@NotNull String name) { Attribute attribute = Bukkit.getUnsafe().get(Registry.ATTRIBUTE, NamespacedKey.fromString(name.toLowerCase(Locale.ROOT))); Preconditions.checkArgument(attribute != null, "No attribute found with the name %s", name); @@ -168,7 +168,7 @@ public interface Attribute extends OldEnum, Keyed, Translatable, net. * @deprecated use {@link Registry#iterator()}. */ @NotNull - @Deprecated(since = "1.21.3") + @Deprecated(since = "1.21.3", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Attribute[] values() { return Lists.newArrayList(Registry.ATTRIBUTE).toArray(new Attribute[0]); } diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java index b352886e697a1c9869226b583da5240592575064..464f8f81ba907a61588e4ab869e4f8269830195a 100644 --- a/src/main/java/org/bukkit/block/Biome.java +++ b/src/main/java/org/bukkit/block/Biome.java @@ -97,7 +97,7 @@ public interface Biome extends OldEnum, Keyed, net.kyori.adventure.transl * * @deprecated Biome is no longer an enum, custom biomes will have their own biome instance. */ - @Deprecated(since = "1.21.3") + @Deprecated(since = "1.21.3", forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils Biome CUSTOM = Bukkit.getUnsafe().getCustomBiome(); @NotNull @@ -111,7 +111,7 @@ public interface Biome extends OldEnum, Keyed, net.kyori.adventure.transl * @deprecated only for backwards compatibility, use {@link Registry#get(NamespacedKey)} instead. */ @NotNull - @Deprecated(since = "1.21.3") + @Deprecated(since = "1.21.3", forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Biome valueOf(@NotNull String name) { if ("CUSTOM".equals(name)) { return Biome.CUSTOM; @@ -127,7 +127,7 @@ public interface Biome extends OldEnum, Keyed, net.kyori.adventure.transl * @deprecated use {@link Registry#iterator()}. */ @NotNull - @Deprecated(since = "1.21.3") + @Deprecated(since = "1.21.3", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Biome[] values() { return Lists.newArrayList(Registry.BIOME).toArray(new Biome[0]); } diff --git a/src/main/java/org/bukkit/block/banner/PatternType.java b/src/main/java/org/bukkit/block/banner/PatternType.java index eb192030832e1741850871bec9bf999f014b6fc1..70904d6c43b93cb7b9d74d20666fac93a6b4996c 100644 --- a/src/main/java/org/bukkit/block/banner/PatternType.java +++ b/src/main/java/org/bukkit/block/banner/PatternType.java @@ -116,7 +116,7 @@ public interface PatternType extends OldEnum, Keyed { * @deprecated only for backwards compatibility, use {@link Registry#get(NamespacedKey)} instead. */ @NotNull - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static PatternType valueOf(@NotNull String name) { PatternType type = Registry.BANNER_PATTERN.get(NamespacedKey.fromString(name.toLowerCase(Locale.ROOT))); Preconditions.checkArgument(type != null, "No pattern type found with the name %s", name); @@ -128,7 +128,7 @@ public interface PatternType extends OldEnum, Keyed { * @deprecated use {@link Registry#iterator()}. */ @NotNull - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static PatternType[] values() { return Lists.newArrayList(Registry.BANNER_PATTERN).toArray(new PatternType[0]); } diff --git a/src/main/java/org/bukkit/entity/Cat.java b/src/main/java/org/bukkit/entity/Cat.java index de422f00f8fd1975669ee5431c466c9c16d699af..fca4671c6976aee9e981ef344244f9322651d0c9 100644 --- a/src/main/java/org/bukkit/entity/Cat.java +++ b/src/main/java/org/bukkit/entity/Cat.java @@ -75,7 +75,7 @@ public interface Cat extends Tameable, Sittable, io.papermc.paper.entity.CollarC * @deprecated only for backwards compatibility, use {@link Registry#get(NamespacedKey)} instead. */ @NotNull - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Type valueOf(@NotNull String name) { Type type = Registry.CAT_VARIANT.get(NamespacedKey.fromString(name.toLowerCase(Locale.ROOT))); Preconditions.checkArgument(type != null, "No cat type found with the name %s", name); @@ -87,7 +87,7 @@ public interface Cat extends Tameable, Sittable, io.papermc.paper.entity.CollarC * @deprecated use {@link Registry#iterator()}. */ @NotNull - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Type[] values() { return Lists.newArrayList(Registry.CAT_VARIANT).toArray(new Type[0]); } diff --git a/src/main/java/org/bukkit/entity/Frog.java b/src/main/java/org/bukkit/entity/Frog.java index db34a6241d63ae986bcb048fa53f6b9e4438e206..f661a6b4797dd814a197e9245bcb2ddf2fca773f 100644 --- a/src/main/java/org/bukkit/entity/Frog.java +++ b/src/main/java/org/bukkit/entity/Frog.java @@ -74,7 +74,7 @@ public interface Frog extends Animals { * @deprecated only for backwards compatibility, use {@link Registry#get(NamespacedKey)} instead. */ @NotNull - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Variant valueOf(@NotNull String name) { Variant variant = Registry.FROG_VARIANT.get(NamespacedKey.fromString(name.toLowerCase(Locale.ROOT))); Preconditions.checkArgument(variant != null, "No frog variant found with the name %s", name); @@ -86,7 +86,7 @@ public interface Frog extends Animals { * @deprecated use {@link Registry#iterator()}. */ @NotNull - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Variant[] values() { return Lists.newArrayList(Registry.FROG_VARIANT).toArray(new Variant[0]); } diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java index bc7137eb802d4613d042fba5fd97eca54a6eea29..1db3742024e9cd1b70af2d52b4b756a544c019df 100644 --- a/src/main/java/org/bukkit/entity/Villager.java +++ b/src/main/java/org/bukkit/entity/Villager.java @@ -190,7 +190,7 @@ public interface Villager extends AbstractVillager { * @deprecated only for backwards compatibility, use {@link Registry#get(NamespacedKey)} instead. */ @NotNull - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Type valueOf(@NotNull String name) { Type type = Registry.VILLAGER_TYPE.get(NamespacedKey.fromString(name.toLowerCase(Locale.ROOT))); Preconditions.checkArgument(type != null, "No villager type found with the name %s", name); @@ -202,7 +202,7 @@ public interface Villager extends AbstractVillager { * @deprecated use {@link Registry#iterator()}. */ @NotNull - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Type[] values() { return Lists.newArrayList(Registry.VILLAGER_TYPE).toArray(new Type[0]); } @@ -297,7 +297,7 @@ public interface Villager extends AbstractVillager { * @deprecated only for backwards compatibility, use {@link Registry#get(NamespacedKey)} instead. */ @NotNull - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Profession valueOf(@NotNull String name) { Profession profession = Registry.VILLAGER_PROFESSION.get(NamespacedKey.fromString(name.toLowerCase(Locale.ROOT))); Preconditions.checkArgument(profession != null, "No villager profession found with the name %s", name); @@ -309,7 +309,7 @@ public interface Villager extends AbstractVillager { * @deprecated use {@link Registry#iterator()}. */ @NotNull - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Profession[] values() { return Lists.newArrayList(Registry.VILLAGER_PROFESSION).toArray(new Profession[0]); } diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java index 6c33fbf720a2e11655e254aeb516e08831c2adf4..eb73f3224e7d2314c4209a3743a37bdae2395670 100644 --- a/src/main/java/org/bukkit/map/MapCursor.java +++ b/src/main/java/org/bukkit/map/MapCursor.java @@ -373,7 +373,7 @@ public final class MapCursor { * @deprecated only for backwards compatibility, use {@link Registry#get(NamespacedKey)} instead. */ @NotNull - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Type valueOf(@NotNull String name) { Type type = Registry.MAP_DECORATION_TYPE.get(NamespacedKey.fromString(name.toLowerCase(Locale.ROOT))); Preconditions.checkArgument(type != null, "No Type found with the name %s", name); @@ -385,7 +385,7 @@ public final class MapCursor { * @deprecated use {@link Registry#iterator()}. */ @NotNull - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils static Type[] values() { return Lists.newArrayList(Registry.MAP_DECORATION_TYPE).toArray(new Type[0]); } diff --git a/src/main/java/org/bukkit/util/OldEnum.java b/src/main/java/org/bukkit/util/OldEnum.java index ce0e5367e5f89e123b8bb6a4581ef0e58036acc5..9360a5918e841346118234068e50740e64f51743 100644 --- a/src/main/java/org/bukkit/util/OldEnum.java +++ b/src/main/java/org/bukkit/util/OldEnum.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; * @deprecated only for backwards compatibility. */ @ApiStatus.Internal -@Deprecated(since = "1.21") +@Deprecated(since = "1.21", forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils public interface OldEnum> extends Comparable { /** @@ -20,7 +20,7 @@ public interface OldEnum> extends Comparable { * @deprecated only for backwards compatibility, old enums can not be * compared. */ - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils @Override int compareTo(@NotNull T other); @@ -29,7 +29,7 @@ public interface OldEnum> extends Comparable { * @deprecated only for backwards compatibility. */ @NotNull - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils String name(); /** @@ -37,6 +37,6 @@ public interface OldEnum> extends Comparable { * @deprecated only for backwards compatibility, it is not guaranteed that * an old enum always has the same ordinal. */ - @Deprecated(since = "1.21") + @Deprecated(since = "1.21", forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils int ordinal(); }