From 422b43695df75584c487e67fb0264a64bbfb5779 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Tue, 2 Mar 2021 05:32:24 -0600 Subject: [PATCH] Mapped some stuff in tags (#2055) * Mapped some stuff in tags out of 10 nested classes, 4 are now mapped, 6 more Signed-off-by: liach 08a stuff See https://github.com/FabricMC/yarn/pull/2108/files/4dd9ce2a30ca40f9571a5dc3a97fc83679fbe3a4#r582544937 Signed-off-by: liach Update mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> * use plain links Signed-off-by: liach * Update mappings/net/minecraft/tag/TagGroup.mapping Co-authored-by: liach Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../s2c/play/SynchronizeTagsS2CPacket.mapping | 6 ++++ .../net/minecraft/tag/RequiredTagList.mapping | 3 ++ .../tag/RequiredTagListRegistry.mapping | 1 + mappings/net/minecraft/tag/TagGroup.mapping | 31 +++++++++++++++--- .../net/minecraft/tag/TagGroupLoader.mapping | 6 +++- mappings/net/minecraft/tag/TagManager.mapping | 32 +++++++++++++++++++ .../minecraft/tag/TagManagerLoader.mapping | 14 ++++++++ 7 files changed, 88 insertions(+), 5 deletions(-) diff --git a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping index 5c21045a5e..6c62b67879 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping @@ -1,9 +1,15 @@ CLASS net/minecraft/class_2790 net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket + FIELD field_12757 groups Ljava/util/Map; + METHOD (Ljava/util/Map;)V + ARG 1 groups METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_12000 getGroups ()Ljava/util/Map; METHOD method_34203 (Lnet/minecraft/class_2540;Lnet/minecraft/class_5414$class_5748;)V ARG 0 buf + ARG 1 serializedGroup METHOD method_34204 (Lnet/minecraft/class_2540;Lnet/minecraft/class_5321;)V ARG 0 buf + ARG 1 registryKey METHOD method_34205 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5321; ARG 0 buf diff --git a/mappings/net/minecraft/tag/RequiredTagList.mapping b/mappings/net/minecraft/tag/RequiredTagList.mapping index 32e53ba64f..2875580cfa 100644 --- a/mappings/net/minecraft/tag/RequiredTagList.mapping +++ b/mappings/net/minecraft/tag/RequiredTagList.mapping @@ -3,8 +3,10 @@ CLASS net/minecraft/class_5120 net/minecraft/tag/RequiredTagList FIELD field_23682 group Lnet/minecraft/class_5414; FIELD field_23683 tags Ljava/util/List; FIELD field_28301 registryKey Lnet/minecraft/class_5321; + FIELD field_28302 dataType Ljava/lang/String; METHOD (Lnet/minecraft/class_5321;Ljava/lang/String;)V ARG 1 registryKey + ARG 2 dataType METHOD method_26770 getGroup ()Lnet/minecraft/class_5414; METHOD method_26771 updateTagManager (Lnet/minecraft/class_5415;)V ARG 1 tagManager @@ -21,6 +23,7 @@ CLASS net/minecraft/class_5120 net/minecraft/tag/RequiredTagList COMMENT Gets the required tags which are not supplied by the current datapacks. ARG 1 tagManager METHOD method_33148 getRegistryKey ()Lnet/minecraft/class_5321; + METHOD method_33149 getDataType ()Ljava/lang/String; CLASS class_5121 TagWrapper FIELD field_23684 id Lnet/minecraft/class_2960; FIELD field_23685 delegate Lnet/minecraft/class_3494; diff --git a/mappings/net/minecraft/tag/RequiredTagListRegistry.mapping b/mappings/net/minecraft/tag/RequiredTagListRegistry.mapping index 32cfa5d758..6e9524678f 100644 --- a/mappings/net/minecraft/tag/RequiredTagListRegistry.mapping +++ b/mappings/net/minecraft/tag/RequiredTagListRegistry.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_5413 net/minecraft/tag/RequiredTagListRegistry ARG 1 list METHOD method_30201 register (Lnet/minecraft/class_5321;Ljava/lang/String;)Lnet/minecraft/class_5120; ARG 0 registryKey + ARG 1 dataType 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/TagGroup.mapping b/mappings/net/minecraft/tag/TagGroup.mapping index 10e54b12e6..969894bd07 100644 --- a/mappings/net/minecraft/tag/TagGroup.mapping +++ b/mappings/net/minecraft/tag/TagGroup.mapping @@ -8,18 +8,41 @@ CLASS net/minecraft/class_5414 net/minecraft/tag/TagGroup ARG 1 object METHOD method_30207 create (Ljava/util/Map;)Lnet/minecraft/class_5414; ARG 0 tags - METHOD method_30208 toPacket (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5414$class_5748; + METHOD method_30208 serialize (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5414$class_5748; + COMMENT Serializes this tag group. + 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_30213 getTagOrEmpty (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494; ARG 1 id METHOD method_30214 createEmpty ()Lnet/minecraft/class_5414; + METHOD method_33155 deserialize (Lnet/minecraft/class_5414$class_5748;Lnet/minecraft/class_2378;)Lnet/minecraft/class_5414; + COMMENT Deserializes a serialized tag group. + ARG 0 serialized + ARG 1 registry + METHOD method_33156 (Lnet/minecraft/class_2378;Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_3494;)V + ARG 2 id + ARG 3 tag + METHOD method_33157 (Lnet/minecraft/class_2378;Ljava/util/Map;Lnet/minecraft/class_2960;Lit/unimi/dsi/fastutil/ints/IntList;)V + ARG 2 id + ARG 3 entries CLASS 1 FIELD field_25742 tags Lcom/google/common/collect/BiMap; FIELD field_25743 emptyTag Lnet/minecraft/class_3494; - CLASS class_5748 - METHOD method_33159 (Lnet/minecraft/class_2540;)V + CLASS class_5748 Serialized + COMMENT A serialization-friendly POJO representation of a {@linkplain + COMMENT TagGroup tag group}. This allows easy transport of tag groups + COMMENT over Minecraft network protocol. + COMMENT + COMMENT

This stores tag entries with raw integer IDs and requires a registry + COMMENT for raw ID access to {@linkplain TagGroup#serialize(Registry) serialize} + COMMENT or {@linkplain TagGroup#deserialize(TagGroup.Serialized, Registry) + COMMENT deserialize} tag groups. + FIELD field_28304 contents Ljava/util/Map; + METHOD (Ljava/util/Map;)V + ARG 1 contents + METHOD method_33159 writeBuf (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_33160 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5414$class_5748; + METHOD method_33160 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5414$class_5748; ARG 0 buf diff --git a/mappings/net/minecraft/tag/TagGroupLoader.mapping b/mappings/net/minecraft/tag/TagGroupLoader.mapping index 801b4b98a4..036237016b 100644 --- a/mappings/net/minecraft/tag/TagGroupLoader.mapping +++ b/mappings/net/minecraft/tag/TagGroupLoader.mapping @@ -7,5 +7,9 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagGroupLoader METHOD (Ljava/util/function/Function;Ljava/lang/String;)V ARG 1 registryGetter ARG 2 dataType - METHOD method_18242 applyReload (Ljava/util/Map;)Lnet/minecraft/class_5414; + METHOD method_18242 buildGroup (Ljava/util/Map;)Lnet/minecraft/class_5414; ARG 1 tags + METHOD method_33174 loadTags (Lnet/minecraft/class_3300;)Ljava/util/Map; + ARG 1 manager + METHOD method_33176 load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_5414; + ARG 1 manager diff --git a/mappings/net/minecraft/tag/TagManager.mapping b/mappings/net/minecraft/tag/TagManager.mapping index 901a0e7e4c..9f10097c95 100644 --- a/mappings/net/minecraft/tag/TagManager.mapping +++ b/mappings/net/minecraft/tag/TagManager.mapping @@ -5,15 +5,47 @@ CLASS net/minecraft/class_5415 net/minecraft/tag/TagManager METHOD (Ljava/util/Map;)V ARG 1 tagGroups METHOD method_30217 toPacket (Lnet/minecraft/class_5455;)Ljava/util/Map; + ARG 1 registryManager METHOD method_30219 fromPacket (Lnet/minecraft/class_5455;Ljava/util/Map;)Lnet/minecraft/class_5415; + ARG 0 registryManager + ARG 1 groups METHOD method_30222 apply ()V + METHOD method_33161 accept (Lnet/minecraft/class_5415$class_5750;)V + ARG 1 visitor + METHOD method_33162 offerTo (Lnet/minecraft/class_5415$class_5750;Lnet/minecraft/class_5321;Lnet/minecraft/class_5414;)V + ARG 0 visitor + ARG 1 type + ARG 2 group + METHOD method_33163 tryAdd (Lnet/minecraft/class_5455;Lnet/minecraft/class_5415$class_5749;Lnet/minecraft/class_5321;Lnet/minecraft/class_5414$class_5748;)V + ARG 0 registryManager + ARG 1 builder + ARG 2 type + ARG 3 group METHOD method_33164 getOrCreateTagGroup (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5414; ARG 1 registryKey METHOD method_33165 getTagId (Lnet/minecraft/class_5321;Lnet/minecraft/class_3494;Ljava/util/function/Supplier;)Lnet/minecraft/class_2960; ARG 1 registryKey ARG 2 tag + ARG 3 exceptionSupplier METHOD method_33166 getTag (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;Ljava/util/function/Function;)Lnet/minecraft/class_3494; ARG 1 registryKey ARG 2 id + ARG 3 exceptionFactory + METHOD method_33168 (Lnet/minecraft/class_5415$class_5750;Lnet/minecraft/class_5321;Lnet/minecraft/class_5414;)V + ARG 1 type + ARG 2 group + METHOD method_33169 (Lnet/minecraft/class_5455;Lnet/minecraft/class_5415$class_5749;Lnet/minecraft/class_5321;Lnet/minecraft/class_5414$class_5748;)V + ARG 2 type + ARG 3 group METHOD method_33170 getTagGroup (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5414; ARG 1 registryKey + CLASS class_5749 Builder + FIELD field_28310 groups Lcom/google/common/collect/ImmutableMap$Builder; + METHOD method_33171 build ()Lnet/minecraft/class_5415; + METHOD method_33172 add (Lnet/minecraft/class_5321;Lnet/minecraft/class_5414;)Lnet/minecraft/class_5415$class_5749; + ARG 1 type + ARG 2 tagGroup + CLASS class_5750 Visitor + METHOD method_33173 visit (Lnet/minecraft/class_5321;Lnet/minecraft/class_5414;)V + ARG 1 type + ARG 2 group diff --git a/mappings/net/minecraft/tag/TagManagerLoader.mapping b/mappings/net/minecraft/tag/TagManagerLoader.mapping index 49c947dfe1..c507bc5783 100644 --- a/mappings/net/minecraft/tag/TagManagerLoader.mapping +++ b/mappings/net/minecraft/tag/TagManagerLoader.mapping @@ -5,3 +5,17 @@ CLASS net/minecraft/class_3505 net/minecraft/tag/TagManagerLoader METHOD (Lnet/minecraft/class_5455;)V ARG 1 registryManager METHOD method_30223 getTagManager ()Lnet/minecraft/class_5415; + METHOD method_33178 buildRequiredGroup (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Lnet/minecraft/class_5120;)Lnet/minecraft/class_3505$class_5751; + ARG 1 resourceManager + ARG 2 prepareExecutor + ARG 3 requirement + METHOD method_33180 (Lnet/minecraft/class_5415$class_5749;Lnet/minecraft/class_3505$class_5751;)V + ARG 1 requiredGroup + CLASS class_5751 RequiredGroup + FIELD field_28313 requirement Lnet/minecraft/class_5120; + FIELD field_28314 groupLoadFuture Ljava/util/concurrent/CompletableFuture; + METHOD (Lnet/minecraft/class_5120;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 requirement + ARG 2 groupLoadFuture + METHOD method_33183 addTo (Lnet/minecraft/class_5415$class_5749;)V + ARG 1 builder