From 74bd79d5b5f2aecfeebf563a6eb557bd13ad1fec Mon Sep 17 00:00:00 2001 From: Mechalopa <92443696+Mechalopa@users.noreply.github.com> Date: Sun, 11 Feb 2024 16:14:38 +0900 Subject: [PATCH] Re-tweak snow canine model --- .../hmag/client/model/SnowCanineModel.java | 32 +++++++++++------- .../hmag/textures/entity/snow_canine.png | Bin 1816 -> 1814 bytes 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/github/mechalopa/hmag/client/model/SnowCanineModel.java b/src/main/java/com/github/mechalopa/hmag/client/model/SnowCanineModel.java index 8d77d100..dcae03ee 100644 --- a/src/main/java/com/github/mechalopa/hmag/client/model/SnowCanineModel.java +++ b/src/main/java/com/github/mechalopa/hmag/client/model/SnowCanineModel.java @@ -87,22 +87,22 @@ public static MeshDefinition createMesh(CubeDeformation cd) PartDefinition bodypd = pd.getChild("body"); PartDefinition bodypart1pd = bodypd.getChild("body_part_1"); PartDefinition bodypart2pd = ModClientUtils.addC(bodypart1pd, cd, "body_part_2", 32, 40, -3.0F, 0.0F, -1.5F, 6.0F, 1.0F, 3.0F, 0.0F, 2.5F, 0.0F); - PartDefinition bodypart3pd = ModClientUtils.addC(bodypart2pd, cd, "body_part_3", 32, 48, -3.5F, 0.0F, -2.0F, 7.0F, 2.0F, 4.0F, 0.0F, 0.5F, 0.0F); + PartDefinition bodypart3pd = ModClientUtils.addC(bodypart2pd, cd, "body_part_3", 32, 48, -4.0F, 0.0F, -2.0F, 8.0F, 2.0F, 4.0F, 0.0F, 0.5F, 0.0F); ModClientUtils.addC(bodypart3pd, cd, "body_part_4", 32, 56, -4.0F, 0.0F, -2.5F, 8.0F, 1.0F, 5.0F, 0.0F, 1.0F, 0.0F); PartDefinition rap1pd = ModClientUtils.addC(rapd, cd, "right_arm_part_1", 40, 20, 0.0F, -2.0F, -1.5F, 2.0F, 6.0F, 3.0F, 0.0F, 0.0F, 0.0F); PartDefinition lap1pd = ModClientUtils.addC(lapd, cd, "left_arm_part_1", 40, 20, -2.0F, -2.0F, -1.5F, 2.0F, 6.0F, 3.0F, 0.0F, 0.0F, 0.0F, true); - PartDefinition rap2pd = ModClientUtils.addC(rap1pd, cd, "right_arm_part_2", 16, 32, 0.0F, -0.5F, -1.5F, 2.0F, 5.0F, 3.0F, 0.0F, 3.5F, 0.0F, -0.125F); - PartDefinition lap2pd = ModClientUtils.addC(lap1pd, cd, "left_arm_part_2", 16, 32, -2.0F, -0.5F, -1.5F, 2.0F, 5.0F, 3.0F, 0.0F, 3.5F, 0.0F, true, -0.125F); + PartDefinition rap2pd = ModClientUtils.addC(rap1pd, cd, "right_arm_part_2", 16, 32, 0.0F, -0.5F, -1.5F, 2.0F, 5.0F, 3.0F, 0.0F, 3.5F, 0.75F, -0.125F); + PartDefinition lap2pd = ModClientUtils.addC(lap1pd, cd, "left_arm_part_2", 16, 32, -2.0F, -0.5F, -1.5F, 2.0F, 5.0F, 3.0F, 0.0F, 3.5F, 0.75F, true, -0.125F); ModClientUtils.addC(rap2pd, cd, "right_arm_part_3", 16, 40, 0.0F, 0.0F, -1.5F, 2.0F, 3.0F, 3.0F, 0.0F, 3.5F, 0.0F); ModClientUtils.addC(lap2pd, cd, "left_arm_part_3", 16, 40, -2.0F, 0.0F, -1.5F, 2.0F, 3.0F, 3.0F, 0.0F, 3.5F, 0.0F, true); PartDefinition rlp1pd = ModClientUtils.addC(rlpd, cd, "right_leg_part_1", 0, 20, -2.25F, 0.0F, -1.75F, 4.0F, 5.0F, 4.0F, 0.0F, -1.5F, 0.0F); PartDefinition llp1pd = ModClientUtils.addC(llpd, cd, "left_leg_part_1", 0, 20, -1.75F, 0.0F, -1.75F, 4.0F, 5.0F, 4.0F, 0.0F, -1.5F, 0.0F, true); ModClientUtils.addC(rlp1pd, cd, "right_leg_part_2", 0, 40, -1.5F, 0.0F, -1.5F, 3.0F, 1.0F, 3.0F, 0.0F, 5.0F, 0.0F); ModClientUtils.addC(llp1pd, cd, "left_leg_part_2", 0, 40, -1.5F, 0.0F, -1.5F, 3.0F, 1.0F, 3.0F, 0.0F, 5.0F, 0.0F, true); - PartDefinition rlp3pd = ModClientUtils.addC(rlp1pd, cd, "right_leg_part_3", 0, 46, -1.5F, 0.0F, -1.5F, 3.0F, 5.0F, 3.0F, 0.0F, 5.25F, 0.0F, -0.005F); - PartDefinition llp3pd = ModClientUtils.addC(llp1pd, cd, "left_leg_part_3", 0, 46, -1.5F, 0.0F, -1.5F, 3.0F, 5.0F, 3.0F, 0.0F, 5.25F, 0.0F, true, -0.005F); - PartDefinition rlp4pd = ModClientUtils.addC(rlp3pd, cd, "right_leg_part_4", 0, 56, -1.5F, -1.5F, -1.0F, 3.0F, 4.0F, 2.0F, 0.0F, 5.75F, 0.0F, 0.125F); - PartDefinition llp4pd = ModClientUtils.addC(llp3pd, cd, "left_leg_part_4", 0, 56, -1.5F, -1.5F, -1.0F, 3.0F, 4.0F, 2.0F, 0.0F, 5.75F, 0.0F, true, 0.125F); + PartDefinition rlp3pd = ModClientUtils.addC(rlp1pd, cd, "right_leg_part_3", 0, 46, -1.5F, 0.0F, -1.5F, 3.0F, 5.0F, 3.0F, 0.0F, 5.25F, 0.25F, -0.005F); + PartDefinition llp3pd = ModClientUtils.addC(llp1pd, cd, "left_leg_part_3", 0, 46, -1.5F, 0.0F, -1.5F, 3.0F, 5.0F, 3.0F, 0.0F, 5.25F, 0.25F, true, -0.005F); + PartDefinition rlp4pd = ModClientUtils.addC(rlp3pd, cd, "right_leg_part_4", 0, 56, -1.5F, -1.5F, -1.0F, 3.0F, 4.0F, 2.0F, 0.0F, 5.75F, -0.125F, 0.125F); + PartDefinition llp4pd = ModClientUtils.addC(llp3pd, cd, "left_leg_part_4", 0, 56, -1.5F, -1.5F, -1.0F, 3.0F, 4.0F, 2.0F, 0.0F, 5.75F, -0.125F, true, 0.125F); ModClientUtils.addC(rlp4pd, cd, "right_leg_part_5", 16, 56, -1.5F, -1.0F, -1.0F, 3.0F, 3.0F, 2.0F, 0.0F, 2.5F, 0.0F); ModClientUtils.addC(llp4pd, cd, "left_leg_part_5", 16, 56, -1.5F, -1.0F, -1.0F, 3.0F, 3.0F, 2.0F, 0.0F, 2.5F, 0.0F, true); PartDefinition repd = ModClientUtils.addC(headpd, cd, "right_ear", 32, 64, -2.0F, -1.75F, -1.0F, 3.0F, 2.0F, 2.0F, -1.5F, -8.0F, -0.75F, 0.25F); @@ -144,10 +144,10 @@ public void setupAnim(T entityIn, float limbSwing, float limbSwingAmount, float this.bodyPart4.xRot = 0.0F; - this.rightArm.zRot = 0.0F; - this.leftArm.zRot = 0.0F; - this.rightArm.zRot += Mth.cos(ageInTicks * 0.09F) * 0.024F + 0.21F; - this.leftArm.zRot -= Mth.cos(ageInTicks * 0.09F) * 0.024F + 0.21F; + this.rightArm.zRot = (float)Math.PI / 12.0F; + this.leftArm.zRot = -((float)Math.PI / 12.0F); + this.rightArm.zRot += Mth.cos(ageInTicks * 0.09F) * 0.024F; + this.leftArm.zRot -= Mth.cos(ageInTicks * 0.09F) * 0.024F; this.rightLeg.zRot = -((float)Math.PI * 0.01F); this.leftLeg.zRot = (float)Math.PI * 0.01F; @@ -165,11 +165,17 @@ public void setupAnim(T entityIn, float limbSwing, float limbSwingAmount, float this.leftLegPart3.xRot = (float)Math.PI / 5.0F; this.rightLegPart4.xRot = -((float)Math.PI * 5.0F / 16.0F); this.leftLegPart4.xRot = -((float)Math.PI * 5.0F / 16.0F); + this.rightLegPart4.yRot = (float)Math.PI / 48.0F; + this.leftLegPart4.yRot = -((float)Math.PI / 48.0F); this.rightLegPart5.xRot = -((float)Math.PI / 3.0F); this.leftLegPart5.xRot = -((float)Math.PI / 3.0F); this.rightLegPart2.xRot = 0.0F; this.leftLegPart2.xRot = 0.0F; + this.rightEar.xRot = -((float)Math.PI / 32.0F); + this.leftEar.xRot = -((float)Math.PI / 32.0F); + this.rightEar.zRot += Mth.cos(ageInTicks * 0.033F + (float)Math.PI / 4.0F) * 0.045F; + this.leftEar.zRot += Mth.cos(ageInTicks * 0.033F + (float)Math.PI / 4.0F) * 0.045F; this.rightEar.zRot = -((float)Math.PI / 36.0F); this.rightEar.zRot += Mth.sin(ageInTicks * 0.04F) * 0.03F; this.leftEar.zRot = (float)Math.PI / 36.0F; @@ -182,9 +188,9 @@ public void setupAnim(T entityIn, float limbSwing, float limbSwingAmount, float this.tail1.xRot += Mth.sin(ageInTicks * 0.09F) * 0.3F; this.tail1.yRot = Mth.cos(ageInTicks * 0.033F) * 0.36F; this.tail2.xRot = (float)Math.PI / 7.0F; - this.tail2.xRot += Mth.sin(ageInTicks * 0.09F + (float)Math.PI / 8.0F) * 0.06F; + this.tail2.xRot += Mth.sin(ageInTicks * 0.09F + (float)Math.PI / 8.0F) * 0.024F; this.tail3.xRot = (float)Math.PI / 9.0F; - this.tail3.xRot += Mth.sin(ageInTicks * 0.09F + (float)Math.PI / 4.0F) * 0.06F; + this.tail3.xRot += Mth.sin(ageInTicks * 0.09F + (float)Math.PI / 4.0F) * 0.03F; this.tail4.xRot = 0.0F; this.hairPart.xRot = (float)Math.PI / 12.0F; diff --git a/src/main/resources/assets/hmag/textures/entity/snow_canine.png b/src/main/resources/assets/hmag/textures/entity/snow_canine.png index 8f9fc6c8f78ca14379159525e0ef9cec38d33fcc..19c6c44640f0b7cdd621096ef7b9ce4c8b6aea3a 100644 GIT binary patch delta 1676 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