Added CanDynamaxInstruction for multi battles.

.gitignore

@@ -37,7 +37,6 @@ common/src/main/resources/assets/cobblemon/showdown
 /fabric/src/generated/resources/cobblemon-common.accesswidener
 /.ignored/
 common/.fabric
-.kotlin/
 
 # MacOS
-.DS_Store
+.DS_Store

.gitlab-ci.yml

@@ -35,7 +35,7 @@ publish:
       - neoforge/build/libs/*.jar
       - fabric/build/libs/*.jar
   rules:
-    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_BRANCH == "sega_bass_pro_fishing_2"'
   script:
     - export GRADLE_OPTS="-Xmx4G -Xms4G"
     - chmod +x ./gradlew

1.20.5 to do.txt

@@ -0,0 +1 @@
+LambDynamicLights compat needs to be restored

CHANGELOG-NO-ENTITY-RENDERING.md

@@ -0,0 +1,24 @@
+### Additions
+- Pokémon are now animated when seen in any GUI that isn't the party GUI.
+- Quirk animations can now occur for Pokémon that are shoulder mounted.
+
+### Changes
+- Improved the performance of display cases that contain Pokémon photos.
+
+### Fixes
+- Fixed some Pokémon photos in display cases flashing if the Pokémon has gender differences.
+- Fixed Bidoof and Jigglypuff sleep animations stopping after some time, causing them to be 'asleep' while T-posing menacingly.
+- Fixed entities not changing poses unless you're looking at them.
+- Fixed cries not playing on send-out if the Pokémon is off-screen.
+
+### Developer
+- Rebuilt large swaths of the model animation code to simplify it.
+- Renamed a bunch of things from %Poseable% to %Posable% because spelling.
+- Renamed StatelessAnimation to PoseAnimation.
+- Renamed StatefulAnimation to ActiveAnimation.
+- Documented the animation system.
+
+### Data Pack & Resource Pack Creators
+- Added MoLang compatibility in the isVisible property for transformed parts.
+- Added q.has_aspect('some_aspect') function to animations, posers, and entity particle effects.
+- Added support for conditional pose animations.

CHANGELOG.md

@@ -1,63 +1,85 @@
 # Changelog
-## [1.6.0 - The Record Catch Update (Month Xth, 2024)](#1-6-0)
+## [1.6.0 - The Bass Pro Fishing Update (Month Xth, 2024)](#1-6-0)
 #### "Now that there's a fishing mechanic, the mod is actually good!"
+### Fixes
+- Fixed trading Pokémon setting their friendsip to 0 instead of the base value.
+- Fixed a scenario where a Pokémon that rolled to spawn with a special Tera type sometimes has a Tera type that is already a part of their natural typing.
+- Fixed PokemonProperty argument suggestions for ``tera`` and ``tera_type`` not suggesting ``stellar``.
+- Fixed being able to stack Relic Coin Pouches on top of each other.
+- Bag Items used during a turn will now be refunded if the battle ends before the next turn begins.
 
 ### Additions
-- Added the Pokédex as a craftable item that can be placed on lecterns.
 - Added Pokémon (and item) fishing using modified fishing rods - Poké Rods! You'll need a Poké Rod smithing template, a fishing rod, and some type of Poké Ball. Each Poké Ball makes a differently themed rod. Why not?
 - Added Lure Ball functionality, increasing the catch rate of Pokémon that were caught on a fishing rod.
-- Added Repeat Ball functionality, increasing the catch rate of Pokémon that are already registered as caught in a player's Pokédex.
 - Added property chaining support for duplicate CustomPokemonPropertyType elements.
-- Added flat level battling with options to set all Pokémon to level 50, 100, or 5 for the duration of a battle. No experience or EVs are granted for a flat battle.
-- Added `aspect` and `unaspect` PokemonProperty arguments (which also includes commands such as `/pokemonedit`, `/spawnpokemon`, and `/givepokemon`) to allow forcing or un-forcing an aspect on a Pokémon.
-- Added `type` alternatively `elemental_type` PokemonProperty argument, this is only used for filtering and is not applied to Pokémon. Example `type=fire` would be true for Charmander but false for Squirtle.
-- Added support for Double Battles, Triple Battles, and Multi-battles.
-- CriticalCaptures and Pokédex progress capture multiplier now work with the Pokédex.
-- Added extra visuals to early berry growth stages.
+- Added ``aspect`` and ``unaspect`` PokemonProperty arguments (which also includes commands such as /pokemonedit, /spawnpokemon, and /givepokemon) to allow forcing or un-forcing an aspect on a Pokémon.
+- Added ``type`` alternatively ``elemental_type`` PokemonProperty argument, this is only used for filtering and is not applied to Pokémon. Example ``type=fire`` would be true for Charmander but false for Squirtle.
+- Added support for Double Battles, Triple Battles, and Multi-battles. 
+- Adjusted Pokémon sendout positions for single battles.
+- Wild Pokémon interaction range increased to 12 blocks (from 10 blocks)
+- Player trade range increased to 12 blocks (from 10 blocks)
+- PvP battle range increased to 32 blocks (from 10 blocks)
+- Spectate range increased to 64 blocks (from 10 blocks)
+
+### Developer
+- SpawnCause is now an implementation of SpawningInfluence.
+- Added "forcedAspects" to Pokemon to make it easier to easily add basic aspects to a Pokémon in a way that persists. We already know that everyone is going to overuse this.
+- Made the Pokemon.aspects setter private. This could technically break sidemods but if you are affected by this then you were using it wrong! Use Pokemon.forcedAspects to fix it.
+- Many types related to ``Pokemon`` including itself now have dedicated ``Codec``, please migrate to them from the NBT/JSON/PacketBuffer write/read methods.
+- ``TeraTypes`` now implements ``Iterable``.
+
+## [1.5.3](#1-5-3)
+### Fixes
+- Scaled down Amaura's fetus model to avoid clipping through the tank while animating
+- Fixed Cubone's cry not having a sound.
+- Fixed the Seafloor spawning context not being a usable context.
+- Fixed Pokemon spawning in non-full blocks like slabs.
+- Fixed Gilded Chests not dropping the chest itself when broken, only the contents.
+- Fixed Pokémon losing their Hidden Ability through evolution if the middle stage did not have a Hidden Ability.
+- Hidden Power no longer plays the water type action effect. (It now plays the normal type action effect.)
+- Fixed Chimchar and Monferno T posing whenever they sleep.
+- Fixed the Magby line not having any placeholder walk animations.
+- Fixed Duskull and Dusclops using skylight levels for their nether spawn data. There is no sun in the Nether!
+- Fixed Hisuian Zoroark using base Zoroark stats. 
+- Fixed Bellossom clipping into the player head when shoulder mounted.
+- Fixed Shroomish's look range to prevent it from looking higher than it should. 
+- Fixed Crumbling Arch not blending in with the world.
+- Fixed Energy Root applying being usable on a fainted Pokemon.
+- Fixed Pokémon entity not spawning when starting a battle while recalling said Pokémon
+- Fixed species comparison not using namespace for both sides in PokemonProperties.isSubsetOf.
+- Fixed PokemonProperties#asString prefixing nicknames with a '$'
+- Fixed PC not saving when Pokemon was changed outside.
+- Fixed shearble Pokemon not dropping correct wool colors.
+- Fixed pasture spawning Pokemon inside solid blocks when closest spawning position is blocked off.
+- Fixed Tumbling Down advancement not being granted by tumblestone variants.
+- Improve error handling when loading spawn-sets to ensure invalid configurations don't crash the server
+- Fixed empty JsonPlayerData files resulting in players being unable to join server/world
+
+### Additions
+- Added extra visuals to early berry growth stages
+- Hidden Power now displays its effective typing.
 - Moves impacted by the abilities Pixelate, Refrigerate, Aerilate, Galvanize, and Normalize now display as their altered typing.
 - Added Polished Tumblestone and Tumblestone Brick block sets from Tumblestone, Black Tumblestone, and Sky Tumblestone.
 - Added Metronome, Protective Pads, Punching Glove, Room Service, Scope Lens, Shed Shell, Terrain Extender, Throat Spray, Utility Umbrella, Wide Lens, and Zoom Lens held items
-- Added particles for moves: Watersport, Mud Sport, and Psychic.
-- Added Fire, Water, Thunder, Leaf, Ice, Sun, Moon, Shiny, Dawn, and Dusk Stone storage blocks.
-- Added Eject Pack, Metronome, Protective Pads, Punching Glove, Room Service, Scope Lens, Shed Shell, Terrain Extender, Throat Spray, Utility Umbrella, Wide Lens, and Zoom Lens held items
-- Added `stonjourner_henge_ruins`, `luna_henge_ruins`, and `sol_henge_ruins` structures.
-- Added a `battleInvulnerability` gamerule to make players invulnerable to any damage during a battle.
-- Added a `mobTargetInBattle` gamerule to exclude players from being targeted by mobs during a battle.
-- Added battle log messages for switching out Pokémon.
-- Added Evolution particles and sounds for Pokémon that are sent out when evolution is started.
-- Added a Nurse profession that can be unlocked by having villagers claim a healing machine block.
-- Added Pokémon Centers to all 5 village types.
-- Added a `natural` block state property for the healing machine block; when property is set to true, the block will have a different texture and drop an iron ingot instead of itself.
-- New config setting `displayEntityNameLabel` and `displayEntityLabelsWhenCrouchingOnly` to control what and when is displayed for the pokemon label
-- `/freezepokemon` command to pause a Pokémon's animation at a specific point in time.
-- Added `no_ai` and `freeze_frame` options to the `/spawnpokemon` command.
-- Added shiny Pokémon effects.
-- Added effects for the burn status effect.
-- Added effects for the moves: Psychic, Water Sport, and Mud Sport.
-- Added a new universal locator called `top`.
-- Added `moves` option to Pokémon properties, allowing you to set the moves of a Pokémon in commands and spawn files using comma-separated move names.
-- Added shiny Pokémon effects.
-- Added effects for the burn status effect.
-- Added effects for the moves: Seismic Toss, Withdraw, Bite, Crunch, Super Fang, Hyper Fang, Pursuit, Mist, Haze, Lick, Kinesis, Psychic, Water Sport, and Mud Sport.
-- Added a new universal locator called `top`.
-- Added shiny Pokémon particles with sound effects.
-- Added animation and sounds for trading.
-- Added icons for pending trade, team-up, and battle requests from other players.
-- Added `/spawnnpc` and `/spawnnpcat` commands.
-- Pokémon are now animated when seen in any GUI that isn't the party GUI.
-- Quirk animations can now occur for Pokémon that are shoulder mounted.
-- Added `fishing boat` structures that contain an Explorer Map leading to a shipwreck cove and a Poké Rod Smithing Template.
-- Added `submerged_shipwreck_cove` and `lush_shipwreck_cove` structures.
-- Added new sounds for Poké Balls bouncing off of Pokémon and landing on the ground during capture.
-- Added a unique set of sounds for Ancient Poké Balls.
-- Added a sound for using Exp Candy and Rare Candy items.
-- Added raft platforms for non-swimming, non-flying Pokémon to stand on during battles that take place on the water's surface. (Flying Pokémon will fly over water in battle, and water breathing Pokémon will swim in water during battle.)
+
+### Added cries to the following Pokémon
+- Timburr, Gurdurr, Conkeldurr
+- Golett, Golurk
+
+### Changes
+- Altered the item model for Medicinal Leeks and Roasted Leeks to be held like sticks and other rod items. 
+- Adjusted some berry balance values like yield and growth times
+- Changes to mulch buffs/durations
+- Dreepy is now shoulder mountable
+- Link Cable recipe has been redesigned
+- Updated potion sprites
+- Weedle, Caterpie, Spearow, Smoochum, Mew, Murkrow, Larvitar, Taillow, Plusle, Minun, Beldum, Starly, Buneary, Combee, Pachirisu, Pidove, Petilil, Hisui Bias Petilil, Zorua, Hisuian Zorua, Elgyem, Fletchling, Skrelp, Klefki, Fomantis, Morelull, Dreepy, Shroodle, Tatsugiri, Glimmet, and Roaming Gimmighoul are now shoulder mountable
+- Chikorita's ability to look around removed due to the awkwardness of it.
+- Link Cable recipe has been redesigned
+- Updated potion sprites
+- Removed the interchangeable evolution results for the first stage Hisuian starters to prevent confusion. The method still exists for stage 2 to 3, but stage 1 to 2 was not distinguishable enough for many users. 
 
 ### Pokémon Added
-#### Gen 1
-- Alola Bias Cubone
-- Alolan Marowak
-
 #### Gen 2
 - Ledyba
 - Ledian
@@ -65,432 +87,21 @@
 - Sunflora
 - Wobbuffet
 - Girafarig
-- Corsola
-- Remoraid
-- Octillery
-- Mantine
-- Smeargle
 
 #### Gen 3
-- Slakoth
-- Vigoroth
-- Slaking
-- Corphish
-- Crawdaunt
-- Feebas
-- Milotic
 - Wynaut
-- Absol
-- Spheal
-- Sealeo
-- Walrein
-- Bagon
-- Shelgon
-- Salamence
-- Kecleon
-
-#### Gen 4
-- Mantyke
-- Finneon
-- Lumineon
-- Shellos
-- Gastrodon
-- Rotom
-
-#### Gen 5
-- Purrloin
-- Liepard
-- Scraggy
-- Scrafty
-
-#### Gen 6
-- Clauncher
-- Clawitzer
-
-#### Gen 7
-- Pikipek
-- Trumbeak
-- Toucannon
-- Mareanie
-- Toxapex
-- Sandygast
-- Palossand
-- Bruxish
-
-#### Gen 8
-- Cramorant
-- Hatenna
-- Hattrem
-- Hatterene
-- Pincurchin
 
 #### Gen 9
-- Wattrel
-- Kilowattrel
-- Wiglett
-- Wugtrio
-- Flamigo
-- Veluza
 - Farigiraf
-- Klawf
-- Finizen
-- Palafin
-- Wiglett
-- Wugtrio
-- Flamigo
-- Dondozo
-
-#### Unique Forms
-- Magikarp Jump Variants
-- Gyarados Jump Variants
-
-### Added cries to the following Pokémon
-- Sandshrew, Sandslash
-- Magnemite, Magneton, Magnezone
-- Gastly, Haunter, Gengar
-- Rhyhorn, Rhydon, Rhyperior
-- Happiny, Chansey
-- Horsea, Seadra, Kingdra
-- Magby, Magmar, Magmortar
-- Porygon, Porygon2, Porygon-Z
-- Sentret, Furret
-- Misdreavus, Mismagius
-- Corsola
-- Mantyke, Mantine
-- Girafarig, Farigiraf
-- Wynaut, Wobbuffet
-- Lunatone
-- Solrock
-- Corphish, Crawdaunt
-- Feebas, Milotic
-- Kecleon
-- Absol
-- Spheal, Sealeo, Walrein
-- Relicanth
-- Bagon, Shelgon, Salamence
-- Munchlax
-- Finneon, Lumineon
-- Purrloin, Liepard
-- Timburr, Gurdurr, Conkeldurr
-- Joltik, Galvantula
-- Elgyem, Beheeyem
-- Golett, Golurk
-- Deino, Zweilous, Hydreigon
-- Flabébé, Floette, Florges
-- Clauncher, Clawitzer
-- Mareanie, Toxapex
-- Wimpod, Golisopod
-- Bruxish
-- Hatenna, Hattrem, Hatterene
-- Pincurchin
-- Klawf
-- Finizen, Palafin \[Zero\], Palafin \[Hero\]
-- Dondozo
-
-### Added shoulder mounts for the following Pokémon
-- Weedle
-- Caterpie
-- Spearow
-- Mew
-- Murkrow
-- Smoochum
-- Larvitar
-- Tailow
-- Plusle
-- Minun
-- Beldum
-- Starly
-- Buneary
-- Combee
-- Pachirisu
-- Tepig
-- Pidove
-- Petilil, Hisui Bias Petilil
-- Zorua, Hisui Bias Zorua
-- Elgyem
-- Fletchling
-- Skrelp
-- Klefki
-- Litten
-- Fomantis
-- Morelull
-- Dreepy
-- Sprigatito
-- Shroodle
-- Tatsugiri
-- Glimmet
-- Gimmighoul \[Roaming\]
-
-### Animation updates for the following Pokémon
-- Bellsprout, Weepinbell, Victreebel
-- Shellder, Cloyster
-- Porygon, Porygon2, Porygon-Z
-- Furret
-- Swinub, Piloswine, Mamoswine
-- Skarmory
-- Tyrogue
-- Spinda
-- Torkoal
-- Nincada, Ninjask
-- Lunatone
-- Solrock
-- Buneary, Lopunny
-- Magnezone
-- Alomomola
-- Tepig, Pignite, Emboar
-- Flabebe, Floette, Florges
-- Litten, Torracat, Incineroar
-- Fomantis, Lurantis
-- Dreepy, Drakloak
-- Kleavor
-- Scorbunny
-- Gimmighoul \[Roaming\]
-
-### Model updates for the following Pokémon
-- Bulbasaur, Ivysaur, Venusaur
-- Charmander, Charmeleon, Charizard
-- Kakuna, Beedrill
-- Lapras
-- Porygon, Porygon2, Porygon-Z
-- Igglybuff, Jigglypuff, Wigglytuff
-- Poliwhirl, Poliwrath
-- Bellsprout, Weepinbell, Victreebel
-- Shellder, Cloyster
-- Gastly, Haunter
-- Onix
-- Krabby, Kingler
-- Rhyhorn, Rhydon, Rhyperior
-- Horsea, Seadra, Kingdra
-- Goldeen, Seaking
-- Magby, Magmar, Magmortar
-- Magikarp, Gyarados
-- Munchlax, Snorlax
-- Swinub, Piloswine, Mamoswine
-- Mudkip, Marshtomp, Swampert
-- Baltoy, Claydol
-- Carvanha
-- Relicanth
-- Prinplup, Empoleon
-- Gible, Gabite, Garchomp
-- Riolu, Lucario
-- Snivy, Servine, Serperior
-- Tepig, Pignite, Emboar
-- Krookodile
-- Dwebble, Crustle
-- Joltik, Galvantula
-- Klink, Klang, Klinglang
-- Golett, Golurk
-- Fennekin, Braixen, Delphox
-- Phantump, Trevenant
-- Litten, Torracat, Incineroar
-- Popplio, Brionne, Primarina
-- Lurantis
-- Scorbunny, Cinderace
-- Quaxly
-- Tatsugiri
 
 ### Changes
-- Buffed Dusk Ball catch multipliers: Increased multiplier to 3.5 (from 3.0) in light level 0. Increased multiplier to 3.0 (from 1.5) in light levels 1-7.
-- Altered the item model for Medicinal Leeks and Roasted Leeks to be held like sticks and other rod items.
-- Adjusted some berry balance values like yield and growth times.
-- Adjusted volumes of sounds made by Display Cases, Berry Bushes, Energy Root, Medicinal Leek, Vivichoke, Mints, Revival Herbs and Gilded Chests.
-- Changes to mulch buffs/durations.
-- Updated potion sprites.
-- Link Cable recipe has been redesigned.
-- Updated sounds for Medicinal Leeks, Big Roots, Energy Roots and Revival Herbs.
-- Updated UI sounds for clicking and evolving Pokémon.
-- Updated cries for Chansey, Crobat, Hoothoot, Noctowl.
-- Removed the interchangeable evolution results for the first stage Hisuian starters to prevent confusion. The method still exists for stage 2 to 3, but stage 1 to 2 was not distinguishable enough for many users.
-- Bulbasaur, Ivysaur, Venusaur, Kakuna, Beedrill, Snorlax, Munchlax, Krabby, Kingler, Lurantis, Horsea, Seadra, Kingdra, Litten, Torracat, Incineroar, Mudkip, Marshtomp, Swampert, Scorbunny, Cinderace, Prinplup, Empoleon, Relicanth, Goldeen, Seaking, Shellder, Cloyster, Tatsugiri, Igglybuff, Jigglypuff, Wigglytuff, Krookodile, Gible, Gabite, Garchomp, Rhyhorn, Rhydon, Rhyperior, and Carvanha received model updates.
-- Vivillon wings will stop being clear when you remove any Vivillon related resourcepacks. The default pattern will be the meadow wings.
-- Adjusted Pokémon sendout positions for single battles.
-- Wild Pokémon interaction range increased to 12 blocks (from 10 blocks).
-- Player trade range increased to 12 blocks (from 10 blocks).
-- PvP battle range increased to 32 blocks (from 10 blocks).
-- Spectate range increased to 64 blocks (from 10 blocks).
-- The inventory key now closes our GUIs if they are open, mirroring how Minecraft screens usually work.
-- The noise from the pasture and PC blocks being interacted with now activates Sculk sensors.
-- Updated dialogue GUI assets with proper assets.
-- Updated party switching interface when in battle.
-- Relic coin pouches can now be waterlogged.
-- Pokémon name and level labels are now only visible when crouching by default. Set the `displayEntityLabelsWhenCrouchingOnly` config to `false` to always have them displayed.
-- The "Press R to start battle prompt" will now disappear after a player's first battle has been won.
-- The default number of digits for the Pokédex number in the summary has been increased, from 3 to 4.
-- The pasture block model's screen is now off by default.
-- The Poké Balls creative tab is now named Utility Items as it also encompasses Poké Rod and Pokédex items.
-- Moves can now be benched without specifying a replacement move, allowing for empty move slots.
-- Moves learned via Sketch now persist after battle.
-- Updated potion sprites
-- Removed the interchangeable evolution results for the first stage Hisuian starters to prevent confusion. The method still exists for stage 2 to 3, but stage 1 to 2 was not distinguishable enough for many users.
-- Hidden Power now displays its effective typing.
-- Updated particles for moves: Confusion, Protect, Sand Attack, and Quick Attack.
-- Updated particles for status effects: Paralysis, Poison, and Sleep.
-- Updated particles on Gastly.
-- Revamped stat buff and de-buff particles.
-- Improved the performance of display cases that contain Pokémon photos.
-- Updated sounds for Poké Balls.
-- Updated the Poké Ball animation for Pokémon breaking out.
-- Improved the performance of display cases that contain Pokémon Model items.
-- Removed species Base Stats from the summary interface as it is now viewable within the Pokédex.
-- Changed summary tab text labels to icons.
-- Clicking the summary interface exit button while the swap moves or evolve screen is open will cause the interface to switch back to the party screen. The button will exit the interface otherwise.
-- Ancient Poke Balls now jump once rather than shaking 3 times when capturing Pokémon.
-  - The jump height indicate the number of shakes that would have occurred.
-    - A high wobbly jump indicates 1 shake.
-    - A high jump indicates 2 shakes.
-    - A medium jump indicates 3 shakes.
-    - A short jump indicates that you caught the Pokémon.
-- Pokémon sent out during battle will spawn facing their opponent.
-- Pokémon sent out outside a battle will spawn facing their trainer.
-
-### Fixes
-- Fixed Ability Patches not reverting Hidden Abilities back to Normal Abilities.
-- Fixed awarding Pokémon experience upon forfeiting battles.
-- Scaled down Amaura's fetus model to avoid clipping through the tank while animating.
-- Fixed Cubone's cry not having a sound.
-- Fixed the sendout sound erroneously playing when a wild Pokémon breaks out of a Poké ball.
-- Flamethrower is no longer missing sounds.
-- Fixed the Seafloor spawning context not being a usable context.
-- Fixed Pokemon spawning in non-full blocks like slabs.
-- Fixed Gilded Chests not dropping the chest itself when broken, only the contents.
-- Fixed Pokémon losing their Hidden Ability through evolution if the middle stage did not have a Hidden Ability.
-- Hidden Power no longer plays the water type action effect (It now plays the normal type action effect).
-- Fixed Chimchar and Monferno T-posing whenever they sleep.
-- Fixed Cetitan's cry breaking its walk and sleep animations. 
-- Fixed Crumbling Arch not blending in with the world.
-- Fixed Energy Root applying being usable on a fainted Pokémon.
-- Fixed Pokémon entity not spawning when starting a battle while recalling said Pokémon.
-- Fixed species comparison not using namespace for both sides in `PokemonProperties.isSubsetOf`.
-- Fixed `PokemonProperties#asString` prefixing nicknames with a '$'.
-- Fixed PC not saving when Pokémon was changed outside.
-- Fixed shearable Pokémon not dropping correct wool colors.
-- Fixed pasture spawning Pokémon inside solid blocks when closest spawning position is blocked off.
-- Fixed Tumbling Down advancement not being granted by tumblestone variants.
-- Improve error handling when loading spawn sets to ensure invalid configurations don't crash the server.
-- Fixed empty `JsonPlayerData` files resulting in players being unable to join server/world.
-- Evolution notification and UI sound is now correctly playing (again).
-- Fix Starter prompt not showing up.
-- Fix evolution now granting Pokédex entries.
-- Fix Pokédex crash when a form is looked up without ever seeing the "normal" form.
-- Fixed owned poké balls floating upwards if pausing mid-transition.
-- Fixed all mouse buttons working for Battle UI navigation (now it's only primary/left click).
-- Fixed trading Pokémon setting their friendship to 0 instead of the base value.
-- Fixed a scenario where a Pokémon that rolled to spawn with a special Tera type sometimes has a Tera type that is already a part of their natural typing.
-- Fixed PokemonProperty argument suggestions for `tera` and `tera_type` not suggesting `stellar`.
-- Fixed being able to stack Relic Coin Pouches on top of each other.
-- Fixed Model loader generating misleading crash-reports when client is crashing.
-- Big Roots and Energy Roots now share the same sounds as intended.
-- Fixed sounds made by blocks playing at a lower pitch than intended.
-- Fixed Chimchar and Monferno T posing whenever they sleep.
-- Fixed the Magby line not having any placeholder walk animations.
-- Fixed Duskull and Dusclops using skylight levels for their nether spawn data. There is no sun in the Nether!
-- Fixed Hisuian Zoroark using base Zoroark stats.
-- Fixed Bellossom clipping into the player head when shoulder mounted.
-- Fixed Shroomish's look range to prevent it from looking higher than it should.
-- Fixed Maushold's faint animations not playing. It's sadder than Tandemaus!
-- Fixed Slowking's battle idle.
-- Fixed Grafaiai's walk speed to prevent model sliding.
-- Fixed Maushold's faint animations not playing. It's sadder than Tandemaus! 
-- Fixed Slowking's battle idle. 
-- Fixed Grafaiai's walk speed to prevent model sliding. 
-- Fixed Alolan Exeggutor's tail not showing in the party UI. It will now also stand in front of all Pokémon in the party menu :)
-- Fixed Timburr duplicating its log while fainting.
-- Fixed hitbox sizes for Grotle and Torterra being set to default values.
-- Fixed reviving items throwing an exception when used in battle.
-- Fixed messages for Focus Sash, Confusion, Mummy, Ice Face, Own Tempo, and Revive.
-- Improve error handling when loading spawn-sets to ensure invalid configurations don't crash the server.
-- Fixed `crumbling_arch_ruins` from generating a giant cube of air and removed the chest.
-- Fixed possible crash on large population servers due to concurrent access of data.
-- Quickly sending out and recalling Pokémon now looks smoother and can no longer be spammed to cause desync issues.
-- Pokémon are now invulnerable during sendout animation and intangible during recall animation.
-- Pokémon are now invincible during sendout animation and intangible during recall animation.
-- Scrolling with party keybinding now behaves properly when using high scroll speed or scroll sensitivity.
-- Fixed battle log GUI flashing when Battle GUI is opened.
-- Bag Items used during a turn will now be refunded if the battle ends before the next turn begins.
-- Pokémon whose current owner is not its Original Trainer now gains extra experience.
-- Fixed Fossil Resurrection advancement not being granted.
-- Fixed village generation caps not applying for berry farms. You were not meant to see more than two berry farms per village!
-- Fixed the Ice Face ability activation being displayed incorrectly in a battle.
-- Fixed edge case of F1 and R locking you in battle with no R functionality (requiring ESC to get out).
-- Fixed Poké Ball render orientation in battle interface when capturing.
-- Fixed sync issues with recently learned moves where their PP would not go down until you logout and in.
-- Fixed some Pokémon photos in display cases flashing if the Pokémon has gender differences.
-- Fixed Bidoof and Jigglypuff sleep animations stopping after some time, causing them to be 'asleep' while T-posing menacingly.
-- Fixed entities not changing poses unless you're looking at them.
-- Fixed cries not playing on send-out if the Pokémon is off-screen.
-- Fixed text row selection highlight in battle log.
-- Fixed top black border rendering in scroll interfaces in summary UI.
-- Fixed aspect tracking for Advancements.
-- Fixed illusion not copying aspects or caught ball.
-- Delay when successfully catching a Pokémon in an Ancient Poké Ball has been increased to account for the new sounds and particles.
-- Prevent summary stats tab from making sounds when clicking on an already open tab.
-- Fixed display case not being able to be fed items from underneath.
-- Fixed Pokémon battling in water continuously sinking to the bottom.
+- Kakuna, Beedrill, Snorlax, Munchlax, and Lurantis received model updates
 
 ### Developer
-- `SpawnCause` is now an implementation of `SpawningInfluence`.
-- Many types related to `Pokemon` including itself now have dedicated `Codec`, please migrate to them from the NBT/JSON/PacketBuffer write/read methods.
-- `TeraTypes` now implements `Iterable`.
-- `PokemonBattle` now starts on turn 0.
-- SpawnCause is now an implementation of SpawningInfluence.
-- Renamed Pokemon.hp to Pokemon.maxHealth to make it clearer. Backwards compatibility is provided but it is an active deprecation, please migrate away from it.
-- Many types related to ``Pokemon`` including itself now have dedicated ``Codec``, please migrate to them from the NBT/JSON/PacketBuffer write/read methods.
-- Serialization of PokemonStores and Pokemon themselves now require registry access, which will break some sidemods. This sucked for us more than it will suck for you! If you have a world or player instance, you can get it from there.
-- ``TeraTypes`` now implements ``Iterable``.
-- PokemonBattle now starts on turn 0.
-- Added `forcedAspects` to Pokémon to make it easier to easily add basic aspects to a Pokémon in a way that persists. We already know that everyone is going to overuse this.
-- Made the `Pokemon.aspects` setter private. This could technically break side-mods but if you are affected by this then you were using it wrong! Use `Pokemon.forcedAspects` to fix it.
-- Cobblemon's main logger is properly static now.
-- PokemonEntity.enablePoseTypeRecalculation can be used to disable automatic pose type recalculation.
-- Added CollectEggEvent and HatchEggEvent for compatibility usage.
-- Added events for:
-  - Showdown Instructions
-  - Mega Showdown Instruction
-  - Terastallize Showdown Instruction
-  - ZPower Showdown Instruction
-  - Bait Consumed, Bait Set, and an event to register custom BaitEffect Functions
-  - Bobber Bucket Chosen
-  - Bobber Spawn Pokémon
-  - Pokérod Cast
-  - Pokérod Reel
-  - Pokémon Heal (with context)
-    - Added HealingSource, an interface applied to all sources of healing from player actions, for easier tracking of healing sources.
-  - Move Change
-  - Shiny Chance Calculation Event (with player context)
-- Rebuilt large swaths of the model animation code to simplify it.
-- Renamed a bunch of things from %Poseable% to %Posable% because spelling.
-- Renamed StatelessAnimation to PoseAnimation.
-- Renamed StatefulAnimation to ActiveAnimation.
-- Documented the animation system.
-- Allowed for SpawnSnowstormEntityParticleHandler to handle non-posable entities (due to being non-posable, locators are useless, to set the offset use the settings in the particle itself)
 
 ### Data Pack & Resource Pack Creators
 - Added support for "shedders" similar to Shedinja's evolution logic.
-- Fixed the placeholder `WingFlapIdle` animation so the wings are not rotating opposite to each other.
-- 'player' type dialogue faces can now be explicitly stated so that NPC mods that use fake players can show in dialogue portraits.
-- Added `isLeftSide` field for dialogue faces. This determines what side of dialogue box the portrait is on.
-- "sounds/attacks" folder has been renamed to "sounds/move"
-- Moves sharing generic sounds now have unique sound events, allowing them to be changed with resource packs.
-- All move sound events have been renamed to "move.NAME.SOURCE" for consistency.
-- Status moves have been moved out of the 'attacks' folder and split into volatile and nonvolatile.
-- 'status.badlypoison.actor' sound event has been renamed to "status.toxpoison.actor"
-- Mulch and berry harvesting sound events have been renamed and moved to their respective folders in "sounds/block."
-- All sounds related to evolving Pokémon have been moved to the "sounds/evolution" folder.
-- Sound events for all blocks now start with "block."
-- Gimmighoul chest and item interaction sounds have been moved to where its cry is.
-- Unused sound files and sound events have been removed.
-- Poké Ball sounds are now in their animation files, making them more flexible to edit.
-- Added MoLang compatibility in the isVisible property for transformed parts.
-- Added q.has_aspect('some_aspect') function to animations, posers, and entity particle effects.
-- Added support for conditional pose animations.
-- Added a new universal locator called "top".
-- Added `eggs_collected` and `eggs_hatched` Advancement triggers.
-
-### Localization
-- Updated translations for:
-  - Czech, German, Greek, Spanish, Mexican Spanish, French, Canadian French, Hungarian, Italian, Japanese, Korean, Dutch, Polish, Portuguese, Brazilian Portuguese, Russian, Ukrainian, Simplified Chinese, and Traditional Chinese
-- Migrated translation project to Weblate at https://lang.cobblemon.com/projects/cobblemon/mod/
-
+- Fixed the placeholder WingFlapIdle animation so the wings are not rotating opposite to each other.
 
 ## [1.5.2 (May 27th, 2024)](#1-5-2)
 ### Fixes
@@ -528,7 +139,7 @@
 ### Changes
 - Sounds for Relic Coin Sacks have been correctly renamed. Relic Coin Pouches received new sounds for breaking and placing.
 - Readjusted Petilil portraits so they fit a bit better.
-- Improved handling of Pokémon taken from the Restoration Tank block to be a bit more stable.
+- Improved handling of Pokémon taken from the Restoration Tank block to be a bit more stable. 
 - Made Mulch cheaper to craft.
 
 ### Fixes
@@ -540,19 +151,19 @@
 - Fixed Supplementaries incompatibility.
 - Fixed Fossil Compartment crash with Jade / WAILA forks.
 - Fixed pasture block PC lookups when the player is offline.
-- Fixed an untranslated battle message that occurs when using a move that just ran out of PP (e.g. Fire Blast that just got spited mid-turn).
+- Fixed an untranslated battle message that occurs when using a move that just ran out of PP (e.g. Fire Blast that just got spited mid-turn). 
 - Fixed held items being eaten even when the held item evolutions are already unlocked.
 - Fixed Hisuian Decidueye not being Grass/Fighting.
 - Fixed both Decidueye forms learning both Triple Arrows and Spirit Shackle.
 - Fixed Pineco being unable to evolve into Shulker Forretress.
-- Fixed Kabutops T-posing when underwater. It doesn't have proper swimming animations yet, though.
+- Fixed Kabutops T-posing when underwater. It doesn't have proper swimming animations yet, though. 
 - Fixed Pidgey's missing walk animation.
 - Fixed Cyndaquil's hidden flames clipping if it was swimming.
 - Fixed Chimecho and Chingling being unable to spawn near bells. They are meant to!
 - Fixed Tyrantrum and Wailord Party Overlay models peeking through the chat box. It was kinda funny though.
 - Fixed hitbox sizes for Seedot, Nuzleaf, and Shiftry.
-- Fixed Budew and Lechonk sliding if they walked for too long.
-- Fixed Shedinja T-posing in battle.
+- Fixed Budew and Lechonk sliding if they walked for too long. 
+- Fixed Shedinja T-posing in battle. 
 - Fixed recoil evolution condition not working, making things like Basculegion unobtainable.
 - Fixed issue where poser debug tools didn't work on JSON posers.
 - Fixed issue where gilded chests don't close when going far away.
@@ -570,7 +181,7 @@
 - Fixed generic battle effect sounds not sounding the way they were intended to.
 - Fixed particle effects often not having access to some specific entity functions from MoLang.
 - Fixed particles sometimes lasting a single tick too long, causing (very quick) visual glitches.
-- Fixed particle rotations being inverted.
+- Fixed particle rotations being inverted. 
 - Fixed particle events not spawning at the instigating particle's location.
 - Fixed a bunch of spam during world generation.
 - Fixed a bug in which throwing a Poké Ball at a player owned Pokémon with the ability Illusion would reveal its true species. Hilarious meta strategy.
@@ -589,13 +200,13 @@
 - Added parametric motion and rotation support to particle effects.
 - Added entity_scale as a molang var for particles (likely only applicable to Pokemon)
 - Added support for primary quirk animations using the following format:
-  `JSON
-  {
-    "quirks": [
-      "q.bedrock_primary_quirk('<pokemon>', '<animation>', <minSeconds>, <maxSeconds>, <loopTimes>, '<excludedLabels>', q.curve('<waveFunction>'))"
-    ]
-  }
-  `
+```JSON
+{
+  "quirks": [
+    "q.bedrock_primary_quirk('<pokemon>', '<animation>', <minSeconds>, <maxSeconds>, <loopTimes>, '<excludedLabels>', q.curve('<waveFunction>'))"
+  ]
+}
+```
 - Added support for custom stashes, similar to Gimmighoul's coin and scrap stashes.
 
 ### Localization
@@ -895,16 +506,16 @@ These are our compromise for having both regular and Hisuian forms of these Pok
 - Fixed thrown Poké Balls technically having no name.
 - Fixed very many issues with Bedrock particle effects. There are probably many more. Life goes on.
 - Fixed Arbok patterns not being as specific in spawning as they were intended to be.
-- Fixed Pokémon not avoiding danger at all when pathfinding.
+- Fixed Pokémon not avoiding danger at all when pathfinding. 
 - Fixed Pokémon pathing over snow layers and carpets.
 - Fixed the Sobble line not being able to swim or breathe underwater.
 - Fixed mod incompatibility with [Just Enough Resources](https://modrinth.com/mod/just-enough-resources-jer).
 - Fixed mod incompatibility with [Visual Overhaul](https://modrinth.com/mod/visual-overhaul).
 - Fixed an issue that allowed Pokémon to spawn on rails.
-- Fixed the data set on Pokémon when abilities are given via properties such as in `/spawnpokemon`.
+- Fixed the data set on Pokémon when abilities are given via properties such as in ``/spawnpokemon``.
 - Fixed Pokémon sometimes losing hidden abilities when evolving. This fix will only take effect for newly created Pokémon because of technical reasons that were explained to me but which I then forgot.
 - Fixed capture messages not displaying in battle.
-- Fixed the Illusion ability causing the wrong Pokémon to be targeted in battle.
+- Fixed the Illusion ability causing the wrong Pokémon to be targeted in battle. 
 - Fixed battles started with fainted party members causing a soft-lock on defeat.
 - Fixed some issues with eyes in the faint animations of Hitmonlee and Phantump
 - Fixed missing evolution moves, for example Stone Axe for Kleavor.
@@ -914,17 +525,17 @@ These are our compromise for having both regular and Hisuian forms of these Pok
 ### Developer
 - Significantly changed the way the properties in PokemonEntity work. This could break some plugins (not in a big way, but changes will be needed for some things).
 - Rebuilt the scheduling API to more clearly force side choices and temporal frames of reference for tasks. The developers say that how it works is cool but I stopped listening.
-- Added dialogue API and data registry. This is powerful, and there is a full example in the Cobblemon mod you can trigger using `/opendialogue <username> cobblemon:example`. The example JSON is inside the data folder of the mod.
+- Added dialogue API and data registry. This is powerful, and there is a full example in the Cobblemon mod you can trigger using /opendialogue \<username\> cobblemon:example. The example JSON is inside the data folder of the mod.
 - Opened up the ItemDropEntry class to allow for it to be extended.
 - Added a new "advancement" evolution variant that takes an advancement identifier and succeeds if the player has the advancement.
 - Made the spawning API capable of non-entity spawning. You can make it 'spawn' commands if you want. Go nuts.
-- Made `PokemonProperties.parse` more interoperable with Java. Save yourself and stop using Java.
-- Added the `HeldItemEvent`, this comes with 2 implementation `HeldItemEvent.Pre` and `HeldItemEvent.Post`.
-- Corrections to the ability implementation have been made that make `Ability.forced` function as intended and never reroll an ability for a Pokémon, please check your implementations to ensure the corrected behavior is intended for your use case.
-- `Pokemon.ability` no longer has a public setter. Please migrate to using `Pokemon#updateAbility`, this handles the ability coordinate storage for you when necessary.
-- `Ability.forced`, `Ability.index` and `Ability.priority` have all had their setters internalized, there is no longer any need to manually adjust these migrate to the method mentioned above to handle that process for you.
-- `AbilityChanger` has been added to API alongside some implementations, this is subject to change as the ability capsule and patch currently only expect the traditional behaviour in the Pokémon games of 1 or 2 regular abilities and 1 hidden ability.
-- `Pokemon#rollAbility` has been added which re9rolls for a legal ability for the Pokémon.
+- Made PokemonProperties.parse more interoperable with Java. Save yourself and stop using Java.
+- Added the ``HeldItemEvent``, this comes with 2 implementation ``HeldItemEvent.Pre`` and ``HeldItemEvent.Post``. 
+- Corrections to the ability implementation have been made that make ``Ability.forced`` function as intended and never reroll an ability for a Pokémon, please check your implementations to ensure the corrected behavior is intended for your use case.
+- ``Pokemon.ability`` no longer has a public setter. Please migrate to using ``Pokemon#updateAbility``, this handles the ability coordinate storage for you when necessary.
+- ``Ability.forced``, ``Ability.index`` and ``Ability.priority`` have all had their setters internalized, there is no longer any need to manually adjust these migrate to the method mentioned above to handle that process for you.
+- ``AbilityChanger`` has been added to API alongside some implementations, this is subject to change as the ability capsule and patch currently only expect the traditional behaviour in the Pokémon games of 1 or 2 regular abilities and 1 hidden ability.
+- ``Pokemon#rollAbility`` has been added which rerolls for a legal ability for the Pokémon.
 - `docs/cobblemon-tags` tags and spawn-presets can now be auto-generated from the current tags in the Cobblemon mod with the `generateSpawnPresetList.py` and `generateTagList.py` scripts.
 - `public_spawns_to_json.py` script has been added to give the powerful spawn.json generator a simplistic UI.
 - Updated Showdown with Gen 9 DLC.
@@ -933,14 +544,14 @@ These are our compromise for having both regular and Hisuian forms of these Pok
 ### Datapack & Resourcepack Creators
 - The maximum amount of fossils that can fit in the Fossil Analyzer can be adjusted in the config.
 - Custom fossils can be defined using a list of items and the resulting Pokémon. An example of `aerodactyl.json`:
-  `JSON
-  {
-    "result": "aerodactyl",
-    "fossils": [
-      "cobblemon:old_amber_fossil"
-    ]
-  }
-  `
+```JSON
+{
+  "result": "aerodactyl",
+  "fossils": [
+    "cobblemon:old_amber_fossil"
+  ]
+}
+```
 - Fetus models can be defined in `bedrock/fossils`.
 - Fetus textures can be defined in `textures/fossils`.
 - Fuel for the Restoration Machine is registered inside the `natural_materials` folder. To register more fuels, create a JSON file containing an array of objects. Each object supports the following fields:
@@ -949,22 +560,22 @@ These are our compromise for having both regular and Hisuian forms of these Pok
   - `returnItem`: Identifier of an item to return to the player after consumption.
 - Added 3 new item tags: `ancient_poke_balls`, `fossils`, and `tumblestones`.
 - Added a spawn rules system to modify general spawning behaviour, see the [wiki](https://wiki.cobblemon.com/index.php/Spawn_Rules) for more information.
-- Added dialogue datapack folder and `/opendialogue` command.
-- Added the item tag `cobblemon:held/leaves_leftovers` this can be used to flag apple-like items that can create leftovers when eaten.
+- Added dialogue datapack folder and /opendialogue command.
+- Added the item tag ``cobblemon:held/leaves_leftovers`` this can be used to flag apple-like items that can create leftovers when eaten.
 - You can now add support for dynamic lighting implementations, Cobblemon ships with a default implementation for [LambDynamicLights](https://modrinth.com/mod/lambdynamiclights) and the [Dynamic Lights Reforged](https://www.curseforge.com/minecraft/mc-mods/dynamiclights-reforged), add the following to any species or form:
-  `JSON
-  {
-    "lightingData": {
-      "lightLevel": 14,
-      "_lightLevelCommentRemoveMe": "Above supports 0 to 15",
-      "liquidGlowMode": "LAND",
-      "_liquidGlowModeCommentRemoveMe": "Above supports LAND, UNDERWATER or BOTH"
-    }
+```JSON
+{
+  "lightingData": {
+    "lightLevel": 14,
+    "_lightLevelCommentRemoveMe": "Above supports 0 to 15",
+    "liquidGlowMode": "LAND",
+    "_liquidGlowModeCommentRemoveMe": "Above supports LAND, UNDERWATER or BOTH"
   }
-  `
-- Following up on this change `light_source` was removed as a possible shoulder effect due to becoming unnecessary and never having had a default implementation.
-- Added the item tag `cobblemon:ability_changers`, contains the `cobblemon:ability_capsule` & `cobblemon:ability_patch` by default.
-- Added the item tag `cobblemon:held/is_friendship_booster`, allows items to give the Soothe Bell effect of a boost of 1.5x Friendship gained, contains `cobblemon:soothe_bell` by default.
+}
+```
+- Following up on this change ``light_source`` was removed as a possible shoulder effect due to becoming unnecessary and never having had a default implementation.
+- Added the item tag ``cobblemon:ability_changers``, contains the ``cobblemon:ability_capsule`` & ``cobblemon:ability_patch`` by default.
+- Added the item tag ``cobblemon:held/is_friendship_booster``, allows items to give the Soothe Bell effect of a boost of 1.5x Friendship gained, contains ``cobblemon:soothe_bell`` by default.
 
 ## [1.4.1 (December 23rd, 2023)](#1-4-1)
 
@@ -980,7 +591,7 @@ These are our compromise for having both regular and Hisuian forms of these Pok
 - Mooshtank can now be milked with a bowl for Mushroom Stew.
 - Updated Showdown version to use generation 9 battle data.
 - Added cries to Beldum, Metang and Metagross.
-- Added a `/bedrockparticle` command to run Snowstorm-format particle effects.
+- Added a /bedrockparticle command to run Snowstorm-format particle effects.
 - Added data for Dipplin, Fezandipiti, Munkidori, Ogerpon, Okidogi, Poltchageist and Sinistcha.
 - Added additional nickname trigger "Grumm" for Inkay's evolution.
 
@@ -1048,7 +659,7 @@ These are our compromise for having both regular and Hisuian forms of these Pok
 - Fixed an exploit that could convert a single piece of Blaze Powder into an extra Medicinal Brew on the Forge version.
 - Fixed an issue where health percentages would show incorrectly after healing
 - Fixed the move Revival Blessing not allowing you to select from fainted party members.
-- Fixed villagers not being able to pick up and plant mint seeds, vivichoke seeds, and revival herbs.
+- Fixed villagers not being able to pick up and plant mint seeds, vivichoke seeds, and revival herbs. 
 - Fixed Exeggcute faint.
 - Fixed various spawn configuration issues across the board.
 - Fixed a possible visual duplication of sent out Pokémon.
@@ -1068,7 +679,7 @@ These are our compromise for having both regular and Hisuian forms of these Pok
 ### Developer
 - Fixed the `SpawnEvent` not respecting usage of `Cancelable#cancel`.
 - Added the `EvolutionTestedEvent`, this allows listening and overriding the final result of evolution requirement tests.
-- Rebuilt the scheduling API to more clearly force side choices and allow more local temporal frames of reference for tasks.
+- Rebuilt the scheduling API to more clearly force side choices and allow more local temporal frames of reference for tasks. 
 - Added utility script that can be used to generate all Spawn JSONS for all pokemon from the spawning spreadsheet in 1 click ([cobblemon_spawn_csv_to_json.py](utilityscripts%2Fcobblemon_spawn_csv_to_json.py)).
 - The `HeldItemManager` has a new method `shouldConsumeItem`, this will return false by default to prevent breaking changes, see the documentation and update your implementations as needed.
 - Added and implemented minSkyLight and maxSkyLight as config options for SpawnConditions
@@ -1094,7 +705,7 @@ These are our compromise for having both regular and Hisuian forms of these Pok
   - Dutch
   - Ukrainian
   - Russian
-
+  
 Thank you so much to all of our community translators that bring the mod to the rest of the world!
 
 ## [1.4.0 - The Friends and Farms Update (October 13th, 2023)](#1-4-0)
@@ -1473,7 +1084,7 @@ Thank you so much to all of our community translators that bring the mod to the
 - Fixed apricorn tree leaves looking gross on the Fast graphics mode.
 - Fixed hoes not breaking apricorn tree leaves any faster.
 - Fixed Shiftry's PC model position.
-- Fixed the `/pc` command not playing the opening sound.
+- Fixed the /pc command not playing the opening sound.
 - Fixed different forms of Pokémon not being able to appear as different sizes.
 - Fixed the Healing Machine soft locking you from using others when removed by non-players.
 - Fixed animations being sped up when using the Replay Mod.
@@ -1490,11 +1101,11 @@ Thank you so much to all of our community translators that bring the mod to the
 - 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 because of a broken `recoil` evolution requirement.
-- Fixed Primeape, Qwilfish and Stantler not being able to evolve because of a broken `use_move` evolution requirement.
-- Fixed Bramblin, Pawmo, and Rellor not being able to evolve because of a broken `blocks_traveled` evolution requirement.
+- 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 because of a broken ``recoil`` evolution requirement.
+- Fixed Primeape, Qwilfish and Stantler not being able to evolve because of a broken ``use_move`` evolution requirement.
+- Fixed Bramblin, Pawmo, and Rellor not being able to evolve because of a broken ``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.
 
@@ -1505,15 +1116,15 @@ Thank you so much to all of our community translators that bring the mod to the
 - 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.
 - 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 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+).
 - CobblemonShowdown updated to version 10.
 - Generation of a battle can be set in BattleFormat.
-- Pokémon now have `teraType`, `dmaxLevel`, and `gmaxFactor` properties. Gimmicks can be used during battle by adding the respective identifiers to `keyItems` in PlayerData: `key_stone`, `z_ring`, `dynamax_band`, and `tera_orb`. Dynamax is only supported in Gen 8 battles. Mega Evolution and Z-Power require custom held items to be added (e.g. an item with the path `gengarite` will allow Gengar to Mega Evolve). Currently custom Z-Crystals and Mega Stones are not supported.
+- Pokémon now have ``teraType``, ``dmaxLevel``, and ``gmaxFactor`` properties. Gimmicks can be used during battle by adding the respective identifiers to ``keyItems`` in PlayerData: ``key_stone``, ``z_ring``, ``dynamax_band``, and ``tera_orb``. Dynamax is only supported in Gen 8 battles. Mega Evolution and Z-Power require custom held items to be added (e.g. an item with the path ``gengarite`` will allow Gengar to Mega Evolve). Currently custom Z-Crystals and Mega Stones are not supported.
 
 ### 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). For example, here is the converted Pidgey asset:
-  - `json
+  - ```json
     {
       "type": "potion_effect",
       "effect": "minecraft:slow_falling",
@@ -1522,18 +1133,18 @@ Thank you so much to all of our community translators that bring the mod to the
       "showParticles": false,
       "showIcon": false
     }
-    `
-- Renamed the `walked_steps` evolution requirement to `blocks_traveled`.
+    ```
+- Renamed the ``walked_steps`` evolution requirement to ``blocks_traveled``.
 - Added support for scale in animations.
 - Added support for jump keyframes (i.e. pre and post keyframes)
 - Added structure spawning conditions
 - Added Advancement trigger for defeating Pokémon and collecting varieties of Pokémon.
 - 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 support for battle music. Sounds can be added to the `battle.pvp.default` and `battle.pvw.default` sound events.
+- Added support for battle music. Sounds can be added to the ``battle.pvp.default`` and ``battle.pvw.default`` sound events.
 - 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.
 - Cobblemon items can now all have their own tooltips via resourcepacks. To add a tooltip, 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.
-- 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.
+- 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.
 - Fixed faint animations not working properly in add-ons.
 - Fixed non-existent species in spawn pool files causing random species to spawn.
 
@@ -1551,7 +1162,7 @@ Thank you so much to all of our community translators that bring the mod to the
 - Added animations to Staryu line and Porygon line.
 - Added faint animations to Klink line.
 - Add lava surface spawn preset.
-- Added an `any` evolution requirement allowing you to define `possibilities` of other evolution requirements, for example, this allows you to create an evolution that requires the Pokémon to be shiny or a female.
+- Added an ``any`` evolution requirement allowing you to define ``possibilities`` of other evolution requirements, for example, this allows you to create an evolution that requires the Pokémon to be shiny or a female.
 - Added the `/spawnpokemonfrompool [amount]` or `/forcespawn [amount]` command to spawn Pokémon(s) in the surrounding area using the natural spawn rates/pool of that area, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.spawnpokemon` if a permission mod is present. On a successful execution of the command, the amount of Pokémon spawned will be the output.
 - Added the `/pokebox` and `/pokeboxall` commands to move Pokémon(s) to the PC from a Player's party, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.pokebox` if a permission mod is present. On a successful execution of the command the output will be the number of pokemon moved to the Player's PC.
 - Added the `/pc` command which opens up the PC UI the same way interacting with the block would, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.pc` if a permission mod is present.
@@ -1676,7 +1287,7 @@ Thank you so much to all of our community translators that bring the mod to the
 - Added support for custom Pokémon to implement 'quirks' such as blinks.
 - Added sound effect for harvesting Apricorns.
 - Added icon to summary and PC interfaces to indicated if a Pokémon is shiny.
-- Added the `/spawnpokemonat <pos> <properties>` command, the `pos` argument uses the same syntax as the Minecraft [summon](https://minecraft.fandom.com/wiki/Commands/summon) command.
+- Added the ``/spawnpokemonat <pos> <properties>`` command, the ``pos`` argument uses the same syntax as the Minecraft [summon](https://minecraft.fandom.com/wiki/Commands/summon) command.
 - Added the `/giveallpokemon` command which is definitely safe and not insane.
 - Added compatibility with Carry On by preventing the mod being able to interact with Cobblemon entities, the mod caused too many gameplay detrimental features to stay enabled.
 - Added healing to your party when you sleep in a bed.
@@ -1685,18 +1296,18 @@ Thank you so much to all of our community translators that bring the mod to the
 - Added a config option for disallowing players from damaging Pokémon by hand.
 - Apricorn seeds can now be used with the [Composter](https://minecraft.fandom.com/wiki/Composter), these have the layer increase chance of 65% like Apricorns and various Minecraft crops.
 - Added support for Pokémon species data appending making it so datapack developers no longer need to overwrite files.
-- Added an implementation of every [catch rate](https://bulbapedia.bulbagarden.net/wiki/Catch_rate) from generation 1 to 9, these can be used by changing the `captureCalculator` config value:
-  - `generation_1` Sets the calculator to the generation 1 implementation.
-  - `generation_2` Sets the calculator to the generation 2 implementation.
-  - `generation_2_fixed` Sets the calculator to the generation 2 implementation with the status multiplier bug fixed.
-  - `generation_3_4` Sets the calculator to the generation 3 and 4 implementation.
-  - `generation_5` Sets the calculator to the generation 5 implementation.
-  - `generation_6` Sets the calculator to the generation 6 implementation.
-  - `generation_7` Sets the calculator to the generation 7 implementation.
-  - `generation_8` Sets the calculator to the generation 8 implementation.
-  - `generation_9` Sets the calculator to the generation 9 implementation.
-  - `cobblemon` Sets the calculator to the custom Cobblemon implementation. This is the default value.
-  - `debug` Sets the calculator to the debug/cheat implementation, every attempt will be a successful critical capture.
+- Added an implementation of every [catch rate](https://bulbapedia.bulbagarden.net/wiki/Catch_rate) from generation 1 to 9, these can be used by changing the ``captureCalculator`` config value:
+  - ``generation_1`` Sets the calculator to the generation 1 implementation.
+  - ``generation_2`` Sets the calculator to the generation 2 implementation.
+  - ``generation_2_fixed`` Sets the calculator to the generation 2 implementation with the status multiplier bug fixed.
+  - ``generation_3_4`` Sets the calculator to the generation 3 and 4 implementation.
+  - ``generation_5`` Sets the calculator to the generation 5 implementation.
+  - ``generation_6`` Sets the calculator to the generation 6 implementation.
+  - ``generation_7`` Sets the calculator to the generation 7 implementation.
+  - ``generation_8`` Sets the calculator to the generation 8 implementation.
+  - ``generation_9`` Sets the calculator to the generation 9 implementation.
+  - ``cobblemon`` Sets the calculator to the custom Cobblemon implementation. This is the default value.
+  - ``debug`` Sets the calculator to the debug/cheat implementation, every attempt will be a successful critical capture.
 
 ### Changes
 - Pokémon now save to the world by default, meaning the same Pokémon will remain in the world and not disappear after you log out and log back in. They still despawn over time though.
@@ -1709,9 +1320,9 @@ Thank you so much to all of our community translators that bring the mod to the
 - Made it so that particles are not shown whenever you have a shoulder Pokémon that gives potion effects.
 - Changed hitbox and size definitions for Decidueye, Blastoise, and Magmortar
 - Apricorns can now be harvested with Axes, the speed will scale with enchantments and tool material, only dropping the Apricorn if fully grown, these will still destroy the Apricorn so the manual harvest still is recommended unless you're just keen on destroying trees.
-- Apricorns are now a part of the vanilla tag `minecraft:blocks/mineable/axe`.
+- Apricorns are now a part of the vanilla tag ``minecraft:blocks/mineable/axe``.
 - Apricorns are now compatible with any mod that breaks a whole tree at once.
-- Apricorns no longer have a config value for the seed drop chance these are now a part of their loot table which can be found in `cobblemon/loot_tables/blocks/<color>_apricorn.json`.
+- Apricorns no longer have a config value for the seed drop chance these are now a part of their loot table which can be found in ``cobblemon/loot_tables/blocks/<color>_apricorn.json``.
 - Advancements were redone to be slightly more interesting, with improved names, descriptions, and sorting.
 - Updated models and textures for Tentacool line, Gengar, Slowpoke line, Tyrogue line, Doduo line, Dratini, Dragonair, Quagsire, and Piplup line. There were probably others, the team lost track.
 - Improved sending out Pokémon at the start of battle so that they are positioned in a less annoying way.
@@ -1749,17 +1360,17 @@ Thank you so much to all of our community translators that bring the mod to the
 - Fixed positioning of Poké Balls when rendered in Healing Machines.
 - Fixed a desync issue on servers where all Pokémon seemed like they were special forms when they weren't.
 - Fixed an incompatibility with [Exordium](https://www.curseforge.com/minecraft/mc-mods/exordium).
-- Fixed datapack Pokémon language key generation. A Pokémon under the namespace `example` named `Pogemon` will now correctly look for the lang key `example.species.pogemon.name`.
+- Fixed datapack Pokémon language key generation. A Pokémon under the namespace ``example`` named ``Pogemon`` will now correctly look for the lang key ``example.species.pogemon.name``.
 - Fixed client not receiving messages for the different "stages" for the move Bide.
-- Fixed the Medium Slow and Medium Fast experience group IDs, they're now `medium_slow` and `medium_fast`. Any custom datapack Pokémon will require an update.
+- Fixed the Medium Slow and Medium Fast experience group IDs, they're now ```medium_slow``` and ``medium_fast``. Any custom datapack Pokémon will require an update.
 - Fixed Pokémon friendship being capped to the maximum level config value instead of the friendship one when loading Pokémon data.
 - Fixed Poké Balls taking forever to capture Pokémon if you are underwater or up in the air where it takes a long time to hit the ground.
 - Fixed Pokémon being unable to spawn on blocks such as snow layers.
 - Fixed Pokémon spawning inside of trees.
 - Fixed Pokémon experience not loading after a restart and instead going back to the minimal amount for the current level.
-- Fixed being able to use `/healpokemon` in battle.
+- Fixed being able to use ``/healpokemon`` in battle.
 - Fixed being able to select fainted party members in the switch menu causing the battle to lock.
-- Fixed `/spawnpokemon` command not supporting any command source other than players.
+- Fixed ``/spawnpokemon`` command not supporting any command source other than players.
 - Fixed issues with Charizard's sleep pose.
 - Fixed players being able to use multiple healer machines at once.
 - Fixed Pokémon layers not rendering when a Pokémon is on your shoulder.
@@ -1794,7 +1405,7 @@ Thank you so much to all of our community translators that bring the mod to the
 - Added models for Natu and Xatu, Murkrow and Honchkrow, Wailmer and Wailord.
 - Added new PC interface and it is beautiful.
 - Reworked the battle system so that battles load faster, cause fewer bugs, and can run on shared server hosts. This is a very big change that also reduced the size of the mod by 50mb!
-- Added full resource pack and data pack customization of models, textures, animations, spawning, and spawn file presets to make custom Pokémon species and variations very easy to create. You can find the guide for creating custom Pokémon on [our website](https://cobblemon.com/guides/custompokemon.html)!
+- Added full resource pack / data pack customization of models, textures, animations, spawning, and spawn file presets to make custom Pokémon species and variations very easy to create. You can find the guide for creating custom Pokémon on [our website](https://cobblemon.com/guides/custompokemon.html)!
 - Added water surface spawning for Pokémon like Lapras.
 - Added emissive texture support to Pokémon render layers.
 - Added compatibility for Mod Menu ([CurseForge](https://www.curseforge.com/minecraft/mc-mods/modmenu), [Modrinth](https://modrinth.com/mod/modmenu)).
@@ -1904,4 +1515,3 @@ Thank you so much to all of our community translators that bring the mod to the
 
 ## [1.0.0 (November 12th, 2022)](#1-0-0)
 - Initial release.
-

common/build.gradle.kts

@@ -40,7 +40,7 @@ dependencies {
     modApi(libs.molang)
 
     // Integrations
-    compileOnlyApi(libs.jei.api)
+//    compileOnlyApi(libs.jei.api)
     modCompileOnly(libs.bundles.fabric.integrations.compileOnly) {
         isTransitive = false
     }

common/src/main/java/com/cobblemon/mod/common/GenericsCheatClass.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common;
+
+import com.cobblemon.mod.common.entity.npc.NPCEntity;
+import java.util.Collection;
+import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.sensing.Sensor;
+import net.minecraft.world.entity.ai.sensing.SensorType;
+
+public class GenericsCheatClass {
+    // For some reason, doing this in the NPCEntity class in Kotlin gives confusing generic errors I could not resolve.
+    public static Brain.Provider<NPCEntity> createNPCBrain(Collection<MemoryModuleType<?>> memories, Collection<SensorType<? extends Sensor<? super NPCEntity>>> sensors) {
+        return Brain.provider(memories, sensors);
+    }
+}

common/src/main/java/com/cobblemon/mod/common/compat/LambDynamicLightsCompat.java

@@ -13,15 +13,11 @@ import com.cobblemon.mod.common.client.render.layer.PokemonOnShoulderRenderer;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.pokemon.FormData;
 import com.cobblemon.mod.common.pokemon.lighthing.LightingData;
-import dev.lambdaurora.lambdynlights.api.DynamicLightHandler;
-import dev.lambdaurora.lambdynlights.api.DynamicLightHandlers;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.EntityType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
-
+import net.minecraft.util.Tuple;
 import net.minecraft.world.entity.player.Player;
 
 // Java class due to relying on entrypoint on Fabric side
@@ -33,32 +29,44 @@ public class LambDynamicLightsCompat {
     // Make sure not to call anything Fabric specific :)
     public static void hookCompat() {
         // Pokémon entities
-        DynamicLightHandlers.registerDynamicLightHandler(
-                CobblemonEntities.POKEMON,
-                DynamicLightHandler.makeHandler(
-                        LambDynamicLightsCompat::resolvedPokemonLightLevel,
-                        pokemon -> false
-                )
-        );
+//        DynamicLightHandlers.registerDynamicLightHandler(
+//                CobblemonEntities.POKEMON,
+//                DynamicLightHandler.makeHandler(
+//                        pokemon -> resolvedPokemonLightLevel(pokemon, false),
+//                        pokemon -> true
+//                )
+//        );
+//        DynamicLightHandlers.registerDynamicLightHandler(
+//                CobblemonEntities.POKEMON,
+//                DynamicLightHandler.makeHandler(
+//                        pokemon -> resolvedPokemonLightLevel(pokemon, true),
+//                        pokemon -> false
+//                )
+//        );
 
         // Shouldered Pokémon
-        DynamicLightHandlers.registerDynamicLightHandler(
-                EntityType.PLAYER,
-                DynamicLightHandler.makeHandler(
-                        LambDynamicLightsCompat::resolvedShoulderLightLevel,
-                        player -> false
-                )
-        );
+//        DynamicLightHandlers.registerDynamicLightHandler(
+//                EntityType.PLAYER,
+//                DynamicLightHandler.makeHandler(
+//                        player -> resolvedShoulderLightLevel(player, false),
+//                        player -> true
+//                )
+//        );
+//        DynamicLightHandlers.registerDynamicLightHandler(
+//                EntityType.PLAYER,
+//                DynamicLightHandler.makeHandler(
+//                        player -> resolvedShoulderLightLevel(player, true),
+//                        player -> false
+//                )
+//        );
     }
 
-    private static int resolvedPokemonLightLevel(PokemonEntity pokemon) {
-        var underwater = !pokemon.level().getFluidState(BlockPos.containing(pokemon.getX(), pokemon.getEyeY(), pokemon.getZ())).isEmpty();
+    private static int resolvedPokemonLightLevel(PokemonEntity pokemon, boolean underwater) {
         return extractFormLightLevel(pokemon.getForm(), underwater).orElse(0);
     }
 
-    private static int resolvedShoulderLightLevel(Player player) {
+    private static int resolvedShoulderLightLevel(Player player, boolean underwater) {
         final var shoulderDataPair = PokemonOnShoulderRenderer.shoulderDataOf(player);
-        var underwater = !player.level().getFluidState(BlockPos.containing(player.getX(), player.getEyeY(), player.getZ())).isEmpty();
         final Optional<Integer> leftLightLevel = extractShoulderLightLevel(shoulderDataPair.getFirst(), underwater);
         final Optional<Integer> rightLightLevel = extractShoulderLightLevel(shoulderDataPair.getSecond(), underwater);
         return Math.max(leftLightLevel.orElse(0), rightLightLevel.orElse(0));

common/src/main/java/com/cobblemon/mod/common/duck/SoundEngineDuck.java

@@ -1,21 +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.duck;
-
-import org.jetbrains.annotations.Nullable;
-
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundSource;
-
-public interface SoundEngineDuck {
-
-    void pauseSounds(@Nullable ResourceLocation id, @Nullable SoundSource category);
-
-    void resumeSounds(@Nullable ResourceLocation id, @Nullable SoundSource category);
-}

common/src/main/java/com/cobblemon/mod/common/duck/SoundManagerDuck.java

@@ -17,4 +17,6 @@ public interface SoundManagerDuck {
     void pauseSounds(@Nullable ResourceLocation id, @Nullable SoundSource category);
 
     void resumeSounds(@Nullable ResourceLocation id, @Nullable SoundSource category);
+
+    void stopSounds(@Nullable ResourceLocation id, @Nullable SoundSource category);
 }

common/src/main/java/com/cobblemon/mod/common/duck/SoundSystemDuck.java

@@ -0,0 +1,27 @@
+/*
+ * 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.duck;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import net.minecraft.client.resources.sounds.SoundInstance;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.sounds.SoundSource;
+
+public interface SoundSystemDuck {
+
+    void pauseSounds(@Nullable ResourceLocation id, @Nullable SoundSource category);
+
+    void resumeSounds(@Nullable ResourceLocation id, @Nullable SoundSource category);
+
+    void stopSounds(@Nullable ResourceLocation id, @Nullable SoundSource category);
+
+    Collection<SoundInstance> getSounds(@Nullable SoundSource category);
+}

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

@@ -1,48 +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.mixin;
-
-import static com.cobblemon.mod.common.datafixer.CobblemonSchemas.VERSION_KEY;
-
-import com.cobblemon.mod.common.datafixer.CobblemonSchemas;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.mojang.serialization.MapCodec;
-import java.util.Optional;
-import java.util.function.Supplier;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.IntTag;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.util.datafix.DataFixTypes;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.chunk.storage.ChunkStorage;
-import net.minecraft.world.level.storage.DimensionDataStorage;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(ChunkStorage.class)
-public class ChunkStorageMixin {
-    //Modifies the NBT returned by the vanilla upgradeChunkTag to also incorporate cobblemon fixup stuff
-    @ModifyExpressionValue(
-        method = "upgradeChunkTag(Lnet/minecraft/resources/ResourceKey;Ljava/util/function/Supplier;Lnet/minecraft/nbt/CompoundTag;Ljava/util/Optional;)Lnet/minecraft/nbt/CompoundTag;",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/util/datafix/DataFixTypes;updateToCurrentVersion(Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/nbt/CompoundTag;I)Lnet/minecraft/nbt/CompoundTag;"
-        )
-    )
-    public CompoundTag cobblemon$doChunkFix(
-        CompoundTag vanillaFixed
-    ) {
-        int curVersion = vanillaFixed.contains(VERSION_KEY) ? vanillaFixed.getInt(VERSION_KEY) : 0;
-        return DataFixTypes.CHUNK.update(CobblemonSchemas.getDATA_FIXER(), vanillaFixed, curVersion, CobblemonSchemas.DATA_VERSION);
-    }
-}

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

@@ -19,7 +19,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(CrashReport.class)
 public final class CrashReportMixin {
 
-    @Inject(method = "getDetails(Ljava/lang/StringBuilder;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/SystemReport;appendToCrashReportString(Ljava/lang/StringBuilder;)V"))
+    @Inject(method = "getDetails", at = @At(value = "INVOKE", target = "Lnet/minecraft/SystemReport;appendToCrashReportString(Ljava/lang/StringBuilder;)V"))
     public void cobblemon$printCobblemonDetails(StringBuilder builder, CallbackInfo callback) {
         CrashReportCategory cobblemon = new CrashReportCategory("Cobblemon");
         cobblemon.setDetail("Version", CobblemonBuildDetails.VERSION);

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

@@ -21,13 +21,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(DecoratedPotPatterns.class)
 public abstract class DecoratedPotPatternsMixin {
     @Inject(method = "getPatternFromItem", at=@At("HEAD"), cancellable = true)
-    private static void cobblemon$getCobblemonSherdTexture(
-        Item sherd,
-        CallbackInfoReturnable<ResourceKey<DecoratedPotPattern>> cir
-    ) {
+    private static void cobblemon$getCobblemonSherdTexture(Item sherd,
+        CallbackInfoReturnable<ResourceKey<DecoratedPotPattern>> cir) {
         if (CobblemonSherds.INSTANCE.getSherdToPattern().containsKey(sherd)) {
             cir.setReturnValue(CobblemonSherds.INSTANCE.getSherdToPattern().get(sherd));
-            cir.cancel();
+            return;
         }
     }
 }

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

@@ -1,40 +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.mixin;
-
-import static com.cobblemon.mod.common.datafixer.CobblemonSchemas.VERSION_KEY;
-
-import com.cobblemon.mod.common.datafixer.CobblemonSchemas;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.IntTag;
-import net.minecraft.util.datafix.DataFixTypes;
-import net.minecraft.world.level.chunk.storage.EntityStorage;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-@Mixin(EntityStorage.class)
-public class EntityStorageMixin {
-    //Modifies the NBT returned by the vanilla upgradeChunkTag to also incorporate cobblemon fixup stuff
-    @ModifyExpressionValue(
-        method = "method_31731(Lnet/minecraft/world/level/ChunkPos;Ljava/util/Optional;)Lnet/minecraft/world/level/entity/ChunkEntities;",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/world/level/chunk/storage/SimpleRegionStorage;upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;I)Lnet/minecraft/nbt/CompoundTag;"
-        )
-    )
-    public CompoundTag cobblemon$doEntityFix(
-        CompoundTag vanillaFixed
-    ) {
-        int curVersion = vanillaFixed.contains(VERSION_KEY) ? vanillaFixed.getInt(VERSION_KEY) : 0;
-        CompoundTag newTag =  DataFixTypes.ENTITY_CHUNK.update(CobblemonSchemas.getDATA_FIXER(), vanillaFixed, curVersion, CobblemonSchemas.DATA_VERSION);
-        newTag.put(VERSION_KEY, IntTag.valueOf(CobblemonSchemas.DATA_VERSION));
-        return newTag;
-    }
-}

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

@@ -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.mixin;
-
-import com.cobblemon.mod.common.item.PokedexItem;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.renderer.ItemInHandRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.item.ItemStack;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(ItemInHandRenderer.class)
-public class ItemInHandRendererMixin {
-    @Inject(method = "renderArmWithItem", at = @At(value = "HEAD"), cancellable = true)
-    private void cobblemon$renderArmWithItem(AbstractClientPlayer abstractClientPlayer, float f, float g, InteractionHand interactionHand, float h, ItemStack itemStack, float i, PoseStack poseStack, MultiBufferSource multiBufferSource, int j, CallbackInfo ci) {
-        if (abstractClientPlayer.isUsingItem() && abstractClientPlayer.getUseItem().getItem() instanceof PokedexItem) {
-            ci.cancel();
-        }
-    }
-}

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

@@ -1,33 +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.mixin;
-
-import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.item.ItemProperties;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(ItemProperties.class)
-public class ItemPropertiesMixin {
-
-    // Mixins into the fishing rod's register() lambda expression
-    // Without this, the fishing rod item model appears cast when using a PokeRod in the other hand
-    @Inject(method = "method_27883", at = @At(value = "RETURN", ordinal = 1), cancellable = true)
-    private static void cobblemon$preventRodMixup(ItemStack itemStack, ClientLevel clientLevel, LivingEntity livingEntity, int i, CallbackInfoReturnable<Float> cir) {
-        if (!(livingEntity instanceof Player) || ((Player) livingEntity).fishing instanceof PokeRodFishingBobberEntity) {
-            cir.setReturnValue(0.0f);
-        }
-    }
-}

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

@@ -1,99 +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.mixin;
-
-import com.cobblemon.mod.common.Cobblemon;
-import com.cobblemon.mod.common.ModAPI;
-import com.cobblemon.mod.common.item.PokeBallItem;
-import com.cobblemon.mod.common.item.PokedexItem;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.ItemModelShaper;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.entity.ItemRenderer;
-import net.minecraft.client.resources.model.BakedModel;
-import net.minecraft.client.resources.model.ModelResourceLocation;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemDisplayContext;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-/*
-    I think it would be nice to maybe use the existing mixin we have for custom item rendering [BuiltinModelItemRendererMixin]
-    Obviously that would require changes. Potentially each item renderer defines what modes it overrides for?
- */
-@Mixin(ItemRenderer.class)
-public abstract class ItemRendererMixin {
-    @Unique private final String MODEL_PATH = Cobblemon.implementation.getModAPI() == ModAPI.FABRIC ? "fabric_resource" : "standalone";
-
-    @Shadow @Final private ItemModelShaper itemModelShaper;
-
-    @Shadow public abstract void render(ItemStack stack, ItemDisplayContext renderMode, boolean leftHanded, PoseStack matrices, MultiBufferSource vertexConsumers, int light, int overlay, BakedModel model);
-
-    @Inject(
-        method = "render(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;ZLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IILnet/minecraft/client/resources/model/BakedModel;)V",
-        at = @At("HEAD"),
-        cancellable = true
-    )
-    private void cobblemon$overrideItemModel(ItemStack stack, ItemDisplayContext renderMode, boolean leftHanded, PoseStack matrices, MultiBufferSource multiBufferSource, int light, int overlay, BakedModel model, CallbackInfo ci) {
-        boolean shouldBe2d = renderMode == ItemDisplayContext.GUI || renderMode == ItemDisplayContext.FIXED;
-        if (shouldBe2d) {
-            ResourceLocation resourceLocation = null;
-            if (stack.getItem() instanceof PokeBallItem pokeBallItem) resourceLocation = pokeBallItem.getPokeBall().getModel2d();
-            else if (stack.getItem() instanceof PokedexItem pokedexItem) resourceLocation = pokedexItem.getType().getItemSpritePath();
-
-            if (resourceLocation != null) {
-                BakedModel replacementModel = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, "inventory"));
-                if (!cobblemon$isSameModel(model, replacementModel)) {
-                    ci.cancel();
-                    render(stack, renderMode, leftHanded, matrices, multiBufferSource, light, overlay, replacementModel);
-                }
-            }
-        }
-    }
-
-    @Inject(method = "getModel", at = @At("HEAD"), cancellable = true)
-    private void cobblemon$getItemModel(ItemStack stack, Level world, LivingEntity entity, int seed, CallbackInfoReturnable<BakedModel> cir) {
-        ResourceLocation resourceLocation = null;
-        if (stack.getItem() instanceof PokeBallItem pokeBallItem) resourceLocation = pokeBallItem.getPokeBall().getModel3d();
-        else if (stack.getItem() instanceof PokedexItem pokedexItem) {
-            boolean isScanModel = entity instanceof Player && entity.getUseItem() == stack && entity.isUsingItem();
-            boolean canOpenScreen = entity != null && ((entity.getOffhandItem() == stack && !(entity.getMainHandItem().getItem() instanceof PokedexItem)) || entity.getMainHandItem() == stack);
-            resourceLocation = pokedexItem.getType().getItemModelPath(isScanModel ? "scanning" : (canOpenScreen ? null : "off"));
-        }
-
-        if (resourceLocation != null) {
-            BakedModel model = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, MODEL_PATH));
-            ClientLevel clientWorld = world instanceof ClientLevel ? (ClientLevel) world : null;
-            BakedModel overriddenModel = model.getOverrides().resolve(model, stack, clientWorld, entity, seed);
-            cir.setReturnValue(overriddenModel == null ? this.itemModelShaper.getModelManager().getMissingModel() : overriddenModel);
-        }
-    }
-
-    // this method aims to cover an issue with modernfixes and it's "dynamic resource" causing the usual .equals check to always fail, resulting in a StackOverflow
-    // this falls back to comparing the model contents (e.g. location of the texture, width and height)
-    @Unique
-    private static boolean cobblemon$isSameModel(BakedModel original, BakedModel replacement) {
-        return original.equals(replacement) ||
-                       (original.getParticleIcon().contents().name().equals(replacement.getParticleIcon().contents().name()) &&
-                                original.getParticleIcon().contents().width() == replacement.getParticleIcon().contents().width() &&
-                                original.getParticleIcon().contents().height() == replacement.getParticleIcon().contents().height());
-    }
-
-}

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

@@ -1,50 +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.mixin;
-
-import com.cobblemon.mod.common.util.DataKeys;
-import com.mojang.serialization.Dynamic;
-import net.minecraft.util.datafix.fixes.ItemStackComponentizationFix;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.stream.Stream;
-
-@Mixin(ItemStackComponentizationFix.class)
-public class ItemStackComponentizationFixMixin
-{
-    @Inject(method = "fixItemStack", at = @At("TAIL"))
-    private static void fixItemStack(ItemStackComponentizationFix.ItemStackData itemStackData, Dynamic<?> dynamic, CallbackInfo ci) {
-        cobblemon$attemptPokemonModelDataFix(itemStackData, dynamic);
-    }
-
-    @Unique
-    private static void cobblemon$attemptPokemonModelDataFix(ItemStackComponentizationFix.ItemStackData itemStackData, Dynamic<?> dynamic)
-    {
-        var species = itemStackData.removeTag(DataKeys.POKEMON_ITEM_SPECIES).asString();
-        var aspects = itemStackData.removeTag(DataKeys.POKEMON_ITEM_ASPECTS).asList(dynamic1 -> dynamic1);
-        var redTint = itemStackData.removeTag(DataKeys.POKEMON_ITEM_TINT_RED).asNumber();
-        var greenTint = itemStackData.removeTag(DataKeys.POKEMON_ITEM_TINT_GREEN).asNumber();
-        var blueTint = itemStackData.removeTag(DataKeys.POKEMON_ITEM_TINT_BLUE).asNumber();
-        var alphaTint = itemStackData.removeTag(DataKeys.POKEMON_ITEM_TINT_ALPHA).asNumber();
-        if(species.hasResultOrPartial() && aspects != null) {
-            var pokeComponent = dynamic.emptyMap().set("species", dynamic.createString(species.getOrThrow()));
-            pokeComponent = pokeComponent.set("aspects", dynamic.createList(aspects.stream()));
-            if(redTint.hasResultOrPartial() || blueTint.hasResultOrPartial() || greenTint.hasResultOrPartial() || alphaTint.hasResultOrPartial()) {
-                pokeComponent = pokeComponent.set("tint", dynamic.createList(Stream.of(redTint, greenTint, blueTint, alphaTint)
-                                                                                     .map(x -> x.mapOrElse(Number::floatValue, error -> 0F))
-                                                                                     .map(dynamic::createFloat)));
-            }
-            itemStackData.setComponent("cobblemon:pokemon_item", pokeComponent);
-        }
-    }
-}

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

@@ -1,63 +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.mixin;
-
-import com.cobblemon.mod.common.block.entity.LecternBlockEntity;
-import com.cobblemon.mod.common.CobblemonBlocks;
-import com.cobblemon.mod.common.CobblemonSounds;
-import com.cobblemon.mod.common.item.PokedexItem;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.ItemInteractionResult;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.HorizontalDirectionalBlock;
-import net.minecraft.world.level.block.LecternBlock;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.BlockHitResult;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import static net.minecraft.world.level.block.LecternBlock.HAS_BOOK;
-
-@Mixin(LecternBlock.class)
-public abstract class LecternBlockMixin {
-    @Inject(method = "useItemOn", at = @At(value = "HEAD"), cancellable = true)
-    private void cobblemon$useItemOn(ItemStack itemStack, BlockState blockState, Level world, BlockPos blockPos, Player player, InteractionHand interactionHand, BlockHitResult blockHitResult, CallbackInfoReturnable<ItemInteractionResult> cir) {
-        if (!world.isClientSide && itemStack.getItem() instanceof PokedexItem) {
-            BlockEntity blockEntity = world.getBlockEntity(blockPos);
-            if (!blockState.getValue(HAS_BOOK)
-                && blockEntity instanceof net.minecraft.world.level.block.entity.LecternBlockEntity
-                && blockState.getBlock() instanceof LecternBlock
-            ) {
-                ItemStack pokedexItemStack = itemStack.copy();
-                Direction facing = blockState.getValue(HorizontalDirectionalBlock.FACING);
-                itemStack.consumeAndReturn(1, player);
-                blockEntity.setRemoved();
-                BlockState newBlockState = CobblemonBlocks.LECTERN.defaultBlockState().setValue(HorizontalDirectionalBlock.FACING, facing);
-                world.setBlockAndUpdate(blockPos, newBlockState);
-                BlockEntity lecternEntity = world.getBlockEntity(blockPos);
-
-                if (lecternEntity instanceof LecternBlockEntity) {
-                    ((LecternBlockEntity) lecternEntity).setItemStack((pokedexItemStack));
-                    world.playSound(null, blockPos, CobblemonSounds.POKEDEX_CLOSE, SoundSource.BLOCKS, 0.5F, 1.25F);
-                    cir.setReturnValue(ItemInteractionResult.SUCCESS);
-                } else {
-                    cir.setReturnValue(itemStack.isEmpty() && interactionHand == InteractionHand.MAIN_HAND ? ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION : ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION);
-                }
-            }
-        }
-    }
-}

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

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.client.CobblemonBakingOverrides;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import net.minecraft.client.color.block.BlockColors;
@@ -19,6 +20,8 @@ import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.profiling.ProfilerFiller;
+import org.slf4j.Logger;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -28,10 +31,16 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(ModelBakery.class)
 public abstract class ModelLoaderMixin {
 
-    @Shadow abstract UnbakedModel getModel(ResourceLocation resourceLocation);
-
     @Shadow protected abstract void registerModel(ModelResourceLocation modelId, UnbakedModel unbakedModel);
 
+    @Final
+    @Shadow
+    private Map<ResourceLocation, UnbakedModel> unbakedCache;
+
+    @Final
+    @Shadow
+    private static Logger LOGGER;
+
     @Inject(
         method = "<init>",
         at = @At("TAIL")
@@ -42,8 +51,19 @@ public abstract class ModelLoaderMixin {
         Map<ResourceLocation, List<BlockStateModelLoader.LoadedJson>> blockStates,
         CallbackInfo ci) {
         CobblemonBakingOverrides.INSTANCE.getModels().forEach(bakingOverride -> {
-            var unbakedModel = this.getModel(bakingOverride.getModelLocation());
-            this.registerModel(bakingOverride.getModelIdentifier(), unbakedModel);
+            try {
+                BlockModel unbakedModel = this.loadBlockModel(bakingOverride.getModelLocation());
+                this.unbakedCache.put(bakingOverride.getModelIdentifier().id(), unbakedModel);
+                this.registerModel(bakingOverride.getModelIdentifier(), unbakedModel);
+            } catch (IOException e) {
+                LOGGER.error("Error loading a Cobblemon BakedModel:", e);
+                throw new RuntimeException(e);
+            }
         });
     }
+
+    @Shadow
+    private BlockModel loadBlockModel(ResourceLocation id) throws IOException {
+        return null;
+    }
 }

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

@@ -1,111 +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.mixin;
-
-import com.cobblemon.mod.common.client.CobblemonClient;
-import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding;
-import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext;
-import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
-import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.MouseHandler;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.util.Mth;
-import net.minecraft.util.SmoothDouble;
-import org.objectweb.asm.Opcodes;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(MouseHandler.class)
-public class MouseHandlerMixin {
-    @Shadow
-    private double accumulatedScrollY;
-
-    @Shadow @Final private Minecraft minecraft;
-
-    @Shadow @Final private SmoothDouble smoothTurnY;
-
-    @Shadow @Final private SmoothDouble smoothTurnX;
-
-    @Shadow private double accumulatedDX;
-
-    @Shadow private double accumulatedDY;
-
-    @Inject(
-            method = "onScroll",
-            at = @At(
-                    value = "FIELD",
-                    target="Lnet/minecraft/client/MouseHandler;accumulatedScrollY:D",
-                    opcode = Opcodes.PUTFIELD,
-                    ordinal = 2,
-                    shift = At.Shift.BEFORE
-            ),
-            cancellable = true
-    )
-    public void cobblemon$scrollParty(long window, double horizontal, double vertical, CallbackInfo ci) {
-        if (PartySendBinding.INSTANCE.getWasDown()) {
-            int i = (int) accumulatedScrollY;
-            if (i > 0) {
-                accumulatedScrollY -= i;
-                CobblemonClient.INSTANCE.getStorage().shiftSelected(false);
-                ci.cancel();
-                PartySendBinding.INSTANCE.actioned();
-            } else if (i < 0) {
-                accumulatedScrollY -= i;
-                CobblemonClient.INSTANCE.getStorage().shiftSelected(true);
-                ci.cancel();
-                PartySendBinding.INSTANCE.actioned();
-            }
-        }
-    }
-
-    @Inject(
-        method = "onScroll",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/world/entity/player/Inventory;swapPaint(D)V"
-        ),
-        cancellable = true
-    )
-    public void cobblemon$doPokedexZoom(long window, double horizontal, double vertical, CallbackInfo ci) {
-        PokedexUsageContext usageContext = CobblemonClient.INSTANCE.getPokedexUsageContext();
-        if (usageContext.getScanningGuiOpen()) {
-            usageContext.adjustZoom(vertical);
-            ci.cancel();
-        }
-    }
-
-    @WrapWithCondition(
-            method = "turnPlayer",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/client/player/LocalPlayer;turn(DD)V"
-            )
-    )
-    public boolean cobblemon$modifyRotation(LocalPlayer player, double cursorDeltaX, double cursorDeltaY, @Local(argsOnly = true) double d) {
-        // I know this technically doesn't need to be a WrapWithCondition, but it'll make things easier later for riding.
-        PokedexUsageContext usageContext = CobblemonClient.INSTANCE.getPokedexUsageContext();
-        if (usageContext.getScanningGuiOpen()) {
-            this.smoothTurnY.reset();
-            this.smoothTurnX.reset();
-            var defaultSensitivity = this.minecraft.options.sensitivity().get() * 0.6000000238418579 + 0.20000000298023224;
-            var spyglassSensitivity = Math.pow(defaultSensitivity, 3);
-            var lookSensitivity = spyglassSensitivity * 8.0;
-            var sensitivity = Mth.lerp(usageContext.getFovMultiplier(), spyglassSensitivity, lookSensitivity);
-            player.turn(this.accumulatedDX * sensitivity, (this.accumulatedDY * sensitivity));
-            return false;
-        }
-        return true;
-    }
-
-}

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

@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.client.sound.BattleMusicController;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.sounds.SoundInstance;
-import net.minecraft.client.sounds.MusicManager;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(MusicManager.class)
-public class MusicManagerMixin {
-
-    @Shadow @Final
-    private Minecraft minecraft;
-
-    @Shadow @Nullable
-    private SoundInstance currentMusic;
-
-    /** Freezes the tracker while a BattleMusicInstance is in progress. Current SoundInstance being tracked will be paused by BattleMusicHandler. */
-    @Inject(method = "tick()V", at = @At("HEAD"), cancellable = true)
-    public void tick(CallbackInfo cb) {
-        if (this.minecraft.getSoundManager().isActive(BattleMusicController.INSTANCE.getMusic())) cb.cancel();
-    }
-}

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.client.sound.battle.BattleMusicController;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.sounds.SoundInstance;
+import net.minecraft.client.sounds.MusicManager;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MusicManager.class)
+public class MusicTrackerMixin {
+
+    @Shadow @Final
+    private Minecraft minecraft;
+
+    @Shadow @Nullable
+    private SoundInstance currentMusic;
+
+    /** Freezes the tracker while a BattleMusicInstance is in progress. Current SoundInstance being tracked will be paused by BattleMusicHandler. */
+    @Inject(method = "tick()V", at = @At("HEAD"), cancellable = true)
+    public void tick(CallbackInfo cb) {
+        if (this.minecraft.getSoundManager().isActive(BattleMusicController.INSTANCE.getMusic())) cb.cancel();
+    }
+}

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

@@ -1,33 +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.mixin;
-
-import static com.cobblemon.mod.common.datafixer.CobblemonSchemas.VERSION_KEY;
-
-import com.cobblemon.mod.common.datafixer.CobblemonSchemas;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtUtils;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(NbtUtils.class)
-public class NbtUtilsMixin {
-    @Inject(
-        method = "addCurrentDataVersion(Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;",
-        at = @At("TAIL")
-    )
-    private static void addCobblemonDataVersion(
-        CompoundTag tag,
-        CallbackInfoReturnable<CompoundTag> cir
-    ) {
-        tag.putInt(VERSION_KEY, CobblemonSchemas.DATA_VERSION);
-    }
-}

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

@@ -0,0 +1,53 @@
+/*
+ * 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.client.CobblemonClient;
+import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding;
+import net.minecraft.client.MouseHandler;
+import org.objectweb.asm.Opcodes;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MouseHandler.class)
+public class PartyScrollMixin {
+    @Shadow
+    private double accumulatedScrollY;
+
+    @Inject(
+            method = "onScroll",
+            at = @At(
+                    value = "FIELD",
+                    target="Lnet/minecraft/client/MouseHandler;accumulatedScrollY:D",
+                    opcode = Opcodes.PUTFIELD,
+                    ordinal = 2,
+                    shift = At.Shift.BEFORE
+            ),
+            cancellable = true
+    )
+    public void onMouseScroll(long window, double horizontal, double vertical, CallbackInfo ci) {
+        if (PartySendBinding.INSTANCE.getWasDown()) {
+            int i = (int)accumulatedScrollY;
+            if (i > 0) {
+                while (i-- > 0) CobblemonClient.INSTANCE.getStorage().shiftSelected(false);
+                ci.cancel();
+                accumulatedScrollY = 0;
+                PartySendBinding.INSTANCE.actioned();
+            } else if (i < 0) {
+                while (i++ < 0) CobblemonClient.INSTANCE.getStorage().shiftSelected(true);
+                ci.cancel();
+                accumulatedScrollY = 0;
+                PartySendBinding.INSTANCE.actioned();
+            }
+        }
+    }
+}

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

@@ -12,50 +12,35 @@ import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.CobblemonItems;
 import com.cobblemon.mod.common.api.events.CobblemonEvents;
 import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent;
-import com.cobblemon.mod.common.api.pokemon.PokemonSpecies;
+import com.cobblemon.mod.common.api.storage.NoPokemonStoreException;
 import com.cobblemon.mod.common.api.storage.party.PartyStore;
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags;
-import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData;
-import com.cobblemon.mod.common.pokedex.scanner.ScannableEntity;
-import com.cobblemon.mod.common.pokemon.FormData;
-import com.cobblemon.mod.common.pokemon.Gender;
 import com.cobblemon.mod.common.pokemon.Pokemon;
-import com.cobblemon.mod.common.pokemon.Species;
 import com.cobblemon.mod.common.util.CompoundTagExtensionsKt;
-import com.cobblemon.mod.common.util.CompoundTagUtilities;
 import com.cobblemon.mod.common.util.DataKeys;
-import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.item.ItemEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.food.FoodProperties;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import java.util.UUID;
-import java.util.stream.Collectors;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.food.FoodProperties;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
 
 @Mixin(Player.class)
-public abstract class PlayerMixin extends LivingEntity implements ScannableEntity {
+public abstract class PlayerMixin extends LivingEntity {
 
     @Shadow public abstract CompoundTag getShoulderEntityLeft();
 
@@ -78,19 +63,19 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
         super(p_20966_, p_20967_);
     }
 
-    @Inject(method = "respawnEntityOnShoulder", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/EntityType;create(Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/Level;)Ljava/util/Optional;"), cancellable = true)
+    @Inject(method = "respawnEntityOnShoulder", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/EntityType;create(Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/Level;)Ljava/util/Optional;"), cancellable = true)
     private void cobblemon$removePokemon(CompoundTag nbt, CallbackInfo ci) {
         if (CompoundTagExtensionsKt.isPokemonEntity(nbt)) {
-            final UUID uuid = CompoundTagUtilities.getPokemonID(nbt);
-            if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())) {
-                final UUID uuidRight = CompoundTagUtilities.getPokemonID(this.getShoulderEntityRight());
+            final UUID uuid = this.getPokemonID(nbt);
+            if (this.isShoulderPokemon(this.getShoulderEntityRight())) {
+                final UUID uuidRight = this.getPokemonID(this.getShoulderEntityRight());
                 if (uuid.equals(uuidRight)) {
                     this.recallPokemon(uuidRight);
                     this.setShoulderEntityRight(new CompoundTag());
                 }
             }
-            if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())) {
-                final UUID uuidLeft = CompoundTagUtilities.getPokemonID(this.getShoulderEntityLeft());
+            if (this.isShoulderPokemon(this.getShoulderEntityLeft())) {
+                final UUID uuidLeft = this.getPokemonID(this.getShoulderEntityLeft());
                 if (uuid.equals(uuidLeft)) {
                     this.recallPokemon(uuidLeft);
                     this.setShoulderEntityLeft(new CompoundTag());
@@ -114,25 +99,36 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
         // We want to allow both of these to forcefully remove the entities
         if (this.isSpectator() || this.isDeadOrDying())
             return;
-        if (!CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())) {
+        if (!this.isShoulderPokemon(this.getShoulderEntityLeft())) {
             this.respawnEntityOnShoulder(this.getShoulderEntityLeft());
             this.setShoulderEntityLeft(new CompoundTag());
         }
-        if (!CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())) {
+        if (!this.isShoulderPokemon(this.getShoulderEntityRight())) {
             this.respawnEntityOnShoulder(this.getShoulderEntityRight());
             this.setShoulderEntityRight(new CompoundTag());
         }
         ci.cancel();
     }
 
+    private UUID getPokemonID(CompoundTag nbt) {
+        return nbt.getCompound(DataKeys.POKEMON)
+                .getUUID(DataKeys.POKEMON_UUID);
+    }
+
     private void recallPokemon(UUID uuid) {
         // We need to do this cause the Entity doesn't store a reference to its storage
-        final PartyStore party = Cobblemon.INSTANCE.getStorage().getParty(this.getUUID(), this.registryAccess());
-        for (Pokemon pokemon : party) {
-            if (pokemon.getUuid().equals(uuid)) {
-                pokemon.recall();
+        try {
+            final PartyStore party = Cobblemon.INSTANCE.getStorage().getParty(this.uuid);
+            for (Pokemon pokemon : party) {
+                if (pokemon.getUuid().equals(uuid)) {
+                    pokemon.recall();
+                }
             }
-        }
+        } catch (NoPokemonStoreException ignored) {}
+    }
+
+    private boolean isShoulderPokemon(CompoundTag nbt) {
+        return CompoundTagExtensionsKt.isPokemonEntity(nbt);
     }
 
     @Inject(
@@ -163,61 +159,4 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
             }
         }
     }
-
-    @Inject(method = "isInvulnerableTo", at = @At("HEAD"), cancellable = true)
-    public void isInvulnerableTo(DamageSource source, CallbackInfoReturnable<Boolean> ci) {
-        if (!level().isClientSide) {
-            ServerPlayer player = (ServerPlayer)(Object)this;
-            boolean invulnerableInBattle = this.level().getGameRules().getBoolean(CobblemonGameRules.BATTLE_INVULNERABILITY);
-            boolean inBattle = Cobblemon.INSTANCE.getBattleRegistry().getBattleByParticipatingPlayer(player) != null;
-            if (invulnerableInBattle && inBattle) {
-                ci.setReturnValue(true);
-            }
-        }
-    }
-
-    @Override @Nullable
-    public PokedexEntityData resolvePokemonScan() {
-        if(CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())){
-            return getDataFromShoulderPokemon(this.getShoulderEntityRight());
-        }
-        if(CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())){
-            return getDataFromShoulderPokemon(this.getShoulderEntityLeft());
-        }
-        return null;
-    }
-
-    @Nullable @Unique
-    private PokedexEntityData getDataFromShoulderPokemon(CompoundTag shoulderTag) {
-        CompoundTag pokemonTag = shoulderTag.getCompound(DataKeys.POKEMON);
-        if(pokemonTag.isEmpty()) return null;
-        Species species = PokemonSpecies.INSTANCE.getByIdentifier(ResourceLocation.parse(pokemonTag.getString(DataKeys.POKEMON_SPECIES_IDENTIFIER)));
-        if(species == null) return null;
-        String formId = pokemonTag.getString(DataKeys.POKEMON_FORM_ID);
-        FormData form = species.getStandardForm();
-        List<FormData> formList = species.getForms().stream().filter(it -> it.formOnlyShowdownId().equals(formId)).toList();
-        if(!formList.isEmpty()) form = formList.getFirst();
-        if(form == null) return null;
-        String genderString = pokemonTag.getString(DataKeys.POKEMON_GENDER);
-        if(genderString.isEmpty()) return null;
-        Gender gender = Gender.valueOf(genderString);
-        boolean shiny = pokemonTag.getBoolean(DataKeys.POKEMON_SHINY);
-        int level = pokemonTag.getInt(DataKeys.POKEMON_LEVEL);
-        Set<String> aspects = shoulderTag.getList(DataKeys.SHOULDER_ASPECTS, Tag.TAG_STRING).stream().map(Tag::getAsString).collect(Collectors.toSet());
-
-        return new PokedexEntityData(
-                species,
-                form,
-                gender,
-                aspects,
-                shiny,
-                level,
-                this.getUUID()
-        );
-    }
-
-    @Override
-    public LivingEntity resolveEntityScan() {
-        return this;
-    }
 }

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

@@ -8,7 +8,7 @@
 
 package com.cobblemon.mod.common.mixin;
 
-import com.cobblemon.mod.common.client.render.ClientPlayerIcon;
+import com.cobblemon.mod.common.client.CobblemonClient;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.renderer.MultiBufferSource;
@@ -20,9 +20,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(PlayerRenderer.class)
 public class PlayerRendererMixin {
-
-    @Inject(method = "render", at = @At(value = "TAIL"))
+    @Inject(
+        method = "render(Lnet/minecraft/client/player/AbstractClientPlayer;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V",
+        at = @At(value = "TAIL")
+    )
     public void renderPlayer(AbstractClientPlayer player, float f, float g, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, CallbackInfo ci) {
-        ClientPlayerIcon.Companion.onRenderPlayer(player);
+        CobblemonClient.INSTANCE.getRequests().onRenderPlayer(player, g);
     }
 }

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

@@ -1,113 +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.mixin;
-
-import com.cobblemon.mod.common.client.sound.BattleMusicController;
-import com.cobblemon.mod.common.duck.SoundEngineDuck;
-import com.google.common.collect.Multimap;
-import com.mojang.blaze3d.audio.Channel;
-import net.minecraft.client.resources.sounds.SoundInstance;
-import net.minecraft.client.sounds.ChannelAccess;
-import net.minecraft.client.sounds.SoundEngine;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundSource;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Map;
-
-@Mixin(SoundEngine.class)
-public abstract class SoundEngineMixin implements SoundEngineDuck {
-
-    @Shadow
-    private boolean loaded;
-
-    @Shadow
-    private Multimap<SoundSource, SoundInstance> instanceBySource;
-
-    @Shadow @Final
-    private Map<SoundInstance, ChannelAccess.ChannelHandle> instanceToChannel;
-
-    @Shadow
-    protected abstract void stop(SoundInstance sound);
-
-    @Shadow
-    public abstract boolean isActive(SoundInstance sound);
-
-    /** Resumes the Source belonging to the queried SoundInstance. */
-    private void resume(SoundInstance sound) {
-        ChannelAccess.ChannelHandle sourceManager = this.instanceToChannel.get(sound);
-        if (this.loaded && sourceManager != null) sourceManager.execute(Channel::unpause);
-    }
-
-    /** Pauses the Source belonging to the queried SoundInstance. */
-    private void pause(SoundInstance sound) {
-        ChannelAccess.ChannelHandle sourceManager = this.instanceToChannel.get(sound);
-        if (this.loaded && sourceManager != null) sourceManager.execute(Channel::pause);
-    }
-
-    /** Resumes the SoundInstance(s) queried by id and/or category. */
-    @Override
-    public void resumeSounds(@Nullable ResourceLocation id, @Nullable SoundSource category) {
-        if (category != null) {
-            this.instanceBySource.get(category).forEach((sound) -> {
-                if (id == null || sound.getLocation().equals(id)) resume(sound);
-            });
-        } else if (id == null) {
-            this.instanceToChannel.keySet().forEach(this::resume);
-        } else {
-            this.instanceToChannel.keySet().forEach(sound -> {
-                if (sound.getLocation().equals(id)) resume(sound);
-            });
-        }
-    }
-
-    /** Pauses the SoundInstances queried by id and/or category. */
-    @Override
-    public void pauseSounds(@Nullable ResourceLocation id, @Nullable SoundSource category) {
-        if (category != null) {
-            this.instanceBySource.get(category).forEach((sound) -> {
-                if (id == null || sound.getLocation().equals(id)) pause(sound);
-            });
-        } else if (id == null) {
-            this.instanceToChannel.keySet().forEach(this::pause);
-        } else {
-            this.instanceToChannel.keySet().forEach(sound -> {
-                if (sound.getLocation().equals(id)) pause(sound);
-            });
-        }
-    }
-
-    /** Allows stopping all SoundInstances that belong to a queried category. */
-    @Inject(method = "stop(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/sounds/SoundSource;)V", at = @At("HEAD"), cancellable = true)
-    public void stopSounds(@Nullable ResourceLocation id, @Nullable SoundSource category, CallbackInfo cb) {
-        if (id == null && category != null) {
-            this.instanceBySource.get(category).forEach(this::stop);
-            cb.cancel();
-        }
-    }
-
-    /** Different behavior for resuming SoundInstances while a BattleMusicInstance is being played. We do not want to resume filtered sounds. */
-    @Inject(method = "resume()V", at = @At("HEAD"), cancellable = true)
-    public void resume(CallbackInfo cb) {
-        if (this.isActive(BattleMusicController.INSTANCE.getMusic())) {
-            this.instanceBySource.values().forEach(sound -> {
-               if (sound == BattleMusicController.INSTANCE.getMusic() || !BattleMusicController.INSTANCE.getFilteredCategories().contains(sound.getSource())) {
-                   resume(sound);
-               }
-            });
-            cb.cancel();
-        }
-    }
-}

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

@@ -8,12 +8,9 @@
 
 package com.cobblemon.mod.common.mixin;
 
-import com.cobblemon.mod.common.client.sound.BlockEntitySoundTracker;
-import com.cobblemon.mod.common.client.sound.EntitySoundTracker;
-import com.cobblemon.mod.common.client.sound.BattleMusicController;
-import com.cobblemon.mod.common.client.sound.SoundTracker;
+import com.cobblemon.mod.common.client.sound.battle.BattleMusicController;
 import com.cobblemon.mod.common.duck.SoundManagerDuck;
-import com.cobblemon.mod.common.duck.SoundEngineDuck;
+import com.cobblemon.mod.common.duck.SoundSystemDuck;
 import net.minecraft.client.resources.sounds.BiomeAmbientSoundsHandler;
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.resources.sounds.UnderwaterAmbientSoundInstances;
@@ -58,13 +55,19 @@ public abstract class SoundManagerMixin implements SoundManagerDuck {
     /** Pauses the queried SoundInstance(s). If id is null, will pause all sounds belonging to the SoundCategory. */
     @Override
     public void pauseSounds(@Nullable ResourceLocation id, @Nullable SoundSource category) {
-        ((SoundEngineDuck)soundEngine).pauseSounds(id, category);
+        ((SoundSystemDuck)soundEngine).pauseSounds(id, category);
     }
 
     /** Resumes the queried SoundInstance(s). If id is null, will resume all sounds belonging to the SoundCategory. */
     @Override
     public void resumeSounds(@Nullable ResourceLocation id, @Nullable SoundSource category) {
-        ((SoundEngineDuck)soundEngine).resumeSounds(id, category);
+        ((SoundSystemDuck)soundEngine).resumeSounds(id, category);
+    }
+
+    /** Stops the queried SoundInstance(s). If id is null, will stop all sounds belonging to the SoundCategory. */
+    @Override
+    public void stopSounds(@Nullable ResourceLocation id, @Nullable SoundSource category) {
+        ((SoundSystemDuck)soundEngine).stopSounds(id, category);
     }
 
     /** Blocks filtered sounds from being played while a BattleMusicInstance is in progress. */
@@ -88,10 +91,4 @@ public abstract class SoundManagerMixin implements SoundManagerDuck {
     public void playEnd(SoundInstance sound, int delay, CallbackInfo cb) {
         if (ambientLoopCondition(sound)) this.pauseSounds(sound.getLocation(), SoundSource.AMBIENT);
     }
-
-    /** Clears tracked sounds on the client when disconnected. */
-    @Inject(method = "stop()V", at = @At("TAIL"))
-    public void stop(CallbackInfo cb) {
-        SoundTracker.Companion.clear();
-    }
 }

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

@@ -0,0 +1,113 @@
+/*
+ * 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.client.sound.battle.BattleMusicController;
+import com.cobblemon.mod.common.duck.SoundSystemDuck;
+import com.google.common.collect.Multimap;
+import com.mojang.blaze3d.audio.Channel;
+import net.minecraft.client.resources.sounds.SoundInstance;
+import net.minecraft.client.sounds.ChannelAccess;
+import net.minecraft.client.sounds.SoundEngine;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.sounds.SoundSource;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Map;
+
+@Mixin(SoundEngine.class)
+public abstract class SoundSystemMixin implements SoundSystemDuck {
+
+    @Shadow
+    private boolean loaded;
+
+    @Shadow
+    private Multimap<SoundSource, SoundInstance> instanceBySource;
+
+    @Shadow @Final
+    private Map<SoundInstance, ChannelAccess.ChannelHandle> instanceToChannel;
+
+    @Shadow
+    protected abstract void stop(SoundInstance sound);
+
+    @Shadow
+    public abstract boolean isActive(SoundInstance sound);
+
+    /** Resumes the Source belonging to the queried SoundInstance. */
+    private void resume(SoundInstance sound) {
+        ChannelAccess.ChannelHandle sourceManager = this.instanceToChannel.get(sound);
+        if (this.loaded && sourceManager != null) sourceManager.execute(Channel::unpause);
+    }
+
+    /** Pauses the Source belonging to the queried SoundInstance. */
+    private void pause(SoundInstance sound) {
+        ChannelAccess.ChannelHandle sourceManager = this.instanceToChannel.get(sound);
+        if (this.loaded && sourceManager != null) sourceManager.execute(Channel::pause);
+    }
+
+    /** Resumes the SoundInstance(s) queried by id and/or category. */
+    @Override
+    public void resumeSounds(@Nullable ResourceLocation id, @Nullable SoundSource category) {
+        if (category != null) {
+            this.instanceBySource.get(category).forEach((sound) -> {
+                if (id == null || sound.getLocation().equals(id)) resume(sound);
+            });
+        } else if (id == null) {
+            this.instanceToChannel.keySet().forEach(this::resume);
+        } else {
+            this.instanceToChannel.keySet().forEach(sound -> {
+                if (sound.getLocation().equals(id)) resume(sound);
+            });
+        }
+    }
+
+    /** Pauses the SoundInstances queried by id and/or category. */
+    @Override
+    public void pauseSounds(@Nullable ResourceLocation id, @Nullable SoundSource category) {
+        if (category != null) {
+            this.instanceBySource.get(category).forEach((sound) -> {
+                if (id == null || sound.getLocation().equals(id)) pause(sound);
+            });
+        } else if (id == null) {
+            this.instanceToChannel.keySet().forEach(this::pause);
+        } else {
+            this.instanceToChannel.keySet().forEach(sound -> {
+                if (sound.getLocation().equals(id)) pause(sound);
+            });
+        }
+    }
+
+    /** Allows stopping all SoundInstances that belong to a queried category. */
+    @Inject(method = "stop(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/sounds/SoundSource;)V", at = @At("HEAD"), cancellable = true)
+    public void stopSoustopnds(@Nullable ResourceLocation id, @Nullable SoundSource category, CallbackInfo cb) {
+        if (id == null && category != null) {
+            this.instanceBySource.get(category).forEach(this::stop);
+            cb.cancel();
+        }
+    }
+
+    /** Different behavior for resuming SoundInstances while a BattleMusicInstance is being played. We do not want to resume filtered sounds. */
+    @Inject(method = "resume()V", at = @At("HEAD"), cancellable = true)
+    public void resume(CallbackInfo cb) {
+        if (this.isActive(BattleMusicController.INSTANCE.getMusic())) {
+            this.instanceBySource.values().forEach(sound -> {
+               if (sound == BattleMusicController.INSTANCE.getMusic() || !BattleMusicController.INSTANCE.getFilteredCategories().contains(sound.getSource())) {
+                   resume(sound);
+               }
+            });
+            cb.cancel();
+        }
+    }
+}

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

@@ -9,26 +9,22 @@
 package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.world.CobblemonStructureIDs;
-import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.RandomSource;
-import net.minecraft.world.level.LevelHeightAccessor;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.levelgen.RandomState;
 import net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece;
-import net.minecraft.world.level.levelgen.structure.pools.*;
-import net.minecraft.world.level.levelgen.structure.pools.alias.PoolAliasLookup;
-import net.minecraft.world.level.levelgen.structure.templatesystem.LiquidSettings;
+import net.minecraft.world.level.levelgen.structure.pools.JigsawPlacement;
+import net.minecraft.world.level.levelgen.structure.pools.LegacySinglePoolElement;
+import net.minecraft.world.level.levelgen.structure.pools.SinglePoolElement;
+import net.minecraft.world.level.levelgen.structure.pools.StructurePoolElement;
+import net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.apache.commons.lang3.mutable.MutableObject;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 import java.util.*;
 
@@ -43,11 +39,11 @@ public abstract class StructurePoolGeneratorMixin {
         String pokecenter = "pokecenter";
         String berry = "berry_farm";
 
-        structureGroups.put(CobblemonStructureIDs.VILLAGE_PLAINS_POKECENTER, Set.of(pokecenter));
-        structureGroups.put(CobblemonStructureIDs.VILLAGE_DESERT_POKECENTER, Set.of(pokecenter));
-        structureGroups.put(CobblemonStructureIDs.VILLAGE_SAVANNA_POKECENTER, Set.of(pokecenter));
-        structureGroups.put(CobblemonStructureIDs.VILLAGE_SNOWY_POKECENTER, Set.of(pokecenter));
-        structureGroups.put(CobblemonStructureIDs.VILLAGE_TAIGA_POKECENTER, Set.of(pokecenter));
+        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));
@@ -121,25 +117,53 @@ public abstract class StructurePoolGeneratorMixin {
         return reducedList.iterator();
     }
 
-    @Inject(method = "tryPlacingChildren", at = @At(value = "NEW", target = "net/minecraft/world/level/levelgen/structure/PoolElementStructurePiece", ordinal = 0), locals = LocalCapture.CAPTURE_FAILHARD)
-    private void afterTryPlacingChildren(
-        PoolElementStructurePiece poolElementStructurePiece,
-        MutableObject<VoxelShape> mutableObject,
-        int i,
-        boolean bl,
-        LevelHeightAccessor levelHeightAccessor,
-        RandomState randomState,
-        PoolAliasLookup poolAliasLookup,
-        LiquidSettings liquidSettings,
-        CallbackInfo ci,
-        @Local(ordinal = 1) StructurePoolElement structurePoolElement
-    ) {
-        ResourceLocation structureLocationKey = getCobblemonOnlyLocation(structurePoolElement);
+    @ModifyVariable(method = "tryPlacingChildren", at = @At("HEAD"), ordinal = 0, argsOnly = true)
+    private PoolElementStructurePiece injected(PoolElementStructurePiece poolStructurePiece) {
+        ResourceLocation structureLocationKey = getCobblemonOnlyLocation(poolStructurePiece.getElement());
         if (structureLocationKey != null) {
             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) {
+////        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 ResourceLocation getCobblemonOnlyLocation(StructurePoolElement structurePoolElement) {
         ResourceLocation location = getLocationIfAvailable(structurePoolElement);
         if (location == null) return null;
@@ -162,4 +186,26 @@ public abstract class StructurePoolGeneratorMixin {
             return null;
         }
     }
+
+//    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;
+//    }
 }

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

@@ -1,33 +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.mixin;
-
-import com.cobblemon.mod.common.Cobblemon;
-import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.ai.targeting.TargetingConditions;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(TargetingConditions.class)
-public class TargetingConditionsMixin {
-
-    @Inject(method = "test", at = @At("HEAD"), cancellable = true)
-    public void test(@Nullable LivingEntity baseEntity, LivingEntity targetEntity, CallbackInfoReturnable<Boolean> ci) {
-        if (targetEntity instanceof ServerPlayer player) {
-            boolean canTargetInBattle = player.level().getGameRules().getBoolean(CobblemonGameRules.MOB_TARGET_IN_BATTLE);
-            boolean targetInBattle = Cobblemon.INSTANCE.getBattleRegistry().getBattleByParticipatingPlayer(player) != null;
-            if (!canTargetInBattle && targetInBattle) ci.setReturnValue(false);
-        }
-    }
-}

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

@@ -1,68 +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.mixin;
-
-import com.cobblemon.mod.common.Cobblemon;
-import com.cobblemon.mod.common.CobblemonVillagerProfessions;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import kotlin.Pair;
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.model.EntityModel;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.entity.LivingEntityRenderer;
-import net.minecraft.client.renderer.entity.layers.RenderLayer;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.monster.ZombieVillager;
-import net.minecraft.world.entity.npc.Villager;
-import net.minecraft.world.entity.npc.VillagerProfession;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(RenderLayer.class)
-public abstract class VillagerProfessionLayerMixin {
-    @Inject(method = "renderColoredCutoutModel", at = @At(value = "HEAD"), cancellable = true)
-    private static <T extends LivingEntity> void cobblemon$renderVillagerProfessionLayer(EntityModel<T> entityModel, ResourceLocation resourceLocation, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, T livingEntity, int j, CallbackInfo ci) {
-        if (resourceLocation.getNamespace().equals(Cobblemon.MODID)) {
-            VillagerProfession profession = null;
-            boolean isZombie = false;
-
-            if (livingEntity instanceof Villager) profession = ((Villager) livingEntity).getVillagerData().getProfession();
-            if (livingEntity instanceof ZombieVillager) {
-                profession = ((ZombieVillager) livingEntity).getVillagerData().getProfession();
-                isZombie = true;
-            }
-
-            Pair<String, String[]> override = CobblemonVillagerProfessions.INSTANCE.getNameTagOverride(profession);
-            if (profession != null && override != null) {
-                String entityName = ChatFormatting.stripFormatting(livingEntity.getName().getString());
-                boolean nameMatches = false;
-                for (String name: override.getSecond())
-                    if (entityName.endsWith(name)) {
-                        nameMatches = true;
-                        break;
-                    }
-                if (nameMatches && resourceLocation.equals(getProfessionResourceLocation(resourceLocation.getNamespace(), ResourceLocation.parse(profession.name()).getPath(), isZombie))) {
-                    ResourceLocation textureLocation = getProfessionResourceLocation(resourceLocation.getNamespace(), override.getFirst(), isZombie);
-                    VertexConsumer vertexConsumer = multiBufferSource.getBuffer(RenderType.entityCutoutNoCull(textureLocation));
-                    entityModel.renderToBuffer(poseStack, vertexConsumer, i, LivingEntityRenderer.getOverlayCoords(livingEntity, 0.0F), j);
-                    ci.cancel();
-                }
-            }
-        }
-    }
-
-    private static ResourceLocation getProfessionResourceLocation(String namespace, String profession, Boolean isZombie) {
-        return ResourceLocation.fromNamespaceAndPath(namespace, "textures/entity/" + (isZombie ? "zombie_villager" : "villager") + "/profession/" + profession + ".png");
-    }
-}

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

@@ -1,19 +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.mixin.accessor;
-
-import net.minecraft.world.level.biome.Biome;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(Biome.class)
-public interface BiomeAccessor {
-    @Accessor("climateSettings")
-    Biome.ClimateSettings getClimateSettings();
-}

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

@@ -1,19 +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.mixin.accessor;
-
-import net.minecraft.client.gui.components.AbstractSelectionList;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(AbstractSelectionList.class)
-public interface EntryListWidgetAccessor {
-    @Accessor("renderHeader")
-    boolean getRenderHeader();
-}

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

@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.client;
-
-import com.cobblemon.mod.common.client.CobblemonClient;
-import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext;
-import net.minecraft.client.player.AbstractClientPlayer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(AbstractClientPlayer.class)
-public class AbstractClientPlayerMixin {
-    @Inject(
-        method = "getFieldOfViewModifier()F",
-        at = @At(
-            value = "HEAD"
-        ),
-        cancellable = true
-    )
-    public void cobblemon$getPokedexFovMultiplier(CallbackInfoReturnable<Float> cir) {
-        PokedexUsageContext usageContext = CobblemonClient.INSTANCE.getPokedexUsageContext();
-        if (usageContext.getScanningGuiOpen()) {
-            cir.setReturnValue(usageContext.getFovMultiplier());
-        }
-    }
-}

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

@@ -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.mixin.client;
-
-import com.cobblemon.mod.common.client.gui.ScrollingWidget;
-import net.minecraft.client.gui.components.AbstractSelectionList;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.Constant;
-import org.spongepowered.asm.mixin.injection.ModifyConstant;
-
-@Mixin(AbstractSelectionList.class)
-public abstract class EntryListWidgetMixin {
-
-    @SuppressWarnings("ConstantValue")
-    @ModifyConstant(method = "getEntryAtPosition", constant = @Constant(intValue = 4))
-    public int cobblemon$adjustOnlyIfNecessary(int input) {
-        if(ScrollingWidget.class.isInstance(this)) {
-            return 0;
-        }
-
-        return input;
-    }
-
-}

common/src/main/java/com/cobblemon/mod/common/mixin/invoker/AdornRegisterInvoker.java

@@ -9,8 +9,6 @@
 package com.cobblemon.mod.common.mixin.invoker;
 
 import java.util.List;
-
-import com.cobblemon.mod.common.integration.AdornCompatibility;
 import juuxel.adorn.block.variant.BlockVariantSet;
 import juuxel.adorn.block.variant.BlockVariantSets;
 import org.spongepowered.asm.mixin.Final;
@@ -28,7 +26,7 @@ public abstract class AdornRegisterInvoker {
     private static List<BlockVariantSet> variantSets;
 
     @Inject(method = "register()V", at = @At("HEAD"), remap = false)
-    private static void register(CallbackInfo ci) {
-        variantSets.add(new AdornCompatibility());
+    void register(CallbackInfo ci) {
+//        variantSets.add(AdornCompatibility.INSTANCE);
     }
 }

common/src/main/java/com/cobblemon/mod/common/mixin/pokeball/ItemRendererMixin.java

@@ -0,0 +1,69 @@
+/*
+ * 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.pokeball;
+
+import com.cobblemon.mod.common.Cobblemon;
+import com.cobblemon.mod.common.ModAPI;
+import com.cobblemon.mod.common.item.PokeBallItem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.renderer.ItemModelShaper;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.ItemDisplayContext;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ItemRenderer.class)
+public abstract class ItemRendererMixin {
+
+    @Unique private static final String MODEL_PATH = Cobblemon.implementation.getModAPI() == ModAPI.FABRIC ? "fabric_resource" : "standalone";
+
+    @Shadow @Final private ItemModelShaper itemModelShaper;
+
+    @Shadow public abstract void render(ItemStack stack, ItemDisplayContext renderMode, boolean leftHanded, PoseStack matrices, MultiBufferSource vertexConsumers, int light, int overlay, BakedModel model);
+
+    @Inject(method = "getModel", at = @At("HEAD"), cancellable = true)
+    private void cobblemon$bakePokeballModel(ItemStack stack, Level world, LivingEntity entity, int seed, CallbackInfoReturnable<BakedModel> cir) {
+        if (stack.getItem() instanceof PokeBallItem pokeBallItem) {
+            BakedModel model = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(pokeBallItem.getPokeBall().getModel3d(), MODEL_PATH));
+            ClientLevel clientWorld = world instanceof ClientLevel ? (ClientLevel) world : null;
+            BakedModel overriddenModel = model.getOverrides().resolve(model, stack, clientWorld, entity, seed);
+            cir.setReturnValue(overriddenModel == null ? this.itemModelShaper.getModelManager().getMissingModel() : overriddenModel);
+        }
+    }
+
+    @Inject(
+            method = "render(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;ZLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IILnet/minecraft/client/resources/model/BakedModel;)V",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void cobblemon$determinePokeballModel(ItemStack stack, ItemDisplayContext renderMode, boolean leftHanded, PoseStack matrices, MultiBufferSource vertexConsumers, int light, int overlay, BakedModel model, CallbackInfo ci) {
+        boolean shouldBe2d = renderMode == ItemDisplayContext.GUI || renderMode == ItemDisplayContext.FIXED;
+        if (shouldBe2d && stack.getItem() instanceof PokeBallItem pokeBallItem) {
+            BakedModel replacementModel = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(pokeBallItem.getPokeBall().getModel2d(), "inventory"));
+            if (!model.equals(replacementModel)) {
+                ci.cancel();
+                render(stack, renderMode, leftHanded, matrices, vertexConsumers, light, overlay, replacementModel);
+            }
+        }
+    }
+
+}

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

@@ -16,8 +16,12 @@ import com.cobblemon.mod.common.api.drop.CommandDropEntry
 import com.cobblemon.mod.common.api.drop.DropEntry
 import com.cobblemon.mod.common.api.drop.ItemDropEntry
 import com.cobblemon.mod.common.api.events.CobblemonEvents
+import com.cobblemon.mod.common.api.events.CobblemonEvents.BATTLE_VICTORY
 import com.cobblemon.mod.common.api.events.CobblemonEvents.DATA_SYNCHRONIZED
-import com.cobblemon.mod.common.api.interaction.RequestManager
+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.permission.PermissionValidator
 import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalculator
 import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalculators
@@ -52,10 +56,9 @@ import com.cobblemon.mod.common.api.storage.factory.FileBackedPokemonStoreFactor
 import com.cobblemon.mod.common.api.storage.molang.NbtMoLangDataStoreFactory
 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.PlayerInstancedDataStoreManager
-import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import com.cobblemon.mod.common.api.storage.player.adapter.*
-import com.cobblemon.mod.common.api.storage.player.factory.CachedPlayerDataStoreFactory
+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.tags.CobblemonItemTags
 import com.cobblemon.mod.common.battles.BagItems
@@ -65,23 +68,20 @@ import com.cobblemon.mod.common.battles.BattleSide
 import com.cobblemon.mod.common.battles.ShowdownThread
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
-import com.cobblemon.mod.common.command.argument.DexArgumentType
+import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.command.argument.DialogueArgumentType
-import com.cobblemon.mod.common.command.argument.FormArgumentType
 import com.cobblemon.mod.common.command.argument.MoveArgumentType
-import com.cobblemon.mod.common.command.argument.NPCClassArgumentType
 import com.cobblemon.mod.common.command.argument.PartySlotArgumentType
+import com.cobblemon.mod.common.command.argument.PokemonArgumentType
 import com.cobblemon.mod.common.command.argument.PokemonPropertiesArgumentType
 import com.cobblemon.mod.common.command.argument.PokemonStoreArgumentType
 import com.cobblemon.mod.common.command.argument.SpawnBucketArgumentType
-import com.cobblemon.mod.common.command.argument.SpeciesArgumentType
 import com.cobblemon.mod.common.config.CobblemonConfig
 import com.cobblemon.mod.common.config.LastChangedVersion
 import com.cobblemon.mod.common.config.constraint.IntConstraint
 import com.cobblemon.mod.common.config.starter.StarterConfig
 import com.cobblemon.mod.common.data.CobblemonDataProvider
 import com.cobblemon.mod.common.events.AdvancementHandler
-import com.cobblemon.mod.common.events.PokedexHandler
 import com.cobblemon.mod.common.events.ServerTickHandler
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
 import com.cobblemon.mod.common.permission.LaxPermissionValidator
@@ -93,12 +93,9 @@ import com.cobblemon.mod.common.pokemon.evolution.variants.BlockClickEvolution
 import com.cobblemon.mod.common.pokemon.feature.TagSeasonResolver
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.pokemon.properties.AspectPropertyType
-import com.cobblemon.mod.common.pokemon.properties.FreezeFrameProperty
 import com.cobblemon.mod.common.pokemon.properties.HiddenAbilityPropertyType
-import com.cobblemon.mod.common.pokemon.properties.NoAIProperty
 import com.cobblemon.mod.common.pokemon.properties.UnaspectPropertyType
 import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
-import com.cobblemon.mod.common.pokemon.properties.BattleCloneProperty
 import com.cobblemon.mod.common.pokemon.properties.tags.PokemonFlagProperty
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
@@ -134,7 +131,6 @@ object Cobblemon {
     const val MODID = CobblemonBuildDetails.MOD_ID
     const val VERSION = CobblemonBuildDetails.VERSION
     const val CONFIG_PATH = "config/$MODID/main.json"
-    @JvmField
     val LOGGER: Logger = LogManager.getLogger()
 
     lateinit var implementation: CobblemonImplementation
@@ -156,7 +152,7 @@ object Cobblemon {
     val battleRegistry = BattleRegistry
     var storage = PokemonStoreManager()
     var molangData = NbtMoLangDataStoreFactory
-    lateinit var playerDataManager: PlayerInstancedDataStoreManager
+    lateinit var playerData: PlayerDataStoreManager
     lateinit var starterConfig: StarterConfig
     val dataProvider: DataProvider = CobblemonDataProvider
     var permissionValidator: PermissionValidator by Delegates.observable(LaxPermissionValidator().also { it.initialize() }) { _, _, newValue -> newValue.initialize() }
@@ -167,7 +163,7 @@ object Cobblemon {
         this.implementation = implementation
 
         this.LOGGER.info("Launching Cobblemon ${CobblemonBuildDetails.VERSION}${if(CobblemonBuildDetails.SNAPSHOT) "-SNAPSHOT" else ""} ")
-        if (CobblemonBuildDetails.SNAPSHOT) {
+        if(CobblemonBuildDetails.SNAPSHOT) {
             this.LOGGER.info("  - Git Commit: ${smallCommitHash()} (https://gitlab.com/cable-mc/cobblemon/-/commit/${CobblemonBuildDetails.GIT_COMMIT})")
             this.LOGGER.info("  - Branch: ${CobblemonBuildDetails.BRANCH}")
         }
@@ -180,7 +176,6 @@ object Cobblemon {
         implementation.registerEntityTypes()
         implementation.registerEntityAttributes()
         implementation.registerBlockEntityTypes()
-        implementation.registerVillagers()
         implementation.registerWorldGenFeatures()
         implementation.registerParticles()
         implementation.registerEntityDataSerializers()
@@ -205,16 +200,16 @@ object Cobblemon {
 
         DATA_SYNCHRONIZED.subscribe {
             storage.onPlayerDataSync(it)
-            playerDataManager.syncAllToPlayer(it)
+            playerData.get(it).sendToPlayer(it)
             starterHandler.handleJoin(it)
-            ServerSettingsPacket(this.config.preventCompletePartyDeposit, this.config.displayEntityLevelLabel, this.config.displayEntityNameLabel).sendToPlayer(it)
+            ServerSettingsPacket(this.config.preventCompletePartyDeposit, this.config.displayEntityLevelLabel).sendToPlayer(it)
         }
         PlatformEvents.SERVER_PLAYER_LOGOUT.subscribe {
             PCLinkManager.removeLink(it.player.uuid)
             BattleRegistry.onPlayerDisconnect(it.player)
             storage.onPlayerDisconnect(it.player)
-            playerDataManager.onPlayerDisconnect(it.player)
-            RequestManager.onLogoff(it.player)
+            playerData.onPlayerDisconnect(it.player)
+            TradeManager.onLogoff(it.player)
         }
         PlatformEvents.PLAYER_DEATH.subscribe {
             PCLinkManager.removeLink(it.player.uuid)
@@ -238,6 +233,9 @@ object Cobblemon {
             }
         }
 
+        // Register the grow_tumblestone advancement
+        PlatformEvents.RIGHT_CLICK_BLOCK.subscribe { AdvancementHandler.onTumbleStonePlaced(it) }
+
         PlatformEvents.CHANGE_DIMENSION.subscribe {
             it.player.party().forEach { pokemon -> pokemon.entity?.recallWithAnimation() }
         }
@@ -253,8 +251,6 @@ object Cobblemon {
         }
 
         HeldItemProvider.register(CobblemonHeldItemManager, Priority.LOWEST)
-
-
     }
 
     fun initialize() {
@@ -278,15 +274,10 @@ object Cobblemon {
             FlagSpeciesFeatureProvider(keys = listOf(DataKeys.HAS_BEEN_SHEARED), default = false))
 
         CustomPokemonProperty.register(UncatchableProperty)
-        CustomPokemonProperty.register(BattleCloneProperty)
         CustomPokemonProperty.register(PokemonFlagProperty)
         CustomPokemonProperty.register(HiddenAbilityPropertyType)
         CustomPokemonProperty.register(AspectPropertyType)
         CustomPokemonProperty.register(UnaspectPropertyType)
-        CustomPokemonProperty.register(FreezeFrameProperty)
-        CustomPokemonProperty.register(NoAIProperty)
-
-        CobblemonEvents.POKEMON_PROPERTY_INITIALISED.emit(Unit)
 
         ifDedicatedServer {
             isDedicatedServer = true
@@ -301,21 +292,16 @@ object Cobblemon {
         }
         PlatformEvents.SERVER_STARTING.subscribe { event ->
             val server = event.server
-            playerDataManager = PlayerInstancedDataStoreManager().also { it.setup(server) }
+            playerData = PlayerDataStoreManager().also { it.setup(server) }
 
             val mongoClient: MongoClient?
 
             val pokemonStoreRoot = server.getWorldPath(LevelResource.ROOT).resolve("pokemon").toFile()
             val storeAdapter = when (config.storageFormat) {
                 "nbt", "json" -> {
-                    val generalJsonFactory = CachedPlayerDataStoreFactory(PlayerDataJsonBackend())
-                    generalJsonFactory.setup(server)
-
-                    val pokedexNbtFactory = CachedPlayerDataStoreFactory(DexDataNbtBackend())
-                    pokedexNbtFactory.setup(server)
-
-                    playerDataManager.setFactory(generalJsonFactory, PlayerInstancedDataStoreTypes.GENERAL)
-                    playerDataManager.setFactory(pokedexNbtFactory, PlayerInstancedDataStoreTypes.POKEDEX)
+                    val jsonFactory = JsonPlayerDataStoreFactory()
+                    jsonFactory.setup(server)
+                    playerData.setFactory(jsonFactory)
 
                     if (config.storageFormat == "nbt") {
                         NBTStoreAdapter(pokemonStoreRoot.absolutePath, useNestedFolders = true, folderPerClass = true)
@@ -336,23 +322,15 @@ object Cobblemon {
                             .applyConnectionString(ConnectionString(config.mongoDBConnectionString))
                             .build()
                         mongoClient = MongoClients.create(mongoClientSettings)
-                        val generalMongoFactory = CachedPlayerDataStoreFactory(PlayerDataMongoBackend(mongoClient, config.mongoDBDatabaseName, "PlayerDataCollection"))
-                        generalMongoFactory.setup(server)
-
-                        val pokedexMongoFactory = CachedPlayerDataStoreFactory(DexDataMongoBackend(mongoClient, config.mongoDBDatabaseName, "PokeDexCollection"))
-                        pokedexMongoFactory.setup(server)
-
-                        playerDataManager.setFactory(generalMongoFactory, PlayerInstancedDataStoreTypes.GENERAL)
-                        playerDataManager.setFactory(pokedexMongoFactory, PlayerInstancedDataStoreTypes.POKEDEX)
+                        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.getWorldPath(LevelResource.ROOT))) as FileStoreAdapter<*>
@@ -368,14 +346,22 @@ object Cobblemon {
         }
 
         PlatformEvents.SERVER_STOPPED.subscribe {
-            storage.unregisterAll(it.server.registryAccess())
-            playerDataManager.saveAllStores()
+            storage.unregisterAll()
+            playerData.saveAll()
         }
         PlatformEvents.SERVER_STARTED.subscribe {
             bestSpawner.onServerStarted()
             battleRegistry.onServerStarted()
         }
         PlatformEvents.SERVER_TICK_POST.subscribe { ServerTickHandler.onTick(it.server) }
+        POKEMON_CAPTURED.subscribe { AdvancementHandler.onCapture(it) }
+//        EGG_HATCH.subscribe { AdvancementHandler.onHatch(it) }
+        BATTLE_VICTORY.subscribe { AdvancementHandler.onWinBattle(it) }
+        EVOLUTION_COMPLETE.subscribe(Priority.LOWEST) { event ->
+            AdvancementHandler.onEvolve(event)
+        }
+        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.")
@@ -387,15 +373,8 @@ object Cobblemon {
             ).ifSuccessful { it.mute = true }
         }
 
-        registerEventHandlers()
-
-        CobblemonEvents.COBBLEMON_INITIALISED.emit(Unit)
-
-    }
-
-    fun registerEventHandlers() {
-        AdvancementHandler.registerListeners()
-        PokedexHandler.registerListeners()
+        //To whomever is merging, this is moved out of Cobblemon and into the CobblemonImplementations
+        //CobblemonSherds.registerSherds()
     }
 
     fun getLevel(dimension: ResourceKey<Level>): Level? {
@@ -493,16 +472,13 @@ object Cobblemon {
     }
 
     private fun registerArgumentTypes() {
-        this.implementation.registerCommandArgument(cobblemonResource("pokemon"), SpeciesArgumentType::class, SingletonArgumentInfo.contextFree(SpeciesArgumentType::species))
+        this.implementation.registerCommandArgument(cobblemonResource("pokemon"), PokemonArgumentType::class, SingletonArgumentInfo.contextFree(PokemonArgumentType::pokemon))
         this.implementation.registerCommandArgument(cobblemonResource("pokemon_properties"), PokemonPropertiesArgumentType::class, SingletonArgumentInfo.contextFree(PokemonPropertiesArgumentType::properties))
         this.implementation.registerCommandArgument(cobblemonResource("spawn_bucket"), SpawnBucketArgumentType::class, SingletonArgumentInfo.contextFree(SpawnBucketArgumentType::spawnBucket))
         this.implementation.registerCommandArgument(cobblemonResource("move"), MoveArgumentType::class, SingletonArgumentInfo.contextFree(MoveArgumentType::move))
         this.implementation.registerCommandArgument(cobblemonResource("party_slot"), PartySlotArgumentType::class, SingletonArgumentInfo.contextFree(PartySlotArgumentType::partySlot))
         this.implementation.registerCommandArgument(cobblemonResource("pokemon_store"), PokemonStoreArgumentType::class, SingletonArgumentInfo.contextFree(PokemonStoreArgumentType::pokemonStore))
         this.implementation.registerCommandArgument(cobblemonResource("dialogue"), DialogueArgumentType::class, SingletonArgumentInfo.contextFree(DialogueArgumentType::dialogue))
-        this.implementation.registerCommandArgument(cobblemonResource("form"), FormArgumentType::class, SingletonArgumentInfo.contextFree(FormArgumentType::form))
-        this.implementation.registerCommandArgument(cobblemonResource("dex"), DexArgumentType::class, SingletonArgumentInfo.contextFree (DexArgumentType::dex))
-        this.implementation.registerCommandArgument(cobblemonResource("npc_class"), NPCClassArgumentType::class, SingletonArgumentInfo.contextFree(NPCClassArgumentType::npcClass))
     }
 
 }

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

@@ -12,9 +12,8 @@ import net.minecraft.world.entity.schedule.Activity
 
 object CobblemonActivities {
     val activities = mutableListOf<Activity>()
-    val BATTLING = register(Activity("battling"))
-    val ACTION_EFFECT = register(Activity("action_effect"))
-    val NPC_CHATTING = register(Activity("npc_chatting"))
+    val BATTLING_ACTIVITY = Activity("pokemon_battling")
+    val NPC_BATTLING = Activity("npc_battling")
 
     fun register(activity: Activity): Activity {
         activities.add(activity)

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

@@ -36,9 +36,6 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
     @JvmField
     val PC: BlockEntityType<PCBlockEntity> = this.create("pc", BlockEntityType.Builder.of(::PCBlockEntity, CobblemonBlocks.PC).build(null))
 
-    @JvmField
-    val LECTERN: BlockEntityType<LecternBlockEntity> = this.create("lectern", BlockEntityType.Builder.of(::LecternBlockEntity, CobblemonBlocks.LECTERN).build(null))
-
     @JvmField
     val BERRY = this.create("berry", BlockEntityType.Builder.of(::BerryBlockEntity, *CobblemonBlocks.berries().values.toTypedArray()).build(null))
 

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

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.api.apricorn.Apricorn
 import com.cobblemon.mod.common.block.*
-import com.cobblemon.mod.common.block.LecternBlock
 import com.cobblemon.mod.common.block.MintBlock.MintType
 import com.cobblemon.mod.common.block.chest.GildedChestBlock
 import com.cobblemon.mod.common.block.sign.CobblemonHangingSignBlock
@@ -38,6 +37,8 @@ import net.minecraft.world.level.material.PushReaction
 @Suppress("SameParameterValue", "HasPlatformType", "MemberVisibilityCanBePrivate", "unused")
 object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<Block>>, Block>() {
 
+
+
     override val registry: Registry<Block> = BuiltInRegistries.BLOCK
     override val resourceKey: ResourceKey<Registry<Block>> = Registries.BLOCK
 
@@ -115,8 +116,8 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val APRICORN_FENCE = this.create("apricorn_fence", FenceBlock(BlockBehaviour.Properties.of().mapColor(APRICORN_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
     @JvmField
     val APRICORN_FENCE_GATE = this.create("apricorn_fence_gate", FenceGateBlock(APRICORN_WOOD_TYPE, BlockBehaviour.Properties.of().mapColor(APRICORN_PLANKS.defaultMapColor()).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
-    @JvmField
-    val APRICORN_BUTTON = this.create("apricorn_button", BlocksInvoker.createWoodenButtonBlock(APRICORN_BLOCK_SET_TYPE))
+    @JvmField // Note At the time of 1.20.0 we don't need our own BlockSetType for Apricorn wood
+    val APRICORN_BUTTON = this.create("apricorn_button", BlocksInvoker.createWoodenButtonBlock(BlockSetType.OAK))
     @JvmField
     val APRICORN_PRESSURE_PLATE = this.create("apricorn_pressure_plate", PressurePlateBlockInvoker.`cobblemon$create`(APRICORN_BLOCK_SET_TYPE, BlockBehaviour.Properties.of().mapColor(APRICORN_PLANKS.defaultMapColor()).noCollission().strength(0.5f).sound(SoundType.WOOD)))
     @JvmField
@@ -189,188 +190,279 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val SMALL_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("small_budding_black_tumblestone", GrowableStoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_BLACK_TUMBLESTONE)
 
     @JvmField
-    val TUMBLESTONE_BLOCK = this.create("tumblestone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val TUMBLESTONE_BLOCK = this.create("tumblestone_block", Block(
+        BlockBehaviour.Properties.of()
+            .mapColor(MapColor.TERRACOTTA_ORANGE)
+            .strength(1.0F)
+            .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+            .requiresCorrectToolForDrops()
+            .instrument(NoteBlockInstrument.BASEDRUM)
+    )
+    )
     @JvmField
-    val SKY_TUMBLESTONE_BLOCK = this.create("sky_tumblestone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val SKY_TUMBLESTONE_BLOCK = this.create("sky_tumblestone_block",
+        Block(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.COLOR_LIGHT_BLUE)
+                .strength(1.0F)
+                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+                .requiresCorrectToolForDrops()
+                .instrument(NoteBlockInstrument.BASEDRUM)
+        )
+    )
     @JvmField
-    val BLACK_TUMBLESTONE_BLOCK = this.create("black_tumblestone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val BLACK_TUMBLESTONE_BLOCK = this.create("black_tumblestone_block",
+        Block(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.TERRACOTTA_BLACK)
+                .strength(1.0F)
+                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+                .requiresCorrectToolForDrops()
+                .instrument(NoteBlockInstrument.BASEDRUM)
+        )
+    )
 
     @JvmField
-    val POLISHED_TUMBLESTONE = this.create("polished_tumblestone", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val POLISHED_TUMBLESTONE = this.create("polished_tumblestone",
+        Block(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.TERRACOTTA_ORANGE)
+                .strength(1.0F)
+                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+                .requiresCorrectToolForDrops()
+                .instrument(NoteBlockInstrument.BASEDRUM)
+        )
+    )
     @JvmField
     val POLISHED_TUMBLESTONE_STAIRS = this.create("polished_tumblestone_stairs", StairsBlockInvoker.`cobblemon$create`(POLISHED_TUMBLESTONE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_TUMBLESTONE)))
     @JvmField
-    val POLISHED_TUMBLESTONE_SLAB = this.create("polished_tumblestone_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val POLISHED_TUMBLESTONE_SLAB = this.create("polished_tumblestone_slab", SlabBlock(BlockBehaviour.Properties.of()
+        .mapColor(MapColor.TERRACOTTA_ORANGE)
+        .strength(1.0F)
+        .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+        .requiresCorrectToolForDrops()
+        .instrument(NoteBlockInstrument.BASEDRUM)
+    ))
     @JvmField
-    val POLISHED_TUMBLESTONE_WALL = this.create("polished_tumblestone_wall", WallBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val POLISHED_TUMBLESTONE_WALL = this.create("polished_tumblestone_wall", WallBlock(BlockBehaviour.Properties.of()
+        .mapColor(MapColor.TERRACOTTA_ORANGE)
+        .strength(1.0F)
+        .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+        .requiresCorrectToolForDrops()
+        .instrument(NoteBlockInstrument.BASEDRUM)
+    ))
     @JvmField
-    val CHISELED_POLISHED_TUMBLESTONE = this.create("chiseled_polished_tumblestone", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val CHISELED_POLISHED_TUMBLESTONE = this.create("chiseled_polished_tumblestone",
+        Block(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.TERRACOTTA_ORANGE)
+                .strength(1.0F)
+                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+                .requiresCorrectToolForDrops()
+                .instrument(NoteBlockInstrument.BASEDRUM)
+        )
+    )
     @JvmField
-    val SMOOTH_TUMBLESTONE = this.create("smooth_tumblestone", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val SMOOTH_TUMBLESTONE_STAIRS = this.create("smooth_tumblestone_stairs", StairsBlockInvoker.`cobblemon$create`(SMOOTH_TUMBLESTONE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SMOOTH_TUMBLESTONE)))
-    @JvmField
-    val SMOOTH_TUMBLESTONE_SLAB = this.create("smooth_tumblestone_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val TUMBLESTONE_BRICKS = this.create("tumblestone_bricks", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val TUMBLESTONE_BRICKS = this.create("tumblestone_bricks", Block(
+        BlockBehaviour.Properties.of()
+            .mapColor(MapColor.TERRACOTTA_ORANGE)
+            .strength(1.0F)
+            .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+            .requiresCorrectToolForDrops()
+            .instrument(NoteBlockInstrument.BASEDRUM)
+    )
+    )
     @JvmField
     val TUMBLESTONE_BRICK_STAIRS = this.create("tumblestone_brick_stairs", StairsBlockInvoker.`cobblemon$create`(TUMBLESTONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(TUMBLESTONE_BRICKS)))
     @JvmField
-    val TUMBLESTONE_BRICK_SLAB = this.create("tumblestone_brick_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val TUMBLESTONE_BRICK_SLAB = this.create("tumblestone_brick_slab", SlabBlock(BlockBehaviour.Properties.of()
+        .mapColor(MapColor.TERRACOTTA_ORANGE)
+        .strength(1.0F)
+        .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+        .requiresCorrectToolForDrops()
+        .instrument(NoteBlockInstrument.BASEDRUM)
+    ))
+@JvmField
+    val TUMBLESTONE_BRICK_WALL = this.create("tumblestone_brick_wall", WallBlock(BlockBehaviour.Properties.of()
+        .mapColor(MapColor.TERRACOTTA_ORANGE)
+        .strength(1.0F)
+        .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+        .requiresCorrectToolForDrops()
+        .instrument(NoteBlockInstrument.BASEDRUM)
+    ))
     @JvmField
-    val TUMBLESTONE_BRICK_WALL = this.create("tumblestone_brick_wall", WallBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val CHISELED_TUMBLESTONE_BRICKS = this.create("chiseled_tumblestone_bricks",
+        Block(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.TERRACOTTA_ORANGE)
+                .strength(1.0F)
+                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+                .requiresCorrectToolForDrops()
+                .instrument(NoteBlockInstrument.BASEDRUM)
+        )
+    )
     @JvmField
-    val CHISELED_TUMBLESTONE_BRICKS = this.create("chiseled_tumblestone_bricks", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-
-    @JvmField
-    val POLISHED_SKY_TUMBLESTONE = this.create("polished_sky_tumblestone", Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val POLISHED_SKY_TUMBLESTONE = this.create("polished_sky_tumblestone",
+        Block(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.COLOR_LIGHT_BLUE)
+                .strength(1.0F)
+                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+                .requiresCorrectToolForDrops()
+                .instrument(NoteBlockInstrument.BASEDRUM)
+        )
+    )
     @JvmField
     val POLISHED_SKY_TUMBLESTONE_STAIRS = this.create("polished_sky_tumblestone_stairs", StairsBlockInvoker.`cobblemon$create`(POLISHED_SKY_TUMBLESTONE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_SKY_TUMBLESTONE)))
     @JvmField
-    val POLISHED_SKY_TUMBLESTONE_SLAB = this.create("polished_sky_tumblestone_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val POLISHED_SKY_TUMBLESTONE_SLAB = this.create("polished_sky_tumblestone_slab", SlabBlock(BlockBehaviour.Properties.of()
+        .mapColor(MapColor.COLOR_LIGHT_BLUE)
+        .strength(1.0F)
+        .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+        .requiresCorrectToolForDrops()
+        .instrument(NoteBlockInstrument.BASEDRUM)
+    ))
+@JvmField
+    val POLISHED_SKY_TUMBLESTONE_WALL = this.create("polished_sky_tumblestone_wall", WallBlock(BlockBehaviour.Properties.of()
+        .mapColor(MapColor.COLOR_LIGHT_BLUE)
+        .strength(1.0F)
+        .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+        .requiresCorrectToolForDrops()
+        .instrument(NoteBlockInstrument.BASEDRUM)
+    ))
     @JvmField
-    val POLISHED_SKY_TUMBLESTONE_WALL = this.create("polished_sky_tumblestone_wall", WallBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val CHISELED_POLISHED_SKY_TUMBLESTONE = this.create("chiseled_polished_sky_tumblestone",
+        Block(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.COLOR_LIGHT_BLUE)
+                .strength(1.0F)
+                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+                .requiresCorrectToolForDrops()
+                .instrument(NoteBlockInstrument.BASEDRUM)
+        )
+    )
     @JvmField
-    val CHISELED_POLISHED_SKY_TUMBLESTONE = this.create("chiseled_polished_sky_tumblestone", Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val SKY_TUMBLESTONE_BRICKS = this.create("sky_tumblestone_bricks",
+        Block(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.COLOR_LIGHT_BLUE)
+                .strength(1.0F)
+                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+                .requiresCorrectToolForDrops()
+                .instrument(NoteBlockInstrument.BASEDRUM)
+        )
+    )
     @JvmField
-    val SMOOTH_SKY_TUMBLESTONE = this.create("smooth_sky_tumblestone", Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val SKY_TUMBLESTONE_BRICK_STAIRS = this.create("sky_tumblestone_brick_stairs", StairsBlockInvoker.`cobblemon$create`(
+        SKY_TUMBLESTONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SKY_TUMBLESTONE_BRICKS)))
     @JvmField
-    val SMOOTH_SKY_TUMBLESTONE_STAIRS = this.create("smooth_sky_tumblestone_stairs", StairsBlockInvoker.`cobblemon$create`(SMOOTH_SKY_TUMBLESTONE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SMOOTH_SKY_TUMBLESTONE)))
+    val SKY_TUMBLESTONE_BRICK_SLAB = this.create("sky_tumblestone_brick_slab", SlabBlock(BlockBehaviour.Properties.of()
+        .mapColor(MapColor.COLOR_LIGHT_BLUE)
+        .strength(1.0F)
+        .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+        .requiresCorrectToolForDrops()
+        .instrument(NoteBlockInstrument.BASEDRUM)
+    ))
     @JvmField
-    val SMOOTH_SKY_TUMBLESTONE_SLAB = this.create("smooth_sky_tumblestone_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val SKY_TUMBLESTONE_BRICK_WALL = this.create("sky_tumblestone_brick_wall", WallBlock(BlockBehaviour.Properties.of()
+        .mapColor(MapColor.COLOR_LIGHT_BLUE)
+        .strength(1.0F)
+        .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+        .requiresCorrectToolForDrops()
+        .instrument(NoteBlockInstrument.BASEDRUM)
+    ))
     @JvmField
-    val SKY_TUMBLESTONE_BRICKS = this.create("sky_tumblestone_bricks", Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val CHISELED_SKY_TUMBLESTONE_BRICKS = this.create("chiseled_sky_tumblestone_bricks",
+        Block(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.COLOR_LIGHT_BLUE)
+                .strength(1.0F)
+                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+                .requiresCorrectToolForDrops()
+                .instrument(NoteBlockInstrument.BASEDRUM)
+        )
+    )
     @JvmField
-    val SKY_TUMBLESTONE_BRICK_STAIRS = this.create("sky_tumblestone_brick_stairs", StairsBlockInvoker.`cobblemon$create`(SKY_TUMBLESTONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SKY_TUMBLESTONE_BRICKS)))
-    @JvmField
-    val SKY_TUMBLESTONE_BRICK_SLAB = this.create("sky_tumblestone_brick_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val SKY_TUMBLESTONE_BRICK_WALL = this.create("sky_tumblestone_brick_wall", WallBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val CHISELED_SKY_TUMBLESTONE_BRICKS = this.create("chiseled_sky_tumblestone_bricks", Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-
-    @JvmField
-    val POLISHED_BLACK_TUMBLESTONE = this.create("polished_black_tumblestone", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val POLISHED_BLACK_TUMBLESTONE = this.create("polished_black_tumblestone",
+        Block(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.TERRACOTTA_BLACK)
+                .strength(1.0F)
+                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+                .requiresCorrectToolForDrops()
+                .instrument(NoteBlockInstrument.BASEDRUM)
+        )
+    )
     @JvmField
     val POLISHED_BLACK_TUMBLESTONE_STAIRS = this.create("polished_black_tumblestone_stairs", StairsBlockInvoker.`cobblemon$create`(POLISHED_BLACK_TUMBLESTONE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_BLACK_TUMBLESTONE)))
     @JvmField
-    val POLISHED_BLACK_TUMBLESTONE_SLAB = this.create("polished_black_tumblestone_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val POLISHED_BLACK_TUMBLESTONE_SLAB = this.create("polished_black_tumblestone_slab", SlabBlock(BlockBehaviour.Properties.of()
+        .mapColor(MapColor.TERRACOTTA_BLACK)
+        .strength(1.0F)
+        .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+        .requiresCorrectToolForDrops()
+        .instrument(NoteBlockInstrument.BASEDRUM)
+    ))
+ @JvmField
+    val POLISHED_BLACK_TUMBLESTONE_WALL = this.create("polished_black_tumblestone_wall", WallBlock(BlockBehaviour.Properties.of()
+        .mapColor(MapColor.TERRACOTTA_BLACK)
+        .strength(1.0F)
+        .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+        .requiresCorrectToolForDrops()
+        .instrument(NoteBlockInstrument.BASEDRUM)
+    ))
     @JvmField
-    val POLISHED_BLACK_TUMBLESTONE_WALL = this.create("polished_black_tumblestone_wall", WallBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val CHISELED_POLISHED_BLACK_TUMBLESTONE = this.create("chiseled_polished_black_tumblestone",
+        Block(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.TERRACOTTA_BLACK)
+                .strength(1.0F)
+                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+                .requiresCorrectToolForDrops()
+                .instrument(NoteBlockInstrument.BASEDRUM)
+        )
+    )
     @JvmField
-    val CHISELED_POLISHED_BLACK_TUMBLESTONE = this.create("chiseled_polished_black_tumblestone", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val BLACK_TUMBLESTONE_BRICKS = this.create("black_tumblestone_bricks",
+        Block(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.TERRACOTTA_BLACK)
+                .strength(1.0F)
+                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+                .requiresCorrectToolForDrops()
+                .instrument(NoteBlockInstrument.BASEDRUM)
+        )
+    )
     @JvmField
-    val SMOOTH_BLACK_TUMBLESTONE = this.create("smooth_black_tumblestone", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val BLACK_TUMBLESTONE_BRICK_STAIRS = this.create("black_tumblestone_brick_stairs", StairsBlockInvoker.`cobblemon$create`(
+        BLACK_TUMBLESTONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(BLACK_TUMBLESTONE_BRICKS)))
     @JvmField
-    val SMOOTH_BLACK_TUMBLESTONE_STAIRS = this.create("smooth_black_tumblestone_stairs", StairsBlockInvoker.`cobblemon$create`(SMOOTH_BLACK_TUMBLESTONE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SMOOTH_BLACK_TUMBLESTONE)))
+    val BLACK_TUMBLESTONE_BRICK_SLAB = this.create("black_tumblestone_brick_slab", SlabBlock(BlockBehaviour.Properties.of()
+        .mapColor(MapColor.TERRACOTTA_BLACK)
+        .strength(1.0F)
+        .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+        .requiresCorrectToolForDrops()
+        .instrument(NoteBlockInstrument.BASEDRUM)
+    ))
     @JvmField
-    val SMOOTH_BLACK_TUMBLESTONE_SLAB = this.create("smooth_black_tumblestone_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    val BLACK_TUMBLESTONE_BRICK_WALL = this.create("black_tumblestone_brick_wall", WallBlock(BlockBehaviour.Properties.of()
+        .mapColor(MapColor.TERRACOTTA_BLACK)
+        .strength(1.0F)
+        .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+        .requiresCorrectToolForDrops()
+        .instrument(NoteBlockInstrument.BASEDRUM)
+    ))
     @JvmField
-    val BLACK_TUMBLESTONE_BRICKS = this.create("black_tumblestone_bricks", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val BLACK_TUMBLESTONE_BRICK_STAIRS = this.create("black_tumblestone_brick_stairs", StairsBlockInvoker.`cobblemon$create`(BLACK_TUMBLESTONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(BLACK_TUMBLESTONE_BRICKS)))
-    @JvmField
-    val BLACK_TUMBLESTONE_BRICK_SLAB = this.create("black_tumblestone_brick_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val BLACK_TUMBLESTONE_BRICK_WALL = this.create("black_tumblestone_brick_wall", WallBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val CHISELED_BLACK_TUMBLESTONE_BRICKS = this.create("chiseled_black_tumblestone_bricks", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-
-    @JvmField
-    val GEM_BUG_BLOCK = this.create("gem_bug_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_DARK_BLOCK = this.create("gem_dark_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_DRAGON_BLOCK = this.create("gem_dragon_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_ELECTRIC_BLOCK = this.create("gem_electric_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_FAIRY_BLOCK = this.create("gem_fairy_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_FIGHTING_BLOCK = this.create("gem_fighting_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_FIRE_BLOCK = this.create("gem_fire_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_FLYING_BLOCK = this.create("gem_flying_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_GHOST_BLOCK = this.create("gem_ghost_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_GRASS_BLOCK = this.create("gem_grass_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_GROUND_BLOCK = this.create("gem_ground_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_ICE_BLOCK = this.create("gem_ice_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_NORMAL_BLOCK = this.create("gem_normal_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_POISON_BLOCK = this.create("gem_poison_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_PSYCHIC_BLOCK = this.create("gem_psychic_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_ROCK_BLOCK = this.create("gem_rock_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_STEEL_BLOCK = this.create("gem_steel_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_WATER_BLOCK = this.create("gem_water_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-
-    @JvmField
-    val GEM_BUG_BUDDING = this.create("gem_bug_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_DARK_BUDDING = this.create("gem_dark_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_DRAGON_BUDDING = this.create("gem_dragon_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_ELECTRIC_BUDDING = this.create("gem_electric_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_FAIRY_BUDDING = this.create("gem_fairy_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_FIGHTING_BUDDING = this.create("gem_fighting_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_FIRE_BUDDING = this.create("gem_fire_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_FLYING_BUDDING = this.create("gem_flying_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_GHOST_BUDDING = this.create("gem_ghost_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_GRASS_BUDDING = this.create("gem_grass_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_GROUND_BUDDING = this.create("gem_ground_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_ICE_BUDDING = this.create("gem_ice_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_NORMAL_BUDDING = this.create("gem_normal_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_POISON_BUDDING = this.create("gem_poison_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_PSYCHIC_BUDDING = this.create("gem_psychic_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_ROCK_BUDDING = this.create("gem_rock_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_STEEL_BUDDING = this.create("gem_steel_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-    @JvmField
-    val GEM_WATER_BUDDING = this.create("gem_water_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
-
-
-    @JvmField
-    val FIRE_STONE_BLOCK = this.create("fire_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.FIRE).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT).lightLevel{13}))
-    @JvmField
-    val WATER_STONE_BLOCK = this.create("water_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.WATER).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT)))
-    @JvmField
-    val THUNDER_STONE_BLOCK = this.create("thunder_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.GLOW_LICHEN).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT).lightLevel{8}))
-    @JvmField
-    val LEAF_STONE_BLOCK = this.create("leaf_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT)))
-    @JvmField
-    val ICE_STONE_BLOCK = this.create("ice_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.ICE).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT)))
-    @JvmField
-    val SUN_STONE_BLOCK = this.create("sun_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT).lightLevel{5}))
-    @JvmField
-    val MOON_STONE_BLOCK = this.create("moon_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.DEEPSLATE).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT)))
-    @JvmField
-    val SHINY_STONE_BLOCK = this.create("shiny_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.QUARTZ).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT).lightLevel{15}))
-    @JvmField
-    val DAWN_STONE_BLOCK = this.create("dawn_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.DIAMOND).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT).lightLevel{15}))
-    @JvmField
-    val DUSK_STONE_BLOCK = this.create("dusk_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.WARPED_HYPHAE).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT)))
+    val CHISELED_BLACK_TUMBLESTONE_BRICKS = this.create("chiseled_black_tumblestone_bricks",
+        Block(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.TERRACOTTA_BLACK)
+                .strength(1.0F)
+                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
+                .requiresCorrectToolForDrops()
+                .instrument(NoteBlockInstrument.BASEDRUM)
+        )
+    )
 
     @JvmField
     val BLACK_APRICORN = apricornBlock("black_apricorn", Apricorn.BLACK)
@@ -388,48 +480,176 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val YELLOW_APRICORN = apricornBlock("yellow_apricorn", Apricorn.YELLOW)
 
     @JvmField
-    val RELIC_COIN_POUCH = create("relic_coin_pouch", CoinPouchBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.RELIC_COIN_POUCH_SOUNDS).pushReaction(PushReaction.DESTROY).noOcclusion(), true))
+    val RELIC_COIN_POUCH = create(
+        "relic_coin_pouch",
+        CoinPouchBlock(
+            BlockBehaviour.Properties.of()
+                .sound(CobblemonSounds.RELIC_COIN_POUCH_SOUNDS)
+                .pushReaction(PushReaction.DESTROY)
+                .strength(0.4f)
+                .noOcclusion(), true
+        )
+    )
     @JvmField
-    val RELIC_COIN_SACK = create("relic_coin_sack", CoinPouchBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.RELIC_COIN_SACK_SOUNDS).pushReaction(PushReaction.DESTROY).strength(0.4f), false))
+    val RELIC_COIN_SACK = create(
+        "relic_coin_sack",
+        CoinPouchBlock(
+            BlockBehaviour.Properties.of()
+                .sound(CobblemonSounds.RELIC_COIN_SACK_SOUNDS)
+                .pushReaction(PushReaction.DESTROY)
+                .strength(0.4f), false
+        ))
 
     @JvmField
-    val GILDED_CHEST = create("gilded_chest", GildedChestBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS), GildedChestBlock.Type.RED))
-    @JvmField
-    val BLUE_GILDED_CHEST = create("blue_gilded_chest", GildedChestBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS), GildedChestBlock.Type.BLUE))
-    @JvmField
-    val BLACK_GILDED_CHEST = create("black_gilded_chest", GildedChestBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS), GildedChestBlock.Type.BLACK))
-    @JvmField
-    val YELLOW_GILDED_CHEST = create("yellow_gilded_chest", GildedChestBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS), GildedChestBlock.Type.YELLOW))
-    @JvmField
-    val WHITE_GILDED_CHEST = create("white_gilded_chest", GildedChestBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS), GildedChestBlock.Type.WHITE))
-    @JvmField
-    val GREEN_GILDED_CHEST = create("green_gilded_chest", GildedChestBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS), GildedChestBlock.Type.GREEN))
-    @JvmField
-    val PINK_GILDED_CHEST = create("pink_gilded_chest", GildedChestBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS), GildedChestBlock.Type.PINK))
-    @JvmField
-    val GIMMIGHOUL_CHEST = create("gimmighoul_chest", GildedChestBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS), GildedChestBlock.Type.FAKE))
+    val GILDED_CHEST = create(
+        "gilded_chest",
+        GildedChestBlock(
+            BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS),
+            GildedChestBlock.Type.RED
+        )
+    )
 
     @JvmField
-    val MONITOR = create("monitor", MonitorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(5.0F, 6.0F).lightLevel { if (it.getValue(MonitorBlock.SCREEN) != MonitorBlock.MonitorScreen.OFF) 15 else 0 }))
-    @JvmField
-    val FOSSIL_ANALYZER = create("fossil_analyzer", FossilAnalyzerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(5.0F, 6.0F).noOcclusion()))
-    @JvmField
-    val RESTORATION_TANK = create("restoration_tank", RestorationTankBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.GLASS).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(5.0F, 6.0F).noOcclusion()))
+    val BLUE_GILDED_CHEST = create(
+        "blue_gilded_chest",
+        GildedChestBlock(
+            BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS),
+            GildedChestBlock.Type.BLUE
+        )
+    )
 
     @JvmField
-    val HEALING_MACHINE = create("healing_machine", HealingMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2f).noOcclusion().lightLevel { if (it.getValue(HealingMachineBlock.CHARGE_LEVEL) >= HealingMachineBlock.MAX_CHARGE_LEVEL) 7 else 2 }))
+    val BLACK_GILDED_CHEST = create(
+        "black_gilded_chest",
+        GildedChestBlock(
+            BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS),
+            GildedChestBlock.Type.BLACK
+        )
+    )
 
     @JvmField
-    val PC = create("pc", PCBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2F).noOcclusion().lightLevel { if ((it.getValue(PCBlock.ON) as Boolean) && (it.getValue(PCBlock.PART) == PCBlock.PCPart.TOP)) 10 else 0 }))
+    val YELLOW_GILDED_CHEST = create(
+        "yellow_gilded_chest",
+        GildedChestBlock(
+            BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS),
+            GildedChestBlock.Type.YELLOW
+        )
+    )
 
     @JvmField
-    val LECTERN = create("lectern", LecternBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).sound(SoundType.WOOD).strength(2.5F).ignitedByLava()))
+    val WHITE_GILDED_CHEST = create(
+        "white_gilded_chest",
+        GildedChestBlock(
+            BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS),
+            GildedChestBlock.Type.WHITE
+        )
+    )
 
     @JvmField
-    val DISPLAY_CASE = create("display_case", DisplayCaseBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.DISPLAY_CASE_SOUNDS).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.STONE).strength(0.3F)))
+    val GREEN_GILDED_CHEST = create(
+        "green_gilded_chest",
+        GildedChestBlock(
+            BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS),
+            GildedChestBlock.Type.GREEN
+        )
+    )
 
     @JvmField
-    val PASTURE = create("pasture", PastureBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).sound(SoundType.WOOD).strength(2F).noOcclusion().pushReaction(PushReaction.BLOCK).lightLevel { if ((it.getValue(PastureBlock.ON) as Boolean) && (it.getValue(PastureBlock.PART) == PastureBlock.PasturePart.TOP)) 10 else 0 }))
+    val PINK_GILDED_CHEST = create(
+        "pink_gilded_chest",
+        GildedChestBlock(
+            BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS),
+            GildedChestBlock.Type.PINK
+        )
+    )
+
+    @JvmField
+    val GIMMIGHOUL_CHEST = create(
+        "gimmighoul_chest",
+        GildedChestBlock(
+            BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS),
+            GildedChestBlock.Type.FAKE
+        )
+    )
+
+    @JvmField
+    val MONITOR = create(
+        "monitor",
+        MonitorBlock(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.METAL)
+                .sound(SoundType.METAL)
+                .pushReaction(PushReaction.BLOCK)
+                .requiresCorrectToolForDrops()
+                .strength(5.0F, 6.0F)
+                .lightLevel { if (it.getValue(MonitorBlock.SCREEN) != MonitorBlock.MonitorScreen.OFF) 15 else 0 }
+        )
+    )
+    @JvmField
+    val FOSSIL_ANALYZER = create(
+        "fossil_analyzer",
+        FossilAnalyzerBlock(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.METAL)
+                .sound(SoundType.METAL)
+                .pushReaction(PushReaction.BLOCK)
+                .requiresCorrectToolForDrops()
+                .strength(5.0F, 6.0F)
+                .noOcclusion()
+        )
+    )
+    @JvmField
+    val RESTORATION_TANK = create(
+        "restoration_tank",
+        RestorationTankBlock(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.METAL)
+                .sound(SoundType.GLASS)
+                .pushReaction(PushReaction.BLOCK)
+                .requiresCorrectToolForDrops()
+                .strength(5.0F, 6.0F)
+                .noOcclusion()
+        )
+    )
+    @JvmField
+    val HEALING_MACHINE = create(
+        "healing_machine",
+        HealingMachineBlock(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.METAL)
+                .sound(SoundType.METAL)
+                .pushReaction(PushReaction.BLOCK)
+                .strength(2f)
+                .noOcclusion()
+                .lightLevel { if (it.getValue(HealingMachineBlock.CHARGE_LEVEL) >= HealingMachineBlock.MAX_CHARGE_LEVEL) 7 else 2 }
+        )
+    )
+    @JvmField
+    val PC = create(
+        "pc",
+        PCBlock(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.METAL)
+                .sound(SoundType.METAL)
+                .pushReaction(PushReaction.BLOCK)
+                .strength(2F)
+                .noOcclusion()
+                .lightLevel { if ((it.getValue(PCBlock.ON) as Boolean) && (it.getValue(PCBlock.PART) == PCBlock.PCPart.TOP)) 10 else 0 }
+        )
+    )
+
+    @JvmField
+    val DISPLAY_CASE = create(
+        "display_case",
+        DisplayCaseBlock(
+            BlockBehaviour.Properties.of()
+                .sound(CobblemonSounds.DISPLAY_CASE_SOUNDS)
+                .noOcclusion()
+                .pushReaction(PushReaction.BLOCK)
+                .mapColor(MapColor.STONE)
+                .strength(0.3f)
+        )
+    )
 
     val RED_MINT = create("red_mint", MintBlock(MintType.RED, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MINT_SOUNDS).pushReaction(PushReaction.DESTROY)))
     @JvmField
@@ -443,6 +663,20 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val WHITE_MINT = create("white_mint", MintBlock(MintType.WHITE, BlockBehaviour.Properties.of().mapColor(MapColor.SNOW).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MINT_SOUNDS).pushReaction(PushReaction.DESTROY)))
 
+    @JvmField
+    val PASTURE = create(
+        "pasture",
+        PastureBlock(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.COLOR_BROWN)
+                .sound(SoundType.WOOD)
+                .strength(2F)
+                .noOcclusion()
+                .pushReaction(PushReaction.BLOCK)
+                .lightLevel { if ((it.getValue(PastureBlock.ON) as Boolean) && (it.getValue(PastureBlock.PART) == PastureBlock.PasturePart.TOP)) 10 else 0 }
+        )
+    )
+
     @JvmField
     val VIVICHOKE_SEEDS = this.create("vivichoke_seeds", VivichokeBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.PLANT).noCollission().randomTicks().instabreak().sound(CobblemonSounds.VIVICHOKE_SOUNDS)))
     @JvmField

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

@@ -1,58 +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
-
-import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.api.ai.config.BrainConfig
-import com.cobblemon.mod.common.api.ai.config.task.TaskConfig
-import com.cobblemon.mod.common.api.data.DataRegistry
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.util.adapters.ActivityAdapter
-import com.cobblemon.mod.common.util.adapters.BrainConfigAdapter
-import com.cobblemon.mod.common.util.adapters.ExpressionAdapter
-import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
-import com.cobblemon.mod.common.util.adapters.TaskConfigAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-import net.minecraft.world.entity.schedule.Activity
-
-object CobblemonBrainConfigs : JsonDataRegistry<List<BrainConfig>> {
-    override val gson: Gson = GsonBuilder()
-        .setPrettyPrinting()
-        .registerTypeAdapter(Activity::class.java, ActivityAdapter)
-        .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
-        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
-        .registerTypeAdapter(BrainConfig::class.java, BrainConfigAdapter)
-        .registerTypeAdapter(TaskConfig::class.java, TaskConfigAdapter)
-        .create()
-
-    override val typeToken = TypeToken.getParameterized(List::class.java, BrainConfig::class.java) as TypeToken<List<BrainConfig>>
-    override val resourcePath = "brain_presets"
-    override val id: ResourceLocation = cobblemonResource("brain_presets")
-    override val type = PackType.SERVER_DATA
-    override val observable = SimpleObservable<CobblemonBrainConfigs>()
-
-    val presets = mutableMapOf<ResourceLocation, List<BrainConfig>>()
-
-    override fun sync(player: ServerPlayer) {
-        // TODO implement probs ay
-    }
-
-    override fun reload(data: Map<ResourceLocation, List<BrainConfig>>) {
-        presets.clear()
-        presets.putAll(data)
-    }
-}

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

@@ -17,10 +17,8 @@ import net.minecraft.commands.Commands
 object CobblemonCommands {
     fun register(dispatcher: CommandDispatcher<CommandSourceStack>, registry: CommandBuildContext, selection: Commands.CommandSelection) {
         SpawnPokemon.register(dispatcher)
-        SpawnNPCCommand.register(dispatcher)
         GivePokemon.register(dispatcher)
         TakePokemon.register(dispatcher)
-        ChangeEyeHeight.register(dispatcher)
         ChangeScaleAndSize.register(dispatcher)
         ChangeWalkSpeed.register(dispatcher)
         TestCommand.register(dispatcher)
@@ -41,7 +39,6 @@ object CobblemonCommands {
         PcCommand.register(dispatcher)
         SpawnPokemonFromPool.register(dispatcher)
         PokeboxCommand.register(dispatcher)
-        PokedexCommand.register(dispatcher)
         TestStoreCommand.register(dispatcher)
         QueryLearnsetCommand.register(dispatcher)
         TestPcSlotCommand.register(dispatcher)
@@ -52,10 +49,7 @@ object CobblemonCommands {
         BedrockParticleCommand.register(dispatcher)
         OpenDialogueCommand.register(dispatcher)
         NPCEditCommand.register(dispatcher)
-        NPCDeleteCommand.register(dispatcher)
         AbandonMultiTeam.register(dispatcher)
-        FreezePokemonCommand.register(dispatcher)
-        ApplyPlayerTextureCommand.register(dispatcher)
 
         // Possibly lock down registration if and only if under dev environment or running in an environment
         // with a certain system environment variable set

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

@@ -97,12 +97,6 @@ interface CobblemonImplementation {
      */
     fun registerBlockEntityTypes()
 
-    /**
-     * TODO
-     *
-     */
-    fun registerVillagers()
-
     /**
      * TODO
      *

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

@@ -19,7 +19,6 @@ import com.cobblemon.mod.common.api.text.gray
 import com.cobblemon.mod.common.block.BerryBlock
 import com.cobblemon.mod.common.block.MintBlock
 import com.cobblemon.mod.common.block.MintBlock.MintType
-import com.cobblemon.mod.common.client.pokedex.PokedexType
 import com.cobblemon.mod.common.entity.boat.CobblemonBoatType
 import com.cobblemon.mod.common.item.*
 import com.cobblemon.mod.common.item.armor.CobblemonArmorTrims
@@ -153,22 +152,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val ANCIENT_ORIGIN_BALL = pokeBallItem(PokeBalls.ANCIENT_ORIGIN_BALL)
 
-    val pokedexes = mutableListOf<PokedexItem>()
-    @JvmField
-    val POKEDEX_RED = pokedexItem(PokedexType.RED)
-    @JvmField
-    val POKEDEX_YELLOW = pokedexItem(PokedexType.YELLOW)
-    @JvmField
-    val POKEDEX_GREEN = pokedexItem(PokedexType.GREEN)
-    @JvmField
-    val POKEDEX_BLUE = pokedexItem(PokedexType.BLUE)
-    @JvmField
-    val POKEDEX_PINK = pokedexItem(PokedexType.PINK)
-    @JvmField
-    val POKEDEX_BLACK = pokedexItem(PokedexType.BLACK)
-    @JvmField
-    val POKEDEX_WHITE = pokedexItem(PokedexType.WHITE)
-
     @JvmField
     val VIVICHOKE = compostableItem("vivichoke")
 
@@ -273,8 +256,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     val PASTURE = blockItem("pasture", CobblemonBlocks.PASTURE)
     @JvmField
     val DISPLAY_CASE = blockItem("display_case", CobblemonBlocks.DISPLAY_CASE)
-    @JvmField
-    val LECTERN = blockItem("lectern", CobblemonBlocks.LECTERN)
 
     // Evolution items
     @JvmField val LINK_CABLE = create("link_cable", LinkCableItem())
@@ -981,12 +962,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val CHISELED_POLISHED_TUMBLESTONE = blockItem("chiseled_polished_tumblestone", CobblemonBlocks.CHISELED_POLISHED_TUMBLESTONE)
     @JvmField
-    val SMOOTH_TUMBLESTONE = blockItem("smooth_tumblestone", CobblemonBlocks.SMOOTH_TUMBLESTONE)
-    @JvmField
-    val SMOOTH_TUMBLESTONE_STAIRS = blockItem("smooth_tumblestone_stairs", CobblemonBlocks.SMOOTH_TUMBLESTONE_STAIRS)
-    @JvmField
-    val SMOOTH_TUMBLESTONE_SLAB = blockItem("smooth_tumblestone_slab", CobblemonBlocks.SMOOTH_TUMBLESTONE_SLAB)
-    @JvmField
     val TUMBLESTONE_BRICKS = blockItem("tumblestone_bricks", CobblemonBlocks.TUMBLESTONE_BRICKS)
     @JvmField
     val TUMBLESTONE_BRICK_STAIRS = blockItem("tumblestone_brick_stairs", CobblemonBlocks.TUMBLESTONE_BRICK_STAIRS)
@@ -1007,12 +982,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val CHISELED_POLISHED_SKY_TUMBLESTONE = blockItem("chiseled_polished_sky_tumblestone", CobblemonBlocks.CHISELED_POLISHED_SKY_TUMBLESTONE)
     @JvmField
-    val SMOOTH_SKY_TUMBLESTONE = blockItem("smooth_sky_tumblestone", CobblemonBlocks.SMOOTH_SKY_TUMBLESTONE)
-    @JvmField
-    val SMOOTH_SKY_TUMBLESTONE_STAIRS = blockItem("smooth_sky_tumblestone_stairs", CobblemonBlocks.SMOOTH_SKY_TUMBLESTONE_STAIRS)
-    @JvmField
-    val SMOOTH_SKY_TUMBLESTONE_SLAB = blockItem("smooth_sky_tumblestone_slab", CobblemonBlocks.SMOOTH_SKY_TUMBLESTONE_SLAB)
-    @JvmField
     val SKY_TUMBLESTONE_BRICKS = blockItem("sky_tumblestone_bricks", CobblemonBlocks.SKY_TUMBLESTONE_BRICKS)
     @JvmField
     val SKY_TUMBLESTONE_BRICK_STAIRS = blockItem("sky_tumblestone_brick_stairs", CobblemonBlocks.SKY_TUMBLESTONE_BRICK_STAIRS)
@@ -1033,12 +1002,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val CHISELED_POLISHED_BLACK_TUMBLESTONE = blockItem("chiseled_polished_black_tumblestone", CobblemonBlocks.CHISELED_POLISHED_BLACK_TUMBLESTONE)
     @JvmField
-    val SMOOTH_BLACK_TUMBLESTONE = blockItem("smooth_black_tumblestone", CobblemonBlocks.SMOOTH_BLACK_TUMBLESTONE)
-    @JvmField
-    val SMOOTH_BLACK_TUMBLESTONE_STAIRS = blockItem("smooth_black_tumblestone_stairs", CobblemonBlocks.SMOOTH_BLACK_TUMBLESTONE_STAIRS)
-    @JvmField
-    val SMOOTH_BLACK_TUMBLESTONE_SLAB = blockItem("smooth_black_tumblestone_slab", CobblemonBlocks.SMOOTH_BLACK_TUMBLESTONE_SLAB)
-    @JvmField
     val BLACK_TUMBLESTONE_BRICKS = blockItem("black_tumblestone_bricks", CobblemonBlocks.BLACK_TUMBLESTONE_BRICKS)
     @JvmField
     val BLACK_TUMBLESTONE_BRICK_STAIRS = blockItem("black_tumblestone_brick_stairs", CobblemonBlocks.BLACK_TUMBLESTONE_BRICK_STAIRS)
@@ -1049,27 +1012,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val CHISELED_BLACK_TUMBLESTONE_BRICKS = blockItem("chiseled_black_tumblestone_bricks", CobblemonBlocks.CHISELED_BLACK_TUMBLESTONE_BRICKS)
 
-    @JvmField
-    val FIRE_STONE_BLOCK = blockItem("fire_stone_block", CobblemonBlocks.FIRE_STONE_BLOCK)
-    @JvmField
-    val WATER_STONE_BLOCK = blockItem("water_stone_block", CobblemonBlocks.WATER_STONE_BLOCK)
-    @JvmField
-    val THUNDER_STONE_BLOCK = blockItem("thunder_stone_block", CobblemonBlocks.THUNDER_STONE_BLOCK)
-    @JvmField
-    val LEAF_STONE_BLOCK = blockItem("leaf_stone_block", CobblemonBlocks.LEAF_STONE_BLOCK)
-    @JvmField
-    val ICE_STONE_BLOCK = blockItem("ice_stone_block", CobblemonBlocks.ICE_STONE_BLOCK)
-    @JvmField
-    val SUN_STONE_BLOCK = blockItem("sun_stone_block", CobblemonBlocks.SUN_STONE_BLOCK)
-    @JvmField
-    val MOON_STONE_BLOCK = blockItem("moon_stone_block", CobblemonBlocks.MOON_STONE_BLOCK)
-    @JvmField
-    val SHINY_STONE_BLOCK = blockItem("shiny_stone_block", CobblemonBlocks.SHINY_STONE_BLOCK)
-    @JvmField
-    val DAWN_STONE_BLOCK = blockItem("dawn_stone_block", CobblemonBlocks.DAWN_STONE_BLOCK)
-    @JvmField
-    val DUSK_STONE_BLOCK = blockItem("dusk_stone_block", CobblemonBlocks.DUSK_STONE_BLOCK)
-
     @JvmField
     val AUTOMATON_ARMOR_TRIM_SMITHING_TEMPLATE: SmithingTemplateItem = this.create(
         "automaton_armor_trim_smithing_template",
@@ -1224,80 +1166,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     //@JvmField
     //val BINDING_SOIL = blockItem("binding_soil", CobblemonBlocks.BINDING_SOIL)
 
-    @JvmField
-    val GEM_BUG_BLOCK = blockItem("gem_bug_block", CobblemonBlocks.GEM_BUG_BLOCK)
-    @JvmField
-    val GEM_DARK_BLOCK = blockItem("gem_dark_block", CobblemonBlocks.GEM_DARK_BLOCK)
-    @JvmField
-    val GEM_DRAGON_BLOCK = blockItem("gem_dragon_block", CobblemonBlocks.GEM_DRAGON_BLOCK)
-    @JvmField
-    val GEM_ELECTRIC_BLOCK = blockItem("gem_electric_block", CobblemonBlocks.GEM_ELECTRIC_BLOCK)
-    @JvmField
-    val GEM_FAIRY_BLOCK = blockItem("gem_fairy_block", CobblemonBlocks.GEM_FAIRY_BLOCK)
-    @JvmField
-    val GEM_FIGHTING_BLOCK = blockItem("gem_fighting_block", CobblemonBlocks.GEM_FIGHTING_BLOCK)
-    @JvmField
-    val GEM_FIRE_BLOCK = blockItem("gem_fire_block", CobblemonBlocks.GEM_FIRE_BLOCK)
-    @JvmField
-    val GEM_FLYING_BLOCK = blockItem("gem_flying_block", CobblemonBlocks.GEM_FLYING_BLOCK)
-    @JvmField
-    val GEM_GHOST_BLOCK = blockItem("gem_ghost_block", CobblemonBlocks.GEM_GHOST_BLOCK)
-    @JvmField
-    val GEM_GRASS_BLOCK = blockItem("gem_grass_block", CobblemonBlocks.GEM_GRASS_BLOCK)
-    @JvmField
-    val GEM_GROUND_BLOCK = blockItem("gem_ground_block", CobblemonBlocks.GEM_GROUND_BLOCK)
-    @JvmField
-    val GEM_ICE_BLOCK = blockItem("gem_ice_block", CobblemonBlocks.GEM_ICE_BLOCK)
-    @JvmField
-    val GEM_NORMAL_BLOCK = blockItem("gem_normal_block", CobblemonBlocks.GEM_NORMAL_BLOCK)
-    @JvmField
-    val GEM_POISON_BLOCK = blockItem("gem_poison_block", CobblemonBlocks.GEM_POISON_BLOCK)
-    @JvmField
-    val GEM_PSYCHIC_BLOCK = blockItem("gem_psychic_block", CobblemonBlocks.GEM_PSYCHIC_BLOCK)
-    @JvmField
-    val GEM_ROCK_BLOCK = blockItem("gem_rock_block", CobblemonBlocks.GEM_ROCK_BLOCK)
-    @JvmField
-    val GEM_STEEL_BLOCK = blockItem("gem_steel_block", CobblemonBlocks.GEM_STEEL_BLOCK)
-    @JvmField
-    val GEM_WATER_BLOCK = blockItem("gem_water_block", CobblemonBlocks.GEM_WATER_BLOCK)
-
-    @JvmField
-    val GEM_BUG_BUDDING = blockItem("gem_bug_budding", CobblemonBlocks.GEM_BUG_BUDDING)
-    @JvmField
-    val GEM_DARK_BUDDING = blockItem("gem_dark_budding", CobblemonBlocks.GEM_DARK_BUDDING)
-    @JvmField
-    val GEM_DRAGON_BUDDING = blockItem("gem_dragon_budding", CobblemonBlocks.GEM_DRAGON_BUDDING)
-    @JvmField
-    val GEM_ELECTRIC_BUDDING = blockItem("gem_electric_budding", CobblemonBlocks.GEM_ELECTRIC_BUDDING)
-    @JvmField
-    val GEM_FAIRY_BUDDING = blockItem("gem_fairy_budding", CobblemonBlocks.GEM_FAIRY_BUDDING)
-    @JvmField
-    val GEM_FIGHTING_BUDDING = blockItem("gem_fighting_budding", CobblemonBlocks.GEM_FIGHTING_BUDDING)
-    @JvmField
-    val GEM_FIRE_BUDDING = blockItem("gem_fire_budding", CobblemonBlocks.GEM_FIRE_BUDDING)
-    @JvmField
-    val GEM_FLYING_BUDDING = blockItem("gem_flying_budding", CobblemonBlocks.GEM_FLYING_BUDDING)
-    @JvmField
-    val GEM_GHOST_BUDDING = blockItem("gem_ghost_budding", CobblemonBlocks.GEM_GHOST_BUDDING)
-    @JvmField
-    val GEM_GRASS_BUDDING = blockItem("gem_grass_budding", CobblemonBlocks.GEM_GRASS_BUDDING)
-    @JvmField
-    val GEM_GROUND_BUDDING = blockItem("gem_ground_budding", CobblemonBlocks.GEM_GROUND_BUDDING)
-    @JvmField
-    val GEM_ICE_BUDDING = blockItem("gem_ice_budding", CobblemonBlocks.GEM_ICE_BUDDING)
-    @JvmField
-    val GEM_NORMAL_BUDDING = blockItem("gem_normal_budding", CobblemonBlocks.GEM_NORMAL_BUDDING)
-    @JvmField
-    val GEM_POISON_BUDDING = blockItem("gem_poison_budding", CobblemonBlocks.GEM_POISON_BUDDING)
-    @JvmField
-    val GEM_PSYCHIC_BUDDING = blockItem("gem_psychic_budding", CobblemonBlocks.GEM_PSYCHIC_BUDDING)
-    @JvmField
-    val GEM_ROCK_BUDDING = blockItem("gem_rock_budding", CobblemonBlocks.GEM_ROCK_BUDDING)
-    @JvmField
-    val GEM_STEEL_BUDDING = blockItem("gem_steel_budding", CobblemonBlocks.GEM_STEEL_BUDDING)
-    @JvmField
-    val GEM_WATER_BUDDING = blockItem("gem_water_budding", CobblemonBlocks.GEM_WATER_BUDDING)
-
     private fun blockItem(name: String, block: Block): BlockItem = this.create(name, BlockItem(block, Item.Properties()))
 
     private fun noSettingsItem(name: String): CobblemonItem = this.create(name, CobblemonItem(Item.Properties()))
@@ -1316,18 +1184,12 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     private fun candyItem(name: String, calculator: CandyItem.Calculator): CandyItem  = this.create(name, CandyItem(calculator))
 
     private fun pokerodItem(pokeRodId: ResourceLocation): PokerodItem {
-        val settings = Item.Properties().stacksTo(1).durability(256)
+        val settings = Item.Properties().stacksTo(1).durability(Items.FISHING_ROD.components().get(DataComponents.MAX_DAMAGE)!!)
         val item = create(pokeRodId.path, PokerodItem(pokeRodId, settings))
         pokeRods.add(item)
         return item
     }
 
-    private fun pokedexItem(type: PokedexType): PokedexItem {
-        val item = create("pokedex_${type.name.lowercase()}", PokedexItem(type))
-        pokedexes.add(item)
-        return item
-    }
-
     private fun heldItem(name: String, remappedName: String? = null): CobblemonItem = create(
         name,
         CobblemonItem(Item.Properties()).also {

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

@@ -8,8 +8,6 @@
 
 package com.cobblemon.mod.common
 
-import com.cobblemon.mod.common.api.dialogue.ActiveDialogue
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.ListCodec
 import com.mojang.serialization.codecs.PrimitiveCodec
@@ -22,8 +20,6 @@ object CobblemonMemories {
 
     val BATTLING_POKEMON = register("battling_pokemon", ListCodec(UUIDUtil.CODEC, 0, 31))
     val NPC_BATTLING = register("npc_battling", PrimitiveCodec.BOOL)
-    val DIALOGUES = register<List<ActiveDialogue>>("npc_dialogues")
-    val ACTIVE_ACTION_EFFECT = register<ActionEffectContext>("active_action_effect")
 
     fun <U> register(id: String, codec: Codec<U>): MemoryModuleType<U> {
         val memoryModule = MemoryModuleType(Optional.of(codec))

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

@@ -24,7 +24,6 @@ import com.cobblemon.mod.common.client.net.effect.RunPosableMoLangHandler
 import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormEntityParticleHandler
 import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormParticleHandler
 import com.cobblemon.mod.common.client.net.gui.InteractPokemonUIPacketHandler
-import com.cobblemon.mod.common.client.net.gui.PokedexUIPacketHandler
 import com.cobblemon.mod.common.client.net.gui.SummaryUIPacketHandler
 import com.cobblemon.mod.common.client.net.npc.CloseNPCEditorHandler
 import com.cobblemon.mod.common.client.net.npc.OpenNPCEditorHandler
@@ -32,7 +31,6 @@ import com.cobblemon.mod.common.client.net.pasture.ClosePastureHandler
 import com.cobblemon.mod.common.client.net.pasture.OpenPastureHandler
 import com.cobblemon.mod.common.client.net.pasture.PokemonPasturedHandler
 import com.cobblemon.mod.common.client.net.pasture.PokemonUnpasturedHandler
-import com.cobblemon.mod.common.client.net.pokedex.ServerConfirmedRegisterHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.PokemonUpdatePacketHandler
 import com.cobblemon.mod.common.client.net.settings.ServerSettingsPacketHandler
 import com.cobblemon.mod.common.client.net.sound.UnvalidatedPlaySoundS2CPacketHandler
@@ -51,7 +49,13 @@ import com.cobblemon.mod.common.client.net.storage.pc.OpenPCHandler
 import com.cobblemon.mod.common.client.net.storage.pc.SetPCBoxPokemonHandler
 import com.cobblemon.mod.common.client.net.storage.pc.SetPCPokemonHandler
 import com.cobblemon.mod.common.client.net.toast.ToastPacketHandler
-import com.cobblemon.mod.common.client.net.trade.*
+import com.cobblemon.mod.common.client.net.trade.TradeAcceptanceChangedHandler
+import com.cobblemon.mod.common.client.net.trade.TradeCancelledHandler
+import com.cobblemon.mod.common.client.net.trade.TradeCompletedHandler
+import com.cobblemon.mod.common.client.net.trade.TradeOfferExpiredHandler
+import com.cobblemon.mod.common.client.net.trade.TradeOfferNotificationHandler
+import com.cobblemon.mod.common.client.net.trade.TradeStartedHandler
+import com.cobblemon.mod.common.client.net.trade.TradeUpdatedHandler
 import com.cobblemon.mod.common.net.PacketRegisterInfo
 import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket
 import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
@@ -81,23 +85,36 @@ import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.Rem
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
 import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
 import com.cobblemon.mod.common.net.messages.client.spawn.SpawnGenericBedrockPacket
-import com.cobblemon.mod.common.net.messages.client.spawn.SpawnNPCPacket
 import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokeballPacket
 import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.starter.OpenStarterUIPacket
-import com.cobblemon.mod.common.net.messages.client.SetClientPlayerDataPacket
+import com.cobblemon.mod.common.net.messages.client.starter.SetClientPlayerDataPacket
 import com.cobblemon.mod.common.net.messages.client.storage.RemoveClientPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.SwapClientPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.InitializePartyPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.MoveClientPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyReferencePacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.*
+import com.cobblemon.mod.common.net.messages.client.storage.pc.ClosePCPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.InitializePCPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.MoveClientPCPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.OpenPCPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCBoxPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.toast.ToastPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeAcceptanceChangedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeCancelledPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeCompletedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferExpiredPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferNotificationPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeStartedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeUpdatedPacket
 import com.cobblemon.mod.common.net.messages.client.ui.InteractPokemonUIPacket
-import com.cobblemon.mod.common.net.messages.client.ui.PokedexUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
 import com.cobblemon.mod.common.net.messages.server.*
+import com.cobblemon.mod.common.net.messages.server.battle.BattleSelectActionsPacket
+import com.cobblemon.mod.common.net.messages.server.battle.RemoveSpectatorPacket
+import com.cobblemon.mod.common.net.messages.server.battle.SpectateBattlePacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectedPacket
 import com.cobblemon.mod.common.net.messages.server.callback.party.PartyPokemonSelectedPacket
@@ -110,7 +127,6 @@ import com.cobblemon.mod.common.net.messages.server.npc.SaveNPCPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.PasturePokemonPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.UnpastureAllPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.UnpasturePokemonPacket
-import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.StartScanningPacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.interact.InteractPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetNicknamePacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
@@ -125,7 +141,15 @@ import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePartyPokemonT
 import com.cobblemon.mod.common.net.messages.server.storage.pc.ReleasePCPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.pc.SwapPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.pc.UnlinkPlayerFromPCPacket
+import com.cobblemon.mod.common.net.messages.server.trade.AcceptTradeRequestPacket
+import com.cobblemon.mod.common.net.messages.server.trade.CancelTradePacket
+import com.cobblemon.mod.common.net.messages.server.trade.ChangeTradeAcceptancePacket
+import com.cobblemon.mod.common.net.messages.server.trade.OfferTradePacket
+import com.cobblemon.mod.common.net.messages.server.trade.UpdateTradeOfferPacket
 import com.cobblemon.mod.common.net.serverhandling.*
+import com.cobblemon.mod.common.net.serverhandling.battle.BattleSelectActionsHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.RemoveSpectatorHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.SpectateBattleHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectCancelledHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectedHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.party.PartyPokemonSelectedHandler
@@ -161,17 +185,6 @@ import com.cobblemon.mod.common.net.serverhandling.trade.CancelTradeHandler
 import com.cobblemon.mod.common.net.serverhandling.trade.ChangeTradeAcceptanceHandler
 import com.cobblemon.mod.common.net.serverhandling.trade.OfferTradeHandler
 import com.cobblemon.mod.common.net.serverhandling.trade.UpdateTradeOfferHandler
-import com.cobblemon.mod.common.net.messages.server.battle.*
-import com.cobblemon.mod.common.net.serverhandling.battle.*
-import com.cobblemon.mod.common.net.messages.client.pokedex.ServerConfirmedRegisterPacket
-import com.cobblemon.mod.common.net.messages.client.trade.*
-import com.cobblemon.mod.common.net.messages.server.block.AdjustBlockEntityViewerCountPacket
-import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.FinishScanningPacket
-import com.cobblemon.mod.common.net.messages.server.trade.*
-import com.cobblemon.mod.common.net.serverhandling.block.AdjustBlockEntityViewerCountHandler
-import com.cobblemon.mod.common.net.serverhandling.pokedex.scanner.FinishScanningHandler
-import com.cobblemon.mod.common.net.serverhandling.pokedex.scanner.StartScanningHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.*
 import com.cobblemon.mod.common.util.server
 import net.minecraft.server.level.ServerPlayer
 
@@ -251,7 +264,6 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(SummaryUIPacket.ID, SummaryUIPacket::decode, SummaryUIPacketHandler))
         list.add(PacketRegisterInfo(InteractPokemonUIPacket.ID, InteractPokemonUIPacket::decode, InteractPokemonUIPacketHandler))
         list.add(PacketRegisterInfo(PlayerInteractOptionsPacket.ID, PlayerInteractOptionsPacket::decode, PlayerInteractOptionsHandler))
-        list.add(PacketRegisterInfo(PokedexUIPacket.ID, PokedexUIPacket::decode, PokedexUIPacketHandler))
 
         // Starter packets
         list.add(PacketRegisterInfo(OpenStarterUIPacket.ID, OpenStarterUIPacket::decode, StarterUIPacketHandler))
@@ -305,8 +317,6 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(NPCRegistrySyncPacket.ID, NPCRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(PokeRodRegistrySyncPacket.ID, PokeRodRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(ScriptRegistrySyncPacket.ID, ScriptRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(PokedexDexSyncPacket.ID, PokedexDexSyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(DexEntrySyncPacket.ID, DexEntrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(FishingBaitRegistrySyncPacket.ID, FishingBaitRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
 
         // Effects
@@ -318,13 +328,11 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(UnvalidatedPlaySoundS2CPacket.ID, UnvalidatedPlaySoundS2CPacket::decode, UnvalidatedPlaySoundS2CPacketHandler))
         list.add(PacketRegisterInfo(SpawnPokemonPacket.ID, SpawnPokemonPacket::decode, SpawnExtraDataEntityHandler()))
         list.add(PacketRegisterInfo(SpawnPokeballPacket.ID, SpawnPokeballPacket::decode, SpawnExtraDataEntityHandler()))
-        list.add(PacketRegisterInfo(SpawnGenericBedrockPacket.ID, SpawnGenericBedrockPacket::decode, SpawnExtraDataEntityHandler()))
-        list.add(PacketRegisterInfo(SpawnNPCPacket.ID, SpawnNPCPacket::decode, SpawnExtraDataEntityHandler()))
         list.add(PacketRegisterInfo(ToastPacket.ID, ToastPacket::decode, ToastPacketHandler))
+        list.add(PacketRegisterInfo(SpawnGenericBedrockPacket.ID, SpawnGenericBedrockPacket::decode, SpawnExtraDataEntityHandler()))
 
         // Trade packets
         list.add(PacketRegisterInfo(TradeAcceptanceChangedPacket.ID, TradeAcceptanceChangedPacket::decode, TradeAcceptanceChangedHandler))
-        list.add(PacketRegisterInfo(TradeProcessStartedPacket.ID, TradeProcessStartedPacket::decode, TradeProcessStartedHandler))
         list.add(PacketRegisterInfo(TradeCancelledPacket.ID, TradeCancelledPacket::decode, TradeCancelledHandler))
         list.add(PacketRegisterInfo(TradeCompletedPacket.ID, TradeCompletedPacket::decode, TradeCompletedHandler))
         list.add(PacketRegisterInfo(TradeUpdatedPacket.ID, TradeUpdatedPacket::decode, TradeUpdatedHandler))
@@ -358,8 +366,6 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(CloseNPCEditorPacket.ID, CloseNPCEditorPacket::decode, CloseNPCEditorHandler))
         list.add(PacketRegisterInfo(OpenNPCEditorPacket.ID, OpenNPCEditorPacket::decode, OpenNPCEditorHandler))
 
-        // Pokédex scanning
-        list.add(PacketRegisterInfo(ServerConfirmedRegisterPacket.ID, ServerConfirmedRegisterPacket::decode, ServerConfirmedRegisterHandler))
         return list
     }
 
@@ -412,22 +418,14 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(AcceptTradeRequestPacket.ID, AcceptTradeRequestPacket::decode, AcceptTradeRequestHandler))
         list.add(PacketRegisterInfo(CancelTradePacket.ID, CancelTradePacket::decode, CancelTradeHandler))
         list.add(PacketRegisterInfo(ChangeTradeAcceptancePacket.ID, ChangeTradeAcceptancePacket::decode, ChangeTradeAcceptanceHandler))
-        list.add(PacketRegisterInfo(PerformTradePacket.ID, PerformTradePacket::decode, PerformTradeHandler))
         list.add(PacketRegisterInfo(OfferTradePacket.ID, OfferTradePacket::decode, OfferTradeHandler))
         list.add(PacketRegisterInfo(UpdateTradeOfferPacket.ID, UpdateTradeOfferPacket::decode, UpdateTradeOfferHandler))
 
-        // Pokédex scanning
-        list.add(PacketRegisterInfo(StartScanningPacket.ID, StartScanningPacket::decode, StartScanningHandler))
-        list.add(PacketRegisterInfo(FinishScanningPacket.ID, FinishScanningPacket::decode, FinishScanningHandler))
-
         // Pasture
         list.add(PacketRegisterInfo(PasturePokemonPacket.ID, PasturePokemonPacket::decode, PasturePokemonHandler))
         list.add(PacketRegisterInfo(UnpasturePokemonPacket.ID, UnpasturePokemonPacket::decode, UnpasturePokemonHandler))
         list.add(PacketRegisterInfo(UnpastureAllPokemonPacket.ID, UnpastureAllPokemonPacket::decode, UnpastureAllPokemonHandler))
 
-        // Block entity
-        list.add(PacketRegisterInfo(AdjustBlockEntityViewerCountPacket.ID, AdjustBlockEntityViewerCountPacket::decode, AdjustBlockEntityViewerCountHandler))
-
         // Move select packets
         list.add(PacketRegisterInfo(MoveSelectedPacket.ID, MoveSelectedPacket::decode, MoveSelectedHandler))
         list.add(PacketRegisterInfo(MoveSelectCancelledPacket.ID, MoveSelectCancelledPacket::decode, MoveSelectCancelledHandler))

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

@@ -25,8 +25,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
 
     @JvmField
     val GUI_CLICK = this.create("gui.click")
-    @JvmField
-    val GUI_TRADE = this.create("gui.trade")
 
     @JvmField
     val PC_ON = this.create("pc.on")
@@ -42,54 +40,35 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val PC_CLICK = this.create("pc.click")
 
     @JvmField
-    val VILLAGER_WORK_NURSE = this.create("entity.villager.work_nurse")
-    @JvmField
-    val HEALING_MACHINE_ACTIVE = this.create("block.healing_machine.active")
+    val HEALING_MACHINE_ACTIVE = this.create("healing_machine.active")
 
+    @JvmField
+    val POKE_BALL_CAPTURE_STARTED = this.create("poke_ball.capture_started")
+    @JvmField
+    val POKE_BALL_CAPTURE_SUCCEEDED = this.create("poke_ball.capture_succeeded")
+    @JvmField
+    val POKE_BALL_SHAKE = this.create("poke_ball.shake")
+    @JvmField
+    val POKE_BALL_OPEN = this.create("poke_ball.open")
     @JvmField
     val POKE_BALL_HIT = this.create("poke_ball.hit")
     @JvmField
     val POKE_BALL_SEND_OUT = this.create("poke_ball.send_out")
     @JvmField
-    val POKE_BALL_SHINY_SEND_OUT = this.create("poke_ball.shiny_send_out")
-    @JvmField
     val POKE_BALL_RECALL = this.create("poke_ball.recall")
     @JvmField
     val POKE_BALL_THROW = this.create("poke_ball.throw")
     @JvmField
     val POKE_BALL_TRAIL = this.create("poke_ball.trail")
 
-    @JvmField
-    val POKEDEX_OPEN = this.create("item.pokedex.open")
-    @JvmField
-    val POKEDEX_CLOSE = this.create("item.pokedex.close")
-    @JvmField
-    val POKEDEX_CLICK = this.create("item.pokedex.click")
-    @JvmField
-    val POKEDEX_CLICK_SHORT = this.create("item.pokedex.click_short")
-    @JvmField
-    val POKEDEX_SCAN_OPEN = this.create("item.pokedex.scan_open")
-    @JvmField
-    val POKEDEX_SCAN_CLOSE = this.create("item.pokedex.scan_close")
-    @JvmField
-    val POKEDEX_SCAN_LOOP = this.create("item.pokedex.scan_loop")
-    @JvmField
-    val POKEDEX_SCAN_DETAIL = this.create("item.pokedex.scan_detail")
-    @JvmField
-    val POKEDEX_SCAN_REGISTER_POKEMON = this.create("item.pokedex.scan_register_pokemon")
-    @JvmField
-    val POKEDEX_SCAN_REGISTER_ASPECT = this.create("item.pokedex.scan_register_aspect")
-    @JvmField
-    val POKEDEX_SCAN_ZOOM_INCREMENT = this.create("item.pokedex.scan_zoom_increment")
-
     @JvmField
     val ITEM_USE = this.create("item.use")
     @JvmField
-    val EVOLUTION_NOTIFICATION = this.create("evolution.notification")
+    val CAN_EVOLVE = this.create("pokemon.can_evolve")
     @JvmField
-    val EVOLUTION_UI = this.create("evolution.ui")
+    val EVOLVING = this.create("pokemon.evolving")
     @JvmField
-    val EVOLUTION = this.create("evolution.full")
+    val EVOLVE = this.create("evolution.evolve")
 
     @JvmField
     val PVN_BATTLE = this.create("battle.pvn.default")
@@ -99,58 +78,61 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val PVW_BATTLE = this.create("battle.pvw.default")
 
     @JvmField
-    val MEDICINE_CANDY_USE = this.create("item.medicine.candy.use")
+    val MEDICINE_HERB_USE = this.create("medicine_herb.use")
     @JvmField
-    val MEDICINE_HERB_USE = this.create("item.medicine.herb.use")
+    val MEDICINE_LIQUID_USE = this.create("medicine_liquid.use")
     @JvmField
-    val MEDICINE_LIQUID_USE = this.create("item.medicine.liquid.use")
+    val MEDICINE_PILLS_USE = this.create("medicine_pills.use")
     @JvmField
-    val MEDICINE_PILLS_USE = this.create("item.medicine.pills.use")
+    val MEDICINE_SPRAY_USE = this.create("medicine_spray.use")
     @JvmField
-    val MEDICINE_SPRAY_USE = this.create("item.medicine.spray.use")
-    @JvmField
-    val MEDICINE_FEATHER_USE = this.create("item.medicine.feather.use")
+    val MEDICINE_FEATHER_USE = this.create("medicine_feather.use")
 
     @JvmField
-    val MULCH_PLACE = this.create("block.mulch.place")
+    val BERRY_HARVEST = this.create("berry.harvest")
     @JvmField
-    val MULCH_REMOVE = this.create("block.mulch.remove")
+    val BERRY_EAT = this.create("berry.eat")
 
     @JvmField
-    val FOSSIL_MACHINE_ACTIVATE = this.create("block.fossil_machine.activate")
+    val MULCH_PLACE = this.create("mulch.place")
     @JvmField
-    val FOSSIL_MACHINE_ACTIVE_LOOP = this.create("block.fossil_machine.active_loop")
-    @JvmField
-    val FOSSIL_MACHINE_ASSEMBLE = this.create("block.fossil_machine.assemble")
-    @JvmField
-    val FOSSIL_MACHINE_DNA_FULL = this.create("block.fossil_machine.dna_full")
-    @JvmField
-    val FOSSIL_MACHINE_FINISHED = this.create("block.fossil_machine.finished")
-    @JvmField
-    val FOSSIL_MACHINE_INSERT_DNA = this.create("block.fossil_machine.insert_dna")
-    @JvmField
-    val FOSSIL_MACHINE_INSERT_DNA_SMALL = this.create("block.fossil_machine.insert_dna_small")
-    @JvmField
-    val FOSSIL_MACHINE_INSERT_FOSSIL = this.create("block.fossil_machine.insert_fossil")
-    @JvmField
-    val FOSSIL_MACHINE_RETRIEVE_FOSSIL = this.create("block.fossil_machine.retrieve_fossil")
-    @JvmField
-    val FOSSIL_MACHINE_RETRIEVE_POKEMON = this.create("block.fossil_machine.retrieve_pokemon")
-    @JvmField
-    val FOSSIL_MACHINE_UNPROTECTED = this.create("block.fossil_machine.unprotected")
+    val MULCH_REMOVE = this.create("mulch.remove")
 
     @JvmField
-    val RELIC_COIN_SACK_BREAK = this.create("block.relic_coin_sack.break")
+    val FOSSIL_MACHINE_ACTIVATE = this.create("fossil_machine.activate")
     @JvmField
-    val RELIC_COIN_SACK_HIT = this.create("block.relic_coin_sack.hit")
+    val FOSSIL_MACHINE_ACTIVE_LOOP = this.create("fossil_machine.active_loop")
     @JvmField
-    val RELIC_COIN_SACK_STEP = this.create("block.relic_coin_sack.step")
+    val FOSSIL_MACHINE_ASSEMBLE = this.create("fossil_machine.assemble")
     @JvmField
-    val RELIC_COIN_SACK_PLACE = this.create("block.relic_coin_sack.place")
+    val FOSSIL_MACHINE_DNA_FULL = this.create("fossil_machine.dna_full")
     @JvmField
-    val RELIC_COIN_POUCH_BREAK = this.create("block.relic_coin_pouch.break")
+    val FOSSIL_MACHINE_FINISHED = this.create("fossil_machine.finished")
     @JvmField
-    val RELIC_COIN_POUCH_PLACE = this.create("block.relic_coin_pouch.place")
+    val FOSSIL_MACHINE_INSERT_DNA = this.create("fossil_machine.insert_dna")
+    @JvmField
+    val FOSSIL_MACHINE_INSERT_DNA_SMALL = this.create("fossil_machine.insert_dna_small")
+    @JvmField
+    val FOSSIL_MACHINE_INSERT_FOSSIL = this.create("fossil_machine.insert_fossil")
+    @JvmField
+    val FOSSIL_MACHINE_RETRIEVE_FOSSIL = this.create("fossil_machine.retrieve_fossil")
+    @JvmField
+    val FOSSIL_MACHINE_RETRIEVE_POKEMON = this.create("fossil_machine.retrieve_pokemon")
+    @JvmField
+    val FOSSIL_MACHINE_UNPROTECTED = this.create("fossil_machine.unprotected")
+
+    @JvmField
+    val RELIC_COIN_SACK_BREAK = this.create("relic_coin_sack.break")
+    @JvmField
+    val RELIC_COIN_SACK_HIT = this.create("relic_coin_sack.hit")
+    @JvmField
+    val RELIC_COIN_SACK_STEP = this.create("relic_coin_sack.step")
+    @JvmField
+    val RELIC_COIN_SACK_PLACE = this.create("relic_coin_sack.place")
+    @JvmField
+    val RELIC_COIN_POUCH_BREAK = this.create("relic_coin_pouch.break")
+    @JvmField
+    val RELIC_COIN_POUCH_PLACE = this.create("relic_coin_pouch.place")
 
     @JvmField
     val FISHING_NOTIFICATION = this.create("fishing.notification")
@@ -168,81 +150,67 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val FISHING_BAIT_ATTACH = this.create("fishing.bait_attach")
     @JvmField
     val FISHING_BAIT_DETACH = this.create("fishing.bait_detach")
+    @JvmField
+    val TUMBLESTONE_BREAK = this.create("tumblestone.break")
+    @JvmField
+    val TUMBLESTONE_BLOCK_BREAK = this.create("tumblestone.block_break")
+    @JvmField
+    val TUMBLESTONE_HIT = this.create("tumblestone.hit")
+    @JvmField
+    val TUMBLESTONE_PLACE = this.create("tumblestone.place")
+    @JvmField
+    val TUMBLESTONE_STEP = this.create("tumblestone.step")
 
     @JvmField
-    val TUMBLESTONE_BREAK = this.create("block.tumblestone.break")
+    val GIMMIGHOUL_GIVE_ITEM_SMALL = this.create("gimmighoul.give_item_small")
     @JvmField
-    val TUMBLESTONE_BLOCK_BREAK = this.create("block.tumblestone.block_break")
-    @JvmField
-    val TUMBLESTONE_HIT = this.create("block.tumblestone.hit")
-    @JvmField
-    val TUMBLESTONE_PLACE = this.create("block.tumblestone.place")
-    @JvmField
-    val TUMBLESTONE_STEP = this.create("block.tumblestone.step")
+    val GIMMIGHOUL_REVEAL = this.create("gimmighoul.reveal")
 
     @JvmField
-    val EVOLUTION_STONE_BLOCK_BREAK = this.create("block.evolution_stone_block.break")
+    val BERRY_BUSH_BREAK = this.create("berry_bush.break")
     @JvmField
-    val EVOLUTION_STONE_BLOCK_HIT = this.create("block.evolution_stone_block.hit")
-    @JvmField
-    val EVOLUTION_STONE_BLOCK_PLACE = this.create("block.evolution_stone_block.place")
-    @JvmField
-    val EVOLUTION_STONE_BLOCK_STEP = this.create("block.evolution_stone_block.step")
+    val BERRY_BUSH_PLACE = this.create("berry_bush.place")
 
     @JvmField
-    val GIMMIGHOUL_GIVE_ITEM = this.create("pokemon.gimmighoul.give_item")
+    val BIG_ROOT_BREAK = this.create("big_root.break")
     @JvmField
-    val GIMMIGHOUL_REVEAL = this.create("pokemon.gimmighoul.reveal")
+    val ENERGY_ROOT_PLACE = this.create("energy_root.place")
 
     @JvmField
-    val BERRY_BUSH_BREAK = this.create("block.berry_bush.break")
+    val VIVICHOKE_BREAK = this.create("vivichoke.break")
     @JvmField
-    val BERRY_BUSH_PLACE = this.create("block.berry_bush.place")
-    @JvmField
-    val BERRY_HARVEST = this.create("block.berry_bush.harvest")
-    @JvmField
-    val BERRY_EAT = this.create("item.berry.eat")
+    val VIVICHOKE_PLACE = this.create("vivichoke.place")
 
     @JvmField
-    val BIG_ROOT_BREAK = this.create("block.big_root.break")
+    val MINT_BREAK = this.create("mint.break")
     @JvmField
-    val ENERGY_ROOT_PLACE = this.create("block.energy_root.place")
+    val MINT_PLACE = this.create("mint.place")
 
     @JvmField
-    val VIVICHOKE_BREAK = this.create("block.vivichoke.break")
+    val REVIVAL_HERB_BREAK = this.create("revival_herb.break")
     @JvmField
-    val VIVICHOKE_PLACE = this.create("block.vivichoke.place")
+    val REVIVAL_HERB_PLACE = this.create("revival_herb.place")
 
     @JvmField
-    val MINT_BREAK = this.create("block.mint.break")
+    val MEDICINAL_LEEK_BREAK = this.create("medicinal_leek.break")
     @JvmField
-    val MINT_PLACE = this.create("block.mint.place")
+    val MEDICINAL_LEEK_PLACE = this.create("medicinal_leek.plant")
 
     @JvmField
-    val REVIVAL_HERB_BREAK = this.create("block.revival_herb.break")
+    val GILDED_CHEST_OPEN = this.create("gilded_chest.open")
     @JvmField
-    val REVIVAL_HERB_PLACE = this.create("block.revival_herb.place")
+    val GILDED_CHEST_CLOSE = this.create("gilded_chest.close")
+    @JvmField
+    val GILDED_CHEST_STEP = this.create("gilded_chest.step")
+    @JvmField
+    val GILDED_CHEST_HIT = this.create("gilded_chest.hit")
+    @JvmField
+    val GILDED_CHEST_BREAK = this.create("gilded_chest.break")
+    @JvmField
+    val GILDED_CHEST_PLACE = this.create("gilded_chest.place")
 
     @JvmField
-    val MEDICINAL_LEEK_BREAK = this.create("block.medicinal_leek.break")
-    @JvmField
-    val MEDICINAL_LEEK_PLACE = this.create("block.medicinal_leek.plant")
-
-    @JvmField
-    val GILDED_CHEST_OPEN = this.create("block.gilded_chest.open")
-    @JvmField
-    val GILDED_CHEST_CLOSE = this.create("block.gilded_chest.close")
-    @JvmField
-    val GILDED_CHEST_STEP = this.create("block.gilded_chest.step")
-    @JvmField
-    val GILDED_CHEST_HIT = this.create("block.gilded_chest.hit")
-    @JvmField
-    val GILDED_CHEST_BREAK = this.create("block.gilded_chest.break")
-    @JvmField
-    val GILDED_CHEST_PLACE = this.create("block.gilded_chest.place")
-
-    @JvmField
-    val RELIC_COIN_SACK_SOUNDS = SoundType(1f, 1.1f,
+    val RELIC_COIN_SACK_SOUNDS = SoundType(1f, 1f,
         RELIC_COIN_SACK_BREAK,
         RELIC_COIN_SACK_STEP,
         RELIC_COIN_SACK_PLACE,
@@ -250,7 +218,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
         RELIC_COIN_SACK_STEP
     )
     @JvmField
-    val RELIC_COIN_POUCH_SOUNDS = SoundType(1f, 1.1f,
+    val RELIC_COIN_POUCH_SOUNDS = SoundType(1f, 1f,
         RELIC_COIN_POUCH_BREAK,
         RELIC_COIN_SACK_STEP,
         RELIC_COIN_POUCH_PLACE,
@@ -258,9 +226,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
         RELIC_COIN_SACK_STEP
     )
 
-    @JvmField
-    val MOVE_QUICKATTACK_TARGET = this.create("move.quickattack.target")
-
     @JvmField
     val IMPACT_NORMAL = this.create("impact.normal")
     @JvmField
@@ -299,7 +264,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val IMPACT_WATER = this.create("impact.water")
 
     @JvmField
-    val TUMBLESTONE_SOUNDS = SoundType(1f, 1.1f,
+    val TUMBLESTONE_SOUNDS = SoundType(1f, 1f,
         TUMBLESTONE_BREAK,
         TUMBLESTONE_STEP,
         TUMBLESTONE_PLACE,
@@ -308,25 +273,16 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     )
 
     @JvmField
-    val TUMBLESTONE_BLOCK_SOUNDS = SoundType(1f, 1.1f,
+    val TUMBLESTONE_BLOCK_SOUNDS = SoundType(1f, 1f,
         TUMBLESTONE_BLOCK_BREAK,
         TUMBLESTONE_STEP,
         TUMBLESTONE_PLACE,
         TUMBLESTONE_HIT,
         TUMBLESTONE_STEP
     )
-    @JvmField
-    val EVOLUTION_STONE_BLOCK_SOUNDS = SoundType(1f, 1.1f,
-        EVOLUTION_STONE_BLOCK_BREAK,
-        EVOLUTION_STONE_BLOCK_STEP,
-        EVOLUTION_STONE_BLOCK_PLACE,
-        EVOLUTION_STONE_BLOCK_HIT,
-        EVOLUTION_STONE_BLOCK_STEP
-    )
-
 
     @JvmField
-    val BERRY_BUSH_SOUNDS = SoundType(0.8f, 1.1f,
+    val BERRY_BUSH_SOUNDS = SoundType(1f, 1f,
         BERRY_BUSH_BREAK,
         SoundEvents.GRASS_STEP,
         BERRY_BUSH_PLACE,
@@ -335,25 +291,25 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     )
 
     @JvmField
-    val BIG_ROOT_SOUNDS = SoundType(0.8f, 1.1f,
+    val BIG_ROOT_SOUNDS = SoundType(1f, 1f,
         BIG_ROOT_BREAK,
         SoundEvents.ROOTS_STEP,
+        SoundEvents.ROOTS_PLACE,
+        SoundEvents.ROOTS_HIT,
+        SoundEvents.ROOTS_FALL
+    )
+
+    @JvmField
+    val ENERGY_ROOT_SOUNDS = SoundType(1f, 1f,
+        SoundEvents.ROOTS_BREAK,
+        SoundEvents.ROOTS_STEP,
         ENERGY_ROOT_PLACE,
         SoundEvents.ROOTS_HIT,
         SoundEvents.ROOTS_FALL
     )
 
     @JvmField
-    val ENERGY_ROOT_SOUNDS = SoundType(0.8f, 1.1f,
-        BIG_ROOT_BREAK,
-        SoundEvents.ROOTS_STEP,
-        ENERGY_ROOT_PLACE,
-        SoundEvents.ROOTS_HIT,
-        SoundEvents.ROOTS_FALL
-    )
-
-    @JvmField
-    val MEDICINAL_LEEK_SOUNDS = SoundType(1f, 1.1f,
+    val MEDICINAL_LEEK_SOUNDS = SoundType(1f, 1f,
         MEDICINAL_LEEK_BREAK,
         SoundEvents.GRASS_STEP,
         MEDICINAL_LEEK_PLACE,
@@ -362,7 +318,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     )
 
     @JvmField
-    val VIVICHOKE_SOUNDS = SoundType(0.6f, 1.1f,
+    val VIVICHOKE_SOUNDS = SoundType(1f, 1f,
         VIVICHOKE_BREAK,
         SoundEvents.GRASS_STEP,
         VIVICHOKE_PLACE,
@@ -371,7 +327,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     )
 
     @JvmField
-    val MINT_SOUNDS = SoundType(0.6f, 1.1f,
+    val MINT_SOUNDS = SoundType(1f, 1f,
         MINT_BREAK,
         SoundEvents.GRASS_STEP,
         MINT_PLACE,
@@ -380,7 +336,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     )
 
     @JvmField
-    val REVIVAL_HERB_SOUNDS = SoundType(0.6f, 1.1f,
+    val REVIVAL_HERB_SOUNDS = SoundType(1f, 1f,
         REVIVAL_HERB_BREAK,
         SoundEvents.GRASS_STEP,
         REVIVAL_HERB_PLACE,
@@ -389,7 +345,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     )
 
     @JvmField
-    val GILDED_CHEST_SOUNDS = SoundType(1f, 1.1f,
+    val GILDED_CHEST_SOUNDS = SoundType(1f, 1f,
         GILDED_CHEST_BREAK,
         GILDED_CHEST_STEP,
         GILDED_CHEST_PLACE,
@@ -398,17 +354,17 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     )
 
     @JvmField
-    val DISPLAY_CASE_ADD_ITEM = this.create("block.display_case.add_item")
+    val DISPLAY_CASE_ADD_ITEM = this.create("display_case.add_item")
     @JvmField
-    val DISPLAY_CASE_REMOVE_ITEM = this.create("block.display_case.remove_item")
+    val DISPLAY_CASE_REMOVE_ITEM = this.create("display_case.remove_item")
     @JvmField
-    val DISPLAY_CASE_BREAK = this.create("block.display_case.break")
+    val DISPLAY_CASE_BREAK = this.create("display_case.break")
     @JvmField
-    val DISPLAY_CASE_HIT = this.create("block.display_case.hit")
+    val DISPLAY_CASE_HIT = this.create("display_case.hit")
     @JvmField
-    val DISPLAY_CASE_PLACE = this.create("block.display_case.place")
+    val DISPLAY_CASE_PLACE = this.create("display_case.place")
     @JvmField
-    val DISPLAY_CASE_STEP = this.create("block.display_case.step")
+    val DISPLAY_CASE_STEP = this.create("display_case.step")
 
     @JvmField
     val DISPLAY_CASE_SOUNDS = SoundType(1f, 1f,

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

@@ -9,16 +9,9 @@
 package com.cobblemon.mod.common
 
 import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.util.RandomSource
-import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.npc.VillagerData
 import net.minecraft.world.entity.npc.VillagerProfession
 import net.minecraft.world.entity.npc.VillagerTrades
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.Items
-import net.minecraft.world.item.trading.ItemCost
-import net.minecraft.world.item.trading.MerchantOffer
-import java.util.Optional
 
 /**
  * A generator for various trade offers in the mod.
@@ -39,45 +32,12 @@ object CobblemonTradeOffers {
      * @return The resulting list.
      */
     fun tradeOffersFor(profession: VillagerProfession): List<VillagerTradeOffer> = when (profession) {
-        CobblemonVillagerProfessions.NURSE -> listOf(
-            // requiredLevel = the level of the villager for the trade to appear for
-            // Novice = 1, Apprentice = 2, Journeyman = 3, Expert = 4, Master = 5
-            VillagerTradeOffer(CobblemonVillagerProfessions.NURSE, 1, listOf(
-                // i = emeraldCost, j = numberOfItems, k = maxUses, l = villagerXp, f = priceMultiplier
-                VillagerTrades.ItemsForEmeralds(CobblemonItems.ORAN_BERRY, 4, 1, 16, 1),
-                VillagerTrades.ItemsForEmeralds(CobblemonItems.PERSIM_BERRY, 4, 1, 16, 1),
-                VillagerTrades.ItemsForEmeralds(CobblemonItems.ENERGY_ROOT, 4, 1, 12, 1),
-                TradeOffer(ItemCost(CobblemonItems.MEDICINAL_LEEK, 24), ItemStack(Items.EMERALD, 1), 12, 2)
-            )),
-            VillagerTradeOffer(CobblemonVillagerProfessions.NURSE, 2, listOf(
-                TradeOffer(ItemCost(Items.EMERALD, 8), ItemStack(CobblemonItems.MEDICINAL_BREW), 8, 5, Optional.of<ItemCost>(ItemCost(Items.GLASS_BOTTLE))),
-                VillagerTrades.ItemsForEmeralds(CobblemonItems.BLUE_MINT_LEAF, 2, 1, 8, 5),
-                VillagerTrades.ItemsForEmeralds(CobblemonItems.CYAN_MINT_LEAF, 2, 1, 8, 5),
-                VillagerTrades.ItemsForEmeralds(CobblemonItems.GREEN_MINT_LEAF, 2, 1, 8, 5),
-                VillagerTrades.ItemsForEmeralds(CobblemonItems.PINK_MINT_LEAF, 2, 1, 8, 5),
-                VillagerTrades.ItemsForEmeralds(CobblemonItems.RED_MINT_LEAF, 2, 1, 8, 5),
-                VillagerTrades.ItemsForEmeralds(CobblemonItems.WHITE_MINT_LEAF, 2, 1, 8, 5)
-            )),
-            VillagerTradeOffer(CobblemonVillagerProfessions.NURSE, 3, listOf(
-                TradeOffer(ItemCost(CobblemonItems.MULCH_BASE, 4), ItemStack(Items.EMERALD, 2), 16, 20),
-                VillagerTrades.ItemsForEmeralds(Items.GLASS_BOTTLE, 1, 1, 16, 10)
-            )),
-            VillagerTradeOffer(CobblemonVillagerProfessions.NURSE, 4, listOf(
-                VillagerTrades.ItemsForEmeralds(CobblemonItems.REVIVAL_HERB, 8, 1, 16, 15),
-                VillagerTrades.ItemsForEmeralds(CobblemonItems.VIVICHOKE_SEEDS, 24, 1, 4, 15)
-            )),
-            VillagerTradeOffer(CobblemonVillagerProfessions.NURSE, 5, listOf(
-                TradeOffer(ItemCost(Items.EMERALD, 10), ItemStack(CobblemonItems.ANTIDOTE, 1), 12, 30, Optional.of<ItemCost>(ItemCost(Items.GLASS_BOTTLE))),
-                TradeOffer(ItemCost(Items.EMERALD, 10), ItemStack(CobblemonItems.AWAKENING, 1), 12, 30, Optional.of<ItemCost>(ItemCost(Items.GLASS_BOTTLE))),
-                TradeOffer(ItemCost(Items.EMERALD, 10), ItemStack(CobblemonItems.BURN_HEAL, 1), 12, 30, Optional.of<ItemCost>(ItemCost(Items.GLASS_BOTTLE))),
-                TradeOffer(ItemCost(Items.EMERALD, 10), ItemStack(CobblemonItems.ICE_HEAL, 1), 12, 30, Optional.of<ItemCost>(ItemCost(Items.GLASS_BOTTLE))),
-                TradeOffer(ItemCost(Items.EMERALD, 10), ItemStack(CobblemonItems.PARALYZE_HEAL, 1), 12, 30, Optional.of<ItemCost>(ItemCost(Items.GLASS_BOTTLE))),
-                TradeOffer(ItemCost(Items.EMERALD, 22), ItemStack(CobblemonItems.VIVICHOKE_DIP, 1), 4, 30, Optional.of<ItemCost>(ItemCost(Items.BOWL)))
-            ))
+        VillagerProfession.FARMER -> listOf(
+            VillagerTradeOffer(VillagerProfession.FARMER, 3, listOf(VillagerTrades.ItemsForEmeralds(CobblemonItems.VIVICHOKE_SEEDS, 24, 1, 1, 6)))
         )
         VillagerProfession.FISHERMAN -> listOf(
             VillagerTradeOffer(VillagerProfession.FISHERMAN, 5, listOf(
-                VillagerTrades.ItemsForEmeralds(CobblemonItems.POKEROD_SMITHING_TEMPLATE, 12, 1, 3, 30)
+                VillagerTrades.ItemsForEmeralds(CobblemonItems.POKEROD_SMITHING_TEMPLATE, 12, 3, 30)
             ))
         )
         else -> emptyList()
@@ -93,7 +53,7 @@ object CobblemonTradeOffers {
     )
 
     /**
-     * Represents trade offers that can be attached to a villager or a wandering trader.
+     * Represents a trade offer that can be attached to a villager or a wandering trader.
      */
     interface TradeOfferHolder {
         /**
@@ -103,7 +63,7 @@ object CobblemonTradeOffers {
     }
 
     /**
-     * Represents trade offers from a villager.
+     * Represents a trade offer from a villager.
      *
      * @property profession The target profession for this trade.
      * @property requiredLevel The level required must be a possible level.
@@ -115,7 +75,7 @@ object CobblemonTradeOffers {
         val profession: VillagerProfession,
         val requiredLevel: Int,
         override val tradeOffers: List<VillagerTrades.ItemListing>
-    ): TradeOfferHolder {
+    ) : TradeOfferHolder {
 
         init {
             if (this.requiredLevel < VillagerData.MIN_VILLAGER_LEVEL || this.requiredLevel > VillagerData.MAX_VILLAGER_LEVEL) {
@@ -126,7 +86,7 @@ object CobblemonTradeOffers {
     }
 
     /**
-     * Represents trade offers from a wandering trader.
+     * Represents a trade offer from a wandering trader.
      *
      * @property isRareTrade If this is rare or common trade.
      * @property tradeOffers The list of the possible [TradeOffers.Factory].
@@ -134,26 +94,6 @@ object CobblemonTradeOffers {
     data class WandererTradeOffer(
         val isRareTrade: Boolean,
         override val tradeOffers: List<VillagerTrades.ItemListing>
-    ): TradeOfferHolder
-
-    /**
-     * Represents a trade offer from a villager.
-     *
-     * @property offeredItem The item cost offered to the villager.
-     * @property receivedItem The item received from the villager.
-     * @property maxUses How many times the trade can be used before the villager resupplies.
-     * @property villagerXp The experience the villager gains from the trade.
-     * @property optionalOfferedItem The optional, secondary item cost offered to the villager.
-     * @property priceMultiplier The amount multiplier of how much the item cost can rise and fall by depending on discounts and penalties
-     */
-    class TradeOffer(
-        private val offeredItem: ItemCost,
-        private val receivedItem: ItemStack,
-        private val maxUses: Int,
-        private val villagerXp: Int = 1,
-        private val optionalOfferedItem: Optional<ItemCost> = Optional.empty(),
-        private val priceMultiplier: Float = 0.05F
-    ): VillagerTrades.ItemListing {
-        override fun getOffer(entity: Entity?, randomSource: RandomSource?): MerchantOffer = MerchantOffer(offeredItem, optionalOfferedItem, receivedItem, maxUses, villagerXp, priceMultiplier)
-    }
+    ) : TradeOfferHolder
+    
 }

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

@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common
-
-import com.cobblemon.mod.common.platform.PlatformRegistry
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.common.collect.ImmutableSet
-import net.minecraft.core.Registry
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
-import net.minecraft.world.entity.ai.village.poi.PoiType
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.state.BlockState
-
-object CobblemonVillagerPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Registry<PoiType>>, PoiType>() {
-    override val registry: Registry<PoiType> = BuiltInRegistries.POINT_OF_INTEREST_TYPE
-    override val resourceKey: ResourceKey<Registry<PoiType>> = Registries.POINT_OF_INTEREST_TYPE
-
-    @JvmField
-    val NURSE_KEY: ResourceKey<PoiType> = createKey("nurse")
-    @JvmField
-    val NURSE = create(NURSE_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.HEALING_MACHINE), 1, 1))
-
-    private fun createKey(string: String): ResourceKey<PoiType> = ResourceKey.create(Registries.POINT_OF_INTEREST_TYPE, cobblemonResource(string))
-
-    private fun getBlockStates(block: Block): Set<BlockState> = ImmutableSet.copyOf(block.stateDefinition.possibleStates)
-}

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

@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common
-
-import com.cobblemon.mod.common.platform.PlatformRegistry
-import com.google.common.collect.ImmutableSet
-import net.minecraft.core.Holder
-import net.minecraft.core.Registry
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
-import net.minecraft.sounds.SoundEvent
-import net.minecraft.world.entity.ai.village.poi.PoiType
-import net.minecraft.world.entity.npc.VillagerProfession
-
-object CobblemonVillagerProfessions: PlatformRegistry<Registry<VillagerProfession>, ResourceKey<Registry<VillagerProfession>>, VillagerProfession>() {
-    override val registry: Registry<VillagerProfession> = BuiltInRegistries.VILLAGER_PROFESSION
-    override val resourceKey: ResourceKey<Registry<VillagerProfession>> = Registries.VILLAGER_PROFESSION
-
-    @JvmField
-    val NURSE = profession(CobblemonVillagerPoiTypes.NURSE_KEY, CobblemonSounds.VILLAGER_WORK_NURSE)
-
-    /**
-     * Register a villager profession texture override for Cobblemon villagers of the given [VillagerProfession] for specified names.
-     *
-     * @param profession The Cobblemon [VillagerProfession] being overridden.
-     * @return The profession override texture file name and a list of names that will trigger the override, as a pair.
-     */
-    fun getNameTagOverride(profession: VillagerProfession?): Pair<String, Array<String>>? = when (profession) {
-        NURSE -> Pair("nurse_joy", arrayOf("ジョーイ", "간호순", "祖兒", "喬伊", "乔伊", "האחות ג'וי", "الممرضة جوي", "Joy", "Joelle", "Joëlle", "Джой", "จอย"))
-        else -> null
-    }
-
-    private fun profession(resourceKey: ResourceKey<PoiType>, soundEvent: SoundEvent?): VillagerProfession =
-        create(resourceKey.location().path, VillagerProfession(
-            resourceKey.location().toString(),
-            { holder: Holder<PoiType> -> holder.`is`(resourceKey) },
-            { holder: Holder<PoiType> -> holder.`is`(resourceKey) },
-            ImmutableSet.of(), ImmutableSet.of(), soundEvent
-        ))
-}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/CobblemonCriteria.kt

@@ -29,8 +29,6 @@ object CobblemonCriteria : PlatformRegistry<Registry<CriterionTrigger<*>>, Resou
 
     val CATCH_SHINY_POKEMON = this.create("catch_shiny_pokemon", SimpleCriterionTrigger(CountableCriterion.CODEC))
 
-    val EGG_COLLECT = this.create("eggs_collected", SimpleCriterionTrigger(CountableCriterion.CODEC))
-
     val EGG_HATCH = this.create("eggs_hatched", SimpleCriterionTrigger(CountableCriterion.CODEC))
 
     val EVOLVE_POKEMON = this.create("pokemon_evolved", SimpleCriterionTrigger(EvolvePokemonCriterion.CODEC))
@@ -60,4 +58,4 @@ object CobblemonCriteria : PlatformRegistry<Registry<CriterionTrigger<*>>, Resou
 
     override val registry = BuiltInRegistries.TRIGGER_TYPES
     override val resourceKey = Registries.TRIGGER_TYPE
-}
+}

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

@@ -59,7 +59,7 @@ class AspectCriterion(
 //        pokemon = json.get("pokemon").asString.asIdentifierDefaultingNamespace()
 //    }
 //
-//    override fun matches(player: ServerPlayer, context: MutableMap<Identifier, MutableSet<String>>): Boolean {
+//    override fun matches(player: ServerPlayerEntity, context: MutableMap<Identifier, MutableSet<String>>): Boolean {
 //        val caughtAspects = context.getOrDefault(pokemon, mutableSetOf())
 //        return this.aspects.all { it in caughtAspects }
 //    }

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

@@ -34,7 +34,8 @@ class BattleCountableCriterion(
 
     override fun matches(player: ServerPlayer, context: BattleCountableContext): Boolean {
         var typeCheck = false
-        val advancementData = Cobblemon.playerDataManager.getGenericData(player).advancementData
+        val advancementData = Cobblemon.playerData.get(player).advancementData
+
         if (battleTypes.isEmpty() || battleTypes.contains("any")) {
             typeCheck = true
         }
@@ -86,7 +87,7 @@ class BattleCountableCriterion(
 //        json.add("battle_types", battleTypes.toJsonArray())
 //    }
 //
-//    override fun matches(player: ServerPlayer, context: BattleCountableContext): Boolean {
+//    override fun matches(player: ServerPlayerEntity, context: BattleCountableContext): Boolean {
 //        var typeCheck = false
 //        val advancementData = Cobblemon.playerData.get(player).advancementData
 //        if (battleTypes.isEmpty() || battleTypes.contains("any")) {

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

@@ -54,7 +54,7 @@ class CaughtPokemonCriterion(
 //        type = json.get("type")?.asString ?: "any"
 //    }
 //
-//    override fun matches(player: ServerPlayer, context: CountablePokemonTypeContext): Boolean {
+//    override fun matches(player: ServerPlayerEntity, context: CountablePokemonTypeContext): Boolean {
 //        return super.matches(player, context) && (context.type == type || type == "any")
 //    }
 //}

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

@@ -50,7 +50,7 @@ open class CountableCriterion<T : CountableContext>(
 //        json.addProperty("count", count)
 //    }
 //
-//    override fun matches(player: ServerPlayer, context: T) = context.times >= count
+//    override fun matches(player: ServerPlayerEntity, context: T) = context.times >= count
 //}
 //
 ///**
@@ -64,7 +64,7 @@ open class CountableCriterion<T : CountableContext>(
 // * @since November 4th, 2022
 // */
 //class SimpleCountableCriterionCondition(id: Identifier, predicate: LootContextPredicate) : CountableCriterionCondition<CountableContext>(id, predicate)
-//fun SimpleCriterionTrigger<CountableContext, SimpleCountableCriterionCondition>.trigger(player: ServerPlayer, times: Int) = trigger(player, CountableContext(times))
+//fun SimpleCriterionTrigger<CountableContext, SimpleCountableCriterionCondition>.trigger(player: ServerPlayerEntity, times: Int) = trigger(player, CountableContext(times))
 //
 ///**
 // * Some type of context that has a count associated with it, representing how many times the trigger has occurred.

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

@@ -55,7 +55,7 @@ class EvolvePokemonCriterion(
 //        evolution = json.get("evolution")?.asString ?: "any"
 //    }
 //
-//    override fun matches(player: ServerPlayer, context: EvolvePokemonContext): Boolean {
+//    override fun matches(player: ServerPlayerEntity, context: EvolvePokemonContext): Boolean {
 //        return context.times >= count && (context.species == species.asIdentifierDefaultingNamespace() || species == "any") &&
 //                (context.evolution == evolution.asIdentifierDefaultingNamespace() || evolution == "any")
 //    }

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

@@ -57,7 +57,7 @@ class LevelUpCriterion(
         evolved = json.get("has_evolved")?.asBoolean ?: true
     }
 
-    override fun matches(player: ServerPlayer, context: LevelUpContext): Boolean {
+    override fun matches(player: ServerPlayerEntity, context: LevelUpContext): Boolean {
         val preEvo = context.pokemon.preEvolution == null
         val hasEvolution = !context.pokemon.evolutions.none()
         var evolutionCheck = true

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

@@ -79,7 +79,7 @@ class PartyCheckCriterion(
         }
     }
 
-    override fun matches(player: ServerPlayer, context: PartyCheckContext): Boolean {
+    override fun matches(player: ServerPlayerEntity, context: PartyCheckContext): Boolean {
         val playerParty = player.party()
         val matches = mutableListOf<Identifier>()
         party.forEach {

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

@@ -57,7 +57,7 @@ class PlantTumblestoneCriterion(
 //     * @param context The context of the criterion
 //     * @return True if the tumblestone block can grow at the given position, false otherwise
 //     */
-//    override fun matches(player: ServerPlayer, context: PlantTumblestoneContext): Boolean {
+//    override fun matches(player: ServerPlayerEntity, context: PlantTumblestoneContext): Boolean {
 //        return context.tumbleStoneBlock.canGrow(context.pos, player.level())
 //    }
 //}

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

@@ -21,18 +21,20 @@ class PokemonInteractContext(val type: ResourceLocation, val item: ResourceLocat
 
 class PokemonInteractCriterion(
     playerCtx: Optional<ContextAwarePredicate>,
-    val type: String,
-    val item: String
+    val type: Optional<String>,
+    val item: Optional<String>
 ): SimpleCriterionCondition<PokemonInteractContext>(playerCtx) {
     companion object {
         val CODEC: Codec<PokemonInteractCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PokemonInteractCriterion::playerCtx),
-            Codec.STRING.optionalFieldOf("type", "any").forGetter(PokemonInteractCriterion::type),
-            Codec.STRING.optionalFieldOf("item", "any").forGetter(PokemonInteractCriterion::item)
+            Codec.STRING.optionalFieldOf("type").forGetter(PokemonInteractCriterion::type),
+            Codec.STRING.optionalFieldOf("item").forGetter(PokemonInteractCriterion::item)
         ).apply(it, ::PokemonInteractCriterion) }
     }
 
     override fun matches(player: ServerPlayer, context: PokemonInteractContext): Boolean {
-        return (context.type == this.type.asIdentifierDefaultingNamespace() || this.type == "any") && (context.item == this.item.asIdentifierDefaultingNamespace() || this.item == "any")
+        val otherType = this.type.orElse("any")
+        val otherItem = this.item.orElse("any")
+        return (context.type == otherType.asIdentifierDefaultingNamespace() || otherType == "any") && (context.type == otherItem.asIdentifierDefaultingNamespace() || otherItem == "any")
     }
 }

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

@@ -80,7 +80,7 @@ class TradePokemonCriterion(
         receivedHeldItem = json.get("received_held_item")?.asString ?: "minecraft:air"
     }
 
-    override fun matches(player: ServerPlayer, context: TradePokemonContext): Boolean {
+    override fun matches(player: ServerPlayerEntity, context: TradePokemonContext): Boolean {
         val heldItem1 = context.traded.heldItem().item.registryEntry.ResourceKey().value
         val heldItem2 = context.received.heldItem().item.registryEntry.ResourceKey().value
         return (context.traded.species.resourceIdentifier == traded.asIdentifierDefaultingNamespace() || traded == "any") &&

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

@@ -26,7 +26,7 @@ import net.minecraft.nbt.NbtOps
  * @author Qu
  * @since January 9th, 2022
  */
-open class Ability internal constructor(var template: AbilityTemplate, forced: Boolean, priority: Priority) {
+open class Ability internal constructor(var template: AbilityTemplate, forced: Boolean) {
 
     val name: String
         get() = template.name
@@ -57,7 +57,7 @@ open class Ability internal constructor(var template: AbilityTemplate, forced: B
      *
      * @see [Pokemon.updateAbility].
      */
-    var priority = priority
+    var priority = Priority.LOWEST
         internal set
 
     @Deprecated("Please use the Codec instead", ReplaceWith("Ability.CODEC"))
@@ -111,7 +111,7 @@ open class Ability internal constructor(var template: AbilityTemplate, forced: B
                 Codec.BOOL.optionalFieldOf(DataKeys.POKEMON_ABILITY_FORCED, false).forGetter(Ability::forced),
                 Codec.INT.optionalFieldOf(DataKeys.POKEMON_ABILITY_INDEX, -1).forGetter(Ability::index),
                 Priority.CODEC.optionalFieldOf(DataKeys.POKEMON_ABILITY_PRIORITY, Priority.LOWEST).forGetter(Ability::priority)
-            ).apply(it) { template, forced, index, priority -> Ability(template, forced, priority).apply {
+            ).apply(it) { template, forced, index, priority -> Ability(template, forced).apply {
                 this.index = index
                 this.priority = priority
             } }

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

@@ -23,7 +23,7 @@ import com.cobblemon.mod.common.pokemon.Species
  */
 open class AbilityPool : PrioritizedList<PotentialAbility>() {
     fun select(species: Species, aspects: Set<String>): Pair<Ability, Priority> {
-        for (priority in Priority.entries) {
+        for (priority in Priority.values()) {
             val potentialAbilities = priorityMap[priority]?.filter { it.isSatisfiedBy(aspects) } ?: continue
             if (potentialAbilities.isNotEmpty()) {
                 return potentialAbilities.random().template.create() to priority
@@ -31,7 +31,7 @@ open class AbilityPool : PrioritizedList<PotentialAbility>() {
         }
 
         LOGGER.error("Unable to select an ability from the pool for $species and aspects: ${aspects.joinToString()}")
-        LOGGER.error("Please show this to the Cobblemon developers!")
+        LOGGER.error("Usually this happens when a client is doing logic it shouldn't. Please show this to the Cobblemon developers!")
         Exception().printStackTrace()
         return Abilities.first().create() to Priority.LOWEST
     }

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

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common.api.abilities
 
-import com.cobblemon.mod.common.api.Priority
 import com.cobblemon.mod.common.util.codec.CodecUtils
 import com.google.gson.JsonObject
 import com.mojang.serialization.Codec
@@ -22,14 +21,14 @@ import net.minecraft.nbt.CompoundTag
  */
 class AbilityTemplate(
     val name: String = "",
-    var builder: (AbilityTemplate, forced: Boolean, priority: Priority) -> Ability = { template, forced, priority -> Ability(template, forced, priority) },
+    var builder: (AbilityTemplate, forced: Boolean) -> Ability = { template, forced -> Ability(template, forced) },
     val displayName: String = "cobblemon.ability.$name",
     val description: String = "cobblemon.ability.$name.desc"
 ) {
     /**
      * Returns the Ability or if applicable the extension connected to this template
      */
-    fun create(forced: Boolean = false, priority: Priority = Priority.LOWEST) = builder(this, forced, priority)
+    fun create(forced: Boolean = false) = builder(this, forced)
 
     /**
      * Returns the Ability and loads the given NBT Tag into it.

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

@@ -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.ai
-
-import com.google.common.collect.ImmutableList
-import com.mojang.datafixers.util.Pair
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.Mob
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.schedule.Activity
-
-class ActivityConfigurationContext(val activity: Activity) {
-    val tasks = mutableListOf<Pair<Int, BehaviorControl<in LivingEntity>>>()
-
-    fun addTasks(weight: Int, vararg tasks: BehaviorControl<in LivingEntity>) {
-        this.tasks.addAll(tasks.map { Pair.of(weight, it) })
-    }
-
-    fun apply(entity: LivingEntity) {
-        entity.brain.addActivity(activity, ImmutableList.copyOf(tasks))
-    }
-}

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

@@ -1,40 +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.ai
-
-import com.cobblemon.mod.common.api.ai.config.BrainConfig
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.schedule.Activity
-import net.minecraft.world.entity.schedule.Schedule
-
-class BrainConfigurationContext {
-
-    var defaultActivity = Activity.IDLE
-    var coreActivities = setOf(Activity.CORE)
-    val activities = mutableListOf<ActivityConfigurationContext>()
-    val schedule = Schedule.EMPTY
-
-    fun getOrCreateActivity(activity: Activity): ActivityConfigurationContext {
-        return activities.firstOrNull { it.activity == activity } ?: ActivityConfigurationContext(activity).also(activities::add)
-    }
-
-    fun apply(entity: LivingEntity, brainConfigs: List<BrainConfig>) {
-        val brain = entity.brain
-
-        // Setup the brain config
-        brainConfigs.forEach { it.configure(entity, this) }
-
-        // Apply the brain config
-        activities.forEach { it.apply(entity) }
-        brain.setCoreActivities(coreActivities)
-        brain.setDefaultActivity(defaultActivity)
-        brain.schedule = schedule
-        brain.setActiveActivityIfPossible(defaultActivity)
-    }
-}

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

@@ -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.ai
-
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class WrapperLivingEntityTask<T : LivingEntity>(val task: BehaviorControl<T>, val clazz: Class<T>) : BehaviorControl<LivingEntity> {
-    override fun tryStart(level: ServerLevel, entity: LivingEntity, gameTime: Long): Boolean {
-        if (clazz.isInstance(entity)) {
-            return task.tryStart(level, entity as T, gameTime)
-        } else {
-            return false
-        }
-    }
-
-    override fun debugString() = task.debugString()
-    override fun tickOrStop(level: ServerLevel, entity: LivingEntity, gameTime: Long) {
-        task.tickOrStop(level, entity as T, gameTime)
-    }
-
-    override fun getStatus() = task.status
-    override fun doStop(level: ServerLevel, entity: LivingEntity, gameTime: Long) = task.doStop(level, entity as T, gameTime)
-}

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

@@ -1,39 +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.ai.config
-
-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.config.task.TaskConfig
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.schedule.Activity
-
-class AddTasksToActivity : BrainConfig {
-    val activity = Activity.IDLE
-    val condition = "true".asExpressionLike()
-    val tasksByPriority = mutableMapOf<Int, List<TaskConfig>>()
-
-    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
-        val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return
-
-        val activity = brainConfigurationContext.getOrCreateActivity(activity)
-        tasksByPriority.forEach { (priority, taskConfigs) ->
-            val tasks = taskConfigs.flatMap { it.createTasks(entity, brainConfigurationContext) }
-            activity.addTasks(priority, *tasks.toTypedArray())
-        }
-    }
-}

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

@@ -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.ai.config
-
-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.CobblemonBrainConfigs
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.entity.LivingEntity
-
-class ApplyPresets : BrainConfig {
-    val condition = "true".asExpressionLike()
-    val presets = mutableListOf<ResourceLocation>()
-    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
-        val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return
-
-        val presetConfigs = presets.flatMap { CobblemonBrainConfigs.presets[it] ?: return Cobblemon.LOGGER.warn("Preset $it not found") }
-        presetConfigs.forEach { it.configure(entity, brainConfigurationContext) }
-    }
-}

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

@@ -1,41 +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.ai.config
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import net.minecraft.world.entity.LivingEntity
-
-/**
- * Something that contributes to the construction of an entity's brain. Implementations are expected to make
- * their changes using the provided [BrainConfigurationContext] which helps stage the details of the entity's
- * brain before locking into the highly immutable structure that Mojang uses.
- *
- * A brain config has access to the [LivingEntity] it's for but note that this is, in most cases, an extremely
- * young version of the entity that is not fully initialized and might die if you try getting exotic with it.
- *
- * @see BrainConfigurationContext
- * @author Hiroku
- * @since October 13th, 2024
- */
-interface BrainConfig {
-    companion object {
-        val types = mutableMapOf<String, Class<out BrainConfig>>(
-            "script" to ScriptBrainConfig::class.java,
-            "add_tasks_to_activity" to AddTasksToActivity::class.java,
-            "apply_presets" to ApplyPresets::class.java,
-            "set_default_activity" to SetDefaultActivity::class.java,
-            "set_core_activities" to SetCoreActivities::class.java
-        )
-
-    }
-
-//    fun encode(buffer: RegistryFriendlyByteBuf)
-//    fun decode(buffer: RegistryFriendlyByteBuf)
-    fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext)
-}

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

@@ -1,16 +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.ai.config
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import net.minecraft.world.entity.LivingEntity
-
-object DummyBrainConfig : BrainConfig {
-    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {}
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/README.md

@@ -1,119 +0,0 @@
-# Brain Configuration
-
-A "Brain" is a Java Edition AI concept for more modern entities. It has tasks that are listed inside of 'activities',
-and in some cases a schedule which determines which activities will occur during different times of the day. There is
-also a set of core activities, and a default activity. In Minecraft, the most complex usage of the Brain AI system 
-is on villagers which have schedules that control their behaviour during the day and night as well as child villager play behaviours.
-
-Cobblemon's NPCs use the Brain AI system. As part of that, Cobblemon added the concept of a Brain Configuration
-that allows Java Edition brains to be configured in a more data-driven way. 
-
-By default, without any brain configuration, the default activity will be `minecraft:idle` and the core activities will be `[minecraft:core]`.
-The activities would not have any tasks though.
-
-## Possible Activities
-The activities that can be used in brains is determined by code and cannot be added to using datapacks. Note that except for
-when used as defaults and core activities, these are purely names and what you use them for is entirely up to you.
-
-The activities that exist in Minecraft are:
-- `minecraft:core`: The core activity intended to be used for fundamental actions like floating in water and looking at look targets.
-- `minecraft:idle`: The idle activity is used when the entity is not doing anything else. This is typically used for things like wandering and other random actions.
-- `minecraft:work`: The work activity is used for actions that are related to the entity's job. For villagers, this is things like farming, smithing, and other job-related tasks.
-- `minecraft:play`
-- `minecraft:rest`: The rest activity is used in villagers for the activity that moves them to a bed and hops into it.
-- `minecraft:meet`: The meet activity is used in villagers for going to the meeting place and gossipping with other NPCs.
-- `minecraft:panic`: The panic activity is used in villagers for when they are panicking and fleeing, usually from an attacker.
-- `minecraft:raid`
-- `minecraft:pre_raid`: The raid activity is used in villagers for what they do when a raid is about to start, like running to a safe location during a raid.
-- `minecraft:hide`
-- `minecraft:fight`: Intended to be used when engaging in combat.
-- `minecraft:celebrate`
-- `minecraft:admire_item`
-- `minecraft:avoid`
-- `minecraft:ride`
-- `minecraft:play_dead`
-- `minecraft:long_jump`
-- `minecraft:ram`
-- `minecraft:tongue`
-- `minecraft:swim`
-- `minecraft:lay_spawn`
-- `minecraft:sniff`
-- `minecraft:investigate`
-- `minecraft:roar`
-- `minecraft:emerge`
-- `minecraft:dig`
-
-The activities that were added by Cobblemon are:
-- `cobblemon:battling`: For when the entity is in a Pokémon battle.
-- `cobblemon:action_effect`: For when the entity is performing an action effect. Usually registered as an almost empty activity that simply prevents the entity from doing other things.
-- `cobblemon:npc_chatting`: Intended for NPC entities using dialogue so that they look at their chat partner and do nothing else.
-
-## Brain Configuration Format
-A brain is configured using a series of "Brain Configurations". Each configuration is a JSON object that contains
-a "type" field which determines the action to perform when configuring a brain. Many different types are available.
-
-### script
-The `script` type executes a MoLang script which will apply some changes to the brain.
-- `script`: The MoLang script to execute. This will be a resource location for the `molang` datapack folder. Something like `cobblemon:some_script`.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if the script should be executed. Defaults to `"true"`.
-
-### add_tasks_to_activity
-The 'add_tasks_to_activity' type adds a list of tasks to an activity.
-- `activity`: The activity to add the tasks to. This must be a pre-existing activity - a brain configuration cannot
-    create new activities. 
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if the tasks should be added. If this
-    is not present, the tasks will always be added.
-- `tasksByPriority`: A map of task priorities to lists of tasks to add to the activity. Each task is a JSON object with a "type" field that determines the
-    task to add or in simple cases can just be the type as a simple JSON primitive to use default properties. Many different types of task config are available. See [Task Configuration](./task/README.md).
-    The priority of the task is used to determine the execution order each tick. This usually does not matter, but in some cases
-    where the execution of one task will move to a different activity or otherwise prevent another task, the priority matters a lot.
-    As an example, a task that moves to nearby healing machines will set a walk target which prevents the use of the healing machine,
-    so the use task would need to have a lower priority or be earlier in the list so that it runs sooner.
-
-Example, making sure `heal_using_healing_machine` comes before `go_to_healing_machine`:
-```json
-{
-  "type": "add_tasks_to_activity",
-  "activity": "minecraft:idle",
-  "tasksByPriority": {
-    "1": [
-      {
-        "type": "cobblemon:heal_using_healing_machine",
-        "horizontalUseRange": "2"
-      },
-      "cobblemon:go_to_healing_machine"
-    ]
-  }
-}
-```
-
-Note that when specifying tasks, you can either use an object format with the "type" property, or if you want to use only
-default parameters for the task you can simply state the type as a string. The above example uses both formats.
-
-### set_core_activities
-The `set_core_activities` type sets the core activities of the brain. It has only one property, `activities`, which is a list of activities.
-
-### set_default_activity
-The `set_default_activity` type sets the default activity of the brain. It has only one property, `activity`, which is the activity to set as the default.
-
-### apply_preset
-The `apply_preset` type applies a preset to the brain. Brain presets are JSON arrays under the `brain_presets` datapack folder. 
-This is a way to apply a set of configurations to the brain.
-- `preset`: The name of the preset to apply. This is the name of the file in the `brain_presets` folder without the `.json` extension.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if the preset should be applied. Defaults to `"true"`.
-
-Example brain preset (`uses_healing_machine.json`):
-```json
-[
-  {
-    "type": "add_tasks_to_activity",
-    "activity": "idle",
-    "tasksByPriority": {
-      "1": [
-        "heal_using_healing_machine",
-        "go_to_healing_machine"
-      ]
-    }
-  }
-]
-```

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

@@ -1,89 +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.ai.config
-
-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.ai.ActivityConfigurationContext
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.api.molang.ObjectValue
-import com.cobblemon.mod.common.api.scripting.CobblemonScripts
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.activityRegistry
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.resolve
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.util.Pair
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class ScriptBrainConfig : BrainConfig {
-    val condition = "true".asExpressionLike()
-    val script = cobblemonResource("dummy")
-
-    override fun configure(entity: LivingEntity, context: BrainConfigurationContext) {
-        val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return
-
-        val struct = createBrainStruct(entity, context)
-        val script = CobblemonScripts.scripts[this.script]
-            ?: run {
-                Cobblemon.LOGGER.error("Tried loading script $script as part of an entity brain but that script does not exist")
-                return
-            }
-        runtime.resolve(script, mapOf("brain" to struct))
-    }
-
-    fun createBrainStruct(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): QueryStruct {
-        return QueryStruct(hashMapOf()).addStandardFunctions()
-            .addFunction("entity") { (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()) }
-            .addFunction("create_activity") { params ->
-                val name = params.getString(0).asIdentifierDefaultingNamespace()
-                val activity = entity.level().activityRegistry.get(name) ?: return@addFunction run {
-                    Cobblemon.LOGGER.error("Tried loading activity $name as part of an entity brain but that activity does not exist")
-                    DoubleValue.ZERO
-                }
-                val existingActivityBuilder = brainConfigurationContext.activities.find { it.activity == activity }
-                if (existingActivityBuilder != null) {
-                    return@addFunction createActivityStruct(existingActivityBuilder)
-                } else {
-                    val activityConfigurationContext = ActivityConfigurationContext(activity)
-                    brainConfigurationContext.activities.add(activityConfigurationContext)
-                    return@addFunction createActivityStruct(activityConfigurationContext)
-                }
-            }
-            .addFunction("set_core_activities") { params ->
-                brainConfigurationContext.coreActivities = params.params.map { (it as ObjectValue<ActivityConfigurationContext>).obj.activity }.toSet()
-                return@addFunction DoubleValue.ONE
-            }
-            .addFunction("set_default_activity") { params ->
-                brainConfigurationContext.defaultActivity = params.get<ObjectValue<ActivityConfigurationContext>>(0).obj.activity
-                return@addFunction DoubleValue.ONE
-            }
-    }
-
-    fun createActivityStruct(activityConfigurationContext: ActivityConfigurationContext): ObjectValue<ActivityConfigurationContext> {
-        val struct = ObjectValue(activityConfigurationContext)
-        struct.addStandardFunctions()
-            .addFunction("add_task") { params ->
-                val priority = params.getInt(0)
-                val task = params.get(1) as ObjectValue<BehaviorControl<in LivingEntity>>
-                activityConfigurationContext.tasks.add(Pair(priority, task.obj))
-            }
-        return struct
-    }
-}

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

@@ -1,20 +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.ai.config
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.schedule.Activity
-
-class SetCoreActivities : BrainConfig {
-    val activities = mutableListOf<Activity>()
-    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
-        brainConfigurationContext.coreActivities = activities.toSet()
-    }
-}

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

@@ -1,20 +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.ai.config
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.schedule.Activity
-
-class SetDefaultActivity : BrainConfig {
-    val activity: Activity = Activity.IDLE
-    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
-        brainConfigurationContext.defaultActivity = activity
-    }
-}

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

@@ -1,32 +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.ai.config.task
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class AllOfTaskConfig : TaskConfig {
-    val condition = "true".asExpressionLike()
-    val tasks: List<TaskConfig> = emptyList()
-
-    override fun createTasks(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): List<BehaviorControl<in LivingEntity>> {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return emptyList()
-        return tasks.flatMap { it.createTasks(entity, brainConfigurationContext) }
-    }
-}

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

@@ -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.ai.config.task
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.entity.ai.AttackAngryAtTask
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class AttackAngryAtTaskConfig : SingleTaskConfig {
-    val condition = "true".asExpressionLike()
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return AttackAngryAtTask.create()
-    }
-}

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

@@ -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.ai.config.task
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.VillagerCalmDown
-
-class CalmDownTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return VillagerCalmDown.create()
-    }
-}

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

@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveInt
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.DoNothing
-
-class DoNothingTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val minDurationTicks = "40".asExpression()
-    val maxDurationTicks = "80".asExpression()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return DoNothing(runtime.resolveInt(minDurationTicks), runtime.resolveInt(maxDurationTicks))
-    }
-}

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

@@ -1,75 +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.ai.config.task
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.battles.BattleRegistry
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.entity.npc.NPCEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
-import net.minecraft.world.entity.ai.behavior.declarative.Trigger
-import net.minecraft.world.entity.ai.memory.MemoryModuleType
-
-class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    var includePassiveDamage = true
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-
-        if (entity is NPCEntity) {
-            fun cancelNPCBattles(npcEntity: NPCEntity): Boolean {
-                val battles = npcEntity.battleIds.mapNotNull(BattleRegistry::getBattle)
-                battles.forEach { it.end() }
-                return battles.isNotEmpty()
-            }
-
-            return if (includePassiveDamage) {
-                 BehaviorBuilder.create {
-                    it.group(it.present(MemoryModuleType.HURT_BY), it.present(CobblemonMemories.NPC_BATTLING))
-                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelNPCBattles(entity as NPCEntity) } }
-                }
-            } else {
-                BehaviorBuilder.create {
-                    it.group(it.present(MemoryModuleType.HURT_BY_ENTITY), it.present(CobblemonMemories.NPC_BATTLING))
-                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelNPCBattles(entity as NPCEntity) } }
-                }
-            }
-        } else { return null }/* else if (entity is PokemonEntity) { TODO uncomment when pokemon have brain :)
-            fun cancelPokemonBattle(pokemonEntity: PokemonEntity): Boolean {
-                val battle = BattleRegistry.getBattle(pokemonEntity.battleId ?: return false)
-                battle?.end()
-                return battle != null
-            }
-
-            return if (includePassiveDamage) {
-                BehaviorBuilder.create {
-                    it.group(it.present(MemoryModuleType.HURT_BY), it.present(CobblemonMemories.POKEMON_BATTLING))
-                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelPokemonBattle(entity as PokemonEntity) } }
-                }
-            } else {
-                BehaviorBuilder.create {
-                    it.group(it.present(MemoryModuleType.HURT_BY_ENTITY), it.present(CobblemonMemories.POKEMON_BATTLING))
-                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelPokemonBattle(entity as PokemonEntity) } }
-                }
-            }
-        }*/
-    }
-}

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

@@ -1,44 +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.ai.config.task
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.resolveInt
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.PathfinderMob
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
-import net.minecraft.world.entity.ai.memory.MemoryModuleType
-
-class FleeAttackerTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    var speedMultiplier = "0.5".asExpression()
-    var desiredDistance = "9".asExpression()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition) || entity !is PathfinderMob) return null
-        val speedMultiplier = runtime.resolveFloat(speedMultiplier)
-        val desiredDistance = runtime.resolveInt(desiredDistance)
-        return WrapperLivingEntityTask(
-            SetWalkTargetAwayFrom.entity(MemoryModuleType.HURT_BY_ENTITY, speedMultiplier, desiredDistance, false),
-            PathfinderMob::class.java
-        )
-    }
-}

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

@@ -1,44 +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.ai.config.task
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.resolveInt
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.PathfinderMob
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
-import net.minecraft.world.entity.ai.memory.MemoryModuleType
-
-class FleeNearestHostileTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    var speedMultiplier = "0.5".asExpression()
-    var desiredDistance = "9".asExpression()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition) || entity !is PathfinderMob) return null
-        val speedMultiplier = runtime.resolveFloat(speedMultiplier)
-        val desiredDistance = runtime.resolveInt(desiredDistance)
-        return WrapperLivingEntityTask(
-            SetWalkTargetAwayFrom.entity(MemoryModuleType.NEAREST_HOSTILE, speedMultiplier, desiredDistance, false),
-            PathfinderMob::class.java
-        )
-    }
-}

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

@@ -1,40 +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.ai.config.task
-
-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.entity.ai.FollowWalkTargetTask
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveInt
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.PathfinderMob
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class FollowWalkTargetTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val minRunTicks: Expression = "150".asExpression()
-    val maxRunTicks: Expression = "250".asExpression()
-
-    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return WrapperLivingEntityTask(
-            FollowWalkTargetTask(runtime.resolveInt(minRunTicks), runtime.resolveInt(maxRunTicks)),
-            PathfinderMob::class.java
-        )
-    }
-}

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

@@ -1,33 +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.ai.config.task
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.entity.ai.GetAngryAtAttackerTask
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class GetAngryAtAttackerTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return GetAngryAtAttackerTask.create()
-    }
-}

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

@@ -1,46 +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.ai.config.task
-
-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.entity.npc.ai.GoToHealingMachineTask
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class GoToHealingMachineTaskConfig(
-    val condition: ExpressionLike = "true".asExpressionLike(),
-    val horizontalSearchRange: Expression = "10".asExpression(),
-    val verticalSearchRange: Expression = "5".asExpression(),
-    val speedMultiplier: Expression = "0.35".asExpression(),
-    val completionRange: Expression = "1".asExpression()
-) : SingleTaskConfig {
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-
-        return GoToHealingMachineTask.create(
-            horizontalSearchRange = horizontalSearchRange,
-            verticalSearchRange = verticalSearchRange,
-            speedMultiplier = speedMultiplier,
-            completionRange = completionRange
-        )
-    }
-
-}

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

@@ -1,36 +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.ai.config.task
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.entity.npc.ai.HealUsingHealingMachineTask
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class HealUsingHealingMachineTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val horizontalUseRange = "3".asExpression()
-    val verticalUseRange = "2".asExpression()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return HealUsingHealingMachineTask(horizontalUseRange, verticalUseRange)
-    }
-}

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

@@ -1,36 +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.ai.config.task
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.entity.npc.ai.LookAtBattlingPokemonTask
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveInt
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class LookAtBattlingPokemonTaskConfig : SingleTaskConfig {
-    val minDurationTicks = "40".asExpression()
-    val maxDurationTicks = "80".asExpression()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        return LookAtBattlingPokemonTask.create(
-            minDurationTicks = runtime.resolveInt(minDurationTicks),
-            maxDurationTicks = runtime.resolveInt(maxDurationTicks)
-        )
-    }
-
-}

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

@@ -1,36 +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.ai.config.task
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.SetEntityLookTarget
-
-class LookAtEntitiesTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val maxDistance = "15".asExpression()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return SetEntityLookTarget.create(runtime.resolveFloat(maxDistance))
-    }
-}

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

@@ -1,20 +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.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.npc.ai.LookAtSpeakerTask
-import net.minecraft.world.entity.LivingEntity
-
-class LookAtSpeakerTaskConfig : SingleTaskConfig {
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ) = LookAtSpeakerTask.create()
-}

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

@@ -1,40 +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.ai.config.task
-
-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveInt
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.Mob
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.LookAtTargetSink
-
-class LookAtTargetTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val minDurationTicks: Expression = "40".asExpression()
-    val maxDurationTicks: Expression = "80".asExpression()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return WrapperLivingEntityTask(LookAtTargetSink(runtime.resolveInt(minDurationTicks), runtime.resolveInt(maxDurationTicks)), Mob::class.java)
-    }
-}

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

@@ -1,39 +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.ai.config.task
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.entity.npc.ai.MeleeAttackTask
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class MeleeAttackTaskConfig : SingleTaskConfig {
-    val condition = "true".asExpressionLike()
-    val range = "1.5".asExpression()
-    val cooldownTicks = "30".asExpression()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-
-        return MeleeAttackTask.create(
-            range = range,
-            cooldownTicks = cooldownTicks
-        )
-    }
-}

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

@@ -1,27 +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.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.ai.MoveToAttackTargetTask
-import com.cobblemon.mod.common.util.asExpression
-import net.minecraft.world.entity.LivingEntity
-
-class MoveToAttackTargetTaskConfig : SingleTaskConfig {
-    val speedMultiplier = "0.5".asExpression()
-    val closeEnoughDistance = "1".asExpression()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ) = MoveToAttackTargetTask.create(
-        speedMultiplier = speedMultiplier,
-        closeEnoughDistance = closeEnoughDistance
-    )
-}

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

@@ -1,48 +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.ai.config.task
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.toDF
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.DoNothing
-import net.minecraft.world.entity.ai.behavior.RunOne
-
-/**
- * A task where each time the brain is ticked, a different task might run. This differs from [RandomTaskConfig] in that
- * the same entity can run all of the different possibilities, rather than [RandomTaskConfig] where once the entity
- * spawns, it will only use whichever was selected at the time of spawning.
- *
- * This is most useful for making a single entity randomly choose what to do at a given moment.
- *
- * @author Hiroku
- * @since October 19th, 2024
- */
-class OneOfTaskConfig : SingleTaskConfig {
-    class OneOfTaskOption {
-        val weight: Int = 1
-        val task: TaskConfig = SingleTaskConfig { _, _ -> DoNothing(0, 1) }
-    }
-
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val options = mutableListOf<OneOfTaskOption>()
-
-    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return RunOne(options.map { it.task.createTasks(entity, brainConfigurationContext).first() toDF it.weight })
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/README.md

@@ -1,175 +0,0 @@
-# Task Configuration
-
-A task configuration is responsible for producing one or multiple tasks as part of a
-[BrainConfiguration](../README.md). Tasks are the smallest unit of behaviour in a brain and are executed
-as part of an activity.
-
-A task configuration can be a simple string that represents the type of task to create, or a JSON object
-which a `type` property that describes what type of task is being created and other properties that configure it.
-
-### one_of
-The 'one_of' type creates a task that randomly selects one of the tasks in the list to execute each tick.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `options`: A list of objects representing the different tasks that could run for a tick. Each object must have a `task`
-    which is a task configuration. Optionally, you can also specify a `weight` which is a number that determines the 
-    probability of the task being selected. If no weight is specified, the task will have a weight of 1.
-
-### all_of
-The 'all_of' type creates a task that executes all of the tasks in the list each tick.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `tasks`: A list of task configurations to execute each tick.
-
-### do_nothing
-The 'do_nothing' type creates a task that does nothing for some period of time.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `minDurationTicks`: A MoLang expression that determines the minimum number of ticks to do nothing. Defaults to 40. Has `q.entity` as the entity.
-- `maxDurationTicks`: A MoLang expression that determines the maximum number of ticks to do nothing. Defaults to 80. Has `q.entity` as the entity.
-
-### random
-The 'random' type creates a task that chooses one of the contained tasks when the entity is spawned. Note that this does not save forever,
-so if the entity is reloaded, it will choose a new task. To make persisting randomization you have to use MoLang conditions on other task
-configurations that use `q.entity.id_modulo(some_number)` to apply randomization based on the entity UUID.
-For example, `q.entity.id_modulo(2)` will return 0 or 1 for an entity but will always be the same for the same entity,
-so using `q.entity.id_modulo(2) == 0` as a task condition will make it occur for 50% of entities and remain after reloads.
-`q.entity.id_modulo(3)` will return 0 or 1 or 2, and so on.
-
-### follow_walk_target
-The 'follow_walk_target' type creates a task that makes the entity follow a walk target. This does not choose the walk target,
-it is only responsible for ensuring the entity will follow a path to whatever the current walk target is. Note that the target
-does not necessarily need to be a land target.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `minRunTicks`: A MoLang expression that determines the minimum number of ticks to run to the target before stopping. Defaults to 150.
-- `maxRunTicks`: A MoLang expression that determines the maximum number of ticks to run to the target before giving up. Defaults to 250.
-
-### look_at_target
-The 'look_at_target' type creates a task that makes the entity look at a target. This does not choose the target, it is only
-responsible for ensuring the entity will look at the target position.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `minDurationTicks`: A MoLang expression that determines the minimum number of ticks that the entity will look at the target. Defaults to 40.
-- `maxDurationTicks`: A MoLang expression that determines the maximum number of ticks that the entity will look at the target. Defaults to 80.
-
-### stay_afloat
-The 'stay_afloat' type creates a task that makes the entity stay afloat in water instead of quietly sinking and drowning.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `chance`: A MoLang expression that determines the chance of the entity trying to stay afloat. The higher it is, the more desperately it stays above the water. Defaults to 0.01. You don't need to change this, honestly.
-
-### wander
-The 'wander' type creates a task that makes the entity wander around randomly.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `shouldWander`: A MoLang expression that determines if the entity should wander. Defaults to `math.random(0, 20*8) <= 1`, which makes it wander approximately once every 8 seconds.
-- `horizontalRange`: A MoLang expression that determines the maximum distance the entity will wander in a single path. Defaults to 10.
-- `verticalRange`: A MoLang expression that determines the maximum vertical distance the entity will wander from its starting position. Defaults to 5.
-- `speedMultiplier`: A MoLang expression that determines the speed multiplier for wandering. Defaults to 0.35 which is a standard walk speed.
-- `completionRange`: A MoLang expression that determines the distance from the target location that the entity needs to be for the path to be considered complete. Defaults to 1.
-- `lookTargetYOffset`: A MoLang expression that determines the vertical offset of the look target from the target walk position. Defaults to 1.5. You probably don't need to change this.
-
-### look_at_entities
-The 'look_at_entities' type creates a task that will randomly set the entity's look target to a nearby entity.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `maxDistance`: A MoLang expression that determines the maximum distance for an entity to be from this entity and be looked at.
-
-### go_to_healing_machine
-The 'go_to_healing_machine' type creates a task that makes the entity go to a nearby healing machine when they have a static NPC party that could be healed.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `horizontalSearchRange`: A MoLang expression that determines the maximum distance to search for a healing machine. Defaults to 10.
-- `verticalSearchRange`: A MoLang expression that determines the maximum vertical distance to search for a healing machine. Defaults to 5.
-- `speedMultiplier`: A MoLang expression that determines the speed multiplier for walking to the healing machine. Defaults to 0.35 which is a standard walk speed.
-- `completionRange`: A MoLang expression that determines the distance from the target location that the entity needs to be for the path to be considered complete. Defaults to 1.
-
-### heal_using_healing_machine
-The 'heal_using_healing_machine' type creates a task that makes the entity heal its static NPC party using a healing machine if one is right next to the NPC.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `horizontalUseRange`: A MoLang expression that determines the maximum distance to a healing machine from which the NPC can use it. Defaults to 3.
-- `verticalUseRange`: A MoLang expression that determines the maximum vertical distance to a healing machine from which the NPC can use it. Defaults to 2.
-
-### switch_npc_to_battle
-The 'switch_npc_to_battle' type creates a task that will switch NPC entities to the battle activity when it is in a battle. You'd generally put this 
-on the idle activity so that it automatically transitions activities when a battle starts.
-
-### switch_npc_from_battle
-The 'switch_npc_from_battle' type creates a task that will switch NPC entities from the battle activity when it is no longer in a battle. You should
-put this in the battle activity so that it automatically transitions activities when a battle ends. If the NPC is in multiple battles, this
-will only activate when no battles remain. It will rely on the brain schedule to decide what activity to switch back to (usually idle).
-
-### look_at_battling_pokemon
-The 'look_at_battling_pokemon' type creates a task that will set the entity's look target to switch between the battling Pokémon.
-- `minDurationTicks`: A MoLang expression that determines the minimum number of ticks that the entity will look at a specific battling Pokémon. Defaults to 40.
-- `maxDurationTicks`: A MoLang expression that determines the maximum number of ticks that the entity will look at a specific battling Pokémon. Defaults to 80.
-
-### exit_battle_when_hurt
-The 'exit_battle_when_hurt' type creates a task that will make the entity exit the battle when it is hurt.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `includePassiveDamage`: A boolean that determines if passive damage (like poison or cacti) should trigger this task. Defaults to true.
-
-### switch_to_chatting
-The 'switch_to_chatting' type creates a task that will switch the entity to the chatting activity when a dialogue has been opened with that NPC.
-
-### switch_from_chatting
-The 'switch_from_chatting' type creates a task that will switch the entity from the chatting activity when the dialogue has been closed with that NPC.
-It will rely on the brain schedule to decide what activity to switch back to (usually idle).
-
-### look_at_speaker
-The 'look_at_speaker' type creates a task that will set the entity's look target to the speaker of the dialogue.
-
-### switch_to_action_effect
-The 'switch_to_action_effect' type creates a task that will switch the entity to the action effect activity when it is performing an action effect.
-
-### switch_from_action_effect
-The 'switch_from_action_effect' type creates a task that will switch the entity from the action effect activity when it is no longer performing an action effect.
-It will rely on the brain schedule to decide what activity to switch back to (usually idle).
-
-### switch_to_fight
-The 'switch_to_fight' type creates a task that will switch the entity to the fight activity when it has an attack target.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `activity`: The activity to switch to when the NPC is in a fight. Defaults to `minecraft:fight`.
-
-### switch_from_fight
-The 'switch_from_fight' type creates a task that will switch the entity from the fight activity when it no longer has an attack target. It will rely on the brain schedule to decide what activity to switch back to (usually idle).
-
-### get_angry_at_attacker
-The 'get_angry_at_attacker' type creates a task that will make the entity get angry at the attacker when it is attacked.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-
-### stop_being_angry_if_attacker_dead
-The 'stop_being_angry_if_attacker_dead' type creates a task that will make the entity stop being angry at the attacker when the attacker is dead.
-
-### attack_angry_at
-The 'attack_angry_at' type creates a task that will make the entity choose the entity that it is angry at to be its attack target.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-
-### move_to_attack_target
-The 'move_to_attack_target' type creates a task that will make the entity move to its attack target.
-- `speedMultiplier`: A MoLang expression that determines the speed multiplier for moving to the attack target. Defaults to 0.5 which is an elevated speed to usual.
-- `closeEnoughDistance`: A MoLang expression that determines the distance from the attack target that the entity needs to be for the path to be considered complete. Defaults to 1.
-
-### melee_attack
-The 'melee_attack' type creates a task that will make the entity perform a melee attack on its attack target when it is close enough. The damage dealt is determined by entity properties, which cannot be easily configured at time of writing.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `range`: A MoLang expression that determines the maximum distance from the attack target that the entity can be to perform the attack. Defaults to 1.5.
-- `cooldownTicks`: A MoLang expression that determines the number of ticks to wait before performing another attack. Defaults to 30.
-
-### switch_to_panic_when_hurt
-The 'switch_to_panic_when_hurt' type creates a task that will switch the entity to the panic activity when it is hurt.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `includePassiveDamage`: A boolean that determines if passive damage (like poison or cacti) should trigger this task. Defaults to false.
-
-### switch_to_panic_when_hostiles_nearby
-The 'switch_to_panic_when_hostiles_nearby' type creates a task that will switch the entity to the panic activity when hostiles are nearby. The definition of nearby depends
-on the entity type and this piggy-backs off the Minecraft list of aggressive mobs and the right distances.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-
-### calm_down
-The 'calm_down' type creates a task that will make the entity calm down when it is no longer being hurt and is far from hostiles and its attacker.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-
-### flee_attacker
-The 'flee_attacker' type creates a task that will make the entity flee from its attacker when it is hurt.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `speedMultiplier`: A MoLang expression that determines the speed multiplier for fleeing from the attacker. Defaults to 0.5 which is an elevated speed to usual.
-- `desiredDistance`: A MoLang expression that determines the distance from the attacker that the entity should try to maintain. Defaults to 9.
-
-### flee_nearest_hostile
-The 'flee_nearest_hostile' type creates a task that will make the entity flee from the nearest hostile entity when it is hurt.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
-- `speedMultiplier`: A MoLang expression that determines the speed multiplier for fleeing from the nearest hostile. Defaults to 0.5 which is an elevated speed to usual.
-- `desiredDistance`: A MoLang expression that determines the distance from the nearest hostile that the entity should try to maintain. Defaults to 9.

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

@@ -1,52 +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.ai.config.task
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.weightedSelection
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.DoNothing
-
-/**
- * Randomly chooses one of the possible tasks to add to the brain. This differs from [OneOfTaskConfig] in that
- * the randomization happens before the brain is created, rather than [OneOfTaskConfig] where the randomization
- * happens each time the brain is ticked.
- *
- * This is most useful when the goal is to apply something like a specialization to an entity where it varies
- * but once put on the entity, it sticks.
- *
- * @author Hiroku
- * @since October 19th, 2024
- */
-class RandomTaskConfig : TaskConfig {
-    class RandomTaskChoice {
-        val weight = 1.0
-        val task: TaskConfig = SingleTaskConfig { _, _ -> DoNothing(0, 1) }
-    }
-
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val choices = mutableListOf<RandomTaskChoice>()
-
-    override fun createTasks(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): List<BehaviorControl<in LivingEntity>> {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return emptyList()
-        val task = choices.weightedSelection { it.weight }?.task ?: throw IllegalStateException("No tasks to choose from in random_task config")
-        return task.createTasks(entity, brainConfigurationContext)
-    }
-}

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

@@ -1,24 +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.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-fun interface SingleTaskConfig : TaskConfig {
-    override fun createTasks(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): List<BehaviorControl<in LivingEntity>> {
-        return createTask(entity, brainConfigurationContext)?.let { listOf(it) } ?: emptyList()
-    }
-
-    fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<in LivingEntity>?
-}