From 6897512a0126dc40770a7c1dd19491c7a9210718 Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Tue, 10 Jan 2023 15:21:58 -0600 Subject: [PATCH] Removed redundant client-side fields from puppet parts. --- .../noppes/npcs/mixin/MixinModelRenderer.java | 18 +++++++++--------- src/main/java/noppes/npcs/roles/JobPuppet.java | 3 --- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java b/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java index 327ac9f58..e88713118 100644 --- a/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java +++ b/src/main/java/noppes/npcs/mixin/MixinModelRenderer.java @@ -188,19 +188,19 @@ public class MixinModelRenderer { this.rotationPointX = modelPart.originalPivotX + modelPart.pivotX; this.rotationPointY = modelPart.originalPivotY + modelPart.pivotY; this.rotationPointZ = modelPart.originalPivotZ + modelPart.pivotZ; + modelPart.prevPivots[0] = modelPart.pivotX; + modelPart.prevPivots[1] = modelPart.pivotY; + modelPart.prevPivots[2] = modelPart.pivotZ; } else if (modelPart.partialPivotTick != ClientEventHandler.partialRenderTick) { modelPart.partialPivotTick = ClientEventHandler.partialRenderTick; + this.rotationPointX = modelPart.originalPivotX + modelPart.prevPivots[0]; + this.rotationPointY = modelPart.originalPivotY + modelPart.prevPivots[1]; + this.rotationPointZ = modelPart.originalPivotZ + modelPart.prevPivots[2]; if (modelPart.interpolate) { - modelPart.destPivotX = (modelPart.pivotX - modelPart.destPivotX) * Math.abs(modelPart.animRate) / 10f + modelPart.destPivotX; - this.rotationPointX = modelPart.originalPivotX + modelPart.destPivotX; - modelPart.destPivotY = (modelPart.pivotY - modelPart.destPivotY) * Math.abs(modelPart.animRate) / 10f + modelPart.destPivotY; - this.rotationPointY = modelPart.originalPivotY + modelPart.destPivotY; - modelPart.destPivotZ = (modelPart.pivotZ - modelPart.destPivotZ) * Math.abs(modelPart.animRate) / 10f + modelPart.destPivotZ; - this.rotationPointZ = modelPart.originalPivotZ + modelPart.destPivotZ; + modelPart.prevPivots[0] = (modelPart.pivotX - modelPart.prevPivots[0]) * Math.abs(modelPart.animRate) / 10f + modelPart.prevPivots[0]; + modelPart.prevPivots[1] = (modelPart.pivotY - modelPart.prevPivots[1]) * Math.abs(modelPart.animRate) / 10f + modelPart.prevPivots[1]; + modelPart.prevPivots[2] = (modelPart.pivotZ - modelPart.prevPivots[2]) * Math.abs(modelPart.animRate) / 10f + modelPart.prevPivots[2]; } else { - this.rotationPointX = modelPart.originalPivotX + modelPart.prevPivots[0]; - this.rotationPointY = modelPart.originalPivotY + modelPart.prevPivots[1]; - this.rotationPointZ = modelPart.originalPivotZ + modelPart.prevPivots[2]; int directionX = Float.compare(modelPart.pivotX, modelPart.prevPivots[0]); modelPart.prevPivots[0] += directionX * modelPart.animRate / 10f; modelPart.prevPivots[0] = directionX == 1 ? diff --git a/src/main/java/noppes/npcs/roles/JobPuppet.java b/src/main/java/noppes/npcs/roles/JobPuppet.java index 33bb4b26d..8494a63ad 100644 --- a/src/main/java/noppes/npcs/roles/JobPuppet.java +++ b/src/main/java/noppes/npcs/roles/JobPuppet.java @@ -93,9 +93,6 @@ public class JobPuppet extends JobInterface{ public float partialRotationTick = 0f; public float partialPivotTick = 0f; - public float destPivotX = 0f; - public float destPivotY = 0f; - public float destPivotZ = 0f; public boolean setOriginalPivot; public float originalPivotX; public float originalPivotY;