Add more 24w35a mappings (#3973)

* Add more 24w35a mappings

* Revert RegistryWrapper change

* Revert Registry change

mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping

@@ -1,19 +1,24 @@
 CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic
 	FIELD field_47359 MAX_ENTITY_DISTANCE I
 	FIELD field_47360 MAX_ENTITY_DISTANCE_SQUARED I
+	FIELD field_47361 SOUND_RATE_PER_TICK F
 	FIELD field_47363 data Lnet/minecraft/class_8966;
 	FIELD field_47364 trialSpawner Lnet/minecraft/class_8963$class_8964;
 	FIELD field_47365 entityDetector Lnet/minecraft/class_8962;
 	FIELD field_47366 forceActivate Z
 	FIELD field_48864 entitySelector Lnet/minecraft/class_8962$class_9198;
 	FIELD field_50177 NORMAL_CONFIG_NBT_KEY Ljava/lang/String;
 	FIELD field_50178 OMINOUS_CONFIG_NBT_KEY Ljava/lang/String;
+	FIELD field_50179 DEFAULT_COOLDOWN_LENGTH I
+	FIELD field_50180 DEFAULT_ENTITY_DETECTION_RANGE I
 	FIELD field_50181 normalConfig Lnet/minecraft/class_6880;
 	FIELD field_50182 ominousConfig Lnet/minecraft/class_6880;
 	FIELD field_50183 entityDetectionRange I
 	FIELD field_50184 cooldownLength I
 	FIELD field_50185 ominous Z
 	METHOD <init> (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_8966;IILnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;)V
+		ARG 1 normalConfig
+		ARG 2 ominousConfig
 		ARG 3 data
 		ARG 4 cooldownLength
 		ARG 5 entityDetectionRange
@@ -98,6 +103,12 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic
 	METHOD method_58705 isOminous ()Z
 	METHOD method_58706 getCooldownLength ()I
 	METHOD method_58707 getDetectionRadius ()I
+	METHOD method_63464 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Lnet/minecraft/class_8966;Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/class_8963;
+		ARG 1 normalConfig
+		ARG 2 ominousConfig
+		ARG 3 data
+		ARG 4 cooldownLength
+		ARG 5 entityDetectionRange
 	CLASS class_8964 TrialSpawner
 		METHOD method_55146 setSpawnerState (Lnet/minecraft/class_1937;Lnet/minecraft/class_8967;)V
 			ARG 1 world

mappings/net/minecraft/client/MinecraftClient.mapping

@@ -176,6 +176,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	FIELD field_45295 symlinkFinder Lnet/minecraft/class_8580;
 	FIELD field_45899 gameProfileFuture Ljava/util/concurrent/CompletableFuture;
 	FIELD field_45900 finishedLoading Z
+	FIELD field_46550 UNIVERSE J
 	FIELD field_46551 disconnecting Z
 	FIELD field_46552 startTime J
 	FIELD field_46553 uptimeInTicks J
@@ -531,6 +532,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_61964 getInactivityFpsLimiter ()Lnet/minecraft/class_9919;
 	METHOD method_61965 getMapRenderer ()Lnet/minecraft/class_330;
 	METHOD method_61966 getRenderTickCounter ()Lnet/minecraft/class_9779;
+	METHOD method_62887 getShaderLoader ()Lnet/minecraft/class_10151;
+	METHOD method_63507 onShaderResourceReloadFailure (Ljava/lang/Exception;)V
 	CLASS 1
 		FIELD field_52756 closed Z
 	CLASS class_5859 ChatRestriction

mappings/net/minecraft/client/gl/ShaderLoader.mapping

@@ -5,8 +5,11 @@ CLASS net/minecraft/class_10151 net/minecraft/client/gl/ShaderLoader
 	FIELD field_53938 SHADERS_FINDER Lnet/minecraft/class_7654;
 	FIELD field_53939 POST_EFFECT_FINDER Lnet/minecraft/class_7654;
 	FIELD field_53940 textureManager Lnet/minecraft/class_1060;
+	FIELD field_54019 onError Ljava/util/function/Consumer;
+	FIELD field_54020 cache Lnet/minecraft/class_10151$class_10170;
 	METHOD <init> (Lnet/minecraft/class_1060;Ljava/util/function/Consumer;)V
 		ARG 1 textureManager
+		ARG 2 onError
 	METHOD method_62937 isDefinition (Lnet/minecraft/class_2960;)Z
 		ARG 0 id
 	METHOD method_62938 loadDefinition (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;Lcom/google/common/collect/ImmutableMap$Builder;)V
@@ -33,6 +36,10 @@ CLASS net/minecraft/class_10151 net/minecraft/client/gl/ShaderLoader
 	METHOD method_62947 getOrCreateProgram (Lnet/minecraft/class_10156;)Lnet/minecraft/class_5944;
 		ARG 1 key
 	METHOD method_62948 createProgram (Lnet/minecraft/class_10156;Lnet/minecraft/class_10157;Lnet/minecraft/class_10141;Lnet/minecraft/class_10141;)Lnet/minecraft/class_5944;
+		ARG 0 key
+		ARG 1 definition
+		ARG 2 vertexShader
+		ARG 3 fragmentShader
 	METHOD method_62949 (Ljava/util/Map$Entry;)Ljava/lang/String;
 		ARG 0 entry
 	METHOD method_62950 createImportProcessor (Ljava/util/Map;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5913;
@@ -57,3 +64,28 @@ CLASS net/minecraft/class_10151 net/minecraft/client/gl/ShaderLoader
 		FIELD field_53948 EMPTY Lnet/minecraft/class_10151$class_10153;
 	CLASS class_10154 ShaderKey
 	CLASS class_10155 ShaderSourceKey
+	CLASS class_10170 Cache
+		FIELD field_54022 definitions Lnet/minecraft/class_10151$class_10153;
+		FIELD field_54023 shaderPrograms Ljava/util/Map;
+		FIELD field_54024 compiledShaders Ljava/util/Map;
+		FIELD field_54025 postEffectProcessors Ljava/util/Map;
+		METHOD <init> (Lnet/minecraft/class_10151;Lnet/minecraft/class_10151$class_10153;)V
+			ARG 2 definitions
+		METHOD method_63522 loadShader (Lnet/minecraft/class_2960;Lnet/minecraft/class_10141$class_282;Lnet/minecraft/class_10149;)Lnet/minecraft/class_10141;
+			ARG 1 id
+			ARG 2 type
+			ARG 3 defines
+		METHOD method_63523 getOrLoadProcessor (Lnet/minecraft/class_2960;Ljava/util/Set;)Lnet/minecraft/class_279;
+			ARG 1 id
+			ARG 2 availableExternalTargets
+		METHOD method_63524 compileShader (Lnet/minecraft/class_10151$class_10154;)Lnet/minecraft/class_10141;
+			ARG 1 key
+		METHOD method_63525 getOrLoadProgram (Lnet/minecraft/class_10156;)Lnet/minecraft/class_5944;
+			ARG 1 key
+		METHOD method_63526 (Ljava/util/Optional;)V
+			ARG 0 program
+		METHOD method_63527 loadProcessor (Lnet/minecraft/class_2960;Ljava/util/Set;)Lnet/minecraft/class_279;
+			ARG 1 id
+			ARG 2 availableExternalTargets
+		METHOD method_63528 loadProgram (Lnet/minecraft/class_10156;)Lnet/minecraft/class_5944;
+			ARG 1 key

mappings/net/minecraft/client/gui/DrawContext.mapping

@@ -16,39 +16,70 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
 		COMMENT
 		COMMENT <p>The width and height of the region are the same as
 		COMMENT the dimensions of the rectangle.
+		ARG 1 renderLayers
+		ARG 2 sprite
+		ARG 3 x
+		ARG 4 y
+		ARG 5 u
+		ARG 6 v
+		ARG 7 width
+		ARG 8 height
+		ARG 9 textureWidth
+		ARG 10 textureHeight
 	METHOD method_25291 drawTexture (Ljava/util/function/Function;Lnet/minecraft/class_2960;IIFFIIIII)V
 		COMMENT Draws a textured rectangle from a region in a texture.
 		COMMENT
 		COMMENT <p>The width and height of the region are the same as
 		COMMENT the dimensions of the rectangle.
+		ARG 1 renderLayers
+		ARG 2 sprite
+		ARG 3 x
+		ARG 4 y
 		ARG 5 u
 		ARG 6 v
+		ARG 7 width
+		ARG 8 height
+		ARG 9 textureWidth
 		ARG 10 textureHeight
+		ARG 11 color
 	METHOD method_25292 drawHorizontalLine (IIII)V
 		ARG 1 x1
 		ARG 2 x2
 		ARG 3 y
 		ARG 4 color
 	METHOD method_25293 drawTexture (Ljava/util/function/Function;Lnet/minecraft/class_2960;IIFFIIIIIII)V
 		COMMENT Draws a textured rectangle from a region in a texture.
-		ARG 6 u
-		ARG 9 regionHeight
-		ARG 10 textureWidth
+		ARG 1 renderLayers
+		ARG 2 sprite
+		ARG 3 x
+		ARG 4 y
+		ARG 5 u
+		ARG 6 v
+		ARG 7 width
+		ARG 8 height
+		ARG 9 regionWidth
+		ARG 10 regionHeight
+		ARG 11 textureWidth
+		ARG 12 textureHeight
+		ARG 13 color
 	METHOD method_25294 fill (IIIII)V
 		ARG 1 x1
 		ARG 2 y1
 		ARG 3 x2
 		ARG 4 y2
 		ARG 5 color
 	METHOD method_25295 drawTexturedQuad (Ljava/util/function/Function;Lnet/minecraft/class_2960;IIIIFFFFI)V
-		ARG 3 x2
-		ARG 4 y1
-		ARG 5 y2
-		ARG 6 z
+		ARG 1 renderLayers
+		ARG 2 sprite
+		ARG 3 x1
+		ARG 4 x2
+		ARG 5 y1
+		ARG 6 y2
 		ARG 7 u1
 		ARG 8 u2
 		ARG 9 v1
 		ARG 10 v2
+		ARG 11 color
 	METHOD method_25296 fillGradient (IIIIII)V
 		ARG 1 startX
 		ARG 2 startY
@@ -74,8 +105,18 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
 		COMMENT
 		COMMENT <p>The width and height of the region are the same as
 		COMMENT the dimensions of the rectangle.
-		ARG 3 y
-		ARG 4 u
+		ARG 1 renderLayers
+		ARG 2 sprite
+		ARG 3 x
+		ARG 4 y
+		ARG 5 u
+		ARG 6 v
+		ARG 7 width
+		ARG 8 height
+		ARG 9 regionWith
+		ARG 10 regionHeight
+		ARG 11 textureWidth
+		ARG 12 textureHeight
 	METHOD method_25303 drawTextWithShadow (Lnet/minecraft/class_327;Ljava/lang/String;III)I
 		ARG 1 textRenderer
 		ARG 2 text
@@ -310,33 +351,81 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
 		ARG 4 y2
 		ARG 5 color
 	METHOD method_52706 drawGuiTexture (Ljava/util/function/Function;Lnet/minecraft/class_2960;IIII)V
-		ARG 5 height
+		ARG 1 renderLayers
+		ARG 2 sprite
+		ARG 3 x
+		ARG 4 y
+		ARG 5 width
+		ARG 6 height
 	METHOD method_52707 drawGuiTexture (Ljava/util/function/Function;Lnet/minecraft/class_2960;IIIII)V
+		ARG 1 renderLayers
+		ARG 2 sprite
+		ARG 3 x
+		ARG 4 y
+		ARG 5 width
+		ARG 6 height
+		ARG 7 color
 	METHOD method_52708 drawGuiTexture (Ljava/util/function/Function;Lnet/minecraft/class_2960;IIIIIIII)V
+		ARG 1 renderLayers
+		ARG 2 sprite
+		ARG 3 textureWidth
+		ARG 4 textureHeight
+		ARG 5 u
+		ARG 6 v
+		ARG 7 x
+		ARG 8 y
+		ARG 9 width
+		ARG 10 height
 	METHOD method_52709 drawGuiTexture (Ljava/util/function/Function;Lnet/minecraft/class_1058;IIII)V
+		ARG 1 renderLayers
+		ARG 2 sprite
+		ARG 3 x
+		ARG 4 y
+		ARG 5 width
+		ARG 6 height
 	METHOD method_52710 drawSprite (Ljava/util/function/Function;Lnet/minecraft/class_1058;IIIII)V
-		ARG 3 y
-		ARG 4 z
+		ARG 1 renderLayers
+		ARG 2 sprite
+		ARG 3 x
+		ARG 4 y
 		ARG 5 width
 		ARG 6 height
+		ARG 7 color
 	METHOD method_52711 drawSprite (Ljava/util/function/Function;Lnet/minecraft/class_1058;IIIIIIIII)V
-		ARG 6 x
-		ARG 7 y
-		ARG 8 z
+		ARG 1 renderLayers
+		ARG 2 sprite
+		ARG 3 textureWidth
+		ARG 4 textureHeight
+		ARG 5 u
+		ARG 6 v
+		ARG 7 x
+		ARG 8 y
 		ARG 9 width
 		ARG 10 height
+		ARG 11 color
 	METHOD method_52712 drawSpriteTiled (Ljava/util/function/Function;Lnet/minecraft/class_1058;IIIIIIIIIII)V
-		ARG 3 y
-		ARG 4 z
+		ARG 1 renderLayers
+		ARG 2 sprite
+		ARG 3 x
+		ARG 4 y
 		ARG 5 width
 		ARG 6 height
+		ARG 7 u
+		ARG 8 v
 		ARG 9 tileWidth
 		ARG 10 tileHeight
+		ARG 11 textureWidth
+		ARG 12 textureHeight
+		ARG 13 color
 	METHOD method_52713 drawSprite (Ljava/util/function/Function;Lnet/minecraft/class_1058;Lnet/minecraft/class_8690$class_8691;IIIII)V
-		ARG 4 y
-		ARG 5 z
+		ARG 1 renderLayers
+		ARG 2 sprite
+		ARG 3 nineSlice
+		ARG 4 x
+		ARG 5 y
 		ARG 6 width
 		ARG 7 height
+		ARG 8 color
 	METHOD method_55231 drawItemWithoutEntity (Lnet/minecraft/class_1799;III)V
 		ARG 1 stack
 		ARG 2 x

mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping

@@ -11,16 +11,19 @@ CLASS net/minecraft/class_7532 net/minecraft/client/gui/PlayerSkinDrawer
 	METHOD method_44443 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_8685;IIII)V
 		COMMENT Draws the player's head (including the hat) on GUI.
 		ARG 0 context
+		ARG 1 textures
 		ARG 2 x
 		ARG 3 y
 		ARG 4 size
+		ARG 5 color
 	METHOD method_44444 drawHat (Lnet/minecraft/class_332;Lnet/minecraft/class_2960;IIIZI)V
 		ARG 0 context
 		ARG 1 texture
 		ARG 2 x
 		ARG 3 y
 		ARG 4 size
 		ARG 5 upsideDown
+		ARG 6 color
 	METHOD method_44445 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_2960;IIIZZI)V
 		COMMENT Draws the player's head on GUI.
 		ARG 0 context
@@ -30,6 +33,7 @@ CLASS net/minecraft/class_7532 net/minecraft/client/gui/PlayerSkinDrawer
 		ARG 4 size
 		ARG 5 hatVisible
 		ARG 6 upsideDown
+		ARG 7 color
 	METHOD method_52722 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_8685;III)V
 		ARG 0 context
 		ARG 1 textures

mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping

@@ -6,3 +6,4 @@ CLASS net/minecraft/class_537 net/minecraft/client/gui/hud/spectator/SpectatorMe
 	METHOD method_2784 renderIcon (Lnet/minecraft/class_332;FF)V
 		ARG 1 context
 		ARG 2 brightness
+		ARG 3 alpha

mappings/net/minecraft/client/main/Main.mapping

@@ -12,3 +12,7 @@ CLASS net/minecraft/client/main/Main
 		ARG 0 string
 	METHOD method_53858 unescape (Ljava/lang/String;)Ljava/lang/String;
 		ARG 0 string
+	METHOD method_62729 isUuidSetAndValid (Ljoptsimple/OptionSpec;Ljoptsimple/OptionSet;Lorg/slf4j/Logger;)Z
+		ARG 0 uuidOption
+	METHOD method_62730 isUuidValid (Ljoptsimple/OptionSpec;Ljoptsimple/OptionSet;Lorg/slf4j/Logger;)Z
+		ARG 0 uuidOption

mappings/net/minecraft/client/render/BuiltChunkStorage.mapping

@@ -6,6 +6,7 @@ CLASS net/minecraft/class_769 net/minecraft/client/render/BuiltChunkStorage
 	FIELD field_4150 chunks [Lnet/minecraft/class_846$class_851;
 	FIELD field_4151 world Lnet/minecraft/class_1937;
 	FIELD field_45629 viewDistance I
+	FIELD field_53952 sectionPos Lnet/minecraft/class_4076;
 	METHOD <init> (Lnet/minecraft/class_846;Lnet/minecraft/class_1937;ILnet/minecraft/class_761;)V
 		ARG 1 chunkBuilder
 		ARG 2 world
@@ -17,6 +18,7 @@ CLASS net/minecraft/class_769 net/minecraft/client/render/BuiltChunkStorage
 		ARG 3 z
 		ARG 4 important
 	METHOD method_3323 getRenderedChunk (Lnet/minecraft/class_2338;)Lnet/minecraft/class_846$class_851;
+		ARG 1 blockPos
 	METHOD method_3324 createChunks (Lnet/minecraft/class_846;)V
 		ARG 1 chunkBuilder
 	METHOD method_3325 setViewDistance (I)V
@@ -27,5 +29,17 @@ CLASS net/minecraft/class_769 net/minecraft/client/render/BuiltChunkStorage
 		ARG 3 z
 	METHOD method_3327 clear ()V
 	METHOD method_3330 updateCameraPosition (Lnet/minecraft/class_4076;)V
+		ARG 1 sectionPos
 	METHOD method_52839 getViewDistance ()I
 	METHOD method_52840 getWorld ()Lnet/minecraft/class_5539;
+	METHOD method_62963 getRenderedChunk (J)Lnet/minecraft/class_846$class_851;
+		ARG 1 sectionPos
+	METHOD method_62964 getRenderedChunk (III)Lnet/minecraft/class_846$class_851;
+		ARG 1 sectionX
+		ARG 2 sectionY
+		ARG 3 sectionZ
+	METHOD method_62965 isSectionWithinViewDistance (III)Z
+		ARG 1 sectionX
+		ARG 2 sectionY
+		ARG 3 sectionZ
+	METHOD method_62966 getSectionPos ()Lnet/minecraft/class_4076;