diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping index d047cfc2d1..e6b2709750 100644 --- a/mappings/net/minecraft/SharedConstants.mapping +++ b/mappings/net/minecraft/SharedConstants.mapping @@ -25,6 +25,7 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants FIELD field_34373 CURRENT_SERIES Ljava/lang/String; FIELD field_36325 CRASH_ON_UNCAUGHT_THREAD_EXCEPTION Z FIELD field_43095 requiredDataFixTypes Ljava/util/Set; + FIELD field_49017 EXPANDED_MACRO_COMMAND_MAX_LENGTH I METHOD method_16673 getGameVersion ()Lnet/minecraft/class_6489; METHOD method_31372 getProtocolVersion ()I METHOD method_34872 setGameVersion (Lnet/minecraft/class_6489;)V diff --git a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping index 60176381d2..e8f62b34c2 100644 --- a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping @@ -68,3 +68,5 @@ CLASS net/minecraft/class_2643 net/minecraft/block/entity/EndGatewayBlockEntity ARG 1 pos ARG 2 state ARG 3 blockEntity + METHOD method_57012 (Lnet/minecraft/class_2338;)V + ARG 1 exitPortalPos diff --git a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping index aac85173a9..e5dc886366 100644 --- a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity FIELD field_12024 inventory Lnet/minecraft/class_2371; FIELD field_31341 TRANSFER_COOLDOWN I FIELD field_31342 INVENTORY_SIZE I + FIELD field_49100 AVAILABLE_SLOTS_CACHE [[I FIELD field_49101 facing Lnet/minecraft/class_2350; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos @@ -106,3 +107,5 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity ARG 0 world ARG 1 pos ARG 2 state + METHOD method_57011 indexArray (I)[I + ARG 0 size diff --git a/mappings/net/minecraft/class_9224.mapping b/mappings/net/minecraft/class_9224.mapping deleted file mode 100644 index e056a42363..0000000000 --- a/mappings/net/minecraft/class_9224.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_9224 - METHOD method_56927 (ZLnet/minecraft/class_2561;)Lnet/minecraft/class_2561; - ARG 1 enabled diff --git a/mappings/net/minecraft/class_9243.mapping b/mappings/net/minecraft/class_9243.mapping deleted file mode 100644 index b383c0f366..0000000000 --- a/mappings/net/minecraft/class_9243.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_9243 - FIELD field_49114 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/class_9247.mapping b/mappings/net/minecraft/class_9247.mapping deleted file mode 100644 index d91db78ef7..0000000000 --- a/mappings/net/minecraft/class_9247.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_9247 - FIELD field_49124 realmsManager Lnet/minecraft/class_3283; - METHOD method_57046 createLifecycledResourceManager ()Lnet/minecraft/class_6860; - METHOD method_57048 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_3288;)V - ARG 1 resourcePackProfile diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 52a9ce28cf..6776d36e6b 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -538,6 +538,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_53526 getDebugHud ()Lnet/minecraft/class_340; METHOD method_53527 onInitFinished (Lnet/minecraft/class_310$class_8764;)Ljava/lang/Runnable; ARG 1 loadingContext + METHOD method_53865 (Ljava/util/List;)Lnet/minecraft/class_1123; + ARG 0 stacks METHOD method_54116 formatSeconds (D)Ljava/lang/String; ARG 0 seconds METHOD method_54117 addUptimesToCrashReport (Lnet/minecraft/class_129;)V @@ -553,6 +555,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_55607 getUserProperties ()Lcom/mojang/authlib/minecraft/UserApiService$UserProperties; METHOD method_56134 disconnect (Lnet/minecraft/class_437;)V ARG 1 disconnectionScreen + METHOD method_57017 onFontOptionsChanged ()V CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/font/Font.mapping b/mappings/net/minecraft/client/font/Font.mapping index d75bae7442..4f74900ff5 100644 --- a/mappings/net/minecraft/client/font/Font.mapping +++ b/mappings/net/minecraft/client/font/Font.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_390 net/minecraft/client/font/Font ARG 1 codePoint METHOD method_27442 getProvidedGlyphs ()Lit/unimi/dsi/fastutil/ints/IntSet; COMMENT {@return the set of code points for which this font can provide glyphs} + CLASS class_9241 FontFilterPair diff --git a/mappings/net/minecraft/client/font/FontFilterType.mapping b/mappings/net/minecraft/client/font/FontFilterType.mapping new file mode 100644 index 0000000000..37ce40e511 --- /dev/null +++ b/mappings/net/minecraft/client/font/FontFilterType.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_9243 net/minecraft/client/font/FontFilterType + FIELD field_49114 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49115 id Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id + CLASS class_9244 FilterMap + FIELD field_49117 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49118 NO_FILTER Lnet/minecraft/class_9243$class_9244; + FIELD field_49119 activeFilters Ljava/util/Map; + METHOD (Ljava/util/Map;)V + ARG 1 activeFilters + METHOD method_57031 apply (Lnet/minecraft/class_9243$class_9244;)Lnet/minecraft/class_9243$class_9244; + ARG 1 activeFilters + METHOD method_57032 isAllowed (Ljava/util/Set;)Z + ARG 1 activeFilters diff --git a/mappings/net/minecraft/client/font/FontLoader.mapping b/mappings/net/minecraft/client/font/FontLoader.mapping index 692c709e0e..7349dca626 100644 --- a/mappings/net/minecraft/client/font/FontLoader.mapping +++ b/mappings/net/minecraft/client/font/FontLoader.mapping @@ -8,3 +8,7 @@ CLASS net/minecraft/class_389 net/minecraft/client/font/FontLoader METHOD load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; ARG 1 resourceManager CLASS class_8540 Reference + CLASS class_9245 Provider + FIELD field_49122 CODEC Lcom/mojang/serialization/Codec; + METHOD method_57040 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping index 99712cd1e7..35dc9995c6 100644 --- a/mappings/net/minecraft/client/font/FontManager.mapping +++ b/mappings/net/minecraft/client/font/FontManager.mapping @@ -8,12 +8,16 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager FIELD field_40409 FINDER Lnet/minecraft/class_7654; FIELD field_44757 GSON Lcom/google/gson/Gson; FIELD field_44758 fonts Ljava/util/List; + FIELD field_49111 currentStorage Lnet/minecraft/class_377; METHOD (Lnet/minecraft/class_1060;)V ARG 1 manager METHOD method_27539 createTextRenderer ()Lnet/minecraft/class_327; METHOD method_27540 (Lnet/minecraft/class_377;)V ARG 0 fontStorage METHOD method_45078 createAdvanceValidatingTextRenderer ()Lnet/minecraft/class_327; + METHOD method_51607 (Ljava/util/Set;Lnet/minecraft/class_2960;Ljava/util/List;)V + ARG 2 id + ARG 3 fonts METHOD method_51608 loadIndex (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 1 resourceManager ARG 2 executor @@ -23,6 +27,8 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager ARG 2 index METHOD method_51611 (Lnet/minecraft/class_390$class_9241;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 3 dest + METHOD method_51612 (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_9243$class_9244;Lnet/minecraft/class_389$class_8539;)V + ARG 6 loadable METHOD method_51613 load (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_389$class_8539;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 1 key ARG 2 loadable @@ -31,6 +37,8 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager METHOD method_51614 reload (Lnet/minecraft/class_378$class_8536;Lnet/minecraft/class_3695;)V ARG 1 index ARG 2 profiler + METHOD method_51615 (Lnet/minecraft/class_378$class_8537;Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_9243$class_9244;Lnet/minecraft/class_389$class_8540;)V + ARG 3 reference METHOD method_51617 getRequiredFontProviders (Ljava/util/List;)Ljava/util/Map; ARG 1 entries METHOD method_51618 (Ljava/util/List;I)V @@ -40,6 +48,7 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager ARG 1 id METHOD method_51620 insertFont (Ljava/util/List;Lnet/minecraft/class_390$class_9241;)V ARG 1 fonts + ARG 2 font METHOD method_51621 (Ljava/util/List;Lnet/minecraft/class_390$class_9241;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage; ARG 4 providers METHOD method_51622 (Ljava/util/List;Ljava/util/Map;Ljava/lang/Void;)Lnet/minecraft/class_378$class_8536; @@ -51,20 +60,39 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager ARG 2 fonts METHOD method_51626 (Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletionStage; ARG 2 entries + METHOD method_57023 getStorageInternal (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377; + ARG 1 id + METHOD method_57024 setActiveFilters (Lnet/minecraft/class_315;)V + ARG 1 options + METHOD method_57025 getStorage (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377; + ARG 1 id + METHOD method_57026 getActiveFilters (Lnet/minecraft/class_315;)Ljava/util/Set; + ARG 0 options + METHOD method_57027 createEmptyFont ()Lnet/minecraft/class_390$class_9241; CLASS class_8534 FontKey CLASS class_8535 Builder + METHOD method_51628 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/Optional; + ARG 1 future METHOD method_51629 build (Ljava/util/function/Function;)Ljava/util/Optional; ARG 1 fontRetriever METHOD method_51630 (Ljava/util/function/Function;Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 2 referee + METHOD method_57028 applyFilter (Lnet/minecraft/class_390$class_9241;)Lnet/minecraft/class_390$class_9241; + ARG 1 font + METHOD method_57029 (Lnet/minecraft/class_390;)Ljava/util/List; + ARG 1 font CLASS class_8536 ProviderIndex CLASS class_8537 FontEntry METHOD (Lnet/minecraft/class_2960;)V ARG 1 fontId METHOD method_51631 addReferenceBuilder (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_9243$class_9244;Lnet/minecraft/class_389$class_8540;)V ARG 1 key + ARG 2 filters + ARG 3 reference METHOD method_51632 addBuilder (Lnet/minecraft/class_378$class_8534;Lnet/minecraft/class_9243$class_9244;Ljava/util/concurrent/CompletableFuture;)V ARG 1 key + ARG 2 filters + ARG 3 fontFuture METHOD method_51633 (Lnet/minecraft/class_378$class_8535;)Ljava/util/stream/Stream; ARG 0 builder METHOD method_51634 getRequiredFontProviders (Ljava/util/function/Function;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping index c60a90cb68..53e16a1455 100644 --- a/mappings/net/minecraft/client/font/FontStorage.mapping +++ b/mappings/net/minecraft/client/font/FontStorage.mapping @@ -9,11 +9,14 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage FIELD field_2256 blankGlyphRenderer Lnet/minecraft/class_382; FIELD field_2257 glyphCache Lnet/minecraft/class_8532; FIELD field_39934 MAX_ADVANCE F + FIELD field_49120 allFonts Ljava/util/List; + FIELD field_49121 availableFonts Ljava/util/List; METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V ARG 1 textureManager ARG 2 id METHOD method_2004 setFonts (Ljava/util/List;Ljava/util/Set;)V - ARG 1 fonts + ARG 1 allFonts + ARG 2 activeFilters METHOD method_2010 closeGlyphAtlases ()V METHOD method_2011 getGlyph (IZ)Lnet/minecraft/class_379; COMMENT {@return the glyph of {@code codePoint}} @@ -41,6 +44,15 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage ARG 0 rowCount METHOD method_51638 (I)[[Lnet/minecraft/class_382; ARG 0 rowCount + METHOD method_57034 getId ()Lnet/minecraft/class_2960; + METHOD method_57035 (Ljava/util/List;Ljava/util/Set;I)V + ARG 3 codePoint + METHOD method_57036 setActiveFilters (Ljava/util/Set;)V + ARG 1 activeFilters + METHOD method_57037 applyFilters (Ljava/util/List;Ljava/util/Set;)Ljava/util/List; + ARG 1 allFonts + ARG 2 activeFilters + METHOD method_57038 clear ()V CLASS class_7647 GlyphPair FIELD comp_979 glyph Lnet/minecraft/class_379; FIELD comp_980 advanceValidatedGlyph Lnet/minecraft/class_379; diff --git a/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping index e48eb0a2fb..b71a3042e8 100644 --- a/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/option/LanguageOpt METHOD method_19820 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_52184 onDone ()V + METHOD method_57042 (Lnet/minecraft/class_4185;)V + ARG 1 button CLASS class_4195 LanguageSelectionListWidget METHOD (Lnet/minecraft/class_426;Lnet/minecraft/class_310;)V ARG 2 client diff --git a/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping index 430579abbd..e6046cb76b 100644 --- a/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientConfigurationNetworkHandler.mapping @@ -4,5 +4,10 @@ CLASS net/minecraft/class_8674 net/minecraft/client/network/ClientConfigurationN FIELD field_45598 registryManager Lnet/minecraft/class_5455$class_6890; FIELD field_45599 enabledFeatures Lnet/minecraft/class_7699; FIELD field_48766 clientRegistries Lnet/minecraft/class_9173; + FIELD field_49123 dataPackManager Lnet/minecraft/class_9247; METHOD method_52797 handleCustomPayload (Lnet/minecraft/class_8710;)V ARG 1 payload + METHOD method_57043 (Lnet/minecraft/class_5912;)Lnet/minecraft/class_5455$class_6890; + ARG 1 factory + METHOD method_57044 openClientDataPack (Ljava/util/function/Function;)Ljava/lang/Object; + ARG 1 opener diff --git a/mappings/net/minecraft/client/network/ClientRegistries.mapping b/mappings/net/minecraft/client/network/ClientRegistries.mapping index 8bf55839f3..27a76d91d9 100644 --- a/mappings/net/minecraft/client/network/ClientRegistries.mapping +++ b/mappings/net/minecraft/client/network/ClientRegistries.mapping @@ -1,10 +1,13 @@ CLASS net/minecraft/class_9173 net/minecraft/client/network/ClientRegistries FIELD field_48767 dynamicRegistries Lnet/minecraft/class_9173$class_9174; - FIELD field_48768 tags Lnet/minecraft/class_9175; + FIELD field_48768 tagLoader Lnet/minecraft/class_9175; METHOD method_56583 putDynamicRegistry (Lnet/minecraft/class_5321;Ljava/util/List;)V ARG 1 registryRef ARG 2 entries METHOD method_56585 createRegistryManager (Lnet/minecraft/class_5912;Lnet/minecraft/class_5455;Z)Lnet/minecraft/class_5455$class_6890; + ARG 1 factory + ARG 2 registryManager + ARG 3 local METHOD method_56586 putTags (Ljava/util/Map;)V ARG 1 tags CLASS class_9174 DynamicRegistries @@ -15,3 +18,5 @@ CLASS net/minecraft/class_9173 net/minecraft/client/network/ClientRegistries ARG 1 registryRef ARG 2 entries METHOD method_56589 load (Lnet/minecraft/class_5912;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5455; + ARG 1 factory + ARG 2 registryManager diff --git a/mappings/net/minecraft/client/network/ClientTagLoader.mapping b/mappings/net/minecraft/client/network/ClientTagLoader.mapping new file mode 100644 index 0000000000..7ef5cd3e3b --- /dev/null +++ b/mappings/net/minecraft/client/network/ClientTagLoader.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/class_9175 net/minecraft/client/network/ClientTagLoader + FIELD field_48770 tagsByRegistry Ljava/util/Map; + METHOD method_56590 put (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V + ARG 1 registryRef + ARG 2 serialized + METHOD method_56591 load (Lnet/minecraft/class_5455;Ljava/util/function/Predicate;)V + ARG 1 registryManager + ARG 2 predicate + METHOD method_56592 (Ljava/util/function/Predicate;Lnet/minecraft/class_5455;Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V + ARG 2 registryRef + ARG 3 serialized + METHOD method_57050 onDynamicTagsLoaded ()V + METHOD method_57051 (Lnet/minecraft/class_5321;)Z + ARG 0 registryRef + METHOD method_57052 (Lnet/minecraft/class_5455$class_6892;)V + ARG 0 entry + METHOD method_57053 load (Lnet/minecraft/class_5455;Z)V + ARG 1 registryManager + ARG 2 local + METHOD method_57054 onStaticTagsLoaded ()V + METHOD method_57055 (Lnet/minecraft/class_5455$class_6892;)Z + ARG 0 registries diff --git a/mappings/net/minecraft/client/network/Tags.mapping b/mappings/net/minecraft/client/network/Tags.mapping deleted file mode 100644 index 5faf20770c..0000000000 --- a/mappings/net/minecraft/client/network/Tags.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_9175 net/minecraft/client/network/Tags - FIELD field_48770 tagsByRegistry Ljava/util/Map; - METHOD method_56590 put (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V - ARG 1 registryRef - ARG 2 serialized - METHOD method_56591 load (Lnet/minecraft/class_5455;Ljava/util/function/Predicate;)V diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 20ab1a5494..8fe593ab3a 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -599,6 +599,8 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_53842 getSyncedOptions ()Lnet/minecraft/class_8791; METHOD method_54581 getHideSplashTexts ()Lnet/minecraft/class_7172; METHOD method_57018 getJapaneseGlyphVariants ()Lnet/minecraft/class_7172; + METHOD method_57019 acceptProfiledOptions (Lnet/minecraft/class_315$class_9242;)V + ARG 1 visitor METHOD method_57020 onFontOptionsChanged ()V METHOD method_57021 shouldUseJapaneseGlyphsByDefault ()Z METHOD method_57022 (Ljava/lang/Boolean;)V @@ -633,5 +635,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_33684 visitBoolean (Ljava/lang/String;Z)Z ARG 1 key ARG 2 current - CLASS class_9242 + CLASS class_9242 OptionVisitor METHOD method_42570 accept (Ljava/lang/String;Lnet/minecraft/class_7172;)V + ARG 1 key + ARG 2 option diff --git a/mappings/net/minecraft/client/particle/GustEmitterParticle.mapping b/mappings/net/minecraft/client/particle/GustEmitterParticle.mapping index 04da029911..52f1990343 100644 --- a/mappings/net/minecraft/client/particle/GustEmitterParticle.mapping +++ b/mappings/net/minecraft/client/particle/GustEmitterParticle.mapping @@ -1,2 +1,19 @@ CLASS net/minecraft/class_8979 net/minecraft/client/particle/GustEmitterParticle + FIELD field_49126 deviation D + FIELD field_49127 interval I + METHOD (Lnet/minecraft/class_638;DDDDII)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 deviation + ARG 10 maxAge + ARG 11 interval CLASS class_8980 Factory + FIELD field_49128 deviation D + FIELD field_49129 maxAge I + FIELD field_49130 interval I + METHOD (DII)V + ARG 1 deviation + ARG 3 maxAge + ARG 4 interval diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index ecdae0ab78..c2fbd8b6ab 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -38,6 +38,11 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle FIELD field_3871 z D FIELD field_3872 boundingBox Lnet/minecraft/class_238; FIELD field_3874 x D + METHOD (Lnet/minecraft/class_638;DDD)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z METHOD (Lnet/minecraft/class_638;DDDDDD)V ARG 1 world ARG 2 x diff --git a/mappings/net/minecraft/client/realms/FileUpload.mapping b/mappings/net/minecraft/client/realms/FileUpload.mapping index 47a08985ea..14f2d76b78 100644 --- a/mappings/net/minecraft/client/realms/FileUpload.mapping +++ b/mappings/net/minecraft/client/realms/FileUpload.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_4337 net/minecraft/client/realms/FileUpload FIELD field_19561 requestConfig Lorg/apache/http/client/config/RequestConfig; FIELD field_32056 MAX_ATTEMPTS I FIELD field_32057 UPLOAD_ENDPOINT Ljava/lang/String; + FIELD field_49104 worldVersion Ljava/lang/String; METHOD (Ljava/io/File;JILnet/minecraft/class_4888;Lnet/minecraft/class_320;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_4351;)V ARG 1 file ARG 2 worldId @@ -20,6 +21,8 @@ CLASS net/minecraft/class_4337 net/minecraft/client/realms/FileUpload ARG 5 uploadInfo ARG 6 session ARG 7 clientVersion + ARG 8 worldVersion + ARG 9 uploadStatus METHOD method_20970 cancel ()V METHOD method_20971 requestUpload (I)Lnet/minecraft/class_4429; ARG 1 currentAttempt diff --git a/mappings/net/minecraft/client/resource/ClientDataPackManager.mapping b/mappings/net/minecraft/client/resource/ClientDataPackManager.mapping new file mode 100644 index 0000000000..4c935d6bff --- /dev/null +++ b/mappings/net/minecraft/client/resource/ClientDataPackManager.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_9247 net/minecraft/client/resource/ClientDataPackManager + FIELD field_49124 packManager Lnet/minecraft/class_3283; + FIELD field_49125 knownPacks Ljava/util/Map; + METHOD method_57046 createResourceManager ()Lnet/minecraft/class_6860; + METHOD method_57047 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_9224;Lnet/minecraft/class_9226;)V + ARG 2 knownPackInfo + METHOD method_57048 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_3288;)V + ARG 1 resourcePackProfile + METHOD method_57049 getCommonKnownPacks (Ljava/util/List;)Ljava/util/List; + ARG 1 serverKnownPacks diff --git a/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping index 6d6e67fcd1..04084c942f 100644 --- a/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping +++ b/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping @@ -4,7 +4,10 @@ CLASS net/minecraft/class_1065 net/minecraft/client/resource/DefaultClientResour FIELD field_40559 PROFILE_NAME_TEXTS Ljava/util/Map; FIELD field_40560 ID Lnet/minecraft/class_2960; FIELD field_40561 resourcePacksPath Ljava/nio/file/Path; - FIELD field_43088 HIGH_CONTRAST_NAME Ljava/lang/String; + FIELD field_43088 HIGH_CONTRAST_ID Ljava/lang/String; + FIELD field_49131 INFO Lnet/minecraft/class_9224; + FIELD field_49132 REQUIRED_POSITION Lnet/minecraft/class_9225; + FIELD field_49133 OPTIONAL_POSITION Lnet/minecraft/class_9225; METHOD (Ljava/nio/file/Path;Lnet/minecraft/class_8580;)V ARG 1 assetsPath ARG 2 symlinkFinder @@ -12,3 +15,6 @@ CLASS net/minecraft/class_1065 net/minecraft/client/resource/DefaultClientResour ARG 1 path METHOD method_45857 createDefaultPack (Ljava/nio/file/Path;)Lnet/minecraft/class_3268; ARG 0 assetsPath + METHOD method_57056 createInfo (Ljava/lang/String;Lnet/minecraft/class_2561;)Lnet/minecraft/class_9224; + ARG 0 id + ARG 1 title diff --git a/mappings/net/minecraft/client/resource/server/ServerResourcePackLoader.mapping b/mappings/net/minecraft/client/resource/server/ServerResourcePackLoader.mapping index abe84d4c66..685d3859ab 100644 --- a/mappings/net/minecraft/client/resource/server/ServerResourcePackLoader.mapping +++ b/mappings/net/minecraft/client/resource/server/ServerResourcePackLoader.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/server/ServerResour FIELD field_47600 packSource Lnet/minecraft/class_5352; FIELD field_47601 packStateChangeCallback Lnet/minecraft/class_9039; FIELD field_47690 packIndex I + FIELD field_49134 POSITION Lnet/minecraft/class_9225; FIELD field_5296 SHA1_PATTERN Ljava/util/regex/Pattern; FIELD field_5298 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_310;Ljava/nio/file/Path;Lnet/minecraft/class_542$class_547;)V diff --git a/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping b/mappings/net/minecraft/datafixer/fix/RenameEntityAttributesFix.mapping similarity index 66% rename from mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping rename to mappings/net/minecraft/datafixer/fix/RenameEntityAttributesFix.mapping index 681d6aad37..0d4b89222a 100644 --- a/mappings/net/minecraft/datafixer/fix/RenameItemStackAttributesFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RenameEntityAttributesFix.mapping @@ -1,7 +1,10 @@ -CLASS net/minecraft/class_5129 net/minecraft/datafixer/fix/RenameItemStackAttributesFix - FIELD field_23695 RENAMES Ljava/util/function/UnaryOperator; +CLASS net/minecraft/class_5129 net/minecraft/datafixer/fix/RenameEntityAttributesFix + FIELD field_23695 renames Ljava/util/function/UnaryOperator; + FIELD field_49056 description Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/UnaryOperator;)V ARG 1 outputSchema + ARG 2 description + ARG 3 renames METHOD method_26808 updateAttributeName (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_26810 updateAttributeModifiers (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; - METHOD method_26814 updatePlayerAttributes (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + METHOD method_26814 updateEntityAttributes (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index ffb3214e57..44c7f0cb08 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -1360,8 +1360,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5693 initDataTracker (Lnet/minecraft/class_2945$class_9222;)V COMMENT Initializes data tracker. COMMENT - COMMENT @apiNote Subclasses should override this and call {@link DataTracker#startTracking} - COMMENT for any data that needs to be tracked. + COMMENT @apiNote Subclasses should override this and add to the builder any data + COMMENT that needs to be tracked. ARG 1 builder METHOD method_5694 onPlayerCollision (Lnet/minecraft/class_1657;)V COMMENT Called when a player collides with the entity. Does nothing by default. diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 9553200965..3a172cbab5 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -375,6 +375,11 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack + METHOD method_56991 canUseSlot (Lnet/minecraft/class_1304;)Z + ARG 1 slot + METHOD method_56992 isInCreativeMode ()Z + METHOD method_56993 getSafeFallDistance (F)I + ARG 1 health METHOD method_56994 getJumpVelocity (F)F ARG 1 strength METHOD method_5877 getHandItems ()Ljava/lang/Iterable; diff --git a/mappings/net/minecraft/entity/DataTracked.mapping b/mappings/net/minecraft/entity/data/DataTracked.mapping similarity index 69% rename from mappings/net/minecraft/entity/DataTracked.mapping rename to mappings/net/minecraft/entity/data/DataTracked.mapping index ed0cc28a4f..ef8cbbb39e 100644 --- a/mappings/net/minecraft/entity/DataTracked.mapping +++ b/mappings/net/minecraft/entity/data/DataTracked.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9221 net/minecraft/entity/DataTracked +CLASS net/minecraft/class_9221 net/minecraft/entity/data/DataTracked METHOD method_48850 onDataTrackerUpdate (Ljava/util/List;)V ARG 1 entries METHOD method_5674 onTrackedDataSet (Lnet/minecraft/class_2940;)V diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping index 6f2cd256b5..a633f0e64e 100644 --- a/mappings/net/minecraft/entity/data/DataTracker.mapping +++ b/mappings/net/minecraft/entity/data/DataTracker.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker FIELD field_13333 trackedEntity Lnet/minecraft/class_9221; FIELD field_13334 LOGGER Lorg/slf4j/Logger; FIELD field_33378 MAX_DATA_VALUE_ID I + FIELD field_49021 CLASS_TO_LAST_ID Lnet/minecraft/class_9227; METHOD (Lnet/minecraft/class_9221;[Lnet/minecraft/class_2945$class_2946;)V ARG 1 trackedEntity ARG 2 entries diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 7ce5b9bea3..cd7aa3085e 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -156,6 +156,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_56677 isWearingBodyArmor ()Z METHOD method_56678 equipBodyArmor (Lnet/minecraft/class_1799;)V ARG 1 stack + METHOD method_56995 (Ljava/util/UUID;)Lnet/minecraft/class_2520; + ARG 0 uuid METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F ARG 1 slot METHOD method_5930 setForwardSpeed (F)V diff --git a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping index a1f08c3fcf..55aee4aa16 100644 --- a/mappings/net/minecraft/entity/mob/PatrolEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PatrolEntity.mapping @@ -22,6 +22,8 @@ CLASS net/minecraft/class_3732 net/minecraft/entity/mob/PatrolEntity ARG 4 random METHOD method_22332 setPatrolling (Z)V ARG 1 patrolling + METHOD method_57005 (Lnet/minecraft/class_2338;)V + ARG 1 patrolTarget CLASS class_3733 PatrolGoal FIELD field_16480 leaderSpeed D FIELD field_16481 entity Lnet/minecraft/class_3732; diff --git a/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping b/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping index a4d259df88..308514fb0f 100644 --- a/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_3989 net/minecraft/entity/passive/WanderingTraderEntit ARG 1 wanderTarget METHOD method_20508 tickDespawnDelay ()V METHOD method_52557 fillRebalancedRecipes ()V + METHOD method_57006 (Lnet/minecraft/class_2338;)V + ARG 1 wanderTarget CLASS class_3994 WanderToTargetGoal FIELD field_17759 trader Lnet/minecraft/class_3989; FIELD field_17760 proximityDistance D diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 706bb401a7..b5c1f47e71 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_41765 damageTiltYaw F FIELD field_46174 DEFAULT_MAIN_ARM Lnet/minecraft/class_1306; FIELD field_47821 VEHICLE_ATTACHMENT_POS Lnet/minecraft/class_243; + FIELD field_49094 ignoreFallDamageAboveY Ljava/lang/Double; FIELD field_7483 strideDistance F FIELD field_7484 itemCooldownManager Lnet/minecraft/class_1796; FIELD field_7486 enderChestInventory Lnet/minecraft/class_1730; diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 66f615ad87..7298e61687 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -300,6 +300,11 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT the item of the resultant stack ARG 2 count COMMENT the item count of the resultant stack + METHOD method_57008 decrementUnlessCreative (ILnet/minecraft/class_1309;)V + COMMENT Decrements the count of items in this item stack, unless {@code entity} + COMMENT is a creative mode player. + ARG 1 amount + ARG 2 entity METHOD method_7909 getItem ()Lnet/minecraft/class_1792; COMMENT {@return the item of this stack} COMMENT diff --git a/mappings/net/minecraft/nbt/NbtHelper.mapping b/mappings/net/minecraft/nbt/NbtHelper.mapping index 81b37f1e25..c076384f03 100644 --- a/mappings/net/minecraft/nbt/NbtHelper.mapping +++ b/mappings/net/minecraft/nbt/NbtHelper.mapping @@ -80,7 +80,7 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper METHOD method_10692 fromBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2520; COMMENT {@return the serialized block position} COMMENT - COMMENT @see #toBlockPos(NbtCompound) + COMMENT @see #toBlockPos(NbtCompound, String) ARG 0 pos METHOD method_25929 fromUuid (Ljava/util/UUID;)Lnet/minecraft/class_2495; COMMENT Serializes a {@link UUID} into its equivalent NBT representation. diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 54edb1610b..bcf7826a6b 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -131,8 +131,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@linkplain #readIdentifier() read} or {@linkplain #writeIdentifier(Identifier) COMMENT written} in their string form. FIELD field_33284 MAX_TEXT_LENGTH I - COMMENT The maximum size, in terms of JSON string length, allowed of the text read by - COMMENT {@link #readText()} or written by {@link #writeText(Text)}. + COMMENT The maximum size, in terms of JSON string length, allowed for serialized texts. FIELD field_33287 MAX_READ_NBT_SIZE I COMMENT The maximum size, in number of bytes, allowed of the NBT compound read by COMMENT {@link #readNbt()}. diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping index 8e0452e812..c85421f8d0 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -92,5 +92,5 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi ARG 1 packet METHOD method_54436 onSlotChangedState (Lnet/minecraft/class_8875;)V ARG 1 packet - METHOD method_56619 onDebugSampleSubcription (Lnet/minecraft/class_9179;)V + METHOD method_56619 onDebugSampleSubscription (Lnet/minecraft/class_9179;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping index 4fdaf7ded4..7018cce9e9 100644 --- a/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_8734 net/minecraft/network/packet/s2c/config/DynamicRegistriesS2CPacket FIELD field_48692 CODEC Lnet/minecraft/class_9139; + FIELD field_48777 REGISTRY_KEY_CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/registry/MutableRegistry.mapping b/mappings/net/minecraft/registry/MutableRegistry.mapping index 0de8dafd00..156250f980 100644 --- a/mappings/net/minecraft/registry/MutableRegistry.mapping +++ b/mappings/net/minecraft/registry/MutableRegistry.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2385 net/minecraft/registry/MutableRegistry METHOD method_10272 add (Lnet/minecraft/class_5321;Ljava/lang/Object;Lnet/minecraft/class_9248;)Lnet/minecraft/class_6880$class_6883; ARG 1 key ARG 2 value + ARG 3 info METHOD method_35863 isEmpty ()Z COMMENT {@return whether the registry is empty} METHOD method_46769 createMutableEntryLookup ()Lnet/minecraft/class_7871; diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping index a2b6e347a8..f184e1276d 100644 --- a/mappings/net/minecraft/registry/Registry.mapping +++ b/mappings/net/minecraft/registry/Registry.mapping @@ -237,7 +237,7 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry COMMENT COMMENT @see #getEntry(RegistryKey) ARG 1 key - METHOD method_40294 createEntryCodec ()Lcom/mojang/serialization/Codec; + METHOD method_40294 getEntryCodec ()Lcom/mojang/serialization/Codec; COMMENT {@return the codec for serializing the registry entry of {@code T}} COMMENT COMMENT @implNote This serializes a registry entry using the ID. @@ -251,6 +251,8 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry METHOD method_46772 getTagCreatingWrapper ()Lnet/minecraft/class_7225$class_7226; COMMENT {@return a registry wrapper that creates and stores a new registry entry list COMMENT when handling an unknown tag key} + METHOD method_47448 (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 value METHOD method_47983 getEntry (Ljava/lang/Object;)Lnet/minecraft/class_6880; ARG 1 value METHOD method_47984 registerReference (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/Object;)Lnet/minecraft/class_6880$class_6883; @@ -270,6 +272,19 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry ARG 2 random METHOD method_56160 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; ARG 1 entryList + METHOD method_57058 getEntryInfo (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 key + METHOD method_57059 getReferenceEntryCodec ()Lcom/mojang/serialization/Codec; + METHOD method_57060 (Lnet/minecraft/class_6880$class_6883;)Lcom/mojang/serialization/Lifecycle; + ARG 1 entry + METHOD method_57061 validateReference (Lnet/minecraft/class_6880;)Lcom/mojang/serialization/DataResult; + ARG 1 entry + METHOD method_57062 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_2960; + ARG 0 entry + METHOD method_57064 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880; + ARG 0 entry + METHOD method_57065 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; + ARG 1 id CLASS 1 METHOD method_46773 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880; ARG 0 entry diff --git a/mappings/net/minecraft/registry/RegistryLoader.mapping b/mappings/net/minecraft/registry/RegistryLoader.mapping index 8418aa4ee8..b0fee4f82e 100644 --- a/mappings/net/minecraft/registry/RegistryLoader.mapping +++ b/mappings/net/minecraft/registry/RegistryLoader.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader FIELD field_39969 DIMENSION_REGISTRIES Ljava/util/List; FIELD field_39970 LOGGER Lorg/slf4j/Logger; FIELD field_48709 SYNCED_REGISTRIES Ljava/util/List; + FIELD field_49024 EXPERIMENTAL_ENTRY_INFO Lnet/minecraft/class_9248; + FIELD field_49025 RESOURCE_ENTRY_INFO_GETTER Ljava/util/function/Function; METHOD method_45119 getPath (Lnet/minecraft/class_2960;)Ljava/lang/String; ARG 0 id METHOD method_45120 (Lnet/minecraft/class_7655$class_7656;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_7655$class_9158;)V @@ -51,10 +53,34 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader ARG 2 entries METHOD method_56516 (Ljava/lang/String;)V ARG 0 error + METHOD method_56517 (Ljava/util/Map;Lnet/minecraft/class_5912;Lnet/minecraft/class_7655$class_9158;Lnet/minecraft/class_6903$class_7863;)V + ARG 2 loader + ARG 3 infoGetter METHOD method_56518 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5912;Lnet/minecraft/class_6903$class_7863;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V ARG 0 data + ARG 1 factory + ARG 2 infoGetter + ARG 3 registry + ARG 4 decoder + ARG 5 loadingErrors METHOD method_56519 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5912;Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_5455$class_6890; ARG 0 data + ARG 1 factory + ARG 2 registryManager + ARG 3 entries + METHOD method_56913 (Ljava/lang/Boolean;)Lcom/mojang/serialization/Lifecycle; + ARG 0 vanilla + METHOD method_56914 (Ljava/util/Optional;)Lnet/minecraft/class_9248; + ARG 0 knownPacks + METHOD method_56915 parseAndAdd (Lnet/minecraft/class_2385;Lcom/mojang/serialization/Decoder;Lnet/minecraft/class_6903;Lnet/minecraft/class_5321;Lnet/minecraft/class_3298;Lnet/minecraft/class_9248;)V + ARG 0 registry + ARG 1 decoder + ARG 2 ops + ARG 3 key + ARG 4 resource + ARG 5 entryInfo + METHOD method_56916 (Ljava/lang/String;)V + ARG 0 error CLASS class_7656 RegistryLoadable METHOD apply (Lnet/minecraft/class_7655$class_9158;Lnet/minecraft/class_6903$class_7863;)V ARG 1 loader @@ -71,3 +97,5 @@ CLASS net/minecraft/class_7655 net/minecraft/registry/RegistryLoader ARG 2 infoGetter METHOD method_56521 loadFromNetwork (Ljava/util/Map;Lnet/minecraft/class_5912;Lnet/minecraft/class_6903$class_7863;)V ARG 1 data + ARG 2 factory + ARG 3 infoGetter diff --git a/mappings/net/minecraft/registry/SerializableRegistries.mapping b/mappings/net/minecraft/registry/SerializableRegistries.mapping index 7f96137e9e..c2fb2b3eea 100644 --- a/mappings/net/minecraft/registry/SerializableRegistries.mapping +++ b/mappings/net/minecraft/registry/SerializableRegistries.mapping @@ -6,12 +6,23 @@ CLASS net/minecraft/class_7782 net/minecraft/registry/SerializableRegistries ARG 0 dynamicRegistryManager METHOD method_47449 streamDynamicEntries (Lnet/minecraft/class_7780;)Ljava/util/stream/Stream; ARG 0 combinedRegistries + METHOD method_56595 (Lnet/minecraft/class_2378;Ljava/util/Set;Lnet/minecraft/class_7655$class_7657;Lcom/mojang/serialization/DynamicOps;Ljava/util/List;Lnet/minecraft/class_6880$class_6883;)V + ARG 5 registryEntry + METHOD method_56596 (Ljava/util/Set;Lnet/minecraft/class_7655$class_7657;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2378;)V + ARG 4 registry METHOD method_56597 serialize (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;Lnet/minecraft/class_5455;Ljava/util/Set;Ljava/util/function/BiConsumer;)V ARG 0 nbtOps + ARG 1 entry ARG 2 registryManager + ARG 3 knownPacks + ARG 4 callback METHOD method_56598 forEachSyncedRegistry (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/Set;Ljava/util/function/BiConsumer;)V ARG 0 nbtOps ARG 1 registryManager + ARG 2 knownPacks + ARG 3 callback + METHOD method_56599 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5455;Ljava/util/Set;Ljava/util/function/BiConsumer;Lnet/minecraft/class_7655$class_7657;)V + ARG 4 registry METHOD method_56600 (Lnet/minecraft/class_6880$class_6883;Ljava/lang/String;)Ljava/lang/IllegalArgumentException; ARG 1 error METHOD method_56601 (Lnet/minecraft/class_5455$class_6892;)Z diff --git a/mappings/net/minecraft/registry/SimpleRegistry.mapping b/mappings/net/minecraft/registry/SimpleRegistry.mapping index f89348be85..9eb010f4e5 100644 --- a/mappings/net/minecraft/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/registry/SimpleRegistry.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry FIELD field_40584 intrusiveValueToEntry Ljava/util/Map; FIELD field_41126 key Lnet/minecraft/class_5321; FIELD field_41127 wrapper Lnet/minecraft/class_7225$class_7226; + FIELD field_49135 keyToEntryInfo Ljava/util/Map; METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V ARG 1 key ARG 2 lifecycle @@ -58,4 +59,6 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry ARG 0 value ARG 1 entry METHOD method_45939 assertNotFrozen ()V + METHOD method_56594 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; + ARG 1 k CLASS 1 diff --git a/mappings/net/minecraft/network/packet/VersionedIdentifier.mapping b/mappings/net/minecraft/registry/VersionedIdentifier.mapping similarity index 75% rename from mappings/net/minecraft/network/packet/VersionedIdentifier.mapping rename to mappings/net/minecraft/registry/VersionedIdentifier.mapping index ef40d34b73..9902778e1a 100644 --- a/mappings/net/minecraft/network/packet/VersionedIdentifier.mapping +++ b/mappings/net/minecraft/registry/VersionedIdentifier.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9226 net/minecraft/network/packet/VersionedIdentifier +CLASS net/minecraft/class_9226 net/minecraft/registry/VersionedIdentifier FIELD field_49035 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_49036 DEFAULT_NAMESPACE Ljava/lang/String; METHOD method_56931 isVanilla ()Z diff --git a/mappings/net/minecraft/registry/entry/RegistryEntryInfo.mapping b/mappings/net/minecraft/registry/entry/RegistryEntryInfo.mapping new file mode 100644 index 0000000000..4e5b11d022 --- /dev/null +++ b/mappings/net/minecraft/registry/entry/RegistryEntryInfo.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9248 net/minecraft/registry/entry/RegistryEntryInfo + FIELD field_49136 DEFAULT Lnet/minecraft/class_9248; diff --git a/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping b/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping index 01a700c9f5..b7a12389cf 100644 --- a/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping +++ b/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_3255 net/minecraft/resource/AbstractFileResourcePack FIELD field_14182 LOGGER Lorg/slf4j/Logger; + 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; ARG 0 metaReader ARG 1 inputStream diff --git a/mappings/net/minecraft/resource/DefaultResourcePack.mapping b/mappings/net/minecraft/resource/DefaultResourcePack.mapping index f44c39ff60..e783b3d0c5 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePack.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping @@ -4,6 +4,13 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack FIELD field_26938 metadata Lnet/minecraft/class_7662; FIELD field_40002 rootPaths Ljava/util/List; FIELD field_40003 namespacePaths Ljava/util/Map; + FIELD field_49032 info Lnet/minecraft/class_9224; + METHOD (Lnet/minecraft/class_9224;Lnet/minecraft/class_7662;Ljava/util/Set;Ljava/util/List;Ljava/util/Map;)V + ARG 1 info + ARG 2 metadata + ARG 3 namespaces + ARG 4 rootPaths + ARG 5 namespacePaths METHOD method_14418 collectIdentifiers (Lnet/minecraft/class_3262$class_7664;Ljava/lang/String;Ljava/nio/file/Path;Ljava/util/List;)V ARG 0 consumer ARG 1 namespace @@ -11,7 +18,7 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack ARG 3 prefixSegments METHOD method_43032 getFactory ()Lnet/minecraft/class_5912; METHOD method_45188 (Lnet/minecraft/class_2960;)Ljava/util/Optional; - ARG 1 name + ARG 1 id METHOD method_45189 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3264;Ljava/util/List;)Lnet/minecraft/class_7367; ARG 3 segments METHOD method_45190 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3264;Ljava/util/function/Consumer;Ljava/util/List;)V diff --git a/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping index 79ae7a54c5..72cbf2201c 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/class_7665 net/minecraft/resource/DefaultResourcePackBuilder METHOD method_45209 exists (Ljava/nio/file/Path;)Z ARG 1 path METHOD method_45210 build (Lnet/minecraft/class_9224;)Lnet/minecraft/class_3268; + ARG 1 info METHOD method_45211 (Lnet/minecraft/class_3264;Ljava/nio/file/Path;)V ARG 1 type ARG 2 path diff --git a/mappings/net/minecraft/resource/DirectoryResourcePack.mapping b/mappings/net/minecraft/resource/DirectoryResourcePack.mapping index 6c8e9bb5ef..7ebb91e3d3 100644 --- a/mappings/net/minecraft/resource/DirectoryResourcePack.mapping +++ b/mappings/net/minecraft/resource/DirectoryResourcePack.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3259 net/minecraft/resource/DirectoryResourcePack FIELD field_40000 SEPARATOR_JOINER Lcom/google/common/base/Joiner; FIELD field_40001 root Ljava/nio/file/Path; METHOD (Lnet/minecraft/class_9224;Ljava/nio/file/Path;)V + ARG 1 info ARG 2 root METHOD method_14402 isValidPath (Ljava/nio/file/Path;)Z ARG 0 path diff --git a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping index baf797b343..44319ad1af 100644 --- a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping +++ b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackProvider FIELD field_40044 LOGGER Lorg/slf4j/Logger; FIELD field_40045 type Lnet/minecraft/class_3264; FIELD field_45054 symlinkFinder Lnet/minecraft/class_8580; + FIELD field_49034 POSITION Lnet/minecraft/class_9225; METHOD (Ljava/nio/file/Path;Lnet/minecraft/class_3264;Lnet/minecraft/class_5352;Lnet/minecraft/class_8580;)V ARG 1 packsDir ARG 2 type @@ -12,8 +13,12 @@ CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackProvider METHOD method_45271 forEachProfile (Ljava/nio/file/Path;Lnet/minecraft/class_8580;Ljava/util/function/BiConsumer;)V ARG 0 path ARG 1 symlinkFinder + ARG 2 callback METHOD method_45272 (Ljava/util/function/Consumer;Ljava/nio/file/Path;Lnet/minecraft/class_3288$class_7680;)V + ARG 2 path ARG 3 packFactory METHOD method_45273 getFileName (Ljava/nio/file/Path;)Ljava/lang/String; ARG 0 path + METHOD method_56930 createPackInfo (Ljava/nio/file/Path;)Lnet/minecraft/class_9224; + ARG 1 path CLASS class_8620 PackOpenerImpl diff --git a/mappings/net/minecraft/resource/NamespaceResourceManager.mapping b/mappings/net/minecraft/resource/NamespaceResourceManager.mapping index 0998ba103c..c302aa69a7 100644 --- a/mappings/net/minecraft/resource/NamespaceResourceManager.mapping +++ b/mappings/net/minecraft/resource/NamespaceResourceManager.mapping @@ -30,11 +30,11 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager ARG 0 pack ARG 1 idToEntryList METHOD method_41260 addPack (Ljava/lang/String;Lnet/minecraft/class_3262;Ljava/util/function/Predicate;)V - ARG 1 name + ARG 1 id ARG 2 underlyingPack ARG 3 filter METHOD method_41261 addPack (Ljava/lang/String;Ljava/util/function/Predicate;)V - ARG 1 name + ARG 1 id ARG 2 filter METHOD method_43035 createMetadataSupplier (Lnet/minecraft/class_2960;I)Lnet/minecraft/class_7367; ARG 1 id @@ -71,7 +71,7 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager METHOD (Ljava/io/InputStream;Lnet/minecraft/class_2960;Ljava/lang/String;)V ARG 1 parent ARG 2 id - ARG 3 packName + ARG 3 packId CLASS class_7081 EntryList FIELD comp_1005 id Lnet/minecraft/class_2960; FIELD comp_527 metadataId Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/resource/Resource.mapping b/mappings/net/minecraft/resource/Resource.mapping index 6ebcf30728..845c34a755 100644 --- a/mappings/net/minecraft/resource/Resource.mapping +++ b/mappings/net/minecraft/resource/Resource.mapping @@ -16,16 +16,17 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource ARG 1 pack ARG 2 inputSupplier ARG 3 metadataSupplier - METHOD method_14480 getResourcePackName ()Ljava/lang/String; - COMMENT Returns the user-friendly name of the pack this resource is from. + METHOD method_14480 getPackId ()Ljava/lang/String; + COMMENT {@return the ID of the pack this resource is from} METHOD method_14481 getMetadata ()Lnet/minecraft/class_7368; COMMENT {@return the metadata for the resource} COMMENT COMMENT

The metadata must then be decoded using COMMENT {@link ResourceMetadata#decode(ResourceMetadataReader)} before using. METHOD method_14482 getInputStream ()Ljava/io/InputStream; - COMMENT Returns the input stream of this resource. + COMMENT {@return the input stream of this resource} COMMENT COMMENT

This input stream is closed when this resource is closed. METHOD method_43039 getReader ()Ljava/io/BufferedReader; METHOD method_45304 getPack ()Lnet/minecraft/class_3262; + METHOD method_56936 getKnownPackInfo ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/resource/ResourceFactory.mapping b/mappings/net/minecraft/resource/ResourceFactory.mapping index 7a23b9baf0..6dbecb9180 100644 --- a/mappings/net/minecraft/resource/ResourceFactory.mapping +++ b/mappings/net/minecraft/resource/ResourceFactory.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_5912 net/minecraft/resource/ResourceFactory COMMENT Provides resource access. + FIELD field_49043 MISSING Lnet/minecraft/class_5912; METHOD fromMap (Ljava/util/Map;)Lnet/minecraft/class_5912; ARG 0 map METHOD getResourceOrThrow (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3298; @@ -15,6 +16,8 @@ CLASS net/minecraft/class_5912 net/minecraft/resource/ResourceFactory COMMENT the resource identifier to search for METHOD method_45307 (Ljava/util/Map;Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id + METHOD method_56937 (Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 0 id METHOD open (Lnet/minecraft/class_2960;)Ljava/io/InputStream; ARG 1 id METHOD openAsReader (Lnet/minecraft/class_2960;)Ljava/io/BufferedReader; diff --git a/mappings/net/minecraft/resource/ResourcePack.mapping b/mappings/net/minecraft/resource/ResourcePack.mapping index 51f0c0d38b..0eceaf7671 100644 --- a/mappings/net/minecraft/resource/ResourcePack.mapping +++ b/mappings/net/minecraft/resource/ResourcePack.mapping @@ -19,7 +19,9 @@ CLASS net/minecraft/class_3262 net/minecraft/resource/ResourcePack ARG 2 namespace ARG 3 prefix ARG 4 consumer - METHOD method_14409 getName ()Ljava/lang/String; + METHOD method_14409 getId ()Ljava/lang/String; METHOD method_14410 openRoot ([Ljava/lang/String;)Lnet/minecraft/class_7367; ARG 1 segments + METHOD method_56926 getInfo ()Lnet/minecraft/class_9224; + METHOD method_56929 getKnownPackInfo ()Ljava/util/Optional; CLASS class_7664 ResultConsumer diff --git a/mappings/net/minecraft/resource/ResourcePackInfo.mapping b/mappings/net/minecraft/resource/ResourcePackInfo.mapping new file mode 100644 index 0000000000..52f30fc2d0 --- /dev/null +++ b/mappings/net/minecraft/resource/ResourcePackInfo.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_9224 net/minecraft/resource/ResourcePackInfo + METHOD method_56927 getInformationText (ZLnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + ARG 1 enabled + ARG 2 description + METHOD method_56928 (ZLnet/minecraft/class_2561;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 3 style diff --git a/mappings/net/minecraft/resource/ResourcePackManager.mapping b/mappings/net/minecraft/resource/ResourcePackManager.mapping index 69c508ff45..023bb66721 100644 --- a/mappings/net/minecraft/resource/ResourcePackManager.mapping +++ b/mappings/net/minecraft/resource/ResourcePackManager.mapping @@ -13,15 +13,15 @@ CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager METHOD method_14447 setEnabledProfiles (Ljava/util/Collection;)V ARG 1 enabled METHOD method_14449 getProfile (Ljava/lang/String;)Lnet/minecraft/class_3288; - ARG 1 name - METHOD method_29206 getNames ()Ljava/util/Collection; + ARG 1 id + METHOD method_29206 getIds ()Ljava/util/Collection; METHOD method_29207 hasProfile (Ljava/lang/String;)Z - ARG 1 name + ARG 1 id METHOD method_29208 buildEnabledProfiles (Ljava/util/Collection;)Ljava/util/List; ARG 1 enabledNames - METHOD method_29209 streamProfilesByName (Ljava/util/Collection;)Ljava/util/stream/Stream; - ARG 1 names - METHOD method_29210 getEnabledNames ()Ljava/util/Collection; + METHOD method_29209 streamProfilesById (Ljava/util/Collection;)Ljava/util/stream/Stream; + ARG 1 ids + METHOD method_29210 getEnabledIds ()Ljava/util/Collection; METHOD method_29211 createResourcePacks ()Ljava/util/List; METHOD method_29212 providePackProfiles ()Ljava/util/Map; METHOD method_29484 (Ljava/util/Map;Lnet/minecraft/class_3288;)V diff --git a/mappings/net/minecraft/resource/ResourcePackPosition.mapping b/mappings/net/minecraft/resource/ResourcePackPosition.mapping new file mode 100644 index 0000000000..b59b971bd9 --- /dev/null +++ b/mappings/net/minecraft/resource/ResourcePackPosition.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9225 net/minecraft/resource/ResourcePackPosition diff --git a/mappings/net/minecraft/resource/ResourcePackProfile.mapping b/mappings/net/minecraft/resource/ResourcePackProfile.mapping index 8cae08c26e..d457f50503 100644 --- a/mappings/net/minecraft/resource/ResourcePackProfile.mapping +++ b/mappings/net/minecraft/resource/ResourcePackProfile.mapping @@ -10,10 +10,14 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile COMMENT

Closing the profile doesn't have any effect. FIELD field_14273 packFactory Lnet/minecraft/class_3288$class_7680; FIELD field_14279 LOGGER Lorg/slf4j/Logger; + FIELD field_49037 info Lnet/minecraft/class_9224; FIELD field_49038 metaData Lnet/minecraft/class_3288$class_7679; + FIELD field_49039 position Lnet/minecraft/class_9225; METHOD (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_9225;)V + ARG 1 info ARG 2 packFactory ARG 3 metaData + ARG 4 position METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_14457 getDisplayName ()Lnet/minecraft/class_2561; @@ -22,19 +26,26 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile METHOD method_14460 getCompatibility ()Lnet/minecraft/class_3281; METHOD method_14461 getInformationText (Z)Lnet/minecraft/class_2561; ARG 1 enabled - METHOD method_14463 getName ()Ljava/lang/String; - METHOD method_14464 isAlwaysEnabled ()Z + METHOD method_14463 getId ()Ljava/lang/String; + METHOD method_14464 isRequired ()Z METHOD method_14465 isPinned ()Z METHOD method_14466 getInitialPosition ()Lnet/minecraft/class_3288$class_3289; METHOD method_29483 getSource ()Lnet/minecraft/class_5352; METHOD method_45274 loadMetadata (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7680;I)Lnet/minecraft/class_3288$class_7679; + ARG 0 info ARG 1 packFactory ARG 2 currentPackFormat METHOD method_45275 create (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3264;Lnet/minecraft/class_9225;)Lnet/minecraft/class_3288; + ARG 0 info + ARG 1 packFactory + ARG 2 type + ARG 3 position METHOD method_45276 getRequestedFeatures ()Lnet/minecraft/class_7699; METHOD method_52440 getSupportedFormats (Ljava/lang/String;Lnet/minecraft/class_3272;)Lnet/minecraft/class_6497; - ARG 0 packName + ARG 0 packId ARG 1 metadata + METHOD method_56933 getInfo ()Lnet/minecraft/class_9224; + METHOD method_56934 getPosition ()Lnet/minecraft/class_9225; CLASS class_3289 InsertionPosition METHOD method_14467 inverse ()Lnet/minecraft/class_3288$class_3289; METHOD method_14468 insert (Ljava/util/List;Ljava/lang/Object;Ljava/util/function/Function;Z)I @@ -45,5 +56,7 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile CLASS class_7679 Metadata CLASS class_7680 PackFactory METHOD method_52424 open (Lnet/minecraft/class_9224;)Lnet/minecraft/class_3262; + ARG 1 info METHOD method_52425 openWithOverlays (Lnet/minecraft/class_9224;Lnet/minecraft/class_3288$class_7679;)Lnet/minecraft/class_3262; + ARG 1 info ARG 2 metadata diff --git a/mappings/net/minecraft/resource/ResourcePackProvider.mapping b/mappings/net/minecraft/resource/ResourcePackProvider.mapping index 0e30669bb3..26444888c2 100644 --- a/mappings/net/minecraft/resource/ResourcePackProvider.mapping +++ b/mappings/net/minecraft/resource/ResourcePackProvider.mapping @@ -5,6 +5,6 @@ CLASS net/minecraft/class_3285 net/minecraft/resource/ResourcePackProvider COMMENT Register resource pack profiles created with the {@code factory} to the COMMENT {@code profileAdder}. COMMENT - COMMENT @see ResourcePackProfile#of + COMMENT @see ResourcePackProfile ARG 1 profileAdder COMMENT the profile adder that accepts created resource pack profiles diff --git a/mappings/net/minecraft/resource/ResourcePackSource.mapping b/mappings/net/minecraft/resource/ResourcePackSource.mapping index a743d00cfe..57f3d1dacf 100644 --- a/mappings/net/minecraft/resource/ResourcePackSource.mapping +++ b/mappings/net/minecraft/resource/ResourcePackSource.mapping @@ -12,6 +12,6 @@ CLASS net/minecraft/class_5352 net/minecraft/resource/ResourcePackSource ARG 0 sourceTextSupplier ARG 1 canBeEnabledLater METHOD method_45282 decorate (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; - ARG 1 packName + ARG 1 packDisplayName METHOD method_45283 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 1 name diff --git a/mappings/net/minecraft/resource/ResourceType.mapping b/mappings/net/minecraft/resource/ResourceType.mapping index 8ee9c05dae..401321dfe7 100644 --- a/mappings/net/minecraft/resource/ResourceType.mapping +++ b/mappings/net/minecraft/resource/ResourceType.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3264 net/minecraft/resource/ResourceType FIELD field_14189 directory Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 name + ARG 3 directory METHOD method_14413 getDirectory ()Ljava/lang/String; diff --git a/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping b/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping index 0c95c1ebe0..0dcd866cf4 100644 --- a/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping +++ b/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping @@ -3,6 +3,9 @@ CLASS net/minecraft/class_3286 net/minecraft/resource/VanillaDataPackProvider FIELD field_40051 METADATA Lnet/minecraft/class_3272; FIELD field_40052 FEATURE_FLAGS Lnet/minecraft/class_7663; FIELD field_40053 ID Lnet/minecraft/class_2960; + FIELD field_49040 INFO Lnet/minecraft/class_9224; + FIELD field_49041 BOTTOM_POSITION Lnet/minecraft/class_9225; + FIELD field_49042 TOP_POSITION Lnet/minecraft/class_9225; METHOD (Lnet/minecraft/class_8580;)V ARG 1 symlinkFinder METHOD method_45285 createManager (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_3283; @@ -11,4 +14,9 @@ CLASS net/minecraft/class_3286 net/minecraft/resource/VanillaDataPackProvider ARG 0 dataPacksPath ARG 1 symlinkFinder METHOD method_45287 createDefaultPack ()Lnet/minecraft/class_3268; - METHOD method_52443 createRealmsManager ()Lnet/minecraft/class_3283; + METHOD method_52442 (Ljava/nio/file/Path;)Z + ARG 0 path + METHOD method_52443 createClientManager ()Lnet/minecraft/class_3283; + METHOD method_56935 createInfo (Ljava/lang/String;Lnet/minecraft/class_2561;)Lnet/minecraft/class_9224; + ARG 0 id + ARG 1 title diff --git a/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping b/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping index 8b90b61064..f6d52a0241 100644 --- a/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping +++ b/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_7678 net/minecraft/resource/VanillaResourcePackProvide FIELD field_40042 resourcePack Lnet/minecraft/class_3268; FIELD field_40043 id Lnet/minecraft/class_2960; FIELD field_45052 symlinkFinder Lnet/minecraft/class_8580; + FIELD field_49033 VANILLA_ID Lnet/minecraft/class_9226; METHOD (Lnet/minecraft/class_3264;Lnet/minecraft/class_3268;Lnet/minecraft/class_2960;Lnet/minecraft/class_8580;)V ARG 1 type ARG 2 resourcePack @@ -14,11 +15,11 @@ CLASS net/minecraft/class_7678 net/minecraft/resource/VanillaResourcePackProvide METHOD method_45257 createDefault (Lnet/minecraft/class_3262;)Lnet/minecraft/class_3288; ARG 1 pack METHOD method_45258 (Lnet/minecraft/class_3288$class_7680;Ljava/lang/String;)Lnet/minecraft/class_3288; - ARG 2 name - METHOD method_45259 getProfileName (Ljava/lang/String;)Lnet/minecraft/class_2561; + ARG 2 id + METHOD method_45259 getDisplayName (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 1 id METHOD method_45260 create (Ljava/lang/String;Lnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_2561;)Lnet/minecraft/class_3288; - ARG 1 name + ARG 1 fileName ARG 2 packFactory ARG 3 displayName METHOD method_45261 getFileName (Ljava/nio/file/Path;)Ljava/lang/String; @@ -34,7 +35,7 @@ CLASS net/minecraft/class_7678 net/minecraft/resource/VanillaResourcePackProvide ARG 2 profilePath ARG 3 factory METHOD method_45266 (Ljava/util/function/Consumer;Ljava/lang/String;Ljava/util/function/Function;)V - ARG 1 fileName + ARG 1 id ARG 2 packFactory METHOD method_45267 forEachProfile (Ljava/util/function/Consumer;)V ARG 1 consumer diff --git a/mappings/net/minecraft/resource/ZipResourcePack.mapping b/mappings/net/minecraft/resource/ZipResourcePack.mapping index 549a6e2f6f..8f349ad248 100644 --- a/mappings/net/minecraft/resource/ZipResourcePack.mapping +++ b/mappings/net/minecraft/resource/ZipResourcePack.mapping @@ -3,7 +3,9 @@ CLASS net/minecraft/class_3258 net/minecraft/resource/ZipResourcePack FIELD field_45038 zipFile Lnet/minecraft/class_3258$class_8616; FIELD field_45039 overlay Ljava/lang/String; METHOD (Lnet/minecraft/class_9224;Lnet/minecraft/class_3258$class_8616;Ljava/lang/String;)V + ARG 1 info ARG 2 zipFile + ARG 3 overlay METHOD method_14391 openFile (Ljava/lang/String;)Lnet/minecraft/class_7367; ARG 1 path METHOD method_45177 toPath (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/lang/String; diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index 8a09141a39..b908d2ff7e 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction ARG 0 dispatcher ARG 1 source ARG 2 reader + METHOD method_57057 validateCommandLength (Ljava/lang/CharSequence;)V + ARG 0 command METHOD method_9195 create (Lnet/minecraft/class_2960;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;Ljava/util/List;)Lnet/minecraft/class_2158; COMMENT Parses a function in the context of {@code source}. COMMENT diff --git a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping index 22743d8862..a57a5cde35 100644 --- a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_8610 net/minecraft/server/network/ServerConfigurationN FIELD field_45023 tasks Ljava/util/Queue; FIELD field_45024 currentTask Lnet/minecraft/class_8605; FIELD field_46157 syncedOptions Lnet/minecraft/class_8791; + FIELD field_49026 synchronizedRegistriesTask Lnet/minecraft/class_9223; METHOD method_52406 onTaskFinished (Lnet/minecraft/class_8605$class_8606;)V ARG 1 key METHOD method_52407 (Lnet/minecraft/server/MinecraftServer$class_7460;)V @@ -13,3 +14,5 @@ CLASS net/minecraft/class_8610 net/minecraft/server/network/ServerConfigurationN METHOD method_52410 endConfiguration ()V METHOD method_52411 queueSendResourcePackTask ()V METHOD method_52412 pollTask ()V + METHOD method_56530 (Lnet/minecraft/class_3262;)Ljava/util/stream/Stream; + ARG 0 pack diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 5f84c693fe..a516183dd8 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -39,6 +39,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_45026 chunkDataSender Lnet/minecraft/class_8608; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;Lnet/minecraft/class_8792;)V ARG 1 server + ARG 2 connection ARG 3 player ARG 4 clientData METHOD method_14360 requestTeleport (DDDFFLjava/util/Set;)V @@ -175,6 +176,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_48107 getConnectionAddress ()Ljava/net/SocketAddress; METHOD method_52414 reconfigure ()V METHOD method_52415 cleanUp ()V + METHOD method_56922 getMaxAllowedFloatingTicks (Lnet/minecraft/class_1297;)I + ARG 1 vehicle CLASS 1 METHOD method_33897 processInteract (Lnet/minecraft/class_1268;Lnet/minecraft/class_3244$class_5860;)V ARG 1 hand diff --git a/mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping b/mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping index b33004bb01..70675f8003 100644 --- a/mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping +++ b/mappings/net/minecraft/server/network/SynchronizeRegistriesTask.mapping @@ -1,2 +1,16 @@ CLASS net/minecraft/class_9223 net/minecraft/server/network/SynchronizeRegistriesTask FIELD field_49028 KEY Lnet/minecraft/class_8605$class_8606; + FIELD field_49029 knownPacks Ljava/util/List; + FIELD field_49030 registries Lnet/minecraft/class_7780; + METHOD (Ljava/util/List;Lnet/minecraft/class_7780;)V + ARG 1 knownPacks + ARG 2 registries + METHOD method_56923 onSelectKnownPacks (Ljava/util/List;Ljava/util/function/Consumer;)V + ARG 1 clientKnownPacks + ARG 2 sender + METHOD method_56924 (Ljava/util/function/Consumer;Lnet/minecraft/class_5321;Ljava/util/List;)V + ARG 1 key + ARG 2 entries + METHOD method_56925 syncRegistryAndTags (Ljava/util/function/Consumer;Ljava/util/Set;)V + ARG 1 sender + ARG 2 commonKnownPacks diff --git a/mappings/net/minecraft/test/Batches.mapping b/mappings/net/minecraft/test/Batches.mapping index aaeb48ea6e..addb73993b 100644 --- a/mappings/net/minecraft/test/Batches.mapping +++ b/mappings/net/minecraft/test/Batches.mapping @@ -1,10 +1,16 @@ CLASS net/minecraft/class_9113 net/minecraft/test/Batches FIELD field_48467 BATCH_SIZE I METHOD method_56188 defaultBatcher ()Lnet/minecraft/class_4520$class_9116; + METHOD method_56189 (Lnet/minecraft/class_3218;Ljava/lang/String;Ljava/util/List;J)Lnet/minecraft/class_4514; + ARG 2 states + ARG 3 index METHOD method_56190 (Lnet/minecraft/class_3218;Ljava/util/Map$Entry;)Ljava/util/stream/Stream; ARG 1 entry METHOD method_56191 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4529;)Lnet/minecraft/class_4517; ARG 1 testFunction + METHOD method_56192 (Ljava/lang/String;Ljava/util/List;J)Lnet/minecraft/class_4514; + ARG 1 states + ARG 2 index METHOD method_56193 (Ljava/util/Collection;)Ljava/util/Collection; ARG 0 states METHOD method_56194 createBatches (Ljava/util/Collection;Lnet/minecraft/class_3218;)Ljava/util/Collection; @@ -13,6 +19,7 @@ CLASS net/minecraft/class_9113 net/minecraft/test/Batches METHOD method_56195 create (Ljava/util/List;Ljava/lang/String;J)Lnet/minecraft/class_4514; ARG 0 states ARG 1 batchId + ARG 2 index METHOD method_56196 (Ljava/util/Map$Entry;)Ljava/util/stream/Stream; ARG 0 entry METHOD method_56197 (Lnet/minecraft/class_4517;)Ljava/lang/String; diff --git a/mappings/net/minecraft/test/TestRunContext.mapping b/mappings/net/minecraft/test/TestRunContext.mapping index 209d173b75..df3cd59445 100644 --- a/mappings/net/minecraft/test/TestRunContext.mapping +++ b/mappings/net/minecraft/test/TestRunContext.mapping @@ -43,6 +43,8 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestRunContext METHOD method_56230 (Lnet/minecraft/class_4517;)V ARG 0 state METHOD method_56231 onFinish ()V + METHOD method_57072 (Lnet/minecraft/class_4517;)Ljava/lang/String; + ARG 0 state CLASS 1 METHOD method_56232 onFinished ()V METHOD method_56233 (J)V diff --git a/mappings/net/minecraft/util/collection/Class2IntMap.mapping b/mappings/net/minecraft/util/collection/Class2IntMap.mapping new file mode 100644 index 0000000000..56eafd2e5e --- /dev/null +++ b/mappings/net/minecraft/util/collection/Class2IntMap.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_9227 net/minecraft/util/collection/Class2IntMap + COMMENT A map with {@link Class}es as keys and an integer as values. + COMMENT If the entry for the provided class does not exist, then it recursively checks + COMMENT their superclasses. + FIELD field_49052 MISSING I + FIELD field_49053 backingMap Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD method_56939 get (Ljava/lang/Class;)I + ARG 1 clazz + METHOD method_56940 getNext (Ljava/lang/Class;)I + ARG 1 clazz + METHOD method_56941 put (Ljava/lang/Class;)I + ARG 1 clazz diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 8e413c95ce..0745e57c45 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -304,6 +304,9 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs METHOD method_56627 createRecursiveMap (Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec; METHOD method_56907 (Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult; ARG 0 value + METHOD method_56942 withLifecycle (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; + ARG 0 originalCodec + ARG 1 lifecycleGetter CLASS 1 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops diff --git a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping index 9c6de23f78..33e860c353 100644 --- a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping @@ -12,14 +12,26 @@ CLASS net/minecraft/class_6611 net/minecraft/util/profiling/jfr/FlightProfiler ARG 3 targetStatus METHOD method_38656 onPacketReceived (Lnet/minecraft/class_2539;Lnet/minecraft/class_9145;Ljava/net/SocketAddress;I)V ARG 1 state + ARG 2 type ARG 3 remoteAddress ARG 4 bytes METHOD method_38657 onPacketSent (Lnet/minecraft/class_2539;Lnet/minecraft/class_9145;Ljava/net/SocketAddress;I)V ARG 1 state + ARG 2 type ARG 3 remoteAddress ARG 4 bytes METHOD method_38658 isAvailable ()Z METHOD method_38659 startWorldLoadProfiling ()Lnet/minecraft/class_6613; + METHOD method_56979 onChunkRegionRead (Lnet/minecraft/class_9240;Lnet/minecraft/class_1923;Lnet/minecraft/class_4486;I)V + ARG 1 key + ARG 2 chunkPos + ARG 3 format + ARG 4 bytes + METHOD method_56980 onChunkRegionWrite (Lnet/minecraft/class_9240;Lnet/minecraft/class_1923;Lnet/minecraft/class_4486;I)V + ARG 1 key + ARG 2 chunkPos + ARG 3 format + ARG 4 bytes CLASS class_6612 NoopProfiler FIELD field_34924 LOGGER Lorg/slf4j/Logger; FIELD field_34925 NOOP Lnet/minecraft/class_6613; diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping index 6b8d86213c..e88a0a7d95 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping @@ -15,8 +15,11 @@ CLASS net/minecraft/class_6519 net/minecraft/util/profiling/jfr/JfrJsonReport ARG 1 statistics METHOD method_38014 collectPacketSection (Lnet/minecraft/class_6767;Ljava/util/function/BiConsumer;)Lcom/google/gson/JsonElement; ARG 1 statistics + ARG 2 callback METHOD method_38015 collectThreadAllocationSection (Lnet/minecraft/class_6530$class_6531;)Lcom/google/gson/JsonElement; ARG 1 statistics + METHOD method_38016 (Lcom/google/gson/JsonArray;Ljava/util/function/BiConsumer;Lcom/mojang/datafixers/util/Pair;)V + ARG 2 topContributor METHOD method_38017 (Lcom/google/gson/JsonArray;Ljava/lang/String;Ljava/lang/Double;)V ARG 1 threadName ARG 2 allocation @@ -51,3 +54,9 @@ CLASS net/minecraft/class_6519 net/minecraft/util/profiling/jfr/JfrJsonReport ARG 1 samples METHOD method_38664 (Lnet/minecraft/class_6532;)D ARG 0 sample + METHOD method_56983 addChunkData (Lnet/minecraft/class_9234;Lcom/google/gson/JsonObject;)V + ARG 0 chunk + ARG 1 json + METHOD method_56984 addPacketData (Lnet/minecraft/class_6769;Lcom/google/gson/JsonObject;)V + ARG 0 packet + ARG 1 json diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping index 2b22b64fb6..3fea768334 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_6516 net/minecraft/util/profiling/jfr/JfrProfileRecord FIELD field_34433 threadAllocationStatisticsSamples Ljava/util/List; FIELD field_34434 serverTickTimeSamples Ljava/util/List; FIELD field_34435 worldGenDuration Ljava/time/Duration; + FIELD field_49070 chunkRegionReadCounter Ljava/util/Map; + FIELD field_49071 chunkRegionWriteCounter Ljava/util/Map; METHOD (Ljava/util/stream/Stream;)V ARG 1 events METHOD method_38000 createProfile ()Lnet/minecraft/class_6517; @@ -37,7 +39,13 @@ CLASS net/minecraft/class_6516 net/minecraft/util/profiling/jfr/JfrProfileRecord ARG 1 event ARG 2 bytes ARG 3 packetsToCounter - CLASS class_6766 PacketCounter + METHOD method_56981 (Lnet/minecraft/class_9234;)Lnet/minecraft/class_6516$class_6766; + ARG 0 chunk + METHOD method_56982 addChunkRegionEvent (Ljdk/jfr/consumer/RecordedEvent;ILjava/util/Map;)V + ARG 1 event + ARG 2 bytes + ARG 3 chunksToCounter + CLASS class_6766 Counter FIELD field_35581 totalCount J FIELD field_35582 totalBytes J METHOD method_39436 toStatistics ()Lnet/minecraft/class_6767$class_6768; diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping index 34905ac76b..efce971007 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_6505 net/minecraft/util/profiling/jfr/JfrProfiler FIELD field_35576 INSTANCE Lnet/minecraft/class_6505; FIELD field_35577 tickTime F FIELD field_35578 summaryRecorderByAddress Ljava/util/Map; + FIELD field_49058 STORAGE Ljava/lang/String; METHOD method_37982 (Lnet/minecraft/class_6506;Ljava/lang/String;Ljdk/jfr/Recording;)V ARG 2 recording METHOD method_37983 start (Ljava/io/Reader;Lnet/minecraft/class_6506;)Z diff --git a/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping index 0d477585c1..e8be28e5c0 100644 --- a/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/event/ChunkRegionEvent.mapping @@ -1,16 +1,19 @@ CLASS net/minecraft/class_9232 net/minecraft/util/profiling/jfr/event/ChunkRegionEvent FIELD levelId worldId Ljava/lang/String; METHOD (Lnet/minecraft/class_9240;Lnet/minecraft/class_1923;Lnet/minecraft/class_4486;I)V + ARG 1 key + ARG 2 chunkPos + ARG 3 format ARG 4 bytes - CLASS class_9233 Constants - FIELD field_49059 regionPosX Ljava/lang/String; - FIELD field_49060 regionPosZ Ljava/lang/String; - FIELD field_49061 localPosX Ljava/lang/String; - FIELD field_49062 localPosZ Ljava/lang/String; - FIELD field_49063 chunkPosX Ljava/lang/String; - FIELD field_49064 chunkPosZ Ljava/lang/String; - FIELD field_49065 world Ljava/lang/String; - FIELD field_49066 dimension Ljava/lang/String; - FIELD field_49067 type Ljava/lang/String; - FIELD field_49068 compression Ljava/lang/String; - FIELD field_49069 bytes Ljava/lang/String; + CLASS class_9233 Names + FIELD field_49059 REGION_POS_X Ljava/lang/String; + FIELD field_49060 REGION_POS_Z Ljava/lang/String; + FIELD field_49061 LOCAL_POS_X Ljava/lang/String; + FIELD field_49062 LOCAL_POS_Z Ljava/lang/String; + FIELD field_49063 CHUNK_POS_X Ljava/lang/String; + FIELD field_49064 CHUNK_POS_Z Ljava/lang/String; + FIELD field_49065 LEVEL Ljava/lang/String; + FIELD field_49066 DIMENSION Ljava/lang/String; + FIELD field_49067 TYPE Ljava/lang/String; + FIELD field_49068 COMPRESSION Ljava/lang/String; + FIELD field_49069 BYTES Ljava/lang/String; diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/ChunkRegionSample.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/ChunkRegionSample.mapping new file mode 100644 index 0000000000..336045d5f9 --- /dev/null +++ b/mappings/net/minecraft/util/profiling/jfr/sample/ChunkRegionSample.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9234 net/minecraft/util/profiling/jfr/sample/ChunkRegionSample + METHOD method_56985 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_9234; + ARG 0 event diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping index e1ac280700..145226f36e 100644 --- a/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping @@ -14,3 +14,4 @@ CLASS net/minecraft/class_6767 net/minecraft/util/profiling/jfr/sample/NetworkIo FIELD field_35586 COMPARATOR Ljava/util/Comparator; METHOD method_39444 add (Lnet/minecraft/class_6767$class_6768;)Lnet/minecraft/class_6767$class_6768; ARG 1 statistics + METHOD method_56986 getAverageSize ()F diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/PacketSample.mapping similarity index 92% rename from mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping rename to mappings/net/minecraft/util/profiling/jfr/sample/PacketSample.mapping index cc4e3508cb..11189c9003 100644 --- a/mappings/net/minecraft/util/profiling/jfr/sample/Packet.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/sample/PacketSample.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6769 net/minecraft/util/profiling/jfr/sample/Packet +CLASS net/minecraft/class_6769 net/minecraft/util/profiling/jfr/sample/PacketSample FIELD comp_259 side Ljava/lang/String; METHOD comp_259 side ()Ljava/lang/String; METHOD method_39447 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6769; diff --git a/mappings/net/minecraft/world/gen/WorldPresets.mapping b/mappings/net/minecraft/world/gen/WorldPresets.mapping index dbea58e7cc..37338b4b22 100644 --- a/mappings/net/minecraft/world/gen/WorldPresets.mapping +++ b/mappings/net/minecraft/world/gen/WorldPresets.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_5317 net/minecraft/world/gen/WorldPresets METHOD method_41593 bootstrap (Lnet/minecraft/class_7891;)V ARG 0 presetRegisterable METHOD method_41594 getWorldPreset (Lnet/minecraft/class_7723;)Ljava/util/Optional; + ARG 0 registry METHOD method_41597 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id METHOD method_41598 createDemoOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7723; diff --git a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping index d5a57f3b28..1a7f5e53b4 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping @@ -1,6 +1,13 @@ 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 (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_5455;Lnet/minecraft/class_5539;)V + ARG 1 storageKey + ARG 2 directory + ARG 3 dataFixer + ARG 4 dsync + ARG 5 registryManager + ARG 6 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 diff --git a/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping b/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping index a7beb15489..b771e2eacc 100644 --- a/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping +++ b/mappings/net/minecraft/world/storage/ChunkPosKeyedStorage.mapping @@ -3,6 +3,10 @@ CLASS net/minecraft/class_9172 net/minecraft/world/storage/ChunkPosKeyedStorage FIELD field_48761 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_48762 dataFixTypes Lnet/minecraft/class_4284; METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_4284;)V + ARG 1 storageKey + ARG 2 directory + ARG 3 dataFixer + ARG 4 dsync ARG 5 dataFixTypes METHOD method_56565 set (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/concurrent/CompletableFuture; ARG 1 pos diff --git a/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping b/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping index 3096ef698a..3c927b5dca 100644 --- a/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/RecreatedChunkStorage.mapping @@ -1,3 +1,10 @@ CLASS net/minecraft/class_9170 net/minecraft/world/storage/RecreatedChunkStorage FIELD field_48748 recreationWorker Lnet/minecraft/class_4698; FIELD field_48749 outputDirectory Ljava/nio/file/Path; + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V + ARG 1 storageKey + ARG 2 directory + ARG 3 outputStorageKey + ARG 4 outputDirectory + ARG 5 dataFixer + ARG 6 dsync diff --git a/mappings/net/minecraft/world/storage/RecreationStorage.mapping b/mappings/net/minecraft/world/storage/RecreationStorage.mapping index cef5cd7b30..ba61b20a00 100644 --- a/mappings/net/minecraft/world/storage/RecreationStorage.mapping +++ b/mappings/net/minecraft/world/storage/RecreationStorage.mapping @@ -1,3 +1,11 @@ CLASS net/minecraft/class_9171 net/minecraft/world/storage/RecreationStorage FIELD field_48750 recreationWorker Lnet/minecraft/class_4698; FIELD field_48751 outputDirectory Ljava/nio/file/Path; + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_4284;)V + ARG 1 storageKey + ARG 2 directory + ARG 3 outputStorageKey + ARG 4 outputDirectory + ARG 5 dataFixer + ARG 6 dsync + ARG 7 dataFixTypes diff --git a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping index a42ff95720..79121168f7 100644 --- a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping @@ -4,6 +4,11 @@ CLASS net/minecraft/class_2867 net/minecraft/world/storage/RegionBasedStorage FIELD field_23748 dsync Z FIELD field_31425 MCA_EXTENSION Ljava/lang/String; FIELD field_31426 MAX_CACHE_SIZE I + FIELD field_49103 storageKey Lnet/minecraft/class_9240; + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Z)V + ARG 1 storageKey + ARG 2 directory + ARG 3 dsync METHOD method_12440 getRegionFile (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2861; ARG 1 pos METHOD method_17911 getTagAt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping index 442064177f..d2ebeb8721 100644 --- a/mappings/net/minecraft/world/storage/RegionFile.mapping +++ b/mappings/net/minecraft/world/storage/RegionFile.mapping @@ -11,8 +11,18 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile FIELD field_31417 SECTOR_DATA_LIMIT I FIELD field_31421 FILE_EXTENSION Ljava/lang/String; FIELD field_48752 path Ljava/nio/file/Path; + FIELD field_49102 storageKey Lnet/minecraft/class_9240; + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;Z)V + ARG 1 storageKey + ARG 2 path + ARG 3 directory + ARG 4 compressionFormat + ARG 5 dsync METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V + ARG 1 storageKey ARG 2 directory + ARG 3 path + ARG 4 dsync METHOD method_12419 getSectorData (Lnet/minecraft/class_1923;)I ARG 1 pos METHOD method_12423 hasChunk (Lnet/minecraft/class_1923;)Z diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping index 1f78a2716e..807bf7ad28 100644 --- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping +++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping @@ -6,6 +6,10 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker FIELD field_24468 executor Lnet/minecraft/class_3846; FIELD field_38240 blendingStatusCaches Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; FIELD field_38241 MAX_CACHE_SIZE I + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Z)V + ARG 1 storageKey + ARG 2 directory + ARG 3 dsync METHOD method_23698 completeAll (Z)Ljava/util/concurrent/CompletableFuture; ARG 1 sync METHOD method_23701 write (Lnet/minecraft/class_1923;Lnet/minecraft/class_4698$class_4699;)V diff --git a/mappings/net/minecraft/world/storage/StorageKey.mapping b/mappings/net/minecraft/world/storage/StorageKey.mapping new file mode 100644 index 0000000000..bb42a9adef --- /dev/null +++ b/mappings/net/minecraft/world/storage/StorageKey.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9240 net/minecraft/world/storage/StorageKey + METHOD method_57013 withSuffix (Ljava/lang/String;)Lnet/minecraft/class_9240; + ARG 1 suffix diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping index 2cbf14c1df..da6ad4643c 100644 --- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping @@ -3,6 +3,11 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage FIELD field_17655 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_21494 worker Lnet/minecraft/class_4698; FIELD field_36219 FEATURE_UPDATING_VERSION I + METHOD (Lnet/minecraft/class_9240;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V + ARG 1 storageKey + ARG 2 directory + ARG 3 dataFixer + ARG 4 dsync METHOD method_17907 updateChunkNbt (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;Ljava/util/Optional;)Lnet/minecraft/class_2487; ARG 1 worldKey ARG 2 persistentStateManagerFactory diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index 9eebe666c2..0d050c27cc 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -46,18 +46,29 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater METHOD method_5402 cancel ()V METHOD method_5403 isDone ()Z METHOD method_5404 updateWorld ()V + METHOD method_56987 getNewDirectoryPath (Ljava/nio/file/Path;)Ljava/nio/file/Path; + ARG 0 current CLASS class_9161 Update FIELD field_48732 pendingUpdateFuture Ljava/util/concurrent/CompletableFuture; FIELD field_48733 dataFixTypes Lnet/minecraft/class_4284; FIELD field_48735 upgradingText Lnet/minecraft/class_5250; FIELD field_48736 finishedText Lnet/minecraft/class_5250; FIELD field_48737 targetName Ljava/lang/String; + FIELD field_49072 name Ljava/lang/String; + METHOD (Lnet/minecraft/class_1257;Lnet/minecraft/class_4284;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_5250;Lnet/minecraft/class_5250;)V + ARG 2 dataFixTypes + ARG 3 name + ARG 4 targetName + ARG 5 upgradingText + ARG 6 finishedText METHOD method_56537 update ()V METHOD method_56538 update (Lnet/minecraft/class_5321;Ljava/lang/AutoCloseable;Lnet/minecraft/class_1923;)Z ARG 1 worldKey ARG 2 storage ARG 3 chunkPos METHOD method_56539 listRegions (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/util/List; + ARG 0 key + ARG 1 regionDirectory METHOD method_56540 (Lnet/minecraft/class_1257$class_9165;)I ARG 0 region METHOD method_56541 recreate (Lnet/minecraft/class_2861;)V @@ -71,7 +82,10 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater ARG 3 worldKey METHOD method_56544 listWoldData ()Ljava/util/List; METHOD method_56545 enumerateRegions (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/util/ListIterator; + ARG 1 key + ARG 2 regionDirectory METHOD method_56546 openStorage (Lnet/minecraft/class_9240;Ljava/nio/file/Path;)Ljava/lang/AutoCloseable; + ARG 1 key ARG 2 worldDirectory CLASS class_9162 RegionUpdate CLASS class_9163 WorldData @@ -79,6 +93,11 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater CLASS class_9165 Region CLASS class_9166 PoiUpdate CLASS class_9167 ChunkPosKeyedStorageUpdate + METHOD (Lnet/minecraft/class_1257;Lnet/minecraft/class_4284;Ljava/lang/String;Lnet/minecraft/class_5250;Lnet/minecraft/class_5250;)V + ARG 2 dataFixTypes + ARG 3 targetName + ARG 4 upgradingText + ARG 5 finishedText METHOD method_56550 updateNbt (Lnet/minecraft/class_9172;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 storage ARG 2 nbt