mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

22w11a resource (#3048) 

* 22w11a resource stuff

* 22w11a client resource stuff

* Apply suggestions from code review

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
This commit is contained in:
apple502j 2022-03-20 00:58:06 +09:00 committed by GitHub
parent c2d1eac595
commit ebd912a82f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 185 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mappings/net/minecraft/client/resource/PeriodicNotificationManager.mapping
View File

@ -25,6 +25,11 @@ CLASS net/minecraft/class_6877 net/minecraft/client/resource/PeriodicNotificatio
METHOD method_40200 (Lnet/minecraft/class_6877$class_6878;)Z
ARG 0 entry
CLASS class_6878 Entry
METHOD <init> (JJLjava/lang/String;Ljava/lang/String;)V
ARG 1 delay
ARG 3 period
ARG 5 title
ARG 6 message
CLASS class_6879 NotifyTask
FIELD field_36441 client Lnet/minecraft/class_310;
FIELD field_36442 entries Ljava/util/List;

1
mappings/net/minecraft/client/resource/ResourceIndex.mapping
View File

@ -14,3 +14,4 @@ CLASS net/minecraft/class_1064 net/minecraft/client/resource/ResourceIndex
METHOD method_4632 getFilesRecursively (Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection;
ARG 1 prefix
ARG 2 namespace
ARG 3 allowedPathPredicate

3
mappings/net/minecraft/client/resource/language/TranslationStorage.mapping
View File

@ -9,3 +9,6 @@ CLASS net/minecraft/class_1078 net/minecraft/client/resource/language/Translatio
ARG 0 resourceManager
ARG 1 definitions
METHOD method_4676 load (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;)V
ARG 0 langCode
ARG 1 resourceRefs
ARG 2 translations

4
mappings/net/minecraft/resource/DataPackSettings.mapping
View File

@ -7,6 +7,10 @@ CLASS net/minecraft/class_5359 net/minecraft/resource/DataPackSettings
ARG 1 enabled
ARG 2 disabled
METHOD method_29547 getEnabled ()Ljava/util/List;
METHOD method_29548 (Lnet/minecraft/class_5359;)Ljava/util/List;
ARG 0 settings
METHOD method_29549 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_29550 getDisabled ()Ljava/util/List;
METHOD method_29551 (Lnet/minecraft/class_5359;)Ljava/util/List;
ARG 0 settings

9
mappings/net/minecraft/resource/DefaultResourcePack.mapping
View File

@ -13,7 +13,12 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack
ARG 2 id
METHOD method_14417 getInputStream (Ljava/lang/String;)Ljava/io/InputStream;
ARG 1 path
METHOD method_14418 getIdentifiers (Ljava/util/Collection;Ljava/lang/String;Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/function/Predicate;)V
METHOD method_14418 collectIdentifiers (Ljava/util/Collection;Ljava/lang/String;Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/function/Predicate;)V
ARG 0 results
ARG 1 namespace
ARG 2 root
ARG 3 prefix
ARG 4 allowedPathPredicate
METHOD method_20728 isValidUrl (Ljava/lang/String;Ljava/net/URL;)Z
ARG 0 fileName
ARG 1 url
@ -22,6 +27,8 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack
ARG 1 id
METHOD method_23857 (Ljava/lang/String;Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/class_2960;
ARG 2 path
METHOD method_23858 (Ljava/nio/file/Path;)Z
ARG 0 path
METHOD method_37454 getPath (Ljava/net/URI;)Ljava/nio/file/Path;
ARG 0 uri
CLASS 1

4
mappings/net/minecraft/resource/DirectoryResourcePack.mapping
View File

@ -4,6 +4,10 @@ CLASS net/minecraft/class_3259 net/minecraft/resource/DirectoryResourcePack
FIELD field_14187 LOGGER Lorg/slf4j/Logger;
METHOD method_14400 findFiles (Ljava/io/File;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/util/function/Predicate;)V
ARG 1 file
ARG 2 namespace
ARG 3 foundIds
ARG 4 rootDirectory
ARG 5 allowedPathPredicate
METHOD method_14401 getFile (Ljava/lang/String;)Ljava/io/File;
ARG 1 name
METHOD method_14402 isValidPath (Ljava/io/File;Ljava/lang/String;)Z

2
mappings/net/minecraft/resource/JsonDataLoader.mapping
View File

@ -9,3 +9,5 @@ CLASS net/minecraft/class_4309 net/minecraft/resource/JsonDataLoader
METHOD <init> (Lcom/google/gson/Gson;Ljava/lang/String;)V
ARG 1 gson
ARG 2 dataType
METHOD method_20730 (Lnet/minecraft/class_2960;)Z
ARG 0 id

7
mappings/net/minecraft/resource/LifecycledResourceManagerImpl.mapping
View File

@ -7,6 +7,13 @@ CLASS net/minecraft/class_6861 net/minecraft/resource/LifecycledResourceManagerI
COMMENT @see NamespaceResourceManager
FIELD field_36389 subManagers Ljava/util/Map;
FIELD field_36390 packs Ljava/util/List;
FIELD field_37288 LOGGER Lorg/slf4j/Logger;
METHOD <init> (Lnet/minecraft/class_3264;Ljava/util/List;)V
ARG 1 type
ARG 2 packs
METHOD method_41274 parseResourceFilter (Lnet/minecraft/class_3262;)Lnet/minecraft/class_7084;
ARG 1 pack
METHOD method_41275 (Lnet/minecraft/class_3264;Lnet/minecraft/class_3262;)Ljava/util/stream/Stream;
ARG 1 pack
METHOD method_41276 (Lnet/minecraft/class_7084;Lnet/minecraft/class_2960;)Z
ARG 1 id

50
mappings/net/minecraft/resource/NamespaceResourceManager.mapping
View File

@ -23,6 +23,31 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager
ARG 1 id
METHOD method_24233 addPack (Lnet/minecraft/class_3262;)V
ARG 1 pack
METHOD method_41256 addPack (Lnet/minecraft/class_3262;Ljava/util/function/Predicate;)V
ARG 1 pack
ARG 2 filter
METHOD method_41257 (Lnet/minecraft/class_3294$class_7082;)Lnet/minecraft/class_3262;
ARG 0 pack
METHOD method_41258 findAndAdd (Lnet/minecraft/class_3294$class_7082;Ljava/lang/String;Ljava/util/function/Predicate;Ljava/util/Map;)V
ARG 1 pack
ARG 2 startingPath
ARG 3 allowedPathPredicate
ARG 4 idToEntryList
METHOD method_41259 applyFilter (Lnet/minecraft/class_3294$class_7082;Ljava/util/Map;)V
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 2 underlyingPack
ARG 3 filter
METHOD method_41261 addPack (Ljava/lang/String;Ljava/util/function/Predicate;)V
ARG 1 name
ARG 2 filter
METHOD method_41262 (Ljava/util/TreeMap;Lnet/minecraft/class_2960;Lnet/minecraft/class_3294$class_7081;)V
ARG 1 id
ARG 2 entryList
METHOD method_41264 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3294$class_7081;
ARG 1 id
CLASS class_3295 DebugInputStream
FIELD field_14287 closed Z
FIELD field_14288 leakMessage Ljava/lang/String;
@ -30,3 +55,28 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager
ARG 1 parent
ARG 2 id
ARG 3 packName
CLASS class_7081 EntryList
FIELD comp_527 metadataId Lnet/minecraft/class_2960;
METHOD comp_527 metadataId ()Lnet/minecraft/class_2960;
METHOD method_41266 toReferenceList ()Ljava/util/List;
CLASS class_7082 FilterablePack
FIELD comp_530 underlying Lnet/minecraft/class_3262;
METHOD comp_530 underlying ()Lnet/minecraft/class_3262;
METHOD method_41267 contains (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Z
ARG 1 type
ARG 2 id
METHOD method_41268 removeFiltered (Ljava/util/Collection;)V
ARG 1 ids
METHOD method_41269 isFiltered (Lnet/minecraft/class_2960;)Z
ARG 1 id
CLASS class_7083 Entry
FIELD field_37284 id Lnet/minecraft/class_2960;
FIELD field_37285 metadataId Lnet/minecraft/class_2960;
FIELD field_37286 pack Lnet/minecraft/class_3262;
FIELD field_37287 checksMetadata Z
METHOD <init> (Lnet/minecraft/class_3294;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_3262;)V
ARG 2 id
ARG 3 metadataId
ARG 4 pack
METHOD method_41270 ignoreMetadata ()V
METHOD method_41272 toReference ()Lnet/minecraft/class_7086;

5
mappings/net/minecraft/resource/ResourceManager.mapping
View File

@ -14,7 +14,7 @@ CLASS net/minecraft/class_3300 net/minecraft/resource/ResourceManager
COMMENT @return the list matching identifiers
ARG 1 startingPath
COMMENT the starting path to begin scanning from
ARG 2 pathPredicate
ARG 2 allowedPathPredicate
COMMENT a predicate to determine whether a path should be included or not
METHOD method_14489 getAllResources (Lnet/minecraft/class_2960;)Ljava/util/List;
COMMENT Gets all of the available resources to the corresponding resource identifier.
@ -37,4 +37,7 @@ CLASS net/minecraft/class_3300 net/minecraft/resource/ResourceManager
COMMENT the resource identifier to search for
METHOD method_29213 streamResourcePacks ()Ljava/util/stream/Stream;
COMMENT Gets a stream of loaded resource packs in increasing order of priority.
METHOD method_41265 findAllResources (Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Map;
ARG 1 startingPath
ARG 2 allowedPathPredicate
CLASS class_5353 Empty

1
mappings/net/minecraft/resource/ResourcePack.mapping
View File

@ -18,6 +18,7 @@ CLASS net/minecraft/class_3262 net/minecraft/resource/ResourcePack
ARG 1 type
ARG 2 namespace
ARG 3 prefix
ARG 4 allowedPathPredicate
METHOD method_14409 getName ()Ljava/lang/String;
METHOD method_14410 openRoot (Ljava/lang/String;)Ljava/io/InputStream;
ARG 1 fileName

9
mappings/net/minecraft/resource/ResourceRef.mapping Normal file
View File

@ -0,0 +1,9 @@
CLASS net/minecraft/class_7086 net/minecraft/resource/ResourceRef
FIELD field_37298 packName Ljava/lang/String;
FIELD field_37299 opener Lnet/minecraft/class_7086$class_7087;
METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_7086$class_7087;)V
ARG 1 name
ARG 2 opener
METHOD method_41290 getPackName ()Ljava/lang/String;
METHOD method_41291 open ()Lnet/minecraft/class_3298;
CLASS class_7087 Opener

41
mappings/net/minecraft/resource/metadata/ResourceFilter.mapping Normal file
View File

@ -0,0 +1,41 @@
CLASS net/minecraft/class_7084 net/minecraft/resource/metadata/ResourceFilter
FIELD field_37289 READER Lnet/minecraft/class_3270;
FIELD field_37290 LOGGER Lorg/slf4j/Logger;
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.
METHOD <init> (Ljava/util/List;)V
ARG 1 blocks
METHOD method_41277 (Lnet/minecraft/class_7084;)Ljava/util/List;
ARG 0 filter
METHOD method_41278 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_41279 isNamespaceBlocked (Ljava/lang/String;)Z
ARG 1 namespace
METHOD method_41280 (Ljava/lang/String;Lnet/minecraft/class_7084$class_7085;)Z
ARG 1 block
METHOD method_41281 isPathBlocked (Ljava/lang/String;)Z
ARG 1 namespace
METHOD method_41282 (Ljava/lang/String;Lnet/minecraft/class_7084$class_7085;)Z
ARG 1 block
CLASS class_7085 BlockEntry
FIELD field_37293 CODEC Lcom/mojang/serialization/Codec;
FIELD field_37294 namespace Ljava/util/Optional;
FIELD field_37295 namespacePredicate Ljava/util/function/Predicate;
FIELD field_37296 path Ljava/util/Optional;
FIELD field_37297 pathPredicate Ljava/util/function/Predicate;
METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;)V
ARG 1 namespace
ARG 2 path
METHOD method_41284 (Lnet/minecraft/class_7084$class_7085;)Ljava/util/Optional;
ARG 0 entry
METHOD method_41285 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_41286 (Ljava/lang/String;)Z
ARG 0 path_
METHOD method_41288 (Lnet/minecraft/class_7084$class_7085;)Ljava/util/Optional;
ARG 0 entry
METHOD method_41289 (Ljava/lang/String;)Z
ARG 0 namespace_
METHOD test (Ljava/lang/Object;)Z
ARG 1 id

3
mappings/net/minecraft/util/dynamic/Codecs.mapping
View File

@ -7,6 +7,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
FIELD field_33441 NONNEGATIVE_INT Lcom/mojang/serialization/Codec;
FIELD field_33442 POSITIVE_INT Lcom/mojang/serialization/Codec;
FIELD field_34387 POSITIVE_FLOAT Lcom/mojang/serialization/Codec;
FIELD field_37408 REGULAR_EXPRESSION Lcom/mojang/serialization/Codec;
METHOD method_33817 xor (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
COMMENT Returns an exclusive-or codec for {@link Either} instances.
COMMENT
@ -90,6 +91,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
ARG 0 originalCodec
METHOD method_40114 createEqualTypeChecker (Ljava/util/function/Function;)Ljava/util/function/Function;
ARG 0 typeGetter
METHOD method_41302 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
ARG 0 pattern
CLASS 1
METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult;
ARG 1 ops

36
mappings/net/minecraft/util/dynamic/EntryLoader.mapping
View File

@ -5,11 +5,29 @@ CLASS net/minecraft/class_5506 net/minecraft/util/dynamic/EntryLoader
COMMENT @return A collection of file Identifiers of all known entries of the given registry.
COMMENT Note that these are file Identifiers for use in a resource manager, not the logical names of the entries.
ARG 1 key
METHOD method_42083 createParseable (Lnet/minecraft/class_5321;)Ljava/util/Optional;
ARG 1 key
CLASS 1
FIELD field_36186 JSON Ljava/lang/String;
METHOD method_31158 (Lnet/minecraft/class_2960;)Z
ARG 0 id
METHOD method_39745 (Ljava/lang/String;Lnet/minecraft/class_5321;Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_7086;)V
ARG 4 id
ARG 5 resourceRef
METHOD method_39746 createId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2960;
ARG 0 rootKey
METHOD method_39747 getPath (Lnet/minecraft/class_2960;)Ljava/lang/String;
ARG 0 id
METHOD method_42084 (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
ARG 3 jsonOps
ARG 4 decoder
METHOD method_42085 (Lnet/minecraft/class_7086;Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
ARG 3 jsonOps
ARG 4 decoder
METHOD method_42086 parse (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;Lnet/minecraft/class_3298;)Lcom/mojang/serialization/DataResult;
ARG 1 jsonOps
ARG 2 decoder
ARG 3 resource
CLASS class_5507 Impl
FIELD field_26741 values Ljava/util/Map;
FIELD field_36187 LOGGER Lorg/slf4j/Logger;
@ -20,10 +38,28 @@ CLASS net/minecraft/class_5506 net/minecraft/util/dynamic/EntryLoader
ARG 4 rawId
ARG 5 entry
ARG 6 lifecycle
METHOD method_42087 (Lcom/mojang/serialization/DataResult;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
ARG 1 jsonOps
ARG 2 decoder
METHOD method_42088 (Ljava/util/Map$Entry;)Lnet/minecraft/class_5506$class_7236;
ARG 0 entry
METHOD method_42089 (Lnet/minecraft/class_5321;Ljava/util/Map$Entry;)Z
ARG 1 entry
METHOD method_42090 (Ljava/util/Map$Entry;)Lnet/minecraft/class_5321;
ARG 0 entry
CLASS class_6821 Element
METHOD method_42091 parse (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
ARG 1 jsonOps
ARG 2 decoder
METHOD method_42092 (Ljava/lang/Object;)Lnet/minecraft/class_5506$class_6822;
ARG 1 value
CLASS class_6822 Entry
METHOD method_39750 of (Ljava/lang/Object;)Lnet/minecraft/class_5506$class_6822;
ARG 0 value
METHOD method_39751 of (Ljava/lang/Object;I)Lnet/minecraft/class_5506$class_6822;
ARG 0 value
ARG 1 id
CLASS class_7236 Parseable
METHOD parseElement (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
ARG 1 jsonOps
ARG 2 decoder

7
mappings/net/minecraft/util/dynamic/RegistryLoader.mapping
View File

@ -26,6 +26,13 @@ CLASS net/minecraft/class_6900 net/minecraft/util/dynamic/RegistryLoader
ARG 5 reg
METHOD method_40408 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6900$class_6902;
ARG 0 ref
METHOD method_42082 load (Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_5321;Ljava/util/Optional;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult;
ARG 1 registry
ARG 2 registryRef
ARG 3 codec
ARG 4 entryKey
ARG 5 parseable
ARG 6 ops
CLASS class_6901 LoaderAccess
FIELD comp_354 dynamicRegistryManager Lnet/minecraft/class_5455$class_6893;
METHOD comp_354 dynamicRegistryManager ()Lnet/minecraft/class_5455$class_6893;