Start working on 1.19.4

1 files changed, 0 insertions, 933 deletions

diff --git a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch
deleted file mode 100644
index 005e2563d7..0000000000
--- a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch
+++ /dev/null
@@ -1,933 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-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.
-
-These do not help plugin developers if they bring moise noise than value.
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c59700bcec0938bd5a0f10c4e0d5e3e2c446d622..9abb50fb10bb2fbd21d5f31e54b135416cae3433 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1200,10 +1200,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);
-@@ -1752,7 +1750,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/GrassSpecies.java b/src/main/java/org/bukkit/GrassSpecies.java
-index f9c9ae463aacd593e3aa9caf037ea1e23d56c780..f8ae143acbf586d5279b44f7311ca97f3ae4ead2 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 // Paper
- public enum GrassSpecies {
- 
-     /**
-diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 20978b269a7757a561d6b872cc77898b44bbd272..2b9a117804a8ca54b47e51e23359bd6e01087641 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 a4a85c62e87c18e38ba16e3966a41e6631ec8add..e883bb46461eb40b018ebe8c07caff96046fd11d 100644
---- a/src/main/java/org/bukkit/Material.java
-+++ b/src/main/java/org/bukkit/Material.java
-@@ -4303,11 +4303,11 @@ public enum Material implements Keyed, Translatable {
-     }
- 
-     /**
--     * 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;
-     }
-@@ -4378,8 +4378,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();
-diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index dbc22807a33606f8fe326cc2f5f755fee5edc7aa..1416918d1924b362a688635823484f16e6adf125 100644
---- a/src/main/java/org/bukkit/NamespacedKey.java
-+++ b/src/main/java/org/bukkit/NamespacedKey.java
-@@ -73,12 +73,14 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key, com.des
- 
-     /**
-      * 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
--     * @deprecated should never be used by plugins, for internal use only!!
-+     * @see #NamespacedKey(Plugin, String)
-      */
--    @Deprecated
-     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..f0094e6fb05e526736629ad3181c8d2c16ba6ca4 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
-+// Paper end
- public enum NetherWartsState {
- 
-     /**
-diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index ea80520c19cd3dd6aa25665c748d96fd4a3f6e40..ff1fcdaccbca81602278a0b52670f7b895ba22b7 100644
---- a/src/main/java/org/bukkit/Registry.java
-+++ b/src/main/java/org/bukkit/Registry.java
-@@ -229,8 +229,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..10f5cfb1885833a1d2c1027c03974da45ab28e2f 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 // Paper
- 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 7e51025404bdc64e5eff48423280ad53244c6631..60897ff659a468f80f6ddf554c8facb136ecb24b 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1001,10 +1001,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);
- 
-@@ -1470,7 +1468,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/UndefinedNullability.java b/src/main/java/org/bukkit/UndefinedNullability.java
-index f465ea001c190e10eb99db818559d302e5512e99..567f560d145dea6fc7240699175496156c468a6d 100644
---- a/src/main/java/org/bukkit/UndefinedNullability.java
-+++ b/src/main/java/org/bukkit/UndefinedNullability.java
-@@ -13,6 +13,7 @@ import java.lang.annotation.RetentionPolicy;
-  * suggests a bad API design.
-  */
- @Retention(RetentionPolicy.CLASS)
[email protected] // Paper
- @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 0ece998826c8e5d5a02a4a348172274b82bb2086..f57e59dd5db687fb4feb13e8283e4ff327c3e8c4 100644
---- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -430,9 +430,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);
- 
-     /**
-@@ -2145,8 +2144,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
-      * @return The spawned {@link FallingBlock} instance
-      * @throws IllegalArgumentException if {@link Location} or {@link
-      *     MaterialData} are null or {@link Material} of the {@link MaterialData} is not a block
-+     * @deprecated use {@link #spawnFallingBlock(Location, BlockData)}
-      */
-     @NotNull
-+    @Deprecated // Paper
-     public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull MaterialData data) throws IllegalArgumentException;
- 
-     /**
-diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
-index 631cbf2be51040eee00aa39a39c5ec4003f91843..3147e278eac674ed21d714bbe318b135c0a6b408 100644
---- a/src/main/java/org/bukkit/block/BlockState.java
-+++ b/src/main/java/org/bukkit/block/BlockState.java
-@@ -35,8 +35,10 @@ public interface BlockState extends Metadatable {
-      * Gets the metadata for this block state.
-      *
-      * @return block specific metadata
-+     * @deprecated use {@link #getBlockData()}
-      */
-     @NotNull
-+    @Deprecated // Paper
-     MaterialData getData();
- 
-     /**
-@@ -131,7 +133,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 // Paper
-     void setData(@NotNull MaterialData data);
- 
-     /**
-diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java
-index 821c690f8a32918bdb284ffec4af98f411f76ccc..94f3a8c4bf8cf14263d34d866db66728e98dfdb0 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 // Paper
-     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 // Paper
-     public void setCarriedMaterial(@NotNull MaterialData material);
- 
-     /**
-diff --git a/src/main/java/org/bukkit/entity/LingeringPotion.java b/src/main/java/org/bukkit/entity/LingeringPotion.java
-index f124b35ec76e6cb6a1a0dc464005087043c3efd0..f50aaddf8582be55fd4860ad374d8f2206991897 100644
---- a/src/main/java/org/bukkit/entity/LingeringPotion.java
-+++ b/src/main/java/org/bukkit/entity/LingeringPotion.java
-@@ -3,6 +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(forRemoval = true) // Paper
- public interface LingeringPotion extends ThrownPotion { }
-diff --git a/src/main/java/org/bukkit/entity/Minecart.java b/src/main/java/org/bukkit/entity/Minecart.java
-index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..7f9c4d4b430a3f0276461346ff2621bacf864075 100644
---- a/src/main/java/org/bukkit/entity/Minecart.java
-+++ b/src/main/java/org/bukkit/entity/Minecart.java
-@@ -101,7 +101,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 // Paper
-     public void setDisplayBlock(@Nullable MaterialData material);
- 
-     /**
-@@ -109,8 +111,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 // Paper
-     public MaterialData getDisplayBlock();
- 
-     /**
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 98b50de33b9c48e25da0a19747cd1599df5becfc..fec96fff783995ccb7df24bd40368885ed9eefa1 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1432,9 +1432,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      *
-      * @param plugin Plugin that wants to hide the entity
-      * @param entity Entity to hide
--     * @deprecated draft API
-      */
--    @Deprecated
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper
-     public void hideEntity(@NotNull Plugin plugin, @NotNull Entity entity);
- 
-     /**
-@@ -1444,9 +1443,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      *
-      * @param plugin Plugin that wants to show the entity
-      * @param entity Entity to show
--     * @deprecated draft API
-      */
--    @Deprecated
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper
-     public void showEntity(@NotNull Plugin plugin, @NotNull Entity entity);
- 
-     /**
-@@ -1455,9 +1453,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @param entity Entity to check
-      * @return True if the provided entity is not being hidden from this
-      *     player
--     * @deprecated draft API
-      */
--    @Deprecated
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper
-     public boolean canSee(@NotNull Entity entity);
- 
-     /**
-diff --git a/src/main/java/org/bukkit/entity/Projectile.java b/src/main/java/org/bukkit/entity/Projectile.java
-index c854860c13912f9a8707eb825cca23763d1323a6..a523fca4baab447181ef91df67fa69b24e010149 100644
---- a/src/main/java/org/bukkit/entity/Projectile.java
-+++ b/src/main/java/org/bukkit/entity/Projectile.java
-@@ -29,7 +29,9 @@ public interface Projectile extends Entity {
-      * If a small fireball does not bounce it will set the target on fire.
-      *
-      * @return true if it should bounce.
-+     * @deprecated Does not do anything
-      */
-+    @Deprecated(forRemoval = true) // Paper
-     public boolean doesBounce();
- 
-     /**
-@@ -37,6 +39,8 @@ public interface Projectile extends Entity {
-      * something.
-      *
-      * @param doesBounce whether or not it should bounce.
-+     * @deprecated Does not do anything
-      */
-+    @Deprecated(forRemoval = true) // Paper
-     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/event/enchantment/PrepareItemEnchantEvent.java b/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
-index 2ff1b1308571d8f8056d3359e8a8ba4a589c3726..8eb6f4090578d9e1b12aff813840108fdeece730 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 InventoryView view, @NotNull final Block table, @NotNull final ItemStack item, @NotNull final EnchantmentOffer[] offers, final int bonus) {
-+    public PrepareItemEnchantEvent(@NotNull final Player enchanter, @NotNull InventoryView 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;
-@@ -68,6 +68,7 @@ public class PrepareItemEnchantEvent extends InventoryEvent implements Cancellab
-      * @return experience level costs offered
-      * @deprecated Use {@link #getOffers()} instead of this method
-      */
-+    @Deprecated // Paper
-     @NotNull
-     public int[] getExpLevelCostsOffered() {
-         int[] levelOffers = new int[offers.length];
-@@ -85,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/player/PlayerHideEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java
-index d8a73cd22268e90eb438f522b9019f826f343275..78869fdb9cf4c541dff7d67b51866914987abf18 100644
---- a/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java
-@@ -15,9 +15,8 @@ import org.jetbrains.annotations.NotNull;
-  * This event is called regardless of if the entity was within tracking range.
-  *
-  * @see Player#hideEntity(org.bukkit.plugin.Plugin, org.bukkit.entity.Entity)
-- * @deprecated draft API
-  */
--@Deprecated
[email protected] // Paper
- @Warning(false)
- public class PlayerHideEntityEvent extends PlayerEvent {
- 
-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/player/PlayerShowEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java
-index 5408a8c123942a56ef11597ae6cdb77e14f741e3..29bb84145be18ef9162abdfc8820f2b3f7fd0db5 100644
---- a/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java
-@@ -16,9 +16,8 @@ import org.jetbrains.annotations.NotNull;
-  * range.
-  *
-  * @see Player#showEntity(org.bukkit.plugin.Plugin, org.bukkit.entity.Entity)
-- * @deprecated draft API
-  */
--@Deprecated
[email protected] // Paper
- @Warning(false)
- public class PlayerShowEntityEvent extends PlayerEvent {
- 
-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 0cc6e29a5af28e95f87f415d6b2424d4622a6f34..acba500393e1736e6081facac6ef9ab10da655de 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 a91fa5386afd7a1137adb921ad5adb798604772f..42f76751ec414648ee719c341d471d947bf85be6 100644
---- a/src/main/java/org/bukkit/inventory/EntityEquipment.java
-+++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java
-@@ -511,6 +511,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/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 66ffc658dba85942f179760dc6c50258e24ab903..50fe28b48d885c782278bdb53a0bbae303f4a32d 100644
---- a/src/main/java/org/bukkit/inventory/ItemFactory.java
-+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
-@@ -26,7 +26,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 a70de962712c14cb895708e89ad3811041728935..b15645cd56c245214bb5b87b36395fbc8e86e3d3 100644
---- a/src/main/java/org/bukkit/inventory/ItemStack.java
-+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -8,6 +8,7 @@ import java.util.Map;
- import org.bukkit.Bukkit;
- import org.bukkit.Material;
- import org.bukkit.Translatable;
-+import org.bukkit.UndefinedNullability;
- import org.bukkit.Utility;
- import org.bukkit.configuration.serialization.ConfigurationSerializable;
- import org.bukkit.enchantments.Enchantment;
-@@ -68,6 +69,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
-      * @param damage durability / damage
-      * @deprecated see {@link #setDurability(short)}
-      */
-+    @Deprecated // Paper
-     public ItemStack(@NotNull final Material type, final int amount, final short damage) {
-         this(type, amount, damage, null);
-     }
-@@ -169,8 +171,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 // Paper
-     public MaterialData getData() {
-         Material mat = Bukkit.getUnsafe().toLegacy(getType());
-         if (data == null && mat != null && mat.getData() != null) {
-@@ -184,7 +188,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 // Paper
-     public void setData(@Nullable MaterialData data) {
-         if (data == null) {
-             this.data = data;
-@@ -546,7 +552,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 5461f7fa75f5a065bb333b4a113640b5fe1e3825..c4d657727e508cb941320730a9d3aa5486712ef3 100644
---- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
-+++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-@@ -14,8 +14,7 @@ public interface PlayerInventory extends Inventory {
-      *
-      * @return All the ItemStacks from the armor slots. Individual items can be null.
-      */
--    @NotNull
--    public ItemStack[] getArmorContents();
-+    public @Nullable ItemStack @NotNull [] getArmorContents(); // Paper - make array elements nullable instead array
- 
-     /**
-      * Get all additional ItemStacks stored in this inventory.
-@@ -26,8 +25,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
-@@ -104,9 +102,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 baba8485587baab945add8bc91e91a1bfa27c84b..038a82b865afee02380805bd1f3816149143c811 100644
---- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-+++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-@@ -97,8 +97,10 @@ public class ShapedRecipe implements Recipe, Keyed {
-      * @param key The character that represents the ingredient in the shape.
-      * @param ingredient The ingredient.
-      * @return The changed recipe, so you can chain calls.
-+     * @deprecated use {@link #setIngredient(char, RecipeChoice)}
-      */
-     @NotNull
-+    @Deprecated // Paper
-     public ShapedRecipe setIngredient(char key, @NotNull MaterialData ingredient) {
-         return setIngredient(key, ingredient.getItemType(), ingredient.getData());
-     }
-@@ -157,7 +159,9 @@ public class ShapedRecipe implements Recipe, Keyed {
-      * 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 61b3a1b1d03fe6cdacb82b07e6c7197f56b4a1b3..402eef14987f00d2a5fccc45f0b7e3b1c16706dc 100644
---- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-+++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-@@ -56,8 +56,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
-      *
-      * @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);
-     }
-@@ -93,8 +95,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
-      * @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());
-     }
-@@ -211,8 +215,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
-      *
-      * @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());
-     }
-@@ -239,8 +245,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
-      * @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());
-     }
-@@ -301,7 +309,9 @@ public class ShapelessRecipe implements Recipe, Keyed {
-      * 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 07c3dff4d6190ef388d9c1e1c36f67f00a3e8e66..aa5e7f37d20d6976f33e04876ae625ed0e5b2b41 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 35009498aafd1bd36c493085127135fc8a5c36ec..1beedb446a9dd554d05d1d94dba8598e4b69eba6 100644
---- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -74,8 +74,10 @@ 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 // Paper - Deprecate old localized API
-     boolean hasLocalizedName();
- 
-     /**
-@@ -84,16 +86,20 @@ 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 // Paper - Deprecate old localized API
-     @NotNull
-     String getLocalizedName();
- 
-     /**
-      * 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 // Paper - Deprecate old localized API
-     void setLocalizedName(@Nullable String name);
- 
-     /**
-diff --git a/src/main/java/org/bukkit/material/Step.java b/src/main/java/org/bukkit/material/Step.java
-index 9f502e7ee05d0512e190a1722cc112ece068c4e2..10c0465cf58d680bfa9a0f9233f94e8b6d5a9b93 100644
---- a/src/main/java/org/bukkit/material/Step.java
-+++ b/src/main/java/org/bukkit/material/Step.java
-@@ -78,6 +78,7 @@ public class Step extends TexturedMaterial {
-      *
-      * @deprecated Magic value
-      */
-+    @Deprecated // Paper
-     @Override
-     protected int getTextureIndex() {
-         return getData() & 0x7;
-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 {
- 
-     /**