refactor: PlayerManager#animate

Author: toxicity188

api/src/main/java/kr/toxicity/model/api/manager/PlayerManager.java

@@ -1,6 +1,6 @@
 package kr.toxicity.model.api.manager;
 
-import kr.toxicity.model.api.animation.AnimationIterator;
+import kr.toxicity.model.api.animation.AnimationModifier;
 import kr.toxicity.model.api.data.renderer.ModelRenderer;
 import kr.toxicity.model.api.nms.PlayerChannelHandler;
 import org.bukkit.entity.Player;
@@ -37,17 +37,17 @@ public interface PlayerManager extends GlobalManager {
      * @param animation animation name
      */
     default void animate(@NotNull Player player, @NotNull String model, @NotNull String animation) {
-        animate(player, model, animation, null);
+        animate(player, model, animation, AnimationModifier.DEFAULT_WITH_PLAY_ONCE);
     }
 
     /**
      * Play's animation to this player with a specific loop type.
      * @param player player
      * @param model model name
      * @param animation animation name
-     * @param loopType the loop type to use, or null to use the animation's default.
+     * @param modifier modifier
      */
-    void animate(@NotNull Player player, @NotNull String model, @NotNull String animation, @Nullable AnimationIterator.Type loopType);
+    void animate(@NotNull Player player, @NotNull String model, @NotNull String animation, @NotNull AnimationModifier modifier);
 
 
     /**

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

@@ -11,6 +11,7 @@ import dev.jorel.commandapi.executors.PlayerCommandExecutor
 import kr.toxicity.model.api.BetterModel
 import kr.toxicity.model.api.BetterModelPlugin.ReloadResult.*
 import kr.toxicity.model.api.animation.AnimationIterator
+import kr.toxicity.model.api.animation.AnimationModifier
 import kr.toxicity.model.api.manager.CommandManager
 import kr.toxicity.model.api.manager.PlayerManager
 import kr.toxicity.model.api.manager.ReloadInfo
@@ -172,7 +173,13 @@ object CommandManagerImpl : CommandManager, GlobalManagerImpl {
                             player.audience().warn("Invalid loop type: '$loopTypeStr'. Using default.")
                         }.getOrNull()
                     }
-                    (PlayerManagerImpl as PlayerManager).animate(player, n, a, loopType)
+                    (PlayerManagerImpl as PlayerManager).animate(player, n, a, AnimationModifier(
+                        { true },
+                        1,
+                        0,
+                        loopType,
+                        1.0F
+                    ))
                 })
             }
         }.build().register(PLUGIN)

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

@@ -77,18 +77,11 @@ object PlayerManagerImpl : PlayerManager, GlobalManagerImpl {
     override fun limbs(): List<ModelRenderer> = renderMap.values.toList()
     override fun limb(name: String): ModelRenderer? = renderMap[name]
 
-    override fun animate(player: Player, model: String, animation: String, loopType: AnimationIterator.Type?) {
+    override fun animate(player: Player, model: String, animation: String, modifier: AnimationModifier) {
         renderMap[model]?.let {
             EntityTracker.tracker(player.uniqueId)?.close()
             val create = it.create(player)
             create.spawnNearby()
-            val modifier = AnimationModifier(
-                { true },
-                1,
-                0,
-                loopType,
-                1.0F
-            )
             if (!create.animate(animation, modifier) {
                     create.close()
                 }) create.close()