Animations work properly. Currently hardcoded transition curves instant. Will renable later once needed for blended animation attempts.

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/GenerationsClientMolangFunctions.kt

@@ -1,8 +1,10 @@
 package generations.gg.generations.core.generationscore.common.client.model
 
 import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.client.ClientMoLangFunctions
+import com.cobblemon.mod.common.client.render.models.blockbench.ExcludedLabels
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunction
@@ -37,17 +39,27 @@ object GenerationsClientMolangFunctions {
             val anim = pkStateful(group, animation)
 
             val excludedLabels = mutableSetOf<String>()
-            val curve: WaveFunction = { t ->
+            var curve: WaveFunction = /*{ t ->
                 if (t < 0.1) {
                     t * 10
                 } else if (t < 0.9) {
                     1F
                 } else {
                     1F
                 }
-            }
-
+            }*/ { 1f } //TODO: revert once we get around to adding proper curve input to the resource packs.
             for (index in 2 until params.params.size) {
+                val param = params.get<MoValue>(index)
+                if (param is ObjectValue<*>) {
+                    val obj = param.obj
+                    if (obj is ExcludedLabels) {
+                        excludedLabels.addAll(obj.labels)
+                    } else {
+                        curve = param.obj as WaveFunction
+                    }
+                    continue
+                }
+
                 val label = params.getString(index) ?: continue
                 excludedLabels.add(label)
             }

common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/RareCandyActiveAnimation.kt

@@ -11,7 +11,7 @@ data class RareCandyActiveAnimation(private val animation: RareCandyAnimation):
     override var enduresPrimaryAnimations: Boolean = true
 
     override val duration: Float
-        get() = animation.animation?.animationDuration?.toFloat() ?: 0F
+        get() = animation.animation?.animationDuration?.toFloat() ?: -0F
 
     private var afterAction: (RenderContext, PosableState) -> Unit = { _, _ -> }
 
@@ -37,7 +37,7 @@ data class RareCandyActiveAnimation(private val animation: RareCandyAnimation):
         headPitch: Float,
         intensity: Float
     ): Boolean {
-        return animation.run(context, state.animationSeconds - startedSeconds, false).also {
+        return animation.run(context, state.animationSeconds - startedSeconds, intensity).also {
             if (!it) {
                 afterAction(context, state)
             }

common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/RareCandyAnimation.kt

@@ -3,7 +3,6 @@ package generations.gg.generations.core.generationscore.common.client.model
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import generations.gg.generations.core.generationscore.common.client.render.CobblemonInstanceProvider
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.ModelRegistry
-import generations.gg.generations.core.generationscore.common.client.render.rarecandy.Pipelines
 import gg.generations.rarecandy.renderer.animation.Animation
 import gg.generations.rarecandy.renderer.components.AnimatedMeshObject
 import net.minecraft.resources.ResourceLocation
@@ -23,14 +22,19 @@ data class RareCandyAnimation(private val model: ResourceLocation, private val n
     fun run(
         context: RenderContext,
         animationSeconds: Float,
-        shouldLoop: Boolean
+        intensity: Float
     ): Boolean {
-        val instance = context.request(Pipelines.INSTANCE) ?: context.request(RenderContext.ENTITY)?.takeIf { it is CobblemonInstanceProvider }?.let { it as CobblemonInstanceProvider }?.instance ?: return false
-        val anim = animation ?: return false
+        val instance = context.request(RenderContext.POSABLE_STATE)?.takeIf { it is CobblemonInstanceProvider }?.let { it as CobblemonInstanceProvider }?.instance ?: return false
+
+        val anim = animation ?: let {
+            System.out.println("Warning! Animation $name is current not loaded or null")
+            return false
+        }
+
+        val duration = anim.animationDuration.div(anim.ticksPerSecond).toFloat()
 
-        val duration = anim.animationDuration.toFloat()
         var currentSeconds = animationSeconds
-        if (shouldLoop) {
+        if (anim.loops) {
             currentSeconds %= duration
         } else if (animationSeconds > duration && duration > 0) {
             return false

common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/RareCandyBone.kt

@@ -66,17 +66,16 @@ class RareCandyBone /*Remove when cobblemon doesn't have parts of code that assu
         packedOverlay: Int,
         color: Int
     ) {
-        val model = objectSupplier.invoke()
-        if (model?.renderObject == null) return
 
-        var instance = context.request(Pipelines.INSTANCE)
-        if (instance == null) {
-            val entity = context.request(RenderContext.Companion.POSABLE_STATE)
-            if (entity is CobblemonInstanceProvider) {
-                instance = entity.instance
-            }
+        val instance = context.request(RenderContext.Companion.POSABLE_STATE).instanceOrNull<CobblemonInstanceProvider>()?.instance
+
+        if(instance != null) {
+            let {  }
         }
 
+        val model = objectSupplier.invoke()
+        if (model?.renderObject == null) return
+
         var scale = model.renderObject!!.scale // / context.requires(RenderContext.SCALE)
         if (instance == null) {
             return
@@ -118,7 +117,7 @@ class RareCandyBone /*Remove when cobblemon doesn't have parts of code that assu
     override fun get(): Bone = this
 
     companion object {
-                val CUBE_LIST = listOf(Cube(0, 0, 0f, 0f, 0f, 1f, 1f, 1f, 0f, 0f, 0f, false, 1.0f, 1.0f, java.util.Set.of(Direction.NORTH))) //TODO: Remove when assumpt of Bone is always ModelPart is gone.
+        val CUBE_LIST = listOf(Cube(0, 0, 0f, 0f, 0f, 1f, 1f, 1f, 0f, 0f, 0f, false, 1.0f, 1.0f, java.util.Set.of(Direction.NORTH))) //TODO: Remove when assumpt of Bone is always ModelPart is gone.
         private val BLANK_MAP = mapOf("root" to ModelPart(CUBE_LIST, mapOf()))
         private val temp = Vector3f()
         private val ROTATION_CORRECTION = Axis.YP.rotationDegrees(180f)

common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/RareCandyPoseAnimation.kt

@@ -6,17 +6,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.PoseAn
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 
 class RareCandyPoseAnimation(private val animation: RareCandyAnimation) : PoseAnimation() {
-    override fun setupAnim(
-        context: RenderContext,
-        model: PosableModel,
-        state: PosableState,
-        limbSwing: Float,
-        limbSwingAmount: Float,
-        ageInTicks: Float,
-        headYaw: Float,
-        headPitch: Float,
-        intensity: Float,
-    ) {
-        animation.run(context, state.animationSeconds, false)
+    override fun setupAnim(context: RenderContext, model: PosableModel, state: PosableState, limbSwing: Float, limbSwingAmount: Float, ageInTicks: Float, headYaw: Float, headPitch: Float, intensity: Float, ) {
+        animation.run(context, state.animationSeconds, intensity)
     }
 }

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/BlockObjectInstance.java

@@ -9,8 +9,8 @@ public class BlockObjectInstance extends ObjectInstance implements BlockLightVal
     private int light = 0x000000;
     private Vector3f tint = null;
 
-    public BlockObjectInstance(Matrix4f transformationMatrix, Matrix4f viewMatrix, String variant) {
-        super(transformationMatrix, viewMatrix, variant);
+    public BlockObjectInstance(Matrix4f transformationMatrix, String variant) {
+        super(transformationMatrix, variant);
     }
 
 

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/loading/VanilaRenderModel.java

@@ -62,17 +62,16 @@ public void render(VertexConsumer consumer, ObjectInstance instance, Transform t
 
         if(tint == null) tint = WHITE;
         var modelMatrix = instance.transformationMatrix();
-        var viewMatrix = instance.viewMatrix();
 
         for (int i = 0; i < indexSize; i += 3) {
-            addVertex(consumer, i, tint, light, modelMatrix, viewMatrix, transform, transforms);
-            addVertex(consumer, i, tint, light, modelMatrix, viewMatrix, transform, transforms);
-            addVertex(consumer, i + 1, tint, light, modelMatrix, viewMatrix, transform, transforms);
-            addVertex(consumer, i + 2, tint, light, modelMatrix, viewMatrix, transform, transforms);
+            addVertex(consumer, i, tint, light, modelMatrix, transform, transforms);
+            addVertex(consumer, i, tint, light, modelMatrix, transform, transforms);
+            addVertex(consumer, i + 1, tint, light, modelMatrix, transform, transforms);
+            addVertex(consumer, i + 2, tint, light, modelMatrix, transform, transforms);
         }
     }
 
-    private void addVertex(VertexConsumer consumer, int i, Vector3f tint, int light, Matrix4f modelMatrix, Matrix4f viewMatrix, Transform transform, Matrix4f[] transforms) {
+    private void addVertex(VertexConsumer consumer, int i, Vector3f tint, int light, Matrix4f modelMatrix, Transform transform, Matrix4f[] transforms) {
         var bufferIndex = indicies[i];
 
         var posIndex = bufferIndex * 3;

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/loading/VanillaModelLoader.java

@@ -67,6 +67,9 @@ private static Map<String, Animation> processAnimations(AIScene scene, Skeleton
             var fps = animResource.fps();
             fps = config.animationFpsOverride != null && config.animationFpsOverride.containsKey(name) ? config.animationFpsOverride.get(name) : fps;
 
+            var loops = animResource.loops();
+            loops = config.animationLoopsOverride != null && config.animationLoopsOverride.containsKey(name) ? config.animationLoopsOverride.get(name) : loops;
+
             var offsets = animResource.getOffsets();
             offsets.forEach((trackName, offset) -> config.getMaterialsForAnimation(trackName).forEach(a -> offSetsToInsert.put(a, offset)));
             offsets.putAll(offSetsToInsert);
@@ -75,7 +78,7 @@ private static Map<String, Animation> processAnimations(AIScene scene, Skeleton
             var nodes = animResource.getNodes(skeleton);
             var ignoreScaling = config.ignoreScaleInAnimation != null && (config.ignoreScaleInAnimation.contains(name) || config.ignoreScaleInAnimation.contains("all"));
 
-            animations.put(name, new Animation(name, (int) fps, skeleton, nodes, offsets, ignoreScaling, config.offsets.getOrDefault(name, new SkeletalTransform()).scale(config.scale)));
+            animations.put(name, new Animation(name, (int) fps, loops, skeleton, nodes, offsets, ignoreScaling, config.offsets.getOrDefault(name, new SkeletalTransform()).scale(config.scale)));
         });
 
         return animations;
@@ -140,7 +143,7 @@ private static void extractAssimpAnimations(AIScene scene, Skeleton skeleton, Ma
                 }
             }
 
-            animResources.putIfAbsent(animName, new GenericAnimResource((long) fps, animationNodes));
+            animResources.putIfAbsent(animName, new GenericAnimResource((long) fps, false, animationNodes));
         }
     }
 

common/src/main/java/generations/gg/generations/core/generationscore/common/world/entity/ZygardeCellEntity.kt

@@ -23,7 +23,7 @@ import org.joml.Matrix4f
 
 class ZygardeCellEntity : Entity {
     @JvmField
-    var instance: BlockObjectInstance = BlockObjectInstance(Matrix4f(), Matrix4f(), null)
+    var instance: BlockObjectInstance = BlockObjectInstance(Matrix4f(), null)
 
     constructor(level: Level) : super(GenerationsEntities.ZYGARDE_CELL.get(), level)
 

common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/ModelProvidingBlockEntity.kt

@@ -39,8 +39,8 @@ abstract class ModelProvidingBlockEntity(
     override fun getVariant(): String? = blockState.block.instanceOrNull<VariantProvider>()?.variant
 
     fun generateInstance(): ObjectInstance {
-        return if (isAnimated) BlockAnimatedObjectInstance(Matrix4f(), Matrix4f(), null) else BlockObjectInstance(
-            Matrix4f(), Matrix4f(), null
+        return if (isAnimated) BlockAnimatedObjectInstance(Matrix4f(), null, null) else BlockObjectInstance(
+            Matrix4f(), null
         )
     }