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

New tag mappings and refactor of tag names (#1543) 

* Map new tag logic.

* slight javadoc correction

* Tag refactor

* Update mappings/net/minecraft/tag/TagGroup.mapping

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

* RequiredTagGroupRegistry -> RequiredTagListRegistry

* Fix a couple of lambda parameters

* RequiredTagList.get -> add

Co-authored-by: i509VCB <git@i509.me>
Co-authored-by: i509VCB <i509vcb@gmail.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
This commit is contained in:
Joseph Burton 2020-07-06 22:51:14 +01:00 committed by GitHub
parent 4b5dadbafa
commit 24246abf20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 131 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mappings/net/minecraft/tag/BlockTags.mapping
View File

@ -1,5 +1,5 @@
CLASS net/minecraft/class_3481 net/minecraft/tag/BlockTags
FIELD field_23678 ACCESSOR Lnet/minecraft/class_5120;
FIELD field_23678 REQUIRED_TAGS Lnet/minecraft/class_5120;
METHOD method_15069 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123;
ARG 0 id
METHOD method_15073 getContainer ()Lnet/minecraft/class_5414;
METHOD method_15073 getTagGroup ()Lnet/minecraft/class_5414;

4
mappings/net/minecraft/tag/EntityTypeTags.mapping
View File

@ -1,5 +1,5 @@
CLASS net/minecraft/class_3483 net/minecraft/tag/EntityTypeTags
FIELD field_23679 ACCESSOR Lnet/minecraft/class_5120;
FIELD field_23679 REQUIRED_TAGS Lnet/minecraft/class_5120;
METHOD method_15077 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123;
ARG 0 id
METHOD method_15082 getContainer ()Lnet/minecraft/class_5414;
METHOD method_15082 getTagGroup ()Lnet/minecraft/class_5414;

5
mappings/net/minecraft/tag/FluidTags.mapping
View File

@ -1,5 +1,6 @@
CLASS net/minecraft/class_3486 net/minecraft/tag/FluidTags
FIELD field_23680 ACCESSOR Lnet/minecraft/class_5120;
FIELD field_23680 REQUIRED_TAGS Lnet/minecraft/class_5120;
METHOD method_15095 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123;
ARG 0 id
METHOD method_22448 getContainer ()Lnet/minecraft/class_5414;
METHOD method_22448 getTagGroup ()Lnet/minecraft/class_5414;
METHOD method_29897 all ()Ljava/util/List;

18
mappings/net/minecraft/tag/GlobalTagAccessor.mapping
View File

@ -1,18 +0,0 @@
CLASS net/minecraft/class_5120 net/minecraft/tag/GlobalTagAccessor
COMMENT Allows access to tags from either client or server threads and propagates
COMMENT tag changes through reloads/server tag sends.
FIELD field_23682 currentContainer Lnet/minecraft/class_5414;
FIELD field_23683 tags Ljava/util/List;
METHOD method_26770 getContainer ()Lnet/minecraft/class_5414;
METHOD method_26771 setContainer (Lnet/minecraft/class_5415;)V
METHOD method_26773 get (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123;
ARG 1 id
METHOD method_27061 markReady ()V
CLASS class_5121 CachedTag
FIELD field_23684 id Lnet/minecraft/class_2960;
FIELD field_23685 currentTag Lnet/minecraft/class_3494;
METHOD <init> (Lnet/minecraft/class_2960;)V
ARG 1 id
METHOD method_26775 updateContainer (Ljava/util/function/Function;)V
ARG 1 tagFactory
METHOD method_26776 get ()Lnet/minecraft/class_3494;

4
mappings/net/minecraft/tag/ItemTags.mapping
View File

@ -1,5 +1,5 @@
CLASS net/minecraft/class_3489 net/minecraft/tag/ItemTags
FIELD field_23681 ACCESSOR Lnet/minecraft/class_5120;
FIELD field_23681 REQUIRED_TAGS Lnet/minecraft/class_5120;
METHOD method_15102 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123;
ARG 0 id
METHOD method_15106 getContainer ()Lnet/minecraft/class_5414;
METHOD method_15106 getTagGroup ()Lnet/minecraft/class_5414;

31
mappings/net/minecraft/tag/RequiredTagList.mapping Normal file
View File

@ -0,0 +1,31 @@
CLASS net/minecraft/class_5120 net/minecraft/tag/RequiredTagList
COMMENT Stores all required tags of a given type, so they can be updated to point to the new tag instances on datapack reload
FIELD field_23682 group Lnet/minecraft/class_5414;
FIELD field_23683 tags Ljava/util/List;
FIELD field_25740 groupGetter Ljava/util/function/Function;
METHOD <init> (Ljava/util/function/Function;)V
ARG 1 managerGetter
METHOD method_26770 getGroup ()Lnet/minecraft/class_5414;
METHOD method_26771 updateTagManager (Lnet/minecraft/class_5415;)V
ARG 1 manager
METHOD method_26772 (Lnet/minecraft/class_5414;Lnet/minecraft/class_5120$class_5121;)V
ARG 1 tag
METHOD method_26773 add (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123;
ARG 1 id
METHOD method_27061 clearAllTags ()V
METHOD method_27062 (Lnet/minecraft/class_3494;Lnet/minecraft/class_5120$class_5121;)V
ARG 1 tag
METHOD method_27063 (Lnet/minecraft/class_3494;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494;
ARG 1 id
METHOD method_29224 getMissingTags (Lnet/minecraft/class_5415;)Ljava/util/Set;
COMMENT Gets the required tags which are not supplied by the current datapacks.
ARG 1 manager
METHOD method_29902 getTags ()Ljava/util/List;
CLASS class_5121 TagWrapper
FIELD field_23684 id Lnet/minecraft/class_2960;
FIELD field_23685 delegate Lnet/minecraft/class_3494;
METHOD <init> (Lnet/minecraft/class_2960;)V
ARG 1 id
METHOD method_26775 updateDelegate (Ljava/util/function/Function;)V
ARG 1 tagFactory
METHOD method_26776 get ()Lnet/minecraft/class_3494;

18
mappings/net/minecraft/tag/RequiredTagListRegistry.mapping Normal file
View File

@ -0,0 +1,18 @@
CLASS net/minecraft/class_5413 net/minecraft/tag/RequiredTagListRegistry
FIELD field_25741 REQUIRED_TAG_LISTS Ljava/util/Map;
METHOD method_30196 clearAllTags ()V
METHOD method_30197 (Lnet/minecraft/class_5120;)Z
ARG 0 list
METHOD method_30198 updateTagManager (Lnet/minecraft/class_5415;)V
ARG 0 tagManager
METHOD method_30199 (Lnet/minecraft/class_5415;Lnet/minecraft/class_5120;)V
ARG 1 list
METHOD method_30200 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_5415;Lnet/minecraft/class_2960;Lnet/minecraft/class_5120;)V
ARG 2 id
ARG 3 list
METHOD method_30201 register (Lnet/minecraft/class_2960;Ljava/util/function/Function;)Lnet/minecraft/class_5120;
ARG 0 id
ARG 1 containerGetter
METHOD method_30202 validateRegistrations ()V
METHOD method_30203 getMissingTags (Lnet/minecraft/class_5415;)Lcom/google/common/collect/Multimap;
ARG 0 tagManager

6
mappings/net/minecraft/tag/ServerTagManagerHolder.mapping Normal file
View File

@ -0,0 +1,6 @@
CLASS net/minecraft/class_5323 net/minecraft/tag/ServerTagManagerHolder
COMMENT A class containing the single static instance of {@link TagManager} on the server.
FIELD field_25149 tagManager Lnet/minecraft/class_5415;
METHOD method_29219 setTagManager (Lnet/minecraft/class_5415;)V
ARG 0 tagManager
METHOD method_29223 getTagManager ()Lnet/minecraft/class_5415;

16
mappings/net/minecraft/tag/SetTag.mapping
View File

@ -1,7 +1,15 @@
CLASS net/minecraft/class_5394 net/minecraft/tag/SetTag
FIELD field_25593 values Lcom/google/common/collect/ImmutableList;
FIELD field_25591 type Ljava/lang/Class;
FIELD field_25593 valueList Lcom/google/common/collect/ImmutableList;
FIELD field_25594 valueSet Ljava/util/Set;
METHOD <init> (Ljava/util/Set;Ljava/lang/Class;)V
ARG 1 set
ARG 1 values
ARG 2 type
METHOD method_29898 empty ()Lnet/minecraft/class_5394;
METHOD method_29900 (Ljava/util/Set;)Lnet/minecraft/class_5394;
ARG 0 set
METHOD method_29899 getCommonType (Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/Class;
ARG 0 first
ARG 1 second
METHOD method_29900 of (Ljava/util/Set;)Lnet/minecraft/class_5394;
ARG 0 values
METHOD method_29901 getCommonType (Ljava/util/Set;)Ljava/lang/Class;
ARG 0 values

4
mappings/net/minecraft/tag/Tag.mapping
View File

@ -15,7 +15,9 @@ CLASS net/minecraft/class_3494 net/minecraft/tag/Tag
METHOD method_15142 getRandom (Ljava/util/Random;)Ljava/lang/Object;
ARG 1 random
METHOD method_26777 of (Ljava/util/Set;)Lnet/minecraft/class_3494;
ARG 0 set
ARG 0 values
METHOD method_28134 codec (Ljava/util/function/Supplier;)Lcom/mojang/serialization/Codec;
ARG 0 groupGetter
CLASS class_3495 Builder
COMMENT A builder class to ease the creation of tags. It can also be used as a
COMMENT mutable form of a tag.

3
mappings/net/minecraft/tag/TagContainers.mapping
View File

@ -1,3 +0,0 @@
CLASS net/minecraft/class_5323 net/minecraft/tag/TagContainers
FIELD field_25149 instance Lnet/minecraft/class_5415;
METHOD method_29223 instance ()Lnet/minecraft/class_5415;

27
mappings/net/minecraft/tag/TagGroup.mapping Normal file
View File

@ -0,0 +1,27 @@
CLASS net/minecraft/class_5414 net/minecraft/tag/TagGroup
COMMENT Contains the set of tags all of the same type.
METHOD method_30204 getTags ()Ljava/util/Map;
METHOD method_30205 getUncheckedTagId (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2960;
ARG 1 tag
METHOD method_30206 getTagsFor (Ljava/lang/Object;)Ljava/util/Collection;
COMMENT Gets the identifiers of all tags an object is applicable to.
ARG 1 object
METHOD method_30207 create (Ljava/util/Map;)Lnet/minecraft/class_5414;
ARG 0 tags
METHOD method_30208 toPacket (Lnet/minecraft/class_2540;Lnet/minecraft/class_2348;)V
ARG 1 buf
ARG 2 registry
METHOD method_30209 fromPacket (Lnet/minecraft/class_2540;Lnet/minecraft/class_2378;)Lnet/minecraft/class_5414;
ARG 0 buf
ARG 1 registry
METHOD method_30210 getTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494;
ARG 1 id
METHOD method_30211 getTagIds ()Ljava/util/Collection;
METHOD method_30212 getTagId (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2960;
ARG 1 tag
METHOD method_30213 getTagOrEmpty (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494;
ARG 1 id
METHOD method_30214 createEmpty ()Lnet/minecraft/class_5414;
CLASS 1
FIELD field_25742 tags Lcom/google/common/collect/BiMap;
FIELD field_25743 emptyTag Lnet/minecraft/class_3494;

10
mappings/net/minecraft/tag/TagContainer.mapping → mappings/net/minecraft/tag/TagGroupLoader.mapping
View File

@ -1,14 +1,16 @@
CLASS net/minecraft/class_3503 net/minecraft/tag/TagContainer
CLASS net/minecraft/class_3503 net/minecraft/tag/TagGroupLoader
FIELD field_15603 JSON_EXTENSION_LENGTH I
FIELD field_15605 dataType Ljava/lang/String;
FIELD field_15606 entryType Ljava/lang/String;
FIELD field_15607 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_15608 GSON Lcom/google/gson/Gson;
FIELD field_15609 getter Ljava/util/function/Function;
FIELD field_15609 registryGetter Ljava/util/function/Function;
METHOD <init> (Ljava/util/function/Function;Ljava/lang/String;Ljava/lang/String;)V
ARG 1 getter
ARG 1 registryGetter
ARG 2 dataType
ARG 3 entryType
METHOD method_15192 prepareReload (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 1 manager
ARG 2 executor
ARG 2 prepareExecutor
METHOD method_18242 applyReload (Ljava/util/Map;)Lnet/minecraft/class_5414;
ARG 1 tags

16
mappings/net/minecraft/tag/TagManager.mapping Normal file
View File

@ -0,0 +1,16 @@
CLASS net/minecraft/class_5415 net/minecraft/tag/TagManager
FIELD field_25744 EMPTY Lnet/minecraft/class_5415;
METHOD method_30215 getBlocks ()Lnet/minecraft/class_5414;
METHOD method_30216 create (Lnet/minecraft/class_5414;Lnet/minecraft/class_5414;Lnet/minecraft/class_5414;Lnet/minecraft/class_5414;)Lnet/minecraft/class_5415;
ARG 0 blocks
ARG 1 items
ARG 2 fluids
ARG 3 entityTypes
METHOD method_30217 toPacket (Lnet/minecraft/class_2540;)V
ARG 1 buf
METHOD method_30218 getItems ()Lnet/minecraft/class_5414;
METHOD method_30219 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5415;
ARG 0 buf
METHOD method_30220 getFluids ()Lnet/minecraft/class_5414;
METHOD method_30221 getEntityTypes ()Lnet/minecraft/class_5414;
METHOD method_30222 apply ()V

4
mappings/net/minecraft/tag/RegistryTagManager.mapping → mappings/net/minecraft/tag/TagManagerLoader.mapping
View File

@ -1,5 +1,7 @@
CLASS net/minecraft/class_3505 net/minecraft/tag/RegistryTagManager
CLASS net/minecraft/class_3505 net/minecraft/tag/TagManagerLoader
FIELD field_15612 blocks Lnet/minecraft/class_3503;
FIELD field_15613 items Lnet/minecraft/class_3503;
FIELD field_15614 fluids Lnet/minecraft/class_3503;
FIELD field_15615 entityTypes Lnet/minecraft/class_3503;
FIELD field_25749 tagManager Lnet/minecraft/class_5415;
METHOD method_30223 getTagManager ()Lnet/minecraft/class_5415;