fix: remove overhead via updateBaseEntity0

toxicity188 · toxicity188 · commit 38bfc71a4626 · 2026-02-28T19:39:07.000+09:00
diff --git a/api/src/main/java/kr/toxicity/model/api/nms/ModelDisplay.java b/api/src/main/java/kr/toxicity/model/api/nms/ModelDisplay.java
@@ -51,12 +51,12 @@ public interface ModelDisplay extends Identifiable {
     void rotate(@NotNull ModelRotation rotation, @NotNull PacketBundler bundler);
 
     /**
-     * Synchronizes this display with a source entity's data.
+     * Synchronizes the potion effect (glowing, etc.) from the base entity to this display.
      *
      * @param entity the source entity
-     * @since 1.15.2
+     * @since 2.2.0
      */
-    void syncEntity(@NotNull BaseEntity entity);
+    void syncPotionEffect(@NotNull BaseEntity entity);
 
     /**
      * Synchronizes this display's position with a location.
diff --git a/api/src/main/java/kr/toxicity/model/api/tracker/EntityTracker.java b/api/src/main/java/kr/toxicity/model/api/tracker/EntityTracker.java
@@ -22,6 +22,7 @@
 import kr.toxicity.model.api.platform.PlatformPlayer;
 import kr.toxicity.model.api.util.EventUtil;
 import kr.toxicity.model.api.util.FunctionUtil;
+import kr.toxicity.model.api.util.MathUtil;
 import kr.toxicity.model.api.util.function.BonePredicate;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -69,6 +70,8 @@ public class EntityTracker extends Tracker {
     private final EntityBodyRotator bodyRotator;
     private EntityHideOption hideOption = EntityHideOption.DEFAULT;
 
+    private volatile PlatformLocation location;
+
     /**
      * Creates a new entity tracker.
      *
@@ -82,6 +85,7 @@ public class EntityTracker extends Tracker {
     public EntityTracker(@NotNull EntityTrackerRegistry registry, @NotNull RenderPipeline pipeline, @NotNull TrackerModifier modifier, @NotNull Consumer<EntityTracker> preUpdateConsumer) {
         super(pipeline, modifier);
         this.registry = registry;
+        this.location = registry.entity().location();
         bodyRotator = new EntityBodyRotator(registry);
 
         var entity = registry.entity();
@@ -99,7 +103,7 @@ public EntityTracker(@NotNull EntityTrackerRegistry registry, @NotNull RenderPip
                 tick(((t, s) -> {
                     var wPos = bone.hitBoxPosition(posCache);
                     shadow.shadowRadius(scale.getAsFloat() * baseScale);
-                    shadow.syncEntity(entity);
+                    shadow.syncPotionEffect(entity);
                     shadow.syncPosition(location().add(wPos.x, wPos.y, wPos.z));
                     shadow.sendDirtyEntityData(s.getDataBundler());
                     shadow.sendPosition(entity, s.getTickBundler());
@@ -141,7 +145,7 @@ public EntityTracker(@NotNull EntityTrackerRegistry registry, @NotNull RenderPip
             if (isClosed()) return;
             createHitBox(null, CREATE_HITBOX_PREDICATE);
         });
-        tick((t, s) -> updateBaseEntity0());
+        tick((t, s) -> updateLocation());
         tick((t, s) -> {
             if (damageTint.getAndDecrement() == 0) update(TrackerUpdateAction.previousTint());
         });
@@ -152,7 +156,7 @@ public EntityTracker(@NotNull EntityTrackerRegistry registry, @NotNull RenderPip
 
     @Override
     public @NotNull ModelRotation rotation() {
-        return registry.entity().dead() ? pipeline.getRotation() : super.rotation();
+        return sourceEntity().dead() ? pipeline.getRotation() : super.rotation();
     }
 
     /**
@@ -161,21 +165,22 @@ public EntityTracker(@NotNull EntityTrackerRegistry registry, @NotNull RenderPip
      * @since 1.15.2
      */
     public void updateBaseEntity() {
+        if (sourceEntity().dead() || isClosed()) return;
         BetterModel.platform().scheduler().asyncTaskLater(1, () -> {
-            updateBaseEntity0();
+            var entity = sourceEntity();
+            pipeline.forEach(bone -> bone.applyAtDisplay(BonePredicate.TRUE, display -> display.syncPotionEffect(entity)));
+            updateLocation();
             forceUpdate(true);
         });
     }
 
-    /**
-     * Updates base entity's data to parent entity
-     */
-    private void updateBaseEntity0() {
-        var loc = location();
-        displays().forEach(d -> {
-            d.syncEntity(registry.entity());
-            d.syncPosition(loc);
-        });
+    private void updateLocation() {
+        var loc = sourceEntity().location();
+        if (this.location.distanceSquared(loc) < MathUtil.VECTOR_COMPARISON_EPSILON_SQ) return;
+        synchronized (this) {
+            this.location = loc;
+        }
+        pipeline.forEach(bone -> bone.applyAtDisplay(BonePredicate.TRUE, display -> display.syncPosition(loc)));
     }
 
     /**
@@ -245,7 +250,7 @@ public void damageTint() {
 
     @Override
     public void despawn() {
-        if (registry.entity().dead()) {
+        if (sourceEntity().dead()) {
             close(CloseReason.DESPAWN);
             return;
         }
@@ -254,7 +259,7 @@ public void despawn() {
 
     @Override
     public @NotNull PlatformLocation location() {
-        return sourceEntity().location();
+        return location;
     }
 
     /**
@@ -283,7 +288,7 @@ public void cancelDamageTint() {
      */
     @ApiStatus.Internal
     public void refresh() {
-        updateBaseEntity0();
+        updateLocation();
         registry.entity().platform().task(() -> createHitBox(null, HITBOX_REFRESH_PREDICATE));
     }
 
diff --git a/nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R1/HitBoxImpl.kt b/nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R1/HitBoxImpl.kt
@@ -286,7 +286,6 @@ internal class HitBoxImpl(
         BlockPos.betweenClosedStream(boundingBox).forEach {
             level().getBlockState(it).entityInside(level(), it, delegate)
         }
-        updateInWaterStateAndDoFluidPushing()
         if (isInLava) delegate.lavaHurt()
         firstTick = false
         listener.sync(craftEntity)
diff --git a/nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R1/ModelDisplayImpl.kt b/nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R1/ModelDisplayImpl.kt
@@ -48,7 +48,6 @@ internal class ModelDisplayImpl(
     override fun id(): Int = display.id
     override fun uuid(): UUID = display.uuid
     override fun rotate(rotation: ModelRotation, bundler: PacketBundler) {
-        if (!display.valid) return
         display.xRot = rotation.x
         display.yRot = rotation.y
         bundler += ClientboundMoveEntityPacket.Rot(
@@ -67,9 +66,7 @@ internal class ModelDisplayImpl(
         }
     }
 
-    override fun syncEntity(entity: BaseEntity) {
-        display.valid = !entity.dead()
-        display.onGround = entity.ground()
+    override fun syncPotionEffect(entity: BaseEntity) {
         val beforeInvisible = display.isInvisible
         val afterInvisible = entity.invisible()
         entityDataLock.accessToLock {
diff --git a/nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R3/HitBoxImpl.kt b/nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R3/HitBoxImpl.kt
@@ -300,7 +300,6 @@ internal class HitBoxImpl(
         BlockPos.betweenClosedStream(boundingBox).forEach {
             level().getBlockState(it).entityInside(level(), it, delegate)
         }
-        updateInWaterStateAndDoFluidPushing()
         if (isInLava) delegate.lavaHurt()
         firstTick = false
         listener.sync(craftEntity)
diff --git a/nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R3/ModelDisplayImpl.kt b/nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R3/ModelDisplayImpl.kt
@@ -48,7 +48,6 @@ internal class ModelDisplayImpl(
     override fun id(): Int = display.id
     override fun uuid(): UUID = display.uuid
     override fun rotate(rotation: ModelRotation, bundler: PacketBundler) {
-        if (!display.valid) return
         display.xRot = rotation.x
         display.yRot = rotation.y
         bundler += ClientboundMoveEntityPacket.Rot(
@@ -67,9 +66,7 @@ internal class ModelDisplayImpl(
         }
     }
 
-    override fun syncEntity(entity: BaseEntity) {
-        display.valid = !entity.dead()
-        display.onGround = entity.ground()
+    override fun syncPotionEffect(entity: BaseEntity) {
         val beforeInvisible = display.isInvisible
         val afterInvisible = entity.invisible()
         entityDataLock.accessToLock {
diff --git a/nms/v1_21_R4/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R4/HitBoxImpl.kt b/nms/v1_21_R4/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R4/HitBoxImpl.kt
@@ -290,7 +290,6 @@ internal class HitBoxImpl(
             level().getBlockState(pos).entityInside(level(), pos, delegate, applier)
         }
         applier.applyAndClear(delegate)
-        updateInWaterStateAndDoFluidPushing()
         if (isInLava) delegate.lavaHurt()
         firstTick = false
         listener.sync(craftEntity)
diff --git a/nms/v1_21_R4/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R4/ModelDisplayImpl.kt b/nms/v1_21_R4/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R4/ModelDisplayImpl.kt
@@ -48,7 +48,6 @@ internal class ModelDisplayImpl(
     override fun id(): Int = display.id
     override fun uuid(): UUID = display.uuid
     override fun rotate(rotation: ModelRotation, bundler: PacketBundler) {
-        if (!display.valid) return
         display.xRot = rotation.x
         display.yRot = rotation.y
         bundler += ClientboundMoveEntityPacket.Rot(
@@ -67,9 +66,7 @@ internal class ModelDisplayImpl(
         }
     }
 
-    override fun syncEntity(entity: BaseEntity) {
-        display.valid = !entity.dead()
-        display.onGround = entity.ground()
+    override fun syncPotionEffect(entity: BaseEntity) {
         val beforeInvisible = display.isInvisible
         val afterInvisible = entity.invisible()
         entityDataLock.accessToLock {
diff --git a/nms/v1_21_R5/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R5/HitBoxImpl.kt b/nms/v1_21_R5/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R5/HitBoxImpl.kt
@@ -307,7 +307,6 @@ internal class HitBoxImpl(
             true
         }
         applier.applyAndClear(delegate)
-        updateInWaterStateAndDoFluidPushing()
         if (isInLava) delegate.lavaHurt()
         firstTick = false
         listener.sync(craftEntity)
diff --git a/nms/v1_21_R5/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R5/ModelDisplayImpl.kt b/nms/v1_21_R5/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R5/ModelDisplayImpl.kt
@@ -48,7 +48,6 @@ internal class ModelDisplayImpl(
     override fun id(): Int = display.id
     override fun uuid(): UUID = display.uuid
     override fun rotate(rotation: ModelRotation, bundler: PacketBundler) {
-        if (!display.valid) return
         display.xRot = rotation.x
         display.yRot = rotation.y
         bundler += ClientboundMoveEntityPacket.Rot(
@@ -67,9 +66,7 @@ internal class ModelDisplayImpl(
         }
     }
 
-    override fun syncEntity(entity: BaseEntity) {
-        display.valid = !entity.dead()
-        display.onGround = entity.ground()
+    override fun syncPotionEffect(entity: BaseEntity) {
         val beforeInvisible = display.isInvisible
         val afterInvisible = entity.invisible()
         entityDataLock.accessToLock {
diff --git a/nms/v1_21_R6/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R6/HitBoxImpl.kt b/nms/v1_21_R6/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R6/HitBoxImpl.kt
@@ -307,7 +307,6 @@ internal class HitBoxImpl(
             true
         }
         applier.applyAndClear(delegate)
-        updateInWaterStateAndDoFluidPushing()
         if (isInLava) delegate.lavaHurt()
         firstTick = false
         listener.sync(craftEntity)
diff --git a/nms/v1_21_R6/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R6/ModelDisplayImpl.kt b/nms/v1_21_R6/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R6/ModelDisplayImpl.kt
@@ -48,7 +48,6 @@ internal class ModelDisplayImpl(
     override fun id(): Int = display.id
     override fun uuid(): UUID = display.uuid
     override fun rotate(rotation: ModelRotation, bundler: PacketBundler) {
-        if (!display.valid) return
         display.xRot = rotation.x
         display.yRot = rotation.y
         bundler += ClientboundMoveEntityPacket.Rot(
@@ -67,9 +66,7 @@ internal class ModelDisplayImpl(
         }
     }
 
-    override fun syncEntity(entity: BaseEntity) {
-        display.valid = !entity.dead()
-        display.onGround = entity.ground()
+    override fun syncPotionEffect(entity: BaseEntity) {
         val beforeInvisible = display.isInvisible
         val afterInvisible = entity.invisible()
         entityDataLock.accessToLock {
diff --git a/nms/v1_21_R7/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R7/HitBoxImpl.kt b/nms/v1_21_R7/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R7/HitBoxImpl.kt
@@ -307,7 +307,6 @@ internal class HitBoxImpl(
             true
         }
         applier.applyAndClear(delegate)
-        updateInWaterStateAndDoFluidPushing()
         if (isInLava) delegate.lavaHurt()
         firstTick = false
         listener.sync(craftEntity)
diff --git a/nms/v1_21_R7/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R7/ModelDisplayImpl.kt b/nms/v1_21_R7/src/main/kotlin/kr/toxicity/model/bukkit/nms/v1_21_R7/ModelDisplayImpl.kt
@@ -48,7 +48,6 @@ internal class ModelDisplayImpl(
     override fun id(): Int = display.id
     override fun uuid(): UUID = display.uuid
     override fun rotate(rotation: ModelRotation, bundler: PacketBundler) {
-        if (!display.valid) return
         display.xRot = rotation.x
         display.yRot = rotation.y
         bundler += ClientboundMoveEntityPacket.Rot(
@@ -67,9 +66,7 @@ internal class ModelDisplayImpl(
         }
     }
 
-    override fun syncEntity(entity: BaseEntity) {
-        display.valid = !entity.dead()
-        display.onGround = entity.ground()
+    override fun syncPotionEffect(entity: BaseEntity) {
         val beforeInvisible = display.isInvisible
         val afterInvisible = entity.invisible()
         entityDataLock.accessToLock {
diff --git a/platform/fabric/src/main/kotlin/kr/toxicity/model/impl/fabric/entity/HitBoxEntityImpl.kt b/platform/fabric/src/main/kotlin/kr/toxicity/model/impl/fabric/entity/HitBoxEntityImpl.kt
@@ -370,7 +370,6 @@ class HitBoxEntityImpl(
             true
         }
         applier.applyAndClear(delegate)
-        updateInWaterStateAndDoFluidPushing()
 
         if (isInLava) {
             delegate.lavaHurt()
diff --git a/platform/fabric/src/main/kotlin/kr/toxicity/model/impl/fabric/entity/ModelDisplayEntityImpl.kt b/platform/fabric/src/main/kotlin/kr/toxicity/model/impl/fabric/entity/ModelDisplayEntityImpl.kt
@@ -77,9 +77,7 @@ class ModelDisplayEntityImpl(
         }
     }
 
-    override fun syncEntity(entity: BaseEntity) {
-        display.setOnGround(entity.ground())
-
+    override fun syncPotionEffect(entity: BaseEntity) {
         val beforeInvisible = display.isInvisible
         val afterInvisible = entity.invisible()
 

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,6 @@ internal class HitBoxImpl(`
`286`	`286`	`BlockPos.betweenClosedStream(boundingBox).forEach {`
`287`	`287`	`level().getBlockState(it).entityInside(level(), it, delegate)`
`288`	`288`	`}`
`289`		`- updateInWaterStateAndDoFluidPushing()`
`290`	`289`	`if (isInLava) delegate.lavaHurt()`
`291`	`290`	`firstTick = false`
`292`	`291`	`listener.sync(craftEntity)`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,6 @@ internal class HitBoxImpl(`
`300`	`300`	`BlockPos.betweenClosedStream(boundingBox).forEach {`
`301`	`301`	`level().getBlockState(it).entityInside(level(), it, delegate)`
`302`	`302`	`}`
`303`		`- updateInWaterStateAndDoFluidPushing()`
`304`	`303`	`if (isInLava) delegate.lavaHurt()`
`305`	`304`	`firstTick = false`
`306`	`305`	`listener.sync(craftEntity)`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,6 @@ internal class HitBoxImpl(`
`290`	`290`	`level().getBlockState(pos).entityInside(level(), pos, delegate, applier)`
`291`	`291`	`}`
`292`	`292`	`applier.applyAndClear(delegate)`
`293`		`- updateInWaterStateAndDoFluidPushing()`
`294`	`293`	`if (isInLava) delegate.lavaHurt()`
`295`	`294`	`firstTick = false`
`296`	`295`	`listener.sync(craftEntity)`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,6 @@ internal class HitBoxImpl(`
`307`	`307`	`true`
`308`	`308`	`}`
`309`	`309`	`applier.applyAndClear(delegate)`
`310`		`- updateInWaterStateAndDoFluidPushing()`
`311`	`310`	`if (isInLava) delegate.lavaHurt()`
`312`	`311`	`firstTick = false`
`313`	`312`	`listener.sync(craftEntity)`