diff --git a/mappings/net/minecraft/block/StemAttachedBlock.mapping b/mappings/net/minecraft/block/AttachedStemBlock.mapping
similarity index 92%
rename from mappings/net/minecraft/block/StemAttachedBlock.mapping
rename to mappings/net/minecraft/block/AttachedStemBlock.mapping
index 342d1b546b..b068687ba7 100644
--- a/mappings/net/minecraft/block/StemAttachedBlock.mapping
+++ b/mappings/net/minecraft/block/AttachedStemBlock.mapping
@@ -1,4 +1,4 @@
-CLASS bgq net/minecraft/block/StemAttachedBlock
+CLASS bgq net/minecraft/block/AttachedStemBlock
 	METHOD a getPickStack (Lbbr;Let;Lbqe;)Laxd;
 		ARG 1 world
 		ARG 2 pos
diff --git a/mappings/net/minecraft/block/BlockPlacementEnvironment.mapping b/mappings/net/minecraft/block/BlockPlacementEnvironment.mapping
new file mode 100644
index 0000000000..383817436f
--- /dev/null
+++ b/mappings/net/minecraft/block/BlockPlacementEnvironment.mapping
@@ -0,0 +1 @@
+CLASS cia net/minecraft/block/BlockPlacementEnvironment
diff --git a/mappings/net/minecraft/block/CarpetBlock.mapping b/mappings/net/minecraft/block/CarpetBlock.mapping
index 4fddd88ffd..7e1d74ba30 100644
--- a/mappings/net/minecraft/block/CarpetBlock.mapping
+++ b/mappings/net/minecraft/block/CarpetBlock.mapping
@@ -1,4 +1,5 @@
 CLASS bny net/minecraft/block/CarpetBlock
+	FIELD b color Lawa;
 	METHOD a getBoundingShape (Lbqe;Lbbr;Let;)Lcnm;
 		ARG 1 state
 		ARG 2 view
@@ -14,3 +15,4 @@ CLASS bny net/minecraft/block/CarpetBlock
 		ARG 4 world
 		ARG 5 pos
 		ARG 6 neighborPos
+	METHOD d getColor ()Lawa;
diff --git a/mappings/net/minecraft/block/ChorusPlantBlock.mapping b/mappings/net/minecraft/block/ChorusPlantBlock.mapping
index 49ab7729b3..5afa2993f1 100644
--- a/mappings/net/minecraft/block/ChorusPlantBlock.mapping
+++ b/mappings/net/minecraft/block/ChorusPlantBlock.mapping
@@ -3,6 +3,7 @@ CLASS bhz net/minecraft/block/ChorusPlantBlock
 		ARG 1 settings
 	METHOD a getPlacementState (Lavi;)Lbqe;
 		ARG 1 ctx
+	METHOD a withConnectionProperties (Lbbr;Let;)Lbqe;
 	METHOD a canPlaceAtSide (Lbqe;Lbbr;Let;Lcia;)Z
 		ARG 1 world
 		ARG 2 view
diff --git a/mappings/net/minecraft/block/GourdBlock.mapping b/mappings/net/minecraft/block/GourdBlock.mapping
index cf82ac3273..bfd970f14b 100644
--- a/mappings/net/minecraft/block/GourdBlock.mapping
+++ b/mappings/net/minecraft/block/GourdBlock.mapping
@@ -1,3 +1,5 @@
 CLASS bmt net/minecraft/block/GourdBlock
 	METHOD <init> (Lbhi$c;)V
 		ARG 1 settings
+	METHOD d getStem ()Lbms;
+	METHOD e getAttachedStem ()Lbgq;
diff --git a/mappings/net/minecraft/block/MaterialColor.mapping b/mappings/net/minecraft/block/MaterialColor.mapping
index 0cb2e721bc..c514e60b7c 100644
--- a/mappings/net/minecraft/block/MaterialColor.mapping
+++ b/mappings/net/minecraft/block/MaterialColor.mapping
@@ -57,3 +57,4 @@ CLASS cfx net/minecraft/block/MaterialColor
 	METHOD <init> (II)V
 		ARG 1 id
 	METHOD a getRenderColor (I)I
+		ARG 1 shade
diff --git a/mappings/net/minecraft/block/MelonBlock.mapping b/mappings/net/minecraft/block/MelonBlock.mapping
index 867024f812..d3e14e6912 100644
--- a/mappings/net/minecraft/block/MelonBlock.mapping
+++ b/mappings/net/minecraft/block/MelonBlock.mapping
@@ -1,3 +1,5 @@
 CLASS bkr net/minecraft/block/MelonBlock
 	METHOD <init> (Lbhi$c;)V
 		ARG 1 settings
+	METHOD d getStem ()Lbms;
+	METHOD e getAttachedStem ()Lbgq;
diff --git a/mappings/net/minecraft/block/PlacementEnvironment.mapping b/mappings/net/minecraft/block/PlacementEnvironment.mapping
deleted file mode 100644
index 8ce792a381..0000000000
--- a/mappings/net/minecraft/block/PlacementEnvironment.mapping
+++ /dev/null
@@ -1 +0,0 @@
-CLASS cia net/minecraft/block/PlacementEnvironment
diff --git a/mappings/net/minecraft/block/PumpkinBlock.mapping b/mappings/net/minecraft/block/PumpkinBlock.mapping
index 05effc0ca9..bccef3ab71 100644
--- a/mappings/net/minecraft/block/PumpkinBlock.mapping
+++ b/mappings/net/minecraft/block/PumpkinBlock.mapping
@@ -10,3 +10,5 @@ CLASS blh net/minecraft/block/PumpkinBlock
 		ARG 6 facing
 		ARG 7 hitX
 		ARG 8 hitY
+	METHOD d getStem ()Lbms;
+	METHOD e getAttachedStem ()Lbgq;
diff --git a/mappings/net/minecraft/block/SpongeWetBlock.mapping b/mappings/net/minecraft/block/WetSpongeBlock.mapping
similarity index 77%
rename from mappings/net/minecraft/block/SpongeWetBlock.mapping
rename to mappings/net/minecraft/block/WetSpongeBlock.mapping
index 405b95ccae..2717617d41 100644
--- a/mappings/net/minecraft/block/SpongeWetBlock.mapping
+++ b/mappings/net/minecraft/block/WetSpongeBlock.mapping
@@ -1,4 +1,4 @@
-CLASS bnt net/minecraft/block/SpongeWetBlock
+CLASS bnt net/minecraft/block/WetSpongeBlock
 	METHOD <init> (Lbhi$c;)V
 		ARG 1 settings
 	METHOD a randomDisplayTick (Lbqe;Lbcf;Let;Ljava/util/Random;)V
diff --git a/mappings/net/minecraft/container/BeaconContainer.mapping b/mappings/net/minecraft/container/BeaconContainer.mapping
index 7cb79227b8..9f683c2463 100644
--- a/mappings/net/minecraft/container/BeaconContainer.mapping
+++ b/mappings/net/minecraft/container/BeaconContainer.mapping
@@ -6,8 +6,8 @@ CLASS ati net/minecraft/container/BeaconContainer
 	CLASS ati$a SlotPayment
 		METHOD a getMaxStackAmount ()I
 		METHOD a canInsert (Laxd;)Z
-	METHOD a getType ()Laug;
 	FIELD f propertyDelegate Lato;
+	METHOD a getType ()Laug;
 	METHOD a setProperty (II)V
 		ARG 1 pos
 		ARG 2 propertyId
diff --git a/mappings/net/minecraft/server/world/ChunkHolderManager.mapping b/mappings/net/minecraft/server/world/ChunkHolderManager.mapping
index 2fe7eb235b..70663ffead 100644
--- a/mappings/net/minecraft/server/world/ChunkHolderManager.mapping
+++ b/mappings/net/minecraft/server/world/ChunkHolderManager.mapping
@@ -20,12 +20,9 @@ CLASS ug net/minecraft/server/world/ChunkHolderManager
 	FIELD k chunkTaskPrioritySystem Lui;
 	FIELD l worldgenActor Lafh;
 	FIELD m mainActor Lafh;
-	FIELD n progressListener Lvh;
 	FIELD o chunkSaveHandler Lbsr;
 	FIELD p ticketManager Lug$a;
 	FIELD q totalChunksLoadedCount Ljava/util/concurrent/atomic/AtomicInteger;
-	METHOD <init> (Ljava/util/concurrent/Executor;Luf$d;Ljava/util/concurrent/Executor;Lbsr;Lbsg;Lbcf;Lbrt;Lvh;)V
-		ARG 3 genQueueAdder
 	METHOD a getLightProvider ()Lux;
 	METHOD a applyViewDistance (II)V
 	METHOD a getChunkHolder (J)Luf;