From 10bde51fc15abe73986b5d464528f1935f474009 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Wed, 17 Jun 2020 15:59:33 -0500 Subject: [PATCH] Map the new advancement trigger (#1476) Signed-off-by: liach Co-authored-by: liach --- .../advancement/criterion/Criteria.mapping | 1 + ...layerInteractedWithEntityCriterion.mapping | 20 +++++++++++++++++++ .../listener/ServerPlayPacketListener.mapping | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping diff --git a/mappings/net/minecraft/advancement/criterion/Criteria.mapping b/mappings/net/minecraft/advancement/criterion/Criteria.mapping index 0d13e44679..3e6fd36183 100644 --- a/mappings/net/minecraft/advancement/criterion/Criteria.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criteria.mapping @@ -41,6 +41,7 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria FIELD field_24478 ITEM_USED_ON_BLOCK Lnet/minecraft/class_4711; FIELD field_24479 PLAYER_GENERATES_CONTAINER_LOOT Lnet/minecraft/class_5282; FIELD field_24480 THROWN_ITEM_PICKED_UP_BY_ENTITY Lnet/minecraft/class_5279; + FIELD field_25694 PLAYER_INTERACTED_WITH_ENTITY Lnet/minecraft/class_5409; METHOD method_765 getById (Lnet/minecraft/class_2960;)Lnet/minecraft/class_179; ARG 0 id METHOD method_766 getCriteria ()Ljava/lang/Iterable; diff --git a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping new file mode 100644 index 0000000000..18563b304c --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_5409 net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion + FIELD field_25699 ID Lnet/minecraft/class_2960; + METHOD method_30097 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)V + ARG 1 player + ARG 2 stack + ARG 3 entity + CLASS class_5410 Conditions + FIELD field_25700 item Lnet/minecraft/class_2073; + FIELD field_25701 entity Lnet/minecraft/class_2048$class_5258; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)V + ARG 1 player + ARG 2 item + ARG 3 entity + METHOD method_30099 create (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5409$class_5410; + ARG 0 player + ARG 1 itemBuilder + ARG 2 entity + METHOD method_30100 test (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Z + ARG 1 stack + ARG 2 context diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping index b476f137c0..5b02f29269 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi METHOD method_12061 onCraftRequest (Lnet/minecraft/class_2840;)V ARG 1 packet METHOD method_12062 onPlayerInteractEntity (Lnet/minecraft/class_2824;)V - ARG 1 rpacket + ARG 1 packet METHOD method_12063 onPlayerMove (Lnet/minecraft/class_2828;)V ARG 1 packet METHOD method_12064 onBoatPaddleState (Lnet/minecraft/class_2836;)V