Work on integration of Common Storage Library and side tangent to get rare candy animation integration code updated to 1.6

Author: Waterpicker

…lient/model/RareCandyAnimationFactory.kt …odel/GenerationsClientMolangFunctions.ktcommon/src/main/java/generations/gg/generations/core/generationscore/common/client/model/RareCandyAnimationFactory.kt renamed to common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/GenerationsClientMolangFunctions.kt common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/RareCandyAnimationFactory.kt renamed to common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/GenerationsClientMolangFunctions.kt

@@ -4,15 +4,11 @@ import com.bedrockk.molang.runtime.MoParams
 import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.client.ClientMoLangFunctions
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.ActiveAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunction
 import com.cobblemon.mod.common.util.asResource
 import com.cobblemon.mod.common.util.getBooleanOrNull
-import generations.gg.generations.core.generationscore.common.client.render.CobblemonInstanceProvider
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.CobblemonInstance
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.ModelRegistry
 import gg.generations.rarecandy.renderer.animation.Animation
@@ -22,18 +18,8 @@ import java.util.function.Function
 import java.util.function.Supplier
 
 object RareCandyAnimationFactory {
-    data class ActiveRareCandyAnimation(private val animation: RareCandyAnimation): ActiveAnimation {
-        private var startedSeconds = -1F
-        override val isTransition: Boolean = false
-        override var enduresPrimaryAnimations: Boolean = false
 
-        override val duration: Float
-            get() = animation.duration
-
-
-    }
-
-    fun <T : Entity> stateful(loc: String, name: String, transforms: Boolean): RareCandyAnimation<T> {
+    fun <T : Entity> PosableModel.pkStateful(model: String, name: String) {
         val location = loc.asResource().withPrefix("bedrock/pokemon/models/")
 
         return RareCandyAnimation(Supplier<Animation?> {
@@ -47,16 +33,13 @@ object RareCandyAnimationFactory {
 
     fun stateless(model: PosableModel, loc: String, name: String): ActiveAnimation {
         val location = loc.asResource().withPrefix("bedrock/pokemon/models/")
-        return RareCandyAnimation(
-            {
-                val objects = ModelRegistry[location]?.renderObject
-                if (objects != null && objects.isReady) {
-                    (objects.objects[0] as AnimatedMeshObject).animations[name]
-                }
-                null
-            },
-            { ModelRegistry[location]?.guiInstance },
-        )
+        return RareCandyAnimation {
+            val objects = ModelRegistry[location]?.renderObject
+            if (objects != null && objects.isReady) {
+                (objects.objects[0] as AnimatedMeshObject).animations[name]
+            }
+            null
+        }
     }
 
     fun function(function: (PosableModel, MoParams) -> Any): Function<PosableModel, Function<MoParams, Any>> {
@@ -68,20 +51,21 @@ object RareCandyAnimationFactory {
 
         var map = ClientMoLangFunctions.animationFunctions
 
-        map["pk_stateful"] = function { model, params ->
-            val group = params.getString(0)
-            val animation = params.getString(1)
-            val anim = stateful<T>(group, animation, params.getBooleanOrNull(2) ?: false)
-            ObjectValue(anim)
-        }
-
         map["pk_primary"] = function { model, params ->
             val group = params.getString(0)
             val animation = params.getString(1)
             val anim = stateful<T>(group, animation, params.getBooleanOrNull(2) ?: false)
 
             val excludedLabels = mutableSetOf<String>()
-            val curve: WaveFunction = { 2F }
+            var curve: WaveFunction = { t ->
+                if (t < 0.1) {
+                    t * 10
+                } else if (t < 0.9) {
+                    1F
+                } else {
+                    1F
+                }
+            }
 
             for (index in 2 until params.params.size) {
                 val label = params.getString(index) ?: continue
@@ -91,70 +75,23 @@ object RareCandyAnimationFactory {
             ObjectValue(PrimaryAnimation(animation = anim, excludedLabels = excludedLabels, curve = curve))
         }
 
-        map["pk"] = function { model, params ->
+        map["pk_stateful"] = function { model, params ->
             val group = params.getString(0)
             val animation = params.getString(1)
-            val anim = stateless(model, group, animation)
+            val anim = stateful<T>(group, animation, params.getBooleanOrNull(2) ?: false)
             ObjectValue(anim)
         }
-    }
-
-
-    class RareCandyAnimation(
-        private val animationSuppler: Supplier<Animation?>,
-        private val instanceProvider: Supplier<CobblemonInstance?>,
-    ) {
-
-
-        fun run(
-            context: RenderContext,
-            model: PosableModel,
-            state: PosableState,
-            limbSwing: Float,
-            limbSwingAmount: Float,
-            ageInTicks: Float,
-            headYaw: Float,
-            headPitch: Float,
-            intensity: Float
-        ): Boolean {
-            if (startedSeconds == -1F) {
-                startedSeconds = state.animationSeconds
-            }
-
-
-            val instance = model.context.request(
-                    RenderContext.ENTITY
-                )?.takeIf { it is CobblemonInstanceProvider }?.let { it as CobblemonInstanceProvider }?.instance
-                    ?: instanceProvider.get()
-            val animation = animationSuppler.get()
-
-            if (animation != null) {
-                val currentSeconds = state.animationSeconds - startedSeconds
-                val animationLength = animation.animationDuration / animation.ticksPerSecond
-
-                if(currentSeconds > animationLength) {
-                    return false
-                }
-
-                if (instance != null) {
-                    instance.setAnimation(animation)
-
-                    instance.matrixTransforms = animation.getFrameTransform((currentSeconds).toDouble())
-                    animation.getFrameOffset(instance.currentAnimation!!)
-                }
 
-                return true
-            }
 
-            return false
 
+        map["pk"] = function { model, params ->
+            val group = params.getString(0)
+            val animation = params.getString(1)
+            val anim = stateless(model, group, animation)
+            ObjectValue(anim)
         }
+    }
 
 
-
-        override fun applyEffects(entity: T, state: PoseableEntityState<T>, previousSeconds: Float, newSeconds: Float) = run { }
-
-        fun asMolang() = ObjectValue(this)
-    }
 }
 

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

@@ -0,0 +1,2 @@
+package generations.gg.generations.core.generationscore.common.client.model 
+

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

@@ -0,0 +1,2 @@
+package generations.gg.generations.core.generationscore.common.client.model 
+

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

@@ -0,0 +1,4 @@
+package generations.gg.generations.core.generationscore.common.client.model
+
+class RareCandyPoseAnimation {
+}

common/src/main/java/generations/gg/generations/core/generationscore/common/network/spawn/SpawnExtraDataEntityHandler.kt

@@ -0,0 +1,2 @@
+package generations.gg.generations.core.generationscore.common.util 
+

common/src/main/java/generations/gg/generations/core/generationscore/common/util/CSLExtensions.kt

@@ -0,0 +1,4 @@
+package generations.gg.generations.core.generationscore.common.world.container.slots
+
+class ItemStorageSlot {
+}

common/src/main/java/generations/gg/generations/core/generationscore/common/world/container/slots/ItemStorageSlot.kt

@@ -0,0 +1,2 @@
+package generations.gg.generations.core.generationscore.common.world.item.components 
+

common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/components/TmDetails.kt

@@ -0,0 +1,53 @@
+package generations.gg.generations.core.generationscore.common.world.item.curry
+
+import net.minecraft.ChatFormatting
+import net.minecraft.util.StringRepresentable
+import java.util.function.Consumer
+import java.util.stream.Stream
+
+enum class CurryTasteRating(
+    exp: Int,
+    healthPercent: Double,
+    healStatus: Boolean,
+    restorePP: Boolean,
+    private val textFormatting: ChatFormatting
+) :
+    StringRepresentable {
+    Unknown(0, 0, false, false, ChatFormatting.GRAY),
+    Koffing(25, 0.25, false, false, ChatFormatting.DARK_RED),
+    Wobbuffet(200, 0.5, false, false, ChatFormatting.RED),
+    Milcery(1000, 1.0, true, false, ChatFormatting.WHITE),
+    Copperajah(5000, 1.0, true, true, ChatFormatting.DARK_GREEN),
+    Charizard(10000, 1.0, true, true, ChatFormatting.GREEN);
+
+    private val consumer =
+        Consumer { curryData: CurryData ->
+            curryData.setExperience(exp).setHealthPercentage(healthPercent).setCanHealStatus(healStatus)
+                .setCanRestorePP(restorePP)
+        }
+
+    fun configureData(data: CurryData) {
+        consumer.accept(data)
+    }
+
+    override fun getSerializedName(): String {
+        return name.lowercase()
+    }
+
+    companion object {
+        fun fromId(id: Int): CurryTasteRating {
+            return try {
+                entries[id]
+            } catch (e: Exception) {
+                Koffing
+            }
+        }
+
+        fun get(name: String): CurryTasteRating {
+            return Stream.of(*entries.toTypedArray()).filter { a: CurryTasteRating -> a.serializedName == name }
+                .findAny().orElse(
+                    Unknown
+                )
+        }
+    }
+}