diff --git a/patches/api/Fix-upstream-javadocs.patch b/patches/api/Fix-upstream-javadocs.patch
index da1829ffab..94ba8ba47e 100644
--- a/patches/api/Fix-upstream-javadocs.patch
+++ b/patches/api/Fix-upstream-javadocs.patch
@@ -1069,6 +1069,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * matches, with a data value of 0.
       *
       * @param count The number of copies to remove.
+diff --git a/src/main/java/org/bukkit/inventory/SmithingRecipe.java b/src/main/java/org/bukkit/inventory/SmithingRecipe.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/inventory/SmithingRecipe.java
++++ b/src/main/java/org/bukkit/inventory/SmithingRecipe.java
+@@ -0,0 +0,0 @@ public class SmithingRecipe implements Recipe, Keyed {
+      * @param result The item you want the recipe to create.
+      * @param base The base ingredient
+      * @param addition The addition ingredient
++     * @deprecated use {@link SmithingTrimRecipe} or {@link SmithingTransformRecipe}
+      */
++    @Deprecated(forRemoval = true) // Paper
+     public SmithingRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result, @NotNull RecipeChoice base, @NotNull RecipeChoice addition) {
+         this.key = key;
+         this.result = result;
 diff --git a/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java b/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
diff --git a/patches/api/Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 3c501825ea..ef3fa7ce09 100644
--- a/patches/api/Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/api/Option-to-prevent-NBT-copy-in-smithing-recipes.patch
@@ -17,8 +17,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      /**
       * Create a smithing recipe to produce the specified result ItemStack.
 @@ -0,0 +0,0 @@ public class SmithingRecipe implements Recipe, Keyed {
-      * @param addition The addition ingredient
       */
+     @Deprecated(forRemoval = true) // Paper
      public SmithingRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result, @NotNull RecipeChoice base, @NotNull RecipeChoice addition) {
 +        // Paper start
 +        this(key, result, base, addition, true);
@@ -31,7 +31,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param base The base ingredient
 +     * @param addition The addition ingredient
 +     * @param copyNbt whether to copy the nbt from the input base item to the output
++     * @deprecated use {@link SmithingTrimRecipe} or {@link SmithingTransformRecipe}
 +     */
++    @Deprecated(forRemoval = true) // Paper
 +    public SmithingRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result, @NotNull RecipeChoice base, @NotNull RecipeChoice addition, boolean copyNbt) {
 +        this.copyNbt = copyNbt;
 +        // Paper end
diff --git a/patches/server/Fix-upstreams-block-state-factories.patch b/patches/server/Fix-upstreams-block-state-factories.patch
index 45b31072c9..34da830b97 100644
--- a/patches/server/Fix-upstreams-block-state-factories.patch
+++ b/patches/server/Fix-upstreams-block-state-factories.patch
@@ -320,7 +320,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        register(BlockEntityType.SMOKER, CraftSmoker.class, CraftSmoker::new);
 +        register(BlockEntityType.MOB_SPAWNER, CraftCreatureSpawner.class, CraftCreatureSpawner::new);
 +        register(BlockEntityType.STRUCTURE_BLOCK, CraftStructureBlock.class, CraftStructureBlock::new);
-+        register(BlockEntityType.BRUSHABLE_BLOCK, CraftBrushableBlock.class, CraftBrushableBlock::new); // TODO: HANDLE DIFFERENT MATERIALS....
++        register(BlockEntityType.BRUSHABLE_BLOCK, CraftBrushableBlock.class, CraftBrushableBlock::new); // note: spigot still uses CraftSuspiciousSand impl for that block type
 +        register(BlockEntityType.TRAPPED_CHEST, CraftChest.class, CraftChest::new);
 +        // Paper end
      }