diff --git a/build.gradle b/build.gradle index 4a7e2f6e87..d42381250a 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "24w45a" +def minecraft_version = "24w46a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/EyeblossomBlock.mapping b/mappings/net/minecraft/block/EyeblossomBlock.mapping index 2830526a71..644a8878ce 100644 --- a/mappings/net/minecraft/block/EyeblossomBlock.mapping +++ b/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 diff --git a/mappings/net/minecraft/block/GlowLichenBlock.mapping b/mappings/net/minecraft/block/GlowLichenBlock.mapping index 27add04a22..7e8db42366 100644 --- a/mappings/net/minecraft/block/GlowLichenBlock.mapping +++ b/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 diff --git a/mappings/net/minecraft/block/MultifaceBlock.mapping b/mappings/net/minecraft/block/MultifaceBlock.mapping index bf2ecdbcbd..422732239e 100644 --- a/mappings/net/minecraft/block/MultifaceBlock.mapping +++ b/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 diff --git a/mappings/net/minecraft/block/SculkVeinBlock.mapping b/mappings/net/minecraft/block/SculkVeinBlock.mapping index 90afca8afa..87c1e99f1f 100644 --- a/mappings/net/minecraft/block/SculkVeinBlock.mapping +++ b/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; diff --git a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping index 054ee82342..b9e42529ba 100644 --- a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping @@ -12,8 +12,7 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity METHOD (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 diff --git a/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping b/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping index 408736ae5e..2792a16abc 100644 --- a/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping +++ b/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 diff --git a/mappings/net/minecraft/class_10480.mapping b/mappings/net/minecraft/class_10480.mapping new file mode 100644 index 0000000000..1a004569ff --- /dev/null +++ b/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 diff --git a/mappings/net/minecraft/class_10529.mapping b/mappings/net/minecraft/class_10529.mapping new file mode 100644 index 0000000000..82c586d657 --- /dev/null +++ b/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 diff --git a/mappings/net/minecraft/client/gui/CubeMapRenderer.mapping b/mappings/net/minecraft/client/gui/CubeMapRenderer.mapping index 56c53e484f..9e8bc2db85 100644 --- a/mappings/net/minecraft/client/gui/CubeMapRenderer.mapping +++ b/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 (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 diff --git a/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping b/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping index 570f521a91..a9c6646e6d 100644 --- a/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping +++ b/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 diff --git a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping index e1941bd5a0..d8e9fc4eb3 100644 --- a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping @@ -15,9 +15,6 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen METHOD (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 diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping index ba78822069..457ab3c006 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping +++ b/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 (Lnet/minecraft/class_9938;Z)V - ARG 1 currentIndexProvider ARG 2 furnace METHOD method_2613 setVisible (Z)V ARG 1 visible diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping index 2deea22edf..a127ce613a 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping +++ b/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 (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 diff --git a/mappings/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.mapping index 6aad544dc6..a5feaa3e79 100644 --- a/mappings/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.mapping +++ b/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; diff --git a/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping index be49a949f9..955a2b2371 100644 --- a/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping +++ b/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 (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 diff --git a/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping index 055c486847..8cae2aad87 100644 --- a/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping +++ b/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 diff --git a/mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadata.mapping b/mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadata.mapping index f3a82ee49e..10c2249b32 100644 --- a/mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadata.mapping +++ b/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 (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 (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 diff --git a/mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadataReader.mapping b/mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadataReader.mapping deleted file mode 100644 index b4fe48d4c4..0000000000 --- a/mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadataReader.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3890 net/minecraft/client/render/entity/feature/VillagerResourceMetadataReader diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping index cc61994a41..857874df19 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping +++ b/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 (I)V ARG 1 index - METHOD (II)V + METHOD (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 diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping index 02f6b2596b..c9e12bf145 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping +++ b/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 (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 (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 diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadataReader.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadataReader.mapping deleted file mode 100644 index 48dc5cb80a..0000000000 --- a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadataReader.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_1081 net/minecraft/client/resource/metadata/AnimationResourceMetadataReader - METHOD method_4693 readFrameMetadata (ILcom/google/gson/JsonElement;)Lnet/minecraft/class_1080; - ARG 1 frame - ARG 2 json diff --git a/mappings/net/minecraft/client/resource/metadata/TextureResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/TextureResourceMetadata.mapping index 22f7ec4ad0..88489e2dd1 100644 --- a/mappings/net/minecraft/client/resource/metadata/TextureResourceMetadata.mapping +++ b/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 (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 diff --git a/mappings/net/minecraft/client/resource/metadata/TextureResourceMetadataReader.mapping b/mappings/net/minecraft/client/resource/metadata/TextureResourceMetadataReader.mapping deleted file mode 100644 index b8f90f0d38..0000000000 --- a/mappings/net/minecraft/client/resource/metadata/TextureResourceMetadataReader.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1085 net/minecraft/client/resource/metadata/TextureResourceMetadataReader diff --git a/mappings/net/minecraft/client/texture/AbstractTexture.mapping b/mappings/net/minecraft/client/texture/AbstractTexture.mapping index 32666dc110..d6cd2e4dda 100644 --- a/mappings/net/minecraft/client/texture/AbstractTexture.mapping +++ b/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 diff --git a/mappings/net/minecraft/client/texture/AsyncTexture.mapping b/mappings/net/minecraft/client/texture/AsyncTexture.mapping deleted file mode 100644 index cada56f06f..0000000000 --- a/mappings/net/minecraft/client/texture/AsyncTexture.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS net/minecraft/class_4005 net/minecraft/client/texture/AsyncTexture - FIELD field_17894 future Ljava/util/concurrent/CompletableFuture; - METHOD (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;Ljava/util/concurrent/Executor;)V - ARG 1 resourceManager - ARG 2 id - ARG 3 executor - METHOD method_18148 getLoadCompleteFuture ()Ljava/util/concurrent/CompletableFuture; - METHOD method_18149 (Lnet/minecraft/class_1049$class_4006;)Ljava/lang/Void; - ARG 0 texture - METHOD method_22808 createRenderThreadExecutor (Ljava/util/concurrent/Executor;)Ljava/util/concurrent/Executor; - ARG 0 executor - METHOD method_22809 (Ljava/util/concurrent/Executor;Ljava/lang/Runnable;)V - ARG 1 runnable diff --git a/mappings/net/minecraft/client/texture/MissingSprite.mapping b/mappings/net/minecraft/client/texture/MissingSprite.mapping index 732aab4e58..2adc05afd6 100644 --- a/mappings/net/minecraft/client/texture/MissingSprite.mapping +++ b/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 diff --git a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping index 107f95c393..d0a13a2dff 100644 --- a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping +++ b/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 (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 (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; diff --git a/mappings/net/minecraft/client/texture/PlayerSkinTexture.mapping b/mappings/net/minecraft/client/texture/PlayerSkinTexture.mapping deleted file mode 100644 index b89e5ab9af..0000000000 --- a/mappings/net/minecraft/client/texture/PlayerSkinTexture.mapping +++ /dev/null @@ -1,37 +0,0 @@ -CLASS net/minecraft/class_1046 net/minecraft/client/texture/PlayerSkinTexture - FIELD field_20842 convertLegacy Z - FIELD field_20843 loadedCallback Ljava/lang/Runnable; - FIELD field_20844 loader Ljava/util/concurrent/CompletableFuture; - FIELD field_34017 WIDTH I - FIELD field_34018 HEIGHT I - FIELD field_34019 OLD_HEIGHT I - FIELD field_5210 cacheFile Ljava/io/File; - FIELD field_5212 LOGGER Lorg/slf4j/Logger; - FIELD field_5214 url Ljava/lang/String; - FIELD field_5215 loaded Z - METHOD (Ljava/io/File;Ljava/lang/String;Lnet/minecraft/class_2960;ZLjava/lang/Runnable;)V - ARG 1 cacheFile - ARG 2 url - ARG 3 fallbackSkin - ARG 4 convertLegacy - ARG 5 callback - METHOD method_22794 stripColor (Lnet/minecraft/class_1011;IIII)V - ARG 0 image - ARG 1 x1 - ARG 2 y1 - ARG 3 x2 - ARG 4 y2 - METHOD method_22795 loadTexture (Ljava/io/InputStream;)Lnet/minecraft/class_1011; - ARG 1 stream - METHOD method_22796 stripAlpha (Lnet/minecraft/class_1011;IIII)V - ARG 0 image - ARG 1 x1 - ARG 2 y1 - ARG 3 x2 - ARG 4 y2 - METHOD method_22798 remapTexture (Lnet/minecraft/class_1011;)Lnet/minecraft/class_1011; - ARG 1 image - METHOD method_4531 uploadTexture (Lnet/minecraft/class_1011;)V - ARG 1 image - METHOD method_4534 onTextureLoaded (Lnet/minecraft/class_1011;)V - ARG 1 image diff --git a/mappings/net/minecraft/client/texture/ResourceTexture.mapping b/mappings/net/minecraft/client/texture/ResourceTexture.mapping index a5472e37de..f566ded19d 100644 --- a/mappings/net/minecraft/client/texture/ResourceTexture.mapping +++ b/mappings/net/minecraft/client/texture/ResourceTexture.mapping @@ -1,26 +1,3 @@ CLASS net/minecraft/class_1049 net/minecraft/client/texture/ResourceTexture - FIELD field_5224 location Lnet/minecraft/class_2960; - FIELD field_5225 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_2960;)V ARG 1 location - METHOD method_18153 loadTextureData (Lnet/minecraft/class_3300;)Lnet/minecraft/class_1049$class_4006; - ARG 1 resourceManager - METHOD method_22810 upload (Lnet/minecraft/class_1011;ZZ)V - ARG 1 image - ARG 2 blur - ARG 3 clamp - CLASS class_4006 TextureData - FIELD field_17895 metadata Lnet/minecraft/class_1084; - FIELD field_17896 image Lnet/minecraft/class_1011; - FIELD field_17897 exception Ljava/io/IOException; - METHOD (Ljava/io/IOException;)V - ARG 1 exception - METHOD (Lnet/minecraft/class_1084;Lnet/minecraft/class_1011;)V - ARG 1 metadata - ARG 2 image - METHOD method_18155 getMetadata ()Lnet/minecraft/class_1084; - METHOD method_18156 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1049$class_4006; - ARG 0 resourceManager - ARG 1 id - METHOD method_18157 getImage ()Lnet/minecraft/class_1011; - METHOD method_18158 checkException ()V diff --git a/mappings/net/minecraft/client/texture/SpriteContents.mapping b/mappings/net/minecraft/client/texture/SpriteContents.mapping index b35f82c485..e6d5e75103 100644 --- a/mappings/net/minecraft/client/texture/SpriteContents.mapping +++ b/mappings/net/minecraft/client/texture/SpriteContents.mapping @@ -11,7 +11,6 @@ CLASS net/minecraft/class_7764 net/minecraft/client/texture/SpriteContents ARG 1 id ARG 2 dimensions ARG 3 image - ARG 4 metadata METHOD method_45808 generateMipmaps (I)V ARG 1 mipmapLevels METHOD method_45809 upload (II)V @@ -34,9 +33,6 @@ CLASS net/minecraft/class_7764 net/minecraft/client/texture/SpriteContents ARG 4 metadata METHOD method_45813 (Lit/unimi/dsi/fastutil/ints/IntSet;I)Z ARG 0 frameIndex - METHOD method_45814 (Ljava/util/List;II)V - ARG 1 index - ARG 2 frameTime METHOD method_45817 getDistinctFrameCount ()Ljava/util/stream/IntStream; METHOD method_45818 createAnimator ()Lnet/minecraft/class_7768; METHOD method_45819 getFrameCount ()I @@ -81,11 +77,13 @@ CLASS net/minecraft/class_7764 net/minecraft/client/texture/SpriteContents ARG 3 frame METHOD method_45823 createAnimator ()Lnet/minecraft/class_7768; CLASS class_5791 AnimationFrame - FIELD field_28475 index I - FIELD field_28476 time I + FIELD comp_3445 index I + FIELD comp_3446 time I METHOD (II)V ARG 1 index ARG 2 time + METHOD comp_3445 index ()I + METHOD comp_3446 time ()I CLASS class_7765 AnimatorImpl FIELD field_40544 frame I FIELD field_40545 currentTime I diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index d16fb20acb..b6f896dcf5 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1060 net/minecraft/client/texture/TextureManager - FIELD field_5283 dynamicIdCounters Ljava/util/Map; FIELD field_5284 tickListeners Ljava/util/Set; FIELD field_5285 MISSING_IDENTIFIER Lnet/minecraft/class_2960; FIELD field_5286 textures Ljava/util/Map; @@ -7,30 +6,13 @@ CLASS net/minecraft/class_1060 net/minecraft/client/texture/TextureManager FIELD field_5288 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_3300;)V ARG 1 resourceManager - METHOD method_18168 loadTextureAsync (Lnet/minecraft/class_2960;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 1 id - ARG 2 executor - METHOD method_22812 runOnRenderThread (Ljava/lang/Runnable;)V - ARG 0 runnable - METHOD method_22814 (Ljava/lang/Runnable;)V - ARG 0 runnable - METHOD method_24303 loadTexture (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)Lnet/minecraft/class_1044; - ARG 1 id - ARG 2 texture METHOD method_30299 closeTexture (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)V ARG 1 id - ARG 2 texture - METHOD method_34590 getOrDefault (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)Lnet/minecraft/class_1044; - ARG 1 id - ARG 2 fallback METHOD method_4615 destroyTexture (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_4616 registerTexture (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)V ARG 1 id ARG 2 texture - METHOD method_4617 registerDynamicTexture (Ljava/lang/String;Lnet/minecraft/class_1043;)Lnet/minecraft/class_2960; - ARG 1 prefix - ARG 2 texture METHOD method_4619 getTexture (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1044; ARG 1 id METHOD method_49715 dumpDynamicTextures (Ljava/nio/file/Path;)V diff --git a/mappings/net/minecraft/entity/mob/CreakingEntity.mapping b/mappings/net/minecraft/entity/mob/CreakingEntity.mapping index 4cc8c9d105..287c5e36f3 100644 --- a/mappings/net/minecraft/entity/mob/CreakingEntity.mapping +++ b/mappings/net/minecraft/entity/mob/CreakingEntity.mapping @@ -27,3 +27,8 @@ CLASS net/minecraft/class_10275 net/minecraft/entity/mob/CreakingEntity CLASS class_10279 CreakingMoveControl METHOD (Lnet/minecraft/class_10275;Lnet/minecraft/class_10275;)V ARG 2 creaking + CLASS class_10282 CreakingNavigation + METHOD (Lnet/minecraft/class_10275;Lnet/minecraft/class_10275;Lnet/minecraft/class_1937;)V + ARG 2 creaking + ARG 3 world + CLASS class_10283 CreakingLandPathNodeMaker diff --git a/mappings/net/minecraft/entity/mob/TransientCreakingEntity.mapping b/mappings/net/minecraft/entity/mob/TransientCreakingEntity.mapping deleted file mode 100644 index 049c69c0ae..0000000000 --- a/mappings/net/minecraft/entity/mob/TransientCreakingEntity.mapping +++ /dev/null @@ -1,19 +0,0 @@ -CLASS net/minecraft/class_10281 net/minecraft/entity/mob/TransientCreakingEntity - FIELD field_54588 invulnerableAnimationTimer I - FIELD field_54589 heartPos Lnet/minecraft/class_2338; - FIELD field_55013 CRUMBLING Lnet/minecraft/class_2940; - FIELD field_55016 playerIntersectionTimer I - METHOD method_64641 tickAnimations ()V - METHOD method_64642 crumbleAndDie ()V - METHOD method_64643 setHeartPos (Lnet/minecraft/class_2338;)V - ARG 1 heartPos - METHOD method_65119 checkPlayerIntersection ()Z - METHOD method_65120 setCrumbling ()V - METHOD method_65121 isCrumbling ()Z - METHOD method_65124 onHeartBroken (Lnet/minecraft/class_1282;)V - ARG 1 damageSource - CLASS class_10282 CreakingNavigation - METHOD (Lnet/minecraft/class_10281;Lnet/minecraft/class_10275;Lnet/minecraft/class_1937;)V - ARG 2 creaking - ARG 3 world - CLASS class_10283 CreakingLandPathNodeMaker diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index 04c2714f0e..6efcedb356 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient FIELD field_48355 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_52595 OPTIONAL_PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_52596 ENTRIES_CODEC Lcom/mojang/serialization/Codec; - FIELD field_9018 matchingItems Ljava/util/List; FIELD field_9019 entries Lnet/minecraft/class_6885; METHOD (Lnet/minecraft/class_6885;)V ARG 1 entries @@ -41,7 +40,7 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient ARG 0 items METHOD method_8101 ofItem (Lnet/minecraft/class_1935;)Lnet/minecraft/class_1856; ARG 0 item - METHOD method_8105 getMatchingItems ()Ljava/util/List; + METHOD method_8105 getMatchingItems ()Ljava/util/stream/Stream; METHOD method_8106 fromTag (Lnet/minecraft/class_6885;)Lnet/minecraft/class_1856; ARG 0 tag METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/recipe/IngredientPlacement.mapping b/mappings/net/minecraft/recipe/IngredientPlacement.mapping index 7f199989d6..fc1f4270ab 100644 --- a/mappings/net/minecraft/recipe/IngredientPlacement.mapping +++ b/mappings/net/minecraft/recipe/IngredientPlacement.mapping @@ -1,13 +1,8 @@ CLASS net/minecraft/class_9887 net/minecraft/recipe/IngredientPlacement FIELD field_52597 NONE Lnet/minecraft/class_9887; - FIELD field_52599 placementSlots Ljava/util/List; FIELD field_54635 ingredients Ljava/util/List; - FIELD field_54636 rawIngredients Ljava/util/List; - METHOD (Ljava/util/List;Ljava/util/List;Ljava/util/List;)V + METHOD (Ljava/util/List;Lit/unimi/dsi/fastutil/ints/IntList;)V ARG 1 ingredients - ARG 2 rawIngredients - ARG 3 placementSlots - METHOD method_61681 getPlacementSlots ()Ljava/util/List; METHOD method_61682 forSingleSlot (Lnet/minecraft/class_1856;)Lnet/minecraft/class_9887; ARG 0 ingredient METHOD method_61683 forMultipleSlots (Ljava/util/List;)Lnet/minecraft/class_9887; @@ -15,8 +10,4 @@ CLASS net/minecraft/class_9887 net/minecraft/recipe/IngredientPlacement METHOD method_61686 forShapeless (Ljava/util/List;)Lnet/minecraft/class_9887; ARG 0 ingredients METHOD method_61687 hasNoPlacement ()Z - METHOD method_64674 sort (Lnet/minecraft/class_1856;)Lnet/minecraft/class_1662$class_9873; - ARG 0 ingredient METHOD method_64675 getIngredients ()Ljava/util/List; - METHOD method_64676 getRawIngredients ()Ljava/util/List; - CLASS class_9888 PlacementSlot diff --git a/mappings/net/minecraft/recipe/InputSlotFiller.mapping b/mappings/net/minecraft/recipe/InputSlotFiller.mapping index c8897634a5..d72311db09 100644 --- a/mappings/net/minecraft/recipe/InputSlotFiller.mapping +++ b/mappings/net/minecraft/recipe/InputSlotFiller.mapping @@ -21,11 +21,6 @@ CLASS net/minecraft/class_2955 net/minecraft/recipe/InputSlotFiller ARG 2 item ARG 3 count METHOD method_12825 canReturnInputs ()Z - METHOD method_61230 (ILjava/util/List;Ljava/util/Optional;III)V - ARG 3 slot - ARG 4 index - ARG 5 x - ARG 6 y METHOD method_61231 calculateCraftAmount (IZ)I ARG 1 forCraftAll ARG 2 match @@ -42,8 +37,6 @@ CLASS net/minecraft/class_2955 net/minecraft/recipe/InputSlotFiller METHOD method_61233 tryFill (Lnet/minecraft/class_8786;Lnet/minecraft/class_9875;)Lnet/minecraft/class_1729$class_9885; ARG 1 recipe ARG 2 finder - METHOD method_61234 (Lnet/minecraft/class_6880;)I - ARG 0 item METHOD method_61235 fill (Lnet/minecraft/class_8786;Lnet/minecraft/class_9875;)V ARG 1 recipe ARG 2 finder diff --git a/mappings/net/minecraft/recipe/RecipeFinder.mapping b/mappings/net/minecraft/recipe/RecipeFinder.mapping index 6f508488a3..e0d4e08ea9 100644 --- a/mappings/net/minecraft/recipe/RecipeFinder.mapping +++ b/mappings/net/minecraft/recipe/RecipeFinder.mapping @@ -13,10 +13,6 @@ CLASS net/minecraft/class_9875 net/minecraft/recipe/RecipeFinder METHOD method_61538 isCraftable (Lnet/minecraft/class_1860;Lnet/minecraft/class_1662$class_9874;)Z ARG 1 recipe ARG 2 itemCallback - METHOD method_61539 sort (Ljava/util/stream/Stream;)Lnet/minecraft/class_1662$class_9873; - ARG 0 items - METHOD method_61540 (Lnet/minecraft/class_6880;)I - ARG 0 item METHOD method_61541 addInput (Lnet/minecraft/class_1799;)V ARG 1 item METHOD method_61542 countCrafts (Lnet/minecraft/class_1860;ILnet/minecraft/class_1662$class_9874;)I diff --git a/mappings/net/minecraft/recipe/RecipeMatcher.mapping b/mappings/net/minecraft/recipe/RecipeMatcher.mapping index 768a4b9798..ed5144d127 100644 --- a/mappings/net/minecraft/recipe/RecipeMatcher.mapping +++ b/mappings/net/minecraft/recipe/RecipeMatcher.mapping @@ -2,8 +2,6 @@ CLASS net/minecraft/class_1662 net/minecraft/recipe/RecipeMatcher COMMENT Matching class that matches a recipe to its required resources. COMMENT This specifically does not check patterns (See {@link ShapedRecipe} for that). FIELD field_52504 available Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap; - METHOD method_61500 hasAny (Ljava/lang/Object;)Z - ARG 1 input METHOD method_61501 add (Ljava/lang/Object;I)V ARG 1 input ARG 2 count @@ -44,8 +42,6 @@ CLASS net/minecraft/class_1662 net/minecraft/recipe/RecipeMatcher METHOD method_61507 setMatch (II)V ARG 1 itemIndex ARG 2 ingredientIndex - METHOD method_61508 (Ljava/lang/Object;)Z - ARG 1 item METHOD method_61509 tryFindIngredientItemLookup (I)Lit/unimi/dsi/fastutil/ints/IntList; ARG 1 min METHOD method_61510 getVisitedIngredientIndexOffset ()I @@ -90,7 +86,6 @@ CLASS net/minecraft/class_1662 net/minecraft/recipe/RecipeMatcher ARG 1 index METHOD method_61532 clearRequirements ()V METHOD method_61533 clearVisited ()V - METHOD method_7415 getMaximumCrafts ()I METHOD method_7416 getRequirement (I)Z ARG 1 itemId METHOD method_7417 match (ILnet/minecraft/class_1662$class_9874;)Z @@ -103,13 +98,11 @@ CLASS net/minecraft/class_1662 net/minecraft/recipe/RecipeMatcher ARG 1 itemId METHOD method_7421 unfulfillRequirement (I)V ARG 1 itemId - METHOD method_7422 createItemRequirementList ()Ljava/util/List; METHOD method_7426 isRequirementUnfulfilled (I)Z ARG 1 index METHOD method_7427 countCrafts (ILnet/minecraft/class_1662$class_9874;)I ARG 1 max ARG 2 itemCallback - CLASS class_9873 RawIngredient CLASS class_9874 ItemCallback METHOD accept (Ljava/lang/Object;)V ARG 1 item diff --git a/mappings/net/minecraft/recipe/RecipePropertySet.mapping b/mappings/net/minecraft/recipe/RecipePropertySet.mapping index 976ef08ddd..463a7a37db 100644 --- a/mappings/net/minecraft/recipe/RecipePropertySet.mapping +++ b/mappings/net/minecraft/recipe/RecipePropertySet.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/class_10290 net/minecraft/recipe/RecipePropertySet ARG 1 usableItems METHOD method_64701 canUse (Lnet/minecraft/class_1799;)Z ARG 1 stack - METHOD method_64702 (Lnet/minecraft/class_1856;)Ljava/util/stream/Stream; - ARG 0 ingredient METHOD method_64703 (Lnet/minecraft/class_10290;)Ljava/util/List; ARG 0 set METHOD method_64704 register (Ljava/lang/String;)Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping b/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping index b7a12389cf..5ff0cc80b6 100644 --- a/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping +++ b/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping @@ -3,6 +3,6 @@ CLASS net/minecraft/class_3255 net/minecraft/resource/AbstractFileResourcePack FIELD field_49031 info Lnet/minecraft/class_9224; METHOD (Lnet/minecraft/class_9224;)V ARG 1 info - METHOD method_14392 parseMetadata (Lnet/minecraft/class_3270;Ljava/io/InputStream;)Ljava/lang/Object; + METHOD method_14392 parseMetadata (Lnet/minecraft/class_7677;Ljava/io/InputStream;)Ljava/lang/Object; ARG 0 metaReader ARG 1 inputStream diff --git a/mappings/net/minecraft/resource/ResourcePack.mapping b/mappings/net/minecraft/resource/ResourcePack.mapping index 0eceaf7671..dd8577ef13 100644 --- a/mappings/net/minecraft/resource/ResourcePack.mapping +++ b/mappings/net/minecraft/resource/ResourcePack.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_3262 net/minecraft/resource/ResourcePack ARG 2 id METHOD method_14406 getNamespaces (Lnet/minecraft/class_3264;)Ljava/util/Set; ARG 1 type - METHOD method_14407 parseMetadata (Lnet/minecraft/class_3270;)Ljava/lang/Object; + METHOD method_14407 parseMetadata (Lnet/minecraft/class_7677;)Ljava/lang/Object; ARG 1 metaReader METHOD method_14408 findResources (Lnet/minecraft/class_3264;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_3262$class_7664;)V ARG 1 type diff --git a/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping b/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping index 338ee46ff0..8c1d2c7ace 100644 --- a/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping +++ b/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping @@ -1,20 +1,20 @@ CLASS net/minecraft/class_7368 net/minecraft/resource/metadata/ResourceMetadata FIELD field_38688 NONE Lnet/minecraft/class_7368; FIELD field_40056 NONE_SUPPLIER Lnet/minecraft/class_7367; - METHOD method_43041 decode (Lnet/minecraft/class_3270;)Ljava/util/Optional; + METHOD method_43041 decode (Lnet/minecraft/class_7677;)Ljava/util/Optional; ARG 1 reader METHOD method_43042 create (Ljava/io/InputStream;)Lnet/minecraft/class_7368; ARG 0 stream - METHOD method_52444 decodeAndAdd (Lnet/minecraft/class_7368$class_8622;Lnet/minecraft/class_3270;)V + METHOD method_52444 decodeAndAdd (Lnet/minecraft/class_7368$class_8622;Lnet/minecraft/class_7677;)V ARG 1 builder ARG 2 reader - METHOD method_52445 (Lnet/minecraft/class_7368$class_8622;Lnet/minecraft/class_3270;Ljava/lang/Object;)V + METHOD method_52445 (Lnet/minecraft/class_7368$class_8622;Lnet/minecraft/class_7677;Ljava/lang/Object;)V ARG 2 value METHOD method_52446 copy (Ljava/util/Collection;)Lnet/minecraft/class_7368; ARG 1 readers CLASS class_8622 Builder FIELD field_45058 values Lcom/google/common/collect/ImmutableMap$Builder; METHOD method_52447 build ()Lnet/minecraft/class_7368; - METHOD method_52448 add (Lnet/minecraft/class_3270;Ljava/lang/Object;)Lnet/minecraft/class_7368$class_8622; + METHOD method_52448 add (Lnet/minecraft/class_7677;Ljava/lang/Object;)Lnet/minecraft/class_7368$class_8622; ARG 1 reader ARG 2 value diff --git a/mappings/net/minecraft/resource/metadata/ResourceMetadataMap.mapping b/mappings/net/minecraft/resource/metadata/ResourceMetadataMap.mapping index 0a9f7f65a2..ba0747425a 100644 --- a/mappings/net/minecraft/resource/metadata/ResourceMetadataMap.mapping +++ b/mappings/net/minecraft/resource/metadata/ResourceMetadataMap.mapping @@ -4,12 +4,12 @@ CLASS net/minecraft/class_7662 net/minecraft/resource/metadata/ResourceMetadataM METHOD (Ljava/util/Map;)V ARG 1 values METHOD method_45172 of ()Lnet/minecraft/class_7662; - METHOD method_45173 get (Lnet/minecraft/class_3270;)Ljava/lang/Object; + METHOD method_45173 get (Lnet/minecraft/class_7677;)Ljava/lang/Object; ARG 1 reader - METHOD method_45174 of (Lnet/minecraft/class_3270;Ljava/lang/Object;)Lnet/minecraft/class_7662; + METHOD method_45174 of (Lnet/minecraft/class_7677;Ljava/lang/Object;)Lnet/minecraft/class_7662; ARG 0 reader ARG 1 value - METHOD method_45175 of (Lnet/minecraft/class_3270;Ljava/lang/Object;Lnet/minecraft/class_3270;Ljava/lang/Object;)Lnet/minecraft/class_7662; + METHOD method_45175 of (Lnet/minecraft/class_7677;Ljava/lang/Object;Lnet/minecraft/class_7677;Ljava/lang/Object;)Lnet/minecraft/class_7662; ARG 0 reader ARG 1 value ARG 2 reader2 diff --git a/mappings/net/minecraft/resource/metadata/ResourceMetadataReader.mapping b/mappings/net/minecraft/resource/metadata/ResourceMetadataReader.mapping deleted file mode 100644 index 8c5858d85a..0000000000 --- a/mappings/net/minecraft/resource/metadata/ResourceMetadataReader.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_3270 net/minecraft/resource/metadata/ResourceMetadataReader - METHOD method_14420 getKey ()Ljava/lang/String; - METHOD method_14421 fromJson (Lcom/google/gson/JsonObject;)Ljava/lang/Object; - ARG 1 json diff --git a/mappings/net/minecraft/resource/metadata/ResourceMetadataSerializer.mapping b/mappings/net/minecraft/resource/metadata/ResourceMetadataSerializer.mapping index a1dde33434..77c65e68e1 100644 --- a/mappings/net/minecraft/resource/metadata/ResourceMetadataSerializer.mapping +++ b/mappings/net/minecraft/resource/metadata/ResourceMetadataSerializer.mapping @@ -1,7 +1 @@ CLASS net/minecraft/class_7677 net/minecraft/resource/metadata/ResourceMetadataSerializer - METHOD method_45251 toJson (Ljava/lang/Object;)Lcom/google/gson/JsonObject; - ARG 1 metadata - METHOD method_45252 fromCodec (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_7677; - ARG 0 key - ARG 1 codec - CLASS 1