diff --git a/mappings/net/minecraft/client/render/block/BiomeColorHandler.mapping b/mappings/net/minecraft/client/render/block/BiomeColorHandler.mapping
deleted file mode 100644
index 7ba05675c8..0000000000
--- a/mappings/net/minecraft/client/render/block/BiomeColorHandler.mapping
+++ /dev/null
@@ -1,2 +0,0 @@
-CLASS dce net/minecraft/client/render/block/BiomeColorHandler
-	CLASS dce$a Proxy
diff --git a/mappings/net/minecraft/client/render/block/BiomeColors.mapping b/mappings/net/minecraft/client/render/block/BiomeColors.mapping
new file mode 100644
index 0000000000..b99f909caf
--- /dev/null
+++ b/mappings/net/minecraft/client/render/block/BiomeColors.mapping
@@ -0,0 +1,10 @@
+CLASS dce net/minecraft/client/render/block/BiomeColors
+	CLASS dce$a Proxy
+	FIELD a GRASS_COLOR Ldce$a;
+	FIELD b FOLIAGE_COLOR Ldce$a;
+	FIELD c WATER_COLOR Ldce$a;
+	FIELD d WATER_FOG_COLOR Ldce$a;
+	METHOD a grassColorAt (Lbac;Let;)I
+	METHOD a colorAt (Lbac;Let;Ldce$a;)I
+	METHOD b foliageColorAt (Lbac;Let;)I
+	METHOD c waterColorAt (Lbac;Let;)I
diff --git a/mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping
index da3760a10e..f77047d4ef 100644
--- a/mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping
+++ b/mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping
@@ -1 +1,5 @@
 CLASS ddh net/minecraft/client/render/block/BlockLiquidRenderer
+	FIELD a lavaSprite [Ldlw;
+	FIELD b waterSprite [Ldlw;
+	FIELD c waterOverlaySprite Ldlw;
+	METHOD a onResourceReload ()V
diff --git a/mappings/net/minecraft/client/render/block/BlockModels.mapping b/mappings/net/minecraft/client/render/block/BlockModels.mapping
new file mode 100644
index 0000000000..3555b3d961
--- /dev/null
+++ b/mappings/net/minecraft/client/render/block/BlockModels.mapping
@@ -0,0 +1,11 @@
+CLASS ddf net/minecraft/client/render/block/BlockModels
+	FIELD a models Ljava/util/Map;
+	FIELD b modelManager Ldni;
+	METHOD a getModelManager ()Ldni;
+	METHOD a getSprite (Lbom;)Ldlw;
+	METHOD a propertyValueToString (Lbpo;Ljava/lang/Comparable;)Ljava/lang/String;
+	METHOD a propertyMapToString (Ljava/util/Map;)Ljava/lang/String;
+	METHOD a getModelId (Lpz;Lbom;)Ldnj;
+	METHOD b reload ()V
+	METHOD b getModel (Lbom;)Ldne;
+	METHOD c getModelId (Lbom;)Ldnj;
diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping
index 03f0fc92cf..482c1b9ec3 100644
--- a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping
+++ b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping
@@ -1,10 +1,13 @@
 CLASS ddg net/minecraft/client/render/block/BlockRenderManager
-	FIELD a maps Lddf;
+	FIELD a models Lddf;
 	FIELD b renderer Lddi;
+	FIELD c modelRenderer Ldde;
+	FIELD d liquidRenderer Lddh;
 	METHOD <init> (Lddf;Lcop;)V
-		ARG 1 maps
-	METHOD a getStateMaps ()Lddf;
+		ARG 1 models
+	METHOD a getModels ()Lddf;
 	METHOD a getModel (Lbom;)Ldne;
+		ARG 1 state
 	METHOD a render (Lbom;F)V
 		ARG 1 state
 	METHOD a tesselate (Lbom;Let;Ldlw;Lbac;)V
diff --git a/mappings/net/minecraft/client/render/block/BlockStateModelMaps.mapping b/mappings/net/minecraft/client/render/block/BlockStateModelMaps.mapping
deleted file mode 100644
index 6db952f359..0000000000
--- a/mappings/net/minecraft/client/render/block/BlockStateModelMaps.mapping
+++ /dev/null
@@ -1,6 +0,0 @@
-CLASS ddf net/minecraft/client/render/block/BlockStateModelMaps
-	FIELD a modelCache Ljava/util/Map;
-	FIELD b modelManager Ldni;
-	METHOD a getModelManager ()Ldni;
-	METHOD b reload ()V
-	METHOD b getModel (Lbom;)Ldne;
diff --git a/mappings/net/minecraft/client/render/block/FoliageColorHandler.mapping b/mappings/net/minecraft/client/render/block/FoliageColorHandler.mapping
index b36b3ae026..bda4d25e80 100644
--- a/mappings/net/minecraft/client/render/block/FoliageColorHandler.mapping
+++ b/mappings/net/minecraft/client/render/block/FoliageColorHandler.mapping
@@ -1,9 +1,9 @@
 CLASS bam net/minecraft/client/render/block/FoliageColorHandler
 	FIELD a colorMap [I
-	METHOD a getColorSpruce ()I
+	METHOD a getSpruceColor ()I
 	METHOD a getColor (DD)I
 		ARG 0 temperature
 	METHOD a setColorMap ([I)V
 		ARG 0 pixels
-	METHOD b getColorBirch ()I
-	METHOD c getColorDefault ()I
+	METHOD b getBirchColor ()I
+	METHOD c getDefaultColor ()I
diff --git a/mappings/net/minecraft/client/render/item/ItemModelMap.mapping b/mappings/net/minecraft/client/render/item/ItemModelMap.mapping
deleted file mode 100644
index 3dd314aecb..0000000000
--- a/mappings/net/minecraft/client/render/item/ItemModelMap.mapping
+++ /dev/null
@@ -1,6 +0,0 @@
-CLASS dcp net/minecraft/client/render/item/ItemModelMap
-	FIELD c blockModelManager Ldni;
-	METHOD a getBlockModelManager ()Ldni;
-	METHOD a getSprite (Lbar;)Ldlw;
-	METHOD b reloadModels ()V
-	METHOD b getModel (Lavu;)Ldne;
diff --git a/mappings/net/minecraft/client/render/item/ItemModels.mapping b/mappings/net/minecraft/client/render/item/ItemModels.mapping
new file mode 100644
index 0000000000..da4e793f21
--- /dev/null
+++ b/mappings/net/minecraft/client/render/item/ItemModels.mapping
@@ -0,0 +1,14 @@
+CLASS dcp net/minecraft/client/render/item/ItemModels
+	FIELD a modelIds Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
+	FIELD b models Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
+	FIELD c modelManager Ldni;
+	METHOD a getModelManager ()Ldni;
+	METHOD a getModel (Lavp;)Ldne;
+	METHOD a putModel (Lavp;Ldnj;)V
+		ARG 1 item
+		ARG 2 modelId
+	METHOD a getSprite (Lavu;)Ldlw;
+	METHOD a getSprite (Lbar;)Ldlw;
+	METHOD b reloadModels ()V
+	METHOD b getModelId (Lavp;)I
+	METHOD b getModel (Lavu;)Ldne;