Animation changes

hybridlabs · Nov 3, 2024 · ab47416 · ab47416
1 parent 6e34f78
commit ab47416
Show file tree

Hide file tree

Showing 84 changed files with 695 additions and 1,801 deletions.
diff --git a/...v/hybridlabs/aquatic/client/model/entity/cephalopod/HybridAquaticCephalopodEntityModel.kt b/...v/hybridlabs/aquatic/client/model/entity/cephalopod/HybridAquaticCephalopodEntityModel.kt
@@ -2,7 +2,11 @@ package dev.hybridlabs.aquatic.client.model.entity.cephalopod
 
 import dev.hybridlabs.aquatic.HybridAquatic
 import dev.hybridlabs.aquatic.entity.cephalopod.HybridAquaticCephalopodEntity
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.render.entity.model.EntityModelPartNames
 import net.minecraft.util.Identifier
+import net.minecraft.util.math.MathHelper
+import software.bernie.geckolib.core.animation.AnimationState
 import software.bernie.geckolib.model.GeoModel
 
 abstract class HybridAquaticCephalopodEntityModel<T: HybridAquaticCephalopodEntity> (private val id: String) : GeoModel<T>() {
@@ -26,4 +30,16 @@ abstract class HybridAquaticCephalopodEntityModel<T: HybridAquaticCephalopodEnti
             return Identifier(HybridAquatic.MOD_ID, "animations/${id}_${variant.variantName}.animation.json")
         return Identifier(HybridAquatic.MOD_ID, "animations/$id.animation.json")
     }
+
+    override fun setCustomAnimations(
+        animatable: T,
+        instanceId: Long,
+        animationState: AnimationState<T>
+    ) {
+        super.setCustomAnimations(animatable, instanceId, animationState)
+        val deltaTime: Float = MinecraftClient.getInstance().tickDelta
+
+        val body = animationProcessor.getBone(EntityModelPartNames.BODY)
+        body.rotX = MathHelper.lerp(deltaTime, animatable.prevPitch, animatable.pitch) * -MathHelper.RADIANS_PER_DEGREE
+    }
 }
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/CuttlefishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/CuttlefishEntity.kt
@@ -8,7 +8,13 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class CuttlefishEntity(entityType: EntityType<out CuttlefishEntity>, world: World) :
-    HybridAquaticCephalopodEntity(entityType, world, emptyMap(), HybridAquaticEntityTags.CUTTLEFISH_PREY, HybridAquaticEntityTags.CUTTLEFISH_PREDATOR, true) {
+    HybridAquaticCephalopodEntity(
+        entityType,
+        world,
+        emptyMap(),
+        HybridAquaticEntityTags.CUTTLEFISH_PREY,
+        HybridAquaticEntityTags.CUTTLEFISH_PREDATOR
+    ) {
 
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/FireflySquidEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/FireflySquidEntity.kt
@@ -8,7 +8,13 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class FireflySquidEntity(entityType: EntityType<out FireflySquidEntity>, world: World) :
-    HybridAquaticCephalopodEntity(entityType, world, emptyMap(), HybridAquaticEntityTags.FIREFLY_SQUID_PREY, HybridAquaticEntityTags.FIREFLY_SQUID_PREDATOR, true) {
+    HybridAquaticCephalopodEntity(
+        entityType,
+        world,
+        emptyMap(),
+        HybridAquaticEntityTags.FIREFLY_SQUID_PREY,
+        HybridAquaticEntityTags.FIREFLY_SQUID_PREDATOR
+    ) {
 
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/GlowingSuckerOctopusEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/cephalopod/GlowingSuckerOctopusEntity.kt
@@ -8,7 +8,7 @@ import net.minecraft.entity.mob.WaterCreatureEntity
 import net.minecraft.world.World
 
 class GlowingSuckerOctopusEntity(entityType: EntityType<out GlowingSuckerOctopusEntity>, world: World) :
-    HybridAquaticCephalopodEntity(entityType, world, emptyMap(), HybridAquaticEntityTags.OCTOPUS_PREY, HybridAquaticEntityTags.OCTOPUS_PREDATOR, false) {
+    HybridAquaticCephalopodEntity(entityType, world, emptyMap(), HybridAquaticEntityTags.OCTOPUS_PREY, HybridAquaticEntityTags.OCTOPUS_PREDATOR) {
     companion object {
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()