22w19a

build.gradle

@@ -27,7 +27,7 @@ plugins {
 	id 'net.fabricmc.filament' version '0.3.0'
 }
 
-def minecraft_version = "22w18a"
+def minecraft_version = "22w19a"
 
 def ENV = System.getenv()
 // Fetch build number from Github Actions

mappings/net/minecraft/block/FrogspawnBlock.mapping

@@ -23,6 +23,4 @@ CLASS net/minecraft/class_7113 net/minecraft/block/FrogspawnBlock
 		ARG 0 random
 	METHOD method_41430 spawnTadpoles (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 		ARG 1 world
-		ARG 2 pos
-		ARG 3 random
 	METHOD method_41431 resetHatchTimeRange ()V

mappings/net/minecraft/block/SculkShriekerBlock.mapping

@@ -13,5 +13,5 @@ CLASS net/minecraft/class_7268 net/minecraft/block/SculkShriekerBlock
 		ARG 1 blockEntity
 	METHOD method_43133 (Lnet/minecraft/class_3218;Lnet/minecraft/class_7133;)V
 		ARG 1 blockEntity
-	METHOD method_43134 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;Lnet/minecraft/class_7133;)V
+	METHOD method_43134 (Lnet/minecraft/class_3218;Lnet/minecraft/class_3222;Lnet/minecraft/class_7133;)V
 		ARG 2 blockEntity

mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping

@@ -9,28 +9,12 @@ CLASS net/minecraft/class_7133 net/minecraft/block/entity/SculkShriekerBlockEnti
 	METHOD method_42322 (Lnet/minecraft/class_5718;)V
 		ARG 1 vibrationListener
 	METHOD method_42325 getVibrationListener ()Lnet/minecraft/class_5718;
-	METHOD method_43141 shriek (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)V
+	METHOD method_43141 shriek (Lnet/minecraft/class_3218;Lnet/minecraft/class_3222;)V
-		ARG 1 world
+	METHOD method_43142 trySyncWarningLevel (Lnet/minecraft/class_3218;Lnet/minecraft/class_3222;)Z
-		ARG 2 entity
-	METHOD method_43142 trySyncWarningLevel (Lnet/minecraft/class_3218;Lnet/minecraft/class_2680;)Z
-		ARG 1 world
-		ARG 2 state
-	METHOD method_43143 getClosestPlayerWarningManager (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Ljava/util/Optional;
-		ARG 0 world
-		ARG 1 pos
-	METHOD method_43144 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_7262;)Z
-		ARG 2 warningManager
-	METHOD method_43145 (Lnet/minecraft/class_7260;)V
-		ARG 0 entity
 	METHOD method_43146 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V
 		ARG 0 warningSounds
 	METHOD method_43147 warn (Lnet/minecraft/class_3218;)V
-		ARG 1 world
+	METHOD method_43148 trySpawnWarden (Lnet/minecraft/class_3218;)Z
-	METHOD method_43148 trySpawnWarden (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V
-		ARG 0 world
-		ARG 1 pos
-	METHOD method_43149 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_7262;)Ljava/lang/Boolean;
-		ARG 2 warningManager
 	METHOD method_43150 canWarn (Lnet/minecraft/class_3218;)Z
 		ARG 1 world
 	METHOD method_43151 playWarningSound ()V

mappings/net/minecraft/block/entity/SculkShriekerWarningManager.mapping

@@ -10,23 +10,15 @@ CLASS net/minecraft/class_7262 net/minecraft/block/entity/SculkShriekerWarningMa
 	METHOD method_42247 tick ()V
 	METHOD method_42248 setWarningLevel (I)V
 		ARG 1 warningLevel
-	METHOD method_42250 warnNearbyPlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z
+	METHOD method_42250 warnNearbyPlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_3222;)Ljava/util/OptionalInt;
-		ARG 1 world
-		ARG 2 pos
 	METHOD method_42252 copy (Lnet/minecraft/class_7262;)V
 		ARG 1 other
-	METHOD method_42253 (Lnet/minecraft/class_7262;Lnet/minecraft/class_3222;)V
-		ARG 1 player
 	METHOD method_42254 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_42255 (Lnet/minecraft/class_243;Lnet/minecraft/class_3222;)Z
 		ARG 1 player
-	METHOD method_42257 (Ljava/util/List;Lnet/minecraft/class_7262;)V
-		ARG 1 manager
 	METHOD method_42258 reset ()V
 	METHOD method_42259 canIncreaseWarningLevel (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z
-		ARG 1 world
-		ARG 2 pos
 	METHOD method_42260 (Lnet/minecraft/class_7262;)I
 		ARG 0 manager
 	METHOD method_42261 increaseWarningLevel ()V

mappings/net/minecraft/client/font/MultilineText.mapping

@@ -32,8 +32,6 @@ CLASS net/minecraft/class_5489 net/minecraft/client/font/MultilineText
 	METHOD method_30894 (Lnet/minecraft/class_327;Lnet/minecraft/class_5481;)Lnet/minecraft/class_5489$class_5490;
 		ARG 1 text
 	METHOD method_30895 create (Lnet/minecraft/class_327;Ljava/util/List;)Lnet/minecraft/class_5489;
-		ARG 0 renderer
-		ARG 1 lines
 	METHOD method_30896 draw (Lnet/minecraft/class_4587;IIII)I
 		ARG 1 matrices
 		ARG 2 x

mappings/net/minecraft/client/gui/screen/Realms32BitWarningScreen.mapping

@@ -3,7 +3,5 @@ CLASS net/minecraft/class_7064 net/minecraft/client/gui/screen/Realms32BitWarnin
 	FIELD field_37213 MESSAGE Lnet/minecraft/class_2561;
 	FIELD field_37214 CHECK_MESSAGE Lnet/minecraft/class_2561;
 	FIELD field_37215 NARRATED_TEXT Lnet/minecraft/class_2561;
-	METHOD <init> (Lnet/minecraft/class_437;)V
-		ARG 1 parent
 	METHOD method_41161 (Lnet/minecraft/class_4185;)V
 		ARG 1 button

mappings/net/minecraft/client/gui/screen/Screen.mapping

@@ -78,15 +78,10 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 		ARG 2 text
 		ARG 3 x
 		ARG 4 y
-	METHOD method_25425 sendMessage (Ljava/lang/String;Z)V
-		ARG 1 message
-		ARG 2 toHud
 	METHOD method_25426 init ()V
 		COMMENT Called when a screen should be initialized.
 		COMMENT
 		COMMENT <p>This method is called when this screen is {@linkplain net.minecraft.client.MinecraftClient#setScreen(Screen) opened} or resized.
-	METHOD method_25427 sendMessage (Ljava/lang/String;)V
-		ARG 1 message
 	METHOD method_25428 confirmLink (Z)V
 		ARG 1 open
 	METHOD method_25429 addSelectableChild (Lnet/minecraft/class_364;)Lnet/minecraft/class_364;

mappings/net/minecraft/client/gui/screen/TitleScreen.mapping

@@ -15,8 +15,6 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen
 	FIELD field_32271 COPYRIGHT Lnet/minecraft/class_2561;
 	FIELD field_32272 DEMO_WORLD_NAME Ljava/lang/String;
 	FIELD field_37209 deprecationNotice Lnet/minecraft/class_442$class_7063;
-	FIELD field_37210 realms Lnet/minecraft/class_4341;
-	FIELD field_37211 displayedRealms32BitWarning Z
 	METHOD <init> (Z)V
 		ARG 1 doBackgroundFade
 	METHOD method_18105 loadTexturesAsync (Lnet/minecraft/class_1060;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
@@ -57,10 +55,6 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen
 		ARG 2 x
 		ARG 3 y
 	METHOD method_31129 canReadDemoWorldData ()Z
-	METHOD method_41157 (Lnet/minecraft/class_4877;)Z
-		ARG 1 server
-	METHOD method_41158 tryShowRealms32BitWarning ()V
-	METHOD method_41159 fetchRealmsSubscribed ()Z
 	METHOD method_41198 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	CLASS 1

mappings/net/minecraft/client/gui/screen/WarningScreen.mapping

@@ -1,16 +1,14 @@
 CLASS net/minecraft/class_7065 net/minecraft/client/gui/screen/WarningScreen
-	FIELD field_37216 parent Lnet/minecraft/class_437;
 	FIELD field_37217 checkbox Lnet/minecraft/class_4286;
 	FIELD field_37218 header Lnet/minecraft/class_2561;
 	FIELD field_37219 message Lnet/minecraft/class_2561;
 	FIELD field_37220 checkMessage Lnet/minecraft/class_2561;
 	FIELD field_37221 narratedText Lnet/minecraft/class_2561;
 	FIELD field_37222 messageText Lnet/minecraft/class_5489;
-	METHOD <init> (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_437;)V
+	METHOD <init> (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V
 		ARG 1 header
 		ARG 2 message
 		ARG 3 checkMessage
 		ARG 4 narratedText
-		ARG 5 parent
 	METHOD method_41160 initButtons (I)V
 		ARG 1 yOffset

mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.mapping

@@ -3,5 +3,3 @@ CLASS net/minecraft/class_4749 net/minecraft/client/gui/screen/multiplayer/Multi
 	FIELD field_21844 MESSAGE Lnet/minecraft/class_2561;
 	FIELD field_21845 CHECK_MESSAGE Lnet/minecraft/class_2561;
 	FIELD field_21846 NARRATED_TEXT Lnet/minecraft/class_2561;
-	METHOD <init> (Lnet/minecraft/class_437;)V
-		ARG 1 parent

mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping

@@ -111,8 +111,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 		ARG 1 entity
 	METHOD method_43331 resolveUrl (Ljava/lang/String;)Ljava/net/URL;
 		ARG 0 url
-	METHOD method_43597 isSignatureValid (Lnet/minecraft/class_7438;)Z
+	METHOD method_43597 isSignatureValid (Lnet/minecraft/class_7471;)Z
 		COMMENT {@return whether the chat message packet has a valid signature}
 		COMMENT
 		COMMENT <p>This returns {@code false} when the chat sender is unknown.
-		ARG 1 packet

mappings/net/minecraft/client/network/ClientPlayerEntity.mapping

@@ -120,7 +120,7 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity
 		COMMENT {@link ArgumentSignatures#none()}.
 		ARG 1 signer
 		ARG 2 parseResults
-	METHOD method_43787 sendCommand (Lnet/minecraft/class_7470;Ljava/lang/String;)V
+	METHOD method_43787 sendCommand (Lnet/minecraft/class_7470;Ljava/lang/String;Lnet/minecraft/class_2561;)V
 		COMMENT Signs and sends {@code command} to the server.
 		ARG 1 signer
 		ARG 2 command

mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping

@@ -6,9 +6,9 @@ CLASS net/minecraft/class_5597 net/minecraft/client/render/entity/model/SinglePa
 		ARG 1 part
 	METHOD method_41911 (Ljava/lang/String;Lnet/minecraft/class_630;)Z
 		ARG 1 part
-	METHOD method_43781 updateAnimation (Lnet/minecraft/class_7094;Lnet/minecraft/class_7184;)V
+	METHOD method_43781 updateAnimation (Lnet/minecraft/class_7094;Lnet/minecraft/class_7184;F)V
 		ARG 1 animationState
 		ARG 2 animation
-	METHOD method_43782 updateAnimation (Lnet/minecraft/class_7094;Lnet/minecraft/class_7184;F)V
+	METHOD method_43782 updateAnimation (Lnet/minecraft/class_7094;Lnet/minecraft/class_7184;FF)V
 		ARG 1 animationState
 		ARG 2 animation

mappings/net/minecraft/client/toast/SystemToast.mapping

@@ -5,7 +5,6 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast
 	FIELD field_2216 startTime J
 	FIELD field_25037 lines Ljava/util/List;
 	FIELD field_25038 width I
-	FIELD field_32218 DURATION J
 	FIELD field_32219 MIN_WIDTH I
 	METHOD <init> (Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Ljava/util/List;I)V
 		ARG 1 type

mappings/net/minecraft/command/argument/CommandFunctionArgumentType.mapping

@@ -10,7 +10,7 @@ CLASS net/minecraft/class_2284 net/minecraft/command/argument/CommandFunctionArg
 		ARG 0 id
 	METHOD method_9765 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
-	METHOD method_9767 getFunctionTag (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494;
+	METHOD method_9767 getFunctionTag (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2960;)Ljava/util/Collection;
 		ARG 0 context
 		ARG 1 id
 	METHOD method_9768 getFunctionOrTag (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcom/mojang/datafixers/util/Pair;

mappings/net/minecraft/command/argument/RegistryPredicateArgumentType.mapping

@@ -1,30 +1,18 @@
 CLASS net/minecraft/class_7066 net/minecraft/command/argument/RegistryPredicateArgumentType
 	FIELD field_37223 EXAMPLES Ljava/util/Collection;
-	FIELD field_37224 INVALID_BIOME_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	FIELD field_37225 INVALID_CONFIGURED_STRUCTURE_FEATURE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_37226 registryRef Lnet/minecraft/class_5321;
 	METHOD <init> (Lnet/minecraft/class_5321;)V
 		ARG 1 registryRef
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 context
 		ARG 2 builder
-	METHOD method_41165 getBiomePredicate (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_7066$class_7068;
-		ARG 0 context
-		ARG 1 name
 	METHOD method_41166 getPredicate (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/class_7066$class_7068;
 		ARG 0 context
 		ARG 1 name
 		ARG 2 registryRef
 		ARG 3 invalidException
-	METHOD method_41169 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 id
 	METHOD method_41170 registryPredicate (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7066;
 		ARG 0 registryRef
-	METHOD method_41171 getConfiguredStructureFeaturePredicate (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_7066$class_7068;
-		ARG 0 context
-		ARG 1 name
-	METHOD method_41172 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 id
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
 		ARG 1 reader
 	CLASS class_7067 RegistryKeyBased

mappings/net/minecraft/data/client/ModelProvider.mapping

@@ -1,18 +1,8 @@
 CLASS net/minecraft/class_4916 net/minecraft/data/client/ModelProvider
 	FIELD field_22845 LOGGER Lorg/slf4j/Logger;
-	FIELD field_22847 generator Lnet/minecraft/class_2403;
 	METHOD <init> (Lnet/minecraft/class_2403;)V
 		ARG 1 generator
-	METHOD method_25735 writeJsons (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Ljava/util/Map;Ljava/util/function/BiFunction;)V
+	METHOD method_25735 writeJsons (Lnet/minecraft/class_7403;Ljava/util/Map;Ljava/util/function/Function;)V
 		ARG 1 cache
-		ARG 2 root
-		ARG 3 jsons
-		ARG 4 locator
-	METHOD method_25736 getBlockStateJsonPath (Ljava/nio/file/Path;Lnet/minecraft/class_2248;)Ljava/nio/file/Path;
-		ARG 0 root
-		ARG 1 block
-	METHOD method_25737 getModelJsonPath (Ljava/nio/file/Path;Lnet/minecraft/class_2960;)Ljava/nio/file/Path;
-		ARG 0 root
-		ARG 1 id
 	METHOD method_25741 (Ljava/util/Set;Ljava/util/Map;Lnet/minecraft/class_2248;)V
 		ARG 2 block

mappings/net/minecraft/data/report/WorldgenProvider.mapping

@@ -3,30 +3,12 @@ CLASS net/minecraft/class_5475 net/minecraft/data/report/WorldgenProvider
 	FIELD field_26379 generator Lnet/minecraft/class_2403;
 	METHOD <init> (Lnet/minecraft/class_2403;)V
 		ARG 1 generator
-	METHOD method_30682 getPath (Ljava/nio/file/Path;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Ljava/nio/file/Path;
+	METHOD method_39678 writeRegistryEntries (Lnet/minecraft/class_7403;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_5456;)V
-		ARG 0 root
-		ARG 1 rootId
-		ARG 2 id
-	METHOD method_39678 writeRegistryEntries (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_5456;)V
-		ARG 0 cache
-		ARG 1 path
-		ARG 2 registryManager
-		ARG 3 json
-		ARG 4 info
-	METHOD method_39679 getRootPath (Ljava/nio/file/Path;)Ljava/nio/file/Path;
-		ARG 0 path
 	METHOD method_39680 writeToPath (Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)V
 		ARG 0 path
 		ARG 1 cache
 		ARG 2 json
 		ARG 3 encoder
 		ARG 4 value
-	METHOD method_39681 writeRegistryEntries (Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;Lcom/mojang/serialization/Encoder;)V
+	METHOD method_39682 (Lnet/minecraft/class_7403;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_5456;)V
-		ARG 0 path
-		ARG 1 cache
-		ARG 2 json
-		ARG 3 registryKey
-		ARG 4 registry
-		ARG 5 encoder
-	METHOD method_39682 (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Lnet/minecraft/class_5455;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455$class_5456;)V
 		ARG 4 info

mappings/net/minecraft/data/server/AbstractTagProvider.mapping

@@ -2,32 +2,27 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider
 	FIELD field_11479 LOGGER Lorg/slf4j/Logger;
 	FIELD field_11481 tagBuilders Ljava/util/Map;
 	FIELD field_11482 registry Lnet/minecraft/class_2378;
-	FIELD field_11483 root Lnet/minecraft/class_2403;
 	METHOD <init> (Lnet/minecraft/class_2403;Lnet/minecraft/class_2378;)V
 		ARG 1 root
 		ARG 2 registry
-	METHOD method_10510 getOutput (Lnet/minecraft/class_2960;)Ljava/nio/file/Path;
-		ARG 1 id
 	METHOD method_10512 getOrCreateTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2474$class_5124;
 		ARG 1 tag
 	METHOD method_10514 configure ()V
-	METHOD method_27046 (Lnet/minecraft/class_7403;Lnet/minecraft/class_2960;Lnet/minecraft/class_3494$class_3495;)V
+	METHOD method_27046 (Lnet/minecraft/class_7403;Lnet/minecraft/class_2960;Lnet/minecraft/class_3495;)V
 		ARG 2 id
 		ARG 3 builder
-	METHOD method_27169 getTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_3494$class_3495;
+	METHOD method_27169 getTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_3495;
 		ARG 1 tag
-	METHOD method_27170 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494$class_3495;
+	METHOD method_27170 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3495;
 		ARG 0 id
-	METHOD method_33130 (Lnet/minecraft/class_3494$class_5145;)Z
+	METHOD method_33130 (Lnet/minecraft/class_3497;)Z
 		ARG 1 tag
 	CLASS class_5124 ObjectBuilder
-		FIELD field_23960 builder Lnet/minecraft/class_3494$class_3495;
+		FIELD field_23960 builder Lnet/minecraft/class_3495;
 		FIELD field_23961 registry Lnet/minecraft/class_2378;
-		FIELD field_23962 source Ljava/lang/String;
+		METHOD <init> (Lnet/minecraft/class_3495;Lnet/minecraft/class_2378;)V
-		METHOD <init> (Lnet/minecraft/class_3494$class_3495;Lnet/minecraft/class_2378;Ljava/lang/String;)V
 			ARG 1 builder
 			ARG 2 registry
-			ARG 3 source
 		METHOD method_26792 addTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2474$class_5124;
 			ARG 1 identifiedTag
 		METHOD method_26793 add (Ljava/lang/Object;)Lnet/minecraft/class_2474$class_5124;

mappings/net/minecraft/data/server/AdvancementProvider.mapping

@@ -1,11 +1,7 @@
 CLASS net/minecraft/class_2409 net/minecraft/data/server/AdvancementProvider
-	FIELD field_11288 root Lnet/minecraft/class_2403;
 	FIELD field_11289 tabGenerators Ljava/util/List;
 	FIELD field_11290 LOGGER Lorg/slf4j/Logger;
 	METHOD <init> (Lnet/minecraft/class_2403;)V
 		ARG 1 root
-	METHOD method_10333 (Ljava/util/Set;Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lnet/minecraft/class_161;)V
+	METHOD method_10333 (Ljava/util/Set;Lnet/minecraft/class_7403;Lnet/minecraft/class_161;)V
 		ARG 3 advancement
-	METHOD method_10334 getOutput (Ljava/nio/file/Path;Lnet/minecraft/class_161;)Ljava/nio/file/Path;
-		ARG 0 rootOutput
-		ARG 1 advancement

mappings/net/minecraft/data/server/BiomeParametersProvider.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_7228 net/minecraft/data/server/BiomeParametersProvider
 	FIELD field_38012 LOGGER Lorg/slf4j/Logger;
-	FIELD field_38014 dataGenerator Lnet/minecraft/class_2403;
 	METHOD <init> (Lnet/minecraft/class_2403;)V
 		ARG 1 dataGenerator

mappings/net/minecraft/data/server/LootTableProvider.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_2438 net/minecraft/data/server/LootTableProvider
-	FIELD field_11353 root Lnet/minecraft/class_2403;
 	FIELD field_11354 lootTypeGenerators Ljava/util/List;
 	FIELD field_11355 LOGGER Lorg/slf4j/Logger;
 	METHOD <init> (Lnet/minecraft/class_2403;)V
@@ -7,12 +6,9 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/LootTableProvider
 	METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V
 		ARG 0 name
 		ARG 1 message
-	METHOD method_10408 (Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V
+	METHOD method_10408 (Lnet/minecraft/class_7403;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V
 		ARG 2 id
 		ARG 3 table
-	METHOD method_10409 getOutput (Ljava/nio/file/Path;Lnet/minecraft/class_2960;)Ljava/nio/file/Path;
-		ARG 0 rootOutput
-		ARG 1 lootTableId
 	METHOD method_10410 (Ljava/util/Map;Lcom/mojang/datafixers/util/Pair;)V
 		ARG 1 generator
 	METHOD method_10411 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V

mappings/net/minecraft/data/server/RecipeProvider.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider
-	FIELD field_11373 root Lnet/minecraft/class_2403;
 	FIELD field_11374 LOGGER Lorg/slf4j/Logger;
 	FIELD field_28555 VARIANT_FACTORIES Ljava/util/Map;
 	FIELD field_33420 COAL_ORES Lcom/google/common/collect/ImmutableList;
@@ -16,7 +15,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider
 		ARG 0 exporter
 	METHOD method_10420 conditionsFromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2066$class_2068;
 		ARG 0 tag
-	METHOD method_10421 (Ljava/util/Set;Lnet/minecraft/class_7403;Ljava/nio/file/Path;Lnet/minecraft/class_2444;)V
+	METHOD method_10421 (Ljava/util/Set;Lnet/minecraft/class_7403;Lnet/minecraft/class_2444;)V
 		ARG 3 provider
 	METHOD method_10422 requireEnteringFluid (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2037$class_2039;
 		ARG 0 block

mappings/net/minecraft/entity/AnimationState.mapping

@@ -7,6 +7,5 @@ CLASS net/minecraft/class_7094 net/minecraft/entity/AnimationState
 	METHOD method_41324 startIfNotRunning ()V
 	METHOD method_41325 stop ()V
 	METHOD method_41327 isRunning ()Z
-	METHOD method_43686 update (ZF)V
+	METHOD method_43686 update (FF)V
-		ARG 1 gamePaused
 	METHOD method_43687 getTimeRunning ()J

mappings/net/minecraft/entity/ai/WardenAngerManager.mapping

@@ -23,7 +23,7 @@ CLASS net/minecraft/class_7254 net/minecraft/entity/ai/WardenAngerManager
 		ARG 1 entity
 		ARG 2 amount
 	METHOD method_42181 getPrimeSuspect ()Ljava/util/Optional;
-	METHOD method_42185 getPrimeSuspectAnger ()I
+	METHOD method_42185 getPrimeSuspectAnger (Lnet/minecraft/class_1297;)I
 	METHOD method_42186 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1309;
 		ARG 0 suspect
 	METHOD method_42187 getPrimeSuspect ()Lnet/minecraft/class_1297;

mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping

@@ -1,21 +1,19 @@
 CLASS net/minecraft/class_4096 net/minecraft/entity/ai/brain/task/FindPointOfInterestTask
 	FIELD field_18332 positionExpireTimeLimit J
 	FIELD field_18854 onlyRunIfChild Z
-	FIELD field_19287 poiType Lnet/minecraft/class_4158;
+	FIELD field_19287 poiType Ljava/util/function/Predicate;
 	FIELD field_19289 foundPositionsToExpiry Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
 	FIELD field_20287 targetMemoryModuleType Lnet/minecraft/class_4140;
 	FIELD field_25812 entityStatus Ljava/util/Optional;
 	FIELD field_30098 POI_SORTING_RADIUS I
 	FIELD field_30099 MAX_POSITIONS_PER_RUN I
 	FIELD field_30100 POSITION_EXPIRE_INTERVAL I
-	METHOD <init> (Lnet/minecraft/class_4158;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;ZLjava/util/Optional;)V
+	METHOD <init> (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;ZLjava/util/Optional;)V
-		ARG 1 poiType
 		ARG 2 moduleType
 		ARG 3 targetMemoryModuleType
 		ARG 4 onlyRunIfChild
 		ARG 5 entityStatus
-	METHOD <init> (Lnet/minecraft/class_4158;Lnet/minecraft/class_4140;ZLjava/util/Optional;)V
+	METHOD <init> (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;ZLjava/util/Optional;)V
-		ARG 1 poiType
 		ARG 2 moduleType
 		ARG 3 onlyRunIfChild
 		ARG 4 entityStatus

mappings/net/minecraft/entity/ai/brain/task/ForgetCompletedPointOfInterestTask.mapping

@@ -2,8 +2,7 @@ CLASS net/minecraft/class_4128 net/minecraft/entity/ai/brain/task/ForgetComplete
 	FIELD field_18390 memoryModule Lnet/minecraft/class_4140;
 	FIELD field_18391 condition Ljava/util/function/Predicate;
 	FIELD field_30185 MAX_RANGE I
-	METHOD <init> (Lnet/minecraft/class_4158;Lnet/minecraft/class_4140;)V
+	METHOD <init> (Ljava/util/function/Predicate;Lnet/minecraft/class_4140;)V
-		ARG 1 poiType
 		ARG 2 memoryModule
 	METHOD method_20499 hasCompletedPointOfInterest (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z
 		ARG 1 world

mappings/net/minecraft/entity/ai/brain/task/GoToWorkTask.mapping

@@ -1,8 +1,6 @@
 CLASS net/minecraft/class_4114 net/minecraft/entity/ai/brain/task/GoToWorkTask
-	METHOD method_18984 (Lnet/minecraft/class_4158;Lnet/minecraft/class_3852;)Z
+	METHOD method_18984 (Lnet/minecraft/class_6880;Lnet/minecraft/class_3852;)Z
 		ARG 1 profession
-	METHOD method_18985 (Lnet/minecraft/class_4158;)Ljava/util/Optional;
-		ARG 0 poiType
 	METHOD method_18986 (Lnet/minecraft/class_1646;Lnet/minecraft/class_3218;Lnet/minecraft/class_3852;)V
 		ARG 2 profession
 	METHOD method_29929 (Lnet/minecraft/class_4208;Lnet/minecraft/class_3218;)Ljava/util/Optional;

mappings/net/minecraft/entity/ai/brain/task/HideInHomeTask.mapping

@@ -7,7 +7,3 @@ CLASS net/minecraft/class_4246 net/minecraft/entity/ai/brain/task/HideInHomeTask
 		ARG 1 maxDistance
 		ARG 2 walkSpeed
 		ARG 3 preferredDistance
-	METHOD method_19983 (Lnet/minecraft/class_4158;)Z
-		ARG 0 poiType
-	METHOD method_19985 (Lnet/minecraft/class_4158;)Z
-		ARG 0 poiType

mappings/net/minecraft/entity/ai/brain/task/TakeJobSiteTask.mapping

@@ -2,8 +2,7 @@ CLASS net/minecraft/class_5327 net/minecraft/entity/ai/brain/task/TakeJobSiteTas
 	FIELD field_25158 speed F
 	METHOD <init> (F)V
 		ARG 1 speed
-	METHOD method_29260 canUseJobSite (Lnet/minecraft/class_4158;Lnet/minecraft/class_1646;Lnet/minecraft/class_2338;)Z
+	METHOD method_29260 canUseJobSite (Lnet/minecraft/class_6880;Lnet/minecraft/class_1646;Lnet/minecraft/class_2338;)Z
-		ARG 1 poiType
 		ARG 2 villager
 		ARG 3 pos
 	METHOD method_29261 forgetJobSiteAndWalkTarget (Lnet/minecraft/class_1646;)V

mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping

@@ -15,7 +15,7 @@ CLASS net/minecraft/class_4111 net/minecraft/entity/ai/brain/task/VillagerBreedT
 	METHOD method_19573 getReachableHome (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;)Ljava/util/Optional;
 		ARG 1 world
 		ARG 2 villager
-	METHOD method_20642 canReachHome (Lnet/minecraft/class_1646;Lnet/minecraft/class_2338;)Z
+	METHOD method_20642 canReachHome (Lnet/minecraft/class_1646;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)Z
 		ARG 1 villager
 		ARG 2 pos
 	METHOD method_20643 goHome (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;Lnet/minecraft/class_1646;)V

mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping

@@ -2,15 +2,13 @@ CLASS net/minecraft/class_5326 net/minecraft/entity/ai/brain/task/WorkStationCom
 	FIELD field_25156 profession Lnet/minecraft/class_3852;
 	METHOD <init> (Lnet/minecraft/class_3852;)V
 		ARG 1 profession
-	METHOD method_29253 isCompletedWorkStation (Lnet/minecraft/class_4158;Lnet/minecraft/class_3852;)Z
+	METHOD method_29253 isCompletedWorkStation (Lnet/minecraft/class_6880;Lnet/minecraft/class_3852;)Z
-		ARG 1 poiType
 		ARG 2 profession
 	METHOD method_29254 hasJobSite (Lnet/minecraft/class_1646;)Z
 		ARG 1 villager
 	METHOD method_29255 keepJobSiteForMoreExperiencedVillager (Lnet/minecraft/class_1646;Lnet/minecraft/class_1646;)Lnet/minecraft/class_1646;
 		ARG 0 first
 		ARG 1 second
-	METHOD method_29257 isUsingWorkStationAt (Lnet/minecraft/class_4208;Lnet/minecraft/class_4158;Lnet/minecraft/class_1646;)Z
+	METHOD method_29257 isUsingWorkStationAt (Lnet/minecraft/class_4208;Lnet/minecraft/class_6880;Lnet/minecraft/class_1646;)Z
 		ARG 1 pos
-		ARG 2 poiType
 		ARG 3 villager

mappings/net/minecraft/entity/damage/DamageSource.mapping

@@ -11,7 +11,6 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource
 		COMMENT @apiNote This is used by goats to prevent rammed mobs from retaliating.
 		COMMENT Damages that are neutral do not cause {@link LivingEntity#setAttacker(LivingEntity)}
 		COMMENT to be called.
-	FIELD field_39043 SONIC_BOOM Lnet/minecraft/class_1282;
 	FIELD field_5839 unblockable Z
 	FIELD field_5840 bypassesArmor Z
 	FIELD field_5841 name Ljava/lang/String;

mappings/net/minecraft/entity/mob/WardenEntity.mapping

@@ -43,4 +43,3 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity
 		ARG 1 tickDelta
 	METHOD method_43113 isDiggingOrEmerging ()Z
 	METHOD method_43274 updateAttackTarget (Lnet/minecraft/class_1309;)V
-		ARG 1 entity

mappings/net/minecraft/entity/passive/BeeEntity.mapping

@@ -135,8 +135,6 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity
 			ARG 2 bee
 	CLASS class_4476 FindHiveGoal
 		METHOD method_23742 getNearbyFreeHives ()Ljava/util/List;
-		METHOD method_23743 (Lnet/minecraft/class_4158;)Z
-			ARG 0 poiType
 	CLASS class_4477 BeeLookControl
 		METHOD <init> (Lnet/minecraft/class_4466;Lnet/minecraft/class_1308;)V
 			ARG 2 entity

mappings/net/minecraft/entity/passive/VillagerEntity.mapping

@@ -50,15 +50,12 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
 		ARG 1 player
 	METHOD method_19193 depleteFood (I)V
 		ARG 1 amount
-	METHOD method_19520 (Lnet/minecraft/class_1646;Lnet/minecraft/class_4158;)Z
+	METHOD method_19520 (Lnet/minecraft/class_1646;Lnet/minecraft/class_6880;)Z
 		ARG 0 villager
-		ARG 1 poiType
+	METHOD method_19521 (Lnet/minecraft/class_1646;Lnet/minecraft/class_6880;)Z
-	METHOD method_19521 (Lnet/minecraft/class_1646;Lnet/minecraft/class_4158;)Z
 		ARG 0 villager
-		ARG 1 poiType
+	METHOD method_19522 (Lnet/minecraft/class_1646;Lnet/minecraft/class_6880;)Z
-	METHOD method_19522 (Lnet/minecraft/class_1646;Lnet/minecraft/class_4158;)Z
 		ARG 0 villager
-		ARG 1 poiType
 	METHOD method_19623 hasSeedToPlant ()Z
 	METHOD method_19625 setExperience (I)V
 		ARG 1 experience
@@ -96,9 +93,8 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity
 	METHOD method_21724 updateDemandBonus ()V
 		COMMENT Updates the demand bonus of all the trade offers of this villager.
 	METHOD method_26955 createVillagerAttributes ()Lnet/minecraft/class_5132$class_5133;
-	METHOD method_29278 (Lnet/minecraft/class_1646;Lnet/minecraft/class_4158;)Z
+	METHOD method_29278 (Lnet/minecraft/class_1646;Lnet/minecraft/class_6880;)Z
 		ARG 0 villager
-		ARG 1 poiType
 	METHOD method_29279 isNatural ()Z
 	METHOD method_30958 releaseAllTickets ()V
 	METHOD method_7234 wantsToStartBreeding ()Z

mappings/net/minecraft/entity/raid/RaiderEntity.mapping

@@ -53,8 +53,6 @@ CLASS net/minecraft/class_3763 net/minecraft/entity/raid/RaiderEntity
 			ARG 1 raider
 			ARG 2 speed
 			ARG 4 distance
-		METHOD method_20037 (Lnet/minecraft/class_4158;)Z
-			ARG 0 poiType
 		METHOD method_20038 canLootHome (Lnet/minecraft/class_2338;)Z
 			ARG 1 pos
 		METHOD method_20039 isRaiding ()Z

mappings/net/minecraft/item/GoatHornItem.mapping

@@ -18,9 +18,6 @@ CLASS net/minecraft/class_7430 net/minecraft/item/GoatHornItem
 		ARG 0 world
 		ARG 1 player
 		ARG 2 instrument
-	METHOD method_43564 getInstrumentId (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2960;
-		ARG 0 stack
 	METHOD method_43710 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional;
 		ARG 1 entryList
-	METHOD method_43711 getInstrument (Lnet/minecraft/class_1799;)Lnet/minecraft/class_7444;
+	METHOD method_43711 getInstrument (Lnet/minecraft/class_1799;)Ljava/util/Optional;
-		ARG 0 stack

mappings/net/minecraft/network/MessageType.mapping

@@ -75,7 +75,7 @@ CLASS net/minecraft/class_2556 net/minecraft/network/MessageType
 		COMMENT does not have a decoration.
 	METHOD method_43843 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
-	METHOD method_43844 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2556;
+	METHOD method_43844 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
 		ARG 0 registry
 	METHOD method_43845 register (Ljava/lang/String;)Lnet/minecraft/class_5321;
 		ARG 0 id
@@ -89,6 +89,7 @@ CLASS net/minecraft/class_2556 net/minecraft/network/MessageType
 			COMMENT the kind of the narration, also known as {@code priority} in the serialized
 			COMMENT format
 		FIELD field_39233 CODEC Lcom/mojang/serialization/Codec;
+		METHOD comp_796 kind ()Lnet/minecraft/class_2556$class_7466$class_7467;
 		METHOD method_43846 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 			ARG 0 instance
 		METHOD method_43847 of (Lnet/minecraft/class_7463;Lnet/minecraft/class_2556$class_7466$class_7467;)Lnet/minecraft/class_2556$class_7466;

mappings/net/minecraft/network/encryption/ChatMessageSignature.mapping

@@ -4,7 +4,6 @@ CLASS net/minecraft/class_7469 net/minecraft/network/encryption/ChatMessageSigna
 		ARG 1 signature
 		ARG 2 message
 	METHOD method_43861 verify (Ljava/security/Signature;Lnet/minecraft/class_2561;)Z
-		ARG 1 signature
 		ARG 2 message
 	METHOD method_43862 updateSignature (Ljava/security/Signature;Lnet/minecraft/class_2561;Ljava/util/UUID;Ljava/time/Instant;J)V
 		ARG 0 signature

mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping

@@ -198,8 +198,7 @@ CLASS net/minecraft/class_3515 net/minecraft/network/encryption/NetworkEncryptio
 			COMMENT {@return whether the signature data has a signature}
 			COMMENT
 			COMMENT @apiNote This <strong>does not validate</strong> the signature itself.
-		METHOD method_43529 write (Lnet/minecraft/class_2540;)V
+		METHOD method_43529 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_3515$class_7425;)V
-			ARG 1 buf
 		METHOD method_43530 getSalt ()[B
 	CLASS class_7426 SecureRandomUtil
 		COMMENT Utilities for working with a secure random number generator.

mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping

@@ -30,5 +30,4 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey
 		METHOD method_43701 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 			ARG 0 instance
 		METHOD method_43702 toSerializedString ()Ljava/lang/String;
-		METHOD method_43703 decodeKey ()Ljava/security/PublicKey;
 		METHOD method_43704 isExpired ()Z

mappings/net/minecraft/network/encryption/SignedChatMessage.mapping

@@ -1,8 +1,4 @@
 CLASS net/minecraft/class_7471 net/minecraft/network/encryption/SignedChatMessage
-	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_7469;)V
-		ARG 1 content
-		ARG 2 signature
 	METHOD method_43867 verify (Lnet/minecraft/class_7428;)Z
-		ARG 1 publicKey
 	METHOD method_43868 verify (Ljava/security/Signature;)Z
 		ARG 1 signature

mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping

@@ -1,8 +1,3 @@
 CLASS net/minecraft/class_2915 net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD method_43638 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7428$class_7443;)V
-		ARG 0 buf2
-		ARG 1 publicKey
-	METHOD method_43639 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7428$class_7443;
-		ARG 0 buf2

mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping

@@ -23,9 +23,6 @@ CLASS net/minecraft/class_2917 net/minecraft/network/packet/c2s/login/LoginKeyC2
 		ARG 1 privateKey
 	METHOD method_43640 (Lnet/minecraft/class_7428;[BLnet/minecraft/class_3515$class_7425;)Ljava/lang/Boolean;
 		ARG 2 signature
-	METHOD method_43641 (Lnet/minecraft/class_2540;Lnet/minecraft/class_3515$class_7425;)V
-		ARG 0 buf2
-		ARG 1 signature
 	METHOD method_43642 ([B)Ljava/lang/Boolean;
 		ARG 0 encrypted
 	METHOD method_43643 verifySignedNonce ([BLnet/minecraft/class_7428;)Z

mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping

@@ -18,7 +18,7 @@ CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessage
 	FIELD field_39086 TIME_TO_LIVE Ljava/time/Duration;
 	FIELD field_39087 time Ljava/time/Instant;
 	FIELD field_39088 signature Lnet/minecraft/class_3515$class_7425;
-	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_7469;)V
+	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_7469;Z)V
 		ARG 1 chatMessage
 		ARG 2 signature
 	METHOD <init> (Lnet/minecraft/class_2540;)V

mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping

@@ -21,8 +21,6 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage
 	COMMENT
 	COMMENT @see net.minecraft.server.network.ServerPlayerEntity#sendChatMessage
 	COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#onChatMessage
-	FIELD comp_758 Lnet/minecraft/class_2561;
-		COMMENT the unwrapped chat message
 	FIELD comp_761 time Ljava/time/Instant;
 	FIELD field_39085 TIME_TO_LIVE Ljava/time/Duration;
 	METHOD <init> (Lnet/minecraft/class_2540;)V

mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping

@@ -8,13 +8,13 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C
 	FIELD comp_91 previousGameMode Lnet/minecraft/class_1934;
 	FIELD comp_92 dimensionIds Ljava/util/Set;
 	FIELD comp_93 registryManager Lnet/minecraft/class_5455$class_6890;
-	FIELD comp_94 dimensionType Lnet/minecraft/class_6880;
+	FIELD comp_94 dimensionType Lnet/minecraft/class_5321;
 	FIELD comp_95 dimensionId Lnet/minecraft/class_5321;
 	FIELD comp_96 sha256Seed J
 	FIELD comp_97 maxPlayers I
 	FIELD comp_98 viewDistance I
 	FIELD comp_99 reducedDebugInfo Z
-	METHOD <init> (IZLnet/minecraft/class_1934;Lnet/minecraft/class_1934;Ljava/util/Set;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_6880;Lnet/minecraft/class_5321;JIIIZZZZ)V
+	METHOD <init> (IZLnet/minecraft/class_1934;Lnet/minecraft/class_1934;Ljava/util/Set;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;JIIIZZZZ)V
 		ARG 1 playerEntityId
 		ARG 3 previousGameMode
 		ARG 11 maxPlayers
@@ -30,14 +30,11 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C
 	METHOD comp_91 previousGameMode ()Lnet/minecraft/class_1934;
 	METHOD comp_92 dimensionIds ()Ljava/util/Set;
 	METHOD comp_93 registryManager ()Lnet/minecraft/class_5455$class_6890;
-	METHOD comp_94 dimensionType ()Lnet/minecraft/class_6880;
+	METHOD comp_94 dimensionType ()Lnet/minecraft/class_5321;
 	METHOD comp_95 dimensionId ()Lnet/minecraft/class_5321;
 	METHOD comp_96 sha256Seed ()J
 	METHOD comp_97 maxPlayers ()I
 	METHOD comp_98 viewDistance ()I
 	METHOD comp_99 reducedDebugInfo ()Z
-	METHOD method_34134 (Lnet/minecraft/class_2540;Lnet/minecraft/class_5321;)V
-		ARG 0 b
-		ARG 1 dimension
 	METHOD method_34135 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5321;
 		ARG 0 b

mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping

@@ -37,8 +37,3 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS
 			ARG 1 buf
 			ARG 2 entry
 		CLASS 1
-			METHOD method_43887 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7428$class_7443;)V
-				ARG 0 buf2
-				ARG 1 publicKeyData
-			METHOD method_43888 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7428$class_7443;
-				ARG 0 buf2

mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping

@@ -5,11 +5,11 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespa
 	FIELD field_24451 keepPlayerAttributes Z
 	FIELD field_24620 debugWorld Z
 	FIELD field_24621 flatWorld Z
-	FIELD field_25322 dimensionType Lnet/minecraft/class_6880;
+	FIELD field_25322 dimensionType Lnet/minecraft/class_5321;
 	FIELD field_25714 previousGameMode Lnet/minecraft/class_1934;
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD <init> (Lnet/minecraft/class_6880;Lnet/minecraft/class_5321;JLnet/minecraft/class_1934;Lnet/minecraft/class_1934;ZZZ)V
+	METHOD <init> (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;JLnet/minecraft/class_1934;Lnet/minecraft/class_1934;ZZZ)V
 		ARG 2 dimension
 		ARG 3 sha256Seed
 		ARG 5 gameMode
@@ -23,5 +23,5 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespa
 	METHOD method_27904 shouldKeepPlayerAttributes ()Z
 	METHOD method_28120 isDebugWorld ()Z
 	METHOD method_28121 isFlatWorld ()Z
-	METHOD method_29445 getDimensionType ()Lnet/minecraft/class_6880;
+	METHOD method_29445 getDimensionType ()Lnet/minecraft/class_5321;
 	METHOD method_30117 getPreviousGameMode ()Lnet/minecraft/class_1934;

mappings/net/minecraft/server/PlayerManager.mapping

@@ -214,7 +214,6 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager
 		COMMENT @see #broadcast(SignedChatMessage, ChatMessageSender, RegistryKey)
 		COMMENT @see #broadcast(SignedChatMessage, Function, ChatMessageSender, RegistryKey)
 		ARG 1 message
-		ARG 2 filterableMessage
 		ARG 3 sender
 		ARG 4 typeKey
 	METHOD method_43674 broadcast (Lnet/minecraft/class_7471;Lnet/minecraft/class_7436;Lnet/minecraft/class_5321;)V

mappings/net/minecraft/server/command/LocateBiomeCommand.mapping

@@ -1,16 +0,0 @@
-CLASS net/minecraft/class_4799 net/minecraft/server/command/LocateBiomeCommand
-	FIELD field_22253 NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	FIELD field_33395 RADIUS I
-	FIELD field_38053 HORIZONTAL_BLOCK_CHECK_INTERVAL I
-	FIELD field_38054 VERTICAL_BLOCK_CHECK_INTERVAL I
-	METHOD method_24491 register (Lcom/mojang/brigadier/CommandDispatcher;)V
-		ARG 0 dispatcher
-	METHOD method_24492 (Lcom/mojang/brigadier/context/CommandContext;)I
-		ARG 0 context
-	METHOD method_24494 (Lnet/minecraft/class_2168;)Z
-		ARG 0 source
-	METHOD method_24495 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I
-		ARG 0 source
-		ARG 1 biome
-	METHOD method_24496 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
-		ARG 0 id

mappings/net/minecraft/server/command/LocateCommand.mapping

@@ -1,6 +1,4 @@
 CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand
-	FIELD field_13666 FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
-	FIELD field_37038 INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	METHOD method_13439 getDistance (IIII)F
 		ARG 0 x1
 		ARG 1 y1
@@ -10,25 +8,16 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand
 		ARG 0 dispatcher
 	METHOD method_13448 (Lnet/minecraft/class_2168;)Z
 		ARG 0 source
-	METHOD method_13457 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;)I
-		ARG 0 source
-		ARG 1 structureFeature
 	METHOD method_24499 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;Z)I
 		ARG 0 source
 		ARG 1 structureFeature
 		ARG 2 currentPos
 		ARG 3 structurePosAndEntry
 		ARG 4 successMessage
-	METHOD method_39984 (Lcom/mojang/brigadier/context/CommandContext;)I
-		ARG 0 context
 	METHOD method_39985 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
 	METHOD method_40998 (Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_6862;)Ljava/lang/String;
 		ARG 1 key
-	METHOD method_41000 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6885$class_6886;
-		ARG 0 entry
-	METHOD method_41001 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Ljava/util/Optional;
-		ARG 1 key
 	METHOD method_41002 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
 	METHOD method_41003 (Lnet/minecraft/class_5321;)Ljava/lang/String;

mappings/net/minecraft/server/command/MeCommand.mapping

@@ -3,5 +3,5 @@ CLASS net/minecraft/class_3045 net/minecraft/server/command/MeCommand
 		ARG 0 dispatcher
 	METHOD method_13238 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_43645 (Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;Lnet/minecraft/class_3222;Lnet/minecraft/class_5513$class_5837;)V
+	METHOD method_43645 (Lnet/minecraft/class_2168;Lnet/minecraft/class_3222;Lnet/minecraft/class_7471;Lnet/minecraft/class_5513$class_5837;)V
 		ARG 3 message

mappings/net/minecraft/server/command/ScheduleCommand.mapping

@@ -13,8 +13,6 @@ CLASS net/minecraft/class_3112 net/minecraft/server/command/ScheduleCommand
 		ARG 0 context
 	METHOD method_13569 (Lnet/minecraft/class_2168;)Z
 		ARG 0 source
-	METHOD method_13570 (Lnet/minecraft/class_2960;ZLnet/minecraft/class_236;JLnet/minecraft/class_2168;ILnet/minecraft/class_3494;)V
-		ARG 7 tag
 	METHOD method_13571 (Lnet/minecraft/class_2960;ZLnet/minecraft/class_236;JLnet/minecraft/class_2168;ILnet/minecraft/class_2158;)V
 		ARG 7 function
 	METHOD method_22833 clearEvent (Lnet/minecraft/class_2168;Ljava/lang/String;)I

mappings/net/minecraft/server/function/CommandFunctionManager.mapping

@@ -54,7 +54,7 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana
 		COMMENT Sets the functions that this command function manager will use in executions.
 		ARG 1 loader
 			COMMENT the new loader functions will be taken from
-	METHOD method_29462 getTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494;
+	METHOD method_29462 getTag (Lnet/minecraft/class_2960;)Ljava/util/Collection;
 		ARG 1 id
 	METHOD method_29463 getAllFunctions ()Ljava/lang/Iterable;
 	METHOD method_29464 getFunctionTags ()Ljava/lang/Iterable;

mappings/net/minecraft/server/function/FunctionLoader.mapping

@@ -41,5 +41,5 @@ CLASS net/minecraft/class_5349 net/minecraft/server/function/FunctionLoader
 		ARG 2 function
 		ARG 3 ex
 	METHOD method_29458 getTags ()Ljava/lang/Iterable;
-	METHOD method_29459 getTagOrEmpty (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494;
+	METHOD method_29459 getTagOrEmpty (Lnet/minecraft/class_2960;)Ljava/util/Collection;
 		ARG 1 id

mappings/net/minecraft/server/network/DebugInfoSender.mapping

@@ -73,8 +73,6 @@ CLASS net/minecraft/class_4209 net/minecraft/server/network/DebugInfoSender
 	METHOD method_36158 writeBrain (Lnet/minecraft/class_1309;Lnet/minecraft/class_2540;)V
 		ARG 0 entity
 		ARG 1 buf
-	METHOD method_36159 (Lnet/minecraft/class_4158;)Z
-		ARG 0 poiType
 	METHOD method_36160 (Ljava/util/List;Ljava/lang/String;Lnet/minecraft/class_4139;Ljava/lang/Integer;)V
 		ARG 2 type
 		ARG 3 value

mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping

@@ -35,7 +35,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 	FIELD field_37280 MAX_BREAK_SQUARED_DISTANCE D
 	FIELD field_37282 sequence I
 	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;)V
-		ARG 1 server
 		ARG 2 connection
 		ARG 3 player
 	METHOD method_14360 requestTeleport (DDDFFLjava/util/Set;)V
@@ -111,7 +110,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 	METHOD method_31285 (Lnet/minecraft/class_2877;Ljava/util/List;)V
 		ARG 2 texts
 	METHOD method_31286 handleMessage (Lnet/minecraft/class_2797;Lnet/minecraft/class_5513$class_5837;)V
-		ARG 1 packet
 		ARG 2 message
 	METHOD method_33562 requestTeleportAndDismount (DDDFF)V
 		ARG 1 x

mappings/net/minecraft/server/network/ServerPlayerEntity.mapping

@@ -234,7 +234,6 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 		COMMENT @see #sendMessage(Text, RegistryKey)
 		ARG 1 message
 		ARG 2 sender
-		ARG 3 typeKey
 	METHOD method_43506 sendMessageDeliverError (Lnet/minecraft/class_2561;Lnet/minecraft/class_5321;)V
 		ARG 1 message
 		ARG 2 typeKey

mappings/net/minecraft/server/world/ServerWorld.mapping

@@ -227,10 +227,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 	METHOD method_19503 hasRaidAt (Lnet/minecraft/class_2338;)Z
 		COMMENT {@return {@code true} if a raid exists within 96 block radius of {@code pos}}
 		ARG 1 pos
-	METHOD method_19535 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)V
-		ARG 2 poiType
-	METHOD method_19536 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)V
-		ARG 2 poiType
 	METHOD method_20588 isNearOccupiedPointOfInterest (Lnet/minecraft/class_4076;)Z
 		ARG 1 sectionPos
 	METHOD method_21624 dumpEntities (Ljava/io/Writer;Ljava/lang/Iterable;)V
@@ -306,8 +302,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 		ARG 1 pos
 	METHOD method_31420 (Lnet/minecraft/class_3695;Lnet/minecraft/class_1297;)V
 		ARG 2 entity
-	METHOD method_31421 (Lnet/minecraft/class_4158;)Z
-		ARG 0 poiType
 	METHOD method_31422 (Ljava/util/function/Predicate;Ljava/util/List;Lnet/minecraft/class_1297;)V
 		ARG 2 entity
 	METHOD method_31423 loadEntities (Ljava/util/stream/Stream;)V

mappings/net/minecraft/structure/MineshaftGenerator.mapping

@@ -128,8 +128,7 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator
 			ARG 4 x
 			ARG 5 y
 			ARG 6 z
-		METHOD method_33999 (Lnet/minecraft/class_1922;Lnet/minecraft/class_3341;)Z
+		METHOD method_33999 (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;)Z
-			ARG 1 world
 			ARG 2 box
 	CLASS class_3357 MineshaftRoom
 		FIELD field_14422 entrances Ljava/util/List;

mappings/net/minecraft/structure/StructurePiecesCollector.mapping

@@ -6,7 +6,7 @@ CLASS net/minecraft/class_6626 net/minecraft/structure/StructurePiecesCollector
 	METHOD method_38714 toList ()Lnet/minecraft/class_6624;
 	METHOD method_38715 shift (I)V
 		ARG 1 y
-	METHOD method_38716 shiftInto (IILnet/minecraft/class_5819;I)V
+	METHOD method_38716 shiftInto (IILnet/minecraft/class_5819;I)I
 		COMMENT Somewhat like {@code shiftInto(random, bottomY, topY - topPenalty)}.
 		ARG 1 topY
 		ARG 2 bottomY

mappings/net/minecraft/structure/StructureSets.mapping

@@ -17,7 +17,7 @@ CLASS net/minecraft/class_7072 net/minecraft/structure/StructureSets
 	FIELD field_37248 END_CITIES Lnet/minecraft/class_6880;
 	FIELD field_37249 STRONGHOLDS Lnet/minecraft/class_6880;
 	FIELD field_38475 ANCIENT_CITIES Lnet/minecraft/class_6880;
-	METHOD method_41182 initAndGetDefault ()Lnet/minecraft/class_6880;
+	METHOD method_41182 initAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
 	METHOD method_41183 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_7059;)Lnet/minecraft/class_6880;
 		ARG 0 key
 		ARG 1 structureSet

mappings/net/minecraft/structure/pool/StructurePools.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_5468 net/minecraft/structure/pool/StructurePools
 	FIELD field_26254 EMPTY Lnet/minecraft/class_5321;
 	FIELD field_26255 INVALID Lnet/minecraft/class_6880;
-	METHOD method_30599 initDefaultPools ()Lnet/minecraft/class_6880;
+	METHOD method_30599 initDefaultPools (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
 	METHOD method_30600 register (Lnet/minecraft/class_3785;)Lnet/minecraft/class_6880;
 		ARG 0 templatePool

mappings/net/minecraft/tag/Builder.mapping

@@ -0,0 +1,15 @@
+CLASS net/minecraft/class_3495 net/minecraft/tag/Builder
+	COMMENT A builder class to ease the creation of tags. It can also be used as a
+	COMMENT mutable form of a tag.
+	FIELD field_23688 entries Ljava/util/List;
+	METHOD method_26778 create ()Lnet/minecraft/class_3495;
+	METHOD method_26782 build ()Ljava/util/List;
+	METHOD method_26784 add (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3495;
+		ARG 1 id
+	METHOD method_26787 addTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3495;
+		ARG 1 id
+	METHOD method_27064 add (Lnet/minecraft/class_3497;)Lnet/minecraft/class_3495;
+	METHOD method_34891 addOptional (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3495;
+		ARG 1 id
+	METHOD method_34892 addOptionalTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3495;
+		ARG 1 id

mappings/net/minecraft/tag/Tag.mapping

@@ -1,93 +0,0 @@
-CLASS net/minecraft/class_3494 net/minecraft/tag/Tag
-	COMMENT A tag is a set of objects.
-	COMMENT
-	COMMENT <p>Tags simplifies reference to multiple objects, especially for
-	COMMENT predicate (testing against) purposes.
-	COMMENT
-	COMMENT <p>A tag is immutable by design. It has a builder, which is a mutable
-	COMMENT equivalent.
-	COMMENT
-	COMMENT <p>Its entries' iteration may be ordered
-	COMMENT or unordered, depending on the configuration from the tag builder.
-	FIELD field_36392 EMPTY Lnet/minecraft/class_3494;
-	FIELD field_36393 values Ljava/util/List;
-	METHOD <init> (Ljava/util/Collection;)V
-		ARG 1 values
-	METHOD method_15138 values ()Ljava/util/List;
-	METHOD method_40088 empty ()Lnet/minecraft/class_3494;
-	CLASS class_3495 Builder
-		COMMENT A builder class to ease the creation of tags. It can also be used as a
-		COMMENT mutable form of a tag.
-		FIELD field_23688 entries Ljava/util/List;
-		METHOD method_26778 create ()Lnet/minecraft/class_3494$class_3495;
-		METHOD method_26780 read (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lnet/minecraft/class_3494$class_3495;
-			ARG 1 json
-			ARG 2 source
-		METHOD method_26782 build (Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/datafixers/util/Either;
-			ARG 1 tagGetter
-			ARG 2 objectGetter
-		METHOD method_26784 add (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_3494$class_3495;
-			ARG 1 id
-			ARG 2 source
-		METHOD method_26785 streamEntries ()Ljava/util/stream/Stream;
-		METHOD method_26787 addTag (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_3494$class_3495;
-			ARG 1 id
-			ARG 2 source
-		METHOD method_26788 toJson ()Lcom/google/gson/JsonObject;
-		METHOD method_27064 add (Lnet/minecraft/class_3494$class_5145;)Lnet/minecraft/class_3494$class_3495;
-			ARG 1 trackedEntry
-		METHOD method_27065 add (Lnet/minecraft/class_3494$class_3496;Ljava/lang/String;)Lnet/minecraft/class_3494$class_3495;
-			ARG 1 entry
-			ARG 2 source
-		METHOD method_27066 (Ljava/lang/String;Lnet/minecraft/class_3494$class_3496;)V
-			ARG 2 entry
-		METHOD method_30740 resolveEntry (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_3494$class_3496;
-			ARG 0 json
-		METHOD method_32826 forEachTagId (Ljava/util/function/Consumer;)V
-			ARG 1 consumer
-		METHOD method_32828 forEachGroupId (Ljava/util/function/Consumer;)V
-			ARG 1 consumer
-		METHOD method_34891 addOptional (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_3494$class_3495;
-			ARG 1 id
-			ARG 2 source
-		METHOD method_34892 addOptionalTag (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_3494$class_3495;
-			ARG 1 id
-			ARG 2 source
-	CLASS class_3496 Entry
-		METHOD method_26789 addToJson (Lcom/google/gson/JsonArray;)V
-			ARG 1 json
-		METHOD method_26790 resolve (Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/function/Consumer;)Z
-			ARG 1 tagGetter
-			ARG 2 objectGetter
-			ARG 3 collector
-		METHOD method_32831 forEachTagId (Ljava/util/function/Consumer;)V
-			ARG 1 consumer
-		METHOD method_32832 canAdd (Ljava/util/function/Predicate;Ljava/util/function/Predicate;)Z
-			ARG 1 objectExistsTest
-			ARG 2 tagExistsTest
-		METHOD method_32833 forEachGroupId (Ljava/util/function/Consumer;)V
-			ARG 1 consumer
-	CLASS class_3497 TagEntry
-		FIELD field_15584 id Lnet/minecraft/class_2960;
-		METHOD <init> (Lnet/minecraft/class_2960;)V
-			ARG 1 id
-	CLASS class_5122 ObjectEntry
-		FIELD field_23689 id Lnet/minecraft/class_2960;
-		METHOD <init> (Lnet/minecraft/class_2960;)V
-			ARG 1 id
-	CLASS class_5145 TrackedEntry
-		FIELD comp_324 entry Lnet/minecraft/class_3494$class_3496;
-		FIELD comp_325 source Ljava/lang/String;
-		METHOD <init> (Lnet/minecraft/class_3494$class_3496;Ljava/lang/String;)V
-			ARG 1 entry
-			ARG 2 source
-		METHOD comp_324 entry ()Lnet/minecraft/class_3494$class_3496;
-		METHOD comp_325 source ()Ljava/lang/String;
-	CLASS class_5479 OptionalObjectEntry
-		FIELD field_26383 id Lnet/minecraft/class_2960;
-		METHOD <init> (Lnet/minecraft/class_2960;)V
-			ARG 1 id
-	CLASS class_5480 OptionalTagEntry
-		FIELD field_26384 id Lnet/minecraft/class_2960;
-		METHOD <init> (Lnet/minecraft/class_2960;)V
-			ARG 1 id

mappings/net/minecraft/tag/TagEntry.mapping

@@ -0,0 +1,7 @@
+CLASS net/minecraft/class_3497 net/minecraft/tag/TagEntry
+	FIELD field_15584 id Lnet/minecraft/class_2960;
+	METHOD <init> (Lnet/minecraft/class_2960;ZZ)V
+		ARG 1 id
+	METHOD method_26790 resolve (Lnet/minecraft/class_3497$class_7474;Ljava/util/function/Consumer;)Z
+	METHOD method_32831 forEachTagId (Ljava/util/function/Consumer;)V
+	METHOD method_32832 canAdd (Ljava/util/function/Predicate;Ljava/util/function/Predicate;)Z

mappings/net/minecraft/tag/TagGroupLoader.mapping

@@ -2,17 +2,20 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagGroupLoader
 	FIELD field_15603 JSON_EXTENSION_LENGTH I
 	FIELD field_15605 dataType Ljava/lang/String;
 	FIELD field_15607 LOGGER Lorg/slf4j/Logger;
-	FIELD field_15608 GSON Lcom/google/gson/Gson;
 	FIELD field_15609 registryGetter Ljava/util/function/Function;
 	FIELD field_29827 JSON_EXTENSION Ljava/lang/String;
 	METHOD <init> (Ljava/util/function/Function;Ljava/lang/String;)V
 		ARG 1 registryGetter
 		ARG 2 dataType
 	METHOD method_18242 buildGroup (Ljava/util/Map;)Ljava/util/Map;
-		ARG 1 tags
-	METHOD method_26799 (Lnet/minecraft/class_2960;)Ljava/lang/Object;
-		ARG 1 id
 	METHOD method_33174 loadTags (Lnet/minecraft/class_3300;)Ljava/util/Map;
 		ARG 1 manager
 	METHOD method_33176 load (Lnet/minecraft/class_3300;)Ljava/util/Map;
 		ARG 1 manager
+	CLASS class_5145 TrackedEntry
+		FIELD comp_324 entry Lnet/minecraft/class_3497;
+		FIELD comp_325 source Ljava/lang/String;
+		METHOD <init> (Lnet/minecraft/class_3497;Ljava/lang/String;)V
+			ARG 2 source
+		METHOD comp_324 entry ()Lnet/minecraft/class_3497;
+		METHOD comp_325 source ()Ljava/lang/String;

mappings/net/minecraft/text/Texts.mapping

@@ -48,4 +48,3 @@ CLASS net/minecraft/class_2564 net/minecraft/text/Texts
 		ARG 0 texts
 		ARG 1 separator
 	METHOD method_43476 hasTranslation (Lnet/minecraft/class_2561;)Z
-		ARG 0 text

mappings/net/minecraft/util/BlockMirror.mapping

@@ -1,8 +1,7 @@
 CLASS net/minecraft/class_2415 net/minecraft/util/BlockMirror
 	FIELD field_23263 directionTransformation Lnet/minecraft/class_4990;
 	FIELD field_27883 name Lnet/minecraft/class_2561;
-	METHOD <init> (Ljava/lang/String;ILnet/minecraft/class_2561;Lnet/minecraft/class_4990;)V
+	METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_4990;)V
-		ARG 3 name
 		ARG 4 directionTransformation
 	METHOD method_10343 apply (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350;
 		ARG 1 direction

mappings/net/minecraft/util/BlockRotation.mapping

@@ -1,7 +1,5 @@
 CLASS net/minecraft/class_2470 net/minecraft/util/BlockRotation
 	FIELD field_23264 directionTransformation Lnet/minecraft/class_4990;
-	METHOD <init> (Ljava/lang/String;ILnet/minecraft/class_4990;)V
-		ARG 3 directionTransformation
 	METHOD method_10501 rotate (Lnet/minecraft/class_2470;)Lnet/minecraft/class_2470;
 		ARG 1 rotation
 	METHOD method_10502 rotate (II)I

mappings/net/minecraft/util/registry/BuiltinRegistries.mapping

@@ -36,18 +36,15 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries
 		ARG 0 registry
 		ARG 1 id
 		ARG 2 object
-	METHOD method_30563 addRegistry (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378;
+	METHOD method_30563 addRegistry (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_5458$class_7488;)Lnet/minecraft/class_2378;
 		ARG 0 registryRef
 		ARG 1 lifecycle
-		ARG 2 defaultValueSupplier
+	METHOD method_30564 addRegistry (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lnet/minecraft/class_5458$class_7488;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_2385;
-	METHOD method_30564 addRegistry (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Ljava/util/function/Supplier;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_2385;
 		ARG 0 registryRef
 		ARG 1 registry
-		ARG 2 defaultValueSupplier
 		ARG 3 lifecycle
-	METHOD method_30565 addRegistry (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378;
+	METHOD method_30565 addRegistry (Lnet/minecraft/class_5321;Lnet/minecraft/class_5458$class_7488;)Lnet/minecraft/class_2378;
 		ARG 0 registryRef
-		ARG 1 defaultValueSupplier
 	METHOD method_30566 (Lnet/minecraft/class_2960;Ljava/util/function/Supplier;)V
 		ARG 0 id
 		ARG 1 supplier

mappings/net/minecraft/util/registry/Registry.mapping

@@ -28,7 +28,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
 	FIELD field_17429 SCREEN_HANDLER Lnet/minecraft/class_2378;
 	FIELD field_17597 RECIPE_TYPE Lnet/minecraft/class_2378;
 	FIELD field_17598 RECIPE_SERIALIZER Lnet/minecraft/class_2378;
-	FIELD field_18792 POINT_OF_INTEREST_TYPE Lnet/minecraft/class_2348;
+	FIELD field_18792 POINT_OF_INTEREST_TYPE Lnet/minecraft/class_2378;
 	FIELD field_18793 MEMORY_MODULE_TYPE Lnet/minecraft/class_2348;
 	FIELD field_18794 SENSOR_TYPE Lnet/minecraft/class_2348;
 	FIELD field_18795 SCHEDULE Lnet/minecraft/class_2378;
@@ -160,7 +160,6 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
 	FIELD field_38806 ROOT_PLACER_TYPE_KEY Lnet/minecraft/class_5321;
 	FIELD field_38807 ROOT_PLACER_TYPE Lnet/minecraft/class_2378;
 	FIELD field_39205 MESSAGE_TYPE_KEY Lnet/minecraft/class_5321;
-	FIELD field_39206 MESSAGE_TYPE Lnet/minecraft/class_2378;
 	FIELD field_39207 BANNER_PATTERN_KEY Lnet/minecraft/class_5321;
 	FIELD field_39208 BANNER_PATTERN Lnet/minecraft/class_2378;
 	FIELD field_39209 INSTRUMENT_KEY Lnet/minecraft/class_5321;
@@ -255,8 +254,6 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
 		ARG 0 registry
 	METHOD method_19452 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4140;
 		ARG 0 registry
-	METHOD method_19453 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4158;
-		ARG 0 registry
 	METHOD method_20574 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3448;
 		ARG 0 registry
 	METHOD method_26429 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4996;

mappings/net/minecraft/village/VillagerProfession.mapping

@@ -1,27 +1,21 @@
 CLASS net/minecraft/class_3852 net/minecraft/village/VillagerProfession
-	FIELD field_18541 id Ljava/lang/String;
+	FIELD comp_818 id Ljava/lang/String;
-	FIELD field_18542 workStation Lnet/minecraft/class_4158;
+	FIELD comp_819 workStation Ljava/util/function/Predicate;
-	FIELD field_18543 gatherableItems Lcom/google/common/collect/ImmutableSet;
+	FIELD comp_821 gatherableItems Lcom/google/common/collect/ImmutableSet;
-	FIELD field_18880 secondaryJobSites Lcom/google/common/collect/ImmutableSet;
+	FIELD comp_822 secondaryJobSites Lcom/google/common/collect/ImmutableSet;
-	FIELD field_20633 workSound Lnet/minecraft/class_3414;
+	FIELD comp_823 workSound Lnet/minecraft/class_3414;
-	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_4158;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)V
+	METHOD <init> (Ljava/lang/String;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)V
 		ARG 1 id
-		ARG 2 workStation
+	METHOD comp_818 id ()Ljava/lang/String;
-		ARG 3 gatherableItems
+	METHOD comp_819 workStation ()Ljava/util/function/Predicate;
-		ARG 4 secondaryJobSites
+	METHOD comp_821 gatherableItems ()Lcom/google/common/collect/ImmutableSet;
-		ARG 5 workSound
+	METHOD comp_822 secondaryJobSites ()Lcom/google/common/collect/ImmutableSet;
-	METHOD method_16926 register (Ljava/lang/String;Lnet/minecraft/class_4158;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852;
+	METHOD comp_823 workSound ()Lnet/minecraft/class_3414;
+	METHOD method_16926 register (Ljava/lang/String;Lnet/minecraft/class_5321;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852;
 		ARG 0 id
-		ARG 1 workStation
 		ARG 2 workSound
-	METHOD method_19197 register (Ljava/lang/String;Lnet/minecraft/class_4158;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852;
+	METHOD method_19197 register (Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852;
 		ARG 0 id
-		ARG 1 workStation
 		ARG 2 gatherableItems
 		ARG 3 secondaryJobSites
 		ARG 4 workSound
-	METHOD method_19198 getWorkStation ()Lnet/minecraft/class_4158;
-	METHOD method_19199 getGatherableItems ()Lcom/google/common/collect/ImmutableSet;
-	METHOD method_19630 getSecondaryJobSites ()Lcom/google/common/collect/ImmutableSet;
-	METHOD method_22384 getWorkSound ()Lnet/minecraft/class_3414;
-	METHOD method_35202 getId ()Ljava/lang/String;

mappings/net/minecraft/world/PortalForcer.mapping

@@ -4,8 +4,6 @@ CLASS net/minecraft/class_1946 net/minecraft/world/PortalForcer
 		ARG 1 world
 	METHOD method_22388 (Lnet/minecraft/class_4156;)I
 		ARG 0 poi
-	METHOD method_22389 (Lnet/minecraft/class_4158;)Z
-		ARG 0 poiType
 	METHOD method_22390 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4156;)D
 		ARG 1 poi
 	METHOD method_30479 (Lnet/minecraft/class_4156;)Lnet/minecraft/class_5459$class_5460;

mappings/net/minecraft/world/World.mapping

@@ -27,7 +27,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 	FIELD field_9235 rainGradient F
 	FIELD field_9236 isClient Z
 	FIELD field_9238 lcgBlockSeedIncrement I
-	FIELD field_9247 dimension Lnet/minecraft/class_2874;
+	FIELD field_9247 dimension Lnet/minecraft/class_5321;
 	FIELD field_9249 iteratingTickingBlockEntities Z
 	FIELD field_9251 thunderGradientPrev F
 	FIELD field_9253 rainGradientPrev F

mappings/net/minecraft/world/biome/BuiltinBiomes.mapping

@@ -1,5 +1,2 @@
 CLASS net/minecraft/class_5504 net/minecraft/world/biome/BuiltinBiomes
-	METHOD method_31145 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1959;)V
+	METHOD method_40363 getDefaultBiome (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
-		ARG 0 key
-		ARG 1 biome
-	METHOD method_40363 getDefaultBiome ()Lnet/minecraft/class_6880;

mappings/net/minecraft/world/dimension/DimensionTypeRegistrar.mapping

@@ -1,2 +1,2 @@
 CLASS net/minecraft/class_7231 net/minecraft/world/dimension/DimensionTypeRegistrar
-	METHOD method_42043 initAndGetDefault ()Lnet/minecraft/class_6880;
+	METHOD method_42043 initAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;

mappings/net/minecraft/world/gen/FlatLevelGeneratorPresets.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_7143 net/minecraft/world/gen/FlatLevelGeneratorPresets
-	METHOD method_41579 initAndGetDefault ()Lnet/minecraft/class_6880;
+	METHOD method_41579 initAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
 	METHOD method_41580 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
 		ARG 0 id
 	CLASS class_7144 Registrar

mappings/net/minecraft/world/gen/WorldPresets.mapping

@@ -10,7 +10,7 @@ CLASS net/minecraft/class_5317 net/minecraft/world/gen/WorldPresets
 		ARG 1 seed
 		ARG 3 generateStructures
 		ARG 4 bonusChest
-	METHOD method_41593 initAndGetDefault ()Lnet/minecraft/class_6880;
+	METHOD method_41593 initAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
 	METHOD method_41594 getWorldPreset (Lnet/minecraft/class_5285;)Ljava/util/Optional;
 		ARG 0 generatorOptions
 	METHOD method_41595 createDefaultOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285;

mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping

@@ -38,10 +38,8 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti
 	METHOD method_30643 createSurfaceSettings (ZZ)Lnet/minecraft/class_5284;
 		ARG 0 amplified
 		ARG 1 largeBiomes
-	METHOD method_30644 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_5284;)V
+	METHOD method_30644 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Lnet/minecraft/class_5284;)Lnet/minecraft/class_6880;
-		ARG 0 registryKey
+	METHOD method_31111 getInstance (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
-		ARG 1 settings
-	METHOD method_31111 getInstance ()Lnet/minecraft/class_6880;
 	METHOD method_33757 hasAquifers ()Z
 	METHOD method_38999 getRandomProvider ()Lnet/minecraft/class_2919$class_6675;
 	METHOD method_39901 createCavesSettings ()Lnet/minecraft/class_5284;

mappings/net/minecraft/world/gen/densityfunction/DensityFunctions.mapping

@@ -1,17 +1,13 @@
 CLASS net/minecraft/class_6954 net/minecraft/world/gen/densityfunction/DensityFunctions
-	METHOD method_41100 init ()Lnet/minecraft/class_6880;
+	METHOD method_41100 init (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
-	METHOD method_41103 createSurfaceNoiseRouter (ZZ)Lnet/minecraft/class_6953;
+	METHOD method_41103 createSurfaceNoiseRouter (Lnet/minecraft/class_2378;ZZ)Lnet/minecraft/class_6953;
-		ARG 0 largeBiomes
-		ARG 1 amplified
 	METHOD method_41109 of (Ljava/lang/String;)Lnet/minecraft/class_5321;
 		ARG 0 id
-	METHOD method_41112 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_6910;)Lnet/minecraft/class_6880;
+	METHOD method_41112 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Lnet/minecraft/class_6910;)Lnet/minecraft/class_6880;
-		ARG 0 key
+	METHOD method_41118 createNetherNoiseRouter (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6953;
-		ARG 1 function
+	METHOD method_41120 createEndNoiseRouter (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6953;
-	METHOD method_41118 createNetherNoiseRouter ()Lnet/minecraft/class_6953;
+	METHOD method_41549 createCavesNoiseRouter (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6953;
-	METHOD method_41120 createEndNoiseRouter ()Lnet/minecraft/class_6953;
+	METHOD method_41552 createFloatingIslandsNoiseRouter (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6953;
-	METHOD method_41549 createCavesNoiseRouter ()Lnet/minecraft/class_6953;
-	METHOD method_41552 createFloatingIslandsNoiseRouter ()Lnet/minecraft/class_6953;
 	CLASS class_5841 CaveScaler
 		METHOD method_33835 scaleCaves (D)D
 			ARG 0 value

mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_6803 net/minecraft/world/gen/feature/ConfiguredFeatures
-	METHOD method_39702 getDefaultConfiguredFeature ()Lnet/minecraft/class_6880;
+	METHOD method_39702 getDefaultConfiguredFeature (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
 	METHOD method_39703 createRandomPatchFeatureConfig (ILnet/minecraft/class_6880;)Lnet/minecraft/class_4638;
 		ARG 0 tries
 		ARG 1 feature

mappings/net/minecraft/world/gen/feature/PlacedFeatures.mapping

@@ -8,7 +8,7 @@ CLASS net/minecraft/class_6817 net/minecraft/world/gen/feature/PlacedFeatures
 	FIELD field_36084 EIGHT_ABOVE_AND_BELOW_RANGE Lnet/minecraft/class_6797;
 	FIELD field_36085 FOUR_ABOVE_AND_BELOW_RANGE Lnet/minecraft/class_6797;
 	FIELD field_36086 BOTTOM_TO_120_RANGE Lnet/minecraft/class_6797;
-	METHOD method_39735 getDefaultPlacedFeature ()Lnet/minecraft/class_6880;
+	METHOD method_39735 getDefaultPlacedFeature (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
 	METHOD method_39736 createCountExtraModifier (IFI)Lnet/minecraft/class_6797;
 		ARG 0 count
 		ARG 1 extraChance

mappings/net/minecraft/world/gen/noise/BuiltinNoiseParameters.mapping

@@ -1,13 +1,4 @@
 CLASS net/minecraft/class_6736 net/minecraft/world/gen/noise/BuiltinNoiseParameters
-	METHOD method_39216 init ()Lnet/minecraft/class_6880;
+	METHOD method_39216 init (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
-	METHOD method_39217 register (Lnet/minecraft/class_5321;ID[D)V
+	METHOD method_39217 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;ID[D)Lnet/minecraft/class_6880;
-		ARG 0 noise
+	METHOD method_39493 register (Lnet/minecraft/class_2378;ILnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V
-		ARG 1 firstOctave
-		ARG 2 firstAmplitude
-		ARG 4 amplitudes
-	METHOD method_39493 register (ILnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V
-		ARG 0 firstOctaveOffset
-		ARG 1 temperature
-		ARG 2 vegetation
-		ARG 3 continentalness
-		ARG 4 erosion

mappings/net/minecraft/world/gen/structure/MineshaftStructure.mapping

@@ -4,12 +4,8 @@ CLASS net/minecraft/class_3098 net/minecraft/world/gen/structure/MineshaftStruct
 	METHOD <init> (Lnet/minecraft/class_3195$class_7302;Lnet/minecraft/class_3098$class_3100;)V
 		ARG 1 config
 		ARG 2 type
-	METHOD method_38678 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_2338;Lnet/minecraft/class_3195$class_7149;)V
+	METHOD method_38678 addPieces (Lnet/minecraft/class_6626;Lnet/minecraft/class_3195$class_7149;)I
 		ARG 1 collector
-		ARG 2 pos
-		ARG 3 context
-	METHOD method_41668 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6626;)V
-		ARG 3 collector
 	CLASS class_3100 Type
 		FIELD field_13689 name Ljava/lang/String;
 		FIELD field_24839 CODEC Lcom/mojang/serialization/Codec;

mappings/net/minecraft/world/gen/structure/StructureTypes.mapping

@@ -34,7 +34,7 @@ CLASS net/minecraft/class_5470 net/minecraft/world/gen/structure/StructureTypes
 	METHOD method_30603 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_3195;)Lnet/minecraft/class_6880;
 		ARG 0 key
 		ARG 1 configuredStructureFeature
-	METHOD method_38569 getDefault ()Lnet/minecraft/class_6880;
+	METHOD method_38569 getDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880;
 	METHOD method_42044 getOrCreateBiomeTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885;
 		ARG 0 key
 	METHOD method_42757 createConfig (Lnet/minecraft/class_6862;Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_5847;)Lnet/minecraft/class_3195$class_7302;

mappings/net/minecraft/world/poi/PointOfInterest.mapping

@@ -1,16 +1,14 @@
 CLASS net/minecraft/class_4156 net/minecraft/world/poi/PointOfInterest
 	FIELD field_18492 pos Lnet/minecraft/class_2338;
-	FIELD field_18493 type Lnet/minecraft/class_4158;
+	FIELD field_18493 type Lnet/minecraft/class_6880;
 	FIELD field_18494 freeTickets I
 	FIELD field_18495 updateListener Ljava/lang/Runnable;
-	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;ILjava/lang/Runnable;)V
+	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;ILjava/lang/Runnable;)V
 		ARG 1 pos
-		ARG 2 type
 		ARG 3 freeTickets
 		ARG 4 updateListener
-	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;Ljava/lang/Runnable;)V
+	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;Ljava/lang/Runnable;)V
 		ARG 1 pos
-		ARG 2 type
 		ARG 3 updateListener
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
@@ -19,14 +17,14 @@ CLASS net/minecraft/class_4156 net/minecraft/world/poi/PointOfInterest
 	METHOD method_19139 hasSpace ()Z
 	METHOD method_19140 isOccupied ()Z
 	METHOD method_19141 getPos ()Lnet/minecraft/class_2338;
-	METHOD method_19142 getType ()Lnet/minecraft/class_4158;
+	METHOD method_19142 getType ()Lnet/minecraft/class_6880;
 	METHOD method_28358 (Lnet/minecraft/class_4156;)Ljava/lang/Integer;
 		ARG 0 poi
 	METHOD method_28359 createCodec (Ljava/lang/Runnable;)Lcom/mojang/serialization/Codec;
 		ARG 0 updateListener
 	METHOD method_28360 (Ljava/lang/Runnable;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 1 instance
-	METHOD method_28361 (Lnet/minecraft/class_4156;)Lnet/minecraft/class_4158;
+	METHOD method_28361 (Lnet/minecraft/class_4156;)Lnet/minecraft/class_6880;
 		ARG 0 poi
 	METHOD method_28362 (Lnet/minecraft/class_4156;)Lnet/minecraft/class_2338;
 		ARG 0 poi

mappings/net/minecraft/world/poi/PointOfInterestSet.mapping

@@ -10,13 +10,10 @@ CLASS net/minecraft/class_4157 net/minecraft/world/poi/PointOfInterestSet
 		ARG 1 updateListener
 		ARG 2 valid
 		ARG 3 pois
-	METHOD method_19143 (Lnet/minecraft/class_4158;)Ljava/util/Set;
-		ARG 0 poiType
 	METHOD method_19145 remove (Lnet/minecraft/class_2338;)V
 		ARG 1 pos
-	METHOD method_19146 add (Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)V
+	METHOD method_19146 add (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V
 		ARG 1 pos
-		ARG 2 type
 	METHOD method_19147 test (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)Z
 		ARG 1 pos
 		ARG 2 predicate
@@ -29,9 +26,8 @@ CLASS net/minecraft/class_4157 net/minecraft/world/poi/PointOfInterestSet
 		ARG 1 pos
 	METHOD method_20350 add (Lnet/minecraft/class_4156;)Z
 		ARG 1 poi
-	METHOD method_20352 (Lit/unimi/dsi/fastutil/shorts/Short2ObjectMap;Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)V
+	METHOD method_20352 (Lit/unimi/dsi/fastutil/shorts/Short2ObjectMap;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V
 		ARG 2 pos
-		ARG 3 poiType
 	METHOD method_20353 updatePointsOfInterest (Ljava/util/function/Consumer;)V
 	METHOD method_20395 clear ()V
 	METHOD method_22444 isValid ()Z

mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping

@@ -1,18 +1,16 @@
 CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage
 	FIELD field_18484 pointOfInterestDistanceTracker Lnet/minecraft/class_4153$class_4154;
 	FIELD field_20688 preloadedChunks Lit/unimi/dsi/fastutil/longs/LongSet;
-	METHOD <init> (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_5539;)V
+	METHOD <init> (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_5455;Lnet/minecraft/class_5539;)V
 		ARG 1 path
 		ARG 2 dataFixer
 		ARG 3 dsync
-		ARG 4 world
 	METHOD method_19112 remove (Lnet/minecraft/class_2338;)V
 		ARG 1 pos
 	METHOD method_19113 (Lnet/minecraft/class_2338;ILnet/minecraft/class_4156;)Z
 		ARG 2 poi
-	METHOD method_19115 add (Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)V
+	METHOD method_19115 add (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V
 		ARG 1 pos
-		ARG 2 type
 	METHOD method_19116 test (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)Z
 		ARG 1 pos
 		ARG 2 predicate
@@ -31,9 +29,8 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage
 		ARG 2 pos
 		ARG 3 radius
 		ARG 4 occupationStatus
-	METHOD method_19126 getPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_2338;I)Ljava/util/Optional;
+	METHOD method_19126 getPosition (Ljava/util/function/Predicate;Ljava/util/function/BiPredicate;Lnet/minecraft/class_2338;I)Ljava/util/Optional;
 		ARG 1 typePredicate
-		ARG 2 positionPredicate
 		ARG 3 pos
 		ARG 4 radius
 	METHOD method_19127 getPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/Optional;
@@ -46,7 +43,7 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage
 		ARG 0 poi
 	METHOD method_19129 releaseTicket (Lnet/minecraft/class_2338;)Z
 		ARG 1 pos
-	METHOD method_19130 (Ljava/util/function/Predicate;Lnet/minecraft/class_4156;)Z
+	METHOD method_19130 (Ljava/util/function/BiPredicate;Lnet/minecraft/class_4156;)Z
 		ARG 1 poi
 	METHOD method_19132 getType (Lnet/minecraft/class_2338;)Ljava/util/Optional;
 		ARG 1 pos
@@ -57,8 +54,6 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage
 		ARG 2 chunkSection
 	METHOD method_19511 (Lnet/minecraft/class_2826;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V
 		ARG 2 pos
-	METHOD method_19512 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)V
-		ARG 2 poiType
 	METHOD method_20004 (Ljava/util/function/Predicate;Lnet/minecraft/class_4156;)Z
 		ARG 1 poi
 	METHOD method_20005 getPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_4153$class_4155;Lnet/minecraft/class_2338;ILnet/minecraft/class_5819;)Ljava/util/Optional;
@@ -108,8 +103,7 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage
 		ARG 1 chunkPos
 	METHOD method_22443 (Lnet/minecraft/class_4076;)Lcom/mojang/datafixers/util/Pair;
 		ARG 1 sectionPos
-	METHOD method_26339 hasTypeAt (Lnet/minecraft/class_4158;Lnet/minecraft/class_2338;)Z
+	METHOD method_26339 hasTypeAt (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;)Z
-		ARG 1 type
 		ARG 2 pos
 	METHOD method_30335 (Lnet/minecraft/class_2338;ILnet/minecraft/class_4156;)Z
 		ARG 2 poi

mappings/net/minecraft/world/poi/PointOfInterestType.mapping

@@ -1,59 +1,9 @@
 CLASS net/minecraft/class_4158 net/minecraft/world/poi/PointOfInterestType
-	FIELD field_18500 IS_USED_BY_PROFESSION Ljava/util/function/Predicate;
+	FIELD comp_815 blockStates Ljava/util/Set;
-	FIELD field_18501 ALWAYS_TRUE Ljava/util/function/Predicate;
+	FIELD comp_816 ticketCount I
-	FIELD field_18519 id Ljava/lang/String;
+	FIELD comp_817 searchDistance I
-	FIELD field_18521 ticketCount I
+	METHOD comp_815 blockStates ()Ljava/util/Set;
-	FIELD field_18523 completionCondition Ljava/util/function/Predicate;
+	METHOD comp_816 ticketCount ()I
-	FIELD field_18849 BLOCK_STATE_TO_POINT_OF_INTEREST_TYPE Ljava/util/Map;
+	METHOD comp_817 searchDistance ()I
-	FIELD field_18850 blockStates Ljava/util/Set;
-	FIELD field_19227 BED_STATES Ljava/util/Set;
-	FIELD field_20298 searchDistance I
-	FIELD field_25162 REGISTERED_STATES Ljava/util/Set;
-	FIELD field_25163 VILLAGER_WORKSTATIONS Ljava/util/function/Supplier;
-	FIELD field_30267 CAULDRON_STATES Ljava/util/Set;
-	METHOD <init> (Ljava/lang/String;Ljava/util/Set;II)V
-		ARG 1 id
-		ARG 2 blockStates
-		ARG 3 ticketCount
-		ARG 4 searchDistance
-	METHOD <init> (Ljava/lang/String;Ljava/util/Set;ILjava/util/function/Predicate;I)V
-		ARG 1 id
-		ARG 2 blockStates
-		ARG 3 ticketCount
-		ARG 4 completionCondition
-		ARG 5 searchDistance
-	METHOD method_19156 (Lnet/minecraft/class_4158;)Z
-		ARG 1 poiType
-	METHOD method_19161 getTicketCount ()I
-	METHOD method_19162 (Lnet/minecraft/class_4158;)Z
-		ARG 0 poiType
-	METHOD method_19164 getCompletionCondition ()Ljava/util/function/Predicate;
-	METHOD method_19516 from (Lnet/minecraft/class_2680;)Ljava/util/Optional;
-		ARG 0 state
-	METHOD method_19517 (Lnet/minecraft/class_2680;)Z
-		ARG 0 state
-	METHOD method_20354 setup (Lnet/minecraft/class_4158;)Lnet/minecraft/class_4158;
-		ARG 0 poiType
-	METHOD method_20355 (Lnet/minecraft/class_4158;Lnet/minecraft/class_2680;)V
-		ARG 1 state
-	METHOD method_20356 getAllStatesOf (Lnet/minecraft/class_2248;)Ljava/util/Set;
-		ARG 0 block
-	METHOD method_20357 register (Ljava/lang/String;Ljava/util/Set;II)Lnet/minecraft/class_4158;
-		ARG 0 id
-		ARG 1 workStationStates
-		ARG 2 ticketCount
-		ARG 3 searchDistance
-	METHOD method_20358 register (Ljava/lang/String;Ljava/util/Set;ILjava/util/function/Predicate;I)Lnet/minecraft/class_4158;
-		ARG 0 id
-		ARG 1 workStationStates
-		ARG 2 ticketCount
-		ARG 3 completionCondition
-		ARG 4 searchDistance
-	METHOD method_20359 (Lnet/minecraft/class_2248;)Ljava/util/stream/Stream;
-		ARG 0 block
-	METHOD method_21648 getSearchDistance ()I
-	METHOD method_29269 (Lnet/minecraft/class_4158;)Z
-		ARG 0 poiType
-	METHOD method_35158 getId ()Ljava/lang/String;
 	METHOD method_35159 contains (Lnet/minecraft/class_2680;)Z
 		ARG 1 state

mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping

@@ -9,18 +9,16 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase
 	FIELD field_24750 codecFactory Ljava/util/function/Function;
 	FIELD field_27240 world Lnet/minecraft/class_5539;
 	FIELD field_31427 SECTIONS_KEY Ljava/lang/String;
-	METHOD <init> (Ljava/nio/file/Path;Ljava/util/function/Function;Ljava/util/function/Function;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;ZLnet/minecraft/class_5539;)V
+	METHOD <init> (Ljava/nio/file/Path;Ljava/util/function/Function;Ljava/util/function/Function;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;ZLnet/minecraft/class_5455;Lnet/minecraft/class_5539;)V
 		ARG 1 path
 		ARG 2 codecFactory
 		ARG 3 factory
 		ARG 4 dataFixer
 		ARG 5 dataFixTypes
 		ARG 6 dsync
-		ARG 7 world
 	METHOD method_19288 onUpdate (J)V
 		ARG 1 pos
 	METHOD method_19289 loadDataAt (Lnet/minecraft/class_1923;)V
-		ARG 1 chunkPos
 	METHOD method_19290 tick (Ljava/util/function/BooleanSupplier;)V
 		ARG 1 shouldKeepTicking
 	METHOD method_19291 onLoad (J)V
@@ -45,7 +43,6 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase
 	METHOD method_20369 getDataVersion (Lcom/mojang/serialization/Dynamic;)I
 		ARG 0 dynamic
 	METHOD method_20370 save (Lnet/minecraft/class_1923;)V
-		ARG 1 chunkPos
 	METHOD method_20436 saveChunk (Lnet/minecraft/class_1923;)V
 		ARG 1 pos
 	METHOD method_20621 loadNbt (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture;