not snap

[1.6] Add entity type id molang function

See merge request cable-mc/cobblemon!1415

.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

@@ -3,23 +3,155 @@ image: amazoncorretto:21
 before_script:
   - export GRADLE_USER_HOME=`pwd`/.gradle
 
+# TODO add client reference test process, search for import com.cobblemon.mod.common.client
+
 stages:
+  - preprocessing
+  - packsquash
+  - replaceresources
   - build
   - deploy
 
-#TODO add client reference test process, search for import com.cobblemon.mod.common.client
+check_assets_cache:
+  stage: preprocessing
+  script:
+    - echo "Checking if cached hash matches current hash"
+
+    # Calculate the current hash
+    - find common/src/main/resources/assets common/src/main/resources/data -type f -exec sha256sum {} + | sort -k 2 | sha256sum > current_hash.txt
+    - echo "Current hash:"
+    - cat current_hash.txt
+
+    # Check for the existence of the previous hash
+    - if [[ -f assets_data_hash.txt ]]; then
+      echo "Previous cached hash found:";
+      cat assets_data_hash.txt;
+      if cmp -s assets_data_hash.txt current_hash.txt; then
+      echo "Hashes match, skipping PackSquash";
+      rm -f run_packsquash.flag || true;
+      else
+      echo "Hashes differ, PackSquash needed";
+      touch run_packsquash.flag;
+      fi;
+      else
+      echo "No cached hash found, marking PackSquash as required";
+      touch run_packsquash.flag;
+      fi
+
+    # Save the current hash for future runs
+    - echo "Saving current hash to cache";
+    - cp current_hash.txt assets_data_hash.txt
+  artifacts:
+    paths:
+      - current_hash.txt
+      - assets_data_hash.txt
+      - run_packsquash.flag
+    expire_in: 7 days
+  cache:
+    key: "cache-${CI_COMMIT_REF_NAME}"
+    paths:
+      - assets_data_hash.txt
+      - ./compressed_pack.zip
+
+setup_resource_pack:
+  stage: preprocessing
+  script:
+    - echo "Setting up fake resource pack"
+    - mkdir ./fake_resource_pack
+    - cp -r common/src/main/resources/assets common/src/main/resources/data ./fake_resource_pack/
+    - echo '{"pack":{"pack_format":34,"description":"Fake Cobblemon Pack"}}' > ./fake_resource_pack/pack.mcmeta
+  artifacts:
+    paths:
+      - ./fake_resource_pack/
+    expire_in: 7 days
+
+setup_packsquash:
+  stage: preprocessing
+  script:
+    - echo "Installing wget & unzip"
+    - yum install -y wget unzip
+    - echo "Downloading PackSquash"
+    - wget https://github.com/ComunidadAylas/PackSquash/releases/download/v0.4.0/PackSquash.CLI.executable.x86_64-unknown-linux-musl.zip
+    - unzip PackSquash.CLI.executable.x86_64-unknown-linux-musl.zip -d ./packsquash_bin
+    - echo "Creating PackSquash options.toml"
+    - |
+      cat <<EOF > ./options.toml
+      pack_directory = "./fake_resource_pack/"
+      output_file_path = "./compressed_pack.zip"
+      zip_spec_conformance_level = "high"
+      ['**/*?.ogg']
+      transcode_ogg = false
+      two_pass_vorbis_optimization_and_validation = false
+      sampling_frequency = 999999
+      empty_audio_optimization=false
+      EOF
+  artifacts:
+    paths:
+      - ./packsquash_bin/
+      - ./options.toml
+    expire_in: 7 days
+
+default:
+  artifacts:
+    expire_in: 7 days
+
+run_packsquash:
+  stage: packsquash
+  dependencies:
+    - check_assets_cache
+    - setup_resource_pack
+    - setup_packsquash
+  script:
+    - ls -l
+    - if [[ ! -f ./compressed_pack.zip || -f run_packsquash.flag ]]; then
+      echo "Running PackSquash";
+      chmod +x ./packsquash_bin/packsquash;
+      ./packsquash_bin/packsquash ./options.toml;
+      else
+      echo "Skipping PackSquash; no changes detected and compressed pack exists";
+      fi
+  cache:
+    key: "cache-${CI_COMMIT_REF_NAME}"
+    policy: pull-push
+    paths:
+      - assets_data_hash.txt
+      - ./compressed_pack.zip
+  artifacts:
+    paths:
+      - ./compressed_pack.zip
+
+replace_resources:
+  stage: replaceresources
+  dependencies:
+    - run_packsquash
+  script:
+    - echo "Installing unzip"
+    - yum install -y unzip
+
+    - echo "Unzipping compressed pack"
+    - mkdir temp_unpack
+    - unzip ./compressed_pack.zip -d temp_unpack
+
+    - echo "Removing original assets and data"
+    - rm -rf common/src/main/resources/assets
+    - rm -rf common/src/main/resources/data
+
+    - echo "Replacing assets and data"
+    - mv temp_unpack/assets common/src/main/resources/
+    - mv temp_unpack/data common/src/main/resources/
+  artifacts:
+    paths:
+      - common/src/main/resources/
 
 build:
   stage: build
-  only:
-    - branches@cable-mc/cobblemon
+  dependencies:
+    - replace_resources
   script:
     - export GRADLE_OPTS="-Xmx4G -Xms4G"
     - chmod +x ./gradlew
     - ./gradlew build
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
-    policy: push
+  artifacts:
     paths:
       - neoforge/build/libs
       - fabric/build/libs
@@ -28,39 +160,26 @@ publish:
   stage: deploy
   dependencies:
     - build
-  cache:
-    key: "CI_COMMIT_REF_NAME"
-    policy: pull
-    paths:
-      - neoforge/build/libs/*.jar
-      - fabric/build/libs/*.jar
   rules:
-    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_PROJECT_PATH == "cable-mc/cobblemon" && $CI_COMMIT_BRANCH == "main"'
   script:
     - export GRADLE_OPTS="-Xmx4G -Xms4G"
     - chmod +x ./gradlew
     - ./gradlew publish
-
-# Separate step to deploy the artifacts, save Norry the headache of keeping even more shit around
-deploy:
-  stage: deploy
-  dependencies:
-    - build
-  when: manual
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
-    policy: pull
+  artifacts:
     paths:
       - neoforge/build/libs/*.jar
       - fabric/build/libs/*.jar
-  script: 
+
+deploy_artifacts:
+  stage: deploy
+  dependencies:
+    - build
+  script:
     - echo "Collecting artifacts..."
-    - mv neoforge/build/libs/*+*.jar ./
-    - mv fabric/build/libs/*+*.jar ./
+    - find neoforge/build/libs/ -type f -name "*.jar" | grep -vE "dev-shadow|sources|javadoc" | xargs -I {} mv {} ./
+    - find fabric/build/libs/ -type f -name "*.jar" | grep -vE "dev-shadow|sources|javadoc" | xargs -I {} mv {} ./
     - for f in *.jar; do mv "$f" "$(echo "$f" | sed s/+/b$CI_PIPELINE_IID+/)"; done
   artifacts:
-    expire_in: 28 days
     paths:
       - ./*.jar
-#      - neoforge/build/libs/*+*.jar
-#      - fabric/build/libs/*+*.jar

1.20.5 to do.txt

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

CHANGELOG-DEX.md

@@ -1,3 +0,0 @@
-### Additions
-- Added the Poké Dex as a craftable item.
-- Poké Dexes can be placed on lecterns.

CHANGELOG-MORE-NPCS.md

@@ -1,6 +0,0 @@
-### Additions
-- Added `moves` option to PokemonProperties, allowing you to set the moves of a Pokémon in commands and spawn files.
-- Added /spawnnpc and /spawnnpcat commands.
-
-### Fixes
-- Fixed sync issues with recently learned moves where their PP would not go down until you logout and in.

CHANGELOG-NO-ENTITY-RENDERING.md

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

CHANGELOG.md

@@ -1,38 +1,59 @@
 # Changelog
-## [1.6.0 - The Bass Pro Fishing Update (Month Xth, 2024)](#1-6-0)
+## [1.6.0 - The Record Catch Update (Month Xth, 2024)](#1-6-0)
 #### "Now that there's a fishing mechanic, the mod is actually good!"
 
 ### Additions
-- Added Pokémon (and item) fishing using modified fishing rods - Poké Rods! You'll need a Poké Rod smithing template, a fishing rod, and some type of Poké Ball. Each Poké Ball makes a differently themed rod. Why not?
+- Added the Pokédex as a craftable item that can be placed on lecterns.
+- Added Pokémon (and item) fishing using modified fishing rods - Poké Rods! You'll need a Poké Rod smithing template, a fishing rod, and some type of Poké Ball. Each Poké Ball makes a differently themed rod because it's cool.
 - 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 `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 flat level battling with options to set all Pokémon to level 50, 100, or 5 for the duration of a battle. No experience or EVs are granted for a flat battle.
+- Added support for Double Battles, Triple Battles, and Multi-battles.
+- Added raft platforms for non-swimming, non-flying Pokémon to stand on during battles that take place on the water's surface (Flying Pokémon will fly over water in battle, and water breathing Pokémon will swim in water during battle).
+- Added smarter send-out positions for Pokémon in battle. They should get in your way less!
 - CriticalCaptures and Pokédex progress capture multiplier now work with the Pokédex.
+- Added shiny Pokémon particle effects and sounds to help find them.
+- Added effects for the burn status effect.
+- Added effects for the moves: Seismic Toss, Withdraw, Bite, Crunch, Super Fang, Hyper Fang, Pursuit, Mist, Haze, Lick, Kinesis, Psychic, Water Sport, and Mud Sport.
 - Added 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.
+- Moves impacted by the abilities Pixelate, Refrigerate, Aerilate, Galvanize, and Normalize now display as their altered typing.
 - 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 Eject Pack, Metronome, Protective Pads, Punching Glove, Room Service, Scope Lens, Shed Shell, Terrain Extender, Throat Spray, Utility Umbrella, Wide Lens, and Zoom Lens held items.
+- Added a full evolution particle effect for Pokémon that are sent out when evolution is started.
+- Added a Nurse profession that can be unlocked by having villagers claim a healing machine block.
+- Pokémon are now animated when seen in any GUI that isn't the party GUI.
+- Added animation and sounds for trading.
+- Added icons for pending trade, team-up, and battle requests from other players.
+- Quirk animations can now occur for Pokémon that are shoulder mounted.
+- Added new sounds for Poké Balls bouncing off of Pokémon and landing on the ground during capture.
+- Added a unique set of sounds for Ancient Poké Balls.
+- Added a sound for using Exp Candy and Rare Candy items.
+- Added revamped Poké Ball animation for Pokémon breaking out.
+- Added battle log messages for switching out Pokémon.
+- Added config setting `displayEntityNameLabel` and `displayEntityLabelsWhenCrouchingOnly` to control what and when is displayed for the pokemon label.
+- Added `no_ai` and `freeze_frame` options to the `/spawnpokemon` command.
+- Added `moves` option to Pokémon properties, allowing you to set the moves of a Pokémon in commands and spawn files using comma-separated move names.
+- Added a `natural` block state property for the healing machine block; when property is set to true, the block will have a different texture and drop an iron ingot instead of itself.
 - Added a `battleInvulnerability` gamerule to make players invulnerable to any damage during a battle.
 - Added a `mobTargetInBattle` gamerule to exclude players from being targeted by mobs during a battle.
-- Added battle log messages for switching out Pokémon.
-- Added Evolution particles and sounds for Pokémon that are sent out when evolution is started.
-- Added a Nurse profession that can be unlocked by having villagers claim a healing machine block.
-- Added pokecenters to all 5 village types.
-- Added a `natural` block state property for the healing machine block; when property is set to true, the block will have a different texture and drop an iron ingot instead of itself.
-- New config setting `displayEntityNameLabel` and `displayEntityLabelsWhenCrouchingOnly` to control what and when is displayed for the pokemon label
-- `/freezepokemon` command to pause a Pokémon's animation at a specific point in time.
-- Added `no_ai` and `freeze_frame` options to the `/spawnpokemon` command.
-- Added shiny Pokémon particles with sound effects.
+- Added a `/freezepokemon` command to pause a Pokémon's animation at a specific point in time.
+- Added `/spawnnpc` and `/spawnnpcat` commands.
+- Added `hiddenability=false` option to `/spawnpokemon` and `/pokemonedit` commands, allowing the Pokémon's ability to be reverted to a normal ability.
+- 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.
 
+### Structures Added
+- Fishing boat structure that contain an Explorer Map leading to a shipwreck cove and a Poké Rod Smithing Template.
+- Stonjourner Henge Ruins, Luna Henge Ruins, and Sol Henge Ruins.
+- Submerged Shipwreck Cove and Lush Shipwreck Cove.
+- Pokémon Centers to all 5 village types.
+ 
 ### Pokémon Added
+#### Gen 1
+- Alola Bias Cubone (built-in resource pack)
+- Alolan Marowak
+
 #### Gen 2
 - Ledyba
 - Ledian
@@ -40,19 +61,233 @@
 - Sunflora
 - Wobbuffet
 - Girafarig
+- Corsola
+- Remoraid
+- Octillery
+- Mantine
+- Smeargle
+- Delibird
 
 #### Gen 3
+- Slakoth
+- Vigoroth
+- Slaking
+- Corphish
+- Crawdaunt
+- Feebas
+- Milotic
 - Wynaut
+- Absol
+- Spheal
+- Sealeo
+- Walrein
+- Bagon
+- Shelgon
+- Salamence
+- Kecleon
+
+#### Gen 4
+- Mantyke
+- Finneon
+- Lumineon
+- Shellos
+- Gastrodon
+- Rotom
+
+#### Gen 5
+- Purrloin
+- Liepard
+- Scraggy
+- Scrafty
+
+#### Gen 6
+- Clauncher
+- Clawitzer
+
+#### Gen 7
+- Pikipek
+- Trumbeak
+- Toucannon
+- Mareanie
+- Toxapex
+- Sandygast
+- Palossand
+- Bruxish
 
 #### Gen 8
 - Cramorant
+- Hatenna
+- Hattrem
+- Hatterene
+- Pincurchin
 
 #### Gen 9
+- Wattrel
+- Kilowattrel
+- Wiglett
+- Wugtrio
+- Flamigo
+- Veluza
 - Farigiraf
+- Klawf
+- Finizen
+- Palafin
+- Wiglett
+- Wugtrio
+- Flamigo
+- Dondozo
+
+#### Unique Forms
+- Magikarp Jump variants for Magikarp
+- Magikarp Jump variants for Gyarados (built-in resource pack, enabled by default on Fabric)
 
 ### Added cries to the following Pokémon
+- Sandshrew, Sandslash
+- Magnemite, Magneton, Magnezone
+- Gastly, Haunter, Gengar
+- Rhyhorn, Rhydon, Rhyperior
+- Happiny, Chansey
+- Horsea, Seadra, Kingdra
+- Magby, Magmar, Magmortar
+- Porygon, Porygon2, Porygon-Z
+- Sentret, Furret
+- Misdreavus, Mismagius
+- Corsola
+- Mantyke, Mantine
+- Girafarig, Farigiraf
+- Wynaut, Wobbuffet
+- Lunatone
+- Solrock
+- Corphish, Crawdaunt
+- Feebas, Milotic
+- Kecleon
+- Absol
+- Spheal, Sealeo, Walrein
+- Relicanth
+- Bagon, Shelgon, Salamence
+- Munchlax
+- Finneon, Lumineon
+- Purrloin, Liepard
 - Timburr, Gurdurr, Conkeldurr
+- Joltik, Galvantula
+- Elgyem, Beheeyem
 - Golett, Golurk
+- Deino, Zweilous, Hydreigon
+- Flabébé, Floette, Florges
+- Clauncher, Clawitzer
+- Mareanie, Toxapex
+- Wimpod, Golisopod
+- Bruxish
+- Hatenna, Hattrem, Hatterene
+- Pincurchin
+- Klawf
+- Finizen, Palafin \[Zero\], Palafin \[Hero\]
+- Dondozo
+
+### Added shoulder mounts for the following Pokémon
+- Weedle
+- Caterpie
+- Spearow
+- Mew
+- Murkrow
+- Smoochum
+- Larvitar
+- Tailow
+- Plusle
+- Minun
+- Beldum
+- Starly
+- Buneary
+- Combee
+- Pachirisu
+- Tepig
+- Pidove
+- Petilil, Hisui Bias Petilil
+- Zorua, Hisui Bias Zorua
+- Elgyem
+- Fletchling
+- Skrelp
+- Klefki
+- Litten
+- Fomantis
+- Morelull
+- Dreepy
+- Sprigatito
+- Shroodle
+- Tatsugiri
+- Glimmet
+- Gimmighoul \[Roaming\]
+
+### Animation updates for the following Pokémon
+- Bellsprout, Weepinbell, Victreebel
+- Shellder, Cloyster
+- Porygon, Porygon2, Porygon-Z
+- Furret
+- Swinub, Piloswine, Mamoswine
+- Skarmory
+- Tyrogue
+- Spinda
+- Torkoal
+- Nincada, Ninjask
+- Lunatone
+- Solrock
+- Buneary, Lopunny
+- Magnezone
+- Alomomola
+- Tepig, Pignite, Emboar
+- Flabebe, Floette, Florges
+- Litten, Torracat, Incineroar
+- Fomantis, Lurantis
+- Dreepy, Drakloak
+- Kleavor
+- Scorbunny
+- Gimmighoul \[Roaming\]
+
+### Model updates for the following Pokémon
+- Bulbasaur, Ivysaur, Venusaur
+- Charmander, Charmeleon, Charizard
+- Caterpie
+- 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
+- Mudbray
+- Lurantis
+- Scorbunny, Cinderace
+- Quaxly
+- Skeledirge
+- 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.
@@ -60,118 +295,199 @@
 - 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.
+- Changed Link Cable recipe to be much cheaper.
 - 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.
-- 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).
 - Player trade range increased to 12 blocks (from 10 blocks).
 - PvP battle range increased to 32 blocks (from 10 blocks).
 - Spectate range increased to 64 blocks (from 10 blocks).
 - The inventory key now closes our GUIs if they are open, mirroring how Minecraft screens usually work.
 - The noise from the pasture and PC blocks being interacted with now activates Sculk sensors.
-- Updated dialogue GUI assets with proper assets.
+- Updated dialogue GUI assets with proper assets not made by a programmer. Well, it was still a programmer, but- someone who can also draw!
 - Updated party switching interface when in battle.
 - Relic coin pouches can now be waterlogged.
-- 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 "Press R to start battle prompt" will now disappear after a player's first battle has been won. You've probably figured that detail out by then.
+- The default number of digits for the Pokédex number in the summary has been increased, from 3 to 4. There sure are a lot of Pokémon these days.
+- 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.
+- Hidden Power now displays its effective typing.
+- Updated particles for moves: Confusion, Protect, Sand Attack, and Quick Attack.
+- Updated particles for status effects: Paralysis, Poison, and Sleep.
+- Updated particles on Gastly.
+- Revamped stat buff and de-buff particles.
+- Improved the performance of display cases that contain Pokémon photos.
+- Updated sounds for Poké Balls closing, opening and for Pokémon breaking out.
+- Improved the performance of display cases that contain Pokémon Model items.
+- Removed species Base Stats from the summary interface as it is now viewable within the Pokédex.
+- Changed summary tab text labels to icons. You'll get used to them. Or else.
+- Clicking the summary interface exit button while the swap moves or evolve screen is open will cause the interface to switch back to the party screen. The button will exit the interface otherwise.
+- Ancient Poke Balls now jump once rather than shaking 3 times when capturing Pokémon.
+  - The jump height indicate the number of shakes that would have occurred.
+    - A high wobbly jump indicates 1 shake.
+    - A high jump indicates 2 shakes.
+    - A medium jump indicates 3 shakes.
+    - A short jump indicates that you caught the Pokémon.
+- Pokémon sent out during battle will spawn facing their opponent.
+- Pokémon sent out outside a battle will spawn facing their trainer.
+- Wailord is now 25% bigger. ... [But I have an idea.](https://tenor.com/view/star-wars-more-gif-21856591)
+- Region-biased Pokémon forms are now optional to a built-in resource pack. This pack is enabled by default for Fabric. For NeoForge users, all our built-in resource packs default to disabled because that's all it supports right now.
+- Update item sprites for Cell Battery, Chipped Pot, Covert Cloak, Cracked Pot, Masterpiece Teacup, Red Card, Sachet, and Unremarkable Teacup.
 
 ### Fixes
+- Fixed Ability Patches not reverting Hidden Abilities back to Normal Abilities.
+- Fixed awarding Pokémon experience upon forfeiting battles.
 - Scaled down Amaura's fetus model to avoid clipping through the tank while animating.
-- Fixed Cubone's cry not having a sound.
+- Fixed Cubone's cry not having a sound (as if that Pokémon needed to be more tragic).
+- Fixed the sendout sound erroneously playing when a wild Pokémon breaks out of a Poké ball.
+- Flamethrower is no longer missing sounds.
 - Fixed the Seafloor spawning context not being a usable context.
 - Fixed Pokemon spawning in non-full blocks like slabs.
 - Fixed Gilded Chests not dropping the chest itself when broken, only the contents.
 - Fixed Pokémon losing their Hidden Ability through evolution if the middle stage did not have a Hidden Ability.
 - Hidden Power no longer plays the water type action effect (It now plays the normal type action effect).
-- Fixed Chimchar and Monferno T-posing whenever they sleep.
-- Fixed the Magby line not having any placeholder walk animations.
-- Fixed Duskull and Dusclops using skylight levels for their nether spawn data. There is no sun in the Nether!
-- Fixed Hisuian Zoroark using base Zoroark stats. 
-- Fixed Bellossom clipping into the player head when shoulder mounted.
-- Fixed Shroomish's look range to prevent it from looking higher than it should. 
-- Fixed Crumbling Arch not blending in with the world.
-- Fixed Energy Root applying being usable on a fainted Pokémon.
-- Fixed Pokémon entity not spawning when starting a battle while recalling said Pokémon.
+- Fixed Crumbling Arch structures not blending in with the world.
+- Fixed Energy Root being usable on a fainted Pokémon.
+- Fixed Pokémon not being sent out when starting a battle while recalling said Pokémon.
 - Fixed species comparison not using namespace for both sides in `PokemonProperties.isSubsetOf`.
 - Fixed `PokemonProperties#asString` prefixing nicknames with a '$'.
-- Fixed PC not saving when Pokémon was changed outside.
 - Fixed shearable Pokémon not dropping correct wool colors.
 - Fixed pasture spawning Pokémon inside solid blocks when closest spawning position is blocked off.
 - Fixed Tumbling Down advancement not being granted by tumblestone variants.
 - Improve error handling when loading spawn sets to ensure invalid configurations don't crash the server.
 - Fixed empty `JsonPlayerData` files resulting in players being unable to join server/world.
-- Evolution notification and UI sound is now correctly playing (again).
+- Sound for evolving Pokémon through the Summary Menu is now correctly playing again.
 - Fix Starter prompt not showing up.
-- Fix evolution now granting Pokédex entries.
-- Fix Pokédex crash when a form is looked up without ever seeing the "normal" form.
-- Fixed owned poké balls floating upwards if pausing mid-transition.
+- Fixed owned Poké balls floating upwards if pausing the game mid-transition (which looked absolutely hilarious).
 - Fixed all mouse buttons working for Battle UI navigation (now it's only primary/left click).
 - Fixed trading Pokémon setting their friendship to 0 instead of the base value.
-- Fixed a scenario where a Pokémon that rolled to spawn with a special Tera type sometimes has a Tera type that is already a part of their natural typing.
+- Fixed a scenario where a Pokémon that rolled to spawn with a special Tera type sometimes having a Tera type that is already a part of their natural typing.
 - Fixed PokemonProperty argument suggestions for `tera` and `tera_type` not suggesting `stellar`.
 - Fixed being able to stack Relic Coin Pouches on top of each other.
-- Fixed Model loader generating misleading crash-reports when client is crashing.
+- Fixed model loader generating misleading crash-reports when client is crashing - that resurrection tank error wasn't our fault! We're innocent, your honour!
 - Big Roots and Energy Roots now share the same sounds as intended.
 - Fixed sounds made by blocks playing at a lower pitch than intended.
-- Fixed Chimchar and Monferno T posing whenever they sleep.
+- Fixed Chimchar and Monferno comically T posing whenever they sleep.
+- Fixed Cetitan's cry breaking its walk and sleep animations. 
 - Fixed the Magby line not having any placeholder walk animations.
 - Fixed Duskull and Dusclops using skylight levels for their nether spawn data. There is no sun in the Nether!
 - Fixed Hisuian Zoroark using base Zoroark stats.
 - Fixed Bellossom clipping into the player head when shoulder mounted.
 - Fixed Shroomish's look range to prevent it from looking higher than it should.
-- Fixed Maushold's faint animations not playing. It's sadder than Tandemaus! 
-- Fixed Slowking's battle idle. 
-- Fixed Grafaiai's walk speed to prevent model sliding. 
-- Fixed reviving items throwing an exception when used in battle.
+- Fixed Maushold's faint animations not playing. It's even sadder than Tandemaus!
+- Fixed Slowking's battle idle.
+- Fixed Grafaiai's walk speed to prevent model sliding.
+- Fixed Alolan Exeggutor's tail not showing in the party UI. It will now also stand in front of all Pokémon in the party menu :)
+- Fixed Timburr duplicating its log while fainting.
+- Fixed hitbox sizes for Grotle and Torterra being set to default values.
+- Fixed Hisuian Sneasel using Johtonian Sneasel's cry. Johto-nian. Jotonion. Jotunheim?
+- Fixed Trevenant T-posing after 8 seconds of sleeping. I also do that.
+- Fixed Bewear T-posing for a bit if a wild one faints where you can see.
+- Fixed Noctowl's placeholder fly animation.
+- Corrected Lotad blinking animation. 
+- Fixed reviving items causing errors when used in battle.
 - Fixed messages for Focus Sash, Confusion, Mummy, Ice Face, Own Tempo, and Revive.
 - Improve error handling when loading spawn-sets to ensure invalid configurations don't crash the server.
-- Fixed `crumbling_arch_ruins` from generating a giant cube of air and removed the chest.
+- Fixed Crumbling Arch Ruins generating a giant cube of air and removed the chest.
 - Fixed possible crash on large population servers due to concurrent access of data.
 - Quickly sending out and recalling Pokémon now looks smoother and can no longer be spammed to cause desync issues.
 - Pokémon are now invulnerable during sendout animation and intangible during recall animation.
-- Pokémon are now invincible during sendout animation and intangible during recall animation.
 - Scrolling with party keybinding now behaves properly when using high scroll speed or scroll sensitivity.
 - Fixed battle log GUI flashing when Battle GUI is opened.
 - Bag Items used during a turn will now be refunded if the battle ends before the next turn begins.
-- Pokémon whose current owner is not its Original Trainer now gains extra experience.
+- Pokémon whose current owner is not its Original Trainer now gain 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 village generation caps not applying for berry farms. You were not meant to see more than two berry farms per village! This has been broken for ages but no one noticed... Hmmm... We could just remove it from here...
+- Fixed the Ice Face ability activation being displayed incorrectly in a battle.
+- Fixed edge case of F1 and R locking you in battle with no R functionality (requiring ESC to get out).
+- Fixed Poké Ball render orientation in battle interface when capturing.
+- Fixed sync issues with recently learned moves where their PP would not go down until you logout and in.
+- Fixed some Pokémon photos in display cases flashing if the Pokémon has gender differences.
+- Fixed Bidoof and Jigglypuff sleep animations stopping after some time, causing them to be 'asleep' while T-posing menacingly.
+- Fixed entities not changing poses unless you're looking at them.
+- Fixed cries not playing on send-out if the Pokémon is off-screen.
+- Fixed text row selection highlight in battle log.
+- Fixed top black border rendering in scroll interfaces in summary UI.
+- Fixed aspect tracking for Advancements.
+- Fixed illusion not copying aspects or caught ball.
+- Prevent summary stats tab from making sounds when clicking on an already open tab.
+- Fixed display case not being able to be fed items from underneath.
+- Fixed Pokémon battling in water continuously sinking to the bottom.
+- Fixed passive healing and wake from faint not disabling when their config values are set to 0.
+- Fixed an issue where rebinding the R key to a mouse button prevented players from closing the battle interface using that button.
 
 ### Developer
 - `SpawnCause` is now an implementation of `SpawningInfluence`.
 - Many types related to `Pokemon` including itself now have dedicated `Codec`, please migrate to them from the NBT/JSON/PacketBuffer write/read methods.
-- `TeraTypes` now implements `Iterable`.
 - `PokemonBattle` now starts on turn 0.
-- SpawnCause is now an implementation of SpawningInfluence.
 - Renamed Pokemon.hp to Pokemon.maxHealth to make it clearer. Backwards compatibility is provided but it is an active deprecation, please migrate away from it.
-- Many types related to ``Pokemon`` including itself now have dedicated ``Codec``, please migrate to them from the NBT/JSON/PacketBuffer write/read methods.
 - Serialization of PokemonStores and Pokemon themselves now require registry access, which will break some sidemods. This sucked for us more than it will suck for you! If you have a world or player instance, you can get it from there.
 - ``TeraTypes`` now implements ``Iterable``.
-- PokemonBattle now starts on turn 0.
-- 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.
+- `PokemonEntity.enablePoseTypeRecalculation` can be used to disable automatic pose type recalculation.
+- Added CollectEggEvent and HatchEggEvent for compatibility usage.
+- Added events for:
+  - Showdown Instructions
+  - Mega Showdown Instruction
+  - Terastallize Showdown Instruction
+  - ZPower Showdown Instruction
+  - Bait Consumed, Bait Set, and an event to register custom BaitEffect Functions
+  - Bobber Bucket Chosen
+  - Bobber Spawn Pokémon
+  - Pokérod Cast
+  - Pokérod Reel
+  - Pokémon Heal (with context)
+    - Added HealingSource, an interface applied to all sources of healing from player actions, for easier tracking of healing sources.
+  - Move Change
+  - Shiny Chance Calculation Event (with player context)
+  - Dex Information Changed (Pre and Post); this event is fired when the Pokédex is updated with new information.
+- Rebuilt large swaths of the model animation code to simplify it.
+- Renamed a bunch of things from %Poseable% to %Posable% because spelling.
+- Renamed StatelessAnimation to PoseAnimation.
+- Renamed StatefulAnimation to ActiveAnimation.
+- Documented the animation system.
+- Allowed for SpawnSnowstormEntityParticleHandler to handle non-posable entities (due to being non-posable, locators are useless - to set the offset use the settings in the particle itself).
+- Added property chaining support for duplicate CustomPokemonPropertyType elements.
 
 ### Data Pack & Resource Pack Creators
+- Added experimental `flow` datapack directory for handling events using MoLang event handlers.
 - 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` directory 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` directory 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 directories in `sounds/block`.
+- All sounds related to evolving Pokémon have been moved to the `sounds/evolution` directory.
+- Sound events for all blocks now start with `block`.
+- Gimmighoul chest and item interaction sounds have been moved to where its cry is.
+- Unused sound files and sound events have been removed.
+- Poké Ball sounds are now in their animation files, making them more flexible to edit.
+- Added MoLang compatibility in the isVisible property for transformed parts.
+- Added `q.has_aspect('some_aspect')` function to animations, posers, and entity particle effects.
+- Added support for conditional pose animations.
+- Added a new universal locator called "top".
+- Added `eggs_collected` and `eggs_hatched` Advancement triggers.
+- Added missing `minYaw` configuration to the `q.look()` function for JSON posers.
+- Some pose condition names have been changed: 
+  - `isTouchingWaterOrRain` has been changed to `isInWaterOrRain`
+  - `isSubermegedInWater` has been changed to `isUnderWater`
+
 
 ### 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/
 
 
@@ -211,7 +527,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
@@ -223,19 +539,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.
@@ -253,7 +569,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.
@@ -272,13 +588,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
@@ -578,7 +894,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).
@@ -587,7 +903,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.
@@ -602,7 +918,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.
@@ -616,14 +932,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:
@@ -635,16 +951,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.
@@ -731,7 +1047,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.
@@ -751,7 +1067,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
@@ -777,7 +1093,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)
@@ -1188,7 +1504,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.
@@ -1402,6 +1718,7 @@ Thank you so much to all of our community translators that bring the mod to the
 - Lowered spawn rate of Tauros.
 - Sableye now spawns near gem ores as well as amethyst.
 - Added evolution stones and items to item tags
+- Pokémon now play their cry animations when clicked on the starter selection screen.
 
 ### Fixes
 - Fixed catch rates being entirely too difficult.
@@ -1587,3 +1904,4 @@ 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,11 +13,15 @@ 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
@@ -29,44 +33,32 @@ public class LambDynamicLightsCompat {
     // Make sure not to call anything Fabric specific :)
     public static void hookCompat() {
         // Pokémon entities
-//        DynamicLightHandlers.registerDynamicLightHandler(
-//                CobblemonEntities.POKEMON,
-//                DynamicLightHandler.makeHandler(
-//                        pokemon -> resolvedPokemonLightLevel(pokemon, false),
-//                        pokemon -> true
-//                )
-//        );
-//        DynamicLightHandlers.registerDynamicLightHandler(
-//                CobblemonEntities.POKEMON,
-//                DynamicLightHandler.makeHandler(
-//                        pokemon -> resolvedPokemonLightLevel(pokemon, true),
-//                        pokemon -> false
-//                )
-//        );
+        DynamicLightHandlers.registerDynamicLightHandler(
+                CobblemonEntities.POKEMON,
+                DynamicLightHandler.makeHandler(
+                        LambDynamicLightsCompat::resolvedPokemonLightLevel,
+                        pokemon -> false
+                )
+        );
 
         // Shouldered Pokémon
-//        DynamicLightHandlers.registerDynamicLightHandler(
-//                EntityType.PLAYER,
-//                DynamicLightHandler.makeHandler(
-//                        player -> resolvedShoulderLightLevel(player, false),
-//                        player -> true
-//                )
-//        );
-//        DynamicLightHandlers.registerDynamicLightHandler(
-//                EntityType.PLAYER,
-//                DynamicLightHandler.makeHandler(
-//                        player -> resolvedShoulderLightLevel(player, true),
-//                        player -> false
-//                )
-//        );
+        DynamicLightHandlers.registerDynamicLightHandler(
+                EntityType.PLAYER,
+                DynamicLightHandler.makeHandler(
+                        LambDynamicLightsCompat::resolvedShoulderLightLevel,
+                        player -> false
+                )
+        );
     }
 
-    private static int resolvedPokemonLightLevel(PokemonEntity pokemon, boolean underwater) {
+    private static int resolvedPokemonLightLevel(PokemonEntity pokemon) {
+        var underwater = !pokemon.level().getFluidState(BlockPos.containing(pokemon.getX(), pokemon.getEyeY(), pokemon.getZ())).isEmpty();
         return extractFormLightLevel(pokemon.getForm(), underwater).orElse(0);
     }
 
-    private static int resolvedShoulderLightLevel(Player player, boolean underwater) {
+    private static int resolvedShoulderLightLevel(Player player) {
         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/ChunkStorageMixin.java

@@ -45,21 +45,4 @@ public class ChunkStorageMixin {
         int curVersion = vanillaFixed.contains(VERSION_KEY) ? vanillaFixed.getInt(VERSION_KEY) : 0;
         return DataFixTypes.CHUNK.update(CobblemonSchemas.getDATA_FIXER(), vanillaFixed, curVersion, CobblemonSchemas.DATA_VERSION);
     }
-
-    @Inject(
-        method = "upgradeChunkTag(Lnet/minecraft/resources/ResourceKey;Ljava/util/function/Supplier;Lnet/minecraft/nbt/CompoundTag;Ljava/util/Optional;)Lnet/minecraft/nbt/CompoundTag;",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/nbt/NbtUtils;addCurrentDataVersion(Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;"
-        )
-    )
-    public void cobblemon$addChunkVersion(
-        ResourceKey<Level> resourceKey,
-        Supplier<DimensionDataStorage> supplier,
-        CompoundTag compoundTag,
-        Optional<ResourceKey<MapCodec<? extends ChunkGenerator>>> optional,
-        CallbackInfoReturnable<CompoundTag> cir
-    ) {
-        compoundTag.put(VERSION_KEY, IntTag.valueOf(CobblemonSchemas.DATA_VERSION));
-    }
 }

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.renderer.item.ItemProperties;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ItemProperties.class)
+public class ItemPropertiesMixin {
+
+    // Mixins into the fishing rod's register() lambda expression
+    // Without this, the fishing rod item model appears cast when using a PokeRod in the other hand
+    @Inject(method = "method_27883", at = @At(value = "RETURN", ordinal = 1), cancellable = true)
+    private static void cobblemon$preventRodMixup(ItemStack itemStack, ClientLevel clientLevel, LivingEntity livingEntity, int i, CallbackInfoReturnable<Float> cir) {
+        if (!(livingEntity instanceof Player) || ((Player) livingEntity).fishing instanceof PokeRodFishingBobberEntity) {
+            cir.setReturnValue(0.0f);
+        }
+    }
+}

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

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.ModAPI;
-import com.cobblemon.mod.common.client.CobblemonBakingOverrides;
 import com.cobblemon.mod.common.item.PokeBallItem;
 import com.cobblemon.mod.common.item.PokedexItem;
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -20,7 +19,9 @@ import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
@@ -52,25 +53,33 @@ public abstract class ItemRendererMixin {
     )
     private void cobblemon$overrideItemModel(ItemStack stack, ItemDisplayContext renderMode, boolean leftHanded, PoseStack matrices, MultiBufferSource multiBufferSource, int light, int overlay, BakedModel model, CallbackInfo ci) {
         boolean shouldBe2d = renderMode == ItemDisplayContext.GUI || renderMode == ItemDisplayContext.FIXED;
-        if (!shouldBe2d && stack.getItem() instanceof PokedexItem) {
-            BakedModel replacementModel = CobblemonBakingOverrides.INSTANCE.getPokedexOverride(((PokedexItem) stack.getItem()).getType()).getModel();
-            if (!cobblemon$isSameModel(model, replacementModel)) {
-                ci.cancel();
-                render(stack, renderMode, leftHanded, matrices, multiBufferSource, light, overlay, replacementModel);
-            }
-        } else if (shouldBe2d && stack.getItem() instanceof PokeBallItem pokeBallItem) {
-            BakedModel replacementModel = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(pokeBallItem.getPokeBall().getModel2d(), "inventory"));
-            if (!cobblemon$isSameModel(model, replacementModel)) {
-                ci.cancel();
-                render(stack, renderMode, leftHanded, matrices, multiBufferSource, light, overlay, replacementModel);
+        if (shouldBe2d) {
+            ResourceLocation resourceLocation = null;
+            if (stack.getItem() instanceof PokeBallItem pokeBallItem) resourceLocation = pokeBallItem.getPokeBall().getModel2d();
+            else if (stack.getItem() instanceof PokedexItem pokedexItem) resourceLocation = pokedexItem.getType().getItemSpritePath();
+
+            if (resourceLocation != null) {
+                BakedModel replacementModel = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, "inventory"));
+                if (!cobblemon$isSameModel(model, replacementModel)) {
+                    ci.cancel();
+                    render(stack, renderMode, leftHanded, matrices, multiBufferSource, light, overlay, replacementModel);
+                }
             }
         }
     }
 
     @Inject(method = "getModel", at = @At("HEAD"), cancellable = true)
-    private void cobblemon$bakePokeballModel(ItemStack stack, Level world, LivingEntity entity, int seed, CallbackInfoReturnable<BakedModel> cir) {
-        if (stack.getItem() instanceof PokeBallItem pokeBallItem) {
-            BakedModel model = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(pokeBallItem.getPokeBall().getModel3d(), MODEL_PATH));
+    private void cobblemon$getItemModel(ItemStack stack, Level world, LivingEntity entity, int seed, CallbackInfoReturnable<BakedModel> cir) {
+        ResourceLocation resourceLocation = null;
+        if (stack.getItem() instanceof PokeBallItem pokeBallItem) resourceLocation = pokeBallItem.getPokeBall().getModel3d();
+        else if (stack.getItem() instanceof PokedexItem pokedexItem) {
+            boolean isScanModel = entity instanceof Player && entity.getUseItem() == stack && entity.isUsingItem();
+            boolean canOpenScreen = entity != null && ((entity.getOffhandItem() == stack && !(entity.getMainHandItem().getItem() instanceof PokedexItem)) || entity.getMainHandItem() == stack);
+            resourceLocation = pokedexItem.getType().getItemModelPath(isScanModel ? "scanning" : (canOpenScreen ? null : "off"));
+        }
+
+        if (resourceLocation != null) {
+            BakedModel model = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, MODEL_PATH));
             ClientLevel clientWorld = world instanceof ClientLevel ? (ClientLevel) world : null;
             BakedModel overriddenModel = model.getOverrides().resolve(model, stack, clientWorld, entity, seed);
             cir.setReturnValue(overriddenModel == null ? this.itemModelShaper.getModelManager().getMissingModel() : overriddenModel);

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

@@ -52,10 +52,11 @@ public abstract class LecternBlockMixin {
 
                 if (lecternEntity instanceof LecternBlockEntity) {
                     ((LecternBlockEntity) lecternEntity).setItemStack((pokedexItemStack));
+                    world.playSound(null, blockPos, CobblemonSounds.POKEDEX_CLOSE, SoundSource.BLOCKS, 0.5F, 1.25F);
+                    cir.setReturnValue(ItemInteractionResult.SUCCESS);
+                } else {
+                    cir.setReturnValue(itemStack.isEmpty() && interactionHand == InteractionHand.MAIN_HAND ? ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION : ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION);
                 }
-
-                world.playSound(null, blockPos, CobblemonSounds.POKEDEX_CLOSE, SoundSource.BLOCKS, 0.5F, 1.25F);
-                cir.setReturnValue(itemStack.isEmpty() && interactionHand == InteractionHand.MAIN_HAND ? ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION : ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION);
             }
         }
     }

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

@@ -22,7 +22,7 @@ public abstract class MinecraftDedicatedServerMixin implements ServerInterface {
 
     @Inject(method = "shouldDiscardEntity", at = @At(value = "HEAD"), cancellable = true)
     public void cobblemon$allowPokemonSpawns(Entity entity, CallbackInfoReturnable<Boolean> callback) {
-        if(entity instanceof PokemonEntity) {
+        if (entity instanceof PokemonEntity) {
             callback.setReturnValue(false);
         }
     }

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

@@ -10,11 +10,14 @@ 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;
@@ -24,12 +27,20 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(MouseHandler.class)
-public class PartyScrollMixin {
+public class MouseHandlerMixin {
     @Shadow
     private double accumulatedScrollY;
 
     @Shadow @Final private Minecraft minecraft;
 
+    @Shadow @Final private SmoothDouble smoothTurnY;
+
+    @Shadow @Final private SmoothDouble smoothTurnX;
+
+    @Shadow private double accumulatedDX;
+
+    @Shadow private double accumulatedDY;
+
     @Inject(
             method = "onScroll",
             at = @At(
@@ -74,4 +85,27 @@ public class PartyScrollMixin {
         }
     }
 
-}
+    @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/NbtUtilsMixin.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import static com.cobblemon.mod.common.datafixer.CobblemonSchemas.VERSION_KEY;
+
+import com.cobblemon.mod.common.datafixer.CobblemonSchemas;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtUtils;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(NbtUtils.class)
+public class NbtUtilsMixin {
+    @Inject(
+        method = "addCurrentDataVersion(Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;",
+        at = @At("TAIL")
+    )
+    private static void addCobblemonDataVersion(
+        CompoundTag tag,
+        CallbackInfoReturnable<CompoundTag> cir
+    ) {
+        tag.putInt(VERSION_KEY, CobblemonSchemas.DATA_VERSION);
+    }
+}

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

@@ -12,15 +12,23 @@ 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.storage.NoPokemonStoreException;
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies;
 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;
@@ -30,19 +38,24 @@ 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 {
+public abstract class PlayerMixin extends LivingEntity implements ScannableEntity {
 
     @Shadow public abstract CompoundTag getShoulderEntityLeft();
 
@@ -68,16 +81,16 @@ public abstract class PlayerMixin extends LivingEntity {
     @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 = this.getPokemonID(nbt);
-            if (this.isShoulderPokemon(this.getShoulderEntityRight())) {
-                final UUID uuidRight = this.getPokemonID(this.getShoulderEntityRight());
+            final UUID uuid = CompoundTagUtilities.getPokemonID(nbt);
+            if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())) {
+                final UUID uuidRight = CompoundTagUtilities.getPokemonID(this.getShoulderEntityRight());
                 if (uuid.equals(uuidRight)) {
                     this.recallPokemon(uuidRight);
                     this.setShoulderEntityRight(new CompoundTag());
                 }
             }
-            if (this.isShoulderPokemon(this.getShoulderEntityLeft())) {
-                final UUID uuidLeft = this.getPokemonID(this.getShoulderEntityLeft());
+            if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())) {
+                final UUID uuidLeft = CompoundTagUtilities.getPokemonID(this.getShoulderEntityLeft());
                 if (uuid.equals(uuidLeft)) {
                     this.recallPokemon(uuidLeft);
                     this.setShoulderEntityLeft(new CompoundTag());
@@ -101,22 +114,17 @@ public abstract class PlayerMixin extends LivingEntity {
         // We want to allow both of these to forcefully remove the entities
         if (this.isSpectator() || this.isDeadOrDying())
             return;
-        if (!this.isShoulderPokemon(this.getShoulderEntityLeft())) {
+        if (!CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())) {
             this.respawnEntityOnShoulder(this.getShoulderEntityLeft());
             this.setShoulderEntityLeft(new CompoundTag());
         }
-        if (!this.isShoulderPokemon(this.getShoulderEntityRight())) {
+        if (!CompoundTagUtilities.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());
@@ -127,10 +135,6 @@ public abstract class PlayerMixin extends LivingEntity {
         }
     }
 
-    private boolean isShoulderPokemon(CompoundTag nbt) {
-        return CompoundTagExtensionsKt.isPokemonEntity(nbt);
-    }
-
     @Inject(
         method = "eat",
         at = @At(
@@ -171,4 +175,49 @@ public abstract class PlayerMixin extends LivingEntity {
             }
         }
     }
+
+    @Override @Nullable
+    public PokedexEntityData resolvePokemonScan() {
+        if(CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())){
+            return getDataFromShoulderPokemon(this.getShoulderEntityRight());
+        }
+        if(CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())){
+            return getDataFromShoulderPokemon(this.getShoulderEntityLeft());
+        }
+        return null;
+    }
+
+    @Nullable @Unique
+    private PokedexEntityData getDataFromShoulderPokemon(CompoundTag shoulderTag) {
+        CompoundTag pokemonTag = shoulderTag.getCompound(DataKeys.POKEMON);
+        if(pokemonTag.isEmpty()) return null;
+        Species species = PokemonSpecies.INSTANCE.getByIdentifier(ResourceLocation.parse(pokemonTag.getString(DataKeys.POKEMON_SPECIES_IDENTIFIER)));
+        if(species == null) return null;
+        String formId = pokemonTag.getString(DataKeys.POKEMON_FORM_ID);
+        FormData form = species.getStandardForm();
+        List<FormData> formList = species.getForms().stream().filter(it -> it.formOnlyShowdownId().equals(formId)).toList();
+        if(!formList.isEmpty()) form = formList.getFirst();
+        if(form == null) return null;
+        String genderString = pokemonTag.getString(DataKeys.POKEMON_GENDER);
+        if(genderString.isEmpty()) return null;
+        Gender gender = Gender.valueOf(genderString);
+        boolean shiny = pokemonTag.getBoolean(DataKeys.POKEMON_SHINY);
+        int level = pokemonTag.getInt(DataKeys.POKEMON_LEVEL);
+        Set<String> aspects = shoulderTag.getList(DataKeys.SHOULDER_ASPECTS, Tag.TAG_STRING).stream().map(Tag::getAsString).collect(Collectors.toSet());
+
+        return new PokedexEntityData(
+                species,
+                form,
+                gender,
+                aspects,
+                shiny,
+                level,
+                this.getUUID()
+        );
+    }
+
+    @Override
+    public LivingEntity resolveEntityScan() {
+        return this;
+    }
 }

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

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

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

@@ -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.mixin.client;
-
-import com.cobblemon.mod.common.client.CobblemonClient;
-import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiGraphics;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-/**
- * Mixin to give us a hook to render the PartyOverlay below the Chat
- *
- * @author Qu
- * @since 2022-02-22
- */
-@Mixin(Gui.class)
-public class GuiMixin {
-    //This injects into the actual BooleanSupplier lambda for the "this.layers.add(layeredDraw, () -> !minecraft.options.hideGui)" call
-    // sus af. You have to get the method name by looking at the bytecode of the class. Can do in intellij By clicking View -> Show Bytecode (top left)
-    @Inject(method = "method_55797", at = @At("HEAD"), cancellable = true)
-    private static void cobblemon$dontRenderUiInPokedex(Minecraft minecraft, CallbackInfoReturnable<Boolean> cir) {
-        if (CobblemonClient.INSTANCE.getPokedexUsageContext().getScanningGuiOpen() && minecraft.options.getCameraType().isFirstPerson()) {
-            cir.setReturnValue(false);
-        }
-    }
-}

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

@@ -9,6 +9,8 @@
 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;
@@ -26,7 +28,7 @@ public abstract class AdornRegisterInvoker {
     private static List<BlockVariantSet> variantSets;
 
     @Inject(method = "register()V", at = @At("HEAD"), remap = false)
-    void register(CallbackInfo ci) {
-//        variantSets.add(AdornCompatibility.INSTANCE);
+    private static void register(CallbackInfo ci) {
+        variantSets.add(new AdornCompatibility());
     }
 }

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

@@ -17,6 +17,7 @@ import com.cobblemon.mod.common.api.drop.DropEntry
 import com.cobblemon.mod.common.api.drop.ItemDropEntry
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.CobblemonEvents.DATA_SYNCHRONIZED
+import com.cobblemon.mod.common.api.interaction.RequestManager
 import com.cobblemon.mod.common.api.permission.PermissionValidator
 import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalculator
 import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalculators
@@ -43,6 +44,7 @@ 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
@@ -52,8 +54,10 @@ 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.DexDataMongoBackend
 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.adapter.PlayerDataMongoBackend
 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
@@ -64,22 +68,14 @@ import com.cobblemon.mod.common.battles.BattleSide
 import com.cobblemon.mod.common.battles.ShowdownThread
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
-import com.cobblemon.mod.common.command.argument.DexArgumentType
-import com.cobblemon.mod.common.command.argument.DialogueArgumentType
-import com.cobblemon.mod.common.command.argument.FormArgumentType
-import com.cobblemon.mod.common.command.argument.MoveArgumentType
-import com.cobblemon.mod.common.command.argument.NPCClassArgumentType
-import com.cobblemon.mod.common.command.argument.PartySlotArgumentType
-import com.cobblemon.mod.common.command.argument.PokemonPropertiesArgumentType
-import com.cobblemon.mod.common.command.argument.PokemonStoreArgumentType
-import com.cobblemon.mod.common.command.argument.SpawnBucketArgumentType
-import com.cobblemon.mod.common.command.argument.SpeciesArgumentType
+import com.cobblemon.mod.common.command.argument.*
 import com.cobblemon.mod.common.config.CobblemonConfig
 import com.cobblemon.mod.common.config.LastChangedVersion
 import com.cobblemon.mod.common.config.constraint.IntConstraint
 import com.cobblemon.mod.common.config.starter.StarterConfig
 import com.cobblemon.mod.common.data.CobblemonDataProvider
 import com.cobblemon.mod.common.events.AdvancementHandler
+import com.cobblemon.mod.common.events.FlowHandler
 import com.cobblemon.mod.common.events.PokedexHandler
 import com.cobblemon.mod.common.events.ServerTickHandler
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
@@ -92,6 +88,7 @@ import com.cobblemon.mod.common.pokemon.evolution.variants.BlockClickEvolution
 import com.cobblemon.mod.common.pokemon.feature.TagSeasonResolver
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.pokemon.properties.AspectPropertyType
+import com.cobblemon.mod.common.pokemon.properties.BattleCloneProperty
 import com.cobblemon.mod.common.pokemon.properties.FreezeFrameProperty
 import com.cobblemon.mod.common.pokemon.properties.HiddenAbilityPropertyType
 import com.cobblemon.mod.common.pokemon.properties.NoAIProperty
@@ -100,17 +97,24 @@ import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
 import com.cobblemon.mod.common.pokemon.properties.tags.PokemonFlagProperty
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
-import com.cobblemon.mod.common.trade.TradeManager
-import com.cobblemon.mod.common.util.*
+import com.cobblemon.mod.common.util.DataKeys
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.ifDedicatedServer
+import com.cobblemon.mod.common.util.isLaterVersion
+import com.cobblemon.mod.common.util.party
+import com.cobblemon.mod.common.util.server
 import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
 import com.cobblemon.mod.common.world.feature.ore.CobblemonOrePlacedFeatures
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
+import com.mongodb.ConnectionString
+import com.mongodb.MongoClientSettings
 import com.mongodb.client.MongoClient
+import com.mongodb.client.MongoClients
 import java.io.File
 import java.io.FileReader
 import java.io.FileWriter
 import java.io.PrintWriter
-import java.util.*
+import java.util.UUID
 import kotlin.math.roundToInt
 import kotlin.properties.Delegates
 import kotlin.reflect.full.memberProperties
@@ -209,7 +213,7 @@ object Cobblemon {
             BattleRegistry.onPlayerDisconnect(it.player)
             storage.onPlayerDisconnect(it.player)
             playerDataManager.onPlayerDisconnect(it.player)
-            TradeManager.onLogoff(it.player)
+            RequestManager.onLogoff(it.player)
         }
         PlatformEvents.PLAYER_DEATH.subscribe {
             PCLinkManager.removeLink(it.player.uuid)
@@ -273,6 +277,7 @@ 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)
@@ -280,6 +285,10 @@ object Cobblemon {
         CustomPokemonProperty.register(FreezeFrameProperty)
         CustomPokemonProperty.register(NoAIProperty)
 
+        CobblemonEvents.POKEMON_PROPERTY_INITIALISED.emit(Unit)
+
+        FlowHandler.setup()
+
         ifDedicatedServer {
             isDedicatedServer = true
         }
@@ -320,9 +329,7 @@ object Cobblemon {
                     }
                 }
 
-                /*
                 "mongodb" -> {
-                    /*
                     try {
                         Class.forName("com.mongodb.client.MongoClient")
 
@@ -330,18 +337,22 @@ object Cobblemon {
                             .applyConnectionString(ConnectionString(config.mongoDBConnectionString))
                             .build()
                         mongoClient = MongoClients.create(mongoClientSettings)
-                        val mongoFactory = MongoPlayerDataStoreFactory(mongoClient, config.mongoDBDatabaseName)
-                        playerData.setFactory(mongoFactory, PlayerInstancedDataStoreType.GENERAL)
+                        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)
                         MongoDBStoreAdapter(mongoClient, config.mongoDBDatabaseName)
                     } catch (e: ClassNotFoundException) {
                         LOGGER.error("MongoDB driver not found.")
                         throw e
                     }
 
-                     */
                 }
 
-                 */
 
                 else -> throw IllegalArgumentException("Unsupported storageFormat: ${config.storageFormat}")
             }
@@ -373,11 +384,19 @@ object Cobblemon {
                 BattleFormat.GEN_9_SINGLES,
                 BattleSide(PokemonBattleActor(UUID.randomUUID(), BattlePokemon(Pokemon().initialize()), -1F)),
                 BattleSide(PokemonBattleActor(UUID.randomUUID(), BattlePokemon(Pokemon().initialize()), -1F)),
-                true
-            ).ifSuccessful { it.mute = true }
+                false
+            ).ifSuccessful {
+                it.mute = true
+            }.ifErrored {
+                val errors = it.errors.joinToString("\n") { it.javaClass.name }
+                LOGGER.error("Failed to start dummy Showdown battle: $errors")
+            }
         }
 
         registerEventHandlers()
+
+        CobblemonEvents.COBBLEMON_INITIALISED.emit(Unit)
+
     }
 
     fun registerEventHandlers() {

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

@@ -12,10 +12,9 @@ import net.minecraft.world.entity.schedule.Activity
 
 object CobblemonActivities {
     val activities = mutableListOf<Activity>()
-    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")
+    val BATTLING = register(Activity("battling"))
+    val ACTION_EFFECT = register(Activity("action_effect"))
+    val NPC_CHATTING = register(Activity("npc_chatting"))
 
     fun register(activity: Activity): Activity {
         activities.add(activity)

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

@@ -38,8 +38,6 @@ 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
 
@@ -117,16 +115,23 @@ 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 // 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_BUTTON = this.create("apricorn_button", BlocksInvoker.createWoodenButtonBlock(APRICORN_BLOCK_SET_TYPE))
     @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
     val APRICORN_SIGN = this.create("apricorn_sign", CobblemonSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SIGN), APRICORN_WOOD_TYPE))
+
+    @JvmField //if you wonder why we don't copy of OAK_WALL_SIGN, then I can tell you its because it uses Properties#dropsLike to point to the SIGN loot table, but we cant use that in our setup due to a deeper rooted issue, so falling back to this and writing dedicated (duplicated) loot tables
+    val APRICORN_WALL_SIGN = this.create(
+        "apricorn_wall_sign",
+        CobblemonWallSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SIGN), APRICORN_WOOD_TYPE)
+    )
     @JvmField
-    val APRICORN_WALL_SIGN = this.create("apricorn_wall_sign", CobblemonWallSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_WALL_SIGN), APRICORN_WOOD_TYPE))
-    @JvmField
-    val APRICORN_HANGING_SIGN = this.create("apricorn_hanging_sign", CobblemonHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN), APRICORN_WOOD_TYPE))
+    val APRICORN_HANGING_SIGN = this.create(
+        "apricorn_hanging_sign",
+        CobblemonHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_HANGING_SIGN), APRICORN_WOOD_TYPE)
+    )
     @JvmField
     val APRICORN_WALL_HANGING_SIGN = this.create("apricorn_wall_hanging_sign", CobblemonWallHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_HANGING_SIGN), APRICORN_WOOD_TYPE))
     @JvmField
@@ -191,453 +196,113 @@ 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)
-    ))
-@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 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 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)
-        )
-    )
+    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 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 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)))
     @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)
-    ))
-@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 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 CHISELED_POLISHED_SKY_TUMBLESTONE = this.create("chiseled_polished_sky_tumblestone",
-        Block(
-            BlockBehaviour.Properties.of()
-                .mapColor(MapColor.COLOR_LIGHT_BLUE)
-                .strength(1.0F)
-                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-                .requiresCorrectToolForDrops()
-                .instrument(NoteBlockInstrument.BASEDRUM)
-        )
-    )
+    val 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 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 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)))
     @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)
-    ))
- @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 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 CHISELED_POLISHED_BLACK_TUMBLESTONE = this.create("chiseled_polished_black_tumblestone",
-        Block(
-            BlockBehaviour.Properties.of()
-                .mapColor(MapColor.TERRACOTTA_BLACK)
-                .strength(1.0F)
-                .sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-                .requiresCorrectToolForDrops()
-                .instrument(NoteBlockInstrument.BASEDRUM)
-        )
-    )
-
+    val 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 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 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)))
     @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 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 FIRE_STONE_BLOCK = this.create("fire_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.FIRE).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT).lightLevel{13}))
     @JvmField
-    val 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)
-        )
-    )
+    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 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 THUNDER_STONE_BLOCK = this.create("thunder_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.GLOW_LICHEN).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT).lightLevel{8}))
     @JvmField
-    val 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 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 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)
-        )
-    )
+    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 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 SUN_STONE_BLOCK = this.create("sun_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT).lightLevel{5}))
     @JvmField
-    val 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)
-        )
-    )
+    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 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)
-        )
-    )
+    val SHINY_STONE_BLOCK = this.create("shiny_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.QUARTZ).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT).lightLevel{15}))
     @JvmField
-    val 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 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)))
 
     @JvmField
     val BLACK_APRICORN = apricornBlock("black_apricorn", Apricorn.BLACK)
@@ -655,188 +320,48 @@ 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
-        )
-    )
+    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))
 
     @JvmField
-    val BLUE_GILDED_CHEST = create(
-        "blue_gilded_chest",
-        GildedChestBlock(
-            BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS),
-            GildedChestBlock.Type.BLUE
-        )
-    )
+    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 BLACK_GILDED_CHEST = create(
-        "black_gilded_chest",
-        GildedChestBlock(
-            BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS),
-            GildedChestBlock.Type.BLACK
-        )
-    )
+    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 YELLOW_GILDED_CHEST = create(
-        "yellow_gilded_chest",
-        GildedChestBlock(
-            BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS),
-            GildedChestBlock.Type.YELLOW
-        )
-    )
+    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 WHITE_GILDED_CHEST = create(
-        "white_gilded_chest",
-        GildedChestBlock(
-            BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS),
-            GildedChestBlock.Type.WHITE
-        )
-    )
+    val LECTERN = create("lectern", LecternBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).sound(SoundType.WOOD).strength(2.5F).ignitedByLava()))
 
     @JvmField
-    val GREEN_GILDED_CHEST = create(
-        "green_gilded_chest",
-        GildedChestBlock(
-            BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS),
-            GildedChestBlock.Type.GREEN
-        )
-    )
+    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)))
 
     @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
-        )
-    )
-
-    @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 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 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
@@ -850,20 +375,6 @@ 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

@@ -0,0 +1,58 @@
+/*
+ * 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,6 +20,7 @@ object CobblemonCommands {
         SpawnNPCCommand.register(dispatcher)
         GivePokemon.register(dispatcher)
         TakePokemon.register(dispatcher)
+        ChangeEyeHeight.register(dispatcher)
         ChangeScaleAndSize.register(dispatcher)
         ChangeWalkSpeed.register(dispatcher)
         TestCommand.register(dispatcher)
@@ -51,9 +52,11 @@ object CobblemonCommands {
         BedrockParticleCommand.register(dispatcher)
         OpenDialogueCommand.register(dispatcher)
         NPCEditCommand.register(dispatcher)
+        NPCDeleteCommand.register(dispatcher)
         AbandonMultiTeam.register(dispatcher)
         FreezePokemonCommand.register(dispatcher)
         ApplyPlayerTextureCommand.register(dispatcher)
+        RunMolangScriptCommand.register(dispatcher)
 
         // Possibly lock down registration if and only if under dev environment or running in an environment
         // with a certain system environment variable set

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

@@ -0,0 +1,103 @@
+/*
+ * 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.runtime.MoLangRuntime
+import com.bedrockk.molang.runtime.value.MoValue
+import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
+import com.cobblemon.mod.common.api.data.DataRegistry
+import com.cobblemon.mod.common.api.events.Cancelable
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
+import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.api.scripting.CobblemonScripts
+import com.cobblemon.mod.common.net.messages.client.data.FlowRegistrySyncPacket
+import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.endsWith
+import java.util.concurrent.ExecutionException
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.server.packs.PackType
+import net.minecraft.server.packs.resources.ResourceManager
+
+/**
+ * Holds all the flows that are loaded from the server's data packs. A flow is foldered under the event identifier,
+ * which can be Cobblemon's namespace but can also be minecraft or any other namespace someone has added hooks for.
+ * The value of the map is a list of MoLang scripts that will execute when that event occurs.
+ *
+ * @author Hiroku
+ * @since February 24th, 2024
+ */
+object CobblemonFlows : DataRegistry {
+    override val id = cobblemonResource("flows")
+    override val observable = SimpleObservable<CobblemonFlows>()
+    override val type = PackType.SERVER_DATA
+    override fun sync(player: ServerPlayer) {
+        player.sendPacket(FlowRegistrySyncPacket(clientFlows.entries))
+    }
+
+    val runtime by lazy { MoLangRuntime().setup() } // Lazy for if someone adds to generalFunctions in MoLangFunctions
+
+    val clientFlows = hashMapOf<ResourceLocation, MutableList<ExpressionLike>>()
+    val flows = hashMapOf<ResourceLocation, MutableList<ExpressionLike>>()
+
+    override fun reload(manager: ResourceManager) {
+        clientFlows.clear()
+        flows.clear()
+
+        val unsortedFlows = mutableMapOf<ResourceLocation, MutableList<Pair<String, ExpressionLike>>>()
+        val folderBeforeNameRegex = ".*\\/([^\\/]+)\\/[^\\/]+\$".toRegex()
+        manager.listResources("flows") { path -> path.endsWith(CobblemonScripts.MOLANG_EXTENSION) }.forEach { (identifier, resource) ->
+            resource.openAsReader().use { stream ->
+                stream.buffered().use { reader ->
+                    try {
+                        val expression = reader.readText().asExpressionLike()
+
+                        val event = folderBeforeNameRegex.find(identifier.path)?.groupValues?.get(1)
+                            ?: throw IllegalArgumentException("Invalid flow path: $identifier. Should have a folder structure that includes the name of the event being flowed.")
+
+                        val flowKey = ResourceLocation.fromNamespaceAndPath(identifier.namespace, event)
+                        unsortedFlows.putIfAbsent(flowKey, mutableListOf())
+                        unsortedFlows[flowKey]!!.add(identifier.path to expression)
+                    } catch (exception: Exception) {
+                        throw ExecutionException("Error loading MoLang script for flow: $identifier", exception)
+                    }
+                }
+            }
+        }
+
+        unsortedFlows.forEach { (key, value) ->
+            value.sortBy { it.first }
+            if (key.path.startsWith("flows/client/")) {
+                clientFlows.getOrPut(key) { mutableListOf() }.addAll(value.map { it.second })
+            } else {
+                flows.getOrPut(key) { mutableListOf() }.addAll(value.map { it.second })
+            }
+        }
+
+        Cobblemon.LOGGER.info("Loaded ${flows.size} flows and ${clientFlows.size} client flows")
+        observable.emit(this)
+    }
+
+    fun run(eventResourceLocation: ResourceLocation, context: Map<String, MoValue>, cancelable: Cancelable? = null) {
+        if (cancelable == null) {
+            runtime.environment.query.functions.remove("cancel")
+        } else {
+            runtime.environment.query.addFunction("cancel") { cancelable }
+        }
+
+        flows[eventResourceLocation]?.forEach {
+            if (cancelable != null && cancelable.isCanceled) {
+                return
+            }
+            it.resolve(runtime, context)
+        }
+    }
+}

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

@@ -8,25 +8,22 @@
 
 package com.cobblemon.mod.common
 
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.mojang.brigadier.arguments.ArgumentType
+import kotlin.reflect.KClass
 import net.minecraft.commands.synchronization.ArgumentTypeInfo
-import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.MinecraftServer
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.server.packs.resources.PreparableReloadListener
-import net.minecraft.server.packs.resources.ResourceManager
 import net.minecraft.tags.TagKey
 import net.minecraft.world.level.GameRules
 import net.minecraft.world.level.ItemLike
 import net.minecraft.world.level.biome.Biome
 import net.minecraft.world.level.levelgen.GenerationStep
 import net.minecraft.world.level.levelgen.placement.PlacedFeature
-import kotlin.reflect.KClass
 
 interface CobblemonImplementation {
     val modAPI: ModAPI
@@ -171,14 +168,6 @@ interface CobblemonImplementation {
      */
     fun server(): MinecraftServer?
 
-    /**
-     * Handles platform independent reloading of a [JsonDataRegistry].
-     *
-     * @param registry The [JsonDataRegistry] to reload.
-     * @param manager The [ResourceManager] to reload from.
-     */
-    fun <T> reloadJsonRegistry(registry: JsonDataRegistry<T>, manager: ResourceManager): HashMap<ResourceLocation, T>
-
     /**
      * Registers an item to the [ComposterBlock].
      *
@@ -186,16 +175,6 @@ interface CobblemonImplementation {
      * @param chance The chance % of increasing the composter level, 0 to 1 expected.
      */
     fun registerCompostable(item: ItemLike, chance: Float)
-
-    /**
-     * Registers a builtin resource pack.
-     *
-     * @param id The unique [ResourceLocation] of this pack.
-     * @param title The title displayed in the resource pack GUI, the description is still a part of the pack metadata.
-     * @param activationBehaviour The [ResourcePackActivationBehaviour] for this pack.
-     */
-    fun registerBuiltinResourcePack(id: ResourceLocation, title: Component, activationBehaviour: ResourcePackActivationBehaviour)
-
 }
 
 enum class ResourcePackActivationBehaviour {

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

@@ -19,7 +19,7 @@ import com.cobblemon.mod.common.api.text.gray
 import com.cobblemon.mod.common.block.BerryBlock
 import com.cobblemon.mod.common.block.MintBlock
 import com.cobblemon.mod.common.block.MintBlock.MintType
-import com.cobblemon.mod.common.client.pokedex.PokedexTypes
+import com.cobblemon.mod.common.client.pokedex.PokedexType
 import com.cobblemon.mod.common.entity.boat.CobblemonBoatType
 import com.cobblemon.mod.common.item.*
 import com.cobblemon.mod.common.item.armor.CobblemonArmorTrims
@@ -54,6 +54,9 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     override val registry: Registry<Item> = BuiltInRegistries.ITEM
     override val resourceKey: ResourceKey<Registry<Item>> = Registries.ITEM
 
+    @JvmField
+    val NPC_EDITOR = create("npc_editor", CobblemonItem(Item.Properties().stacksTo(1)))
+
     @JvmField
     val pokeBalls = mutableListOf<PokeBallItem>()
     @JvmField
@@ -153,20 +156,21 @@ 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 = create("pokedex_black", PokedexItem(PokedexTypes.BLACK))
+    val POKEDEX_RED = pokedexItem(PokedexType.RED)
     @JvmField
-    val POKEDEX_BLUE = create("pokedex_blue", PokedexItem(PokedexTypes.BLUE))
+    val POKEDEX_YELLOW = pokedexItem(PokedexType.YELLOW)
     @JvmField
-    val POKEDEX_GREEN = create("pokedex_green", PokedexItem(PokedexTypes.GREEN))
+    val POKEDEX_GREEN = pokedexItem(PokedexType.GREEN)
     @JvmField
-    val POKEDEX_PINK = create("pokedex_pink", PokedexItem(PokedexTypes.PINK))
+    val POKEDEX_BLUE = pokedexItem(PokedexType.BLUE)
     @JvmField
-    val POKEDEX_RED = create("pokedex_red", PokedexItem(PokedexTypes.RED))
+    val POKEDEX_PINK = pokedexItem(PokedexType.PINK)
     @JvmField
-    val POKEDEX_WHITE = create("pokedex_white", PokedexItem(PokedexTypes.WHITE))
+    val POKEDEX_BLACK = pokedexItem(PokedexType.BLACK)
     @JvmField
-    val POKEDEX_YELLOW = create("pokedex_yellow", PokedexItem(PokedexTypes.YELLOW))
+    val POKEDEX_WHITE = pokedexItem(PokedexType.WHITE)
 
     @JvmField
     val VIVICHOKE = compostableItem("vivichoke")
@@ -1241,12 +1245,18 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     private fun candyItem(name: String, calculator: CandyItem.Calculator): CandyItem  = this.create(name, CandyItem(calculator))
 
     private fun pokerodItem(pokeRodId: ResourceLocation): PokerodItem {
-        val settings = Item.Properties().stacksTo(1).durability(Items.FISHING_ROD.components().get(DataComponents.MAX_DAMAGE)!!)
+        val settings = Item.Properties().stacksTo(1).durability(256)
         val item = create(pokeRodId.path, PokerodItem(pokeRodId, settings))
         pokeRods.add(item)
         return item
     }
 
+    private fun pokedexItem(type: PokedexType): PokedexItem {
+        val item = create("pokedex_${type.name.lowercase()}", PokedexItem(type))
+        pokedexes.add(item)
+        return item
+    }
+
     private fun heldItem(name: String, remappedName: String? = null): CobblemonItem = create(
         name,
         CobblemonItem(Item.Properties()).also {

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

@@ -51,15 +51,10 @@ 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.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.client.net.trade.*
 import com.cobblemon.mod.common.net.PacketRegisterInfo
 import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket
+import com.cobblemon.mod.common.net.messages.client.SetClientPlayerDataPacket
 import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
 import com.cobblemon.mod.common.net.messages.client.battle.*
 import com.cobblemon.mod.common.net.messages.client.callback.OpenMoveCallbackPacket
@@ -80,6 +75,7 @@ import com.cobblemon.mod.common.net.messages.client.pasture.ClosePasturePacket
 import com.cobblemon.mod.common.net.messages.client.pasture.OpenPasturePacket
 import com.cobblemon.mod.common.net.messages.client.pasture.PokemonPasturedPacket
 import com.cobblemon.mod.common.net.messages.client.pasture.PokemonUnpasturedPacket
+import com.cobblemon.mod.common.net.messages.client.pokedex.ServerConfirmedRegisterPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.*
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.AddEvolutionPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClearEvolutionsPacket
@@ -91,7 +87,6 @@ import com.cobblemon.mod.common.net.messages.client.spawn.SpawnNPCPacket
 import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokeballPacket
 import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.starter.OpenStarterUIPacket
-import com.cobblemon.mod.common.net.messages.client.SetClientPlayerDataPacket
 import com.cobblemon.mod.common.net.messages.client.storage.RemoveClientPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.SwapClientPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.InitializePartyPacket
@@ -100,20 +95,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.trade.*
 import com.cobblemon.mod.common.net.messages.client.ui.InteractPokemonUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.PokedexUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
 import com.cobblemon.mod.common.net.messages.server.*
-import com.cobblemon.mod.common.net.messages.server.battle.BattleSelectActionsPacket
-import com.cobblemon.mod.common.net.messages.server.battle.RemoveSpectatorPacket
-import com.cobblemon.mod.common.net.messages.server.battle.SpectateBattlePacket
+import com.cobblemon.mod.common.net.messages.server.battle.*
+import com.cobblemon.mod.common.net.messages.server.block.AdjustBlockEntityViewerCountPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectedPacket
 import com.cobblemon.mod.common.net.messages.server.callback.party.PartyPokemonSelectedPacket
@@ -126,6 +114,7 @@ import com.cobblemon.mod.common.net.messages.server.npc.SaveNPCPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.PasturePokemonPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.UnpastureAllPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.UnpasturePokemonPacket
+import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.FinishScanningPacket
 import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.StartScanningPacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.interact.InteractPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetNicknamePacket
@@ -141,15 +130,10 @@ 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.messages.server.trade.*
 import com.cobblemon.mod.common.net.serverhandling.*
-import com.cobblemon.mod.common.net.serverhandling.battle.BattleSelectActionsHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.RemoveSpectatorHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.SpectateBattleHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.*
+import com.cobblemon.mod.common.net.serverhandling.block.AdjustBlockEntityViewerCountHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectCancelledHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectedHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.party.PartyPokemonSelectedHandler
@@ -163,6 +147,8 @@ import com.cobblemon.mod.common.net.serverhandling.npc.SaveNPCHandler
 import com.cobblemon.mod.common.net.serverhandling.pasture.PasturePokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.pasture.UnpastureAllPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.pasture.UnpasturePokemonHandler
+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.pokemon.interact.InteractPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetNicknameHandler
 import com.cobblemon.mod.common.net.serverhandling.starter.RequestStarterScreenHandler
@@ -180,15 +166,7 @@ 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.server.pokedex.scanner.FinishScanningPacket
-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
 
@@ -325,6 +303,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(PokedexDexSyncPacket.ID, PokedexDexSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(DexEntrySyncPacket.ID, DexEntrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(FishingBaitRegistrySyncPacket.ID, FishingBaitRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
+        list.add(PacketRegisterInfo(FlowRegistrySyncPacket.ID, FlowRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
 
         // Effects
         list.add(PacketRegisterInfo(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler))
@@ -341,6 +320,7 @@ 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))
@@ -374,7 +354,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(CloseNPCEditorPacket.ID, CloseNPCEditorPacket::decode, CloseNPCEditorHandler))
         list.add(PacketRegisterInfo(OpenNPCEditorPacket.ID, OpenNPCEditorPacket::decode, OpenNPCEditorHandler))
 
-        //Pokedex scanning
+        // Pokédex scanning
         list.add(PacketRegisterInfo(ServerConfirmedRegisterPacket.ID, ServerConfirmedRegisterPacket::decode, ServerConfirmedRegisterHandler))
         return list
     }
@@ -428,10 +408,11 @@ 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))
 
-        // Pokedex scanning
+        // Pokédex scanning
         list.add(PacketRegisterInfo(StartScanningPacket.ID, StartScanningPacket::decode, StartScanningHandler))
         list.add(PacketRegisterInfo(FinishScanningPacket.ID, FinishScanningPacket::decode, FinishScanningHandler))
 
@@ -440,6 +421,9 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(UnpasturePokemonPacket.ID, UnpasturePokemonPacket::decode, UnpasturePokemonHandler))
         list.add(PacketRegisterInfo(UnpastureAllPokemonPacket.ID, UnpastureAllPokemonPacket::decode, UnpastureAllPokemonHandler))
 
+        // Block entity
+        list.add(PacketRegisterInfo(AdjustBlockEntityViewerCountPacket.ID, AdjustBlockEntityViewerCountPacket::decode, AdjustBlockEntityViewerCountHandler))
+
         // Move select packets
         list.add(PacketRegisterInfo(MoveSelectedPacket.ID, MoveSelectedPacket::decode, MoveSelectedHandler))
         list.add(PacketRegisterInfo(MoveSelectCancelledPacket.ID, MoveSelectCancelledPacket::decode, MoveSelectCancelledHandler))

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

@@ -25,6 +25,8 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
 
     @JvmField
     val GUI_CLICK = this.create("gui.click")
+    @JvmField
+    val GUI_TRADE = this.create("gui.trade")
 
     @JvmField
     val PC_ON = this.create("pc.on")
@@ -42,18 +44,8 @@ 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("healing_machine.active")
+    val HEALING_MACHINE_ACTIVE = this.create("block.healing_machine.active")
 
-    @JvmField
-    val POKE_BALL_CAPTURE_STARTED = this.create("poke_ball.capture_started")
-    @JvmField
-    val POKE_BALL_CAPTURE_SUCCEEDED = this.create("poke_ball.capture_succeeded")
-    @JvmField
-    val POKE_BALL_SHAKE = this.create("poke_ball.shake")
-    @JvmField
-    val POKE_BALL_OPEN = this.create("poke_ball.open")
-    @JvmField
-    val POKE_BALL_SHINY_OPEN = this.create("poke_ball.shiny_open")
     @JvmField
     val POKE_BALL_HIT = this.create("poke_ball.hit")
     @JvmField
@@ -107,61 +99,58 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val PVW_BATTLE = this.create("battle.pvw.default")
 
     @JvmField
-    val MEDICINE_HERB_USE = this.create("medicine_herb.use")
+    val MEDICINE_CANDY_USE = this.create("item.medicine.candy.use")
     @JvmField
-    val MEDICINE_LIQUID_USE = this.create("medicine_liquid.use")
+    val MEDICINE_HERB_USE = this.create("item.medicine.herb.use")
     @JvmField
-    val MEDICINE_PILLS_USE = this.create("medicine_pills.use")
+    val MEDICINE_LIQUID_USE = this.create("item.medicine.liquid.use")
     @JvmField
-    val MEDICINE_SPRAY_USE = this.create("medicine_spray.use")
+    val MEDICINE_PILLS_USE = this.create("item.medicine.pills.use")
     @JvmField
-    val MEDICINE_FEATHER_USE = this.create("medicine_feather.use")
+    val MEDICINE_SPRAY_USE = this.create("item.medicine.spray.use")
+    @JvmField
+    val MEDICINE_FEATHER_USE = this.create("item.medicine.feather.use")
 
     @JvmField
-    val BERRY_HARVEST = this.create("berry.harvest")
+    val MULCH_PLACE = this.create("block.mulch.place")
     @JvmField
-    val BERRY_EAT = this.create("berry.eat")
+    val MULCH_REMOVE = this.create("block.mulch.remove")
 
     @JvmField
-    val MULCH_PLACE = this.create("mulch.place")
+    val FOSSIL_MACHINE_ACTIVATE = this.create("block.fossil_machine.activate")
     @JvmField
-    val MULCH_REMOVE = this.create("mulch.remove")
+    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")
 
     @JvmField
-    val FOSSIL_MACHINE_ACTIVATE = this.create("fossil_machine.activate")
+    val RELIC_COIN_SACK_BREAK = this.create("block.relic_coin_sack.break")
     @JvmField
-    val FOSSIL_MACHINE_ACTIVE_LOOP = this.create("fossil_machine.active_loop")
+    val RELIC_COIN_SACK_HIT = this.create("block.relic_coin_sack.hit")
     @JvmField
-    val FOSSIL_MACHINE_ASSEMBLE = this.create("fossil_machine.assemble")
+    val RELIC_COIN_SACK_STEP = this.create("block.relic_coin_sack.step")
     @JvmField
-    val FOSSIL_MACHINE_DNA_FULL = this.create("fossil_machine.dna_full")
+    val RELIC_COIN_SACK_PLACE = this.create("block.relic_coin_sack.place")
     @JvmField
-    val FOSSIL_MACHINE_FINISHED = this.create("fossil_machine.finished")
+    val RELIC_COIN_POUCH_BREAK = this.create("block.relic_coin_pouch.break")
     @JvmField
-    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")
+    val RELIC_COIN_POUCH_PLACE = this.create("block.relic_coin_pouch.place")
 
     @JvmField
     val FISHING_NOTIFICATION = this.create("fishing.notification")
@@ -179,73 +168,78 @@ 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 EVOLUTION_STONE_BLOCK_BREAK = this.create("evolution_stone_block.break")
+    val TUMBLESTONE_BREAK = this.create("block.tumblestone.break")
     @JvmField
-    val EVOLUTION_STONE_BLOCK_HIT = this.create("evolution_stone_block.hit")
+    val TUMBLESTONE_BLOCK_BREAK = this.create("block.tumblestone.block_break")
     @JvmField
-    val EVOLUTION_STONE_BLOCK_PLACE = this.create("evolution_stone_block.place")
+    val TUMBLESTONE_HIT = this.create("block.tumblestone.hit")
     @JvmField
-    val EVOLUTION_STONE_BLOCK_STEP = this.create("evolution_stone_block.step")
+    val TUMBLESTONE_PLACE = this.create("block.tumblestone.place")
+    @JvmField
+    val TUMBLESTONE_STEP = this.create("block.tumblestone.step")
 
     @JvmField
-    val GIMMIGHOUL_GIVE_ITEM_SMALL = this.create("gimmighoul.give_item_small")
+    val EVOLUTION_STONE_BLOCK_BREAK = this.create("block.evolution_stone_block.break")
     @JvmField
-    val GIMMIGHOUL_REVEAL = this.create("gimmighoul.reveal")
+    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")
 
     @JvmField
-    val BERRY_BUSH_BREAK = this.create("berry_bush.break")
+    val GIMMIGHOUL_GIVE_ITEM = this.create("pokemon.gimmighoul.give_item")
     @JvmField
-    val BERRY_BUSH_PLACE = this.create("berry_bush.place")
+    val GIMMIGHOUL_REVEAL = this.create("pokemon.gimmighoul.reveal")
 
     @JvmField
-    val BIG_ROOT_BREAK = this.create("big_root.break")
+    val BERRY_BUSH_BREAK = this.create("block.berry_bush.break")
     @JvmField
-    val ENERGY_ROOT_PLACE = this.create("energy_root.place")
+    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")
 
     @JvmField
-    val VIVICHOKE_BREAK = this.create("vivichoke.break")
+    val BIG_ROOT_BREAK = this.create("block.big_root.break")
     @JvmField
-    val VIVICHOKE_PLACE = this.create("vivichoke.place")
+    val ENERGY_ROOT_PLACE = this.create("block.energy_root.place")
 
     @JvmField
-    val MINT_BREAK = this.create("mint.break")
+    val VIVICHOKE_BREAK = this.create("block.vivichoke.break")
     @JvmField
-    val MINT_PLACE = this.create("mint.place")
+    val VIVICHOKE_PLACE = this.create("block.vivichoke.place")
 
     @JvmField
-    val REVIVAL_HERB_BREAK = this.create("revival_herb.break")
+    val MINT_BREAK = this.create("block.mint.break")
     @JvmField
-    val REVIVAL_HERB_PLACE = this.create("revival_herb.place")
+    val MINT_PLACE = this.create("block.mint.place")
 
     @JvmField
-    val MEDICINAL_LEEK_BREAK = this.create("medicinal_leek.break")
+    val REVIVAL_HERB_BREAK = this.create("block.revival_herb.break")
     @JvmField
-    val MEDICINAL_LEEK_PLACE = this.create("medicinal_leek.plant")
+    val REVIVAL_HERB_PLACE = this.create("block.revival_herb.place")
 
     @JvmField
-    val GILDED_CHEST_OPEN = this.create("gilded_chest.open")
+    val MEDICINAL_LEEK_BREAK = this.create("block.medicinal_leek.break")
     @JvmField
-    val GILDED_CHEST_CLOSE = this.create("gilded_chest.close")
+    val MEDICINAL_LEEK_PLACE = this.create("block.medicinal_leek.plant")
+
     @JvmField
-    val GILDED_CHEST_STEP = this.create("gilded_chest.step")
+    val GILDED_CHEST_OPEN = this.create("block.gilded_chest.open")
     @JvmField
-    val GILDED_CHEST_HIT = this.create("gilded_chest.hit")
+    val GILDED_CHEST_CLOSE = this.create("block.gilded_chest.close")
     @JvmField
-    val GILDED_CHEST_BREAK = this.create("gilded_chest.break")
+    val GILDED_CHEST_STEP = this.create("block.gilded_chest.step")
     @JvmField
-    val GILDED_CHEST_PLACE = this.create("gilded_chest.place")
+    val GILDED_CHEST_HIT = this.create("block.gilded_chest.hit")
+    @JvmField
+    val GILDED_CHEST_BREAK = this.create("block.gilded_chest.break")
+    @JvmField
+    val GILDED_CHEST_PLACE = this.create("block.gilded_chest.place")
 
     @JvmField
     val RELIC_COIN_SACK_SOUNDS = SoundType(1f, 1.1f,
@@ -264,6 +258,13 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
         RELIC_COIN_SACK_STEP
     )
 
+    @JvmField
+    val MOVE_QUICKATTACK_TARGET = this.create("move.quickattack.target")
+    @JvmField
+    val MOVE_PURSUIT_TARGET = this.create("move.pursuit.target")
+    @JvmField
+    val MOVE_PSYCHIC_TARGET = this.create("move.psychic.target")
+
     @JvmField
     val IMPACT_NORMAL = this.create("impact.normal")
     @JvmField
@@ -401,17 +402,17 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     )
 
     @JvmField
-    val DISPLAY_CASE_ADD_ITEM = this.create("display_case.add_item")
+    val DISPLAY_CASE_ADD_ITEM = this.create("block.display_case.add_item")
     @JvmField
-    val DISPLAY_CASE_REMOVE_ITEM = this.create("display_case.remove_item")
+    val DISPLAY_CASE_REMOVE_ITEM = this.create("block.display_case.remove_item")
     @JvmField
-    val DISPLAY_CASE_BREAK = this.create("display_case.break")
+    val DISPLAY_CASE_BREAK = this.create("block.display_case.break")
     @JvmField
-    val DISPLAY_CASE_HIT = this.create("display_case.hit")
+    val DISPLAY_CASE_HIT = this.create("block.display_case.hit")
     @JvmField
-    val DISPLAY_CASE_PLACE = this.create("display_case.place")
+    val DISPLAY_CASE_PLACE = this.create("block.display_case.place")
     @JvmField
-    val DISPLAY_CASE_STEP = this.create("display_case.step")
+    val DISPLAY_CASE_STEP = this.create("block.display_case.step")
 
     @JvmField
     val DISPLAY_CASE_SOUNDS = SoundType(1f, 1f,

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

@@ -77,7 +77,7 @@ object CobblemonTradeOffers {
         )
         VillagerProfession.FISHERMAN -> listOf(
             VillagerTradeOffer(VillagerProfession.FISHERMAN, 5, listOf(
-                VillagerTrades.ItemsForEmeralds(CobblemonItems.POKEROD_SMITHING_TEMPLATE, 12, 3, 30)
+                VillagerTrades.ItemsForEmeralds(CobblemonItems.POKEROD_SMITHING_TEMPLATE, 12, 1, 3, 30)
             ))
         )
         else -> emptyList()

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

@@ -29,6 +29,8 @@ object CobblemonCriteria : PlatformRegistry<Registry<CriterionTrigger<*>>, Resou
 
     val CATCH_SHINY_POKEMON = this.create("catch_shiny_pokemon", SimpleCriterionTrigger(CountableCriterion.CODEC))
 
+    val EGG_COLLECT = this.create("eggs_collected", SimpleCriterionTrigger(CountableCriterion.CODEC))
+
     val EGG_HATCH = this.create("eggs_hatched", SimpleCriterionTrigger(CountableCriterion.CODEC))
 
     val EVOLVE_POKEMON = this.create("pokemon_evolved", SimpleCriterionTrigger(EvolvePokemonCriterion.CODEC))
@@ -53,9 +55,11 @@ object CobblemonCriteria : PlatformRegistry<Registry<CriterionTrigger<*>>, Resou
 
     val CAST_POKE_ROD = this.create("cast_poke_rod", SimpleCriterionTrigger(CastPokeRodCriterionCondition.CODEC))
 
+    val REEL_IN_POKEMON = this.create("reel_in_pokemon", SimpleCriterionTrigger(ReelInPokemonCriterionCondition.CODEC))
+
     // Advancement criteria for [grow_tumblestone.json]
     val PLANT_TUMBLESTONE = this.create("plant_tumblestone", SimpleCriterionTrigger(PlantTumblestoneCriterion.CODEC))
 
     override val registry = BuiltInRegistries.TRIGGER_TYPES
     override val resourceKey = Registries.TRIGGER_TYPE
-}
+}

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

@@ -8,26 +8,30 @@
 
 package com.cobblemon.mod.common.advancement.criterion
 
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.mojang.serialization.Codec
-import com.mojang.serialization.codecs.PrimitiveCodec
 import com.mojang.serialization.codecs.RecordCodecBuilder
 import java.util.Optional
 import net.minecraft.advancements.critereon.ContextAwarePredicate
 import net.minecraft.advancements.critereon.EntityPredicate
 import net.minecraft.server.level.ServerPlayer
+import net.minecraft.resources.ResourceLocation
+
+class CastPokeRodContext(val baitId: ResourceLocation)
 
 class CastPokeRodCriterionCondition(
-    playerCtx: Optional<ContextAwarePredicate>,
-    val hasBait: Boolean
-): SimpleCriterionCondition<Boolean>(playerCtx) {
+        playerCtx: Optional<ContextAwarePredicate>,
+        val baitId: String
+): SimpleCriterionCondition<CastPokeRodContext>(playerCtx) {
+
     companion object {
         val CODEC: Codec<CastPokeRodCriterionCondition> = RecordCodecBuilder.create { it.group(
-            EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(CastPokeRodCriterionCondition::playerCtx),
-            PrimitiveCodec.BOOL.fieldOf("hasBait").forGetter(CastPokeRodCriterionCondition::hasBait)
-        ).apply(it, ::CastPokeRodCriterionCondition) }
+                EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(CastPokeRodCriterionCondition::playerCtx),
+                Codec.STRING.optionalFieldOf("baitId", "empty_bait").forGetter(CastPokeRodCriterionCondition::baitId)
+        ).apply(it, { playerCtx, baitId -> CastPokeRodCriterionCondition(playerCtx, baitId.ifEmpty { "empty_bait" }) }) }
     }
 
-    override fun matches(player: ServerPlayer, context: Boolean): Boolean {
-        return hasBait == context
+    override fun matches(player: ServerPlayer, context: CastPokeRodContext): Boolean {
+        return (context.baitId == this.baitId.asIdentifierDefaultingNamespace() || this.baitId.equals("empty_bait"))
     }
-}
+}

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

@@ -26,7 +26,7 @@ class PartyCheckCriterion(
     companion object {
         val CODEC: Codec<PartyCheckCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PartyCheckCriterion::playerCtx),
-            ResourceLocation.CODEC.listOf().optionalFieldOf("id", listOf()).forGetter(PartyCheckCriterion::party)
+            ResourceLocation.CODEC.listOf().optionalFieldOf("party", listOf()).forGetter(PartyCheckCriterion::party)
         ).apply(it, ::PartyCheckCriterion) }
     }
 
@@ -44,7 +44,7 @@ class PartyCheckCriterion(
                 matches.add(it.species.resourceIdentifier)
             }
         }
-        return matches.containsAll(party) && matches.size == partyCount
+        return matches.containsAll(party) && matches.size == party.size
     }
 }
 

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.advancement.criterion
+
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.mojang.serialization.Codec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import java.util.Optional
+import net.minecraft.advancements.critereon.ContextAwarePredicate
+import net.minecraft.advancements.critereon.EntityPredicate
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.resources.ResourceLocation
+
+class ReelInPokemonContext(val pokemonId : ResourceLocation, val baitId: ResourceLocation)
+
+class ReelInPokemonCriterionCondition(
+        playerCtx: Optional<ContextAwarePredicate>,
+        val pokemonId: String,
+        val baitId: String
+) : SimpleCriterionCondition<ReelInPokemonContext>(playerCtx) {
+
+    companion object {
+        val CODEC: Codec<ReelInPokemonCriterionCondition> = RecordCodecBuilder.create { it.group(
+            EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter { it.playerCtx },
+            Codec.STRING.optionalFieldOf("pokemonId", "any").forGetter { it.pokemonId },
+            Codec.STRING.optionalFieldOf("baitId", "empty_bait").forGetter { it.baitId }
+        ).apply(it, { playerCtx, pokemonId, baitId -> ReelInPokemonCriterionCondition(playerCtx, pokemonId, baitId.ifEmpty { "empty_bait" }) }) }
+    }
+
+    override fun matches(player: ServerPlayer, context: ReelInPokemonContext): Boolean {
+        return (context.pokemonId == this.pokemonId.asIdentifierDefaultingNamespace() || this.pokemonId == "any") && (context.baitId == this.baitId.asIdentifierDefaultingNamespace() || this.baitId == "empty_bait")
+    }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,28 @@
+/*
+ * 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

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.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

@@ -0,0 +1,31 @@
+/*
+ * 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

@@ -0,0 +1,39 @@
+/*
+ * 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

@@ -0,0 +1,35 @@
+/*
+ * 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

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.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

@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import net.minecraft.world.entity.LivingEntity
+
+object DummyBrainConfig : BrainConfig {
+    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {}
+}

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

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

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

@@ -0,0 +1,89 @@
+/*
+ * 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

@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.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

@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.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

@@ -0,0 +1,32 @@
+/*
+ * 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

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

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

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

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

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

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

@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.battles.BattleRegistry
+import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.entity.npc.NPCEntity
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+
+class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {
+    var condition = "true".asExpression()
+    var includePassiveDamage = true
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
+
+        if (entity is NPCEntity) {
+            fun cancelNPCBattles(npcEntity: NPCEntity): Boolean {
+                val battles = npcEntity.battleIds.mapNotNull(BattleRegistry::getBattle)
+                battles.forEach { it.end() }
+                return battles.isNotEmpty()
+            }
+
+            return if (includePassiveDamage) {
+                 BehaviorBuilder.create {
+                    it.group(it.present(MemoryModuleType.HURT_BY), it.present(CobblemonMemories.NPC_BATTLING))
+                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelNPCBattles(entity as NPCEntity) } }
+                }
+            } else {
+                BehaviorBuilder.create {
+                    it.group(it.present(MemoryModuleType.HURT_BY_ENTITY), it.present(CobblemonMemories.NPC_BATTLING))
+                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelNPCBattles(entity as NPCEntity) } }
+                }
+            }
+        } else { return null }/* else if (entity is PokemonEntity) { TODO uncomment when pokemon have brain :)
+            fun cancelPokemonBattle(pokemonEntity: PokemonEntity): Boolean {
+                val battle = BattleRegistry.getBattle(pokemonEntity.battleId ?: return false)
+                battle?.end()
+                return battle != null
+            }
+
+            return if (includePassiveDamage) {
+                BehaviorBuilder.create {
+                    it.group(it.present(MemoryModuleType.HURT_BY), it.present(CobblemonMemories.POKEMON_BATTLING))
+                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelPokemonBattle(entity as PokemonEntity) } }
+                }
+            } else {
+                BehaviorBuilder.create {
+                    it.group(it.present(MemoryModuleType.HURT_BY_ENTITY), it.present(CobblemonMemories.POKEMON_BATTLING))
+                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelPokemonBattle(entity as PokemonEntity) } }
+                }
+            }
+        }*/
+    }
+}

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.resolveFloat
+import com.cobblemon.mod.common.util.resolveInt
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+
+class FleeAttackerTaskConfig : SingleTaskConfig {
+    var condition = "true".asExpression()
+    var speedMultiplier = "0.5".asExpression()
+    var desiredDistance = "9".asExpression()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition) || entity !is PathfinderMob) return null
+        val speedMultiplier = runtime.resolveFloat(speedMultiplier)
+        val desiredDistance = runtime.resolveInt(desiredDistance)
+        return WrapperLivingEntityTask(
+            SetWalkTargetAwayFrom.entity(MemoryModuleType.HURT_BY_ENTITY, speedMultiplier, desiredDistance, false),
+            PathfinderMob::class.java
+        )
+    }
+}

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.resolveFloat
+import com.cobblemon.mod.common.util.resolveInt
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+
+class FleeNearestHostileTaskConfig : SingleTaskConfig {
+    var condition = "true".asExpression()
+    var speedMultiplier = "0.5".asExpression()
+    var desiredDistance = "9".asExpression()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition) || entity !is PathfinderMob) return null
+        val speedMultiplier = runtime.resolveFloat(speedMultiplier)
+        val desiredDistance = runtime.resolveInt(desiredDistance)
+        return WrapperLivingEntityTask(
+            SetWalkTargetAwayFrom.entity(MemoryModuleType.NEAREST_HOSTILE, speedMultiplier, desiredDistance, false),
+            PathfinderMob::class.java
+        )
+    }
+}

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

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

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.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

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

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

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.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

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.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

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.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

@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.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

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.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/LookInDirectionTaskConfig.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.entity.ai.LookInDirectionTask
+import com.cobblemon.mod.common.util.asExpression
+import net.minecraft.world.entity.LivingEntity
+
+class LookInDirectionTaskConfig : SingleTaskConfig {
+    var yaw: Expression = "0".asExpression()
+    var pitch: Expression = "0".asExpression()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ) = LookInDirectionTask(yaw, pitch)
+}

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

@@ -0,0 +1,39 @@
+/*
+ * 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

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.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

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.toDF
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.DoNothing
+import net.minecraft.world.entity.ai.behavior.RunOne
+
+/**
+ * A task where each time the brain is ticked, a different task might run. This differs from [RandomTaskConfig] in that
+ * the same entity can run all of the different possibilities, rather than [RandomTaskConfig] where once the entity
+ * spawns, it will only use whichever was selected at the time of spawning.
+ *
+ * This is most useful for making a single entity randomly choose what to do at a given moment.
+ *
+ * @author Hiroku
+ * @since October 19th, 2024
+ */
+class OneOfTaskConfig : SingleTaskConfig {
+    class OneOfTaskOption {
+        val weight: Int = 1
+        val task: TaskConfig = SingleTaskConfig { _, _ -> DoNothing(0, 1) }
+    }
+
+    val condition: ExpressionLike = "true".asExpressionLike()
+    val options = mutableListOf<OneOfTaskOption>()
+
+    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
+        return RunOne(options.map { it.task.createTasks(entity, brainConfigurationContext).first() toDF it.weight })
+    }
+}

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

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

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

@@ -0,0 +1,52 @@
+/*
+ * 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/RunScript.kt

@@ -0,0 +1,49 @@
+/*
+ * 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.value.DoubleValue
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.scripting.CobblemonScripts
+import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+
+/**
+ * Runs a registered MoLang script (from the molang datapack folder) each tick.
+ *
+ * It's up to the user to not make expensive ass scripts. Remember you can access the game time
+ * from q.entity.level.game_time which can be used with a modulo operator to make something intermittent.
+ *
+ * @author Hiroku
+ * @since December 2nd, 2024
+ */
+class RunScript : SingleTaskConfig {
+    val script = cobblemonResource("dummy")
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? = BehaviorBuilder.create {
+        it.group(
+            it.registered(MemoryModuleType.LOOK_TARGET) // I think I need to have at least something here?
+        ).apply(it) { _ ->
+            Trigger { world, entity, _ ->
+                runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: entity.asMostSpecificMoLangValue())
+                return@Trigger CobblemonScripts.run(script, runtime) == DoubleValue.ONE
+            }
+        }
+    }
+}

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

@@ -0,0 +1,24 @@
+/*
+ * 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

@@ -0,0 +1,39 @@
+/*
+ * 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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.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

@@ -0,0 +1,31 @@
+/*
+ * 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
+
+class SwitchFromActionEffectTaskConfig : SingleTaskConfig {
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ) = BehaviorBuilder.create {
+        it.group(
+            it.absent(CobblemonMemories.ACTIVE_ACTION_EFFECT)
+        ).apply(it) { _ ->
+            Trigger { level, entity, _ ->
+                entity.brain.updateActivityFromSchedule(level.dayTime, level.gameTime)
+                return@Trigger true
+            }
+        }
+    }
+}

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

@@ -0,0 +1,31 @@
+/*
+ * 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
+
+class SwitchFromChattingTaskConfig : SingleTaskConfig {
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ) = BehaviorBuilder.create {
+        it.group(
+            it.absent(CobblemonMemories.DIALOGUES)
+        ).apply(it) { _ ->
+            Trigger { level, entity, _ ->
+                entity.brain.updateActivityFromSchedule(level.dayTime, level.gameTime)
+                return@Trigger true
+            }
+        }
+    }
+}

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

@@ -0,0 +1,31 @@
+/*
+ * 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
+
+class SwitchFromFightTaskConfig : SingleTaskConfig {
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ) = BehaviorBuilder.create {
+        it.group(
+            it.absent(MemoryModuleType.ATTACK_TARGET)
+        ).apply(it) { _ ->
+            Trigger { level, entity, _ ->
+                entity.brain.updateActivityFromSchedule(level.dayTime, level.gameTime)
+                return@Trigger true
+            }
+        }
+    }
+}

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

@@ -6,27 +6,24 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package com.cobblemon.mod.common.entity.npc.ai
+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.OneShot
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
-import net.minecraft.world.entity.schedule.Activity
 
-/**
- * When NPC battling memory is removed, this task swaps the NPC's activity over to idle.
- *
- * @author Hiroku
- * @since February 24th, 2024
- */
-object SwitchFromBattleTask {
-    fun create(): OneShot<LivingEntity> {
+class SwitchFromNPCBattleTaskConfig : SingleTaskConfig {
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
         return BehaviorBuilder.create {
             it.group(it.absent(CobblemonMemories.NPC_BATTLING)).apply(it) { _ ->
-                Trigger { _, entity, _ ->
-                    entity.brain.setActiveActivityIfPossible(Activity.IDLE)
+                Trigger { level, entity, _ ->
+                    entity.brain.updateActivityFromSchedule(level.dayTime, level.gameTime)
                     true
                 }
             }

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

@@ -6,23 +6,27 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package com.cobblemon.mod.common.entity.npc.ai
+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.entity.npc.NPCEntity
-import net.minecraft.world.entity.ai.behavior.OneShot
+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
-import net.minecraft.world.entity.schedule.Activity
 
-object FinishActionEffectTask {
-    fun create(): OneShot<NPCEntity> {
+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(Activity.IDLE)
+                    entity.brain.setActiveActivityIfPossible(CobblemonActivities.ACTION_EFFECT)
                     return@Trigger true
                 }
             }

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

@@ -0,0 +1,35 @@
+/*
+ * 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.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+
+class SwitchToChattingTaskConfig : SingleTaskConfig {
+    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, _ ->
+                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

@@ -0,0 +1,45 @@
+/*
+ * 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

@@ -0,0 +1,21 @@
+/*
+ * 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/SwitchToPanicWhenHostilesNearbyTaskConfig.kt

@@ -0,0 +1,35 @@
+/*
+ * 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.util.asExpression
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+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 SwitchToPanicWhenHostilesNearbyTaskConfig : SingleTaskConfig {
+    var condition = "true".asExpression()
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ) = BehaviorBuilder.create {
+        it.group(it.present(MemoryModuleType.NEAREST_HOSTILE))
+            .apply(it) { nearestHostile ->
+                Trigger { world, entity, _ ->
+                    (entity as? PathfinderMob)?.navigation?.stop()
+                    entity.brain.setActiveActivityIfPossible(Activity.PANIC)
+                    return@Trigger true
+                }
+            }
+    }
+}

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

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.schedule.Activity
+
+class SwitchToPanicWhenHurtTaskConfig : SingleTaskConfig {
+    var condition = "true".asExpression()
+    var includePassiveDamage = false
+
+    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 if (includePassiveDamage) {
+            BehaviorBuilder.create {
+                it.group(it.present(MemoryModuleType.HURT_BY))
+                    .apply(it) { _ ->
+                        Trigger { world, entity, _ ->
+                            (entity as? PathfinderMob)?.navigation?.stop()
+                            entity.brain.setActiveActivityIfPossible(Activity.PANIC)
+                            return@Trigger true
+                        }
+                    }
+            }
+        } else {
+            BehaviorBuilder.create {
+                it.group(it.present(MemoryModuleType.HURT_BY_ENTITY))
+                    .apply(it) { _ ->
+                        Trigger { world, entity, _ ->
+                            (entity as? PathfinderMob)?.navigation?.stop()
+                            entity.brain.setActiveActivityIfPossible(Activity.PANIC)
+                            return@Trigger true
+                        }
+                    }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,73 @@
+/*
+ * 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,
+            "exit_battle_when_hurt" to ExitBattleWhenHurtTaskConfig::class.java,
+            "switch_to_panic_when_hurt" to SwitchToPanicWhenHurtTaskConfig::class.java,
+            "switch_to_panic_when_hostiles_nearby" to SwitchToPanicWhenHostilesNearbyTaskConfig::class.java,
+            "calm_down" to CalmDownTaskConfig::class.java,
+            "flee_attacker" to FleeAttackerTaskConfig::class.java,
+            "flee_nearest_hostile" to FleeNearestHostileTaskConfig::class.java,
+            "run_script" to RunScript::class.java,
+            "look_in_direction" to LookInDirectionTaskConfig::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

@@ -0,0 +1,71 @@
+/*
+ * 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/interpreter/InvalidInstructionException.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.battles.interpreter
+
+import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
+
+/**
+ * An exception thrown when properties from a [BattleMessage] cannot be interpreted for an [InterpreterInstruction].
+ *
+ * @author Segfault Guy
+ * @since November 10th, 2024
+ */
+class InvalidInstructionException(battleMessage: BattleMessage) : Exception("Failed to interpret ${battleMessage.rawMessage}")

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

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.battles.model
 import com.bedrockk.molang.runtime.MoLangRuntime
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.CobblemonNetwork
@@ -22,9 +21,9 @@ import com.cobblemon.mod.common.api.battles.model.actor.EntityBackedBattleActor
 import com.cobblemon.mod.common.api.battles.model.actor.FleeableBattleActor
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 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
@@ -42,6 +41,7 @@ import com.cobblemon.mod.common.battles.dispatch.WaitDispatch
 import com.cobblemon.mod.common.battles.interpreter.ContextManager
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.battles.runner.ShowdownService
+import com.cobblemon.mod.common.entity.PlatformType
 import com.cobblemon.mod.common.entity.npc.NPCBattleActor
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -50,17 +50,16 @@ import com.cobblemon.mod.common.net.messages.client.battle.BattleMessagePacket
 import com.cobblemon.mod.common.pokemon.evolution.progress.DefeatEvolutionProgress
 import com.cobblemon.mod.common.pokemon.evolution.progress.LastBattleCriticalHitsEvolutionProgress
 import com.cobblemon.mod.common.pokemon.evolution.requirements.DefeatRequirement
-import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.util.battleLang
 import com.cobblemon.mod.common.util.getPlayer
-import net.minecraft.network.chat.Component
 import com.cobblemon.mod.common.util.giveOrDropItemStack
 import com.cobblemon.mod.common.util.itemRegistry
-import net.minecraft.resources.ResourceLocation
 import java.io.File
 import java.util.UUID
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ConcurrentLinkedDeque
+import net.minecraft.network.chat.Component
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.item.ItemStack
 
@@ -83,6 +82,8 @@ open class PokemonBattle(
 
     val onEndHandlers: MutableList<(PokemonBattle) -> Unit> = mutableListOf()
 
+    val battlePartyStores = mutableListOf<PlayerPartyStore>()
+
     init {
         side1.battle = this
         side2.battle = this
@@ -93,7 +94,6 @@ open class PokemonBattle(
                     .filterIsInstance<LastBattleCriticalHitsEvolutionProgress>()
                     .forEach { it.reset() }
             }
-            actor.setupStruct()
         }
     }
 
@@ -268,22 +268,31 @@ open class PokemonBattle(
                             else -> continue
                         }
                         val experience = Cobblemon.experienceCalculator.calculate(opponentPokemon, faintedPokemon, multiplier)
-                        if (experience > 0) {
+                        if (experience > 0 && actor.pokemonList.all { it.health <= 0 }) {
                             opponent.awardExperience(opponentPokemon, experience)
                         }
                         Cobblemon.evYieldCalculator.calculate(opponentPokemon, faintedPokemon).forEach { (stat, amount) ->
                             pokemon.evs.add(stat, amount)
                         }
+
                     }
                 }
             }
-            if(actor.itemsUsed.isNotEmpty() && actor.getPlayerUUIDs().count() > 0) {
+            if (actor.itemsUsed.isNotEmpty() && actor.getPlayerUUIDs().count() > 0) {
                 val player = actor.getPlayerUUIDs().first().getPlayer()
                 player?.level()?.itemRegistry.let { registry ->
                     actor.itemsUsed.mapNotNull { registry?.get(ResourceLocation.tryBySeparator(it.itemName.substringAfter('.'), '.')) }
                             .forEach { player?.giveOrDropItemStack(ItemStack(it))}
                 }
             }
+
+            // Heal NPC's team if enabled
+            if (actor is NPCBattleActor) {
+                if (actor.npc.npc.autoHealParty) {
+                    actor.npc.party?.heal()
+                }
+            }
+
         }
         // Heal Mon if wild
         actors.filter { it.type == ActorType.WILD }
@@ -294,6 +303,11 @@ open class PokemonBattle(
         actors.forEach { actor ->
             actor.pokemonList.forEach { battlePokemon ->
                 battlePokemon.entity?.let { entity -> battlePokemon.postBattleEntityOperation(entity) }
+                if (battlePokemon.effectedPokemon.entity != null
+                        && battlePokemon.effectedPokemon.entity?.beamMode == 0
+                        && battlePokemon.effectedPokemon.entity?.platform != PlatformType.NONE) {
+                    battlePokemon.effectedPokemon.tryRecallWithAnimation()
+                }
             }
         }
         sendUpdate(BattleEndPacket())
@@ -371,6 +385,13 @@ 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/battles/model/actor/BattleActor.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.api.battles.model.actor
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.battles.ActiveBattlePokemon
 import com.cobblemon.mod.common.battles.ForcePassActionResponse
@@ -36,10 +37,11 @@ abstract class BattleActor(
         pokemonList.forEach { it.actor = this }
     }
 
-    val struct = QueryStruct(hashMapOf())
+    val struct = asMoLangValue()
 
     lateinit var showdownId: String
     lateinit var battle: PokemonBattle
+    fun isInitialized() = this::battle.isInitialized && this::showdownId.isInitialized
 
     val activePokemon = mutableListOf<ActiveBattlePokemon>()
     var canDynamax = false
@@ -138,10 +140,6 @@ abstract class BattleActor(
         battle.writeShowdownAction(">$showdownId ${showdownMessages.joinToString()}")
     }
 
-    open fun setupStruct() {
-        struct.addFunction("uuid") { StringValue(uuid.toString()) }
-    }
-
     abstract fun getName(): MutableComponent
 
     /**