fix: moveDuration

Author: toxicity188

api/src/main/java/kr/toxicity/model/api/nms/NMS.java

@@ -37,6 +37,15 @@ public interface NMS {
     default @NotNull ModelDisplay create(@NotNull Location location) {
         return create(location, 0, d -> {});
     }
+    /**
+     * Creates model display
+     * @param location start location
+     * @param initialConsumer initial consumer
+     * @return model display
+     */
+    default @NotNull ModelDisplay create(@NotNull Location location, @NotNull Consumer<ModelDisplay> initialConsumer) {
+        return create(location, 0, initialConsumer);
+    }
 
     /**
      * Creates model display

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

@@ -82,7 +82,7 @@ public EntityTracker(@NotNull EntityTrackerRegistry registry, @NotNull RenderPip
                 .ifPresent(bone -> {
                     var box = bone.getGroup().getHitBox();
                     if (box == null) return;
-                    var shadow = BetterModel.plugin().nms().create(entity.getLocation());
+                    var shadow = BetterModel.plugin().nms().create(entity.getLocation(), d -> d.moveDuration(1));
                     var baseScale = (float) (box.box().x() + box.box().z()) / 4F;
                     tick(((t, s) -> {
                         var wPos = bone.hitBoxPosition();

core/src/main/kotlin/kr/toxicity/model/manager/EntityManagerImpl.kt

@@ -18,6 +18,7 @@ import kr.toxicity.model.api.nms.ModelInteractionHand
 import kr.toxicity.model.api.pack.PackZipper
 import kr.toxicity.model.api.tracker.EntityTracker
 import kr.toxicity.model.api.tracker.EntityTrackerRegistry
+import kr.toxicity.model.api.tracker.TrackerUpdateAction
 import kr.toxicity.model.util.PLUGIN
 import kr.toxicity.model.util.registerListener
 import org.bukkit.entity.Entity
@@ -30,6 +31,7 @@ import org.bukkit.event.player.PlayerChangedWorldEvent
 import org.bukkit.event.player.PlayerInteractAtEntityEvent
 import org.bukkit.event.player.PlayerInteractEntityEvent
 import org.bukkit.event.player.PlayerQuitEvent
+import org.bukkit.event.player.PlayerToggleSneakEvent
 import org.bukkit.event.world.EntitiesLoadEvent
 import org.bukkit.event.world.EntitiesUnloadEvent
 import org.bukkit.inventory.EquipmentSlot
@@ -164,6 +166,13 @@ object EntityManagerImpl : EntityManager, GlobalManager {
                 it.damageTint()
             }
         }
+        @EventHandler
+        fun PlayerToggleSneakEvent.sneak() {
+            BetterModel.registryOrNull(player)?.trackers()?.forEach {
+                it.update(TrackerUpdateAction.moveDuration(0))
+                it.task { it.update(TrackerUpdateAction.moveDuration(3)) }
+            }
+        }
     }
     private val platformListener = if (BetterModel.IS_PAPER) PaperListener() else SpigotListener()
 

nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/EntityData.kt

@@ -33,7 +33,12 @@ internal val ITEM_DISPLAY_ID = ItemDisplay::class.java.accessors().map {
     it.id
 }
 internal val ITEM_SERIALIZER = ItemDisplay::class.java.accessors().first()
-internal val ITEM_ENTITY_DATA = (mutableListOf(SHARED_FLAG) + ITEM_DISPLAY_ID + DISPLAY_SET.subList(7, DISPLAY_SET.size).map { it.id }).toIntSet()
+internal val ITEM_ENTITY_DATA = buildList { 
+    add(SHARED_FLAG)
+    addAll(ITEM_DISPLAY_ID)
+    add(Display.DATA_POS_ROT_INTERPOLATION_DURATION_ID.id)
+    DISPLAY_SET.subList(7, DISPLAY_SET.size).mapTo(this) { it.id }
+}.toIntSet()
 
 @Suppress("UNCHECKED_CAST")
 private val DISPLAY_INTERPOLATION_DELAY = (DISPLAY_SET.first() as EntityDataAccessor<Int>).run {

nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/ModelDisplayImpl.kt

@@ -83,11 +83,6 @@ internal class ModelDisplayImpl(
 
     override fun spawn(showItem: Boolean, bundler: PacketBundler) {
         bundler += addPacket
-        bundler += ClientboundSetEntityDataPacket(display.id, listOf(SynchedEntityData.DataValue(
-            Display.DATA_POS_ROT_INTERPOLATION_DURATION_ID.id,
-            Display.DATA_POS_ROT_INTERPOLATION_DURATION_ID.serializer,
-            3
-        )))
     }
 
     override fun remove(bundler: PacketBundler) {

nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/ModelNametagImpl.kt

@@ -44,7 +44,7 @@ internal class ModelNametagImpl(
         EntityType.TEXT_DISPLAY,
         MinecraftServer.getServer().overworld()
     ).apply {
-        entityData[Display.DATA_POS_ROT_INTERPOLATION_DURATION_ID] = 3
+        entityData[Display.DATA_POS_ROT_INTERPOLATION_DURATION_ID] = 1
         setTransformation(emptyTransformation)
         billboardConstraints = Display.BillboardConstraints.CENTER
     }

nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/NMSImpl.kt

@@ -308,6 +308,7 @@ class NMSImpl : NMS {
     override fun createParallelBundler(threshold: Int): PacketBundler = parallelBundlerOf(threshold)
 
     override fun create(location: Location, yOffset: Double, initialConsumer: Consumer<ModelDisplay>): ModelDisplay = ModelDisplayImpl(ItemDisplay(EntityType.ITEM_DISPLAY, (location.world as CraftWorld).handle).apply {
+        entityData[Display.DATA_POS_ROT_INTERPOLATION_DURATION_ID] = 3
         billboardConstraints = Display.BillboardConstraints.FIXED
         valid = true
         moveTo(

nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/nms/v1_21_R1/EntityData.kt

@@ -33,7 +33,12 @@ internal val ITEM_DISPLAY_ID = ItemDisplay::class.java.accessors().map {
     it.id
 }
 internal val ITEM_SERIALIZER = ItemDisplay::class.java.accessors().first()
-internal val ITEM_ENTITY_DATA = (mutableListOf(SHARED_FLAG) + ITEM_DISPLAY_ID + DISPLAY_SET.subList(7, DISPLAY_SET.size).map { it.id }).toIntSet()
+internal val ITEM_ENTITY_DATA = buildList { 
+    add(SHARED_FLAG)
+    addAll(ITEM_DISPLAY_ID)
+    add(Display.DATA_POS_ROT_INTERPOLATION_DURATION_ID.id)
+    DISPLAY_SET.subList(7, DISPLAY_SET.size).mapTo(this) { it.id }
+}.toIntSet()
 
 @Suppress("UNCHECKED_CAST")
 private val DISPLAY_INTERPOLATION_DELAY = (DISPLAY_SET.first() as EntityDataAccessor<Int>).run {

nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/nms/v1_21_R1/ModelDisplayImpl.kt

@@ -83,11 +83,6 @@ internal class ModelDisplayImpl(
 
     override fun spawn(showItem: Boolean, bundler: PacketBundler) {
         bundler += addPacket
-        bundler += ClientboundSetEntityDataPacket(display.id, listOf(SynchedEntityData.DataValue(
-            Display.DATA_POS_ROT_INTERPOLATION_DURATION_ID.id,
-            Display.DATA_POS_ROT_INTERPOLATION_DURATION_ID.serializer,
-            3
-        )))
     }
 
     override fun remove(bundler: PacketBundler) {

nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/nms/v1_21_R1/ModelNametagImpl.kt

@@ -44,7 +44,7 @@ internal class ModelNametagImpl(
         EntityType.TEXT_DISPLAY,
         MinecraftServer.getServer().overworld()
     ).apply {
-        entityData[Display.DATA_POS_ROT_INTERPOLATION_DURATION_ID] = 3
+        entityData[Display.DATA_POS_ROT_INTERPOLATION_DURATION_ID] = 1
         setTransformation(emptyTransformation)
         billboardConstraints = Display.BillboardConstraints.CENTER
     }