More accurate model part location

Author: toxicity188

api/src/main/java/kr/toxicity/model/api/data/renderer/RenderInstance.java

@@ -136,7 +136,13 @@ public boolean addAnimationMovementModifier(@NotNull Predicate<RenderedEntity> p
     }
 
     public double height() {
-        return entityMap.values().stream().mapToDouble(RenderedEntity::height).max().orElse(0.0);
+        var h = 0D;
+        for (RenderedEntity renderer : renderers()) {
+            var lt = renderer.lastTransform().y;
+            if (renderer.getName().startsWith("h_")) return lt;
+            if (h < lt) h = lt;
+        }
+        return h;
     }
 
     public void tint(int rgb) {

api/src/main/java/kr/toxicity/model/api/data/renderer/RendererGroup.java

@@ -78,7 +78,7 @@ public RendererGroup(
                 .div(16));
         this.hitBox = box;
         rotation = group.rotation().toVector();
-        center = hitBox != null ? new Vector3f(position).add(hitBox.centerVector()) : position;
+        center = hitBox != null ? hitBox.centerVector() : new Vector3f();
     }
 
     /**

api/src/main/java/kr/toxicity/model/api/entity/EntityMovement.java

@@ -19,6 +19,14 @@ public record EntityMovement(
         @NotNull Quaternionf rotation,
         @NotNull Vector3f rawRotation
 ) {
+
+    public static final EntityMovement EMPTY = new EntityMovement(
+            new Vector3f(),
+            new Vector3f(1),
+            new Quaternionf(),
+            new Vector3f()
+    );
+
     /**
      * Animates this movement.
      * @param movement animation

api/src/main/java/kr/toxicity/model/api/entity/RenderedEntity.java

@@ -8,6 +8,8 @@
 import kr.toxicity.model.api.data.renderer.RendererGroup;
 import kr.toxicity.model.api.nms.*;
 import kr.toxicity.model.api.tracker.ModelRotation;
+import kr.toxicity.model.api.util.MathUtil;
+import kr.toxicity.model.api.util.VectorUtil;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -210,8 +212,9 @@ private boolean updateKeyframe(Iterator<TreeIterator> iterator, TreeIterator nex
     }
 
     private TrackerMovement lastMovement;
-    private EntityMovement lastTransform;
+    private EntityMovement beforeTransform, lastTransform;
     private Vector3f defaultPosition = new Vector3f();
+    private ModelRotation rotation = ModelRotation.EMPTY;
 
     public void lastMovement(@NotNull TrackerMovement movement) {
         lastMovement = movement;
@@ -222,10 +225,14 @@ public void lastMovement(@NotNull TrackerMovement movement) {
 
     public void move(@NotNull ModelRotation rotation, @NotNull TrackerMovement movement, @NotNull PacketBundler bundler) {
         var d = display;
-        if (d != null && delay % 5 == 0) d.rotate(rotation, bundler);
+        this.rotation = rotation;
+        if (d != null && delay % 5 == 0) {
+            d.rotate(rotation, bundler);
+        }
         if (delay <= 0) {
             var f = frame();
             delay = f;
+            beforeTransform = lastTransform;
             var entityMovement = (lastTransform = (lastMovement = movement.copy()).plus(relativeOffset())).plus(defaultPosition);
             if (d != null) {
                 d.frame(f <= 0 ? 0 : toInterpolationDuration(f));
@@ -243,6 +250,7 @@ public void forceUpdate(@NotNull PacketBundler bundler) {
         var speed = currentIterator != null ? currentIterator.modifier.speedValue() : 1F;
         delay = Math.round(speed * (double) delay);
         if (d != null && lastMovement != null && delay > 0) {
+            beforeTransform = lastTransform;
             var entityMovement = (lastTransform = lastMovement.copy().plus(relativeOffset())).plus(defaultPosition);
             d.frame(toInterpolationDuration(delay));
             setup(entityMovement);
@@ -255,9 +263,18 @@ private static int toInterpolationDuration(long delay) {
     }
 
     public @NotNull Vector3f lastTransform() {
-        return lastTransform != null ? new Vector3f(lastTransform.transform())
-                .add(defaultPosition)
-                .mul(progress()): new Vector3f();
+        if (lastTransform != null) {
+            var progress = 1 - progress();
+            var before = beforeTransform != null ? beforeTransform : EntityMovement.EMPTY;
+            return VectorUtil.linear(before.transform(), lastTransform.transform(), progress)
+                    .mul(VectorUtil.linear(before.scale(), lastTransform.scale(), progress))
+                    .rotate(
+                            MathUtil.toQuaternion(MathUtil.blockBenchToDisplay(VectorUtil.linear(before.rawRotation(), lastTransform.rawRotation(), progress)))
+                    )
+                    .add(defaultPosition)
+                    .rotateY((float) -Math.toRadians(rotation.y()));
+        }
+        return new Vector3f();
     }
 
     public void setup(@NotNull TrackerMovement movement) {
@@ -330,15 +347,6 @@ private EntityMovement relativeHitBoxOffset() {
         return def;
     }
 
-    public double height() {
-        var d = (double) defaultPosition.y + (lastTransform != null ? new Vector3f(lastTransform.transform()).mul(progress()).y : 0);
-        for (RenderedEntity value : children.values()) {
-            var v = value.height();
-            if (getGroup().getCenter().y < value.getGroup().getCenter().y) d = v;
-        }
-        return d;
-    }
-
     public void tint(int toggle, @NotNull PacketBundler bundler) {
         tint = toggle;
         if (applyItem()) forceUpdate(bundler);
@@ -533,7 +541,7 @@ public int hashCode() {
     @NotNull
     @Override
     public Vector3f supplyTransform() {
-        return lastMovement != null ? lastMovement.plus(relativeHitBoxOffset().plus(defaultPosition)).transform() : relativeHitBoxOffset().plus(defaultPosition).transform();
+        return lastMovement != null ? lastMovement.plus(relativeHitBoxOffset()).plus(defaultPosition).transform() : relativeHitBoxOffset().plus(defaultPosition).transform();
     }
 
     @Override

api/src/main/java/kr/toxicity/model/api/tracker/EntityTracker.java

@@ -33,6 +33,7 @@ public class EntityTracker extends Tracker {
     private static final Map<UUID, EntityTracker> TRACKER_MAP = new ConcurrentHashMap<>();
 
     private final @NotNull Entity entity;
+    @Getter
     private final @NotNull EntityAdapter adapter;
     private final AtomicBoolean closed = new AtomicBoolean();
     private final AtomicBoolean forRemoval = new AtomicBoolean();

api/src/main/java/kr/toxicity/model/api/tracker/ModelRotation.java

@@ -1,4 +1,5 @@
 package kr.toxicity.model.api.tracker;
 
 public record ModelRotation(float x, float y) {
+    public static final ModelRotation EMPTY = new ModelRotation(0, 0);
 }

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
     kotlin("jvm") version "2.1.10"
     id("org.jetbrains.dokka") version "2.0.0"
     id("io.github.goooler.shadow") version "8.1.8"
-    id("io.papermc.paperweight.userdev") version "2.0.0-beta.14" apply false
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.16" apply false
     id("xyz.jpenilla.run-paper") version "2.3.1"
     id("xyz.jpenilla.resource-factory-bukkit-convention") version "1.2.0"
     id("com.modrinth.minotaur") version "2.+"

core/src/main/kotlin/kr/toxicity/model/compatibility/mythicmobs/targeter/ModelPartTargeter.kt

@@ -13,10 +13,11 @@ class ModelPartTargeter(mlc: MythicLineConfig) : ILocationTargeter {
     override fun getLocations(p0: SkillMetadata): Collection<AbstractLocation> {
         val entity = p0.caster.entity
         val bukkit = entity.bukkitEntity
-        return EntityTracker.tracker(bukkit.uniqueId)?.entity(part)?.lastTransform()?.let {
+        val tracker = EntityTracker.tracker(bukkit.uniqueId) ?: return emptyList()
+        return tracker.entity(part)?.lastTransform()?.let {
             listOf(entity.location.add(
                 it.x.toDouble(),
-                it.y.toDouble(),
+                it.y.toDouble() + tracker.adapter.passengerPosition().y(),
                 it.z.toDouble()
             ))
         } ?: emptyList()