diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping
index 9e120620a7..e32097c040 100644
--- a/mappings/net/minecraft/SharedConstants.mapping
+++ b/mappings/net/minecraft/SharedConstants.mapping
@@ -3,6 +3,8 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants
 	FIELD field_1125 isDevelopment Z
 	FIELD field_1126 INVALID_CHARS_LEVEL_NAME [C
 	FIELD field_16742 gameVersion Lcom/mojang/bridge/game/GameVersion;
+	FIELD field_25135 useChoiceTypeRegistrations Z
+		COMMENT Specifies whether Minecraft should use choice type registrations from the game's schema when entity types or block entity types are created.
 	METHOD method_16673 getGameVersion ()Lcom/mojang/bridge/game/GameVersion;
 	METHOD method_643 isValidChar (C)Z
 		ARG 0 chr
diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping
index 96be6bad31..d8ab026094 100644
--- a/mappings/net/minecraft/util/Util.mapping
+++ b/mappings/net/minecraft/util/Util.mapping
@@ -1,15 +1,15 @@
 CLASS net/minecraft/class_156 net/minecraft/util/Util
 	FIELD field_1128 nanoTimeSupplier Ljava/util/function/LongSupplier;
 	FIELD field_1129 LOGGER Lorg/apache/logging/log4j/Logger;
-	FIELD field_18034 NEXT_SERVER_WORKER_ID Ljava/util/concurrent/atomic/AtomicInteger;
-	FIELD field_18035 SERVER_WORKER_EXECUTOR Ljava/util/concurrent/ExecutorService;
+	FIELD field_18034 NEXT_WORKER_ID Ljava/util/concurrent/atomic/AtomicInteger;
+	FIELD field_18035 MAIN_WORKER_EXECUTOR Ljava/util/concurrent/ExecutorService;
 	FIELD field_24477 IO_WORKER_EXECUTOR Ljava/util/concurrent/ExecutorService;
 	FIELD field_24622 BOOTSTRAP_EXECUTOR Ljava/util/concurrent/ExecutorService;
 	FIELD field_25140 NIL_UUID Ljava/util/UUID;
 	METHOD method_17815 stream (Ljava/util/Optional;)Ljava/util/stream/Stream;
 	METHOD method_17974 ifPresentOrElse (Ljava/util/Optional;Ljava/util/function/Consumer;Ljava/lang/Runnable;)Ljava/util/Optional;
-	METHOD method_18349 getServerWorkerExecutor ()Ljava/util/concurrent/Executor;
-	METHOD method_18350 shutdownServerWorkerExecutor ()V
+	METHOD method_18349 getMainWorkerExecutor ()Ljava/util/concurrent/Executor;
+	METHOD method_18350 shutdownExecutors ()V
 	METHOD method_18839 debugRunnable (Ljava/lang/Runnable;Ljava/util/function/Supplier;)Ljava/lang/Runnable;
 		ARG 0 runnable
 		ARG 1 messageSupplier
@@ -43,9 +43,15 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util
 	METHOD method_27959 createIoWorker ()Ljava/util/concurrent/ExecutorService;
 	METHOD method_28122 createWorker (Ljava/lang/String;)Ljava/util/concurrent/ExecutorService;
 	METHOD method_28124 getBootstrapExecutor ()Ljava/util/concurrent/Executor;
+	METHOD method_29187 getChoiceType (Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)Lcom/mojang/datafixers/types/Type;
+		ARG 0 typeReference
+		ARG 1 id
 	METHOD method_29190 toIntArray (Ljava/util/stream/IntStream;I)Lcom/mojang/serialization/DataResult;
 		ARG 0 intStream
 		ARG 1 length
+	METHOD method_29191 getChoiceTypeInternal (Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)Lcom/mojang/datafixers/types/Type;
+		ARG 0 typeReference
+		ARG 1 id
 	METHOD method_29476 startTimerHack ()V
 	METHOD method_29775 relativeCopy (Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/nio/file/Path;)V
 		COMMENT Copies a file contained in the folder {@code src} to the folder {@code dest}.