From dfa505944a32c359ca9ba444aced7fbee18024e2 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:15:56 +0900 Subject: [PATCH] 24w06a resource, registry, network --- mappings/net/minecraft/class_9224.mapping | 3 -- mappings/net/minecraft/class_9243.mapping | 2 -- mappings/net/minecraft/class_9247.mapping | 5 ---- .../ClientConfigurationNetworkHandler.mapping | 5 ++++ .../client/network/ClientRegistries.mapping | 7 ++++- .../client/network/ClientTagLoader.mapping | 22 +++++++++++++++ .../net/minecraft/client/network/Tags.mapping | 6 ---- .../resource/ClientDataPackManager.mapping | 10 +++++++ .../DefaultClientResourcePackProvider.mapping | 8 +++++- .../server/ServerResourcePackLoader.mapping | 1 + .../config/DynamicRegistriesS2CPacket.mapping | 1 + .../registry/MutableRegistry.mapping | 1 + .../net/minecraft/registry/Registry.mapping | 17 ++++++++++- .../minecraft/registry/RegistryLoader.mapping | 28 +++++++++++++++++++ .../registry/SerializableRegistries.mapping | 11 ++++++++ .../minecraft/registry/SimpleRegistry.mapping | 3 ++ .../VersionedIdentifier.mapping | 2 +- .../registry/entry/RegistryEntryInfo.mapping | 2 ++ .../resource/AbstractFileResourcePack.mapping | 3 ++ .../resource/DefaultResourcePack.mapping | 7 +++++ .../DefaultResourcePackBuilder.mapping | 1 + .../resource/DirectoryResourcePack.mapping | 1 + .../resource/FileResourcePackProvider.mapping | 5 ++++ .../net/minecraft/resource/Resource.mapping | 1 + .../resource/ResourceFactory.mapping | 3 ++ .../minecraft/resource/ResourcePack.mapping | 4 ++- .../resource/ResourcePackInfo.mapping | 6 ++++ .../resource/ResourcePackPosition.mapping | 1 + .../resource/ResourcePackProfile.mapping | 17 +++++++++-- .../resource/VanillaDataPackProvider.mapping | 10 ++++++- .../VanillaResourcePackProvider.mapping | 3 +- .../resource/ZipResourcePack.mapping | 2 ++ .../ServerConfigurationNetworkHandler.mapping | 3 ++ .../network/ServerPlayNetworkHandler.mapping | 3 ++ .../network/SynchronizeRegistriesTask.mapping | 14 ++++++++++ 35 files changed, 193 insertions(+), 25 deletions(-) delete mode 100644 mappings/net/minecraft/class_9224.mapping delete mode 100644 mappings/net/minecraft/class_9243.mapping delete mode 100644 mappings/net/minecraft/class_9247.mapping create mode 100644 mappings/net/minecraft/client/network/ClientTagLoader.mapping delete mode 100644 mappings/net/minecraft/client/network/Tags.mapping create mode 100644 mappings/net/minecraft/client/resource/ClientDataPackManager.mapping rename mappings/net/minecraft/{network/packet => registry}/VersionedIdentifier.mapping (75%) create mode 100644 mappings/net/minecraft/registry/entry/RegistryEntryInfo.mapping create mode 100644 mappings/net/minecraft/resource/ResourcePackInfo.mapping create mode 100644 mappings/net/minecraft/resource/ResourcePackPosition.mapping 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/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/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/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..9f2b260879 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 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/Resource.mapping b/mappings/net/minecraft/resource/Resource.mapping index 6ebcf30728..a8c2b515da 100644 --- a/mappings/net/minecraft/resource/Resource.mapping +++ b/mappings/net/minecraft/resource/Resource.mapping @@ -29,3 +29,4 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource 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/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..c970a23ee8 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 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/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..66dff87336 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 @@ -18,7 +19,7 @@ CLASS net/minecraft/class_7678 net/minecraft/resource/VanillaResourcePackProvide METHOD method_45259 getProfileName (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 id ARG 2 packFactory ARG 3 displayName METHOD method_45261 getFileName (Ljava/nio/file/Path;)Ljava/lang/String; 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/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