From 9b09c7929c9275c26f4177bd1d9d55b06ea1ff7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=ADSollace?= Date: Mon, 18 Nov 2019 15:11:10 +0200 Subject: [PATCH] Rename the body parts to be more descriptive (#950) * Rename the body parts to be more descriptive * unmap "accept" method Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Mapped the quadrupedal model fields * StrayEntityModel -> SkeletonEntityModel * Map parameters --- .../entity/model/BipedEntityModel.mapping | 4 ++-- .../entity/model/CreeperEntityModel.mapping | 12 ++++++------ .../render/entity/model/ModelWithArms.mapping | 1 + .../entity/model/PlayerEntityModel.mapping | 10 +++++----- .../entity/model/QuadrupedEntityModel.mapping | 18 ++++++++++++------ .../entity/model/SkeletonEntityModel.mapping | 4 ++++ .../entity/model/StrayEntityModel.mapping | 1 - 7 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 mappings/net/minecraft/client/render/entity/model/SkeletonEntityModel.mapping delete mode 100644 mappings/net/minecraft/client/render/entity/model/StrayEntityModel.mapping diff --git a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping index 09b4493477..890d1420f9 100644 --- a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping @@ -4,10 +4,10 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti ARG 1 name ARG 2 id FIELD field_3390 leftArm Lnet/minecraft/class_630; - FIELD field_3391 body Lnet/minecraft/class_630; + FIELD field_3391 torso 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_3394 helmet Lnet/minecraft/class_630; FIELD field_3395 rightArmPose Lnet/minecraft/class_572$class_573; FIELD field_3397 leftLeg Lnet/minecraft/class_630; FIELD field_3398 head Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/CreeperEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/CreeperEntityModel.mapping index cb2b263718..29e8c39817 100644 --- a/mappings/net/minecraft/client/render/entity/model/CreeperEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/CreeperEntityModel.mapping @@ -1,10 +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_3357 frontRightLeg Lnet/minecraft/class_630; + FIELD field_3358 backRightLeg Lnet/minecraft/class_630; + FIELD field_3359 backLeftLeg 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; + FIELD field_3361 torso Lnet/minecraft/class_630; + FIELD field_3362 helmet Lnet/minecraft/class_630; + FIELD field_3363 frontLeftLeg 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 6512e2453e..4fbb950c9d 100644 --- a/mappings/net/minecraft/client/render/entity/model/ModelWithArms.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ModelWithArms.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_3881 net/minecraft/client/render/entity/model/ModelWithArms METHOD method_2803 setArmAngle (Lnet/minecraft/class_1306;Lnet/minecraft/class_4587;)V + ARG 1 arm diff --git a/mappings/net/minecraft/client/render/entity/model/PlayerEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/PlayerEntityModel.mapping index cfd1da1a07..79b45114f3 100644 --- a/mappings/net/minecraft/client/render/entity/model/PlayerEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/PlayerEntityModel.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_591 net/minecraft/client/render/entity/model/PlayerEntityModel FIELD field_20787 parts Ljava/util/List; - FIELD field_3479 rightLegOverlay Lnet/minecraft/class_630; + FIELD field_3479 rightPantLeg Lnet/minecraft/class_630; FIELD field_3480 thinArms Z FIELD field_3481 ears Lnet/minecraft/class_630; - FIELD field_3482 leftLegOverlay Lnet/minecraft/class_630; - FIELD field_3483 bodyOverlay Lnet/minecraft/class_630; - FIELD field_3484 leftArmOverlay Lnet/minecraft/class_630; + FIELD field_3482 leftPantLeg Lnet/minecraft/class_630; + FIELD field_3483 jacket Lnet/minecraft/class_630; + FIELD field_3484 leftSleeve Lnet/minecraft/class_630; FIELD field_3485 cape Lnet/minecraft/class_630; - FIELD field_3486 rightArmOverlay Lnet/minecraft/class_630; + FIELD field_3486 rightSleeve Lnet/minecraft/class_630; METHOD (FZ)V ARG 1 scale ARG 2 thinArms diff --git a/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping index ab9ddfb2b7..3c6bc2ceea 100644 --- a/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping @@ -1,10 +1,16 @@ CLASS net/minecraft/class_597 net/minecraft/client/render/entity/model/QuadrupedEntityModel - FIELD field_3533 leg3 Lnet/minecraft/class_630; - FIELD field_3534 leg2 Lnet/minecraft/class_630; + FIELD field_3533 frontRightLeg Lnet/minecraft/class_630; + FIELD field_3534 backLeftLeg Lnet/minecraft/class_630; FIELD field_3535 head Lnet/minecraft/class_630; - FIELD field_3536 leg1 Lnet/minecraft/class_630; - FIELD field_3538 body Lnet/minecraft/class_630; - FIELD field_3539 leg4 Lnet/minecraft/class_630; + FIELD field_3536 backRightLeg Lnet/minecraft/class_630; + FIELD field_3538 torso Lnet/minecraft/class_630; + FIELD field_3539 frontLeftLeg Lnet/minecraft/class_630; METHOD (IFZFFFFI)V - ARG 1 ySize + ARG 1 legHeight ARG 2 scale + ARG 3 headScaled + ARG 4 childHeadYOffset + ARG 5 childHeadZOffset + ARG 6 invertedChildHeadScale + ARG 7 invertedChildBodyScale + ARG 8 childBodyYOffset diff --git a/mappings/net/minecraft/client/render/entity/model/SkeletonEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/SkeletonEntityModel.mapping new file mode 100644 index 0000000000..361918309a --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/SkeletonEntityModel.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_606 net/minecraft/client/render/entity/model/SkeletonEntityModel + METHOD (FZ)V + ARG 1 stretch + ARG 2 isClothing diff --git a/mappings/net/minecraft/client/render/entity/model/StrayEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/StrayEntityModel.mapping deleted file mode 100644 index 4785e66220..0000000000 --- a/mappings/net/minecraft/client/render/entity/model/StrayEntityModel.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_606 net/minecraft/client/render/entity/model/StrayEntityModel