Merge remote-tracking branch 'origin/1.6.1-faster-spawner' into test-observable-bypass

(cherry picked from commit dd2c1ddbc6)

CHANGELOG.md

@@ -1,4 +1,64 @@
 # Changelog
+## [1.7.0 (Month xth, 2025)](#1-7-0)
+
+### Additions
+- Added an in-game configuration screen, allowing all settings from `main.json` to be edited directly in-game.
+- Added `/cobblemonconfig reload` command to reload `main.json` configuration. **Note:** Some settings require a server restart to take effect; use this command cautiously.
+- Added `blacklisted_items_to_hold` and `whitelisted_items_to_hold` tags to allow for controlling which items players can give to their Pokémon. If the whitelist is empty, it will consider all item as allowed (unless they are in the blacklist).
+- Pokémon now follow the mouse cursor on the Summary screen, with an option to disable this in the settings.
+- Pokémon's held items can now be rendered, with a visibility toggle in the Summary screen.
+- Added cosmetic item functionality for Pokémon. Certain cosmetic items can be given to applicable Pokémon via the interact menu.
+  - Added the various log blocks as cosmetic items for Timburr and Komala.
+- Added `visibility/hidden`, `visibility/hat` and `visibility/face` tags to control where and how certain items are rendered.
+
+### Changes
+- Renamed `chargeGainedPerTick` config to `secondsToChargeHealingMachine`.
+- Made Blocks of Gold count as Big Nuggets when held by a Pokémon (for Fling functionality)
+- Substantially optimised spawning checks mainly by front-loading biome filtering.
+
+### Fixes
+- Fixed Particles sometimes facing the wrong direction (looking at you, Swords Dance)
+- Fixed PCs always opening at box 2 instead of box 1.
+- Fixed not being able to do complex item requirements aside from just NBT with evolution conditions, requirements and fossil items.
+- Fixed the usage `hiddenability` in `pokegive` or other spawn commands resulting in a forced hidden ability
+- Fixed the consumption of friendship berries (or EV berries) not making any noise
+- Fixed Instantly breaking and replacing a fossil analyzer with any block entity crashing the game in a complete multi-structure
+- Fixed players getting disconnected when sidemods update a Pokémon's teratype
+- Fixed fling not using Item Names for minecraft held items that substitute Pokémon items
+- Fixed evolutions sometimes preventing players from logging in to servers
+- Fixed rendering of shoulder-mounted Pokémon desyncing between clients
+- Fixed apricorn chest boats forgetting their inventories when being unloaded
+- Fixed moves not updating correctly between form changes resulting in illegal movesets
+- Fixed crash sometimes occurring with the "Oritech" mod
+- Fixed crashes due to an incorrect Java version handing out an obscure crash.
+- Fixed some berries being able to rarely get too many berries and cause a crash.
+- Fixed status curing berries not playing the berry eating sound, same for healing berries used mid-battle.
+- Fixed owned Pokémon sometimes being un-interactable after the player relogs fast
+- Fixed field name in evolution requirements for Spewpa Pokeball.
+- Fixed LevelUpCriterion logic to correctly check that the Pokémon is a preEvo.
+- Fixed `hide_additional_tooltip` vanilla flag not properly hiding tooltips on pokerod and bait items
+
+### Developer
+- A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
+- Dialogues are correctly removed from memory when they are stopped.
+- Dialogues with variably-set initial pages now properly start timeout tracking.
+- Added `EvGainedEvent.Pre` and `EvGainedEvent.Post`.
+- Deprecated `EVs#add(Stat, Int)`, you will not be able to compile against this code please migrate to the `EVs#add(Stat, Int, EvSource)` you most likely want to use `SidemodEvSource` but please check other implementations or make your own.
+- Removed the NbtItemPredicate class, all the mod usages now use the vanilla item predicate solution, this causes breaking changes on Fossil, HeldItemRequirement & ItemInteractionEvolution
+- Renamed Cobblemon's creative tabs to start with "Cobblemon: " to distinguish Cobblemon's tabs from tabs for other mods.
+- Various items now have a rarity value.
+
+### Changes
+- When using the `cobblemon` or `generation_9` capture calculators a critical capture with a single shake will always play for successful captures when you've already registered the Pokémon as caught in your Pokédex.
+
+### MoLang & Datapacks
+- The following usages for item predicates can now use item conditions like advancements do, you can learn about them in the [Minecraft wiki](https://minecraft.wiki/w/Advancement_definition#minecraft:filled_bucket)
+  - The `requiredContext` for an item interaction evolution
+  - The `itemCondition` for a held item evolution requirement
+  - The `fossils` for a fossil entry
+- Added MoLang flows for `poke_ball_capture_calculated`, `evolution_tested`, `evolution_accepted`, `evolution_completed`
+- Added `interpolate` boolean property to animated textures to allow gradual colour changes between frames.
+
 ## [1.6.1 (January 26th, 2025)](#1-6-1)
 
 ### Additions

common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt

@@ -388,8 +388,8 @@ object Cobblemon {
             storage.unregisterAll(it.server.registryAccess())
             playerDataManager.saveAllStores()
         }
-        PlatformEvents.SERVER_STARTED.subscribe {
-            bestSpawner.onServerStarted()
+        PlatformEvents.SERVER_STARTED.subscribe { event ->
+            bestSpawner.onServerStarted(event.server)
             battleRegistry.onServerStarted()
         }
         PlatformEvents.SERVER_TICK_POST.subscribe { ServerTickHandler.onTick(it.server) }

common/src/main/kotlin/com/cobblemon/mod/common/api/conditional/RegistryLikeCondition.kt

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.api.conditional
 
+import net.minecraft.core.Holder
 import net.minecraft.core.Registry
 
 /**
@@ -17,5 +18,10 @@ import net.minecraft.core.Registry
  * @since July 16th, 2022
  */
 interface RegistryLikeCondition<T> {
-    fun fits(t: T, registry: Registry<T>): Boolean
+    fun fits(t: T, registry: Registry<T>): Boolean {
+        val holder = registry.wrapAsHolder(t)
+        return holder != null && fits(holder)
+    }
+
+    fun fits(holder: Holder<T>): Boolean
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/conditional/RegistryLikeIdentifierCondition.kt

@@ -9,7 +9,7 @@
 package com.cobblemon.mod.common.api.conditional
 
 import com.google.gson.JsonElement
-import net.minecraft.core.Registry
+import net.minecraft.core.Holder
 import net.minecraft.resources.ResourceLocation
 
 /**
@@ -24,5 +24,6 @@ open class RegistryLikeIdentifierCondition<T : Any>(val identifier: ResourceLoca
             constructor: (ResourceLocation) -> RegistryLikeIdentifierCondition<T>
         ): (JsonElement) -> RegistryLikeIdentifierCondition<T>? = { constructor(ResourceLocation.parse(it.asString)) }
     }
-    override fun fits(t: T, registry: Registry<T>) = registry.getKey(t) == identifier
+
+    override fun fits(t: Holder<T>) = t.`is`(identifier)
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/conditional/RegistryLikeTagCondition.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.api.conditional
 
 import com.google.gson.JsonElement
+import net.minecraft.core.Holder
 import net.minecraft.core.Registry
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
@@ -39,16 +40,5 @@ open class RegistryLikeTagCondition<T : Any>(val tag: TagKey<T>) : RegistryLikeC
         }
     }
 
-    override fun fits(t: T, registry: Registry<T>): Boolean {
-//        val registryHasTag = registry.containsTag(tag)
-//        if (!registryHasTag) {
-////            LOGGER.warn("No tag in registry: ${tag.id}")
-//            return false
-//        }
-
-        return registry.getResourceKey(t)
-            .flatMap(registry::getHolder)
-            .map { entry -> entry.`is`(tag) }
-            .orElse(false)
-    }
+    override fun fits(t: Holder<T>) = t.`is`(tag)
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt

@@ -850,7 +850,7 @@ object MoLangFunctions {
         { spawningContext ->
             val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
             val worldValue = spawningContext.world.registryAccess().registryOrThrow(Registries.DIMENSION).wrapAsHolder(spawningContext.world).asWorldMoLangValue()
-            val biomeValue = spawningContext.biomeRegistry.wrapAsHolder(spawningContext.biome).asBiomeMoLangValue()
+            val biomeValue = spawningContext.biomeHolder.asBiomeMoLangValue()
             map.put("biome") { _ -> biomeValue }
             map.put("world") { _ -> worldValue }
             map.put("light") { _ -> DoubleValue(spawningContext.light.toDouble()) }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/BestSpawner.kt

@@ -10,7 +10,14 @@ package com.cobblemon.mod.common.api.spawning
 
 import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.api.entity.Despawner
-import com.cobblemon.mod.common.api.spawning.condition.*
+import com.cobblemon.mod.common.api.spawning.condition.AreaSpawningCondition
+import com.cobblemon.mod.common.api.spawning.condition.BasicSpawningCondition
+import com.cobblemon.mod.common.api.spawning.condition.FishingSpawningCondition
+import com.cobblemon.mod.common.api.spawning.condition.GroundedSpawningCondition
+import com.cobblemon.mod.common.api.spawning.condition.SeafloorSpawningCondition
+import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
+import com.cobblemon.mod.common.api.spawning.condition.SubmergedSpawningCondition
+import com.cobblemon.mod.common.api.spawning.condition.SurfaceSpawningCondition
 import com.cobblemon.mod.common.api.spawning.context.AreaContextResolver
 import com.cobblemon.mod.common.api.spawning.context.FishingSpawningContext
 import com.cobblemon.mod.common.api.spawning.context.GroundedSpawningContext
@@ -44,6 +51,7 @@ import com.cobblemon.mod.common.api.spawning.spawner.Spawner
 import com.cobblemon.mod.common.api.spawning.spawner.TickingSpawner
 import com.cobblemon.mod.common.entity.pokemon.CobblemonAgingDespawner
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import net.minecraft.server.MinecraftServer
 
 /**
  * A grouping of all the overarching behaviours of the Best Spawner system. This is a convenient accessor to
@@ -119,7 +127,8 @@ object BestSpawner {
         SpawnDetailPresets.registerPresetType(PokemonSpawnDetailPreset.NAME, PokemonSpawnDetailPreset::class.java)
     }
 
-    fun onServerStarted() {
+    fun onServerStarted(server: MinecraftServer) {
+        CobblemonSpawnPools.onServerLoad(server)
         spawnerManagers.forEach(SpawnerManager::onServerStarted)
         fishingSpawner = FishingSpawner()
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/CobblemonSpawnPools.kt

@@ -8,10 +8,13 @@
 
 package com.cobblemon.mod.common.api.spawning
 
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.spawning.condition.BiomePrecalculation
 import com.cobblemon.mod.common.api.spawning.condition.BucketPrecalculation
 import com.cobblemon.mod.common.api.spawning.condition.ContextPrecalculation
 import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
 import com.cobblemon.mod.common.data.CobblemonDataProvider
+import net.minecraft.server.MinecraftServer
 
 /**
  * A collection of all of Cobblemon's general-purpose [SpawnPool]s. These
@@ -26,6 +29,18 @@ object CobblemonSpawnPools {
     lateinit var WORLD_SPAWN_POOL: SpawnPool
 
     fun load() {
-        WORLD_SPAWN_POOL = CobblemonDataProvider.register(SpawnPool("world").addPrecalculators(ContextPrecalculation, BucketPrecalculation))
+        WORLD_SPAWN_POOL = CobblemonDataProvider.register(SpawnPool("world")
+            .addPrecalculators(
+                ContextPrecalculation,
+                BucketPrecalculation,
+                BiomePrecalculation
+            )
+        )
+    }
+
+    fun onServerLoad(server: MinecraftServer) {
+        Cobblemon.LOGGER.info("Optimizing spawn pools...")
+        WORLD_SPAWN_POOL.forEach { it.onServerLoad(server) }
+        WORLD_SPAWN_POOL.precalculate()
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/AreaSpawningCondition.kt

@@ -32,7 +32,7 @@ abstract class AreaTypeSpawningCondition<T : AreaSpawningContext> : SpawningCond
             return false
         } else if (maxHeight != null && ctx.height > maxHeight!!) {
             return false
-        } else if (neededNearbyBlocks != null && neededNearbyBlocks!!.none { cond -> ctx.nearbyBlockTypes.any { cond.fits(it, ctx.blockRegistry) } }) {
+        } else if (neededNearbyBlocks != null && neededNearbyBlocks!!.none { cond -> ctx.nearbyBlockHolders.any { cond.fits(it) } }) {
             return false
         } else {
             return true

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/CompositeSpawningCondition.kt

@@ -10,6 +10,8 @@ package com.cobblemon.mod.common.api.spawning.condition
 
 import com.cobblemon.mod.common.api.spawning.context.SpawningContext
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
+import net.minecraft.core.Holder
+import net.minecraft.world.level.biome.Biome
 
 /**
  * A spawning condition that is composed of a list of conditions and anticonditions.
@@ -30,6 +32,15 @@ class CompositeSpawningCondition {
     var conditions = mutableListOf<SpawningCondition<*>>()
     var anticonditions = mutableListOf<SpawningCondition<*>>()
 
+    fun isBiomeValid(holder: Holder<Biome>): Boolean {
+        if (conditions.isEmpty() || conditions.any { it.biomes == null || it.biomes!!.isEmpty() || it.biomes!!.any { it.fits(holder) } }) {
+            if (anticonditions.isEmpty() || anticonditions.none { it.biomes != null && it.biomes!!.any { it.fits(holder) } }) {
+                return true
+            }
+        }
+        return false
+    }
+
     fun satisfiedBy(ctx: SpawningContext): Boolean {
         return if (conditions.isNotEmpty() && conditions.none { it.isSatisfiedBy(ctx) }) {
             false

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/GroundedSpawningCondition.kt

@@ -30,7 +30,11 @@ abstract class GroundedTypeSpawningCondition<T : GroundedSpawningContext> : Area
             return false
         } else if (maxHeight != null && ctx.height > maxHeight!!) {
             return false
-        } else !(neededBaseBlocks != null && neededBaseBlocks!!.none { it.fits(ctx.baseBlock.block, ctx.blockRegistry) })
+        } else if (neededBaseBlocks != null && neededBaseBlocks!!.none { it.fits(ctx.baseBlockHolder) }) {
+            return false
+        } else {
+            return true
+        }
     }
 
     override fun copyFrom(other: SpawningCondition<*>, merger: Merger) {

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SeafloorSpawningCondition.kt

@@ -30,10 +30,14 @@ abstract class SeafloorTypeSpawningCondition<T : SeafloorSpawningContext> : Area
         return if (!super.fits(ctx)) {
             false
         } else if (minHeight != null && ctx.height < minHeight!!) {
-            return false
+            false
         } else if (maxHeight != null && ctx.height > maxHeight!!) {
-            return false
-        } else !(neededBaseBlocks != null && neededBaseBlocks!!.none { it.fits(ctx.baseBlock.block, ctx.blockRegistry) })
+            false
+        } else if (neededBaseBlocks != null && neededBaseBlocks!!.none { it.fits(ctx.baseBlockHolder) }) {
+            false
+        } else {
+            true
+        }
     }
 
     override fun copyFrom(other: SpawningCondition<*>, merger: Merger) {
@@ -44,7 +48,7 @@ abstract class SeafloorTypeSpawningCondition<T : SeafloorSpawningContext> : Area
     }
 
     override fun isValid(): Boolean {
-        val containsNullValues = neededBaseBlocks != null && neededBaseBlocks!!.any {it == null}
+        val containsNullValues = neededBaseBlocks != null && neededBaseBlocks!!.any { it == null }
         return super.isValid() && !containsNullValues
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SpawningCondition.kt

@@ -42,6 +42,7 @@ abstract class SpawningCondition<T : SpawningContext> {
     }
 
     var dimensions: MutableList<ResourceLocation>? = null
+    /** This gets checked in a precalculation but still needs to be checked for things like rarity multipliers. */
     var biomes: MutableSet<RegistryLikeCondition<Biome>>? = null
     var moonPhase: MoonPhaseRange? = null
     var canSeeSky: Boolean? = null
@@ -98,7 +99,7 @@ abstract class SpawningCondition<T : SpawningContext> {
             return false
         } else if (dimensions != null && dimensions!!.isNotEmpty() && ctx.world.dimensionType().effectsLocation !in dimensions!!) {
             return false
-        } else if (biomes != null && biomes!!.isNotEmpty() && biomes!!.none { condition -> condition.fits(ctx.biome, ctx.biomeRegistry) }) {
+        } else if (biomes != null && biomes!!.isNotEmpty() && biomes!!.none { condition -> condition.fits(ctx.biomeHolder) }) {
             return false
         } else if (appendages.any { !it.fits(ctx) }) {
             return false
@@ -153,11 +154,11 @@ abstract class SpawningCondition<T : SpawningContext> {
     }
 
     open fun isValid(): Boolean {
-        if(biomes != null && biomes!!.any {it == null})
+        if (biomes != null && biomes!!.any { it == null })
             return false
-        if(dimensions != null && dimensions!!.any {it == null})
+        if (dimensions != null && dimensions!!.any { it == null })
             return false
-        if(structures != null && structures!!.any {it == null})
+        if (structures != null && structures!!.any { it == null })
             return false
         return true
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SpawningPrecalculation.kt

@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.context.SpawningContext
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
 import com.cobblemon.mod.common.api.spawning.spawner.Spawner
+import net.minecraft.resources.ResourceLocation
 
 /**
  * A type of precalculation that can occur on a list of [SpawnDetail] to accelerate
@@ -31,7 +32,7 @@ import com.cobblemon.mod.common.api.spawning.spawner.Spawner
  */
 interface SpawningPrecalculation<T : Any> {
     /** Retrieves the precalculation keys for the given spawn detail. */
-    fun select(detail: SpawnDetail): List<T>
+    fun select(detail: SpawnDetail): Collection<T>
     /** Retrieves the precalculation key for the given context, if that key exists for this context. */
     fun select(ctx: SpawningContext): T?
 
@@ -71,7 +72,8 @@ interface SpawningPrecalculation<T : Any> {
  * @since January 31st, 2022
  */
 object RootPrecalculation : SpawningPrecalculation<Any> {
-    override fun select(detail: SpawnDetail): List<Any> = listOf(Unit)
+    val list = listOf(Unit)
+    override fun select(detail: SpawnDetail): List<Any> = list
     override fun select(ctx: SpawningContext): Any = Unit
 }
 
@@ -89,7 +91,15 @@ object ContextPrecalculation : SpawningPrecalculation<Class<out SpawningContext>
 object BucketPrecalculation : SpawningPrecalculation<SpawnBucket> {
     override fun select(detail: SpawnDetail) = listOf(detail.bucket)
     override fun select(ctx: SpawningContext) = ctx.cause.bucket
+}
 
+/**
+ * This isn't so much of a precalculation as it is a yoinking of another precalculation.
+ * Uses pre-established [SpawnDetail.validBiomes] to shortcut knowing which spawns are valid for a biome.
+ */
+object BiomePrecalculation : SpawningPrecalculation<ResourceLocation> {
+    override fun select(detail: SpawnDetail) = detail.validBiomes
+    override fun select(ctx: SpawningContext) = ctx.biomeHolder.unwrapKey().map { it.location() }.orElse(null)
 }
 
 /**

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/context/AreaSpawningContext.kt

@@ -18,6 +18,7 @@ import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.core.BlockPos
+import net.minecraft.core.Holder
 
 /**
  * A [SpawningContext] that is for a particular area, and therefore has spatial properties.
@@ -39,6 +40,7 @@ open class AreaSpawningContext(
     val slice: WorldSlice
 ) : SpawningContext() {
     val nearbyBlockTypes: List<Block> by lazy { nearbyBlocks.mapNotNull { it.block }.distinct() }
+    val nearbyBlockHolders: List<Holder<Block>> by lazy { nearbyBlockTypes.mapNotNull(blockRegistry::wrapAsHolder) }
 
     override fun getStructureCache(pos: BlockPos): StructureChunkCache {
         return slice.getStructureCache(pos)

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/context/GroundedContexts.kt

@@ -11,9 +11,12 @@ package com.cobblemon.mod.common.api.spawning.context
 import com.cobblemon.mod.common.api.spawning.SpawnCause
 import com.cobblemon.mod.common.api.spawning.WorldSlice
 import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
+import com.cobblemon.mod.common.util.blockRegistry
 import net.minecraft.core.BlockPos
+import net.minecraft.core.Holder
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.tags.FluidTags
+import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.BlockState
 
 /**
@@ -36,6 +39,7 @@ abstract class FlooredSpawningContext(
 ) : AreaSpawningContext(cause, world, position, light, skyLight, canSeeSky, influences, height, nearbyBlocks, slice) {
     /** The block that the spawning is occurring on. */
     val baseBlock = slice.getBlockState(position.x, position.y, position.z)
+    val baseBlockHolder: Holder<Block> by lazy { world.blockRegistry.wrapAsHolder(baseBlock.block) }
 }
 
 /**

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/context/SpawningContext.kt

@@ -82,7 +82,9 @@ abstract class SpawningContext {
     /** The current phase of the moon at this location. */
     val moonPhase: Int by lazy { world.moonPhase }
     /** The biome of this location. */
-    val biome: Biome by lazy { world.getBiome(position).value() }
+    val biome: Biome by lazy { biomeHolder.value() }
+    /** The registry holder for the biome this context is in. */
+    val biomeHolder: Holder<Biome> by lazy { world.getBiome(position) }
 
     val biomeRegistry: Registry<Biome> by lazy { world.registryAccess().registryOrThrow(Registries.BIOME) }
     val blockRegistry: Registry<Block> by lazy { world.registryAccess().registryOrThrow(Registries.BLOCK) }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/context/calculators/SpawningContextCalculator.kt

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.api.Priority
 import com.cobblemon.mod.common.api.spawning.SpawnCause
 import com.cobblemon.mod.common.api.spawning.context.SpawningContext
 import net.minecraft.server.level.ServerLevel
+import net.minecraft.tags.BlockTags
 import net.minecraft.tags.FluidTags
 import net.minecraft.world.level.block.state.BlockState
 
@@ -29,7 +30,7 @@ import net.minecraft.world.level.block.state.BlockState
  */
 interface SpawningContextCalculator<I : SpawningContextInput, O : SpawningContext> {
     companion object {
-        val isAirCondition: (BlockState) -> Boolean = { it.isAir || (!it.isSolid && !it.fluidState.`is`(FluidTags.WATER)) }
+        val isAirCondition: (BlockState) -> Boolean = { it.isAir || (!it.isSolid && !it.fluidState.`is`(FluidTags.WATER) && !it.`is`(BlockTags.RAILS)) }
         val isSolidCondition: (BlockState) -> Boolean = { it.isSolid }
         val isWaterCondition: (BlockState) -> Boolean = { it.fluidState.`is`(FluidTags.WATER) && it.fluidState.isSource  }
         val isLavaCondition: (BlockState) -> Boolean = { it.fluidState.`is`(FluidTags.LAVA) && it.fluidState.isSource }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/PokemonSpawnDetail.kt

@@ -88,7 +88,6 @@ class PokemonSpawnDetail : SpawnDetail() {
             }
         }
 
-        struct.setDirectly("pokemon", pokemonStruct)
         super.autoLabel()
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/SpawnDetail.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.api.spawning.detail
 
 import com.bedrockk.molang.runtime.struct.ArrayStruct
+import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.bedrockk.molang.runtime.struct.VariableStruct
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.StringValue
@@ -22,6 +23,9 @@ import com.cobblemon.mod.common.api.spawning.context.SpawningContext
 import com.cobblemon.mod.common.api.spawning.multiplier.WeightMultiplier
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.util.asTranslated
+import net.minecraft.core.registries.Registries
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.MinecraftServer
 
 /**
  * A spawnable unit in the Best Spawner API. This is extended for any kind of entity
@@ -55,24 +59,41 @@ abstract class SpawnDetail : ModDependant {
 
     var labels = mutableListOf<String>()
 
-    val struct: VariableStruct = VariableStruct()
+    /**
+     * This is calculated when the server starts. It is a set of all biome identifiers in which this spawn
+     * is possible. It is used as part of the [com.cobblemon.mod.common.api.spawning.condition.BiomePrecalculation].
+     */
+    @Transient
+    val validBiomes = mutableSetOf<ResourceLocation>()
+
+    @Transient
+    val struct: QueryStruct = QueryStruct(hashMapOf())
 
     override var neededInstalledMods = listOf<String>()
     override var neededUninstalledMods = listOf<String>()
 
     open fun autoLabel() {
-        struct.setDirectly("weight", DoubleValue(weight.toDouble()))
-        struct.setDirectly("percentage", DoubleValue(percentage.toDouble()))
-        struct.setDirectly("id", StringValue(id))
-        struct.setDirectly("bucket", StringValue(bucket.name))
-        struct.setDirectly("width", DoubleValue(width.toDouble()))
-        struct.setDirectly("height", DoubleValue(height.toDouble()))
-        struct.setDirectly("context", StringValue(context.name))
-        struct.setDirectly("labels", ArrayStruct(labels.mapIndexed { index, s -> "$index" to StringValue(s) }.toMap()))
     }
 
     open fun getName() = displayName?.asTranslated() ?: id.text()
 
+    open fun onServerLoad(server: MinecraftServer) {
+        val biomeRegistry = server.registryAccess().registryOrThrow(Registries.BIOME)
+        validBiomes.clear()
+
+        // Calculate in advance what biomes of this world the spawn detail is valid for.
+        biomeRegistry.holders().forEach { holder ->
+            val key = holder.unwrapKey().orElse(null) ?: return@forEach
+            if (conditions.isEmpty() || conditions.any { it.biomes == null || it.biomes!!.isEmpty() || it.biomes!!.any { it.fits(holder) } }) {
+                if (anticonditions.isEmpty() || anticonditions.none { it.biomes != null && it.biomes!!.any { it.fits(holder) } }) {
+                    if (compositeCondition?.isBiomeValid(holder) != false) {
+                        validBiomes.add(key.location())
+                    }
+                }
+            }
+        }
+    }
+
     open fun isSatisfiedBy(ctx: SpawningContext): Boolean {
         if (!ctx.preFilter(this)) {
             return false

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/SpawnPool.kt

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.api.spawning.detail
 
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.api.spawning.CobblemonSpawnPools
 import com.cobblemon.mod.common.api.spawning.SpawnLoader
 import com.cobblemon.mod.common.api.spawning.SpawnSet
 import com.cobblemon.mod.common.api.spawning.condition.PrecalculationResult
@@ -18,6 +19,7 @@ import com.cobblemon.mod.common.api.spawning.condition.SpawningPrecalculation
 import com.cobblemon.mod.common.api.spawning.context.SpawningContext
 import com.cobblemon.mod.common.api.spawning.spawner.Spawner
 import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.server
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import net.minecraft.resources.ResourceLocation
@@ -48,6 +50,10 @@ class SpawnPool(val name: String) : JsonDataRegistry<SpawnSet>, Iterable<SpawnDe
         for (set in data.values) {
             details.addAll(set.filter { it.isValid() })
         }
+        val server = server()
+        if (server != null && server.isRunning) {
+            CobblemonSpawnPools.onServerLoad(server)
+        }
         precalculate()
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/influence/RestrictedSpawnBlocksInfluence.kt

@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.spawning.influence
-
-import com.cobblemon.mod.common.api.spawning.context.SpawningContext
-import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
-import net.minecraft.tags.BlockTags
-
-/**
- * Implements a [SpawningInfluence] that prevents Pokémon spawning on certain blocks.
- * This ensures that Pokémon don't spawn in areas that could disrupt player-built structures or mechanisms.
- * The influence checks the block directly above the potential spawn location; if the block is in the restricted list,
- * the spawn is disallowed.
- *
- * @author Aethen
- * @since February 20th, 2024
- */
-open class RestrictedSpawnBlocksInfluence
-    : SpawningInfluence {
-
-    // The list of blocks that Pokémon are not allowed to spawn on.
-    private val restrictedBlocks = BlockTags.RAILS
-
-
-
-    /**
-     * Affects the spawnable status of a Pokémon spawn detail.
-     * If the block directly above the spawn location is in the restricted list, the spawn is disallowed.
-     *
-     * @param detail The Pokémon spawn detail to be affected.
-     * @param ctx The context of the spawning event.
-     * @return `true` if the spawn is allowed, `false` if it is disallowed.
-     */
-    override fun affectSpawnable(detail: SpawnDetail, ctx: SpawningContext): Boolean {
-        // If the spawn detail is not a Pokémon, it is not affected by this influence.
-        if (detail.type != "pokemon") return true
-
-        // Get the position of the potential spawn location.
-        val pokemonSpawnPos = ctx.position
-
-        // Examine the block immediately above the spawn block to check for a rail
-        // Potentially need a refactor if we ever want to check the spawn block itself.
-        return ctx.world.getBlockState(pokemonSpawnPos.atY(pokemonSpawnPos.y + 1)).`is`(restrictedBlocks).not()
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/spawner/PlayerSpawnerFactory.kt

@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.api.spawning.SpawnerManager
 import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
 import com.cobblemon.mod.common.api.spawning.influence.PlayerLevelRangeInfluence
 import com.cobblemon.mod.common.api.spawning.influence.PlayerLevelRangeInfluence.Companion.TYPICAL_VARIATION
-import com.cobblemon.mod.common.api.spawning.influence.RestrictedSpawnBlocksInfluence
 import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
 import com.cobblemon.mod.common.api.spawning.rules.SpawnRule
 import com.cobblemon.mod.common.util.mutableLazy
@@ -45,7 +44,7 @@ object PlayerSpawnerFactory {
             it,
             variation = TYPICAL_VARIATION
         )
-    }, { RestrictedSpawnBlocksInfluence() })
+    })
 
     fun create(spawnerManager: SpawnerManager, player: ServerPlayer): PlayerSpawner {
         val influences = influenceBuilders.mapNotNull { it(player) }

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/BottomlessStore.kt

@@ -45,9 +45,9 @@ open class BottomlessStore(override val uuid: UUID) : PokemonStore<BottomlessPos
     override fun initialize() {
         pokemon.forEachIndexed { index, pokemon ->
             pokemon.storeCoordinates.set(StoreCoordinates(this, BottomlessPosition(index)))
-            pokemon.getChangeObservable().pipe(
-                stopAfter { it.storeCoordinates.get()?.store != this }
-            ).subscribe { storeChangeObservable.emit(Unit) }
+//            pokemon.getChangeObservable().pipe(
+//                stopAfter { it.storeCoordinates.get()?.store != this }
+//            ).subscribe { storeChangeObservable.emit(Unit) }
         }
     }
 
@@ -98,6 +98,10 @@ open class BottomlessStore(override val uuid: UUID) : PokemonStore<BottomlessPos
 
     override fun getAnyChangeObservable() = storeChangeObservable
 
+    override fun onPokemonChange(pokemon: Pokemon) {
+        this.storeChangeObservable.emit(Unit)
+    }
+
     override fun setAtPosition(position: BottomlessPosition, pokemon: Pokemon?) {
         if (position.currentIndex == this.pokemon.size && pokemon != null) {
             this.pokemon.add(pokemon)

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/PokemonStore.kt

@@ -168,4 +168,6 @@ abstract class PokemonStore<T : StorePosition> : Iterable<Pokemon> {
      * each change, accessed by [Pokemon.getChangeObservable].
      */
     abstract fun getAnyChangeObservable(): Observable<Unit>
+
+    abstract fun onPokemonChange(pokemon: Pokemon)
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/party/PartyStore.kt

@@ -73,9 +73,13 @@ open class PartyStore(override val uuid: UUID) : PokemonStore<PartyPosition>() {
     }
 
     fun trackPokemon(pokemon: Pokemon) {
-        pokemon.getChangeObservable()
-            .pipe(stopAfter { pokemon.storeCoordinates.get()?.store != this })
-            .subscribe { anyChangeObservable.emit(Unit) }
+//        pokemon.getChangeObservable()
+//            .pipe(stopAfter { pokemon.storeCoordinates.get()?.store != this })
+//            .subscribe { anyChangeObservable.emit(Unit) }
+    }
+
+    override fun onPokemonChange(pokemon: Pokemon) {
+        anyChangeObservable.emit(Unit)
     }
 
     override fun getFirstAvailablePosition(): PartyPosition? {

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/pc/PCBox.kt

@@ -89,14 +89,14 @@ open class PCBox(val pc: PCStore) : Iterable<Pokemon> {
     }
 
     fun trackPokemon(pokemon: Pokemon) {
-        pokemon.getChangeObservable()
-            .pipe(
-                stopAfter {
-                    val coordinates = it.storeCoordinates.get() ?: return@stopAfter true
-                    return@stopAfter coordinates.store !is PCStore || coordinates.store.uuid != pc.uuid || (coordinates.position as PCPosition).box != boxNumber
-                }
-            )
-            .subscribe { boxChangeEmitter.emit(Unit) }
+//        pokemon.getChangeObservable()
+//            .pipe(
+//                stopAfter {
+//                    val coordinates = it.storeCoordinates.get() ?: return@stopAfter true
+//                    return@stopAfter coordinates.store !is PCStore || coordinates.store.uuid != pc.uuid || (coordinates.position as PCPosition).box != boxNumber
+//                }
+//            )
+//            .subscribe { boxChangeEmitter.emit(Unit) }
     }
 
     fun sendTo(player: ServerPlayer) {

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/pc/PCStore.kt

@@ -250,6 +250,10 @@ open class PCStore(
         }
     }
 
+    override fun onPokemonChange(pokemon: Pokemon) {
+        this.pcChangeObservable.emit(Unit)
+    }
+
     fun clearPC() {
         boxes.forEach { box ->
             box.getNonEmptySlots().forEach{

common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt

@@ -900,6 +900,7 @@ open class PokemonEntity(
                             val newColorFeature =
                                 StringSpeciesFeature(DataKeys.CAN_BE_COLORED, item.dyeColor.name.lowercase())
                             this.pokemon.features.add(newColorFeature)
+                            this.pokemon.onChange()
                             this.pokemon.anyChangeObservable.emit(pokemon)
                         }
 

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt

@@ -396,12 +396,14 @@ open class Pokemon : ShowdownIdentifiable {
     var faintedTimer: Int = -1
         set(value) {
             field = value
+            onChange()
             anyChangeObservable.emit(this)
         }
 
     var healTimer: Int = -1
         set(value) {
             field = value
+            onChange()
             anyChangeObservable.emit(this)
         }
 
@@ -1566,6 +1568,7 @@ open class Pokemon : ShowdownIdentifiable {
                     notify(packet)
                 }
             }
+            onChange()
             anyChangeObservable.emit(this)
         }
         return observable
@@ -1574,6 +1577,13 @@ open class Pokemon : ShowdownIdentifiable {
     private val observables = mutableListOf<Observable<*>>()
     val anyChangeObservable = SimpleObservable<Pokemon>()
 
+    fun onChange() {
+        val store = storeCoordinates.get()?.store
+        if (store != null) {
+            store.onPokemonChange(this)
+        }
+    }
+
     val struct = ObjectValue<Pokemon>(this)
         .addPokemonFunctions(this)
 

common/src/main/kotlin/com/cobblemon/mod/common/registry/BiomeLikeCondition.kt

@@ -11,8 +11,8 @@ package com.cobblemon.mod.common.registry
 import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
 import com.cobblemon.mod.common.api.conditional.RegistryLikeIdentifierCondition
 import com.cobblemon.mod.common.api.conditional.RegistryLikeTagCondition
-import net.minecraft.tags.TagKey
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.tags.TagKey
 import net.minecraft.world.level.biome.Biome
 
 /**