diff --git a/Spigot-API-Patches/LootTable-API.patch b/Spigot-API-Patches/LootTable-API.patch
index 53d8c18996..b8201c58fe 100644
--- a/Spigot-API-Patches/LootTable-API.patch
+++ b/Spigot-API-Patches/LootTable-API.patch
@@ -352,4 +352,24 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +public interface Hopper extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
 +
 +}
+diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/block/ShulkerBox.java
++++ b/src/main/java/org/bukkit/block/ShulkerBox.java
+@@ -0,0 +0,0 @@
+ package org.bukkit.block;
+ 
++import com.destroystokyo.paper.loottable.LootableInventory;
+ import org.bukkit.DyeColor;
+ import org.bukkit.Nameable;
+ import org.bukkit.inventory.InventoryHolder;
+@@ -0,0 +0,0 @@ import org.bukkit.inventory.InventoryHolder;
+ /**
+  * Represents a ShulkerBox.
+  */
+-public interface ShulkerBox extends BlockState, InventoryHolder, Lockable, Nameable {
++public interface ShulkerBox extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
+ 
+     /**
+      * Get the {@link DyeColor} corresponding to this ShulkerBox
 --
\ No newline at end of file
diff --git a/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch
index cd0a3e252e..72d44a3eed 100644
--- a/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch
@@ -712,6 +712,35 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private final TileEntityHopper hopper;
  
      public CraftHopper(final Block block) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
+@@ -0,0 +0,0 @@
+ package org.bukkit.craftbukkit.block;
+ 
++import com.destroystokyo.paper.loottable.CraftLootableBlockInventory;
+ import net.minecraft.server.BlockShulkerBox;
+ import net.minecraft.server.TileEntity;
+ import net.minecraft.server.TileEntityShulkerBox;
+@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.CraftWorld;
+ import org.bukkit.craftbukkit.inventory.CraftInventory;
+ import org.bukkit.inventory.Inventory;
+ 
+-public class CraftShulkerBox extends CraftLootable implements ShulkerBox {
++public class CraftShulkerBox extends CraftLootable implements ShulkerBox, CraftLootableBlockInventory { // Paper
+ 
+     private final CraftWorld world;
+     private final TileEntityShulkerBox box;
+@@ -0,0 +0,0 @@ public class CraftShulkerBox extends CraftLootable implements ShulkerBox {
+     }
+ 
+     @Override
+-    public TileEntity getTileEntity() {
++    public TileEntityShulkerBox getTileEntity() { // Paper
+         return box;
+     }
+ 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java