bump idofront

gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 group=com.mineinabyss
 version=1.9
-idofrontVersion=0.18.10
+idofrontVersion=0.18.26

settings.gradle.kts

@@ -17,7 +17,6 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             from("com.mineinabyss:catalog:$idofrontVersion")
-            version("modelengine", "R3.1.7")
         }
     }
 }

src/main/kotlin/org/cultofclang/bonehurtingjuice/Extensions.kt

@@ -3,6 +3,9 @@ package org.cultofclang.bonehurtingjuice
 import com.mineinabyss.idofront.typealiases.BukkitEntity
 import com.ticxo.modelengine.api.ModelEngineAPI
 import com.ticxo.modelengine.api.model.ModeledEntity
+import com.ticxo.modelengine.api.model.bone.behavior.BoneBehavior
+import com.ticxo.modelengine.api.model.bone.manager.BehaviorManager
+import com.ticxo.modelengine.api.model.bone.manager.MountManager
 import org.bukkit.Bukkit
 import org.bukkit.Location
 import org.bukkit.block.Block
@@ -14,6 +17,8 @@ import org.bukkit.event.vehicle.VehicleEvent
 import org.cultofclang.bonehurtingjuice.events.BoneHurtDamageEvent
 import org.cultofclang.bonehurtingjuice.listeners.MoveListener
 import org.cultofclang.bonehurtingjuice.modules.bones
+import java.util.*
+import kotlin.jvm.optionals.getOrNull
 
 
 internal fun VehicleEvent.forRidingPlayers(action: (Player) -> Unit) = vehicle.passengers
@@ -61,4 +66,21 @@ fun Player.hurtBones(fallDist: Float) {
     }
 }
 
-internal fun BukkitEntity.toModelEntity(): ModeledEntity? = ModelEngineAPI.getModeledEntity(uniqueId)
+fun BukkitEntity.toModelEntity(): ModeledEntity? = ModelEngineAPI.getModeledEntity(uniqueId)
+
+class MountManagerWithBehavior<T: BoneBehavior>(
+    mountManager: MountManager,
+    behaviorManager: BehaviorManager<T>,
+): MountManager by mountManager, BehaviorManager<T> by behaviorManager
+
+fun BukkitEntity.getMountManager() : MountManagerWithBehavior<*>? {
+    val mountManager = (toModelEntity()
+        ?.models?.values?.firstOrNull()
+        ?.getMountManager<Nothing>() as Optional<*>?)
+        ?.getOrNull() ?: return null
+
+    return MountManagerWithBehavior(
+        mountManager as MountManager,
+        mountManager as BehaviorManager<*>
+    )
+}

src/main/kotlin/org/cultofclang/bonehurtingjuice/listeners/ModelEngineListener.kt

@@ -4,25 +4,25 @@ import io.papermc.paper.event.entity.EntityMoveEvent
 import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
+import org.cultofclang.bonehurtingjuice.getMountManager
 import org.cultofclang.bonehurtingjuice.hurtBones
 import org.cultofclang.bonehurtingjuice.modules.bones
-import org.cultofclang.bonehurtingjuice.toModelEntity
 
 class ModelEngineListener : Listener {
     @EventHandler
     fun EntityMoveEvent.onRidableMobEnterWater() {
         if (entity.fallDistance < bones.config.minFallDist) return
         if (from.block.isLiquid) return
-        val mount = entity.toModelEntity()?.mountManager ?: return
+        val mount = entity.getMountManager() ?: return
 
         if (mount.driver != null && mount.driver is Player) {
             val driver = mount.driver as Player
             driver.fallDistance = entity.fallDistance
             driver.hurtBones(entity.fallDistance)
         }
-        mount.passengers.keys.filterIsInstance<Player>().forEach { rider ->
+        /*mount.passengers.keys.filterIsInstance<Player>().forEach { rider ->
             rider.fallDistance = entity.fallDistance
             rider.hurtBones(entity.fallDistance)
-        }
+        }*/
     }
 }