1 files changed, 25 insertions, 3 deletions
diff --git a/patches/api/0483-Deprecate-for-removal-all-OldEnum-related-methods.patch b/patches/api/0483-Deprecate-for-removal-all-OldEnum-related-methods.patch
index abb2e9d9f4..2d9016eb36 100644
--- a/patches/api/0483-Deprecate-for-removal-all-OldEnum-related-methods.patch
+++ b/patches/api/0483-Deprecate-for-removal-all-OldEnum-related-methods.patch
@@ -4,6 +4,28 @@ 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/Art.java b/src/main/java/org/bukkit/Art.java
+index a53e59e030aea65a99806d5b0375cbb4b7457319..47eaec38253136f8335dc40519ff25b81c4006d9 100644
+--- a/src/main/java/org/bukkit/Art.java
++++ b/src/main/java/org/bukkit/Art.java
+@@ -159,7 +159,7 @@ public interface Art extends OldEnum<Art>, 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 Art valueOf(@NotNull String name) {
+         Art art = Bukkit.getUnsafe().get(Registry.ART, NamespacedKey.fromString(name.toLowerCase(Locale.ROOT)));
+         Preconditions.checkArgument(art != null, "No art found with the name %s", name);
+@@ -171,7 +171,7 @@ public interface Art extends OldEnum<Art>, 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 Art[] values() {
+         return Lists.newArrayList(Registry.ART).toArray(new Art[0]);
+     }
 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
@@ -80,10 +102,10 @@ index b352886e697a1c9869226b583da5240592575064..464f8f81ba907a61588e4ab869e4f826
          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
+index ae05025f39283a8dddd5703473322d75157de713..390f831f00c530a3d0a6f07f3e75aad0ec9a30db 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<PatternType>, Keyed {
+@@ -126,7 +126,7 @@ public interface PatternType extends OldEnum<PatternType>, Keyed {
       * @deprecated only for backwards compatibility, use {@link Registry#get(NamespacedKey)} instead.
       */
      @NotNull
@@ -92,7 +114,7 @@ index eb192030832e1741850871bec9bf999f014b6fc1..70904d6c43b93cb7b9d74d20666fac93
      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<PatternType>, Keyed {
+@@ -138,7 +138,7 @@ public interface PatternType extends OldEnum<PatternType>, Keyed {
       * @deprecated use {@link Registry#iterator()}.
       */
      @NotNull