diff --git a/mappings/net/minecraft/block/entity/BarrelBlockEntity.mapping b/mappings/net/minecraft/block/entity/BarrelBlockEntity.mapping
index 257017c793..4562f3f67b 100644
--- a/mappings/net/minecraft/block/entity/BarrelBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/BarrelBlockEntity.mapping
@@ -1,6 +1,12 @@
 CLASS net/minecraft/class_3719 net/minecraft/block/entity/BarrelBlockEntity
 	FIELD field_16410 inventory Lnet/minecraft/class_2371;
+	FIELD field_27207 stateManager Lnet/minecraft/class_5561;
+	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
+		ARG 1 pos
+		ARG 2 state
 	METHOD method_17764 playSound (Lnet/minecraft/class_2680;Lnet/minecraft/class_3414;)V
+		ARG 1 state
+		ARG 2 soundEvent
 	METHOD method_18318 setOpen (Lnet/minecraft/class_2680;Z)V
 		ARG 1 state
 		ARG 2 open
diff --git a/mappings/net/minecraft/block/entity/BlockEntityTicker.mapping b/mappings/net/minecraft/block/entity/BlockEntityTicker.mapping
index 415294d41b..d74c396fed 100644
--- a/mappings/net/minecraft/block/entity/BlockEntityTicker.mapping
+++ b/mappings/net/minecraft/block/entity/BlockEntityTicker.mapping
@@ -1,5 +1,7 @@
 CLASS net/minecraft/class_5558 net/minecraft/block/entity/BlockEntityTicker
 	METHOD tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2586;)V
+		COMMENT Runs this action on the given block entity. The world, block position, and block state are passed
+		COMMENT as context.
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
diff --git a/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping b/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping
index 2df2016d5c..ae3a149645 100644
--- a/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping
@@ -1,5 +1,10 @@
 CLASS net/minecraft/class_2595 net/minecraft/block/entity/ChestBlockEntity
 	FIELD field_11927 inventory Lnet/minecraft/class_2371;
+	FIELD field_27209 stateManager Lnet/minecraft/class_5561;
+	FIELD field_27210 lidAnimator Lnet/minecraft/class_5560;
+	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
+		ARG 1 pos
+		ARG 2 state
 	METHOD method_11047 copyInventory (Lnet/minecraft/class_2595;Lnet/minecraft/class_2595;)V
 		ARG 0 from
 		ARG 1 to
@@ -7,5 +12,19 @@ CLASS net/minecraft/class_2595 net/minecraft/block/entity/ChestBlockEntity
 		ARG 0 world
 		ARG 1 pos
 	METHOD method_11049 onInvOpenOrClose (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;II)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
+		ARG 4 oldViewerCount
+		ARG 5 newViewerCount
 	METHOD method_11050 playSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3414;)V
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 state
+		ARG 3 soundEvent
 	METHOD method_31670 clientTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2595;)V
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 state
+		ARG 3 blockEntity
+	METHOD method_31671 onScheduledTick ()V
diff --git a/mappings/net/minecraft/block/entity/ChestLidAnimator.mapping b/mappings/net/minecraft/block/entity/ChestLidAnimator.mapping
new file mode 100644
index 0000000000..30d225de46
--- /dev/null
+++ b/mappings/net/minecraft/block/entity/ChestLidAnimator.mapping
@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_5560 net/minecraft/block/entity/ChestLidAnimator
+	COMMENT Handles the animation for opening and closing chests and ender chests.
+	FIELD field_27212 open Z
+	FIELD field_27213 progress F
+	FIELD field_27214 lastProgress F
+	METHOD method_31672 step ()V
+	METHOD method_31673 getProgress (F)F
+		ARG 1 delta
+	METHOD method_31674 setOpen (Z)V
+		ARG 1 open
diff --git a/mappings/net/minecraft/block/entity/ChestStateManager.mapping b/mappings/net/minecraft/block/entity/ChestStateManager.mapping
new file mode 100644
index 0000000000..b701ec3e02
--- /dev/null
+++ b/mappings/net/minecraft/block/entity/ChestStateManager.mapping
@@ -0,0 +1,43 @@
+CLASS net/minecraft/class_5561 net/minecraft/block/entity/ChestStateManager
+	COMMENT Handles the viewer count for chest-like block entities.
+	FIELD field_27215 viewerCount I
+	METHOD method_31678 getViewerCount ()I
+	METHOD method_31679 isPlayerViewing (Lnet/minecraft/class_1657;)Z
+		COMMENT Determines whether the given player is currently viewing this chest.
+		ARG 1 player
+	METHOD method_31680 getInRangeViewerCount (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)I
+		ARG 1 world
+		ARG 2 pos
+	METHOD method_31681 onChestOpened (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
+		COMMENT Run when this chest is opened (when the viewer count becomes nonzero).
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
+	METHOD method_31682 onInteracted (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;II)V
+		COMMENT Run when a player interacts with this chest.
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
+		ARG 4 oldViewerCount
+		ARG 5 newViewerCount
+	METHOD method_31683 onChestClosed (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
+		COMMENT Run when this chest closes (when the viewer count reaches zero).
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
+	METHOD method_31684 openChest (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
+	METHOD method_31685 closeChest (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
+	METHOD method_31686 updateViewerCount (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
+	METHOD method_31687 scheduleBlockTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 state
diff --git a/mappings/net/minecraft/block/entity/EnderChestBlockEntity.mapping b/mappings/net/minecraft/block/entity/EnderChestBlockEntity.mapping
index 2c1d6bc96d..cb2e20e3b2 100644
--- a/mappings/net/minecraft/block/entity/EnderChestBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/EnderChestBlockEntity.mapping
@@ -1,5 +1,18 @@
 CLASS net/minecraft/class_2611 net/minecraft/block/entity/EnderChestBlockEntity
+	FIELD field_27216 lidAnimator Lnet/minecraft/class_5560;
+	FIELD field_27217 stateManager Lnet/minecraft/class_5561;
+	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
+		ARG 1 pos
+		ARG 2 state
 	METHOD method_11218 canPlayerUse (Lnet/minecraft/class_1657;)Z
+		ARG 1 player
 	METHOD method_11219 onOpen (Lnet/minecraft/class_1657;)V
+		ARG 1 player
 	METHOD method_11220 onClose (Lnet/minecraft/class_1657;)V
+		ARG 1 player
 	METHOD method_31689 clientTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2611;)V
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 state
+		ARG 3 blockEntity
+	METHOD method_31690 onScheduledTick ()V