diff --git a/patches/api/Fix-Spigot-annotation-mistakes.patch b/patches/api/Fix-Spigot-annotation-mistakes.patch
index 737d2fa2b..4d4b2d3ae 100644
--- a/patches/api/Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/Fix-Spigot-annotation-mistakes.patch
@@ -98,7 +98,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  /**
   * Represents the two types of coal
   */
-+@Deprecated // Paper
++@Deprecated(forRemoval = true, since = "1.13")
  public enum CoalType {
      COAL(0x0),
      CHARCOAL(0x1);
@@ -110,7 +110,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  /**
   * Represents the different growth states of crops
   */
-+@Deprecated // Paper
++@Deprecated(forRemoval = true, since = "1.13")
  public enum CropState {
  
      /**
@@ -264,7 +264,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
   * Represents the different types of grass.
 + * @deprecated use {@link org.bukkit.block.data.BlockData}
   */
-+@Deprecated // Paper
++@Deprecated(forRemoval = true, since = "1.13")
  public enum GrassSpecies {
  
      /**
@@ -383,7 +383,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +/**
 + * @deprecated use {@link org.bukkit.block.data.BlockData} and {@link org.bukkit.block.data.Ageable}
 + */
-+@Deprecated
++@Deprecated(forRemoval = true, since = "1.13")
 +// Paper end
  public enum NetherWartsState {
  
@@ -493,7 +493,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
   * Represents the three different types of Sandstone
 + * @deprecated use {@link org.bukkit.block.data.BlockData}
   */
-+@Deprecated // Paper
++@Deprecated(forRemoval = true, since = "1.13")
  public enum SandstoneType {
      CRACKED(0x0),
      GLYPHED(0x1),
@@ -547,6 +547,32 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    @NotNull // Paper
      ScoreboardManager getScoreboardManager();
  
+     /**
+diff --git a/src/main/java/org/bukkit/SkullType.java b/src/main/java/org/bukkit/SkullType.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/SkullType.java
++++ b/src/main/java/org/bukkit/SkullType.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/TreeSpecies.java
++++ b/src/main/java/org/bukkit/TreeSpecies.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
@@ -674,7 +700,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #getBlockData()}
       */
      @NotNull
-+    @Deprecated // Paper
++    @Deprecated(forRemoval = true, since = "1.13")
      MaterialData getData();
  
      /**
@@ -684,7 +710,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * @param data New block specific metadata
 +     * @deprecated use {@link #setBlockData(BlockData)}
       */
-+    @Deprecated // Paper
++    @Deprecated(forRemoval = true, since = "1.13")
      void setData(@NotNull MaterialData data);
  
      /**
@@ -729,6 +755,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/block/SuspiciousSand.java
++++ b/src/main/java/org/bukkit/block/SuspiciousSand.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java
@@ -766,7 +804,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #getCarriedBlock()}
       */
      @NotNull
-+    @Deprecated // Paper
++    @Deprecated(forRemoval = true, since = "1.13")
      public MaterialData getCarriedMaterial();
  
      /**
@@ -775,7 +813,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * @param material data to set the carried block to
 +     * @deprecated use {@link #setCarriedBlock(BlockData)}
       */
-+    @Deprecated // Paper
++    @Deprecated(forRemoval = true, since = "1.13")
      public void setCarriedMaterial(@NotNull MaterialData material);
  
      /**
@@ -884,7 +922,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * @param material the material to set as display block.
 +     * @deprecated use {@link #setDisplayBlockData(BlockData)}
       */
-+    @Deprecated // Paper
++    @Deprecated(forRemoval = true, since = "1.13")
      public void setDisplayBlock(@Nullable MaterialData material);
  
      /**
@@ -895,7 +933,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #getDisplayBlockData()}
       */
      @NotNull
-+    @Deprecated // Paper
++    @Deprecated(forRemoval = true, since = "1.13")
      public MaterialData getDisplayBlock();
  
      /**
@@ -1513,6 +1551,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import org.bukkit.Utility;
  import org.bukkit.configuration.serialization.ConfigurationSerializable;
  import org.bukkit.enchantments.Enchantment;
+@@ -0,0 +0,0 @@ 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()) {
 @@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
       * Gets the MaterialData for this stack of items
       *
@@ -1520,7 +1567,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated cast to {@link org.bukkit.inventory.meta.BlockDataMeta} and use {@link org.bukkit.inventory.meta.BlockDataMeta#getBlockData(Material)}
       */
      @Nullable
-+    @Deprecated // Paper
++    @Deprecated(forRemoval = true, since = "1.13")
      public MaterialData getData() {
          Material mat = Bukkit.getUnsafe().toLegacy(getType());
          if (data == null && mat != null && mat.getData() != null) {
@@ -1530,7 +1577,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * @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
++    @Deprecated(forRemoval = true, since = "1.13")
      public void setData(@Nullable MaterialData data) {
          if (data == null) {
              this.data = data;
@@ -1919,6 +1966,435 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Banner.java
++++ b/src/main/java/org/bukkit/material/Banner.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Bed.java
++++ b/src/main/java/org/bukkit/material/Bed.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Button.java
++++ b/src/main/java/org/bukkit/material/Button.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Cake.java
++++ b/src/main/java/org/bukkit/material/Cake.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Cauldron.java
++++ b/src/main/java/org/bukkit/material/Cauldron.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Chest.java
++++ b/src/main/java/org/bukkit/material/Chest.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Coal.java
++++ b/src/main/java/org/bukkit/material/Coal.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/CocoaPlant.java
++++ b/src/main/java/org/bukkit/material/CocoaPlant.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Command.java
++++ b/src/main/java/org/bukkit/material/Command.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Comparator.java
++++ b/src/main/java/org/bukkit/material/Comparator.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Crops.java
++++ b/src/main/java/org/bukkit/material/Crops.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/DetectorRail.java
++++ b/src/main/java/org/bukkit/material/DetectorRail.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Diode.java
++++ b/src/main/java/org/bukkit/material/Diode.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/DirectionalContainer.java
++++ b/src/main/java/org/bukkit/material/DirectionalContainer.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Dispenser.java
++++ b/src/main/java/org/bukkit/material/Dispenser.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Door.java
++++ b/src/main/java/org/bukkit/material/Door.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Dye.java
++++ b/src/main/java/org/bukkit/material/Dye.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/EnderChest.java
++++ b/src/main/java/org/bukkit/material/EnderChest.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/ExtendedRails.java
++++ b/src/main/java/org/bukkit/material/ExtendedRails.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/FlowerPot.java
++++ b/src/main/java/org/bukkit/material/FlowerPot.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Furnace.java
++++ b/src/main/java/org/bukkit/material/Furnace.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/FurnaceAndDispenser.java
++++ b/src/main/java/org/bukkit/material/FurnaceAndDispenser.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Gate.java
++++ b/src/main/java/org/bukkit/material/Gate.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Hopper.java
++++ b/src/main/java/org/bukkit/material/Hopper.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Ladder.java
++++ b/src/main/java/org/bukkit/material/Ladder.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Leaves.java
++++ b/src/main/java/org/bukkit/material/Leaves.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Lever.java
++++ b/src/main/java/org/bukkit/material/Lever.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/LongGrass.java
++++ b/src/main/java/org/bukkit/material/LongGrass.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/MaterialData.java
++++ b/src/main/java/org/bukkit/material/MaterialData.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/MonsterEggs.java
++++ b/src/main/java/org/bukkit/material/MonsterEggs.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Mushroom.java
++++ b/src/main/java/org/bukkit/material/Mushroom.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/NetherWarts.java
++++ b/src/main/java/org/bukkit/material/NetherWarts.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Observer.java
++++ b/src/main/java/org/bukkit/material/Observer.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/material/Openable.java
@@ -1926,10 +2402,88 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
  package org.bukkit.material;
  
-+@Deprecated // Paper
++@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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/PistonBaseMaterial.java
++++ b/src/main/java/org/bukkit/material/PistonBaseMaterial.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/PistonExtensionMaterial.java
++++ b/src/main/java/org/bukkit/material/PistonExtensionMaterial.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/PoweredRail.java
++++ b/src/main/java/org/bukkit/material/PoweredRail.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/PressurePlate.java
++++ b/src/main/java/org/bukkit/material/PressurePlate.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Pumpkin.java
++++ b/src/main/java/org/bukkit/material/Pumpkin.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Rails.java
++++ b/src/main/java/org/bukkit/material/Rails.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/material/Redstone.java
@@ -1938,10 +2492,283 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  /**
   * Indicated a Material that may carry or create a Redstone current
   */
-+@Deprecated // Paper
++@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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/RedstoneTorch.java
++++ b/src/main/java/org/bukkit/material/RedstoneTorch.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/RedstoneWire.java
++++ b/src/main/java/org/bukkit/material/RedstoneWire.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Sandstone.java
++++ b/src/main/java/org/bukkit/material/Sandstone.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Sapling.java
++++ b/src/main/java/org/bukkit/material/Sapling.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Sign.java
++++ b/src/main/java/org/bukkit/material/Sign.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java
++++ b/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Skull.java
++++ b/src/main/java/org/bukkit/material/Skull.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/SmoothBrick.java
++++ b/src/main/java/org/bukkit/material/SmoothBrick.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/SpawnEgg.java
++++ b/src/main/java/org/bukkit/material/SpawnEgg.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Stairs.java
++++ b/src/main/java/org/bukkit/material/Stairs.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Step.java
++++ b/src/main/java/org/bukkit/material/Step.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/TexturedMaterial.java
++++ b/src/main/java/org/bukkit/material/TexturedMaterial.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Torch.java
++++ b/src/main/java/org/bukkit/material/Torch.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/TrapDoor.java
++++ b/src/main/java/org/bukkit/material/TrapDoor.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Tree.java
++++ b/src/main/java/org/bukkit/material/Tree.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Tripwire.java
++++ b/src/main/java/org/bukkit/material/Tripwire.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/TripwireHook.java
++++ b/src/main/java/org/bukkit/material/TripwireHook.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Vine.java
++++ b/src/main/java/org/bukkit/material/Vine.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Wood.java
++++ b/src/main/java/org/bukkit/material/Wood.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/WoodenStep.java
++++ b/src/main/java/org/bukkit/material/WoodenStep.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/material/Wool.java
++++ b/src/main/java/org/bukkit/material/Wool.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java