diff --git a/src/main/java/net/worldseed/multipart/model_bones/display_entity/ModelBonePartDisplay.java b/src/main/java/net/worldseed/multipart/model_bones/display_entity/ModelBonePartDisplay.java index 56b62361..ab52e059 100644 --- a/src/main/java/net/worldseed/multipart/model_bones/display_entity/ModelBonePartDisplay.java +++ b/src/main/java/net/worldseed/multipart/model_bones/display_entity/ModelBonePartDisplay.java @@ -169,8 +169,7 @@ public void detachModel(GenericModel model) { public void setGlobalRotation(double yaw, double pitch) { if (this.stand != null) { var correctYaw = (180 + yaw + 360) % 360; - var correctPitch = (pitch + 360) % 360; - this.stand.setView((float) correctYaw, (float) correctPitch); + this.stand.setView((float) correctYaw, (float) pitch); } } @@ -191,14 +190,14 @@ public void destroy() { @Override public Pos calculatePosition() { - return new Pos(model.getPosition()).withView(0, 0); + return model.getPosition().withView(0, 0); } private Pos calculatePositionInternal() { if (this.offset == null) return Pos.ZERO; Point p = this.offset; p = applyTransform(p); - return new Pos(p).div(4).mul(scale).withView(0, 0); + return p.asPos().div(4).mul(scale).withView(0, 0); } @Override @@ -217,7 +216,7 @@ public void teleport(Point position) { // Model roots move every tick. A teleport emits an absolute position sync, which makes // passenger displays visibly snap between server ticks. Let Minestom choose relative // movement packets instead so the vanilla client's entity interpolation can do its job. - if (this.baseStand != null) this.baseStand.refreshPosition(new Pos(position), true); + if (this.baseStand != null) this.baseStand.refreshPosition(position.asPos(), true); } public void draw() { @@ -261,7 +260,7 @@ public void draw() { @Override public CompletableFuture spawn(Instance instance, Pos position) { var correctLocation = (180 + this.model.getGlobalRotation() + 360) % 360; - return super.spawn(instance, new Pos(position).withYaw((float) correctLocation)).whenCompleteAsync((_, e) -> { + return super.spawn(instance, position.withYaw((float) correctLocation)).whenCompleteAsync((_, e) -> { if (e != null) { e.printStackTrace(); return; diff --git a/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneHitbox.java b/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneHitbox.java index 44774604..31daa7bb 100644 --- a/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneHitbox.java +++ b/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneHitbox.java @@ -222,7 +222,7 @@ public Pos calculatePosition() { p = applyTransform(p); p = calculateGlobalRotation(p); - return Pos.fromPoint(p).div(4).mul(scale); + return p.asPos().div(4).mul(scale); } @Override diff --git a/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneNametag.java b/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneNametag.java index 78c3062d..157c7eec 100644 --- a/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneNametag.java +++ b/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneNametag.java @@ -91,7 +91,7 @@ public Pos calculatePosition() { p = applyTransform(p); p = calculateGlobalRotation(p); - return new Pos(p) + return p.asPos() .div(4, 4, 4).mul(scale) .add(model.getPosition()) .add(model.getGlobalOffset()); diff --git a/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneSeat.java b/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneSeat.java index c683c7af..b0088195 100644 --- a/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneSeat.java +++ b/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneSeat.java @@ -113,7 +113,7 @@ public Pos calculatePosition() { var p = applyTransform(this.offset); p = calculateGlobalRotation(p); - Pos endPos = new Pos(p); + Pos endPos = p.asPos(); return endPos .div(4, 4, 4).mul(scale) diff --git a/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneVFX.java b/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneVFX.java index 9f515d86..417d442e 100644 --- a/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneVFX.java +++ b/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneVFX.java @@ -64,7 +64,7 @@ public Pos calculatePosition() { p = applyTransform(p); p = calculateGlobalRotation(p); - Pos endPos = Pos.fromPoint(p); + Pos endPos = p.asPos(); return endPos .div(4, 4, 4).mul(scale)