diff --git a/patches/api/0055-Fix-upstream-javadocs.patch b/patches/api/0055-Fix-upstream-javadocs.patch
index e5ef091840..f5dfd1b744 100644
--- a/patches/api/0055-Fix-upstream-javadocs.patch
+++ b/patches/api/0055-Fix-upstream-javadocs.patch
@@ -697,6 +697,67 @@ index c17ff41a688b2cbd877cda25d4ec033ac8ef5524..bd67b7cba78b9bbdd82a5a40048e658a
   */
  public class PiglinBarterEvent extends EntityEvent implements Cancellable {
  
+diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
+index bc71bc2d3ace0d19d730c09f05f9e0655bcee8f5..24077da8e6a7937f66eafc6779206055cf82e8d2 100644
+--- a/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
++++ b/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
+@@ -8,7 +8,9 @@ import org.bukkit.inventory.ItemStack;
+ import org.jetbrains.annotations.NotNull;
+ 
+ /**
+- * Called when an ItemStack is successfully burned as fuel in a furnace.
++ * Called when an ItemStack is successfully burned as fuel in a furnace-like block such as a
++ * {@link org.bukkit.block.Furnace}, {@link org.bukkit.block.Smoker}, or
++ * {@link org.bukkit.block.BlastFurnace}.
+  */
+ public class FurnaceBurnEvent extends BlockEvent implements Cancellable {
+     private static final HandlerList handlers = new HandlerList();
+diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java
+index 020739697a0b535cad0b15b574f77cdabbdfa3eb..a965b6a78073c5da86ad671752eff4a270029420 100644
+--- a/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java
++++ b/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java
+@@ -7,7 +7,9 @@ import org.bukkit.event.block.BlockExpEvent;
+ import org.jetbrains.annotations.NotNull;
+ 
+ /**
+- * This event is called when a player takes items out of the furnace
++ * This event is called when a player takes items out of a furnace-like block such as a
++ * {@link org.bukkit.block.Furnace}, {@link org.bukkit.block.Smoker}, or
++ * {@link org.bukkit.block.BlastFurnace}.
+  */
+ public class FurnaceExtractEvent extends BlockExpEvent {
+     private final Player player;
+diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java
+index 066e7dd9a34d35c8b643a5efcf95d6a5ef47c7ee..f8f9b08a0bd82a2667ae4e0c99dae9103f0db3f0 100644
+--- a/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java
++++ b/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java
+@@ -6,7 +6,9 @@ import org.bukkit.inventory.ItemStack;
+ import org.jetbrains.annotations.NotNull;
+ 
+ /**
+- * Called when an ItemStack is successfully smelted in a furnace.
++ * Called when an ItemStack is successfully smelted in a furnace-like block
++ * such as a {@link org.bukkit.block.Furnace}, {@link org.bukkit.block.Smoker},
++ * or {@link org.bukkit.block.BlastFurnace}.
+  */
+ public class FurnaceSmeltEvent extends BlockCookEvent {
+ 
+diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java
+index 1440c6115520d692faf75455df35b92aa8734491..0808e7aeffb69160913344de5b5e21d5e857f1d6 100644
+--- a/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java
++++ b/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java
+@@ -8,7 +8,10 @@ import org.bukkit.inventory.ItemStack;
+ import org.jetbrains.annotations.NotNull;
+ 
+ /**
+- * Called when a Furnace starts smelting.
++ * Called when any of the furnace-like blocks start smelting.
++ * <p>
++ * Furnace-like blocks are {@link org.bukkit.block.Furnace},
++ * {@link org.bukkit.block.Smoker}, and {@link org.bukkit.block.BlastFurnace}.
+  */
+ public class FurnaceStartSmeltEvent extends InventoryBlockStartEvent {
+     private static final HandlerList handlers = new HandlerList();
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
 index 79797a2be7fb139d528116d34d13e51d39b96e56..fe58058f9b5d29388d48115cc81dc48ab08c58c1 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
diff --git a/patches/api/0151-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0151-Implement-furnace-cook-speed-multiplier-API.patch
index dd6ed2012a..6e836a844d 100644
--- a/patches/api/0151-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/api/0151-Implement-furnace-cook-speed-multiplier-API.patch
@@ -37,10 +37,10 @@ index ac3b24c5c99eeb1435d785efade728dd40947da5..dbdf3dbe9517b09a7965cf9d65cae1ed
      @Override
      public FurnaceInventory getInventory();
 diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java
-index 1440c6115520d692faf75455df35b92aa8734491..1e55f50f04de78ae0b8832a8021ffc7327676e8e 100644
+index 0808e7aeffb69160913344de5b5e21d5e857f1d6..d386ab5dd46cc6706ace61fe6b646713ffd50cb7 100644
 --- a/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java
 +++ b/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java
-@@ -15,10 +15,17 @@ public class FurnaceStartSmeltEvent extends InventoryBlockStartEvent {
+@@ -18,10 +18,17 @@ public class FurnaceStartSmeltEvent extends InventoryBlockStartEvent {
      private final CookingRecipe<?> recipe;
      private int totalCookTime;
  
diff --git a/patches/api/0262-Add-recipe-to-cook-events.patch b/patches/api/0262-Add-recipe-to-cook-events.patch
index b0b34773c0..8c8712541e 100644
--- a/patches/api/0262-Add-recipe-to-cook-events.patch
+++ b/patches/api/0262-Add-recipe-to-cook-events.patch
@@ -50,10 +50,10 @@ index be7af5440bf9923f0c9c84efa4d70a89337a2f96..a3f1c9cb36c9069ed622985a525bfc2a
      @Override
      public HandlerList getHandlers() {
 diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java
-index 066e7dd9a34d35c8b643a5efcf95d6a5ef47c7ee..16b3ab8f525c4e863f804cc8460a330407d85478 100644
+index f8f9b08a0bd82a2667ae4e0c99dae9103f0db3f0..25478725bef34153bca204c815a167913b9cd389 100644
 --- a/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java
 +++ b/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java
-@@ -10,7 +10,13 @@ import org.jetbrains.annotations.NotNull;
+@@ -12,7 +12,13 @@ import org.jetbrains.annotations.NotNull;
   */
  public class FurnaceSmeltEvent extends BlockCookEvent {
  
diff --git a/patches/api/0268-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0268-add-consumeFuel-to-FurnaceBurnEvent.patch
index 6c8b681cd9..07036efb43 100644
--- a/patches/api/0268-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/api/0268-add-consumeFuel-to-FurnaceBurnEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] add consumeFuel to FurnaceBurnEvent
 
 
 diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
-index bc71bc2d3ace0d19d730c09f05f9e0655bcee8f5..caef53d0f6546516fa7aabb2cb3abed70808b3ba 100644
+index 24077da8e6a7937f66eafc6779206055cf82e8d2..ba4dc8aed85169e55cac276bdd51116919305019 100644
 --- a/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
 +++ b/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
-@@ -16,6 +16,7 @@ public class FurnaceBurnEvent extends BlockEvent implements Cancellable {
+@@ -18,6 +18,7 @@ public class FurnaceBurnEvent extends BlockEvent implements Cancellable {
      private int burnTime;
      private boolean cancelled;
      private boolean burning;
@@ -16,7 +16,7 @@ index bc71bc2d3ace0d19d730c09f05f9e0655bcee8f5..caef53d0f6546516fa7aabb2cb3abed7
  
      public FurnaceBurnEvent(@NotNull final Block furnace, @NotNull final ItemStack fuel, final int burnTime) {
          super(furnace);
-@@ -70,6 +71,25 @@ public class FurnaceBurnEvent extends BlockEvent implements Cancellable {
+@@ -72,6 +73,25 @@ public class FurnaceBurnEvent extends BlockEvent implements Cancellable {
      public void setBurning(boolean burning) {
          this.burning = burning;
      }
diff --git a/patches/api/0407-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0407-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
index 98799cd97d..1ae7f17da6 100644
--- a/patches/api/0407-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
+++ b/patches/api/0407-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
@@ -63,11 +63,11 @@ index 53119742beda00a38111063243665bb995ae2188..1f7a8bf65e9ac3188f759f9b3c4d6edb
 +    // Paper - remove HandlerList
  }
 diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java
-index 1e55f50f04de78ae0b8832a8021ffc7327676e8e..e6ebc17c438f231d67e44a5390d06a8dafba6dfd 100644
+index d386ab5dd46cc6706ace61fe6b646713ffd50cb7..abfd0441f1dd485e59ce5a9f7fca88ffa32e87f7 100644
 --- a/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java
 +++ b/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java
-@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
-  * Called when a Furnace starts smelting.
+@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
+  * {@link org.bukkit.block.Smoker}, and {@link org.bukkit.block.BlastFurnace}.
   */
  public class FurnaceStartSmeltEvent extends InventoryBlockStartEvent {
 -    private static final HandlerList handlers = new HandlerList();
@@ -75,7 +75,7 @@ index 1e55f50f04de78ae0b8832a8021ffc7327676e8e..e6ebc17c438f231d67e44a5390d06a8d
      private final CookingRecipe<?> recipe;
      private int totalCookTime;
  
-@@ -56,14 +56,5 @@ public class FurnaceStartSmeltEvent extends InventoryBlockStartEvent {
+@@ -59,14 +59,5 @@ public class FurnaceStartSmeltEvent extends InventoryBlockStartEvent {
          this.totalCookTime = cookTime;
      }
  
diff --git a/patches/api/0437-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0437-Limit-setBurnTime-to-valid-short-values.patch
index c6d04e7c9d..2faac56fd8 100644
--- a/patches/api/0437-Limit-setBurnTime-to-valid-short-values.patch
+++ b/patches/api/0437-Limit-setBurnTime-to-valid-short-values.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Limit setBurnTime to valid short values
 
 
 diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
-index caef53d0f6546516fa7aabb2cb3abed70808b3ba..6dd3df56c51e61c37c4ee194557ee2b1901790f6 100644
+index ba4dc8aed85169e55cac276bdd51116919305019..2f80910dd23dacb30c41189a07a4e54117110bb8 100644
 --- a/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
 +++ b/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
-@@ -50,8 +50,8 @@ public class FurnaceBurnEvent extends BlockEvent implements Cancellable {
+@@ -52,8 +52,8 @@ public class FurnaceBurnEvent extends BlockEvent implements Cancellable {
       *
       * @param burnTime the burn time for this fuel
       */