Remove test logging

# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/client/pokedex/PokedexScannerRenderer.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/pokedex/scanner/PokedexUsageContext.kt

.gitlab-ci.yml

@@ -71,8 +71,8 @@ setup_packsquash:
     - echo "Installing wget & unzip"
     - yum install -y wget unzip
     - echo "Downloading PackSquash"
-    - wget https://github.com/ComunidadAylas/PackSquash/releases/download/v0.4.1/packsquash-x86_64-unknown-linux-musl.zip
-    - unzip packsquash-x86_64-unknown-linux-musl.zip -d ./packsquash_bin
+    - wget https://github.com/ComunidadAylas/PackSquash/releases/download/v0.4.0/PackSquash.CLI.executable.x86_64-unknown-linux-musl.zip
+    - unzip PackSquash.CLI.executable.x86_64-unknown-linux-musl.zip -d ./packsquash_bin
     - echo "Creating PackSquash options.toml"
     - |
       cat <<EOF > ./options.toml

CHANGELOG.md

@@ -2,6 +2,10 @@
 ## [1.8.0 (MONTH Xth, 2026)](#1-8-0)
 
 ### Additions
+- Added trades for Saccharine Saplings, Hearty Grains, Chipped Pot, and Masterpiece Teacup to the Wandering Trader.
+- Added brewing recipe for Throat Spray.
+- Added Berry Tree scanning for Pokedex
+- Added Datapackable Pokedex Scanning for Block Entities
 - Added config options to award experience to fainted Pokémon for opponents they helped defeat (`awardExperienceToFaintedPokemon`) and to still award experience for defeated enemies even after battle loss/forfeit (`awardExperienceOnBattleLoss`)
 - Party Overlay Exp Gained Animation will now display the amount of EXP the Pokémon gained
 - Added a toast to notify players of how they can scroll through their party. Did you know you can hold R and scroll instead of using arrow keys??!
@@ -53,69 +57,40 @@
 - All shipwreck coves' spawners have been adjusted to give compatible mobs enchanted iron or diamond armour and weapons while in its ominous state. The armour given to the mobs will also use the automaton trim. We upped the difficulty because it was too easy now that your Pokémon can fight for you.
 - One TM of the elemental hyper beams has been added as guaranteed loot to the main treasure chest in every shipwreck cove. (Magma cove gets blast burn, lush cove gets frenzy plant, and submerged cove gets hydro cannon)
 - Added 7 new advancements
-- Pressing the inventory key now closes the Pokémon interact wheel GUI
-- Pokémon cries now play when clicking Pokémon in the summary screen.
-- Pressing the Summary key while either the starter selection or summary screen are open now closes those screens
 
 ### New rideable Pokémon
 - Drampa
 - Archeops
-- Skarmory
-- Crobat
-- Goodra
-- Hisuian Goodra
-- Milotic
 
 ### Pokémon Added
+- Pancham (+ Cosmetic with Black Glasses)
+- Pangoro (+ Cosmetic with Black Glasses)
+- Skitty
+- Delcatty
 - Wurmple
 - Silcoon
 - Beautifly
 - Cascoon
 - Dustox
-- Skitty
-- Delcatty
-
-- Seviper
-- Zangoose
-- Cherubi
-- Cherrim
-- Stunky
-- Skuntank
-
 - Audino
-- Pawniard
-- Bisharp
-- Kingambit
-
-- Pancham (+ Cosmetic with Black Glasses)
-- Pangoro (+ Cosmetic with Black Glasses)
-
 - Rockruff
 - Lycanroc
-
-- Rolycoly
-- Carkol
-- Coalossal
-
 - Snom
 - Frosmoth
-
-- Duraludon
-- Archaludon
-
 - Applin
 - Flapple
 - Appletun
 - Dipplin
 - Hydrapple
-
-- Nymble
-- Lokix
-
-#### Regional Forms
 - Sandshrew (Alolan)
 - Sandslash (Alolan)
-- Avalugg (Hisuian)
+- Seviper
+- Zangoose
+- Stunky
+- Skuntank
+- Pawniard
+- Bisharp
+- Kingambit
 
 ### Model updates for the following Pokémon
 - Goomy
@@ -127,77 +102,35 @@
 - Zubat
 - Golbat
 - Crobat
-
-### Model updates for the following Pokémon
-
-- Sandshrew
+- Pidgey
+- Pidgeotto
+- Pidgeot
 - Sandslash
 - Nidoking
-- Zubat
-- Golbat
-- Crobat
-- Porygon
-- Porygon2
-- Porygon-Z
-
-- Skarmory
-- Jynx
-- Popplio
-- Brionne
-- Primarina
-- Fletchling
-- Fletchinder
-- Talonflame
-
 - Sableye
 - Mawile
-
-- Goomy
-- Sliggoo
-- Goodra
-
 - Nacli
-- Naclstack
+- Naclestack
 - Garganacl
-
-#### Model changes to the regional bias resource pack:
-
-- Added Mime Jr. (Galar Bias)
-- Added Bergmite (Hisui Bias)
-- Changed models for every existing regional bias
+- Skarmory
 
 ### Animation updates for the following Pokémon
+- Drampa
+- Archeops
 - Skarmory
-- Skitty
-- Flygon
-- Shellos
 - Riolu
 - Lucario
+- Shellos
+- Skitty
+- Joltik
 - Purrloin
 - Liepard
-- Joltik
-- Galvantula
-- Nidoking
-- Fletchling
-- Fletchinder
-- Talonflame
-- Archeops
-- Drampa
-- Sewaddle
-- Swadloon
-- Leavanny
-- Goomy
-- Sliggoo
-- Goodra
-- Shedinja
-- Skwovet
-- Greedent
+- Flygon
 
 #### Added sounds to the following moves
 - Absorb
 - Aurora Beam
 - Double Team
-- Draco Meteor
 - Fire Punch
 - Fire Spin
 - Flame Charge
@@ -217,19 +150,10 @@
 - Tail Whip
 
 ### Changes
-- Stat increase and decrease particles have been changed, with the addition of alpha boost particles. 
 - Dragonite's mailbag cosmetic can now also be obtained with a chest in the cosmetic slot
-
-### Fixes
-- Adjusted Croagunk's walkspeed
-- Fixed Blitzle's base scale being `1` rather than the intended `0.8`
-- Fixed Magnezone's emissive layer for the shiny having the wrong name, thus displaying wrongly
-- Fixed Litleo not blinking
-- Fixed Garchomp T-posing when sleeping while out of battle.
 - Sharp Beak can now be crafted
 - Metal Alloy can now be crafted
 - Ability Capsules can now be brewed
-- Using an Ability Capsule will now return an Empty Bottle
 - The following items can now be obtained by brushing the following Pokémon:
   - Pink Wool - Wigglytuff
   - White Wool - Swablu, Altaria
@@ -253,41 +177,6 @@
 - Cleaned up seat data. Removed all now unused fields from seats in all species files. Also made locator seat names explicit in the species files (however, this doesn't break the legacy format)
 - Marks can now provide aspects.
 - Added new shiny and Alpha chance configs
-- Apricorns now make a new sound when harvested
-- Lowered the volume of harvesting berries
-- Added alternate versions of the basic PC Wallpapers based on the original design of Cobblemon's PC, before public release
-- Improved compatibility with various mods
-    - Farmer's Delight's cutting board can now be used to strip Apricorn and Saccharine's logs, or salvage their planks from various blocks. It can also separate their boats from chests
-    - Farmer's Delight's cutting board can be used to get two white dye from Pep-Up Flowers and two magenta dye from Medicinal Leeks
-    - Farmer's Delight's cutting board can separate Tumblestone Blocks back into Tumblestones
-    - Farmer's Delight's cutting board can salvage Type Gems from their Gem Blocks
-    - Farmer's Delight's Onions, Tomatoes, and Cabbages can be used to cook Open-Faced Sandwiches. Nature's Spirit's Olives also can be used
-    - Farmer's Delight's cutting board can be used on Hearty Grains to obtain rice and straw, similarly to Farmer's Delight's Rice Panicles
-    - Farmer's Delight's Apple Pies and Apple Ciders can now be made using Applin Apples, alongside the Vanilla counterpart
-    - Amendments allows for cooking Leek and Potato Stew in a Cauldron
-    - Any mods that utilise Moonlight's Soft Fluid system can store Leek and Potato Stew, Medicinal Brew, Antidote, Awakening, Burn Heal, Ice Heal, Paralyze Heal, Full Heal, Potion, Super Potion, Hyper Potion, Max Potion, Full Restore, Ability Capsules, Moomoo Milk, and Berry Juice in liquid form (such as Suplementaries' Jar or Goblet, or Cauldrons while using Amendments)
-    - Supplementaries' Hourglass can now use Bright Powder, Quick Powder, Metal Powder, Heal Powder, Silver Powder, and Remedy
-    - Berry Trees are now compatible with the Planter properly
-    - Saccharine Way Signs (added by Supplementaries automagically) now use a premade texture to prevent odd visual issues
-    - Supplementaries' Jar can now store various Cobblemon cookies, candies, and similar items
-    - Some of Supplementaries' items have been added to the `#cobblemon:held/container_held_items` item tag, including sacks, safes, and lunch baskets
-    - Experience Nuggets can be used in place of Sculk for making the EXP Candies if using Create
-    - Rage Candy Bar has a Create Mixing recipe
-    - All Cobblemon ores can now be crushed in Create's Crushing Wheels
-    - All Gem and Tumblestone Clusters can be crushed for automatic, low return, gems
-    - Hearty Grains can be milled like Farmer's Delight Rice Panicles if both Farmer's Delight and Create are installed
-    - Big Roots and Revival Herbs can be milled to their respective powders
-    - Pep-Up Flowers, Medicinal Leeks, and all 70 berries can be milled in Create's Millstone for additional dye drops
-    - Auspicious Armor and Upgrades can be Haunted using Create's crafting systems
-    - Applin Apples can be used to make Honeyed Apples in Create
-- Golden Apples can now be crafted using the Applin Apples
-- Prismarine Crystals and Amethyst Shards can now be used to craft Pokedexes
-- Updated Pokedex Screens item tag to support tagged variants of Redstone and Glowstone Dust
-- Sounds for interacting with various Cobblemon blocks now play from the center of the block, rather than the corner
-- The `/pc` command no longer plays PC activation sounds
-- Lowered the volume of Blitzle and Zebstrika's cry
-- Fixed Raichu (male) and Alolan Raichu (both genders) not displaying the correct Partner Cap when Pewter Crunchies are in the cosmetic slot.
-- Regional Foods will now prioritize being eaten instead of used for healing Pokémon, shift clicking will use it as healing
 
 ### Fixes
 - Fixed Croagunk's walkspeed
@@ -299,7 +188,6 @@
 - Fixed a compatibility issue with World Game Rules which caused some log spam in specific cases.
 - Fixed improper validation of Pokémon when performing a trade.
 - Fixed an issue where particle like beam can disappear when you don't see the beginning of the beam, or you look away
-- Fixed Bedrock particle materials (alpha/opaque/blend/add) sharing one render batch, which caused incorrect culling on mixed batches; each material now batches and draws with its own blend and cull state, and the alpha material renders as a true cutout
 - Fixed an occasional crash on retrieving revived fossils
 - Fixed brushing not working on Neoforge
 - Fixed braking not working for submarines (whoops).
@@ -326,18 +214,6 @@
 - Fixed Galarian Ponyta missing its cry.
 - Fixed various log warnings caused by redundant files and sound events.
 - Traded Pokémon will now retain the original friendship level when traded back to its OT
-- Clusters now display correctly on maps
-- Fixed removing mulch from berry trees with a shovel not working.
-- Fixed collecting honey from Saccharine Leaf blocks deleting Honey Bottles when the inventory was full
-- Fixed Stripped Saccharine Wood recipe being missing
-- Fixed CancelableSoundInstance causing lag by attempting to create sounds every tick when out of range of hearing
-- Fixed Stat Reducing Aprijuice not being possible to apply on a max out Pokémon, and the possibility of going into negatives
-- Fixed Exploit where you could take out the bait or drop your Pokérod with bait to avoid consuming bait, now the bobber will just disappear if you do so
-- Fixed Apricorn and Saccharine boats incorrectly using chest boat models
-- Fixed wild and trainer battle AI refusing to select moves with the `adjacentAlly` target type, even when it's their only option
-- Fixed Guilded chests being more accessible than intended
-- Fixed fished up Pokémon not being added as "seen" to the Pokedex
-- Fixed surprised Gimmighoul encounters not being added as "seen" to the Pokedex
 
 ### Developer
 - Added `PokeSnackSpawnerFactory` which allows influence registration on PokeSnack encounters
@@ -346,8 +222,6 @@
 - Tweaked the spawning selector interface to take a bucket function rather than a bucket directly.
 - Added a new `cobblemon:height_range` processor type to allow developers to restrict structure-spawning ranges.
 - Separated all the functions of MoLangFunctions.kt into their own files.
-- Spawn buckets and their base weights are now provided by the spawner, with different base weights for world, fishing, snack, and habitat spawn buckets.
-- Removed "SpawnBucket" class in favour of just storing maps of bucket names to weights.
 
 ### Molang & Datapacks
 - Added `moveset_builders` datapack folder for different styles of movesets.
@@ -370,16 +244,8 @@
 - Ride sounds can now be set as exclusive to passengers
 - Ride sounds no longer play when submerged unless specified with a new setting
 - NPC Trainers can now call a `command` animation when issuing a command in battle.
-- Added a q.failed function to move action effects.
-- Herd spawned Pokémon have their levels controlled differently. The `levelRange` property now acts as a clamp instead of a filter, with a new `herdLevelRange` property to do the filter behaviour. 
 
 ### Particles
 
 ### Localization
 - Updated translations for:
-  - Japanese
-  - German
-  - Ecuadorian Spanish
-  - Simplified Chinese
-  - Traditional Chinese
-  - Korean

common/build.gradle.kts

@@ -1,9 +1,9 @@
 
+import utilities.isSnapshot
+import utilities.version
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
-import utilities.isSnapshot
-import utilities.version
 
 /*
  *
@@ -72,10 +72,6 @@ tasks.withType<Test> {
     }
 }
 
-tasks.processResources {
-    exclude("data/**/README.md")
-}
-
 sourceSets {
     main {
         blossom {

common/src/main/java/com/cobblemon/mod/common/mixin/ChannelMixin.java

@@ -6,7 +6,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package com.cobblemon.mod.common.mixin.client;
+package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.duck.ChannelDuck;
 import com.mojang.blaze3d.audio.Channel;

common/src/main/java/com/cobblemon/mod/common/mixin/ClientPacketListenerMixin.java

@@ -20,6 +20,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Objects;
 
 @Mixin(ClientPacketListener.class)

common/src/main/java/com/cobblemon/mod/common/mixin/ServerEntityMixin.java

@@ -139,4 +139,23 @@ public abstract class ServerEntityMixin {
             CobblemonNetwork.INSTANCE.sendPacketToPlayer(player, packet);
         }
     }
+
+    @Inject(method = "sendPairingData", at = @At("TAIL"))
+    private void cobblemon$sendPairingSeatAssignments(
+            ServerPlayer player,
+            Consumer<Packet<ClientGamePacketListener>> consumer,
+            CallbackInfo ci
+    ) {
+        if (!(entity instanceof PokemonEntity pokemon)) return;
+        if (pokemon.getOccupiedSeats().isEmpty()) return;
+
+        pokemon.getOccupiedSeats().forEach((seat, passenger) -> {
+            if (seat.getLocator() == null) return;
+            CobblemonNetwork.INSTANCE.sendPacketToPlayer(
+                    player,
+                    new ClientboundSeatAssignmentPacket(passenger.getId(), pokemon.getId(), seat.getLocator())
+            );
+        });
+    }
+
 }

common/src/main/java/com/cobblemon/mod/common/mixin/accessor/RecipeBookComponentAccessor.java

@@ -10,7 +10,9 @@ package com.cobblemon.mod.common.mixin.accessor;
 
 import net.minecraft.client.gui.components.StateSwitchingButton;
 import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
+import net.minecraft.network.chat.Component;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(RecipeBookComponent.class)

common/src/main/java/com/cobblemon/mod/common/mixin/brewing/BrewingStandBlockEntityMixin.java

@@ -15,9 +15,11 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.Containers;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.item.alchemy.PotionBrewing;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.item.crafting.RecipeManager;
@@ -32,7 +34,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.List;
 import java.util.Optional;
-
 @Mixin(BrewingStandBlockEntity.class)
 public class BrewingStandBlockEntityMixin {
 

common/src/main/java/com/cobblemon/mod/common/mixin/brewing/BrewingStandMenuMixin.java

@@ -9,11 +9,17 @@
 package com.cobblemon.mod.common.mixin.brewing;
 
 import com.cobblemon.mod.common.duck.RecipeAwareSlot;
+import com.cobblemon.mod.common.item.crafting.brewingstand.BrewingStandRecipe;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.world.Container;
 import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.BrewingStandMenu;
 import net.minecraft.world.inventory.ContainerData;
 import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

common/src/main/java/com/cobblemon/mod/common/mixin/brewing/PotionSlotMixin.java

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.item.crafting.brewingstand.BrewingStandRecipe;
 import net.minecraft.world.inventory.BrewingStandMenu;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeManager;
+import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;

common/src/main/java/com/cobblemon/mod/common/mixin/client/CameraMixin.java

@@ -19,6 +19,7 @@ import net.minecraft.client.Camera;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.phys.Vec3;
+import org.joml.Quaternionf;
 import org.joml.Vector3f;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;

common/src/main/java/com/cobblemon/mod/common/mixin/client/ClientRecipeBookMixin.java

@@ -10,7 +10,9 @@ package com.cobblemon.mod.common.mixin.client;
 
 import com.cobblemon.mod.common.CobblemonRecipeCategories;
 import com.cobblemon.mod.common.item.crafting.CookingPotBookCategory;
+import com.cobblemon.mod.common.item.crafting.CookingPotRecipe;
 import com.cobblemon.mod.common.item.crafting.CookingPotRecipeBase;
+import com.cobblemon.mod.common.item.crafting.CookingPotShapelessRecipe;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;

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

@@ -93,14 +93,16 @@ import com.cobblemon.mod.common.events.StatHandler
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
 import com.cobblemon.mod.common.permission.LaxPermissionValidator
 import com.cobblemon.mod.common.platform.events.PlatformEvents
+import com.cobblemon.mod.common.api.pokedex.scan.BlockScanProviderRegistry
+import com.cobblemon.mod.common.pokedex.scanner.block.BerryBlockScanProvider
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.pokemon.aspects.ALPHA_ASPECT
 import com.cobblemon.mod.common.pokemon.aspects.CHARACTERISTIC_RAINBOW_ASPECT
 import com.cobblemon.mod.common.pokemon.aspects.COSMETIC_SLOT_ASPECT
-import com.cobblemon.mod.common.pokemon.aspects.FORM_ASPECTS
 import com.cobblemon.mod.common.pokemon.aspects.GENDER_ASPECT
 import com.cobblemon.mod.common.pokemon.aspects.MARK_ASPECT
 import com.cobblemon.mod.common.pokemon.aspects.SHINY_ASPECT
+import com.cobblemon.mod.common.pokemon.evolution.variants.BlockClickEvolution
 import com.cobblemon.mod.common.pokemon.feature.SlowpokeTailRegrowthSpeciesFeature
 import com.cobblemon.mod.common.pokemon.feature.SlowpokeTailRegrowthSpeciesFeatureProvider
 import com.cobblemon.mod.common.pokemon.feature.TagSeasonResolver
@@ -114,7 +116,6 @@ import com.cobblemon.mod.common.pokemon.properties.NoAIProperty
 import com.cobblemon.mod.common.pokemon.properties.UnaspectPropertyType
 import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
-import com.cobblemon.mod.common.pokemon.transformation.triggers.BlockClickTrigger
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
 import com.cobblemon.mod.common.util.*
 import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
@@ -273,8 +274,13 @@ object Cobblemon {
         PlatformEvents.RIGHT_CLICK_BLOCK.subscribe { event ->
             val player = event.player
             val block = player.level().getBlockState(event.pos).block
-            val context = BlockClickTrigger.Context(block, player.level())
-            player.party().forEach { pokemon -> pokemon.triggerTransformations<BlockClickTrigger>(context) }
+            player.party().forEach { pokemon ->
+                pokemon.lockedEvolutions
+                    .filterIsInstance<BlockClickEvolution>()
+                    .forEach { evolution ->
+                        evolution.attemptEvolution(pokemon, BlockClickEvolution.BlockInteractionContext(block, player.level()))
+                    }
+            }
         }
 
         PlatformEvents.CHANGE_DIMENSION.subscribe {
@@ -316,7 +322,6 @@ object Cobblemon {
 
         SHINY_ASPECT.register()
         GENDER_ASPECT.register()
-        FORM_ASPECTS.register()
         COSMETIC_SLOT_ASPECT.register()
         CHARACTERISTIC_RAINBOW_ASPECT.register()
         ALPHA_ASPECT.register()
@@ -348,6 +353,8 @@ object Cobblemon {
 
         CobblemonEvents.POKEMON_PROPERTY_INITIALISED.emit(Unit)
 
+        BlockScanProviderRegistry.register(cobblemonResource("berry"), BerryBlockScanProvider)
+
         CallbackHandler.setup()
         EntityCallbackHandler.setup()
 

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

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common
 
 import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.CobblemonBehaviours.autoPokemonBehaviours
 import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
 import com.cobblemon.mod.common.api.ai.CobblemonBehaviour
 import com.cobblemon.mod.common.api.ai.config.BehaviourConfig
@@ -20,7 +19,16 @@ import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.net.messages.client.data.BehaviourSyncPacket
-import com.cobblemon.mod.common.util.adapters.*
+import com.cobblemon.mod.common.util.adapters.ActivityAdapter
+import com.cobblemon.mod.common.util.adapters.BehaviourConfigAdapter
+import com.cobblemon.mod.common.util.adapters.ExpressionAdapter
+import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
+import com.cobblemon.mod.common.util.adapters.ExpressionOrEntityVariableAdapter
+import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
+import com.cobblemon.mod.common.util.adapters.MemoryModuleTypeAdapter
+import com.cobblemon.mod.common.util.adapters.SensorTypeAdapter
+import com.cobblemon.mod.common.util.adapters.TaskConfigAdapter
+import com.cobblemon.mod.common.util.adapters.TranslatedTextAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.endsWith
 import com.google.gson.Gson

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

@@ -255,31 +255,31 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val POKE_SNACK = this.create("poke_snack", PokeSnackBlock(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY).lightLevel { if (it.getValue(BlockStateProperties.LIT)) 3 else 0 }, true))
 
     @JvmField
-    val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null, MapColor.TERRACOTTA_ORANGE)
+    val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null)
     @JvmField
-    val LARGE_BUDDING_TUMBLESTONE = tumblestoneBlock("large_budding_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, TUMBLESTONE_CLUSTER, MapColor.TERRACOTTA_ORANGE)
+    val LARGE_BUDDING_TUMBLESTONE = tumblestoneBlock("large_budding_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, TUMBLESTONE_CLUSTER)
     @JvmField
-    val MEDIUM_BUDDING_TUMBLESTONE = tumblestoneBlock("medium_budding_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_TUMBLESTONE, MapColor.TERRACOTTA_ORANGE)
+    val MEDIUM_BUDDING_TUMBLESTONE = tumblestoneBlock("medium_budding_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_TUMBLESTONE)
     @JvmField
-    val SMALL_BUDDING_TUMBLESTONE = tumblestoneBlock("small_budding_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_TUMBLESTONE, MapColor.TERRACOTTA_ORANGE)
+    val SMALL_BUDDING_TUMBLESTONE = tumblestoneBlock("small_budding_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_TUMBLESTONE)
 
     @JvmField
-    val SKY_TUMBLESTONE_CLUSTER = tumblestoneBlock("sky_tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null, MapColor.COLOR_LIGHT_BLUE)
+    val SKY_TUMBLESTONE_CLUSTER = tumblestoneBlock("sky_tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null)
     @JvmField
-    val LARGE_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("large_budding_sky_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, SKY_TUMBLESTONE_CLUSTER, MapColor.COLOR_LIGHT_BLUE)
+    val LARGE_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("large_budding_sky_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, SKY_TUMBLESTONE_CLUSTER)
     @JvmField
-    val MEDIUM_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("medium_budding_sky_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_SKY_TUMBLESTONE, MapColor.COLOR_LIGHT_BLUE)
+    val MEDIUM_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("medium_budding_sky_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_SKY_TUMBLESTONE)
     @JvmField
-    val SMALL_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("small_budding_sky_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_SKY_TUMBLESTONE, MapColor.COLOR_LIGHT_BLUE)
+    val SMALL_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("small_budding_sky_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_SKY_TUMBLESTONE)
 
     @JvmField
-    val BLACK_TUMBLESTONE_CLUSTER = tumblestoneBlock("black_tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null, MapColor.TERRACOTTA_BLACK)
+    val BLACK_TUMBLESTONE_CLUSTER = tumblestoneBlock("black_tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null)
     @JvmField
-    val LARGE_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("large_budding_black_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, BLACK_TUMBLESTONE_CLUSTER, MapColor.TERRACOTTA_BLACK)
+    val LARGE_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("large_budding_black_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, BLACK_TUMBLESTONE_CLUSTER)
     @JvmField
-    val MEDIUM_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("medium_budding_black_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_BLACK_TUMBLESTONE, MapColor.TERRACOTTA_BLACK)
+    val MEDIUM_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("medium_budding_black_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_BLACK_TUMBLESTONE)
     @JvmField
-    val SMALL_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("small_budding_black_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_BLACK_TUMBLESTONE, MapColor.TERRACOTTA_BLACK)
+    val SMALL_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("small_budding_black_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_BLACK_TUMBLESTONE)
 
     @JvmField
     val TUMBLESTONE_BLOCK = this.create("tumblestone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
@@ -289,85 +289,85 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val BLACK_TUMBLESTONE_BLOCK = this.create("black_tumblestone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
 
     @JvmField
-    val TYPE_GEM_CORE = this.create("deepslate_crystal_core", TypeGemCoreBlock(BlockBehaviour.Properties.of().strength(4.0F, 10.0F).requiresCorrectToolForDrops().mapColor(MapColor.DEEPSLATE)))
+    val TYPE_GEM_CORE = this.create("deepslate_crystal_core", TypeGemCoreBlock(BlockBehaviour.Properties.of().strength(4.0F, 10.0F).requiresCorrectToolForDrops()))
 
     private val typeGemBlocks = mutableMapOf<ResourceLocation, Block>()
 
     @JvmField
-    val TYPE_GEM_BLOCK_NORMAL = typeGemBlock("normal_gem_block", MapColor.QUARTZ)
+    val TYPE_GEM_BLOCK_NORMAL = typeGemBlock("normal_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_FIRE = typeGemBlock("fire_gem_block", MapColor.FIRE)
+    val TYPE_GEM_BLOCK_FIRE = typeGemBlock("fire_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_WATER = typeGemBlock("water_gem_block", MapColor.WATER)
+    val TYPE_GEM_BLOCK_WATER = typeGemBlock("water_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_GRASS = typeGemBlock("grass_gem_block", MapColor.COLOR_LIGHT_GREEN)
+    val TYPE_GEM_BLOCK_ELECTRIC = typeGemBlock("electric_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_ELECTRIC = typeGemBlock("electric_gem_block", MapColor.GOLD)
+    val TYPE_GEM_BLOCK_GRASS = typeGemBlock("grass_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_ICE = typeGemBlock("ice_gem_block", MapColor.ICE)
+    val TYPE_GEM_BLOCK_ICE = typeGemBlock("ice_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_FIGHTING = typeGemBlock("fighting_gem_block", MapColor.COLOR_RED)
+    val TYPE_GEM_BLOCK_FIGHTING = typeGemBlock("fighting_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_POISON = typeGemBlock("poison_gem_block", MapColor.COLOR_PURPLE)
+    val TYPE_GEM_BLOCK_POISON = typeGemBlock("poison_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_GROUND = typeGemBlock("ground_gem_block", MapColor.PODZOL)
+    val TYPE_GEM_BLOCK_GROUND = typeGemBlock("ground_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_FLYING = typeGemBlock("flying_gem_block", MapColor.COLOR_LIGHT_BLUE)
+    val TYPE_GEM_BLOCK_FLYING = typeGemBlock("flying_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_PSYCHIC = typeGemBlock("psychic_gem_block", MapColor.COLOR_MAGENTA)
+    val TYPE_GEM_BLOCK_PSYCHIC = typeGemBlock("psychic_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_BUG = typeGemBlock("bug_gem_block", MapColor.TERRACOTTA_LIGHT_GREEN)
+    val TYPE_GEM_BLOCK_BUG = typeGemBlock("bug_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_ROCK = typeGemBlock("rock_gem_block", MapColor.TERRACOTTA_LIGHT_GRAY)
+    val TYPE_GEM_BLOCK_ROCK = typeGemBlock("rock_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_GHOST = typeGemBlock("ghost_gem_block", MapColor.TERRACOTTA_MAGENTA)
+    val TYPE_GEM_BLOCK_GHOST = typeGemBlock("ghost_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_DRAGON = typeGemBlock("dragon_gem_block", MapColor.COLOR_BLUE)
+    val TYPE_GEM_BLOCK_DRAGON = typeGemBlock("dragon_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_DARK = typeGemBlock("dark_gem_block", MapColor.TERRACOTTA_BLACK)
+    val TYPE_GEM_BLOCK_DARK = typeGemBlock("dark_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_STEEL = typeGemBlock("steel_gem_block", MapColor.METAL)
+    val TYPE_GEM_BLOCK_STEEL = typeGemBlock("steel_gem_block")
     @JvmField
-    val TYPE_GEM_BLOCK_FAIRY = typeGemBlock("fairy_gem_block", MapColor.COLOR_PINK)
+    val TYPE_GEM_BLOCK_FAIRY = typeGemBlock("fairy_gem_block")
 
     private val typeGemClusters = mutableMapOf<ResourceLocation, TypeGemClusterBlock>()
 
     @JvmField
-    val TYPE_GEM_CLUSTER_NORMAL = typeGemCluster("normal_gem_cluster", TYPE_GEM_BLOCK_NORMAL, cobblemonResource("normal_gem"), MapColor.QUARTZ)
+    val TYPE_GEM_CLUSTER_NORMAL = typeGemCluster("normal_gem_cluster", TYPE_GEM_BLOCK_NORMAL, cobblemonResource("normal_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_FIRE = typeGemCluster("fire_gem_cluster", TYPE_GEM_BLOCK_FIRE, cobblemonResource("fire_gem"), MapColor.FIRE)
+    val TYPE_GEM_CLUSTER_FIRE = typeGemCluster("fire_gem_cluster", TYPE_GEM_BLOCK_FIRE, cobblemonResource("fire_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_WATER = typeGemCluster("water_gem_cluster", TYPE_GEM_BLOCK_WATER, cobblemonResource("water_gem"), MapColor.WATER)
+    val TYPE_GEM_CLUSTER_WATER = typeGemCluster("water_gem_cluster", TYPE_GEM_BLOCK_WATER, cobblemonResource("water_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_GRASS = typeGemCluster("grass_gem_cluster", TYPE_GEM_BLOCK_GRASS, cobblemonResource("grass_gem"), MapColor.COLOR_LIGHT_GREEN)
+    val TYPE_GEM_CLUSTER_ELECTRIC = typeGemCluster("electric_gem_cluster", TYPE_GEM_BLOCK_ELECTRIC, cobblemonResource("electric_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_ELECTRIC = typeGemCluster("electric_gem_cluster", TYPE_GEM_BLOCK_ELECTRIC, cobblemonResource("electric_gem"), MapColor.GOLD)
+    val TYPE_GEM_CLUSTER_GRASS = typeGemCluster("grass_gem_cluster", TYPE_GEM_BLOCK_GRASS, cobblemonResource("grass_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_ICE = typeGemCluster("ice_gem_cluster", TYPE_GEM_BLOCK_ICE, cobblemonResource("ice_gem"), MapColor.ICE)
+    val TYPE_GEM_CLUSTER_ICE = typeGemCluster("ice_gem_cluster", TYPE_GEM_BLOCK_ICE, cobblemonResource("ice_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_FIGHTING = typeGemCluster("fighting_gem_cluster", TYPE_GEM_BLOCK_FIGHTING, cobblemonResource("fighting_gem"), MapColor.COLOR_RED)
+    val TYPE_GEM_CLUSTER_FIGHTING = typeGemCluster("fighting_gem_cluster", TYPE_GEM_BLOCK_FIGHTING, cobblemonResource("fighting_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_POISON = typeGemCluster("poison_gem_cluster", TYPE_GEM_BLOCK_POISON, cobblemonResource("poison_gem"), MapColor.COLOR_PURPLE)
+    val TYPE_GEM_CLUSTER_POISON = typeGemCluster("poison_gem_cluster", TYPE_GEM_BLOCK_POISON, cobblemonResource("poison_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_GROUND = typeGemCluster("ground_gem_cluster", TYPE_GEM_BLOCK_GROUND, cobblemonResource("ground_gem"), MapColor.PODZOL)
+    val TYPE_GEM_CLUSTER_GROUND = typeGemCluster("ground_gem_cluster", TYPE_GEM_BLOCK_GROUND, cobblemonResource("ground_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_FLYING = typeGemCluster("flying_gem_cluster", TYPE_GEM_BLOCK_FLYING, cobblemonResource("flying_gem"), MapColor.COLOR_LIGHT_BLUE)
+    val TYPE_GEM_CLUSTER_FLYING = typeGemCluster("flying_gem_cluster", TYPE_GEM_BLOCK_FLYING, cobblemonResource("flying_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_PSYCHIC = typeGemCluster("psychic_gem_cluster", TYPE_GEM_BLOCK_PSYCHIC, cobblemonResource("psychic_gem"), MapColor.COLOR_MAGENTA)
+    val TYPE_GEM_CLUSTER_PSYCHIC = typeGemCluster("psychic_gem_cluster", TYPE_GEM_BLOCK_PSYCHIC, cobblemonResource("psychic_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_BUG = typeGemCluster("bug_gem_cluster", TYPE_GEM_BLOCK_BUG, cobblemonResource("bug_gem"), MapColor.TERRACOTTA_LIGHT_GREEN)
+    val TYPE_GEM_CLUSTER_BUG = typeGemCluster("bug_gem_cluster", TYPE_GEM_BLOCK_BUG, cobblemonResource("bug_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_ROCK = typeGemCluster("rock_gem_cluster", TYPE_GEM_BLOCK_ROCK, cobblemonResource("rock_gem"), MapColor.TERRACOTTA_LIGHT_GRAY)
+    val TYPE_GEM_CLUSTER_ROCK = typeGemCluster("rock_gem_cluster", TYPE_GEM_BLOCK_ROCK, cobblemonResource("rock_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_GHOST = typeGemCluster("ghost_gem_cluster", TYPE_GEM_BLOCK_GHOST, cobblemonResource("ghost_gem"), MapColor.TERRACOTTA_MAGENTA)
+    val TYPE_GEM_CLUSTER_GHOST = typeGemCluster("ghost_gem_cluster", TYPE_GEM_BLOCK_GHOST, cobblemonResource("ghost_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_DRAGON = typeGemCluster("dragon_gem_cluster", TYPE_GEM_BLOCK_DRAGON, cobblemonResource("dragon_gem"), MapColor.COLOR_BLUE)
+    val TYPE_GEM_CLUSTER_DRAGON = typeGemCluster("dragon_gem_cluster", TYPE_GEM_BLOCK_DRAGON, cobblemonResource("dragon_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_DARK = typeGemCluster("dark_gem_cluster", TYPE_GEM_BLOCK_DARK, cobblemonResource("dark_gem"), MapColor.TERRACOTTA_BLACK)
+    val TYPE_GEM_CLUSTER_DARK = typeGemCluster("dark_gem_cluster", TYPE_GEM_BLOCK_DARK, cobblemonResource("dark_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_STEEL = typeGemCluster("steel_gem_cluster", TYPE_GEM_BLOCK_STEEL, cobblemonResource("steel_gem"), MapColor.METAL)
+    val TYPE_GEM_CLUSTER_STEEL = typeGemCluster("steel_gem_cluster", TYPE_GEM_BLOCK_STEEL, cobblemonResource("steel_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_FAIRY = typeGemCluster("fairy_gem_cluster", TYPE_GEM_BLOCK_FAIRY, cobblemonResource("fairy_gem"), MapColor.COLOR_PINK)
+    val TYPE_GEM_CLUSTER_FAIRY = typeGemCluster("fairy_gem_cluster", TYPE_GEM_BLOCK_FAIRY, cobblemonResource("fairy_gem"))
 
     @JvmField
     val POLISHED_TUMBLESTONE = this.create("polished_tumblestone", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
@@ -558,7 +558,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val RELIC_COIN_POUCH = create("relic_coin_pouch", CoinPouchBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.RELIC_COIN_POUCH_SOUNDS).pushReaction(PushReaction.DESTROY).noOcclusion(), true))
     @JvmField
-    val RELIC_COIN_SACK = create("relic_coin_sack", CoinPouchBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.RELIC_COIN_SACK_SOUNDS).pushReaction(PushReaction.DESTROY).strength(0.4F).mapColor(MapColor.GOLD), false))
+    val RELIC_COIN_SACK = create("relic_coin_sack", CoinPouchBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.RELIC_COIN_SACK_SOUNDS).pushReaction(PushReaction.DESTROY).strength(0.4F), false))
 
     @JvmField
     val GILDED_CHEST = create("gilded_chest", GildedChestBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS), GildedChestBlock.Type.RED))
@@ -777,9 +777,8 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
 
     private fun apricornBlock(name: String, apricorn: Apricorn): ApricornBlock = this.create(name, ApricornBlock(BlockBehaviour.Properties.of().mapColor(apricorn.mapColor()).randomTicks().strength(Blocks.OAK_LOG.defaultDestroyTime(), Blocks.OAK_LOG.explosionResistance).sound(SoundType.WOOD).noOcclusion(), apricorn))
 
-    private fun tumblestoneBlock(name: String, stage: Int, height: Int, xzOffset: Int, nextStage: Block?, mapColor: MapColor) : Block {
+    private fun tumblestoneBlock(name: String, stage: Int, height: Int, xzOffset: Int, nextStage: Block?) : Block {
         return this.create(name, TumblestoneBlock(BlockBehaviour.Properties.of()
-            .mapColor(mapColor)
             .pushReaction(PushReaction.DESTROY)
             .noOcclusion()
             .strength(1.5F)
@@ -1009,8 +1008,8 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
         return this.create(name, block)
     }
 
-    private fun typeGemBlock(name: String, mapColor: MapColor): Block {
-        val typeGemBlock = this.create(name, Block(BlockBehaviour.Properties.of().mapColor(mapColor).strength(3.0F, 6.0F).sound(CobblemonSounds.TYPE_GEM_BLOCK_SOUNDS)))
+    private fun typeGemBlock(name: String): Block {
+        val typeGemBlock = this.create(name, Block(BlockBehaviour.Properties.of().strength(3.0F, 6.0F).sound(CobblemonSounds.TYPE_GEM_BLOCK_SOUNDS)))
 
         val identifier = cobblemonResource(name)
         typeGemBlocks[identifier] = typeGemBlock
@@ -1020,8 +1019,8 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
 
     fun typeGemBlocks() = typeGemBlocks.toMap()
 
-    private fun typeGemCluster(name: String, gemBlock: Block, dropItemId: ResourceLocation, mapColor: MapColor): Block {
-        val gemClusterBlock = this.create(name, TypeGemClusterBlock(BlockBehaviour.Properties.of().mapColor(mapColor).strength(2.0F, 3.0F).sound(CobblemonSounds.TYPE_GEM_CLUSTER_SOUNDS).pushReaction(PushReaction.DESTROY), gemBlock, dropItemId))
+    private fun typeGemCluster(name: String, gemBlock: Block, dropItemId: ResourceLocation): Block {
+        val gemClusterBlock = this.create(name, TypeGemClusterBlock(BlockBehaviour.Properties.of().strength(2.0F, 3.0F).sound(CobblemonSounds.TYPE_GEM_CLUSTER_SOUNDS).pushReaction(PushReaction.DESTROY), gemBlock, dropItemId))
 
         TypeGemClusterBlock.gemToClusterMap[gemBlock] = gemClusterBlock
 
@@ -1032,4 +1031,4 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     }
 
     fun typeGemClusters() = typeGemClusters.toMap()
-}
+}

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

@@ -19,6 +19,7 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.server.packs.resources.PreparableReloadListener
 import net.minecraft.tags.TagKey
+import net.minecraft.world.inventory.MenuType
 import net.minecraft.world.level.GameRules
 import net.minecraft.world.level.ItemLike
 import net.minecraft.world.level.biome.Biome

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

@@ -15,12 +15,12 @@ import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.ListCodec
 import com.mojang.serialization.codecs.PrimitiveCodec
-import java.util.Optional
-import java.util.UUID
 import net.minecraft.core.BlockPos
+import net.minecraft.core.GlobalPos
 import net.minecraft.core.UUIDUtil
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import java.util.*
 
 object CobblemonMemories {
     val memories = mutableMapOf<String, MemoryModuleType<*>>()

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

@@ -106,9 +106,6 @@ import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.Add
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClearEvolutionsPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClientboundSeatAssignmentPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.RemoveEvolutionPacket
-import com.cobblemon.mod.common.net.messages.client.pokemon.update.form.AddFormPacket
-import com.cobblemon.mod.common.net.messages.client.pokemon.update.form.ClearFormsPacket
-import com.cobblemon.mod.common.net.messages.client.pokemon.update.form.RemoveFormPacket
 import com.cobblemon.mod.common.net.messages.client.settings.OpenCobblemonConfigScreenPacket
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
 import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
@@ -194,8 +191,6 @@ import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetItemHidden
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetMarkingsPacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetNicknamePacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
-import com.cobblemon.mod.common.net.messages.server.pokemon.update.form.AcceptFormPacket
-import com.cobblemon.mod.common.net.messages.server.pokemon.update.form.RevertFormPacket
 import com.cobblemon.mod.common.net.messages.server.riding.DismountPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateDriverInputPacket
 import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdatePassengerPositionPacket
@@ -213,11 +208,9 @@ import com.cobblemon.mod.common.net.messages.server.trade.ChangeTradeAcceptanceP
 import com.cobblemon.mod.common.net.messages.server.trade.OfferTradePacket
 import com.cobblemon.mod.common.net.messages.server.trade.PerformTradePacket
 import com.cobblemon.mod.common.net.messages.server.trade.UpdateTradeOfferPacket
-import com.cobblemon.mod.common.net.serverhandling.AcceptFormHandler
 import com.cobblemon.mod.common.net.serverhandling.ChallengeHandler
 import com.cobblemon.mod.common.net.serverhandling.ChallengeResponseHandler
 import com.cobblemon.mod.common.net.serverhandling.RequestInteractionsHandler
-import com.cobblemon.mod.common.net.serverhandling.RevertFormHandler
 import com.cobblemon.mod.common.net.serverhandling.battle.BattleSelectActionsHandler
 import com.cobblemon.mod.common.net.serverhandling.battle.RemoveSpectatorHandler
 import com.cobblemon.mod.common.net.serverhandling.battle.SpectateBattleHandler
@@ -508,11 +501,6 @@ object CobblemonNetwork {
         // Pokédex scanning
         list.add(PacketRegisterInfo(ServerConfirmedRegisterPacket.ID, ServerConfirmedRegisterPacket::decode, ServerConfirmedRegisterHandler))
 
-        // Form packets
-        list.add(PacketRegisterInfo(AddFormPacket.ID, AddFormPacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(ClearFormsPacket.ID, ClearFormsPacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(RemoveFormPacket.ID, RemoveFormPacket::decode, PokemonUpdatePacketHandler()))
-
         // Riding
         list.add(PacketRegisterInfo(ClientboundUpdateRidingStatePacket.ID, ClientboundUpdateRidingStatePacket::decode, ClientboundUpdateRidingStateHandler))
         list.add(PacketRegisterInfo(ClientboundUpdateDriverInputPacket.ID, ClientboundUpdateDriverInputPacket::decode, ClientboundUpdateDriverInputHandler))
@@ -628,10 +616,6 @@ object CobblemonNetwork {
         // NPC packets
         list.add(PacketRegisterInfo(SaveNPCPacket.ID, SaveNPCPacket::decode, SaveNPCHandler))
 
-        // Form Packets
-        list.add(PacketRegisterInfo(AcceptFormPacket.ID, AcceptFormPacket::decode, AcceptFormHandler))
-        list.add(PacketRegisterInfo(RevertFormPacket.ID, RevertFormPacket::decode, RevertFormHandler))
-
         // Riding packet(s)
         list.add(PacketRegisterInfo(ServerboundUpdateOrientationPacket.ID, ServerboundUpdateOrientationPacket::decode, ServerboundUpdateOrientationHandler))
         list.add(PacketRegisterInfo(ServerboundUpdateRidingStatePacket.ID, ServerboundUpdateRidingStatePacket::decode, ServerboundUpdateRidingStateHandler))

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

@@ -9,9 +9,9 @@
 package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.entity.pokemon.ai.sensors.*
+import com.cobblemon.mod.common.pokemon.ai.PokemonDisturbancesSensor
 import com.cobblemon.mod.common.entity.sensor.BattlingPokemonSensor
 import com.cobblemon.mod.common.entity.sensor.NPCBattlingSensor
-import com.cobblemon.mod.common.pokemon.ai.PokemonDisturbancesSensor
 import java.util.function.Supplier
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.ai.sensing.Sensor

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

@@ -108,9 +108,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val LEVELUP = this.create("gui.levelup")
 
-    @JvmField
-    val MOVE_LEARN = this.create("gui.move_learn")
-
     @JvmField
     val PVN_BATTLE = this.create("battle.pvn.default")
     @JvmField
@@ -145,8 +142,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val MONITOR_INSERT = this.create("block.monitor.insert")
     @JvmField
     val MONITOR_LOADING = this.create("block.monitor.loading")
-    @JvmField
-    val MONITOR_GLITCHING = this.create("block.monitor.glitching")
 
     @JvmField
     val FOSSIL_MACHINE_ACTIVATE = this.create("block.fossil_machine.activate")
@@ -215,23 +210,17 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val TM_USE = this.create("item.tm.use")
     @JvmField
-    val TM_MACHINE_BURN_LOOP = this.create("block.tm_machine.burn_loop")
-    @JvmField
     val TM_MACHINE_CRAFT = this.create("block.tm_machine.craft")
     @JvmField
-    val TM_MACHINE_START = this.create("block.tm_machine.start")
+    val TM_MACHINE_OFF = this.create("block.tm_machine.off")
+    @JvmField
+    val TM_MACHINE_ON = this.create("block.tm_machine.on")
     @JvmField
     val TM_MACHINE_OPEN = this.create("block.tm_machine.open")
     @JvmField
     val TM_MACHINE_CLOSE = this.create("block.tm_machine.close")
     @JvmField
-    val TM_MACHINE_TM_INSERT = this.create("block.tm_machine.tm_insert")
-    @JvmField
-    val TM_MACHINE_TM_RETRIEVE = this.create("block.tm_machine.tm_retrieve")
-    @JvmField
-    val TM_MACHINE_ITEM_INSERT = this.create("block.tm_machine.item_insert")
-    @JvmField
-    val TM_MACHINE_ITEM_RETRIEVE = this.create("block.tm_machine.item_retrieve")
+    val TM_MACHINE_PLACE_DISC = this.create("block.tm_machine.place_disc")
 
 
     @JvmField
@@ -272,9 +261,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val BERRY_EAT_FULL = this.create("item.berry.eat.full")
 
-    @JvmField
-    val APRICORN_HARVEST = this.create("block.apricorn.harvest")
-
     @JvmField
     val BIG_ROOT_BREAK = this.create("block.big_root.break")
     @JvmField
@@ -422,9 +408,9 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     )
 
     @JvmField
-    val TYPE_GEM_BLOCK_BREAK = this.create("block.type_gem_block.break")
+    val TYPE_GEM_BLOCK_BREAK = this.create("block.type_gem_cluster.break")
     @JvmField
-    val TYPE_GEM_CLUSTER_BREAK = this.create("block.type_gem_cluster.break")
+    val TYPE_GEM_CLUSTER_BREAK = this.create("block.type_gem_block.break")
     @JvmField
     val TYPE_GEM_BLOCK_HIT = this.create("block.type_gem_block.hit")
     @JvmField
@@ -433,7 +419,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val TYPE_GEM_BLOCK_STEP = this.create("block.type_gem_block.step")
 
     @JvmField
-    val TYPE_GEM_CLUSTER_SOUNDS = SoundType(1f, 1.1f,
+    val TYPE_GEM_CLUSTER_SOUNDS = SoundType(1f, 1.2f,
         TYPE_GEM_CLUSTER_BREAK,
         TYPE_GEM_BLOCK_STEP,
         TYPE_GEM_BLOCK_PLACE,

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

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common
 
-import java.util.Optional
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.util.RandomSource
 import net.minecraft.world.entity.Entity
@@ -19,6 +18,7 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
 import net.minecraft.world.item.trading.ItemCost
 import net.minecraft.world.item.trading.MerchantOffer
+import java.util.Optional
 
 /**
  * A generator for various trade offers in the mod.

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/AspectCriterion.kt

@@ -11,10 +11,10 @@ package com.cobblemon.mod.common.advancement.criterion
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.RecordCodecBuilder
-import java.util.Optional
 import net.minecraft.advancements.critereon.ContextAwarePredicate
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
+import java.util.Optional
 
 class AspectCriterion(
     playerCtx: Optional<ContextAwarePredicate>,

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/CastPokeRodCriterionCondition.kt

@@ -14,8 +14,8 @@ import com.mojang.serialization.codecs.RecordCodecBuilder
 import java.util.Optional
 import net.minecraft.advancements.critereon.ContextAwarePredicate
 import net.minecraft.advancements.critereon.EntityPredicate
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
+import net.minecraft.resources.ResourceLocation
 
 class CastPokeRodContext(val baitId: ResourceLocation)
 

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/CatchPokemonCriterion.kt

@@ -10,10 +10,10 @@ package com.cobblemon.mod.common.advancement.criterion
 
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.RecordCodecBuilder
-import java.util.Optional
 import net.minecraft.advancements.critereon.ContextAwarePredicate
 import net.minecraft.advancements.critereon.EntityPredicate
 import net.minecraft.server.level.ServerPlayer
+import java.util.Optional
 
 /**
  * A context that is used when you require a [CountableContext] along with some type string.

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/ReelInPokemonCriterionCondition.kt

@@ -14,8 +14,8 @@ import com.mojang.serialization.codecs.RecordCodecBuilder
 import java.util.Optional
 import net.minecraft.advancements.critereon.ContextAwarePredicate
 import net.minecraft.advancements.critereon.EntityPredicate
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
+import net.minecraft.resources.ResourceLocation
 
 class ReelInPokemonContext(val species : ResourceLocation, val baitId: ResourceLocation)
 

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/RidingStatBoostCriterion.kt

@@ -48,7 +48,7 @@ class RidingStatBoostCriterion(
                     val max = context.pokemon.pokemon.getMaxRideBoost(rideStat).toDouble()
                     val min = context.pokemon.pokemon.getBaseRideStat(rideStat).toDouble()
                     val value = context.pokemon.getRideStat(rideStat, ridingStyle, min, max)
-                    val isSufficient = (value >= this.statValue && this.statValue > 0.0) || !context.pokemon.pokemon.canApplyRideBoost(rideStat)
+                    val isSufficient = (value >= this.statValue && this.statValue > 0.0) || !context.pokemon.pokemon.canAddRideBoost(rideStat)
                     if (isSufficient && this.rideStat == "any") {
                         return true
                     } else if (!isSufficient && this.rideStat == "all") {

common/src/main/kotlin/com/cobblemon/mod/common/api/abilities/AbilityTemplate.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.abilities
 
 import com.cobblemon.mod.common.api.Priority
-import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
 import com.cobblemon.mod.common.util.codec.CodecUtils
 import com.google.gson.JsonObject
 import com.mojang.serialization.Codec
@@ -26,7 +25,7 @@ class AbilityTemplate(
     var builder: (AbilityTemplate, forced: Boolean, priority: Priority) -> Ability = { template, forced, priority -> Ability(template, forced, priority) },
     val displayName: String = "cobblemon.ability.$name",
     val description: String = "cobblemon.ability.$name.desc"
-) : ShowdownIdentifiable {
+) {
     /**
      * Returns the Ability or if applicable the extension connected to this template
      */
@@ -46,8 +45,6 @@ class AbilityTemplate(
      */
     fun create(json: JsonObject) = create().loadFromJSON(json)
 
-    override fun showdownId(): String = ShowdownIdentifiable.REGEX.replace(this.name.lowercase(), "")
-
     companion object {
 
         @JvmStatic

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/BehaviourConfigurationContext.kt

@@ -18,6 +18,7 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.api.scripting.CobblemonScripts
 import com.cobblemon.mod.common.entity.MoLangScriptingEntity
 import com.cobblemon.mod.common.util.activityRegistry
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/CobblemonBehaviour.kt

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.api.ai.config.BehaviourConfig
 import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
+import com.cobblemon.mod.common.api.scripting.CobblemonScripts
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.resolve
 import com.cobblemon.mod.common.util.withQueryValue

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/CobblemonWanderControl.kt

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.util.getBooleanOrNull
 import com.cobblemon.mod.common.util.getDoubleOrNull
 import kotlin.math.sqrt
 import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.PathfinderMob
 
 /**
  * Used to maintain some settings around how the entity should wander this tick. The idea is you

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/BehaviourConfig.kt

@@ -8,12 +8,16 @@
 
 package com.cobblemon.mod.common.api.ai.config
 
+import com.bedrockk.molang.runtime.MoLangRuntime
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity
 

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/RandomTaskConfig.kt

@@ -11,8 +11,13 @@ package com.cobblemon.mod.common.api.ai.config.task
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.weightedSelection
+import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/StopAttackingIfTargetInvalidTaskConfig.kt

@@ -8,10 +8,12 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
+import com.bedrockk.molang.runtime.MoLangRuntime
 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask.Companion.wrapped
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.mainThreadRuntime
 import com.cobblemon.mod.common.util.resolveBoolean

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/StopBeingAngryIfAttackerDeadTaskConfig.kt

@@ -10,6 +10,8 @@ package com.cobblemon.mod.common.api.ai.config.task
 
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.StopBeingAngryIfTargetDead

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/SwitchToFightTaskConfig.kt

@@ -9,7 +9,9 @@
 package com.cobblemon.mod.common.api.ai.config.task
 
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.Difficulty
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/SwitchToNPCBattleTaskConfig.kt

@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.npc.ai.SwitchToBattleTask
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
 
 class SwitchToNPCBattleTaskConfig : SingleTaskConfig {
     override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) = emptyList<MoLangConfigVariable>()

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/SwitchToPanicWhenHostilesNearbyTaskConfig.kt

@@ -10,6 +10,8 @@ package com.cobblemon.mod.common.api.ai.config.task
 
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/SwitchToPanicWhenHurtTaskConfig.kt

@@ -10,6 +10,8 @@ package com.cobblemon.mod.common.api.ai.config.task
 
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/TargetEntityTaskConfig.kt

@@ -25,6 +25,7 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.MemoryStatus
 import net.minecraft.world.entity.ai.sensing.SensorType
 
 /**

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/WaterWanderTaskConfig.kt

@@ -22,7 +22,6 @@ import com.cobblemon.mod.common.util.mainThreadRuntime
 import com.cobblemon.mod.common.util.resolveFloat
 import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.datafixers.util.Either
-import kotlin.math.ceil
 import net.minecraft.core.BlockPos
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
@@ -35,6 +34,7 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.level.material.Fluids
 import net.minecraft.world.level.pathfinder.PathType
 import net.minecraft.world.phys.Vec3
+import kotlin.math.ceil
 
 class WaterWanderTaskConfig : SingleTaskConfig {
     val condition = booleanVariable(WANDER, "water_wanders", true).asExpressible()

common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/PokemonBattle.kt

@@ -54,9 +54,9 @@ import com.cobblemon.mod.common.net.messages.client.battle.BattleEndPacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMessagePacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleQueueRequestPacket
-import com.cobblemon.mod.common.pokemon.transformation.progress.DefeatTransformationProgress
-import com.cobblemon.mod.common.pokemon.transformation.progress.LastBattleCriticalHitsTransformationProgress
-import com.cobblemon.mod.common.pokemon.transformation.requirements.DefeatRequirement
+import com.cobblemon.mod.common.pokemon.evolution.progress.DefeatEvolutionProgress
+import com.cobblemon.mod.common.pokemon.evolution.progress.LastBattleCriticalHitsEvolutionProgress
+import com.cobblemon.mod.common.pokemon.requirements.DefeatRequirement
 import com.cobblemon.mod.common.util.battleLang
 import com.cobblemon.mod.common.util.getPlayer
 import com.cobblemon.mod.common.util.giveOrDropItemStack
@@ -97,8 +97,8 @@ open class PokemonBattle(
         this.actors.forEach { actor ->
             actor.battle = this
             actor.pokemonList.forEach { battlePokemon ->
-                battlePokemon.effectedPokemon.requirementProgress
-                    .filterIsInstance<LastBattleCriticalHitsTransformationProgress>()
+                battlePokemon.effectedPokemon.evolutionProxy.current().progress()
+                    .filterIsInstance<LastBattleCriticalHitsEvolutionProgress>()
                     .forEach { it.reset() }
             }
         }
@@ -271,13 +271,12 @@ open class PokemonBattle(
                         val facedFainted = opponentPokemon.facedOpponents.contains(faintedPokemon)
                         val pokemon = opponentPokemon.effectedPokemon
                         if (facedFainted) {
-                            if (pokemon.hasMatchingRequirement<DefeatRequirement>({ it.target.matches(faintedPokemon.effectedPokemon) })) {
-                                val requiredPokemonProperties = pokemon.getRelevantRequirements<DefeatRequirement> { it.target.matches(faintedPokemon.effectedPokemon) }
-                                    .map { it.target }
-                                    .distinctBy { it.asString() }
-                                for (props in requiredPokemonProperties) {
-                                    val progress = pokemon.progressFirstOrCreate({ it is DefeatTransformationProgress && it.currentProgress().target.asString().equals(props.asString(), ignoreCase = true) }, ::DefeatTransformationProgress)
-                                    progress.updateProgress(DefeatTransformationProgress.Progress(props.copy(), progress.currentProgress().amount + 1))
+                            pokemon.lockedEvolutions.forEach { evolution ->
+                                evolution.requirements.filterIsInstance<DefeatRequirement>().forEach { defeatRequirement ->
+                                    if (defeatRequirement.target.matches(faintedPokemon.effectedPokemon)) {
+                                        val progress = pokemon.evolutionProxy.current().progressFirstOrCreate({ it is DefeatEvolutionProgress && it.currentProgress().target == defeatRequirement.target }) { DefeatEvolutionProgress() }
+                                        progress.updateProgress(DefeatEvolutionProgress.Progress(defeatRequirement.target, progress.currentProgress().amount + 1))
+                                    }
                                 }
                             }
                         }

common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/actor/BattleActor.kt

@@ -22,9 +22,9 @@ import com.cobblemon.mod.common.item.battle.BagItem
 import com.cobblemon.mod.common.net.messages.client.battle.BattleApplyPassResponsePacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMessagePacket
-import java.util.UUID
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
+import java.util.UUID
 import net.minecraft.server.level.ServerPlayer
 
 abstract class BattleActor(

common/src/main/kotlin/com/cobblemon/mod/common/api/berry/Berries.kt

@@ -21,7 +21,6 @@ import com.cobblemon.mod.common.util.adapters.*
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
-import java.awt.Color
 import net.minecraft.advancements.critereon.MinMaxBounds
 import net.minecraft.core.registries.Registries
 import net.minecraft.resources.ResourceLocation
@@ -31,6 +30,7 @@ import net.minecraft.tags.TagKey
 import net.minecraft.world.level.biome.Biome
 import net.minecraft.world.phys.AABB
 import net.minecraft.world.phys.Vec3
+import java.awt.Color
 
 /**
  * The data registry for [Berry].

common/src/main/kotlin/com/cobblemon/mod/common/api/berry/Berry.kt

@@ -26,10 +26,10 @@ import com.cobblemon.mod.common.util.writeBox
 import com.cobblemon.mod.common.util.writeEnumConstant
 import com.cobblemon.mod.common.util.writeIdentifier
 import com.google.gson.annotations.SerializedName
-import java.awt.Color
-import java.util.EnumSet
 import net.minecraft.core.BlockPos
 import net.minecraft.network.RegistryFriendlyByteBuf
+import java.awt.Color
+import java.util.EnumSet
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.tags.TagKey
 import net.minecraft.world.entity.LivingEntity

common/src/main/kotlin/com/cobblemon/mod/common/api/data/ClientDataSynchronizer.kt

@@ -0,0 +1,33 @@
+/*
+ * 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.data
+
+import com.cobblemon.mod.common.api.net.Decodable
+import com.cobblemon.mod.common.api.net.Encodable
+
+// TODO this is implemented in multiple places but unused. Can we scratch this?
+/**
+ * Represents an object that will possibly be synchronized to the client during datapack synchronization.
+ *
+ * @param T The type of the object being synchronized.
+ *
+ * @author Licious
+ * @since October 14th, 2022
+ */
+interface ClientDataSynchronizer<T> : Decodable, Encodable {
+
+    /**
+     * Compares an object of type [T] with this instance to see if synchronization is necessary.
+     *
+     * @param other The other instance of type [T].
+     * @return If synchronization is necessary.
+     */
+    fun shouldSynchronize(other: T): Boolean
+
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/drop/EvolutionItemDropEntry.kt

@@ -8,11 +8,11 @@
 
 package com.cobblemon.mod.common.api.drop
 
-import com.cobblemon.mod.common.api.pokemon.transformation.requirement.TransformationRequirement
+import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
 import com.cobblemon.mod.common.pokemon.Pokemon
 
 class EvolutionItemDropEntry : ItemDropEntry() {
-    val requirements: MutableSet<TransformationRequirement> = mutableSetOf()
+    val requirements: MutableSet<Requirement> = mutableSetOf()
 
     override fun canDrop(pokemon: Pokemon?): Boolean = pokemon != null && requirements.all { it.check(pokemon) }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/events/CobblemonEvents.kt

@@ -48,10 +48,6 @@ import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionAcceptedEv
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEvent
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionDisplayEvent
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionTestedEvent
-import com.cobblemon.mod.common.api.events.pokemon.form.FormAcceptedEvent
-import com.cobblemon.mod.common.api.events.pokemon.form.FormCompleteEvent
-import com.cobblemon.mod.common.api.events.pokemon.form.FormDisplayEvent
-import com.cobblemon.mod.common.api.events.pokemon.form.FormTestedEvent
 import com.cobblemon.mod.common.api.events.pokemon.healing.PokemonHealedEvent
 import com.cobblemon.mod.common.api.events.pokemon.interaction.ExperienceCandyUseEvent
 import com.cobblemon.mod.common.api.events.pokemon.interaction.PokemonInteractionGUICreationEvent
@@ -107,18 +103,6 @@ object CobblemonEvents {
     @JvmField
     val EVOLUTION_COMPLETE = EventObservable<EvolutionCompleteEvent>()
 
-    @JvmField
-    val FORM_ACCEPTED = CancelableObservable<FormAcceptedEvent>()
-
-    @JvmField
-    val FORM_DISPLAY = EventObservable<FormDisplayEvent>()
-
-    @JvmField
-    val FORM_TESTED = EventObservable<FormTestedEvent>()
-
-    @JvmField
-    val FORM_COMPLETE = EventObservable<FormCompleteEvent>()
-
     @JvmField
     val POKEMON_NICKNAMED = CancelableObservable<PokemonNicknamedEvent>()
 

common/src/main/kotlin/com/cobblemon/mod/common/api/events/battles/BattleVictoryEvent.kt

@@ -15,7 +15,9 @@ import com.cobblemon.mod.common.api.battles.model.actor.ActorType
 import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
 import com.cobblemon.mod.common.api.battles.model.actor.EntityBackedBattleActor
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
 import com.cobblemon.mod.common.entity.MoLangScriptingEntity
+import com.cobblemon.mod.common.entity.npc.NPCBattleActor
 import com.cobblemon.mod.common.util.asArrayValue
 import net.minecraft.world.entity.LivingEntity
 

common/src/main/kotlin/com/cobblemon/mod/common/api/events/entity/SpawnBucketChosenEvent.kt

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.api.events.entity
 
+import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.SpawnCause
 import com.cobblemon.mod.common.api.spawning.spawner.Spawner
 
@@ -20,7 +21,7 @@ class SpawnBucketChosenEvent(
     /** The cause of the spawn. */
     val spawnCause: SpawnCause,
     /** The bucket that was chosen. You can alter this. */
-    var bucket: String,
+    var bucket: SpawnBucket,
     /** The final weights that were used to make the choice. */
-    val bucketWeights: Map<String, Float>
+    val bucketWeights: Map<SpawnBucket, Float>
 )

common/src/main/kotlin/com/cobblemon/mod/common/api/events/fishing/BaitSpawnPokemonEvent.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.api.events.fishing
 
 import com.cobblemon.mod.common.api.events.Cancelable
+import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.world.item.ItemStack
@@ -26,7 +27,7 @@ interface BaitSpawnPokemonEvent {
      */
     data class Pre(
         val bobber: PokeRodFishingBobberEntity, // todo replace this with the bait entity
-        val chosenBucket: String,
+        val chosenBucket: SpawnBucket,
         val rod: ItemStack
     ) : Cancelable(), BobberSpawnPokemonEvent
 
@@ -37,7 +38,7 @@ interface BaitSpawnPokemonEvent {
      * @param pokemon The Pokemon that is modified.
      */
     data class Modify(
-        val chosenBucket: String,
+        val chosenBucket: SpawnBucket,
         val rod: ItemStack,
         val pokemon: PokemonEntity
     ) : BobberSpawnPokemonEvent
@@ -51,7 +52,7 @@ interface BaitSpawnPokemonEvent {
      */
     data class Post(
         val bobber: PokeRodFishingBobberEntity,
-        val chosenBucket: String,
+        val chosenBucket: SpawnBucket,
         val bait: ItemStack,
         val pokemon: PokemonEntity
     ) : BobberSpawnPokemonEvent

common/src/main/kotlin/com/cobblemon/mod/common/api/events/fishing/BobberBucketChosenEvent.kt

@@ -8,10 +8,12 @@
 
 package com.cobblemon.mod.common.api.events.fishing
 
+import com.cobblemon.mod.common.api.spawning.SpawnBucket
+
 /**
  * Event that is fired when a bucket is chosen by the bobber.
  * @param chosenBucket The bucket that is chosen.
  * @param buckets The list of buckets that the bobber can choose from.
  * @param luckOfTheSeaLevel The level of the Luck of the Sea enchantment on the rod.
  */
-class BobberBucketChosenEvent(var chosenBucket: String, val buckets: MutableList<String>, val luckOfTheSeaLevel: Int)
+class BobberBucketChosenEvent(var chosenBucket: SpawnBucket, val buckets: MutableList<SpawnBucket>, val luckOfTheSeaLevel: Int)

common/src/main/kotlin/com/cobblemon/mod/common/api/events/fishing/BobberSpawnPokemonEvent.kt

@@ -12,7 +12,10 @@ import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
+import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
 import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -70,8 +73,8 @@ interface BobberSpawnPokemonEvent {
         val bait: ItemStack,
         val pokemon: PokemonEntity
     ) : BobberSpawnPokemonEvent {
-        val context = mutableMapOf(
-            "chosen_bucket" to StringValue(spawnAction.bucket),
+        val context = mutableMapOf<String, MoValue>(
+            "chosen_bucket" to ObjectValue(spawnAction.bucket, { it.name }),
             "bait" to pokemon.level().itemRegistry.wrapAsHolder(bait.item).asMoLangValue(Registries.ITEM),
             "pokemon_entity" to pokemon.asMoLangValue()
         )

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/TradeEvent.kt

@@ -12,6 +12,7 @@ import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.trade.TradeParticipant
 import com.cobblemon.mod.common.util.getPlayer

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/evolution/EvolutionAcceptedEvent.kt

@@ -12,8 +12,8 @@ import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
 
 /**
  * Fired when an evolution is accepted.

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/evolution/EvolutionCompleteEvent.kt

@@ -10,8 +10,8 @@ package com.cobblemon.mod.common.api.events.pokemon.evolution
 
 import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
 
 /**
  * Fired after an evolution finishes.

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/evolution/EvolutionDisplayEvent.kt

@@ -8,9 +8,9 @@
 
 package com.cobblemon.mod.common.api.events.pokemon.evolution
 
-import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.api.pokemon.evolution.EvolutionDisplay
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.transformation.evolution.EvolutionDisplay
 
 /**
  * Fired before an evolution is sent to clients.

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/evolution/EvolutionEvent.kt

@@ -8,7 +8,7 @@
 
 package com.cobblemon.mod.common.api.events.pokemon.evolution
 
-import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.pokemon.Pokemon
 
 /**

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/evolution/EvolutionTestedEvent.kt

@@ -12,8 +12,8 @@ import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
 import com.cobblemon.mod.common.util.getBoolean
 
 /**

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/form/FormAcceptedEvent.kt

@@ -1,37 +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.events.pokemon.form
-
-import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.transformation.form.TemporaryForm
-
-/**
- * Fired when a temporary form change is accepted.
- * Cancelling will not notify users nor remove the form from the pending list.
- *
- * @param pokemon The [Pokemon] about to change form.
- * @param form The [TemporaryForm] being used.
- *
- * @author Hiroku
- * @since June 3rd, 2026
- */
-data class FormAcceptedEvent(
-    override val pokemon: Pokemon,
-    override val form: TemporaryForm
-) : Cancelable(), FormEvent {
-    val context = mutableMapOf(
-        "pokemon" to pokemon.struct,
-        "form" to StringValue(form.formOnlyShowdownId())
-    )
-
-    val functions = moLangFunctionMap(cancelFunc)
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/form/FormCompleteEvent.kt

@@ -1,34 +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.events.pokemon.form
-
-import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.transformation.form.TemporaryForm
-
-/**
- * Fired after a temporary form change finishes.
- *
- * @param pokemon The [Pokemon] resulting from the form change.
- * @param form The [TemporaryForm] that was used.
- *
- * @author Hiroku
- * @since June 3rd, 2026
- */
-data class FormCompleteEvent(
-    /** The [Pokemon] that did the form change. */
-    override val pokemon: Pokemon,
-    /** The [TemporaryForm] that was used. */
-    override val form: TemporaryForm
-) : FormEvent {
-    val context = mutableMapOf(
-        "pokemon" to pokemon.struct,
-        "form" to StringValue(form.formOnlyShowdownId())
-    )
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/form/FormDisplayEvent.kt

@@ -1,37 +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.events.pokemon.form
-
-import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.transformation.form.FormDisplay
-import com.cobblemon.mod.common.pokemon.transformation.form.TemporaryForm
-
-/**
- * Fired before a form is sent to clients. For modifications on the actual output when they accept it modify
- * the [display] directly.
- *
- * @param pokemon The [Pokemon] that will change form if this proposition is accepted.
- * @param display The current [FormDisplay] the client will see.
- * @param form The [TemporaryForm] being used.
- *
- * @author Hiroku
- * @since June 3rd, 2026
- */
-data class FormDisplayEvent(
-    override val pokemon: Pokemon,
-    var display: FormDisplay,
-    override val form: TemporaryForm
-) : FormEvent {
-    val context = mutableMapOf(
-        "pokemon" to pokemon.struct,
-        "display" to display.struct,
-        "form" to StringValue(form.formOnlyShowdownId())
-    )
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/form/FormEvent.kt

@@ -1,22 +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.events.pokemon.form
-
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.transformation.form.TemporaryForm
-
-/**
- * The root of the various [TemporaryForm]-related events.
- */
-interface FormEvent {
-    /** The Pokémon impacted in this event.*/
-    val pokemon: Pokemon
-    /*** The form triggering this event.*/
-    val form: TemporaryForm
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/form/FormTestedEvent.kt

@@ -1,47 +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.events.pokemon.form
-
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.transformation.form.TemporaryForm
-import com.cobblemon.mod.common.util.getBoolean
-
-/**
- * An event fired when [TemporaryForm.test] has been performed.
- * The final state [result] will be the return value of the test function.
- *
- * @property pokemon The [Pokemon] being tested against.
- * @property form The [TemporaryForm] instance performing the test.
- * @property originalResult The base result from the Cobblemon implementation.
- * @property result The final value returned by [TemporaryForm.test].
- */
-data class FormTestedEvent(
-    override val pokemon: Pokemon,
-    override val form: TemporaryForm,
-    val originalResult: Boolean,
-) : FormEvent {
-    var result: Boolean = originalResult
-
-    val context = mutableMapOf(
-        "pokemon" to pokemon.struct,
-        "form" to StringValue(form.formOnlyShowdownId()),
-        "original_result" to DoubleValue(originalResult),
-    )
-
-    val functions = moLangFunctionMap(
-        "result" to { DoubleValue(result) },
-        "set_result" to {
-            result = it.getBoolean(0)
-            DoubleValue.ONE
-        }
-    )
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/events/starter/StarterChosenEvent.kt

@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.getPlayer
 import net.minecraft.server.level.ServerPlayer
 
 /**

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

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.api.events.storage
 
+import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue

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

@@ -16,7 +16,9 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.api.storage.PokemonStore
 import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.getPlayer
 import net.minecraft.server.level.ServerPlayer
+import java.util.UUID
 
 /**
  * The base of the events around the release of Pokémon from pc or party.

common/src/main/kotlin/com/cobblemon/mod/common/api/fossil/Fossils.kt

@@ -14,7 +14,7 @@ import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.net.messages.client.data.FossilRegistrySyncPacket
-import com.cobblemon.mod.common.pokemon.transformation.adapters.LegacyItemConditionWrapperAdapter
+import com.cobblemon.mod.common.pokemon.evolution.adapters.LegacyItemConditionWrapperAdapter
 import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.adapters.ItemLikeConditionAdapter
 import com.cobblemon.mod.common.util.adapters.pokemonPropertiesShortAdapter

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/ActivatedHabitatPool.kt

@@ -0,0 +1,37 @@
+/*
+ * 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.habitats
+
+import com.cobblemon.mod.common.api.spawning.SpawnBucket
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.resources.ResourceLocation
+
+/**
+ * A [HabitatPool] of [ActivatedHabitatSpawn]s. Mainly just to help with deserialization and ensuring
+ * a single type for everything that's applied to a habitat block.
+ *
+ * @author Hiroku
+ * @since February 13th, 2026
+ */
+class ActivatedHabitatPool : HabitatPool<ActivatedHabitatSpawn>() {
+    override val type: ResourceLocation = ActivatedHabitatSpawn.TYPE
+    override var spawns: List<ActivatedHabitatSpawn> = listOf()
+
+    companion object {
+        fun default() = ActivatedHabitatPool().apply {
+            id = ResourceLocation("cobblemon", "custom__default_activated_pool")
+            name = "Custom"
+        }
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf, buckets: List<SpawnBucket>) {
+        super.decode(buffer, buckets)
+        spawns = buffer.readList { ActivatedHabitatSpawn().apply { decode(buffer, buckets) } }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/ActivatedHabitatSpawn.kt

@@ -0,0 +1,23 @@
+/*
+ * 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.habitats
+
+import com.cobblemon.mod.common.util.cobblemonResource
+
+/**
+ * A basic [HabitatSpawn] that will be triggered via activated spawning in a habitat. Nothing to it, really.
+ *
+ * @author Hiroku
+ * @since February 13th, 2026
+ */
+class ActivatedHabitatSpawn : HabitatSpawn() {
+    companion object {
+        val TYPE = cobblemonResource("activated")
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/HabitatPool.kt

@@ -8,81 +8,39 @@
 
 package com.cobblemon.mod.common.api.habitats
 
-import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.detail.PokemonSpawnDetail
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
-import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import net.minecraft.nbt.CompoundTag
-import net.minecraft.nbt.ListTag
-import net.minecraft.nbt.Tag
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 
 /**
- * A pool of [HabitatSpawn]s. This is filled with [HabitatSpawn]s. The pool is responsible for converting
+ * A pool of [HabitatSpawn]s. This is either filled with [NaturalHabitatSpawn]s or [ActivatedHabitatSpawn]s depending
+ * on whether the pool is a [NaturalHabitatPool] or an [ActivatedHabitatPool]. The pool is responsible for converting
  * its spawns into [PokemonSpawnDetail]s.
  *
  * @author Hiroku
  * @since February 13th, 2026
  */
-class HabitatPool {
+abstract class HabitatPool<T : HabitatSpawn> {
     companion object {
-        fun default() = HabitatPool().apply {
-            id = ResourceLocation("cobblemon", "custom__default_pool")
-            name = "Custom"
-        }
-
-        fun writePoolToNBT(pool: HabitatPool, nbt: CompoundTag) {
-            nbt.putString(DataKeys.HABITAT_POOL_ID, pool.id.toString())
-            if (pool.id.path.startsWith("custom__")) {
-                nbt.putString(DataKeys.HABITAT_POOL_NAME, pool.name)
-                val spawnsListNBT = ListTag()
-                for (spawn in pool.spawns) {
-                    val spawnTag = CompoundTag()
-                    spawn.writeToNBT(spawnTag)
-                    spawnsListNBT.add(spawnTag)
-                }
-                nbt.put(DataKeys.HABITAT_POOL_SPAWNS, spawnsListNBT)
-            }
-        }
-
-        fun readPoolFromNBT(nbt: CompoundTag): HabitatPool {
-            val poolId = nbt.getString(DataKeys.HABITAT_POOL_ID).asIdentifierDefaultingNamespace()
-            if (nbt.contains(DataKeys.HABITAT_POOL_NAME)) {
-                // It's one that was stored on the block
-                val pool = HabitatPool()
-                pool.id = poolId
-                pool.name = nbt.getString(DataKeys.HABITAT_POOL_NAME)
-                val spawnsListNBT = nbt.getList(DataKeys.HABITAT_POOL_SPAWNS, Tag.TAG_COMPOUND.toInt())
-                val spawns = mutableListOf<HabitatSpawn>()
-                spawnsListNBT.forEach { spawnTag ->
-                    try {
-                        val spawn = HabitatSpawn().apply { readFromNBT(spawnTag as CompoundTag) }
-                        spawns.add(spawn)
-                    } catch (_: Exception) {
-                        // If there's an error reading a spawn, skip it and log the error.
-                        Cobblemon.LOGGER.error("Error reading activated habitat spawn from NBT for habitat block, skipping.")
-                    }
-                }
-                pool.spawns = spawns
-                return pool
-            } else {
-                return HabitatPools.habitatPoolsById[poolId] ?: HabitatPool.default()
-            }
-        }
+        val types = mutableMapOf(
+            ActivatedHabitatSpawn.TYPE to ActivatedHabitatPool::class.java,
+            NaturalHabitatSpawn.TYPE to NaturalHabitatPool::class.java
+        )
     }
 
     lateinit var id: ResourceLocation
     var name: String = ""
-    var spawns: List<HabitatSpawn> = listOf()
+    abstract val type: ResourceLocation
+    abstract var spawns: List<T>
 
     /** Whether a pool is editable is just down to whether it's not from a datapack. */
     @Transient
     var editable: Boolean = false
 
-    fun validate() {
+    open fun validate() {
         for (spawn in spawns) {
             if (SpawnablePosition.getByName(spawn.spawnablePositionType) == null) {
                 throw IllegalArgumentException("$id mentions non-existent spawnable position type ${spawn.spawnablePositionType} on spawn for ${spawn.species}")
@@ -100,9 +58,8 @@ class HabitatPool {
         buffer.writeCollection(spawns) { _, it -> it.encode(buffer) }
     }
 
-    fun decode(buffer: RegistryFriendlyByteBuf) {
+    open fun decode(buffer: RegistryFriendlyByteBuf, buckets: List<SpawnBucket>) {
         id = buffer.readResourceLocation()
         name = buffer.readUtf()
-        spawns = buffer.readList { HabitatSpawn().apply { decode(buffer) } }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/HabitatPools.kt

@@ -12,13 +12,16 @@ import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.spawning.IntRanges
+import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.TimeRange
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePositionType
 import com.cobblemon.mod.common.pokemon.Species
+import com.cobblemon.mod.common.util.adapters.HabitatPoolAdapter
 import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.adapters.IntRangeAdapter
 import com.cobblemon.mod.common.util.adapters.IntRangesAdapter
 import com.cobblemon.mod.common.util.adapters.RegisteredSpawnablePositionAdapter
+import com.cobblemon.mod.common.util.adapters.SpawnBucketAdapter
 import com.cobblemon.mod.common.util.adapters.SpeciesAdapter
 import com.cobblemon.mod.common.util.adapters.pokemonPropertiesShortAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
@@ -33,16 +36,18 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.world.level.storage.LevelResource
 
-object HabitatPools : JsonDataRegistry<HabitatPool> {
+object HabitatPools : JsonDataRegistry<HabitatPool<*>> {
     override val id = cobblemonResource("habitat_pools")
     override val type = PackType.SERVER_DATA
     override val observable = SimpleObservable<HabitatPools>()
-    override val typeToken: TypeToken<HabitatPool> = TypeToken.get(HabitatPool::class.java)
+    override val typeToken: TypeToken<HabitatPool<*>> = TypeToken.get(HabitatPool::class.java)
     override val resourcePath = "habitat_pools"
 
     override val gson: Gson = GsonBuilder()
         .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+        .registerTypeAdapter(HabitatPool::class.java, HabitatPoolAdapter)
         .registerTypeAdapter(SpawnablePositionType::class.java, RegisteredSpawnablePositionAdapter)
+        .registerTypeAdapter(SpawnBucket::class.java, SpawnBucketAdapter)
         .registerTypeAdapter(Species::class.java, SpeciesAdapter)
         .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
         .registerTypeAdapter(TimeRange::class.java, TimeRange.adapter)
@@ -51,10 +56,10 @@ object HabitatPools : JsonDataRegistry<HabitatPool> {
         .setPrettyPrinting()
         .create()
 
-    private val datapacked = mutableMapOf<ResourceLocation, HabitatPool>()
-    private val worldSaved = mutableMapOf<ResourceLocation, HabitatPool>()
+    private val datapacked = mutableMapOf<ResourceLocation, HabitatPool<*>>()
+    private val worldSaved = mutableMapOf<ResourceLocation, HabitatPool<*>>()
 
-    val habitatPoolsById = mutableMapOf<ResourceLocation, HabitatPool>()
+    val habitatPoolsById = mutableMapOf<ResourceLocation, HabitatPool<*>>()
 
     private lateinit var worldSavedPoolsFolder: File
 
@@ -68,7 +73,7 @@ object HabitatPools : JsonDataRegistry<HabitatPool> {
 
         worldSavedPoolsFolder.listFiles { it.endsWith(".json") }.forEach {
             val identifier = ResourceLocation.parse(it.nameWithoutExtension)
-            val habitat = gson.fromJson<HabitatPool>(it.reader())
+            val habitat = gson.fromJson<HabitatPool<*>>(it.reader())
             habitat.id = identifier
             habitat.validate()
             habitat.editable = true
@@ -77,7 +82,7 @@ object HabitatPools : JsonDataRegistry<HabitatPool> {
         setupHabitatPoolsById()
     }
 
-    override fun reload(data: Map<ResourceLocation, HabitatPool>) {
+    override fun reload(data: Map<ResourceLocation, HabitatPool<*>>) {
         datapacked.clear()
         datapacked.putAll(data)
         data.entries.forEach { (identifier, habitat) ->

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/HabitatSpawn.kt

@@ -10,7 +10,9 @@ package com.cobblemon.mod.common.api.habitats
 
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
+import com.cobblemon.mod.common.api.spawning.BestSpawner
 import com.cobblemon.mod.common.api.spawning.IntRanges
+import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.TimeRange
 import com.cobblemon.mod.common.api.spawning.condition.AppendageCondition
 import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
@@ -28,7 +30,9 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.network.RegistryFriendlyByteBuf
 
 /**
- * A kind of simplified spawn definition for the purposes of spawning from [HabitatBlockEntity] instances.
+ * A kind of simplified spawn definition for the purposes of spawning from [HabitatBlockEntity] instances. This is a
+ * very shallow class tree, with [ActivatedHabitatSpawn] being a trivial subclass but the other subclass being
+ * [NaturalHabitatSpawn] which introduces the need to supply a spawn bucket.
  *
  * These have only a small subset of the properties that a regular [PokemonSpawnDetail] would have to align with the
  * fact that these are configured from a simple GUI. There are limits to how many properties and conditions could be
@@ -42,13 +46,11 @@ import net.minecraft.network.RegistryFriendlyByteBuf
  * @author Hiroku
  * @since February 13th, 2026
  */
-class HabitatSpawn {
+sealed class HabitatSpawn {
     /** The species that will be spawned. */
     lateinit var species: Species
     /** The kind of position the Pokémon will spawn in. Things like "grounded", "seafloor", "fishing". */
     lateinit var spawnablePositionType: String
-    /** The bucket to spawn from. */
-    var bucket: String = "common"
 
     /** Selection weight. */
     var weight: Float = 1F
@@ -75,7 +77,6 @@ class HabitatSpawn {
         timeRange?.let { nbt.putString(DataKeys.HABITAT_POOL_SPAWN_TIMES, TimeRange.adapter.serialize(it)) }
         minLight?.let { nbt.putInt(DataKeys.HABITAT_POOL_SPAWN_MIN_LIGHT, it) }
         maxLight?.let { nbt.putInt(DataKeys.HABITAT_POOL_SPAWN_MAX_LIGHT, it) }
-        nbt.putString(DataKeys.HABITAT_POOL_SPAWN_BUCKET, bucket)
     }
 
     open fun readFromNBT(nbt: CompoundTag) {
@@ -88,7 +89,6 @@ class HabitatSpawn {
         timeRange = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_TIMES)) TimeRange.adapter.deserialize(nbt.getString(DataKeys.HABITAT_POOL_SPAWN_TIMES)) else null
         minLight = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_MIN_LIGHT)) nbt.getInt(DataKeys.HABITAT_POOL_SPAWN_MIN_LIGHT) else null
         maxLight = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_MAX_LIGHT)) nbt.getInt(DataKeys.HABITAT_POOL_SPAWN_MAX_LIGHT) else null
-        bucket = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_BUCKET)) nbt.getString(DataKeys.HABITAT_POOL_SPAWN_BUCKET) else "common"
     }
 
     open fun encode(buffer: RegistryFriendlyByteBuf) {
@@ -101,10 +101,12 @@ class HabitatSpawn {
         buffer.writeNullable(timeRange) { _, value -> buffer.writeUtf(TimeRange.adapter.serialize(value)) }
         buffer.writeNullable(minLight) { _, value -> buffer.writeInt(value) }
         buffer.writeNullable(maxLight) { _, value -> buffer.writeInt(value) }
-        buffer.writeUtf(bucket)
     }
 
-    open fun decode(buffer: RegistryFriendlyByteBuf) {
+    open fun decode(
+        buffer: RegistryFriendlyByteBuf,
+        buckets: List<SpawnBucket>
+    ) {
         species = PokemonSpecies.getByIdentifier(buffer.readResourceLocation())!!
         spawnablePositionType = buffer.readUtf()
         weight = buffer.readFloat()
@@ -114,7 +116,6 @@ class HabitatSpawn {
         timeRange = buffer.readNullable { _ -> TimeRange.adapter.deserialize(buffer.readUtf()) }
         minLight = buffer.readNullable { _ -> buffer.readInt() }
         maxLight = buffer.readNullable { _ -> buffer.readInt() }
-        bucket = buffer.readUtf()
     }
 
     /** Creates the [PokemonSpawnDetail] that will be used in the spawner. This is done per habitat block. */
@@ -137,7 +138,7 @@ class HabitatSpawn {
         spawnDetail.apply {
             this.id = "habitat_${species.resourceIdentifier}"
             this.pokemon = properties
-            this.bucket = this@HabitatSpawn.bucket
+            this.bucket = BestSpawner.config.buckets.first { it.weight > 0 }
             this.weight = this@HabitatSpawn.weight
             this.levelRange = levelRange
             this.conditions = mutableListOf(condition)

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/NaturalHabitatPool.kt

@@ -0,0 +1,37 @@
+/*
+ * 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.habitats
+
+import com.cobblemon.mod.common.api.spawning.SpawnBucket
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.resources.ResourceLocation
+
+/**
+ * A [HabitatPool] of [NaturalHabitatSpawn]s. Mainly just to help with deserialization and ensuring
+ * a single type for everything that's applied to a habitat block.
+ *
+ * @author Hiroku
+ * @since February 13th, 2026
+ */
+class NaturalHabitatPool : HabitatPool<NaturalHabitatSpawn>() {
+    override val type: ResourceLocation = NaturalHabitatSpawn.TYPE
+    override var spawns: List<NaturalHabitatSpawn> = listOf()
+
+    companion object {
+        fun default() = NaturalHabitatPool().apply {
+            id = ResourceLocation("cobblemon", "custom__default_natural_pool")
+            name = "Custom"
+        }
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf, buckets: List<SpawnBucket>) {
+        super.decode(buffer, buckets)
+        spawns = buffer.readList { NaturalHabitatSpawn().apply { decode(buffer, buckets) } }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/NaturalHabitatSpawn.kt

@@ -0,0 +1,63 @@
+/*
+ * 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.habitats
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.spawning.SpawnBucket
+import com.cobblemon.mod.common.api.spawning.detail.PokemonSpawnDetail
+import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
+import com.cobblemon.mod.common.util.DataKeys
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.network.RegistryFriendlyByteBuf
+
+/**
+ * A type of [HabitatSpawn] that spawns Pokémon as part of natural world spawning, and therefore
+ * needs to indicate the [SpawnBucket] it will be part of.
+ *
+ * @author Hiroku
+ * @since February 13th, 2026
+ */
+class NaturalHabitatSpawn : HabitatSpawn() {
+    companion object {
+        val TYPE = cobblemonResource("natural")
+    }
+
+    lateinit var bucket: SpawnBucket
+
+    override fun createSpawnDetail(habitatBlockEntity: HabitatBlockEntity): PokemonSpawnDetail? {
+        val spawnDetail = super.createSpawnDetail(habitatBlockEntity)
+        spawnDetail?.bucket = bucket
+        return spawnDetail
+    }
+
+    override fun writeToNBT(nbt: CompoundTag) {
+        super.writeToNBT(nbt)
+        nbt.putString(DataKeys.HABITAT_POOL_SPAWN_BUCKET, bucket.name)
+    }
+
+    override fun readFromNBT(nbt: CompoundTag) {
+        super.readFromNBT(nbt)
+        bucket = Cobblemon.bestSpawner.config.buckets.first { it.name == nbt.getString(DataKeys.HABITAT_POOL_SPAWN_BUCKET) }
+    }
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        super.encode(buffer)
+        buffer.writeUtf(bucket.name)
+    }
+
+    override fun decode(
+        buffer: RegistryFriendlyByteBuf,
+        buckets: List<SpawnBucket>
+    ) {
+        super.decode(buffer, buckets)
+        val bucketName = buffer.readUtf()
+        bucket = buckets.first { it.name == bucketName }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/dto/ActivatedHabitatSettingsDTO.kt

@@ -8,7 +8,9 @@
 
 package com.cobblemon.mod.common.api.habitats.dto
 
+import com.cobblemon.mod.common.api.habitats.ActivatedHabitatPool
 import com.cobblemon.mod.common.api.habitats.spawningstyle.ActivatedHabitatSpawning
+import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import net.minecraft.network.RegistryFriendlyByteBuf
 
 class ActivatedHabitatSettingsDTO() {
@@ -18,6 +20,7 @@ class ActivatedHabitatSettingsDTO() {
     var spawnRange = 16
     var maxSpawns = -1
     var maxSpawnsPerActivation = 1
+    var habitatPool: HabitatPoolSettingsDTO = HabitatPoolSettingsDTO(ActivatedHabitatPool.default())
 
     constructor(activatedHabitatSpawning: ActivatedHabitatSpawning): this() {
         this.chance = activatedHabitatSpawning.chance
@@ -26,6 +29,7 @@ class ActivatedHabitatSettingsDTO() {
         this.spawnRange = activatedHabitatSpawning.spawnRange
         this.maxSpawns = activatedHabitatSpawning.maxSpawns
         this.maxSpawnsPerActivation = activatedHabitatSpawning.maxSpawnsPerActivation
+        this.habitatPool = HabitatPoolSettingsDTO(activatedHabitatSpawning.pool)
     }
 
     fun encode(buffer: RegistryFriendlyByteBuf) {
@@ -35,14 +39,20 @@ class ActivatedHabitatSettingsDTO() {
         buffer.writeInt(spawnRange)
         buffer.writeInt(maxSpawns)
         buffer.writeInt(maxSpawnsPerActivation)
+        habitatPool.encode(buffer)
     }
 
-    fun decode(buffer: RegistryFriendlyByteBuf) {
+    fun decode(
+        buffer: RegistryFriendlyByteBuf,
+        buckets: List<SpawnBucket>
+    ) {
         this.chance = buffer.readFloat()
         this.trigger = buffer.readEnum(ActivatedHabitatSpawning.Trigger::class.java)
         this.cancelledNaturalSpawningRange = buffer.readInt()
         this.spawnRange = buffer.readInt()
         this.maxSpawns = buffer.readInt()
         this.maxSpawnsPerActivation = buffer.readInt()
+        this.habitatPool = HabitatPoolSettingsDTO()
+        habitatPool.decode(buffer, buckets)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/dto/HabitatPoolSettingsDTO.kt

@@ -9,23 +9,30 @@
 package com.cobblemon.mod.common.api.habitats.dto
 
 import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.habitats.ActivatedHabitatPool
+import com.cobblemon.mod.common.api.habitats.ActivatedHabitatSpawn
 import com.cobblemon.mod.common.api.habitats.HabitatPool
 import com.cobblemon.mod.common.api.habitats.HabitatPools
 import com.cobblemon.mod.common.api.habitats.HabitatSpawn
+import com.cobblemon.mod.common.api.habitats.NaturalHabitatPool
+import com.cobblemon.mod.common.api.habitats.NaturalHabitatSpawn
+import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 
 class HabitatPoolSettingsDTO() {
     lateinit var id: ResourceLocation
     var isReference = false
+    var isActivated = false
 
     // Below properties are only there when it's not a reference, otherwise the handler will have to look them up from the id
     var name: String? = null
     var spawns: MutableList<HabitatSpawn>? = null
 
-    constructor(habitatPool: HabitatPool): this() {
+    constructor(habitatPool: HabitatPool<*>): this() {
         this.id = habitatPool.id
         this.isReference = !id.path.startsWith("custom__")
+        this.isActivated = habitatPool is ActivatedHabitatPool
         if (!this.isReference) {
             this.name = habitatPool.name
             this.spawns = habitatPool.spawns.toMutableList()
@@ -35,6 +42,7 @@ class HabitatPoolSettingsDTO() {
     fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeResourceLocation(id)
         buffer.writeBoolean(isReference)
+        buffer.writeBoolean(isActivated)
         if (!isReference) {
             buffer.writeUtf(name!!)
             buffer.writeCollection(spawns!!) { _, spawn ->
@@ -44,32 +52,50 @@ class HabitatPoolSettingsDTO() {
     }
 
     fun decode(
-        buffer: RegistryFriendlyByteBuf
+        buffer: RegistryFriendlyByteBuf,
+        buckets: List<SpawnBucket>
     ) {
         this.id = buffer.readResourceLocation()
         this.isReference = buffer.readBoolean()
+        this.isActivated = buffer.readBoolean()
         if (!isReference) {
             this.name = buffer.readUtf()
             this.spawns = buffer.readList {
-                val spawn = HabitatSpawn()
-                spawn.decode(buffer)
+                val spawn = if (isActivated) {
+                    ActivatedHabitatSpawn()
+                } else {
+                    NaturalHabitatSpawn()
+                }
+                spawn.decode(buffer, buckets)
                 spawn
             }.toMutableList()
         }
     }
 
-    fun toHabitatPool(): HabitatPool? {
+    fun toHabitatPool(): HabitatPool<*>? {
         if (isReference) {
             val pool = HabitatPools.habitatPoolsById[id]
             if (pool == null) {
                 Cobblemon.LOGGER.error("Could not find habitat pool with id $id")
+            } else if (pool is ActivatedHabitatPool && !isActivated) {
+                Cobblemon.LOGGER.error("Pool with id $id is an activated habitat pool but was deserialized as a natural pool")
+            } else if (pool !is ActivatedHabitatPool && isActivated) {
+                Cobblemon.LOGGER.error("Pool with id $id is a natural habitat pool but was deserialized as an activated pool")
             }
             return pool
         }
-        val pool = HabitatPool()
-        pool.id = id
-        pool.name = name!!
-        pool.spawns = spawns!!
-        return pool
+        return if (isActivated) {
+            val pool = ActivatedHabitatPool()
+            pool.id = id
+            pool.name = name!!
+            pool.spawns = spawns!!.map { it as ActivatedHabitatSpawn }
+            pool
+        } else {
+            val pool = NaturalHabitatPool()
+            pool.id = id
+            pool.name = name!!
+            pool.spawns = spawns!!.map { it as NaturalHabitatSpawn }
+            pool
+        }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/dto/HabitatSettingsDTO.kt

@@ -9,9 +9,9 @@
 package com.cobblemon.mod.common.api.habitats.dto
 
 import com.cobblemon.mod.common.api.habitats.HabitatPhaseOrder
-import com.cobblemon.mod.common.api.habitats.HabitatPool
 import com.cobblemon.mod.common.api.habitats.spawningstyle.ActivatedHabitatSpawning
 import com.cobblemon.mod.common.api.habitats.spawningstyle.NaturalHabitatSpawning
+import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
@@ -23,7 +23,6 @@ class HabitatSettingsDTO() {
     var modifiers: String = ""
     lateinit var mimicId: ResourceLocation
     var isActivatedSpawning = false
-    var pool: HabitatPoolSettingsDTO = HabitatPoolSettingsDTO(HabitatPool.default())
     var activatedSettings: ActivatedHabitatSettingsDTO? = null
     var naturalSettings: NaturalHabitatSettingsDTO? = null
 
@@ -33,7 +32,6 @@ class HabitatSettingsDTO() {
         this.levelRange = habitatBlockEntity.levelRange
         this.modifiers = habitatBlockEntity.modifiers.asString()
         this.mimicId = habitatBlockEntity.mimicId
-        this.pool = HabitatPoolSettingsDTO(habitatBlockEntity.pool)
         val style = habitatBlockEntity.spawningStyle
         if (style is ActivatedHabitatSpawning) {
             this.isActivatedSpawning = true
@@ -50,7 +48,6 @@ class HabitatSettingsDTO() {
         buffer.writeInt(levelRange.last)
         buffer.writeUtf(modifiers)
         buffer.writeResourceLocation(mimicId)
-        pool.encode(buffer)
         buffer.writeBoolean(isActivatedSpawning)
         if (isActivatedSpawning) {
             activatedSettings?.encode(buffer)
@@ -59,7 +56,10 @@ class HabitatSettingsDTO() {
         }
     }
 
-    fun decode(buffer: RegistryFriendlyByteBuf) {
+    fun decode(
+        buffer: RegistryFriendlyByteBuf,
+        buckets: List<SpawnBucket>
+    ) {
         this.numberOfPhases = buffer.readInt()
         this.phaseOrder = buffer.readEnum(HabitatPhaseOrder::class.java)
         val levelRangeStart = buffer.readInt()
@@ -67,18 +67,16 @@ class HabitatSettingsDTO() {
         this.levelRange = levelRangeStart..levelRangeEnd
         this.modifiers = buffer.readUtf()
         this.mimicId = buffer.readResourceLocation()
-        this.pool = HabitatPoolSettingsDTO()
-        this.pool.decode(buffer)
         if (buffer.readBoolean()) {
             this.isActivatedSpawning = true
             this.naturalSettings = null
             val activatedSettings = ActivatedHabitatSettingsDTO()
-            activatedSettings.decode(buffer)
+            activatedSettings.decode(buffer, buckets)
             this.activatedSettings = activatedSettings
         } else {
             this.activatedSettings = null
             val naturalSettings = NaturalHabitatSettingsDTO()
-            naturalSettings.decode(buffer)
+            naturalSettings.decode(buffer, buckets)
             this.naturalSettings = naturalSettings
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/dto/NaturalHabitatSettingsDTO.kt

@@ -8,25 +8,35 @@
 
 package com.cobblemon.mod.common.api.habitats.dto
 
+import com.cobblemon.mod.common.api.habitats.NaturalHabitatPool
 import com.cobblemon.mod.common.api.habitats.spawningstyle.NaturalHabitatSpawning
+import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import net.minecraft.network.RegistryFriendlyByteBuf
 
 class NaturalHabitatSettingsDTO() {
     var replaceSpawns = false
     var rangeOfInfluence = 16
+    var habitatPool: HabitatPoolSettingsDTO = HabitatPoolSettingsDTO(NaturalHabitatPool.default())
 
     constructor(naturalHabitatSpawning: NaturalHabitatSpawning): this() {
         this.replaceSpawns = naturalHabitatSpawning.replaceSpawns
         this.rangeOfInfluence = naturalHabitatSpawning.rangeOfInfluence
+        this.habitatPool = HabitatPoolSettingsDTO(naturalHabitatSpawning.pool)
     }
 
     fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeBoolean(replaceSpawns)
         buffer.writeInt(rangeOfInfluence)
+        habitatPool.encode(buffer)
     }
 
-    fun decode(buffer: RegistryFriendlyByteBuf, ) {
+    fun decode(
+        buffer: RegistryFriendlyByteBuf,
+        buckets: List<SpawnBucket>
+    ) {
         this.replaceSpawns = buffer.readBoolean()
         this.rangeOfInfluence = buffer.readInt()
+        this.habitatPool = HabitatPoolSettingsDTO()
+        habitatPool.decode(buffer, buckets)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/spawningstyle/ActivatedHabitatSpawning.kt

@@ -8,16 +8,17 @@
 
 package com.cobblemon.mod.common.api.habitats.spawningstyle
 
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.habitats.HabitatSpawnActivatedEvent
+import com.cobblemon.mod.common.api.habitats.ActivatedHabitatPool
+import com.cobblemon.mod.common.api.habitats.ActivatedHabitatSpawn
 import com.cobblemon.mod.common.api.habitats.ActivatedHabitatSpawningInfluence
 import com.cobblemon.mod.common.api.spawning.SpawnCause
+import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
 import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
 import com.cobblemon.mod.common.api.spawning.spawner.FixedAreaSpawner
 import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
 import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.core.BlockPos
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.server.level.ServerLevel
@@ -26,7 +27,7 @@ import net.minecraft.server.level.ServerLevel
  * A habitat spawning style defined by being triggered by something. The activation trigger, [trigger], is either
  * a redstone pulse, every tick, or every random tick.
  *
- * The spawn details are generated from the pool every time there is some change to the habitat block's settings,
+ * The spawn details are generated from the [pool] every time there is some change to the habitat block's settings,
  * then those spawn details are used for spawning Pokémon when the habitat block is triggered.
  *
  * The [chance] property is applied after the trigger logic so that not every activation necessarily results in a spawn
@@ -36,10 +37,6 @@ import net.minecraft.server.level.ServerLevel
  * @since February 14th, 2026
  */
 class ActivatedHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : HabitatSpawningStyle {
-    companion object {
-        val TYPE = cobblemonResource("activated")
-    }
-
     enum class Trigger {
         /** Requires a redstone pulse. */
         REDSTONE,
@@ -49,8 +46,7 @@ class ActivatedHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : Hab
         RANDOM_TICK
     }
 
-    @Transient
-    override val type = TYPE
+    override val type = ActivatedHabitatSpawn.TYPE
 
     /** The chance that an activation by the [trigger] will result in a spawn attempt. The spawn attempt may still fail. */
     var chance = 1F
@@ -64,7 +60,11 @@ class ActivatedHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : Hab
     var maxSpawns = -1
     /** The maximum number of Pokémon that can spawn in a single activation. This will still be capped by [maxSpawns]. */
     var maxSpawnsPerActivation = 1
+    /** The pool of spawns to choose from. */
+    var pool: ActivatedHabitatPool = ActivatedHabitatPool.default()
 
+    // This is cached here so that it doesn't have to be regenerated every time the block is triggered, updated when settings change.
+    var spawnDetails: List<SpawnDetail> = listOf()
     lateinit var spawner: FixedAreaSpawner
 
     override fun writeToNBT(nbt: CompoundTag) {
@@ -75,6 +75,10 @@ class ActivatedHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : Hab
         nbt.putInt(DataKeys.HABITAT_ACTIVATED_SPAWN_RANGE, spawnRange)
         nbt.putInt(DataKeys.HABITAT_ACTIVATED_MAX_SPAWNS, maxSpawns)
         nbt.putInt(DataKeys.HABITAT_ACTIVATED_MAX_SPAWNS_PER_ACTIVATION, maxSpawnsPerActivation)
+
+        val poolNBT = CompoundTag()
+        writePoolToNBT(pool, poolNBT)
+        nbt.put(DataKeys.HABITAT_POOL, poolNBT)
     }
 
     override fun readFromNBT(nbt: CompoundTag) {
@@ -84,18 +88,25 @@ class ActivatedHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : Hab
         spawnRange = nbt.getInt(DataKeys.HABITAT_ACTIVATED_SPAWN_RANGE)
         maxSpawns = nbt.getInt(DataKeys.HABITAT_ACTIVATED_MAX_SPAWNS)
         maxSpawnsPerActivation = nbt.getInt(DataKeys.HABITAT_ACTIVATED_MAX_SPAWNS_PER_ACTIVATION)
+
+        pool = HabitatSpawningStyle.readPoolFromNBT(
+            nbt = nbt.getCompound(DataKeys.HABITAT_POOL),
+            poolInitializer = ::ActivatedHabitatPool,
+            spawnInitializer = ::ActivatedHabitatSpawn,
+            defaultPool = ActivatedHabitatPool::default
+        )
     }
 
     fun generateSpawnDetails(world: ServerLevel, pos: BlockPos) {
+        spawnDetails = pool.createSpawnDetails(habitatBlockEntity)
         spawner = FixedAreaSpawner(
             name = "habitat_spawner_$pos",
             world = world,
             position = pos,
             spawnPool = SpawnPool("habitat_block").also {
-                it.details.addAll(habitatBlockEntity.spawnDetails)
+                it.details.addAll(spawnDetails)
                 it.precalculate()
             },
-            buckets = Cobblemon.bestSpawner.config.activatedHabitatBuckets,
             maxPokemonPerChunk = 16F,
             verticalRadius = spawnRange,
             horizontalRadius = spawnRange
@@ -107,7 +118,7 @@ class ActivatedHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : Hab
         // Check if the spawn attempt should even happen based on chance.
         if (chance < 1F && world.random.nextFloat() >= chance) {
             return
-        } else if (habitatBlockEntity.spawnDetails.isEmpty()) {
+        } else if (spawnDetails.isEmpty()) {
             // If there are no spawn details, then there's no point in trying to spawn anything.
             return
         }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/spawningstyle/HabitatSpawningStyle.kt

@@ -8,7 +8,15 @@
 
 package com.cobblemon.mod.common.api.habitats.spawningstyle
 
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.habitats.HabitatPool
+import com.cobblemon.mod.common.api.habitats.HabitatPools
+import com.cobblemon.mod.common.api.habitats.HabitatSpawn
+import com.cobblemon.mod.common.util.DataKeys
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.ListTag
+import net.minecraft.nbt.Tag
 import net.minecraft.resources.ResourceLocation
 
 /**
@@ -25,4 +33,47 @@ sealed interface HabitatSpawningStyle {
 
     fun writeToNBT(nbt: CompoundTag)
     fun readFromNBT(nbt: CompoundTag)
+
+    fun writePoolToNBT(pool: HabitatPool<*>, nbt: CompoundTag) {
+        nbt.putString(DataKeys.HABITAT_POOL_ID, pool.id.toString())
+        if (pool.id.path.startsWith("custom__")) {
+            nbt.putString(DataKeys.HABITAT_POOL_NAME, pool.name)
+            val spawnsListNBT = ListTag()
+            for (spawn in pool.spawns) {
+                val spawnTag = CompoundTag()
+                spawn.writeToNBT(spawnTag)
+                spawnsListNBT.add(spawnTag)
+            }
+            nbt.put(DataKeys.HABITAT_POOL_SPAWNS, spawnsListNBT)
+        }
+    }
+    
+    companion object {
+        fun <T : HabitatSpawn, P : HabitatPool<T>> readPoolFromNBT(nbt: CompoundTag, poolInitializer: () -> P, spawnInitializer: () -> T, defaultPool: () -> P): P {
+            var pool: P
+            val poolId = nbt.getString(DataKeys.HABITAT_POOL_ID).asIdentifierDefaultingNamespace()
+            if (nbt.contains(DataKeys.HABITAT_POOL_NAME)) {
+                // It's one that was stored on the block
+                pool = poolInitializer()
+                pool.id = poolId
+                pool.name = nbt.getString(DataKeys.HABITAT_POOL_NAME)
+                val spawnsListNBT = nbt.getList(DataKeys.HABITAT_POOL_SPAWNS, Tag.TAG_COMPOUND.toInt())
+                val spawns = mutableListOf<T>()
+                spawnsListNBT.forEach { spawnTag ->
+                    try {
+                        val spawn = spawnInitializer().apply { readFromNBT(spawnTag as CompoundTag) }
+                        spawns.add(spawn)
+                    } catch (_: Exception) {
+                        // If there's an error reading a spawn, skip it and log the error.
+                        Cobblemon.LOGGER.error("Error reading activated habitat spawn from NBT for habitat block, skipping.")
+                    }
+                }
+                pool.spawns = spawns
+            } else {
+                pool = HabitatPools.habitatPoolsById[poolId] as? P ?: defaultPool()
+            }
+            
+            return pool
+        }
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/spawningstyle/NaturalHabitatSpawning.kt

@@ -8,18 +8,21 @@
 
 package com.cobblemon.mod.common.api.habitats.spawningstyle
 
+import com.cobblemon.mod.common.api.habitats.NaturalHabitatPool
+import com.cobblemon.mod.common.api.habitats.NaturalHabitatSpawn
+import com.cobblemon.mod.common.api.habitats.spawningstyle.HabitatSpawningStyle.Companion.readPoolFromNBT
+import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
 import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
 import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.resources.ResourceLocation
 
 /**
  * A habitat spawning style defined by tapping into regular spawning methods. This works by adding to the spawn list
  * for spawning that's occurring nearby. When [replaceSpawns] is set to true, the original spawns will be
- * removed completely in favour of the spawns provided in this habitat's pool.
+ * removed completely in favour of the spawns provided in this habitat's [pool].
  *
- * The spawn details are generated from the pool every time there is some change to the habitat block's settings,
+ * The spawn details are generated from the [pool] every time there is some change to the habitat block's settings,
  * then those spawn details are used for spawning Pokémon when world spawning is occurring nearby.
  *
  * Whether or not this interactions with overworld or fishing spawns is determined by whether the habitat pool has
@@ -29,13 +32,10 @@ import net.minecraft.resources.ResourceLocation
  * @since February 22nd, 2026
  */
 class NaturalHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : HabitatSpawningStyle {
-    companion object {
-        val TYPE = cobblemonResource("natural")
-    }
-
     @Transient
-    override val type: ResourceLocation = TYPE
+    override val type: ResourceLocation = NaturalHabitatSpawn.TYPE
 
+    var pool: NaturalHabitatPool = NaturalHabitatPool.default()
     var replaceSpawns = false
     var rangeOfInfluence = 16
 
@@ -43,19 +43,33 @@ class NaturalHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : Habit
     var affectsFishing = false
     @Transient
     var affectsOverworld = false
+    @Transient
+    var spawnDetails: List<SpawnDetail> = listOf()
 
     fun generateSpawnDetails() {
-        affectsFishing = habitatBlockEntity.spawnDetails.any { it.spawnablePositionType.name == "fishing" }
-        affectsOverworld = habitatBlockEntity.spawnDetails.any { it.spawnablePositionType.name != "fishing" }
+        spawnDetails = pool.createSpawnDetails(habitatBlockEntity = habitatBlockEntity)
+        affectsFishing = spawnDetails.any { it.spawnablePositionType.name == "fishing" }
+        affectsOverworld = spawnDetails.any { it.spawnablePositionType.name != "fishing" }
     }
 
     override fun writeToNBT(nbt: CompoundTag) {
         nbt.putBoolean(DataKeys.HABITAT_NATURAL_REPLACE_SPAWNS, replaceSpawns)
         nbt.putInt(DataKeys.HABITAT_NATURAL_RANGE_OF_INFLUENCE, rangeOfInfluence)
+
+        val poolNBT = CompoundTag()
+        writePoolToNBT(pool, poolNBT)
+        nbt.put(DataKeys.HABITAT_POOL, poolNBT)
     }
 
     override fun readFromNBT(nbt: CompoundTag) {
         replaceSpawns = nbt.getBoolean(DataKeys.HABITAT_NATURAL_REPLACE_SPAWNS)
         rangeOfInfluence = nbt.getInt(DataKeys.HABITAT_NATURAL_RANGE_OF_INFLUENCE)
+
+        pool = readPoolFromNBT(
+            nbt = nbt.getCompound(DataKeys.HABITAT_POOL),
+            poolInitializer = ::NaturalHabitatPool,
+            spawnInitializer = ::NaturalHabitatSpawn,
+            defaultPool = NaturalHabitatPool::default
+        )
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/interaction/PokemonInteractions.kt

@@ -13,13 +13,13 @@ import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.api.pokemon.transformation.requirement.TransformationRequirement
+import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.client.data.PokemonInteractionsSyncPacket
-import com.cobblemon.mod.common.pokemon.transformation.adapters.CobblemonRequirementAdapter
-import com.cobblemon.mod.common.pokemon.transformation.adapters.LegacyItemConditionWrapperAdapter
-import com.cobblemon.mod.common.pokemon.transformation.requirements.PokemonPropertiesRequirement
+import com.cobblemon.mod.common.pokemon.adapters.CobblemonRequirementAdapter
+import com.cobblemon.mod.common.pokemon.evolution.adapters.LegacyItemConditionWrapperAdapter
+import com.cobblemon.mod.common.pokemon.requirements.PokemonPropertiesRequirement
 import com.cobblemon.mod.common.util.adapters.*
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.Gson
@@ -46,7 +46,7 @@ object PokemonInteractions : JsonDataRegistry<PokemonInteractionSet> {
         .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
         .registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
         .registerTypeAdapter(ItemPredicate::class.java, LegacyItemConditionWrapperAdapter)
-        .registerTypeAdapter(TransformationRequirement::class.java, CobblemonRequirementAdapter)
+        .registerTypeAdapter(Requirement::class.java, CobblemonRequirementAdapter)
         .registerTypeAdapter(InteractionEffect::class.java, InteractionEffectAdapter)
         .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
         .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)

common/src/main/kotlin/com/cobblemon/mod/common/api/interaction/PokemonInteration.kt

@@ -12,16 +12,11 @@ import com.bedrockk.molang.runtime.MoLangRuntime
 import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.api.pokemon.transformation.requirement.TransformationRequirement
+import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
-import com.cobblemon.mod.common.pokemon.transformation.adapters.CobblemonRequirementAdapter
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.giveOrDropItemStack
-import com.cobblemon.mod.common.util.readExpressionLike
-import com.cobblemon.mod.common.util.withPlayerValue
-import com.cobblemon.mod.common.util.withQueryValue
-import com.cobblemon.mod.common.util.writeExpressionLike
+import com.cobblemon.mod.common.pokemon.adapters.CobblemonRequirementAdapter
+import com.cobblemon.mod.common.util.*
 import com.google.gson.annotations.SerializedName
 import net.minecraft.core.registries.Registries
 import net.minecraft.network.FriendlyByteBuf
@@ -34,7 +29,7 @@ import net.minecraft.world.entity.item.ItemEntity
 import net.minecraft.world.item.ItemStack
 
 data class PokemonInteractionSet(
-    val requirements: List<TransformationRequirement> = listOf(),
+    val requirements: List<Requirement> = listOf(),
     val interactions: List<PokemonInteraction> = listOf(),
 ) {
     fun encode(buffer: FriendlyByteBuf) {
@@ -56,15 +51,11 @@ data class PokemonInteractionSet(
 }
 
 data class PokemonInteraction(
-    val requirements: List<TransformationRequirement> = listOf(),
+    val grouping: ResourceLocation,
+    val requirements: List<Requirement> = listOf(),
     val effects: List<InteractionEffect> = listOf(),
     val cooldown: ExpressionLike = "0".asExpressionLike()
 ) {
-    // Not put as a necessary constructor parameter because then there isn't a default constructor
-    // and that means Gson just gives null for everything in the constructor and falls back to the JSON
-    // properties - completely ignoring the default values above.
-    lateinit var grouping: ResourceLocation
-
     fun encode(buffer: FriendlyByteBuf) {
         buffer.writeResourceLocation(grouping)
         buffer.writeCollection(requirements) { it, requirement ->
@@ -85,12 +76,11 @@ data class PokemonInteraction(
             val cooldown = buffer.readExpressionLike()
 
             return PokemonInteraction(
+                grouping,
                 requirements,
                 effects,
                 cooldown,
-            ).also {
-                it.grouping = grouping
-            }
+            )
         }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/interaction/RequestManager.kt

@@ -74,7 +74,7 @@ abstract class RequestManager<T : ServerPlayerActionRequest> {
         ?: this.getInboundRequest(receiver.uuid, requestID)
 
     /** Determines whether [player] can receive a [T]. */
-    open fun isBusy(player: ServerPlayer): Boolean = player.isBusy() || player.isPartyBusy()
+    open fun isBusy(player: ServerPlayer): Boolean = player.isInBattle() || player.isTrading() || player.party().find { it.entity?.isBusy == true } != null
 
     /** Determines if the [target] is a valid interaction request target. */
     abstract fun isValidInteraction(player: ServerPlayer, target: ServerPlayer): Boolean

common/src/main/kotlin/com/cobblemon/mod/common/api/item/PokemonSelectingItem.kt

@@ -38,7 +38,7 @@ import net.minecraft.world.phys.AABB
  * @since July 29th, 2023
  */
 interface PokemonSelectingItem {
-    fun use(player: ServerPlayer, stack: ItemStack, ignoreShift: Boolean = false): InteractionResultHolder<ItemStack> {
+    fun use(player: ServerPlayer, stack: ItemStack): InteractionResultHolder<ItemStack> {
         val range = player.entityInteractionRange()
         val entity = player.level()
             .getEntities(player, AABB.ofSize(player.position(), range, range, range))
@@ -60,7 +60,7 @@ interface PokemonSelectingItem {
                 return interactWithSpecificBattle(player, stack, battlePokemon)
             }
         } ?: run {
-            if (ignoreShift || !player.isShiftKeyDown) {
+            if (!player.isShiftKeyDown) {
                 return if (entity != null) {
                     val pokemon = entity.pokemon
                     if (entity.ownerUUID == player.uuid) {

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

@@ -21,9 +21,34 @@ import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
 import com.cobblemon.mod.common.api.drop.DropEntry
-import com.cobblemon.mod.common.api.molang.function.*
+import com.cobblemon.mod.common.api.molang.function.BattleActorMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.BattleMessageMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.BattleMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.BiomeMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.BlockMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.DimensionTypeMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.DropEntryMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.EntityMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.EvolutionMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.GeneralMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.ItemStackMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.LivingEntityMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.NPCMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.PCMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.PartyMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.PlayerMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.PokedexMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.PokemonEntityMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.PokemonMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.PokemonPropertiesMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.PokemonStoreMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.ServerMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.SpawnablePositionMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.SpeciesMoLangFunctions
+import com.cobblemon.mod.common.api.molang.function.WorldMoLangFunctions
 import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.api.scripting.CobblemonScripts
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.api.storage.PokemonStore
@@ -33,10 +58,8 @@ import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.pokemon.Species
-import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
 import com.cobblemon.mod.common.util.effectiveName
 import com.mojang.datafixers.util.Either
-import java.util.function.Function
 import net.minecraft.core.Holder
 import net.minecraft.core.Registry
 import net.minecraft.core.RegistryAccess
@@ -60,7 +83,14 @@ import net.minecraft.world.level.Level
 import net.minecraft.world.level.biome.Biome
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.dimension.DimensionType
+import net.minecraft.world.level.levelgen.Heightmap
+import net.minecraft.world.level.pathfinder.PathType
+import net.minecraft.world.level.storage.loot.LootParams
+import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets
+import net.minecraft.world.level.storage.loot.parameters.LootContextParams
+import net.minecraft.world.phys.AABB
 import net.minecraft.world.phys.Vec3
+import java.util.function.Function
 
 /**
  * Holds a bunch of useful MoLang trickery that can be used or extended in API

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

@@ -13,7 +13,7 @@ import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.util.asArrayValue
-import java.util.UUID
+import java.util.*
 
 object BattleMoLangFunctions : AbstractMoLangFunctionHolder<PokemonBattle>() {
     override fun PokemonBattle.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {

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

@@ -11,34 +11,31 @@ package com.cobblemon.mod.common.api.molang.function
 import com.bedrockk.molang.runtime.MoParams
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.pokemon.transformation.Transformation
-import com.cobblemon.mod.common.pokemon.transformation.evolution.Evolution
-import com.cobblemon.mod.common.pokemon.transformation.triggers.ItemInteractionTrigger
-import com.cobblemon.mod.common.pokemon.transformation.triggers.LevelUpTrigger
-import com.cobblemon.mod.common.pokemon.transformation.triggers.TradeTrigger
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolution
+import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
+import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
 
-object EvolutionMoLangFunctions : AbstractMoLangFunctionHolder<Transformation>() {
-    override fun Transformation.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+object EvolutionMoLangFunctions : AbstractMoLangFunctionHolder<Evolution>() {
+    override fun Evolution.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val evolution = this
         val map = hashMapOf<String, (MoParams) -> Any>()
 
+        map["result"] = { evolution.result.asMoLangValue() }
         map["is_optional"] = { DoubleValue(evolution.optional) }
-        map["reevaluate"] = { DoubleValue(evolution.reevaluate) }
+        map["consumes_held_item"] = { DoubleValue(evolution.consumeHeldItem) }
 
-        if (evolution is Evolution) {
-            map["result"] = { evolution.result.asMoLangValue() }
-            when (evolution.trigger) {
-                is LevelUpTrigger -> {
-                    map["is_level_up"] = { DoubleValue.ONE }
-                }
+        when (evolution) {
+            is LevelUpEvolution -> {
+                map["is_level_up"] = { DoubleValue.ONE }
+            }
 
-                is TradeTrigger -> {
-                    map["is_trade"] = { DoubleValue.ONE }
-                }
+            is TradeEvolution -> {
+                map["is_trade"] = { DoubleValue.ONE }
+            }
 
-                is ItemInteractionTrigger -> {
-                    map["is_item"] = { DoubleValue.ONE }
-                }
+            is ItemInteractionEvolution -> {
+                map["is_item"] = { DoubleValue.ONE }
             }
         }
 

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

@@ -444,7 +444,7 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
         map["force_evolve"] = forceEvolve@{ params ->
             val idx = params.getInt(0)
             val evolution = if (idx >= 0) pokemon.evolutions.elementAtOrNull(idx) else return@forceEvolve DoubleValue.ZERO
-            evolution?.perform(pokemon)
+            evolution?.forceEvolve(pokemon)
             StringValue(evolution.toString())
         }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/MoveTemplate.kt

@@ -12,8 +12,6 @@ import com.bedrockk.molang.runtime.struct.MoStruct
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
 import com.cobblemon.mod.common.api.moves.categories.DamageCategories
 import com.cobblemon.mod.common.api.moves.categories.DamageCategory
 import com.cobblemon.mod.common.api.types.ElementalType
@@ -57,7 +55,7 @@ open class MoveTemplate(
     val critRatio: Double,
     val effectChances: Array<Double>,
     val weight: Float
-) : ShowdownIdentifiable {
+) {
     val struct: MoStruct by lazy {
         QueryStruct(hashMapOf())
             .addFunction("name") { StringValue(name) }
@@ -165,8 +163,6 @@ open class MoveTemplate(
         return this.elementalType
     }
 
-    override fun showdownId() = ShowdownIdentifiable.REGEX.replace(this.name.lowercase(), "")
-
     fun getSelectionWeight(form: FormData): Float {
         return if (this in form.signatureMoves) {
             weight * MovesetBuilder.signatureMoveWeightMultiplier

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/ActionEffectTimeline.kt

@@ -10,17 +10,13 @@ package com.cobblemon.mod.common.api.moves.animations
 
 import com.bedrockk.molang.runtime.MoLangRuntime
 import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions
 import com.cobblemon.mod.common.api.moves.animations.keyframes.ActionEffectKeyframe
-import com.cobblemon.mod.common.api.scheduling.Schedulable
-import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
 import com.cobblemon.mod.common.entity.npc.NPCEntity
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.resolveBoolean
-import java.util.concurrent.CompletableFuture
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.level.Level
+import java.util.concurrent.CompletableFuture
 
 /**
  * An action effect will run and execute a series of 'keyframes', with each running once
@@ -40,7 +36,7 @@ class ActionEffectTimeline(
     }
 
     fun run(context: ActionEffectContext): CompletableFuture<Unit> {
-        val future = if (timeline.isEmpty() || !context.runtime.resolveBoolean(condition)) {
+        return if (timeline.isEmpty() || !context.runtime.resolveBoolean(condition)) {
             CompletableFuture.completedFuture(Unit)
         } else {
             val finalFuture = CompletableFuture<Unit>()
@@ -51,10 +47,6 @@ class ActionEffectTimeline(
             it.printStackTrace()
             CompletableFuture.completedFuture(Unit)
         }
-
-        context.future = future
-        future.thenRun { context.getHolds().forEach(context::removeHold) }
-        return future
     }
 
     fun chainKeyframes(context: ActionEffectContext, iterator: Iterator<ActionEffectKeyframe>, finalFuture: CompletableFuture<Unit>) {
@@ -73,45 +65,15 @@ class ActionEffectTimeline(
 
 class ActionEffectContext(
     val actionEffect: ActionEffectTimeline,
-    private val holds: MutableSet<String> = mutableSetOf(),
+    val holds: MutableSet<String> = mutableSetOf(),
     val providers: MutableList<Any> = mutableListOf(),
     val runtime: MoLangRuntime,
     var canBeInterrupted: Boolean = false,
     var interrupted: Boolean = false,
     var currentKeyframes: MutableList<ActionEffectKeyframe> = mutableListOf(),
-    var level: Level? = null,
-    var holdRemovalCallbacks: MutableMap<String, () -> Unit> = mutableMapOf(),
-    var tracker: Schedulable = ServerTaskTracker
+    var level: Level? = null
 ) {
-    companion object {
-        fun fromPokemonEntity(
-            actionEffect: ActionEffectTimeline,
-            pokemonEntity: PokemonEntity,
-            runtime: MoLangRuntime = MoLangRuntime().also { it.environment.query.addStandardFunctions() },
-            holds: Collection<String> = emptySet(),
-            holdRemovalCallbacks: Map<String, () -> Unit> = emptyMap()
-        ): ActionEffectContext {
-            return ActionEffectContext(
-                actionEffect = actionEffect,
-                providers = mutableListOf(UsersProvider(listOf(pokemonEntity))),
-                holdRemovalCallbacks = holdRemovalCallbacks.toMutableMap(),
-                holds = holds.toMutableSet(),
-                runtime = runtime,
-                level = pokemonEntity.level()
-            )
-        }
-    }
-
-    lateinit var future: CompletableFuture<Unit>
     inline fun <reified T> findOneProvider() = providers.filterIsInstance<T>().firstOrNull()
-
-    /** Returns a reference to the internal holds set so you can keep an eye on it. */
-    fun getHolds(): Set<String> = holds
-    fun addHold(hold: String) = holds.add(hold)
-    fun removeHold(hold: String) {
-        holds.remove(hold)
-        holdRemovalCallbacks.remove(hold)?.invoke()
-    }
 }
 
 class UsersProvider(users: List<Entity>): EntityProvider {

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/AddHoldsActionEffectKeyframe.kt

@@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture
 class AddHoldsActionEffectKeyframe : ActionEffectKeyframe {
     val holds = mutableSetOf<String>()
     override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
-        holds.forEach(context::addHold)
+        context.holds.addAll(holds)
         return CompletableFuture.completedFuture(Unit)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/AnimationActionEffectKeyframe.kt

@@ -49,6 +49,6 @@ class AnimationActionEffectKeyframe : ConditionalActionEffectKeyframe(), EntityC
             players.forEach { it.sendPacket(pkt) }
         }
 
-        return delayedFuture(seconds = delay.resolveFloat(context.runtime), tracker = context.tracker)
+        return delayedFuture(seconds = delay.resolveFloat(context.runtime))
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityMoLangActionEffectKeyframe.kt

@@ -46,6 +46,6 @@ class EntityMoLangActionEffectKeyframe : ConditionalActionEffectKeyframe(), Enti
             players.forEach { it.sendPacket(pkt) }
         }
 
-        return delayedFuture(seconds = delay.resolveFloat(context.runtime), context.tracker)
+        return delayedFuture(seconds = delay.resolveFloat(context.runtime))
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityParticlesActionEffectKeyframe.kt

@@ -18,6 +18,7 @@ import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import net.minecraft.commands.arguments.EntityArgument.getPlayers
 import java.util.concurrent.CompletableFuture
 import net.minecraft.server.level.ServerLevel
 
@@ -78,6 +79,6 @@ class EntityParticlesActionEffectKeyframe : ConditionalActionEffectKeyframe(), E
             }
         }
 
-        return delayedFuture(seconds = delay.resolveFloat(context.runtime), context.tracker)
+        return delayedFuture(seconds = delay.resolveFloat(context.runtime))
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntitySoundActionEffectKeyframe.kt

@@ -15,8 +15,8 @@ import com.cobblemon.mod.common.api.moves.animations.UsersProvider
 import com.cobblemon.mod.common.api.scheduling.delayedFuture
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import java.util.concurrent.CompletableFuture
 import net.minecraft.core.registries.Registries
+import java.util.concurrent.CompletableFuture
 
 /**
  * An action effect keyframe that plays a positioned sound for all matching entities.
@@ -45,6 +45,6 @@ class EntitySoundActionEffectKeyframe : ConditionalActionEffectKeyframe(), Entit
             entity.playSound(soundEvent, 1f, 1f)
         }
 
-        return delayedFuture(seconds = delay.resolveFloat(context.runtime), context.tracker)
+        return delayedFuture(seconds = delay.resolveFloat(context.runtime))
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/MoLangActionEffectKeyframe.kt

@@ -8,6 +8,8 @@
 
 package com.cobblemon.mod.common.api.moves.animations.keyframes
 
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
 import com.cobblemon.mod.common.api.scheduling.delayedFuture
@@ -25,6 +27,6 @@ class MoLangActionEffectKeyframe : ActionEffectKeyframe {
     val delay: ExpressionLike = "0".asExpressionLike()
     override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
         expressions.resolve(context.runtime)
-        return delayedFuture(seconds = delay.resolveFloat(context.runtime), context.tracker)
+        return delayedFuture(seconds = delay.resolveFloat(context.runtime))
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/MoveToTargetActionEffectKeyframe.kt

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
 import com.cobblemon.mod.common.api.moves.animations.ActionEffects
 import com.cobblemon.mod.common.api.moves.animations.TargetsProvider
 import com.cobblemon.mod.common.api.moves.animations.UsersProvider
+import com.cobblemon.mod.common.api.scheduling.afterOnServer
 import com.cobblemon.mod.common.entity.ai.OmniPathNavigation.NavigationContext
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.asExpressionLike
@@ -60,7 +61,7 @@ class MoveToTargetActionEffectKeyframe : ActionEffectKeyframe {
             }
         )
 
-        context.tracker.after(seconds = timeout.resolveFloat(context.runtime)) {
+        afterOnServer(seconds = timeout.resolveFloat(context.runtime)) {
             if (!future.isDone && !timedOut) {
                 timedOut = true
                 timeoutEffect.run(context).thenApply { future.complete(Unit) }

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/PauseActionEffectKeyframe.kt

@@ -14,5 +14,5 @@ import com.cobblemon.mod.common.util.asExpressionLike
 
 class PauseActionEffectKeyframe : ConditionalActionEffectKeyframe() {
     val pause = "1".asExpressionLike()
-    override fun playWhenTrue(context: ActionEffectContext) = delayedFuture(seconds = pause.resolveFloat(context.runtime), context.tracker)
+    override fun playWhenTrue(context: ActionEffectContext) = delayedFuture(seconds = pause.resolveFloat(context.runtime))
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/RemoveHoldsActionEffectKeyframe.kt

@@ -25,8 +25,11 @@ class RemoveHoldsActionEffectKeyframe : ActionEffectKeyframe {
     val holds = mutableSetOf<String>()
     override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
         return delayedFuture(seconds = delay).thenApply {
-            val holdsToRemove = if (holds.isEmpty()) context.getHolds() else holds
-            holdsToRemove.forEach(context::removeHold)
+            if (holds.isEmpty()) {
+                context.holds.clear()
+            } else {
+                context.holds.removeAll(holds)
+            }
         }
     }
 }