Whole lot of stuff icnluding additional of the common storage lib.

Author: Waterpicker

common/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     modImplementation("net.fabricmc:fabric-loader:${project.properties["fabric_loader_version"]}")
     modApi("dev.architectury:architectury:${project.properties["architectury_version"]}")
 
-//    modCompileOnly("earth.terrarium.botarium:botarium-common-$minecraftVersion:${project.properties["botarium_version"]}")
+    modImplementation(group = "earth.terrarium.common_storage_lib", name = "common-storage-lib-common-1.21.1", version = "0.0.7")
 
     implementation("gg.generations:RareCandy:${project.properties["rareCandy"]}"){isTransitive = false}
 

common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsCobblemonEvents.kt

@@ -5,6 +5,7 @@ import com.cobblemon.mod.common.api.Priority
 import com.cobblemon.mod.common.api.battles.model.actor.ActorType
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.CobblemonEvents.BATTLE_VICTORY
+import com.cobblemon.mod.common.api.events.CobblemonEvents.FORME_CHANGE
 import com.cobblemon.mod.common.api.events.CobblemonEvents.FRIENDSHIP_UPDATED
 import com.cobblemon.mod.common.api.events.CobblemonEvents.HELD_ITEM_POST
 import com.cobblemon.mod.common.api.events.CobblemonEvents.LOOT_DROPPED
@@ -21,6 +22,7 @@ import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.giveOrDropItemStack
 import generations.gg.generations.core.generationscore.common.api.player.Caught
+import generations.gg.generations.core.generationscore.common.battle.GenerationsInstructionProcessor
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.instanceOrNull
 import generations.gg.generations.core.generationscore.common.config.LegendKeys
 import generations.gg.generations.core.generationscore.common.config.SpeciesKey
@@ -54,14 +56,13 @@ class GenerationsCobblemonEvents {
 
         @JvmStatic
         fun init() {
+            FORME_CHANGE.subscribe(Priority.NORMAL, {(a, b, c) -> GenerationsInstructionProcessor.processDetailsChange(a, b, c) })
 
 //            CobblemonEvents.POKEMON_ENTITY_SPAWN.subscribe(Priority.HIGHEST) { it ->
 //
 //
 //            }
 
-            GenerationsArchitecturyEvents
-
             BATTLE_VICTORY.subscribe(Priority.HIGH) { event ->
                 val data = mutableListOf<BattleData>()
 

common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsDataProvider.kt

@@ -3,9 +3,7 @@ package generations.gg.generations.core.generationscore.common
 import com.cobblemon.mod.common.api.Priority
 import com.cobblemon.mod.common.api.data.DataProvider
 import com.cobblemon.mod.common.api.data.DataRegistry
-import com.cobblemon.mod.common.api.reactive.SimpleObservable.subscribe
 import com.cobblemon.mod.common.platform.events.PlatformEvents
-import com.cobblemon.mod.common.platform.events.ServerPlayerEvent.Logout.player
 import com.cobblemon.mod.common.util.ifClient
 import com.cobblemon.mod.common.util.server
 import dev.architectury.platform.Platform
@@ -22,8 +20,6 @@ import net.minecraft.server.packs.resources.ResourceManager
 import net.minecraft.server.packs.resources.ResourceManagerReloadListener
 import java.util.*
 import java.util.function.Consumer
-import kotlin.jvm.functions.Function0
-import kotlin.jvm.functions.Function0.invoke
 
 class GenerationsDataProvider : DataProvider {
     // Both Forge n Fabric keep insertion order so if a registry depends on another simply register it after

common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsStorage.kt

@@ -0,0 +1,10 @@
+package generations.gg.generations.core.generationscore.common
+
+import earth.terrarium.common_storage_lib.data.DataManagerRegistry
+import earth.terrarium.common_storage_lib.item.util.ItemStorageData
+
+object GenerationsStorage {
+    val registry = DataManagerRegistry(GenerationsCore.MOD_ID)
+
+    val item_contents = registry.builder(ItemStorageData.DEFAULT).serialize(ItemStorageData.CODEC).buildAndRegister().componentType()
+}

common/src/main/java/generations/gg/generations/core/generationscore/common/NetworkManager.kt

@@ -13,7 +13,6 @@ import kotlin.reflect.KClass
 
 
 interface NetworkManager {
-    fun
 
     fun registerClientBound()
 

common/src/main/java/generations/gg/generations/core/generationscore/common/api/GenerationsMolangFunctions.kt

@@ -130,7 +130,7 @@ object GenerationsMolangFunctions {
 
                     if(speciesKey == null) return@Function DoubleValue(1.0)
 
-                    return@Function DoubleValue(if (GenerationsCore.CONFIG.caught.capped(player, speciesKey)) 1.0 else 0.0)
+                    return@Function DoubleValue(if (player is ServerPlayer && GenerationsCore.CONFIG.caught.capped(player, speciesKey)) 1.0 else 0.0)
                 },
                 "main_hand" to Function<MoParams, Any> {
                     player.mainHandItem.toMolang()

common/src/main/java/generations/gg/generations/core/generationscore/common/battle/GenerationsInstructionProcessor.kt

@@ -15,22 +15,18 @@ import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.hasKeyItem
 import com.mojang.datafixers.util.Unit
 import generations.gg.generations.core.generationscore.common.util.getProviderOrNull
+import java.util.*
 
+//TODO Use
 object GenerationsInstructionProcessor {
     @JvmStatic
-    fun processDetailsChange(battle: PokemonBattle, message: BattleMessage) {
-        val s1 = message.argumentAt(1) ?: return
-        val s2 = s1.split(",".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-        if (s2.isEmpty()) return
-        val s3 = s2[0].split("-".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+    fun processDetailsChange(battle: PokemonBattle, pokemon: BattlePokemon, formeName: String) {
 
-        if (s3.size < 2) return
+        val battlePokemon = pokemon
 
-        val battlePokemon = message.battlePokemon(0, battle) ?: return
+        val name = formeName
 
-        val name = s3[1].lowercase()
-
-        var pair: Pair<String, Any> = when(name) {
+        val pair: Pair<String, Any> = when(name) {
             "mega" -> {
                 val megaStone = battlePokemon.heldItemManager.showdownId(battlePokemon) ?: return
                 when {
@@ -41,14 +37,16 @@ object GenerationsInstructionProcessor {
             }
             "sunshine" -> "sunny" to true
             "school" -> "schooling" to true
-            "wellspring", "hearthflame", "cornerstone", "teal" -> s3.getOrNull(2)?.takeIf { it == "Tera" }.let { "terastal" to true } ?: null
+//            "wellspring", "hearthflame", "cornerstone", "teal" -> s3.getOrNull(2)?.takeIf { it == "Tera" }.let { "terastal" to true } ?: null TODO: Figure out what ogrepon here uses in the new system.
             else -> name to true
         } ?: let {
             battlePokemon.originalPokemon.removeBattleFeature()
             battlePokemon.effectedPokemon.removeBattleFeature()
             return
         }
 
+        println(arrayOf("A", "A").contentToString())
+
         pair.let {
             when (it.second) {
                 is String -> it.let { StringSpeciesFeature(it.first, it.second as String) }
@@ -122,4 +120,6 @@ private fun Pokemon.applyBattleFeature(feature: SpeciesFeature) {
     } else {
         (feature as FlagSpeciesFeature).apply(this)
     }
+
+    updateForm()
 }

common/src/main/java/generations/gg/generations/core/generationscore/common/client/entity/StatueClientDelegate.kt

@@ -2,7 +2,6 @@ package generations.gg.generations.core.generationscore.common.client.entity
 
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 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.repository.PokemonModelRepository
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -12,24 +11,24 @@ import generations.gg.generations.core.generationscore.common.client.render.rare
 import generations.gg.generations.core.generationscore.common.world.entity.StatueSideDelegate
 import generations.gg.generations.core.generationscore.common.world.entity.statue.StatueEntity
 import net.minecraft.client.Minecraft
+import net.minecraft.network.syncher.EntityDataAccessor
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.Entity
 import org.joml.Matrix4f
 
 class StatueClientDelegate : StatueSideDelegate, PosableState(), CobblemonInstanceProvider {
-    private var modelEntity: PokemonEntity = PokemonEntity(Minecraft.getInstance().level!!)
     private var instance = StatueInstance(Matrix4f(), Matrix4f(), null)
     lateinit var currentEntity: StatueEntity
 
     var trueAge: Int = 0
 
-    val activeAge: Float
+    val activeAge: Int
         get() = if(currentEntity.staticToggle) currentEntity.staticAge else trueAge
 
     override val schedulingTracker
         get() = currentEntity.schedulingTracker
 
-    override fun getEntity() = modelEntity
+    override fun getEntity() = currentEntity
     override fun updatePoke(properties: PokemonProperties) {
 
         modelEntity.pokemon = properties.create()
@@ -39,20 +38,24 @@ class StatueClientDelegate : StatueSideDelegate, PosableState(), CobblemonInstan
         instance.material = value
     }
 
+    override fun onSyncedDataUpdated(data: EntityDataAccessor<*>) {
+        super.onSyncedDataUpdated(data)
+
+    }
 
     override fun initialize(entity: StatueEntity) {
         super.initialize(entity)
         this.currentEntity = entity
         this.age = entity.tickCount
-        this.currentModel = PokemonModelRepository.getPoser(modelEntity.pokemon.species.resourceIdentifier, modelEntity.pokemon.aspects)
+        this.currentModel = PokemonModelRepository.getPoser(modelEntity.pokemon.species.resourceIdentifier, this)
 
         val model = currentModel!!
         model.context.put(RenderContext.ENTITY, entity)
         currentModel!!.updateLocators(entity, this)
         updateLocatorPosition(entity.position())
 
         val currentPoseType = entity.getCurrentPoseType()
-        val pose = this.currentModel!!.poses.values.firstOrNull { currentPoseType in it.poseTypes && (it.condition == null || it.condition?.invoke(modelEntity) == true) }
+        val pose = this.currentModel!!.poses.values.firstOrNull { currentPoseType in it.poseTypes && (it.condition == null || it.condition?.invoke(this) == true) }
         if (pose != null) {
             doLater { setPose(pose.poseName) }
         }
@@ -67,7 +70,7 @@ class StatueClientDelegate : StatueSideDelegate, PosableState(), CobblemonInstan
     override fun incrementAge(entity: Entity) {
         val previousAge = this.activeAge
         updateAge(trueAge + 1)
-        runEffects(entity, previousAge, this.activeAge)
+        runEffects(entity, previousAge.toFloat(), this.activeAge.toFloat()) //TODO: Check if this goes bad. I get a funny feeling
 
         age = this.activeAge