Toying with data reload for species data, current issue is render thread needs species data (shouldn't it be concmodding sometimes)

.gitignore

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

.gitlab-ci.yml

@@ -1,10 +1,9 @@
-image: amazoncorretto:21-alpine
+image: amazoncorretto:21
 
 before_script:
   - export GRADLE_USER_HOME=`pwd`/.gradle
 
 stages:
-  - merge
   - build
   - deploy
 
@@ -65,30 +64,3 @@ deploy:
       - ./*.jar
 #      - neoforge/build/libs/*+*.jar
 #      - fabric/build/libs/*+*.jar
-
-merge_on_lang_change:
-  stage: merge
-  script:
-    # Check for changes in the specified file or directory
-    - |
-      apk add git
-      if git diff --name-only "$CI_COMMIT_BEFORE_SHA" "$CI_COMMIT_SHA" | grep -q "common/src/main/resources/assets/cobblemon/lang/en_us.json"; then
-        echo "US locale changed! Updating lang branch..."
-      
-        # Configure Git user for the merge commit
-        git config --global user.email "noreply@weblate.org"
-        git config --global user.name "Weblate"
-        git remote set-url origin https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/cable-mc/cobblemon.git
-      
-        # Fetch the target branch and merge main into it
-        git fetch origin lang-updates
-        git checkout lang-updates
-        git merge origin/ci-test
-      
-        # Push the merged branch back to the repository
-        git push origin lang-updates:lang-updates-test
-      else
-        echo "No need to update lang"
-      fi
-  only:
-    - ci-test

1.20.5 to do.txt

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

CHANGELOG.md

@@ -7,18 +7,18 @@
 - 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 Pokemon 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.
+- 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.
+- 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
+- Moves can now be benched without specifying a replacement move, allowing for empty move slots.
+- Moves learned via Sketch now persist after battle.
 - 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.
@@ -30,18 +30,9 @@
 - 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 shiny Pokémon particles with sound effects.
-- Added animation for trading.
 
 ### Pokémon Added
-#### Gen 1
-- Alola Bias Cubone
-- Alolan Marowak
-
 #### Gen 2
 - Ledyba
 - Ledian
@@ -49,250 +40,19 @@
 - Sunflora
 - Wobbuffet
 - Girafarig
-- Corsola
-- Remoraid
-- Octillery
-- Mantine
-- Smeargle
-- Remoraid
-- Octillery
-- Mantine
-- Corsola
 
 #### Gen 3
-- Slakoth
-- Vigoroth
-- Slaking
-- Corphish
-- Crawdaunt
-- Feebas
-- Milotic
 - Wynaut
-- Absol
-- Spheal
-- Sealeo
-- Walrein
-- Bagon
-- Shelgon
-- Salamence
-
-#### Gen 4
-- Shellos [East Sea form]
-- Gastrodon [East Sea form]
-- Finneon
-- Lumineon
-- Mantyke
-- Feebas
-- Milotic
-- Spheal
-- Sealeo
-- Walrein
-- 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
-- Bruxish
-- Mareanie
-- Toxapex
-
-#### Gen 8
-- Cramorant
-- Pincurchin
 
 #### Gen 9
-- Wattrel
-- Kilowattrel
-- Wiglett
-- Wugtrio
-- Flamigo
-- Veluza
 - Farigiraf
-- Klawf
-- Finizen
-- Palafin
-- Wiglett
-- Wugtrio
-- Flamigo
-
-#### 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, Weepinbel, 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.
@@ -300,13 +60,14 @@
 - 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.
+- Dreepy is now shoulder mountable.
 - 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.
 - 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.
+- Kakuna, Beedrill, Snorlax, Munchlax, Krabby, Kingler, and Lurantis 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).
@@ -318,26 +79,13 @@
 - 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.
+- Pokemon Name (and level) labels are now only visible when crouching by default, set the `displayEntityLabelsWhenCrouchingOnly` to `false` to always them even when not crouching
+- 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.
 
 ### 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 sendout sound erronously 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.
@@ -346,10 +94,9 @@
 - 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 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 Cetitan's cry breaking its walk and sleep animations. 
+- 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 Pokémon.
 - Fixed Pokémon entity not spawning when starting a battle while recalling said Pokémon.
@@ -380,14 +127,9 @@
 - 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 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.
@@ -402,9 +144,7 @@
 - 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 the Ice Face ability activation being displayed incorrectly in a battle
 
 ### Developer
 - `SpawnCause` is now an implementation of `SpawningInfluence`.
@@ -417,44 +157,21 @@
 - 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.
+- All sounds related to evolving Pokémon have been moved to the "sounds/evolution" folder.
 - 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
 
 ### 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.
 
 ### 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
+  - 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/
 
 
@@ -494,7 +211,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
@@ -506,19 +223,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.
@@ -536,7 +253,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.
@@ -555,13 +272,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
@@ -861,7 +578,7 @@ 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).
@@ -870,7 +587,7 @@ These are our compromise for having both regular and Hisuian forms of these Pok
 - 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.
@@ -885,7 +602,7 @@ These are our compromise for having both regular and Hisuian forms of these Pok
 - 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`.
+- 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.
@@ -899,14 +616,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:
@@ -918,16 +635,16 @@ These are our compromise for having both regular and Hisuian forms of these Pok
 - 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.
@@ -1014,7 +731,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.
@@ -1034,7 +751,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
@@ -1060,7 +777,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)
@@ -1471,7 +1188,7 @@ 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.
@@ -1870,4 +1587,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/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/mixin/PartyScrollMixin.java

@@ -10,14 +10,11 @@ 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.item.PokedexItem;
 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;
@@ -27,20 +24,12 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(MouseHandler.class)
-public class MouseHandlerMixin {
+public class PartyScrollMixin {
     @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(
@@ -85,27 +74,4 @@ public class MouseHandlerMixin {
         }
     }
 
-    @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/PlayerMixin.java

@@ -12,23 +12,15 @@ 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;
@@ -38,24 +30,19 @@ 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;
 
 @Mixin(Player.class)
-public abstract class PlayerMixin extends LivingEntity implements ScannableEntity {
+public abstract class PlayerMixin extends LivingEntity {
 
     @Shadow public abstract CompoundTag getShoulderEntityLeft();
 
@@ -81,16 +68,16 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
     @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)
     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,17 +101,22 @@ 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());
@@ -135,6 +127,10 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
         }
     }
 
+    private boolean isShoulderPokemon(CompoundTag nbt) {
+        return CompoundTagExtensionsKt.isPokemonEntity(nbt);
+    }
+
     @Inject(
         method = "eat",
         at = @At(
@@ -175,49 +171,4 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
             }
         }
     }
-
-    @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/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/kotlin/com/cobblemon/mod/common/Cobblemon.kt

@@ -43,7 +43,6 @@ import com.cobblemon.mod.common.api.spawning.prospecting.SpawningProspector
 import com.cobblemon.mod.common.api.starter.StarterHandler
 import com.cobblemon.mod.common.api.storage.PokemonStoreManager
 import com.cobblemon.mod.common.api.storage.adapter.conversions.ReforgedConversion
-import com.cobblemon.mod.common.api.storage.adapter.database.MongoDBStoreAdapter
 import com.cobblemon.mod.common.api.storage.adapter.flatfile.FileStoreAdapter
 import com.cobblemon.mod.common.api.storage.adapter.flatfile.JSONStoreAdapter
 import com.cobblemon.mod.common.api.storage.adapter.flatfile.NBTStoreAdapter
@@ -53,7 +52,8 @@ 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.adapter.DexDataNbtBackend
+import com.cobblemon.mod.common.api.storage.player.adapter.PlayerDataJsonBackend
 import com.cobblemon.mod.common.api.storage.player.factory.CachedPlayerDataStoreFactory
 import com.cobblemon.mod.common.api.tags.CobblemonEntityTypeTags
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
@@ -97,7 +97,6 @@ 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
@@ -106,10 +105,7 @@ import com.cobblemon.mod.common.util.*
 import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
 import com.cobblemon.mod.common.world.feature.ore.CobblemonOrePlacedFeatures
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
-import com.mongodb.ConnectionString
-import com.mongodb.MongoClientSettings
 import com.mongodb.client.MongoClient
-import com.mongodb.client.MongoClients
 import java.io.File
 import java.io.FileReader
 import java.io.FileWriter
@@ -277,7 +273,6 @@ 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)
@@ -325,7 +320,9 @@ object Cobblemon {
                     }
                 }
 
+                /*
                 "mongodb" -> {
+                    /*
                     try {
                         Class.forName("com.mongodb.client.MongoClient")
 
@@ -333,22 +330,18 @@ 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, PlayerInstancedDataStoreType.GENERAL)
                         MongoDBStoreAdapter(mongoClient, config.mongoDBDatabaseName)
                     } catch (e: ClassNotFoundException) {
                         LOGGER.error("MongoDB driver not found.")
                         throw e
                     }
 
+                     */
                 }
 
+                 */
 
                 else -> throw IllegalArgumentException("Unsupported storageFormat: ${config.storageFormat}")
             }

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

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

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

@@ -38,6 +38,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 +117,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,113 +191,453 @@ 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)))
+    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)))
+    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)))
-    @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 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)
+        )
+    )
     @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)))
     @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 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)
+    ))
     @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 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 SKY_TUMBLESTONE_BRICK_STAIRS = this.create("sky_tumblestone_brick_stairs", StairsBlockInvoker.`cobblemon$create`(SKY_TUMBLESTONE_BRICKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SKY_TUMBLESTONE_BRICKS)))
+    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)))
+    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)))
+    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)))
-
+    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)))
-    @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 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)
+        )
+    )
     @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)))
     @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 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)
+    ))
     @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)))
+    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)))
+    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)))
+    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)))
+    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)))
+    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 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)
+        )
+    )
     @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}))
+    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 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)))
+    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)
+        )
+    )
     @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}))
+    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 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)))
+    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 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)))
+    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)
+        )
+    )
     @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}))
+    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 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)))
+    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)
+        )
+    )
     @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}))
+    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)
+        )
+    )
     @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 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)
+        )
+    )
 
     @JvmField
     val BLACK_APRICORN = apricornBlock("black_apricorn", Apricorn.BLACK)
@@ -313,48 +655,188 @@ 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)
+                .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 LECTERN = create(
+        "lectern",
+        LecternBlock(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.WOOD)
+                .instrument(NoteBlockInstrument.BASS)
+                .sound(SoundType.WOOD)
+                .strength(2.5F)
+                .ignitedByLava()
+        )
+    )
+
+    @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
@@ -368,6 +850,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

@@ -20,7 +20,6 @@ object CobblemonCommands {
         SpawnNPCCommand.register(dispatcher)
         GivePokemon.register(dispatcher)
         TakePokemon.register(dispatcher)
-        ChangeEyeHeight.register(dispatcher)
         ChangeScaleAndSize.register(dispatcher)
         ChangeWalkSpeed.register(dispatcher)
         TestCommand.register(dispatcher)

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

@@ -153,21 +153,20 @@ 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_BLACK = pokedexItem(PokedexTypes.BLACK)
+    val POKEDEX_BLACK = create("pokedex_black", PokedexItem(PokedexTypes.BLACK))
     @JvmField
-    val POKEDEX_BLUE = pokedexItem(PokedexTypes.BLUE)
+    val POKEDEX_BLUE = create("pokedex_blue", PokedexItem(PokedexTypes.BLUE))
     @JvmField
-    val POKEDEX_GREEN = pokedexItem(PokedexTypes.GREEN)
+    val POKEDEX_GREEN = create("pokedex_green", PokedexItem(PokedexTypes.GREEN))
     @JvmField
-    val POKEDEX_PINK = pokedexItem(PokedexTypes.PINK)
+    val POKEDEX_PINK = create("pokedex_pink", PokedexItem(PokedexTypes.PINK))
     @JvmField
-    val POKEDEX_RED = pokedexItem(PokedexTypes.RED)
+    val POKEDEX_RED = create("pokedex_red", PokedexItem(PokedexTypes.RED))
     @JvmField
-    val POKEDEX_WHITE = pokedexItem(PokedexTypes.WHITE)
+    val POKEDEX_WHITE = create("pokedex_white", PokedexItem(PokedexTypes.WHITE))
     @JvmField
-    val POKEDEX_YELLOW = pokedexItem(PokedexTypes.YELLOW)
+    val POKEDEX_YELLOW = create("pokedex_yellow", PokedexItem(PokedexTypes.YELLOW))
 
     @JvmField
     val VIVICHOKE = compostableItem("vivichoke")
@@ -1248,12 +1247,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
         return item
     }
 
-    private fun pokedexItem(type: PokedexTypes): 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/CobblemonNetwork.kt

@@ -51,7 +51,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
@@ -94,6 +100,13 @@ import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyPokemo
 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.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
@@ -128,6 +141,11 @@ 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
@@ -162,13 +180,15 @@ import com.cobblemon.mod.common.net.serverhandling.storage.pc.MovePartyPokemonTo
 import com.cobblemon.mod.common.net.serverhandling.storage.pc.ReleasePartyPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.pc.SwapPCPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.pc.UnlinkPlayerFromPCHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.AcceptTradeRequestHandler
+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.client.pokedex.ServerConfirmedRegisterPacket
-import com.cobblemon.mod.common.net.messages.client.trade.*
 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.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
 
@@ -321,7 +341,6 @@ object CobblemonNetwork {
 
         // 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))
@@ -409,7 +428,6 @@ 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))
 

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")
@@ -44,7 +42,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @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")
@@ -109,56 +107,61 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val PVW_BATTLE = this.create("battle.pvw.default")
 
     @JvmField
-    val MEDICINE_HERB_USE = this.create("item.medicine.herb.use")
+    val MEDICINE_HERB_USE = this.create("medicine_herb.use")
     @JvmField
-    val MEDICINE_LIQUID_USE = this.create("item.medicine.liquid.use")
+    val MEDICINE_LIQUID_USE = this.create("medicine_liquid.use")
     @JvmField
-    val MEDICINE_PILLS_USE = this.create("item.medicine.pills.use")
+    val MEDICINE_PILLS_USE = this.create("medicine_pills.use")
     @JvmField
-    val MEDICINE_SPRAY_USE = this.create("item.medicine.spray.use")
+    val MEDICINE_SPRAY_USE = this.create("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")
@@ -176,78 +179,73 @@ 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 EVOLUTION_STONE_BLOCK_BREAK = this.create("evolution_stone_block.break")
     @JvmField
-    val TUMBLESTONE_BLOCK_BREAK = this.create("block.tumblestone.block_break")
+    val EVOLUTION_STONE_BLOCK_HIT = this.create("evolution_stone_block.hit")
     @JvmField
-    val TUMBLESTONE_HIT = this.create("block.tumblestone.hit")
+    val EVOLUTION_STONE_BLOCK_PLACE = this.create("evolution_stone_block.place")
     @JvmField
-    val TUMBLESTONE_PLACE = this.create("block.tumblestone.place")
-    @JvmField
-    val TUMBLESTONE_STEP = this.create("block.tumblestone.step")
+    val EVOLUTION_STONE_BLOCK_STEP = this.create("evolution_stone_block.step")
 
     @JvmField
-    val EVOLUTION_STONE_BLOCK_BREAK = this.create("block.evolution_stone_block.break")
+    val GIMMIGHOUL_GIVE_ITEM_SMALL = this.create("gimmighoul.give_item_small")
     @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 GIMMIGHOUL_REVEAL = this.create("gimmighoul.reveal")
 
     @JvmField
-    val GIMMIGHOUL_GIVE_ITEM = this.create("pokemon.gimmighoul.give_item")
+    val BERRY_BUSH_BREAK = this.create("berry_bush.break")
     @JvmField
-    val GIMMIGHOUL_REVEAL = this.create("pokemon.gimmighoul.reveal")
+    val BERRY_BUSH_PLACE = this.create("berry_bush.place")
 
     @JvmField
-    val BERRY_BUSH_BREAK = this.create("block.berry_bush.break")
+    val BIG_ROOT_BREAK = this.create("big_root.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 ENERGY_ROOT_PLACE = this.create("energy_root.place")
 
     @JvmField
-    val BIG_ROOT_BREAK = this.create("block.big_root.break")
+    val VIVICHOKE_BREAK = this.create("vivichoke.break")
     @JvmField
-    val ENERGY_ROOT_PLACE = this.create("block.energy_root.place")
+    val VIVICHOKE_PLACE = this.create("vivichoke.place")
 
     @JvmField
-    val VIVICHOKE_BREAK = this.create("block.vivichoke.break")
+    val MINT_BREAK = this.create("mint.break")
     @JvmField
-    val VIVICHOKE_PLACE = this.create("block.vivichoke.place")
+    val MINT_PLACE = this.create("mint.place")
 
     @JvmField
-    val MINT_BREAK = this.create("block.mint.break")
+    val REVIVAL_HERB_BREAK = this.create("revival_herb.break")
     @JvmField
-    val MINT_PLACE = this.create("block.mint.place")
+    val REVIVAL_HERB_PLACE = this.create("revival_herb.place")
 
     @JvmField
-    val REVIVAL_HERB_BREAK = this.create("block.revival_herb.break")
+    val MEDICINAL_LEEK_BREAK = this.create("medicinal_leek.break")
     @JvmField
-    val REVIVAL_HERB_PLACE = this.create("block.revival_herb.place")
+    val MEDICINAL_LEEK_PLACE = this.create("medicinal_leek.plant")
 
     @JvmField
-    val MEDICINAL_LEEK_BREAK = this.create("block.medicinal_leek.break")
+    val GILDED_CHEST_OPEN = this.create("gilded_chest.open")
     @JvmField
-    val MEDICINAL_LEEK_PLACE = this.create("block.medicinal_leek.plant")
-
+    val GILDED_CHEST_CLOSE = this.create("gilded_chest.close")
     @JvmField
-    val GILDED_CHEST_OPEN = this.create("block.gilded_chest.open")
+    val GILDED_CHEST_STEP = this.create("gilded_chest.step")
     @JvmField
-    val GILDED_CHEST_CLOSE = this.create("block.gilded_chest.close")
+    val GILDED_CHEST_HIT = this.create("gilded_chest.hit")
     @JvmField
-    val GILDED_CHEST_STEP = this.create("block.gilded_chest.step")
+    val GILDED_CHEST_BREAK = this.create("gilded_chest.break")
     @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")
+    val GILDED_CHEST_PLACE = this.create("gilded_chest.place")
 
     @JvmField
     val RELIC_COIN_SACK_SOUNDS = SoundType(1f, 1.1f,
@@ -403,17 +401,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/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/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/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/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 minRunTime: Expression = "150".asExpression()
-    val maxRunTime: 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(minRunTime), runtime.resolveInt(maxRunTime)),
-            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.33".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/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>?
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/StayAfloatTaskConfig.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.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.StayAfloatTask
-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.PathfinderMob
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class StayAfloatTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val chance: Expression = "0.01".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
-        val chance = runtime.resolveFloat(chance)
-        return WrapperLivingEntityTask(
-            StayAfloatTask(chance),
-            PathfinderMob::class.java
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/StopBeingAngryIfAttackerDeadTaskConfig.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.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
-import net.minecraft.world.entity.ai.behavior.StopBeingAngryIfTargetDead
-
-class StopBeingAngryIfAttackerDeadTaskConfig : 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 StopBeingAngryIfTargetDead.create()
-    }
-}

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

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.npc.ai.SwitchFromActionEffectTask
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.schedule.Activity
-
-class SwitchFromActionEffectTaskConfig : SingleTaskConfig {
-    val activity = Activity.IDLE
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ) = SwitchFromActionEffectTask.create(activity)
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/SwitchFromChattingTaskConfig.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.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
-import net.minecraft.world.entity.ai.behavior.declarative.Trigger
-import net.minecraft.world.entity.schedule.Activity
-
-class SwitchFromChattingTaskConfig : SingleTaskConfig {
-    val activity = Activity.IDLE
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ) = BehaviorBuilder.create {
-        it.group(
-            it.absent(CobblemonMemories.DIALOGUES)
-        ).apply(it) { _ ->
-            Trigger { world, entity, _ ->
-                entity.brain.setActiveActivityIfPossible(activity)
-                return@Trigger true
-            }
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/SwitchFromFightTaskConfig.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.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
-import net.minecraft.world.entity.ai.behavior.declarative.Trigger
-import net.minecraft.world.entity.ai.memory.MemoryModuleType
-import net.minecraft.world.entity.schedule.Activity
-
-class SwitchFromFightTaskConfig : SingleTaskConfig {
-    val activity = Activity.IDLE
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ) = BehaviorBuilder.create {
-        it.group(
-            it.absent(MemoryModuleType.ATTACK_TARGET)
-        ).apply(it) { _ ->
-            Trigger { world, entity, _ ->
-                entity.brain.setActiveActivityIfPossible(activity)
-                return@Trigger true
-            }
-        }
-    }
-}

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

@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.npc.ai.SwitchFromBattleTask
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.schedule.Activity
-
-class SwitchFromNPCBattleTaskConfig : SingleTaskConfig {
-    val activity: Activity = Activity.IDLE
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return SwitchFromBattleTask.create(activity)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/SwitchToActionEffectTaskConfig.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.task
-
-import com.cobblemon.mod.common.CobblemonActivities
-import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-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
-
-class SwitchToActionEffectTaskConfig : SingleTaskConfig {
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return BehaviorBuilder.create {
-            it.group(
-                it.absent(CobblemonMemories.ACTIVE_ACTION_EFFECT)
-            ).apply(it) { _ ->
-                Trigger { world, entity, time ->
-                    entity.brain.setActiveActivityIfPossible(CobblemonActivities.NPC_ACTION_EFFECT)
-                    return@Trigger true
-                }
-            }
-        }
-    }
-}

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

@@ -1,43 +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.CobblemonActivities
-import com.cobblemon.mod.common.CobblemonMemories
-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.declarative.BehaviorBuilder
-import net.minecraft.world.entity.ai.behavior.declarative.Trigger
-import net.minecraft.world.entity.ai.memory.MemoryModuleType
-
-class SwitchToChattingTaskConfig : SingleTaskConfig {
-    val condition = "true".asExpressionLike()
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ) = BehaviorBuilder.create {
-        it.group(
-            it.present(CobblemonMemories.DIALOGUES),
-            it.registered(MemoryModuleType.WALK_TARGET)
-        ).apply(it) { _, walkTarget ->
-            Trigger { world, entity, _ ->
-                runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-                if (!runtime.resolveBoolean(condition)) return@Trigger false
-                walkTarget.erase()
-                entity.brain.setActiveActivityIfPossible(CobblemonActivities.NPC_CHATTING)
-                return@Trigger true
-            }
-        }
-    }
-}

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

@@ -1,45 +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.Difficulty
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
-import net.minecraft.world.entity.ai.behavior.declarative.Trigger
-import net.minecraft.world.entity.ai.memory.MemoryModuleType
-import net.minecraft.world.entity.schedule.Activity
-
-class SwitchToFightTaskConfig : SingleTaskConfig {
-    val condition = "true".asExpressionLike()
-    val activity = Activity.FIGHT
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ) = BehaviorBuilder.create {
-        it.group(
-            it.present(MemoryModuleType.ATTACK_TARGET)
-        ).apply(it) { _ ->
-            Trigger { world, entity, _ ->
-                runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-                if (!runtime.resolveBoolean(condition)) return@Trigger false
-                if (entity.commandSenderWorld.getCurrentDifficultyAt(entity.blockPosition()).difficulty == Difficulty.PEACEFUL) return@Trigger false
-
-                entity.brain.setActiveActivityIfPossible(activity)
-                return@Trigger true
-            }
-        }
-    }
-}

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

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

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

@@ -1,65 +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.MoLangRuntime
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-/**
- * A configuration for a brain task. Its purpose is to generate a list of tasks to add to the brain of
- * an entity when it spawns.
- *
- * This is essentially a builder for tasks.
- *
- * @author Hiroku
- * @since October 14th, 2024
- */
-fun interface TaskConfig {
-    companion object {
-        val types = mutableMapOf<String, Class<out TaskConfig>>(
-            "one_of" to OneOfTaskConfig::class.java,
-            "wander" to WanderTaskConfig::class.java,
-            "look_at_target" to LookAtTargetTaskConfig::class.java,
-            "follow_walk_target" to FollowWalkTargetTaskConfig::class.java,
-            "random" to RandomTaskConfig::class.java,
-            "stay_afloat" to StayAfloatTaskConfig::class.java,
-            "look_at_entities" to LookAtEntitiesTaskConfig::class.java,
-            "do_nothing" to DoNothingTaskConfig::class.java,
-            "get_angry_at_attacker" to GetAngryAtAttackerTaskConfig::class.java,
-            "stop_being_angry_if_attacker_dead" to StopBeingAngryIfAttackerDeadTaskConfig::class.java,
-            "switch_npc_to_battle" to SwitchToNPCBattleTaskConfig::class.java,
-            "look_at_battling_pokemon" to LookAtBattlingPokemonTaskConfig::class.java,
-            "switch_npc_from_battle" to SwitchFromNPCBattleTaskConfig::class.java,
-            "go_to_healing_machine" to GoToHealingMachineTaskConfig::class.java,
-            "heal_using_healing_machine" to HealUsingHealingMachineTaskConfig::class.java,
-            "all_of" to AllOfTaskConfig::class.java,
-            "attack_angry_at" to AttackAngryAtTaskConfig::class.java,
-            "move_to_attack_target" to MoveToAttackTargetTaskConfig::class.java,
-            "melee_attack" to MeleeAttackTaskConfig::class.java,
-            "switch_from_fight" to SwitchFromFightTaskConfig::class.java,
-            "switch_to_fight" to SwitchToFightTaskConfig::class.java,
-            "switch_to_chatting" to SwitchToChattingTaskConfig::class.java,
-            "switch_from_chatting" to SwitchFromChattingTaskConfig::class.java,
-            "look_at_speaker" to LookAtSpeakerTaskConfig::class.java,
-            "switch_to_action_effect" to SwitchToActionEffectTaskConfig::class.java,
-            "switch_from_action_effect" to SwitchFromActionEffectTaskConfig::class.java,
-        )
-
-        val runtime = MoLangRuntime().setup()
-    }
-
-    val runtime: MoLangRuntime
-        get() = Companion.runtime
-
-    /** Given the entity in construction, returns a list of tasks. */
-    fun createTasks(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): List<BehaviorControl<in LivingEntity>>
-}

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

@@ -1,71 +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.MoLangRuntime
-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.resolveDouble
-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.BlockPosTracker
-import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
-import net.minecraft.world.entity.ai.behavior.declarative.Trigger
-import net.minecraft.world.entity.ai.memory.MemoryModuleType
-import net.minecraft.world.entity.ai.memory.WalkTarget
-import net.minecraft.world.entity.ai.util.LandRandomPos
-
-class WanderTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val shouldWander: ExpressionLike = "math.random(0, 20 * 8) <= 1".asExpressionLike()
-    val horizontalRange: Expression = "10".asExpression()
-    val verticalRange: Expression = "5".asExpression()
-    val speedMultiplier: Expression = "0.35".asExpression()
-    val completionRange: Expression = "1".asExpression()
-    val lookTargetYOffset: Expression = "1.5".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 BehaviorBuilder.create {
-            it.group(
-                it.absent(MemoryModuleType.WALK_TARGET),
-                it.registered(MemoryModuleType.LOOK_TARGET)
-            ).apply(it) { walkTarget, lookTarget ->
-                Trigger { world, entity, time ->
-                    if (entity !is PathfinderMob) {
-                        return@Trigger false
-                    }
-
-                    runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-                    if (!runtime.resolveBoolean(shouldWander)) return@Trigger false
-
-                    val targetVec = LandRandomPos.getPos(entity, runtime.resolveInt(horizontalRange), runtime.resolveInt(verticalRange)) ?: return@Trigger false
-                    walkTarget.set(WalkTarget(targetVec, runtime.resolveFloat(speedMultiplier), runtime.resolveInt(completionRange)))
-                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, runtime.resolveDouble(lookTargetYOffset), 0.0)))
-                    return@Trigger true
-                }
-            }
-        }
-    }
-}

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

@@ -25,7 +25,6 @@ import com.cobblemon.mod.common.api.events.battles.BattleFledEvent
 import com.cobblemon.mod.common.api.moves.Moves
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.net.NetworkPacket
-import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.api.text.red
 import com.cobblemon.mod.common.api.text.yellow
@@ -84,8 +83,6 @@ open class PokemonBattle(
 
     val onEndHandlers: MutableList<(PokemonBattle) -> Unit> = mutableListOf()
 
-    val battlePartyStores = mutableListOf<PlayerPartyStore>()
-
     init {
         side1.battle = this
         side2.battle = this
@@ -374,13 +371,6 @@ open class PokemonBattle(
 
     }
 
-    fun dispatchWaitingToFront(delaySeconds: Float = 1F, dispatcher: () -> Unit) {
-        dispatches.addFirst(BattleDispatch {
-            dispatcher()
-            WaitDispatch(delaySeconds)
-        })
-    }
-
     fun dispatchGo(dispatcher: () -> Unit) {
         dispatch {
             dispatcher()

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

@@ -172,8 +172,7 @@ class Berry(
         val treeEntity = world.getBlockEntity(pos) as BerryBlockEntity
         if (BerryBlock.getMulch(treeEntity) == MulchVariant.RICH) {
             //I hope the upper bound isnt exclusive, especially when there's a method called nextBetweenExclusive
-            // update: it was meant to be exclusive, which caused #1124. I've lowered the upper bound from 3 to 2.
-            yield += world.random.nextIntBetweenInclusive(1, 2)
+            yield += world.random.nextIntBetweenInclusive(1, 3)
             treeEntity.decrementMulchDuration(world, pos, state)
         }
         val event = BerryYieldCalculationEvent(this, world, state, pos, placer, yield, bonus.second)

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

@@ -13,9 +13,6 @@ import com.cobblemon.mod.common.api.events.battles.BattleFledEvent
 import com.cobblemon.mod.common.api.events.battles.BattleStartedPostEvent
 import com.cobblemon.mod.common.api.events.battles.BattleStartedPreEvent
 import com.cobblemon.mod.common.api.events.battles.BattleVictoryEvent
-import com.cobblemon.mod.common.api.events.battles.instruction.MegaEvolutionEvent
-import com.cobblemon.mod.common.api.events.battles.instruction.TerastallizationEvent
-import com.cobblemon.mod.common.api.events.battles.instruction.ZMoveUsedEvent
 import com.cobblemon.mod.common.api.events.berry.BerryHarvestEvent
 import com.cobblemon.mod.common.api.events.berry.BerryMutationOfferEvent
 import com.cobblemon.mod.common.api.events.berry.BerryMutationResultEvent
@@ -26,7 +23,6 @@ import com.cobblemon.mod.common.api.events.entity.PokemonEntitySaveEvent
 import com.cobblemon.mod.common.api.events.entity.PokemonEntitySaveToWorldEvent
 import com.cobblemon.mod.common.api.events.entity.SpawnEvent
 import com.cobblemon.mod.common.api.events.farming.ApricornHarvestEvent
-import com.cobblemon.mod.common.api.events.fishing.*
 import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent
 import com.cobblemon.mod.common.api.events.pokeball.PokeBallCaptureCalculatedEvent
 import com.cobblemon.mod.common.api.events.pokeball.PokemonCatchRateEvent
@@ -37,14 +33,15 @@ import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionAcceptedEv
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEvent
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionDisplayEvent
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionTestedEvent
-import com.cobblemon.mod.common.api.events.pokemon.healing.PokemonHealedEvent
 import com.cobblemon.mod.common.api.events.pokemon.interaction.ExperienceCandyUseEvent
+import com.cobblemon.mod.common.api.events.pokemon.interaction.HeldItemUpdatedEvent
 import com.cobblemon.mod.common.api.events.pokemon.interaction.PokemonInteractionGUICreationEvent
 import com.cobblemon.mod.common.api.events.starter.StarterChosenEvent
 import com.cobblemon.mod.common.api.events.storage.ReleasePokemonEvent
 import com.cobblemon.mod.common.api.events.world.BigRootPropagatedEvent
 import com.cobblemon.mod.common.api.reactive.CancelableObservable
 import com.cobblemon.mod.common.api.reactive.EventObservable
+import com.cobblemon.mod.common.api.reactive.Observable
 import com.cobblemon.mod.common.api.reactive.Observable.Companion.filter
 import com.cobblemon.mod.common.api.reactive.Observable.Companion.map
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
@@ -83,6 +80,8 @@ object CobblemonEvents {
     val POKEMON_CAPTURED = EventObservable<PokemonCapturedEvent>()
     @JvmField
     val FOSSIL_REVIVED = EventObservable<FossilRevivedEvent>()
+//    @JvmField
+//    val EGG_HATCH = EventObservable<HatchEggEvent>()
     @JvmField
     val BATTLE_STARTED_PRE = CancelableObservable<BattleStartedPreEvent>()
     @JvmField
@@ -94,14 +93,6 @@ object CobblemonEvents {
     @JvmField
     val BATTLE_FAINTED = EventObservable<BattleFaintedEvent>()
 
-    // instructions
-    @JvmField
-    val MEGA_EVOLUTON = EventObservable<MegaEvolutionEvent>()
-    @JvmField
-    val TERASTALLIZATION = EventObservable<TerastallizationEvent>()
-    @JvmField
-    val ZPOWER_USED = EventObservable<ZMoveUsedEvent>()
-
     @JvmField
     val POKEMON_SENT_PRE = CancelableObservable<PokemonSentPreEvent>()
     @JvmField
@@ -115,9 +106,6 @@ object CobblemonEvents {
     @JvmField
     val LEVEL_UP_EVENT = EventObservable<LevelUpEvent>()
 
-    @JvmField
-    val POKEMON_HEALED = CancelableObservable<PokemonHealedEvent>()
-
     @JvmField
     /** CLIENT ONLY! */
     val POKEMON_INTERACTION_GUI_CREATION = EventObservable<PokemonInteractionGUICreationEvent>()
@@ -186,35 +174,4 @@ object CobblemonEvents {
     val POKEMON_GAINED = EventObservable<PokemonGainedEvent>()
     @JvmField
     val POKEMON_SEEN = EventObservable<PokemonSeenEvent>()
-
-    // Fishing
-    @JvmField
-    val BAIT_SET = CancelableObservable<BaitSetEvent>()
-    @JvmField
-    val BAIT_SET_PRE = CancelableObservable<BaitSetEvent>()
-    @JvmField
-    val BAIT_CONSUMED = CancelableObservable<BaitConsumedEvent>()
-    @JvmField
-    val POKEROD_CAST_PRE = CancelableObservable<PokerodCastEvent.Pre>()
-    @JvmField
-    val POKEROD_CAST_POST = EventObservable<PokerodCastEvent.Post>()
-    @JvmField
-    val POKEROD_REEL = CancelableObservable<PokerodReelEvent>()
-    @JvmField
-    val BOBBER_BUCKET_CHOSEN = EventObservable<BobberBucketChosenEvent>()
-    @JvmField
-    val BOBBER_SPAWN_POKEMON_PRE = CancelableObservable<BobberSpawnPokemonEvent.Pre>()
-    @JvmField
-    val BOBBER_SPAWN_POKEMON_MODIFY = EventObservable<BobberSpawnPokemonEvent.Modify>()
-    @JvmField
-    val BOBBER_SPAWN_POKEMON_POST = EventObservable<BobberSpawnPokemonEvent.Post>()
-    @JvmField
-    val BAIT_EFFECT_REGISTRATION = EventObservable<BaitEffectFunctionRegistryEvent>()
-
-    @JvmField
-    val COLLECT_EGG = CancelableObservable<CollectEggEvent>()
-    @JvmField
-    val HATCH_EGG_PRE = CancelableObservable<HatchEggEvent.Pre>()
-    @JvmField
-    val HATCH_EGG_POST = EventObservable<HatchEggEvent.Post>()
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/events/battles/instruction/MegaEvolutionEvent.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.events.battles.instruction
-
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
-
-/**
- * Event that is fired when a Pokemon Mega Evolves.
- * @param battle The Pokemon Battle.
- * @param pokemon The Pokemon that Mega Evolves.
- */
-data class MegaEvolutionEvent(val battle: PokemonBattle, val pokemon: BattlePokemon)

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

@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.battles.instruction
-
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.types.tera.TeraType
-import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
-
-/**
- * Event that is fired when a Pokemon Terastallizes.
- * @param battle The Pokemon Battle.
- * @param pokemon The Pokemon that Terastallizes.
- * @param teraType The TeraType of the Terastallization.
- */
-data class TerastallizationEvent(
-    val battle: PokemonBattle,
-    val pokemon: BattlePokemon,
-    val teraType: TeraType
-    )

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

@@ -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.api.events.battles.instruction
-
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
-
-/**
- * Event that is fired when a Pokemon uses a Z-Move.
- * @param battle The Pokemon Battle.
- * @param pokemon The Pokemon that uses the Z-Move.
- */
-data class ZMoveUsedEvent(val battle: PokemonBattle, val pokemon: BattlePokemon)

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

@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.fishing
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import net.minecraft.world.item.ItemStack
-
-/**
- * Event that is fired when a bait is consumed.
- * @param rod The ItemStack of the rod that consumed the bait.
- */
-class BaitConsumedEvent(val rod: ItemStack) : Cancelable()

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

@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.fishing
-
-import com.cobblemon.mod.common.api.fishing.FishingBait
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import net.minecraft.resources.ResourceLocation
-
-/**
- * Event to register code-based functions for bait effects.
- * @see FishingBait.Effect
- * @see FishingBait.Effects
- */
-class BaitEffectFunctionRegistryEvent {
-    val functions = mutableMapOf<ResourceLocation, (PokemonEntity, FishingBait.Effect) -> Unit>()
-
-    fun registerFunction(id: ResourceLocation, function: (PokemonEntity, FishingBait.Effect) -> Unit) {
-        functions[id] = function
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/events/fishing/BaitSetEvent.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.events.fishing
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.reactive.CancelableObservable
-import net.minecraft.world.item.ItemStack
-
-/**
- * Event that is fired when a bait is set on a fishing rod.
- * @param rod The ItemStack of the rod that the bait is set on.
- * @param bait The ItemStack of the bait that is set on the rod.
- */
-class BaitSetEvent(val rod: ItemStack, val bait: ItemStack) : Cancelable()

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

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

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

@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.fishing
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
-import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import net.minecraft.world.item.ItemStack
-
-/**
- * Event that is fired when a Pokemon is spawned by a bobber.
- */
-interface BobberSpawnPokemonEvent {
-
-    /**
-     * Event that is fired before a Pokemon is spawned by a bobber.
-     * @param bobber The PokeRodFishingBobberEntity that is spawning the Pokemon.
-     * @param chosenBucket The bucket that is chosen.
-     * @param rod The ItemStack of the rod that the bobber is attached to.
-     */
-    data class Pre(
-        val bobber: PokeRodFishingBobberEntity,
-        val chosenBucket: SpawnBucket,
-        val rod: ItemStack
-    ) : Cancelable(), BobberSpawnPokemonEvent
-
-    /**
-     * Event that is fired when a Pokemon is modified before it is spawned by a bobber.
-     * @param chosenBucket The bucket that is chosen.
-     * @param rod The ItemStack of the rod that the bobber is attached to.
-     * @param pokemon The Pokemon that is modified.
-     */
-    data class Modify(
-        val chosenBucket: SpawnBucket,
-        val rod: ItemStack,
-        val pokemon: PokemonEntity
-    ) : BobberSpawnPokemonEvent
-
-    /**
-     * Event that is fired after a Pokemon is spawned by a bobber.
-     * @param bobber The PokeRodFishingBobberEntity that is spawning the Pokemon.
-     * @param chosenBucket The bucket that is chosen.
-     * @param bait The ItemStack of the bait that is set on the rod.
-     * @param pokemon The Pokemon that is spawned.
-     */
-    data class Post(
-        val bobber: PokeRodFishingBobberEntity,
-        val chosenBucket: SpawnBucket,
-        val bait: ItemStack,
-        val pokemon: PokemonEntity
-    ) : BobberSpawnPokemonEvent
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/events/fishing/PokerodCastEvent.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.events.fishing
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
-import net.minecraft.world.item.ItemStack
-
-/**
- * Event that is fired when a fishing rod is cast.
- */
-interface PokerodCastEvent {
-    val rod: ItemStack
-
-    /**
-     * Event that is fired before a fishing rod is cast.
-     * @param rod The ItemStack of the rod that is being cast.
-     * @param bobber The PokeRodFishingBobberEntity that is being cast.
-     * @param bait The ItemStack of the bait that is set on the rod.
-     */
-    data class Pre(
-        override var rod: ItemStack,
-        var bobber: PokeRodFishingBobberEntity,
-        var bait: ItemStack
-    ) : PokerodCastEvent, Cancelable()
-
-    /**
-     * Event that is fired after a fishing rod is cast.
-     * @param rod The ItemStack of the rod that is being cast.
-     * @param bobber The PokeRodFishingBobberEntity that is being cast.
-     * @param bait The ItemStack of the bait that is set on the rod.
-     */
-    data class Post(
-        override var rod: ItemStack,
-        var bobber: PokeRodFishingBobberEntity,
-        var bait: ItemStack
-    ) : PokerodCastEvent
-}

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

@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.fishing
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import net.minecraft.world.item.ItemStack
-
-/**
- * Event that is fired when a fishing rod is reeled.
- * @param rod The ItemStack of the rod that is being reeled.
- */
-class PokerodReelEvent(val rod: ItemStack) : Cancelable()

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokedex/scanning/PokemonScannedEvent.kt

@@ -8,14 +8,14 @@
 
 package com.cobblemon.mod.common.api.events.pokedex.scanning
 
-import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData
-import com.cobblemon.mod.common.pokedex.scanner.ScannableEntity
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.pokemon.Pokemon
 import net.minecraft.server.level.ServerPlayer
 
-data class PokemonScannedEvent(val player: ServerPlayer, val scannedPokemonEntityData: PokedexEntityData, val scannedEntity: ScannableEntity) {
-    val pokedexEntityData: PokedexEntityData
-        get() = scannedPokemonEntityData
+data class PokemonScannedEvent(val player: ServerPlayer, val scannedEntity: PokemonEntity) {
+    val pokemon: Pokemon
+        get() = scannedEntity.pokemon
 
     val isOwned: Boolean
-        get() = scannedPokemonEntityData.ownerUUID == player.uuid
+        get() = pokemon.getOwnerPlayer() == player
 }

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

@@ -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.api.events.pokemon
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.pokemon.Pokemon
-import net.minecraft.server.level.ServerPlayer
-
-class CollectEggEvent (
-    val egg : PokemonProperties,
-    val maleParent : Pokemon,
-    val femaleParent : Pokemon,
-    val player : ServerPlayer
-) : Cancelable()

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

@@ -8,15 +8,7 @@
 
 package com.cobblemon.mod.common.api.events.pokemon
 
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import net.minecraft.server.level.ServerPlayer
-
-interface HatchEggEvent {
-    val egg: PokemonProperties
-    val player: ServerPlayer
-
-    data class Pre(override var egg : PokemonProperties, override var player: ServerPlayer) : HatchEggEvent, Cancelable()
-
-    data class Post(override var egg : PokemonProperties, override var player: ServerPlayer) : HatchEggEvent
-}
+//data class HatchEggEvent (
+//    val pokemon: Pokemon,
+//    val player: ServerPlayer
+//)

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

@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.pokemon.healing
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.events.CobblemonEvents
-import com.cobblemon.mod.common.api.item.HealingSource
-import com.cobblemon.mod.common.item.berry.HealingBerryItem
-import com.cobblemon.mod.common.item.interactive.PotionItem
-import com.cobblemon.mod.common.item.interactive.PotionType
-import com.cobblemon.mod.common.pokemon.Pokemon
-
-/**
- * Event that is fired when a Pokemon is healed.
- * @param pokemon The Pokemon that is being healed.
- * @param amount The amount of healing that is being applied. If -1, the Pokemon is fully healed.
- * @param source The HealingSource that is being used to heal the Pokemon.
- *
- * @see HealingSource
- */
-class PokemonHealedEvent(
-    val pokemon: Pokemon,
-    var amount: Int = -1,
-    val source: HealingSource = HealingSource.Force
-) : Cancelable() {
-    fun isFullHeal() = amount == -1
-    fun isHealed() = amount > 0
-}

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

@@ -8,16 +8,11 @@
 
 package com.cobblemon.mod.common.api.fishing
 
-import com.cobblemon.mod.common.api.events.CobblemonEvents
-import com.cobblemon.mod.common.api.events.fishing.BaitEffectFunctionRegistryEvent
-import com.cobblemon.mod.common.api.spawning.fishing.FishingSpawnCause
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.core.Registry
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.ListTag
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.entity.Entity
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 
@@ -80,7 +75,6 @@ data class FishingBait(
     }
 
     object Effects {
-        private val EFFECT_FUNCTIONS: MutableMap<ResourceLocation, (PokemonEntity, Effect) -> Unit> = mutableMapOf()
         val NATURE = cobblemonResource("nature")
         val IV = cobblemonResource("iv")
         val EV = cobblemonResource("ev")
@@ -93,28 +87,6 @@ data class FishingBait(
         val POKEMON_CHANCE = cobblemonResource("pokemon_chance")
         val FRIENDSHIP = cobblemonResource("friendship")
         val INERT = cobblemonResource("inert")
-
-        fun registerEffect(type: ResourceLocation, effect: (PokemonEntity, Effect) -> Unit) {
-            EFFECT_FUNCTIONS[type] = effect
-        }
-
-        fun getEffectFunction(type: ResourceLocation): ((PokemonEntity, Effect) -> Unit)? {
-            return EFFECT_FUNCTIONS[type]
-        }
-
-        fun setupEffects() {
-            EFFECT_FUNCTIONS[NATURE] = { entity, effect -> FishingSpawnCause.alterNatureAttempt(entity, effect) }
-            EFFECT_FUNCTIONS[IV] = { entity, effect -> FishingSpawnCause.alterIVAttempt(entity, effect) }
-            EFFECT_FUNCTIONS[SHINY_REROLL] = { entity, effect -> FishingSpawnCause.shinyReroll(entity, effect) }
-            EFFECT_FUNCTIONS[GENDER_CHANCE] = { entity, effect -> FishingSpawnCause.alterGenderAttempt(entity, effect) }
-            EFFECT_FUNCTIONS[LEVEL_RAISE] = { entity, effect -> FishingSpawnCause.alterLevelAttempt(entity, effect) }
-            EFFECT_FUNCTIONS[TERA] = { entity, effect -> FishingSpawnCause.alterTeraAttempt(entity, effect) }
-            EFFECT_FUNCTIONS[HIDDEN_ABILITY_CHANCE] = { entity, _ -> FishingSpawnCause.alterHAAttempt(entity) }
-            EFFECT_FUNCTIONS[FRIENDSHIP] = { entity, effect -> FishingSpawnCause.alterFriendshipAttempt(entity, effect) }
-            CobblemonEvents.BAIT_EFFECT_REGISTRATION.post(BaitEffectFunctionRegistryEvent()) { event ->
-                EFFECT_FUNCTIONS.putAll(event.functions)
-            }
-        }
     }
 }
 

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

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.item
-
-import com.cobblemon.mod.common.item.interactive.PotionItem
-
-/**
- * Interface that represents a source of healing.
- */
-interface HealingSource {
-    /**
-     * A source of healing that is forced, i.e it has no specific source.
-     */
-    object Force : HealingSource
-}
-

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

@@ -28,13 +28,9 @@ import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
 import com.cobblemon.mod.common.api.moves.animations.ActionEffects
 import com.cobblemon.mod.common.api.moves.animations.NPCProvider
 import com.cobblemon.mod.common.api.scripting.CobblemonScripts
-import com.cobblemon.mod.common.api.storage.party.PartyStore
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunctions
 import com.cobblemon.mod.common.entity.npc.NPCEntity
-import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.PokemonMoveControl
 import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.*
@@ -56,7 +52,6 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.tags.TagKey
 import net.minecraft.world.damagesource.DamageSource
 import net.minecraft.world.damagesource.DamageTypes
-import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.level.Level
@@ -196,7 +191,6 @@ object MoLangFunctions {
             map.put("is_in_water") { _ -> DoubleValue(entity.isUnderWater) }
             map.put("is_touching_water_or_rain") { _ -> DoubleValue(entity.isInWaterRainOrBubble) }
             map.put("is_touching_water") { _ -> DoubleValue(entity.isInWater) }
-            map.put("is_underwater") { DoubleValue(entity.getIsSubmerged()) }
             map.put("is_in_lava") { _ -> DoubleValue(entity.isInLava) }
             map.put("is_on_fire") { _ -> DoubleValue(entity.isOnFire) }
             map.put("is_invisible") { _ -> DoubleValue(entity.isInvisible) }
@@ -213,18 +207,10 @@ object MoLangFunctions {
             map.put("velocity_x") { _ -> DoubleValue(entity.deltaMovement.x) }
             map.put("velocity_y") { _ -> DoubleValue(entity.deltaMovement.y) }
             map.put("velocity_z") { _ -> DoubleValue(entity.deltaMovement.z) }
-            map.put("width") { DoubleValue(entity.boundingBox.xsize) }
-            map.put("height") { DoubleValue(entity.boundingBox.ysize) }
-            map.put("entity_size") { DoubleValue(entity.boundingBox.run { if (xsize > ysize) xsize else ysize }) }
-            map.put("entity_width") { DoubleValue(entity.boundingBox.xsize) }
-            map.put("entity_height") { DoubleValue(entity.boundingBox.ysize) }
-
             map.put("horizontal_velocity") { _ -> DoubleValue(entity.deltaMovement.horizontalDistance()) }
-            map.put("vertical_velocity") { DoubleValue(entity.deltaMovement.y) }
             map.put("is_on_ground") { _ -> DoubleValue(entity.onGround()) }
             map.put("world") { _ -> entity.level().worldRegistry.wrapAsHolder(entity.level()).asWorldMoLangValue() }
             map.put("biome") { _ -> entity.level().getBiome(entity.blockPosition()).asBiomeMoLangValue() }
-            map.put("is_passenger") { DoubleValue(entity.isPassenger) }
             map.put("is_healer_in_use") { params ->
                 val pos = params.get<ArrayStruct>(0).asBlockPos()
                 val healer = entity.level().getBlockEntity(pos, CobblemonBlockEntities.HEALING_MACHINE).orElse(null) ?: return@put DoubleValue.ONE
@@ -332,43 +318,6 @@ object MoLangFunctions {
         }
     )
 
-    val pokemonFunctions = mutableListOf<(Pokemon) -> HashMap<String, java.util.function.Function<MoParams, Any>>>(
-        { pokemon ->
-            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
-            map.put("is_wild") { DoubleValue(pokemon.isWild()) }
-            map.put("is_shiny") { DoubleValue(pokemon.shiny) }
-            map.put("form") { StringValue(pokemon.form.name) }
-            map.put("weight") { DoubleValue(pokemon.species.weight.toDouble()) }
-            map
-        }
-    )
-
-    val pokemonEntityFunctions = mutableListOf<(PokemonEntity) -> HashMap<String, java.util.function.Function<MoParams, Any>>>(
-        { pokemonEntity ->
-            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
-            map.put("in_battle") { DoubleValue(pokemonEntity.isBattling) }
-            map.put("is_moving") { DoubleValue((pokemonEntity.moveControl as? PokemonMoveControl)?.hasWanted() == true) }
-            map.put("is_flying") { DoubleValue(pokemonEntity.getBehaviourFlag(PokemonBehaviourFlag.FLYING)) }
-            map.put("has_aspect") { DoubleValue(it.getString(0) in pokemonEntity.aspects) }
-            map
-        }
-    )
-
-    val partyFunctions = mutableListOf<(PartyStore) -> HashMap<String, java.util.function.Function<MoParams, Any>>>(
-        { party ->
-            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
-            map.put("get_pokemon") { params ->
-                val index = params.getInt(0)
-                val pokemon = party.get(index) ?: return@put DoubleValue.ZERO
-                val struct = VariableStruct()
-                pokemon.writeVariables(struct)
-                return@put struct
-            }
-            map.put("healing_remainder_percent") { _ -> DoubleValue(party.getHealingRemainderPercent()) }
-
-            return@mutableListOf map
-        })
-
     fun Holder<Biome>.asBiomeMoLangValue() = asMoLangValue(Registries.BIOME).addFunctions(biomeFunctions)
     fun Holder<Level>.asWorldMoLangValue() = asMoLangValue(Registries.DIMENSION).addFunctions(worldFunctions)
     fun Holder<Block>.asBlockMoLangValue() = asMoLangValue(Registries.BLOCK).addFunctions(blockFunctions)
@@ -423,30 +372,6 @@ object MoLangFunctions {
         return this
     }
 
-    fun QueryStruct.addEntityFunctions(entity: LivingEntity): QueryStruct {
-        val addedFunctions = entityFunctions
-            .flatMap { it.invoke(entity).entries }
-            .associate { it.key to it.value }
-        functions.putAll(addedFunctions)
-        return this
-    }
-
-    fun QueryStruct.addPokemonFunctions(pokemon: Pokemon): QueryStruct {
-        val addedFunctions = pokemonFunctions
-            .flatMap { it.invoke(pokemon).entries }
-            .associate { it.key to it.value }
-        functions.putAll(addedFunctions)
-        return this
-    }
-
-    fun QueryStruct.addPokemonEntityFunctions(pokemonEntity: PokemonEntity): QueryStruct {
-        val addedFunctions = pokemonEntityFunctions
-            .flatMap { it.invoke(pokemonEntity).entries }
-            .associate { it.key to it.value }
-        functions.putAll(addedFunctions)
-        return this
-    }
-
     fun <T : QueryStruct> T.addFunctions(functions: Map<String, java.util.function.Function<MoParams, Any>>): T {
         this.functions.putAll(functions)
         return this

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

@@ -35,14 +35,6 @@ class BenchedMoves : Iterable<BenchedMove> {
         emit = previousEmit
     }
 
-    fun copyFrom(other: BenchedMoves) {
-        doWithoutEmitting {
-            clear()
-            other.forEach { add(it) }
-        }
-        update()
-    }
-
     fun doThenEmit(action: () -> Unit) {
         doWithoutEmitting(action)
         update()

common/src/main/kotlin/com/cobblemon/mod/common/api/multiblock/MultiblockBlock.kt

@@ -56,12 +56,16 @@ abstract class MultiblockBlock(properties: Properties) : BaseEntityBlock(propert
         return super.useWithoutItem(state, world, pos, player, hit)
     }
 
-    override fun onRemove(state: BlockState, level: Level, pos: BlockPos, newState: BlockState, movedByPiston: Boolean) {
-        val entity = level.getBlockEntity(pos)
-        if (entity is MultiblockEntity && entity.multiblockStructure != null && state.block != newState.block) {
-            entity.multiblockStructure!!.playerWillDestroy(level, pos, state, null)
+    override fun playerWillDestroy(world: Level, pos: BlockPos, state: BlockState, player: Player): BlockState {
+        val result = super.playerWillDestroy(world, pos, state, player)
+        if (!world.isClientSide) {
+            val entity = world.getBlockEntity(pos)
+            if (entity is MultiblockEntity && entity.multiblockStructure != null) {
+                entity.multiblockStructure!!.playerWillDestroy(world, pos, state, player)
+            }
+            entity?.setRemoved()
         }
-        super.onRemove(state, level, pos, newState, movedByPiston)
+        return result
     }
 
     override fun newBlockEntity(pos: BlockPos, state: BlockState): BlockEntity? {

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCClass.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.npc
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.api.ai.config.BrainConfig
 import com.cobblemon.mod.common.api.npc.configuration.NPCBattleConfiguration
 import com.cobblemon.mod.common.api.npc.configuration.NPCConfigVariable
 import com.cobblemon.mod.common.api.npc.configuration.NPCInteractConfiguration
@@ -40,15 +39,13 @@ class NPCClass {
     var aspects: MutableSet<String> = mutableSetOf() // These only make sense when applied via presets
     var hitbox = EntityDimensions.scalable(0.6F, 1.8F)
     var battleConfiguration = NPCBattleConfiguration()
+    var aiScripts: MutableList<ResourceLocation> = mutableListOf()
     var interaction: NPCInteractConfiguration? = null
-    var canDespawn = true
     var variations: MutableMap<String, NPCVariationProvider> = mutableMapOf()
     var config: MutableList<NPCConfigVariable> = mutableListOf()
     var variables = mutableMapOf<String, MoValue>() // Questionable whether this should be here.
     var party: NPCPartyProvider? = null
     var skill: Int = 0
-    var battleTheme: ResourceLocation? = null
-    var ai: MutableList<BrainConfig> = mutableListOf()
 
     // If you're adding stuff here, add it to NPCPreset and NPCClassAdapter too
 
@@ -59,6 +56,7 @@ class NPCClass {
         buffer.writeFloat(this.hitbox.height)
         buffer.writeBoolean(this.hitbox.fixed)
         battleConfiguration.encode(buffer)
+        buffer.writeCollection(aiScripts) { _, v -> buffer.writeString(v.toString()) }
         buffer.writeNullable(interaction) { _, value ->
             buffer.writeString(value.type)
             value.encode(buffer)
@@ -81,7 +79,6 @@ class NPCClass {
             buffer.writeString(key)
             buffer.writeString(value.asString())
         }
-        buffer.writeNullable(battleTheme) { _, v -> buffer.writeIdentifier(v) }
     }
 
     fun decode(buffer: RegistryFriendlyByteBuf) {
@@ -93,6 +90,7 @@ class NPCClass {
         hitbox = if (fixed) EntityDimensions.fixed(length, width) else EntityDimensions.scalable(length, width)
         battleConfiguration = NPCBattleConfiguration()
         battleConfiguration.decode(buffer)
+        aiScripts = buffer.readList { ResourceLocation.parse(buffer.readString()) }.toMutableList()
         interaction = buffer.readNullable {
             val type = buffer.readString()
             val configType = NPCInteractConfiguration.types[type] ?: return@readNullable null
@@ -125,6 +123,5 @@ class NPCClass {
                 return@readMapK key to StringValue(value)
             }
         }
-        battleTheme = buffer.readNullable { buffer.readIdentifier() }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCClasses.kt

@@ -8,12 +8,9 @@
 
 package com.cobblemon.mod.common.api.npc
 
-import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.ai.SleepDepth
-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.conditional.RegistryLikeCondition
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.drop.DropEntry
@@ -40,7 +37,6 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.world.entity.EntityDimensions
-import net.minecraft.world.entity.schedule.Activity
 import net.minecraft.world.item.Item
 import net.minecraft.world.level.biome.Biome
 import net.minecraft.world.level.block.Block
@@ -64,16 +60,12 @@ object NPCClasses : JsonDataRegistry<NPCClass> {
         .registerTypeAdapter(CompoundTag::class.java, NbtCompoundAdapter)
         .registerTypeAdapter(NPCPartyProvider::class.java, NPCPartyProviderAdapter)
         .registerTypeAdapter(NPCInteractConfiguration::class.java, NPCInteractConfigurationAdapter)
-        .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
         .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
-        .registerTypeAdapter(NPCVariationProvider::class.java, NPCVariationProviderAdapter)
         .registerTypeAdapter(MoValue::class.java, MoValueAdapter)
         .registerTypeAdapter(NPCClass::class.java, NPCClassAdapter)
-        .registerTypeAdapter(Activity::class.java, ActivityAdapter)
         .registerTypeAdapter(Component::class.java, TextAdapter)
+        .registerTypeAdapter(NPCVariationProvider::class.java, NPCVariationProviderAdapter)
         .registerTypeAdapter(WeightedAspect::class.java, WeightedAspectAdapter)
-        .registerTypeAdapter(BrainConfig::class.java, BrainConfigAdapter)
-        .registerTypeAdapter(TaskConfig::class.java, TaskConfigAdapter)
         .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
         .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)
         .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCPreset.kt

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common.api.npc
 
-import com.cobblemon.mod.common.api.ai.config.BrainConfig
 import com.cobblemon.mod.common.api.npc.configuration.NPCConfigVariable
 import com.cobblemon.mod.common.api.npc.configuration.NPCInteractConfiguration
 import com.cobblemon.mod.common.api.npc.variation.NPCVariationProvider
@@ -23,13 +22,11 @@ class NPCPreset {
     var variations: Map<String, NPCVariationProvider>? = null
     var config: List<NPCConfigVariable>? = null
     var party: NPCPartyProvider? = null
-    var canDespawn: Boolean? = null
+    var aiScripts: List<ResourceLocation>? = null
     var interaction: NPCInteractConfiguration? = null
     var names: MutableSet<Component>? = null
     var hitbox: EntityDimensions? = null
-    var ai: List<BrainConfig>? = null
     var skill: Int? = null
-    var battleTheme: ResourceLocation? = null
 
     fun applyTo(npcClass: NPCClass) {
         resourceIdentifier?.let { npcClass.resourceIdentifier = it }
@@ -41,13 +38,10 @@ class NPCPreset {
         }
         variations?.entries?.forEach { (key, value) -> npcClass.variations[key] = value }
         party?.let { npcClass.party = it }
-        canDespawn?.let { npcClass.canDespawn = it }
-//        aiScripts?.let { npcClass.aiScripts.addAll(it) }
+        aiScripts?.let { npcClass.aiScripts.addAll(it) }
         interaction?.let { npcClass.interaction = it }
         names?.let { npcClass.names.addAll(it) }
         hitbox?.let { npcClass.hitbox = it }
         skill?.let { npcClass.skill = it }
-        battleTheme?.let { npcClass.battleTheme = it }
-        ai?.let { npcClass.ai.addAll(it) }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCPresets.kt

@@ -8,11 +8,8 @@
 
 package com.cobblemon.mod.common.api.npc
 
-import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.api.ai.SleepDepth
-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.conditional.RegistryLikeCondition
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.drop.DropEntry
@@ -20,8 +17,6 @@ import com.cobblemon.mod.common.api.drop.ItemDropMethod
 import com.cobblemon.mod.common.api.entity.EntityDimensionsAdapter
 import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.npc.configuration.NPCInteractConfiguration
-import com.cobblemon.mod.common.api.npc.variation.NPCVariationProvider
-import com.cobblemon.mod.common.api.npc.variation.WeightedAspect
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.spawning.TimeRange
@@ -37,7 +32,6 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.world.entity.EntityDimensions
-import net.minecraft.world.entity.schedule.Activity
 import net.minecraft.world.item.Item
 import net.minecraft.world.level.biome.Biome
 import net.minecraft.world.level.block.Block
@@ -60,16 +54,10 @@ object NPCPresets : JsonDataRegistry<NPCPreset> {
         .registerTypeAdapter(DropEntry::class.java, DropEntryAdapter)
         .registerTypeAdapter(CompoundTag::class.java, NbtCompoundAdapter)
         .registerTypeAdapter(NPCPartyProvider::class.java, NPCPartyProviderAdapter)
-        .registerTypeAdapter(NPCInteractConfiguration::class.java, NPCInteractConfigurationAdapter)
-        .registerTypeAdapter(WeightedAspect::class.java, WeightedAspectAdapter)
-        .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
         .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
-        .registerTypeAdapter(NPCVariationProvider::class.java, NPCVariationProviderAdapter)
-        .registerTypeAdapter(Activity::class.java, ActivityAdapter)
+        .registerTypeAdapter(NPCInteractConfiguration::class.java, NPCInteractConfigurationAdapter)
         .registerTypeAdapter(MoValue::class.java, MoValueAdapter)
         .registerTypeAdapter(Component::class.java, TextAdapter)
-        .registerTypeAdapter(BrainConfig::class.java, BrainConfigAdapter)
-        .registerTypeAdapter(TaskConfig::class.java, TaskConfigAdapter)
         .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
         .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)
         .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
@@ -79,7 +67,7 @@ object NPCPresets : JsonDataRegistry<NPCPreset> {
         .create()
 
     override val typeToken: TypeToken<NPCPreset> = TypeToken.get(NPCPreset::class.java)
-    override val resourcePath = "npc_presets"
+    override val resourcePath = "npcs"
     override val observable = SimpleObservable<NPCPresets>()
     private val npcPresetsByIdentifier = mutableMapOf<ResourceLocation, NPCPreset>()
 

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

@@ -73,7 +73,6 @@ any number of presets and the properties of those presets will be merged into th
       "battleConfiguration": {
         "canChallenge": true
       },
-      "canDespawn": false,
       "skill": 5,
       "party": {
         "type": "simple",
@@ -232,10 +231,6 @@ in this file. The script property can be a single string or an array of strings
 ### battleConfiguration
 I don't really know whether this is going to stay tbh
 
-### canDespawn
-Whether or not regular entity despawning logic applies. By default, NPCs will despawn over time. If the value
-of this property is set to false, the NPC will never despawn over time.
-
 ### skill
 The skill level when this NPC is used in battle. This is a number from 1 to 5, with 5 being most difficult
 to beat. This does not control their Pokémon's levels or moves, but it does control how well they use them.

common/src/main/kotlin/com/cobblemon/mod/common/api/permission/CobblemonPermissions.kt

@@ -15,7 +15,6 @@ object CobblemonPermissions {
     private const val COMMAND_PREFIX = "command."
     private val permissions = arrayListOf<Permission>()
 
-    val CHANGE_EYE_HEIGHT = this.create("${COMMAND_PREFIX}changeeyeheight", PermissionLevel.ALL_COMMANDS)
     val CHANGE_SCALE_AND_SIZE = this.create("${COMMAND_PREFIX}changescaleandsize", PermissionLevel.ALL_COMMANDS)
     val CHANGE_WALK_SPEED = this.create("${COMMAND_PREFIX}changewalkspeed", PermissionLevel.ALL_COMMANDS)
     val CHECKSPAWNS = this.create("${COMMAND_PREFIX}checkspawns", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/AbstractPokedexManager.kt

@@ -12,8 +12,8 @@ import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexForm
-import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData
 import com.cobblemon.mod.common.pokemon.Gender
+import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import net.minecraft.resources.ResourceLocation
 
@@ -47,8 +47,8 @@ abstract class AbstractPokedexManager {
         }
     }
 
-    fun getHighestKnowledgeForSpecies(pokemonId: ResourceLocation): PokedexEntryProgress {
-        val speciesRecord = getSpeciesRecord(pokemonId)
+    fun getHighestKnowledgeForSpecies(pokemon: Pokemon): PokedexEntryProgress {
+        val speciesRecord = getSpeciesRecord(pokemon.species.resourceIdentifier)
         return speciesRecord?.getKnowledge() ?: PokedexEntryProgress.NONE
     }
 
@@ -86,16 +86,16 @@ abstract class AbstractPokedexManager {
         }
     }
 
-    fun getNewInformation(pokedexEntityData: PokedexEntityData): PokedexLearnedInformation {
-        val speciesRecord = getSpeciesRecord(pokedexEntityData.species.resourceIdentifier)
+    fun getNewInformation(pokemon: Pokemon): PokedexLearnedInformation {
+        val speciesRecord = getSpeciesRecord(pokemon.species.resourceIdentifier)
         if (speciesRecord == null || speciesRecord.getKnowledge() == PokedexEntryProgress.NONE) {
             return PokedexLearnedInformation.SPECIES
         }
-        val formRecord = speciesRecord.getFormRecord(pokedexEntityData.form.name)
+        val formRecord = speciesRecord.getFormRecord(pokemon.form.name)
         if (formRecord == null || formRecord.knowledge == PokedexEntryProgress.NONE) {
             return PokedexLearnedInformation.FORM
         }
-        if (pokedexEntityData.aspects.none(speciesRecord::hasAspect) || pokedexEntityData.gender !in formRecord.getGenders() || !formRecord.hasSeenShinyState(pokedexEntityData.shiny)) {
+        if (pokemon.aspects.none(speciesRecord::hasAspect) || pokemon.gender !in formRecord.getGenders() || !formRecord.hasSeenShinyState(pokemon.shiny)) {
             return PokedexLearnedInformation.VARIATION
         }
         return PokedexLearnedInformation.NONE

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/FormDexRecord.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.pokedex
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.bedrockk.molang.runtime.struct.VariableStruct
 import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData
 import com.cobblemon.mod.common.pokemon.Gender
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.readEnumConstant
@@ -78,12 +77,6 @@ class FormDexRecord {
         }
     }
 
-    fun encountered(pokedexEntityData: PokedexEntityData) {
-        if (wouldBeDifferent(pokedexEntityData, PokedexEntryProgress.ENCOUNTERED)) {
-            addInformation(pokedexEntityData, PokedexEntryProgress.ENCOUNTERED)
-        }
-    }
-
     fun caught(pokemon: Pokemon) {
         if (wouldBeDifferent(pokemon, PokedexEntryProgress.CAUGHT)) {
             addInformation(pokemon, PokedexEntryProgress.CAUGHT)
@@ -115,16 +108,6 @@ class FormDexRecord {
         speciesDexRecord.onFormRecordUpdated(this)
     }
 
-    private fun addInformation(pokedexEntityData: PokedexEntityData, knowledge: PokedexEntryProgress) {
-        genders.add(pokedexEntityData.gender)
-        seenShinyStates.add(if (pokedexEntityData.shiny) "shiny" else "normal")
-        if (knowledge.ordinal > this.knowledge.ordinal) {
-            this.knowledge = knowledge
-        }
-        speciesDexRecord.addInformation(pokedexEntityData, knowledge)
-        speciesDexRecord.onFormRecordUpdated(this)
-    }
-
     /** Returns whether the given [Pokemon] and [knowledge] would add new information to the Pokédex.*/
     fun wouldBeDifferent(pokemon: Pokemon, knowledge: PokedexEntryProgress): Boolean {
         return pokemon.gender !in genders
@@ -134,14 +117,6 @@ class FormDexRecord {
             || speciesDexRecord.wouldBeDifferent(pokemon)
     }
 
-    fun wouldBeDifferent(pokedexEntityData: PokedexEntityData, knowledge: PokedexEntryProgress): Boolean {
-        return pokedexEntityData.gender !in genders
-                || (pokedexEntityData.shiny && "shiny" !in seenShinyStates)
-                || (!pokedexEntityData.shiny && "normal" !in seenShinyStates)
-                || knowledge.ordinal > this.knowledge.ordinal
-                || speciesDexRecord.wouldBeDifferent(pokedexEntityData)
-    }
-
     fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeCollection(genders) { _, it -> buffer.writeEnumConstant(it) }
         buffer.writeCollection(seenShinyStates) { _, it -> buffer.writeString(it) }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/PokedexManager.kt

@@ -10,11 +10,13 @@ package com.cobblemon.mod.common.api.pokedex
 
 import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
 import com.cobblemon.mod.common.api.storage.player.InstancedPlayerData
+import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreType
 import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
 import com.cobblemon.mod.common.api.storage.player.client.ClientPokedexManager
 import com.cobblemon.mod.common.net.messages.client.SetClientPlayerDataPacket
-import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData
+import com.cobblemon.mod.common.pokemon.FormData
 import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.pokemon.Species
 import com.cobblemon.mod.common.util.getPlayer
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.PrimitiveCodec
@@ -33,12 +35,6 @@ class PokedexManager(
         getOrCreateSpeciesRecord(speciesId).getOrCreateFormRecord(formName).encountered(pokemon)
     }
 
-    fun encounter(pokedexEntityData: PokedexEntityData) {
-        val speciesId = pokedexEntityData.species.resourceIdentifier
-        val formName = pokedexEntityData.form.name
-        getOrCreateSpeciesRecord(speciesId).getOrCreateFormRecord(formName).encountered(pokedexEntityData)
-    }
-
     fun catch(pokemon: Pokemon) {
         val speciesId = pokemon.species.resourceIdentifier
         val formName = pokemon.form.name
@@ -53,7 +49,6 @@ class PokedexManager(
     }
 
     override fun onSpeciesRecordUpdated(speciesDexRecord: SpeciesDexRecord) {
-        super.onSpeciesRecordUpdated(speciesDexRecord)
         uuid.getPlayer()?.sendPacket(
             SetClientPlayerDataPacket(
                 type = PlayerInstancedDataStoreTypes.POKEDEX,

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/PokedexValueCalculator.kt

@@ -8,29 +8,17 @@
 
 package com.cobblemon.mod.common.api.pokedex
 
-import com.cobblemon.mod.common.api.pokedex.entry.DexEntries
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
 import net.minecraft.resources.ResourceLocation
 
-/**
- * Interface that serves for various calculations can be done around Pokédex. The output of these gets cached and invalidated when the Pokédex of a user updates.
- * As opposed to the [GlobalPokedexValueCalculator] this interface is always called on a specific dex definition (e.g. galar, kanto)
- */
 interface PokedexValueCalculator<T> {
     fun calculate(dexManager: AbstractPokedexManager, dex: Map<ResourceLocation, PokedexEntry>): T
 }
 
-/**
- * Interface that serves for various calculations can be done around Pokédex. The output of these gets cached and invalidated when the Pokédex of a user updates.
- * The calculation of this interface is aimed to consider all available Pokédex entries and is not limited or filtered to a particular dex
- */
 interface GlobalPokedexValueCalculator<T> {
     fun calculate(dexManager: AbstractPokedexManager): T
 }
 
-/**
- * Calculates the amount of caught Pokémon (globally or per dex)
- */
 object CaughtCount : PokedexValueCalculator<Int>, GlobalPokedexValueCalculator<Int> {
     override fun calculate(dexManager: AbstractPokedexManager): Int {
         return dexManager.speciesRecords.values.count { it.getKnowledge() == PokedexEntryProgress.CAUGHT }
@@ -41,9 +29,6 @@ object CaughtCount : PokedexValueCalculator<Int>, GlobalPokedexValueCalculator<I
     }
 }
 
-/**
- * Calculates the amount of seen Pokémon (globally or per dex)
- */
 object SeenCount : PokedexValueCalculator<Int>, GlobalPokedexValueCalculator<Int> {
     override fun calculate(dexManager: AbstractPokedexManager): Int {
         return dexManager.speciesRecords.values.count { it.getKnowledge() != PokedexEntryProgress.NONE }
@@ -52,30 +37,4 @@ object SeenCount : PokedexValueCalculator<Int>, GlobalPokedexValueCalculator<Int
     override fun calculate(dexManager: AbstractPokedexManager, dex: Map<ResourceLocation, PokedexEntry>): Int {
         return dex.entries.map { it.value }.count { dexManager.getKnowledgeForSpecies(it.speciesId) != PokedexEntryProgress.NONE }
     }
-}
-
-/**
- * Calculates the seen percentage globally or relative to a particular dex
- */
-object SeenPercent : PokedexValueCalculator<Float>, GlobalPokedexValueCalculator<Float> {
-    override fun calculate(dexManager: AbstractPokedexManager): Float {
-        return dexManager.speciesRecords.values.count { it.getKnowledge() != PokedexEntryProgress.NONE }.toFloat() / DexEntries.entries.count().toFloat() * 100F
-    }
-
-    override fun calculate(dexManager: AbstractPokedexManager, dex: Map<ResourceLocation, PokedexEntry>): Float {
-        return dex.entries.map { it.value }.count { dexManager.getKnowledgeForSpecies(it.speciesId) != PokedexEntryProgress.NONE }.toFloat() / DexEntries.entries.count().toFloat() * 100F
-    }
-}
-
-/**
- * Calculates the caught percentage globally or relative to a particular dex
- */
-object CaughtPercent : PokedexValueCalculator<Float>, GlobalPokedexValueCalculator<Float> {
-    override fun calculate(dexManager: AbstractPokedexManager): Float {
-        return dexManager.speciesRecords.values.count { it.getKnowledge() == PokedexEntryProgress.CAUGHT }.toFloat() / DexEntries.entries.count().toFloat().toFloat() * 100F
-    }
-
-    override fun calculate(dexManager: AbstractPokedexManager, dex: Map<ResourceLocation, PokedexEntry>): Float {
-        return dex.entries.map { it.value }.count { dexManager.getKnowledgeForSpecies(it.speciesId) == PokedexEntryProgress.CAUGHT }.toFloat() / DexEntries.entries.count().toFloat().toFloat() * 100F
-    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/SpeciesDexRecord.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.pokedex
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions
-import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.readString
 import com.cobblemon.mod.common.util.writeString
@@ -20,6 +19,7 @@ import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.ListCodec
 import com.mojang.serialization.codecs.PrimitiveCodec
 import com.mojang.serialization.codecs.RecordCodecBuilder
+import java.util.UUID
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 
@@ -90,10 +90,6 @@ class SpeciesDexRecord {
         aspects.addAll(pokemon.aspects)
     }
 
-    fun addInformation(pokedexEntityData: PokedexEntityData, knowledge: PokedexEntryProgress) {
-        aspects.addAll(pokedexEntityData.aspects)
-    }
-
     fun addAspects(addedAspects: Set<String>) {
         aspects.addAll(addedAspects)
     }
@@ -101,8 +97,6 @@ class SpeciesDexRecord {
     /** Returns true if the given Pokémon contains new information. Internal because it's only to be called from [FormDexRecord.wouldBeDifferent]. */
     internal fun wouldBeDifferent(pokemon: Pokemon) = pokemon.aspects.any { it !in aspects }
 
-    internal fun wouldBeDifferent(pokedexEntityData: PokedexEntityData) = pokedexEntityData.aspects.any { it !in aspects }
-
     fun getOrCreateFormRecord(formName: String): FormDexRecord {
         return formRecords.getOrPut(formName.lowercase()) {
             val record = FormDexRecord()

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/filter/SearchFilter.kt

@@ -8,8 +8,6 @@
 
 package com.cobblemon.mod.common.api.pokedex.filter
 
-import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
-import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 
@@ -20,11 +18,11 @@ import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
  * @since September 4th, 2024
  * @param searchString The string to use when checking.
  */
-class SearchFilter(val pokedexManager: AbstractPokedexManager, val searchString: String) : EntryFilter() {
+class SearchFilter(val searchString: String) : EntryFilter() {
     override fun test(entry: PokedexEntry): Boolean {
         if (searchString == "") return true
         val species = PokemonSpecies.getByIdentifier(entry.speciesId) ?: return false
-        if (pokedexManager.getHighestKnowledgeFor(entry) == PokedexEntryProgress.NONE) return false
+
         return species.translatedName.string.contains(searchString.trim(), true)
     }
 

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

@@ -49,6 +49,7 @@ import kotlin.random.Random
 import net.minecraft.ResourceLocationException
 import net.minecraft.commands.arguments.item.ItemParser
 import net.minecraft.core.HolderLookup
+import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.ListTag
 import net.minecraft.nbt.StringTag
@@ -504,22 +505,6 @@ open class PokemonProperties {
         originalTrainer?.takeIf { it != pokemon.originalTrainer }?.let { return false }
         originalTrainerType?.takeIf { it != pokemon.originalTrainerType }?.let { return false }
         moves?.takeIf { it.any { move -> pokemon.moveSet.none { it.template.name == move } } }?.let { return false }
-        heldItem?.takeIf { itemKey ->
-            val server = server() ?: return@takeIf true
-            val parser = ItemParser(server.registryAccess())
-            val result = parser.parse(StringReader(itemKey))
-
-            if (!pokemon.heldItem.`is`(result.item)) return@takeIf true
-
-            for (entry in result.components.entrySet()) {
-                val targetPropValue = pokemon.heldItem.get(entry.key)
-                if (targetPropValue != entry.value.get()) {
-                    return@takeIf true
-                }
-            }
-
-            return@takeIf false
-        }?.let { return false }
         return true
     }
 

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

@@ -31,7 +31,6 @@ import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
 import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
 import com.cobblemon.mod.common.util.lang
 import com.cobblemon.mod.common.util.party
-import net.minecraft.client.Minecraft
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.network.protocol.game.ClientboundSoundPacket
 import net.minecraft.sounds.SoundSource
@@ -155,13 +154,10 @@ interface Evolution : EvolutionLike {
             pokemon.tryRecallWithAnimation()
         }
 
-        val preEvoName = pokemon.getDisplayName()
-        val evolveMessage = lang("ui.evolve.into", preEvoName, pokemon.species.translatedName)
         val pokemonEntity = pokemon.entity
         if (pokemonEntity == null || !useEvolutionEffect) {
             pokemon.getOwnerPlayer()?.playNotifySound(CobblemonSounds.EVOLUTION_UI, SoundSource.PLAYERS, 1F, 1F)
             evolutionMethod(pokemon)
-            pokemon.getOwnerPlayer()?.sendSystemMessage(evolveMessage)
         } else {
             pokemonEntity.busyLocks.add("evolving")
             pokemonEntity.navigation.stop()
@@ -174,7 +170,6 @@ interface Evolution : EvolutionLike {
             pokemonEntity.after( seconds = 12F ) {
                 cryAnimation(pokemonEntity)
                 pokemonEntity.busyLocks.remove("evolving")
-                pokemon.getOwnerPlayer()?.sendSystemMessage(evolveMessage)
             }
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/feature/SpeciesFeatures.kt

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.api.pokemon.feature
 
 import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.pokemon.aspect.AspectProvider
 import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
 import com.cobblemon.mod.common.api.properties.CustomPokemonPropertyType
@@ -76,6 +77,12 @@ object SpeciesFeatures : JsonDataRegistry<SpeciesFeatureProvider<*>> {
     }
 
     fun getFeatures() = (resourceFeatures.keys + codeFeatures.keys).mapNotNull(this::getFeature)
+
+    fun getFeaturesFor(speciesIdentifier: ResourceLocation): List<SpeciesFeatureProvider<*>> {
+        val species = PokemonSpecies.getByIdentifier(speciesIdentifier) ?: return emptyList()
+        return getFeaturesFor(species)
+    }
+
     fun getFeaturesFor(species: Species): List<SpeciesFeatureProvider<*>> {
         val mentionedFeatures = species.features.mapNotNull(this::getFeature)
         val globalFeatures = GlobalSpeciesFeatures.getFeatures()

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

@@ -10,10 +10,6 @@ package com.cobblemon.mod.common.api.spawning.fishing
 
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.LOGGER
-import com.cobblemon.mod.common.api.Priority
-import com.cobblemon.mod.common.api.abilities.Abilities
-import com.cobblemon.mod.common.api.events.CobblemonEvents
-import com.cobblemon.mod.common.api.events.fishing.BobberSpawnPokemonEvent
 import com.cobblemon.mod.common.api.fishing.FishingBait
 import com.cobblemon.mod.common.api.pokemon.Natures
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
@@ -30,9 +26,9 @@ import com.cobblemon.mod.common.item.interactive.PokerodItem
 import com.cobblemon.mod.common.pokemon.Gender
 import com.cobblemon.mod.common.pokemon.abilities.HiddenAbility
 import com.cobblemon.mod.common.util.cobblemonResource
+import kotlin.random.Random.Default.nextInt
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.item.ItemStack
-import kotlin.random.Random.Default.nextInt
 
 /**
  * A spawning cause that is embellished with fishing information. Could probably also
@@ -49,95 +45,6 @@ class FishingSpawnCause(
 ) : SpawnCause(spawner, bucket, entity) {
     companion object {
         const val FISHED_ASPECT = "fished"
-        fun shinyReroll(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
-            if (pokemonEntity.pokemon.shiny) return
-
-            val shinyOdds = Cobblemon.config.shinyRate.toInt()
-            if (shinyOdds <= 0) {
-                return
-            }
-            val randomNumber = nextInt(0, shinyOdds + 1)
-
-            if (randomNumber <= effect.value.toInt()) {
-                pokemonEntity.pokemon.shiny = true
-            }
-        }
-
-        fun alterNatureAttempt(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
-            val baitStat = effect.subcategory?.let { it1 -> Stats.getStat(it1.path).identifier } ?: run {
-                LOGGER.warn("One of your nature baits is missing a subcategory and failed to effect a fished Pokemon")
-                return
-            }
-            // TIMNOTE: This replaces the static lists. It's less performant because it's being reviewed every time,
-            // but also it's not something that goes off too often.
-            val possibleNatures = Natures.all().filter { it.increasedStat?.identifier == baitStat }
-            if (possibleNatures.isEmpty() || possibleNatures.any { it == pokemonEntity.pokemon.nature }) return
-            val takenNature = possibleNatures.random()
-
-            pokemonEntity.pokemon.nature = Natures.getNature(takenNature.name.path) ?: return
-        }
-
-        fun alterIVAttempt(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
-            val iv = effect.subcategory ?: return
-
-            if ((pokemonEntity.pokemon.ivs[Stats.getStat(iv.path)] ?: 0) + effect.value > 31) // if HP IV is already less than 3 away from 31
-                pokemonEntity.pokemon.ivs.set(Stats.getStat(iv.path), 31)
-            else
-                pokemonEntity.pokemon.ivs.set(Stats.getStat(iv.path), (pokemonEntity.pokemon.ivs[Stats.getStat(iv.path)] ?: 0) + (effect.value).toInt())
-        }
-
-        fun alterGenderAttempt(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
-            if (pokemonEntity.pokemon.species.maleRatio > 0 && pokemonEntity.pokemon.species.maleRatio < 1) // if the pokemon is allowed to be male or female
-                when (effect.subcategory) {
-                    cobblemonResource("male") -> if (pokemonEntity.pokemon.gender != Gender.MALE) pokemonEntity.pokemon.gender = Gender.MALE
-                    cobblemonResource("female") -> if (pokemonEntity.pokemon.gender != Gender.FEMALE) pokemonEntity.pokemon.gender = Gender.FEMALE
-                }
-        }
-
-        fun alterLevelAttempt(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
-            var level = pokemonEntity.pokemon.level + effect.value.toInt()
-            if (level > Cobblemon.config.maxPokemonLevel)
-                level = Cobblemon.config.maxPokemonLevel
-            pokemonEntity.pokemon.level = level
-        }
-
-        fun alterTeraAttempt(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
-            if (pokemonEntity.pokemon.teraType == effect.subcategory?.let { TeraTypes.get(it.path) } ||
-                TeraTypes.get(effect.subcategory!!.path) == null) return
-
-            pokemonEntity.pokemon.teraType = TeraTypes.get(effect.subcategory.path)!!
-        }
-
-        fun alterHAAttempt(pokemonEntity: PokemonEntity) {
-            //val species = pokemonEntity.pokemon.species.let { PokemonSpecies.getByName(it.name) } ?: return
-            //val ability = species.abilities.mapping[Priority.LOW]?.first()?.template?.name ?: return
-
-            //pokemonEntity.pokemon.ability = Abilities.get(ability)?.create(false) ?: return
-
-            // Old code from Licious that might be helpful if the above proves to not work
-
-            // This will iterate from highest to lowest priority
-            pokemonEntity.pokemon.form.abilities.mapping.values.forEach { abilities ->
-                abilities.filterIsInstance<HiddenAbility>()
-                    .randomOrNull ()
-                    ?.let { ability ->
-                        // No need to force, this is legal
-                        pokemonEntity.pokemon.ability = ability.template.create(false)
-                        return
-                    }
-            }
-            // There was never a hidden ability :( possible but not by default
-            return
-
-
-        }
-
-        fun alterFriendshipAttempt(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
-            if (pokemonEntity.pokemon.friendship + effect.value > 255)
-                pokemonEntity.pokemon.setFriendship(255)
-            else
-                pokemonEntity.pokemon.setFriendship(pokemonEntity.pokemon.friendship + effect.value.toInt())
-        }
     }
 
     val rodItem = rodStack.item as? PokerodItem
@@ -150,7 +57,16 @@ class FishingSpawnCause(
 
             bait?.effects?.forEach { it ->
                 if (Math.random() > it.chance) return
-                FishingBait.Effects.getEffectFunction(it.type)?.invoke(entity, it)
+                when (it.type) {
+                    FishingBait.Effects.SHINY_REROLL -> shinyReroll(entity, it)
+                    FishingBait.Effects.NATURE -> alterNatureAttempt(entity, it)
+                    FishingBait.Effects.IV -> alterIVAttempt(entity, it)
+                    FishingBait.Effects.GENDER_CHANCE -> alterGenderAttempt(entity, it)
+                    FishingBait.Effects.LEVEL_RAISE -> alterLevelAttempt(entity, it)
+                    FishingBait.Effects.TERA -> alterTeraAttempt(entity, it)
+                    FishingBait.Effects.HIDDEN_ABILITY_CHANCE -> alterHAAttempt(entity)
+                    FishingBait.Effects.FRIENDSHIP -> alterFriendshipAttempt(entity, it)
+                }
             }
 
             // Some of the bait actions might have changed the aspects and we need it to be
@@ -158,7 +74,6 @@ class FishingSpawnCause(
             // with the old aspects.
             // New aspects copy into the entity data only on the next tick.
             entity.entityData.set(PokemonEntity.ASPECTS, entity.pokemon.aspects)
-            CobblemonEvents.BOBBER_SPAWN_POKEMON_MODIFY.post(BobberSpawnPokemonEvent.Modify(bucket, rodStack, entity))
         }
     }
 
@@ -182,5 +97,93 @@ class FishingSpawnCause(
         return super.affectWeight(detail, ctx, weight)
     }
 
+    private fun shinyReroll(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
+        if (pokemonEntity.pokemon.shiny) return
 
+        val shinyOdds = Cobblemon.config.shinyRate.toInt()
+        if (shinyOdds <= 0) {
+            return
+        }
+        val randomNumber = nextInt(0, shinyOdds + 1)
+
+        if (randomNumber <= effect.value.toInt()) {
+            pokemonEntity.pokemon.shiny = true
+        }
+    }
+
+    private fun alterNatureAttempt(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
+        val baitStat = effect.subcategory?.let { it1 -> Stats.getStat(it1.path).identifier } ?: run {
+            LOGGER.warn("One of your nature baits is missing a subcategory and failed to effect a fished Pokemon")
+            return
+        }
+        // TIMNOTE: This replaces the static lists. It's less performant because it's being reviewed every time,
+        // but also it's not something that goes off too often.
+        val possibleNatures = Natures.all().filter { it.increasedStat?.identifier == baitStat }
+        if (possibleNatures.isEmpty() || possibleNatures.any { it == pokemonEntity.pokemon.nature }) return
+        val takenNature = possibleNatures.random()
+
+        pokemonEntity.pokemon.nature = Natures.getNature(takenNature.name.path) ?: return
+    }
+
+    private fun alterIVAttempt(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
+        val iv = effect.subcategory ?: return
+
+        if ((pokemonEntity.pokemon.ivs[Stats.getStat(iv.path)] ?: 0) + effect.value > 31) // if HP IV is already less than 3 away from 31
+            pokemonEntity.pokemon.ivs.set(Stats.getStat(iv.path), 31)
+        else
+            pokemonEntity.pokemon.ivs.set(Stats.getStat(iv.path), (pokemonEntity.pokemon.ivs[Stats.getStat(iv.path)] ?: 0) + (effect.value).toInt())
+    }
+
+    private fun alterGenderAttempt(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
+        if (pokemonEntity.pokemon.species.maleRatio > 0 && pokemonEntity.pokemon.species.maleRatio < 1) // if the pokemon is allowed to be male or female
+            when (effect.subcategory) {
+                cobblemonResource("male") -> if (pokemonEntity.pokemon.gender != Gender.MALE) pokemonEntity.pokemon.gender = Gender.MALE
+                cobblemonResource("female") -> if (pokemonEntity.pokemon.gender != Gender.FEMALE) pokemonEntity.pokemon.gender = Gender.FEMALE
+            }
+    }
+
+    private fun alterLevelAttempt(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
+        var level = pokemonEntity.pokemon.level + effect.value.toInt()
+        if (level > Cobblemon.config.maxPokemonLevel)
+            level = Cobblemon.config.maxPokemonLevel
+        pokemonEntity.pokemon.level = level
+    }
+
+    private fun alterTeraAttempt(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
+        if (pokemonEntity.pokemon.teraType == effect.subcategory?.let { TeraTypes.get(it.path) } ||
+                TeraTypes.get(effect.subcategory!!.path) == null) return
+
+        pokemonEntity.pokemon.teraType = TeraTypes.get(effect.subcategory.path)!!
+    }
+
+    private fun alterHAAttempt(pokemonEntity: PokemonEntity) {
+        //val species = pokemonEntity.pokemon.species.let { PokemonSpecies.getByName(it.name) } ?: return
+        //val ability = species.abilities.mapping[Priority.LOW]?.first()?.template?.name ?: return
+
+        //pokemonEntity.pokemon.ability = Abilities.get(ability)?.create(false) ?: return
+
+        // Old code from Licious that might be helpful if the above proves to not work
+
+        // This will iterate from highest to lowest priority
+        pokemonEntity.pokemon.form.abilities.mapping.values.forEach { abilities ->
+            abilities.filterIsInstance<HiddenAbility>()
+                    .randomOrNull ()
+                    ?.let { ability ->
+                        // No need to force, this is legal
+                        pokemonEntity.pokemon.ability = ability.template.create(false)
+                        return
+                    }
+        }
+        // There was never a hidden ability :( possible but not by default
+        return
+
+
+    }
+
+    private fun alterFriendshipAttempt(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
+        if (pokemonEntity.pokemon.friendship + effect.value > 255)
+            pokemonEntity.pokemon.setFriendship(255)
+        else
+            pokemonEntity.pokemon.setFriendship(pokemonEntity.pokemon.friendship + effect.value.toInt())
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/DexDataJsonBackend.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.storage.player.adapter
 import com.cobblemon.mod.common.api.pokedex.PokedexManager
 import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreType
 import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import com.cobblemon.mod.common.util.adapters.CodecBackedAdapter
 import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
@@ -28,7 +27,7 @@ class DexDataJsonBackend: JsonBackedPlayerDataStoreBackend<PokedexManager>("poke
     override val gson = GsonBuilder()
         .setPrettyPrinting()
         .disableHtmlEscaping()
-        .registerTypeAdapter(PokedexManager::class.java, CodecBackedAdapter(PokedexManager.CODEC))
+        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
         .create()
     override val classToken = TypeToken.get(PokedexManager::class.java)
     override val defaultData = defaultDataFunc

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/DexDataMongoBackend.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.storage.player.adapter
-
-import com.cobblemon.mod.common.api.pokedex.PokedexManager
-import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import com.cobblemon.mod.common.util.adapters.CodecBackedAdapter
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import com.mongodb.client.MongoClient
-import java.util.UUID
-
-/**
- * A [PlayerDataStoreBackend] for [PokedexManager]
- *
- * @author Pebbles
- * @since October 26, 2024
- */
-
-class DexDataMongoBackend(mongoClient: MongoClient, databaseName: String, collectionName: String) :
-    MongoBackedPlayerDataStoreBackend<PokedexManager>(mongoClient, databaseName, collectionName, PlayerInstancedDataStoreTypes.POKEDEX) {
-    override val gson = GsonBuilder()
-        .registerTypeAdapter(PokedexManager::class.java, CodecBackedAdapter(PokedexManager.CODEC))
-        .create()
-    override val classToken = TypeToken.get(PokedexManager::class.java)
-    override val defaultData = defaultDataFunc
-
-    override fun initialize(store: PokedexManager) {
-        store.initialize()
-    }
-
-    companion object {
-        val defaultDataFunc = { uuid: UUID ->
-            PokedexManager(uuid, mutableMapOf())
-        }
-    }
-
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/MongoBackedPlayerDataStoreBackend.kt

@@ -1,59 +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.storage.player.adapter
-
-import com.cobblemon.mod.common.api.storage.player.InstancedPlayerData
-import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreType
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
-import com.mongodb.client.MongoClient
-import com.mongodb.client.model.ReplaceOptions
-import org.bson.Document
-import java.io.BufferedReader
-import java.io.FileReader
-import java.io.PrintWriter
-import java.util.UUID
-import kotlin.reflect.KMutableProperty
-import kotlin.reflect.full.memberProperties
-
-abstract class MongoBackedPlayerDataStoreBackend<T : InstancedPlayerData>(
-    mongoClient: MongoClient, databaseName: String, collectionName: String, type: PlayerInstancedDataStoreType
-) : MongoBasedPlayerDataStoreBackend<T>(mongoClient, type, databaseName, collectionName) {
-    abstract val gson: Gson
-
-    //The class GSON needs to deserialize to
-    abstract val classToken: TypeToken<T>
-
-    override fun save(playerData: T) {
-        collection.replaceOne(
-            Document("uuid", playerData.uuid.toString()),
-            Document.parse(gson.toJson(playerData)),
-            ReplaceOptions().upsert(true)
-        )
-    }
-
-    override fun load(uuid: UUID): T {
-        val filter = Document("uuid", uuid.toString())
-        val document = collection.find(filter).first()
-
-        return if (document != null) {
-            val jsonStr = document.toJson()
-            gson.fromJson(jsonStr, classToken).also {
-                val newProps = it::class.memberProperties.filterIsInstance<KMutableProperty<*>>()
-                    .filter { member -> member.getter.call(it) == null }
-                if (newProps.isNotEmpty()) {
-                    val defaultData = defaultData(uuid)
-                    newProps.forEach { member -> member.setter.call(it, member.getter.call(defaultData)) }
-                }
-            }
-        } else {
-            defaultData(uuid).also(::save)
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/MongoBasedPlayerDataStoreBackend.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.storage.player.adapter
-
-import com.cobblemon.mod.common.api.storage.player.InstancedPlayerData
-import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreType
-import com.mongodb.client.MongoClient
-import net.minecraft.server.MinecraftServer
-import java.util.UUID
-
-/**
- * A [PlayerDataStoreBackend] that stores the [InstancedPlayerData] in a file.
- *
- * @author Pebbles
- * @since October 27, 2024
- */
-abstract class MongoBasedPlayerDataStoreBackend<T : InstancedPlayerData>(
-    val mongoClient: MongoClient, val type: PlayerInstancedDataStoreType, databaseName: String, collectionName: String
-) : PlayerDataStoreBackend<T>(type) {
-
-    abstract val defaultData: (UUID) -> (T)
-    val collection by lazy {
-        mongoClient.getDatabase(databaseName).getCollection(collectionName)
-    }
-
-    override fun setup(server: MinecraftServer) {
-        // Ping the database to ensure it's connected
-        mongoClient.listDatabaseNames().first()
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/MongoPlayerData.kt

@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+/*
+package com.cobblemon.mod.common.api.storage.player.adapter
+
+import com.cobblemon.mod.common.api.storage.player.PlayerData
+import com.cobblemon.mod.common.api.storage.player.PlayerDataExtension
+import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
+import com.google.gson.GsonBuilder
+import com.mongodb.client.MongoClient
+import com.mongodb.client.model.ReplaceOptions
+import net.minecraft.resources.ResourceLocation
+import org.bson.Document
+import java.util.UUID
+import kotlin.reflect.KMutableProperty
+import kotlin.reflect.full.memberProperties
+
+class MongoPlayerDataAdapter(
+    mongoClient: MongoClient,
+    databaseName: String
+) : PlayerDataStoreAdapter {
+
+    companion object {
+        val gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(PlayerDataExtension::class.java, PlayerDataExtensionAdapter)
+            .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+            .create()
+    }
+
+    private val collection = mongoClient.getDatabase(databaseName).getCollection("PlayerDataCollection")
+
+    override fun load(uuid: UUID): PlayerData {
+        val filter = Document("uuid", uuid.toString())
+        val document = collection.find(filter).first()
+
+        return if (document != null) {
+            val jsonStr = document.toJson()
+            gson.fromJson(jsonStr, PlayerData::class.java).also {
+                val newProps = it::class.memberProperties.filterIsInstance<KMutableProperty<*>>().filter { member -> member.getter.call(it) == null }
+                if (newProps.isNotEmpty()) {
+                    val defaultData = PlayerData.defaultData(uuid)
+                    newProps.forEach { member -> member.setter.call(it, member.getter.call(defaultData)) }
+                }
+            }
+        } else {
+            PlayerData.defaultData(uuid).also(::save)
+        }
+    }
+
+    override fun save(playerData: PlayerData) {
+        val jsonStr = gson.toJson(playerData)
+        val document = Document.parse(jsonStr)
+        document.put("uuid", playerData.uuid.toString())
+        val filter = Document("uuid", playerData.uuid.toString())
+
+        collection.replaceOne(filter, document, ReplaceOptions().upsert(true))
+    }
+}
+
+ */

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/PlayerDataMongoBackend.kt

@@ -1,49 +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.storage.player.adapter
-
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.CobblemonSounds
-import com.cobblemon.mod.common.api.storage.player.GeneralPlayerData
-import com.cobblemon.mod.common.api.storage.player.PlayerDataExtension
-import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import com.mongodb.client.MongoClient
-import net.minecraft.resources.ResourceLocation
-import java.util.UUID
-
-/**
- * A [PlayerDataStoreBackend] for [GeneralPlayerData]
- *
- * @author Apion
- * @since February 21, 2024
- */
-class PlayerDataMongoBackend(mongoClient: MongoClient, databaseName: String, collectionName: String): MongoBackedPlayerDataStoreBackend<GeneralPlayerData>(
-    mongoClient, databaseName, collectionName, PlayerInstancedDataStoreTypes.GENERAL
-){
-    override val defaultData = { forPlayer: UUID -> GeneralPlayerData(
-        uuid = forPlayer,
-        starterPrompted = false,
-        starterLocked = !Cobblemon.starterConfig.allowStarterOnJoin,
-        starterSelected =  false,
-        starterUUID =  null,
-        keyItems = mutableSetOf(),
-        extraData = mutableMapOf(),
-        battleTheme = CobblemonSounds.PVP_BATTLE.location
-    )}
-
-    override val gson = GsonBuilder()
-        .registerTypeAdapter(PlayerDataExtension::class.java, PlayerDataExtensionAdapter)
-        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-        .create()
-
-    override val classToken = TypeToken.get(GeneralPlayerData::class.java)
-}

common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleBuilder.kt

@@ -9,11 +9,9 @@
 package com.cobblemon.mod.common.battles
 
 import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
 import com.cobblemon.mod.common.api.storage.party.PartyStore
-import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore
 import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
@@ -33,6 +31,7 @@ import net.minecraft.network.chat.MutableComponent
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.phys.Vec3
+import java.util.*
 import kotlin.collections.HashMap
 import kotlin.collections.Iterable
 import kotlin.collections.MutableSet
@@ -61,30 +60,8 @@ object BattleBuilder {
         healFirst: Boolean = false,
         partyAccessor: (ServerPlayer) -> PartyStore = { it.party() }
     ): BattleStartResult {
-
-        val adjustLevel = battleFormat.adjustLevel
-        val team1 = partyAccessor(player1).toBattleTeam(clone = cloneParties || adjustLevel > 0,  healPokemon = healFirst, leadingPokemonPlayer1).sortedBy { it.health <= 0 }
-        val team2 = partyAccessor(player2).toBattleTeam(clone = cloneParties || adjustLevel > 0,  healPokemon = healFirst, leadingPokemonPlayer2).sortedBy { it.health <= 0 }
-
-        val battlePartyStores = mutableListOf<PlayerPartyStore>()
-
-        if (adjustLevel > 0) {
-            val tempStoreP1 = PlayerPartyStore(player1.uuid)
-            team1.forEachIndexed { index, it ->
-                it.effectedPokemon.level = adjustLevel
-                it.effectedPokemon.heal()
-                tempStoreP1.set(index, it.effectedPokemon)
-            }
-            battlePartyStores.add(tempStoreP1)
-
-            val tempStoreP2 = PlayerPartyStore(player2.uuid)
-            team2.forEachIndexed { index, it ->
-                it.effectedPokemon.level = adjustLevel
-                it.effectedPokemon.heal()
-                tempStoreP2.set(index, it.effectedPokemon)
-            }
-            battlePartyStores.add(tempStoreP2)
-        }
+        val team1 = partyAccessor(player1).toBattleTeam(clone = cloneParties, healPokemon = healFirst, leadingPokemonPlayer1).sortedBy { it.health <= 0 }
+        val team2 = partyAccessor(player2).toBattleTeam(clone = cloneParties, healPokemon = healFirst, leadingPokemonPlayer2).sortedBy { it.health <= 0 }
 
         val player1Actor = PlayerBattleActor(player1.uuid, team1)
         val player2Actor = PlayerBattleActor(player2.uuid, team2)
@@ -114,7 +91,6 @@ object BattleBuilder {
             ).ifSuccessful {
                 player1Actor.battleTheme = player2.getBattleTheme()
                 player2Actor.battleTheme = player1.getBattleTheme()
-                it.battlePartyStores.addAll(battlePartyStores)
                 result = SuccessfulBattleStart(it)
             }
             result
@@ -141,20 +117,6 @@ object BattleBuilder {
         }
         val playerActors = teams.mapIndexed { index, team -> PlayerBattleActor(players[index].uuid, team)}.toMutableList()
 
-        val adjustLevel = battleFormat.adjustLevel
-        val battlePartyStores = mutableListOf<PlayerPartyStore>()
-
-        if (adjustLevel > 0) {
-            teams.forEachIndexed { index, battleTeam ->
-                battleTeam.forEach { battlePokemon ->
-                    battlePokemon.effectedPokemon.level = adjustLevel
-                    battlePokemon.effectedPokemon.heal()
-                    val tempStore = PlayerPartyStore(players[index].uuid)
-                    battlePartyStores.add(tempStore)
-                }
-            }
-        }
-
         val errors = ErroredBattleStart()
 
         if (players.size != BattleRegistry.MAX_TEAM_MEMBER_COUNT * 2) {
@@ -207,8 +169,6 @@ object BattleBuilder {
 
                 playerActors[2].battleTheme = players[0].getBattleTheme()
                 playerActors[3].battleTheme = players[0].getBattleTheme()
-
-                it.battlePartyStores.addAll(battlePartyStores)
             }
             errors
         } else {
@@ -312,6 +272,7 @@ object BattleBuilder {
     ): BattleStartResult {
         val playerTeam = party.toBattleTeam(clone = cloneParties, healPokemon = healFirst, leadingPokemon = leadingPokemon)
         val playerActor = PlayerBattleActor(player.uuid, playerTeam)
+
         val npcParty = npcEntity.party?.getParty(player, npcEntity)
         val errors = ErroredBattleStart()
 
@@ -352,7 +313,8 @@ object BattleBuilder {
                 side1 = BattleSide(playerActor),
                 side2 = BattleSide(npcActor)
             ).ifSuccessful { battle ->
-                playerActor.battleTheme = npcEntity.getBattleTheme()
+                // TODO NPC battle themes
+//                playerActor.battleTheme = pokemonEntity.getBattleTheme()
                 npcEntity.entityData.update(NPCEntity.BATTLE_IDS) { it + battle.battleId }
                 result = SuccessfulBattleStart(battle)
             }

common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleFormat.kt

@@ -24,9 +24,8 @@ import net.minecraft.network.RegistryFriendlyByteBuf
 data class BattleFormat(
     val mod: String = "cobblemon",
     val battleType: BattleType = BattleTypes.SINGLES,
-    var ruleSet: Set<String> = setOf(),
-    val gen: Int = 9,
-    var adjustLevel: Int = -1, // Stop gap rule before a more general system for rules enforced by Cobblemon is implemented.
+    val ruleSet: Set<String> = setOf(),
+    val gen: Int = 9
 ) {
     companion object {
         val GEN_9_SINGLES = BattleFormat(
@@ -50,8 +49,8 @@ data class BattleFormat(
         )
 
         val GEN_9_ROYAL = BattleFormat(
-            battleType = BattleTypes.ROYAL,
-            ruleSet = mutableSetOf(BattleRules.OBTAINABLE, BattleRules.PAST, BattleRules.UNOBTAINABLE)
+                battleType = BattleTypes.ROYAL,
+                ruleSet = mutableSetOf(BattleRules.OBTAINABLE, BattleRules.PAST, BattleRules.UNOBTAINABLE)
         )
 
         fun loadFromBuffer(buffer: RegistryFriendlyByteBuf): BattleFormat {
@@ -59,12 +58,10 @@ data class BattleFormat(
             val battleType = BattleType.loadFromBuffer(buffer)
             val ruleSet = mutableSetOf<String>()
             repeat(times = buffer.readSizedInt(IntSize.U_BYTE)) { ruleSet.add(buffer.readString()) }
-            val adjustLevel = buffer.readSizedInt(IntSize.INT)
             return BattleFormat(
                 mod = mod,
                 battleType = battleType,
-                ruleSet = ruleSet,
-                adjustLevel = adjustLevel
+                ruleSet = ruleSet
             )
         }
     }
@@ -74,7 +71,6 @@ data class BattleFormat(
         battleType.saveToBuffer(buffer)
         buffer.writeSizedInt(IntSize.U_BYTE, ruleSet.size)
         ruleSet.forEach(buffer::writeString)
-        buffer.writeSizedInt(IntSize.INT, adjustLevel)
         return buffer
     }