24w46a

build.gradle

@@ -19,7 +19,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "24w45a"
+def minecraft_version = "24w46a"
 
 filament {
 	minecraftVersion = minecraft_version

mappings/net/minecraft/block/EyeblossomBlock.mapping

@@ -32,7 +32,6 @@ CLASS net/minecraft/class_10374 net/minecraft/block/EyeblossomBlock
 			ARG 6 longSound
 			ARG 7 sound
 			ARG 8 particleColor
-		METHOD method_65154 getToggledBlockState ()Lnet/minecraft/class_2680;
 		METHOD method_65155 spawnTrailParticle (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 			ARG 1 world
 			ARG 2 pos

mappings/net/minecraft/block/GlowLichenBlock.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_5777 net/minecraft/block/GlowLichenBlock
-	FIELD field_28412 WATERLOGGED Lnet/minecraft/class_2746;
 	FIELD field_37585 grower Lnet/minecraft/class_7118;
 	FIELD field_46363 CODEC Lcom/mojang/serialization/MapCodec;
 	METHOD method_34727 (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z

mappings/net/minecraft/block/MultifaceBlock.mapping

@@ -42,7 +42,6 @@ CLASS net/minecraft/class_5778 net/minecraft/block/MultifaceBlock
 		ARG 0 shapes
 	METHOD method_33374 getProperty (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2746;
 		ARG 0 direction
-	METHOD method_33378 isWaterlogged ()Z
 	METHOD method_33380 getShapeForState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265;
 		ARG 0 state
 	METHOD method_33381 hasAnyDirection (Lnet/minecraft/class_2680;)Z

mappings/net/minecraft/block/SculkVeinBlock.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_7130 net/minecraft/block/SculkVeinBlock
-	FIELD field_37631 WATERLOGGED Lnet/minecraft/class_2746;
 	FIELD field_37632 allGrowTypeGrower Lnet/minecraft/class_7118;
 	FIELD field_37633 samePositionOnlyGrower Lnet/minecraft/class_7118;
 	FIELD field_46437 CODEC Lcom/mojang/serialization/MapCodec;

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

@@ -12,8 +12,7 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity
 	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
 		ARG 2 state
-	METHOD method_21848 tryEnterHive (Lnet/minecraft/class_1297;)V
-		ARG 1 entity
+	METHOD method_21848 tryEnterHive (Lnet/minecraft/class_4466;)V
 	METHOD method_21850 angerBees (Lnet/minecraft/class_1657;Lnet/minecraft/class_2680;Lnet/minecraft/class_4482$class_4484;)V
 		ARG 1 player
 		ARG 2 state

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

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_10323 net/minecraft/block/entity/CreakingHeartBlockEntity
-	FIELD field_54786 creakingPuppet Lnet/minecraft/class_10281;
 	FIELD field_54787 creakingUpdateTimer I
 	FIELD field_54788 trailParticlesSpawnTimer I
 	FIELD field_54789 lastCreakingPuppetPos Lnet/minecraft/class_243;
@@ -11,7 +10,7 @@ CLASS net/minecraft/class_10323 net/minecraft/block/entity/CreakingHeartBlockEnt
 		ARG 1 world
 		ARG 2 count
 		ARG 3 towardsPuppet
-	METHOD method_64801 spawnCreakingPuppet (Lnet/minecraft/class_3218;Lnet/minecraft/class_10323;)Lnet/minecraft/class_10281;
+	METHOD method_64801 spawnCreakingPuppet (Lnet/minecraft/class_3218;Lnet/minecraft/class_10323;)Lnet/minecraft/class_10275;
 		ARG 0 world
 		ARG 1 blockEntity
 	METHOD method_64802 killPuppet (Lnet/minecraft/class_1282;)V

mappings/net/minecraft/class_10480.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_10480
+	METHOD method_65644 call (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F

mappings/net/minecraft/class_10529.mapping

@@ -0,0 +1,5 @@
+CLASS net/minecraft/class_10529
+	METHOD method_45790 getTextOffset ()Lnet/minecraft/class_243;
+	METHOD method_45792 getTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730;
+	METHOD method_51272 getSignScale ()F
+	METHOD method_51273 getTextScale ()F

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

@@ -1,11 +1,7 @@
 CLASS net/minecraft/class_751 net/minecraft/client/gui/CubeMapRenderer
 	FIELD field_32680 FACES_COUNT I
-	FIELD field_3952 faces [Lnet/minecraft/class_2960;
 	METHOD <init> (Lnet/minecraft/class_2960;)V
 		ARG 1 faces
-	METHOD method_18143 loadTexturesAsync (Lnet/minecraft/class_1060;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
-		ARG 1 textureManager
-		ARG 2 executor
 	METHOD method_3156 draw (Lnet/minecraft/class_310;FFF)V
 		ARG 1 client
 		ARG 2 x

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

@@ -26,8 +26,7 @@ CLASS net/minecraft/class_425 net/minecraft/client/gui/screen/SplashOverlay
 		ARG 4 maxX
 		ARG 5 maxY
 		ARG 6 opacity
-	METHOD method_18819 init (Lnet/minecraft/class_310;)V
-		ARG 0 client
+	METHOD method_18819 init (Lnet/minecraft/class_1060;)V
 	METHOD method_35732 withAlpha (II)I
 		ARG 0 color
 		ARG 1 alpha

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

@@ -15,9 +15,6 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen
 	METHOD <init> (ZLnet/minecraft/class_8020;)V
 		ARG 1 doBackgroundFade
 		ARG 2 logoDrawer
-	METHOD method_18105 loadTexturesAsync (Lnet/minecraft/class_1060;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
-		ARG 0 textureManager
-		ARG 1 executor
 	METHOD method_19857 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_19858 (ZLnet/minecraft/class_4185;)V

mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping

@@ -9,7 +9,6 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA
 	FIELD field_45541 OVERLAY_RECIPE_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_52829 currentIndexProvider Lnet/minecraft/class_9938;
 	METHOD <init> (Lnet/minecraft/class_9938;Z)V
-		ARG 1 currentIndexProvider
 		ARG 2 furnace
 	METHOD method_2613 setVisible (Z)V
 		ARG 1 visible

mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping

@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_516 net/minecraft/client/gui/screen/recipebook/RecipeResultCollection
 	FIELD field_3146 craftableRecipes Ljava/util/Set;
-	FIELD field_3148 singleOutput Z
 	FIELD field_54835 entries Ljava/util/List;
 	FIELD field_54836 displayableRecipes Ljava/util/Set;
 	METHOD <init> (Ljava/util/List;)V
@@ -9,9 +8,6 @@ CLASS net/minecraft/class_516 net/minecraft/client/gui/screen/recipebook/RecipeR
 	METHOD method_2653 isCraftable (Lnet/minecraft/class_10298;)Z
 		ARG 1 recipeId
 	METHOD method_2655 hasCraftableRecipes ()Z
-	METHOD method_2656 hasSingleOutput ()Z
-	METHOD method_30295 shouldHaveSingleOutput (Ljava/util/List;)Z
-		ARG 0 recipes
 	METHOD method_64884 populateRecipes (Lnet/minecraft/class_9875;Ljava/util/function/Predicate;)V
 		ARG 1 finder
 		ARG 2 displayablePredicate

mappings/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.mapping

@@ -13,6 +13,7 @@ CLASS net/minecraft/class_7761 net/minecraft/client/render/block/entity/HangingS
 	FIELD field_44576 TEXT_OFFSET Lnet/minecraft/class_243;
 	METHOD method_45795 getTexturedModelData (Lnet/minecraft/class_7761$class_10381;)Lnet/minecraft/class_5607;
 		ARG 0 attachementType
+	METHOD method_49918 setAngles (Lnet/minecraft/class_4587;F)V
 	METHOD method_65239 (Lnet/minecraft/class_4719;Lnet/minecraft/class_7761$class_10381;)Lnet/minecraft/class_7761$class_10382;
 		ARG 1 attachmentType
 	METHOD method_65240 (Lnet/minecraft/class_5614$class_5615;Lnet/minecraft/class_7761$class_10382;)Lnet/minecraft/class_3879;

mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping

@@ -1,8 +1,5 @@
 CLASS net/minecraft/class_837 net/minecraft/client/render/block/entity/SignBlockEntityRenderer
 	FIELD field_27754 typeToModelPair Ljava/util/Map;
-	FIELD field_27755 textRenderer Lnet/minecraft/class_327;
-	FIELD field_33962 GLOWING_BLACK_COLOR I
-	FIELD field_33963 RENDER_DISTANCE I
 	FIELD field_44577 SCALE F
 	FIELD field_44578 TEXT_OFFSET Lnet/minecraft/class_243;
 	METHOD <init> (Lnet/minecraft/class_5614$class_5615;)V
@@ -17,50 +14,5 @@ CLASS net/minecraft/class_837 net/minecraft/client/render/block/entity/SignBlock
 		ARG 2 standing
 	METHOD method_32158 (Lnet/minecraft/class_5614$class_5615;Lnet/minecraft/class_4719;)Lnet/minecraft/class_837$class_9985;
 		ARG 1 signType
-	METHOD method_37311 getColor (Lnet/minecraft/class_8242;)I
-		ARG 0 sign
-	METHOD method_37312 shouldRender (Lnet/minecraft/class_2338;I)Z
-		ARG 0 pos
-		ARG 1 signColor
-	METHOD method_45790 getTextOffset ()Lnet/minecraft/class_243;
-	METHOD method_45792 getTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730;
-		ARG 1 signType
-	METHOD method_45798 renderText (Lnet/minecraft/class_2338;Lnet/minecraft/class_8242;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IIIZ)V
-		ARG 1 pos
-		ARG 2 signText
-		ARG 3 matrices
-		ARG 4 vertexConsumers
-		ARG 5 light
-		ARG 6 lineHeight
-		ARG 7 lineWidth
-		ARG 8 front
-	METHOD method_45799 (ILnet/minecraft/class_2561;)Lnet/minecraft/class_5481;
-		ARG 2 text
-	METHOD method_45800 renderSign (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_4719;Lnet/minecraft/class_3879;)V
-		ARG 1 matrices
-		ARG 2 vertexConsumers
-		ARG 3 light
-		ARG 4 overlay
-		ARG 5 woodType
-		ARG 6 model
-	METHOD method_49918 setAngles (Lnet/minecraft/class_4587;FLnet/minecraft/class_2680;)V
-		ARG 1 matrices
-		ARG 2 rotationDegrees
-		ARG 3 state
-	METHOD method_49919 setTextAngles (Lnet/minecraft/class_4587;ZLnet/minecraft/class_243;)V
-		ARG 1 matrices
-		ARG 2 front
-		ARG 3 translation
-	METHOD method_49920 render (Lnet/minecraft/class_2625;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_2680;Lnet/minecraft/class_2478;Lnet/minecraft/class_4719;Lnet/minecraft/class_3879;)V
-		ARG 1 entity
-		ARG 2 matrices
-		ARG 3 vertexConsumers
-		ARG 4 light
-		ARG 5 overlay
-		ARG 6 state
-		ARG 7 block
-		ARG 8 woodType
-		ARG 9 model
-	METHOD method_51272 getSignScale ()F
-	METHOD method_51273 getTextScale ()F
+	METHOD method_45800 renderSign (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_3879;Lnet/minecraft/class_4730;)V
 	CLASS class_9985 SignModelPair

mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping

@@ -12,8 +12,7 @@ CLASS net/minecraft/class_836 net/minecraft/client/render/block/entity/SkullBloc
 		ARG 5 light
 		ARG 6 model
 		ARG 7 renderLayer
-	METHOD method_3578 getRenderLayer (Lnet/minecraft/class_2484$class_2485;Lnet/minecraft/class_9296;)Lnet/minecraft/class_1921;
+	METHOD method_3578 getRenderLayer (Lnet/minecraft/class_2484$class_2485;Lnet/minecraft/class_9296;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
 		ARG 0 type
-		ARG 1 profile
 	METHOD method_3580 (Ljava/util/HashMap;)V
 		ARG 0 map

mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadata.mapping

@@ -1,17 +1,9 @@
 CLASS net/minecraft/class_3888 net/minecraft/client/render/entity/feature/VillagerResourceMetadata
-	FIELD field_17158 READER Lnet/minecraft/class_3890;
-	FIELD field_17159 hatType Lnet/minecraft/class_3888$class_3889;
-	FIELD field_32977 KEY Ljava/lang/String;
+	FIELD comp_3458 hatType Lnet/minecraft/class_3888$class_3889;
 	METHOD <init> (Lnet/minecraft/class_3888$class_3889;)V
 		ARG 1 hatType
-	METHOD method_17167 getHatType ()Lnet/minecraft/class_3888$class_3889;
+	METHOD comp_3458 hatType ()Lnet/minecraft/class_3888$class_3889;
 	CLASS class_3889 HatType
-		FIELD field_17163 BY_NAME Ljava/util/Map;
 		FIELD field_17164 name Ljava/lang/String;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 			ARG 3 name
-		METHOD method_17168 getName ()Ljava/lang/String;
-		METHOD method_17169 (Lnet/minecraft/class_3888$class_3889;)Lnet/minecraft/class_3888$class_3889;
-			ARG 0 hatType
-		METHOD method_17170 from (Ljava/lang/String;)Lnet/minecraft/class_3888$class_3889;
-			ARG 0 name

mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping

@@ -1,12 +1,11 @@
 CLASS net/minecraft/class_1080 net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata
-	FIELD field_32973 UNDEFINED_TIME I
-	FIELD field_5340 time I
-	FIELD field_5341 index I
+	FIELD comp_3451 index I
+	FIELD comp_3452 time Ljava/util/Optional;
 	METHOD <init> (I)V
 		ARG 1 index
-	METHOD <init> (II)V
+	METHOD <init> (ILjava/util/Optional;)V
 		ARG 1 index
-		ARG 2 time
-	METHOD method_4690 getIndex ()I
+	METHOD comp_3451 index ()I
+	METHOD comp_3452 time ()Ljava/util/Optional;
 	METHOD method_4691 getTime (I)I
 		ARG 1 defaultTime

mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping

@@ -1,28 +1,17 @@
 CLASS net/minecraft/class_1079 net/minecraft/client/resource/metadata/AnimationResourceMetadata
-	FIELD field_21768 EMPTY Lnet/minecraft/class_1079;
-	FIELD field_32974 KEY Ljava/lang/String;
-	FIELD field_32975 EMPTY_FRAME_TIME I
-	FIELD field_32976 UNDEFINED I
-	FIELD field_5334 defaultFrameTime I
-	FIELD field_5335 interpolate Z
-	FIELD field_5336 height I
-	FIELD field_5337 READER Lnet/minecraft/class_1081;
-	FIELD field_5338 width I
-	FIELD field_5339 frames Ljava/util/List;
-	METHOD <init> (Ljava/util/List;IIIZ)V
-		ARG 1 frames
-		ARG 2 width
-		ARG 3 height
+	FIELD comp_3453 frames Ljava/util/Optional;
+	FIELD comp_3454 width Ljava/util/Optional;
+	FIELD comp_3455 height Ljava/util/Optional;
+	FIELD comp_3456 defaultFrameTime I
+	FIELD comp_3457 interpolate Z
+	METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;IZ)V
 		ARG 4 defaultFrameTime
 		ARG 5 interpolate
+	METHOD comp_3453 frames ()Ljava/util/Optional;
+	METHOD comp_3454 width ()Ljava/util/Optional;
+	METHOD comp_3455 height ()Ljava/util/Optional;
+	METHOD comp_3456 defaultFrameTime ()I
+	METHOD comp_3457 interpolate ()Z
 	METHOD method_24143 getSize (II)Lnet/minecraft/class_7771;
 		ARG 1 defaultWidth
 		ARG 2 defaultHeight
-	METHOD method_33460 forEachFrame (Lnet/minecraft/class_1079$class_5792;)V
-		ARG 1 consumer
-	METHOD method_4684 getDefaultFrameTime ()I
-	METHOD method_4685 shouldInterpolate ()Z
-	CLASS class_5792 FrameConsumer
-		METHOD accept (II)V
-			ARG 1 index
-			ARG 2 frameTime

mappings/net/minecraft/client/resource/metadata/TextureResourceMetadata.mapping

@@ -1,9 +1,8 @@
 CLASS net/minecraft/class_1084 net/minecraft/client/resource/metadata/TextureResourceMetadata
-	FIELD field_5344 READER Lnet/minecraft/class_1085;
-	FIELD field_5345 clamp Z
-	FIELD field_5346 blur Z
+	FIELD comp_3459 blur Z
+	FIELD comp_3460 clamp Z
 	METHOD <init> (ZZ)V
 		ARG 1 blur
 		ARG 2 clamp
-	METHOD method_4696 shouldBlur ()Z
-	METHOD method_4697 shouldClamp ()Z
+	METHOD comp_3459 blur ()Z
+	METHOD comp_3460 clamp ()Z

mappings/net/minecraft/client/texture/AbstractTexture.mapping

@@ -2,17 +2,10 @@ CLASS net/minecraft/class_1044 net/minecraft/client/texture/AbstractTexture
 	FIELD field_32948 DEFAULT_ID I
 	FIELD field_5204 glId I
 	FIELD field_5205 bilinear Z
-	METHOD method_18169 registerTexture (Lnet/minecraft/class_1060;Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;Ljava/util/concurrent/Executor;)V
-		ARG 1 textureManager
-		ARG 2 resourceManager
-		ARG 3 id
-		ARG 4 executor
 	METHOD method_23207 bindTexture ()V
 	METHOD method_4527 setFilter (ZZ)V
 		ARG 1 bilinear
 		ARG 2 mipmap
 	METHOD method_4528 clearGlId ()V
 	METHOD method_4624 getGlId ()I
-	METHOD method_4625 load (Lnet/minecraft/class_3300;)V
-		ARG 1 manager
 	METHOD method_62619 isBilinear ()Z

mappings/net/minecraft/client/texture/MissingSprite.mapping

@@ -2,11 +2,8 @@ CLASS net/minecraft/class_1047 net/minecraft/client/texture/MissingSprite
 	FIELD field_32950 WIDTH I
 	FIELD field_32951 HEIGHT I
 	FIELD field_32952 MISSINGNO_ID Ljava/lang/String;
-	FIELD field_45630 METADATA Lnet/minecraft/class_7368;
 	FIELD field_5219 MISSINGNO Lnet/minecraft/class_2960;
-	FIELD field_5220 texture Lnet/minecraft/class_1043;
 	METHOD method_4539 getMissingSpriteId ()Lnet/minecraft/class_2960;
-	METHOD method_4540 getMissingSpriteTexture ()Lnet/minecraft/class_1043;
 	METHOD method_45805 createSpriteContents ()Lnet/minecraft/class_7764;
 	METHOD method_45806 createImage (II)Lnet/minecraft/class_1011;
 		ARG 0 width

mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping

@@ -5,11 +5,6 @@ CLASS net/minecraft/class_1071 net/minecraft/client/texture/PlayerSkinProvider
 	FIELD field_45637 elytraCache Lnet/minecraft/class_1071$class_8687;
 	FIELD field_46909 LOGGER Lorg/slf4j/Logger;
 	FIELD field_46910 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService;
-	METHOD <init> (Lnet/minecraft/class_1060;Ljava/nio/file/Path;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Ljava/util/concurrent/Executor;)V
-		ARG 1 textureManager
-		ARG 2 directory
-		ARG 3 sessionService
-		ARG 4 executor
 	METHOD method_52858 getSkinTexturesSupplier (Lcom/mojang/authlib/GameProfile;)Ljava/util/function/Supplier;
 		ARG 1 profile
 	METHOD method_52859 fetchSkinTextures (Ljava/util/UUID;Lcom/mojang/authlib/minecraft/MinecraftProfileTextures;)Ljava/util/concurrent/CompletableFuture;
@@ -28,14 +23,9 @@ CLASS net/minecraft/class_1071 net/minecraft/client/texture/PlayerSkinProvider
 			ARG 2 textures
 	CLASS class_8686 Key
 	CLASS class_8687 FileCache
-		FIELD field_45639 textureManager Lnet/minecraft/class_1060;
 		FIELD field_45640 directory Ljava/nio/file/Path;
 		FIELD field_45641 type Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;
 		FIELD field_45642 hashToTexture Ljava/util/Map;
-		METHOD <init> (Lnet/minecraft/class_1060;Ljava/nio/file/Path;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)V
-			ARG 1 textureManager
-			ARG 2 directory
-			ARG 3 type
 		METHOD method_52870 get (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)Ljava/util/concurrent/CompletableFuture;
 			ARG 1 texture
 		METHOD method_52871 getTexturePath (Ljava/lang/String;)Lnet/minecraft/class_2960;