From 7e4228442fcfaf00bb95ab128ccf0eedd7f5fa55 Mon Sep 17 00:00:00 2001 From: haykam821 <24855774+haykam821@users.noreply.github.com> Date: Thu, 5 May 2022 12:36:49 -0400 Subject: [PATCH] Map changes to banner patterns in 22w18a (#3135) --- .../net/minecraft/block/entity/BannerPattern.mapping | 9 +++++++++ .../net/minecraft/block/entity/BannerPatterns.mapping | 5 +++++ .../block/entity/BannerBlockEntityRenderer.mapping | 4 ++++ .../data/server/BannerPatternTagProvider.mapping | 3 +++ mappings/net/minecraft/item/BannerItem.mapping | 4 ++++ mappings/net/minecraft/item/BannerPatternItem.mapping | 3 ++- .../loot/function/SetBannerPatternFunction.mapping | 6 ++++++ mappings/net/minecraft/tag/BannerPatternTags.mapping | 3 +++ mappings/net/minecraft/util/Identifier.mapping | 2 ++ mappings/net/minecraft/util/registry/Registry.mapping | 2 ++ 10 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 mappings/net/minecraft/block/entity/BannerPatterns.mapping create mode 100644 mappings/net/minecraft/data/server/BannerPatternTagProvider.mapping create mode 100644 mappings/net/minecraft/tag/BannerPatternTags.mapping diff --git a/mappings/net/minecraft/block/entity/BannerPattern.mapping b/mappings/net/minecraft/block/entity/BannerPattern.mapping index b063d85e6e..dccdfa16ce 100644 --- a/mappings/net/minecraft/block/entity/BannerPattern.mapping +++ b/mappings/net/minecraft/block/entity/BannerPattern.mapping @@ -1,14 +1,23 @@ CLASS net/minecraft/class_2582 net/minecraft/block/entity/BannerPattern FIELD field_11824 id Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 id METHOD method_10945 getId ()Ljava/lang/String; METHOD method_10946 byId (Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 id METHOD method_22536 getSpriteId (Lnet/minecraft/class_5321;Z)Lnet/minecraft/class_2960; + ARG 0 pattern ARG 1 banner + METHOD method_43719 (Ljava/lang/String;Lnet/minecraft/class_6880$class_6883;)Z + ARG 1 pattern CLASS class_3750 Patterns FIELD field_16548 entries Ljava/util/List; METHOD method_16375 toNbt ()Lnet/minecraft/class_2499; METHOD method_16376 add (Lnet/minecraft/class_6880;Lnet/minecraft/class_1767;)Lnet/minecraft/class_2582$class_3750; + ARG 1 pattern ARG 2 color METHOD method_31653 add (Lcom/mojang/datafixers/util/Pair;)Lnet/minecraft/class_2582$class_3750; ARG 1 pattern + METHOD method_43720 add (Lnet/minecraft/class_5321;Lnet/minecraft/class_1767;)Lnet/minecraft/class_2582$class_3750; + ARG 1 pattern + ARG 2 color diff --git a/mappings/net/minecraft/block/entity/BannerPatterns.mapping b/mappings/net/minecraft/block/entity/BannerPatterns.mapping new file mode 100644 index 0000000000..796b48796a --- /dev/null +++ b/mappings/net/minecraft/block/entity/BannerPatterns.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7446 net/minecraft/block/entity/BannerPatterns + METHOD method_43721 initAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2582; + ARG 0 registry + METHOD method_43722 register (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id diff --git a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping index 23107d8e4e..d859d169b1 100644 --- a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping @@ -30,3 +30,7 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlo ARG 6 isBanner ARG 7 patterns METHOD method_32135 getTexturedModelData ()Lnet/minecraft/class_5607; + METHOD method_43789 (Lnet/minecraft/class_630;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II[FLnet/minecraft/class_4730;)V + ARG 6 sprite + METHOD method_43790 (ZLnet/minecraft/class_5321;)Lnet/minecraft/class_4730; + ARG 1 key diff --git a/mappings/net/minecraft/data/server/BannerPatternTagProvider.mapping b/mappings/net/minecraft/data/server/BannerPatternTagProvider.mapping new file mode 100644 index 0000000000..d62357eab0 --- /dev/null +++ b/mappings/net/minecraft/data/server/BannerPatternTagProvider.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7458 net/minecraft/data/server/BannerPatternTagProvider + METHOD (Lnet/minecraft/class_2403;)V + ARG 1 dataGenerator diff --git a/mappings/net/minecraft/item/BannerItem.mapping b/mappings/net/minecraft/item/BannerItem.mapping index 9dabc02299..7745300eb2 100644 --- a/mappings/net/minecraft/item/BannerItem.mapping +++ b/mappings/net/minecraft/item/BannerItem.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_1746 net/minecraft/item/BannerItem FIELD field_30848 TRANSLATION_KEY_PREFIX Ljava/lang/String; + METHOD method_43707 (Ljava/util/List;Lnet/minecraft/class_1767;Ljava/lang/String;)V + ARG 2 translationKey + METHOD method_43708 (Lnet/minecraft/class_5321;)Ljava/lang/String; + ARG 0 key METHOD method_7705 appendBannerTooltip (Lnet/minecraft/class_1799;Ljava/util/List;)V ARG 0 stack ARG 1 tooltip diff --git a/mappings/net/minecraft/item/BannerPatternItem.mapping b/mappings/net/minecraft/item/BannerPatternItem.mapping index ab827786ec..f485b9f2b7 100644 --- a/mappings/net/minecraft/item/BannerPatternItem.mapping +++ b/mappings/net/minecraft/item/BannerPatternItem.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1745 net/minecraft/item/BannerPatternItem - FIELD field_7900 pattern Lnet/minecraft/class_6862; + FIELD field_7900 patternItemTag Lnet/minecraft/class_6862; METHOD (Lnet/minecraft/class_6862;Lnet/minecraft/class_1792$class_1793;)V + ARG 1 patternItemTag ARG 2 settings METHOD method_7703 getDescription ()Lnet/minecraft/class_5250; METHOD method_7704 getPattern ()Lnet/minecraft/class_6862; diff --git a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping index d70d7d7f8e..295af0a284 100644 --- a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping @@ -8,10 +8,16 @@ CLASS net/minecraft/class_5592 net/minecraft/loot/function/SetBannerPatternFunct METHOD method_35531 builder (Z)Lnet/minecraft/class_5592$class_6157; ARG 0 append CLASS class_5593 Serializer + METHOD method_31935 (Lcom/google/gson/JsonArray;Lcom/mojang/datafixers/util/Pair;)V + ARG 1 pair CLASS class_6157 Builder FIELD field_31862 patterns Lcom/google/common/collect/ImmutableList$Builder; FIELD field_31863 append Z METHOD (Z)V ARG 1 append METHOD method_35533 pattern (Lnet/minecraft/class_6880;Lnet/minecraft/class_1767;)Lnet/minecraft/class_5592$class_6157; + ARG 1 pattern + ARG 2 color + METHOD method_43741 pattern (Lnet/minecraft/class_5321;Lnet/minecraft/class_1767;)Lnet/minecraft/class_5592$class_6157; + ARG 1 pattern ARG 2 color diff --git a/mappings/net/minecraft/tag/BannerPatternTags.mapping b/mappings/net/minecraft/tag/BannerPatternTags.mapping new file mode 100644 index 0000000000..c7111f0da6 --- /dev/null +++ b/mappings/net/minecraft/tag/BannerPatternTags.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7440 net/minecraft/tag/BannerPatternTags + METHOD method_43675 of (Ljava/lang/String;)Lnet/minecraft/class_6862; + ARG 0 id diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index 6658dc2a13..4c1287bc15 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -55,6 +55,8 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier METHOD method_42093 toTranslationKey (Ljava/lang/String;)Ljava/lang/String; ARG 1 prefix METHOD method_42094 toTranslationKey ()Ljava/lang/String; + METHOD method_43903 toShortTranslationKey ()Ljava/lang/String; + COMMENT {@return the short translation key, with the default namespace omitted if present} CLASS class_2961 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index f5c3d9a1fc..bc9fdd0d64 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -159,6 +159,8 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_38805 FROG_VARIANT Lnet/minecraft/class_2378; FIELD field_38806 ROOT_PLACER_TYPE_KEY Lnet/minecraft/class_5321; FIELD field_38807 ROOT_PLACER_TYPE Lnet/minecraft/class_2378; + FIELD field_39207 BANNER_PATTERN_KEY Lnet/minecraft/class_5321; + FIELD field_39208 BANNER_PATTERN Lnet/minecraft/class_2378; METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V ARG 1 key ARG 2 lifecycle