From 24246abf20fe02cb413be2e75679b461c42026bb Mon Sep 17 00:00:00 2001 From: Joseph Burton Date: Mon, 6 Jul 2020 22:51:14 +0100 Subject: [PATCH] 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 Co-authored-by: i509VCB Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- mappings/net/minecraft/tag/BlockTags.mapping | 4 +-- .../net/minecraft/tag/EntityTypeTags.mapping | 4 +-- mappings/net/minecraft/tag/FluidTags.mapping | 5 +-- .../minecraft/tag/GlobalTagAccessor.mapping | 18 ----------- mappings/net/minecraft/tag/ItemTags.mapping | 4 +-- .../net/minecraft/tag/RequiredTagList.mapping | 31 +++++++++++++++++++ .../tag/RequiredTagListRegistry.mapping | 18 +++++++++++ .../tag/ServerTagManagerHolder.mapping | 6 ++++ mappings/net/minecraft/tag/SetTag.mapping | 16 +++++++--- mappings/net/minecraft/tag/Tag.mapping | 4 ++- .../net/minecraft/tag/TagContainers.mapping | 3 -- mappings/net/minecraft/tag/TagGroup.mapping | 27 ++++++++++++++++ ...ntainer.mapping => TagGroupLoader.mapping} | 10 +++--- mappings/net/minecraft/tag/TagManager.mapping | 16 ++++++++++ ...nager.mapping => TagManagerLoader.mapping} | 4 ++- 15 files changed, 131 insertions(+), 39 deletions(-) delete mode 100644 mappings/net/minecraft/tag/GlobalTagAccessor.mapping create mode 100644 mappings/net/minecraft/tag/RequiredTagList.mapping create mode 100644 mappings/net/minecraft/tag/RequiredTagListRegistry.mapping create mode 100644 mappings/net/minecraft/tag/ServerTagManagerHolder.mapping delete mode 100644 mappings/net/minecraft/tag/TagContainers.mapping create mode 100644 mappings/net/minecraft/tag/TagGroup.mapping rename mappings/net/minecraft/tag/{TagContainer.mapping => TagGroupLoader.mapping} (73%) create mode 100644 mappings/net/minecraft/tag/TagManager.mapping rename mappings/net/minecraft/tag/{RegistryTagManager.mapping => TagManagerLoader.mapping} (53%) diff --git a/mappings/net/minecraft/tag/BlockTags.mapping b/mappings/net/minecraft/tag/BlockTags.mapping index a16686e37d..0dd72f895f 100644 --- a/mappings/net/minecraft/tag/BlockTags.mapping +++ b/mappings/net/minecraft/tag/BlockTags.mapping @@ -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; diff --git a/mappings/net/minecraft/tag/EntityTypeTags.mapping b/mappings/net/minecraft/tag/EntityTypeTags.mapping index 80643e2cda..295142d67e 100644 --- a/mappings/net/minecraft/tag/EntityTypeTags.mapping +++ b/mappings/net/minecraft/tag/EntityTypeTags.mapping @@ -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; diff --git a/mappings/net/minecraft/tag/FluidTags.mapping b/mappings/net/minecraft/tag/FluidTags.mapping index 408147d871..d3141ef218 100644 --- a/mappings/net/minecraft/tag/FluidTags.mapping +++ b/mappings/net/minecraft/tag/FluidTags.mapping @@ -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; diff --git a/mappings/net/minecraft/tag/GlobalTagAccessor.mapping b/mappings/net/minecraft/tag/GlobalTagAccessor.mapping deleted file mode 100644 index eb32bdc00c..0000000000 --- a/mappings/net/minecraft/tag/GlobalTagAccessor.mapping +++ /dev/null @@ -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 (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; diff --git a/mappings/net/minecraft/tag/ItemTags.mapping b/mappings/net/minecraft/tag/ItemTags.mapping index e440406062..b5bb3c28fe 100644 --- a/mappings/net/minecraft/tag/ItemTags.mapping +++ b/mappings/net/minecraft/tag/ItemTags.mapping @@ -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; diff --git a/mappings/net/minecraft/tag/RequiredTagList.mapping b/mappings/net/minecraft/tag/RequiredTagList.mapping new file mode 100644 index 0000000000..a1cd28e0c6 --- /dev/null +++ b/mappings/net/minecraft/tag/RequiredTagList.mapping @@ -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 (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 (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; diff --git a/mappings/net/minecraft/tag/RequiredTagListRegistry.mapping b/mappings/net/minecraft/tag/RequiredTagListRegistry.mapping new file mode 100644 index 0000000000..a07a4bd6a1 --- /dev/null +++ b/mappings/net/minecraft/tag/RequiredTagListRegistry.mapping @@ -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 diff --git a/mappings/net/minecraft/tag/ServerTagManagerHolder.mapping b/mappings/net/minecraft/tag/ServerTagManagerHolder.mapping new file mode 100644 index 0000000000..1b310d9e24 --- /dev/null +++ b/mappings/net/minecraft/tag/ServerTagManagerHolder.mapping @@ -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; diff --git a/mappings/net/minecraft/tag/SetTag.mapping b/mappings/net/minecraft/tag/SetTag.mapping index c7b961a890..ead648fa60 100644 --- a/mappings/net/minecraft/tag/SetTag.mapping +++ b/mappings/net/minecraft/tag/SetTag.mapping @@ -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 (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 diff --git a/mappings/net/minecraft/tag/Tag.mapping b/mappings/net/minecraft/tag/Tag.mapping index 5096b7495d..8608b65123 100644 --- a/mappings/net/minecraft/tag/Tag.mapping +++ b/mappings/net/minecraft/tag/Tag.mapping @@ -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. diff --git a/mappings/net/minecraft/tag/TagContainers.mapping b/mappings/net/minecraft/tag/TagContainers.mapping deleted file mode 100644 index c89c18a3fd..0000000000 --- a/mappings/net/minecraft/tag/TagContainers.mapping +++ /dev/null @@ -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; diff --git a/mappings/net/minecraft/tag/TagGroup.mapping b/mappings/net/minecraft/tag/TagGroup.mapping new file mode 100644 index 0000000000..0227438a5c --- /dev/null +++ b/mappings/net/minecraft/tag/TagGroup.mapping @@ -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; diff --git a/mappings/net/minecraft/tag/TagContainer.mapping b/mappings/net/minecraft/tag/TagGroupLoader.mapping similarity index 73% rename from mappings/net/minecraft/tag/TagContainer.mapping rename to mappings/net/minecraft/tag/TagGroupLoader.mapping index 8ed15f5edc..c27d26104d 100644 --- a/mappings/net/minecraft/tag/TagContainer.mapping +++ b/mappings/net/minecraft/tag/TagGroupLoader.mapping @@ -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 (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 diff --git a/mappings/net/minecraft/tag/TagManager.mapping b/mappings/net/minecraft/tag/TagManager.mapping new file mode 100644 index 0000000000..850499490a --- /dev/null +++ b/mappings/net/minecraft/tag/TagManager.mapping @@ -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 diff --git a/mappings/net/minecraft/tag/RegistryTagManager.mapping b/mappings/net/minecraft/tag/TagManagerLoader.mapping similarity index 53% rename from mappings/net/minecraft/tag/RegistryTagManager.mapping rename to mappings/net/minecraft/tag/TagManagerLoader.mapping index afceda14f2..f2adb8b138 100644 --- a/mappings/net/minecraft/tag/RegistryTagManager.mapping +++ b/mappings/net/minecraft/tag/TagManagerLoader.mapping @@ -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;