From f3692142b69b6995bdff5bc00f428f4e55c76f69 Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Thu, 26 Mar 2020 15:09:47 +0100 Subject: [PATCH] Strider entity mappings (#1225) * strider entity mappings * some additions * changes * changes * Update ItemSteerable.mapping * class_4988 --- mappings/net/minecraft/class_4981.mapping | 3 --- .../entity/StriderEntityRenderer.mapping | 2 ++ .../entity/model/StriderEntityModel.mapping | 1 + .../minecraft/entity/ItemSteerable.mapping | 16 +++++++++++++++ .../minecraft/entity/SaddledComponent.mapping | 9 +++++++++ .../entity/passive/PigEntity.mapping | 1 + .../entity/passive/StriderEntity.mapping | 20 +++++++++++++++++++ .../minecraft/item/CarrotOnAStickItem.mapping | 3 --- mappings/net/minecraft/item/Items.mapping | 1 + .../net/minecraft/item/OnAStickItem.mapping | 7 +++++++ 10 files changed, 57 insertions(+), 6 deletions(-) delete mode 100644 mappings/net/minecraft/class_4981.mapping create mode 100644 mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/StriderEntityModel.mapping create mode 100644 mappings/net/minecraft/entity/ItemSteerable.mapping create mode 100644 mappings/net/minecraft/entity/SaddledComponent.mapping create mode 100644 mappings/net/minecraft/entity/passive/StriderEntity.mapping delete mode 100644 mappings/net/minecraft/item/CarrotOnAStickItem.mapping create mode 100644 mappings/net/minecraft/item/OnAStickItem.mapping diff --git a/mappings/net/minecraft/class_4981.mapping b/mappings/net/minecraft/class_4981.mapping deleted file mode 100644 index fbd95eb30d..0000000000 --- a/mappings/net/minecraft/class_4981.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_4981 - METHOD method_6575 isSaddled ()Z - METHOD method_6576 setSaddled (Z)V diff --git a/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping new file mode 100644 index 0000000000..eb6daba1cc --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_4999 net/minecraft/client/render/entity/StriderEntityRenderer + FIELD field_23372 TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/entity/model/StriderEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/StriderEntityModel.mapping new file mode 100644 index 0000000000..8143fed76a --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/StriderEntityModel.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4997 net/minecraft/client/render/entity/model/StriderEntityModel diff --git a/mappings/net/minecraft/entity/ItemSteerable.mapping b/mappings/net/minecraft/entity/ItemSteerable.mapping new file mode 100644 index 0000000000..110f42d229 --- /dev/null +++ b/mappings/net/minecraft/entity/ItemSteerable.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_4981 net/minecraft/entity/ItemSteerable + METHOD method_26313 travel (Lnet/minecraft/class_1308;Lnet/minecraft/class_4980;Lnet/minecraft/class_243;)Z + ARG 1 entity + ARG 2 saddledEntity + ARG 3 movementInput + METHOD method_26314 interactMob (Lnet/minecraft/class_1308;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Z)Z + ARG 1 entity + ARG 2 player + ARG 3 hand + ARG 4 childRideable + METHOD method_26315 setMovementInput (Lnet/minecraft/class_243;)V + ARG 1 movementInput + METHOD method_6575 isSaddled ()Z + METHOD method_6576 setSaddled (Z)V + ARG 1 saddled + METHOD method_6577 consumeOnAStickItem ()Z diff --git a/mappings/net/minecraft/entity/SaddledComponent.mapping b/mappings/net/minecraft/entity/SaddledComponent.mapping new file mode 100644 index 0000000000..3bb578ace5 --- /dev/null +++ b/mappings/net/minecraft/entity/SaddledComponent.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_4980 net/minecraft/entity/SaddledComponent + FIELD field_23218 dataTracker Lnet/minecraft/class_2945; + FIELD field_23220 saddled Lnet/minecraft/class_2940; + METHOD (Lnet/minecraft/class_2945;Lnet/minecraft/class_2940;Lnet/minecraft/class_2940;)V + ARG 1 dataTracker + ARG 3 saddled + METHOD method_26311 isSaddled ()Z + METHOD method_26312 (Lnet/minecraft/class_2487;)V + ARG 1 tag diff --git a/mappings/net/minecraft/entity/passive/PigEntity.mapping b/mappings/net/minecraft/entity/passive/PigEntity.mapping index 7b5f0add93..6731accbc7 100644 --- a/mappings/net/minecraft/entity/passive/PigEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PigEntity.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_1452 net/minecraft/entity/passive/PigEntity + FIELD field_23230 saddledComponent Lnet/minecraft/class_4980; FIELD field_6816 SADDLED Lnet/minecraft/class_2940; FIELD field_6817 BREEDING_INGREDIENT Lnet/minecraft/class_1856; diff --git a/mappings/net/minecraft/entity/passive/StriderEntity.mapping b/mappings/net/minecraft/entity/passive/StriderEntity.mapping new file mode 100644 index 0000000000..ac39f54a04 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/StriderEntity.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity + FIELD field_23240 saddledComponent Lnet/minecraft/class_4980; + FIELD field_23243 BREEDING_INGREDIENT Lnet/minecraft/class_1856; + FIELD field_23244 ATTRACTING_INGREDIENT Lnet/minecraft/class_1856; + FIELD field_23247 SADDLED Lnet/minecraft/class_2940; + METHOD method_26344 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z + ARG 0 type + ARG 1 world + ARG 2 spawnType + ARG 3 pos + ARG 4 random + CLASS class_4986 StriderData + FIELD field_23248 type Lnet/minecraft/class_4985$class_4986$class_4987; + METHOD (Lnet/minecraft/class_4985$class_4986$class_4987;)V + ARG 1 type + CLASS class_4987 RiderType + CLASS class_4988 Navigation + METHOD (Lnet/minecraft/class_4985;Lnet/minecraft/class_1937;)V + ARG 1 entity + ARG 2 world diff --git a/mappings/net/minecraft/item/CarrotOnAStickItem.mapping b/mappings/net/minecraft/item/CarrotOnAStickItem.mapping deleted file mode 100644 index 4078ed43f7..0000000000 --- a/mappings/net/minecraft/item/CarrotOnAStickItem.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_1758 net/minecraft/item/CarrotOnAStickItem - METHOD method_20271 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 p diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 8fc7896494..2ddd0acb79 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -151,6 +151,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_22420 TARGET Lnet/minecraft/class_1792; FIELD field_22421 CRYING_OBSIDIAN Lnet/minecraft/class_1792; FIELD field_23141 RESPAWN_ANCHOR Lnet/minecraft/class_1792; + FIELD field_23256 LODESTONE 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; diff --git a/mappings/net/minecraft/item/OnAStickItem.mapping b/mappings/net/minecraft/item/OnAStickItem.mapping new file mode 100644 index 0000000000..11dac0d31d --- /dev/null +++ b/mappings/net/minecraft/item/OnAStickItem.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_1758 net/minecraft/item/OnAStickItem + FIELD field_23253 target Lnet/minecraft/class_1299; + METHOD (Lnet/minecraft/class_1792$class_1793;Lnet/minecraft/class_1299;)V + ARG 1 settings + ARG 2 target + METHOD method_20271 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V + ARG 1 p