From b39dc9e86854573dd780163a03ca3a7ad8f30054 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:29:20 +0900 Subject: [PATCH] Finish ID rename --- .../minecraft/resource/DefaultResourcePack.mapping | 2 +- .../resource/NamespaceResourceManager.mapping | 6 +++--- mappings/net/minecraft/resource/Resource.mapping | 6 +++--- .../minecraft/resource/ResourcePackManager.mapping | 12 ++++++------ .../minecraft/resource/ResourcePackProfile.mapping | 2 +- .../minecraft/resource/ResourcePackSource.mapping | 2 +- mappings/net/minecraft/resource/ResourceType.mapping | 2 +- .../resource/VanillaResourcePackProvider.mapping | 8 ++++---- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/mappings/net/minecraft/resource/DefaultResourcePack.mapping b/mappings/net/minecraft/resource/DefaultResourcePack.mapping index 9f2b260879..e783b3d0c5 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePack.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack ARG 3 prefixSegments METHOD method_43032 getFactory ()Lnet/minecraft/class_5912; METHOD method_45188 (Lnet/minecraft/class_2960;)Ljava/util/Optional; - ARG 1 name + ARG 1 id METHOD method_45189 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3264;Ljava/util/List;)Lnet/minecraft/class_7367; ARG 3 segments METHOD method_45190 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3264;Ljava/util/function/Consumer;Ljava/util/List;)V diff --git a/mappings/net/minecraft/resource/NamespaceResourceManager.mapping b/mappings/net/minecraft/resource/NamespaceResourceManager.mapping index 0998ba103c..c302aa69a7 100644 --- a/mappings/net/minecraft/resource/NamespaceResourceManager.mapping +++ b/mappings/net/minecraft/resource/NamespaceResourceManager.mapping @@ -30,11 +30,11 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager ARG 0 pack ARG 1 idToEntryList METHOD method_41260 addPack (Ljava/lang/String;Lnet/minecraft/class_3262;Ljava/util/function/Predicate;)V - ARG 1 name + ARG 1 id ARG 2 underlyingPack ARG 3 filter METHOD method_41261 addPack (Ljava/lang/String;Ljava/util/function/Predicate;)V - ARG 1 name + ARG 1 id ARG 2 filter METHOD method_43035 createMetadataSupplier (Lnet/minecraft/class_2960;I)Lnet/minecraft/class_7367; ARG 1 id @@ -71,7 +71,7 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager METHOD (Ljava/io/InputStream;Lnet/minecraft/class_2960;Ljava/lang/String;)V ARG 1 parent ARG 2 id - ARG 3 packName + ARG 3 packId CLASS class_7081 EntryList FIELD comp_1005 id Lnet/minecraft/class_2960; FIELD comp_527 metadataId Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/resource/Resource.mapping b/mappings/net/minecraft/resource/Resource.mapping index a8c2b515da..845c34a755 100644 --- a/mappings/net/minecraft/resource/Resource.mapping +++ b/mappings/net/minecraft/resource/Resource.mapping @@ -16,15 +16,15 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource ARG 1 pack ARG 2 inputSupplier ARG 3 metadataSupplier - METHOD method_14480 getResourcePackName ()Ljava/lang/String; - COMMENT Returns the user-friendly name of the pack this resource is from. + METHOD method_14480 getPackId ()Ljava/lang/String; + COMMENT {@return the ID of the pack this resource is from} METHOD method_14481 getMetadata ()Lnet/minecraft/class_7368; COMMENT {@return the metadata for the resource} COMMENT COMMENT

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

This input stream is closed when this resource is closed. METHOD method_43039 getReader ()Ljava/io/BufferedReader; diff --git a/mappings/net/minecraft/resource/ResourcePackManager.mapping b/mappings/net/minecraft/resource/ResourcePackManager.mapping index 69c508ff45..023bb66721 100644 --- a/mappings/net/minecraft/resource/ResourcePackManager.mapping +++ b/mappings/net/minecraft/resource/ResourcePackManager.mapping @@ -13,15 +13,15 @@ CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager METHOD method_14447 setEnabledProfiles (Ljava/util/Collection;)V ARG 1 enabled METHOD method_14449 getProfile (Ljava/lang/String;)Lnet/minecraft/class_3288; - ARG 1 name - METHOD method_29206 getNames ()Ljava/util/Collection; + ARG 1 id + METHOD method_29206 getIds ()Ljava/util/Collection; METHOD method_29207 hasProfile (Ljava/lang/String;)Z - ARG 1 name + ARG 1 id METHOD method_29208 buildEnabledProfiles (Ljava/util/Collection;)Ljava/util/List; ARG 1 enabledNames - METHOD method_29209 streamProfilesByName (Ljava/util/Collection;)Ljava/util/stream/Stream; - ARG 1 names - METHOD method_29210 getEnabledNames ()Ljava/util/Collection; + METHOD method_29209 streamProfilesById (Ljava/util/Collection;)Ljava/util/stream/Stream; + ARG 1 ids + METHOD method_29210 getEnabledIds ()Ljava/util/Collection; METHOD method_29211 createResourcePacks ()Ljava/util/List; METHOD method_29212 providePackProfiles ()Ljava/util/Map; METHOD method_29484 (Ljava/util/Map;Lnet/minecraft/class_3288;)V diff --git a/mappings/net/minecraft/resource/ResourcePackProfile.mapping b/mappings/net/minecraft/resource/ResourcePackProfile.mapping index c970a23ee8..d457f50503 100644 --- a/mappings/net/minecraft/resource/ResourcePackProfile.mapping +++ b/mappings/net/minecraft/resource/ResourcePackProfile.mapping @@ -42,7 +42,7 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile ARG 3 position METHOD method_45276 getRequestedFeatures ()Lnet/minecraft/class_7699; METHOD method_52440 getSupportedFormats (Ljava/lang/String;Lnet/minecraft/class_3272;)Lnet/minecraft/class_6497; - ARG 0 packName + ARG 0 packId ARG 1 metadata METHOD method_56933 getInfo ()Lnet/minecraft/class_9224; METHOD method_56934 getPosition ()Lnet/minecraft/class_9225; diff --git a/mappings/net/minecraft/resource/ResourcePackSource.mapping b/mappings/net/minecraft/resource/ResourcePackSource.mapping index a743d00cfe..57f3d1dacf 100644 --- a/mappings/net/minecraft/resource/ResourcePackSource.mapping +++ b/mappings/net/minecraft/resource/ResourcePackSource.mapping @@ -12,6 +12,6 @@ CLASS net/minecraft/class_5352 net/minecraft/resource/ResourcePackSource ARG 0 sourceTextSupplier ARG 1 canBeEnabledLater METHOD method_45282 decorate (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; - ARG 1 packName + ARG 1 packDisplayName METHOD method_45283 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 1 name diff --git a/mappings/net/minecraft/resource/ResourceType.mapping b/mappings/net/minecraft/resource/ResourceType.mapping index 8ee9c05dae..401321dfe7 100644 --- a/mappings/net/minecraft/resource/ResourceType.mapping +++ b/mappings/net/minecraft/resource/ResourceType.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3264 net/minecraft/resource/ResourceType FIELD field_14189 directory Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 name + ARG 3 directory METHOD method_14413 getDirectory ()Ljava/lang/String; diff --git a/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping b/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping index 66dff87336..f6d52a0241 100644 --- a/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping +++ b/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping @@ -15,11 +15,11 @@ CLASS net/minecraft/class_7678 net/minecraft/resource/VanillaResourcePackProvide METHOD method_45257 createDefault (Lnet/minecraft/class_3262;)Lnet/minecraft/class_3288; ARG 1 pack METHOD method_45258 (Lnet/minecraft/class_3288$class_7680;Ljava/lang/String;)Lnet/minecraft/class_3288; - ARG 2 name - METHOD method_45259 getProfileName (Ljava/lang/String;)Lnet/minecraft/class_2561; + ARG 2 id + METHOD method_45259 getDisplayName (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 1 id METHOD method_45260 create (Ljava/lang/String;Lnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_2561;)Lnet/minecraft/class_3288; - ARG 1 id + ARG 1 fileName ARG 2 packFactory ARG 3 displayName METHOD method_45261 getFileName (Ljava/nio/file/Path;)Ljava/lang/String; @@ -35,7 +35,7 @@ CLASS net/minecraft/class_7678 net/minecraft/resource/VanillaResourcePackProvide ARG 2 profilePath ARG 3 factory METHOD method_45266 (Ljava/util/function/Consumer;Ljava/lang/String;Ljava/util/function/Function;)V - ARG 1 fileName + ARG 1 id ARG 2 packFactory METHOD method_45267 forEachProfile (Ljava/util/function/Consumer;)V ARG 1 consumer