Port PokemonBehaviour to Codecs

Port Evolution stuff to codecs, rework RegistryLikeCondition to accept any registry type without implementation need.
Merge branch 'main' into custom-type-support
2023-10-15 15:09:58 +01:00 · 2023-10-15 14:06:17 +01:00 · 2023-10-13 15:57:18 +01:00 · 2023-10-13 15:27:22 +10:00 · 2023-10-12 21:29:06 +00:00 · 2023-10-12 18:15:32 +00:00
5495 changed files with 328460 additions and 31967 deletions
@@ -1,4 +1,15 @@
 # Changelog
+## [1.?.?]()
+### Developer
+- Various breaking changes have been made to ElementalTypes, Moves and other registries, Cobblemon has migrated to make use of proper Minecraft registries.
+- DamageCategory is now an Enum.
+- Gender has been moved to an API package.
+
+### Datapack & Resourcepack Creators
+- Pokémon types can now be created via datapacks. Data path is ``your_mod_namespace/cobblemon/elemental_types/path_to_your_file``.
+- Custom moves are now possible via datapacks, these require JavaScript/TypeScript programming knowledge. Data path is ``your_mod_namespace/cobblemon/moves/path_to_your_file``.
+- Pokémon species data path has been changed to ``your_mod_namespace/cobblemon/species/path_to_your_file``.
+
 ## [1.4.0](#1-4-0)
 ### Additions
 - Added nicknaming.
@@ -15,27 +26,44 @@
 - Added support for jump keyframes (i.e. pre and post keyframes)
 - Added AI for Nosepass to point towards world spawn when idle.
 - Added structure spawn conditions
- Added cries for Gen 1-9 starters and their evolutions.
- Added cries for Chatot, Darmanitan, Darumaka, Lucario, Mimikyu, Quagsire, Riolu, Wooper, Caterpie, Metapod, Butterfree, Weedle, Kakuna, Beedrill, Pidgey, Pidgeotto, Pidgeot, Rattata, Raticate, Cleffa, Clefairy, Clefable, Tauros, Miltank, Buneary, Lopunny, Wooloo, Dubwool.
- Added recipes for Berry Juice, Heal Powder, Remedy, Fine Remedy, Superb Remedy, Revive, Max Revive, HP Up, Protein, Iron, Calcium, Zinc, Carbos, PP Up, PP Max, Pasture, Medicinal Leek to Magenta Dye, Roasted Leek, Leek and Potato Stew, Braised Vivichoke, Vivichoke Dip, Mulch Base, Growth Mulch, Surprise Mulch, Coarse Mulch, Humid Mulch, Rich Mulch, Loamy Mulch, Peat Mulch, Sandy Mulch, Health Feather, Muscle Feather, Resist Feather, Genius Feather, Clever Feather, Genius Feather
+- Added recipes for Berry Juice, Heal Powder, Remedy, Fine Remedy, Superb Remedy, Revive, Max Revive, HP Up, Protein, Iron, Calcium, Zinc, Carbos, PP Up, PP Max, Pasture, Medicinal Leek to Magenta Dye, Roasted Leek, Leek and Potato Stew, Braised Vivichoke, Vivichoke Dip, Mulch Base, Growth Mulch, Surprise Mulch, Coarse Mulch, Humid Mulch, Rich Mulch, Loamy Mulch, Peat Mulch, Sandy Mulch, X Attack, X Defense, X Special Attack, X Special Defense, X Speed, X Accuracy, Dire Hit, Guard Spec, Power Anklet, Power Band, Power Belt, Power Bracelet, Power Lens, Power Weight, Bright Powder, Destiny Knot
 - Added a shoulder mount for Mimikyu
 - Added Advancement trigger for defeating Pokémon and collecting varieties of Pokémon.
 - Added sleep animations to Arcanine, Jigglypuff, Wigglytuff, Vulpix and Ninetales.
 - Added flying placeholder animations to Pidgey, Pidgeotto, Pidgeot, Golbat, Crobat, Scyther, Scizor, Zapdos, Moltres, Articuno, Dragonite, Rowlet, Dartrix, and Decidueye.
- Added loot to various vanilla chest loot tables (Link Cable in Ancient Cities, Woodland Mansions, End Cities, and Igloos, Vivichoke Seeds in Jungle Temples, Dungeons, and Plains, Savanna, Snowy, and Taiga Villages, and all 7 Apricorn Sprouts in Desert, Plains, Savanna, Snowy, and Taiga Villages, as well as the Bonus Chest)
+- Added loot to various vanilla chest loot tables (Link Cable in Ancient Cities, Woodland Mansions, End Cities, and Igloos, Vivichoke Seeds in Jungle Temples, Dungeons, and Plains, Savanna, Snowy, and Taiga Villages, and all 7 Apricorn Sprouts in Desert, Plains, Savanna, Snowy, and Taiga Villages, as well as the Bonus Chest, which can also have 5 of the basic Poké Ball types)
 - Added the `/teststore <player> <store> <properties>` command allowing command block/mcfunction users to query a party, PC or both for Pokémon matching specific properties and returning the match count, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.teststore` if a permission mod is present.
 - Added the `/querylearnset <player> <slot> <move>` command allowing command block/mcfunction users to query a party slot and check if the Pokémon can learn a specific move returning a 1 if yes otherwise 0, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.querylearnset` if a permission mod is present.
 - Added the `/testpcslot <player> <slot> <properties>` command allowing command block/mcfunction users to query a pc slot and check if the Pokémon matches specific properties returning a 1 if yes otherwise 0, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.testpcslot` if a permission mod is present.
 - Added the `/testpartyslot <player> <slot> <properties>` command allowing command block/mcfunction users to query a party slot and check if the Pokémon matches a specific properties returning a 1 if yes otherwise 0, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.testpartyslot` if a permission mod is present.
 - Added the `/clearparty <player>` command for emptying a player's party.
+- Added the `/clearpc <player>` command for emptying a player's PC.
 - Added the `/pokemonrestart <reset_starters>` and the `/pokemonrestartother <player> <reset_starters>` command allowing command block/mcfunction users to reset a players Pokémon data.
 - Added support for "isBattle" and "isTouchingWater" properties on resource pack Pokémon poses. This allows your custom Pokémon to be posed differently when in battle.
 - Added support for "isVisible" on a transformed part on resource pack Pokémon poses. This allows your custom Pokémon to have bones disappear in specific poses, such as hiding Greninja's throwing star when not in a battle pose.
+- Added a "doShinyStarters" gamerule
 - Added the `doPokemonLoot` gamerule to toggle Pokémon dropping items/exp on death.
+- Added support for battle music. Sounds can be added to the ``battle.pvp.default`` and ``battle.pvw.default`` sound events.
+- Added ability activation announcement when in battle.
+- Added Auspicious Armor and Malicious Armor, which can be used to evolve Charcadet into Armarouge or Ceruledge respectively.
+- Added animations for Wailord.
+- Added Cherry Torterra variant.
+- Added 2 new face spots for Spinda.
+- Added Forretress Shulker variant.
+- Added 'enabled' optional property on model layers, allowing later variations to disable previously-defined layers. See [this issue](https://gitlab.com/cable-mc/cobblemon/-/issues/335) for how this looks.

 ### Pokémon Added
 #### Gen 2

+- Chikorita
+- Bayleef
+- Meganium
+- Totodile
+- Croconaw
+- Feraligatr
+- Cyndaquil
+- Quilava
+- Typhlosion
 - Spinarak
 - Ariados
 - Shuckle
@@ -49,6 +77,12 @@
 - Flaaffy
 - Ampharos
 - Sudowoodo
+- Snubbull
+- Granbull
+- Phanpy
+- Donphan
+- Teddiursa
+- Ursaring

 #### Gen 3

@@ -62,7 +96,7 @@
 - Cacnea
 - Cacturne
 - Poochyena
- Mightyenna
+- Mightyena
 - Wingull
 - Pelipper
 - Numel
@@ -75,11 +109,22 @@
 - Chimecho
 - Barboach
 - Whiscash
+- Volbeat
+- Illumise
+- Zigzagoon
+- Linoone
+- Ralts
+- Kirlia
+- Gardevoir
+- Nincada
+- Ninjask
+- Shedinja
+- Beldum
+- Metang
+- Metagross

 #### Gen 4

- Cherubi (Planned)
- Cherrim (Planned)
 - Carnivine
 - Shinx
 - Luxio
@@ -92,48 +137,77 @@
 - Chatot
 - Combee
 - Vespiquen
+- Buizel
+- Floatzel
+- Starly
+- Staravia
+- Staraptor
+- Gallade

 #### Gen 5

- Bouffolant
+- Bouffalant
 - Roggenrola
 - Boldore
 - Gigalith
- Venepede
- Whirlpede
+- Venipede
+- Whirlipede
 - Scolipede
- Yamask (Planned)
- Cofagrigus (Planned)
- Patrat (Planned)
- Watchog (Planned)
+- Yamask
+- Cofagrigus
+- Patrat
+- Watchog
 - Lillipup
 - Herdier
 - Stoutland
+- Cottonee
+- Whimsicott
+- Pidove
+- Tranquill
+- Unfezant
+- Timburr
+- Gurdurr
+- Conkeldurr

 #### Gen 6

 - Scatterbug
 - Spewpa
- Vivillion
- Skrelp (Planned)
- Dragalge (Planned)
- Bunnelby (Planned)
- Diggersby (Planned)
+- Vivillon
+- Skrelp
+- Dragalge
+- Bunnelby
+- Diggersby
+- Phantump
+- Trevenant
+- Fletchling
+- Fletchinder
+- Talonflame

 #### Gen 7

- Wishiwashi (Planned)
+- Wishiwashi
 - Cutiefly
 - Ribombee
 - Stufful
 - Bewear
 - Comfey
 - Alolan Exeggutor
+- Alolan Raichu
+- Alolan Meowth
+- Alolan Persian
+- Komala
+- Wimpod
+- Golisopod
+- Crabrawler
+- Crabominable
+- Mudbray
+- Mudsdale

 #### Gen 8

- Arrokuda (Planned)
- Barraskewda (Planned)
+- Arrokuda
+- Barraskewda
 - Nickit
 - Thievul
 - Falinks
@@ -142,12 +216,28 @@
 - Rookidee
 - Corvisquire
 - Corviknight
+- Galarian Ponyta
+- Galarian Rapidash
+- Yamper
+- Boltund
+- Galarian Zigzagoon
+- Galarian Linoone
+- Obstagoon
+- Galarian Meowth
+- Perrserker
+- Ursaluna

 #### Gen 9

- Sprigatitto
+- Sprigatito
 - Floragato
 - Meowscarada
+- Fuecoco
+- Crocalor
+- Skeledirge
+- Quaxly
+- Quaxwell
+- Quaquaval
 - Flittle
 - Espathra
 - Garganacl
@@ -157,20 +247,29 @@
 - Ceruledge
 - Cetoddle
 - Cetitan
- Shroodle (Planned)
- Grafaiai (Planned)
+- Shroodle
+- Grafaiai
 - Tandemaus
 - Maushold
 - Varoom
 - Revavroom
- Squawkabilly (Planned)
+- Squawkabilly
 - Glimmet
 - Glimmora
-
+- Annihilape
+- Tinkatink
+- Tinkatuff
+- Tinkaton
+- Maschiff
+- Mabosstiff
+- Lechonk
+- Oinkologne
+- Paldean Wooper
+- Clodsire

 ### Changes
- Updated model and textures of Arcanine, Magnemite, Magneton, Magnezone, Exeggcute, Exeggutor, Farfetchd, Elekid, Electabuzz, Electivire, Pichu, Pikachu, Raichu, Gengar, Wooper Drowzee, Hypno, Aerodactyl, Spearow, Fearow, Lickitung, Pidgeotto, Pidgeot, Scyther, Scizor, Kleavor, Popplio, Brionne, Primarina, Torchic, Combusken, Blaziken, Aerodacyl, Scyther, Scizor, Kleavor, Lickitung, Lickilicky, Happiny, Chansey, Pidgey, Pidgeotto, Pidgeot, Spearow, Fearow, Drowzee, Hypno, Arcanine, Magnemite, Magneton, Magnezone, Exeggcute, Exeggutor, Farfetchd, Elekid, Electabuzz, Electivire, Pichu, Pikachu, Raichu, and Gengar.
- Updated models of Sceptile and Shuckle.
+- Updated model and textures of Spiritomb, Koffing, Weezing, Kadabra, Alakazam, Emolga, Oshawott, Doduo, Dodrio, Dratini, Dragonair, Dragonite, Sneasel, Weavile, Gyarados, Hitmonlee, Hitmonchan, Chesnaught, Spinda, Mamoswine, Steelix, Midreavus, Mismagius, Buneary, Lopunny, Golduck, Meowth, Persian, Fennekin, Braixen, Delphox, Snivy, Servine, Serperior, Ratatta, Raticate, Nidorina, Nidoqueen, NidoranM, Nidoking, Riolu, Lucario, Haunter, Mankey, Primeape, Mew, Mewtwo, Arcanine, Magnemite, Magneton, Magnezone, Exeggcute, Exeggutor, Elekid, Electabuzz, Electivire, Pichu, Pikachu, Raichu, Gengar, Wooper, Drowzee, Hypno, Aerodactyl, Spearow, Fearow, Lickitung, Pidgey, Pidgeotto, Pidgeot, Scyther, Scizor, Kleavor, Popplio, Brionne, Primarina, Torchic, Combusken, Blaziken, Aerodacyl, Scyther, Scizor, Kleavor, Lickitung, Lickilicky, Happiny, Chansey and Blissey.
+- Updated animations for Steelix, Turtwig, Grotle, Torterra, Ponyta, Rapidash, Piplup, Prinplup, Empoleon, Drowzee, Hypno, Farfetch'd, Exeggcute, Exeggutor, Bidoof, Chimecho, Lickytung, Lickilicky, Popplio, Brionne, Luvdisc, Chimchar, Monferno, Infernape, Sobble, Drizzile, Inteleon, Greninja, Heatmor, Aerodactyl, Ditto, Lotad, Lombre, Ludicolo, Pumpkaboo, Gourgeist.
 - Updated sprites for EV medicines, the rare candy, and the apricorn door item.
 - Updated textures for apricorn doors and all the evolution stone ores.
 - Updated Apricorn Leaves color.
@@ -182,12 +281,11 @@
 - Cobblemon items can now all have their own tooltips via resourcepacks, to add a tooltip simply add a lang entry like "item.cobblemon.{item_id}.tooltip", if you want to add multiple tooltip lines you can do so with "item.cobblemon.{item_id}.tooltip_1" and upwards.
 - Updated texture of Weedle.
 - Updated shiny texture of Dwebble and Crustle.
- Updated Animations for Piplup, Prinplup, Empoleon, Drowzee, Hypno, Farfetch'd, Exeggcute, Exeggutor, Bidoof, Chimecho, Lickytung, Lickilicky, Popplio, Brionne, Luvdisc, Chimchar, Monferno, Infernape, Sobble, Drizzile, Inteleon, Greninja, Heatmor, Aerodactyl, Ditto, Lotad, Lombre, Ludicolo, Pumpkaboo, Gourgeist.
 - Reorganised the advancements recipes folder
- Pokeedit command now supports IVs and EVs.
+- Pokéedit command now supports IVs and EVs.
 - Reorganised creative categories
- Pokemon can now wander into non-solid blocks such as foliage
- Pokeballs now despawn after 30 seconds
+- Pokémon can now wander into non-solid blocks such as foliage
+- Pokéballs now despawn after 30 seconds
 - Dive Balls will now have the same motion speed underwater as if they were thrown in the air.
 - Hardcoded potion shoulder effects have been removed, you can now use any potion vanilla or otherwise with the parameters you'd like, for more information see the [Datapack & Resourcepack Creators](#datapack-&-resourcepack-creators) section.
 - Clicking categories of the Stat sub-section or the party reorder button in the Summary screen will now produce a click sound.
@@ -196,11 +294,85 @@
 - Friendship will slowly increase when Pokémon are shoulder-mounted.
 - Master balls are now unable to be burned when dropped into fire/lava.
 - Pokémon will appear red when hurt, like regular entities, except when they're fainting.
+- Ponyta and Rapidash now have animated textures.
+- Pokémon's air meter no longer depletes while battling underwater.
+- Sleeping partially restores PP of Pokémon
+- Item interaction evolutions and held item requirements now support NBT by creating an object JSON containing the key ``item`` for what used to be the existing condition support and a ``nbt`` key for the NBT format, this is the string [format](https://minecraft.fandom.com/wiki/NBT_format) expected in commands. Existing data does not need to be updated.
+- Shoulder mounts now match the shoulder position a bit more accurately when sneaking.
+- Poison Heal will now cause poisoned Pokémon to heal outside of battle.
+- Updated Pokéball, PC, UI, evolution and Healing Machine sounds.
+
+### Added cries to the following Pokémon:
+- All starters and their evolutions
+- Caterpie, Metapod, Butterfree
+- Weedle, Kakuna, Beedrill
+- Pidgey, Pidgeotto, Pidgeot
+- Rattata, Raticate
+- Spearow, Fearow
+- Ekans, Arbok
+- Pichu, Pikachu, Raichu, Alolan Raichu
+- Cleffa, Clefairy, Clefable
+- Mankey, Primeape, Annihilape
+- Ponyta, Rapidash, Galarian Ponyta, Galarian Rapidash
+- Farfetch'd, Galarian Farfetch'd, Sirfetch'd
+- Onix, Steelix
+- Tauros
+- Ditto
+- Eevee, Vaporeon, Jolteon, Flareon, Espeon, Umbreon, Leafeon, Glaceon, Sylveon
+- Hoothoot, Noctowl
+- Mareep, Flaaffy, Ampharos
+- Aipom, Ambipom
+- Wooper, Quagsire, Clodsire
+- Snubbull, Granbull
+- Miltank
+- Poochyena, Mightyena
+- Taillow, Swellow
+- Ralts, Kirlia, Gardevoir, Gallade
+- Shroomish, Breloom
+- Nincada, Ninjask, Shedinja
+- Buneary, Lopunny
+- Chingling
+- Chatot
+- Riolu, Lucario
+- Pidove, Tranquill, Unfezant
+- Roggenrola, Boldore, Gigalith
+- Venipede, Whirlipede, Scolipede
+- Maractus
+- Dwebble, Crustle
+- Yamask, Cofagrigus
+- Bunnelby, Diggersby
+- Fletchling, Fletchinder, Talonflame
+- Scatterbug, Spewpa, Vivillon
+- Honedge, Doublade, Aegislash
+- Skrelp, Dragalge
+- Phantump, Trevenant
+- Pumpkaboo, Gourgeist
+- Bergmite, Avalugg
+- Mudbray, Mudsdale
+- Stufful, Bewear
+- Mimikyu
+- Rookidee, Corvisquire, Corviknight
+- Nickit, Thievul
+- Wooloo, Dubwool
+- Yamper, Boltund
+- Tandemaus
+- Fidough, Dachsbun
+- Squawkabilly
+- Nacli, Naclstack, Garganacl
+- Charcadet, Armarouge, Ceruledge
+- Maschiff, Mabosstiff
+- Shroodle, Grafaiai
+- Flittle, Espathra
+- Tinkatink, Tinkatuff, Tinkaton
+- Varoom, Revavroom
+- Glimmet, Glimmora
+- Cetoddle, Cetitan
+- Tatsugiri

 ### Fixes
 - Fixed spawning moon phase dependent Pokémon only when the moon phase is wrong
 - Fixed large Pokémon spawning partially inside walls where they suffocate.
- Fixed messages for entry hazards, screens, Tailwind, Perish Song, Destiny Bond, Shed Skin, Uproar, Forewarn, Disguise, Arena Trap, Yawn, Curse, Clamp, Whirlpool, Liquid Ooze, Miracle Eye and Safeguard.
+- Fixed messages for entry hazards, screens, weather, damage, healing, Tailwind, Perish Song, Destiny Bond, Shed Skin, Uproar, Forewarn, Disguise, Arena Trap, Yawn, Curse, Clamp, Whirlpool, Liquid Ooze, Miracle Eye, Safeguard, Magic Bounce, Lock On, Focus Energy, Confusion, and more.
 - Fixed Porygon not evolving with an Upgrade.
 - Fixed super sized Pumpkaboo not having any moves.
 - Fixed Infernape look animation.
@@ -226,19 +398,32 @@
 - Fixed particle animations not running when a Pokémon is off-screen.
 - Fixed Pokémon variants and layers not rendering correctly when shouldered and playing on a dedicated server, existing shoulders affected will need to be retrieved and shouldered again.
 - Shoulder effects will now stay applied through situations that remove potion effects such as drinking milk.
- Fixed Shedinja evolving to use the consumed Pokeball and removed the held item.
+- Fixed Shedinja evolving to use the consumed PokéBall and removed the held item.
 - Fixed non-existent species in spawn pool file causing random species to spawn.
 - Fixed shearing Pokémon dropping 0-2 wool instead of 1-3.
 - Fixed some alignment issues in the stat hexagon of the summary menu.
 - Fixed capture calculations not applying ball bonuses entirely correctly.
+- Fixed Shedinja healing above 1 HP.
+- Fixed battles soft-locking when consecutive Pokémon faint on switch-in.
+- Fixed timing and color of battle window messages.
+- Fixed players being able to trade, battle and let out their Pokémon while in spectator mode.
+- Fixed Galarian Yamask not being able to evolve and by proxy the ``damage_taken`` evolution requirement.
+- Fixed Bisharp not being able to evolve and by proxy the ``defeat`` evolution requirement.
+- Fixed White-Striped Basculin not being able to evolve and by proxy the ``recoil`` evolution requirement.
+- Fixed Primeape, Qwilfish and Stantler not being able to evolve and by proxy the ``use_move`` evolution requirement.
+- Fixed Bramblin, Pawmo, and Rellor not being able to evolve and by proxy the ``blocks_traveled`` evolution requirement.
+- Fixed displayName property in spawn files not doing what it's meant to do.
+- Fixed Pokémon not sleeping in the wild like we wanted them to.

 ### Developer
- Added SpawnEvent
- Added persistent NBT property inside Pokemon to store quick and simple data.
+- Added SpawnEvent, ThrownPokeballHitEvent, PokemonSentEvent, PokemonRecalledEvent.
+- Added BattleFledEvent, BattleStartedEvent, BattleFaintedEvent.
+- Added persistent NBT property inside Pokémon to store quick and simple data.
 - Species and FormData have had their evolutions, pre-evolution and labels properties exposed. It is still recommended to work using a Pokémon instance when possible.
- Added capture check to BattleVictoryEvent
- Added ThownPokeballHitEvent
+- Added capture check to BattleVictoryEvent.
 - The various hardcoded potion shoulder effects have been removed, make use of PotionBaseEffect.
+- Added ContextManager for tracking causes and contexts of conditions created during a battle. See BattleContext for types of conditions that are tracked. 
+- Added MongoDB support for storing Pokémon and Player data. Must be enabled in config, requires MongoDB core and sync drivers (4.10.0+).

 ### Datapack & Resourcepack Creators
 - All potion related shoulder effects have had their IDs changed, they now all share the same type being `potion_effect` and use the vanilla Potion data [parameters](https://minecraft.fandom.com/wiki/Potion#Item_data), take for example the default Pidgey asset:
@@ -252,6 +437,7 @@
      "showIcon": false
    }
    ```
+- Renamed the ``walked_steps`` evolution requirement to ``blocks_traveled``.

 ## [1.3.1 (March 31st, 2023)](#1-3-1)

@@ -288,7 +474,6 @@
 - Changed the recipes for Mystic Water, Miracle Seed, and Charcoal Stick to utilise the evolution stones, as well as Never-Melt Ice having an alternate recipe using the Ice Stone.
 - Replaced the `Failed to handle` battle messages to `Missing interpretation` to make it more clear that mechanics do work just still pending dedicated messages.
 - Healing Machine and PC are now mine-able with pickaxes and Apricorn leaves are mine-able using hoes.
- Updated Pokéball, UI and evolution sounds.

 ### Fixes
 - Fixed killing a Dodrio killing your game. Dodrio will never look the same to us.
@@ -25,6 +25,7 @@ repositories {
    mavenCentral()
    //JEI
    maven("https://maven.blamejared.com/")
+    maven("https://maven.tterrag.com/")
 }

 license {
@@ -27,6 +27,8 @@ dependencies {
    implementation(libs.reflect)

    modImplementation(libs.fabricLoader)
+    //Flywheel has no common dep so just pick one and don't use any platform specific code in common
+    modCompileOnly(libs.flywheelFabric)
    modApi(libs.molang)
    compileOnlyApi(libs.jeiApi)

@@ -35,6 +37,9 @@ dependencies {

    //shadowCommon group: 'commons-io', name: 'commons-io', version: '2.6'

+    // For datastore
+    modCompileOnly(libs.mongoDriverCore)
+    modCompileOnly(libs.mongoDriverSync)

    testRuntimeOnly(libs.junitEngine)
    testImplementation(libs.junitApi)
@@ -8,6 +8,8 @@

 package com.cobblemon.mod.common.client.render.models.blockbench.pose;

+import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityModel;
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
@@ -38,7 +40,7 @@ public interface Bone {
    /**
     * Renders a particular bone in relation to a particular entity.
     *
-     * @param entity The entity this bone is being drawn for. This parameter need not be available and can be null
+     * @param context The render context this bone is being drawn for.
     * @param stack The current [MatrixStack] for the renderer
     * @param buffer The vertex consumer deployed by the renderer
     * @param packedLight The light level to be applied to the bone
@@ -50,8 +52,8 @@ public interface Bone {
     *
     * @since 1.4.0
     */
-    <T extends Entity> void render(
-            @Nullable T entity,
+    void render(
+            RenderContext context,
            MatrixStack stack,
            VertexConsumer buffer,
            int packedLight,
@@ -1,25 +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.cobblemonstructures;
-
-public class CobblemonStructureIDs {
-    //Location of the nbt
-    //Not sure if this is a good way to store them but doing this meant I wouldnt have to keep typing this out during development
-    public static final String PLAINS_POKECENTER = "cobblemon:village_plains/village_plains_pokecenter";
-    public static final String DESERT_POKECENTER = "cobblemon:village_desert/village_desert_pokecenter";
-    public static final String SAVANNA_POKECENTER = "cobblemon:village_savanna/village_savanna_pokecenter";
-    public static final String SNOWY_POKECENTER = "cobblemon:village_snowy/village_snowy_pokecenter";
-    public static final String TAIGA_POKECENTER = "cobblemon:village_taiga/village_taiga_pokecenter";
-
-    public static final String PLAINS_LONG_PATH = "cobblemon:village_plains/village_plains_long_path";
-    public static final String DESERT_LONG_PATH = "cobblemon:village_desert/village_desert_long_path";
-    public static final String SAVANNA_LONG_PATH = "cobblemon:village_savanna/village_savanna_long_path";
-    public static final String SNOWY_LONG_PATH = "cobblemon:village_snowy/village_snowy_long_path";
-    public static final String TAIGA_LONG_PATH = "cobblemon:village_taiga/village_taiga_long_path";
-}
@@ -1,101 +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.cobblemonstructures;
-
-import com.cobblemon.mod.common.mixin.StructurePoolAccessor;
-import com.mojang.datafixers.util.Pair;
-import net.minecraft.registry.Registry;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.structure.pool.LegacySinglePoolElement;
-import net.minecraft.structure.pool.SinglePoolElement;
-import net.minecraft.structure.pool.StructurePool;
-import net.minecraft.structure.pool.StructurePoolElement;
-import net.minecraft.structure.processor.StructureProcessorList;
-import net.minecraft.structure.processor.StructureProcessorLists;
-import net.minecraft.util.Identifier;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class CobblemonStructures {
-
-    private static final RegistryKey<StructureProcessorList> EMPTY_PROCESSOR_LIST_KEY = RegistryKey.of(RegistryKeys.PROCESSOR_LIST, new Identifier("minecraft", "empty"));
-    private static final Integer pokecenterWeight = 35;
-    private static final Integer longPathWeight = 10;
-
-    public static void registerJigsaws(MinecraftServer server) {
-        Registry<StructurePool> templatePoolRegistry = server.getRegistryManager().get(RegistryKeys.TEMPLATE_POOL);
-        Registry<StructureProcessorList> processorListRegistry = server.getRegistryManager().get(RegistryKeys.PROCESSOR_LIST);
-
-        //No pokecenters yet
-        //addPokecenters(templatePoolRegistry, processorListRegistry);
-        //addLongPaths(templatePoolRegistry, processorListRegistry);
-    }
-
-    private static void addPokecenters(Registry<StructurePool> templatePoolRegistry, Registry<StructureProcessorList> processorListRegistry) {
-        Identifier plainsHousesPoolLocation = new Identifier("minecraft:village/plains/houses");
-        Identifier desertHousesPoolLocation = new Identifier("minecraft:village/desert/houses");
-        Identifier savannaHousesPoolLocation = new Identifier("minecraft:village/savanna/houses");
-        Identifier snowyHousesPoolLocation = new Identifier("minecraft:village/snowy/houses");
-        Identifier taigaHousesPoolLocation = new Identifier("minecraft:village/taiga/houses");
-
-        addBuildingToPool(templatePoolRegistry, processorListRegistry, plainsHousesPoolLocation, CobblemonStructureIDs.PLAINS_POKECENTER, pokecenterWeight, StructurePool.Projection.RIGID, EMPTY_PROCESSOR_LIST_KEY);
-        addBuildingToPool(templatePoolRegistry, processorListRegistry, desertHousesPoolLocation, CobblemonStructureIDs.DESERT_POKECENTER, pokecenterWeight, StructurePool.Projection.RIGID, EMPTY_PROCESSOR_LIST_KEY);
-        addBuildingToPool(templatePoolRegistry, processorListRegistry, savannaHousesPoolLocation, CobblemonStructureIDs.SAVANNA_POKECENTER, pokecenterWeight, StructurePool.Projection.RIGID, EMPTY_PROCESSOR_LIST_KEY);
-        addBuildingToPool(templatePoolRegistry, processorListRegistry, snowyHousesPoolLocation, CobblemonStructureIDs.SNOWY_POKECENTER, pokecenterWeight, StructurePool.Projection.RIGID, EMPTY_PROCESSOR_LIST_KEY);
-        addBuildingToPool(templatePoolRegistry, processorListRegistry, taigaHousesPoolLocation, CobblemonStructureIDs.TAIGA_POKECENTER, pokecenterWeight, StructurePool.Projection.RIGID, StructureProcessorLists.MOSSIFY_10_PERCENT);
-    }
-    private static void addLongPaths(Registry<StructurePool> templatePoolRegistry, Registry<StructureProcessorList> processorListRegistry) {
-        Identifier plainsStreetsPoolLocation = new Identifier("minecraft:village/plains/streets");
-        Identifier desertStreetsPoolLocation = new Identifier("minecraft:village/desert/streets");
-        Identifier savannaStreetsPoolLocation = new Identifier("minecraft:village/savanna/streets");
-        Identifier snowyStreetsPoolLocation = new Identifier("minecraft:village/snowy/streets");
-        Identifier taigaStreetsPoolLocation = new Identifier("minecraft:village/taiga/streets");
-
-        addLegacyBuildingToPool(templatePoolRegistry, processorListRegistry, plainsStreetsPoolLocation, CobblemonStructureIDs.PLAINS_LONG_PATH, longPathWeight, StructurePool.Projection.TERRAIN_MATCHING, StructureProcessorLists.STREET_PLAINS);
-        addLegacyBuildingToPool(templatePoolRegistry, processorListRegistry, desertStreetsPoolLocation, CobblemonStructureIDs.DESERT_LONG_PATH, longPathWeight, StructurePool.Projection.TERRAIN_MATCHING, EMPTY_PROCESSOR_LIST_KEY);
-        addLegacyBuildingToPool(templatePoolRegistry, processorListRegistry, savannaStreetsPoolLocation, CobblemonStructureIDs.SAVANNA_LONG_PATH, longPathWeight, StructurePool.Projection.TERRAIN_MATCHING, StructureProcessorLists.STREET_SAVANNA);
-        addLegacyBuildingToPool(templatePoolRegistry, processorListRegistry, snowyStreetsPoolLocation, CobblemonStructureIDs.SNOWY_LONG_PATH, longPathWeight, StructurePool.Projection.TERRAIN_MATCHING, StructureProcessorLists.STREET_SNOWY_OR_TAIGA);
-        addLegacyBuildingToPool(templatePoolRegistry, processorListRegistry, taigaStreetsPoolLocation, CobblemonStructureIDs.TAIGA_LONG_PATH, longPathWeight, StructurePool.Projection.TERRAIN_MATCHING, StructureProcessorLists.STREET_SNOWY_OR_TAIGA);
-    }
-
-    public static void addLegacyBuildingToPool(Registry<StructurePool> templatePoolRegistry, Registry<StructureProcessorList> processorListRegistry, Identifier poolRL, String nbtPieceRL, int weight, StructurePool.Projection projection, RegistryKey<StructureProcessorList> processorListKey) {
-        addBuildingToPool(templatePoolRegistry, processorListRegistry, poolRL, nbtPieceRL, weight, projection, processorListKey, true);
-    }
-
-    public static void addBuildingToPool(Registry<StructurePool> templatePoolRegistry, Registry<StructureProcessorList> processorListRegistry, Identifier poolRL, String nbtPieceRL, int weight, StructurePool.Projection projection, RegistryKey<StructureProcessorList> processorListKey) {
-        addBuildingToPool(templatePoolRegistry, processorListRegistry, poolRL, nbtPieceRL, weight, projection, processorListKey, false);
-    }
-
-    public static void addBuildingToPool(Registry<StructurePool> templatePoolRegistry, Registry<StructureProcessorList> processorListRegistry, Identifier poolRL, String nbtPieceRL, int weight, StructurePool.Projection projection, RegistryKey<StructureProcessorList> processorListKey, boolean shouldUseLegacySingePoolElement) {
-        if (processorListRegistry.getEntry(processorListKey).isEmpty()) return;
-        RegistryEntry.Reference<StructureProcessorList> processorList = processorListRegistry.getEntry(processorListKey).get();
-
-        StructurePool pool = templatePoolRegistry.get(poolRL);
-        if (pool == null) return;
-
-        SinglePoolElement piece;
-        if (shouldUseLegacySingePoolElement) {
-            piece = LegacySinglePoolElement.ofProcessedLegacySingle(nbtPieceRL, processorList).apply(projection);
-        } else {
-            piece = SinglePoolElement.ofProcessedSingle(nbtPieceRL, processorList).apply(projection);
-        }
-
-        for (int i = 0; i < weight; i++) {
-            ((StructurePoolAccessor) pool).getElements().add(piece);
-        }
-
-        List<Pair<StructurePoolElement, Integer>> listOfPieceEntries = new ArrayList<>(((StructurePoolAccessor) pool).getElementCounts());
-        listOfPieceEntries.add(new Pair<>(piece, weight));
-        ((StructurePoolAccessor) pool).setElementCounts(listOfPieceEntries);
-    }
-}
@@ -0,0 +1,38 @@
+/*
+ * 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.mixin;
+
+import com.cobblemon.mod.common.block.PreEmptsExplosion;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.explosion.Explosion;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(value = Explosion.class)
+public class ExplosionMixin {
+
+    @Redirect(
+            method = "affectWorld",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/world/World;getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;",
+                    ordinal = 0
+            )
+    )
+    public BlockState cobblemon$whenExploded(World world, BlockPos pos) {
+        BlockState blockState = world.getBlockState(pos);
+        if(blockState.getBlock() instanceof PreEmptsExplosion preExplosionBlock) {
+            preExplosionBlock.whenExploded(world, blockState, pos);
+        }
+        return blockState;
+    }
+}
@@ -8,7 +8,9 @@

 package com.cobblemon.mod.common.mixin;

+import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityModel;
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone;
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext;
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.util.math.MatrixStack;
@@ -36,7 +38,7 @@ public abstract class ModelPartMixin implements Bone {
    }

    @Override
-    public <T extends Entity> void render(T entity, MatrixStack stack, VertexConsumer buffer, int packedLight, int packedOverlay, float r, float g, float b, float a) {
+    public void render(RenderContext context, MatrixStack stack, VertexConsumer buffer, int packedLight, int packedOverlay, float r, float g, float b, float a) {
        this.render(stack, buffer, packedLight, packedOverlay, r, g, b, a);
    }

@@ -8,11 +8,12 @@

 package com.cobblemon.mod.common.mixin;

-import com.cobblemon.mod.common.cobblemonstructures.CobblemonStructureIDs;
+import com.cobblemon.mod.common.world.CobblemonStructureIDs;
 import net.minecraft.registry.Registry;
 import net.minecraft.structure.PoolStructurePiece;
 import net.minecraft.structure.StructureTemplateManager;
 import net.minecraft.structure.pool.*;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.random.Random;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.HeightLimitView;
@@ -29,7 +30,6 @@ import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

 import java.util.*;
-import java.util.stream.Collectors;

@Mixin(StructurePoolBasedGenerator.StructurePoolGenerator.class)
 public abstract class StructurePoolGeneratorMixin {
@@ -37,17 +37,35 @@ public abstract class StructurePoolGeneratorMixin {
    @Mutable
    @Shadow Deque<StructurePoolBasedGenerator.ShapedPoolStructurePiece> structurePieces;

-    Map<String, Integer> generatedStructureCounts;
+    Map<String, Integer> generatedStructureGroupCounts;

    private static final Map<String, Integer> structureMaxes;
+    private static final Map<Identifier, Set<String>> structureGroups = new HashMap<>();
    static {
+        String pokecenter = "pokecenter";
+        String berry = "berry_farm";
+
+        structureGroups.put(CobblemonStructureIDs.PLAINS_POKECENTER, Set.of(pokecenter));
+        structureGroups.put(CobblemonStructureIDs.DESERT_POKECENTER, Set.of(pokecenter));
+        structureGroups.put(CobblemonStructureIDs.SAVANNA_POKECENTER, Set.of(pokecenter));
+        structureGroups.put(CobblemonStructureIDs.SNOWY_POKECENTER, Set.of(pokecenter));
+        structureGroups.put(CobblemonStructureIDs.TAIGA_POKECENTER, Set.of(pokecenter));
+
+        structureGroups.put(CobblemonStructureIDs.SAVANNA_BERRY_SMALL, Set.of(berry));
+        structureGroups.put(CobblemonStructureIDs.SAVANNA_BERRY_LARGE, Set.of(berry));
+        structureGroups.put(CobblemonStructureIDs.PLAINS_BERRY_SMALL, Set.of(berry));
+        structureGroups.put(CobblemonStructureIDs.PLAINS_BERRY_LARGE, Set.of(berry));
+        structureGroups.put(CobblemonStructureIDs.SNOWY_BERRY_SMALL, Set.of(berry));
+        structureGroups.put(CobblemonStructureIDs.SNOWY_BERRY_LARGE, Set.of(berry));
+        structureGroups.put(CobblemonStructureIDs.DESERT_BERRY_SMALL, Set.of(berry));
+        structureGroups.put(CobblemonStructureIDs.DESERT_BERRY_LARGE, Set.of(berry));
+        structureGroups.put(CobblemonStructureIDs.TAIGA_BERRY_SMALL, Set.of(berry));
+        structureGroups.put(CobblemonStructureIDs.TAIGA_BERRY_LARGE, Set.of(berry));
+
        //Mapped using location string as key
        Map<String, Integer> aMap = new HashMap<>();
-        aMap.put(CobblemonStructureIDs.PLAINS_POKECENTER, 1);
-        aMap.put(CobblemonStructureIDs.DESERT_POKECENTER, 1);
-        aMap.put(CobblemonStructureIDs.SAVANNA_POKECENTER, 1);
-        aMap.put(CobblemonStructureIDs.SNOWY_POKECENTER, 1);
-        aMap.put(CobblemonStructureIDs.TAIGA_POKECENTER, 1);
+        aMap.put(pokecenter, 1);
+        aMap.put(berry, 2);

 //        aMap.put(CobblemonStructureIDs.PLAINS_LONG_PATH, 3);
 //        aMap.put(CobblemonStructureIDs.DESERT_LONG_PATH, 3);
@@ -57,143 +75,143 @@ public abstract class StructurePoolGeneratorMixin {
        structureMaxes = Collections.unmodifiableMap(aMap);
    }

+    public Set<String> getGroups(Identifier structureIdentifier) {
+        return structureGroups.getOrDefault(structureIdentifier, Set.of());
+    }
+
+    public boolean hasReachedMaximum(Identifier structureIdentifier) {
+        Set<String> groups = getGroups(structureIdentifier);
+        for (String group : groups) {
+            int count = generatedStructureGroupCounts.getOrDefault(group, 0);
+            if (count >= structureMaxes.getOrDefault(group, Integer.MAX_VALUE)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public void incrementStructureCount(Identifier structureIdentifier) {
+        Set<String> groups = getGroups(structureIdentifier);
+        for (String group : groups) {
+            generatedStructureGroupCounts.put(group, generatedStructureGroupCounts.getOrDefault(group, 0) + 1);
+        }
+    }
+
    @Inject(method = "<init>", at = @At("RETURN"))
    private void onStructurePoolGeneratorCreation(Registry<StructurePool> registry, int maxSize, ChunkGenerator chunkGenerator, StructureTemplateManager structureTemplateManager, List<? super PoolStructurePiece> children, Random random, CallbackInfo ci) {
-        generatedStructureCounts = new HashMap<>();
+        generatedStructureGroupCounts = new HashMap<>();
    }

    @ModifyVariable(method = "generatePiece", at = @At("STORE"), ordinal = 1)
-    private Iterator<StructurePoolElement> reduceStructurePoolELementIterator(Iterator<StructurePoolElement> iterator) {
+    private Iterator<StructurePoolElement> reduceStructurePoolElementIterator(Iterator<StructurePoolElement> iterator) {
        List<StructurePoolElement> reducedList = new ArrayList<>();

        while (iterator.hasNext()) {
            StructurePoolElement structure = iterator.next();
-            String structurePieceLocationKey = getCobblemonOnlyLocation(structure);
+            Identifier structurePieceLocationKey = getCobblemonOnlyLocation(structure);
            if (structurePieceLocationKey == null) {
                reducedList.add(structure);
                continue;
            }

-            Integer currentlyPlacedCount = generatedStructureCounts.get(structurePieceLocationKey);
-            if (currentlyPlacedCount == null) currentlyPlacedCount = 0;
-
-            Integer maxAllowed = structureMaxes.get(structurePieceLocationKey);
-            if (maxAllowed == null) {
-                reducedList.add(structure);
-                continue;
-            }
-
-            if (currentlyPlacedCount < maxAllowed) {
+            if (!hasReachedMaximum(structurePieceLocationKey)) {
                reducedList.add(structure);
            }
        }

-        for (String maxStructureLocationKey : structureMaxes.keySet()) {
-            Integer maxAllowed = structureMaxes.get(maxStructureLocationKey);
-
-            Integer currentlyGenerated = generatedStructureCounts.get(maxStructureLocationKey);
-            if (currentlyGenerated == null) currentlyGenerated = 0;
-
-            Integer allowedInstances = maxAllowed - currentlyGenerated;
-            reducedList = removeInstanceOfLocationKeyFrom(reducedList, allowedInstances, maxStructureLocationKey);
-        }
-
        return reducedList.iterator();
    }

    @ModifyVariable(method = "generatePiece", at = @At("STORE"), ordinal = 1)
    private PoolStructurePiece injected(PoolStructurePiece poolStructurePiece) {
-        String structureLocationKey = getCobblemonOnlyLocation(poolStructurePiece.getPoolElement());
+        Identifier structureLocationKey = getCobblemonOnlyLocation(poolStructurePiece.getPoolElement());
        if (structureLocationKey != null) {
-            Integer currentlyGenerated = generatedStructureCounts.get(structureLocationKey);
-            if (currentlyGenerated == null) currentlyGenerated = 0;
-            generatedStructureCounts.put(structureLocationKey, currentlyGenerated + 1);
+            incrementStructureCount(structureLocationKey);
        }
-
        return poolStructurePiece;
    }

+    // This doesn't SEEM necessary? It appears to work without.
    @Inject(method = "generatePiece", at = @At("HEAD"))
    private void beforeGeneratePiece(PoolStructurePiece piece, MutableObject<VoxelShape> pieceShape, int minY, boolean modifyBoundingBox, HeightLimitView world, NoiseConfig noiseConfig, CallbackInfo ci) {
-        String structureLocationKey = getCobblemonOnlyLocation(piece.getPoolElement());
-
-        if (structureLocationKey != null && structureLocationKey.equals("cobblemon:village_snowy/village_snowy_pokecenter")) System.out.println("Before Counts" + generatedStructureCounts);
-
-        if (structureLocationKey != null) {
-            Integer currentlyGenerated = generatedStructureCounts.get(structureLocationKey);
-            if (currentlyGenerated == null) currentlyGenerated = 0;
-            generatedStructureCounts.put(structureLocationKey, currentlyGenerated + 1);
-        }
-
-        List<StructurePoolBasedGenerator.ShapedPoolStructurePiece> reducedStructurePiecesList = structurePieces.stream().toList();
-
-        for (String maxStructureLocationKey : structureMaxes.keySet()) {
-            Integer maxAllowed = structureMaxes.get(maxStructureLocationKey);
-
-            Integer currentlyGenerated = generatedStructureCounts.get(maxStructureLocationKey);
-            if (currentlyGenerated == null) currentlyGenerated = 0;
-            if (currentlyGenerated < maxAllowed) {
-                continue;
-            }
-
-            //Already have max so need to remove
-            reducedStructurePiecesList = reducedStructurePiecesList.stream()
-                    .filter(shapedStructurePiece -> {
-                        String locationKey = getCobblemonOnlyLocation(shapedStructurePiece.piece.getPoolElement());
-                        if (locationKey == null) {
-                            return true;
-                        }
-
-                        return !locationKey.equals(maxStructureLocationKey);
-                    })
-                    .collect(Collectors.toList());
-        }
-
-        structurePieces = new ArrayDeque<>(reducedStructurePiecesList);
+//        Identifier structureLocationKey = getCobblemonOnlyLocation(piece.getPoolElement());
+//
+//        if (structureLocationKey != null) {
+//            Integer currentlyGenerated = generatedStructureCounts.get(structureLocationKey);
+//            if (currentlyGenerated == null) currentlyGenerated = 0;
+//            generatedStructureCounts.put(structureLocationKey, currentlyGenerated + 1);
+//        }
+//
+//        List<StructurePoolBasedGenerator.ShapedPoolStructurePiece> reducedStructurePiecesList = structurePieces.stream().toList();
+//
+//        for (Identifier maxStructureLocationKey : structureMaxes.keySet()) {
+//            Integer maxAllowed = structureMaxes.get(maxStructureLocationKey);
+//
+//            Integer currentlyGenerated = generatedStructureCounts.get(maxStructureLocationKey);
+//            if (currentlyGenerated == null) currentlyGenerated = 0;
+//            if (currentlyGenerated < maxAllowed) {
+//                continue;
+//            }
+//
+//            //Already have max so need to remove
+//            reducedStructurePiecesList = reducedStructurePiecesList.stream()
+//                    .filter(shapedStructurePiece -> {
+//                        Identifier locationKey = getCobblemonOnlyLocation(shapedStructurePiece.piece.getPoolElement());
+//                        if (locationKey == null) {
+//                            return true;
+//                        }
+//
+//                        return !locationKey.equals(maxStructureLocationKey);
+//                    })
+//                    .collect(Collectors.toList());
+//        }
+//
+//        structurePieces = new ArrayDeque<>(reducedStructurePiecesList);
    }

-    private static String getCobblemonOnlyLocation(StructurePoolElement structurePoolElement) {
-        String location = getLocationIfAvailable(structurePoolElement);
+    private static Identifier getCobblemonOnlyLocation(StructurePoolElement structurePoolElement) {
+        Identifier location = getLocationIfAvailable(structurePoolElement);
        if (location == null) return null;

-        if (!location.contains("cobblemon")) return null;
+        if (!location.getNamespace().equals("cobblemon")) return null;

        return location;
    }

-    private static String getLocationIfAvailable(StructurePoolElement structurePoolElement) {
+    private static Identifier getLocationIfAvailable(StructurePoolElement structurePoolElement) {
        if (structurePoolElement instanceof LegacySinglePoolElement legacySinglePoolElement) {
            if (legacySinglePoolElement.location.left().isEmpty()) return null;

-            return legacySinglePoolElement.location.left().get().toString();
+            return legacySinglePoolElement.location.left().get();
        } else if (structurePoolElement instanceof SinglePoolElement singlePoolElement) {
            if (singlePoolElement.location.left().isEmpty()) return null;

-            return singlePoolElement.location.left().get().toString();
+            return singlePoolElement.location.left().get();
        } else {
            return null;
        }
    }

-    private List<StructurePoolElement> removeInstanceOfLocationKeyFrom(List<StructurePoolElement> structureList, Integer allowedNumberOfInstances, String locationKey) {
-        List<StructurePoolElement> reducedList = new ArrayList<>();
-        int instancesFound = 0;
-
-        for (StructurePoolElement structurePoolElement: structureList) {
-            String structureKey = getCobblemonOnlyLocation(structurePoolElement);
-            if (structureKey == null || !structureKey.equals(locationKey)) {
-                reducedList.add(structurePoolElement);
-                continue;
-            }
-
-            if (instancesFound >= allowedNumberOfInstances) {
-                continue;
-            }
-
-            reducedList.add(structurePoolElement);
-            instancesFound++;
-        }
-
-        return  reducedList;
-    }
+//    private List<StructurePoolElement> removeInstanceOfLocationKeyFrom(List<StructurePoolElement> structureList, Integer allowedNumberOfInstances, Identifier locationKey) {
+//        List<StructurePoolElement> reducedList = new ArrayList<>();
+//        int instancesFound = 0;
+//
+//        for (StructurePoolElement structurePoolElement: structureList) {
+//            Identifier structureKey = getCobblemonOnlyLocation(structurePoolElement);
+//            if (structureKey == null || !structureKey.equals(locationKey)) {
+//                reducedList.add(structurePoolElement);
+//                continue;
+//            }
+//
+//            if (instancesFound >= allowedNumberOfInstances) {
+//                continue;
+//            }
+//
+//            reducedList.add(structurePoolElement);
+//            instancesFound++;
+//        }
+//
+//        return  reducedList;
+//    }
 }
@@ -6,6 +6,8 @@
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

+@file:Suppress("unused")
+
 package com.cobblemon.mod.common

 import com.cobblemon.mod.common.advancement.CobblemonCriteria
@@ -18,7 +20,9 @@ import com.cobblemon.mod.common.api.drop.ItemDropEntry
 import com.cobblemon.mod.common.api.events.CobblemonEvents.BATTLE_VICTORY
 import com.cobblemon.mod.common.api.events.CobblemonEvents.DATA_SYNCHRONIZED
 import com.cobblemon.mod.common.api.events.CobblemonEvents.EVOLUTION_COMPLETE
+import com.cobblemon.mod.common.api.events.CobblemonEvents.LEVEL_UP_EVENT
 import com.cobblemon.mod.common.api.events.CobblemonEvents.POKEMON_CAPTURED
+import com.cobblemon.mod.common.api.events.CobblemonEvents.TRADE_COMPLETED
 import com.cobblemon.mod.common.api.net.serializers.PoseTypeDataSerializer
 import com.cobblemon.mod.common.api.net.serializers.StringSetDataSerializer
 import com.cobblemon.mod.common.api.net.serializers.Vec3DataSerializer
@@ -27,6 +31,7 @@ import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalcula
 import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalculators
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffectRegistry
+import com.cobblemon.mod.common.api.pokemon.evolution.adapters.EvolutionRegistry
 import com.cobblemon.mod.common.api.pokemon.experience.ExperienceCalculator
 import com.cobblemon.mod.common.api.pokemon.experience.ExperienceGroups
 import com.cobblemon.mod.common.api.pokemon.experience.StandardExperienceCalculator
@@ -38,6 +43,7 @@ import com.cobblemon.mod.common.api.pokemon.stats.EvCalculator
 import com.cobblemon.mod.common.api.pokemon.stats.Generation8EvCalculator
 import com.cobblemon.mod.common.api.pokemon.stats.StatProvider
 import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
+import com.cobblemon.mod.common.api.registry.CobblemonRegistryKeys
 import com.cobblemon.mod.common.api.scheduling.ScheduledTaskTracker
 import com.cobblemon.mod.common.api.spawning.BestSpawner
 import com.cobblemon.mod.common.api.spawning.CobblemonSpawningProspector
@@ -46,14 +52,18 @@ import com.cobblemon.mod.common.api.spawning.prospecting.SpawningProspector
 import com.cobblemon.mod.common.api.starter.StarterHandler
 import com.cobblemon.mod.common.api.storage.PokemonStoreManager
 import com.cobblemon.mod.common.api.storage.adapter.conversions.ReforgedConversion
-import com.cobblemon.mod.common.api.storage.adapter.flatifle.FileStoreAdapter
-import com.cobblemon.mod.common.api.storage.adapter.flatifle.JSONStoreAdapter
-import com.cobblemon.mod.common.api.storage.adapter.flatifle.NBTStoreAdapter
+import com.cobblemon.mod.common.api.storage.adapter.database.MongoDBStoreAdapter
+import com.cobblemon.mod.common.api.storage.adapter.flatfile.FileStoreAdapter
+import com.cobblemon.mod.common.api.storage.adapter.flatfile.JSONStoreAdapter
+import com.cobblemon.mod.common.api.storage.adapter.flatfile.NBTStoreAdapter
 import com.cobblemon.mod.common.api.storage.factory.FileBackedPokemonStoreFactory
 import com.cobblemon.mod.common.api.storage.pc.PCStore
 import com.cobblemon.mod.common.api.storage.pc.link.PCLinkManager
 import com.cobblemon.mod.common.api.storage.player.PlayerDataStoreManager
+import com.cobblemon.mod.common.api.storage.player.factory.JsonPlayerDataStoreFactory
+import com.cobblemon.mod.common.api.storage.player.factory.MongoPlayerDataStoreFactory
 import com.cobblemon.mod.common.api.tags.CobblemonEntityTypeTags
+import com.cobblemon.mod.common.api.types.ElementalType
 import com.cobblemon.mod.common.battles.BagItems
 import com.cobblemon.mod.common.battles.BattleFormat
 import com.cobblemon.mod.common.battles.BattleRegistry
@@ -86,7 +96,6 @@ import com.cobblemon.mod.common.pokemon.feature.TagSeasonResolver
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.pokemon.properties.HiddenAbilityPropertyType
 import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
-import com.cobblemon.mod.common.pokemon.properties.UntradeableProperty
 import com.cobblemon.mod.common.pokemon.properties.tags.PokemonFlagProperty
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
@@ -101,6 +110,10 @@ import com.cobblemon.mod.common.util.server
 import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
 import com.cobblemon.mod.common.world.feature.ore.CobblemonOrePlacedFeatures
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
+import com.mongodb.ConnectionString
+import com.mongodb.MongoClientSettings
+import com.mongodb.client.MongoClient
+import com.mongodb.client.MongoClients
 import java.io.File
 import java.io.FileReader
 import java.io.FileWriter
@@ -153,6 +166,7 @@ object Cobblemon {

    fun preInitialize(implementation: CobblemonImplementation) {
        this.implementation = implementation
+        this.queueRegistryCreation()
        implementation.registerPermissionValidator()
        implementation.registerSoundEvents()
        implementation.registerBlocks()
@@ -180,6 +194,8 @@ object Cobblemon {

        ShoulderEffectRegistry.register()

+        EvolutionRegistry.init()
+
        DATA_SYNCHRONIZED.subscribe {
            storage.onPlayerDataSync(it)
            playerData.get(it).sendToPlayer(it)
@@ -245,7 +261,6 @@ object Cobblemon {
            DataKeys.HAS_BEEN_SHEARED,
            FlagSpeciesFeatureProvider(keys = listOf(DataKeys.HAS_BEEN_SHEARED), default = false))

-        CustomPokemonProperty.register(UntradeableProperty)
        CustomPokemonProperty.register(UncatchableProperty)
        CustomPokemonProperty.register(PokemonFlagProperty)
        CustomPokemonProperty.register(HiddenAbilityPropertyType)
@@ -258,15 +273,52 @@ object Cobblemon {
        PlatformEvents.SERVER_STARTING.subscribe { event ->
            val server = event.server
            playerData = PlayerDataStoreManager().also { it.setup(server) }
+
+            val mongoClient: MongoClient?
+
            val pokemonStoreRoot = server.getSavePath(WorldSavePath.ROOT).resolve("pokemon").toFile()
+            val storeAdapter = when (config.storageFormat) {
+                "nbt", "json" -> {
+                    val jsonFactory = JsonPlayerDataStoreFactory()
+                    jsonFactory.setup(server)
+                    playerData.setFactory(jsonFactory)
+
+                    if (config.storageFormat == "nbt") {
+                        NBTStoreAdapter(pokemonStoreRoot.absolutePath, useNestedFolders = true, folderPerClass = true)
+                    } else {
+                        JSONStoreAdapter(
+                            pokemonStoreRoot.absolutePath,
+                            useNestedFolders = true,
+                            folderPerClass = true
+                        )
+                    }
+                }
+
+                "mongodb" -> {
+                    try {
+                        Class.forName("com.mongodb.client.MongoClient")
+
+                        val mongoClientSettings = MongoClientSettings.builder()
+                            .applyConnectionString(ConnectionString(config.mongoDBConnectionString))
+                            .build()
+                        mongoClient = MongoClients.create(mongoClientSettings)
+                        val mongoFactory = MongoPlayerDataStoreFactory(mongoClient, config.mongoDBDatabaseName)
+                        playerData.setFactory(mongoFactory)
+                        MongoDBStoreAdapter(mongoClient, config.mongoDBDatabaseName)
+                    } catch (e: ClassNotFoundException) {
+                        LOGGER.error("MongoDB driver not found.")
+                        throw e
+                    }
+                }
+
+                else -> throw IllegalArgumentException("Unsupported storageFormat: ${config.storageFormat}")
+            }
+                .with(ReforgedConversion(server.getSavePath(WorldSavePath.ROOT))) as FileStoreAdapter<*>
+
            storage.registerFactory(
                priority = Priority.LOWEST,
                factory = FileBackedPokemonStoreFactory(
-                    adapter = if (config.storageFormat == "nbt") {
-                        NBTStoreAdapter(pokemonStoreRoot.absolutePath, useNestedFolders = true, folderPerClass = true)
-                    } else {
-                        JSONStoreAdapter(pokemonStoreRoot.absolutePath, useNestedFolders = true, folderPerClass = true)
-                    }.with(ReforgedConversion(server.getSavePath(WorldSavePath.ROOT))) as FileStoreAdapter<*>,
+                    adapter = storeAdapter,
                    createIfMissing = true,
                    pcConstructor = { uuid -> PCStore(uuid).also { it.resize(config.defaultBoxCount) } }
                )
@@ -312,6 +364,8 @@ object Cobblemon {
                }
            }
        }
+        LEVEL_UP_EVENT.subscribe { AdvancementHandler.onLevelUp(it) }
+        TRADE_COMPLETED.subscribe { AdvancementHandler.onTradeCompleted(it) }

        BagItems.observable.subscribe {
            LOGGER.info("Starting dummy Showdown battle to force it to pre-load data.")
@@ -426,4 +480,8 @@ object Cobblemon {
        this.implementation.registerCommandArgument(cobblemonResource("pokemon_store"), PokemonStoreArgumentType::class, ConstantArgumentSerializer.of(PokemonStoreArgumentType::pokemonStore))
    }

+    private fun queueRegistryCreation() {
+        this.implementation.createRegistry(CobblemonRegistryKeys.ELEMENTAL_TYPE, ElementalType.CODEC, ElementalType.NETWORK_CODEC)
+    }
+
 }
@@ -306,7 +306,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<

    private fun berryBlock(name: String): BerryBlock {
        val identifier = cobblemonResource("${name}_berry")
-        val block = this.create(identifier.path, BerryBlock(identifier, AbstractBlock.Settings.copy(Blocks.WHEAT).dynamicBounds().sounds(BlockSoundGroup.CROP)))
+        val block = this.create(identifier.path, BerryBlock(identifier, AbstractBlock.Settings.copy(Blocks.WHEAT).dynamicBounds().sounds(BlockSoundGroup.CROP).strength(0.2F)))
        this.berries[identifier] = block
        return block
    }
@@ -44,6 +44,7 @@ object CobblemonCommands {
        TestPcSlotCommand.register(dispatcher)
        TestPartySlotCommand.register(dispatcher)
        ClearPartyCommand.register(dispatcher)
+        ClearPCCommand.register(dispatcher)
        PokemonRestartCommand.register(dispatcher)
    }
 }
@@ -8,18 +8,22 @@

 package com.cobblemon.mod.common

+import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler
 import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
 import com.mojang.brigadier.arguments.ArgumentType
+import com.mojang.serialization.Codec
 import kotlin.reflect.KClass
 import net.minecraft.advancement.criterion.Criterion
 import net.minecraft.command.argument.serialize.ArgumentSerializer
 import net.minecraft.network.PacketByteBuf
 import net.minecraft.network.listener.ClientPlayPacketListener
 import net.minecraft.network.packet.Packet
+import net.minecraft.registry.Registry
 import net.minecraft.registry.RegistryKey
 import net.minecraft.registry.tag.TagKey
+import net.minecraft.resource.ResourceManager
 import net.minecraft.resource.ResourceReloader
 import net.minecraft.resource.ResourceType
 import net.minecraft.server.MinecraftServer
@@ -29,6 +33,7 @@ import net.minecraft.world.GameRules
 import net.minecraft.world.biome.Biome
 import net.minecraft.world.gen.GenerationStep
 import net.minecraft.world.gen.feature.PlacedFeature
+import org.jetbrains.annotations.ApiStatus

 interface CobblemonImplementation {
    val modAPI: ModAPI
@@ -160,6 +165,41 @@ interface CobblemonImplementation {
     */
    fun server(): MinecraftServer?

+    /**
+     * Handles platform independent reloading of a [JsonDataRegistry].
+     *
+     * @param registry The [JsonDataRegistry] to reload.
+     * @param manager The [ResourceManager] to reload from.
+     */
+    fun <T> reloadJsonRegistry(registry: JsonDataRegistry<T>, manager: ResourceManager): HashMap<Identifier, T>
+    /**
+     * Queue the creation of a registry in the implementation.
+     * This registry will not be immediately available for access.
+     *
+     * @param T The type of the registry entries.
+     * @param registryKey The [RegistryKey] of this registry.
+     * @param codec The [Codec] used for this registry entries to be parsed on the server.
+     * @param networkCodec The [Codec] used when the client is synchronizing this registry from the server. If this is null the client will not require the registry aka not load any data.
+     *
+     * @see getRegistry
+     */
+    @ApiStatus.Internal
+    fun <T> createRegistry(registryKey: RegistryKey<Registry<T>>, codec: Codec<T>, networkCodec: Codec<T>? = null)
+
+    /**
+     * Fetches a registry.
+     * This is intended for Cobblemon registries but can be used for any.
+     *
+     * @param T The type of the registry.
+     * @param registryKey The [RegistryKey] of the registry being fetched.
+     * @return The registry if present.
+     *
+     * @throws Exception If the registry doesn't exist or isn't loaded yet.
+     * @see createRegistry
+     */
+    @ApiStatus.Internal
+    fun <T> getRegistry(registryKey: RegistryKey<Registry<T>>): Registry<T>
+
 }

 enum class ModAPI {
@@ -231,8 +231,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    @JvmField val PEAT_BLOCK = noSettingsItem("peat_block")
    @JvmField val RAZOR_CLAW = noSettingsItem("razor_claw")
    @JvmField val RAZOR_FANG = noSettingsItem("razor_fang")
-    // ToDo enable me when malicious armor goes in the game
-    //@JvmField val AUSPICIOUS_ARMOR = heldItem("auspicious_armor")
+    @JvmField val AUSPICIOUS_ARMOR = heldItem("auspicious_armor")
+    @JvmField val MALICIOUS_ARMOR = heldItem("malicious_armor")

    private val berries = mutableMapOf<Identifier, BerryItem>()
    // Plants
@@ -338,7 +338,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    @JvmField
    val ROASTED_LEEK = create("roasted_leek", Item(Item.Settings().food(FoodComponent.Builder().snack().hunger(3).saturationModifier(0.3f).build())))
    @JvmField
-    val BRAISED_VIVICHOKE = create("braised_vivichoke", Item(Item.Settings().maxCount(1).food(FoodComponent.Builder().hunger(6).saturationModifier(0.6f).build())))
+    val BRAISED_VIVICHOKE = create("braised_vivichoke", Item(Item.Settings().food(FoodComponent.Builder().hunger(6).saturationModifier(0.6f).build())))
    @JvmField
    val VIVICHOKE_DIP = create("vivichoke_dip", object : StewItem(Settings().maxCount(1)
        .food(FoodComponent.Builder()
@@ -55,11 +55,8 @@ import com.cobblemon.mod.common.net.messages.client.battle.*
 import com.cobblemon.mod.common.net.messages.client.callback.OpenMoveCallbackPacket
 import com.cobblemon.mod.common.net.messages.client.callback.OpenPartyCallbackPacket
 import com.cobblemon.mod.common.net.messages.client.callback.OpenPartyMoveCallbackPacket
-import com.cobblemon.mod.common.net.messages.client.data.AbilityRegistrySyncPacket
-import com.cobblemon.mod.common.net.messages.client.data.BerryRegistrySyncPacket
-import com.cobblemon.mod.common.net.messages.client.data.MovesRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.data.*
 import com.cobblemon.mod.common.net.messages.client.data.PropertiesCompletionRegistrySyncPacket
-import com.cobblemon.mod.common.net.messages.client.data.SpeciesRegistrySyncPacket
 import com.cobblemon.mod.common.net.messages.client.data.UnlockReloadPacket
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormParticlePacket
 import com.cobblemon.mod.common.net.messages.client.pasture.ClosePasturePacket
@@ -211,6 +208,7 @@ object CobblemonNetwork : NetworkManager {
        this.createClientBound(HeldItemUpdatePacket.ID, HeldItemUpdatePacket::decode, PokemonUpdatePacketHandler())
        this.createClientBound(PokemonStateUpdatePacket.ID, PokemonStateUpdatePacket::decode, PokemonUpdatePacketHandler())
        this.createClientBound(TetheringUpdatePacket.ID, TetheringUpdatePacket::decode, PokemonUpdatePacketHandler())
+        this.createClientBound(TradeableUpdatePacket.ID, TradeableUpdatePacket::decode, PokemonUpdatePacketHandler())

        // Evolution start
        this.createClientBound(AddEvolutionPacket.ID, AddEvolutionPacket::decode, PokemonUpdatePacketHandler())
@@ -78,6 +78,8 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
    @JvmField
    val MEDICINE_SPRAY_USE = this.create("medicine_spray.use")

+    @JvmField
+    val BERRY_HARVEST = this.create("berry.harvest")
    @JvmField
    val BERRY_EAT = this.create("berry.eat")

@@ -32,7 +32,7 @@ object CobblemonTradeOffers {
     * @return The resulting list.
     */
    fun tradeOffersFor(profession: VillagerProfession): List<VillagerTradeOffer> = when (profession) {
-        VillagerProfession.FARMER -> listOf(VillagerTradeOffer(VillagerProfession.FARMER, 3, listOf(TradeOffers.SellItemFactory(CobblemonItems.VIVICHOKE_SEEDS, 32, 1, 1, 6))))
+        VillagerProfession.FARMER -> listOf(VillagerTradeOffer(VillagerProfession.FARMER, 3, listOf(TradeOffers.SellItemFactory(CobblemonItems.VIVICHOKE_SEEDS, 24, 1, 1, 6))))
        else -> emptyList()
    }

@@ -42,7 +42,7 @@ object CobblemonTradeOffers {
     * @return The resulting list.
     */
    fun resolveWanderingTradeOffers(): List<WandererTradeOffer> = listOf(
-        WandererTradeOffer(false, listOf(TradeOffers.SellItemFactory(CobblemonItems.VIVICHOKE_SEEDS, 32, 1, 1, 6)))
+        WandererTradeOffer(false, listOf(TradeOffers.SellItemFactory(CobblemonItems.VIVICHOKE_SEEDS, 24, 1, 1, 6)))
    )

    /**
@@ -47,13 +47,13 @@ object CobblemonCriteria {
    val EVOLVE_POKEMON = this.create(
        SimpleCriterionTrigger(
            cobblemonResource("pokemon_evolved"),
-            SimpleCountableCriterionCondition::class.java
+            EvolvePokemonCriterionCondition::class.java
        )
    )
    val WIN_BATTLE = this.create(
-        SimpleCriterionTrigger(
+        BattleCountableCriterionTrigger(
            cobblemonResource("battles_won"),
-            SimpleCountableCriterionCondition::class.java
+            BattleCountableCriterionCondition::class.java
        )
    )

@@ -71,6 +71,41 @@ object CobblemonCriteria {
        )
    )

+    val POKEMON_INTERACT = this.create(
+        SimpleCriterionTrigger(
+            cobblemonResource("pokemon_interact"),
+            PokemonInteractCriterion::class.java
+        )
+    )
+
+    val PARTY_CHECK = this.create(
+        SimpleCriterionTrigger(
+            cobblemonResource("party"),
+            PartyCheckCriterion::class.java
+        )
+    )
+
+    val LEVEL_UP = this.create(
+        SimpleCriterionTrigger(
+            cobblemonResource("level_up"),
+            LevelUpCriterionCondition::class.java
+        )
+    )
+
+    val PASTURE_USE = this.create(
+        SimpleCriterionTrigger(
+            cobblemonResource("pasture_use"),
+            PickStarterCriterionCondition::class.java
+        )
+    )
+
+    val TRADE_POKEMON = this.create(
+        SimpleCriterionTrigger(
+            cobblemonResource("trade_pokemon"),
+            TradePokemonCriterionCondition::class.java
+        )
+    )
+
    private fun <T : Criterion<*>> create(criteria: T): T = Cobblemon.implementation.registerCriteria(criteria)

 }
@@ -0,0 +1,67 @@
+/*
+ * 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.advancement.criterion
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.battles.model.PokemonBattle
+import com.cobblemon.mod.common.util.toJsonArray
+import com.google.gson.JsonObject
+import net.minecraft.predicate.entity.LootContextPredicate
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.Identifier
+
+open class BattleCountableCriterionTrigger(identifier: Identifier, criterionClass: Class<BattleCountableCriterionCondition>) : SimpleCriterionTrigger<BattleCountableContext, BattleCountableCriterionCondition>(identifier, criterionClass) {
+
+}
+
+class BattleCountableCriterionCondition(id: Identifier, predicate: LootContextPredicate) : CountableCriterionCondition<BattleCountableContext>(id, predicate) {
+
+    private var battleTypes = mutableListOf("any")
+
+    override fun fromJson(json: JsonObject) {
+        super.fromJson(json)
+        if(!json.get("battle_types").isJsonNull) {
+            battleTypes.clear()
+            json.get("battle_types").asJsonArray.asList().forEach() {
+                battleTypes.add(it.asString)
+            }
+        }
+    }
+
+    override fun toJson(json: JsonObject) {
+        super.toJson(json)
+        json.add("battle_types", battleTypes.toJsonArray())
+    }
+
+    override fun matches(player: ServerPlayerEntity, context: BattleCountableContext): Boolean {
+        var typeCheck = false
+        val advancementData = Cobblemon.playerData.get(player).advancementData
+        if (battleTypes.isEmpty() || battleTypes.contains("any")) {
+            typeCheck = true
+        }
+        if (battleTypes.contains("pvp")) {
+            typeCheck = context.battle.isPvP
+            context.times = advancementData.totalPvPBattleVictoryCount
+        }
+        if (battleTypes.contains("pvw")) {
+            typeCheck = context.battle.isPvW
+            context.times = advancementData.totalPvWBattleVictoryCount
+        }
+        if (battleTypes.contains("pvn")) {
+            typeCheck = context.battle.isPvN
+            context.times = advancementData.totalPvWBattleVictoryCount
+        }
+        if (battleTypes.size > 1) {
+            context.times = advancementData.totalBattleVictoryCount
+        }
+        return context.times >= count && typeCheck
+    }
+}
+
+open class BattleCountableContext(times : Int, var battle : PokemonBattle) : CountableContext(times)
@@ -8,6 +8,7 @@

 package com.cobblemon.mod.common.advancement.criterion

+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.google.gson.JsonObject
 import net.minecraft.predicate.entity.LootContextPredicate
 import net.minecraft.server.network.ServerPlayerEntity
@@ -30,10 +31,14 @@ class CaughtPokemonCriterionCondition(id: Identifier, predicate: LootContextPred

    override fun fromJson(json: JsonObject) {
        super.fromJson(json)
-        type = json.get("type")?.asString ?: "any"
+        var stored = json.get("type")?.asString
+        if (stored != null && stored != "any") {
+            stored = stored.asIdentifierDefaultingNamespace().toString()
+        }
+        type = stored ?: "any"
    }

    override fun matches(player: ServerPlayerEntity, context: CountablePokemonTypeContext): Boolean {
-        return super.matches(player, context) && context.type == type
+        return super.matches(player, context) && (context.type == type || type == "any")
    }
 }
@@ -0,0 +1,38 @@
+/*
+ * 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.advancement.criterion
+
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.google.gson.JsonObject
+import net.minecraft.predicate.entity.LootContextPredicate
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.Identifier
+
+class EvolvePokemonCriterionCondition(id: Identifier, entity: LootContextPredicate) : CountableCriterionCondition<EvolvePokemonContext>(id, entity) {
+    var species = "any"
+    var evolution = "any"
+    override fun toJson(json: JsonObject) {
+        super.toJson(json)
+        json.addProperty("species", species)
+        json.addProperty("evolution", evolution)
+    }
+
+    override fun fromJson(json: JsonObject) {
+        super.fromJson(json)
+        species = json.get("species")?.asString ?: "any"
+        evolution = json.get("evolution")?.asString ?: "any"
+    }
+
+    override fun matches(player: ServerPlayerEntity, context: EvolvePokemonContext): Boolean {
+        return context.times >= count && (context.species == species.asIdentifierDefaultingNamespace() || species == "any") &&
+                (context.evolution == evolution.asIdentifierDefaultingNamespace() || evolution == "any")
+    }
+}
+
+open class EvolvePokemonContext(val species : Identifier, val evolution : Identifier, times: Int) : CountableContext(times)
@@ -0,0 +1,41 @@
+/*
+ * 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.advancement.criterion
+
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.google.gson.JsonObject
+import net.minecraft.predicate.entity.LootContextPredicate
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.Identifier
+
+class LevelUpCriterionCondition(id: Identifier, entity: LootContextPredicate) : SimpleCriterionCondition<LevelUpContext>(id, entity) {
+    var level = 0
+    var evolved = true
+    override fun toJson(json: JsonObject) {
+        json.addProperty("level", level)
+        json.addProperty("has_evolved", evolved)
+    }
+
+    override fun fromJson(json: JsonObject) {
+        level = json.get("level")?.asInt ?: 0
+        evolved = json.get("has_evolved")?.asBoolean ?: true
+    }
+
+    override fun matches(player: ServerPlayerEntity, context: LevelUpContext): Boolean {
+        val preEvo = context.pokemon.preEvolution == null
+        val hasEvolution = !context.pokemon.evolutions.none()
+        var evolutionCheck = true
+        if (preEvo || hasEvolution) {
+            evolutionCheck = !(preEvo == hasEvolution)
+        }
+        return level == context.level && evolutionCheck == evolved
+    }
+}
+
+open class LevelUpContext(var level : Int, var pokemon : Pokemon)
@@ -0,0 +1,54 @@
+/*
+ * 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.advancement.criterion
+
+import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.party
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import net.minecraft.predicate.entity.LootContextPredicate
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.Identifier
+
+class PartyCheckCriterion(id: Identifier, entity: LootContextPredicate) : SimpleCriterionCondition<PartyCheckContext>(id, entity){
+    val party = mutableListOf<Identifier>()
+    override fun toJson(json: JsonObject) {
+        json.add("party", JsonArray(party.size).also {
+            party.forEach { pokemon -> it.add(pokemon.toString()) }
+        })
+    }
+
+    override fun fromJson(json: JsonObject) {
+        party.clear()
+        json.getAsJsonArray("party").forEach { element ->
+            party.add(element.asString.asIdentifierDefaultingNamespace())
+        }
+    }
+
+    override fun matches(player: ServerPlayerEntity, context: PartyCheckContext): Boolean {
+        val playerParty = player.party()
+        val matches = mutableListOf<Identifier>()
+        party.forEach {
+            if (it == "any".asIdentifierDefaultingNamespace()) {
+                matches.add(it)
+            }
+        }
+        val partyCount = playerParty.count()
+        if (matches.containsAll(party) && party.size == partyCount && matches.size == partyCount) return true
+        playerParty.iterator().forEach {
+            if (party.contains(it.species.resourceIdentifier)) {
+                matches.add(it.species.resourceIdentifier)
+            }
+        }
+        return matches.containsAll(party) && matches.size == partyCount
+    }
+}
+
+open class PartyCheckContext(val party : PlayerPartyStore)
@@ -0,0 +1,34 @@
+/*
+ * 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.advancement.criterion
+
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.google.gson.JsonObject
+import net.minecraft.predicate.entity.LootContextPredicate
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.Identifier
+
+open class PokemonInteractContext(var type: Identifier, var item : Identifier)
+class PokemonInteractCriterion(id: Identifier, entity: LootContextPredicate) : SimpleCriterionCondition<PokemonInteractContext>(id, entity) {
+    var type = "any"
+    var item = "any"
+    override fun toJson(json: JsonObject) {
+        json.addProperty("type", type)
+        json.addProperty("item", item)
+    }
+
+    override fun fromJson(json: JsonObject) {
+        type = json.get("type")?.asString ?: "any"
+        item = json.get("item")?.asString ?: "any"
+    }
+
+    override fun matches(player: ServerPlayerEntity, context: PokemonInteractContext): Boolean {
+        return (context.type == type.asIdentifierDefaultingNamespace() || type == "any") && (context.item == item.asIdentifierDefaultingNamespace() || item == "any")
+    }
+}
@@ -0,0 +1,47 @@
+/*
+ * 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.advancement.criterion
+
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.google.gson.JsonObject
+import net.minecraft.predicate.entity.LootContextPredicate
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.Identifier
+
+class TradePokemonCriterionCondition(id: Identifier, entity: LootContextPredicate) : SimpleCriterionCondition<TradePokemonContext>(id, entity) {
+    var traded = "any"
+    var received = "any"
+    var tradedHeldItem = "any"
+    var receivedHeldItem = "any"
+    override fun toJson(json: JsonObject) {
+        json.addProperty("traded", traded)
+        json.addProperty("received", received)
+        json.addProperty("traded_held_item", tradedHeldItem)
+        json.addProperty("received_held_item", receivedHeldItem)
+    }
+
+    override fun fromJson(json: JsonObject) {
+        traded = json.get("traded")?.asString ?: "any"
+        received = json.get("received")?.asString ?: "any"
+        tradedHeldItem = json.get("traded_held_item")?.asString ?: "minecraft:air"
+        receivedHeldItem = json.get("received_held_item")?.asString ?: "minecraft:air"
+    }
+
+    override fun matches(player: ServerPlayerEntity, context: TradePokemonContext): Boolean {
+        val heldItem1 = context.traded.heldItem().item.registryEntry.registryKey().value
+        val heldItem2 = context.received.heldItem().item.registryEntry.registryKey().value
+        return (context.traded.species.resourceIdentifier == traded.asIdentifierDefaultingNamespace() || traded == "any") &&
+                (context.received.species.resourceIdentifier == received.asIdentifierDefaultingNamespace() || received == "any") &&
+                (heldItem1 == tradedHeldItem.asIdentifierDefaultingNamespace() || heldItem1 == "minecraft:air".asIdentifierDefaultingNamespace()) &&
+                (heldItem2 == receivedHeldItem.asIdentifierDefaultingNamespace() || heldItem2 == "minecraft:air".asIdentifierDefaultingNamespace())
+    }
+}
+
+open class TradePokemonContext(val traded: Pokemon, val received: Pokemon)
@@ -12,6 +12,8 @@ import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.api.PrioritizedList
 import com.cobblemon.mod.common.api.Priority
 import com.cobblemon.mod.common.pokemon.Species
+import com.mojang.serialization.Codec
+import com.mojang.serialization.DataResult

 /**
 * A pool of potential abilities, as a [PrioritizedList]. The added logic of this subclass
@@ -35,4 +37,22 @@ open class AbilityPool : PrioritizedList<PotentialAbility>() {
        Exception().printStackTrace()
        return Abilities.first().create() to Priority.LOWEST
    }
+
+    companion object {
+
+        @JvmField
+        val CODEC: Codec<AbilityPool> = Codec.list(Codec.STRING)
+            .comapFlatMap(
+                { raw ->
+                    val pool = AbilityPool()
+                    if (raw.isEmpty()) {
+                        return@comapFlatMap DataResult.error { "Cannot create ability pool from an empty list" }
+                    }
+                    raw.forEach {  }
+                    DataResult.success(pool)
+                }
+            )
+
+    }
+
 }
@@ -10,9 +10,12 @@ package com.cobblemon.mod.common.api.abilities

 import com.cobblemon.mod.common.api.Priority
 import com.google.gson.JsonElement
+import com.mojang.serialization.Codec

 interface PotentialAbilityType<T : PotentialAbility> {
    fun parseFromJSON(element: JsonElement): T?
+
+    fun codec(): Codec<out PotentialAbilityType<*>>
 }

 /**
@@ -45,6 +48,10 @@ object CommonAbilityType : PotentialAbilityType<CommonAbility> {
            }
        }
    }
+
+    override fun codec(): Codec<out PotentialAbilityType<*>> {
+        TODO("Not yet implemented")
+    }
 }

 open class CommonAbility(override val template: AbilityTemplate) : PotentialAbility {
@@ -10,6 +10,8 @@ package com.cobblemon.mod.common.api.ai

 import com.cobblemon.mod.common.api.serialization.StringIdentifiedObjectAdapter
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.mojang.serialization.Codec
+import com.mojang.serialization.DataResult
 import net.minecraft.entity.ai.TargetPredicate
 import net.minecraft.util.math.Box

@@ -35,7 +37,7 @@ interface SleepDepth {

            override fun shouldWake(pokemonEntity: PokemonEntity): Boolean {
                val nearbyPlayers = pokemonEntity.world.getPlayers(TargetPredicate.createNonAttackable(), pokemonEntity, Box.of(pokemonEntity.pos, 16.0, 16.0, 16.0))
-                return nearbyPlayers.none { !it.isSneaking }
+                return nearbyPlayers.any { !it.isSneaking }
            }
        }

@@ -44,6 +46,11 @@ interface SleepDepth {
            "normal" to normal
        )
        val adapter = StringIdentifiedObjectAdapter { depths[it] ?: throw IllegalArgumentException("Unknown sleep depth: $it") }
+
+        val CODEC: Codec<SleepDepth> = Codec.STRING.flatXmap(
+            { string -> depths[string]?.let { DataResult.success(it) } ?: DataResult.error { "Cannot find a SleepDepth with the ID $string" } },
+            { depth -> depths.entries.firstOrNull { it.value == depth }?.let { DataResult.success(it.key) } ?: DataResult.error { "Cannot resolve a ID for the SleepDepth $depth" } }
+        )
    }

    fun canSleep(pokemonEntity: PokemonEntity): Boolean
@@ -10,6 +10,8 @@ package com.cobblemon.mod.common.api.battles.interpreter

 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.moves.MoveTemplate
+import com.cobblemon.mod.common.api.moves.Moves
 import com.cobblemon.mod.common.battles.ActiveBattlePokemon
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import java.util.UUID
@@ -194,6 +196,11 @@ class BattleMessage(rawMessage: String) {
        return Effect.parse(data)
    }

+    fun moveAt(index: Int): MoveTemplate? {
+        val argument = argumentAt(index)?.lowercase()?.replace("[^a-z0-9]".toRegex(), "") ?: return null
+        return Moves.getByName(argument)
+    }
+
    /**
     * Queries an optional argument with given [argumentName] for a 'pnx' that will be parsed into a [BattleActor] and [ActiveBattlePokemon].
     *
@@ -40,6 +40,7 @@ import com.cobblemon.mod.common.net.messages.client.battle.BattleEndPacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMessagePacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMusicPacket
 import com.cobblemon.mod.common.pokemon.evolution.progress.DefeatEvolutionProgress
+import com.cobblemon.mod.common.pokemon.evolution.requirements.DefeatRequirement
 import com.cobblemon.mod.common.util.battleLang
 import com.cobblemon.mod.common.util.getPlayer
 import java.io.File
@@ -208,11 +209,16 @@ open class PokemonBattle(
                faintedPokemons.forEach { faintedPokemon ->
                    for (opponentPokemon in opponentNonFaintedPokemons) {
                        val facedFainted = opponentPokemon.facedOpponents.contains(faintedPokemon)
-                        val defeatProgress = DefeatEvolutionProgress()
                        val pokemon = opponentPokemon.effectedPokemon
-                        if (facedFainted && defeatProgress.shouldKeep(pokemon)) {
-                            val progress = pokemon.evolutionProxy.current().progressFirstOrCreate({ it is DefeatEvolutionProgress && it.currentProgress().target.matches(faintedPokemon.effectedPokemon) }) { defeatProgress }
-                            progress.updateProgress(DefeatEvolutionProgress.Progress(progress.currentProgress().target, progress.currentProgress().amount + 1))
+                        if (facedFainted) {
+                            pokemon.evolutions.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))
+                                    }
+                                }
+                            }
                        }
                        val multiplier = when {
                            // ToDo when Exp. All is implement if enabled && !facedFainted return 2.0, probably should be a configurable value too, this will have priority over the Exp. Share
@@ -50,6 +50,7 @@ object Berries : JsonDataRegistry<Berry> {
        .registerTypeAdapter(MulchVariant::class.java, MulchVariantAdapter)
        .registerTypeAdapter(NumberRange.FloatRange::class.java, FloatNumberRangeAdapter)
        .registerTypeAdapter(Status::class.java, StatusAdapter)
+        .registerTypeAdapter(TypeToken.getParameterized(Collection::class.java, Box::class.java).type, BoxCollectionAdapter)
        .registerTypeAdapter(Box::class.java, BoxAdapter)
        .registerTypeAdapter(Vec3d::class.java, VerboseVec3dAdapter)
        .registerTypeAdapter(Identifier::class.java, IdentifierAdapter)
@@ -65,9 +66,6 @@ object Berries : JsonDataRegistry<Berry> {

    private val berries = hashMapOf<Identifier, Berry>()

-    val PECHA
-        get() = this.getByName("")
-
    override fun reload(data: Map<Identifier, Berry>) {
        this.berries.clear()
        data.forEach { (identifier, berry) ->
@@ -23,6 +23,7 @@ import com.cobblemon.mod.common.util.writeBox
 import com.google.gson.annotations.SerializedName
 import java.awt.Color
 import java.util.EnumSet
+import kotlin.math.min
 import net.minecraft.block.Block
 import net.minecraft.block.BlockState
 import net.minecraft.client.model.ModelPart
@@ -159,16 +160,14 @@ class Berry(
        val base = this.baseYield.random()
        val bonus = this.bonusYield(world, state, pos)
        var yield = base + bonus.first
-        val event = BerryYieldCalculationEvent(this, world, state, pos, placer, yield, bonus.second)
        val treeEntity = world.getBlockEntity(pos) as BerryBlockEntity
-        if (treeEntity.mulchVariant == MulchVariant.RICH) {
-            yield = yield.times(1.2).coerceAtMost(maxYield().toDouble()).toInt()
-            treeEntity.mulchDuration--
+        if (BerryBlock.getMulch(state) == MulchVariant.RICH) {
+            yield = min(yield + 1, maxYield())
+            treeEntity.decrementMulchDuration(world, pos, state)
        }
+        val event = BerryYieldCalculationEvent(this, world, state, pos, placer, yield, bonus.second)
        CobblemonEvents.BERRY_YIELD.post(event) { yield = it.yield }
        return yield
-        //Just for testing the renderer
-        //return growthPoints.size
    }

    /**
@@ -293,14 +292,13 @@ class Berry(
    private fun bonusYield(world: World, state: BlockState, pos: BlockPos): Pair<Int, Collection<GrowthFactor>> {
        var bonus = 0
        val passed = arrayListOf<GrowthFactor>()
-        val entity = world.getBlockEntity(pos) as BerryBlockEntity
-        val hasBiomeMulch = favoriteMulches.contains(entity.mulchVariant)
+        val mulchVariant = BerryBlock.getMulch(state)
+        val hasBiomeMulch = mulchVariant in favoriteMulches
        this.growthFactors.forEach { factor ->
            if (factor.isValid(world, state, pos)) {
                bonus += factor.yield()
                passed += factor
-            }
-            else if (hasBiomeMulch) {
+            } else if (hasBiomeMulch) {
                bonus += factor.yield()
            }
        }
@@ -121,6 +121,7 @@ class PartySelectCallback(

 open class PartySelectPokemonDTO(
    val pokemonProperties: PokemonProperties,
+    val aspects: Set<String>,
    val heldItem: ItemStack = ItemStack.EMPTY,
    var currentHealth: Int,
    var maxHealth: Int,
@@ -129,13 +130,13 @@ open class PartySelectPokemonDTO(
    @JvmOverloads
    constructor(pokemon: Pokemon, enabled: Boolean = true): this(
        pokemonProperties = pokemon.createPokemonProperties(
-            PokemonPropertyExtractor.ASPECTS,
            PokemonPropertyExtractor.SPECIES,
            PokemonPropertyExtractor.LEVEL,
            PokemonPropertyExtractor.NICKNAME,
            PokemonPropertyExtractor.POKEBALL,
-            PokemonPropertyExtractor.STATUS
+            PokemonPropertyExtractor.STATUS,
        ),
+        aspects = pokemon.aspects,
        heldItem = pokemon.heldItemNoCopy(),
        currentHealth = pokemon.currentHealth,
        maxHealth = pokemon.hp,
@@ -144,6 +145,7 @@ open class PartySelectPokemonDTO(

    constructor(buffer: PacketByteBuf): this(
        pokemonProperties = PokemonProperties().loadFromNBT(buffer.readNbt() as NbtCompound),
+        aspects = buffer.readList { it.readString() }.toSet(),
        heldItem = buffer.readItemStack(),
        currentHealth = buffer.readInt(),
        maxHealth = buffer.readInt(),
@@ -152,6 +154,7 @@ open class PartySelectPokemonDTO(

    fun writeToBuffer(buffer: PacketByteBuf) {
        buffer.writeNbt(pokemonProperties.saveToNBT())
+        buffer.writeCollection(aspects) { _, aspect -> buffer.writeString(aspect) }
        buffer.writeItemStack(heldItem)
        buffer.writeInt(currentHealth)
        buffer.writeInt(maxHealth)
@@ -0,0 +1,20 @@
+/*
+ * 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.conditional
+
+import net.minecraft.registry.Registry
+import net.minecraft.util.Identifier
+
+class RegistryElementCondition<T>(val element: T, private val source: Identifier) : RegistryLikeCondition<T> {
+
+    override fun fits(value: T, registry: Registry<T>): Boolean = value == this.element
+
+    override fun pretty(): String = this.source.toString()
+
+}
@@ -1,31 +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.conditional
-
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import java.lang.reflect.Type
-
-/**
- * Adapter for [RegistryLikeCondition]s. Its logic is that the implementation of this adapter must
- * provide a list of resolvers, and the deserializer will find the first resolver that returns a non-null
- * value for the [JsonElement].
- *
- * @author Hiroku
- * @since July 17th, 2022
- */
-interface RegistryLikeAdapter<B> : JsonDeserializer<RegistryLikeCondition<B>> {
-    val registryLikeConditions: MutableList<(JsonElement) -> RegistryLikeCondition<B>?>
-
-    override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext): RegistryLikeCondition<B> {
-        return registryLikeConditions.firstNotNullOfOrNull { it(json) }
-            ?: throw IllegalArgumentException("Unable to deserialize $json")
-    }
-}
@@ -8,7 +8,11 @@

 package com.cobblemon.mod.common.api.conditional

+import com.mojang.serialization.Codec
+import com.mojang.serialization.DataResult
 import net.minecraft.registry.Registry
+import net.minecraft.registry.tag.TagKey
+import net.minecraft.util.Identifier

 /**
 * A condition which applies to an entry in some [Registry].
@@ -16,6 +20,43 @@ import net.minecraft.registry.Registry
 * @author Hiroku
 * @since July 16th, 2022
 */
-interface RegistryLikeCondition<T> {
-    fun fits(t: T, registry: Registry<T>): Boolean
+sealed interface RegistryLikeCondition<T> {
+
+    /**
+     * Checks if a given [value] matches this condition.
+     *
+     * @param value The value being matched against this condition.
+     * @param registry The [Registry] of type [T] being queried.
+     * @return If the condition is fulfilled.
+     */
+    fun fits(value: T, registry: Registry<T>): Boolean
+
+    /**
+     * Generates a string like human-friendly representation used by the Codec when serializing.
+     *
+     * @return The string like human-friendly representation.
+     */
+    fun pretty(): String
+
+    companion object {
+
+        @JvmStatic
+        fun <T> createCodec(registryAccessor: () -> Registry<T>): Codec<RegistryLikeCondition<T>> = Codec.STRING.comapFlatMap(
+            { string ->
+                val registry = registryAccessor.invoke()
+                val isTag = string.startsWith("#")
+                val rawIdentifier = if (isTag) string.substringAfter("#") else string
+                val identifier = Identifier.tryParse(rawIdentifier) ?: return@comapFlatMap DataResult.error { "Cannot resolve identifier/tag from the string $string" }
+                if (isTag) {
+                    val tag = TagKey.of(registry.key, identifier)
+                    return@comapFlatMap DataResult.success(RegistryTagCondition(tag))
+                }
+                val element = registry.get(identifier) ?: return@comapFlatMap DataResult.error { "Cannot find an element in registry ${registry.key.value} with the ID $identifier" }
+                return@comapFlatMap DataResult.success(RegistryElementCondition(element, identifier))
+            },
+            { it.pretty() }
+        )
+
+    }
+
 }
@@ -1,28 +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.conditional
-
-import com.google.gson.JsonElement
-import net.minecraft.registry.Registry
-import net.minecraft.util.Identifier
-
-/**
- * A condition for some registry type which asserts that the entry must have the given [Identifier].
- *
- * @author Hiroku
- * @since July 16th, 2022
- */
-open class RegistryLikeIdentifierCondition<T>(val identifier: Identifier) : RegistryLikeCondition<T> {
-    companion object {
-        fun <T> resolver(
-            constructor: (Identifier) -> RegistryLikeIdentifierCondition<T>
-        ): (JsonElement) -> RegistryLikeIdentifierCondition<T>? = { constructor(Identifier(it.asString)) }
-    }
-    override fun fits(t: T, registry: Registry<T>) = registry.getId(t) == identifier
-}
@@ -1,54 +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.conditional
-
-import com.google.gson.JsonElement
-import net.minecraft.registry.Registry
-import net.minecraft.registry.RegistryKey
-import net.minecraft.registry.tag.TagKey
-import net.minecraft.util.Identifier
-
-/**
- * A condition for some registry type that asserts that the entry must be inside the given [TagKey]. This is presented
- * in JSONs as an identifier prefixed with a hash.
- *
- * @author Hiroku
- * @since July 16th, 2022
- */
-open class RegistryLikeTagCondition<T>(val tag: TagKey<T>) : RegistryLikeCondition<T> {
-
-    companion object {
-        const val PREFIX = "#"
-        fun <T> resolver(
-            registryKey: RegistryKey<Registry<T>>,
-            constructor: (TagKey<T>) -> RegistryLikeTagCondition<T>
-        ): (JsonElement) -> RegistryLikeTagCondition<T>? = {
-            val firstSymbol = it.asString.substring(0, 1)
-            if (firstSymbol == PREFIX) {
-                val identifier = Identifier(it.asString.substring(1))
-                constructor(TagKey.of(registryKey, identifier))
-            } else {
-                null
-            }
-        }
-    }
-
-    override fun fits(t: T, registry: Registry<T>): Boolean {
-//        val registryHasTag = registry.containsTag(tag)
-//        if (!registryHasTag) {
-////            LOGGER.warn("No tag in registry: ${tag.id}")
-//            return false
-//        }
-
-        return registry.getKey(t)
-            .flatMap(registry::getEntry)
-            .map { entry -> entry.isIn(tag) }
-            .orElse(false)
-    }
-}
@@ -0,0 +1,20 @@
+/*
+ * 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.conditional
+
+import net.minecraft.registry.Registry
+import net.minecraft.registry.tag.TagKey
+
+class RegistryTagCondition<T>(val tag: TagKey<T>) : RegistryLikeCondition<T> {
+
+    override fun fits(value: T, registry: Registry<T>): Boolean = registry.getEntry(value).isIn(this.tag)
+
+    override fun pretty(): String = "#${this.tag.id}"
+
+}
@@ -8,11 +8,9 @@

 package com.cobblemon.mod.common.api.data

-import com.cobblemon.mod.common.util.endsWith
+import com.cobblemon.mod.common.Cobblemon
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import java.io.File
-import java.util.concurrent.ExecutionException
 import net.minecraft.resource.ResourceManager
 import net.minecraft.util.Identifier

@@ -44,20 +42,7 @@ interface JsonDataRegistry<T> : DataRegistry {
    val resourcePath: String

    override fun reload(manager: ResourceManager) {
-        val data = hashMapOf<Identifier, T>()
-        manager.findResources(this.resourcePath) { path -> path.endsWith(JSON_EXTENSION) }.forEach { (identifier, resource) ->
-            resource.inputStream.use { stream ->
-                stream.bufferedReader().use { reader ->
-                    val resolvedIdentifier = Identifier(identifier.namespace, File(identifier.path).nameWithoutExtension)
-                    try {
-                        data[resolvedIdentifier] = this.gson.fromJson(reader, this.typeToken.type)
-                    } catch (exception: Exception) {
-                        throw ExecutionException("Error loading JSON for data: $identifier", exception)
-                    }
-                }
-            }
-        }
-        this.reload(data)
+        this.reload(Cobblemon.implementation.reloadJsonRegistry(this, manager))
    }

    /**
@@ -68,6 +53,6 @@ interface JsonDataRegistry<T> : DataRegistry {
    fun reload(data: Map<Identifier, T>)

    companion object {
-        private const val JSON_EXTENSION = ".json"
+        const val JSON_EXTENSION = ".json"
    }
 }
@@ -8,13 +8,11 @@

 package com.cobblemon.mod.common.api.events

-import com.cobblemon.mod.common.api.events.battles.BattleFaintedEvent
-import com.cobblemon.mod.common.api.events.battles.BattleFledEvent
-import com.cobblemon.mod.common.api.events.battles.BattleStartedPostEvent
-import com.cobblemon.mod.common.api.events.battles.BattleStartedPreEvent
-import com.cobblemon.mod.common.api.events.battles.BattleVictoryEvent
-import com.cobblemon.mod.common.api.events.berry.*
 import com.cobblemon.mod.common.api.events.battles.*
+import com.cobblemon.mod.common.api.events.berry.BerryHarvestEvent
+import com.cobblemon.mod.common.api.events.berry.BerryMutationOfferEvent
+import com.cobblemon.mod.common.api.events.berry.BerryMutationResultEvent
+import com.cobblemon.mod.common.api.events.berry.BerryYieldCalculationEvent
 import com.cobblemon.mod.common.api.events.drops.LootDroppedEvent
 import com.cobblemon.mod.common.api.events.entity.PokemonEntityLoadEvent
 import com.cobblemon.mod.common.api.events.entity.PokemonEntitySaveEvent
@@ -41,6 +39,7 @@ import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.server.network.ServerPlayerEntity

+@Suppress("unused")
 object CobblemonEvents {

    @JvmField
@@ -88,6 +87,9 @@ object CobblemonEvents {
    @JvmField
    val POKEMON_RECALLED = EventObservable<PokemonRecalledEvent>()

+    @JvmField
+    val TRADE_COMPLETED = EventObservable<TradeCompletedEvent>()
+
    @JvmField
    val LEVEL_UP_EVENT = EventObservable<LevelUpEvent>()

@@ -100,6 +102,7 @@ object CobblemonEvents {
    @JvmField
    val ENTITY_SPAWN = CancelableObservable<SpawnEvent<*>>()

+    @Suppress("UNCHECKED_CAST")
    @JvmField
    val POKEMON_ENTITY_SPAWN = ENTITY_SPAWN
        .pipe(
@@ -8,6 +8,7 @@

 package com.cobblemon.mod.common.api.events.farming

+import com.cobblemon.mod.common.api.apricorn.Apricorn
 import net.minecraft.block.BlockState
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.server.world.ServerWorld
@@ -18,6 +19,7 @@ import net.minecraft.util.math.BlockPos
 */
 class ApricornHarvestEvent(
    val player: ServerPlayerEntity,
+    val apricorn: Apricorn,
    val world: ServerWorld,
    val pos: BlockPos
 ) {
@@ -0,0 +1,14 @@
+/*
+ * 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
+
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.trade.TradeParticipant
+
+class TradeCompletedEvent(val tradeParticipant1 : TradeParticipant, val tradeParticipant1Pokemon : Pokemon, val tradeParticipant2 : TradeParticipant, val tradeParticipant2Pokemon : Pokemon)
@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.api.text.font
 import com.cobblemon.mod.common.client.gui.battle.BattleOverlay.Companion.PORTRAIT_DIAMETER
 import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.Species
@@ -179,7 +180,11 @@ fun drawPortraitPokemon(
    partialTicks: Float
 ) {
    val model = PokemonModelRepository.getPoser(species.resourceIdentifier, aspects)
-    val texture = PokemonModelRepository.getTexture(species.resourceIdentifier, aspects, state)
+    val texture = PokemonModelRepository.getTexture(species.resourceIdentifier, aspects, state?.animationSeconds ?: 0F)
+
+    val context = RenderContext()
+    PokemonModelRepository.getTextureNoSubstitute(species.resourceIdentifier, aspects, 0f).let { it -> context.put(RenderContext.TEXTURE, it) }
+    context.put(RenderContext.SCALE, species.getForm(aspects).baseScale)

    val renderType = model.getLayer(texture)

@@ -215,11 +220,12 @@ fun drawPortraitPokemon(
    val packedLight = LightmapTextureManager.pack(11, 7)

    model.withLayerContext(immediate, state, PokemonModelRepository.getLayers(species.resourceIdentifier, aspects)) {
-        model.render(matrixStack, buffer, packedLight, OverlayTexture.DEFAULT_UV, 1F, 1F, 1F, 1F)
+        model.render(context, matrixStack, buffer, packedLight, OverlayTexture.DEFAULT_UV, 1F, 1F, 1F, 1F)
        immediate.draw()
    }

    matrixStack.pop()
+    model.setDefault()

    DiffuseLighting.enableGuiDepthLighting()
 }
@@ -98,6 +98,11 @@ interface PokemonAndMoveSelectingItem {
    fun canUseOnMove(move: Move): Boolean

    fun interactWithSpecific(player: ServerPlayerEntity, stack: ItemStack, pokemon: Pokemon): TypedActionResult<ItemStack>? {
+
+        if (player.isSneaking) {
+            return TypedActionResult.pass(stack)
+        }
+
        MoveSelectCallbacks.create(
            player = player,
            moves = pokemon.moveSet.toList(),
@@ -146,4 +151,4 @@ interface PokemonAndMoveSelectingItem {

        return TypedActionResult.success(stack)
    }
-}
+}
@@ -8,6 +8,8 @@

 package com.cobblemon.mod.common.api.item

+import com.cobblemon.mod.common.advancement.CobblemonCriteria
+import com.cobblemon.mod.common.advancement.criterion.PokemonInteractContext
 import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
 import com.cobblemon.mod.common.api.callback.PartySelectCallbacks
 import com.cobblemon.mod.common.api.text.red
@@ -22,6 +24,7 @@ import com.cobblemon.mod.common.util.isHeld
 import com.cobblemon.mod.common.util.isLookingAt
 import com.cobblemon.mod.common.util.party
 import net.minecraft.item.ItemStack
+import net.minecraft.registry.Registries
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.util.TypedActionResult
 import net.minecraft.util.math.Box
@@ -59,15 +62,17 @@ interface PokemonSelectingItem {
                return interactWithSpecificBattle(player, stack, battlePokemon)
            }
        } ?: run {
-            if (entity != null) {
-                val pokemon = entity.pokemon
-                if (entity.ownerUuid == player.uuid) {
-                    return applyToPokemon(player, stack, pokemon) ?: TypedActionResult.pass(stack)
+            if (!player.isSneaking) {
+                return if (entity != null) {
+                    val pokemon = entity.pokemon
+                    if (entity.ownerUuid == player.uuid) {
+                        applyToPokemon(player, stack, pokemon) ?: TypedActionResult.pass(stack)
+                    } else {
+                        TypedActionResult.fail(stack)
+                    }
                } else {
-                    return TypedActionResult.fail(stack)
+                    interactGeneral(player, stack)
                }
-            } else {
-                return interactGeneral(player, stack)
            }
        }

@@ -89,6 +94,7 @@ interface PokemonSelectingItem {
            if (!player.isCreative) {
                stack.decrement(1)
            }
+            CobblemonCriteria.POKEMON_INTERACT.trigger(player, PokemonInteractContext(battlePokemon.entity!!.pokemon.species.resourceIdentifier, Registries.ITEM.getId(stack.item)))
        }
    }

@@ -118,9 +124,7 @@ interface PokemonSelectingItem {
            handler = { pk ->
                if (stack.isHeld(player)) {
                    applyToPokemon(player, stack, pk)
-                    if (!player.isCreative) {
-                        stack.decrement(1)
-                    }
+                    CobblemonCriteria.POKEMON_INTERACT.trigger(player, PokemonInteractContext(pk.species.resourceIdentifier, Registries.ITEM.getId(stack.item)))
                }
            }
        )
@@ -0,0 +1,43 @@
+/*
+ * 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.moves
+
+import com.cobblemon.mod.common.util.lang
+import com.mojang.serialization.Codec
+import net.minecraft.text.MutableText
+import net.minecraft.util.StringIdentifiable
+
+/**
+ * Represents the damage category of a [MoveTemplate]/[Move].
+ *
+ * @see MoveTemplate
+ * @see Move
+ */
+enum class DamageCategory : StringIdentifiable {
+
+    PHYSICAL,
+    SPECIAL,
+    STATUS;
+
+    override fun asString(): String = this.name
+
+    /**
+     * Resolves the display name of this damage category.
+     *
+     * @return The generated text.
+     */
+    fun displayName(): MutableText = lang("move.category.${this.name.lowercase()}")
+
+    companion object {
+
+        val CODEC: Codec<DamageCategory> = StringIdentifiable.createCodec(DamageCategory::values)
+
+    }
+
+}
@@ -8,7 +8,6 @@

 package com.cobblemon.mod.common.api.moves

-import com.cobblemon.mod.common.api.moves.categories.DamageCategory
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.types.ElementalType
 import com.cobblemon.mod.common.net.IntSize
@@ -18,6 +18,8 @@ import net.minecraft.nbt.NbtCompound
 import net.minecraft.nbt.NbtElement
 import net.minecraft.nbt.NbtList
 import net.minecraft.network.PacketByteBuf
+import kotlin.math.min
+
 class MoveSet : Iterable<Move> {
    val observable = SimpleObservable<MoveSet>()
    private var emit = true
@@ -63,6 +65,11 @@ class MoveSet : Iterable<Move> {
        update()
    }

+    fun partialHeal() {
+        getMoves().forEach { it.currentPp = min((it.currentPp + (it.maxPp / 2)), it.maxPp)}
+        update()
+    }
+
    fun clear() {
        doWithoutEmitting {
            for (i in 0 until MOVE_COUNT){
@@ -8,14 +8,15 @@

 package com.cobblemon.mod.common.api.moves

-import com.cobblemon.mod.common.api.moves.categories.DamageCategories
-import com.cobblemon.mod.common.api.moves.categories.DamageCategory
+import com.cobblemon.mod.common.api.registry.CobblemonRegistries
 import com.cobblemon.mod.common.api.types.ElementalType
-import com.cobblemon.mod.common.api.types.ElementalTypes
 import com.cobblemon.mod.common.battles.MoveTarget
 import com.cobblemon.mod.common.util.lang
 import com.google.gson.annotations.SerializedName
+import com.mojang.serialization.Codec
+import com.mojang.serialization.codecs.RecordCodecBuilder
 import net.minecraft.text.MutableText
+import net.minecraft.util.math.random.Random

 /**
 * This class represents the base of a Move.
@@ -48,6 +49,27 @@ open class MoveTemplate(
    val effectChances: Array<Double>
 ) {

+    companion object {
+        fun dummy(name: String) = Dummy(name)
+
+        val CODEC: Codec<MoveTemplate> = RecordCodecBuilder.create { builder ->
+            builder.group(
+                Codec.STRING.fieldOf("name").forGetter(MoveTemplate::name),
+                Codec.INT.fieldOf("num").forGetter(MoveTemplate::num),
+                CobblemonRegistries.ELEMENTAL_TYPE.codec.fieldOf("type").forGetter(MoveTemplate::elementalType),
+                DamageCategory.CODEC.fieldOf("damageCategory").forGetter(MoveTemplate::damageCategory),
+                Codec.DOUBLE.fieldOf("power").forGetter(MoveTemplate::power),
+                MoveTarget.CODEC.fieldOf("target").forGetter(MoveTemplate::target),
+                Codec.DOUBLE.fieldOf("accuracy").forGetter(MoveTemplate::accuracy),
+                Codec.INT.fieldOf("pp").forGetter(MoveTemplate::pp),
+                Codec.INT.fieldOf("priority").forGetter(MoveTemplate::priority),
+                Codec.DOUBLE.fieldOf("critRatio").forGetter(MoveTemplate::critRatio),
+                Codec.list(Codec.DOUBLE).fieldOf("effectChances").xmap({ e -> e.toTypedArray() }, {  e -> e.toList() }).forGetter(MoveTemplate::effectChances)
+            ).apply(builder, ::MoveTemplate)
+        }
+
+    }
+
    val displayName: MutableText
        get() = lang("move.$name")
    val description: MutableText
@@ -57,8 +79,8 @@ open class MoveTemplate(
    class Dummy(name: String) : MoveTemplate(
        name = name,
        num = -1,
-        elementalType = ElementalTypes.NORMAL,
-        damageCategory = DamageCategories.STATUS,
+        elementalType = CobblemonRegistries.ELEMENTAL_TYPE.getRandom(Random.create()).orElseThrow().value(),
+        damageCategory = DamageCategory.STATUS,
        power = 0.0,
        target = MoveTarget.all,
        accuracy = 100.0,
@@ -68,10 +90,6 @@ open class MoveTemplate(
        effectChances = emptyArray()
    )

-    companion object {
-        fun dummy(name: String) = Dummy(name)
-    }
-
    /**
     * Creates the Move with full PP
     */
@@ -92,4 +110,5 @@ open class MoveTemplate(
            template = this
        )
    }
+
 }
@@ -10,9 +10,8 @@ package com.cobblemon.mod.common.api.moves

 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.data.DataRegistry
-import com.cobblemon.mod.common.api.moves.categories.DamageCategories
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.api.types.ElementalTypes
+import com.cobblemon.mod.common.api.registry.CobblemonRegistries
 import com.cobblemon.mod.common.battles.MoveTarget
 import com.cobblemon.mod.common.battles.runner.ShowdownService
 import com.cobblemon.mod.common.net.messages.client.data.MovesRegistrySyncPacket
@@ -44,8 +43,8 @@ object Moves : DataRegistry {
            val id = jsMove.get("id").asString
            try {
                val num = jsMove.get("num").asInt
-                val elementalType = ElementalTypes.getOrException(jsMove.get("type").asString)
-                val damageCategory = DamageCategories.getOrException(jsMove.get("category").asString)
+                val elementalType = CobblemonRegistries.ELEMENTAL_TYPE.first { it.showdownId() == jsMove.get("type").asString }
+                val damageCategory = DamageCategory.valueOf(jsMove.get("category").asString.uppercase())
                val power = jsMove.get("basePower").asDouble
                val target = MoveTarget.fromShowdownId(jsMove.get("target").asString)
                // If not a double it's always true
@@ -1,30 +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.moves.adapters
-
-import com.cobblemon.mod.common.api.moves.categories.DamageCategories
-import com.cobblemon.mod.common.api.moves.categories.DamageCategory
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonPrimitive
-import com.google.gson.JsonSerializationContext
-import com.google.gson.JsonSerializer
-import java.lang.reflect.Type
-
-object DamageCategoryAdapter: JsonSerializer<DamageCategory>, JsonDeserializer<DamageCategory> {
-
-    override fun serialize(src: DamageCategory, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
-        return JsonPrimitive(src.name)
-    }
-
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): DamageCategory {
-        return DamageCategories.getOrException(json.asString)
-    }
-}
@@ -1,64 +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.moves.categories
-
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.text.Text
-import net.minecraft.util.Identifier
-
-object DamageCategories {
-    private val allCategories = mutableListOf<DamageCategory>()
-
-    val PHYSICAL = register(
-        name = "physical",
-        displayName = Text.translatable("cobblemon.move.category.physical"),
-        textureXMultiplier = 0
-    )
-    val SPECIAL = register(
-        name = "special",
-        displayName = Text.translatable("cobblemon.move.category.special"),
-        textureXMultiplier = 1
-    )
-    val STATUS = register(
-        name = "status",
-        displayName = Text.translatable("cobblemon.move.category.status"),
-        textureXMultiplier = 2
-    )
-
-    fun register(
-        name: String,
-        displayName: Text,
-        resourceLocation: Identifier = cobblemonResource("textures/gui/categories.png"),
-        textureXMultiplier: Int
-    ): DamageCategory {
-        return DamageCategory(
-            name = name,
-            displayName = displayName,
-            textureXMultiplier = textureXMultiplier,
-            resourceLocation = resourceLocation
-        ).also {
-            allCategories.add(it)
-        }
-    }
-
-    fun register(damageCategory: DamageCategory): DamageCategory {
-        allCategories.add(damageCategory)
-        return damageCategory
-    }
-
-    fun get(name: String): DamageCategory? {
-        return allCategories.firstOrNull { cat -> cat.name.equals(name, ignoreCase = true) }
-    }
-
-    fun getOrException(name: String): DamageCategory {
-        return allCategories.first { cat -> cat.name.equals(name, ignoreCase = true) }
-    }
-
-    fun count() = allCategories.size
-}
@@ -1,28 +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.moves.categories
-
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.text.Text
-import net.minecraft.util.Identifier
-
-/**
- * Representing a DamageCategory from the Pokemon Game
- *
- * @param name: The English name used to load / find it (spaces -> _)
- * @param displayName: A Component used to display the name, normally a TranslatableText
- * @param resourceLocation: The location of the resource used in the GUI
- */
-class DamageCategory(
-    val name: String,
-    val displayName: Text,
-    val textureXMultiplier: Int,
-    val resourceLocation: Identifier = cobblemonResource("textures/gui/categories.png")
-) {
-}
@@ -8,40 +8,22 @@

 package com.cobblemon.mod.common.api.mulch

-import com.cobblemon.mod.common.CobblemonItems
-import com.cobblemon.mod.common.item.MulchItem
 import net.minecraft.util.StringIdentifiable
-import java.time.Duration

 /**
 * Represents the different types of Mulch implemented in the mod.
 *
 */
-enum class MulchVariant(val isBiomeMulch: Boolean = true, val duration: Int = 0) : StringIdentifiable {
+enum class MulchVariant(val duration: Int = -1) : StringIdentifiable {
    COARSE,
-    GROWTH(false, 3),
+    GROWTH(3),
    HUMID,
    LOAMY,
    PEAT,
-    RICH(false, 3),
+    RICH(3),
    SANDY,
-    SURPRISE(false, 3);
-
-    /**
-     * Resolves the item version of the Mulch.
-     *
-     * @return The [MulchItem] equivalent.
-     */
-    fun item(): MulchItem = when (this) {
-        COARSE -> CobblemonItems.COARSE_MULCH
-        GROWTH -> CobblemonItems.GROWTH_MULCH
-        HUMID -> CobblemonItems.HUMID_MULCH
-        LOAMY -> CobblemonItems.LOAMY_MULCH
-        PEAT -> CobblemonItems.PEAT_MULCH
-        RICH -> CobblemonItems.RICH_MULCH
-        SANDY -> CobblemonItems.SANDY_MULCH
-        SURPRISE -> CobblemonItems.SURPRISE_MULCH
-    }
+    SURPRISE(3),
+    NONE;

    override fun asString(): String {
        return name.lowercase()
@@ -65,6 +65,7 @@ object CobblemonPermissions {
    val TEST_PARTY_SLOT = this.create("${COMMAND_PREFIX}testpartyslot", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)

    val CLEAR_PARTY = this.create("${COMMAND_PREFIX}clearparty", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
+    val CLEAR_PC = this.create("${COMMAND_PREFIX}clearpc", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)

    fun all(): Iterable<Permission> = this.permissions

@@ -24,7 +24,7 @@ import com.cobblemon.mod.common.api.pokemon.labels.CobblemonPokemonLabels
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.api.types.ElementalTypes
+import com.cobblemon.mod.common.api.types.CobblemonElementalTypeTags
 import com.cobblemon.mod.common.pokeball.PokeBall
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.Gson
@@ -136,13 +136,13 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
        createDefault("fast_ball", BaseStatModifier(Stats.SPEED, { it >= 100 }, 4F))
        createDefault("level_ball", CatchRateModifiers.LEVEL)
        // ToDo we will need fishing context here once fishing is implemented for a multiplier
-        createDefault("lure_ball", CatchRateModifiers.typeBoosting(2F, ElementalTypes.WATER))
+        createDefault("lure_ball", CatchRateModifiers.typeBoosting(2F, CobblemonElementalTypeTags.LURE_BALL_BOOSTING))
        createDefault("heavy_ball", CatchRateModifiers.WEIGHT_BASED)
        createDefault("love_ball", CatchRateModifiers.LOVE)
        createDefault("friend_ball", effects = listOf(CaptureEffects.friendshipSetter(150)))
        createDefault("moon_ball", CatchRateModifiers.MOON_PHASES)
        createDefault("sport_ball", MultiplierModifier(1.5F))
-        createDefault("net_ball", CatchRateModifiers.typeBoosting(3F, ElementalTypes.BUG, ElementalTypes.WATER))
+        createDefault("net_ball", CatchRateModifiers.typeBoosting(3F, CobblemonElementalTypeTags.NET_BALL_BOOSTING))
        createDefault("dive_ball", CatchRateModifiers.SUBMERGED_IN_WATER, waterDragValue = 0.99F)
        createDefault("nest_ball", CatchRateModifiers.NEST)
        // ToDo implement effect once pokedex is implemented, we have a custom multiplier of 2.5 instead of the official pokeball
@@ -14,7 +14,8 @@ import com.cobblemon.mod.common.api.pokemon.status.Status
 import com.cobblemon.mod.common.api.tags.CobblemonBiomeTags
 import com.cobblemon.mod.common.api.types.ElementalType
 import com.cobblemon.mod.common.battles.BattleRegistry
-import com.cobblemon.mod.common.pokemon.Gender
+import com.cobblemon.mod.common.api.pokemon.gender.Gender
+import net.minecraft.registry.tag.TagKey

 /**
 * A collection of some default usages of [CatchRateModifier]s.
@@ -139,11 +140,11 @@ object CatchRateModifiers {
     * Used by [PokeBalls.NET_BALL].
     * Boosts the catch rate if the target is of the given types.
     *
-     * @param multiplier The multiplier to be applied if the target has any of the accepted [types].
-     * @param types The [ElementalType]s that will trigger the multiplier.
+     * @param multiplier The multiplier to be applied if the target has any of the accepted [typeTag].
+     * @param typeTag The [ElementalType] [TagKey] that will trigger the multiplier.
     * @return The multiplier modifier.
     */
-    fun typeBoosting(multiplier: Float, vararg types: ElementalType): CatchRateModifier = MultiplierModifier(multiplier) { _, pokemon -> pokemon.types.any { type -> types.contains(type) } }
+    fun typeBoosting(multiplier: Float, typeTag: TagKey<ElementalType>): CatchRateModifier = MultiplierModifier(multiplier) { _, pokemon -> pokemon.types.any { type -> type.isIn(typeTag) } }

    /**
     * Used by [PokeBalls.DREAM_BALL].
@@ -166,6 +166,16 @@ object Natures {
        return allNatures.find { nature -> nature.name == name }
    }

+    /**
+     * Utility method to get a nature by string
+     * @return a nature type or null
+     */
+    fun getNature(identifier: String): Nature? {
+        val nature = getNature(cobblemonResource(identifier))
+        if(nature != null) return nature
+        return getNature(Identifier(identifier))
+    }
+
    /**
     * Helper function for a random Nature
     * @return a random nature type
@@ -12,23 +12,31 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.abilities.Abilities
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.api.pokemon.aspect.AspectProvider
+import com.cobblemon.mod.common.api.pokemon.gender.Gender
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
 import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
+import com.cobblemon.mod.common.api.registry.CobblemonRegistries
+import com.cobblemon.mod.common.api.types.ElementalType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.pokemon.*
+import com.cobblemon.mod.common.pokemon.EVs
+import com.cobblemon.mod.common.pokemon.IVs
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.pokemon.RenderablePokemon
 import com.cobblemon.mod.common.pokemon.status.PersistentStatus
-import com.cobblemon.mod.common.pokemon.status.PersistentStatusContainer
 import com.cobblemon.mod.common.util.DataKeys
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.isInt
 import com.cobblemon.mod.common.util.splitMap
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
+import kotlin.random.Random
+import com.mojang.serialization.Codec
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.nbt.NbtElement
 import net.minecraft.nbt.NbtList
 import net.minecraft.nbt.NbtString
+import net.minecraft.registry.Registry
 import net.minecraft.text.MutableText
 import net.minecraft.text.Text
 import net.minecraft.util.Identifier
@@ -86,6 +94,10 @@ open class PokemonProperties {
            props.ability = parseStringOfRegistry(keyPairs, listOf("ability")) { Abilities.get(it)?.name }
            props.status = parseStringOfRegistry(keyPairs, listOf("status")) { (Statuses.getStatus(it) ?: Statuses.getStatus(it.asIdentifierDefaultingNamespace()))?.showdownName }
            props.nickname = parseText(keyPairs, listOf("nickname", "nick"))
+            props.teraType = parseRegistryValue(CobblemonRegistries.ELEMENTAL_TYPE, keyPairs, "tera_type", "tera")
+            props.dmaxLevel = parseIntProperty(keyPairs, listOf("dmax_level", "dmax"))?.coerceIn(0, Cobblemon.config.maxDynamaxLevel)
+            props.gmaxFactor = parseBooleanProperty(keyPairs, listOf("gmax_factor", "gmax"))
+            props.tradeable = parseBooleanProperty(keyPairs, listOf("tradeable", "tradable"))

            val maybeIVs = IVs()
            val maybeEVs = EVs()
@@ -147,9 +159,10 @@ open class PokemonProperties {
        }

        private fun parseSpeciesIdentifier(keyPairs: MutableList<Pair<String, String?>>): String? {
+            fun cleanSpeciesName(string: String) = string.lowercase().replace("[^a-z0-9:]".toRegex(), "")
            val matched = getMatchedKeyPair(keyPairs, listOf("species"))
            if (matched != null) {
-                val value = matched.second?.lowercase() ?: return null
+                val value = matched.second?.let(::cleanSpeciesName) ?: return null
                return if (value.lowercase() == "random") {
                    "random"
                } else {
@@ -168,7 +181,7 @@ open class PokemonProperties {
                        "random"
                    } else {
                        try {
-                            val identifier = pair.first.asIdentifierDefaultingNamespace()
+                            val identifier = cleanSpeciesName(pair.first).asIdentifierDefaultingNamespace()
                            val found = PokemonSpecies.getByIdentifier(identifier) ?: return@find false
                            if (found.resourceIdentifier.namespace == Cobblemon.MODID) found.resourceIdentifier.path else found.resourceIdentifier.toString()
                        } catch (e: InvalidIdentifierException) {
@@ -186,6 +199,17 @@ open class PokemonProperties {
            }
        }

+        private fun <T> parseRegistryValue(registry: Registry<T>, keyPairs: MutableList<Pair<String, String?>>, vararg labels: String): T? {
+            val matchingKeyPair = getMatchedKeyPair(keyPairs, labels.asIterable()) ?: return null
+            val rawId = matchingKeyPair.second ?: return null
+            return try {
+                val id = Identifier(rawId)
+                registry.get(id)
+            } catch (_: InvalidIdentifierException) {
+                null
+            }
+        }
+
        private fun parseForm(keyPairs: MutableList<Pair<String, String?>>): String? {
            val matchingKeyPair = getMatchedKeyPair(keyPairs, listOf("form")) ?: return null
            keyPairs.remove(matchingKeyPair)
@@ -230,6 +254,9 @@ open class PokemonProperties {
            }
            return null
        }
+
+        val CODEC: Codec<PokemonProperties> = Codec.STRING.xmap(PokemonProperties::parse, PokemonProperties::asString)
+
    }

    var originalString: String = ""
@@ -246,6 +273,10 @@ open class PokemonProperties {
    var ability: String? = null
    var aspects: Set<String> = emptySet()
    var status: String? = null
+    var teraType: ElementalType? = null
+    var dmaxLevel: Int? = null
+    var gmaxFactor: Boolean? = null
+    var tradeable: Boolean? = null

    var ivs: IVs? = null
    var evs: EVs? = null
@@ -295,6 +326,11 @@ open class PokemonProperties {
                pokemon.setEV(stat.key, stat.value)
            }
        }
+        teraType?.let { type -> pokemon.teraType = type }
+        dmaxLevel?.let { pokemon.dmaxLevel = it }
+        gmaxFactor?.let { pokemon.gmaxFactor = it }
+        tradeable?.let { pokemon.tradeable = it }
+        pokemon.updateAspects()
    }

    fun apply(pokemonEntity: PokemonEntity) {
@@ -330,6 +366,11 @@ open class PokemonProperties {
                pokemonEntity.pokemon.setEV(stat.key, stat.value)
            }
        }
+        teraType?.let { type -> pokemonEntity.pokemon.teraType = type }
+        dmaxLevel?.let { pokemonEntity.pokemon.dmaxLevel = it }
+        gmaxFactor?.let { pokemonEntity.pokemon.gmaxFactor = it }
+        tradeable?.let { pokemonEntity.pokemon.tradeable = it }
+        pokemonEntity.pokemon.updateAspects()
    }

    fun matches(pokemon: Pokemon): Boolean {
@@ -363,6 +404,10 @@ open class PokemonProperties {
        evs?.forEach{ stat ->
            if (stat.value != pokemon.evs[stat.key]) { return false }
        }
+        teraType?.takeIf { it != pokemon.teraType }?.let { return false }
+        dmaxLevel?.takeIf { it != pokemon.dmaxLevel }?.let { return false }
+        gmaxFactor?.takeIf { it != pokemon.gmaxFactor }?.let { return false }
+        tradeable?.takeIf { it != pokemon.tradeable }?.let { return false }
        return customProperties.none { !it.matches(pokemon) }
    }

@@ -380,7 +425,7 @@ open class PokemonProperties {
                if (pokemonEntity.pokemon.species != species) {
                    return false
                }
-            } catch (e: InvalidIdentifierException) {}
+            } catch (_: InvalidIdentifierException) {}
        }
        nickname?.takeIf { it != pokemonEntity.pokemon.nickname }?.let { return false }
        form?.takeIf { !it.equals(pokemonEntity.pokemon.form.name, true) }?.let { return false }
@@ -395,6 +440,10 @@ open class PokemonProperties {
        evs?.forEach{ stat ->
            if (stat.value != pokemonEntity.pokemon.evs[stat.key]) { return false }
        }
+        teraType?.takeIf { it != pokemonEntity.pokemon.teraType }?.let { return false }
+        dmaxLevel?.takeIf { it != pokemonEntity.pokemon.dmaxLevel }?.let { return false }
+        gmaxFactor?.takeIf { it != pokemonEntity.pokemon.gmaxFactor }?.let { return false }
+        tradeable?.takeIf { it != pokemonEntity.pokemon.tradeable }?.let { return false }
        return customProperties.none { !it.matches(pokemonEntity) }
    }

@@ -412,7 +461,7 @@ open class PokemonProperties {
                if (properties.species != species.toString()) {
                    return false
                }
-            } catch (e: InvalidIdentifierException) {}
+            } catch (_: InvalidIdentifierException) {}
        }
        nickname?.takeIf { it != properties.nickname }?.let { return false }
        form?.takeIf { !it.equals(properties.form, true) }?.let { return false }
@@ -435,24 +484,34 @@ open class PokemonProperties {
                if (stat.value != propertiesEVs[stat.key]) { return false }
            }
        }
+        teraType?.takeIf { it != properties.teraType }?.let { return false }
+        dmaxLevel?.takeIf { it != properties.dmaxLevel }?.let { return false }
+        gmaxFactor?.takeIf { it != properties.gmaxFactor }?.let { return false }
+        tradeable?.takeIf { it != properties.tradeable }?.let { return false }
        return true
    }

    fun create(): Pokemon {
        val pokemon = Pokemon()
        apply(pokemon)
-        // Force the setter to initialize it
-        pokemon.species = pokemon.species
-        // This should only be a thing once we have moveset control in properties until then a creation should require a moveset init.
-        /*
-        if (pokemon.moveSet.none { it != null }) {
-            pokemon.initializeMoveset()
-        }
-         */
-        pokemon.initializeMoveset()
+        pokemon.initialize()
+        roll(pokemon)
        return pokemon
    }

+    // TEST YOUR LUCK!
+    fun roll(pokemon: Pokemon) {
+        val baseTypes = pokemon.species.types.toList()
+        if (this.shiny == null) pokemon.shiny = Cobblemon.config.shinyRate.checkRate()
+        if (this.gmaxFactor == null) pokemon.gmaxFactor = Cobblemon.config.gigantamaxFactorRate.checkRate()
+        if (this.teraType == null) pokemon.teraType =
+            if (Cobblemon.config.teraTypeRate.checkRate()) CobblemonRegistries.ELEMENTAL_TYPE.filter { !baseTypes.contains(it) }.random()
+            else baseTypes.random()
+    }
+
+    // If the config value is at least 1, then do 1/x and use that as the property chance
+    private fun Float.checkRate(): Boolean = this >= 1 && (Random.Default.nextFloat() < 1 / this)
+
    fun createEntity(world: World): PokemonEntity {
        return PokemonEntity(world, create())
    }
@@ -473,6 +532,10 @@ open class PokemonProperties {
        status?.let { nbt.putString(DataKeys.POKEMON_STATUS_NAME, it) }
        ivs?.let { nbt.put(DataKeys.POKEMON_IVS, it.saveToNBT(NbtCompound())) }
        evs?.let { nbt.put(DataKeys.POKEMON_EVS, it.saveToNBT(NbtCompound())) }
+        teraType?.let { nbt.putString(DataKeys.POKEMON_TERA_TYPE, it.id().toString()) }
+        dmaxLevel?.let { nbt.putInt(DataKeys.POKEMON_DMAX_LEVEL, it) }
+        gmaxFactor?.let { nbt.putBoolean(DataKeys.POKEMON_GMAX_FACTOR, it) }
+        tradeable?.let { nbt.putBoolean(DataKeys.POKEMON_TRADEABLE, it) }
        val custom = NbtList()
        customProperties.map { NbtString.of(it.asString()) }.forEach { custom.add(it) }
        nbt.put(DataKeys.POKEMON_PROPERTIES_CUSTOM, custom)
@@ -494,6 +557,10 @@ open class PokemonProperties {
        status = if (tag.contains(DataKeys.POKEMON_STATUS_NAME)) tag.getString(DataKeys.POKEMON_STATUS_NAME) else null
        ivs = if (tag.contains(DataKeys.POKEMON_IVS)) ivs?.loadFromNBT(tag.getCompound(DataKeys.POKEMON_IVS)) as IVs? else null
        evs = if (tag.contains(DataKeys.POKEMON_EVS)) evs?.loadFromNBT(tag.getCompound(DataKeys.POKEMON_EVS)) as EVs? else null
+        teraType = if (tag.contains(DataKeys.POKEMON_TERA_TYPE)) CobblemonRegistries.ELEMENTAL_TYPE.get(Identifier(tag.getString(DataKeys.POKEMON_TERA_TYPE))) else null
+        dmaxLevel = if (tag.contains(DataKeys.POKEMON_DMAX_LEVEL)) tag.getInt(DataKeys.POKEMON_DMAX_LEVEL) else null
+        gmaxFactor = if (tag.contains(DataKeys.POKEMON_GMAX_FACTOR)) tag.getBoolean(DataKeys.POKEMON_GMAX_FACTOR) else null
+        tradeable = if (tag.contains(DataKeys.POKEMON_TRADEABLE)) tag.getBoolean(DataKeys.POKEMON_TRADEABLE) else null
        val custom = tag.getList(DataKeys.POKEMON_PROPERTIES_CUSTOM, NbtElement.STRING_TYPE.toInt())
        // This is kinda gross
        custom.forEach { customProperties.addAll(parse(it.asString()).customProperties) }
@@ -517,6 +584,10 @@ open class PokemonProperties {
        status?.let { json.addProperty(DataKeys.POKEMON_STATUS_NAME, it) }
        ivs?.let { json.add(DataKeys.POKEMON_IVS, it.saveToJSON(JsonObject())) }
        evs?.let { json.add(DataKeys.POKEMON_EVS, it.saveToJSON(JsonObject())) }
+        teraType?.let { json.addProperty(DataKeys.POKEMON_TERA_TYPE, it.id().toString()) }
+        dmaxLevel?.let { json.addProperty(DataKeys.POKEMON_DMAX_LEVEL, it) }
+        gmaxFactor?.let { json.addProperty(DataKeys.POKEMON_GMAX_FACTOR, it) }
+        tradeable?.let { json.addProperty(DataKeys.POKEMON_TRADEABLE, it) }
        val custom = JsonArray()
        customProperties.map { it.asString() }.forEach { custom.add(it) }
        json.add(DataKeys.POKEMON_PROPERTIES_CUSTOM, custom)
@@ -539,6 +610,12 @@ open class PokemonProperties {
        status = json.get(DataKeys.POKEMON_STATUS_NAME)?.asString
        ivs?.loadFromJSON(json.getAsJsonObject(DataKeys.POKEMON_IVS))
        evs?.loadFromJSON(json.getAsJsonObject(DataKeys.POKEMON_EVS))
+        teraType = json.get(DataKeys.POKEMON_TERA_TYPE)?.asString?.let { CobblemonRegistries.ELEMENTAL_TYPE.get(
+            Identifier(it)
+        ) }
+        dmaxLevel = json.get(DataKeys.POKEMON_DMAX_LEVEL)?.asInt
+        gmaxFactor = json.get(DataKeys.POKEMON_GMAX_FACTOR)?.asBoolean
+        tradeable = json.get(DataKeys.POKEMON_TRADEABLE)?.asBoolean
        val custom = json.get(DataKeys.POKEMON_PROPERTIES_CUSTOM)?.asJsonArray
        // This is still kinda gross
        custom?.forEach { customProperties.addAll(parse(it.asString).customProperties) }
@@ -565,6 +642,10 @@ open class PokemonProperties {
        evs?.forEach{ stat ->
            pieces.add("${stat.key}_ev=${stat.value}")
        }
+        teraType?.let { pieces.add("tera_type=${it.id()}") }
+        dmaxLevel?.let { pieces.add("dmax_level=$it") }
+        gmaxFactor?.let { pieces.add("gmax_factor=$it") }
+        tradeable?.let { pieces.add("tradeable=$it") }
        customProperties.forEach { pieces.add(it.asString()) }
        return pieces.joinToString(separator)
    }
@@ -23,7 +23,6 @@ import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffect
 import com.cobblemon.mod.common.api.pokemon.effect.adapter.ShoulderEffectAdapter
 import com.cobblemon.mod.common.api.pokemon.egg.EggGroup
 import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
-import com.cobblemon.mod.common.api.pokemon.evolution.PreEvolution
 import com.cobblemon.mod.common.api.pokemon.evolution.requirement.EvolutionRequirement
 import com.cobblemon.mod.common.api.pokemon.experience.ExperienceGroup
 import com.cobblemon.mod.common.api.pokemon.experience.ExperienceGroupAdapter
@@ -34,18 +33,18 @@ import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.spawning.TimeRange
 import com.cobblemon.mod.common.api.types.ElementalType
 import com.cobblemon.mod.common.api.types.adapters.ElementalTypeAdapter
-import com.cobblemon.mod.common.battles.runner.ShowdownService
 import com.cobblemon.mod.common.net.messages.client.data.SpeciesRegistrySyncPacket
 import com.cobblemon.mod.common.pokemon.FormData
 import com.cobblemon.mod.common.pokemon.Species
 import com.cobblemon.mod.common.pokemon.SpeciesAdditions
-import com.cobblemon.mod.common.pokemon.evolution.adapters.CobblemonEvolutionAdapter
-import com.cobblemon.mod.common.pokemon.evolution.adapters.CobblemonPreEvolutionAdapter
 import com.cobblemon.mod.common.pokemon.evolution.adapters.CobblemonRequirementAdapter
-import com.cobblemon.mod.common.pokemon.helditem.CobblemonEmptyHeldItemManager
+import com.cobblemon.mod.common.pokemon.evolution.adapters.NbtItemPredicateAdapter
+import com.cobblemon.mod.common.pokemon.evolution.predicate.NbtItemPredicate
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.util.adapters.*
 import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.codec.toTypeAdapter
+import com.cobblemon.mod.common.util.server
 import com.google.common.collect.HashBasedTable
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
@@ -56,6 +55,7 @@ import net.minecraft.entity.effect.StatusEffect
 import net.minecraft.item.Item
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.registry.Registries
+import net.minecraft.registry.RegistryKeys
 import net.minecraft.resource.ResourceType
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.util.Identifier
@@ -76,11 +76,8 @@ object PokemonSpecies : JsonDataRegistry<Species> {
        .registerTypeAdapter(ExperienceGroup::class.java, ExperienceGroupAdapter)
        .registerTypeAdapter(EntityDimensions::class.java, EntityDimensionsAdapter)
        .registerTypeAdapter(Learnset::class.java, LearnsetAdapter)
-        .registerTypeAdapter(Evolution::class.java, CobblemonEvolutionAdapter)
        .registerTypeAdapter(Box::class.java, BoxAdapter)
        .registerTypeAdapter(AbilityPool::class.java, AbilityPoolAdapter)
-        .registerTypeAdapter(EvolutionRequirement::class.java, CobblemonRequirementAdapter)
-        .registerTypeAdapter(PreEvolution::class.java, CobblemonPreEvolutionAdapter)
        .registerTypeAdapter(TypeToken.getParameterized(Set::class.java, Evolution::class.java).type, LazySetAdapter(Evolution::class))
        .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
        .registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
@@ -90,11 +87,12 @@ object PokemonSpecies : JsonDataRegistry<Species> {
        .registerTypeAdapter(SleepDepth::class.java, SleepDepth.adapter)
        .registerTypeAdapter(DropEntry::class.java, DropEntryAdapter)
        .registerTypeAdapter(NbtCompound::class.java, NbtCompoundAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
+        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, RegistryLikeCondition.createCodec { server()!!.registryManager.get(RegistryKeys.BIOME) }.toTypeAdapter())
+        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, RegistryLikeCondition.createCodec { Registries.BLOCK }.toTypeAdapter())
+        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, RegistryLikeCondition.createCodec { Registries.ITEM }.toTypeAdapter())
        .registerTypeAdapter(EggGroup::class.java, EggGroupAdapter)
        .registerTypeAdapter(StatusEffect::class.java, RegistryElementAdapter<StatusEffect> { Registries.STATUS_EFFECT })
+        .registerTypeAdapter(NbtItemPredicate::class.java, NbtItemPredicateAdapter)
        .disableHtmlEscaping()
        .enableComplexMapKeySerialization()
        .create()
@@ -210,7 +208,7 @@ object PokemonSpecies : JsonDataRegistry<Species> {
            "H" to "No Ability",
            "S" to "No Ability"
        )
-        val types = (form?.types ?: species.types).map { it.name.replaceFirstChar(Char::uppercase) }
+        val types = (form?.types ?: species.types).map { it.showdownId() }
        val preevo: String? = (form?.preEvolution ?: species.preEvolution)?.let { if (it.form == it.species.standardForm) createShowdownName(it.species) else "${createShowdownName(it.species)}-${it.form.name}" }
        // For the context of battles the content here doesn't matter whatsoever and due to how PokemonProperties work we can't guarantee an actual specific species is defined.
        val evos = if ((form?.evolutions ?: species.evolutions).isEmpty()) emptyList() else arrayListOf("")
@@ -243,6 +241,9 @@ object PokemonSpecies : JsonDataRegistry<Species> {
        val cannotDynamax = form?.dynamaxBlocked ?: species.dynamaxBlocked
        // ToDo battleOnly
        // ToDo changesFrom
+        val requiredMove = form?.requiredMove
+        val requiredItem = form?.requiredItem
+        val requiredItems = form?.requiredItems
    }

    private fun createShowdownName(species: Species): String {
@@ -10,11 +10,14 @@ package com.cobblemon.mod.common.api.pokemon.effect.adapter

 import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffect
 import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffectRegistry
+import com.cobblemon.mod.common.pokemon.effects.PotionBaseEffect
 import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import java.lang.reflect.Type
+import net.minecraft.registry.Registries
+import net.minecraft.util.Identifier

 object ShoulderEffectAdapter: JsonDeserializer<ShoulderEffect> {
    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): ShoulderEffect {
@@ -23,7 +26,18 @@ object ShoulderEffectAdapter: JsonDeserializer<ShoulderEffect> {
        } else {
            json.asJsonObject.get("type").asString to json.asJsonObject
        }
-        val effect = ShoulderEffectRegistry.get(typeId) ?: throw IllegalArgumentException("Cannot find shoulder effect with type '$typeId'")
+        val effect = ShoulderEffectRegistry.get(typeId) ?: run {
+            try {
+                val effectId = Identifier(typeId.replace("-", "_").replace("slow_fall", "slow_falling"))
+                val registry = Registries.STATUS_EFFECT
+                val effect = registry.get(effectId)
+                if (effect != null) {
+                    return PotionBaseEffect(effect, 0, true, false, false)
+                }
+            } catch (_: Exception) {}
+
+            throw IllegalArgumentException("Cannot find shoulder effect with type '$typeId'")
+        }
        return context.deserialize(obj, effect)
    }
 }
@@ -8,6 +8,9 @@

 package com.cobblemon.mod.common.api.pokemon.egg

+import com.mojang.serialization.Codec
+import net.minecraft.util.StringIdentifiable
+
 /**
 * These represent categories which determine which Pokémon are able to interbreed.
 *
@@ -15,7 +18,7 @@ package com.cobblemon.mod.common.api.pokemon.egg
 *
 * @property showdownID used for data synchronization with Showdown data format.
 */
-enum class EggGroup(internal val showdownID: String) {
+enum class EggGroup(internal val showdownID: String) : StringIdentifiable {

    MONSTER("Monster"),
    WATER_1("Water 1"),
@@ -31,6 +34,15 @@ enum class EggGroup(internal val showdownID: String) {
    WATER_2("Water 2"),
    DITTO("Ditto"),
    DRAGON("Dragon"),
-    UNDISCOVERED("Undiscovered")
+    UNDISCOVERED("Undiscovered");
+
+    override fun asString(): String = this.name
+
+    companion object {
+
+        @JvmField
+        val CODEC: Codec<EggGroup> = StringIdentifiable.createCodec(EggGroup::values)
+
+    }

 }
@@ -9,12 +9,12 @@
 package com.cobblemon.mod.common.api.pokemon.evolution

 import com.cobblemon.mod.common.CobblemonSounds
-import com.cobblemon.mod.common.api.abilities.AbilityPool
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEvent
 import com.cobblemon.mod.common.api.moves.BenchedMove
 import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
+import com.cobblemon.mod.common.api.pokemon.evolution.adapters.Variant
 import com.cobblemon.mod.common.api.pokemon.evolution.requirement.EvolutionRequirement
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.pokemon.activestate.ShoulderedState
@@ -22,6 +22,7 @@ import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolut
 import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
 import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
 import com.cobblemon.mod.common.util.lang
+import com.mojang.serialization.Codec
 import net.minecraft.item.ItemStack
 import net.minecraft.sound.SoundCategory

@@ -61,6 +62,11 @@ interface Evolution : EvolutionLike {
     */
    val learnableMoves: MutableSet<MoveTemplate>

+    /**
+     * The [Variant] of this [Evolution].
+     */
+    val variant: Variant<Evolution>
+
    /**
     * Checks if the given [Pokemon] passes all the conditions and is ready to evolve.
     *
@@ -120,4 +126,12 @@ interface Evolution : EvolutionLike {
    fun applyTo(pokemon: Pokemon) {
        result.apply(pokemon)
    }
+
+    /**
+     * TODO
+     *
+     * @return
+     */
+    fun codec(): Codec<out Evolution> = this.variant.codec
+
 }
@@ -8,9 +8,10 @@

 package com.cobblemon.mod.common.api.pokemon.evolution

-import com.cobblemon.mod.common.pokemon.FormData
-import com.cobblemon.mod.common.pokemon.Species
-import com.cobblemon.mod.common.pokemon.evolution.StandardPreEvolution
+import com.cobblemon.mod.common.api.pokemon.species.Species
+import com.cobblemon.mod.common.api.registry.CobblemonRegistries
+import com.mojang.serialization.Codec
+import net.minecraft.util.Identifier

 /**
 * Represents the previous stage in the evolutionary line of a given Pokémon.
@@ -19,15 +20,14 @@ import com.cobblemon.mod.common.pokemon.evolution.StandardPreEvolution
 * @author Licious
 * @since March 22nd, 2022
 */
-interface PreEvolution {
+class PreEvolution internal constructor(private val speciesKey: Identifier){

-    val species: Species
-
-    val form: FormData
+    val species: Species by lazy { CobblemonRegistries.SPECIES.get(this.speciesKey)!! }

    companion object {

-        fun of(species: Species, form: FormData = species.standardForm): PreEvolution = StandardPreEvolution(species, form)
+        @JvmField
+        val CODEC: Codec<PreEvolution> = Identifier.CODEC.xmap(::PreEvolution, PreEvolution::speciesKey)

    }

@@ -1,35 +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.pokemon.evolution.adapters
-
-import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
-import com.cobblemon.mod.common.pokemon.evolution.adapters.CobblemonEvolutionAdapter
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonSerializer
-import kotlin.reflect.KClass
-
-/**
- * Saves and loads [Evolution]s with JSON.
- * For the default implementation see [CobblemonEvolutionAdapter].
- *
- * @author Licious
- * @since March 20th, 2022
- */
-interface EvolutionAdapter : JsonDeserializer<Evolution>, JsonSerializer<Evolution> {
-
-    /**
-     * Registers the given type of [Evolution] to it's associated ID for deserialization.
-     *
-     * @param T The type of [Evolution].
-     * @param id The id of the evolution event.
-     * @param type The [KClass] of the type.
-     */
-    fun <T : Evolution> registerType(id: String, type: KClass<T>)
-
-}
@@ -0,0 +1,112 @@
+/*
+ * 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.pokemon.evolution.adapters
+
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.api.pokemon.evolution.requirement.EvolutionRequirement
+import com.cobblemon.mod.common.pokemon.evolution.requirements.*
+import com.cobblemon.mod.common.pokemon.evolution.variants.BlockClickEvolution
+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
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.mojang.serialization.Codec
+import com.mojang.serialization.Lifecycle
+import net.minecraft.registry.RegistryKey
+import net.minecraft.registry.SimpleRegistry
+
+/**
+ *
+ */
+object EvolutionRegistry {
+
+    private val EVOLUTION_REGISTRY = SimpleRegistry<Variant<Evolution>>(RegistryKey.ofRegistry(cobblemonResource("evolution_variants")), Lifecycle.stable())
+    private val REQUIREMENT_REGISTRY = SimpleRegistry<Variant<EvolutionRequirement>>(RegistryKey.ofRegistry(cobblemonResource("evolution_requirements")), Lifecycle.stable())
+
+    /**
+     * A [Codec] for [Evolution].
+     * If you wish to register more variants see [registerEvolutionVariant].
+     */
+    @JvmField
+    val EVOLUTION_CODEC: Codec<Evolution> = EVOLUTION_REGISTRY.codec.dispatch("variant", Evolution::variant) { variant -> variant.codec }
+
+    /**
+     * A [Codec] for [EvolutionRequirement].
+     * If you wish to register more variants see [registerRequirementVariant].
+     */
+    @JvmField
+    val REQUIREMENT_CODEC: Codec<EvolutionRequirement> = REQUIREMENT_REGISTRY.codec.dispatch("variant", EvolutionRequirement::variant) { variant -> variant.codec }
+
+    /**
+     * Registers an [Evolution] type.
+     *
+     * @param variant The [Variant] of an [Evolution] being registered.
+     *
+     * @throws IllegalStateException If the backing registry already contains an entry with the [Variant.identifier].
+     * @throws AssertionError If the registry is missing an intrusive holder.
+     */
+    @JvmStatic
+    fun registerEvolutionVariant(variant: Variant<Evolution>) {
+        EVOLUTION_REGISTRY.add(RegistryKey.of(EVOLUTION_REGISTRY.key, variant.identifier), variant, Lifecycle.stable())
+    }
+
+    /**
+     * Registers an [EvolutionRequirement] type.
+     *
+     * @param variant The [Variant] of an [EvolutionRequirement] being registered.
+     *
+     * @throws IllegalStateException If the backing registry already contains an entry with the [Variant.identifier].
+     * @throws AssertionError If the registry is missing an intrusive holder.
+     */
+    @JvmStatic
+    fun registerRequirementVariant(variant: Variant<EvolutionRequirement>) {
+        REQUIREMENT_REGISTRY.add(RegistryKey.of(REQUIREMENT_REGISTRY.key, variant.identifier), variant, Lifecycle.stable())
+    }
+
+    internal fun init() {
+        this.registerDefaultEvolutions()
+        this.registerDefaultRequirements()
+    }
+
+    private fun registerDefaultEvolutions() {
+        this.registerEvolutionVariant(BlockClickEvolution.VARIANT)
+        this.registerEvolutionVariant(ItemInteractionEvolution.VARIANT)
+        this.registerEvolutionVariant(LevelUpEvolution.MAIN_VARIANT)
+        this.registerEvolutionVariant(LevelUpEvolution.ALTERNATIVE_VARIANT)
+        this.registerEvolutionVariant(TradeEvolution.VARIANT)
+    }
+
+    private fun registerDefaultRequirements() {
+        this.registerRequirementVariant(AllOfRequirement.VARIANT)
+        this.registerRequirementVariant(AnyOfRequirement.VARIANT)
+        this.registerRequirementVariant(AreaRequirement.VARIANT)
+        this.registerRequirementVariant(AttackDefenceRatioRequirement.VARIANT)
+        this.registerRequirementVariant(BattleCriticalHitsRequirement.VARIANT)
+        this.registerRequirementVariant(BiomeRequirement.VARIANT)
+        this.registerRequirementVariant(BlocksTraveledRequirement.VARIANT)
+        this.registerRequirementVariant(DamageTakenRequirement.VARIANT)
+        this.registerRequirementVariant(DefeatRequirement.VARIANT)
+        this.registerRequirementVariant(FriendshipRequirement.VARIANT)
+        this.registerRequirementVariant(HeldItemRequirement.VARIANT)
+        this.registerRequirementVariant(LevelRequirement.VARIANT)
+        this.registerRequirementVariant(MoonPhaseRequirement.VARIANT)
+        this.registerRequirementVariant(MoveSetRequirement.VARIANT)
+        this.registerRequirementVariant(MoveTypeRequirement.VARIANT)
+        this.registerRequirementVariant(NoneOfRequirement.VARIANT)
+        this.registerRequirementVariant(NotRequirement.VARIANT)
+        this.registerRequirementVariant(PartyMemberRequirement.VARIANT)
+        this.registerRequirementVariant(PokemonPropertiesRequirement.VARIANT)
+        this.registerRequirementVariant(RecoilRequirement.VARIANT)
+        this.registerRequirementVariant(TimeRangeRequirement.VARIANT)
+        this.registerRequirementVariant(UseMoveRequirement.VARIANT)
+        this.registerRequirementVariant(WeatherRequirement.VARIANT)
+        this.registerRequirementVariant(WorldRequirement.VARIANT)
+    }
+
+}
@@ -1,35 +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.pokemon.evolution.adapters
-
-import com.cobblemon.mod.common.api.pokemon.evolution.requirement.EvolutionRequirement
-import com.cobblemon.mod.common.pokemon.evolution.adapters.CobblemonRequirementAdapter
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonSerializer
-import kotlin.reflect.KClass
-
-/**
- * Saves and loads [EvolutionRequirement]s with JSON.
- * For the default implementation see [CobblemonRequirementAdapter].
- *
- * @author Licious
- * @since March 21st, 2022
- */
-interface RequirementAdapter : JsonDeserializer<EvolutionRequirement>, JsonSerializer<EvolutionRequirement> {
-
-    /**
-     * Registers the given type of [EvolutionRequirement] to it's associated ID for deserialization.
-     *
-     * @param T The type of [EvolutionRequirement].
-     * @param id The id of the evolution event.
-     * @param type The [KClass] of the type.
-     */
-    fun <T : EvolutionRequirement> registerType(id: String, type: KClass<T>)
-
-}
@@ -6,10 +6,12 @@
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

-package com.cobblemon.mod.common.pokemon
+package com.cobblemon.mod.common.api.pokemon.evolution.adapters

-enum class Gender(val showdownName: String) {
-    MALE("M"),
-    FEMALE("F"),
-    GENDERLESS("N")
-}
+import com.mojang.serialization.Codec
+import net.minecraft.util.Identifier
+
+data class Variant<T>(
+    val identifier: Identifier,
+    val codec: Codec<out T>
+)
@@ -10,7 +10,10 @@ package com.cobblemon.mod.common.api.pokemon.evolution.requirement

 import com.cobblemon.mod.common.api.pokemon.evolution.ContextEvolution
 import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.api.pokemon.evolution.adapters.EvolutionRegistry
+import com.cobblemon.mod.common.api.pokemon.evolution.adapters.Variant
 import com.cobblemon.mod.common.pokemon.Pokemon
+import com.mojang.serialization.Codec

 /**
 * Represents a requirement for an evolution.
@@ -22,7 +25,12 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 * @author Licious
 * @since March 19th, 2022
 */
-fun interface EvolutionRequirement {
+interface EvolutionRequirement {
+
+    /**
+     *
+     */
+    val variant: Variant<EvolutionRequirement>

    /**
     * Checks if the given [Pokemon] satisfies the requirement.
@@ -32,4 +40,17 @@ fun interface EvolutionRequirement {
     */
    fun check(pokemon: Pokemon): Boolean

+    /**
+     * TODO
+     *
+     * @return
+     */
+    fun codec(): Codec<out EvolutionRequirement> = this.variant.codec
+
+    companion object {
+
+        val CODEC: Codec<EvolutionRequirement> = EvolutionRegistry.REQUIREMENT_CODEC
+
+    }
+
 }
@@ -18,6 +18,7 @@ import com.google.gson.JsonElement
 import com.google.gson.JsonPrimitive
 import com.google.gson.JsonSerializationContext
 import com.google.gson.JsonSerializer
+import com.mojang.serialization.Codec
 import java.lang.reflect.Type
 import kotlin.math.max
 import net.minecraft.text.MutableText
@@ -74,6 +75,10 @@ interface ExperienceGroup : LevelCurve {
            override fun getExperience(level: Int) = 0
            override fun getLevel(experience: Int) = 1
        }
+
+        @JvmField
+        val CODEC: Codec<ExperienceGroup> = Codec.STRING.xmap(ExperienceGroups::findByName, ExperienceGroup::name)
+
    }
 }

@@ -0,0 +1,54 @@
+/*
+ * 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.pokemon.gender
+
+import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
+import com.cobblemon.mod.common.api.pokemon.species.Species
+import com.cobblemon.mod.common.pokemon.Pokemon
+import java.util.*
+
+/**
+ * Represents the [Gender] of a [Pokemon].
+ * This is taken into account by [Species] when generating the [Pokemon].
+ *
+ * @property showdownId The ID of the [Gender] in Showdown.
+ *
+ * @see Species.genderSelector
+ * @see Pokemon.gender
+ * @see GenderSelector
+ */
+enum class Gender(private val showdownId: String) : ShowdownIdentifiable {
+
+    MALE("M"),
+    FEMALE("F"),
+    GENDERLESS("N");
+
+    override fun showdownId(): String = this.showdownId
+
+    companion object {
+
+        /**
+         * The [Gender]s when a ratio is attached to a [GenderSelector].
+         *
+         * @see GenderSelector.maleRatio
+         */
+        @JvmField
+        val RATIO_BASED_GENDERS: Set<Gender> = EnumSet.of(MALE, FEMALE)
+
+        /**
+         * The [Gender]s when no ratio is attached to a [GenderSelector].
+         *
+         * @see GenderSelector.maleRatio
+         */
+        @JvmField
+        val NO_RATIO_GENDERS: Set<Gender> = EnumSet.of(GENDERLESS)
+
+    }
+
+}
@@ -0,0 +1,72 @@
+/*
+ * 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.pokemon.gender
+
+import com.cobblemon.mod.common.api.pokemon.species.Species
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.mojang.serialization.Codec
+import kotlin.random.Random
+
+/**
+ * Class responsible for querying possible [Gender]s of [Species] and assigning them randomly to generated [Pokemon].
+ *
+ * @property maleRatio The raw ratio for the [Gender.MALE] despite the naming this is able to cover all possible genders.
+ *
+ * @see Species.genderSelector
+ *
+ * @throws IllegalArgumentException If male ratio is greater than 1.
+ */
+@Suppress("MemberVisibilityCanBePrivate")
+class GenderSelector internal constructor(private val maleRatio: Float) {
+
+    init {
+        if (this.maleRatio < 1F) {
+            throw IllegalArgumentException("Male ratio cannot be greater than 1.0")
+        }
+    }
+
+    /**
+     * Collects all the possible [Gender]s from [generate].
+     *
+     * @return The possible [Gender]s.
+     */
+    fun possibleGenders(): Set<Gender> = if (this.maleRatio < 0F) Gender.NO_RATIO_GENDERS else Gender.RATIO_BASED_GENDERS
+
+    /**
+     * Randomly picks a [Gender] using the [maleRatio].
+     *
+     * @return The generated [Gender].
+     */
+    fun generate(): Gender = when {
+        this.maleRatio < 0F -> Gender.GENDERLESS
+        this.maleRatio == 1F || Random.nextFloat() < this.maleRatio -> Gender.MALE
+        else -> Gender.FEMALE
+    }
+
+    /**
+     * Checks if the given [gender] is a possible selection of [generate].
+     *
+     * @param gender The [Gender] being checked.
+     * @return If the [gender] is possible with the context in this [GenderSelector].
+     */
+    fun isValid(gender: Gender): Boolean = this.possibleGenders().contains(gender)
+
+    companion object {
+
+        /**
+         * A [Codec] for [GenderSelector].
+         * This will (de)serialize from a primitive float.
+         * It will error if the value is not between [Float.MIN_VALUE] and 1F.
+         */
+        @JvmField
+        val CODEC: Codec<GenderSelector> = Codec.floatRange(Float.MIN_VALUE, 1F).xmap(::GenderSelector, GenderSelector::maleRatio)
+
+    }
+
+}
@@ -0,0 +1,55 @@
+/*
+ * 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.pokemon.species
+
+import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
+import com.cobblemon.mod.common.api.registry.CobblemonRegistries
+import com.mojang.serialization.Codec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import net.minecraft.util.Identifier
+
+/**
+ * Additional data only present in species that are a variation of an existing species.
+ * This is commonly referred to as a Pokémon form.
+ * In the context of Cobblemon aspects are used when a form is purely cosmetic.
+ * This is only present if a [Species] has actual stat related differences from the "base".
+ *
+ * @see <a href="https://bulbapedia.bulbagarden.net/wiki/Variant_Pok%C3%A9mon">Bulbapedias entry on variant Pokémon</a>
+ */
+class FormData internal constructor(
+    private var baseSpeciesIdentifier: Identifier,
+    private var battleOnly: Boolean
+) {
+
+    /**
+     * Resolves the base species of this form.
+     *
+     * @return The [Species] that is the base of this form.
+     */
+    fun baseSpecies(): Species = CobblemonRegistries.SPECIES.get(this.baseSpeciesIdentifier)!!
+
+    /**
+     * Checks if this [FormData] can only exist in battles.
+     *
+     * @return True if this [FormData] can only exist in battles.
+     */
+    fun isBattleOnly(): Boolean = this.battleOnly
+
+    companion object {
+
+        val CODEC: Codec<FormData> = RecordCodecBuilder.create { builder ->
+            builder.group(
+                Identifier.CODEC.fieldOf("baseSpecies").forGetter(FormData::baseSpeciesIdentifier),
+                Codec.BOOL.fieldOf("battleOnly").forGetter(FormData::battleOnly)
+            ).apply(builder, ::FormData)
+        }
+
+    }
+
+}
@@ -0,0 +1,198 @@
+/*
+ * 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.pokemon.species
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.abilities.AbilityPool
+import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
+import com.cobblemon.mod.common.api.pokemon.egg.EggGroup
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.api.pokemon.evolution.PreEvolution
+import com.cobblemon.mod.common.api.pokemon.experience.ExperienceGroup
+import com.cobblemon.mod.common.api.pokemon.gender.Gender
+import com.cobblemon.mod.common.api.pokemon.gender.GenderSelector
+import com.cobblemon.mod.common.api.pokemon.moves.Learnset
+import com.cobblemon.mod.common.api.pokemon.species.internal.*
+import com.cobblemon.mod.common.api.pokemon.stats.StatMap
+import com.cobblemon.mod.common.api.registry.CobblemonRegistryElement
+import com.cobblemon.mod.common.api.registry.CobblemonRegistryKeys
+import com.cobblemon.mod.common.api.types.ElementalType
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.pokemon.ai.PokemonBehaviour
+import com.cobblemon.mod.common.util.codec.ExtraCodecs
+import com.mojang.serialization.Codec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import net.minecraft.entity.EntityDimensions
+import net.minecraft.registry.Registry
+import net.minecraft.registry.entry.RegistryEntry
+import net.minecraft.text.MutableText
+import net.minecraft.text.Text
+import net.minecraft.util.Identifier
+import java.util.*
+
+@Suppress("unused")
+class Species internal constructor(
+    nationalPokedexNumber: Int,
+    types: Pair<ElementalType, Optional<ElementalType>>,
+    abilities: AbilityPool,
+    baseStats: StatMap,
+    catchRate: Int,
+    genderSelector: GenderSelector,
+    private val experienceData: ExperienceData,
+    private val eggData: EggData,
+    learnset: Learnset,
+    private val behaviourData: BehaviourData,
+    private val evolutionData: EvolutionData,
+    baseFriendship: Int,
+    evYield: StatMap,
+    private val cosmeticData: CosmeticData,
+    formData: Optional<FormData>
+): CobblemonRegistryElement<Species>, ShowdownIdentifiable {
+
+    companion object {
+
+        private val TYPES_CODEC = ExtraCodecs.ENTITY_DIMENSIONS
+
+        val codec = RecordCodecBuilder.create { builder ->
+            builder.group(
+                Codec.INT.fieldOf("nationalPokedexNumber").forGetter(Species::nationalPokedexNumber),
+                ExtraCodecs.DUAL_TYPE_CODEC.fieldOf("types").forGetter(Species::types),
+                // ToDo: abilities
+                StatMap.BASE_STATS_CODEC.fieldOf("baseStats").forGetter(Species::baseStats),
+                Codec.INT.fieldOf("catchRate").forGetter(Species::catchRate),
+                GenderSelector.CODEC.fieldOf("genderSelector").forGetter(Species::genderSelector),
+                ExperienceData.MAP_CODEC.forGetter(Species::experienceData),
+                EggData.MAP_CODEC.fieldOf("eggData").forGetter(Species::eggData),
+                // ToDo: learnset
+                BehaviourData.MAP_CODEC.forGetter(Species::behaviourData),
+                EvolutionData.MAP_CODEC.forGetter(Species::evolutionData),
+                Codec.INT.fieldOf("baseFriendship").forGetter(Species::baseFriendship),
+                StatMap.BASE_STATS_CODEC.fieldOf("evYield").forGetter(Species::evYield),
+                CosmeticData.MAP_CODEC.forGetter(Species::cosmeticData),
+                FormData.CODEC.optionalFieldOf("formData").forGetter(Species::formData)
+            ).apply(builder, ::Species)
+        }
+
+    }
+
+    val displayName: MutableText by lazy { Text.translatable("${this.id().namespace}.species.${this.id().path.replace("/", ".")}.name") }
+
+    var nationalPokedexNumber: Int = nationalPokedexNumber
+        private set
+
+    var types: Pair<ElementalType, Optional<ElementalType>> = types
+        private set
+
+    val primaryType: ElementalType get() = this.types.first
+
+    val secondaryType: Optional<ElementalType> get() = this.types.second
+
+    var abilities: AbilityPool = abilities
+        private set
+
+    var baseStats: StatMap = baseStats
+        private set
+
+    var catchRate: Int = catchRate
+        private set
+
+    /**
+     * Responsible for picking a [Gender] for this [Species] on [create].
+     */
+    var genderSelector: GenderSelector = genderSelector
+        private set
+
+    val shoulderMountable: Boolean get() = this.behaviourData.shoulderMountable
+
+    val baseExperienceYield: Int get() = this.experienceData.baseExperienceYield
+
+    val experienceGroup: ExperienceGroup get() = this.experienceData.experienceGroup
+
+    val eggCycles: Int get() = this.eggData.eggCycles
+
+    val eggGroups: Set<EggGroup> get() = this.eggData.eggGroups
+
+    var learnset: Learnset = learnset
+        private set
+
+    val behaviour: PokemonBehaviour get() = this.behaviourData.pokemonBehaviour
+
+    val evolutions: Set<Evolution> get() = this.evolutionData.evolutions
+
+    val preEvolution: Optional<PreEvolution> get() = this.evolutionData.preEvolution
+
+    val baseScale: Float get() = this.cosmeticData.baseScale
+
+    val hitbox: EntityDimensions get() = this.cosmeticData.hitbox
+
+    var baseFriendship: Int = baseFriendship
+        private set
+
+    var evYield: StatMap = evYield
+        private set
+
+    val weight: Float get() = this.cosmeticData.weight
+
+    val height: Float get() = this.cosmeticData.height
+
+    val aspects: Set<String> get() = this.cosmeticData.aspects
+
+    val features: Set<String> get() = this.behaviourData.features
+
+    val standingEyeHeight: Float get() = this.cosmeticData.standingEyeHeight
+
+    val swimmingEyeHeight: Float get() = this.cosmeticData.swimmingEyeHeight
+
+    val flyingEyeHeight: Float get() = this.cosmeticData.flyingEyeHeight
+
+    var formData: Optional<FormData> = formData
+        private set
+
+    /**
+     * TODO
+     *
+     * @param level
+     * @return
+     */
+    fun create(level: Int): Pokemon {
+        TODO("Not yet implemented")
+    }
+
+    /**
+     * Picks a randomly generated [Gender] using the [genderSelector].
+     *
+     * @return The picked [Gender].
+     */
+    fun pickGender(): Gender = this.genderSelector.generate()
+
+    /**
+     * Checks if this [Species] can be of the given [gender].
+     * This is checked against the [genderSelector].
+     *
+     * @param gender The [Gender] being checked.
+     * @return If the given [gender] is possible for this [Species].
+     */
+    fun canBeOfGender(gender: Gender): Boolean = this.genderSelector.isValid(gender)
+
+    override fun showdownId(): String {
+        val id = this.id()
+        val showdownId = ShowdownIdentifiable.REGEX.replace(id.path, "")
+        if (id.namespace == Cobblemon.MODID) {
+            return showdownId
+        }
+        return id.namespace + showdownId
+    }
+
+    override fun id(): Identifier = this.registry().getId(this)!!
+
+    override fun registryEntry(): RegistryEntry<Species> = this.registry().getEntry(this)
+
+    override fun registry(): Registry<Species> = Cobblemon.implementation.getRegistry(CobblemonRegistryKeys.SPECIES)
+
+}
@@ -0,0 +1,43 @@
+/*
+ * 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.pokemon.species.internal
+
+import com.cobblemon.mod.common.api.pokemon.species.Species
+import com.cobblemon.mod.common.pokemon.ai.PokemonBehaviour
+import com.cobblemon.mod.common.util.codec.setCodec
+import com.mojang.serialization.Codec
+import com.mojang.serialization.MapCodec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+
+/**
+ * Intermediate for [Species] data.
+ */
+internal data class BehaviourData(
+    var pokemonBehaviour: PokemonBehaviour,
+    var shoulderMountable: Boolean,
+    var features: Set<String>,
+    var dynamaxBlocked: Boolean,
+) {
+
+    companion object {
+
+        val MAP_CODEC: MapCodec<BehaviourData> = RecordCodecBuilder.mapCodec { builder ->
+            builder.group(
+                PokemonBehaviour.CODEC.fieldOf("pokemonBehaviour").forGetter(BehaviourData::pokemonBehaviour),
+                Codec.BOOL.fieldOf("shoulderMountable").forGetter(BehaviourData::shoulderMountable),
+                setCodec(Codec.STRING).fieldOf("features").forGetter(BehaviourData::features),
+                Codec.BOOL.optionalFieldOf("dynamaxBlocked", false).forGetter(BehaviourData::dynamaxBlocked)
+            ).apply(builder, ::BehaviourData)
+        }
+
+        val CODEC: Codec<BehaviourData> = MAP_CODEC.codec()
+
+    }
+
+}
@@ -0,0 +1,54 @@
+/*
+ * 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.pokemon.species.internal
+
+import com.cobblemon.mod.common.api.pokemon.species.Species
+import com.cobblemon.mod.common.util.codec.ExtraCodecs
+import com.cobblemon.mod.common.util.codec.setCodec
+import com.mojang.serialization.Codec
+import com.mojang.serialization.MapCodec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import net.minecraft.entity.EntityDimensions
+
+/**
+ * Intermediate for [Species] data.
+ */
+internal data class CosmeticData(
+    var baseScale: Float,
+    var hitbox: EntityDimensions,
+    var weight: Float,
+    var height: Float,
+    var aspects: Set<String>,
+    var standingEyeHeight: Float,
+    var swimmingEyeHeight: Float,
+    var flyingEyeHeight: Float,
+) {
+
+    companion object {
+
+        val MAP_CODEC: MapCodec<CosmeticData> = RecordCodecBuilder.mapCodec { builder ->
+            builder.group(
+                Codec.FLOAT.fieldOf("baseScale").forGetter(CosmeticData::baseScale),
+                ExtraCodecs.ENTITY_DIMENSIONS.fieldOf("hitbox").forGetter(CosmeticData::hitbox),
+                Codec.FLOAT.fieldOf("weight").forGetter(CosmeticData::weight),
+                Codec.FLOAT.fieldOf("height").forGetter(CosmeticData::height),
+                setCodec(Codec.STRING).fieldOf("aspects").forGetter(CosmeticData::aspects),
+                Codec.FLOAT.optionalFieldOf("standingEyeHeight", VANILLA_DEFAULT_EYE_HEIGHT).forGetter(CosmeticData::standingEyeHeight),
+                Codec.FLOAT.optionalFieldOf("swimmingEyeHeight", VANILLA_DEFAULT_EYE_HEIGHT).forGetter(CosmeticData::swimmingEyeHeight),
+                Codec.FLOAT.optionalFieldOf("flyingEyeHeight", VANILLA_DEFAULT_EYE_HEIGHT).forGetter(CosmeticData::flyingEyeHeight),
+            ).apply(builder, ::CosmeticData)
+        }
+
+        val CODEC: Codec<CosmeticData> = MAP_CODEC.codec()
+
+        private const val VANILLA_DEFAULT_EYE_HEIGHT = 0.85F
+
+    }
+
+}
@@ -0,0 +1,40 @@
+/*
+ * 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.pokemon.species.internal
+
+import com.cobblemon.mod.common.api.pokemon.egg.EggGroup
+import com.cobblemon.mod.common.api.pokemon.species.Species
+import com.cobblemon.mod.common.util.codec.setCodec
+import com.mojang.serialization.Codec
+import com.mojang.serialization.MapCodec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import java.util.EnumSet
+
+/**
+ * Intermediate for [Species] data.
+ */
+internal data class EggData(
+    var eggCycles: Int,
+    var eggGroups: EnumSet<EggGroup>,
+) {
+
+    companion object {
+
+        val MAP_CODEC: MapCodec<EggData> = RecordCodecBuilder.mapCodec { builder ->
+            builder.group(
+                Codec.INT.fieldOf("eggCycles").forGetter(EggData::eggCycles),
+                setCodec(EggGroup.CODEC).fieldOf("eggGroups").xmap({ set -> EnumSet.copyOf(set) }, { enumSet -> enumSet }).forGetter { eggData -> eggData.eggGroups }
+            ).apply(builder, ::EggData)
+        }
+
+        val CODEC: Codec<EggData> = MAP_CODEC.codec()
+
+    }
+
+}
@@ -0,0 +1,42 @@
+/*
+ * 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.pokemon.species.internal
+
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.api.pokemon.evolution.PreEvolution
+import com.cobblemon.mod.common.api.pokemon.evolution.adapters.EvolutionRegistry
+import com.cobblemon.mod.common.api.pokemon.species.Species
+import com.cobblemon.mod.common.util.codec.setCodec
+import com.mojang.serialization.Codec
+import com.mojang.serialization.MapCodec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import java.util.*
+
+/**
+ * Intermediate for [Species] data.
+ */
+internal data class EvolutionData(
+    var evolutions: Set<Evolution>,
+    var preEvolution: Optional<PreEvolution>,
+) {
+
+    companion object {
+
+        val MAP_CODEC: MapCodec<EvolutionData> = RecordCodecBuilder.mapCodec { builder ->
+            builder.group(
+                setCodec(EvolutionRegistry.EVOLUTION_CODEC).optionalFieldOf("evolutions", emptySet()).forGetter(EvolutionData::evolutions),
+                PreEvolution.CODEC.optionalFieldOf("preEvolution").forGetter(EvolutionData::preEvolution)
+            ).apply(builder, ::EvolutionData)
+        }
+
+        val CODEC: Codec<EvolutionData> = MAP_CODEC.codec()
+
+    }
+
+}
@@ -0,0 +1,36 @@
+/*
+ * 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.pokemon.species.internal
+
+import com.cobblemon.mod.common.api.pokemon.experience.ExperienceGroup
+import com.cobblemon.mod.common.api.pokemon.species.Species
+import com.mojang.serialization.Codec
+import com.mojang.serialization.MapCodec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+
+/**
+ * Intermediate for [Species] data.
+ */
+internal data class ExperienceData(
+    var baseExperienceYield: Int,
+    var experienceGroup: ExperienceGroup
+) {
+
+    companion object {
+
+        val MAP_CODEC: MapCodec<ExperienceData> = RecordCodecBuilder.mapCodec { builder ->
+            builder.group(
+                Codec.INT.fieldOf("baseExperienceYield").forGetter(ExperienceData::baseExperienceYield),
+                ExperienceGroup.CODEC.fieldOf("experienceGroup").forGetter(ExperienceData::experienceGroup),
+            ).apply(builder, ::ExperienceData)
+        }
+
+    }
+
+}
@@ -0,0 +1,130 @@
+/*
+ * 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.pokemon.stats
+
+import com.mojang.serialization.Codec
+import kotlin.math.absoluteValue
+import kotlin.math.min
+
+/**
+ * An implementation of [StatMap] aimed solely at the EV data structure.
+ * This exists due to a few extra constraints present in EVs regarding the total value of the structure.
+ *
+ * @see <a href="https://bulbapedia.bulbagarden.net/wiki/Effort_values">Effort values Bulbapedia entry</a>
+ */
+@Suppress("MemberVisibilityCanBePrivate")
+class EvMap internal constructor(stats: HashMap<Stat, Int>) : StatMap(Variant.EV, stats) {
+
+    init {
+        if (this.values.sum() > MAX_TOTAL) {
+            throw IllegalArgumentException("Cannot instance ${this::class.simpleName} with values total exceeding $MAX_TOTAL")
+        }
+    }
+
+    /**
+     * Inherits the logic of [StatMap.validateValue].
+     * This has the added constraint of the maximum possible total value being [MAX_TOTAL].
+     *
+     * @see StatMap.validateValue
+     */
+    override fun validateValue(key: Stat, value: Int) {
+        super.validateValue(key, value)
+        val existing = this[key]
+        val current = this.values.sum() - existing
+        if (current + value > MAX_TOTAL) {
+            throw IllegalArgumentException("The total of the values of an ${this::class.simpleName} cannot exceed $MAX_TOTAL")
+        }
+    }
+
+    /**
+     * Adds to the given [stat].
+     *
+     * @param stat The [Stat] being added to.
+     * @param amount The amount being added. This value will be sanitized with [Int.absoluteValue].
+     * @param coerceSafe Should the value be coerced to be safe to add?
+     * @return The new resulting value of [stat].
+     *
+     * @throws IllegalArgumentException if [validateValue] fails.
+     *
+     * @see subtract
+     * @see mutate
+     */
+    fun add(stat: Stat, amount: Int, coerceSafe: Boolean): Int = this.mutate(stat, amount.absoluteValue, coerceSafe)
+
+    /**
+     * Subtracts from the given [stat].
+     *
+     * @param stat The [Stat] being subtracted from.
+     * @param amount The amount being subtracted. This value will be sanitized with [Int.absoluteValue].
+     * @param coerceSafe Should the value be coerced to be safe to subtract?
+     * @return The new resulting value of [stat].
+     *
+     * @throws IllegalArgumentException if [validateValue] fails.
+     *
+     * @see add
+     * @see mutate
+     */
+    fun subtract(stat: Stat, amount: Int, coerceSafe: Boolean): Int = this.mutate(stat, amount.absoluteValue, coerceSafe)
+
+    /**
+     * Mutates the given [stat].
+     *
+     * @param stat The [Stat] being mutated.
+     * @param amount The amount being used in the mutation operation.
+     * @param coerceSafe Should the value be coerced to be safe to operate with?
+     * @return The new resulting value of [stat].
+     *
+     * @throws IllegalArgumentException if [validateValue] fails.
+     *
+     * @see add
+     * @see subtract
+     */
+    fun mutate(stat: Stat, amount: Int, coerceSafe: Boolean): Int {
+        var result = this[stat] + amount
+        if (coerceSafe) {
+            result = result.coerceIn(this.variant.minValue, min(this.variant.maxValue, this.remaining()))
+        }
+        this.put(stat, result)
+        return result
+    }
+
+    /**
+     * Resolves how many EVs can still be allocated to this structure.
+     *
+     * @return How many EVs can still be allocated.
+     */
+    fun remaining(): Int = MAX_TOTAL - this.values.sum()
+
+    companion object {
+
+        /**
+         * A [Codec] for a [EvMap].
+         */
+        @JvmField
+        val EV_STATS_CODEC: Codec<EvMap> = Codec.unboundedMap(Stat.CODEC, Codec.intRange(Variant.EV.minValue, Variant.EV.maxValue))
+            .xmap({ map -> EvMap(HashMap(map)) }, { evMap -> evMap })
+
+        /**
+         * The maximum total EV values.
+         */
+        const val MAX_TOTAL = 510
+
+        /**
+         * Creates a [EvMap] with the given params.
+         *
+         * @param map The base map to take values from.
+         * @return The generated [EvMap].
+         *
+         * @throws IllegalArgumentException If the constraints seen in [StatMap.create] are not fulfilled or if the total of the values exceeds [MAX_TOTAL].
+         */
+        fun create(map: Map<Stat, Int>): EvMap = EvMap(HashMap(map))
+
+    }
+
+}
@@ -8,6 +8,8 @@

 package com.cobblemon.mod.common.api.pokemon.stats

+import com.cobblemon.mod.common.Cobblemon
+import com.mojang.serialization.Codec
 import net.minecraft.text.Text
 import net.minecraft.util.Identifier

@@ -61,4 +63,10 @@ interface Stat {

    }

+    companion object {
+
+        val CODEC: Codec<Stat> = Identifier.CODEC.xmap(Cobblemon.statProvider::fromIdentifierOrThrow, Stat::identifier)
+
+    }
+
 }
@@ -0,0 +1,287 @@
+/*
+ * 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.pokemon.stats
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.serialization.BufferSerializer
+import com.cobblemon.mod.common.api.serialization.DataSerializer
+import com.cobblemon.mod.common.pokemon.EVs
+import com.cobblemon.mod.common.pokemon.IVs
+import com.google.gson.JsonObject
+import com.mojang.serialization.Codec
+import com.mojang.serialization.JsonOps
+import net.minecraft.nbt.NbtCompound
+import net.minecraft.nbt.NbtOps
+import net.minecraft.network.PacketByteBuf
+import kotlin.jvm.optionals.getOrDefault
+
+/**
+ * Represents a map-like structure that is used solely for the purpose of various stat-like Pokémon data structures.
+ *
+ * @property variant The [Variant] of this map.
+ * @property stats The base map used for this map.
+ *
+ * @see <a href="https://bulbapedia.bulbagarden.net/wiki/Base_stats">Base stats Bulbapedia entry</a>
+ * @see <a href="https://bulbapedia.bulbagarden.net/wiki/Effort_values">Effort values Bulbapedia entry</a>
+ * @see <a href="https://bulbapedia.bulbagarden.net/wiki/Individual_values">Individual values Bulbapedia entry</a>
+ *
+ */
+@Suppress("unused", "MemberVisibilityCanBePrivate")
+open class StatMap internal constructor(
+    val variant: Variant,
+    protected val stats: HashMap<Stat, Int>
+) : Map<Stat, Int>, DataSerializer<NbtCompound, JsonObject>, BufferSerializer {
+
+    init {
+        if (!Cobblemon.statProvider.ofType(Stat.Type.PERMANENT).all(this.stats::containsKey)) {
+            throw IllegalArgumentException("Cannot instance ${this::class.simpleName} without all ${Stat.Type.PERMANENT.name} ${Stat::class.simpleName}")
+        }
+        if (!this.stats.values.any { value -> this.variant.fits(value) }) {
+            throw IllegalArgumentException("Cannot instance ${this::class.simpleName} with values not in range [${this.variant.minValue}-${this.variant.maxValue}]")
+        }
+    }
+
+    override val entries: Set<Map.Entry<Stat, Int>>
+        get() = this.stats.entries
+    override val keys: Set<Stat>
+        get() = this.stats.keys
+    override val size: Int
+        get() = this.stats.size
+    override val values: Collection<Int>
+        get() = this.stats.values
+
+    /**
+     * A constraint of implementing [Map].
+     * This is impossible to be false.
+     *
+     * @return Always true.
+     */
+    override fun isEmpty(): Boolean = false
+
+    /**
+     * Returns the value corresponding to the given [key].
+     * Due to implementation details unlike a typical [Map.get] this will never return null.
+     *
+     * @param key The [Stat] being checked.
+     * @return The value attached to the [key].
+     */
+    override fun get(key: Stat): Int = this.stats[key]!!
+
+    override fun containsValue(value: Int): Boolean = this.stats.containsValue(value)
+
+    override fun containsKey(key: Stat): Boolean = this.stats.containsKey(key)
+
+    override fun loadFromNBT(nbt: NbtCompound) {
+        this.codec().decode(NbtOps.INSTANCE, nbt)
+            .result()
+            .ifPresent { pair -> this.putAll(pair.first) }
+    }
+
+    override fun saveToNBT(): NbtCompound {
+        val result = this.codec().encodeStart(NbtOps.INSTANCE, this)
+            .result()
+            .getOrDefault(NbtCompound())
+        // It's safe to cast it will always result in a NbtCompound
+        return result as NbtCompound
+    }
+
+    override fun loadFromJson(json: JsonObject) {
+        this.codec().decode(JsonOps.INSTANCE, json)
+            .result()
+            .ifPresent { pair -> this.putAll(pair.first) }
+    }
+
+    override fun saveToJson(): JsonObject {
+        val result = this.codec().encodeStart(JsonOps.INSTANCE, this)
+            .result()
+            .getOrDefault(JsonObject())
+        // It's safe to cast it will always result in a JsonObject
+        return result as JsonObject
+    }
+
+    override fun saveToBuffer(buffer: PacketByteBuf, toClient: Boolean) {
+        buffer.writeMap(this.stats, { pb, stat -> pb.writeIdentifier(stat.identifier) }, PacketByteBuf::writeInt)
+    }
+
+    override fun loadFromBuffer(buffer: PacketByteBuf) {
+        // This is safe to do as the server will have sanitized the values.
+        this.stats.clear()
+        this.stats.putAll(buffer.readMap({ pb -> Cobblemon.statProvider.decode(pb) }, PacketByteBuf::readInt))
+    }
+
+    /**
+     * Resets the value for the given [key] to the [Variant.minValue] of [variant].
+     *
+     * @param key The [Stat] being reset.
+     * @return The previous attached value.
+     *
+     * @throws IllegalArgumentException If the [key] fails [validateKey].
+     */
+    fun reset(key: Stat): Int {
+        this.validateKey(key)
+        val existing = this.stats[key]!!
+        this.stats[key] = this.variant.minValue
+        return existing
+    }
+
+    /**
+     * Resets all values of this map to the [Variant.minValue] of [variant].
+     */
+    fun reset() {
+        Cobblemon.statProvider.ofType(Stat.Type.PERMANENT).forEach(this::reset)
+    }
+
+    /**
+     * Merges key-value pairs from a map into this [StatMap].
+     *
+     * @param from The map being merged.
+     *
+     * @throws IllegalArgumentException If any value of [from] fails [validateValue].
+     */
+    fun putAll(from: Map<out Stat, Int>) {
+        from.forEach(this::put)
+    }
+
+    /**
+     * Puts the given [value] on the given [key] [Stat] of this [StatMap].
+     *
+     * @param key The [Stat] being set.
+     * @param value The value being set to the [key].
+     * @return The previously attached value.
+     *
+     * @throws IllegalArgumentException If the [value] fails [validateValue].
+     */
+    fun put(key: Stat, value: Int): Int {
+        this.validateValue(key, value)
+        val existing = this.stats[key]!!
+        this.stats[key] = value
+        return existing
+    }
+
+    /**
+     * Resolves the [Codec] for this instance.
+     * This is done based on the [variant].
+     *
+     * @return The [Codec] for this specific [StatMap] setup.
+     *
+     * @see StatMap.BASE_STATS_CODEC
+     * @see StatMap.EV_STATS_CODEC
+     * @see StatMap.IV_STATS_CODEC
+     */
+    fun codec(): Codec<StatMap> = when (this.variant) {
+        Variant.BASE_STATS -> BASE_STATS_CODEC
+        Variant.IV -> IV_STATS_CODEC
+        Variant.EV -> EV_STATS_CODEC
+    }
+
+    /**
+     * Checks if a [Stat.Type] is [Stat.Type.PERMANENT].
+     *
+     * @param stat The [Stat] being checked.
+     *
+     * @throws IllegalArgumentException If the [Stat.Type] is not [Stat.Type.PERMANENT].
+     */
+    protected open fun validateKey(stat: Stat) {
+        if (stat.type != Stat.Type.PERMANENT) {
+            throw IllegalArgumentException("Unsupported stat type of ${stat.type.name} for ${stat.identifier}")
+        }
+    }
+
+    /**
+     * Checks if a value is possible for this map.
+     *
+     * @param key The key having the [value] assigned.
+     * @param value The value being assigned.
+     *
+     * @throws IllegalArgumentException If the [value] doesn't fulfill [Variant.fits] of the [variant].
+     */
+    protected open fun validateValue(key: Stat, value: Int) {
+        if (!this.variant.fits(value)) {
+            throw IllegalArgumentException("Cannot accept $value, a value must be in range [${this.variant.minValue}-${this.variant.maxValue}]")
+        }
+    }
+
+    /**
+     * Represents a type of data collected inside [StatMap].
+     *
+     * @property minValue The minimum possible value for a value of a [StatMap].
+     * @property maxValue The maximum possible value for a value of a [StatMap].
+     */
+    enum class Variant(val minValue: Int, val maxValue: Int) {
+
+        /**
+         * Used to represent [base stats](https://bulbapedia.bulbagarden.net/wiki/Base_stats).
+         */
+        BASE_STATS(1, Int.MAX_VALUE),
+
+        /**
+         * Used to represent [effort values](https://bulbapedia.bulbagarden.net/wiki/Effort_values).
+         */
+        EV(0, EVs.MAX_STAT_VALUE),
+
+        /**
+         * Used to represent [individual values](https://bulbapedia.bulbagarden.net/wiki/Individual_values).
+         */
+        IV(0, IVs.MAX_VALUE);
+
+        /**
+         * Checks if the given [value] fits within the range created by [minValue] & [maxValue].
+         *
+         * @param value The value being checked.
+         * @return If the value can fit in this variant.
+         */
+        fun fits(value: Int): Boolean = value >= this.minValue && value <= this.maxValue
+
+    }
+
+    companion object {
+
+        /**
+         * A [Codec] for a [StatMap] of the [Variant.BASE_STATS] variant.
+         */
+        @JvmField
+        val BASE_STATS_CODEC: Codec<StatMap> = this.createCodec(Variant.BASE_STATS)
+
+        /**
+         * A [Codec] for a [StatMap] of the [Variant.EV] variant.
+         * For the [EvMap] typed Codec see [EvMap.EV_STATS_CODEC].
+         * The result as far as instance types go is the same this is just a constraint of [Codec].
+         *
+         * @see EvMap.EV_STATS_CODEC
+         */
+        @JvmField
+        val EV_STATS_CODEC: Codec<StatMap> = EvMap.EV_STATS_CODEC.xmap({ evMap -> this.create(Variant.EV, evMap) }, EvMap::create)
+
+        /**
+         * A [Codec] for a [StatMap] of the [Variant.IV] variant.
+         */
+        @JvmField
+        val IV_STATS_CODEC: Codec<StatMap> = this.createCodec(Variant.IV)
+
+        /**
+         * Creates a [StatMap] with the given params.
+         *
+         * @param variant The [StatMap] [Variant].
+         * @param map The base map to take values from.
+         * @return The generated [StatMap].
+         *
+         * @throws IllegalArgumentException If map doesn't contain every possible key with type [Stat.Type.PERMANENT] or if any value doesn't respect [Variant.fits] for the given [variant].
+         */
+        fun create(variant: Variant, map: Map<Stat, Int>): StatMap = when (variant) {
+            Variant.BASE_STATS -> StatMap(variant, HashMap(map))
+            Variant.EV -> EvMap(HashMap(map))
+            Variant.IV -> StatMap(variant, HashMap(map))
+        }
+
+        private fun createCodec(variant: Variant): Codec<StatMap> = Codec.unboundedMap(Stat.CODEC, Codec.intRange(variant.minValue, variant.maxValue))
+            .xmap({ map -> StatMap(variant, HashMap(map)) }, { statMap -> statMap })
+
+    }
+
+}
@@ -9,11 +9,7 @@
 package com.cobblemon.mod.common.api.pokemon.stats

 import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.pokemon.EVs
-import com.cobblemon.mod.common.pokemon.FormData
-import com.cobblemon.mod.common.pokemon.IVs
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.Species
+import com.cobblemon.mod.common.pokemon.*
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
 import net.minecraft.network.PacketByteBuf
 import net.minecraft.util.Identifier
@@ -0,0 +1,25 @@
+/*
+ * 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.registry
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.pokemon.species.Species
+import com.cobblemon.mod.common.api.types.ElementalType
+import net.minecraft.registry.Registry
+import net.minecraft.registry.RegistryKey
+
+object CobblemonRegistries {
+
+    val ELEMENTAL_TYPE: Registry<ElementalType> get() = this.get(CobblemonRegistryKeys.ELEMENTAL_TYPE)
+
+    val SPECIES: Registry<Species> get() = this.get(CobblemonRegistryKeys.SPECIES)
+
+    private fun <T> get(key: RegistryKey<Registry<T>>): Registry<T> = Cobblemon.implementation.getRegistry(key)
+
+}
@@ -0,0 +1,26 @@
+/*
+ * 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.registry
+
+import net.minecraft.registry.Registry
+import net.minecraft.registry.entry.RegistryEntry
+import net.minecraft.registry.tag.TagKey
+import net.minecraft.util.Identifier
+
+interface CobblemonRegistryElement<T : CobblemonRegistryElement<T>> {
+
+    fun isIn(tag: TagKey<T>): Boolean = this.registryEntry().isIn(tag)
+
+    fun id(): Identifier
+
+    fun registryEntry(): RegistryEntry<T>
+
+    fun registry(): Registry<T>
+
+}
@@ -0,0 +1,29 @@
+/*
+ * 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.registry
+
+import com.cobblemon.mod.common.api.moves.MoveTemplate
+import com.cobblemon.mod.common.api.pokemon.species.Species
+import com.cobblemon.mod.common.api.types.ElementalType
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.registry.Registry
+import net.minecraft.registry.RegistryKey
+
+/**
+ * Contains the various [RegistryKey]s for Cobblemon.
+ */
+object CobblemonRegistryKeys {
+
+    val ELEMENTAL_TYPE: RegistryKey<Registry<ElementalType>> = this.create("elemental_types")
+
+    val SPECIES: RegistryKey<Registry<Species>> = this.create("species")
+
+    private fun <T> create(key: String): RegistryKey<Registry<T>> = RegistryKey.ofRegistry(cobblemonResource(key))
+
+}
@@ -90,7 +90,7 @@ object CobblemonSpawningProspector : SpawningProspector {
                    val state = query.getBlockState(pos.set(x, y, z))
                    blocks[x - area.baseX][y - baseY][z - area.baseZ] = WorldSlice.BlockData(
                        state = state,
-                        light = state.getOpacity(world, pos)
+                        light = world.getLightLevel(pos)
                    )

                    if (canSeeSky) {
@@ -19,12 +19,15 @@ import com.cobblemon.mod.common.api.spawning.detail.PossibleHeldItem
 import com.cobblemon.mod.common.api.spawning.preset.SpawnDetailPreset
 import com.cobblemon.mod.common.util.adapters.*
 import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.codec.toTypeAdapter
+import com.cobblemon.mod.common.util.server
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import com.mojang.datafixers.util.Either
 import net.minecraft.block.Block
 import net.minecraft.fluid.Fluid
+import net.minecraft.registry.Registries
 import net.minecraft.registry.RegistryKeys
 import net.minecraft.registry.tag.TagKey
 import net.minecraft.resource.ResourceType
@@ -48,9 +51,9 @@ object SpawnDetailPresets : JsonDataRegistry<SpawnDetailPreset> {
        .disableHtmlEscaping()
        .registerTypeAdapter(SpawnBucket::class.java, SpawnBucketAdapter)
        .registerTypeAdapter(RegisteredSpawningContext::class.java, RegisteredSpawningContextAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Fluid::class.java).type, FluidLikeConditionAdapter)
+        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, RegistryLikeCondition.createCodec { server()!!.registryManager.get(RegistryKeys.BIOME) }.toTypeAdapter())
+        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, RegistryLikeCondition.createCodec { Registries.BLOCK }.toTypeAdapter())
+        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Fluid::class.java).type, RegistryLikeCondition.createCodec { Registries.FLUID }.toTypeAdapter())
        .registerTypeAdapter(
            TypeToken.getParameterized(
                Either::class.java,
@@ -17,12 +17,15 @@ import com.cobblemon.mod.common.api.spawning.context.RegisteredSpawningContext
 import com.cobblemon.mod.common.api.spawning.detail.PossibleHeldItem
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
 import com.cobblemon.mod.common.util.adapters.*
+import com.cobblemon.mod.common.util.codec.toTypeAdapter
+import com.cobblemon.mod.common.util.server
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import com.mojang.datafixers.util.Either
 import net.minecraft.block.Block
 import net.minecraft.fluid.Fluid
 import net.minecraft.nbt.NbtCompound
+import net.minecraft.registry.Registries
 import net.minecraft.registry.RegistryKeys
 import net.minecraft.registry.tag.TagKey
 import net.minecraft.util.Identifier
@@ -41,9 +44,9 @@ object SpawnLoader {
        .setPrettyPrinting()
        .disableHtmlEscaping()
        .setLenient()
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Fluid::class.java).type, FluidLikeConditionAdapter)
+        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, RegistryLikeCondition.createCodec { server()!!.registryManager.get(RegistryKeys.BIOME) }.toTypeAdapter())
+        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, RegistryLikeCondition.createCodec { Registries.BLOCK }.toTypeAdapter())
+        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Fluid::class.java).type, RegistryLikeCondition.createCodec { Registries.FLUID }.toTypeAdapter())
        .registerTypeAdapter(
            TypeToken.getParameterized(
                Either::class.java,
@@ -10,6 +10,8 @@ package com.cobblemon.mod.common.api.spawning

 import com.cobblemon.mod.common.api.spawning.TimeRange.Companion.timeRanges
 import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
+import com.mojang.serialization.Codec
+import com.mojang.serialization.DataResult

 /**
 * A range of time ticks for a world mainly to be used in [SpawningCondition]s. A time range
@@ -41,6 +43,12 @@ class TimeRange : IntRanges {
            "morning" to TimeRange(0..4999),
            "afternoon" to TimeRange(7000..12039)
        )
+
+        val CODEC: Codec<TimeRange> = Codec.STRING.flatXmap(
+            { string -> timeRanges[string]?.let { DataResult.success(it) } ?: DataResult.error { "Can't find a time range with ID $string" } },
+            { timeRange -> timeRanges.entries.firstOrNull { (_, range) -> range == timeRange }?.let { DataResult.success(it.key) } ?: DataResult.error { "Couldn't resolve a time range ID for $timeRange" } }
+        )
+
    }

    constructor() : super()
@@ -8,6 +8,7 @@

 package com.cobblemon.mod.common.api.spawning.condition

+import net.minecraft.util.StringIdentifiable
 import net.minecraft.world.World

 /**
@@ -17,7 +18,7 @@ import net.minecraft.world.World
 * @author Licious
 * @since January 25th, 2023
 */
-enum class MoonPhase {
+enum class MoonPhase : StringIdentifiable {

    FULL_MOON,
    WANING_GIBBOUS,
@@ -28,6 +29,8 @@ enum class MoonPhase {
    FIRST_QUARTER,
    WAXING_GIBBOUS;

+    override fun asString(): String = this.name
+
    companion object {
        private val VALUES = values()

@@ -14,9 +14,7 @@ import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.spawning.context.SpawningContext
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.feature.SeasonFeatureHandler
-import com.cobblemon.mod.common.util.toVec3d
 import com.cobblemon.mod.common.util.weightedSelection
-import kotlin.random.Random

 /**
 * A [SpawnAction] that will spawn a single [PokemonEntity].
@@ -35,10 +33,6 @@ class PokemonSpawnAction(
        if (props.level == null) {
            props.level = detail.getDerivedLevelRange().random()
        }
-        if (props.shiny == null) {
-            // If the config value is at least 1, then do 1/x and use that as the shiny chance
-            props.shiny = Cobblemon.config.shinyRate.takeIf { it >= 1 }?.let { Random.Default.nextFloat() < 1 / it }
-        }
        val heldItems = detail.heldItems?.takeIf { it.isNotEmpty() }?.toMutableList() ?: mutableListOf()
        val heldItem = if (heldItems.isNotEmpty()) {
            val until100 = 1 - heldItems.sumOf { it.percentage / 100 }
@@ -17,6 +17,7 @@ import com.cobblemon.mod.common.api.spawning.context.SpawningContext
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.lang
 import com.google.gson.annotations.SerializedName
 import kotlin.math.ceil
@@ -48,6 +49,8 @@ class PokemonSpawnDetail : SpawnDetail() {


    override fun getName(): MutableText {
+        displayName?.let { return it.asTranslated() }
+
        val speciesString = pokemon.species
        if (speciesString != null) {
            if (speciesString.lowercase() == "random") {
@@ -71,8 +74,8 @@ class PokemonSpawnDetail : SpawnDetail() {
            val species = PokemonSpecies.getByIdentifier(pokemon.species!!.asIdentifierDefaultingNamespace())
            if (species != null) {
                labels.addAll(
-                    species.secondaryType?.let { listOf(species.primaryType.name.lowercase(), it.name.lowercase()) }
-                    ?: listOf(species.primaryType.name.lowercase())
+                    species.secondaryType?.let { listOf(species.primaryType.id().toString(), it.id().toString()) }
+                    ?: listOf(species.primaryType.id().toString())
                )

                if (height == -1) {
@@ -32,12 +32,12 @@ open class BottomlessStore(override val uuid: UUID) : PokemonStore<BottomlessPos
    override fun iterator() = pokemon.iterator()

    override fun get(position: BottomlessPosition) = position.currentIndex
-        .takeIf { it < pokemon.size && it >= 0 }
+        .takeIf { it in pokemon.indices }
        ?.let { pokemon[it] }

    override fun getFirstAvailablePosition() = BottomlessPosition(pokemon.size)
    override fun isValidPosition(position: BottomlessPosition) = position.currentIndex >= 0
-    operator fun get(index: Int) = index.takeIf { it >= 0 && it < pokemon.size }?.let { pokemon[it] }
+    operator fun get(index: Int) = index.takeIf { it in pokemon.indices }?.let { pokemon[it] }
    override fun getObservingPlayers() = emptySet<ServerPlayerEntity>()
    override fun sendTo(player: ServerPlayerEntity) {}

@@ -58,7 +58,12 @@ open class BottomlessStore(override val uuid: UUID) : PokemonStore<BottomlessPos
    override fun loadFromNBT(nbt: NbtCompound): BottomlessStore {
        var i = -1
        while (nbt.contains(DataKeys.STORE_SLOT + ++i)) {
-            pokemon.add(Pokemon().loadFromNBT(nbt.getCompound(DataKeys.STORE_SLOT + i)))
+            val pokemonNBT = nbt.getCompound(DataKeys.STORE_SLOT + i)
+            try {
+                pokemon.add(Pokemon().loadFromNBT(pokemonNBT))
+            } catch(_: InvalidSpeciesException) {
+                handleInvalidSpeciesNBT(pokemonNBT)
+            }
        }
        return this
    }
@@ -71,7 +76,12 @@ open class BottomlessStore(override val uuid: UUID) : PokemonStore<BottomlessPos
    override fun loadFromJSON(json: JsonObject): BottomlessStore {
        var i = -1
        while (json.has(DataKeys.STORE_SLOT + ++i)) {
-            pokemon.add(Pokemon().loadFromJSON(json.getAsJsonObject(DataKeys.STORE_SLOT + i)))
+            val pokemonJSON = json.getAsJsonObject(DataKeys.STORE_SLOT + i)
+            try {
+                pokemon.add(Pokemon().loadFromJSON(pokemonJSON))
+            } catch (_: InvalidSpeciesException) {
+                handleInvalidSpeciesJSON(pokemonJSON)
+            }
        }
        return this
    }
@@ -92,11 +102,16 @@ open class BottomlessStore(override val uuid: UUID) : PokemonStore<BottomlessPos
            this.pokemon.add(pokemon)
            storeChangeObservable.emit(Unit)
        } else if (position.currentIndex in 0 until this.pokemon.size) {
+            var startIndex = position.currentIndex;
            if (pokemon != null) {
                this.pokemon.add(position.currentIndex, pokemon)
+                startIndex += 1;
            } else {
                this.pokemon.removeAt(position.currentIndex)
            }
+            for(i in startIndex until this.pokemon.size) {
+                this.pokemon[i].storeCoordinates.set(StoreCoordinates(this, BottomlessPosition(i)))
+            }
            storeChangeObservable.emit(Unit)
        }
    }
@@ -0,0 +1,19 @@
+/*
+ * 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.storage
+
+import net.minecraft.util.Identifier
+
+/**
+ * An exception when trying to deserialize a Pokemon instance with an identifier that doesn't seem to be in the registry.
+ *
+ * @author Hiroku
+ * @since October 9th, 2023
+ */
+class InvalidSpeciesException(val identifier: Identifier) : IllegalStateException("Invalid species: $identifier")
@@ -146,8 +146,10 @@ abstract class PokemonStore<T : StorePosition> : Iterable<Pokemon> {

    operator fun get(uuid: UUID) = find { it.uuid == uuid }

+    open fun handleInvalidSpeciesNBT(nbt: NbtCompound) {}
    abstract fun saveToNBT(nbt: NbtCompound): NbtCompound
    abstract fun loadFromNBT(nbt: NbtCompound): PokemonStore<T>
+    open fun handleInvalidSpeciesJSON(json: JsonObject) {}
    abstract fun saveToJSON(json: JsonObject): JsonObject
    abstract fun loadFromJSON(json: JsonObject): PokemonStore<T>
    abstract fun savePositionToNBT(position: T, nbt: NbtCompound)
@@ -20,7 +20,7 @@ import com.cobblemon.mod.common.api.storage.StorePosition
 import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore
 import com.cobblemon.mod.common.api.storage.pc.PCStore
 import com.cobblemon.mod.common.pokemon.EVs
-import com.cobblemon.mod.common.pokemon.Gender
+import com.cobblemon.mod.common.api.pokemon.gender.Gender
 import com.cobblemon.mod.common.pokemon.IVs
 import com.cobblemon.mod.common.pokemon.Pokemon
 import java.nio.file.Path
@@ -0,0 +1,101 @@
+/*
+ * 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.storage.adapter.database
+
+import com.cobblemon.mod.common.api.storage.PokemonStore
+import com.cobblemon.mod.common.api.storage.StorePosition
+import com.cobblemon.mod.common.api.storage.adapter.CobblemonAdapterParent
+import com.cobblemon.mod.common.api.storage.adapter.flatfile.FileStoreAdapter
+import com.cobblemon.mod.common.api.storage.adapter.flatfile.JSONStoreAdapter
+import com.cobblemon.mod.common.api.storage.adapter.flatfile.NBTStoreAdapter
+import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore
+import com.cobblemon.mod.common.api.storage.pc.PCStore
+import com.cobblemon.mod.common.util.server
+import com.google.gson.Gson
+import com.google.gson.JsonObject
+import com.mongodb.client.MongoClient
+import com.mongodb.client.MongoCollection
+import com.mongodb.client.model.ReplaceOptions
+import net.minecraft.util.WorldSavePath
+import org.bson.Document
+import java.util.UUID
+
+/**
+ * A [FileStoreAdapter] for MongoDB. This allows a [PokemonStore] to be serialized to a MongoDB database.
+ *
+ * @author Pebbles
+ * @since August 23rd, 2023
+ */
+open class MongoDBStoreAdapter(
+    private val mongoClient: MongoClient,
+    private val databaseName: String,
+) : CobblemonAdapterParent<JsonObject>(), FileStoreAdapter<JsonObject> {
+    private fun getCollection(storeClass: Class<out PokemonStore<*>>): MongoCollection<Document> {
+        val collectionName = when (storeClass) {
+            PlayerPartyStore::class.java -> "PlayerPartyCollection"
+            PCStore::class.java -> "PCCollection"
+            else -> "OtherCollection"
+        }
+        return mongoClient.getDatabase(databaseName).getCollection(collectionName)
+    }
+
+    private val gson: Gson = Gson()
+
+    override fun <E : StorePosition, T : PokemonStore<E>> serialize(store: T): JsonObject {
+        return store.saveToJSON(JsonObject())
+    }
+
+    override fun save(storeClass: Class<out PokemonStore<*>>, uuid: UUID, serialized: JsonObject) {
+        val document = Document.parse(gson.toJson(serialized))
+        document.put("uuid", uuid.toString())
+
+        val collection = getCollection(storeClass)
+        val filter = Document("uuid", uuid.toString())
+        collection.replaceOne(filter, document, ReplaceOptions().upsert(true))
+    }
+
+    override fun <E : StorePosition, T : PokemonStore<E>> provide(storeClass: Class<T>, uuid: UUID): T? {
+        val server = server()!!
+        val pokemonStoreRoot = server.getSavePath(WorldSavePath.ROOT).resolve("pokemon").toFile()
+        val jsonAdapter = JSONStoreAdapter(
+            pokemonStoreRoot.absolutePath,
+            useNestedFolders = true,
+            folderPerClass = true
+        )
+        val nbtAdapter = NBTStoreAdapter(pokemonStoreRoot.absolutePath, useNestedFolders = true, folderPerClass = true)
+
+        // 1. Check if data exists in MongoDB
+        val collection = getCollection(storeClass)
+        val filter = Document("uuid", uuid.toString())
+        val document = collection.find(filter).first()
+
+        if (document != null) {
+            val json = gson.fromJson(document.toJson(), JsonObject::class.java)
+            val store = storeClass.getConstructor(UUID::class.java).newInstance(uuid)
+            store.loadFromJSON(json)
+            return store
+        }
+
+        // 2. Fallback to checking JSON and NBT
+        val nbtStore = nbtAdapter.provide(storeClass, uuid)
+        if (nbtStore != null) {
+            save(storeClass, uuid, serialize(nbtStore))
+            return nbtStore
+        }
+
+        val jsonStore = jsonAdapter.provide(storeClass, uuid)
+        if (jsonStore != null) {
+            save(storeClass, uuid, serialize(jsonStore))
+            return jsonStore
+        }
+
+        return null
+    }
+
+}
@@ -6,7 +6,7 @@
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

-package com.cobblemon.mod.common.api.storage.adapter.flatifle
+package com.cobblemon.mod.common.api.storage.adapter.flatfile

 import com.cobblemon.mod.common.api.storage.PokemonStore
 import com.cobblemon.mod.common.api.storage.StorePosition