From a675bd1685ca2d359e212dea0bd8e005790f77a4 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 17 Nov 2022 07:32:31 +1100 Subject: [PATCH] 22w46a Note Block and Piglin Head (#3406) --- mappings/net/minecraft/block/NoteBlock.mapping | 11 +++++++++++ .../net/minecraft/block/WallPiglinHeadBlock.mapping | 2 ++ .../minecraft/block/entity/SkullBlockEntity.mapping | 9 +++++++++ mappings/net/minecraft/block/enums/Instrument.mapping | 10 ++++++++++ .../render/entity/model/PiglinEntityModel.mapping | 3 +++ .../render/entity/model/PiglinHeadEntityModel.mapping | 7 +++++++ mappings/net/minecraft/item/Items.mapping | 1 + 7 files changed, 43 insertions(+) create mode 100644 mappings/net/minecraft/block/WallPiglinHeadBlock.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/PiglinHeadEntityModel.mapping diff --git a/mappings/net/minecraft/block/NoteBlock.mapping b/mappings/net/minecraft/block/NoteBlock.mapping index a9dea2b76a..cbd1a9e643 100644 --- a/mappings/net/minecraft/block/NoteBlock.mapping +++ b/mappings/net/minecraft/block/NoteBlock.mapping @@ -4,3 +4,14 @@ CLASS net/minecraft/class_2428 net/minecraft/block/NoteBlock FIELD field_11326 POWERED Lnet/minecraft/class_2746; METHOD method_10367 playNote (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 entity + ARG 2 state + ARG 3 world + ARG 4 pos + METHOD method_47581 areMobHeadSoundsEnabled (Lnet/minecraft/class_1936;)Z + ARG 0 world + METHOD method_47583 getStateWithInstrument (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + ARG 1 world + ARG 2 pos + ARG 3 state + METHOD method_47584 isInstrumentMobHead (Lnet/minecraft/class_2680;)Z + ARG 1 state diff --git a/mappings/net/minecraft/block/WallPiglinHeadBlock.mapping b/mappings/net/minecraft/block/WallPiglinHeadBlock.mapping new file mode 100644 index 0000000000..03c8ba3e52 --- /dev/null +++ b/mappings/net/minecraft/block/WallPiglinHeadBlock.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_7938 net/minecraft/block/WallPiglinHeadBlock + FIELD field_41311 SHAPES Ljava/util/Map; diff --git a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping index 313d1a24b2..3ae685f178 100644 --- a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity FIELD field_12089 userCache Lnet/minecraft/class_3312; FIELD field_31363 SKULL_OWNER_KEY Ljava/lang/String; FIELD field_34029 executor Ljava/util/concurrent/Executor; + FIELD field_41315 poweredTicks I + FIELD field_41316 powered Z METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -26,3 +28,10 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity ARG 0 apiServices ARG 1 executor METHOD method_39766 clearServices ()V + METHOD method_47588 getPoweredTicks (F)F + ARG 1 tickDelta + METHOD method_47589 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2631;)V + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 blockEntity diff --git a/mappings/net/minecraft/block/enums/Instrument.mapping b/mappings/net/minecraft/block/enums/Instrument.mapping index 77218dadb7..79af7cd77d 100644 --- a/mappings/net/minecraft/block/enums/Instrument.mapping +++ b/mappings/net/minecraft/block/enums/Instrument.mapping @@ -1,7 +1,17 @@ CLASS net/minecraft/class_2766 net/minecraft/block/enums/Instrument FIELD field_12646 name Ljava/lang/String; FIELD field_12649 sound Lnet/minecraft/class_3414; + FIELD field_41330 mobHead Z METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_3414;)V ARG 3 name ARG 4 sound + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_3414;Z)V + ARG 3 name + ARG 4 sound + ARG 5 mobHead METHOD method_11886 getSound ()Lnet/minecraft/class_3414; + METHOD method_47590 fromAboveState (Lnet/minecraft/class_2680;)Ljava/util/Optional; + ARG 0 state + METHOD method_47591 isMobHead ()Z + METHOD method_47592 fromBelowState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2766; + ARG 0 state diff --git a/mappings/net/minecraft/client/render/entity/model/PiglinEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/PiglinEntityModel.mapping index a448b1f812..22d524b78d 100644 --- a/mappings/net/minecraft/client/render/entity/model/PiglinEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/PiglinEntityModel.mapping @@ -67,3 +67,6 @@ CLASS net/minecraft/class_4840 net/minecraft/client/render/entity/model/PiglinEn ARG 1 entity METHOD method_32026 getModelData (Lnet/minecraft/class_5605;)Lnet/minecraft/class_5609; ARG 0 dilation + METHOD method_47656 addHead (Lnet/minecraft/class_5605;Lnet/minecraft/class_5609;)V + ARG 0 dilation + ARG 1 baseModelData diff --git a/mappings/net/minecraft/client/render/entity/model/PiglinHeadEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/PiglinHeadEntityModel.mapping new file mode 100644 index 0000000000..255035bac9 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/PiglinHeadEntityModel.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_7946 net/minecraft/client/render/entity/model/PiglinHeadEntityModel + FIELD field_41379 head Lnet/minecraft/class_630; + FIELD field_41380 leftEar Lnet/minecraft/class_630; + FIELD field_41381 rightEar Lnet/minecraft/class_630; + METHOD (Lnet/minecraft/class_630;)V + ARG 1 root + METHOD method_47655 getModelData ()Lnet/minecraft/class_5609; diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index c8656c193a..53c4d15971 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -337,6 +337,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_40227 BAMBOO_FENCE_GATE Lnet/minecraft/class_1792; FIELD field_41065 STRIPPED_BAMBOO_BLOCK Lnet/minecraft/class_1792; FIELD field_41066 BAMBOO_BLOCK Lnet/minecraft/class_1792; + FIELD field_41304 PIGLIN_HEAD Lnet/minecraft/class_1792; FIELD field_8043 ORANGE_TERRACOTTA Lnet/minecraft/class_1792; FIELD field_8047 JUNGLE_PRESSURE_PLATE Lnet/minecraft/class_1792; FIELD field_8048 SPRUCE_BUTTON Lnet/minecraft/class_1792;