Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
2878 Zeilen
134 KiB
Diff
2878 Zeilen
134 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 24 Mar 2019 18:39:01 -0400
|
|
Subject: [PATCH] Fix Spigot annotation mistakes
|
|
|
|
while some of these may of been true, they are extreme cases and cause
|
|
a ton of noise to plugin developers.
|
|
|
|
Use ApiStatus.Internal instead of Deprecated for actual internal API
|
|
that continues to have use (internally).
|
|
|
|
These do not help plugin developers if they bring moise noise than value.
|
|
|
|
diff --git a/src/main/java/org/bukkit/Art.java b/src/main/java/org/bukkit/Art.java
|
|
index dadff073abb2dec39111e677ec77ffdb2b7ff9a9..042d1d932a33022e4fc873652f70dc6ed342d46a 100644
|
|
--- a/src/main/java/org/bukkit/Art.java
|
|
+++ b/src/main/java/org/bukkit/Art.java
|
|
@@ -96,9 +96,9 @@ public enum Art implements Keyed {
|
|
* Get the ID of this painting.
|
|
*
|
|
* @return The ID of this painting
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public int getId() {
|
|
return id;
|
|
}
|
|
@@ -114,9 +114,9 @@ public enum Art implements Keyed {
|
|
*
|
|
* @param id The ID
|
|
* @return The painting
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
@Nullable
|
|
public static Art getById(int id) {
|
|
return BY_ID.get(id);
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 577b4b89b50441572f0edd9325047c38e25e782e..949ffc320502e46493183cc3ef621d9c4edbe7d6 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -883,9 +883,8 @@ public final class Bukkit {
|
|
*
|
|
* @param id the id of the map to get
|
|
* @return a map view if it exists, or null otherwise
|
|
- * @deprecated Magic value
|
|
*/
|
|
- @Deprecated
|
|
+ //@Deprecated // Paper - Not a magic value
|
|
@Nullable
|
|
public static MapView getMap(int id) {
|
|
return server.getMap(id);
|
|
@@ -964,8 +963,14 @@ public final class Bukkit {
|
|
* Returns the primary logger associated with this server instance.
|
|
*
|
|
* @return Logger associated with this server
|
|
+ * @see org.bukkit.plugin.Plugin#getSLF4JLogger()
|
|
+ * @apiNote This logger is for the Minecraft server software, not for specific plugins. You should
|
|
+ * use a logger for a specific plugin, either via {@link org.bukkit.plugin.Plugin#getSLF4JLogger()}
|
|
+ * or {@link org.bukkit.plugin.Plugin#getLogger()} or create a specific logger for a class via slf4j.
|
|
+ * That way, log messages contain contextual information about the source of the message.
|
|
*/
|
|
@NotNull
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper - internalize Bukkit#getLogger
|
|
public static Logger getLogger() {
|
|
return server.getLogger();
|
|
}
|
|
@@ -1362,10 +1367,8 @@ public final class Bukkit {
|
|
* @param name the name the player to retrieve
|
|
* @return an offline player
|
|
* @see #getOfflinePlayer(java.util.UUID)
|
|
- * @deprecated Persistent storage of users should be by UUID as names are no longer
|
|
- * unique past a single session.
|
|
*/
|
|
- @Deprecated
|
|
+ // @Deprecated // Paper
|
|
@NotNull
|
|
public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
|
|
return server.getOfflinePlayer(name);
|
|
@@ -1978,7 +1981,7 @@ public final class Bukkit {
|
|
*
|
|
* @return the scoreboard manager or null if no worlds are loaded.
|
|
*/
|
|
- @Nullable
|
|
+ @NotNull // Paper
|
|
public static ScoreboardManager getScoreboardManager() {
|
|
return server.getScoreboardManager();
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/CoalType.java b/src/main/java/org/bukkit/CoalType.java
|
|
index c07499dbdd49d70717dbd674d97b6dbcfd7e9d5b..039b71c6471d00123226edda0fe839fd946029c4 100644
|
|
--- a/src/main/java/org/bukkit/CoalType.java
|
|
+++ b/src/main/java/org/bukkit/CoalType.java
|
|
@@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable;
|
|
/**
|
|
* Represents the two types of coal
|
|
*/
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public enum CoalType {
|
|
COAL(0x0),
|
|
CHARCOAL(0x1);
|
|
diff --git a/src/main/java/org/bukkit/CropState.java b/src/main/java/org/bukkit/CropState.java
|
|
index fb4832fb796a38c0f5f51cf80a67259924f2c607..a4f88f4420b855a08f98b77fa1ff35dcec9da8a9 100644
|
|
--- a/src/main/java/org/bukkit/CropState.java
|
|
+++ b/src/main/java/org/bukkit/CropState.java
|
|
@@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable;
|
|
/**
|
|
* Represents the different growth states of crops
|
|
*/
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public enum CropState {
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/Difficulty.java b/src/main/java/org/bukkit/Difficulty.java
|
|
index 3f6cbefc2b1414ba2dad709e79288013b3ef73be..f35801783538d3377b04131b8bf6effd7eb8e1a5 100644
|
|
--- a/src/main/java/org/bukkit/Difficulty.java
|
|
+++ b/src/main/java/org/bukkit/Difficulty.java
|
|
@@ -44,9 +44,9 @@ public enum Difficulty {
|
|
* Gets the difficulty value associated with this Difficulty.
|
|
*
|
|
* @return An integer value of this difficulty
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public int getValue() {
|
|
return value;
|
|
}
|
|
@@ -57,9 +57,9 @@ public enum Difficulty {
|
|
* @param value Value to check
|
|
* @return Associative {@link Difficulty} with the given value, or null if
|
|
* it doesn't exist
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
@Nullable
|
|
public static Difficulty getByValue(final int value) {
|
|
return BY_ID.get(value);
|
|
diff --git a/src/main/java/org/bukkit/DyeColor.java b/src/main/java/org/bukkit/DyeColor.java
|
|
index bd213cabddd8752e609544f24cfba95405726155..47df858e095c4423c20e49e029d72f0f50d2c924 100644
|
|
--- a/src/main/java/org/bukkit/DyeColor.java
|
|
+++ b/src/main/java/org/bukkit/DyeColor.java
|
|
@@ -96,9 +96,9 @@ public enum DyeColor {
|
|
*
|
|
* @return A byte containing the wool data value of this color
|
|
* @see #getDyeData()
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public byte getWoolData() {
|
|
return woolData;
|
|
}
|
|
@@ -142,9 +142,9 @@ public enum DyeColor {
|
|
* @return The {@link DyeColor} representing the given value, or null if
|
|
* it doesn't exist
|
|
* @see #getByDyeData(byte)
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
@Nullable
|
|
public static DyeColor getByWoolData(final byte data) {
|
|
int i = 0xff & data;
|
|
@@ -202,9 +202,9 @@ public enum DyeColor {
|
|
*
|
|
* @param name dye name
|
|
* @return dye color
|
|
- * @deprecated legacy use only
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
@NotNull
|
|
public static DyeColor legacyValueOf(@Nullable String name) {
|
|
return "SILVER".equals(name) ? DyeColor.LIGHT_GRAY : DyeColor.valueOf(name);
|
|
diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
|
|
index 0d0777771485a76d960da2f16e963b19d2cf6c2d..fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38 100644
|
|
--- a/src/main/java/org/bukkit/Effect.java
|
|
+++ b/src/main/java/org/bukkit/Effect.java
|
|
@@ -357,9 +357,9 @@ public enum Effect {
|
|
* Gets the ID for this effect.
|
|
*
|
|
* @return ID of this effect
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public int getId() {
|
|
return this.id;
|
|
}
|
|
@@ -386,9 +386,9 @@ public enum Effect {
|
|
*
|
|
* @param id ID of the Effect to return
|
|
* @return Effect with the given ID
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
@Nullable
|
|
public static Effect getById(int id) {
|
|
return BY_ID.get(id);
|
|
diff --git a/src/main/java/org/bukkit/EntityEffect.java b/src/main/java/org/bukkit/EntityEffect.java
|
|
index 9db85b2f6ffd56bbc4db1f75f8769f1c15d5950f..5341957b10cccd7bce5a7595699b1d90412a01d0 100644
|
|
--- a/src/main/java/org/bukkit/EntityEffect.java
|
|
+++ b/src/main/java/org/bukkit/EntityEffect.java
|
|
@@ -345,9 +345,9 @@ public enum EntityEffect {
|
|
* Gets the data value of this EntityEffect, may not be unique.
|
|
*
|
|
* @return The data value
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public byte getData() {
|
|
return data;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/GameMode.java b/src/main/java/org/bukkit/GameMode.java
|
|
index 938c3217f92e6d3ef9a637269c469f8359af6347..81e45984a88fc84acd0f76d825abf4ddaed0ac3b 100644
|
|
--- a/src/main/java/org/bukkit/GameMode.java
|
|
+++ b/src/main/java/org/bukkit/GameMode.java
|
|
@@ -44,9 +44,9 @@ public enum GameMode {
|
|
* Gets the mode value associated with this GameMode
|
|
*
|
|
* @return An integer value of this gamemode
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public int getValue() {
|
|
return value;
|
|
}
|
|
@@ -57,9 +57,9 @@ public enum GameMode {
|
|
* @param value Value to check
|
|
* @return Associative {@link GameMode} with the given value, or null if
|
|
* it doesn't exist
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
@Nullable
|
|
public static GameMode getByValue(final int value) {
|
|
return BY_ID.get(value);
|
|
diff --git a/src/main/java/org/bukkit/GrassSpecies.java b/src/main/java/org/bukkit/GrassSpecies.java
|
|
index f9c9ae463aacd593e3aa9caf037ea1e23d56c780..38ccfd0a1b38e7a87185e668d3c020816c68a66b 100644
|
|
--- a/src/main/java/org/bukkit/GrassSpecies.java
|
|
+++ b/src/main/java/org/bukkit/GrassSpecies.java
|
|
@@ -6,7 +6,9 @@ import org.jetbrains.annotations.Nullable;
|
|
|
|
/**
|
|
* Represents the different types of grass.
|
|
+ * @deprecated use {@link org.bukkit.block.data.BlockData}
|
|
*/
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public enum GrassSpecies {
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
|
|
index b02efba048be00e42502111fcdd2297529926666..fb4b6f0e908ffa50c3b2f8d04d9f3810898b8d5e 100644
|
|
--- a/src/main/java/org/bukkit/Location.java
|
|
+++ b/src/main/java/org/bukkit/Location.java
|
|
@@ -46,7 +46,7 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
|
|
* @param y The y-coordinate of this new location
|
|
* @param z The z-coordinate of this new location
|
|
*/
|
|
- public Location(@Nullable final World world, final double x, final double y, final double z) {
|
|
+ public Location(@UndefinedNullability final World world, final double x, final double y, final double z) { // Paper
|
|
this(world, x, y, z, 0, 0);
|
|
}
|
|
|
|
@@ -60,7 +60,7 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
|
|
* @param yaw The absolute rotation on the x-plane, in degrees
|
|
* @param pitch The absolute rotation on the y-plane, in degrees
|
|
*/
|
|
- public Location(@Nullable final World world, final double x, final double y, final double z, final float yaw, final float pitch) {
|
|
+ public Location(@UndefinedNullability final World world, final double x, final double y, final double z, final float yaw, final float pitch) { // Paper
|
|
if (world != null) {
|
|
this.world = new WeakReference<>(world);
|
|
}
|
|
@@ -102,7 +102,7 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
|
|
* @throws IllegalArgumentException when world is unloaded
|
|
* @see #isWorldLoaded()
|
|
*/
|
|
- @Nullable
|
|
+ @UndefinedNullability // Paper
|
|
public World getWorld() {
|
|
if (this.world == null) {
|
|
return null;
|
|
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
|
|
index 6ebf024d5c2d5fc7253319b68ceed212de1cd73d..309a79cbe65498c90d9e135607bc246688ac6274 100644
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
|
@@ -4867,20 +4867,20 @@ public enum Material implements Keyed, Translatable {
|
|
* Do not use for any reason.
|
|
*
|
|
* @return ID of this material
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @ApiStatus.Internal // Paper
|
|
public int getId() {
|
|
Preconditions.checkArgument(legacy, "Cannot get ID of Modern Material");
|
|
return id;
|
|
}
|
|
|
|
/**
|
|
- * Do not use for any reason.
|
|
+ * Checks if this constant is a legacy material.
|
|
*
|
|
* @return legacy status
|
|
*/
|
|
- @Deprecated
|
|
+ // @Deprecated // Paper - this is useful, don't deprecate
|
|
public boolean isLegacy() {
|
|
return legacy;
|
|
}
|
|
@@ -4956,8 +4956,10 @@ public enum Material implements Keyed, Translatable {
|
|
* Gets the MaterialData class associated with this Material
|
|
*
|
|
* @return MaterialData associated with this Material
|
|
+ * @deprecated use {@link #createBlockData()}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated // Paper
|
|
public Class<? extends MaterialData> getData() {
|
|
Preconditions.checkArgument(legacy, "Cannot get data class of Modern Material");
|
|
return ctor.getDeclaringClass();
|
|
@@ -5413,7 +5415,11 @@ public enum Material implements Keyed, Translatable {
|
|
* material.
|
|
*
|
|
* @return true if this material can be interacted with.
|
|
+ * @deprecated This method is not comprehensive and does not accurately reflect what block types are
|
|
+ * interactable. Many "interactions" are defined on the item not block, and many are conditional on some other world state
|
|
+ * checks being true.
|
|
*/
|
|
+ @Deprecated // Paper
|
|
public boolean isInteractable() {
|
|
BlockType type = asBlockType();
|
|
return type != null && type.isInteractable();
|
|
diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
|
|
index 9b61129c3ef83d0bfceba54aba2effa12bc90678..cbdaa121dbc1876d0cd55f4b7b57f283ecaa8f1a 100644
|
|
--- a/src/main/java/org/bukkit/NamespacedKey.java
|
|
+++ b/src/main/java/org/bukkit/NamespacedKey.java
|
|
@@ -74,12 +74,14 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key { // Pap
|
|
|
|
/**
|
|
* Create a key in a specific namespace.
|
|
+ * <p>
|
|
+ * For most plugin related code, you should prefer using the
|
|
+ * {@link NamespacedKey#NamespacedKey(Plugin, String)} constructor.
|
|
*
|
|
* @param namespace namespace
|
|
* @param key key
|
|
- * @apiNote should never be used by plugins, for internal use only!!
|
|
+ * @see #NamespacedKey(Plugin, String)
|
|
*/
|
|
- @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);
|
|
diff --git a/src/main/java/org/bukkit/NetherWartsState.java b/src/main/java/org/bukkit/NetherWartsState.java
|
|
index f43209cf7b752c26718c303ca8c3e1c7d9912ad3..d6c09d88189b3e9ecc629d8cf18a2b81e6801871 100644
|
|
--- a/src/main/java/org/bukkit/NetherWartsState.java
|
|
+++ b/src/main/java/org/bukkit/NetherWartsState.java
|
|
@@ -1,5 +1,11 @@
|
|
package org.bukkit;
|
|
|
|
+// Paper start
|
|
+/**
|
|
+ * @deprecated use {@link org.bukkit.block.data.BlockData} and {@link org.bukkit.block.data.Ageable}
|
|
+ */
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
+// Paper end
|
|
public enum NetherWartsState {
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/Note.java b/src/main/java/org/bukkit/Note.java
|
|
index 48aecc9421c500137bbef1dfe3bec8de277c3ff9..aff858346776386f1288b648b221404f7f412399 100644
|
|
--- a/src/main/java/org/bukkit/Note.java
|
|
+++ b/src/main/java/org/bukkit/Note.java
|
|
@@ -39,9 +39,9 @@ public class Note {
|
|
* Returns the not sharped id of this tone.
|
|
*
|
|
* @return the not sharped id of this tone.
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public byte getId() {
|
|
return getId(false);
|
|
}
|
|
@@ -53,9 +53,9 @@ public class Note {
|
|
*
|
|
* @param sharped Set to true to return the sharped id.
|
|
* @return the id of this tone.
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public byte getId(boolean sharped) {
|
|
byte id = (byte) (sharped && sharpable ? this.id + 1 : this.id);
|
|
|
|
@@ -78,9 +78,9 @@ public class Note {
|
|
* @return if the tone id is the sharped id of the tone.
|
|
* @throws IllegalArgumentException if neither the tone nor the
|
|
* semitone have the id.
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public boolean isSharped(byte id) {
|
|
if (id == getId(false)) {
|
|
return false;
|
|
@@ -97,9 +97,9 @@ public class Note {
|
|
*
|
|
* @param id the id of the tone.
|
|
* @return the tone to id.
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
@Nullable
|
|
public static Tone getById(byte id) {
|
|
return BY_DATA.get(id);
|
|
@@ -222,9 +222,9 @@ public class Note {
|
|
* Returns the internal id of this note.
|
|
*
|
|
* @return the internal id of this note.
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public byte getId() {
|
|
return note;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
|
|
index 30ba3daba730c2994b589cc321d66b503da2fe8b..4e67b944351ec3743e5eeaba3f5de99e0df15154 100644
|
|
--- a/src/main/java/org/bukkit/Registry.java
|
|
+++ b/src/main/java/org/bukkit/Registry.java
|
|
@@ -248,14 +248,12 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
|
|
*
|
|
* @see TrimMaterial
|
|
*/
|
|
- @ApiStatus.Experimental
|
|
Registry<TrimMaterial> TRIM_MATERIAL = Objects.requireNonNull(Bukkit.getRegistry(TrimMaterial.class), "No registry present for TrimMaterial. This is a bug.");
|
|
/**
|
|
* Trim patterns.
|
|
*
|
|
* @see TrimPattern
|
|
*/
|
|
- @ApiStatus.Experimental
|
|
Registry<TrimPattern> TRIM_PATTERN = Objects.requireNonNull(Bukkit.getRegistry(TrimPattern.class), "No registry present for TrimPattern. This is a bug.");
|
|
/**
|
|
* Damage types.
|
|
@@ -385,8 +383,11 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
|
|
*
|
|
* @param input non-null input
|
|
* @return registered object or null if does not exist
|
|
+ * @deprecated this method's behavior is broken and not useful. If you want to get an object
|
|
+ * based on its vanilla name, or a key, wrap it in a {@link NamespacedKey} object and use {@link #get(NamespacedKey)}
|
|
*/
|
|
@Nullable
|
|
+ @Deprecated(forRemoval = true) // Paper
|
|
default T match(@NotNull String input) {
|
|
Preconditions.checkArgument(input != null, "input must not be null");
|
|
|
|
diff --git a/src/main/java/org/bukkit/SandstoneType.java b/src/main/java/org/bukkit/SandstoneType.java
|
|
index 6277451c3c6c551078c237cd767b6d70c4f585ea..7d33b3e2f81c14d3aeb800b39e7823831ecc39e4 100644
|
|
--- a/src/main/java/org/bukkit/SandstoneType.java
|
|
+++ b/src/main/java/org/bukkit/SandstoneType.java
|
|
@@ -6,7 +6,9 @@ import org.jetbrains.annotations.Nullable;
|
|
|
|
/**
|
|
* Represents the three different types of Sandstone
|
|
+ * @deprecated use {@link org.bukkit.block.data.BlockData}
|
|
*/
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public enum SandstoneType {
|
|
CRACKED(0x0),
|
|
GLYPHED(0x1),
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 08f6f85388e4c3e3aae40f709109f8706a400675..c6ebdefe940e5e3ab04aac0f22924ef5d876d328 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -744,9 +744,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
*
|
|
* @param id the id of the map to get
|
|
* @return a map view if it exists, or null otherwise
|
|
- * @deprecated Magic value
|
|
*/
|
|
- @Deprecated
|
|
+ //@Deprecated // Paper - Not a magic value
|
|
@Nullable
|
|
public MapView getMap(int id);
|
|
|
|
@@ -813,8 +812,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
* Returns the primary logger associated with this server instance.
|
|
*
|
|
* @return Logger associated with this server
|
|
+ * @see org.bukkit.plugin.Plugin#getSLF4JLogger()
|
|
+ * @apiNote This logger is for the Minecraft server software, not for specific plugins. You should
|
|
+ * use a logger for a specific plugin, either via {@link org.bukkit.plugin.Plugin#getSLF4JLogger()}
|
|
+ * or {@link org.bukkit.plugin.Plugin#getLogger()} or create a specific logger for a class via slf4j.
|
|
+ * That way, log messages contain contextual information about the source of the message.
|
|
*/
|
|
@NotNull
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper - internalize Bukkit#getLogger
|
|
public Logger getLogger();
|
|
|
|
/**
|
|
@@ -1151,10 +1156,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
* @param name the name the player to retrieve
|
|
* @return an offline player
|
|
* @see #getOfflinePlayer(java.util.UUID)
|
|
- * @deprecated Persistent storage of users should be by UUID as names are no longer
|
|
- * unique past a single session.
|
|
*/
|
|
- @Deprecated
|
|
+ // @Deprecated // Paper
|
|
@NotNull
|
|
public OfflinePlayer getOfflinePlayer(@NotNull String name);
|
|
|
|
@@ -1672,7 +1675,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
*
|
|
* @return the scoreboard manager or null if no worlds are loaded.
|
|
*/
|
|
- @Nullable
|
|
+ @NotNull // Paper
|
|
ScoreboardManager getScoreboardManager();
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/SkullType.java b/src/main/java/org/bukkit/SkullType.java
|
|
index 49f2f1128892fa991ed18785cd954b07ddd8e51a..08a946aaf29726d19be970c19d0bbbc59dd21efe 100644
|
|
--- a/src/main/java/org/bukkit/SkullType.java
|
|
+++ b/src/main/java/org/bukkit/SkullType.java
|
|
@@ -4,7 +4,7 @@ package org.bukkit;
|
|
* Represents the different types of skulls.
|
|
* @deprecated check {@link Material} instead
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public enum SkullType {
|
|
SKELETON,
|
|
WITHER,
|
|
diff --git a/src/main/java/org/bukkit/TreeSpecies.java b/src/main/java/org/bukkit/TreeSpecies.java
|
|
index 01285301621c88c9e383e18c46eabd302341a338..57e010a57f804bd9f2a78710d6f52928ad476197 100644
|
|
--- a/src/main/java/org/bukkit/TreeSpecies.java
|
|
+++ b/src/main/java/org/bukkit/TreeSpecies.java
|
|
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.Nullable;
|
|
*
|
|
* @deprecated Deprecated, see usage methods for replacement(s)
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.19")
|
|
public enum TreeSpecies {
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/UndefinedNullability.java b/src/main/java/org/bukkit/UndefinedNullability.java
|
|
index 4d4265c237179470e1fd017721a8dd595f114013..3babc9df26276300392d3f92ee6e317c33643b0b 100644
|
|
--- a/src/main/java/org/bukkit/UndefinedNullability.java
|
|
+++ b/src/main/java/org/bukkit/UndefinedNullability.java
|
|
@@ -14,6 +14,7 @@ import org.jetbrains.annotations.ApiStatus;
|
|
* suggests a bad API design.
|
|
*/
|
|
@Retention(RetentionPolicy.CLASS)
|
|
+@java.lang.annotation.Documented // Paper
|
|
@ApiStatus.Internal
|
|
@Deprecated
|
|
public @interface UndefinedNullability {
|
|
diff --git a/src/main/java/org/bukkit/Vibration.java b/src/main/java/org/bukkit/Vibration.java
|
|
index e455eb21abf121dc6ff10ff8a13dd06f67096a8f..bbc01e7c192ae6689c301670047ff114306c57cb 100644
|
|
--- a/src/main/java/org/bukkit/Vibration.java
|
|
+++ b/src/main/java/org/bukkit/Vibration.java
|
|
@@ -13,6 +13,14 @@ public class Vibration {
|
|
private final Destination destination;
|
|
private final int arrivalTime;
|
|
|
|
+ // Paper start
|
|
+ public Vibration(@NotNull Destination destination, @NotNull int arrivalTime) {
|
|
+ this.destination = destination;
|
|
+ this.arrivalTime = arrivalTime;
|
|
+ this.origin = new Location(null, 0, 0, 0); // Dummy origin because getter expects null
|
|
+ }
|
|
+
|
|
+ @Deprecated(forRemoval = true) // Paper end
|
|
public Vibration(@NotNull Location origin, @NotNull Destination destination, int arrivalTime) {
|
|
this.origin = origin;
|
|
this.destination = destination;
|
|
@@ -22,9 +30,11 @@ public class Vibration {
|
|
/**
|
|
* Get the origin of the vibration.
|
|
*
|
|
+ * @deprecated unused as of 1.19
|
|
* @return origin
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated(forRemoval = true) // Paper
|
|
public Location getOrigin() {
|
|
return origin;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
|
index 7dbc2e4883feb5b0b1a20cf36cda01ef3795a262..e4471e86e1b0993425087d8331e7c3d9896b3908 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -418,9 +418,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
* @param z Z-coordinate of the chunk
|
|
* @return Whether the chunk was actually refreshed
|
|
*
|
|
- * @deprecated This method is not guaranteed to work suitably across all client implementations.
|
|
*/
|
|
- @Deprecated
|
|
+ //@Deprecated // Paper
|
|
public boolean refreshChunk(int x, int z);
|
|
|
|
/**
|
|
@@ -3813,6 +3812,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
|
|
|
|
// Spigot start
|
|
+ @Deprecated(forRemoval = true) // Paper
|
|
public class Spigot {
|
|
|
|
/**
|
|
@@ -3846,7 +3846,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
}
|
|
}
|
|
|
|
+ /**
|
|
+ * @deprecated Unsupported api
|
|
+ */
|
|
@NotNull
|
|
+ @Deprecated // Paper
|
|
Spigot spigot();
|
|
// Spigot end
|
|
|
|
@@ -4064,9 +4068,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
* Gets the dimension ID of this environment
|
|
*
|
|
* @return dimension ID
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public int getId() {
|
|
return id;
|
|
}
|
|
@@ -4076,9 +4080,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
*
|
|
* @param id The ID of the environment
|
|
* @return The environment
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
@Nullable
|
|
public static Environment getEnvironment(int id) {
|
|
return lookup.get(id);
|
|
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
|
|
index bb3cf2c5e2acbcd7cf53ad8551a5b11fa6104ada..e4393f2bd71308a58305cb870271d6a647ffcd92 100644
|
|
--- a/src/main/java/org/bukkit/block/Block.java
|
|
+++ b/src/main/java/org/bukkit/block/Block.java
|
|
@@ -526,7 +526,7 @@ public interface Block extends Metadatable, Translatable {
|
|
* @return a list of dropped items for this type of block
|
|
*/
|
|
@NotNull
|
|
- Collection<ItemStack> getDrops(@NotNull ItemStack tool, @Nullable Entity entity);
|
|
+ Collection<ItemStack> getDrops(@Nullable ItemStack tool, @Nullable Entity entity); // Paper
|
|
|
|
/**
|
|
* Returns if the given item is a preferred choice to break this Block.
|
|
diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
|
|
index 3e07fc1bc0e08d0cfd998711c7fd547b2b7b6b73..f4a739d8022d19a7ae0ee9bf93eb5c4846b4bd40 100644
|
|
--- a/src/main/java/org/bukkit/block/BlockState.java
|
|
+++ b/src/main/java/org/bukkit/block/BlockState.java
|
|
@@ -36,8 +36,10 @@ public interface BlockState extends Metadatable {
|
|
* Gets the metadata for this block state.
|
|
*
|
|
* @return block specific metadata
|
|
+ * @deprecated use {@link #getBlockData()}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated(forRemoval = true, since = "1.13")
|
|
MaterialData getData();
|
|
|
|
/**
|
|
@@ -151,7 +153,9 @@ public interface BlockState extends Metadatable {
|
|
* Sets the metadata for this block state.
|
|
*
|
|
* @param data New block specific metadata
|
|
+ * @deprecated use {@link #setBlockData(BlockData)}
|
|
*/
|
|
+ @Deprecated(forRemoval = true, since = "1.13")
|
|
void setData(@NotNull MaterialData data);
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java
|
|
index cd575a28733a101b3b18ecdeb28ce474413045d6..5ba088456e2c647a719c4ee1e6f006f5c1cca651 100644
|
|
--- a/src/main/java/org/bukkit/block/BlockType.java
|
|
+++ b/src/main/java/org/bukkit/block/BlockType.java
|
|
@@ -3576,9 +3576,14 @@ public interface BlockType extends Keyed, Translatable {
|
|
* state as well. This method will return true if there is at least one
|
|
* state in which additional interact handling is performed for the
|
|
* block type.
|
|
+ *
|
|
+ * @deprecated This method is not comprehensive and does not accurately reflect what block types are
|
|
+ * interactable. Many "interactions" are defined on the item not block, and many are conditional on some other world state
|
|
+ * checks being true.
|
|
*
|
|
* @return true if this block type can be interacted with.
|
|
*/
|
|
+ @Deprecated // Paper
|
|
boolean isInteractable();
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/block/BrushableBlock.java b/src/main/java/org/bukkit/block/BrushableBlock.java
|
|
index 4bd127b3646307398e0c937c3e36ab671235b72b..f2557a87f468ee20c2d276dbfc0e9a976656c75c 100644
|
|
--- a/src/main/java/org/bukkit/block/BrushableBlock.java
|
|
+++ b/src/main/java/org/bukkit/block/BrushableBlock.java
|
|
@@ -15,7 +15,7 @@ public interface BrushableBlock extends Lootable, TileState {
|
|
*
|
|
* @return the item
|
|
*/
|
|
- @Nullable
|
|
+ @org.jetbrains.annotations.NotNull // Paper
|
|
public ItemStack getItem();
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/block/PistonMoveReaction.java b/src/main/java/org/bukkit/block/PistonMoveReaction.java
|
|
index b90f5dc345ad2cdd3ae353dc57f42a14c231d18a..a7b915ded9154d53ac8ca599119c1699cfca2265 100644
|
|
--- a/src/main/java/org/bukkit/block/PistonMoveReaction.java
|
|
+++ b/src/main/java/org/bukkit/block/PistonMoveReaction.java
|
|
@@ -48,9 +48,9 @@ public enum PistonMoveReaction {
|
|
|
|
/**
|
|
* @return The ID of the move reaction
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public int getId() {
|
|
return this.id;
|
|
}
|
|
@@ -58,9 +58,9 @@ public enum PistonMoveReaction {
|
|
/**
|
|
* @param id An ID
|
|
* @return The move reaction with that ID
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
@Nullable
|
|
public static PistonMoveReaction getById(int id) {
|
|
return byId.get(id);
|
|
diff --git a/src/main/java/org/bukkit/block/SuspiciousSand.java b/src/main/java/org/bukkit/block/SuspiciousSand.java
|
|
index a7c4e4baf14dd64e454028002c1c5d4f83ec1659..53c61cfa4c2cdc3adfe1c5b43fb15eebeb4b74d1 100644
|
|
--- a/src/main/java/org/bukkit/block/SuspiciousSand.java
|
|
+++ b/src/main/java/org/bukkit/block/SuspiciousSand.java
|
|
@@ -5,6 +5,6 @@ package org.bukkit.block;
|
|
*
|
|
* @see BrushableBlock
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.20")
|
|
public interface SuspiciousSand extends BrushableBlock {
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
|
|
index 378ef178bdcf0d71b5d80fc5028ce738437f9391..25985a3872ac142c0a3b2fb2dc5387ecdd3ff5b3 100644
|
|
--- a/src/main/java/org/bukkit/enchantments/Enchantment.java
|
|
+++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
|
|
@@ -263,7 +263,7 @@ public abstract class Enchantment implements Keyed, Translatable {
|
|
* @deprecated enchantment groupings are now managed by tags, not categories
|
|
*/
|
|
@NotNull
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true, since = "1.20.5") @org.jetbrains.annotations.Contract("-> fail") // Paper
|
|
public abstract EnchantmentTarget getItemTarget();
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
|
|
index 493f81ba879d1eb29a32722da27e4ff7ce4c68a8..8bf9bf7940d2911486e9d3a4f688cfae3f6173f2 100644
|
|
--- a/src/main/java/org/bukkit/entity/AbstractArrow.java
|
|
+++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
|
|
@@ -157,7 +157,7 @@ public interface AbstractArrow extends Projectile {
|
|
*
|
|
* @return The firing ItemStack
|
|
*/
|
|
- @NotNull
|
|
+ @Nullable // Paper
|
|
@ApiStatus.Experimental
|
|
public ItemStack getWeapon();
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java
|
|
index 3afe2787de576f7190d87c796bea0ab34dc30248..875817b807c9f515eb07b03cc85d368955388dc3 100644
|
|
--- a/src/main/java/org/bukkit/entity/Enderman.java
|
|
+++ b/src/main/java/org/bukkit/entity/Enderman.java
|
|
@@ -25,15 +25,19 @@ public interface Enderman extends Monster {
|
|
* Gets the id and data of the block that the Enderman is carrying.
|
|
*
|
|
* @return MaterialData containing the id and data of the block
|
|
+ * @deprecated use {@link #getCarriedBlock()}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated(forRemoval = true, since = "1.13")
|
|
public MaterialData getCarriedMaterial();
|
|
|
|
/**
|
|
* Sets the id and data of the block that the Enderman is carrying.
|
|
*
|
|
* @param material data to set the carried block to
|
|
+ * @deprecated use {@link #setCarriedBlock(BlockData)}
|
|
*/
|
|
+ @Deprecated(forRemoval = true, since = "1.13")
|
|
public void setCarriedMaterial(@NotNull MaterialData material);
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
|
|
index f5b0ff195b3f7cf1c5b8ebe2fb8cefcf6c1012f4..1c1cdfd6b5a98a378ff7bb7bb3201e84662b52f3 100644
|
|
--- a/src/main/java/org/bukkit/entity/EntityType.java
|
|
+++ b/src/main/java/org/bukkit/entity/EntityType.java
|
|
@@ -424,9 +424,9 @@ public enum EntityType implements Keyed, Translatable {
|
|
*
|
|
* @param name the entity type's name
|
|
* @return the matching entity type or null
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
@Contract("null -> null")
|
|
@Nullable
|
|
public static EntityType fromName(@Nullable String name) {
|
|
diff --git a/src/main/java/org/bukkit/entity/ItemDisplay.java b/src/main/java/org/bukkit/entity/ItemDisplay.java
|
|
index bd718c1cf6f20cd716d2fac11556437b4a5aab2e..586ac8abbd1a0f2724fdfadc01370cb6f1c1067a 100644
|
|
--- a/src/main/java/org/bukkit/entity/ItemDisplay.java
|
|
+++ b/src/main/java/org/bukkit/entity/ItemDisplay.java
|
|
@@ -14,7 +14,7 @@ public interface ItemDisplay extends Display {
|
|
*
|
|
* @return the displayed item stack
|
|
*/
|
|
- @Nullable
|
|
+ @NotNull // Paper
|
|
ItemStack getItemStack();
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java
|
|
index b27447d7a2833f84cf05946c851f5b6740a578e3..5afeb2f6c82e8f752229462c2d7846f6ae7a4b44 100644
|
|
--- a/src/main/java/org/bukkit/entity/LightningStrike.java
|
|
+++ b/src/main/java/org/bukkit/entity/LightningStrike.java
|
|
@@ -84,6 +84,10 @@ public interface LightningStrike extends Entity {
|
|
public void setCausingPlayer(@Nullable Player player);
|
|
|
|
// Spigot start
|
|
+ /**
|
|
+ * @deprecated Unsupported api
|
|
+ */
|
|
+ @Deprecated // Paper
|
|
public class Spigot extends Entity.Spigot {
|
|
|
|
/**
|
|
@@ -98,8 +102,12 @@ public interface LightningStrike extends Entity {
|
|
}
|
|
}
|
|
|
|
+ /**
|
|
+ * @deprecated Unsupported api
|
|
+ */
|
|
@NotNull
|
|
@Override
|
|
+ @Deprecated // Paper
|
|
Spigot spigot();
|
|
// Spigot end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/entity/LingeringPotion.java b/src/main/java/org/bukkit/entity/LingeringPotion.java
|
|
index bafef53c1d449135f1300c8c8fbb06f482ba67e1..f50aaddf8582be55fd4860ad374d8f2206991897 100644
|
|
--- a/src/main/java/org/bukkit/entity/LingeringPotion.java
|
|
+++ b/src/main/java/org/bukkit/entity/LingeringPotion.java
|
|
@@ -3,7 +3,8 @@ package org.bukkit.entity;
|
|
/**
|
|
* Represents a thrown lingering potion bottle
|
|
*
|
|
- * @deprecated lingering status depends on only on the potion item.
|
|
+ * @deprecated should not be used for anything, use {@link ThrownPotion} and
|
|
+ * set the potion via the methods there.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true) // Paper
|
|
public interface LingeringPotion extends ThrownPotion { }
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
index 9e0137ea412ec8c65b2903a76499ba8222446ea3..db7dafba43b50146a32d749ec043c5d548b0d6e3 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -716,7 +716,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
* This may have unexpected results if the entity is not in water.
|
|
*
|
|
* @param swimming True if the entity is swimming.
|
|
+ * @deprecated This does nothing and is immediately reverted by the server, in the next tick <!-- Paper - future note: should wait a mojang input client/server side -->
|
|
*/
|
|
+ @Deprecated // Paper
|
|
public void setSwimming(boolean swimming);
|
|
|
|
/**
|
|
@@ -981,7 +983,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
* @deprecated entity groupings are now managed by tags, not categories
|
|
*/
|
|
@NotNull
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true, since = "1.20.5") @org.jetbrains.annotations.Contract("-> fail") // Paper
|
|
public EntityCategory getCategory();
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/entity/Minecart.java b/src/main/java/org/bukkit/entity/Minecart.java
|
|
index 4910075d0fb21b4dc4fab57894f9c7cca3093e3b..9125cc9f60258938946ee30932f0299edcd9573b 100644
|
|
--- a/src/main/java/org/bukkit/entity/Minecart.java
|
|
+++ b/src/main/java/org/bukkit/entity/Minecart.java
|
|
@@ -106,7 +106,9 @@ public interface Minecart extends Vehicle {
|
|
* Passing a null value will set the minecart to have no display block.
|
|
*
|
|
* @param material the material to set as display block.
|
|
+ * @deprecated use {@link #setDisplayBlockData(BlockData)}
|
|
*/
|
|
+ @Deprecated(forRemoval = true, since = "1.13")
|
|
public void setDisplayBlock(@Nullable MaterialData material);
|
|
|
|
/**
|
|
@@ -114,8 +116,10 @@ public interface Minecart extends Vehicle {
|
|
* This function will return the type AIR if none is set.
|
|
*
|
|
* @return the block displayed by this minecart.
|
|
+ * @deprecated use {@link #getDisplayBlockData()}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated(forRemoval = true, since = "1.13")
|
|
public MaterialData getDisplayBlock();
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/entity/OminousItemSpawner.java b/src/main/java/org/bukkit/entity/OminousItemSpawner.java
|
|
index 60522888bc320ba0a55655532e19185fac816bd1..4aa07d4edb2c81d0ae7999b30ad53ff8bb884ec7 100644
|
|
--- a/src/main/java/org/bukkit/entity/OminousItemSpawner.java
|
|
+++ b/src/main/java/org/bukkit/entity/OminousItemSpawner.java
|
|
@@ -15,7 +15,7 @@ public interface OminousItemSpawner extends Entity {
|
|
*
|
|
* @return the item
|
|
*/
|
|
- @Nullable
|
|
+ @org.jetbrains.annotations.NotNull // Paper
|
|
ItemStack getItem();
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index 76ffe308ae2e3bc36c0e7e1a98adc4b307f4211f..80e894e3d625cde14bfe881d2c367b43a4882cfd 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -1680,11 +1680,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
|
|
/**
|
|
* Forces an update of the player's entire inventory.
|
|
- *
|
|
- * @apiNote It should not be necessary for plugins to use this method. If it
|
|
- * is required for some reason, it is probably a bug.
|
|
*/
|
|
- @ApiStatus.Internal
|
|
+ // @ApiStatus.Internal // Paper - is valid API
|
|
public void updateInventory();
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/entity/Projectile.java b/src/main/java/org/bukkit/entity/Projectile.java
|
|
index 906b33b7569fff5dd78258f9765e879180a52834..06e3ad9cd8f39de0ef6ead794df1492415bc4302 100644
|
|
--- a/src/main/java/org/bukkit/entity/Projectile.java
|
|
+++ b/src/main/java/org/bukkit/entity/Projectile.java
|
|
@@ -29,7 +29,7 @@ public interface Projectile extends Entity {
|
|
* @return true if it should bounce.
|
|
* @deprecated does not do anything
|
|
*/
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true)
|
|
public boolean doesBounce();
|
|
|
|
/**
|
|
@@ -39,6 +39,6 @@ public interface Projectile extends Entity {
|
|
* @param doesBounce whether or not it should bounce.
|
|
* @deprecated does not do anything
|
|
*/
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true)
|
|
public void setBounce(boolean doesBounce);
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/entity/SplashPotion.java b/src/main/java/org/bukkit/entity/SplashPotion.java
|
|
index 9cb08fe7201a9f91e88c7b1ee22c17889a7bf1c3..c0fcfccdf476106b48e626a099658c04244ebff8 100644
|
|
--- a/src/main/java/org/bukkit/entity/SplashPotion.java
|
|
+++ b/src/main/java/org/bukkit/entity/SplashPotion.java
|
|
@@ -3,7 +3,8 @@ package org.bukkit.entity;
|
|
/**
|
|
* Represents a thrown splash potion bottle
|
|
*
|
|
- * @deprecated splash status depends on only on the potion item.
|
|
+ * @deprecated should not be used for anything, use {@link ThrownPotion} and
|
|
+ * set the potion via the methods there.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true) // Paper
|
|
public interface SplashPotion extends ThrownPotion { }
|
|
diff --git a/src/main/java/org/bukkit/entity/ZombieVillager.java b/src/main/java/org/bukkit/entity/ZombieVillager.java
|
|
index 7cc1d9a966454af70b7c25735fe474fe3eb97eb4..e38f38ebfc6e85f29b09c4bb3e2ea79639078ad0 100644
|
|
--- a/src/main/java/org/bukkit/entity/ZombieVillager.java
|
|
+++ b/src/main/java/org/bukkit/entity/ZombieVillager.java
|
|
@@ -13,15 +13,15 @@ public interface ZombieVillager extends Zombie {
|
|
* Sets the villager profession of this zombie.
|
|
*/
|
|
@Override
|
|
- void setVillagerProfession(@Nullable Villager.Profession profession);
|
|
+ void setVillagerProfession(@NotNull Villager.Profession profession); // Paper
|
|
|
|
/**
|
|
* Returns the villager profession of this zombie.
|
|
*
|
|
- * @return the profession or null
|
|
+ * @return the profession
|
|
*/
|
|
@Override
|
|
- @Nullable
|
|
+ @NotNull // Paper
|
|
Villager.Profession getVillagerProfession();
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/entity/memory/MemoryKey.java b/src/main/java/org/bukkit/entity/memory/MemoryKey.java
|
|
index 8f601e85df580ef8106eaff8b9eafb5691a4874b..d615c006c9153fb65024241604b744fbfc383efc 100644
|
|
--- a/src/main/java/org/bukkit/entity/memory/MemoryKey.java
|
|
+++ b/src/main/java/org/bukkit/entity/memory/MemoryKey.java
|
|
@@ -69,6 +69,12 @@ public final class MemoryKey<T> implements Keyed {
|
|
public static final MemoryKey<Location> LIKED_NOTEBLOCK_POSITION = new MemoryKey<>(NamespacedKey.minecraft("liked_noteblock"), Location.class);
|
|
public static final MemoryKey<Integer> LIKED_NOTEBLOCK_COOLDOWN_TICKS = new MemoryKey<>(NamespacedKey.minecraft("liked_noteblock_cooldown_ticks"), Integer.class);
|
|
public static final MemoryKey<Integer> ITEM_PICKUP_COOLDOWN_TICKS = new MemoryKey<>(NamespacedKey.minecraft("item_pickup_cooldown_ticks"), Integer.class);
|
|
+ /**
|
|
+ * @deprecated this constant uses the wrong generic type, the sniffer now stores different positions
|
|
+ * from possibly different worlds. Use the relevant methods in {@link org.bukkit.entity.Sniffer} directly
|
|
+ * for now.
|
|
+ */
|
|
+ @Deprecated // Paper
|
|
public static final MemoryKey<Location> SNIFFER_EXPLORED_POSITIONS = new MemoryKey<>(NamespacedKey.minecraft("sniffer_explored_positions"), Location.class);
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/event/block/BrewingStartEvent.java b/src/main/java/org/bukkit/event/block/BrewingStartEvent.java
|
|
index 9e54ef5b60bf5583c12e1edfa76f19013a5b2a65..37be83184cae203d5e99518b0ff5c708fafb0331 100644
|
|
--- a/src/main/java/org/bukkit/event/block/BrewingStartEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/block/BrewingStartEvent.java
|
|
@@ -8,6 +8,7 @@ import org.jetbrains.annotations.NotNull;
|
|
/**
|
|
* Called when a brewing stand starts to brew.
|
|
*/
|
|
+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
|
|
public class BrewingStartEvent extends InventoryBlockStartEvent {
|
|
|
|
private static final HandlerList handlers = new HandlerList();
|
|
diff --git a/src/main/java/org/bukkit/event/block/CampfireStartEvent.java b/src/main/java/org/bukkit/event/block/CampfireStartEvent.java
|
|
index 53119742beda00a38111063243665bb995ae2188..2d084214e991fecc51f8e18e3d733e43b1dca248 100644
|
|
--- a/src/main/java/org/bukkit/event/block/CampfireStartEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/block/CampfireStartEvent.java
|
|
@@ -9,6 +9,7 @@ import org.jetbrains.annotations.NotNull;
|
|
/**
|
|
* Called when a Campfire starts to cook.
|
|
*/
|
|
+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
|
|
public class CampfireStartEvent extends InventoryBlockStartEvent {
|
|
|
|
private static final HandlerList handlers = new HandlerList();
|
|
diff --git a/src/main/java/org/bukkit/event/block/CrafterCraftEvent.java b/src/main/java/org/bukkit/event/block/CrafterCraftEvent.java
|
|
index f4efb2190ae4b1fa1823d5c97ad518c6d34f0a1a..3d6c0ecc70a748b8508b55513f9d5fa6b4bd6353 100644
|
|
--- a/src/main/java/org/bukkit/event/block/CrafterCraftEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/block/CrafterCraftEvent.java
|
|
@@ -17,6 +17,7 @@ public class CrafterCraftEvent extends BlockEvent implements Cancellable {
|
|
private ItemStack result;
|
|
private boolean cancelled;
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper - fix upstream annotation mistakes
|
|
public CrafterCraftEvent(@NotNull Block theBlock, @NotNull CraftingRecipe recipe, @NotNull ItemStack result) {
|
|
super(theBlock);
|
|
this.result = result;
|
|
diff --git a/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java b/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
|
|
index 7ae338bcecff2ce25939035181457ced505b3a49..27564727edbd9f093e3a021ce6f30e1146a8ddbb 100644
|
|
--- a/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
|
|
@@ -23,7 +23,7 @@ public class PrepareItemEnchantEvent extends InventoryEvent implements Cancellab
|
|
private boolean cancelled;
|
|
private final Player enchanter;
|
|
|
|
- public PrepareItemEnchantEvent(@NotNull final Player enchanter, @NotNull EnchantmentView view, @NotNull final Block table, @NotNull final ItemStack item, @NotNull final EnchantmentOffer[] offers, final int bonus) {
|
|
+ public PrepareItemEnchantEvent(@NotNull final Player enchanter, @NotNull EnchantmentView view, @NotNull final Block table, @NotNull final ItemStack item, @org.jetbrains.annotations.Nullable final EnchantmentOffer @NotNull [] offers, final int bonus) { // Paper - offers can contain null values
|
|
super(view);
|
|
this.enchanter = enchanter;
|
|
this.table = table;
|
|
@@ -86,8 +86,7 @@ public class PrepareItemEnchantEvent extends InventoryEvent implements Cancellab
|
|
*
|
|
* @return list of available enchantment offers
|
|
*/
|
|
- @NotNull
|
|
- public EnchantmentOffer[] getOffers() {
|
|
+ public @org.jetbrains.annotations.Nullable EnchantmentOffer @NotNull [] getOffers() { // Paper offers can contain null values
|
|
return offers;
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
|
|
index d743cc5ee34fd7bc5db92f4b17fed9f3aa5ffbcc..8fdfcbc7d20fe0af6b220ab94516247093637621 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
|
|
@@ -218,7 +218,10 @@ public class EntityPotionEffectEvent extends EntityEvent implements Cancellable
|
|
MILK,
|
|
/**
|
|
* When a player gets bad omen after killing a patrol captain.
|
|
+ *
|
|
+ * @deprecated no longer used, player now gets an ominous bottle instead
|
|
*/
|
|
+ @Deprecated(since = "1.21") // Paper
|
|
PATROL_CAPTAIN,
|
|
/**
|
|
* When a potion effect is modified through the plugin methods.
|
|
diff --git a/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java
|
|
index 090ec6f96ca9b7f760389994da988c44c32b9976..e6b4d4c1722bf4a11744a421d09646b22745b138 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java
|
|
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.Nullable;
|
|
* LivingEntity's.
|
|
*/
|
|
public class EntityTargetLivingEntityEvent extends EntityTargetEvent {
|
|
- public EntityTargetLivingEntityEvent(@NotNull final Entity entity, @Nullable final LivingEntity target, @Nullable final TargetReason reason) {
|
|
+ public EntityTargetLivingEntityEvent(@NotNull final Entity entity, @Nullable final LivingEntity target, @NotNull final TargetReason reason) { // Paper
|
|
super(entity, target, reason);
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/entity/EntityToggleSwimEvent.java b/src/main/java/org/bukkit/event/entity/EntityToggleSwimEvent.java
|
|
index e1123295b9511a2c610a1baf7195638f7f3e64c4..273ae8e5da0a858d3b82d1b0f5992318ff49f145 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/EntityToggleSwimEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/EntityToggleSwimEvent.java
|
|
@@ -24,6 +24,14 @@ public class EntityToggleSwimEvent extends EntityEvent implements Cancellable {
|
|
return cancel;
|
|
}
|
|
|
|
+ /**
|
|
+ * @deprecated This does nothing, the server and the client doesn't work
|
|
+ * correctly when the server try to bypass this. A current workaround
|
|
+ * exists. If you want to cancel the switch from the ground state to the
|
|
+ * swimming state you need to disable the sprinting flag for the player after
|
|
+ * the cancel action.
|
|
+ */
|
|
+ @Deprecated // Paper
|
|
@Override
|
|
public void setCancelled(boolean cancel) {
|
|
this.cancel = cancel;
|
|
diff --git a/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java b/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
|
|
index 56e6024f1fa64569481543dc076e575bb512eef0..7fccda2a48f7bac7da54862c5cb8f1b484cc9da9 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
|
|
@@ -19,22 +19,27 @@ public class ProjectileHitEvent extends EntityEvent implements Cancellable {
|
|
private final BlockFace hitFace;
|
|
private boolean cancel = false;
|
|
|
|
+ @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper
|
|
public ProjectileHitEvent(@NotNull final Projectile projectile) {
|
|
- this(projectile, null, null);
|
|
+ this(projectile, null, null, null); // Paper
|
|
}
|
|
|
|
+ @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper
|
|
public ProjectileHitEvent(@NotNull final Projectile projectile, @Nullable Entity hitEntity) {
|
|
- this(projectile, hitEntity, null);
|
|
+ this(projectile, hitEntity, null, null); // Paper
|
|
}
|
|
|
|
+ @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper
|
|
public ProjectileHitEvent(@NotNull final Projectile projectile, @Nullable Block hitBlock) {
|
|
- this(projectile, null, hitBlock);
|
|
+ this(projectile, null, hitBlock, null); // Paper
|
|
}
|
|
|
|
+ @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper
|
|
public ProjectileHitEvent(@NotNull final Projectile projectile, @Nullable Entity hitEntity, @Nullable Block hitBlock) {
|
|
this(projectile, hitEntity, hitBlock, null);
|
|
}
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public ProjectileHitEvent(@NotNull final Projectile projectile, @Nullable Entity hitEntity, @Nullable Block hitBlock, @Nullable BlockFace hitFace) {
|
|
super(projectile);
|
|
this.hitEntity = hitEntity;
|
|
diff --git a/src/main/java/org/bukkit/event/entity/SpawnerSpawnEvent.java b/src/main/java/org/bukkit/event/entity/SpawnerSpawnEvent.java
|
|
index 9353f0d09272404f42167ab8b7ad83a03620c436..f3ec8f67328b266defb31a44a36d31401d5e9371 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/SpawnerSpawnEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/SpawnerSpawnEvent.java
|
|
@@ -12,12 +12,19 @@ import org.jetbrains.annotations.NotNull;
|
|
public class SpawnerSpawnEvent extends EntitySpawnEvent {
|
|
private final CreatureSpawner spawner;
|
|
|
|
- public SpawnerSpawnEvent(@NotNull final Entity spawnee, @NotNull final CreatureSpawner spawner) {
|
|
+ public SpawnerSpawnEvent(@NotNull final Entity spawnee, @org.jetbrains.annotations.Nullable final CreatureSpawner spawner) { // Paper
|
|
super(spawnee);
|
|
this.spawner = spawner;
|
|
}
|
|
|
|
- @NotNull
|
|
+ /**
|
|
+ * Gets the spawner tile state, or null
|
|
+ * when the entity is spawned from a minecart
|
|
+ * spawner.
|
|
+ *
|
|
+ * @return the spawner tile state
|
|
+ */
|
|
+ @org.jetbrains.annotations.Nullable // Paper
|
|
public CreatureSpawner getSpawner() {
|
|
return spawner;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/event/hanging/HangingBreakByEntityEvent.java b/src/main/java/org/bukkit/event/hanging/HangingBreakByEntityEvent.java
|
|
index 68517811f63838bdad41073ee26be82f95042a8e..454885e47611edd707358ddfe0a01b7acf9ad5c8 100644
|
|
--- a/src/main/java/org/bukkit/event/hanging/HangingBreakByEntityEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/hanging/HangingBreakByEntityEvent.java
|
|
@@ -11,22 +11,21 @@ import org.jetbrains.annotations.Nullable;
|
|
public class HangingBreakByEntityEvent extends HangingBreakEvent {
|
|
private final Entity remover;
|
|
|
|
- public HangingBreakByEntityEvent(@NotNull final Hanging hanging, @Nullable final Entity remover) {
|
|
+ public HangingBreakByEntityEvent(@NotNull final Hanging hanging, @NotNull final Entity remover) { // Paper
|
|
this(hanging, remover, HangingBreakEvent.RemoveCause.ENTITY);
|
|
}
|
|
|
|
- public HangingBreakByEntityEvent(@NotNull final Hanging hanging, @Nullable final Entity remover, @NotNull final HangingBreakEvent.RemoveCause cause) {
|
|
+ public HangingBreakByEntityEvent(@NotNull final Hanging hanging, @NotNull final Entity remover, @NotNull final HangingBreakEvent.RemoveCause cause) { // Paper
|
|
super(hanging, cause);
|
|
this.remover = remover;
|
|
}
|
|
|
|
/**
|
|
* Gets the entity that removed the hanging entity.
|
|
- * May be null, for example when broken by an explosion.
|
|
*
|
|
* @return the entity that removed the hanging entity
|
|
*/
|
|
- @Nullable
|
|
+ @NotNull // Paper
|
|
public Entity getRemover() {
|
|
return remover;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/event/inventory/HopperInventorySearchEvent.java b/src/main/java/org/bukkit/event/inventory/HopperInventorySearchEvent.java
|
|
index 80a0a4ad813d6453b30273d25942e6612bb05c1b..18bb808e73c7a78f367ccdb44d5fe12bc54672cb 100644
|
|
--- a/src/main/java/org/bukkit/event/inventory/HopperInventorySearchEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/inventory/HopperInventorySearchEvent.java
|
|
@@ -34,7 +34,7 @@ public class HopperInventorySearchEvent extends BlockEvent {
|
|
DESTINATION;
|
|
}
|
|
|
|
- public HopperInventorySearchEvent(@NotNull Inventory inventory, @NotNull ContainerType containerType, @NotNull Block hopper, @NotNull Block searchBlock) {
|
|
+ public HopperInventorySearchEvent(@Nullable Inventory inventory, @NotNull ContainerType containerType, @NotNull Block hopper, @NotNull Block searchBlock) { // Paper
|
|
super(hopper);
|
|
this.inventory = inventory;
|
|
this.containerType = containerType;
|
|
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
|
|
index f2a2a2ad9930499c5bf624e73571a3294a90db14..c8540a42ab44647fdd112ce4f731f3dc0df552f4 100644
|
|
--- a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
|
|
@@ -88,7 +88,7 @@ public class InventoryClickEvent extends InventoryInteractEvent {
|
|
*
|
|
* @return the cursor ItemStack
|
|
*/
|
|
- @Nullable
|
|
+ @NotNull // Paper - fix nullability
|
|
public ItemStack getCursor() {
|
|
return getView().getCursor();
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
|
index 3e6ac5beb137efd8ecd80e2e9b17015cb38e8a0a..ae4ae1fa6d407665ef03edcdef683d741668acf1 100644
|
|
--- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
|
+++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
|
@@ -155,7 +155,7 @@ public enum InventoryType {
|
|
*
|
|
* @deprecated use {@link #SMITHING}
|
|
*/
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true) // Paper
|
|
SMITHING_NEW(4, "Upgrade Gear", MenuType.SMITHING),
|
|
;
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java b/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java
|
|
index 1cb70b5c8776863f44f1c4cdde152c35cb51edb5..f09b378508fcc6299e7cb40f174028f6f88ba067 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java
|
|
@@ -43,7 +43,10 @@ public class PlayerBedLeaveEvent extends PlayerEvent implements Cancellable {
|
|
* {@link Player#setBedSpawnLocation(Location)}.
|
|
*
|
|
* @return true if the spawn location will be changed
|
|
+ * @deprecated the respawn point is now set when the player enter the bed and
|
|
+ * this option doesn't work since MC 1.15.
|
|
*/
|
|
+ @Deprecated(forRemoval = true) // Paper - Unused
|
|
public boolean shouldSetSpawnLocation() {
|
|
return setBedSpawn;
|
|
}
|
|
@@ -59,7 +62,10 @@ public class PlayerBedLeaveEvent extends PlayerEvent implements Cancellable {
|
|
* {@link Player#setBedSpawnLocation(Location)}.
|
|
*
|
|
* @param setBedSpawn true to change the new spawn location
|
|
+ * @deprecated the respawn point is now set when the player enter the bed and
|
|
+ * this option doesn't work since MC 1.15.
|
|
*/
|
|
+ @Deprecated(forRemoval = true) // Paper - Unused
|
|
public void setSpawnLocation(boolean setBedSpawn) {
|
|
this.setBedSpawn = setBedSpawn;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
|
index 1b2267f4e8ebded198773ec80e2bff2c861c7084..1a58734d919fae247eeb85dd785fd59990856505 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
|
@@ -78,7 +78,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
|
|
*
|
|
* @return Location the player moved to
|
|
*/
|
|
- @Nullable
|
|
+ @NotNull // Paper
|
|
public Location getTo() {
|
|
return to;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/event/raid/RaidSpawnWaveEvent.java b/src/main/java/org/bukkit/event/raid/RaidSpawnWaveEvent.java
|
|
index cd58dd7de781823804701fc023706e805c0142a8..1b8bb5241efcf4a90fd098f2000f8394072dca4a 100644
|
|
--- a/src/main/java/org/bukkit/event/raid/RaidSpawnWaveEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/raid/RaidSpawnWaveEvent.java
|
|
@@ -19,7 +19,7 @@ public class RaidSpawnWaveEvent extends RaidEvent {
|
|
private final List<Raider> raiders;
|
|
private final Raider leader;
|
|
|
|
- public RaidSpawnWaveEvent(@NotNull Raid raid, @NotNull World world, @Nullable Raider leader, @NotNull List<Raider> raiders) {
|
|
+ public RaidSpawnWaveEvent(@NotNull Raid raid, @NotNull World world, @NotNull Raider leader, @NotNull List<Raider> raiders) { // Paper
|
|
super(raid, world);
|
|
this.raiders = raiders;
|
|
this.leader = leader;
|
|
@@ -30,7 +30,7 @@ public class RaidSpawnWaveEvent extends RaidEvent {
|
|
*
|
|
* @return {@link Raider}
|
|
*/
|
|
- @Nullable
|
|
+ @NotNull // Paper
|
|
public Raider getPatrolLeader() {
|
|
return leader;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
|
|
index 6bafc62e2235a6b783cbf96f4dabeeaf02bd5178..50c762d777ac90a05772501a28cacff8fd3f5126 100644
|
|
--- a/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
|
|
@@ -36,18 +36,22 @@ public class VehicleEntityCollisionEvent extends VehicleCollisionEvent implement
|
|
this.cancelled = cancel;
|
|
}
|
|
|
|
+ @Deprecated(forRemoval = true) // Paper - Unused
|
|
public boolean isPickupCancelled() {
|
|
return cancelledPickup;
|
|
}
|
|
|
|
+ @Deprecated(forRemoval = true) // Paper - Unused
|
|
public void setPickupCancelled(boolean cancel) {
|
|
cancelledPickup = cancel;
|
|
}
|
|
|
|
+ @Deprecated(forRemoval = true) // Paper - Unused
|
|
public boolean isCollisionCancelled() {
|
|
return cancelledCollision;
|
|
}
|
|
|
|
+ @Deprecated(forRemoval = true) // Paper - Unused
|
|
public void setCollisionCancelled(boolean cancel) {
|
|
cancelledCollision = cancel;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java
|
|
index c0b749a5bbf4980d01fed74768bb61909b579cb9..7e7a53b41013f1bf8956c0e278820f18d77b2f0d 100644
|
|
--- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
|
|
+++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
|
|
@@ -656,7 +656,9 @@ public abstract class ChunkGenerator {
|
|
* @param y the y location in the chunk from minHeight (inclusive) - maxHeight (exclusive)
|
|
* @param z the z location in the chunk from 0-15 inclusive
|
|
* @param material the type to set the block to
|
|
+ * @deprecated use {@link #setBlock(int, int, int, BlockData)}
|
|
*/
|
|
+ @Deprecated // Paper
|
|
public void setBlock(int x, int y, int z, @NotNull MaterialData material);
|
|
|
|
/**
|
|
@@ -700,7 +702,9 @@ public abstract class ChunkGenerator {
|
|
* @param yMax maximum y location (exclusive) in the chunk to set
|
|
* @param zMax maximum z location (exclusive) in the chunk to set
|
|
* @param material the type to set the blocks to
|
|
+ * @deprecated use {@link #setRegion(int, int, int, int, int, int, BlockData)}
|
|
*/
|
|
+ @Deprecated // Paper
|
|
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, @NotNull MaterialData material);
|
|
|
|
/**
|
|
@@ -741,8 +745,10 @@ public abstract class ChunkGenerator {
|
|
* @param y the y location in the chunk from minHeight (inclusive) - maxHeight (exclusive)
|
|
* @param z the z location in the chunk from 0-15 inclusive
|
|
* @return the type and data of the block or the MaterialData for air if x, y or z are outside the chunk's bounds
|
|
+ * @deprecated use {@link #getBlockData(int, int, int)}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated // Paper
|
|
public MaterialData getTypeAndData(int x, int y, int z);
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/inventory/CookingRecipe.java b/src/main/java/org/bukkit/inventory/CookingRecipe.java
|
|
index 571652ba8843a9493f1843523e24145baa958637..f7fa79393aef40027446b78bac8e9490cfafd8bc 100644
|
|
--- a/src/main/java/org/bukkit/inventory/CookingRecipe.java
|
|
+++ b/src/main/java/org/bukkit/inventory/CookingRecipe.java
|
|
@@ -68,7 +68,9 @@ public abstract class CookingRecipe<T extends CookingRecipe> implements Recipe,
|
|
* Get the input material.
|
|
*
|
|
* @return The input material.
|
|
+ * @deprecated Use {@link #getInputChoice()} instead for more complete data.
|
|
*/
|
|
+ @Deprecated // Paper
|
|
@NotNull
|
|
public ItemStack getInput() {
|
|
return this.ingredient.getItemStack();
|
|
diff --git a/src/main/java/org/bukkit/inventory/CraftingInventory.java b/src/main/java/org/bukkit/inventory/CraftingInventory.java
|
|
index df81bac9ecff697f98941e5c8490e10391e90090..a32977ba3ba60a1c9aee6e469d5d6cd1887c55a2 100644
|
|
--- a/src/main/java/org/bukkit/inventory/CraftingInventory.java
|
|
+++ b/src/main/java/org/bukkit/inventory/CraftingInventory.java
|
|
@@ -21,8 +21,7 @@ public interface CraftingInventory extends Inventory {
|
|
*
|
|
* @return The contents. Individual entries may be null.
|
|
*/
|
|
- @NotNull
|
|
- ItemStack[] getMatrix();
|
|
+ @Nullable ItemStack @NotNull [] getMatrix(); // Paper - make array elements nullable instead array
|
|
|
|
/**
|
|
* Set the item in the result slot of the crafting inventory.
|
|
@@ -38,7 +37,7 @@ public interface CraftingInventory extends Inventory {
|
|
* @throws IllegalArgumentException if the length of contents is greater
|
|
* than the size of the crafting matrix.
|
|
*/
|
|
- void setMatrix(@NotNull ItemStack[] contents);
|
|
+ void setMatrix(@Nullable ItemStack @NotNull [] contents); // Paper - make array elements nullable instead array
|
|
|
|
/**
|
|
* Get the current recipe formed on the crafting inventory, if any.
|
|
diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java
|
|
index 2dde946443fee1f6e79b882cbcb448549dc0c99c..127302aa7c22f59438de66fffa0b03ae84a2a8ad 100644
|
|
--- a/src/main/java/org/bukkit/inventory/EntityEquipment.java
|
|
+++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java
|
|
@@ -525,6 +525,6 @@ public interface EntityEquipment {
|
|
*
|
|
* @return the entity this EntityEquipment belongs to
|
|
*/
|
|
- @Nullable
|
|
+ @NotNull // Paper
|
|
Entity getHolder();
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/inventory/FurnaceRecipe.java b/src/main/java/org/bukkit/inventory/FurnaceRecipe.java
|
|
index 1d442dc16cbb0fed21714d47007f3f11e30c57d4..af8f7b88edf0fa790edcf16356a030c4834f531e 100644
|
|
--- a/src/main/java/org/bukkit/inventory/FurnaceRecipe.java
|
|
+++ b/src/main/java/org/bukkit/inventory/FurnaceRecipe.java
|
|
@@ -67,8 +67,10 @@ public class FurnaceRecipe extends CookingRecipe<FurnaceRecipe> {
|
|
*
|
|
* @param input The input material.
|
|
* @return The changed recipe, so you can chain calls.
|
|
+ * @deprecated use {@link #setInputChoice(RecipeChoice)}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated
|
|
public FurnaceRecipe setInput(@NotNull MaterialData input) {
|
|
return setInput(input.getItemType(), input.getData());
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java
|
|
index f1a48eab1a357ae64545e1f1dc941c383cff8707..466d1bd7089b76f48f953e1a51c611ecd93dcd54 100644
|
|
--- a/src/main/java/org/bukkit/inventory/Inventory.java
|
|
+++ b/src/main/java/org/bukkit/inventory/Inventory.java
|
|
@@ -161,8 +161,7 @@ public interface Inventory extends Iterable<ItemStack> {
|
|
*
|
|
* @return An array of ItemStacks from the inventory. Individual items may be null.
|
|
*/
|
|
- @NotNull
|
|
- public ItemStack[] getContents();
|
|
+ public @Nullable ItemStack @NotNull [] getContents(); // Paper - make array elements nullable instead array
|
|
|
|
/**
|
|
* Completely replaces the inventory's contents. Removes all existing
|
|
@@ -173,7 +172,7 @@ public interface Inventory extends Iterable<ItemStack> {
|
|
* @throws IllegalArgumentException If the array has more items than the
|
|
* inventory.
|
|
*/
|
|
- public void setContents(@NotNull ItemStack[] items) throws IllegalArgumentException;
|
|
+ public void setContents(@Nullable ItemStack @NotNull [] items) throws IllegalArgumentException; // Paper - make array elements nullable instead array
|
|
|
|
/**
|
|
* Return the contents from the section of the inventory where items can
|
|
@@ -186,8 +185,7 @@ public interface Inventory extends Iterable<ItemStack> {
|
|
*
|
|
* @return inventory storage contents. Individual items may be null.
|
|
*/
|
|
- @NotNull
|
|
- public ItemStack[] getStorageContents();
|
|
+ public @Nullable ItemStack @NotNull [] getStorageContents(); // Paper - make array elements nullable instead array
|
|
|
|
/**
|
|
* Put the given ItemStacks into the storage slots
|
|
@@ -196,7 +194,7 @@ public interface Inventory extends Iterable<ItemStack> {
|
|
* @throws IllegalArgumentException If the array has more items than the
|
|
* inventory.
|
|
*/
|
|
- public void setStorageContents(@NotNull ItemStack[] items) throws IllegalArgumentException;
|
|
+ public void setStorageContents(@Nullable ItemStack @NotNull [] items) throws IllegalArgumentException; // Paper - make array elements nullable instead array
|
|
|
|
/**
|
|
* Checks if the inventory contains any ItemStacks with the given
|
|
diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java
|
|
index ebc14022c9ef9b0b3331ee53e96a32667e4762e0..5c258b6077277575daa5d96349837bdf06f42500 100644
|
|
--- a/src/main/java/org/bukkit/inventory/InventoryView.java
|
|
+++ b/src/main/java/org/bukkit/inventory/InventoryView.java
|
|
@@ -123,9 +123,9 @@ public interface InventoryView {
|
|
* Gets the id of this view.
|
|
*
|
|
* @return the id of this view
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public int getId() {
|
|
return id;
|
|
}
|
|
@@ -195,10 +195,10 @@ public interface InventoryView {
|
|
/**
|
|
* Get the item on the cursor of one of the viewing players.
|
|
*
|
|
- * @return The item on the player's cursor, or null if they aren't holding
|
|
- * one.
|
|
+ * @return The item on the player's cursor, or an empty stack
|
|
+ * if they aren't holding one.
|
|
*/
|
|
- @Nullable
|
|
+ @NotNull // Paper - fix nullability
|
|
public ItemStack getCursor();
|
|
|
|
/**
|
|
@@ -296,8 +296,10 @@ public interface InventoryView {
|
|
* made using {@link #setTitle(String)}.
|
|
*
|
|
* @return the original title
|
|
+ * @deprecated changing the title is not supported
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated(since = "1.21.1") // Paper
|
|
public String getOriginalTitle();
|
|
|
|
/**
|
|
@@ -309,6 +311,9 @@ public interface InventoryView {
|
|
* exception.
|
|
*
|
|
* @param title The new title.
|
|
+ * @deprecated changing the title is not supported. This method has
|
|
+ * poorly defined and broken behaviors. It should not be used.
|
|
*/
|
|
+ @Deprecated(since = "1.21.1") // Paper
|
|
public void setTitle(@NotNull String title);
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
|
index 3d08beee52f2247db6f6e679206ed6a965fbf9a8..1b4f9b93860e58762ac28715adad5a67298b06d7 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
|
@@ -29,7 +29,7 @@ public interface ItemFactory {
|
|
* @return a new ItemMeta that could be applied to an item stack of the
|
|
* specified material
|
|
*/
|
|
- @Nullable
|
|
+ @org.bukkit.UndefinedNullability // Paper
|
|
ItemMeta getItemMeta(@NotNull final Material material);
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
index d125d29759167996a90b7b69d92d944e80af22ab..e9c29fc1db686b80bc2477d78ec2b361b8600b9e 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
@@ -10,6 +10,7 @@ import org.bukkit.Material;
|
|
import org.bukkit.NamespacedKey;
|
|
import org.bukkit.Registry;
|
|
import org.bukkit.Translatable;
|
|
+import org.bukkit.UndefinedNullability;
|
|
import org.bukkit.Utility;
|
|
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
|
import org.bukkit.enchantments.Enchantment;
|
|
@@ -82,7 +83,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
|
|
* @param data the data value or null
|
|
* @deprecated this method uses an ambiguous data byte object
|
|
*/
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true, since = "1.13")
|
|
public ItemStack(@NotNull Material type, final int amount, final short damage, @Nullable final Byte data) {
|
|
Preconditions.checkArgument(type != null, "Material cannot be null");
|
|
if (type.isLegacy()) {
|
|
@@ -179,8 +180,10 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
|
|
* Gets the MaterialData for this stack of items
|
|
*
|
|
* @return MaterialData for this item
|
|
+ * @deprecated cast to {@link org.bukkit.inventory.meta.BlockDataMeta} and use {@link org.bukkit.inventory.meta.BlockDataMeta#getBlockData(Material)}
|
|
*/
|
|
@Nullable
|
|
+ @Deprecated(forRemoval = true, since = "1.13")
|
|
public MaterialData getData() {
|
|
Material mat = Bukkit.getUnsafe().toLegacy(getType());
|
|
if (data == null && mat != null && mat.getData() != null) {
|
|
@@ -194,7 +197,9 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
|
|
* Sets the MaterialData for this stack of items
|
|
*
|
|
* @param data New MaterialData for this item
|
|
+ * @deprecated cast to {@link org.bukkit.inventory.meta.BlockDataMeta} and use {@link org.bukkit.inventory.meta.BlockDataMeta#setBlockData(org.bukkit.block.data.BlockData)}
|
|
*/
|
|
+ @Deprecated(forRemoval = true, since = "1.13")
|
|
public void setData(@Nullable MaterialData data) {
|
|
if (data == null) {
|
|
this.data = data;
|
|
@@ -574,7 +579,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
|
|
*
|
|
* @return a copy of the current ItemStack's ItemData
|
|
*/
|
|
- @Nullable
|
|
+ @UndefinedNullability // Paper
|
|
public ItemMeta getItemMeta() {
|
|
return this.meta == null ? Bukkit.getItemFactory().getItemMeta(this.type) : this.meta.clone();
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
|
|
index 476fe14faa39f02444cab8ad95d4401033dc6938..2c54660dc1fbc7c1232096797a23cae1262888e9 100644
|
|
--- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
|
|
+++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
|
|
@@ -16,8 +16,7 @@ public interface PlayerInventory extends Inventory {
|
|
* null and are returned in a fixed order starting from the boots and going
|
|
* up to the helmet
|
|
*/
|
|
- @NotNull
|
|
- public ItemStack[] getArmorContents();
|
|
+ public @Nullable ItemStack @NotNull [] getArmorContents(); // Paper - make array elements nullable instead array
|
|
|
|
/**
|
|
* Get all additional ItemStacks stored in this inventory.
|
|
@@ -28,8 +27,7 @@ public interface PlayerInventory extends Inventory {
|
|
*
|
|
* @return All additional ItemStacks. Individual items can be null.
|
|
*/
|
|
- @NotNull
|
|
- public ItemStack[] getExtraContents();
|
|
+ public @Nullable ItemStack @NotNull [] getExtraContents(); // Paper - make array elements nullable instead array
|
|
|
|
/**
|
|
* Return the ItemStack from the helmet slot
|
|
@@ -106,9 +104,9 @@ public interface PlayerInventory extends Inventory {
|
|
*
|
|
* @param slot the slot to get the ItemStack
|
|
*
|
|
- * @return the ItemStack in the given slot or null if there is not one
|
|
+ * @return the ItemStack in the given slot
|
|
*/
|
|
- @Nullable
|
|
+ @NotNull // Paper
|
|
public ItemStack getItem(@NotNull EquipmentSlot slot);
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
|
|
index fa03cf187db29896f5af046b311f67881aee0ff4..295d82dd73b600e9436d2bbec0e11dbeaf78bbf4 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
|
|
@@ -107,8 +107,10 @@ public class ShapedRecipe extends CraftingRecipe {
|
|
* @return The changed recipe, so you can chain calls.
|
|
* @throws IllegalArgumentException if the {@code key} is a space character
|
|
* @throws IllegalArgumentException if the {@code key} does not appear in the shape.
|
|
+ * @deprecated use {@link #setIngredient(char, RecipeChoice)}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated // Paper
|
|
public ShapedRecipe setIngredient(char key, @NotNull MaterialData ingredient) {
|
|
return setIngredient(key, ingredient.getItemType(), ingredient.getData());
|
|
}
|
|
@@ -191,7 +193,9 @@ public class ShapedRecipe extends CraftingRecipe {
|
|
* Get a copy of the ingredients map.
|
|
*
|
|
* @return The mapping of character to ingredients.
|
|
+ * @deprecated Use {@link #getChoiceMap()} instead for more complete data.
|
|
*/
|
|
+ @Deprecated // Paper
|
|
@NotNull
|
|
public Map<Character, ItemStack> getIngredientMap() {
|
|
HashMap<Character, ItemStack> result = new HashMap<Character, ItemStack>();
|
|
diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
|
|
index 63a233cc819d8d6995d14b9dbfabc14d89af54cc..3bf5064cd6ceb05ea98b18993da46c67be140115 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
|
|
@@ -44,8 +44,10 @@ public class ShapelessRecipe extends CraftingRecipe {
|
|
*
|
|
* @param ingredient The ingredient to add.
|
|
* @return The changed recipe, so you can chain calls.
|
|
+ * @deprecated use {@link #addIngredient(RecipeChoice)}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated
|
|
public ShapelessRecipe addIngredient(@NotNull MaterialData ingredient) {
|
|
return addIngredient(1, ingredient);
|
|
}
|
|
@@ -81,8 +83,10 @@ public class ShapelessRecipe extends CraftingRecipe {
|
|
* @param count How many to add (can't be more than 9!)
|
|
* @param ingredient The ingredient to add.
|
|
* @return The changed recipe, so you can chain calls.
|
|
+ * @deprecated use {@link #addIngredient(int, Material)}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated // Paper
|
|
public ShapelessRecipe addIngredient(int count, @NotNull MaterialData ingredient) {
|
|
return addIngredient(count, ingredient.getItemType(), ingredient.getData());
|
|
}
|
|
@@ -199,8 +203,10 @@ public class ShapelessRecipe extends CraftingRecipe {
|
|
*
|
|
* @param ingredient The ingredient to remove
|
|
* @return The changed recipe.
|
|
+ * @deprecated use {@link #removeIngredient(Material)}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated // Paper
|
|
public ShapelessRecipe removeIngredient(@NotNull MaterialData ingredient) {
|
|
return removeIngredient(ingredient.getItemType(), ingredient.getData());
|
|
}
|
|
@@ -227,8 +233,10 @@ public class ShapelessRecipe extends CraftingRecipe {
|
|
* @param count The number of copies to remove.
|
|
* @param ingredient The ingredient to remove.
|
|
* @return The changed recipe.
|
|
+ * @deprecated use {@link #removeIngredient(int, Material)}
|
|
*/
|
|
@NotNull
|
|
+ @Deprecated // Paper
|
|
public ShapelessRecipe removeIngredient(int count, @NotNull MaterialData ingredient) {
|
|
return removeIngredient(count, ingredient.getItemType(), ingredient.getData());
|
|
}
|
|
@@ -278,7 +286,9 @@ public class ShapelessRecipe extends CraftingRecipe {
|
|
* Get the list of ingredients used for this recipe.
|
|
*
|
|
* @return The input list
|
|
+ * @deprecated Use {@link #getChoiceList()} instead for more complete data.
|
|
*/
|
|
+ @Deprecated // Paper
|
|
@NotNull
|
|
public List<ItemStack> getIngredientList() {
|
|
ArrayList<ItemStack> result = new ArrayList<ItemStack>(ingredients.size());
|
|
diff --git a/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java b/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
|
|
index 597a18a767b68b47e81454b7d44613c7178c1366..bc3440eb72127824b3961fbdae583bb61385f65e 100644
|
|
--- a/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
|
|
+++ b/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
|
|
@@ -57,7 +57,9 @@ public class StonecuttingRecipe implements Recipe, Keyed {
|
|
* Get the input material.
|
|
*
|
|
* @return The input material.
|
|
+ * @deprecated Use {@link #getInputChoice()} instead for more complete data.
|
|
*/
|
|
+ @Deprecated // Paper
|
|
@NotNull
|
|
public ItemStack getInput() {
|
|
return this.ingredient.getItemStack();
|
|
diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
|
|
index 480dd9a5ff334e6f32b98aa0108ff02e6f7077ab..59e1987f0f0accef369cc29dbec464185eb7c99c 100644
|
|
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
|
|
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
|
|
@@ -151,6 +151,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
|
|
/**
|
|
* Checks for existence of a localized name.
|
|
*
|
|
+ * @deprecated Use {@link ItemMeta#displayName()} and check if it is instanceof a {@link net.kyori.adventure.text.TranslatableComponent}.
|
|
* @return true if this has a localized name
|
|
* @deprecated meta no longer exists
|
|
*/
|
|
@@ -163,6 +164,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
|
|
* Plugins should check that hasLocalizedName() returns <code>true</code>
|
|
* before calling this method.
|
|
*
|
|
+ * @deprecated Use {@link ItemMeta#displayName()} and cast it to a {@link net.kyori.adventure.text.TranslatableComponent}. No longer used by the client.
|
|
* @return the localized name that is set
|
|
* @deprecated meta no longer exists
|
|
*/
|
|
@@ -173,6 +175,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
|
|
/**
|
|
* Sets the localized name.
|
|
*
|
|
+ * @deprecated Use {@link ItemMeta#displayName(Component)} with a {@link net.kyori.adventure.text.TranslatableComponent}. No longer used by the client.
|
|
* @param name the name to set
|
|
* @deprecated meta no longer exists
|
|
*/
|
|
@@ -749,7 +752,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
|
|
*
|
|
* @return component
|
|
*/
|
|
- @Nullable
|
|
+ @NotNull // Paper
|
|
JukeboxPlayableComponent getJukeboxPlayable();
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/inventory/meta/MapMeta.java b/src/main/java/org/bukkit/inventory/meta/MapMeta.java
|
|
index 32055a8890425e0b819930f3059da5ea9dfca553..26a336dade83baee97d20eb39a058925659f5777 100644
|
|
--- a/src/main/java/org/bukkit/inventory/meta/MapMeta.java
|
|
+++ b/src/main/java/org/bukkit/inventory/meta/MapMeta.java
|
|
@@ -16,13 +16,8 @@ public interface MapMeta extends ItemMeta {
|
|
*
|
|
* @return true if this has a map ID number.
|
|
* @see #hasMapView()
|
|
- * @deprecated These methods are poor API: They rely on the caller to pass
|
|
- * in an only an integer property, and have poorly defined implementation
|
|
- * behavior if that integer is not a valid map (the current implementation
|
|
- * for example will generate a new map with a different ID). The xxxMapView
|
|
- * family of methods should be used instead.
|
|
*/
|
|
- @Deprecated
|
|
+ //@Deprecated // Paper
|
|
boolean hasMapId();
|
|
|
|
/**
|
|
@@ -34,13 +29,8 @@ public interface MapMeta extends ItemMeta {
|
|
*
|
|
* @return the map ID that is set
|
|
* @see #getMapView()
|
|
- * @deprecated These methods are poor API: They rely on the caller to pass
|
|
- * in an only an integer property, and have poorly defined implementation
|
|
- * behavior if that integer is not a valid map (the current implementation
|
|
- * for example will generate a new map with a different ID). The xxxMapView
|
|
- * family of methods should be used instead.
|
|
*/
|
|
- @Deprecated
|
|
+ //@Deprecated // Paper
|
|
int getMapId();
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/map/MapCanvas.java b/src/main/java/org/bukkit/map/MapCanvas.java
|
|
index edef478786bb7456af29ca960009873095830050..e8ac449e6280827beb6d2699df75b1d52a922c9b 100644
|
|
--- a/src/main/java/org/bukkit/map/MapCanvas.java
|
|
+++ b/src/main/java/org/bukkit/map/MapCanvas.java
|
|
@@ -95,9 +95,9 @@ public interface MapCanvas {
|
|
* @param x The x coordinate, from 0 to 127.
|
|
* @param y The y coordinate, from 0 to 127.
|
|
* @return The color. See {@link MapPalette}.
|
|
- * @deprecated Magic value, use {@link #getPixelColor(int, int)}
|
|
+ * @deprecated use {@link #getPixelColor(int, int)}
|
|
*/
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper
|
|
public byte getPixel(int x, int y);
|
|
|
|
/**
|
|
@@ -106,9 +106,9 @@ public interface MapCanvas {
|
|
* @param x The x coordinate, from 0 to 127.
|
|
* @param y The y coordinate, from 0 to 127.
|
|
* @return The color. See {@link MapPalette}.
|
|
- * @deprecated Magic value, use {@link #getBasePixelColor(int, int)}
|
|
+ * @deprecated use {@link #getBasePixelColor(int, int)}
|
|
*/
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper
|
|
public byte getBasePixel(int x, int y);
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
|
|
index 871adbf2f9015dffac9edc3ce35aa6acd3b75526..0899981b9ab1f98dacc617156d12779421e4c275 100644
|
|
--- a/src/main/java/org/bukkit/map/MapCursor.java
|
|
+++ b/src/main/java/org/bukkit/map/MapCursor.java
|
|
@@ -163,9 +163,9 @@ public final class MapCursor {
|
|
* Get the type of this cursor.
|
|
*
|
|
* @return The type (color/style) of the map cursor.
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public byte getRawType() {
|
|
return type.getValue();
|
|
}
|
|
@@ -220,9 +220,9 @@ public final class MapCursor {
|
|
* Set the type of this cursor.
|
|
*
|
|
* @param type The type (color/style) of the map cursor.
|
|
- * @deprecated Magic value
|
|
+ * @deprecated use {@link #setType(Type)}
|
|
*/
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper
|
|
public void setRawType(byte type) {
|
|
Type enumType = Type.byValue(type);
|
|
Preconditions.checkArgument(enumType != null, "Unknown type by id %s", type);
|
|
@@ -332,9 +332,9 @@ public final class MapCursor {
|
|
* Gets the internal value of the cursor.
|
|
*
|
|
* @return the value
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
byte getValue();
|
|
|
|
/**
|
|
@@ -342,9 +342,9 @@ public final class MapCursor {
|
|
*
|
|
* @param value the value
|
|
* @return the matching type
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
@Nullable
|
|
static Type byValue(byte value) {
|
|
for (Type t : values()) {
|
|
diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
|
|
index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..c80faa079eca1564847070f0338fc98024639829 100644
|
|
--- a/src/main/java/org/bukkit/map/MapPalette.java
|
|
+++ b/src/main/java/org/bukkit/map/MapPalette.java
|
|
@@ -197,9 +197,9 @@ public final class MapPalette {
|
|
*
|
|
* @param image The image to convert.
|
|
* @return A byte[] containing the pixels of the image.
|
|
- * @deprecated Magic value
|
|
+ * @deprecated use color-related methods
|
|
*/
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper
|
|
@NotNull
|
|
public static byte[] imageToBytes(@NotNull Image image) {
|
|
BufferedImage temp = new BufferedImage(image.getWidth(null), image.getHeight(null), BufferedImage.TYPE_INT_ARGB);
|
|
@@ -225,9 +225,9 @@ public final class MapPalette {
|
|
* @param b The blue component of the color.
|
|
* @param g The green component of the color.
|
|
* @return The index in the palette.
|
|
- * @deprecated Magic value
|
|
+ * @deprecated use color-related methods
|
|
*/
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper
|
|
public static byte matchColor(int r, int g, int b) {
|
|
return matchColor(new Color(r, g, b));
|
|
}
|
|
@@ -238,9 +238,9 @@ public final class MapPalette {
|
|
*
|
|
* @param color The Color to match.
|
|
* @return The index in the palette.
|
|
- * @deprecated Magic value
|
|
+ * @deprecated use color-related methods
|
|
*/
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper
|
|
public static byte matchColor(@NotNull Color color) {
|
|
if (color.getAlpha() < 128) return 0;
|
|
|
|
@@ -268,9 +268,9 @@ public final class MapPalette {
|
|
*
|
|
* @param index The index in the palette.
|
|
* @return The Color of the palette entry.
|
|
- * @deprecated Magic value
|
|
+ * @deprecated use color directly
|
|
*/
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper
|
|
@NotNull
|
|
public static Color getColor(byte index) {
|
|
// Minecraft has 143 colors, some of which have negative byte representations
|
|
@@ -311,9 +311,9 @@ public final class MapPalette {
|
|
* @param color The Color to match.
|
|
* @return The index in the palette.
|
|
* @throws IllegalStateException if {@link #isCached()} returns false
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
byte matchColor(@NotNull Color color);
|
|
}
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/map/MapView.java b/src/main/java/org/bukkit/map/MapView.java
|
|
index 9b8b68b66dc15b06800251702c2722623c8462a0..e998c5d871e02564c24260a8205dcfafb6e703d9 100644
|
|
--- a/src/main/java/org/bukkit/map/MapView.java
|
|
+++ b/src/main/java/org/bukkit/map/MapView.java
|
|
@@ -32,9 +32,9 @@ public interface MapView {
|
|
*
|
|
* @param value The raw scale
|
|
* @return The enum scale, or null for an invalid input
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
@Nullable
|
|
public static Scale valueOf(byte value) {
|
|
switch (value) {
|
|
@@ -51,9 +51,9 @@ public interface MapView {
|
|
* Get the raw value of this scale level.
|
|
*
|
|
* @return The scale value
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
public byte getValue() {
|
|
return value;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/material/Banner.java b/src/main/java/org/bukkit/material/Banner.java
|
|
index 08ce9d8bc6dcd9beec5f75c1b7cd5d98e8c9e168..e1a87c09b90618aacaf728ebdc5a13e255200fef 100644
|
|
--- a/src/main/java/org/bukkit/material/Banner.java
|
|
+++ b/src/main/java/org/bukkit/material/Banner.java
|
|
@@ -7,7 +7,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Banner extends MaterialData implements Attachable {
|
|
|
|
public Banner() {
|
|
diff --git a/src/main/java/org/bukkit/material/Bed.java b/src/main/java/org/bukkit/material/Bed.java
|
|
index c5256129e00a63d2699fbae213470ed7197c4571..54c89d319940a39b3439e3af09d87c21112a8486 100644
|
|
--- a/src/main/java/org/bukkit/material/Bed.java
|
|
+++ b/src/main/java/org/bukkit/material/Bed.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Bed extends MaterialData implements Directional {
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/material/Button.java b/src/main/java/org/bukkit/material/Button.java
|
|
index da7d016cf118932c9cc9ddcfb4a2abd4b4356fb5..3c3d867911b6424d03094d3cc1056dd291825dce 100644
|
|
--- a/src/main/java/org/bukkit/material/Button.java
|
|
+++ b/src/main/java/org/bukkit/material/Button.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Button extends SimpleAttachableMaterialData implements Redstone {
|
|
public Button() {
|
|
super(Material.LEGACY_STONE_BUTTON);
|
|
diff --git a/src/main/java/org/bukkit/material/Cake.java b/src/main/java/org/bukkit/material/Cake.java
|
|
index d39dd491626cd84f83169cf5c2135d05516d77f2..f14ebe07bf898e54a7f0cbe740c02cf5e1851d41 100644
|
|
--- a/src/main/java/org/bukkit/material/Cake.java
|
|
+++ b/src/main/java/org/bukkit/material/Cake.java
|
|
@@ -6,7 +6,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Cake extends MaterialData {
|
|
public Cake() {
|
|
super(Material.LEGACY_CAKE_BLOCK);
|
|
diff --git a/src/main/java/org/bukkit/material/Cauldron.java b/src/main/java/org/bukkit/material/Cauldron.java
|
|
index b331b4c27e58d766dd1759062c9c198c348a58bb..d43caa8d64396a16d6e00cbf0d05cb291fa20c2e 100644
|
|
--- a/src/main/java/org/bukkit/material/Cauldron.java
|
|
+++ b/src/main/java/org/bukkit/material/Cauldron.java
|
|
@@ -8,7 +8,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Cauldron extends MaterialData {
|
|
private static final int CAULDRON_FULL = 3;
|
|
private static final int CAULDRON_EMPTY = 0;
|
|
diff --git a/src/main/java/org/bukkit/material/Chest.java b/src/main/java/org/bukkit/material/Chest.java
|
|
index 4d120d3c33566606ff7d8b03c32341bf2ac147c4..89bb1a34d620d6c39901a315629bc8f43f3d3181 100644
|
|
--- a/src/main/java/org/bukkit/material/Chest.java
|
|
+++ b/src/main/java/org/bukkit/material/Chest.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Chest extends DirectionalContainer {
|
|
|
|
public Chest() {
|
|
diff --git a/src/main/java/org/bukkit/material/Coal.java b/src/main/java/org/bukkit/material/Coal.java
|
|
index fb842cfa7bf29ca6c670fc98e7deecaab31c71f2..f6c61c9005046386c3e8f36b0144f1c9c83f7e9c 100644
|
|
--- a/src/main/java/org/bukkit/material/Coal.java
|
|
+++ b/src/main/java/org/bukkit/material/Coal.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Coal extends MaterialData {
|
|
public Coal() {
|
|
super(Material.LEGACY_COAL);
|
|
diff --git a/src/main/java/org/bukkit/material/CocoaPlant.java b/src/main/java/org/bukkit/material/CocoaPlant.java
|
|
index b1b1c729d182b676d8ea69a8d3c942c6820863dd..f2baf516ea97de4ce55915cee0507f2c07e2f9d5 100644
|
|
--- a/src/main/java/org/bukkit/material/CocoaPlant.java
|
|
+++ b/src/main/java/org/bukkit/material/CocoaPlant.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class CocoaPlant extends MaterialData implements Directional, Attachable {
|
|
|
|
public enum CocoaPlantSize {
|
|
diff --git a/src/main/java/org/bukkit/material/Command.java b/src/main/java/org/bukkit/material/Command.java
|
|
index bcac1b08294569b218722278568b7106e1ce48f3..e8ac121789e8f3b3fe8982a660ed702f5e3a36c7 100644
|
|
--- a/src/main/java/org/bukkit/material/Command.java
|
|
+++ b/src/main/java/org/bukkit/material/Command.java
|
|
@@ -8,7 +8,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Command extends MaterialData implements Redstone {
|
|
public Command() {
|
|
super(Material.LEGACY_COMMAND);
|
|
diff --git a/src/main/java/org/bukkit/material/Comparator.java b/src/main/java/org/bukkit/material/Comparator.java
|
|
index 49d32d54438ad689bc7768342dc84d31e5f30285..7dcb7097119c0e170f29f04ff30d145966d78a1b 100644
|
|
--- a/src/main/java/org/bukkit/material/Comparator.java
|
|
+++ b/src/main/java/org/bukkit/material/Comparator.java
|
|
@@ -12,7 +12,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Comparator extends MaterialData implements Directional, Redstone {
|
|
protected static final BlockFace DEFAULT_DIRECTION = BlockFace.NORTH;
|
|
protected static final boolean DEFAULT_SUBTRACTION_MODE = false;
|
|
diff --git a/src/main/java/org/bukkit/material/Crops.java b/src/main/java/org/bukkit/material/Crops.java
|
|
index 4cf3de5fbba8617bc8edab9ca1c0ddee8033ed09..c73724d7b3ece146da6f7dd67167e7cd01fa3977 100644
|
|
--- a/src/main/java/org/bukkit/material/Crops.java
|
|
+++ b/src/main/java/org/bukkit/material/Crops.java
|
|
@@ -15,7 +15,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Crops extends MaterialData {
|
|
protected static final Material DEFAULT_TYPE = Material.LEGACY_CROPS;
|
|
protected static final CropState DEFAULT_STATE = CropState.SEEDED;
|
|
diff --git a/src/main/java/org/bukkit/material/DetectorRail.java b/src/main/java/org/bukkit/material/DetectorRail.java
|
|
index e8ab2904214f160c56aa01bc106d96f59042e706..6c7c021e654ab020d4a1638d2e9d8b438ea70fdd 100644
|
|
--- a/src/main/java/org/bukkit/material/DetectorRail.java
|
|
+++ b/src/main/java/org/bukkit/material/DetectorRail.java
|
|
@@ -8,7 +8,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class DetectorRail extends ExtendedRails implements PressureSensor {
|
|
public DetectorRail() {
|
|
super(Material.LEGACY_DETECTOR_RAIL);
|
|
diff --git a/src/main/java/org/bukkit/material/Diode.java b/src/main/java/org/bukkit/material/Diode.java
|
|
index 36a62258bcdea8136672ef6b2313a3877b3c724c..490f345cfd2e9e0da151bc81f52c50b41c5933ca 100644
|
|
--- a/src/main/java/org/bukkit/material/Diode.java
|
|
+++ b/src/main/java/org/bukkit/material/Diode.java
|
|
@@ -13,7 +13,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Diode extends MaterialData implements Directional, Redstone {
|
|
|
|
protected static final BlockFace DEFAULT_DIRECTION = BlockFace.NORTH;
|
|
diff --git a/src/main/java/org/bukkit/material/DirectionalContainer.java b/src/main/java/org/bukkit/material/DirectionalContainer.java
|
|
index 0190e5f3df5b86a0d8f912baf0570a4f54853829..6a8ec139c03a6dcdfcb8f55e5fac55f1c0c43156 100644
|
|
--- a/src/main/java/org/bukkit/material/DirectionalContainer.java
|
|
+++ b/src/main/java/org/bukkit/material/DirectionalContainer.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class DirectionalContainer extends MaterialData implements Directional {
|
|
|
|
public DirectionalContainer(final Material type) {
|
|
diff --git a/src/main/java/org/bukkit/material/Dispenser.java b/src/main/java/org/bukkit/material/Dispenser.java
|
|
index b12993a93781bd8a3d218a0dd102e357996ee79e..49e56116f0b224033c25b797e9c28011bbd9cf8f 100644
|
|
--- a/src/main/java/org/bukkit/material/Dispenser.java
|
|
+++ b/src/main/java/org/bukkit/material/Dispenser.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Dispenser extends FurnaceAndDispenser {
|
|
|
|
public Dispenser() {
|
|
diff --git a/src/main/java/org/bukkit/material/Door.java b/src/main/java/org/bukkit/material/Door.java
|
|
index d04ece5abab7a22abc4283d3043a52d4286d4103..48de4417c835db433e7a0884330b11a7afc39303 100644
|
|
--- a/src/main/java/org/bukkit/material/Door.java
|
|
+++ b/src/main/java/org/bukkit/material/Door.java
|
|
@@ -22,7 +22,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Door extends MaterialData implements Directional, Openable {
|
|
|
|
// This class breaks API contracts on Directional and Openable because
|
|
diff --git a/src/main/java/org/bukkit/material/Dye.java b/src/main/java/org/bukkit/material/Dye.java
|
|
index f34f23da74013006ec453b539bb10751dcb3ecee..b2cc9c9173742c9f88bb78b0fb2e2138db95e80c 100644
|
|
--- a/src/main/java/org/bukkit/material/Dye.java
|
|
+++ b/src/main/java/org/bukkit/material/Dye.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Dye extends MaterialData implements Colorable {
|
|
public Dye() {
|
|
super(Material.LEGACY_INK_SACK);
|
|
diff --git a/src/main/java/org/bukkit/material/EnderChest.java b/src/main/java/org/bukkit/material/EnderChest.java
|
|
index ad232cacd94230fbcabb894cf35d540aff1d8662..f621a3ba0056db8a1b5b734252aad676214b4128 100644
|
|
--- a/src/main/java/org/bukkit/material/EnderChest.java
|
|
+++ b/src/main/java/org/bukkit/material/EnderChest.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class EnderChest extends DirectionalContainer {
|
|
|
|
public EnderChest() {
|
|
diff --git a/src/main/java/org/bukkit/material/ExtendedRails.java b/src/main/java/org/bukkit/material/ExtendedRails.java
|
|
index 9b2577f7b5bab678d9e491323772ce616181ade3..fcea4a5169d1535b0696783fa73c05494702770d 100644
|
|
--- a/src/main/java/org/bukkit/material/ExtendedRails.java
|
|
+++ b/src/main/java/org/bukkit/material/ExtendedRails.java
|
|
@@ -10,7 +10,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class ExtendedRails extends Rails {
|
|
|
|
public ExtendedRails(final Material type) {
|
|
diff --git a/src/main/java/org/bukkit/material/FlowerPot.java b/src/main/java/org/bukkit/material/FlowerPot.java
|
|
index 6101e33288dded9ce871fe6c6f0b36c895d7214a..8fe99e15203cca6ed6b238ec3a7b57670940fbfb 100644
|
|
--- a/src/main/java/org/bukkit/material/FlowerPot.java
|
|
+++ b/src/main/java/org/bukkit/material/FlowerPot.java
|
|
@@ -10,7 +10,7 @@ import org.bukkit.TreeSpecies;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class FlowerPot extends MaterialData {
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/material/Furnace.java b/src/main/java/org/bukkit/material/Furnace.java
|
|
index 380f7f4b1f3adaa59c3202db02221abec2678fd7..338b37fbbbb165399cfd45ed109bd18cdf5a14b9 100644
|
|
--- a/src/main/java/org/bukkit/material/Furnace.java
|
|
+++ b/src/main/java/org/bukkit/material/Furnace.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Furnace extends FurnaceAndDispenser {
|
|
|
|
public Furnace() {
|
|
diff --git a/src/main/java/org/bukkit/material/FurnaceAndDispenser.java b/src/main/java/org/bukkit/material/FurnaceAndDispenser.java
|
|
index effa0d8a95ccbd58aa2b85a27cfccb4787e71422..e627c8ff419086a3bae221c65eeb2ec9453ab075 100644
|
|
--- a/src/main/java/org/bukkit/material/FurnaceAndDispenser.java
|
|
+++ b/src/main/java/org/bukkit/material/FurnaceAndDispenser.java
|
|
@@ -8,7 +8,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class FurnaceAndDispenser extends DirectionalContainer {
|
|
|
|
public FurnaceAndDispenser(final Material type) {
|
|
diff --git a/src/main/java/org/bukkit/material/Gate.java b/src/main/java/org/bukkit/material/Gate.java
|
|
index fc67fc59a75410f7aa70609ebc9538bfdecdd403..52d468ae5b21ea00b20314731ca26542d64e455b 100644
|
|
--- a/src/main/java/org/bukkit/material/Gate.java
|
|
+++ b/src/main/java/org/bukkit/material/Gate.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Gate extends MaterialData implements Directional, Openable {
|
|
private static final byte OPEN_BIT = 0x4;
|
|
private static final byte DIR_BIT = 0x3;
|
|
diff --git a/src/main/java/org/bukkit/material/Hopper.java b/src/main/java/org/bukkit/material/Hopper.java
|
|
index cfd32666c274383204dee9f9734ffb06184d2aaa..9983f53d05b5edc7a6bb54eaf65733639ccfa883 100644
|
|
--- a/src/main/java/org/bukkit/material/Hopper.java
|
|
+++ b/src/main/java/org/bukkit/material/Hopper.java
|
|
@@ -12,7 +12,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Hopper extends MaterialData implements Directional, Redstone {
|
|
|
|
protected static final BlockFace DEFAULT_DIRECTION = BlockFace.DOWN;
|
|
diff --git a/src/main/java/org/bukkit/material/Ladder.java b/src/main/java/org/bukkit/material/Ladder.java
|
|
index de263530823aa8c1ae8b4a9bd2497d7239156384..dcccad5a6a517fb5e2409363751e9f94fdc24241 100644
|
|
--- a/src/main/java/org/bukkit/material/Ladder.java
|
|
+++ b/src/main/java/org/bukkit/material/Ladder.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Ladder extends SimpleAttachableMaterialData {
|
|
public Ladder() {
|
|
super(Material.LEGACY_LADDER);
|
|
diff --git a/src/main/java/org/bukkit/material/Leaves.java b/src/main/java/org/bukkit/material/Leaves.java
|
|
index 923a794ac1d2f43b680165dfddb4119faf5ecdd1..75c52aeb4fc01dfc83a3985249d4d577d3aec578 100644
|
|
--- a/src/main/java/org/bukkit/material/Leaves.java
|
|
+++ b/src/main/java/org/bukkit/material/Leaves.java
|
|
@@ -13,7 +13,7 @@ import org.bukkit.TreeSpecies;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Leaves extends Wood {
|
|
protected static final Material DEFAULT_TYPE = Material.LEGACY_LEAVES;
|
|
protected static final boolean DEFAULT_DECAYABLE = true;
|
|
diff --git a/src/main/java/org/bukkit/material/Lever.java b/src/main/java/org/bukkit/material/Lever.java
|
|
index 09f290f8898914b77f89c1546f285a6e6212499e..9ed20612235775c6e6f93b1cea5d2b7e73c2aa83 100644
|
|
--- a/src/main/java/org/bukkit/material/Lever.java
|
|
+++ b/src/main/java/org/bukkit/material/Lever.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Lever extends SimpleAttachableMaterialData implements Redstone {
|
|
public Lever() {
|
|
super(Material.LEGACY_LEVER);
|
|
diff --git a/src/main/java/org/bukkit/material/LongGrass.java b/src/main/java/org/bukkit/material/LongGrass.java
|
|
index 497857ec37482ff477eab77d680b2a1bec52ea14..1c683ad7c4c72671e74c5d2d4b5f872adc9f9021 100644
|
|
--- a/src/main/java/org/bukkit/material/LongGrass.java
|
|
+++ b/src/main/java/org/bukkit/material/LongGrass.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class LongGrass extends MaterialData {
|
|
public LongGrass() {
|
|
super(Material.LEGACY_LONG_GRASS);
|
|
diff --git a/src/main/java/org/bukkit/material/MaterialData.java b/src/main/java/org/bukkit/material/MaterialData.java
|
|
index ccaddb87922b3afe22a350a3e5e5e7af86b2f398..b2b04456590b86a755b392a1ab4d88fa49f2b2bb 100644
|
|
--- a/src/main/java/org/bukkit/material/MaterialData.java
|
|
+++ b/src/main/java/org/bukkit/material/MaterialData.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.inventory.ItemStack;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class MaterialData implements Cloneable {
|
|
private final Material type;
|
|
private byte data = 0;
|
|
diff --git a/src/main/java/org/bukkit/material/MonsterEggs.java b/src/main/java/org/bukkit/material/MonsterEggs.java
|
|
index 2fac218f1e237d4b867c1e6215fe40151dcceaf0..4f450808ead1464b8cb7192bfaa8005ccb5e3d0c 100644
|
|
--- a/src/main/java/org/bukkit/material/MonsterEggs.java
|
|
+++ b/src/main/java/org/bukkit/material/MonsterEggs.java
|
|
@@ -10,7 +10,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class MonsterEggs extends TexturedMaterial {
|
|
|
|
private static final List<Material> textures = new ArrayList<Material>();
|
|
diff --git a/src/main/java/org/bukkit/material/Mushroom.java b/src/main/java/org/bukkit/material/Mushroom.java
|
|
index 8927b307adcc3c98aa96caea38ea2eb9338e284e..e219d29fde408d464015f51dc64b93a929e48320 100644
|
|
--- a/src/main/java/org/bukkit/material/Mushroom.java
|
|
+++ b/src/main/java/org/bukkit/material/Mushroom.java
|
|
@@ -17,7 +17,7 @@ import org.bukkit.material.types.MushroomBlockTexture;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Mushroom extends MaterialData {
|
|
private static final byte NORTH_LIMIT = 4;
|
|
private static final byte SOUTH_LIMIT = 6;
|
|
diff --git a/src/main/java/org/bukkit/material/NetherWarts.java b/src/main/java/org/bukkit/material/NetherWarts.java
|
|
index 1fed8b937a68bfd12d04e04b962e1627c36a074f..3d437cc6b35dbef4819b05326b86dfc926655a2a 100644
|
|
--- a/src/main/java/org/bukkit/material/NetherWarts.java
|
|
+++ b/src/main/java/org/bukkit/material/NetherWarts.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.NetherWartsState;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class NetherWarts extends MaterialData {
|
|
public NetherWarts() {
|
|
super(Material.LEGACY_NETHER_WARTS);
|
|
diff --git a/src/main/java/org/bukkit/material/Observer.java b/src/main/java/org/bukkit/material/Observer.java
|
|
index 843790b331e1ed1db9e46716251851b0782497c1..079b0569332102e3f5c427a5c97c01cb1a609e6c 100644
|
|
--- a/src/main/java/org/bukkit/material/Observer.java
|
|
+++ b/src/main/java/org/bukkit/material/Observer.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Observer extends MaterialData implements Directional, Redstone {
|
|
|
|
public Observer() {
|
|
diff --git a/src/main/java/org/bukkit/material/Openable.java b/src/main/java/org/bukkit/material/Openable.java
|
|
index 0ae54f973d11df74abb3105cf9226afb130b4f33..df2c2a774155d79ccf6fa7f366fe011ae4a43b90 100644
|
|
--- a/src/main/java/org/bukkit/material/Openable.java
|
|
+++ b/src/main/java/org/bukkit/material/Openable.java
|
|
@@ -1,5 +1,6 @@
|
|
package org.bukkit.material;
|
|
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public interface Openable {
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/material/PistonBaseMaterial.java b/src/main/java/org/bukkit/material/PistonBaseMaterial.java
|
|
index 8165e94339097ac5cf8e27ebc60256c8fefd7d63..e7d05b6873c11f531cbea167ee006942bbc2249b 100644
|
|
--- a/src/main/java/org/bukkit/material/PistonBaseMaterial.java
|
|
+++ b/src/main/java/org/bukkit/material/PistonBaseMaterial.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class PistonBaseMaterial extends MaterialData implements Directional, Redstone {
|
|
|
|
public PistonBaseMaterial(final Material type) {
|
|
diff --git a/src/main/java/org/bukkit/material/PistonExtensionMaterial.java b/src/main/java/org/bukkit/material/PistonExtensionMaterial.java
|
|
index e7cfc7158b5d31376ddb8f5415e22e76c6d62f10..9ab0b57a492a6d503ad72d41f3a52b358d73361a 100644
|
|
--- a/src/main/java/org/bukkit/material/PistonExtensionMaterial.java
|
|
+++ b/src/main/java/org/bukkit/material/PistonExtensionMaterial.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class PistonExtensionMaterial extends MaterialData implements Attachable {
|
|
|
|
public PistonExtensionMaterial(final Material type) {
|
|
diff --git a/src/main/java/org/bukkit/material/PoweredRail.java b/src/main/java/org/bukkit/material/PoweredRail.java
|
|
index feebc5c7359098d41abcccb1f1d8afe2a54a9130..27c8974c8fe68af51960dbad91dd424c9c3bfd17 100644
|
|
--- a/src/main/java/org/bukkit/material/PoweredRail.java
|
|
+++ b/src/main/java/org/bukkit/material/PoweredRail.java
|
|
@@ -8,7 +8,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class PoweredRail extends ExtendedRails implements Redstone {
|
|
public PoweredRail() {
|
|
super(Material.LEGACY_POWERED_RAIL);
|
|
diff --git a/src/main/java/org/bukkit/material/PressurePlate.java b/src/main/java/org/bukkit/material/PressurePlate.java
|
|
index ffababbc1b1ef1f19e941beb6412457b839e92eb..0d7f0a7d0001ebbf9920e8d2f82786c5dae6d2e8 100644
|
|
--- a/src/main/java/org/bukkit/material/PressurePlate.java
|
|
+++ b/src/main/java/org/bukkit/material/PressurePlate.java
|
|
@@ -8,7 +8,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class PressurePlate extends MaterialData implements PressureSensor {
|
|
public PressurePlate() {
|
|
super(Material.LEGACY_WOOD_PLATE);
|
|
diff --git a/src/main/java/org/bukkit/material/Pumpkin.java b/src/main/java/org/bukkit/material/Pumpkin.java
|
|
index 7c1b5eea0aba649bc9ed6b05836609e7cda314c0..c9241e64ade6e2aac739159c088aa3bee6bdd219 100644
|
|
--- a/src/main/java/org/bukkit/material/Pumpkin.java
|
|
+++ b/src/main/java/org/bukkit/material/Pumpkin.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Pumpkin extends MaterialData implements Directional {
|
|
|
|
public Pumpkin() {
|
|
diff --git a/src/main/java/org/bukkit/material/Rails.java b/src/main/java/org/bukkit/material/Rails.java
|
|
index 0b041ee66c38cb884a0d69d1cc17df3fe25f7533..de12e71214ed22e40925a1b65260694c80321ff0 100644
|
|
--- a/src/main/java/org/bukkit/material/Rails.java
|
|
+++ b/src/main/java/org/bukkit/material/Rails.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Rails extends MaterialData {
|
|
|
|
public Rails() {
|
|
diff --git a/src/main/java/org/bukkit/material/Redstone.java b/src/main/java/org/bukkit/material/Redstone.java
|
|
index 3e46603f8cd38041394e0e1baf788d9009b3ffc7..eb621f34d0461c9bfe1bd7535344b6778e7b39c5 100644
|
|
--- a/src/main/java/org/bukkit/material/Redstone.java
|
|
+++ b/src/main/java/org/bukkit/material/Redstone.java
|
|
@@ -3,6 +3,7 @@ package org.bukkit.material;
|
|
/**
|
|
* Indicated a Material that may carry or create a Redstone current
|
|
*/
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public interface Redstone {
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/material/RedstoneTorch.java b/src/main/java/org/bukkit/material/RedstoneTorch.java
|
|
index 40956914366195f8a658952923ea7e92235dc4a8..b46b2dde7cd74abd8e05a5222856efdf551ec2ad 100644
|
|
--- a/src/main/java/org/bukkit/material/RedstoneTorch.java
|
|
+++ b/src/main/java/org/bukkit/material/RedstoneTorch.java
|
|
@@ -8,7 +8,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class RedstoneTorch extends Torch implements Redstone {
|
|
public RedstoneTorch() {
|
|
super(Material.LEGACY_REDSTONE_TORCH_ON);
|
|
diff --git a/src/main/java/org/bukkit/material/RedstoneWire.java b/src/main/java/org/bukkit/material/RedstoneWire.java
|
|
index 8877ef48eb8de20b220d40c8068e5da2566d6109..b21be01e753fa16159161ebfea46586ca3895313 100644
|
|
--- a/src/main/java/org/bukkit/material/RedstoneWire.java
|
|
+++ b/src/main/java/org/bukkit/material/RedstoneWire.java
|
|
@@ -8,7 +8,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class RedstoneWire extends MaterialData implements Redstone {
|
|
public RedstoneWire() {
|
|
super(Material.LEGACY_REDSTONE_WIRE);
|
|
diff --git a/src/main/java/org/bukkit/material/Sandstone.java b/src/main/java/org/bukkit/material/Sandstone.java
|
|
index 8d8673edcd19d03077e7d53388c3ba2e9d80a618..8c52df074acdf51957502782615786d3bb2752ed 100644
|
|
--- a/src/main/java/org/bukkit/material/Sandstone.java
|
|
+++ b/src/main/java/org/bukkit/material/Sandstone.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.SandstoneType;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Sandstone extends MaterialData {
|
|
public Sandstone() {
|
|
super(Material.LEGACY_SANDSTONE);
|
|
diff --git a/src/main/java/org/bukkit/material/Sapling.java b/src/main/java/org/bukkit/material/Sapling.java
|
|
index c615a0022256887022ba7f347c19005478c35691..93d1bcac74ea8c4159462786865b6512713d5d91 100644
|
|
--- a/src/main/java/org/bukkit/material/Sapling.java
|
|
+++ b/src/main/java/org/bukkit/material/Sapling.java
|
|
@@ -11,7 +11,7 @@ import org.bukkit.TreeSpecies;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Sapling extends Wood {
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/material/Sign.java b/src/main/java/org/bukkit/material/Sign.java
|
|
index 3b32679b4a670aaaaeb0481265d189a3bb99bdca..d96002acf89e67c6eb29d1d572192d461bb072b3 100644
|
|
--- a/src/main/java/org/bukkit/material/Sign.java
|
|
+++ b/src/main/java/org/bukkit/material/Sign.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Sign extends MaterialData implements Attachable {
|
|
public Sign() {
|
|
super(Material.LEGACY_SIGN_POST);
|
|
diff --git a/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java b/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java
|
|
index 6267d81ba2e9dde3f8a1063df66940086b4f5fce..2d1b640a8ff5d4492408f64e6b01af9ab0ce839e 100644
|
|
--- a/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java
|
|
+++ b/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public abstract class SimpleAttachableMaterialData extends MaterialData implements Attachable {
|
|
|
|
public SimpleAttachableMaterialData(Material type, BlockFace direction) {
|
|
diff --git a/src/main/java/org/bukkit/material/Skull.java b/src/main/java/org/bukkit/material/Skull.java
|
|
index a73ad62468a9589f78e270a82cd9ac8ff1b240b2..bebe06be7279ce1c14c8c81ee58202f2ca3c3e20 100644
|
|
--- a/src/main/java/org/bukkit/material/Skull.java
|
|
+++ b/src/main/java/org/bukkit/material/Skull.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Skull extends MaterialData implements Directional {
|
|
public Skull() {
|
|
super(Material.LEGACY_SKULL);
|
|
diff --git a/src/main/java/org/bukkit/material/SmoothBrick.java b/src/main/java/org/bukkit/material/SmoothBrick.java
|
|
index e4812b7cef9847745d147aad87181c4eb903f5df..171771ab8d3a0b095ed74c4da608a61769f6a2f1 100644
|
|
--- a/src/main/java/org/bukkit/material/SmoothBrick.java
|
|
+++ b/src/main/java/org/bukkit/material/SmoothBrick.java
|
|
@@ -10,7 +10,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class SmoothBrick extends TexturedMaterial {
|
|
|
|
private static final List<Material> textures = new ArrayList<Material>();
|
|
diff --git a/src/main/java/org/bukkit/material/SpawnEgg.java b/src/main/java/org/bukkit/material/SpawnEgg.java
|
|
index a177021d259110ebf0c26e5a19cea5d9f6f3a8a8..f14a918b41d61869bc3b4a644011f4d2260c19ae 100644
|
|
--- a/src/main/java/org/bukkit/material/SpawnEgg.java
|
|
+++ b/src/main/java/org/bukkit/material/SpawnEgg.java
|
|
@@ -8,7 +8,7 @@ import org.bukkit.inventory.meta.SpawnEggMeta;
|
|
* Represents a spawn egg that can be used to spawn mobs
|
|
* @deprecated use {@link SpawnEggMeta}
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class SpawnEgg extends MaterialData {
|
|
|
|
public SpawnEgg() {
|
|
diff --git a/src/main/java/org/bukkit/material/Stairs.java b/src/main/java/org/bukkit/material/Stairs.java
|
|
index e5db60bd0d5c0d4990d418cf89415274c7698a9d..e7fe9cec387e2c86549cfad086839a241840582d 100644
|
|
--- a/src/main/java/org/bukkit/material/Stairs.java
|
|
+++ b/src/main/java/org/bukkit/material/Stairs.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Stairs extends MaterialData implements Directional {
|
|
|
|
public Stairs(final Material type) {
|
|
diff --git a/src/main/java/org/bukkit/material/Step.java b/src/main/java/org/bukkit/material/Step.java
|
|
index ea94222120ddd4e692b67cf48b029af9ed0e5835..b7417693ff9efc5d6fc9d1899b0bb03c9664f903 100644
|
|
--- a/src/main/java/org/bukkit/material/Step.java
|
|
+++ b/src/main/java/org/bukkit/material/Step.java
|
|
@@ -10,7 +10,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Step extends TexturedMaterial {
|
|
private static final List<Material> textures = new ArrayList<Material>();
|
|
static {
|
|
diff --git a/src/main/java/org/bukkit/material/TexturedMaterial.java b/src/main/java/org/bukkit/material/TexturedMaterial.java
|
|
index 6e0a834794453eff7b3efc93e90c9bf49ef7c688..fcac4e6aafd906c14683f0ab0843a7b9ca4d62c7 100644
|
|
--- a/src/main/java/org/bukkit/material/TexturedMaterial.java
|
|
+++ b/src/main/java/org/bukkit/material/TexturedMaterial.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public abstract class TexturedMaterial extends MaterialData {
|
|
|
|
public TexturedMaterial(Material m) {
|
|
diff --git a/src/main/java/org/bukkit/material/Torch.java b/src/main/java/org/bukkit/material/Torch.java
|
|
index a4f0c62dcd39f94a68bca8cc76311847118d9ad1..2dafb1bb9779cc25471b5dfc0176a81014e8c840 100644
|
|
--- a/src/main/java/org/bukkit/material/Torch.java
|
|
+++ b/src/main/java/org/bukkit/material/Torch.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Torch extends SimpleAttachableMaterialData {
|
|
public Torch() {
|
|
super(Material.LEGACY_TORCH);
|
|
diff --git a/src/main/java/org/bukkit/material/TrapDoor.java b/src/main/java/org/bukkit/material/TrapDoor.java
|
|
index effedfc714d67254428b548bba74264cdba4ba15..ed8035f3f45d07a08346efeebf206bcfdb083bc6 100644
|
|
--- a/src/main/java/org/bukkit/material/TrapDoor.java
|
|
+++ b/src/main/java/org/bukkit/material/TrapDoor.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class TrapDoor extends SimpleAttachableMaterialData implements Openable {
|
|
public TrapDoor() {
|
|
super(Material.LEGACY_TRAP_DOOR);
|
|
diff --git a/src/main/java/org/bukkit/material/Tree.java b/src/main/java/org/bukkit/material/Tree.java
|
|
index e759f50339903ab10f50bebe56bab5cfe8d9f7e0..4f79b8ac23e4851da9ed41858eafaffa39efb59a 100644
|
|
--- a/src/main/java/org/bukkit/material/Tree.java
|
|
+++ b/src/main/java/org/bukkit/material/Tree.java
|
|
@@ -13,7 +13,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Tree extends Wood {
|
|
protected static final Material DEFAULT_TYPE = Material.LEGACY_LOG;
|
|
protected static final BlockFace DEFAULT_DIRECTION = BlockFace.UP;
|
|
diff --git a/src/main/java/org/bukkit/material/Tripwire.java b/src/main/java/org/bukkit/material/Tripwire.java
|
|
index e5ffa4db87b435df8c04f1b43521fda6493fd43d..eb667f22b7a143d695cf78219986230c57ab229f 100644
|
|
--- a/src/main/java/org/bukkit/material/Tripwire.java
|
|
+++ b/src/main/java/org/bukkit/material/Tripwire.java
|
|
@@ -8,7 +8,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Tripwire extends MaterialData {
|
|
|
|
public Tripwire() {
|
|
diff --git a/src/main/java/org/bukkit/material/TripwireHook.java b/src/main/java/org/bukkit/material/TripwireHook.java
|
|
index 80aa1c7bc7a1ef71b51101b154361feff4dcf88e..8a19008272897fa32b0b30504545a9873b82a54c 100644
|
|
--- a/src/main/java/org/bukkit/material/TripwireHook.java
|
|
+++ b/src/main/java/org/bukkit/material/TripwireHook.java
|
|
@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class TripwireHook extends SimpleAttachableMaterialData implements Redstone {
|
|
|
|
public TripwireHook() {
|
|
diff --git a/src/main/java/org/bukkit/material/Vine.java b/src/main/java/org/bukkit/material/Vine.java
|
|
index 07a4f3b1511e274affe751aad2b9020b49df815f..574b09896f25e42e20c8953e9668cc4edae31348 100644
|
|
--- a/src/main/java/org/bukkit/material/Vine.java
|
|
+++ b/src/main/java/org/bukkit/material/Vine.java
|
|
@@ -11,7 +11,7 @@ import org.bukkit.block.BlockFace;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Vine extends MaterialData {
|
|
private static final int VINE_NORTH = 0x4;
|
|
private static final int VINE_EAST = 0x8;
|
|
diff --git a/src/main/java/org/bukkit/material/Wood.java b/src/main/java/org/bukkit/material/Wood.java
|
|
index 5d51c9286dbf71ff4bb8717d5e83431b1815770e..2d4556ce2367395d42d622d94f073de9ae4e4a36 100644
|
|
--- a/src/main/java/org/bukkit/material/Wood.java
|
|
+++ b/src/main/java/org/bukkit/material/Wood.java
|
|
@@ -13,7 +13,7 @@ import org.bukkit.TreeSpecies;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Wood extends MaterialData {
|
|
protected static final Material DEFAULT_TYPE = Material.LEGACY_WOOD;
|
|
protected static final TreeSpecies DEFAULT_SPECIES = TreeSpecies.GENERIC;
|
|
diff --git a/src/main/java/org/bukkit/material/WoodenStep.java b/src/main/java/org/bukkit/material/WoodenStep.java
|
|
index b99a9a304d1c14c187ad2721424d5e5caed90973..827bcd7284919a7f7a71a3ea53c2c67bbbca378b 100644
|
|
--- a/src/main/java/org/bukkit/material/WoodenStep.java
|
|
+++ b/src/main/java/org/bukkit/material/WoodenStep.java
|
|
@@ -11,7 +11,7 @@ import org.bukkit.TreeSpecies;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class WoodenStep extends Wood {
|
|
protected static final Material DEFAULT_TYPE = Material.LEGACY_WOOD_STEP;
|
|
protected static final boolean DEFAULT_INVERTED = false;
|
|
diff --git a/src/main/java/org/bukkit/material/Wool.java b/src/main/java/org/bukkit/material/Wool.java
|
|
index 3b17409a98b53538989a8d2d5ad1b80643befeab..c5b32246f9d777d5b02f27ca616bdf8323a14ccd 100644
|
|
--- a/src/main/java/org/bukkit/material/Wool.java
|
|
+++ b/src/main/java/org/bukkit/material/Wool.java
|
|
@@ -8,7 +8,7 @@ import org.bukkit.Material;
|
|
* @deprecated all usage of MaterialData is deprecated and subject to removal.
|
|
* Use {@link org.bukkit.block.data.BlockData}.
|
|
*/
|
|
-@Deprecated
|
|
+@Deprecated(forRemoval = true, since = "1.13")
|
|
public class Wool extends MaterialData implements Colorable {
|
|
public Wool() {
|
|
super(Material.LEGACY_WOOL);
|
|
diff --git a/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java b/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java
|
|
index 0ea9c6b2420a0f990bd1fdf50fc015e37a7060d8..e99644eae1c662b117aa19060d2484aca19fe0a4 100644
|
|
--- a/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java
|
|
+++ b/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java
|
|
@@ -7,7 +7,9 @@ import org.jetbrains.annotations.Nullable;
|
|
|
|
/**
|
|
* Represents the different textured blocks of mushroom.
|
|
+ * @deprecated use BlockData
|
|
*/
|
|
+@Deprecated // Paper
|
|
public enum MushroomBlockTexture {
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
|
|
index bd9ea2fe16b81f5ef5e83427e49c898db69cd4dc..e2d1d26b9debbe1ef852f0260180200a916a7db7 100644
|
|
--- a/src/main/java/org/bukkit/potion/PotionEffectType.java
|
|
+++ b/src/main/java/org/bukkit/potion/PotionEffectType.java
|
|
@@ -278,9 +278,9 @@ public abstract class PotionEffectType implements Keyed, Translatable {
|
|
* Returns the unique ID of this type.
|
|
*
|
|
* @return Unique ID
|
|
- * @deprecated Magic value
|
|
+ * @deprecated use {@link #key()}
|
|
*/
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper
|
|
public abstract int getId();
|
|
|
|
/**
|
|
@@ -316,9 +316,9 @@ public abstract class PotionEffectType implements Keyed, Translatable {
|
|
*
|
|
* @param id Unique ID to fetch
|
|
* @return Resulting type, or null if not found.
|
|
- * @deprecated Magic value
|
|
+ * @apiNote Internal Use Only
|
|
*/
|
|
- @Deprecated
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper
|
|
@Nullable
|
|
public static PotionEffectType getById(int id) {
|
|
PotionEffectType type = ID_MAP.get(id);
|
|
diff --git a/src/test/java/org/bukkit/materials/MaterialDataTest.java b/src/test/java/org/bukkit/materials/MaterialDataTest.java
|
|
index 8d78435cc42a9e668b2d4d674b79b4094c3bd1b1..24a8ce4387b897c717b55405f363ffafff45894d 100644
|
|
--- a/src/test/java/org/bukkit/materials/MaterialDataTest.java
|
|
+++ b/src/test/java/org/bukkit/materials/MaterialDataTest.java
|
|
@@ -22,6 +22,7 @@ import org.bukkit.material.WoodenStep;
|
|
import org.bukkit.material.types.MushroomBlockTexture;
|
|
import org.junit.jupiter.api.Test;
|
|
|
|
+@Deprecated // Paper
|
|
public class MaterialDataTest {
|
|
|
|
@Test
|