Skip to content

Commit 89c8f09

Browse files
committed
refactor confusing rot param
1 parent 5459f5b commit 89c8f09

31 files changed

+52
-52
lines changed

src/main/java/doggytalents/client/DTNClientDogSleepOnManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private Vec3 calclateSleepTranslate(Player player) {
124124
}
125125

126126
public void afterPlayerModelSetupAnim(LivingEntity living, float limbSwing,
127-
float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, PlayerModel<?> model) {
127+
float limbSwingAmount, float ageInTicks, float relativeHeadYRot, float headPitch, PlayerModel<?> model) {
128128
var player_optional = checkIsSleepingOnDog(living);
129129
if (!player_optional.isPresent())
130130
return;

src/main/java/doggytalents/client/entity/model/AngelHaloModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void prepareMobModel(Dog dog) {
5151
}
5252

5353
@Override
54-
public void setupAnim(Dog entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw,
54+
public void setupAnim(Dog entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float relativeHeadYRot,
5555
float headPitch) {
5656
var animLenMillis = (long)HALO_SPINNA.lengthInSeconds() * 1000;
5757
var offset = (entityIn.getId() % 6) * (20 * 0.5);

src/main/java/doggytalents/client/entity/model/ElytraCapeModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void prepareMobModel(Dog dogIn, float limbSwing, float limbSwingAmount, f
6060
private Vector3f vecObj = new Vector3f(0, 0, 0);
6161

6262
@Override
63-
public void setupAnim(Dog dog, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw,
63+
public void setupAnim(Dog dog, float limbSwing, float limbSwingAmount, float ageInTicks, float relativeHeadYRot,
6464
float headPitch) {
6565
var animationManager = dog.animationManager;
6666
var animState = animationManager.animationState;

src/main/java/doggytalents/client/entity/model/FieryReflectorModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public void prepareMobModel(Dog dogIn, float limbSwing, float limbSwingAmount, f
4141
}
4242

4343
@Override
44-
public void setupAnim(Dog dog, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw,
44+
public void setupAnim(Dog dog, float limbSwing, float limbSwingAmount, float ageInTicks, float relativeHeadYRot,
4545
float headPitch) {
46-
super.setupAnim(dog, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch);
46+
super.setupAnim(dog, limbSwing, limbSwingAmount, ageInTicks, relativeHeadYRot, headPitch);
4747
this.reflector.yRot = 6*ageInTicks % 360 * Mth.DEG_TO_RAD;
4848
}
4949

src/main/java/doggytalents/client/entity/model/PropellerHatModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ protected void populatePart(ModelPart box) {
3131
}
3232

3333
@Override
34-
public void setupAnim(Dog entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw,
34+
public void setupAnim(Dog entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float relativeHeadYRot,
3535
float headPitch) {
36-
super.setupAnim(entityIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch);
36+
super.setupAnim(entityIn, limbSwing, limbSwingAmount, ageInTicks, relativeHeadYRot, headPitch);
3737
this.spinna.yRot = 24*ageInTicks % 360 * Mth.DEG_TO_RAD;
3838
}
3939

src/main/java/doggytalents/client/entity/model/SyncedAccessoryModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void prepareMobModel(Dog dogIn, float limbSwing, float limbSwingAmount, f
8585
}
8686

8787
@Override
88-
public void setupAnim(Dog entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) {
88+
public void setupAnim(Dog entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float relativeHeadYRot, float headPitch) {
8989

9090
}
9191
}

src/main/java/doggytalents/client/entity/model/TorchDogModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void prepareModel(Dog dog) {
5858
private Vector3f vecObj = new Vector3f(0, 0, 0);
5959

6060
@Override
61-
public void setupAnim(Dog entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw,
61+
public void setupAnim(Dog entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float relativeHeadYRot,
6262
float headPitch) {
6363
var animLenMillis = (long)TORCH_SPINNA.lengthInSeconds() * 1000;
6464
var offset = (entityIn.getId() % 6) * (20 * 0.5);

src/main/java/doggytalents/client/entity/model/dog/CustomDogModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ public AccessoryState getAccessoryState() {
8585
}
8686

8787
@Override
88-
public void setupAnim(Dog dog, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw,
88+
public void setupAnim(Dog dog, float limbSwing, float limbSwingAmount, float ageInTicks, float relativeHeadYRot,
8989
float headPitch) {
90-
super.setupAnim(dog, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch);
90+
super.setupAnim(dog, limbSwing, limbSwingAmount, ageInTicks, relativeHeadYRot, headPitch);
9191
if (this.props.glowingEyes) {
9292
this.glowingEyes.copyFrom(this.head);
9393
this.realGlowingEyes.copyFrom(this.realHead);

src/main/java/doggytalents/client/entity/model/dog/DogModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public void translateBeggingDog(Dog dog, float limbSwing, float limbSwingAmount,
230230
private float headXRot0 = 0, headYRot0 = 0, realHeadZRot0 = 0;
231231

232232
@Override
233-
public void setupAnim(Dog dog, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) {
233+
public void setupAnim(Dog dog, float limbSwing, float limbSwingAmount, float ageInTicks, float relativeHeadYRot, float headPitch) {
234234
var pose = dog.getDogPose();
235235
var animationManager = dog.animationManager;
236236

@@ -241,7 +241,7 @@ public void setupAnim(Dog dog, float limbSwing, float limbSwingAmount, float age
241241

242242
if (pose.freeHead) {
243243
this.head.xRot += headPitch * ((float)Math.PI / 180F);
244-
this.head.yRot += netHeadYaw * Mth.DEG_TO_RAD;
244+
this.head.yRot += relativeHeadYRot * Mth.DEG_TO_RAD;
245245
}
246246
if (pose.freeTail) {
247247
this.tail.xRot = dog.getTailRotation();

src/main/java/doggytalents/client/entity/model/dog/GlowingEyeDogModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ private void setupGlowingEyes() {
3232
}
3333

3434
@Override
35-
public void setupAnim(Dog dog, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw,
35+
public void setupAnim(Dog dog, float limbSwing, float limbSwingAmount, float ageInTicks, float relativeHeadYRot,
3636
float headPitch) {
37-
super.setupAnim(dog, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch);
37+
super.setupAnim(dog, limbSwing, limbSwingAmount, ageInTicks, relativeHeadYRot, headPitch);
3838
this.glowingEyes.copyFrom(this.head);
3939
this.realGlowingEyes.copyFrom(this.realHead);
4040
}

0 commit comments

Comments
 (0)