geforkt von Mirrors/Paper
174 Zeilen
10 KiB
Diff
174 Zeilen
10 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
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/block/banner/PatternType.java b/src/main/java/org/bukkit/block/banner/PatternType.java
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/org/bukkit/block/banner/PatternType.java
|
|
+++ b/src/main/java/org/bukkit/block/banner/PatternType.java
|
|
@@ -0,0 +0,0 @@ public interface PatternType extends OldEnum<PatternType>, 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);
|
|
@@ -0,0 +0,0 @@ public interface PatternType extends OldEnum<PatternType>, 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/org/bukkit/entity/Cat.java
|
|
+++ b/src/main/java/org/bukkit/entity/Cat.java
|
|
@@ -0,0 +0,0 @@ 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);
|
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/org/bukkit/entity/Frog.java
|
|
+++ b/src/main/java/org/bukkit/entity/Frog.java
|
|
@@ -0,0 +0,0 @@ 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);
|
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/org/bukkit/entity/Villager.java
|
|
+++ b/src/main/java/org/bukkit/entity/Villager.java
|
|
@@ -0,0 +0,0 @@ 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);
|
|
@@ -0,0 +0,0 @@ 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]);
|
|
}
|
|
@@ -0,0 +0,0 @@ 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);
|
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/org/bukkit/map/MapCursor.java
|
|
+++ b/src/main/java/org/bukkit/map/MapCursor.java
|
|
@@ -0,0 +0,0 @@ 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);
|
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/org/bukkit/util/OldEnum.java
|
|
+++ b/src/main/java/org/bukkit/util/OldEnum.java
|
|
@@ -0,0 +0,0 @@ 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<T extends OldEnum<T>> extends Comparable<T> {
|
|
|
|
/**
|
|
@@ -0,0 +0,0 @@ public interface OldEnum<T extends OldEnum<T>> extends Comparable<T> {
|
|
* @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);
|
|
|
|
@@ -0,0 +0,0 @@ public interface OldEnum<T extends OldEnum<T>> extends Comparable<T> {
|
|
* @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();
|
|
|
|
/**
|
|
@@ -0,0 +0,0 @@ public interface OldEnum<T extends OldEnum<T>> extends Comparable<T> {
|
|
* @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();
|
|
}
|