From d41140b598137390d5a4102bcf5e9a4a1c2c4734 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Mon, 18 Nov 2024 19:01:08 -0600 Subject: [PATCH] match 24w46a to 24w45a --- .../net/minecraft/block/entity/BeehiveBlockEntity.mapping | 1 + .../net/minecraft/client/gui/screen/SplashOverlay.mapping | 1 + .../feature/VillagerClothingFeatureRenderer.mapping | 5 +++++ .../metadata/AnimationFrameResourceMetadata.mapping | 1 + .../resource/metadata/AnimationResourceMetadata.mapping | 3 +++ mappings/net/minecraft/recipe/Ingredient.mapping | 1 + mappings/net/minecraft/resource/ResourceMetadata.mapping | 8 ++++++++ .../resource/pack/AbstractFileResourcePack.mapping | 2 ++ mappings/net/minecraft/resource/pack/ResourcePack.mapping | 1 + .../resource/pack/metadata/BuiltinMetadata.mapping | 1 + 10 files changed, 24 insertions(+) diff --git a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping index 9aa0642d6f..e5b7a4212a 100644 --- a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping @@ -40,6 +40,7 @@ CLASS net/minecraft/unmapped/C_cyniebsl net/minecraft/block/entity/BeehiveBlockE METHOD m_kxlqccck getBeeCount ()I METHOD m_onkqbfmj (Ljava/util/List;)V ARG 1 bees + METHOD m_oypeqdjf tryEnterHive (Lnet/minecraft/unmapped/C_hgfgxpql;)V METHOD m_qwlovmrg getOccupants ()Ljava/util/List; METHOD m_qxxpjewr hasNoBees ()Z METHOD m_tbwpiwhq isNearFire ()Z diff --git a/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping b/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping index f312d81622..b63c4e4ab7 100644 --- a/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping +++ b/mappings/net/minecraft/client/gui/screen/SplashOverlay.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/unmapped/C_gkaoaepd net/minecraft/client/gui/screen/SplashOv METHOD m_agtuznnp withAlpha (II)I ARG 0 color ARG 1 alpha + METHOD m_bakkbgoi init (Lnet/minecraft/unmapped/C_rglkduer;)V METHOD m_hqejwtgc renderProgressBar (Lnet/minecraft/unmapped/C_sedilmty;IIIIF)V ARG 2 minX ARG 3 minY diff --git a/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping index 54ab6ad7a5..6651676fc7 100644 --- a/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping @@ -10,6 +10,11 @@ CLASS net/minecraft/unmapped/C_ottemwel net/minecraft/client/render/entity/featu ARG 3 entityType METHOD m_cunoojpm (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V ARG 0 levelToId + METHOD m_tzbcmpac getHatType (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Ljava/lang/String;Lnet/minecraft/unmapped/C_zogerkic;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_mnelcllg$C_htevrnhs; + ARG 1 hatLookUp + ARG 2 keyType + ARG 3 registry + ARG 4 key METHOD m_vowmului findTexture (Ljava/lang/String;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ncpywfca; ARG 1 keyType ARG 2 keyId diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping index 25520274e4..1a3e1f49d0 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping +++ b/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/unmapped/C_tkronwtb net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata + FIELD f_fzjwqlzr time Ljava/util/Optional; FIELD f_ugpflftk index I METHOD (I)V ARG 1 index diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping index d7e1410bf6..283c0aa93c 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping +++ b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/unmapped/C_upzqjtby net/minecraft/client/resource/metadata/AnimationResourceMetadata + FIELD f_bdvyrclt height Ljava/util/Optional; + FIELD f_evozriuy frames Ljava/util/Optional; + FIELD f_fjhgdtsp width Ljava/util/Optional; FIELD f_gdnankyo interpolate Z FIELD f_ubztbcer defaultFrameTime I METHOD m_gsswjyhe getSize (II)Lnet/minecraft/unmapped/C_nrllqdla; diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index f815fc8329..9fc1718663 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/unmapped/C_tcpsydrv net/minecraft/recipe/Ingredient FIELD f_pjjkidpf PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; FIELD f_qdqdigpw OPTIONAL_PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; FIELD f_qqfxxlfb ENTRIES_CODEC Lcom/mojang/serialization/Codec; + METHOD m_hiksyixf getItems ()Ljava/util/stream/Stream; METHOD m_kkrsbepq createOptionalSlotDisplay (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_lahbbtfn; ARG 0 ingredient METHOD m_lqlwthyg getSlotDisplay ()Lnet/minecraft/unmapped/C_lahbbtfn; diff --git a/mappings/net/minecraft/resource/ResourceMetadata.mapping b/mappings/net/minecraft/resource/ResourceMetadata.mapping index 5cd1e416d4..89ac7bab46 100644 --- a/mappings/net/minecraft/resource/ResourceMetadata.mapping +++ b/mappings/net/minecraft/resource/ResourceMetadata.mapping @@ -4,6 +4,12 @@ CLASS net/minecraft/unmapped/C_bzrwskbr net/minecraft/resource/ResourceMetadata COMMENT Represents a resource supplier of an empty {@code ResourceMetadata}. FIELD f_wzwwuuoh EMPTY Lnet/minecraft/unmapped/C_bzrwskbr; COMMENT Represents empty resource metadata. + METHOD m_huhzqhjh copySection (Lnet/minecraft/unmapped/C_bzrwskbr$C_vwlkgaob;Lnet/minecraft/unmapped/C_qevrzqez;)V + ARG 1 builder + METHOD m_ihurncqu readSection (Lnet/minecraft/unmapped/C_qevrzqez;)Ljava/util/Optional; + COMMENT Reads the resource metadata section using the given reader. + COMMENT + COMMENT @return the read metadata section METHOD m_jievslte fromInputStream (Ljava/io/InputStream;)Lnet/minecraft/unmapped/C_bzrwskbr; COMMENT {@return resource metadata from the given input stream} COMMENT @@ -14,4 +20,6 @@ CLASS net/minecraft/unmapped/C_bzrwskbr net/minecraft/resource/ResourceMetadata ARG 1 sections CLASS C_vwlkgaob Builder FIELD f_bjovqcum values Lcom/google/common/collect/ImmutableMap$Builder; + METHOD m_dtqfsgix put (Lnet/minecraft/unmapped/C_qevrzqez;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_bzrwskbr$C_vwlkgaob; + ARG 2 value METHOD m_fjkgwisl build ()Lnet/minecraft/unmapped/C_bzrwskbr; diff --git a/mappings/net/minecraft/resource/pack/AbstractFileResourcePack.mapping b/mappings/net/minecraft/resource/pack/AbstractFileResourcePack.mapping index e9efaaeab6..0f6b9f33bd 100644 --- a/mappings/net/minecraft/resource/pack/AbstractFileResourcePack.mapping +++ b/mappings/net/minecraft/resource/pack/AbstractFileResourcePack.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/unmapped/C_dkmbwhta net/minecraft/resource/pack/AbstractFileResourcePack FIELD f_dfgvktmr LOGGER Lorg/slf4j/Logger; FIELD f_fvoviztp locationInfo Lnet/minecraft/unmapped/C_yebcvztn; + METHOD m_qllgrxap parseMetadata (Lnet/minecraft/unmapped/C_qevrzqez;Ljava/io/InputStream;)Ljava/lang/Object; + ARG 1 inputStream diff --git a/mappings/net/minecraft/resource/pack/ResourcePack.mapping b/mappings/net/minecraft/resource/pack/ResourcePack.mapping index e6530d802c..f48b270e29 100644 --- a/mappings/net/minecraft/resource/pack/ResourcePack.mapping +++ b/mappings/net/minecraft/resource/pack/ResourcePack.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/unmapped/C_tguinuvn net/minecraft/resource/pack/ResourcePack METHOD m_mqibcxod listResources (Lnet/minecraft/unmapped/C_abwutbbk;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/unmapped/C_tguinuvn$C_vgkjxznj;)V METHOD m_oivqcktm getName ()Ljava/lang/String; COMMENT {@return the name of this resource pack} + METHOD m_qccksbjd parseMetadata (Lnet/minecraft/unmapped/C_qevrzqez;)Ljava/lang/Object; METHOD m_wknquuip getKnownPackInfo ()Ljava/util/Optional; METHOD m_zxvjnykg getNamespaces (Lnet/minecraft/unmapped/C_abwutbbk;)Ljava/util/Set; COMMENT {@return a set of namespaces that are present in this pack for the given resource type} diff --git a/mappings/net/minecraft/resource/pack/metadata/BuiltinMetadata.mapping b/mappings/net/minecraft/resource/pack/metadata/BuiltinMetadata.mapping index 6acc626e94..32755d2ba8 100644 --- a/mappings/net/minecraft/resource/pack/metadata/BuiltinMetadata.mapping +++ b/mappings/net/minecraft/resource/pack/metadata/BuiltinMetadata.mapping @@ -4,3 +4,4 @@ CLASS net/minecraft/unmapped/C_iabfqjlu net/minecraft/resource/pack/metadata/Bui METHOD (Ljava/util/Map;)V ARG 1 values METHOD m_kzbhvppc of ()Lnet/minecraft/unmapped/C_iabfqjlu; + METHOD m_slyvwlhr get (Lnet/minecraft/unmapped/C_qevrzqez;)Ljava/lang/Object;