From 82ebc4eecd63a2af11130f2bd11aaf52de54d991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o?= <12478030+YummyLoop@users.noreply.github.com> Date: Thu, 22 Aug 2019 21:26:26 +0100 Subject: [PATCH] ArmorStandEntityModel + CrepperEntityModel + some related mappings (#824) * Set limbs and scale mappings * Add mappings to ArmorStandEntityModel and some associated --- .../entity/model/ArmorStandArmorEntityModel.mapping | 1 + .../render/entity/model/ArmorStandEntityModel.mapping | 4 ++++ .../client/render/entity/model/BipedEntityModel.mapping | 5 +++++ .../client/render/entity/model/CreeperEntityModel.mapping | 8 ++++++++ .../client/render/entity/model/ModelWithArms.mapping | 1 + 5 files changed, 19 insertions(+) diff --git a/mappings/net/minecraft/client/render/entity/model/ArmorStandArmorEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ArmorStandArmorEntityModel.mapping index 1ef739d74f..550d2f933f 100644 --- a/mappings/net/minecraft/client/render/entity/model/ArmorStandArmorEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ArmorStandArmorEntityModel.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_548 net/minecraft/client/render/entity/model/ArmorStan METHOD (FII)V ARG 1 scale ARG 2 textureWidth + ARG 3 textureHeight diff --git a/mappings/net/minecraft/client/render/entity/model/ArmorStandEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ArmorStandEntityModel.mapping index 32797f34e5..a0342b587a 100644 --- a/mappings/net/minecraft/client/render/entity/model/ArmorStandEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ArmorStandEntityModel.mapping @@ -1 +1,5 @@ CLASS net/minecraft/class_551 net/minecraft/client/render/entity/model/ArmorStandEntityModel + FIELD field_3312 plate Lnet/minecraft/class_630; + FIELD field_3313 hip Lnet/minecraft/class_630; + FIELD field_3314 bodyStickRight Lnet/minecraft/class_630; + FIELD field_3315 bodyStickLeft Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping index ae295512f4..906f1b8a79 100644 --- a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti FIELD field_3390 leftArm Lnet/minecraft/class_630; FIELD field_3391 body Lnet/minecraft/class_630; FIELD field_3392 rightLeg Lnet/minecraft/class_630; + FIELD field_3393 itemUsedTime F FIELD field_3394 headwear Lnet/minecraft/class_630; FIELD field_3395 rightArmPose Lnet/minecraft/class_572$class_573; FIELD field_3397 leftLeg Lnet/minecraft/class_630; @@ -10,9 +11,13 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti FIELD field_3399 leftArmPose Lnet/minecraft/class_572$class_573; FIELD field_3400 isSneaking Z FIELD field_3401 rightArm Lnet/minecraft/class_630; + METHOD (F)V + ARG 1 scale METHOD (FFII)V ARG 1 scale + ARG 2 addToRotationPointY ARG 3 textureWidth + ARG 4 textureHeight METHOD method_2805 setVisible (Z)V ARG 1 visible METHOD method_2806 getPreferredArm (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1306; diff --git a/mappings/net/minecraft/client/render/entity/model/CreeperEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/CreeperEntityModel.mapping index 37612b8c49..cb2b263718 100644 --- a/mappings/net/minecraft/client/render/entity/model/CreeperEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/CreeperEntityModel.mapping @@ -1,2 +1,10 @@ CLASS net/minecraft/class_562 net/minecraft/client/render/entity/model/CreeperEntityModel + FIELD field_3357 leg4 Lnet/minecraft/class_630; + FIELD field_3358 leg2 Lnet/minecraft/class_630; + FIELD field_3359 leg1 Lnet/minecraft/class_630; FIELD field_3360 head Lnet/minecraft/class_630; + FIELD field_3361 body Lnet/minecraft/class_630; + FIELD field_3362 headHat Lnet/minecraft/class_630; + FIELD field_3363 leg3 Lnet/minecraft/class_630; + METHOD (F)V + ARG 1 scale diff --git a/mappings/net/minecraft/client/render/entity/model/ModelWithArms.mapping b/mappings/net/minecraft/client/render/entity/model/ModelWithArms.mapping index 658f3cf3e3..d66259f270 100644 --- a/mappings/net/minecraft/client/render/entity/model/ModelWithArms.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ModelWithArms.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_3881 net/minecraft/client/render/entity/model/ModelWithArms METHOD method_2803 setArmAngle (FLnet/minecraft/class_1306;)V + ARG 1 angle ARG 2 arm