From de3a79afb8e7cabcecf468f9ff12b53ff79cd359 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 21 Oct 2022 00:56:05 +0900 Subject: [PATCH] 22w42a resource (#3329) * 22w42a resource * Finish mapping common resource * Map and rename client resource * Move TextReorderingProcessor to net.minecraft.text * Map various resource related stuff --- .../minecraft/client/MinecraftClient.mapping | 7 ++- .../DefaultClientResourcePack.mapping | 1 - .../DefaultClientResourcePackProvider.mapping | 15 +++++ .../client/resource/ResourceIndex.mapping | 7 +++ ...ing => ServerResourcePackProvider.mapping} | 7 ++- .../net/minecraft/client/sound/Sound.mapping | 1 + .../resource/AbstractFileResourcePack.mapping | 3 + .../resource/DefaultResourcePack.mapping | 30 +++++++++ .../DefaultResourcePackBuilder.mapping | 41 ++++++++++++ .../resource/DirectoryResourcePack.mapping | 29 +++++++++ .../resource/FileResourcePackProvider.mapping | 22 ++++++- .../minecraft/resource/InputSupplier.mapping | 5 ++ .../LifecycledResourceManagerImpl.mapping | 5 ++ .../resource/NamespaceResourceManager.mapping | 40 ++++++++++++ .../net/minecraft/resource/Resource.mapping | 5 ++ .../resource/ResourceFactory.mapping | 4 ++ .../minecraft/resource/ResourceFinder.mapping | 22 +++++++ .../minecraft/resource/ResourcePack.mapping | 6 ++ .../resource/ResourcePackManager.mapping | 3 + .../resource/ResourcePackProfile.mapping | 38 +++++++++++ .../resource/ResourcePackSource.mapping | 15 ++++- .../SinglePreparationResourceReloader.mapping | 2 + .../resource/VanillaDataPackProvider.mapping | 12 +++- .../VanillaResourcePackProvider.mapping | 38 +++++++++++ .../resource/ZipResourcePack.mapping | 9 +++ .../resource/fs/ResourceFile.mapping | 5 ++ .../fs/ResourceFileAttributes.mapping | 2 + .../resource/fs/ResourceFileStore.mapping | 12 ++++ .../resource/fs/ResourceFileSystem.mapping | 43 +++++++++++++ .../fs/ResourceFileSystemProvider.mapping | 63 +++++++++++++++++++ .../resource/fs/ResourcePath.mapping | 62 ++++++++++++++++++ .../metadata/PackResourceMetadata.mapping | 2 +- .../resource/metadata/ResourceFilter.mapping | 1 + .../metadata/ResourceMetadata.mapping | 1 + .../metadata/ResourceMetadataMap.mapping | 16 +++++ .../ResourceMetadataSerializer.mapping | 11 ++++ .../minecraft/server/DataPackContents.mapping | 6 ++ .../server/command/DatapackCommand.mapping | 8 +++ .../server/function/FunctionLoader.mapping | 1 + .../StructureTemplateManager.mapping | 1 + .../TextReorderingProcessor.mapping | 2 +- .../net/minecraft/util/FileNameUtil.mapping | 10 +++ .../net/minecraft/util/Identifier.mapping | 19 ++++++ 43 files changed, 624 insertions(+), 8 deletions(-) delete mode 100644 mappings/net/minecraft/client/resource/DefaultClientResourcePack.mapping create mode 100644 mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping rename mappings/net/minecraft/client/resource/{ClientBuiltinResourcePackProvider.mapping => ServerResourcePackProvider.mapping} (81%) create mode 100644 mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping create mode 100644 mappings/net/minecraft/resource/ResourceFinder.mapping create mode 100644 mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping create mode 100644 mappings/net/minecraft/resource/fs/ResourceFile.mapping create mode 100644 mappings/net/minecraft/resource/fs/ResourceFileAttributes.mapping create mode 100644 mappings/net/minecraft/resource/fs/ResourceFileStore.mapping create mode 100644 mappings/net/minecraft/resource/fs/ResourceFileSystem.mapping create mode 100644 mappings/net/minecraft/resource/fs/ResourceFileSystemProvider.mapping create mode 100644 mappings/net/minecraft/resource/fs/ResourcePath.mapping create mode 100644 mappings/net/minecraft/resource/metadata/ResourceMetadataMap.mapping create mode 100644 mappings/net/minecraft/resource/metadata/ResourceMetadataSerializer.mapping rename mappings/net/minecraft/{client/resource/language => text}/TextReorderingProcessor.mapping (92%) diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index e8f510eb4e..7b94dfb30f 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -178,6 +178,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_39769 narratorManager Lnet/minecraft/class_333; FIELD field_39770 messageHandler Lnet/minecraft/class_7594; FIELD field_39924 advanceValidatingTextRenderer Lnet/minecraft/class_327; + FIELD field_40380 defaultResourcePack Lnet/minecraft/class_3268; + FIELD field_40381 serverResourcePackProvider Lnet/minecraft/class_1066; METHOD (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1476 checkIs64Bit ()Z @@ -234,7 +236,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1513 reloadResourcesConcurrently ()Ljava/util/concurrent/CompletableFuture; METHOD method_1514 run ()V METHOD method_1515 getGameVersion ()Ljava/lang/String; - METHOD method_1516 getResourcePackProvider ()Lnet/minecraft/class_1066; + METHOD method_1516 getServerResourcePackProvider ()Lnet/minecraft/class_1066; METHOD method_1517 isFancyGraphicsOrBetter ()Z METHOD method_1519 cleanUpAfterCrash ()V METHOD method_1520 getResourcePackManager ()Lnet/minecraft/class_3283; @@ -493,6 +495,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_44649 isMultiplayerBanned ()Z METHOD method_44713 getNarratorManager ()Lnet/minecraft/class_333; METHOD method_44714 getMessageHandler ()Lnet/minecraft/class_7594; + METHOD method_45573 getDefaultResourcePack ()Lnet/minecraft/class_3268; + METHOD method_45574 getDefaultResourceSupplier ([Ljava/lang/String;)Lnet/minecraft/class_7367; + ARG 1 segments CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/resource/DefaultClientResourcePack.mapping b/mappings/net/minecraft/client/resource/DefaultClientResourcePack.mapping deleted file mode 100644 index d5b31bd4c7..0000000000 --- a/mappings/net/minecraft/client/resource/DefaultClientResourcePack.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1065 net/minecraft/client/resource/DefaultClientResourcePack diff --git a/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping new file mode 100644 index 0000000000..68066b88ed --- /dev/null +++ b/mappings/net/minecraft/client/resource/DefaultClientResourcePackProvider.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_1065 net/minecraft/client/resource/DefaultClientResourcePackProvider + FIELD field_40556 METADATA Lnet/minecraft/class_3272; + FIELD field_40557 METADATA_MAP Lnet/minecraft/class_7662; + FIELD field_40558 VANILLA_NAME_TEXT Lnet/minecraft/class_2561; + 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; + METHOD (Ljava/nio/file/Path;)V + ARG 1 assetsPath + METHOD method_45855 (Lnet/minecraft/class_3262;Ljava/lang/String;)Lnet/minecraft/class_3262; + ARG 1 name + METHOD method_45856 getResourcePacksPath (Ljava/nio/file/Path;)Ljava/nio/file/Path; + ARG 1 path + METHOD method_45857 createDefaultPack (Ljava/nio/file/Path;)Lnet/minecraft/class_3268; + ARG 0 assetsPath diff --git a/mappings/net/minecraft/client/resource/ResourceIndex.mapping b/mappings/net/minecraft/client/resource/ResourceIndex.mapping index 81ddabbb76..5464c633f0 100644 --- a/mappings/net/minecraft/client/resource/ResourceIndex.mapping +++ b/mappings/net/minecraft/client/resource/ResourceIndex.mapping @@ -1,2 +1,9 @@ CLASS net/minecraft/class_1064 net/minecraft/client/resource/ResourceIndex + FIELD field_40563 SEPARATOR_SPLITTER Lcom/google/common/base/Splitter; FIELD field_5290 LOGGER Lorg/slf4j/Logger; + METHOD method_45858 buildFileSystem (Ljava/nio/file/Path;Ljava/lang/String;)Ljava/nio/file/Path; + COMMENT Builds the resource file system from the index. + COMMENT + COMMENT @return the root path of the resource file system + ARG 0 assetsDir + ARG 1 indexName diff --git a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/ServerResourcePackProvider.mapping similarity index 81% rename from mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping rename to mappings/net/minecraft/client/resource/ServerResourcePackProvider.mapping index 2f5dbb2714..7e3dbd8416 100644 --- a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping +++ b/mappings/net/minecraft/client/resource/ServerResourcePackProvider.mapping @@ -1,8 +1,9 @@ -CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResourcePackProvider +CLASS net/minecraft/class_1066 net/minecraft/client/resource/ServerResourcePackProvider FIELD field_32958 MAX_FILE_SIZE I FIELD field_32959 MAX_SAVED_PACKS I FIELD field_32961 SERVER Ljava/lang/String; FIELD field_33633 APPLYING_PACK_TEXT Lnet/minecraft/class_2561; + FIELD field_40562 SERVER_NAME_TEXT Lnet/minecraft/class_2561; FIELD field_5292 serverPacksRoot Ljava/io/File; FIELD field_5294 downloadTask Ljava/util/concurrent/CompletableFuture; FIELD field_5295 serverContainer Lnet/minecraft/class_3288; @@ -25,7 +26,11 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResour ARG 2 void_ METHOD method_44603 (Ljava/lang/Void;)V ARG 1 void_ + METHOD method_4634 (Ljava/lang/String;Ljava/io/File;Lnet/minecraft/class_310;ZLjava/lang/Object;)Ljava/util/concurrent/CompletionStage; + ARG 5 object METHOD method_4636 getDownloadHeaders ()Ljava/util/Map; + METHOD method_4637 (Ljava/io/File;Ljava/lang/String;)Lnet/minecraft/class_3262; + ARG 1 name METHOD method_4638 loadServerPack (Ljava/io/File;Lnet/minecraft/class_5352;)Ljava/util/concurrent/CompletableFuture; ARG 1 packZip ARG 2 packSource diff --git a/mappings/net/minecraft/client/sound/Sound.mapping b/mappings/net/minecraft/client/sound/Sound.mapping index 4592fd2ddd..240d9c6f00 100644 --- a/mappings/net/minecraft/client/sound/Sound.mapping +++ b/mappings/net/minecraft/client/sound/Sound.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1111 net/minecraft/client/sound/Sound + FIELD field_40575 FINDER Lnet/minecraft/class_7654; FIELD field_5463 attenuation I FIELD field_5464 pitch Lnet/minecraft/class_7373; FIELD field_5465 preload Z diff --git a/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping b/mappings/net/minecraft/resource/AbstractFileResourcePack.mapping index 01a700c9f5..3fb81e5af1 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_39993 name Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 name 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 9c48eda626..991f397ce1 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePack.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping @@ -2,6 +2,36 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack FIELD field_14193 namespaces Ljava/util/Set; FIELD field_14195 LOGGER Lorg/slf4j/Logger; FIELD field_26938 metadata Lnet/minecraft/class_7662; + FIELD field_40002 rootPaths Ljava/util/List; + FIELD field_40003 namespacePaths Ljava/util/Map; + METHOD (Lnet/minecraft/class_7662;Ljava/util/Set;Ljava/util/List;Ljava/util/Map;)V + ARG 1 metadata + ARG 2 namespaces + ARG 3 rootPaths + ARG 4 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 ARG 2 root + ARG 3 prefixSegments METHOD method_43032 getFactory ()Lnet/minecraft/class_5912; + METHOD method_45188 (Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 1 name + 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 + ARG 4 segments + METHOD method_45191 (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DataResult$PartialResult;)Lnet/minecraft/class_7367; + ARG 1 result + METHOD method_45192 forEachNamespacedPath (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;Ljava/util/function/Consumer;)V + ARG 1 type + ARG 2 path + ARG 3 consumer + METHOD method_45193 (Lnet/minecraft/class_3264;Lnet/minecraft/class_3262$class_7664;Ljava/lang/String;Ljava/util/List;)V + ARG 4 segments + METHOD method_45194 (Lnet/minecraft/class_7367;)Lnet/minecraft/class_3298; + ARG 1 stream + METHOD method_45195 (Ljava/lang/String;Lcom/mojang/serialization/DataResult$PartialResult;)V + ARG 1 result + METHOD method_45196 (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DataResult$PartialResult;)V + ARG 1 result diff --git a/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping new file mode 100644 index 0000000000..4c157c6e44 --- /dev/null +++ b/mappings/net/minecraft/resource/DefaultResourcePackBuilder.mapping @@ -0,0 +1,41 @@ +CLASS net/minecraft/class_7665 net/minecraft/resource/DefaultResourcePackBuilder + FIELD field_40004 callback Ljava/util/function/Consumer; + FIELD field_40005 LOGGER Lorg/slf4j/Logger; + FIELD field_40006 RESOURCE_TYPE_TO_PATH Ljava/util/Map; + FIELD field_40007 rootPaths Ljava/util/Set; + FIELD field_40008 paths Ljava/util/Map; + FIELD field_40009 metadataMap Lnet/minecraft/class_7662; + FIELD field_40010 namespaces Ljava/util/Set; + METHOD method_45197 withDefaultPaths ()Lnet/minecraft/class_7665; + METHOD method_45198 withMetadataMap (Lnet/minecraft/class_7662;)Lnet/minecraft/class_7665; + ARG 1 metadataMap + METHOD method_45199 (Lnet/minecraft/class_3264;)Ljava/util/Set; + ARG 0 type2 + METHOD method_45200 withPaths (Lnet/minecraft/class_3264;Ljava/lang/Class;)Lnet/minecraft/class_7665; + ARG 1 type + ARG 2 clazz + METHOD method_45201 withPath (Lnet/minecraft/class_3264;Ljava/nio/file/Path;)Lnet/minecraft/class_7665; + ARG 1 type + ARG 2 path + METHOD method_45202 (Lnet/minecraft/class_7665;)V + ARG 0 builder + METHOD method_45203 toPath (Ljava/net/URI;)Ljava/nio/file/Path; + ARG 0 uri + METHOD method_45204 withRoot (Ljava/nio/file/Path;)Lnet/minecraft/class_7665; + ARG 1 root + METHOD method_45205 reverse (Ljava/util/Collection;)Ljava/util/List; + ARG 0 paths + METHOD method_45206 withNamespaces ([Ljava/lang/String;)Lnet/minecraft/class_7665; + ARG 1 namespaces + METHOD method_45207 runCallback ()Lnet/minecraft/class_7665; + METHOD method_45208 addPath (Lnet/minecraft/class_3264;Ljava/nio/file/Path;)V + ARG 1 type + ARG 2 path + METHOD method_45209 exists (Ljava/nio/file/Path;)Z + ARG 1 path + METHOD method_45210 build ()Lnet/minecraft/class_3268; + METHOD method_45211 (Lnet/minecraft/class_3264;Ljava/nio/file/Path;)V + ARG 1 type + ARG 2 path + METHOD method_45212 addRootPath (Ljava/nio/file/Path;)V + ARG 1 path diff --git a/mappings/net/minecraft/resource/DirectoryResourcePack.mapping b/mappings/net/minecraft/resource/DirectoryResourcePack.mapping index bc34489ed3..9955bbb151 100644 --- a/mappings/net/minecraft/resource/DirectoryResourcePack.mapping +++ b/mappings/net/minecraft/resource/DirectoryResourcePack.mapping @@ -1,3 +1,32 @@ CLASS net/minecraft/class_3259 net/minecraft/resource/DirectoryResourcePack FIELD field_14187 LOGGER Lorg/slf4j/Logger; + FIELD field_40000 SEPARATOR_JOINER Lcom/google/common/base/Joiner; + FIELD field_40001 root Ljava/nio/file/Path; + METHOD (Ljava/lang/String;Ljava/nio/file/Path;)V + ARG 1 name + ARG 2 root METHOD method_14402 isValidPath (Ljava/nio/file/Path;)Z + ARG 0 path + METHOD method_45179 (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DataResult$PartialResult;)Lnet/minecraft/class_7367; + ARG 1 result + METHOD method_45180 open (Lnet/minecraft/class_2960;Ljava/nio/file/Path;)Lnet/minecraft/class_7367; + ARG 0 id + ARG 1 path + METHOD method_45181 (Lnet/minecraft/class_3264;Ljava/lang/String;Lnet/minecraft/class_3262$class_7664;Ljava/util/List;)V + ARG 4 prefixSegments + METHOD method_45182 (Ljava/lang/String;Lcom/mojang/serialization/DataResult$PartialResult;)V + ARG 1 result + METHOD method_45183 findResources (Ljava/lang/String;Ljava/nio/file/Path;Ljava/util/List;Lnet/minecraft/class_3262$class_7664;)V + ARG 0 namespace + ARG 1 path + ARG 2 prefixSegments + ARG 3 consumer + METHOD method_45184 (Ljava/nio/file/Path;Ljava/lang/String;Lnet/minecraft/class_3262$class_7664;Ljava/nio/file/Path;)V + ARG 3 foundPath + METHOD method_45185 (Ljava/nio/file/Path;Ljava/nio/file/attribute/BasicFileAttributes;)Z + ARG 0 path2 + ARG 1 attributes + METHOD method_45186 (Ljava/nio/file/Path;Ljava/util/List;)Lnet/minecraft/class_7367; + ARG 1 segments + METHOD method_45187 open (Ljava/nio/file/Path;)Lnet/minecraft/class_7367; + ARG 0 path diff --git a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping index 8406ec1451..d270a631bb 100644 --- a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping +++ b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping @@ -1,3 +1,23 @@ CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackProvider - FIELD field_14218 packsFolder Ljava/nio/file/Path; + FIELD field_14218 packsDir Ljava/nio/file/Path; FIELD field_25345 source Lnet/minecraft/class_5352; + FIELD field_40044 LOGGER Lorg/slf4j/Logger; + FIELD field_40045 type Lnet/minecraft/class_3264; + METHOD (Ljava/nio/file/Path;Lnet/minecraft/class_3264;Lnet/minecraft/class_5352;)V + ARG 1 packsDir + ARG 2 type + ARG 3 source + METHOD method_45268 (Ljava/io/File;Ljava/lang/String;)Lnet/minecraft/class_3262; + ARG 1 name + METHOD method_45269 getFactory (Ljava/nio/file/Path;)Lnet/minecraft/class_3288$class_7680; + ARG 0 path + METHOD method_45270 (Ljava/nio/file/Path;Ljava/lang/String;)Lnet/minecraft/class_3262; + ARG 1 name + METHOD method_45271 forEachProfile (Ljava/nio/file/Path;Ljava/util/function/BiConsumer;)V + ARG 0 packsDir + ARG 1 consumer + 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 diff --git a/mappings/net/minecraft/resource/InputSupplier.mapping b/mappings/net/minecraft/resource/InputSupplier.mapping index e4e023d6ad..f6d4a78ae5 100644 --- a/mappings/net/minecraft/resource/InputSupplier.mapping +++ b/mappings/net/minecraft/resource/InputSupplier.mapping @@ -1 +1,6 @@ CLASS net/minecraft/class_7367 net/minecraft/resource/InputSupplier + METHOD create (Ljava/nio/file/Path;)Lnet/minecraft/class_7367; + ARG 0 path + METHOD create (Ljava/util/zip/ZipFile;Ljava/util/zip/ZipEntry;)Lnet/minecraft/class_7367; + ARG 0 zipFile + ARG 1 zipEntry diff --git a/mappings/net/minecraft/resource/LifecycledResourceManagerImpl.mapping b/mappings/net/minecraft/resource/LifecycledResourceManagerImpl.mapping index a05a8f78e7..ece38e9ba9 100644 --- a/mappings/net/minecraft/resource/LifecycledResourceManagerImpl.mapping +++ b/mappings/net/minecraft/resource/LifecycledResourceManagerImpl.mapping @@ -17,3 +17,8 @@ CLASS net/minecraft/class_6861 net/minecraft/resource/LifecycledResourceManagerI ARG 1 pack METHOD method_41276 (Lnet/minecraft/class_7084;Lnet/minecraft/class_2960;)Z ARG 1 id + METHOD method_45303 validateStartingPath (Ljava/lang/String;)V + COMMENT Validates the starting path to ensure that it does not end with a slash. + COMMENT + COMMENT @throws IllegalArgumentException if {@code startingPath} has a trailing slash + ARG 0 startingPath diff --git a/mappings/net/minecraft/resource/NamespaceResourceManager.mapping b/mappings/net/minecraft/resource/NamespaceResourceManager.mapping index cac642cc99..0998ba103c 100644 --- a/mappings/net/minecraft/resource/NamespaceResourceManager.mapping +++ b/mappings/net/minecraft/resource/NamespaceResourceManager.mapping @@ -39,6 +39,32 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager METHOD method_43035 createMetadataSupplier (Lnet/minecraft/class_2960;I)Lnet/minecraft/class_7367; ARG 1 id ARG 2 index + METHOD method_45288 wrapForDebug (Lnet/minecraft/class_2960;Lnet/minecraft/class_3262;Lnet/minecraft/class_7367;)Lnet/minecraft/class_7367; + ARG 0 id + ARG 1 pack + ARG 2 supplier + METHOD method_45290 createResource (Lnet/minecraft/class_3262;Lnet/minecraft/class_2960;Lnet/minecraft/class_7367;Lnet/minecraft/class_7367;)Lnet/minecraft/class_3298; + ARG 0 pack + ARG 1 id + ARG 2 supplier + ARG 3 metadataSupplier + METHOD method_45291 getMetadataSupplier (Lnet/minecraft/class_7367;)Lnet/minecraft/class_7367; + ARG 0 supplier + METHOD method_45293 (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_3294$class_7681;)V + ARG 2 id + ARG 3 result + METHOD method_45294 (Ljava/util/function/Predicate;Ljava/util/Map;Lnet/minecraft/class_3262;ILjava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_7367;)V + ARG 5 id + ARG 6 supplier + METHOD method_45295 (Ljava/util/function/Predicate;Ljava/util/Map;Lnet/minecraft/class_3262;Lnet/minecraft/class_2960;Lnet/minecraft/class_7367;)V + ARG 3 id + ARG 4 supplier + METHOD method_45296 isMcmeta (Lnet/minecraft/class_2960;)Z + ARG 0 id + METHOD method_45297 loadMetadata (Lnet/minecraft/class_7367;)Lnet/minecraft/class_7368; + ARG 0 supplier + METHOD method_45298 getMetadataFileName (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + ARG 0 id CLASS class_3295 DebugInputStream FIELD field_14287 closed Z FIELD field_14288 leakMessage Ljava/util/function/Supplier; @@ -47,7 +73,11 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager ARG 2 id ARG 3 packName CLASS class_7081 EntryList + FIELD comp_1005 id Lnet/minecraft/class_2960; FIELD comp_527 metadataId Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2960;)V + ARG 1 id + METHOD comp_1005 id ()Lnet/minecraft/class_2960; METHOD comp_527 metadataId ()Lnet/minecraft/class_2960; CLASS class_7082 FilterablePack FIELD comp_530 underlying Lnet/minecraft/class_3262; @@ -56,3 +86,13 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager ARG 1 ids METHOD method_41269 isFiltered (Lnet/minecraft/class_2960;)Z ARG 1 id + CLASS class_7681 Result + FIELD comp_1002 pack Lnet/minecraft/class_3262; + FIELD comp_1003 supplier Lnet/minecraft/class_7367; + METHOD comp_1002 pack ()Lnet/minecraft/class_3262; + METHOD comp_1003 supplier ()Lnet/minecraft/class_7367; + CLASS class_7682 FileSource + FIELD comp_1008 sourcePack Lnet/minecraft/class_3262; + FIELD comp_1009 supplier Lnet/minecraft/class_7367; + METHOD comp_1008 sourcePack ()Lnet/minecraft/class_3262; + METHOD comp_1009 supplier ()Lnet/minecraft/class_7367; diff --git a/mappings/net/minecraft/resource/Resource.mapping b/mappings/net/minecraft/resource/Resource.mapping index f9935679d7..38d380f637 100644 --- a/mappings/net/minecraft/resource/Resource.mapping +++ b/mappings/net/minecraft/resource/Resource.mapping @@ -8,9 +8,12 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource FIELD field_38685 inputSupplier Lnet/minecraft/class_7367; FIELD field_38686 metadataSupplier Lnet/minecraft/class_7367; FIELD field_38687 metadata Lnet/minecraft/class_7368; + FIELD field_40054 pack Lnet/minecraft/class_3262; METHOD (Lnet/minecraft/class_3262;Lnet/minecraft/class_7367;)V + ARG 1 pack ARG 2 inputSupplier METHOD (Lnet/minecraft/class_3262;Lnet/minecraft/class_7367;Lnet/minecraft/class_7367;)V + ARG 1 pack ARG 2 inputSupplier ARG 3 metadataSupplier METHOD method_14480 getResourcePackName ()Ljava/lang/String; @@ -25,3 +28,5 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/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_45305 isAlwaysStable ()Z diff --git a/mappings/net/minecraft/resource/ResourceFactory.mapping b/mappings/net/minecraft/resource/ResourceFactory.mapping index 595d82aa86..7a23b9baf0 100644 --- a/mappings/net/minecraft/resource/ResourceFactory.mapping +++ b/mappings/net/minecraft/resource/ResourceFactory.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_5912 net/minecraft/resource/ResourceFactory COMMENT Provides resource access. + METHOD fromMap (Ljava/util/Map;)Lnet/minecraft/class_5912; + ARG 0 map METHOD getResourceOrThrow (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3298; ARG 1 id METHOD method_14486 getResource (Lnet/minecraft/class_2960;)Ljava/util/Optional; @@ -11,6 +13,8 @@ CLASS net/minecraft/class_5912 net/minecraft/resource/ResourceFactory COMMENT

The returned resource must be closed to avoid resource leaks. ARG 1 id COMMENT the resource identifier to search for + METHOD method_45307 (Ljava/util/Map;Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 1 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/ResourceFinder.mapping b/mappings/net/minecraft/resource/ResourceFinder.mapping new file mode 100644 index 0000000000..3263e96675 --- /dev/null +++ b/mappings/net/minecraft/resource/ResourceFinder.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/class_7654 net/minecraft/resource/ResourceFinder + FIELD field_39966 directoryName Ljava/lang/String; + FIELD field_39967 fileExtension Ljava/lang/String; + METHOD (Ljava/lang/String;Ljava/lang/String;)V + ARG 1 directoryName + ARG 2 fileExtension + METHOD method_45112 toResourcePath (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + COMMENT {@return an identifier that is used as a file path for locating the resource {@code id}} + ARG 1 id + METHOD method_45113 findResources (Lnet/minecraft/class_3300;)Ljava/util/Map; + ARG 1 resourceManager + METHOD method_45114 json (Ljava/lang/String;)Lnet/minecraft/class_7654; + ARG 0 directoryName + METHOD method_45115 toResourceId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + COMMENT {@return an identifier of the resource located at the file path {@code path}} + ARG 1 path + METHOD method_45116 findAllResources (Lnet/minecraft/class_3300;)Ljava/util/Map; + ARG 1 resourceManager + METHOD method_45117 (Lnet/minecraft/class_2960;)Z + ARG 1 path + METHOD method_45118 (Lnet/minecraft/class_2960;)Z + ARG 1 path diff --git a/mappings/net/minecraft/resource/ResourcePack.mapping b/mappings/net/minecraft/resource/ResourcePack.mapping index 0ef77b4938..a46ecbcee5 100644 --- a/mappings/net/minecraft/resource/ResourcePack.mapping +++ b/mappings/net/minecraft/resource/ResourcePack.mapping @@ -18,5 +18,11 @@ CLASS net/minecraft/class_3262 net/minecraft/resource/ResourcePack ARG 1 type ARG 2 namespace ARG 3 prefix + ARG 4 consumer METHOD method_14409 getName ()Ljava/lang/String; METHOD method_14410 openRoot ([Ljava/lang/String;)Lnet/minecraft/class_7367; + ARG 1 segments + METHOD method_45178 isAlwaysStable ()Z + COMMENT {@return whether the dynamic registry entries from this pack are always + COMMENT "stable"/not experimental} + CLASS class_7664 ResultConsumer diff --git a/mappings/net/minecraft/resource/ResourcePackManager.mapping b/mappings/net/minecraft/resource/ResourcePackManager.mapping index 14890e2557..862e0b9f58 100644 --- a/mappings/net/minecraft/resource/ResourcePackManager.mapping +++ b/mappings/net/minecraft/resource/ResourcePackManager.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager FIELD field_14225 enabled Ljava/util/List; FIELD field_14226 profiles Ljava/util/Map; FIELD field_14227 providers Ljava/util/Set; + METHOD ([Lnet/minecraft/class_3285;)V + ARG 1 providers METHOD method_14441 getProfiles ()Ljava/util/Collection; METHOD method_14444 getEnabledProfiles ()Ljava/util/Collection; METHOD method_14445 scanPacks ()V @@ -24,3 +26,4 @@ CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager METHOD method_29212 providePackProfiles ()Ljava/util/Map; METHOD method_29484 (Ljava/util/Map;Lnet/minecraft/class_3288;)V ARG 1 profile + METHOD method_45278 getRequestedFeatures ()Lnet/minecraft/class_7699; diff --git a/mappings/net/minecraft/resource/ResourcePackProfile.mapping b/mappings/net/minecraft/resource/ResourcePackProfile.mapping index 9559bfd133..3b097e3194 100644 --- a/mappings/net/minecraft/resource/ResourcePackProfile.mapping +++ b/mappings/net/minecraft/resource/ResourcePackProfile.mapping @@ -18,6 +18,17 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile FIELD field_14278 compatibility Lnet/minecraft/class_3281; FIELD field_14279 LOGGER Lorg/slf4j/Logger; FIELD field_25346 source Lnet/minecraft/class_5352; + FIELD field_40046 requestedFeatures Lnet/minecraft/class_7699; + METHOD (Ljava/lang/String;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_2561;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_3281;Lnet/minecraft/class_3288$class_3289;ZLnet/minecraft/class_5352;)V + ARG 1 name + ARG 2 alwaysEnabled + ARG 3 packFactory + ARG 4 displayName + ARG 5 metadata + ARG 6 compatibility + ARG 7 position + ARG 8 pinned + ARG 9 source METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_14456 of (Ljava/lang/String;Lnet/minecraft/class_2561;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_3264;Lnet/minecraft/class_3288$class_3289;ZLnet/minecraft/class_5352;)Lnet/minecraft/class_3288; @@ -29,6 +40,15 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile COMMENT {@code null}. COMMENT COMMENT @return the created profile, or {@code null} if missing metadata + ARG 0 name + ARG 1 displayName + ARG 2 alwaysEnabled + ARG 3 packFactory + ARG 4 metadata + ARG 5 type + ARG 6 position + ARG 7 pinned + ARG 8 source METHOD method_14457 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_14458 createResourcePack ()Lnet/minecraft/class_3262; METHOD method_14459 getDescription ()Lnet/minecraft/class_2561; @@ -42,6 +62,18 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile 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 (Ljava/lang/String;Lnet/minecraft/class_3288$class_7680;)Lnet/minecraft/class_3288$class_7679; + ARG 0 name + ARG 1 packFactory + METHOD method_45275 create (Ljava/lang/String;Lnet/minecraft/class_2561;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3264;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288; + ARG 0 name + ARG 1 displayName + ARG 2 alwaysEnabled + ARG 3 packFactory + ARG 4 type + ARG 5 position + ARG 6 source + METHOD method_45276 getRequestedFeatures ()Lnet/minecraft/class_7699; 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 @@ -49,3 +81,9 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile ARG 2 item ARG 3 profileGetter ARG 4 listInverted + CLASS class_7679 Metadata + METHOD method_45277 getCompatibility (Lnet/minecraft/class_3264;)Lnet/minecraft/class_3281; + ARG 1 type + CLASS class_7680 PackFactory + METHOD open (Ljava/lang/String;)Lnet/minecraft/class_3262; + ARG 1 name diff --git a/mappings/net/minecraft/resource/ResourcePackSource.mapping b/mappings/net/minecraft/resource/ResourcePackSource.mapping index c9b92ea1ea..a743d00cfe 100644 --- a/mappings/net/minecraft/resource/ResourcePackSource.mapping +++ b/mappings/net/minecraft/resource/ResourcePackSource.mapping @@ -1,4 +1,17 @@ CLASS net/minecraft/class_5352 net/minecraft/resource/ResourcePackSource - FIELD field_25347 PACK_SOURCE_NONE Lnet/minecraft/class_5352; + FIELD field_25347 NONE Lnet/minecraft/class_5352; + FIELD field_25348 BUILTIN Lnet/minecraft/class_5352; + FIELD field_25349 WORLD Lnet/minecraft/class_5352; + FIELD field_25350 SERVER Lnet/minecraft/class_5352; + FIELD field_40047 NONE_SOURCE_TEXT_SUPPLIER Ljava/util/function/UnaryOperator; + FIELD field_40048 FEATURE Lnet/minecraft/class_5352; + METHOD method_45279 canBeEnabledLater ()Z + METHOD method_45280 getSourceTextSupplier (Ljava/lang/String;)Ljava/util/function/UnaryOperator; + ARG 0 translationKey + METHOD method_45281 create (Ljava/util/function/UnaryOperator;Z)Lnet/minecraft/class_5352; + ARG 0 sourceTextSupplier + ARG 1 canBeEnabledLater METHOD method_45282 decorate (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 1 packName + 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/SinglePreparationResourceReloader.mapping b/mappings/net/minecraft/resource/SinglePreparationResourceReloader.mapping index 57d5b32b09..f19f371f62 100644 --- a/mappings/net/minecraft/resource/SinglePreparationResourceReloader.mapping +++ b/mappings/net/minecraft/resource/SinglePreparationResourceReloader.mapping @@ -25,3 +25,5 @@ CLASS net/minecraft/class_4080 net/minecraft/resource/SinglePreparationResourceR COMMENT the resource manager ARG 2 profiler COMMENT the prepare profiler + METHOD method_18790 (Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;Ljava/lang/Object;)V + ARG 3 prepared diff --git a/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping b/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping index 632b4a925f..f924f4a11c 100644 --- a/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping +++ b/mappings/net/minecraft/resource/VanillaDataPackProvider.mapping @@ -1,3 +1,13 @@ CLASS net/minecraft/class_3286 net/minecraft/resource/VanillaDataPackProvider - FIELD field_26939 DEFAULT_PACK_METADATA Lnet/minecraft/class_7662; + FIELD field_26939 METADATA_MAP Lnet/minecraft/class_7662; FIELD field_29782 NAME Lnet/minecraft/class_2561; + 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; + METHOD method_45284 (Lnet/minecraft/class_3262;Ljava/lang/String;)Lnet/minecraft/class_3262; + ARG 1 name + METHOD method_45285 createManager (Lnet/minecraft/class_32$class_5143;)Lnet/minecraft/class_3283; + ARG 0 session + METHOD method_45286 createManager (Ljava/nio/file/Path;)Lnet/minecraft/class_3283; + ARG 0 dataPacksPath + METHOD method_45287 createDefaultPack ()Lnet/minecraft/class_3268; diff --git a/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping b/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping new file mode 100644 index 0000000000..d1198bace1 --- /dev/null +++ b/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping @@ -0,0 +1,38 @@ +CLASS net/minecraft/class_7678 net/minecraft/resource/VanillaResourcePackProvider + FIELD field_40039 VANILLA_KEY Ljava/lang/String; + FIELD field_40040 LOGGER Lorg/slf4j/Logger; + FIELD field_40041 type Lnet/minecraft/class_3264; + FIELD field_40042 resourcePack Lnet/minecraft/class_3268; + FIELD field_40043 id Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_3264;Lnet/minecraft/class_3268;Lnet/minecraft/class_2960;)V + ARG 1 type + ARG 2 resourcePack + ARG 3 id + METHOD method_45256 getResourcePack ()Lnet/minecraft/class_3268; + 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 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 2 packFactory + ARG 3 displayName + METHOD method_45261 getFileName (Ljava/nio/file/Path;)Ljava/lang/String; + ARG 0 path + METHOD method_45262 forEachProfile (Ljava/nio/file/Path;Ljava/util/function/BiConsumer;)V + ARG 1 namespacedPath + ARG 2 consumer + METHOD method_45263 forEachProfile (Ljava/util/function/BiConsumer;)V + ARG 1 consumer + METHOD method_45264 (Ljava/util/function/BiConsumer;Ljava/nio/file/Path;)V + ARG 2 namespacedPath + METHOD method_45265 (Ljava/util/function/BiConsumer;Ljava/nio/file/Path;Lnet/minecraft/class_3288$class_7680;)V + 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 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 9de8f67780..d2f2f0ef2b 100644 --- a/mappings/net/minecraft/resource/ZipResourcePack.mapping +++ b/mappings/net/minecraft/resource/ZipResourcePack.mapping @@ -1,5 +1,14 @@ CLASS net/minecraft/class_3258 net/minecraft/resource/ZipResourcePack FIELD field_14183 TYPE_NAMESPACE_SPLITTER Lcom/google/common/base/Splitter; FIELD field_14184 file Ljava/util/zip/ZipFile; + FIELD field_39998 backingZipFile Ljava/io/File; + FIELD field_39999 failedToOpen Z + METHOD (Ljava/lang/String;Ljava/io/File;)V + ARG 1 name + ARG 2 backingZipFile METHOD method_14391 openFile (Ljava/lang/String;)Lnet/minecraft/class_7367; + ARG 1 path METHOD method_14399 getZipFile ()Ljava/util/zip/ZipFile; + METHOD method_45177 toPath (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/lang/String; + ARG 0 type + ARG 1 id diff --git a/mappings/net/minecraft/resource/fs/ResourceFile.mapping b/mappings/net/minecraft/resource/fs/ResourceFile.mapping new file mode 100644 index 0000000000..5762d38d02 --- /dev/null +++ b/mappings/net/minecraft/resource/fs/ResourceFile.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7673 net/minecraft/resource/fs/ResourceFile + FIELD field_40035 EMPTY Lnet/minecraft/class_7673; + FIELD field_40036 RELATIVE Lnet/minecraft/class_7673; + CLASS class_7674 Directory + CLASS class_7675 File diff --git a/mappings/net/minecraft/resource/fs/ResourceFileAttributes.mapping b/mappings/net/minecraft/resource/fs/ResourceFileAttributes.mapping new file mode 100644 index 0000000000..d8d6ec19d8 --- /dev/null +++ b/mappings/net/minecraft/resource/fs/ResourceFileAttributes.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_7666 net/minecraft/resource/fs/ResourceFileAttributes + FIELD field_40011 EPOCH Ljava/nio/file/attribute/FileTime; diff --git a/mappings/net/minecraft/resource/fs/ResourceFileStore.mapping b/mappings/net/minecraft/resource/fs/ResourceFileStore.mapping new file mode 100644 index 0000000000..ab10c10fe8 --- /dev/null +++ b/mappings/net/minecraft/resource/fs/ResourceFileStore.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_7667 net/minecraft/resource/fs/ResourceFileStore + FIELD field_40012 name Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 name + METHOD getAttribute (Ljava/lang/String;)Ljava/lang/Object; + ARG 1 attribute + METHOD getFileStoreAttributeView (Ljava/lang/Class;)Ljava/nio/file/attribute/FileStoreAttributeView; + ARG 1 type + METHOD supportsFileAttributeView (Ljava/lang/Class;)Z + ARG 1 type + METHOD supportsFileAttributeView (Ljava/lang/String;)Z + ARG 1 name diff --git a/mappings/net/minecraft/resource/fs/ResourceFileSystem.mapping b/mappings/net/minecraft/resource/fs/ResourceFileSystem.mapping new file mode 100644 index 0000000000..063c5ade58 --- /dev/null +++ b/mappings/net/minecraft/resource/fs/ResourceFileSystem.mapping @@ -0,0 +1,43 @@ +CLASS net/minecraft/class_7670 net/minecraft/resource/fs/ResourceFileSystem + FIELD field_40028 SEPARATOR Ljava/lang/String; + FIELD field_40029 SUPPORTED_FILE_ATTRIBUTE_VIEWS Ljava/util/Set; + FIELD field_40030 SEPARATOR_SPLITTER Lcom/google/common/base/Splitter; + FIELD field_40031 store Ljava/nio/file/FileStore; + FIELD field_40032 fileSystemProvider Ljava/nio/file/spi/FileSystemProvider; + FIELD field_40033 root Lnet/minecraft/class_7668; + METHOD (Ljava/lang/String;Lnet/minecraft/class_7670$class_7672;)V + ARG 1 name + ARG 2 root + METHOD getPath (Ljava/lang/String;[Ljava/lang/String;)Ljava/nio/file/Path; + ARG 1 first + ARG 2 more + METHOD getPathMatcher (Ljava/lang/String;)Ljava/nio/file/PathMatcher; + ARG 1 syntaxAndPattern + METHOD method_45241 getStore ()Ljava/nio/file/FileStore; + METHOD method_45242 toResourcePath (Lnet/minecraft/class_7670$class_7672;Lnet/minecraft/class_7670;Ljava/lang/String;Lnet/minecraft/class_7668;)Lnet/minecraft/class_7668; + ARG 0 root + ARG 1 fileSystem + ARG 2 name + ARG 3 parent + METHOD method_45243 (Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;Lnet/minecraft/class_7670;Lnet/minecraft/class_7668;Ljava/lang/String;Lnet/minecraft/class_7670$class_7672;)V + ARG 3 directoryName + ARG 4 directory + METHOD method_45244 (Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;Lnet/minecraft/class_7670;Lnet/minecraft/class_7668;Ljava/lang/String;Ljava/nio/file/Path;)V + ARG 3 fileName + ARG 4 path + METHOD method_45245 getRoot ()Lnet/minecraft/class_7668; + METHOD method_45246 builder ()Lnet/minecraft/class_7670$class_7671; + CLASS class_7671 Builder + FIELD field_40034 root Lnet/minecraft/class_7670$class_7672; + METHOD method_45247 build (Ljava/lang/String;)Ljava/nio/file/FileSystem; + ARG 1 name + METHOD method_45248 withFile (Ljava/util/List;Ljava/lang/String;Ljava/nio/file/Path;)Lnet/minecraft/class_7670$class_7671; + ARG 1 directories + ARG 2 name + ARG 3 path + METHOD method_45249 withFile (Ljava/util/List;Ljava/nio/file/Path;)Lnet/minecraft/class_7670$class_7671; + ARG 1 directories + ARG 2 path + METHOD method_45250 (Ljava/lang/String;)Lnet/minecraft/class_7670$class_7672; + ARG 0 directory + CLASS class_7672 Directory diff --git a/mappings/net/minecraft/resource/fs/ResourceFileSystemProvider.mapping b/mappings/net/minecraft/resource/fs/ResourceFileSystemProvider.mapping new file mode 100644 index 0000000000..7d72cb4e20 --- /dev/null +++ b/mappings/net/minecraft/resource/fs/ResourceFileSystemProvider.mapping @@ -0,0 +1,63 @@ +CLASS net/minecraft/class_7669 net/minecraft/resource/fs/ResourceFileSystemProvider + FIELD field_40023 SCHEME Ljava/lang/String; + METHOD checkAccess (Ljava/nio/file/Path;[Ljava/nio/file/AccessMode;)V + ARG 1 path + ARG 2 modes + METHOD copy (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/CopyOption;)V + ARG 1 source + ARG 2 target + ARG 3 options + METHOD createDirectory (Ljava/nio/file/Path;[Ljava/nio/file/attribute/FileAttribute;)V + ARG 1 dir + ARG 2 attrs + METHOD delete (Ljava/nio/file/Path;)V + ARG 1 path + METHOD getFileAttributeView (Ljava/nio/file/Path;Ljava/lang/Class;[Ljava/nio/file/LinkOption;)Ljava/nio/file/attribute/FileAttributeView; + ARG 1 path + ARG 2 type + ARG 3 options + METHOD getFileStore (Ljava/nio/file/Path;)Ljava/nio/file/FileStore; + ARG 1 path + METHOD getFileSystem (Ljava/net/URI;)Ljava/nio/file/FileSystem; + ARG 1 uri + METHOD getPath (Ljava/net/URI;)Ljava/nio/file/Path; + ARG 1 uri + METHOD isHidden (Ljava/nio/file/Path;)Z + ARG 1 path + METHOD isSameFile (Ljava/nio/file/Path;Ljava/nio/file/Path;)Z + ARG 1 path + ARG 2 path2 + METHOD method_45238 toResourcePath (Ljava/nio/file/Path;)Lnet/minecraft/class_7668; + ARG 0 path + METHOD move (Ljava/nio/file/Path;Ljava/nio/file/Path;[Ljava/nio/file/CopyOption;)V + ARG 1 source + ARG 2 target + ARG 3 options + METHOD newByteChannel (Ljava/nio/file/Path;Ljava/util/Set;[Ljava/nio/file/attribute/FileAttribute;)Ljava/nio/channels/SeekableByteChannel; + ARG 1 path + ARG 2 options + ARG 3 attrs + METHOD newDirectoryStream (Ljava/nio/file/Path;Ljava/nio/file/DirectoryStream$Filter;)Ljava/nio/file/DirectoryStream; + ARG 1 dir + ARG 2 filter + METHOD newFileSystem (Ljava/net/URI;Ljava/util/Map;)Ljava/nio/file/FileSystem; + ARG 1 uri + ARG 2 env + METHOD readAttributes (Ljava/nio/file/Path;Ljava/lang/Class;[Ljava/nio/file/LinkOption;)Ljava/nio/file/attribute/BasicFileAttributes; + ARG 1 path + ARG 2 type + ARG 3 options + METHOD readAttributes (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/LinkOption;)Ljava/util/Map; + ARG 1 path + ARG 2 attributes + ARG 3 options + METHOD setAttribute (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/Object;[Ljava/nio/file/LinkOption;)V + ARG 1 path + ARG 2 attribute + ARG 3 value + ARG 4 options + CLASS 1 + METHOD method_45239 (Lnet/minecraft/class_7668;)Ljava/nio/file/Path; + ARG 0 child + METHOD method_45240 (Ljava/nio/file/DirectoryStream$Filter;Lnet/minecraft/class_7668;)Z + ARG 1 child diff --git a/mappings/net/minecraft/resource/fs/ResourcePath.mapping b/mappings/net/minecraft/resource/fs/ResourcePath.mapping new file mode 100644 index 0000000000..7df25374db --- /dev/null +++ b/mappings/net/minecraft/resource/fs/ResourcePath.mapping @@ -0,0 +1,62 @@ +CLASS net/minecraft/class_7668 net/minecraft/resource/fs/ResourcePath + FIELD field_40013 DIRECTORY_ATTRIBUTES Ljava/nio/file/attribute/BasicFileAttributes; + FIELD field_40014 FILE_ATTRIBUTES Ljava/nio/file/attribute/BasicFileAttributes; + FIELD field_40015 COMPARATOR Ljava/util/Comparator; + FIELD field_40016 name Ljava/lang/String; + FIELD field_40017 fileSystem Lnet/minecraft/class_7670; + FIELD field_40018 parent Lnet/minecraft/class_7668; + FIELD field_40019 names Ljava/util/List; + FIELD field_40020 pathString Ljava/lang/String; + FIELD field_40021 file Lnet/minecraft/class_7673; + METHOD (Lnet/minecraft/class_7670;Ljava/lang/String;Lnet/minecraft/class_7668;Lnet/minecraft/class_7673;)V + ARG 1 fileSystem + ARG 2 name + ARG 3 parent + ARG 4 file + METHOD compareTo (Ljava/lang/Object;)I + ARG 1 other + METHOD endsWith (Ljava/nio/file/Path;)Z + ARG 1 other + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD getName (I)Ljava/nio/file/Path; + ARG 1 index + METHOD method_45217 relativize (Lnet/minecraft/class_7668;Ljava/lang/String;)Lnet/minecraft/class_7668; + ARG 1 path + ARG 2 name + METHOD method_45218 isSpecial (Lnet/minecraft/class_7673;)Z + ARG 0 file + METHOD method_45219 get (Ljava/lang/String;)Lnet/minecraft/class_7668; + ARG 1 name + METHOD method_45221 get (Ljava/util/List;)Lnet/minecraft/class_7668; + ARG 1 paths + METHOD method_45226 toResourcePath (Ljava/nio/file/Path;)Lnet/minecraft/class_7668; + ARG 1 path + METHOD method_45230 isReadable ()Z + METHOD method_45231 toPath ()Ljava/nio/file/Path; + METHOD method_45232 toDirectory ()Lnet/minecraft/class_7673$class_7674; + METHOD method_45233 getAttributeView ()Ljava/nio/file/attribute/BasicFileAttributeView; + METHOD method_45234 getAttributes ()Ljava/nio/file/attribute/BasicFileAttributes; + METHOD method_45235 getNames ()Ljava/util/List; + METHOD method_45236 isNormal ()Z + METHOD method_45237 getPathString ()Ljava/lang/String; + METHOD register (Ljava/nio/file/WatchService;[Ljava/nio/file/WatchEvent$Kind;[Ljava/nio/file/WatchEvent$Modifier;)Ljava/nio/file/WatchKey; + ARG 1 watcher + ARG 2 events + ARG 3 modifiers + METHOD relativize (Ljava/nio/file/Path;)Ljava/nio/file/Path; + ARG 1 other + METHOD resolve (Ljava/nio/file/Path;)Ljava/nio/file/Path; + ARG 1 other + METHOD startsWith (Ljava/nio/file/Path;)Z + ARG 1 other + METHOD subpath (II)Ljava/nio/file/Path; + ARG 1 beginIndex + ARG 2 endIndex + METHOD toRealPath ([Ljava/nio/file/LinkOption;)Ljava/nio/file/Path; + ARG 1 options + CLASS 3 + METHOD setTimes (Ljava/nio/file/attribute/FileTime;Ljava/nio/file/attribute/FileTime;Ljava/nio/file/attribute/FileTime;)V + ARG 1 lastModifiedTime + ARG 2 lastAccessFile + ARG 3 createTime diff --git a/mappings/net/minecraft/resource/metadata/PackResourceMetadata.mapping b/mappings/net/minecraft/resource/metadata/PackResourceMetadata.mapping index a2767a0b9c..ac1067a55c 100644 --- a/mappings/net/minecraft/resource/metadata/PackResourceMetadata.mapping +++ b/mappings/net/minecraft/resource/metadata/PackResourceMetadata.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3272 net/minecraft/resource/metadata/PackResourceMetadata FIELD field_14201 packFormat I - FIELD field_14202 READER Lnet/minecraft/class_7677; + FIELD field_14202 SERIALIZER Lnet/minecraft/class_7677; FIELD field_14203 description Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2561;I)V ARG 1 description diff --git a/mappings/net/minecraft/resource/metadata/ResourceFilter.mapping b/mappings/net/minecraft/resource/metadata/ResourceFilter.mapping index 653e47c92a..8df31c1759 100644 --- a/mappings/net/minecraft/resource/metadata/ResourceFilter.mapping +++ b/mappings/net/minecraft/resource/metadata/ResourceFilter.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_7084 net/minecraft/resource/metadata/ResourceFilter FIELD field_37291 CODEC Lcom/mojang/serialization/Codec; FIELD field_37292 blocks Ljava/util/List; COMMENT The list of block rules, named {@code block} in the JSON format. + FIELD field_40055 SERIALIZER Lnet/minecraft/class_7677; METHOD (Ljava/util/List;)V ARG 1 blocks METHOD method_41277 (Lnet/minecraft/class_7084;)Ljava/util/List; diff --git a/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping b/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping index ed06ce96e0..f0366c6485 100644 --- a/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping +++ b/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_7368 net/minecraft/resource/metadata/ResourceMetadata FIELD field_38688 NONE Lnet/minecraft/class_7368; + FIELD field_40056 NONE_SUPPLIER Lnet/minecraft/class_7367; METHOD method_43041 decode (Lnet/minecraft/class_3270;)Ljava/util/Optional; ARG 1 reader METHOD method_43042 create (Ljava/io/InputStream;)Lnet/minecraft/class_7368; diff --git a/mappings/net/minecraft/resource/metadata/ResourceMetadataMap.mapping b/mappings/net/minecraft/resource/metadata/ResourceMetadataMap.mapping new file mode 100644 index 0000000000..0a9f7f65a2 --- /dev/null +++ b/mappings/net/minecraft/resource/metadata/ResourceMetadataMap.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_7662 net/minecraft/resource/metadata/ResourceMetadataMap + FIELD field_39994 EMPTY Lnet/minecraft/class_7662; + FIELD field_39995 values Ljava/util/Map; + METHOD (Ljava/util/Map;)V + ARG 1 values + METHOD method_45172 of ()Lnet/minecraft/class_7662; + METHOD method_45173 get (Lnet/minecraft/class_3270;)Ljava/lang/Object; + ARG 1 reader + METHOD method_45174 of (Lnet/minecraft/class_3270;Ljava/lang/Object;)Lnet/minecraft/class_7662; + ARG 0 reader + ARG 1 value + METHOD method_45175 of (Lnet/minecraft/class_3270;Ljava/lang/Object;Lnet/minecraft/class_3270;Ljava/lang/Object;)Lnet/minecraft/class_7662; + ARG 0 reader + ARG 1 value + ARG 2 reader2 + ARG 3 value2 diff --git a/mappings/net/minecraft/resource/metadata/ResourceMetadataSerializer.mapping b/mappings/net/minecraft/resource/metadata/ResourceMetadataSerializer.mapping new file mode 100644 index 0000000000..537f06b890 --- /dev/null +++ b/mappings/net/minecraft/resource/metadata/ResourceMetadataSerializer.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_7677 net/minecraft/resource/metadata/ResourceMetadataSerializer + METHOD method_45251 toJson (Ljava/lang/Object;)Lcom/google/gson/JsonObject; + ARG 1 metadata + METHOD method_45252 fromCodec (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_7677; + ARG 0 key + ARG 1 codec + CLASS 1 + METHOD method_45253 (Ljava/lang/String;)V + ARG 0 error + METHOD method_45254 (Ljava/lang/String;)V + ARG 0 error diff --git a/mappings/net/minecraft/server/DataPackContents.mapping b/mappings/net/minecraft/server/DataPackContents.mapping index 22093ba71e..f2ad0134ca 100644 --- a/mappings/net/minecraft/server/DataPackContents.mapping +++ b/mappings/net/minecraft/server/DataPackContents.mapping @@ -17,6 +17,8 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents FIELD field_38051 commandRegistryAccess Lnet/minecraft/class_7157; METHOD (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7699;Lnet/minecraft/class_2170$class_5364;I)V ARG 1 dynamicRegistryManager + ARG 3 environment + ARG 4 functionPermissionLevel METHOD method_29465 getFunctionLoader ()Lnet/minecraft/class_5349; COMMENT {@return the function loader} COMMENT @@ -28,6 +30,10 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents COMMENT @see MinecraftServer#reloadResources ARG 0 manager ARG 1 dynamicRegistryManager + ARG 3 environment + ARG 4 functionPermissionLevel + ARG 5 prepareExecutor + ARG 6 applyExecutor METHOD method_29468 getLootConditionManager ()Lnet/minecraft/class_4567; METHOD method_29469 getLootManager ()Lnet/minecraft/class_60; COMMENT @see MinecraftServer#getLootManager diff --git a/mappings/net/minecraft/server/command/DatapackCommand.mapping b/mappings/net/minecraft/server/command/DatapackCommand.mapping index 72a4d37f10..b6a2c4b058 100644 --- a/mappings/net/minecraft/server/command/DatapackCommand.mapping +++ b/mappings/net/minecraft/server/command/DatapackCommand.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_3027 net/minecraft/server/command/DatapackCommand FIELD field_13504 ALREADY_ENABLED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_13505 ALREADY_DISABLED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_13506 ENABLED_CONTAINERS_SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider; + FIELD field_39980 NO_FLAGS_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; METHOD method_13111 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13112 (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/List;Lnet/minecraft/class_3288;)V @@ -73,8 +74,15 @@ CLASS net/minecraft/class_3027 net/minecraft/server/command/DatapackCommand ARG 1 container METHOD method_13141 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD method_29477 (Ljava/util/Collection;Lnet/minecraft/class_7699;Lnet/minecraft/class_3288;)Z + ARG 2 profile METHOD method_29776 (Ljava/util/Collection;Ljava/lang/String;)Z ARG 1 name + METHOD method_45145 (Lnet/minecraft/class_7699;Lnet/minecraft/class_3288;)Z + ARG 1 profile + METHOD method_45146 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 name + ARG 1 flags CLASS class_3028 PackAdder METHOD apply (Ljava/util/List;Lnet/minecraft/class_3288;)V ARG 1 profiles diff --git a/mappings/net/minecraft/server/function/FunctionLoader.mapping b/mappings/net/minecraft/server/function/FunctionLoader.mapping index 6ef50150d5..1293cac2f7 100644 --- a/mappings/net/minecraft/server/function/FunctionLoader.mapping +++ b/mappings/net/minecraft/server/function/FunctionLoader.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_5349 net/minecraft/server/function/FunctionLoader FIELD field_25331 level I FIELD field_25332 commandDispatcher Lcom/mojang/brigadier/CommandDispatcher; FIELD field_25801 tags Ljava/util/Map; + FIELD field_39978 FINDER Lnet/minecraft/class_7654; METHOD (ILcom/mojang/brigadier/CommandDispatcher;)V ARG 1 level ARG 2 commandDispatcher diff --git a/mappings/net/minecraft/structure/StructureTemplateManager.mapping b/mappings/net/minecraft/structure/StructureTemplateManager.mapping index c1ca82aa58..30853a35d0 100644 --- a/mappings/net/minecraft/structure/StructureTemplateManager.mapping +++ b/mappings/net/minecraft/structure/StructureTemplateManager.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureTemplateManager FIELD field_31686 SNBT_FILE_EXTENSION Ljava/lang/String; FIELD field_39416 GAME_TEST_STRUCTURES_DIRECTORY Ljava/lang/String; FIELD field_39417 providers Ljava/util/List; + FIELD field_40370 NBT_FINDER Lnet/minecraft/class_7654; METHOD (Lnet/minecraft/class_3300;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_7225;)V ARG 1 resourceManager ARG 2 session diff --git a/mappings/net/minecraft/client/resource/language/TextReorderingProcessor.mapping b/mappings/net/minecraft/text/TextReorderingProcessor.mapping similarity index 92% rename from mappings/net/minecraft/client/resource/language/TextReorderingProcessor.mapping rename to mappings/net/minecraft/text/TextReorderingProcessor.mapping index 33300e781e..f3f3d6526d 100644 --- a/mappings/net/minecraft/client/resource/language/TextReorderingProcessor.mapping +++ b/mappings/net/minecraft/text/TextReorderingProcessor.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5492 net/minecraft/client/resource/language/TextReorderingProcessor +CLASS net/minecraft/class_5492 net/minecraft/text/TextReorderingProcessor FIELD field_26626 string Ljava/lang/String; FIELD field_26627 styles Ljava/util/List; FIELD field_26628 reverser Lit/unimi/dsi/fastutil/ints/Int2IntFunction; diff --git a/mappings/net/minecraft/util/FileNameUtil.mapping b/mappings/net/minecraft/util/FileNameUtil.mapping index d1c69bb390..5ae73ec022 100644 --- a/mappings/net/minecraft/util/FileNameUtil.mapping +++ b/mappings/net/minecraft/util/FileNameUtil.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_4239 net/minecraft/util/FileNameUtil FIELD field_18955 RESERVED_WINDOWS_NAMES Ljava/util/regex/Pattern; FIELD field_18956 FILE_NAME_WITH_COUNT Ljava/util/regex/Pattern; FIELD field_33384 MAX_NAME_LENGTH I + FIELD field_40712 VALID_FILE_NAME Ljava/util/regex/Pattern; METHOD method_19773 getNextUniqueName (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; COMMENT {@return a filename, prefixed with {@code name}, that does not currently COMMENT exist inside {@code path}} @@ -39,3 +40,12 @@ CLASS net/minecraft/class_4239 net/minecraft/util/FileNameUtil COMMENT {@return the normalized path of {@code path} with directory separator normalized COMMENT to {@code /}} ARG 0 path + METHOD method_46344 getPath (Ljava/nio/file/Path;Ljava/util/List;)Ljava/nio/file/Path; + ARG 0 root + ARG 1 paths + METHOD method_46345 isPathValid ([Ljava/lang/String;)V + ARG 0 paths + METHOD method_46346 split (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 path + METHOD method_46347 isFileNameValid (Ljava/lang/String;)Z + ARG 0 name diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index d05a6227a9..216f920594 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -100,6 +100,10 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier METHOD (Ljava/lang/String;Ljava/lang/String;)V ARG 1 namespace ARG 2 path + METHOD (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_2960$class_7658;)V + ARG 1 namespace + ARG 2 path + ARG 3 extraData METHOD ([Ljava/lang/String;)V ARG 1 id METHOD compareTo (Ljava/lang/Object;)I @@ -162,6 +166,18 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier ARG 1 path METHOD method_43903 toShortTranslationKey ()Ljava/lang/String; COMMENT {@return the short translation key, with the default namespace omitted if present} + METHOD method_45134 withPath (Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_2960; + ARG 1 pathFunction + METHOD method_45135 validateNamespace (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 0 namespace + ARG 1 path + METHOD method_45136 withPath (Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 1 path + METHOD method_45137 validatePath (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 0 namespace + ARG 1 path + METHOD method_45138 withPrefixedPath (Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 1 prefix CLASS class_2961 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json @@ -171,3 +187,6 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier ARG 1 id ARG 2 type ARG 3 context + CLASS class_7658 ExtraData + COMMENT A piece of extra data that a subclass may attach to an identifier. This is + COMMENT not used by {@link Identifier} itself.