diff --git a/build.gradle b/build.gradle
index 938f6ba966..256d4f6eb1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ plugins {
 	id 'net.fabricmc.filament' version '0.3.0'
 }
 
-def minecraft_version = "1.17.1-rc1"
+def minecraft_version = "1.17.1-rc2"
 
 def ENV = System.getenv()
 // Fetch build number from Github Actions
diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping
index cbed5082f1..6d6a943133 100644
--- a/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping
+++ b/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping
@@ -3,7 +3,6 @@ CLASS net/minecraft/class_853 net/minecraft/client/render/chunk/ChunkRendererReg
 	FIELD field_4482 sizeZ I
 	FIELD field_4483 chunks [[Lnet/minecraft/class_2818;
 	FIELD field_4484 sizeY I
-	FIELD field_4485 fluidStates [Lnet/minecraft/class_3610;
 	FIELD field_4486 sizeX I
 	FIELD field_4487 chunkZOffset I
 	FIELD field_4488 chunkXOffset I
diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping
index 34b50a0a35..abcbaec36e 100644
--- a/mappings/net/minecraft/network/ClientConnection.mapping
+++ b/mappings/net/minecraft/network/ClientConnection.mapping
@@ -71,7 +71,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
 	METHOD method_10759 handlePacket (Lnet/minecraft/class_2596;Lnet/minecraft/class_2547;)V
 		ARG 0 packet
 		ARG 1 listener
-	METHOD method_10760 setCompressionThreshold (I)V
+	METHOD method_10760 setCompressionThreshold (IZ)V
 		ARG 1 compressionThreshold
 	METHOD method_10762 getAveragePacketsReceived ()F
 	METHOD method_10763 setPacketListener (Lnet/minecraft/class_2547;)V
diff --git a/mappings/net/minecraft/network/PacketInflater.mapping b/mappings/net/minecraft/network/PacketInflater.mapping
index 47236543bd..be87cedd5b 100644
--- a/mappings/net/minecraft/network/PacketInflater.mapping
+++ b/mappings/net/minecraft/network/PacketInflater.mapping
@@ -3,8 +3,7 @@ CLASS net/minecraft/class_2532 net/minecraft/network/PacketInflater
 	FIELD field_11623 compressionThreshold I
 	FIELD field_33279 MAXIMUM_PACKET_SIZE I
 		COMMENT The maximum size allowed for a compressed packet. Has value {@value}.
-	METHOD <init> (I)V
+	METHOD <init> (IZ)V
 		ARG 1 compressionThreshold
-	METHOD method_10739 setCompressionThreshold (I)V
+	METHOD method_10739 setCompressionThreshold (IZ)V
 		ARG 1 compressionThreshold
-	METHOD method_36119 getCompressionThreshold ()I
diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping
index 1e43df65c6..f22ccdfd47 100644
--- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping
+++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping
@@ -16,7 +16,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
 	FIELD field_17442 worldGenerationProgressListener Lnet/minecraft/class_3949;
 	FIELD field_17705 persistentStateManagerFactory Ljava/util/function/Supplier;
 	FIELD field_17706 structureManager Lnet/minecraft/class_3485;
-	FIELD field_17707 saveDir Ljava/io/File;
+	FIELD field_17707 saveDir Ljava/lang/String;
 	FIELD field_18239 MAX_LEVEL I
 		COMMENT Specifies the maximum ticket level a chunk can be before a chunk's {@link net.minecraft.server.world.ChunkHolder.LevelType} is {@link net.minecraft.server.world.ChunkHolder.LevelType#BORDER}.
 	FIELD field_18241 playerChunkWatchingManager Lnet/minecraft/class_3210;
diff --git a/mappings/net/minecraft/world/storage/ChunkDataAccess.mapping b/mappings/net/minecraft/world/storage/ChunkDataAccess.mapping
index 26a9911b61..b6b5c05287 100644
--- a/mappings/net/minecraft/world/storage/ChunkDataAccess.mapping
+++ b/mappings/net/minecraft/world/storage/ChunkDataAccess.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_5571 net/minecraft/world/storage/ChunkDataAccess
-	METHOD method_31758 awaitAll ()V
+	METHOD method_31758 awaitAll (Z)V
 	METHOD method_31759 readChunkData (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 pos
 	METHOD method_31760 writeChunkData (Lnet/minecraft/class_5566;)V
diff --git a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping
index fe1a6593ef..267a99b488 100644
--- a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping
+++ b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping
@@ -4,7 +4,6 @@ CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess
 	FIELD field_27233 world Lnet/minecraft/class_3218;
 	FIELD field_27234 dataLoadWorker Lnet/minecraft/class_4698;
 	FIELD field_27235 emptyChunks Lit/unimi/dsi/fastutil/longs/LongSet;
-	FIELD field_27236 executor Ljava/util/concurrent/Executor;
 	FIELD field_31414 ENTITIES_KEY Ljava/lang/String;
 	FIELD field_31415 POSITION_KEY Ljava/lang/String;
 	METHOD <init> (Lnet/minecraft/class_3218;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;ZLjava/util/concurrent/Executor;)V
diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
index 95e0e6efc0..44ce7b9a24 100644
--- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
+++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping
@@ -8,7 +8,7 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker
 		ARG 1 directory
 		ARG 2 dsync
 		ARG 3 name
-	METHOD method_23698 completeAll ()Ljava/util/concurrent/CompletableFuture;
+	METHOD method_23698 completeAll (Z)Ljava/util/concurrent/CompletableFuture;
 	METHOD method_23700 getNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487;
 		ARG 1 pos
 	METHOD method_23701 write (Lnet/minecraft/class_1923;Lnet/minecraft/class_4698$class_4699;)V