diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping
index 37b8c63e57..2bc542c551 100644
--- a/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping
+++ b/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping
@@ -7,6 +7,7 @@ CLASS none/brs net/minecraft/client/render/chunk/ChunkRenderer
 	FIELD h chunkRenderDataTask Lnone/brm;
 	FIELD i blockEntities Ljava/util/Set;
 	FIELD l buffers [Lnone/bxn;
+	FIELD r chunkCache Lnone/ajf;
 	METHOD <init> (Lnone/aiw;Lnone/bpb;I)V
 		ARG 0 world
 		ARG 1 renderer
diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping
index ef4bd37357..e095fd48d2 100644
--- a/mappings/net/minecraft/world/chunk/Chunk.mapping
+++ b/mappings/net/minecraft/world/chunk/Chunk.mapping
@@ -1,6 +1,10 @@
 CLASS none/atp net/minecraft/world/chunk/Chunk
 	CLASS none/atp$1
 		METHOD a call ()Ljava/lang/String;
+	CLASS none/atp$a CreationMode
+		FIELD a IMMEDIATE Lnone/atp$a;
+		FIELD b QUEUED Lnone/atp$a;
+		FIELD c NEVER Lnone/atp$a;
 	FIELD a NULL_CHUNK_SECTION Lnone/atq;
 	FIELD b chunkX I
 	FIELD c chunkZ I
@@ -19,6 +23,7 @@ CLASS none/atp net/minecraft/world/chunk/Chunk
 	FIELD s dirty Z
 	FIELD u lastSavedTime J
 	FIELD w inhabitedTime J
+	FIELD y blockEntityCreationQueue Ljava/util/concurrent/ConcurrentLinkedQueue;
 	METHOD <init> (Lnone/aiw;II)V
 		ARG 0 world
 		ARG 1 x
@@ -34,6 +39,11 @@ CLASS none/atp net/minecraft/world/chunk/Chunk
 		ARG 0 x
 		ARG 1 y
 		ARG 2 z
+	METHOD a getEntitiesInArea (Ljava/lang/Class;Lnone/bcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
+		ARG 0 entityClass
+		ARG 1 area
+		ARG 2 entities
+		ARG 3 predicate
 	METHOD a (Lnone/ajc;Lnone/cn;)I
 		ARG 0 lightType
 		ARG 1 pos
@@ -57,11 +67,12 @@ CLASS none/atp net/minecraft/world/chunk/Chunk
 	METHOD a addBlockEntity (Lnone/cn;Lnone/are;)V
 		ARG 0 pos
 		ARG 1 blockEntity
-	METHOD a (Lnone/cn;Lnone/asm;)Lnone/asm;
+	METHOD a setBlockState (Lnone/cn;Lnone/asm;)Lnone/asm;
 		ARG 0 pos
 		ARG 1 state
-	METHOD a (Lnone/cn;Lnone/atp$a;)Lnone/are;
+	METHOD a getBlockEntity (Lnone/cn;Lnone/atp$a;)Lnone/are;
 		ARG 0 pos
+		ARG 1 mode
 	METHOD a (Lnone/es;IZ)V
 		ARG 0 buffer
 	METHOD a addEntity (Lnone/sg;)V
@@ -69,6 +80,11 @@ CLASS none/atp net/minecraft/world/chunk/Chunk
 	METHOD a removeEntity (Lnone/sg;I)V
 		ARG 0 entity
 		ARG 1 chunkY
+	METHOD a getEntitiesInArea (Lnone/sg;Lnone/bcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
+		ARG 0 excludedEntity
+		ARG 1 area
+		ARG 2 entities
+		ARG 3 predicate
 	METHOD a setBiomeMap ([B)V
 		ARG 0 biomeMap
 	METHOD a setHeightMap ([I)V
@@ -80,17 +96,24 @@ CLASS none/atp net/minecraft/world/chunk/Chunk
 		ARG 1 z
 	METHOD b setLastSavedTime (J)V
 		ARG 0 worldTime
-	METHOD b (Lnone/cn;)I
+	METHOD b getBlockLightOpacityLevel (Lnone/cn;)I
 		ARG 0 pos
 	METHOD b removeEntity (Lnone/sg;)V
 		ARG 0 entity
 	METHOD b update (Z)V
 	METHOD c addEntitiesToWorld ()V
+	METHOD c areChunkSectionsEmpty (II)Z
+		ARG 0 minY
+		ARG 1 maxY
 	METHOD c setInhabitedTime (J)V
 		ARG 0 inhabitedTime
 	METHOD c setEntitiesLoaded (Z)V
 		ARG 0 value
 	METHOD d dropEntitiesFromWorld ()V
+	METHOD d getBlockLightOpacityLevel (III)I
+		ARG 0 x
+		ARG 1 y
+		ARG 2 z
 	METHOD d invalidateBlockEntityAt (Lnone/cn;)V
 		ARG 0 pos
 	METHOD d setTerrainPopulated (Z)V
@@ -104,6 +127,8 @@ CLASS none/atp net/minecraft/world/chunk/Chunk
 	METHOD f setDirty (Z)V
 		ARG 0 dirty
 	METHOD g getLevelOfTopSection ()I
+	METHOD g createBlockEntity (Lnone/cn;)Lnone/are;
+		ARG 0 pos
 	METHOD h getSections ()[Lnone/atq;
 	METHOD i isReady ()Z
 	METHOD j hadFirstUpdate ()Z
diff --git a/mappings/none/ajf.mapping b/mappings/net/minecraft/world/chunk/ChunkCache.mapping
similarity index 56%
rename from mappings/none/ajf.mapping
rename to mappings/net/minecraft/world/chunk/ChunkCache.mapping
index 33e8409ed1..a6caed3179 100644
--- a/mappings/none/ajf.mapping
+++ b/mappings/net/minecraft/world/chunk/ChunkCache.mapping
@@ -1,4 +1,14 @@
-CLASS none/ajf
+CLASS none/ajf net/minecraft/world/chunk/ChunkCache
+	FIELD a minX I
+	FIELD b minZ I
+	FIELD c chunks [[Lnone/atp;
+	FIELD d allChunksEmpty Z
+	FIELD e world Lnone/aiw;
+	METHOD <init> (Lnone/aiw;Lnone/cn;Lnone/cn;I)V
+		ARG 0 world
+		ARG 1 minPos
+		ARG 2 maxPos
+		ARG 3 offset
 	METHOD L getWorldGenerator ()Lnone/ajb;
 	METHOD a (Lnone/ajc;Lnone/cn;)I
 		ARG 0 lightType
@@ -6,6 +16,7 @@ CLASS none/ajf
 	METHOD a getEmittedStrongRedstonePower (Lnone/cn;Lnone/cu;)I
 		ARG 0 pos
 		ARG 1 facing
+	METHOD aa areAllChunksEmpty ()Z
 	METHOD b getBiome (Lnone/cn;)Lnone/ajj;
 		ARG 0 pos
 	METHOD d isAir (Lnone/cn;)Z
diff --git a/mappings/net/minecraft/world/chunk/ChunkSection.mapping b/mappings/net/minecraft/world/chunk/ChunkSection.mapping
index aa4324e2f4..6073c05ec5 100644
--- a/mappings/net/minecraft/world/chunk/ChunkSection.mapping
+++ b/mappings/net/minecraft/world/chunk/ChunkSection.mapping
@@ -7,7 +7,7 @@ CLASS none/atq net/minecraft/world/chunk/ChunkSection
 	METHOD <init> (IZ)V
 		ARG 0 level
 		ARG 1 hasSky
-	METHOD a hasBlocks ()Z
+	METHOD a isEmpty ()Z
 	METHOD a getBlockState (III)Lnone/asm;
 		ARG 0 x
 		ARG 1 y
diff --git a/mappings/net/minecraft/world/chunk/EmptyChunk.mapping b/mappings/net/minecraft/world/chunk/EmptyChunk.mapping
index eece2c77fa..6fe7262ff5 100644
--- a/mappings/net/minecraft/world/chunk/EmptyChunk.mapping
+++ b/mappings/net/minecraft/world/chunk/EmptyChunk.mapping
@@ -2,6 +2,11 @@ CLASS none/atm net/minecraft/world/chunk/EmptyChunk
 	METHOD a matchesPos (II)Z
 		ARG 0 chunkX
 		ARG 1 chunkZ
+	METHOD a getEntitiesInArea (Ljava/lang/Class;Lnone/bcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
+		ARG 0 entityClass
+		ARG 1 area
+		ARG 2 entities
+		ARG 3 predicate
 	METHOD a (Lnone/ajc;Lnone/cn;)I
 		ARG 0 lightType
 		ARG 1 pos
@@ -18,21 +23,30 @@ CLASS none/atm net/minecraft/world/chunk/EmptyChunk
 	METHOD a addBlockEntity (Lnone/cn;Lnone/are;)V
 		ARG 0 pos
 		ARG 1 blockEntity
-	METHOD a (Lnone/cn;Lnone/atp$a;)Lnone/are;
+	METHOD a getBlockEntity (Lnone/cn;Lnone/atp$a;)Lnone/are;
 		ARG 0 pos
+		ARG 1 mode
 	METHOD a addEntity (Lnone/sg;)V
 		ARG 0 entity
 	METHOD a removeEntity (Lnone/sg;I)V
 		ARG 0 entity
 		ARG 1 chunkY
+	METHOD a getEntitiesInArea (Lnone/sg;Lnone/bcs;Ljava/util/List;Lcom/google/common/base/Predicate;)V
+		ARG 0 excludedEntity
+		ARG 1 area
+		ARG 2 entities
+		ARG 3 predicate
 	METHOD b getHeightAt (II)I
 		ARG 0 x
 		ARG 1 z
-	METHOD b (Lnone/cn;)I
+	METHOD b getBlockLightOpacityLevel (Lnone/cn;)I
 		ARG 0 pos
 	METHOD b removeEntity (Lnone/sg;)V
 		ARG 0 entity
 	METHOD c addEntitiesToWorld ()V
+	METHOD c areChunkSectionsEmpty (II)Z
+		ARG 0 minY
+		ARG 1 maxY
 	METHOD d dropEntitiesFromWorld ()V
 	METHOD d invalidateBlockEntityAt (Lnone/cn;)V
 		ARG 0 pos