Fix feral wolf tail on low health and add wagging

itsmeow · Dec 22, 2019 · e6847e0 · e6847e0
1 parent 2c41051
commit e6847e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/its_meow/betteranimalsplus/client/model/ModelFeralWolf.java b/src/main/java/its_meow/betteranimalsplus/client/model/ModelFeralWolf.java
@@ -297,6 +297,11 @@ public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageI
         if (entity instanceof EntityFeralWolf) {
             EntityFeralWolf wolf = (EntityFeralWolf) entity;
             this.tail01.rotateAngleX = ageInTicks + (wolf.isSitting() ? 1.7453292519943295F : 0.6981317007977318F);
+            if(!wolf.isTamed()) {
+                this.tail01.rotateAngleY = 0.0F;
+            } else {
+                this.tail01.rotateAngleY = MathHelper.cos(limbSwing * 0.6662F) * 1.1F * limbSwingAmount;
+            }
             if(wolf.isSitting()) {
                 sit = true;
                 this.setRotateAngle(rHindPaw, 1.3089969389957472F, 0.20943951023931953F, 0.0F);

diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityFeralWolf.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityFeralWolf.java
@@ -290,11 +290,7 @@ public boolean processInteract(EntityPlayer player, EnumHand hand) {
 
     @SideOnly(Side.CLIENT)
     public float getTailRotation() {
-        if (!this.isTamed()) {
-            return -0.15F;
-        } else {
-            return this.isTamed() ? (0.25F - (this.getMaxHealth() - this.dataManager.get(DATA_HEALTH_ID).floatValue()) * 0.04F) : -0.85F;
-        }
+        return this.isTamed() ? (1F - (this.getMaxHealth() - this.dataManager.get(DATA_HEALTH_ID).floatValue()) * 0.04F) : 0.25F;
     }
 
     @Override