fix some more 1.20 tracking issues

3 files changed, 22 insertions, 6 deletions

diff --git a/patches/api/0055-Fix-upstream-javadocs.patch b/patches/api/0055-Fix-upstream-javadocs.patch
index 21bdfe51d9..bfea387a25 100644
--- a/patches/api/0055-Fix-upstream-javadocs.patch
+++ b/patches/api/0055-Fix-upstream-javadocs.patch
@@ -1069,6 +1069,20 @@ index df4c52f1f0be2409c7506b09167bd58b5602fa7a..74449a635aca84adcc1652e1e85f2d27
       * 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 af04071d37e70b8cc9837d57477c8493be8afb9f..582671a0a94d47302c0fdc572d486282c32f786f 100644
+--- a/src/main/java/org/bukkit/inventory/SmithingRecipe.java
++++ b/src/main/java/org/bukkit/inventory/SmithingRecipe.java
+@@ -21,7 +21,9 @@ 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 07c3dff4d6190ef388d9c1e1c36f67f00a3e8e66..597a18a767b68b47e81454b7d44613c7178c1366 100644
 --- a/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java
diff --git a/patches/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index a782e8b433..a37dea550d 100644
--- a/patches/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option to prevent NBT copy in smithing recipes
 
 
 diff --git a/src/main/java/org/bukkit/inventory/SmithingRecipe.java b/src/main/java/org/bukkit/inventory/SmithingRecipe.java
-index af04071d37e70b8cc9837d57477c8493be8afb9f..00000f1399b053bb3c7b6d4792559b630d414b81 100644
+index 582671a0a94d47302c0fdc572d486282c32f786f..cfb176130cd1e1008a194231113543d8c052371c 100644
 --- a/src/main/java/org/bukkit/inventory/SmithingRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/SmithingRecipe.java
 @@ -13,6 +13,7 @@ public class SmithingRecipe implements Recipe, Keyed {
@@ -16,9 +16,9 @@ index af04071d37e70b8cc9837d57477c8493be8afb9f..00000f1399b053bb3c7b6d4792559b63
  
      /**
       * Create a smithing recipe to produce the specified result ItemStack.
-@@ -23,6 +24,21 @@ public class SmithingRecipe implements Recipe, Keyed {
-      * @param addition The addition ingredient
+@@ -25,6 +26,23 @@ public class SmithingRecipe implements Recipe, Keyed {
       */
+     @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,14 +31,16 @@ index af04071d37e70b8cc9837d57477c8493be8afb9f..00000f1399b053bb3c7b6d4792559b63
 +     * @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
          this.key = key;
          this.result = result;
          this.base = base;
-@@ -60,4 +76,15 @@ public class SmithingRecipe implements Recipe, Keyed {
+@@ -62,4 +80,15 @@ public class SmithingRecipe implements Recipe, Keyed {
      public NamespacedKey getKey() {
          return this.key;
      }
diff --git a/patches/server/0729-Fix-upstreams-block-state-factories.patch b/patches/server/0729-Fix-upstreams-block-state-factories.patch
index 4085b1a658..42689cf062 100644
--- a/patches/server/0729-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0729-Fix-upstreams-block-state-factories.patch
@@ -39,7 +39,7 @@ index 87c25170fbe8b0591d452612496ee1a627138de7..a2894f02ceb7c58f6eafe055e1ff47b1
      private final T tileEntity;
      private final T snapshot;
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
-index 17e1131c79ad140c0803a914621ce7924f0f2a6d..dc8e173ff40c164bf6149db4caedf0ee8dce727b 100644
+index 17e1131c79ad140c0803a914621ce7924f0f2a6d..da4609caecc8183d02c301c7cedbca52ed39323f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
 @@ -19,6 +19,7 @@ import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
@@ -320,7 +320,7 @@ index 17e1131c79ad140c0803a914621ce7924f0f2a6d..dc8e173ff40c164bf6149db4caedf0ee
 +        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
      }