diff --git a/paper-api/src/main/java/org/bukkit/material/Banner.java b/paper-api/src/main/java/org/bukkit/material/Banner.java
index 517b36826a..02d5fb67fb 100644
--- a/paper-api/src/main/java/org/bukkit/material/Banner.java
+++ b/paper-api/src/main/java/org/bukkit/material/Banner.java
@@ -3,6 +3,11 @@ package org.bukkit.material;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 
+/**
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
+ */
+@Deprecated
 public class Banner extends MaterialData implements Attachable {
 
     public Banner() {
diff --git a/paper-api/src/main/java/org/bukkit/material/Bed.java b/paper-api/src/main/java/org/bukkit/material/Bed.java
index 406e7e33bf..c5256129e0 100644
--- a/paper-api/src/main/java/org/bukkit/material/Bed.java
+++ b/paper-api/src/main/java/org/bukkit/material/Bed.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents a bed.
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Bed extends MaterialData implements Directional {
 
     /**
diff --git a/paper-api/src/main/java/org/bukkit/material/Button.java b/paper-api/src/main/java/org/bukkit/material/Button.java
index 7cdfdb14d7..da7d016cf1 100644
--- a/paper-api/src/main/java/org/bukkit/material/Button.java
+++ b/paper-api/src/main/java/org/bukkit/material/Button.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents a button
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Button extends SimpleAttachableMaterialData implements Redstone {
     public Button() {
         super(Material.LEGACY_STONE_BUTTON);
diff --git a/paper-api/src/main/java/org/bukkit/material/Cake.java b/paper-api/src/main/java/org/bukkit/material/Cake.java
index 25e3db4869..d39dd49162 100644
--- a/paper-api/src/main/java/org/bukkit/material/Cake.java
+++ b/paper-api/src/main/java/org/bukkit/material/Cake.java
@@ -2,6 +2,11 @@ package org.bukkit.material;
 
 import org.bukkit.Material;
 
+/**
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
+ */
+@Deprecated
 public class Cake extends MaterialData {
     public Cake() {
         super(Material.LEGACY_CAKE_BLOCK);
diff --git a/paper-api/src/main/java/org/bukkit/material/Cauldron.java b/paper-api/src/main/java/org/bukkit/material/Cauldron.java
index 90e7a5aff0..f998396c3d 100644
--- a/paper-api/src/main/java/org/bukkit/material/Cauldron.java
+++ b/paper-api/src/main/java/org/bukkit/material/Cauldron.java
@@ -4,7 +4,11 @@ import org.bukkit.Material;
 
 /**
  * Represents a cauldron
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Cauldron extends MaterialData {
     private static final int CAULDRON_FULL = 3;
     private static final int CAULDRON_EMPTY = 0;
diff --git a/paper-api/src/main/java/org/bukkit/material/Chest.java b/paper-api/src/main/java/org/bukkit/material/Chest.java
index 48ef0b8ccc..4d120d3c33 100644
--- a/paper-api/src/main/java/org/bukkit/material/Chest.java
+++ b/paper-api/src/main/java/org/bukkit/material/Chest.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents a chest
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Chest extends DirectionalContainer {
 
     public Chest() {
diff --git a/paper-api/src/main/java/org/bukkit/material/Coal.java b/paper-api/src/main/java/org/bukkit/material/Coal.java
index 1ac6faaf68..fb842cfa7b 100644
--- a/paper-api/src/main/java/org/bukkit/material/Coal.java
+++ b/paper-api/src/main/java/org/bukkit/material/Coal.java
@@ -5,7 +5,11 @@ import org.bukkit.Material;
 
 /**
  * Represents the different types of coals.
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Coal extends MaterialData {
     public Coal() {
         super(Material.LEGACY_COAL);
diff --git a/paper-api/src/main/java/org/bukkit/material/CocoaPlant.java b/paper-api/src/main/java/org/bukkit/material/CocoaPlant.java
index 4c780581e8..b1b1c729d1 100644
--- a/paper-api/src/main/java/org/bukkit/material/CocoaPlant.java
+++ b/paper-api/src/main/java/org/bukkit/material/CocoaPlant.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents the cocoa plant
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class CocoaPlant extends MaterialData implements Directional, Attachable {
 
     public enum CocoaPlantSize {
diff --git a/paper-api/src/main/java/org/bukkit/material/Command.java b/paper-api/src/main/java/org/bukkit/material/Command.java
index 09e69be6ba..bcac1b0829 100644
--- a/paper-api/src/main/java/org/bukkit/material/Command.java
+++ b/paper-api/src/main/java/org/bukkit/material/Command.java
@@ -4,7 +4,11 @@ import org.bukkit.Material;
 
 /**
  * Represents a command block
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Command extends MaterialData implements Redstone {
     public Command() {
         super(Material.LEGACY_COMMAND);
diff --git a/paper-api/src/main/java/org/bukkit/material/Comparator.java b/paper-api/src/main/java/org/bukkit/material/Comparator.java
index 3464e8b709..49d32d5443 100644
--- a/paper-api/src/main/java/org/bukkit/material/Comparator.java
+++ b/paper-api/src/main/java/org/bukkit/material/Comparator.java
@@ -8,7 +8,11 @@ import org.bukkit.block.BlockFace;
  *
  * @see Material#LEGACY_REDSTONE_COMPARATOR_OFF
  * @see Material#LEGACY_REDSTONE_COMPARATOR_ON
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 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/paper-api/src/main/java/org/bukkit/material/Crops.java b/paper-api/src/main/java/org/bukkit/material/Crops.java
index 0706f7a2e0..4cf3de5fbb 100644
--- a/paper-api/src/main/java/org/bukkit/material/Crops.java
+++ b/paper-api/src/main/java/org/bukkit/material/Crops.java
@@ -11,7 +11,11 @@ import org.bukkit.Material;
  * @see Material#LEGACY_POTATO
  * @see Material#LEGACY_BEETROOT_BLOCK
  * @see Material#LEGACY_NETHER_WARTS
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 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/paper-api/src/main/java/org/bukkit/material/DetectorRail.java b/paper-api/src/main/java/org/bukkit/material/DetectorRail.java
index 593e025ee7..e8ab290421 100644
--- a/paper-api/src/main/java/org/bukkit/material/DetectorRail.java
+++ b/paper-api/src/main/java/org/bukkit/material/DetectorRail.java
@@ -4,7 +4,11 @@ import org.bukkit.Material;
 
 /**
  * Represents a detector rail
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class DetectorRail extends ExtendedRails implements PressureSensor {
     public DetectorRail() {
         super(Material.LEGACY_DETECTOR_RAIL);
diff --git a/paper-api/src/main/java/org/bukkit/material/Diode.java b/paper-api/src/main/java/org/bukkit/material/Diode.java
index 9b7d02ef62..36a62258bc 100644
--- a/paper-api/src/main/java/org/bukkit/material/Diode.java
+++ b/paper-api/src/main/java/org/bukkit/material/Diode.java
@@ -9,7 +9,11 @@ import org.bukkit.block.BlockFace;
  *
  * @see Material#LEGACY_DIODE_BLOCK_OFF
  * @see Material#LEGACY_DIODE_BLOCK_ON
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Diode extends MaterialData implements Directional, Redstone {
 
     protected static final BlockFace DEFAULT_DIRECTION = BlockFace.NORTH;
diff --git a/paper-api/src/main/java/org/bukkit/material/DirectionalContainer.java b/paper-api/src/main/java/org/bukkit/material/DirectionalContainer.java
index c25dea8cbd..0190e5f3df 100644
--- a/paper-api/src/main/java/org/bukkit/material/DirectionalContainer.java
+++ b/paper-api/src/main/java/org/bukkit/material/DirectionalContainer.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents a furnace or a dispenser.
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class DirectionalContainer extends MaterialData implements Directional {
 
     public DirectionalContainer(final Material type) {
diff --git a/paper-api/src/main/java/org/bukkit/material/Dispenser.java b/paper-api/src/main/java/org/bukkit/material/Dispenser.java
index efc62ca5b2..b12993a937 100644
--- a/paper-api/src/main/java/org/bukkit/material/Dispenser.java
+++ b/paper-api/src/main/java/org/bukkit/material/Dispenser.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents a dispenser.
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Dispenser extends FurnaceAndDispenser {
 
     public Dispenser() {
diff --git a/paper-api/src/main/java/org/bukkit/material/Door.java b/paper-api/src/main/java/org/bukkit/material/Door.java
index ae488dd617..d04ece5aba 100644
--- a/paper-api/src/main/java/org/bukkit/material/Door.java
+++ b/paper-api/src/main/java/org/bukkit/material/Door.java
@@ -18,7 +18,11 @@ import org.bukkit.block.BlockFace;
  * @see Material#LEGACY_JUNGLE_DOOR
  * @see Material#LEGACY_ACACIA_DOOR
  * @see Material#LEGACY_DARK_OAK_DOOR
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Door extends MaterialData implements Directional, Openable {
 
     // This class breaks API contracts on Directional and Openable because
diff --git a/paper-api/src/main/java/org/bukkit/material/Dye.java b/paper-api/src/main/java/org/bukkit/material/Dye.java
index 9635cb6e28..f34f23da74 100644
--- a/paper-api/src/main/java/org/bukkit/material/Dye.java
+++ b/paper-api/src/main/java/org/bukkit/material/Dye.java
@@ -5,7 +5,11 @@ import org.bukkit.Material;
 
 /**
  * Represents dye
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Dye extends MaterialData implements Colorable {
     public Dye() {
         super(Material.LEGACY_INK_SACK);
diff --git a/paper-api/src/main/java/org/bukkit/material/EnderChest.java b/paper-api/src/main/java/org/bukkit/material/EnderChest.java
index c03eb018f4..ad232cacd9 100644
--- a/paper-api/src/main/java/org/bukkit/material/EnderChest.java
+++ b/paper-api/src/main/java/org/bukkit/material/EnderChest.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents an ender chest
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class EnderChest extends DirectionalContainer {
 
     public EnderChest() {
diff --git a/paper-api/src/main/java/org/bukkit/material/ExtendedRails.java b/paper-api/src/main/java/org/bukkit/material/ExtendedRails.java
index 9d7906c11b..5f70e5bde2 100644
--- a/paper-api/src/main/java/org/bukkit/material/ExtendedRails.java
+++ b/paper-api/src/main/java/org/bukkit/material/ExtendedRails.java
@@ -6,7 +6,11 @@ import org.bukkit.block.BlockFace;
 /**
  * This is the superclass for the {@link DetectorRail} and {@link PoweredRail}
  * classes
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class ExtendedRails extends Rails {
 
     public ExtendedRails(final Material type) {
diff --git a/paper-api/src/main/java/org/bukkit/material/Furnace.java b/paper-api/src/main/java/org/bukkit/material/Furnace.java
index 1a9190fe81..380f7f4b1f 100644
--- a/paper-api/src/main/java/org/bukkit/material/Furnace.java
+++ b/paper-api/src/main/java/org/bukkit/material/Furnace.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents a furnace.
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Furnace extends FurnaceAndDispenser {
 
     public Furnace() {
diff --git a/paper-api/src/main/java/org/bukkit/material/FurnaceAndDispenser.java b/paper-api/src/main/java/org/bukkit/material/FurnaceAndDispenser.java
index fbe4083086..effa0d8a95 100644
--- a/paper-api/src/main/java/org/bukkit/material/FurnaceAndDispenser.java
+++ b/paper-api/src/main/java/org/bukkit/material/FurnaceAndDispenser.java
@@ -4,7 +4,11 @@ import org.bukkit.Material;
 
 /**
  * Represents a furnace or dispenser, two types of directional containers
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class FurnaceAndDispenser extends DirectionalContainer {
 
     public FurnaceAndDispenser(final Material type) {
diff --git a/paper-api/src/main/java/org/bukkit/material/Gate.java b/paper-api/src/main/java/org/bukkit/material/Gate.java
index 7d635aa791..fc67fc59a7 100644
--- a/paper-api/src/main/java/org/bukkit/material/Gate.java
+++ b/paper-api/src/main/java/org/bukkit/material/Gate.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents a fence gate
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 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/paper-api/src/main/java/org/bukkit/material/Hopper.java b/paper-api/src/main/java/org/bukkit/material/Hopper.java
index 832d148a7a..cfd32666c2 100644
--- a/paper-api/src/main/java/org/bukkit/material/Hopper.java
+++ b/paper-api/src/main/java/org/bukkit/material/Hopper.java
@@ -8,7 +8,11 @@ import org.bukkit.block.BlockFace;
  * specific direction.
  *
  * @see Material#HOPPER
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Hopper extends MaterialData implements Directional, Redstone {
 
     protected static final BlockFace DEFAULT_DIRECTION = BlockFace.DOWN;
diff --git a/paper-api/src/main/java/org/bukkit/material/Ladder.java b/paper-api/src/main/java/org/bukkit/material/Ladder.java
index b0d13a0078..de26353082 100644
--- a/paper-api/src/main/java/org/bukkit/material/Ladder.java
+++ b/paper-api/src/main/java/org/bukkit/material/Ladder.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents Ladder data
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Ladder extends SimpleAttachableMaterialData {
     public Ladder() {
         super(Material.LEGACY_LADDER);
diff --git a/paper-api/src/main/java/org/bukkit/material/Leaves.java b/paper-api/src/main/java/org/bukkit/material/Leaves.java
index f118fbab1f..923a794ac1 100644
--- a/paper-api/src/main/java/org/bukkit/material/Leaves.java
+++ b/paper-api/src/main/java/org/bukkit/material/Leaves.java
@@ -9,7 +9,11 @@ import org.bukkit.TreeSpecies;
  *
  * @see Material#LEGACY_LEAVES
  * @see Material#LEGACY_LEAVES_2
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Leaves extends Wood {
     protected static final Material DEFAULT_TYPE = Material.LEGACY_LEAVES;
     protected static final boolean DEFAULT_DECAYABLE = true;
diff --git a/paper-api/src/main/java/org/bukkit/material/Lever.java b/paper-api/src/main/java/org/bukkit/material/Lever.java
index 8892f78dde..09f290f889 100644
--- a/paper-api/src/main/java/org/bukkit/material/Lever.java
+++ b/paper-api/src/main/java/org/bukkit/material/Lever.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents a lever
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Lever extends SimpleAttachableMaterialData implements Redstone {
     public Lever() {
         super(Material.LEGACY_LEVER);
diff --git a/paper-api/src/main/java/org/bukkit/material/LongGrass.java b/paper-api/src/main/java/org/bukkit/material/LongGrass.java
index 7592ca7ff2..497857ec37 100644
--- a/paper-api/src/main/java/org/bukkit/material/LongGrass.java
+++ b/paper-api/src/main/java/org/bukkit/material/LongGrass.java
@@ -5,7 +5,11 @@ import org.bukkit.Material;
 
 /**
  * Represents the different types of long grasses.
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class LongGrass extends MaterialData {
     public LongGrass() {
         super(Material.LEGACY_LONG_GRASS);
diff --git a/paper-api/src/main/java/org/bukkit/material/MaterialData.java b/paper-api/src/main/java/org/bukkit/material/MaterialData.java
index a6483e0841..ccaddb8792 100644
--- a/paper-api/src/main/java/org/bukkit/material/MaterialData.java
+++ b/paper-api/src/main/java/org/bukkit/material/MaterialData.java
@@ -1,14 +1,13 @@
 package org.bukkit.material;
 
 import org.bukkit.Material;
-import org.bukkit.block.data.BlockData;
 import org.bukkit.inventory.ItemStack;
 
 /**
  * Handles specific metadata for certain items or blocks
  *
  * @deprecated all usage of MaterialData is deprecated and subject to removal.
- * Use {@link BlockData}.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
 @Deprecated
 public class MaterialData implements Cloneable {
diff --git a/paper-api/src/main/java/org/bukkit/material/MonsterEggs.java b/paper-api/src/main/java/org/bukkit/material/MonsterEggs.java
index a6205344d3..2fac218f1e 100644
--- a/paper-api/src/main/java/org/bukkit/material/MonsterEggs.java
+++ b/paper-api/src/main/java/org/bukkit/material/MonsterEggs.java
@@ -6,7 +6,11 @@ import org.bukkit.Material;
 
 /**
  * Represents the different types of monster eggs
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class MonsterEggs extends TexturedMaterial {
 
     private static final List<Material> textures = new ArrayList<Material>();
diff --git a/paper-api/src/main/java/org/bukkit/material/Mushroom.java b/paper-api/src/main/java/org/bukkit/material/Mushroom.java
index b291422cf3..543b76c8a6 100644
--- a/paper-api/src/main/java/org/bukkit/material/Mushroom.java
+++ b/paper-api/src/main/java/org/bukkit/material/Mushroom.java
@@ -13,7 +13,11 @@ import org.bukkit.material.types.MushroomBlockTexture;
  *
  * @see Material#LEGACY_HUGE_MUSHROOM_1
  * @see Material#LEGACY_HUGE_MUSHROOM_2
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Mushroom extends MaterialData {
     private static final byte NORTH_LIMIT = 4;
     private static final byte SOUTH_LIMIT = 6;
diff --git a/paper-api/src/main/java/org/bukkit/material/NetherWarts.java b/paper-api/src/main/java/org/bukkit/material/NetherWarts.java
index 09d5a9f891..1fed8b937a 100644
--- a/paper-api/src/main/java/org/bukkit/material/NetherWarts.java
+++ b/paper-api/src/main/java/org/bukkit/material/NetherWarts.java
@@ -5,7 +5,11 @@ import org.bukkit.NetherWartsState;
 
 /**
  * Represents nether wart
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class NetherWarts extends MaterialData {
     public NetherWarts() {
         super(Material.LEGACY_NETHER_WARTS);
diff --git a/paper-api/src/main/java/org/bukkit/material/Observer.java b/paper-api/src/main/java/org/bukkit/material/Observer.java
index afedb9304a..843790b331 100644
--- a/paper-api/src/main/java/org/bukkit/material/Observer.java
+++ b/paper-api/src/main/java/org/bukkit/material/Observer.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents an observer.
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Observer extends MaterialData implements Directional, Redstone {
 
     public Observer() {
diff --git a/paper-api/src/main/java/org/bukkit/material/PistonBaseMaterial.java b/paper-api/src/main/java/org/bukkit/material/PistonBaseMaterial.java
index 0f985e0633..8165e94339 100644
--- a/paper-api/src/main/java/org/bukkit/material/PistonBaseMaterial.java
+++ b/paper-api/src/main/java/org/bukkit/material/PistonBaseMaterial.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Material data for the piston base block
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class PistonBaseMaterial extends MaterialData implements Directional, Redstone {
 
     public PistonBaseMaterial(final Material type) {
diff --git a/paper-api/src/main/java/org/bukkit/material/PistonExtensionMaterial.java b/paper-api/src/main/java/org/bukkit/material/PistonExtensionMaterial.java
index 6435f234cc..e7cfc7158b 100644
--- a/paper-api/src/main/java/org/bukkit/material/PistonExtensionMaterial.java
+++ b/paper-api/src/main/java/org/bukkit/material/PistonExtensionMaterial.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Material data for the piston extension block
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class PistonExtensionMaterial extends MaterialData implements Attachable {
 
     public PistonExtensionMaterial(final Material type) {
diff --git a/paper-api/src/main/java/org/bukkit/material/PoweredRail.java b/paper-api/src/main/java/org/bukkit/material/PoweredRail.java
index 96efd3ce39..feebc5c735 100644
--- a/paper-api/src/main/java/org/bukkit/material/PoweredRail.java
+++ b/paper-api/src/main/java/org/bukkit/material/PoweredRail.java
@@ -4,7 +4,11 @@ import org.bukkit.Material;
 
 /**
  * Represents a powered rail
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class PoweredRail extends ExtendedRails implements Redstone {
     public PoweredRail() {
         super(Material.LEGACY_POWERED_RAIL);
diff --git a/paper-api/src/main/java/org/bukkit/material/PressurePlate.java b/paper-api/src/main/java/org/bukkit/material/PressurePlate.java
index bc1f57f055..ffababbc1b 100644
--- a/paper-api/src/main/java/org/bukkit/material/PressurePlate.java
+++ b/paper-api/src/main/java/org/bukkit/material/PressurePlate.java
@@ -4,7 +4,11 @@ import org.bukkit.Material;
 
 /**
  * Represents a pressure plate
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class PressurePlate extends MaterialData implements PressureSensor {
     public PressurePlate() {
         super(Material.LEGACY_WOOD_PLATE);
diff --git a/paper-api/src/main/java/org/bukkit/material/Pumpkin.java b/paper-api/src/main/java/org/bukkit/material/Pumpkin.java
index 1ee690aec5..7c1b5eea0a 100644
--- a/paper-api/src/main/java/org/bukkit/material/Pumpkin.java
+++ b/paper-api/src/main/java/org/bukkit/material/Pumpkin.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents a pumpkin.
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Pumpkin extends MaterialData implements Directional {
 
     public Pumpkin() {
diff --git a/paper-api/src/main/java/org/bukkit/material/Rails.java b/paper-api/src/main/java/org/bukkit/material/Rails.java
index 2c2420efec..0b041ee66c 100644
--- a/paper-api/src/main/java/org/bukkit/material/Rails.java
+++ b/paper-api/src/main/java/org/bukkit/material/Rails.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents minecart rails.
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Rails extends MaterialData {
 
     public Rails() {
diff --git a/paper-api/src/main/java/org/bukkit/material/RedstoneTorch.java b/paper-api/src/main/java/org/bukkit/material/RedstoneTorch.java
index 683eccef84..4095691436 100644
--- a/paper-api/src/main/java/org/bukkit/material/RedstoneTorch.java
+++ b/paper-api/src/main/java/org/bukkit/material/RedstoneTorch.java
@@ -4,7 +4,11 @@ import org.bukkit.Material;
 
 /**
  * Represents a redstone torch
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class RedstoneTorch extends Torch implements Redstone {
     public RedstoneTorch() {
         super(Material.LEGACY_REDSTONE_TORCH_ON);
diff --git a/paper-api/src/main/java/org/bukkit/material/RedstoneWire.java b/paper-api/src/main/java/org/bukkit/material/RedstoneWire.java
index a65ccd4c74..8877ef48eb 100644
--- a/paper-api/src/main/java/org/bukkit/material/RedstoneWire.java
+++ b/paper-api/src/main/java/org/bukkit/material/RedstoneWire.java
@@ -4,7 +4,11 @@ import org.bukkit.Material;
 
 /**
  * Represents redstone wire
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class RedstoneWire extends MaterialData implements Redstone {
     public RedstoneWire() {
         super(Material.LEGACY_REDSTONE_WIRE);
diff --git a/paper-api/src/main/java/org/bukkit/material/Sandstone.java b/paper-api/src/main/java/org/bukkit/material/Sandstone.java
index c2f882c222..8d8673edcd 100644
--- a/paper-api/src/main/java/org/bukkit/material/Sandstone.java
+++ b/paper-api/src/main/java/org/bukkit/material/Sandstone.java
@@ -5,7 +5,11 @@ import org.bukkit.SandstoneType;
 
 /**
  * Represents the different types of sandstone.
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Sandstone extends MaterialData {
     public Sandstone() {
         super(Material.LEGACY_SANDSTONE);
diff --git a/paper-api/src/main/java/org/bukkit/material/Sapling.java b/paper-api/src/main/java/org/bukkit/material/Sapling.java
index db2bae9ff0..c615a00222 100644
--- a/paper-api/src/main/java/org/bukkit/material/Sapling.java
+++ b/paper-api/src/main/java/org/bukkit/material/Sapling.java
@@ -7,7 +7,11 @@ import org.bukkit.TreeSpecies;
  * Represents the different types of Tree block that face a direction.
  *
  * @see Material#LEGACY_SAPLING
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Sapling extends Wood {
 
     /**
diff --git a/paper-api/src/main/java/org/bukkit/material/Sign.java b/paper-api/src/main/java/org/bukkit/material/Sign.java
index 64a79a2240..3b32679b4a 100644
--- a/paper-api/src/main/java/org/bukkit/material/Sign.java
+++ b/paper-api/src/main/java/org/bukkit/material/Sign.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * MaterialData for signs
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Sign extends MaterialData implements Attachable {
     public Sign() {
         super(Material.LEGACY_SIGN_POST);
diff --git a/paper-api/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java b/paper-api/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java
index d5a38c5552..6267d81ba2 100644
--- a/paper-api/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java
+++ b/paper-api/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Simple utility class for attachable MaterialData subclasses
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public abstract class SimpleAttachableMaterialData extends MaterialData implements Attachable {
 
     public SimpleAttachableMaterialData(Material type, BlockFace direction) {
diff --git a/paper-api/src/main/java/org/bukkit/material/Skull.java b/paper-api/src/main/java/org/bukkit/material/Skull.java
index a1936e8c99..a73ad62468 100644
--- a/paper-api/src/main/java/org/bukkit/material/Skull.java
+++ b/paper-api/src/main/java/org/bukkit/material/Skull.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents a skull.
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Skull extends MaterialData implements Directional {
     public Skull() {
         super(Material.LEGACY_SKULL);
diff --git a/paper-api/src/main/java/org/bukkit/material/SmoothBrick.java b/paper-api/src/main/java/org/bukkit/material/SmoothBrick.java
index ebe328e6f0..e4812b7cef 100644
--- a/paper-api/src/main/java/org/bukkit/material/SmoothBrick.java
+++ b/paper-api/src/main/java/org/bukkit/material/SmoothBrick.java
@@ -6,7 +6,11 @@ import org.bukkit.Material;
 
 /**
  * Represents the different types of smooth bricks.
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class SmoothBrick extends TexturedMaterial {
 
     private static final List<Material> textures = new ArrayList<Material>();
diff --git a/paper-api/src/main/java/org/bukkit/material/Stairs.java b/paper-api/src/main/java/org/bukkit/material/Stairs.java
index aae8339876..e5db60bd0d 100644
--- a/paper-api/src/main/java/org/bukkit/material/Stairs.java
+++ b/paper-api/src/main/java/org/bukkit/material/Stairs.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents stairs.
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Stairs extends MaterialData implements Directional {
 
     public Stairs(final Material type) {
diff --git a/paper-api/src/main/java/org/bukkit/material/Step.java b/paper-api/src/main/java/org/bukkit/material/Step.java
index 904fd53476..8b92ec4e87 100644
--- a/paper-api/src/main/java/org/bukkit/material/Step.java
+++ b/paper-api/src/main/java/org/bukkit/material/Step.java
@@ -6,7 +6,11 @@ import org.bukkit.Material;
 
 /**
  * Represents the different types of steps.
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Step extends TexturedMaterial {
     private static final List<Material> textures = new ArrayList<Material>();
     static {
diff --git a/paper-api/src/main/java/org/bukkit/material/TexturedMaterial.java b/paper-api/src/main/java/org/bukkit/material/TexturedMaterial.java
index e48f002f08..6e0a834794 100644
--- a/paper-api/src/main/java/org/bukkit/material/TexturedMaterial.java
+++ b/paper-api/src/main/java/org/bukkit/material/TexturedMaterial.java
@@ -5,7 +5,11 @@ import org.bukkit.Material;
 
 /**
  * Represents textured materials like steps and smooth bricks
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public abstract class TexturedMaterial extends MaterialData {
 
     public TexturedMaterial(Material m) {
diff --git a/paper-api/src/main/java/org/bukkit/material/Torch.java b/paper-api/src/main/java/org/bukkit/material/Torch.java
index 898cbe7f14..a4f0c62dcd 100644
--- a/paper-api/src/main/java/org/bukkit/material/Torch.java
+++ b/paper-api/src/main/java/org/bukkit/material/Torch.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * MaterialData for torches
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Torch extends SimpleAttachableMaterialData {
     public Torch() {
         super(Material.LEGACY_TORCH);
diff --git a/paper-api/src/main/java/org/bukkit/material/TrapDoor.java b/paper-api/src/main/java/org/bukkit/material/TrapDoor.java
index 4fc308a370..effedfc714 100644
--- a/paper-api/src/main/java/org/bukkit/material/TrapDoor.java
+++ b/paper-api/src/main/java/org/bukkit/material/TrapDoor.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents a trap door
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class TrapDoor extends SimpleAttachableMaterialData implements Openable {
     public TrapDoor() {
         super(Material.LEGACY_TRAP_DOOR);
diff --git a/paper-api/src/main/java/org/bukkit/material/Tree.java b/paper-api/src/main/java/org/bukkit/material/Tree.java
index 2c4b0c40d8..e759f50339 100644
--- a/paper-api/src/main/java/org/bukkit/material/Tree.java
+++ b/paper-api/src/main/java/org/bukkit/material/Tree.java
@@ -9,7 +9,11 @@ import org.bukkit.block.BlockFace;
  *
  * @see Material#LEGACY_LOG
  * @see Material#LEGACY_LOG_2
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 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/paper-api/src/main/java/org/bukkit/material/Tripwire.java b/paper-api/src/main/java/org/bukkit/material/Tripwire.java
index 89b85a614b..e5ffa4db87 100644
--- a/paper-api/src/main/java/org/bukkit/material/Tripwire.java
+++ b/paper-api/src/main/java/org/bukkit/material/Tripwire.java
@@ -4,7 +4,11 @@ import org.bukkit.Material;
 
 /**
  * Represents the tripwire
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Tripwire extends MaterialData {
 
     public Tripwire() {
diff --git a/paper-api/src/main/java/org/bukkit/material/TripwireHook.java b/paper-api/src/main/java/org/bukkit/material/TripwireHook.java
index 921b6e77cb..80aa1c7bc7 100644
--- a/paper-api/src/main/java/org/bukkit/material/TripwireHook.java
+++ b/paper-api/src/main/java/org/bukkit/material/TripwireHook.java
@@ -5,7 +5,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents the tripwire hook
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class TripwireHook extends SimpleAttachableMaterialData implements Redstone {
 
     public TripwireHook() {
diff --git a/paper-api/src/main/java/org/bukkit/material/Vine.java b/paper-api/src/main/java/org/bukkit/material/Vine.java
index e0c222f64a..07a4f3b151 100644
--- a/paper-api/src/main/java/org/bukkit/material/Vine.java
+++ b/paper-api/src/main/java/org/bukkit/material/Vine.java
@@ -7,7 +7,11 @@ import org.bukkit.block.BlockFace;
 
 /**
  * Represents a vine
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Vine extends MaterialData {
     private static final int VINE_NORTH = 0x4;
     private static final int VINE_EAST = 0x8;
diff --git a/paper-api/src/main/java/org/bukkit/material/Wood.java b/paper-api/src/main/java/org/bukkit/material/Wood.java
index b020847357..5d51c9286d 100644
--- a/paper-api/src/main/java/org/bukkit/material/Wood.java
+++ b/paper-api/src/main/java/org/bukkit/material/Wood.java
@@ -9,7 +9,11 @@ import org.bukkit.TreeSpecies;
  * @see Material#LEGACY_WOOD
  * @see Material#LEGACY_SAPLING
  * @see Material#LEGACY_WOOD_DOUBLE_STEP
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 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/paper-api/src/main/java/org/bukkit/material/WoodenStep.java b/paper-api/src/main/java/org/bukkit/material/WoodenStep.java
index 34886cfcb9..b99a9a304d 100644
--- a/paper-api/src/main/java/org/bukkit/material/WoodenStep.java
+++ b/paper-api/src/main/java/org/bukkit/material/WoodenStep.java
@@ -7,7 +7,11 @@ import org.bukkit.TreeSpecies;
  * Represents the different types of wooden steps.
  *
  * @see Material#LEGACY_WOOD_STEP
+ *
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 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/paper-api/src/main/java/org/bukkit/material/Wool.java b/paper-api/src/main/java/org/bukkit/material/Wool.java
index 193ae6185f..3b17409a98 100644
--- a/paper-api/src/main/java/org/bukkit/material/Wool.java
+++ b/paper-api/src/main/java/org/bukkit/material/Wool.java
@@ -5,7 +5,10 @@ import org.bukkit.Material;
 
 /**
  * Represents a Wool/Cloth block
+ * @deprecated all usage of MaterialData is deprecated and subject to removal.
+ * Use {@link org.bukkit.block.data.BlockData}.
  */
+@Deprecated
 public class Wool extends MaterialData implements Colorable {
     public Wool() {
         super(Material.LEGACY_WOOL);
diff --git a/paper-api/src/test/java/org/bukkit/AnnotationTest.java b/paper-api/src/test/java/org/bukkit/AnnotationTest.java
index dfd6e137c9..cc6b6e2099 100644
--- a/paper-api/src/test/java/org/bukkit/AnnotationTest.java
+++ b/paper-api/src/test/java/org/bukkit/AnnotationTest.java
@@ -132,8 +132,7 @@ public class AnnotationTest {
         }
 
         if (isSubclassOf(clazz, "org/bukkit/material/MaterialData", allClasses)) {
-            // MaterialData is deprecated and all of its subclasses are excluded
-            return false;
+            throw new AssertionError("Subclass of MaterialData must be deprecated: " + clazz.name);
         }
 
         if (isSubclassOf(clazz, "java/lang/Exception", allClasses)