diff --git a/patches/api/Add-Block-isValidTool.patch b/patches/api/Add-Block-isValidTool.patch
index ed3cd1481c..b5f9bf8d11 100644
--- a/patches/api/Add-Block-isValidTool.patch
+++ b/patches/api/Add-Block-isValidTool.patch
@@ -3,24 +3,29 @@ From: Jake Potrebic <jake.m.potrebic@gmail.com>
 Date: Mon, 6 Jul 2020 12:44:23 -0700
 Subject: [PATCH] Add Block#isValidTool
 
+Deprecated for removal
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -0,0 +0,0 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
-     public static int getBlockKeyZ(long packed) {
-         return (int) ((packed << 10) >> 37);
      }
-+
+     // Paper end
+ 
++    // Paper start - add isValidTool
 +    /**
 +     * Checks if the itemstack is a valid tool to
 +     * break the block with
 +     *
 +     * @param itemStack The (tool) itemstack
 +     * @return whether the block will drop items
++     * @deprecated partially replaced by {@link Block#isPreferredTool(ItemStack)}
 +     */
++    @Deprecated(since = "1.21", forRemoval = true) // Paper
 +    boolean isValidTool(@NotNull ItemStack itemStack);
-     // Paper end
- 
++    // Paper end - add isValidTool
++
      /**
+      * Gets the Location of the block
+      *