Added delta functions and some cleanup

Added the "top" universal locator.

.gitlab-ci.yml

@@ -3,155 +3,23 @@ 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
 
-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/
+#TODO add client reference test process, search for import com.cobblemon.mod.common.client
 
 build:
   stage: build
-  dependencies:
-    - replace_resources
+  only:
+    - branches@cable-mc/cobblemon
   script:
     - export GRADLE_OPTS="-Xmx4G -Xms4G"
     - chmod +x ./gradlew
     - ./gradlew build
-  artifacts:
+  cache:
+    key: "$CI_COMMIT_REF_NAME"
+    policy: push
     paths:
       - neoforge/build/libs
       - fabric/build/libs
@@ -160,26 +28,39 @@ 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_PROJECT_PATH == "cable-mc/cobblemon" && $CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_BRANCH == "main"'
   script:
     - export GRADLE_OPTS="-Xmx4G -Xms4G"
     - chmod +x ./gradlew
     - ./gradlew publish
-  artifacts:
-    paths:
-      - neoforge/build/libs/*.jar
-      - fabric/build/libs/*.jar
 
-deploy_artifacts:
+# Separate step to deploy the artifacts, save Norry the headache of keeping even more shit around
+deploy:
   stage: deploy
   dependencies:
     - build
-  script:
+  when: manual
+  cache:
+    key: "$CI_COMMIT_REF_NAME"
+    policy: pull
+    paths:
+      - neoforge/build/libs/*.jar
+      - fabric/build/libs/*.jar
+  script: 
     - echo "Collecting artifacts..."
-    - 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 {} ./
+    - mv neoforge/build/libs/*+*.jar ./
+    - mv fabric/build/libs/*+*.jar ./
     - 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

CHANGELOG-DEX.md

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

CHANGELOG-MORE-NPCS.md

@@ -0,0 +1,6 @@
+### 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

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

CHANGELOG.md

@@ -1,286 +1,45 @@
 # Changelog
-## [1.7.0 (Month xth, 2025)](#1-7-0)
-
-### Fixes
-- Fixed Particles sometimes facing the wrong direction (looking at you, Swords Dance)
-- Fixed PCs always opening at box 2 instead of box 1.
-
-### Developer
-- A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
-- Dialogues are correctly removed from memory when they are stopped.
-- Dialogues with variably-set initial pages now properly start timeout tracking.
-
-## [1.6.1 (January 26th, 2025)](#1-6-1)
-
-### Additions
-- Added crossover paintings from Close Combat: Premonition, Altar, Slumber, and Nomad.
-- Added Galarica Nuts, used for crafting Galarica Cuffs and Wreaths. Dropped from certain Pokémon. Take a wild guess which.
-- Added compatibility with Repurposed Structures. (Thank you, TelepathicGrunt!)
-- Added an evolution method for Karrablast to evolve into Escavalier in singleplayer.
-- Pokédexes can now be placed in Chiseled Bookshelves.
-- Added optional box argument to the /pc command.
-- Pokédex and Dialogue screens now close when the inventory keybind is pressed.
-- Added config setting `maxPokedexScanningDetectionRange` to control from what distance the player can scan Pokémon using the Pokédex.
-- Added config setting `hideUnimplementedPokemonInThePokedex` which hides unimplemented Pokémon from the Pokédex when set to true. 
-- Added debug renderer for posable entity locators.
-- Added crossover paintings from Close Combat, Premonition, Altar, Slumber, and Nomad.
-- Added optional box argument to the /pc command
-
-### Changes
-- Pokémon will now be dynamically revealed to the Pokédex as they're seen instead of revealing entire parties at the end of battle regardless.
-- Unseen wild Pokémon will update their name from '???' to their real name as soon as a battle starts to reflect the battle UI showing the actual species name.
-- Pokémon under the illusion effect will reveal their disguise to the Pokédex first and then the base Pokémon once the disguise is broken.
-- Added more support for a variety of Fabric/NeoForge Convention tags.
-- Reformatted some tags to be more consistent.
-- Edited some recipes to utilize tags instead of direct item ids, for greater mod compatibility.
-- Berries will drop if broken at age 0
-- Improved Fortune drops on Mint Seeds
-- New Slowpoke shiny texture.
-- Updated drops for many Pokémon.
-- Completely resynced Pokémon move and stat data based on later games. Learnsets have changed considerably to maximise available moves.
-- Cobblemon save data now saves .old files where applicable as a means to recover from file corruption due to crashes or similar abrupt stops
-
-### Pokémon Added
-
-#### Gen 5
-- Ducklett
-- Swanna
-- Shelmet
-- Accelgor
-- Karrablast
-- Escavalier
-- Rufflet
-- Braviary
-- Foongus
-- Amoonguss
-
-#### Gen 6
-- Binacle
-- Barbaracle
-
-#### Gen 7
-- Dewpider
-- Araquanid
-- Alolan Geodude
-- Alolan Graveler
-- Alolan Golem
-
-#### Gen 8
-- Galarian Slowpoke
-- Galarian Slowbro
-- Galarian Slowking
-
-#### Gen 9
-- Paldean Tauros
-
-### Added cries to the following Pokémon
-- All Nidorans
-- Shellder, Cloyster
-- Pinsir
-- Tyrogue, Hitmontop
-- Spinda
-
-### Animation updates for the following Pokémon
-- Primeape
-- Munchlax
-- Snorlax
-- Poliwrath
-- Goldeen
-- Seaking
-- Dondozo
-- Wobbuffet
-- Charcadet
-- Armarouge
-- Ceruledge
-- Geodude
-- Graveler
-- Golem
-- Sandile
-- Krokorok
-- Krookodile
-
-### Model updates for the following Pokémon
-- Slowpoke
-- Slowbro
-- Slowking
-- Eiscue
-- Tauros
-- Goldeen
-- Seaking
-- Charcadet
-- Armarouge
-- Ceruledge
-- Pinsir
-- Geodude
-- Graveler
-- Golem
-
-### Cry updates for the following Pokémon
-- Sceptile
-
-### Changes
-- Completely re-synced Pokémon move and stat data based on later games. Learnsets have changed considerably to maximise available moves.
-- Pokémon will now be dynamically revealed to the Pokédex as they're seen in battle instead of revealing entire parties at the end of battle.
-- Unseen wild Pokémon will update their name from '???' to their real name as soon as a battle starts to match how the battle UI shows the actual species name.
-- Pokémon under the illusion effect will reveal their disguise to the Pokédex first and then the base Pokémon once the disguise is broken.
-- Berries will now drop from berry trees if broken at age 0 so you aren't punished for mistaken planting.
-- Increased Fortune drops on Mint Seeds.
-- Updated Slowpoke's shiny texture.
-- Updated drops for many Pokémon.
-- Adjusted the evolution sound to match the timing of the particle effect.
-- Made berry trees shear-able by dispenser blocks. I'm sure nobody will make unholy contraptions with this.
-- Edited some recipes to utilize tags instead of direct item IDs, for better mod compatibility.
-- Added more support for a variety of Fabric/NeoForge conventional tags.
-- Reformatted some tags to be more consistent.
-
-### Fixes
-- Fixed Pokédex sometimes crashing when switching forms.
-- Fixed Pokédex interface not transitioning out when closed.
-- Fixed texture dimensions for the player and Pokémon interact interface.
-- Fixed crash related to Tom's Simple Storage mod and the Fossil Machine.
-- Fixed not being able to retrieve a fossil from the Fossil Machine with an empty hand.
-- Fixed Pokémon being collidable (collidible? collissionable? kaleidoscopable?) while being captured by a Poké Ball.
-- Fixed `full_party`, `own_zangoose_seviper`, `use_revive` and `use_candy` Advancement triggers.
-- Fixed `healing_machine` Advancement by using the correct 1.21 trigger.
-- Fix Display Cases not dropping items if destroyed through explosions.
-- Fixed an issue where the first Pokémon in the pastured Pokémon list clipped into the interface.
-- Fixed all Pokémon facing South on spawn.
-- Fixed bait being consumed even when not reeling in any Pokémon.
-- Fixed Miltank milk magically disappearing out of your bucket.
-- Fixed Pokémon nicknames migrating from 1.5.2 not being displayed properly.
-- Fixed capitalization in one of our config options. It was a very important fix. Very important. Old configs are fine.
-- Fixed Poké Rods not working if Lure or Luck of the Sea enchantments get removed by other mods.
-- Fixed crashes related to Pokémon when they are ready to evolve while holding an enchanted item. Very specific.
-- Fixed a crash that sometimes occurred when evolving Nincada.
-- Fixed Cobblemon plants not being compostable on NeoForge.
-- Fixed hide UI (F1 key) not hiding the party overlay.
-- Fixed NPC MoLang command `player_lose_command` not working.
-- Fixed misaligned tooltips with edit boxes in the NPC editor screen.
-- Fixed Pokémon riding two boats when attempting to deploy a platform on water.
-- Fixed the summary screen showing there's experience to reach the next level when they are at the level cap.
-- Fixed Pokémon forgetting moves when evolving on specific cases.
-- Fixed Adorn compatibility, including improvements when using JEI/REI (Apricorn items now show up under the collapsed entries rather than standalone).
-- Fixed error message appearing on battle log when using Solar Beam with Sunny Day.
-- Fixed Pokémon Model offsets for larger species.
-- Fixed `/pokedex grant all` command not giving male/female/shininess completion for some Pokémon.
-- Fixed `/pokedex grant only` and `/pokedex remove only` not respecting the form parameter passed.
-- Fixed variant forms appearing incorrectly in the Pokédex when the normal form had not been unlocked.
-- Fixed Pokémon occasionally being shot into the sky during battle. No Pokémon were harmed by this bug, probably.
-- Fixed NPC editing GUI not updating aspects until a game restart.
-- Fixed some users being unable to open their PC if a Pokémon in it had a lot of PP raises beyond normal bounds. How did you get those, anyway? Tell me or the Bellossom gets it.
-- Fixed some color variants (Dubwool, Conkeldurr and Undyed wooloo) being missing in the Pokédex.
-- Fixed invalid species or held items causing Players to not be able to load into their world anymore (commonly happening after removing addons/mods).
-- Fixed Wooloo variants not being automatically registered in the owner's Pokédex when dyed.
-- Fixed Vivichoke Dip and Leek & Potato Stew not returning a bowl upon consumption.
-- Fixed Fossil Restoration Tank not accepting Hay Bales as organic material.
-- Fixed Potion items applying double their intended healing value.
-- Fixed Fast Ball capture bonuses applying to all Pokémon, making it the Best Ball instead of the Mediocre Edge-Case Ball. 
-- Fixed "learned new move" messages appearing for already-known moves on Pokémon evolutions.
-- Fixed Pokémon Item Models breaking shadows nearby when being placed in Display Cases or Item Frames.
-- Fixed berries not giving bonus yields when planted in their preferred biomes. I'm sure we've fixed that 5 times now.
-- Fixed the NeoForge version not supporting "SodiumDynamicLights".
-- Fixed players disconnecting from servers if they made changes to certain config options.
-- Fixed players with shouldered Pokémon not being able to rejoin their 1.5.2 worlds using 1.6.
-- Fixed `PokemonProperties` utilizing `ability=<some ability>` being treated as a forced ability even when it is a legal ability for the Pokémon.
-- Fixed type formatting in Pokédex scanner mode when dual types require two lines.
-- Fixed trading sometimes crashing the game or server. 
-- Fixed Wild shiny sounds not respecting the `shinyNoticeParticlesDistance` config setting.
-- Fixed Pokémon being able to evolve mid-battle.
-- Fixed NPC held items being able to be stolen by players. Don't be a thief!
-- Fixed evolutions that require a held item consuming it as soon as meeting requirements when it should only be consumed upon evolution.
-- Fixed Pokémon showing only the default form when selecting them as a target in battle.
-- Fixed a possible error coming out of reeling fishing rods in specific situations.
-- Fixed incorrect weights being used when Poké Fishing with Luck of the Sea.
-- Parametric particle motion now works.
-- Event-spawned particles now work.
-- Particles can now have independent coordinate spaces.
-
-### Developer
-- Updated the Pokédex data updated events to always include a `Pokemon` instance, and optionally a `DisguiseData` instance.
-- Updated fields in `SpawnNPCPacket` and `SpawnPokemonPacket` to be visible and mutable.
-- Updated `UnvalidatedPlaySoundS2CPacket` to be public instead of internal and made its fields mutable.
-- Added `hideNameTag` field and `HideNPCNameTag` nbt tag to `NPCEntity` to allow hiding the name tag of the NPC.
-- Added the player to `PokerodReelEvent` so you know who is doing the reeling.
-
-### MoLang & Datapacks
-- Added flows for:
-  - `forme_change`: Triggered when a Pokémon changes form in battle.
-  - `mega_evolution`: Triggered when a Pokémon mega evolves in battle. (Note: Third-party mods are required for this feature currently)
-  - `zpower_used`: Triggered when a Pokémon uses a Z-Power move in battle. (Note: Third-party mods are required for this feature currently)
-  - `terastallization`: Triggered when a Pokémon terastallizes in battle. (Note: Third-party mods are required for this feature currently)
-  - `battle_fainted`: Triggered when a Pokémon faints in battle.
-  - `battle_fled`: Triggered when a player flees from battle.
-  - `battle_started_pre`: Triggered when a battle starts. Cancelable!
-  - `battle_started_post`: Triggered when a battle starts.
-  - `apricorn_harvested`: Triggered when an Apricorn is harvested.
-  - `thrown_pokeball_hit`: Triggered when a thrown Pokéball hits a Pokémon.
-  - `level_up`: Triggered when a Pokémon levels up.
-  - `pokemon_fainted`: Triggered when a Pokémon faints.
-  - `pokemon_gained`: Triggered when a player gains a Pokémon.
-- Added MoLang functions:
-  - For Pokémon:
-    - `pokemon.apply(PokemonProperties)`: Applies the given properties to the Pokémon.
-    - `pokemon.owner`: Returns the owner of the Pokémon or 0.0 if there is no owner or they are not online.
-  - For all entities:
-    - `entity.is_standing_on_blocks(depth, blocks...)`: Returns whether the specified entity is standing on a specific block or set of blocks. Example usage: `q.is_standing_on_blocks(2, minecraft:sand)`
-- Added NPC field:
-  - `hideNameTag`: Hides the name tag of the NPC.
-  - Added `baseScale` property to NPCs.
-- Added MoLang particle queries for getting distance to targeted entities.
-
-## [1.6.0 - The Record Catch Update (December 25th, 2024)](#1-6-0)
+## [1.6.0 - The Bass Pro Fishing Update (Month Xth, 2024)](#1-6-0)
 #### "Now that there's a fishing mechanic, the mod is actually good!"
 
 ### Additions
-- Added the Pokédex as a craftable item that can be placed on lecterns.
-- Added Pokémon (and item) fishing using modified fishing rods - Poké Rods! You'll need a Poké Rod smithing template, a fishing rod, and some type of Poké Ball. Each Poké Ball makes a differently themed rod because it's cool.
+- Added Pokémon (and item) fishing using modified fishing rods - Poké Rods! You'll need a Poké Rod smithing template, a fishing rod, and some type of Poké Ball. Each Poké Ball makes a differently themed rod. Why not?
 - Added Lure Ball functionality, increasing the catch rate of Pokémon that were caught on a fishing rod.
 - Added Repeat Ball functionality, increasing the catch rate of Pokémon that are already registered as caught in a player's Pokédex.
-- Added 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.
-- 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.
-- 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 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 property chaining support for duplicate CustomPokemonPropertyType elements.
+- Added flat level battling with options to set all Pokemon to level 50, 100, or 5 for the duration of a battle. No experience or EVs are granted for a flat battle.
 - Added `aspect` and `unaspect` PokemonProperty arguments (which also includes commands such as `/pokemonedit`, `/spawnpokemon`, and `/givepokemon`) to allow forcing or un-forcing an aspect on a Pokémon.
 - Added `type` alternatively `elemental_type` PokemonProperty argument, this is only used for filtering and is not applied to Pokémon. Example `type=fire` would be true for Charmander but false for Squirtle.
+- Added support for Double Battles, Triple Battles, and Multi-battles.
+- CriticalCaptures and Pokédex progress capture multiplier now work with the Pokédex.
+- Added extra visuals to early berry growth stages.
+- Moves impacted by the abilities Pixelate, Refrigerate, Aerilate, Galvanize, and Normalize now display as their altered typing.
+- Added Polished Tumblestone and Tumblestone Brick block sets from Tumblestone, Black Tumblestone, and Sky Tumblestone.
+- Added Metronome, Protective Pads, Punching Glove, Room Service, Scope Lens, Shed Shell, Terrain Extender, Throat Spray, Utility Umbrella, Wide Lens, and Zoom Lens held items
+- Added particles for moves: Watersport, Mud Sport, and Psychic.
+- Added Fire, Water, Thunder, Leaf, Ice, Sun, Moon, Shiny, Dawn, and Dusk Stone storage blocks.
+- Added Eject Pack, Metronome, Protective Pads, Punching Glove, Room Service, Scope Lens, Shed Shell, Terrain Extender, Throat Spray, Utility Umbrella, Wide Lens, and Zoom Lens held items
+- Added `stonjourner_henge_ruins`, `luna_henge_ruins`, and `sol_henge_ruins` structures.
+- Added a `battleInvulnerability` gamerule to make players invulnerable to any damage during a battle.
+- Added a `mobTargetInBattle` gamerule to exclude players from being targeted by mobs during a battle.
+- Added battle log messages for switching out Pokémon.
+- Added Evolution particles and sounds for Pokémon that are sent out when evolution is started.
+- Added a Nurse profession that can be unlocked by having villagers claim a healing machine block.
+- Added 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 animation for trading.
+- Added shiny Pokémon effects.
+- Added effects for the burn status effect.
+- Added effects for the moves: Psychic, Water Sport, and Mud Sport.
+- Added a new universal locator called "top".
 
-### 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)
+- Alola Bias Cubone
 - Alolan Marowak
 
 #### Gen 2
@@ -295,7 +54,10 @@
 - Octillery
 - Mantine
 - Smeargle
-- Delibird
+- Remoraid
+- Octillery
+- Mantine
+- Corsola
 
 #### Gen 3
 - Slakoth
@@ -313,6 +75,18 @@
 - Bagon
 - Shelgon
 - Salamence
+
+#### Gen 4
+- Shellos [East Sea form]
+- Gastrodon [East Sea form]
+- Finneon
+- Lumineon
+- Mantyke
+- Feebas
+- Milotic
+- Spheal
+- Sealeo
+- Walrein
 - Kecleon
 
 #### Gen 4
@@ -348,11 +122,20 @@
 - Hatenna
 - Hattrem
 - Hatterene
+- Bruxish
+- Mareanie
+- Toxapex
+
+#### Gen 8
+- Cramorant
 - Pincurchin
 
 #### Gen 9
 - Wattrel
 - Kilowattrel
+- Wiglett
+- Wugtrio
+- Flamigo
 - Veluza
 - Farigiraf
 - Klawf
@@ -361,11 +144,10 @@
 - 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)
+- Magikarp Jump Variants
+- Gyarados Jump Variants
 
 ### Added cries to the following Pokémon
 - Sandshrew, Sandslash
@@ -407,7 +189,7 @@
 - Hatenna, Hattrem, Hatterene
 - Pincurchin
 - Klawf
-- Finizen, Palafin \[Zero\], Palafin \[Hero\]
+- Finizen, Palafin [Zero], Palafin [Hero]
 - Dondozo
 
 ### Added shoulder mounts for the following Pokémon
@@ -426,7 +208,6 @@
 - Buneary
 - Combee
 - Pachirisu
-- Tepig
 - Pidove
 - Petilil, Hisui Bias Petilil
 - Zorua, Hisui Bias Zorua
@@ -434,47 +215,35 @@
 - Fletchling
 - Skrelp
 - Klefki
-- Litten
 - Fomantis
 - Morelull
 - Dreepy
-- Sprigatito
 - Shroodle
 - Tatsugiri
 - Glimmet
-- Gimmighoul \[Roaming\]
+- Gimmighoul [Roaming]
 
 ### Animation updates for the following Pokémon
-- Bellsprout, Weepinbell, Victreebel
+- Bellsprout, Weepinbel, Victreebel
 - Shellder, Cloyster
 - Porygon, Porygon2, Porygon-Z
 - Furret
 - Swinub, Piloswine, Mamoswine
 - Skarmory
-- Tyrogue
 - Spinda
 - Torkoal
 - Nincada, Ninjask
 - Lunatone
 - Solrock
 - Buneary, Lopunny
-- Magnezone
 - Alomomola
-- Tepig, Pignite, Emboar
-- Flabebe, Floette, Florges
-- Litten, Torracat, Incineroar
-- Fomantis, Lurantis
 - Dreepy, Drakloak
 - Kleavor
-- Scorbunny
-- Gimmighoul \[Roaming\]
 
 ### Model updates for the following Pokémon
 - Bulbasaur, Ivysaur, Venusaur
 - Charmander, Charmeleon, Charizard
-- Caterpie
 - Kakuna, Beedrill
-- Lapras
 - Porygon, Porygon2, Porygon-Z
 - Igglybuff, Jigglypuff, Wigglytuff
 - Poliwhirl, Poliwrath
@@ -508,11 +277,9 @@
 - Phantump, Trevenant
 - Litten, Torracat, Incineroar
 - Popplio, Brionne, Primarina
-- Mudbray
 - Lurantis
 - Scorbunny, Cinderace
 - Quaxly
-- Skeledirge
 - Tatsugiri
 
 ### Changes
@@ -522,143 +289,126 @@
 - Adjusted volumes of sounds made by Display Cases, Berry Bushes, Energy Root, Medicinal Leek, Vivichoke, Mints, Revival Herbs and Gilded Chests.
 - Changes to mulch buffs/durations.
 - Updated potion sprites.
-- Changed Link Cable recipe to be much cheaper.
+- Link Cable recipe has been redesigned.
 - Updated sounds for Medicinal Leeks, Big Roots, Energy Roots and Revival Herbs.
 - Updated UI sounds for clicking and evolving Pokémon.
 - Updated cries for Chansey, Crobat, Hoothoot, Noctowl.
 - Removed the interchangeable evolution results for the first stage Hisuian starters to prevent confusion. The method still exists for stage 2 to 3, but stage 1 to 2 was not distinguishable enough for many users.
+- Bulbasaur, Ivysaur, Venusaur, Kakuna, Beedrill, Snorlax, Munchlax, Krabby, Kingler, Lurantis, Horsea, Seadra, Kingdra, Litten, Torracat, Incineroar, Mudkip, Marshtomp, Swampert, Scorbunny, Cinderace, Prinplup, Empoleon, Relicanth, Goldeen, Seaking, Shellder, Cloyster, Tatsugiri, Igglybuff, Jigglypuff, Wigglytuff, Krookodile, Gible, Gabite, Garchomp, Rhyhorn, Rhydon, Rhyperior, and Carvanha received model updates.
 - Vivillon wings will stop being clear when you remove any Vivillon related resourcepacks. The default pattern will be the meadow wings.
+- Adjusted Pokémon sendout positions for single battles.
 - Wild Pokémon interaction range increased to 12 blocks (from 10 blocks).
 - Player trade range increased to 12 blocks (from 10 blocks).
 - PvP battle range increased to 32 blocks (from 10 blocks).
 - Spectate range increased to 64 blocks (from 10 blocks).
 - The inventory key now closes our GUIs if they are open, mirroring how Minecraft screens usually work.
 - The noise from the pasture and PC blocks being interacted with now activates Sculk sensors.
-- Updated dialogue GUI assets with proper assets not made by a programmer. Well, it was still a programmer, but- someone who can also draw!
+- Updated dialogue GUI assets with proper assets.
 - Updated party switching interface when in battle.
 - Relic coin pouches can now be waterlogged.
-- 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.
+- Pokémon name and level labels are now only visible when crouching by default. Set the `displayEntityLabelsWhenCrouchingOnly` config to `false` to always have them displayed.
+- The "Press R to start battle prompt" will now disappear after a player's first battle has been won.
+- The default number of digits for the Pokédex number in the summary has been increased, from 3 to 4.
 - The pasture block model's screen is now off by default.
 - The Poké Balls creative tab is now named Utility Items as it also encompasses Poké Rod and Pokédex items.
 - Moves can now be benched without specifying a replacement move, allowing for empty move slots.
 - Moves learned via Sketch now persist after battle.
+- Updated potion sprites
+- Removed the interchangeable evolution results for the first stage Hisuian starters to prevent confusion. The method still exists for stage 2 to 3, but stage 1 to 2 was not distinguishable enough for many users.
 - Hidden Power now displays its effective typing.
 - Updated particles for moves: Confusion, Protect, Sand Attack, and Quick Attack.
 - Updated particles for status effects: Paralysis, Poison, and Sleep.
 - Updated particles on Gastly.
 - Revamped stat buff and de-buff particles.
-- Improved the performance of display cases that contain Pokémon photos.
-- Updated sounds for Poké Balls 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 (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.
+- Fixed Cubone's cry not having a sound.
+- Fixed the sendout sound erronously playing when a wild Pokémon breaks out of a Poké ball.
 - Flamethrower is no longer missing sounds.
 - Fixed the Seafloor spawning context not being a usable context.
 - Fixed Pokemon spawning in non-full blocks like slabs.
 - Fixed Gilded Chests not dropping the chest itself when broken, only the contents.
 - 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 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 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.
-- Sound for evolving Pokémon through the Summary Menu is now correctly playing again.
-- Fix Starter prompt not showing up.
-- 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 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 - 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 comically T posing whenever they sleep.
-- Fixed Cetitan's cry breaking its walk and sleep animations. 
+- Fixed Chimchar and Monferno T-posing whenever they sleep.
 - Fixed the Magby line not having any placeholder walk animations.
 - Fixed Duskull and Dusclops using skylight levels for their nether spawn data. There is no sun in the Nether!
 - Fixed Hisuian Zoroark using base Zoroark stats.
 - Fixed Bellossom clipping into the player head when shoulder mounted.
 - Fixed Shroomish's look range to prevent it from looking higher than it should.
-- Fixed Maushold's faint animations not playing. It's even sadder than Tandemaus!
+- Fixed Cetitan's cry breaking its walk and sleep animations. 
+- Fixed Crumbling Arch not blending in with the world.
+- Fixed Energy Root applying being usable on a fainted Pokémon.
+- Fixed Pokémon entity not spawning when starting a battle while recalling said Pokémon.
+- Fixed species comparison not using namespace for both sides in `PokemonProperties.isSubsetOf`.
+- Fixed `PokemonProperties#asString` prefixing nicknames with a '$'.
+- Fixed PC not saving when Pokémon was changed outside.
+- Fixed shearable Pokémon not dropping correct wool colors.
+- Fixed pasture spawning Pokémon inside solid blocks when closest spawning position is blocked off.
+- Fixed Tumbling Down advancement not being granted by tumblestone variants.
+- Improve error handling when loading spawn sets to ensure invalid configurations don't crash the server.
+- Fixed empty `JsonPlayerData` files resulting in players being unable to join server/world.
+- Evolution notification and UI sound is now correctly playing (again).
+- Fix Starter prompt not showing up.
+- Fix evolution now granting Pokédex entries.
+- Fix Pokédex crash when a form is looked up without ever seeing the "normal" form.
+- Fixed owned poké balls floating upwards if pausing mid-transition.
+- Fixed all mouse buttons working for Battle UI navigation (now it's only primary/left click).
+- Fixed trading Pokémon setting their friendship to 0 instead of the base value.
+- Fixed a scenario where a Pokémon that rolled to spawn with a special Tera type sometimes has a Tera type that is already a part of their natural typing.
+- Fixed PokemonProperty argument suggestions for `tera` and `tera_type` not suggesting `stellar`.
+- Fixed being able to stack Relic Coin Pouches on top of each other.
+- Fixed Model loader generating misleading crash-reports when client is crashing.
+- Big Roots and Energy Roots now share the same sounds as intended.
+- Fixed sounds made by blocks playing at a lower pitch than intended.
+- Fixed Chimchar and Monferno T posing whenever they sleep.
+- Fixed the Magby line not having any placeholder walk animations.
+- Fixed Duskull and Dusclops using skylight levels for their nether spawn data. There is no sun in the Nether!
+- Fixed Hisuian Zoroark using base Zoroark stats.
+- Fixed Bellossom clipping into the player head when shoulder mounted.
+- Fixed Shroomish's look range to prevent it from looking higher than it should.
+- Fixed Maushold's faint animations not playing. It's sadder than Tandemaus!
 - Fixed Slowking's battle idle.
 - Fixed Grafaiai's walk speed to prevent model sliding.
+- Fixed Maushold's faint animations not playing. It's sadder than Tandemaus! 
+- Fixed Slowking's battle idle. 
+- Fixed Grafaiai's walk speed to prevent model sliding. 
 - Fixed Alolan Exeggutor's tail not showing in the party UI. It will now also stand in front of all Pokémon in the party menu :)
 - Fixed Timburr duplicating its log while fainting.
-- Fixed hitbox sizes for Grotle and Torterra being set to default values.
-- Fixed 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 reviving items throwing an exception when used in battle.
 - Fixed messages for Focus Sash, Confusion, Mummy, Ice Face, Own Tempo, and Revive.
 - Improve error handling when loading spawn-sets to ensure invalid configurations don't crash the server.
-- Fixed Crumbling Arch Ruins generating a giant cube of air and removed the chest.
+- Fixed `crumbling_arch_ruins` from generating a giant cube of air and removed the chest.
 - Fixed possible crash on large population servers due to concurrent access of data.
 - Quickly sending out and recalling Pokémon now looks smoother and can no longer be spammed to cause desync issues.
 - Pokémon are now invulnerable during sendout animation and intangible during recall animation.
+- Pokémon are now invincible during sendout animation and intangible during recall animation.
 - Scrolling with party keybinding now behaves properly when using high scroll speed or scroll sensitivity.
 - Fixed battle log GUI flashing when Battle GUI is opened.
 - Bag Items used during a turn will now be refunded if the battle ends before the next turn begins.
-- Pokémon whose current owner is not its Original Trainer now gain extra experience.
+- Pokémon whose current owner is not its Original Trainer now gains extra experience.
 - Fixed Fossil Resurrection advancement not being granted.
-- Fixed village generation caps not applying for berry farms. You were not meant to see more than two berry farms per village! This has been broken for ages but no one noticed... Hmmm... We could just remove it from here...
+- Fixed village generation caps not applying for berry farms. You were not meant to see more than two berry farms per village!
 - Fixed the Ice Face ability activation being displayed incorrectly in a battle.
 - Fixed edge case of F1 and R locking you in battle with no R functionality (requiring ESC to get out).
 - Fixed Poké Ball render orientation in battle interface when capturing.
-- Fixed sync issues with recently learned moves where their PP would not go down until you logout and in.
-- Fixed some Pokémon photos in display cases flashing if the Pokémon has gender differences.
-- Fixed Bidoof and Jigglypuff sleep animations stopping after some time, causing them to be 'asleep' while T-posing menacingly.
-- Fixed entities not changing poses unless you're looking at them.
-- Fixed cries not playing on send-out if the Pokémon is off-screen.
-- Fixed text row selection highlight in battle log.
-- Fixed top black border rendering in scroll interfaces in summary UI.
-- Fixed aspect tracking for Advancements.
-- Fixed illusion not copying aspects or caught ball.
-- 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.
 - 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
@@ -673,43 +423,22 @@
   - 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`.
+- "sounds/attacks" folder has been renamed to "sounds/move"
 - Moves sharing generic sounds now have unique sound events, allowing them to be changed with resource packs.
-- All move sound events have been renamed to `move.<NAME>.<SOURCE>` for consistency.
-- Status moves have been moved out of the `attacks` 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`.
+- All move sound events have been renamed to "move.NAME.SOURCE" for consistency.
+- Status moves have been moved out of the 'attacks' folder and split into volatile and nonvolatile.
+- 'status.badlypoison.actor' sound event has been renamed to "status.toxpoison.actor"
+- Mulch and berry harvesting sound events have been renamed and moved to their respective folders in "sounds/block."
+- All sounds related to evolving Pokémon have been moved to the "sounds/evolution" folder.
+- Sound events for all blocks now start with "block."
 - Gimmighoul chest and item interaction sounds have been moved to where its cry is.
 - Unused sound files and sound events have been removed.
-- Poké Ball sounds are now in their animation files, making them more flexible to edit.
-- Added MoLang compatibility in the isVisible property for transformed parts.
-- Added `q.has_aspect('some_aspect')` function to animations, posers, and entity particle effects.
-- Added support for conditional pose animations.
-- Added a new universal locator called "top".
-- Added `eggs_collected` and `eggs_hatched` Advancement triggers.
-- 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:
@@ -1944,7 +1673,6 @@ 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.
@@ -2129,4 +1857,5 @@ Thank you so much to all of our community translators that bring the mod to the
 - Added species, ability, and move translations for `ko_ko`, `jp_jp`, `fr_fr`, `es_es`, `it_it`, and `zh_cn`.
 
 ## [1.0.0 (November 12th, 2022)](#1-0-0)
-- Initial release.
+- Initial release.
+

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 version = "${project.property("mod_version")}+${project.property("mc_version")}"
 
-val isSnapshot = project.property("snapshot")?.equals("true") == true
+val isSnapshot = project.property("snapshot")?.equals("true") ?: false
 if (isSnapshot) {
     val fixedBranchName = versioning.info.branch.substringAfter("/")
     version = "$version-${fixedBranchName}-${versioning.info.build}"

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

@@ -45,4 +45,21 @@ 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/EntityCreeperMixin.java

@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.pokemon.ai.EntityBehaviour;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Mob;
-import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
-import net.minecraft.world.entity.monster.Creeper;
-import net.minecraft.world.level.Level;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(Creeper.class)
-public class EntityCreeperMixin extends Mob {
-
-    private EntityCreeperMixin(net.minecraft.world.entity.EntityType<? extends Creeper> entityType, Level world) {
-        super(entityType, world);
-    }
-
-    @Inject(method = "registerGoals", at = @At(value = "TAIL"), cancellable = false)
-    private void cobblemon$initGoals(CallbackInfo callbackInfo) {
-        final Creeper creeper = (Creeper) (Object) this;
-        // Pokemon Entities
-        this.goalSelector.addGoal(
-            3,
-            new AvoidEntityGoal<>(
-                creeper,
-                PokemonEntity.class,
-                6.0f,
-                1.0,
-                1.2,
-                 entity -> ((PokemonEntity)entity).getBehaviour().getEntityInteract().getAvoidedByCreeper() && ((PokemonEntity)entity).getBeamMode() != 1
-            )
-        );
-
-        // Players with shoulder mounted Pokemon
-        this.goalSelector.addGoal(
-            3,
-            new AvoidEntityGoal<>(
-                creeper,
-                ServerPlayer.class,
-                6.0f,
-                1.0,
-                1.2,
-                entity -> EntityBehaviour.Companion.hasCreeperFearedShoulderMount((ServerPlayer)entity)
-            )
-        );
-
-    }
-}
-

common/src/main/java/com/cobblemon/mod/common/mixin/EntityPhantomMixin.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;
-
-import net.minecraft.world.entity.monster.Phantom;
-import org.spongepowered.asm.mixin.Mixin;
-
-@Mixin(targets = "net/minecraft/world/entity/monster/Phantom$PhantomSweepAttackGoal")
-public class EntityPhantomMixin {
-    // TODO: Figure out how to access the outer class that wraps SwoopMovementGoal
-    // Need to find the cat mons that are near the phantom
-
-//    @Inject(method = "shouldContinue", at = @At(value = "RETURN"), cancellable = true)
-//    public void cobblemon$shouldContinue(CallbackInfoReturnable<Boolean> ci) {
-////        var goalSelectorField = PhantomEntity.class.getClasses();// PhantomEntity.class.getFields();// .class.getDeclaredField("goalSelector");
-//
-////        goalSelectorField.setAccessible(true);
-////        GoalSelector goalSelector = (GoalSelector) goalSelectorField.get(mobEntity);
-////        final SwoopMovementGoal phantom = (SwoopMovementGoal) (Object) this;
-////        if(ci.getReturnValue() == false) {
-////            var result = this$0.getWorld().getEntitiesByClass(
-////                    PokemonEntity.class,
-////                    this$0.getBoundingBox().expand(16.0),
-////                    entity ->  {
-////                        return ((PokemonEntity) entity).getBehaviour().getEntityInteract().getAvoidedByPhantom();
-////                    }
-////            ).isEmpty();
-////
-////                ci.setReturnValue(result);
-////        }
-//    }
-}
-

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

@@ -9,20 +9,6 @@
 package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.client.CobblemonClient;
-import com.cobblemon.mod.common.client.render.MatrixWrapper;
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel;
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState;
-import com.cobblemon.mod.common.entity.PosableEntity;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.Vec3;
-import org.joml.Vector3f;
-import org.spongepowered.asm.mixin.Debug;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -48,39 +34,4 @@ public class EntityRenderDispatcherMixin {
     public void resourceManagerReloadHook(ResourceManager resourceManager, CallbackInfo ci) {
         CobblemonClient.INSTANCE.onAddLayer(this.playerRenderers);
     }
-
-    @Inject(
-        method = "renderHitbox(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/entity/Entity;FFFF)V",
-        at = @At(value = "TAIL")
-    )
-    private static void renderLocators(
-        PoseStack poseStack,
-        VertexConsumer buffer,
-        Entity entity,
-        float red,
-        float green,
-        float blue,
-        float alpha,
-        CallbackInfo ci
-    ) {
-        if (entity instanceof PosableEntity posableEntity) {
-            if (posableEntity.getDelegate() instanceof PosableState state) {
-                state.getLocatorStates().forEach((locator, matrix) -> {
-                    poseStack.pushPose();
-                    Vec3 pos = matrix.getOrigin().subtract(entity.position());
-                    LevelRenderer.renderLineBox(
-                        poseStack,
-                        buffer,
-                        AABB.ofSize(pos, 0.25, 0.25, 0.25),
-                        0F,
-                        1F,
-                        0F,
-                        1F
-                    );
-                    poseStack.popPose();
-                });
-
-            }
-        }
-    }
 }

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

@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.pokemon.ai.EntityBehaviour;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.Mob;
-import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
-import net.minecraft.world.entity.monster.AbstractSkeleton;
-import net.minecraft.world.level.Level;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(AbstractSkeleton.class)
-public class EntitySkeletonMixin extends Mob {
-
-    private EntitySkeletonMixin(EntityType<? extends Mob> entityType, Level world) {
-        super(entityType, world);
-    }
-
-    @Inject(method = "registerGoals", at = @At(value = "TAIL"), cancellable = false)
-    private void cobblemon$initGoals(CallbackInfo callbackInfo) {
-        final AbstractSkeleton skeleton = (AbstractSkeleton) (Object) this;
-        // Pokemon Entities
-        this.goalSelector.addGoal(
-            3,
-            new AvoidEntityGoal<>(
-                skeleton,
-                PokemonEntity.class,
-                6.0f,
-                1.0,
-                1.2,
-                 entity -> ((PokemonEntity)entity).getBehaviour().getEntityInteract().getAvoidedBySkeleton() && ((PokemonEntity)entity).getBeamMode() != 1
-            )
-        );
-
-        // Players with shoulder mounted Pokemon
-        this.goalSelector.addGoal(
-            3,
-            new AvoidEntityGoal<>(
-                skeleton,
-                ServerPlayer.class,
-                6.0f,
-                1.0,
-                1.2,
-                entity -> EntityBehaviour.Companion.hasSkeletonFearedShoulderMount((ServerPlayer)entity)
-            )
-        );
-
-    }
-}
-

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

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

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

@@ -10,6 +10,7 @@ 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;
@@ -19,9 +20,7 @@ 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;
@@ -53,33 +52,25 @@ 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) {
-            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);
-                }
+        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);
             }
         }
     }
 
     @Inject(method = "getModel", at = @At("HEAD"), cancellable = true)
-    private void cobblemon$getItemModel(ItemStack stack, Level world, LivingEntity entity, int seed, CallbackInfoReturnable<BakedModel> cir) {
-        ResourceLocation resourceLocation = null;
-        if (stack.getItem() instanceof PokeBallItem pokeBallItem) resourceLocation = pokeBallItem.getPokeBall().getModel3d();
-        else if (stack.getItem() instanceof PokedexItem pokedexItem) {
-            boolean isScanModel = entity instanceof Player && entity.getUseItem() == stack && entity.isUsingItem();
-            boolean canOpenScreen = entity != null && ((entity.getOffhandItem() == stack && !(entity.getMainHandItem().getItem() instanceof PokedexItem)) || entity.getMainHandItem() == stack);
-            resourceLocation = pokedexItem.getType().getItemModelPath(isScanModel ? "scanning" : (canOpenScreen ? null : "off"));
-        }
-
-        if (resourceLocation != null) {
-            BakedModel model = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, MODEL_PATH));
+    private void cobblemon$bakePokeballModel(ItemStack stack, Level world, LivingEntity entity, int seed, CallbackInfoReturnable<BakedModel> cir) {
+        if (stack.getItem() instanceof PokeBallItem pokeBallItem) {
+            BakedModel model = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(pokeBallItem.getPokeBall().getModel3d(), MODEL_PATH));
             ClientLevel clientWorld = world instanceof ClientLevel ? (ClientLevel) world : null;
             BakedModel overriddenModel = model.getOverrides().resolve(model, stack, clientWorld, entity, seed);
             cir.setReturnValue(overriddenModel == null ? this.itemModelShaper.getModelManager().getMissingModel() : overriddenModel);

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

@@ -52,11 +52,10 @@ 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/NbtUtilsMixin.java

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

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

@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents;
 import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent;
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies;
 import com.cobblemon.mod.common.api.storage.party.PartyStore;
-import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore;
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags;
 import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData;
 import com.cobblemon.mod.common.pokedex.scanner.ScannableEntity;
@@ -179,10 +178,10 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
 
     @Override @Nullable
     public PokedexEntityData resolvePokemonScan() {
-        if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())){
+        if(CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())){
             return getDataFromShoulderPokemon(this.getShoulderEntityRight());
         }
-        if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())){
+        if(CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())){
             return getDataFromShoulderPokemon(this.getShoulderEntityLeft());
         }
         return null;
@@ -191,34 +190,30 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
     @Nullable @Unique
     private PokedexEntityData getDataFromShoulderPokemon(CompoundTag shoulderTag) {
         CompoundTag pokemonTag = shoulderTag.getCompound(DataKeys.POKEMON);
-        if (pokemonTag.isEmpty()) return null;
+        if(pokemonTag.isEmpty()) return null;
         Species species = PokemonSpecies.INSTANCE.getByIdentifier(ResourceLocation.parse(pokemonTag.getString(DataKeys.POKEMON_SPECIES_IDENTIFIER)));
-        if (species == null) return null;
+        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;
+        if(!formList.isEmpty()) form = formList.getFirst();
+        if(form == null) return null;
         String genderString = pokemonTag.getString(DataKeys.POKEMON_GENDER);
-        if (genderString.isEmpty()) return null;
+        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());
 
-        Pokemon pokemon = new Pokemon();
-        if (level().isClientSide) {
-            pokemon.setSpecies(species);
-            pokemon.setForm(form);
-            pokemon.setGender(gender);
-            pokemon.setShiny(shiny);
-            pokemon.setLevel(level);
-            pokemon.setForcedAspects(aspects);
-        } else {
-            PlayerPartyStore party = Cobblemon.INSTANCE.getStorage().getParty(this.getUUID(), this.registryAccess());
-            pokemon = party.get(shoulderTag.getUUID(DataKeys.SHOULDER_UUID));
-        }
-        return new PokedexEntityData(pokemon, null);
+        return new PokedexEntityData(
+                species,
+                form,
+                gender,
+                aspects,
+                shiny,
+                level,
+                this.getUUID()
+        );
     }
 
     @Override

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

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

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

@@ -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.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/kotlin/com/cobblemon/mod/common/Cobblemon.kt

@@ -14,11 +14,9 @@ import com.cobblemon.mod.common.api.SeasonResolver
 import com.cobblemon.mod.common.api.data.DataProvider
 import com.cobblemon.mod.common.api.drop.CommandDropEntry
 import com.cobblemon.mod.common.api.drop.DropEntry
-import com.cobblemon.mod.common.api.drop.EvolutionItemDropEntry
 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
@@ -45,7 +43,6 @@ import com.cobblemon.mod.common.api.spawning.prospecting.SpawningProspector
 import com.cobblemon.mod.common.api.starter.StarterHandler
 import com.cobblemon.mod.common.api.storage.PokemonStoreManager
 import com.cobblemon.mod.common.api.storage.adapter.conversions.ReforgedConversion
-import com.cobblemon.mod.common.api.storage.adapter.database.MongoDBStoreAdapter
 import com.cobblemon.mod.common.api.storage.adapter.flatfile.FileStoreAdapter
 import com.cobblemon.mod.common.api.storage.adapter.flatfile.JSONStoreAdapter
 import com.cobblemon.mod.common.api.storage.adapter.flatfile.NBTStoreAdapter
@@ -55,10 +52,8 @@ import com.cobblemon.mod.common.api.storage.pc.PCStore
 import com.cobblemon.mod.common.api.storage.pc.link.PCLinkManager
 import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreManager
 import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import com.cobblemon.mod.common.api.storage.player.adapter.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
@@ -69,15 +64,22 @@ 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.client.CobblemonPack
-import com.cobblemon.mod.common.command.argument.*
+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.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
@@ -90,33 +92,26 @@ 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
 import com.cobblemon.mod.common.pokemon.properties.UnaspectPropertyType
 import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
+import com.cobblemon.mod.common.pokemon.properties.BattleCloneProperty
 import com.cobblemon.mod.common.pokemon.properties.tags.PokemonFlagProperty
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
-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.trade.TradeManager
+import com.cobblemon.mod.common.util.*
 import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
 import com.cobblemon.mod.common.world.feature.ore.CobblemonOrePlacedFeatures
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
-import com.mongodb.ConnectionString
-import com.mongodb.MongoClientSettings
 import com.mongodb.client.MongoClient
-import com.mongodb.client.MongoClients
 import java.io.File
 import java.io.FileReader
 import java.io.FileWriter
 import java.io.PrintWriter
-import java.util.UUID
+import java.util.*
 import kotlin.math.roundToInt
 import kotlin.properties.Delegates
 import kotlin.reflect.full.memberProperties
@@ -125,7 +120,6 @@ import kotlin.reflect.jvm.javaField
 import net.minecraft.client.Minecraft
 import net.minecraft.commands.synchronization.SingletonArgumentInfo
 import net.minecraft.resources.ResourceKey
-import net.minecraft.server.packs.PackType
 import net.minecraft.world.item.NameTagItem
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.storage.LevelResource
@@ -165,16 +159,6 @@ object Cobblemon {
     var statProvider: StatProvider = CobblemonStatProvider
     var seasonResolver: SeasonResolver = TagSeasonResolver
 
-    @JvmStatic
-    val builtinPacks = listOf<CobblemonPack>(
-        CobblemonPack(id = "adorncompatibility", name = "Adorn Compatibility", packType = PackType.CLIENT_RESOURCES, activationBehaviour = ResourcePackActivationBehaviour.ALWAYS_ENABLED, neededMods = setOf("adorn")),
-        CobblemonPack(id = "gyaradosjump", name = "Gyarados Jump Patterns", packType = PackType.CLIENT_RESOURCES, activationBehaviour = ResourcePackActivationBehaviour.DEFAULT_ENABLED),
-        CobblemonPack(id = "regionbiasforms", name = "Region Bias Forms", packType = PackType.CLIENT_RESOURCES, activationBehaviour = ResourcePackActivationBehaviour.DEFAULT_ENABLED),
-        CobblemonPack(id = "uniqueshinyforms", name = "Shinies for Magikarp Jump", packType = PackType.CLIENT_RESOURCES, activationBehaviour = ResourcePackActivationBehaviour.NORMAL),
-
-        CobblemonPack(id = "repurposedstructurescobblemon", name = "Repurposed Structures Cobblemon", packType = PackType.SERVER_DATA, activationBehaviour = ResourcePackActivationBehaviour.DEFAULT_ENABLED, neededMods = setOf("repurposed_structures")),
-    )
-
     fun preInitialize(implementation: CobblemonImplementation) {
         this.implementation = implementation
 
@@ -201,7 +185,6 @@ object Cobblemon {
 
         DropEntry.register("command", CommandDropEntry::class.java)
         DropEntry.register("item", ItemDropEntry::class.java, isDefault = true)
-        DropEntry.register("evolution", EvolutionItemDropEntry::class.java)
 
         ExperienceGroups.registerDefaults()
         CaptureCalculators.registerDefaults()
@@ -220,14 +203,14 @@ object Cobblemon {
             storage.onPlayerDataSync(it)
             playerDataManager.syncAllToPlayer(it)
             starterHandler.handleJoin(it)
-            ServerSettingsPacket(this.config.preventCompletePartyDeposit, this.config.displayEntityLevelLabel, this.config.displayEntityNameLabel, this.config.maxPokemonLevel, this.config.maxPokemonFriendship, this.config.maxDynamaxLevel).sendToPlayer(it)
+            ServerSettingsPacket(this.config.preventCompletePartyDeposit, this.config.displayEntityLevelLabel, this.config.displayEntityNameLabel).sendToPlayer(it)
         }
         PlatformEvents.SERVER_PLAYER_LOGOUT.subscribe {
             PCLinkManager.removeLink(it.player.uuid)
             BattleRegistry.onPlayerDisconnect(it.player)
             storage.onPlayerDisconnect(it.player)
             playerDataManager.onPlayerDisconnect(it.player)
-            RequestManager.onLogoff(it.player)
+            TradeManager.onLogoff(it.player)
         }
         PlatformEvents.PLAYER_DEATH.subscribe {
             PCLinkManager.removeLink(it.player.uuid)
@@ -258,8 +241,6 @@ object Cobblemon {
         // Lowest priority because this applies after luxury ball bonus as of gen 4
         CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(Priority.LOWEST) { event ->
             var increment = (event.newFriendship - event.pokemon.friendship).toFloat()
-            if (increment <= 0) //these affects are only meant to affect positive gains
-                return@subscribe
             // Our Luxury ball spec is diff from official, but we will still assume these stack
             if (event.pokemon.heldItemNoCopy().`is`(CobblemonItemTags.IS_FRIENDSHIP_BOOSTER)) {
                 increment += increment * 0.5F
@@ -301,10 +282,6 @@ object Cobblemon {
         CustomPokemonProperty.register(FreezeFrameProperty)
         CustomPokemonProperty.register(NoAIProperty)
 
-        CobblemonEvents.POKEMON_PROPERTY_INITIALISED.emit(Unit)
-
-        FlowHandler.setup()
-
         ifDedicatedServer {
             isDedicatedServer = true
         }
@@ -345,7 +322,9 @@ object Cobblemon {
                     }
                 }
 
+                /*
                 "mongodb" -> {
+                    /*
                     try {
                         Class.forName("com.mongodb.client.MongoClient")
 
@@ -353,22 +332,18 @@ object Cobblemon {
                             .applyConnectionString(ConnectionString(config.mongoDBConnectionString))
                             .build()
                         mongoClient = MongoClients.create(mongoClientSettings)
-                        val generalMongoFactory = CachedPlayerDataStoreFactory(PlayerDataMongoBackend(mongoClient, config.mongoDBDatabaseName, "PlayerDataCollection"))
-                        generalMongoFactory.setup(server)
-
-                        val pokedexMongoFactory = CachedPlayerDataStoreFactory(DexDataMongoBackend(mongoClient, config.mongoDBDatabaseName, "PokeDexCollection"))
-                        pokedexMongoFactory.setup(server)
-
-                        playerDataManager.setFactory(generalMongoFactory, PlayerInstancedDataStoreTypes.GENERAL)
-                        playerDataManager.setFactory(pokedexMongoFactory, PlayerInstancedDataStoreTypes.POKEDEX)
+                        val mongoFactory = MongoPlayerDataStoreFactory(mongoClient, config.mongoDBDatabaseName)
+                        playerData.setFactory(mongoFactory, PlayerInstancedDataStoreType.GENERAL)
                         MongoDBStoreAdapter(mongoClient, config.mongoDBDatabaseName)
                     } catch (e: ClassNotFoundException) {
                         LOGGER.error("MongoDB driver not found.")
                         throw e
                     }
 
+                     */
                 }
 
+                 */
 
                 else -> throw IllegalArgumentException("Unsupported storageFormat: ${config.storageFormat}")
             }
@@ -400,19 +375,11 @@ object Cobblemon {
                 BattleFormat.GEN_9_SINGLES,
                 BattleSide(PokemonBattleActor(UUID.randomUUID(), BattlePokemon(Pokemon().initialize()), -1F)),
                 BattleSide(PokemonBattleActor(UUID.randomUUID(), BattlePokemon(Pokemon().initialize()), -1F)),
-                false
-            ).ifSuccessful {
-                it.mute = true
-            }.ifErrored {
-                val errors = it.errors.joinToString("\n") { it.javaClass.name }
-                LOGGER.error("Failed to start dummy Showdown battle: $errors")
-            }
+                true
+            ).ifSuccessful { it.mute = true }
         }
 
         registerEventHandlers()
-
-        CobblemonEvents.COBBLEMON_INITIALISED.emit(Unit)
-
     }
 
     fun registerEventHandlers() {

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

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

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

@@ -121,17 +121,10 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     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_HANGING_SIGN = this.create(
-        "apricorn_hanging_sign",
-        CobblemonHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_HANGING_SIGN), APRICORN_WOOD_TYPE)
-    )
+    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))
     @JvmField
     val APRICORN_WALL_HANGING_SIGN = this.create("apricorn_wall_hanging_sign", CobblemonWallHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_HANGING_SIGN), APRICORN_WOOD_TYPE))
     @JvmField

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

@@ -9,35 +9,27 @@
 package com.cobblemon.mod.common
 
 import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
-import com.cobblemon.mod.common.api.ai.BrainPreset
 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.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.data.BrainPresetSyncPacket
 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.ExpressionOrEntityVariableAdapter
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.adapters.TaskConfigAdapter
-import com.cobblemon.mod.common.util.adapters.TranslatedTextAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
-import com.mojang.datafixers.util.Either
-import net.minecraft.network.chat.Component
 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<BrainPreset> {
+object CobblemonBrainConfigs : JsonDataRegistry<List<BrainConfig>> {
     override val gson: Gson = GsonBuilder()
         .setPrettyPrinting()
         .registerTypeAdapter(Activity::class.java, ActivityAdapter)
@@ -45,27 +37,21 @@ object CobblemonBrainConfigs : JsonDataRegistry<BrainPreset> {
         .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
         .registerTypeAdapter(BrainConfig::class.java, BrainConfigAdapter)
         .registerTypeAdapter(TaskConfig::class.java, TaskConfigAdapter)
-        .registerTypeAdapter(
-            TypeToken.getParameterized(Either::class.java, Expression::class.java, MoLangConfigVariable::class.java).type,
-            ExpressionOrEntityVariableAdapter
-        )
-        .registerTypeAdapter(Component::class.java, TranslatedTextAdapter)
-        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
         .create()
 
-    override val typeToken = TypeToken.get(BrainPreset::class.java)
+    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, BrainPreset>()
+    val presets = mutableMapOf<ResourceLocation, List<BrainConfig>>()
 
     override fun sync(player: ServerPlayer) {
-        player.sendPacket(BrainPresetSyncPacket(presets))
+        // TODO implement probs ay
     }
 
-    override fun reload(data: Map<ResourceLocation, BrainPreset>) {
+    override fun reload(data: Map<ResourceLocation, List<BrainConfig>>) {
         presets.clear()
         presets.putAll(data)
     }

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

@@ -52,12 +52,9 @@ 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)
-        BrainEditCommand.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

@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common
-
-import com.bedrockk.molang.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,22 +8,25 @@
 
 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
@@ -168,6 +171,14 @@ 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].
      *
@@ -175,6 +186,16 @@ 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.PokedexType
+import com.cobblemon.mod.common.client.pokedex.PokedexTypes
 import com.cobblemon.mod.common.entity.boat.CobblemonBoatType
 import com.cobblemon.mod.common.item.*
 import com.cobblemon.mod.common.item.armor.CobblemonArmorTrims
@@ -54,9 +54,6 @@ 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
@@ -158,19 +155,19 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
 
     val pokedexes = mutableListOf<PokedexItem>()
     @JvmField
-    val POKEDEX_RED = pokedexItem(PokedexType.RED)
+    val POKEDEX_BLACK = pokedexItem(PokedexTypes.BLACK)
     @JvmField
-    val POKEDEX_YELLOW = pokedexItem(PokedexType.YELLOW)
+    val POKEDEX_BLUE = pokedexItem(PokedexTypes.BLUE)
     @JvmField
-    val POKEDEX_GREEN = pokedexItem(PokedexType.GREEN)
+    val POKEDEX_GREEN = pokedexItem(PokedexTypes.GREEN)
     @JvmField
-    val POKEDEX_BLUE = pokedexItem(PokedexType.BLUE)
+    val POKEDEX_PINK = pokedexItem(PokedexTypes.PINK)
     @JvmField
-    val POKEDEX_PINK = pokedexItem(PokedexType.PINK)
+    val POKEDEX_RED = pokedexItem(PokedexTypes.RED)
     @JvmField
-    val POKEDEX_BLACK = pokedexItem(PokedexType.BLACK)
+    val POKEDEX_WHITE = pokedexItem(PokedexTypes.WHITE)
     @JvmField
-    val POKEDEX_WHITE = pokedexItem(PokedexType.WHITE)
+    val POKEDEX_YELLOW = pokedexItem(PokedexTypes.YELLOW)
 
     @JvmField
     val VIVICHOKE = compostableItem("vivichoke")
@@ -317,7 +314,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField val RAZOR_FANG = noSettingsItem("razor_fang")
     @JvmField val AUSPICIOUS_ARMOR = heldItem("auspicious_armor")
     @JvmField val MALICIOUS_ARMOR = heldItem("malicious_armor")
-    @JvmField val SHELL_HELMET = heldItem("shell_helmet")
 
     private val berries = mutableMapOf<ResourceLocation, BerryItem>()
     // Plants
@@ -393,9 +389,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
 
     @JvmField val BERRY_JUICE = this.create("berry_juice", BerryJuiceItem())
 
-    @JvmField
-    val GALARICA_NUTS = create("galarica_nuts", GalaricaNutItem())
-
     // Medicine
     @JvmField
     val RARE_CANDY = candyItem("rare_candy") { _, pokemon -> pokemon.getExperienceToNextLevel() }
@@ -446,7 +439,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
             .saturationModifier(1.2F)
             .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
             .alwaysEdible()
-            .usingConvertsTo(Items.BOWL)
             .build())) {
         override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
             user.removeAllEffects()
@@ -482,7 +474,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val HEAL_POWDER = create("heal_powder", HealPowderItem())
     @JvmField
-    val LEEK_AND_POTATO_STEW = create("leek_and_potato_stew", Item(Item.Properties().food(FoodProperties.Builder().nutrition(8).saturationModifier(0.6f).usingConvertsTo(Items.BOWL).build()).stacksTo(1)))
+    val LEEK_AND_POTATO_STEW = create("leek_and_potato_stew", Item(Item.Properties().food(FoodProperties.Builder().nutrition(8).saturationModifier(0.6f).build()).stacksTo(1)))
     @JvmField
     val REVIVE = create("revive", ReviveItem(max = false))
     @JvmField
@@ -1250,13 +1242,13 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     private fun candyItem(name: String, calculator: CandyItem.Calculator): CandyItem  = this.create(name, CandyItem(calculator))
 
     private fun pokerodItem(pokeRodId: ResourceLocation): PokerodItem {
-        val settings = Item.Properties().stacksTo(1).durability(256)
+        val settings = Item.Properties().stacksTo(1).durability(Items.FISHING_ROD.components().get(DataComponents.MAX_DAMAGE)!!)
         val item = create(pokeRodId.path, PokerodItem(pokeRodId, settings))
         pokeRods.add(item)
         return item
     }
 
-    private fun pokedexItem(type: PokedexType): PokedexItem {
+    private fun pokedexItem(type: PokedexTypes): PokedexItem {
         val item = create("pokedex_${type.name.lowercase()}", PokedexItem(type))
         pokedexes.add(item)
         return item

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

@@ -16,31 +16,14 @@ import com.mojang.serialization.codecs.PrimitiveCodec
 import net.minecraft.core.UUIDUtil
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import java.util.Optional
-import java.util.UUID
-import net.minecraft.core.BlockPos
-import net.minecraft.world.entity.LivingEntity
 
 object CobblemonMemories {
     val memories = mutableMapOf<String, MemoryModuleType<*>>()
 
-    /*
-     * When a memory doesn't have a codec provided, it's because it doesn't
-     * get serialized during relogs. This makes sense for things like battles which
-     * do not survive a relog therefore any memory of it should be temporary.
-     */
-
     val BATTLING_POKEMON = register("battling_pokemon", ListCodec(UUIDUtil.CODEC, 0, 31))
     val NPC_BATTLING = register("npc_battling", PrimitiveCodec.BOOL)
     val DIALOGUES = register<List<ActiveDialogue>>("npc_dialogues")
     val ACTIVE_ACTION_EFFECT = register<ActionEffectContext>("active_action_effect")
-    val POKEMON_FLYING = register("pokemon_flying", PrimitiveCodec.BOOL)
-    val POKEMON_DROWSY = register("pokemon_drowsy", PrimitiveCodec.BOOL)
-    val POKEMON_SLEEPING = register("pokemon_sleeping", PrimitiveCodec.BOOL)
-    val POKEMON_BATTLE = register<UUID>("pokemon_battle")
-    val REST_PATH_COOLDOWN = register("rest_path_cooldown", PrimitiveCodec.BOOL)
-    val TARGETED_BATTLE_POKEMON = register<UUID>("targeted_battle_pokemon")
-    val NEAREST_VISIBLE_ATTACKER = register<LivingEntity>("nearest_visible_attacker")
-    val NEARBY_GROWABLE_CROPS = register<BlockPos>("nearby_growable_crops")
 
     fun <U> register(id: String, codec: Codec<U>): MemoryModuleType<U> {
         val memoryModule = MemoryModuleType(Optional.of(codec))
@@ -53,4 +36,4 @@ object CobblemonMemories {
         memories[id] = memoryModule
         return memoryModule
     }
-}
+}

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

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.api.net.NetworkPacket
-import com.cobblemon.mod.common.client.net.OpenBehaviourEditorHandler
 import com.cobblemon.mod.common.client.net.PlayerInteractOptionsHandler
 import com.cobblemon.mod.common.client.net.SetClientPlayerDataHandler
 import com.cobblemon.mod.common.client.net.animation.PlayPosableAnimationHandler
@@ -52,18 +51,9 @@ 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.TradeProcessStartedHandler
-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.OpenBehaviourEditorPacket
 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
@@ -84,7 +74,6 @@ 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
@@ -96,45 +85,22 @@ 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
 import com.cobblemon.mod.common.net.messages.client.storage.party.MoveClientPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyReferencePacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.ClosePCPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.InitializePCPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.MoveClientPCPokemonPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.OpenPCPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCBoxPokemonPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.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.TradeProcessStartedPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeStartedPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeUpdatedPacket
 import com.cobblemon.mod.common.net.messages.client.ui.InteractPokemonUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.PokedexUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
-import com.cobblemon.mod.common.net.messages.server.BattleChallengePacket
-import com.cobblemon.mod.common.net.messages.server.BattleChallengeResponsePacket
-import com.cobblemon.mod.common.net.messages.server.BenchMovePacket
-import com.cobblemon.mod.common.net.messages.server.RequestMoveSwapPacket
-import com.cobblemon.mod.common.net.messages.server.RequestPlayerInteractionsPacket
-import com.cobblemon.mod.common.net.messages.server.SelectStarterPacket
-import com.cobblemon.mod.common.net.messages.server.SendOutPokemonPacket
+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.BattleTeamLeavePacket
-import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamRequestPacket
-import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamResponsePacket
 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.behaviour.SetEntityBehaviourPacket
-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
@@ -147,7 +113,6 @@ import com.cobblemon.mod.common.net.messages.server.npc.SaveNPCPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.PasturePokemonPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.UnpastureAllPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.UnpasturePokemonPacket
-import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.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
@@ -163,23 +128,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.PerformTradePacket
-import com.cobblemon.mod.common.net.messages.server.trade.UpdateTradeOfferPacket
-import com.cobblemon.mod.common.net.serverhandling.ChallengeHandler
-import com.cobblemon.mod.common.net.serverhandling.ChallengeResponseHandler
-import com.cobblemon.mod.common.net.serverhandling.RequestInteractionsHandler
+import com.cobblemon.mod.common.net.serverhandling.*
 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.TeamLeaveHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestResponseHandler
-import com.cobblemon.mod.common.net.serverhandling.behaviour.SetEntityBehaviourHandler
-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
@@ -193,8 +145,6 @@ 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
@@ -212,12 +162,13 @@ 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.PerformTradeHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.UpdateTradeOfferHandler
+import com.cobblemon.mod.common.net.messages.client.pokedex.ServerConfirmedRegisterPacket
+import com.cobblemon.mod.common.net.messages.client.trade.*
+import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.FinishScanningPacket
+import com.cobblemon.mod.common.net.messages.server.trade.*
+import com.cobblemon.mod.common.net.serverhandling.pokedex.scanner.FinishScanningHandler
+import com.cobblemon.mod.common.net.serverhandling.pokedex.scanner.StartScanningHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.*
 import com.cobblemon.mod.common.util.server
 import net.minecraft.server.level.ServerPlayer
 
@@ -326,6 +277,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(BattleChallengeExpiredPacket.ID, BattleChallengeExpiredPacket::decode, BattleChallengeExpiredHandler))
         list.add(PacketRegisterInfo(BattleReplacePokemonPacket.ID, BattleReplacePokemonPacket::decode, BattleReplacePokemonHandler))
         list.add(PacketRegisterInfo(BattleTransformPokemonPacket.ID, BattleTransformPokemonPacket::decode, BattleTransformPokemonHandler))
+        list.add(PacketRegisterInfo(BattleAppendTargetedEntityPacket.ID, BattleAppendTargetedEntityPacket::decode, BattleSetTargetedEntityHandler))
 
         // MultiBattleTeam Packets
         list.add(PacketRegisterInfo(TeamRequestNotificationPacket.ID, TeamRequestNotificationPacket::decode, TeamRequestNotificationHandler))
@@ -354,8 +306,6 @@ 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()))
-        list.add(PacketRegisterInfo(BrainPresetSyncPacket.ID, BrainPresetSyncPacket::decode, DataRegistrySyncPacketHandler()))
 
         // Effects
         list.add(PacketRegisterInfo(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler))
@@ -406,10 +356,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(CloseNPCEditorPacket.ID, CloseNPCEditorPacket::decode, CloseNPCEditorHandler))
         list.add(PacketRegisterInfo(OpenNPCEditorPacket.ID, OpenNPCEditorPacket::decode, OpenNPCEditorHandler))
 
-        // Behaviours
-        list.add(PacketRegisterInfo(OpenBehaviourEditorPacket.ID, OpenBehaviourEditorPacket::decode, OpenBehaviourEditorHandler))
-
-        // Pokédex scanning
+        //Pokedex scanning
         list.add(PacketRegisterInfo(ServerConfirmedRegisterPacket.ID, ServerConfirmedRegisterPacket::decode, ServerConfirmedRegisterHandler))
         return list
     }
@@ -467,7 +414,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(OfferTradePacket.ID, OfferTradePacket::decode, OfferTradeHandler))
         list.add(PacketRegisterInfo(UpdateTradeOfferPacket.ID, UpdateTradeOfferPacket::decode, UpdateTradeOfferHandler))
 
-        // Pokédex scanning
+        // Pokedex scanning
         list.add(PacketRegisterInfo(StartScanningPacket.ID, StartScanningPacket::decode, StartScanningHandler))
         list.add(PacketRegisterInfo(FinishScanningPacket.ID, FinishScanningPacket::decode, FinishScanningHandler))
 
@@ -476,9 +423,6 @@ 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))
@@ -498,9 +442,6 @@ object CobblemonNetwork {
         // NPC packets
         list.add(PacketRegisterInfo(SaveNPCPacket.ID, SaveNPCPacket::decode, SaveNPCHandler))
 
-        // Behaviour Packets
-        list.add(PacketRegisterInfo(SetEntityBehaviourPacket.ID, SetEntityBehaviourPacket::decode, SetEntityBehaviourHandler))
-
         return list
     }
 

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

@@ -8,12 +8,6 @@
 
 package com.cobblemon.mod.common
 
-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.DefendOwnerSensor
-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.DrowsySensor
-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.ItemEntitySensor
-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.PokemonAdultSensor
-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.PokemonGrowableCropSensor
-import com.cobblemon.mod.common.pokemon.ai.PokemonDisturbancesSensor
 import com.cobblemon.mod.common.entity.sensor.BattlingPokemonSensor
 import com.cobblemon.mod.common.entity.sensor.NPCBattlingSensor
 import java.util.function.Supplier
@@ -26,22 +20,10 @@ object CobblemonSensors {
 
     val NPC_BATTLING = register("npc_battling", ::NPCBattlingSensor)
     val BATTLING_POKEMON = register("battling_pokemon", ::BattlingPokemonSensor)
-//    val NPC_BATTLING = register("npc_battling", ::NPCBattlingSensor)
-    val POKEMON_DROWSY = register("pokemon_drowsy", ::DrowsySensor)
-
-    val POKEMON_ADULT = register("pokemon_adult_sensor", ::PokemonAdultSensor)
-
-    val POKEMON_DISTURBANCE = register("pokemon_disturbance_sensor", ::PokemonDisturbancesSensor)
-
-    val POKEMON_DEFEND_OWNER = register("pokemon_owner_under_attack", ::DefendOwnerSensor)
-
-    val NEARBY_GROWABLE_CROPS = register("nearby_growable_crops", ::PokemonGrowableCropSensor)
-
-    val ITEM_SENSOR = register("item_sensor", ::ItemEntitySensor)
 
     fun <E : Entity, U : Sensor<E>> register(id: String, supplier: Supplier<U>): SensorType<U> {
         val sensor = SensorType(supplier)
         sensors[id] = sensor
         return sensor
     }
-}
+}

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

@@ -46,6 +46,16 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     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
@@ -98,8 +108,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val PVW_BATTLE = this.create("battle.pvw.default")
 
-    @JvmField
-    val MEDICINE_CANDY_USE = this.create("item.medicine.candy.use")
     @JvmField
     val MEDICINE_HERB_USE = this.create("item.medicine.herb.use")
     @JvmField
@@ -258,13 +266,6 @@ 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

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, 1, 3, 30)
+                VillagerTrades.ItemsForEmeralds(CobblemonItems.POKEROD_SMITHING_TEMPLATE, 12, 3, 30)
             ))
         )
         else -> emptyList()

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

@@ -29,8 +29,6 @@ object CobblemonCriteria : PlatformRegistry<Registry<CriterionTrigger<*>>, Resou
 
     val CATCH_SHINY_POKEMON = this.create("catch_shiny_pokemon", SimpleCriterionTrigger(CountableCriterion.CODEC))
 
-    val EGG_COLLECT = this.create("eggs_collected", SimpleCriterionTrigger(CountableCriterion.CODEC))
-
     val EGG_HATCH = this.create("eggs_hatched", SimpleCriterionTrigger(CountableCriterion.CODEC))
 
     val EVOLVE_POKEMON = this.create("pokemon_evolved", SimpleCriterionTrigger(EvolvePokemonCriterion.CODEC))
@@ -55,11 +53,9 @@ 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,30 +8,26 @@
 
 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 baitId: String
-): SimpleCriterionCondition<CastPokeRodContext>(playerCtx) {
-
+    playerCtx: Optional<ContextAwarePredicate>,
+    val hasBait: Boolean
+): SimpleCriterionCondition<Boolean>(playerCtx) {
     companion object {
         val CODEC: Codec<CastPokeRodCriterionCondition> = RecordCodecBuilder.create { it.group(
-                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" }) }) }
+            EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(CastPokeRodCriterionCondition::playerCtx),
+            PrimitiveCodec.BOOL.fieldOf("hasBait").forGetter(CastPokeRodCriterionCondition::hasBait)
+        ).apply(it, ::CastPokeRodCriterionCondition) }
     }
 
-    override fun matches(player: ServerPlayer, context: CastPokeRodContext): Boolean {
-        return (context.baitId == this.baitId.asIdentifierDefaultingNamespace() || this.baitId.equals("empty_bait"))
+    override fun matches(player: ServerPlayer, context: Boolean): Boolean {
+        return hasBait == context
     }
-}
+}

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

@@ -26,25 +26,76 @@ class PartyCheckCriterion(
     companion object {
         val CODEC: Codec<PartyCheckCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PartyCheckCriterion::playerCtx),
-            ResourceLocation.CODEC.listOf().optionalFieldOf("party", listOf()).forGetter(PartyCheckCriterion::party)
+            ResourceLocation.CODEC.listOf().optionalFieldOf("id", listOf()).forGetter(PartyCheckCriterion::party)
         ).apply(it, ::PartyCheckCriterion) }
     }
 
     override fun matches(player: ServerPlayer, context: PlayerPartyStore): Boolean {
         val matches = mutableListOf<ResourceLocation>()
         party.forEach {
-            if (it == "any".asIdentifierDefaultingNamespace("minecraft") || it == "any".asIdentifierDefaultingNamespace()) {
+            if (it == "any".asIdentifierDefaultingNamespace()) {
                 matches.add(it)
             }
         }
         val partyCount = context.count()
         if (matches.containsAll(party) && party.size == partyCount && matches.size == partyCount) return true
-        matches.clear()
         context.iterator().forEach {
             if (party.contains(it.species.resourceIdentifier)) {
                 matches.add(it.species.resourceIdentifier)
             }
         }
-        return matches.containsAll(party) && matches.size == party.size
+        return matches.containsAll(party) && matches.size == partyCount
     }
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/*class PartyCheckCriterion(id: Identifier, entity: LootContextPredicate) : SimpleCriterionCondition<PartyCheckContext>(id, entity){
+    val party = mutableListOf<Identifier>()
+    override fun toJson(json: JsonObject) {
+        json.add("party", JsonArray(party.size).also {
+            party.forEach { pokemon -> it.add(pokemon.toString()) }
+        })
+    }
+
+    override fun fromJson(json: JsonObject) {
+        party.clear()
+        json.getAsJsonArray("party").forEach { element ->
+            party.add(element.asString.asIdentifierDefaultingNamespace())
+        }
+    }
+
+    override fun matches(player: ServerPlayer, context: PartyCheckContext): Boolean {
+        val playerParty = player.party()
+        val matches = mutableListOf<Identifier>()
+        party.forEach {
+            if (it == "any".asIdentifierDefaultingNamespace()) {
+                matches.add(it)
+            }
+        }
+        val partyCount = playerParty.count()
+        if (matches.containsAll(party) && party.size == partyCount && matches.size == partyCount) return true
+        playerParty.iterator().forEach {
+            if (party.contains(it.species.resourceIdentifier)) {
+                matches.add(it.species.resourceIdentifier)
+            }
+        }
+        return matches.containsAll(party) && matches.size == partyCount
+    }
+}
+
+open class PartyCheckContext(val party : PlayerPartyStore)*/

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

@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.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, priority: Priority) {
+open class Ability internal constructor(var template: AbilityTemplate, forced: Boolean) {
 
     val name: String
         get() = template.name
@@ -57,7 +57,7 @@ open class Ability internal constructor(var template: AbilityTemplate, forced: B
      *
      * @see [Pokemon.updateAbility].
      */
-    var priority = priority
+    var priority = Priority.LOWEST
         internal set
 
     @Deprecated("Please use the Codec instead", ReplaceWith("Ability.CODEC"))
@@ -111,7 +111,7 @@ open class Ability internal constructor(var template: AbilityTemplate, forced: B
                 Codec.BOOL.optionalFieldOf(DataKeys.POKEMON_ABILITY_FORCED, false).forGetter(Ability::forced),
                 Codec.INT.optionalFieldOf(DataKeys.POKEMON_ABILITY_INDEX, -1).forGetter(Ability::index),
                 Priority.CODEC.optionalFieldOf(DataKeys.POKEMON_ABILITY_PRIORITY, Priority.LOWEST).forGetter(Ability::priority)
-            ).apply(it) { template, forced, index, priority -> Ability(template, forced, priority).apply {
+            ).apply(it) { template, forced, index, priority -> Ability(template, forced).apply {
                 this.index = index
                 this.priority = priority
             } }

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

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

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

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

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

@@ -9,14 +9,11 @@
 package com.cobblemon.mod.common.api.ai
 
 import com.cobblemon.mod.common.api.ai.config.BrainConfig
-import com.cobblemon.mod.common.entity.MoLangScriptingEntity
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity
 import net.minecraft.world.entity.schedule.Schedule
 
 class BrainConfigurationContext {
-    var appliedBrainPresets: MutableSet<ResourceLocation> = mutableSetOf()
 
     var defaultActivity = Activity.IDLE
     var coreActivities = setOf(Activity.CORE)
@@ -30,11 +27,6 @@ class BrainConfigurationContext {
     fun apply(entity: LivingEntity, brainConfigs: List<BrainConfig>) {
         val brain = entity.brain
 
-        if (entity is MoLangScriptingEntity) {
-            entity.registerVariables(brainConfigs.flatMap { it.getVariables(entity) })
-            entity.initializeScripting()
-        }
-
         // Setup the brain config
         brainConfigs.forEach { it.configure(entity, this) }
 

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

@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai
-
-import com.cobblemon.mod.common.api.ai.config.BrainConfig
-import com.cobblemon.mod.common.util.asTranslated
-import com.cobblemon.mod.common.util.entityTypeRegistry
-import net.minecraft.network.chat.Component
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.entity.LivingEntity
-
-class BrainPreset(
-    val name: Component = "dummy".asTranslated(),
-    val description: Component = "".asTranslated(),
-    val entityType: ResourceLocation? = null,
-    val configurations: List<BrainConfig> = mutableListOf()
-) {
-    fun canBeApplied(entity: LivingEntity) = entityType?.let { entity.type == entity.level().entityTypeRegistry.get(it) } != false
-}

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

@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai
-
-import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.mojang.datafixers.util.Either
-import kotlin.jvm.optionals.getOrNull
-
-typealias ExpressionOrEntityVariable = Either<Expression, MoLangConfigVariable>
-
-fun List<ExpressionOrEntityVariable>.asVariables() = mapNotNull { it.right().getOrNull() }
-
-

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

@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai
-
-/**
- * The medium that an entity might be in which motivates what type of wandering it should do.
- *
- * If you've discovered this in main and it's not being used outside of that unused extension function, delete me
- *
- * @author Hiroku
- * @since January 25th, 2025
- */
-enum class PathfindingMedium {
-    LAND,
-    WATER,
-    LAVA,
-    AIR
-}

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

@@ -8,23 +8,27 @@
 
 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.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.ai.config.task.TaskConfig
-import com.cobblemon.mod.common.util.asExpression
-import com.mojang.datafixers.util.Either
+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: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    val condition = "true".asExpressionLike()
     val tasksByPriority = mutableMapOf<Int, List<TaskConfig>>()
-    override fun getVariables(entity: LivingEntity) = tasksByPriority.values.flatten().flatMap { it.getVariables(entity) } + listOf(condition).asVariables()
 
     override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
-        if (!checkCondition(entity, condition)) return
+        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) ->

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

@@ -8,42 +8,28 @@
 
 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.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.util.asExpression
-import com.mojang.datafixers.util.Either
+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 {
-    var condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    val condition = "true".asExpressionLike()
     val presets = mutableListOf<ResourceLocation>()
-    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
-        return if (checkCondition(entity, condition)) {
-            presets.flatMap {
-                CobblemonBrainConfigs.presets[it]?.configurations?.flatMap { it.getVariables(entity) } ?: emptyList()
-            } + listOf(condition).asVariables()
-        } else {
-            listOf(condition).asVariables()
-        }
-    }
-
     override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
-        if (!checkCondition(entity, condition)) return
+        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]?.takeIf { it.canBeApplied(entity) }?.configurations ?: return Cobblemon.LOGGER.warn("Preset $it not found") }
-        // Why not just add the presets to the context directly?
-        // Nested preset application is a thing, and I only want to track the top level presets.
-        // i.e. if a preset applies another preset, I don't want to track the inner preset, since it's redundant if we track the top one.
-        val originalContextPresets = brainConfigurationContext.appliedBrainPresets.toMutableSet()
-        presetConfigs.forEach {
-            it.configure(entity, brainConfigurationContext)
-        }
-        originalContextPresets.addAll(presets)
-        brainConfigurationContext.appliedBrainPresets = originalContextPresets
+        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

@@ -8,15 +8,7 @@
 
 package com.cobblemon.mod.common.api.ai.config
 
-import com.bedrockk.molang.runtime.MoLangRuntime
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 
 /**
@@ -38,21 +30,12 @@ interface BrainConfig {
             "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,
-            "add_variables" to AddVariablesConfig::class.java,
-            "set_variables" to SetVariablesConfig::class.java,
+            "set_core_activities" to SetCoreActivities::class.java
         )
 
     }
 
-    fun checkCondition(entity: LivingEntity, expressionOrEntityVariable: ExpressionOrEntityVariable): Boolean {
-        val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        return runtime.resolveBoolean(expressionOrEntityVariable.map({ it }, { "q.entity.config.${it.variableName}".asExpression() }))
-    }
-
 //    fun encode(buffer: RegistryFriendlyByteBuf)
 //    fun decode(buffer: RegistryFriendlyByteBuf)
-    fun getVariables(entity: LivingEntity): List<MoLangConfigVariable>
     fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext)
 }

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

@@ -9,13 +9,8 @@
 package com.cobblemon.mod.common.api.ai.config
 
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.MoLangScriptingEntity
 import net.minecraft.world.entity.LivingEntity
 
-class AddVariablesConfig : BrainConfig {
-    override fun getVariables(entity: LivingEntity) = mutableListOf<MoLangConfigVariable>()
-
-    // Configuration happens naturally through the override on variables
+object DummyBrainConfig : BrainConfig {
     override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {}
 }

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

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

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

@@ -15,10 +15,8 @@ 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.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.molang.ObjectValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.scripting.CobblemonScripts
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.util.activityRegistry
@@ -35,11 +33,10 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
 class ScriptBrainConfig : BrainConfig {
     val condition = "true".asExpressionLike()
     val script = cobblemonResource("dummy")
-    override fun getVariables(entity: LivingEntity) = mutableListOf<MoLangConfigVariable>()
 
     override fun configure(entity: LivingEntity, context: BrainConfigurationContext) {
         val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
         if (!runtime.resolveBoolean(condition)) return
 
         val struct = createBrainStruct(entity, context)
@@ -53,7 +50,7 @@ class ScriptBrainConfig : BrainConfig {
 
     fun createBrainStruct(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): QueryStruct {
         return QueryStruct(hashMapOf()).addStandardFunctions()
-            .addFunction("entity") { entity.asMostSpecificMoLangValue() }
+            .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 {

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

@@ -9,13 +9,11 @@
 package com.cobblemon.mod.common.api.ai.config
 
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity
 
 class SetCoreActivities : BrainConfig {
     val activities = mutableListOf<Activity>()
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
     override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
         brainConfigurationContext.coreActivities = activities.toSet()
     }

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

@@ -9,13 +9,11 @@
 package com.cobblemon.mod.common.api.ai.config
 
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity
 
 class SetDefaultActivity : BrainConfig {
     val activity: Activity = Activity.IDLE
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
     override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
         brainConfigurationContext.defaultActivity = activity
     }

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

@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config
-
-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.MoLangScriptingEntity
-import com.cobblemon.mod.common.util.resolve
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.entity.LivingEntity
-
-class SetVariablesConfig : BrainConfig {
-    var variableValues = mutableMapOf<String, ExpressionLike>()
-
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
-
-    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
-        val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (entity is MoLangScriptingEntity) {
-            variableValues.forEach { (variableName, valueExpression) ->
-                entity.config.setDirectly(variableName, runtime.resolve(valueExpression))
-            }
-        }
-    }
-}

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

@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.ai.config.task.WanderTaskConfig.Companion.WANDER
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.util.Either
-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.HoverRandomPos
-
-class AirWanderTaskConfig : SingleTaskConfig {
-    val condition = booleanVariable(WANDER, "air_wanders", true).asExpressible()
-    val wanderChance = numberVariable(WANDER, "air_wander_chance", 1/(20 * 1F)).asExpressible()
-    val horizontalRange = numberVariable(WANDER, "horizontal_wander_range", 20).asExpressible()
-    val verticalRange = numberVariable(WANDER, "vertical_wander_range", 5).asExpressible()
-    val speedMultiplier = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
-    val minUpwardsMovement: ExpressionOrEntityVariable = Either.left("3.0".asExpression())
-    val minDownwardsMovement: ExpressionOrEntityVariable = Either.left("3.0".asExpression())
-
-    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
-        return listOf(condition, wanderChance, horizontalRange, verticalRange, speedMultiplier, minUpwardsMovement, minDownwardsMovement).asVariables()
-    }
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) 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 || entity.isInWater) {
-                        return@Trigger false
-                    }
-
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-                    val wanderChance = wanderChance.resolveFloat()
-                    if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) return@Trigger false
-
-                    val rotVec = entity.getViewVector(0F)
-                    val target = HoverRandomPos.getPos(entity, horizontalRange.resolveInt(), verticalRange.resolveInt(), rotVec.x, rotVec.y, 1.5707964f, minUpwardsMovement.resolveInt(), minDownwardsMovement.resolveInt())
-                        ?: return@Trigger false
-                    walkTarget.set(WalkTarget(target, speedMultiplier.resolveFloat(), 3))
-                    lookTarget.set(BlockPosTracker(target))
-                    return@Trigger true
-                }
-            }
-        }
-    }
-}

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

@@ -8,36 +8,25 @@
 
 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.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.util.asExpression
+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 com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
 class AllOfTaskConfig : TaskConfig {
-    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    val condition = "true".asExpressionLike()
     val tasks: List<TaskConfig> = emptyList()
 
-    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
-        return if (checkCondition(entity, condition))
-            tasks.flatMap { it.getVariables(entity) } + listOf(condition).asVariables()
-        else
-            listOf(condition).asVariables()
-    }
-
     override fun createTasks(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
     ): List<BehaviorControl<in LivingEntity>> {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return emptyList()
+        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

@@ -8,10 +8,9 @@
 
 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.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+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
@@ -20,15 +19,13 @@ import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
 class AttackAngryAtTaskConfig : SingleTaskConfig {
-    val condition = booleanVariable(SharedEntityVariables.ATTACKING_CATEGORY, "should_attack_angry_at", true).asExpressible()
-    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
-
+    val condition = "true".asExpressionLike()
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
         return AttackAngryAtTask.create()
     }
 }

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

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

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

@@ -8,34 +8,30 @@
 
 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.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+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 com.mojang.datafixers.util.Either
 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: ExpressionOrEntityVariable = Either.left("true".asExpression())
-    val minDurationTicks: ExpressionOrEntityVariable = Either.left("40".asExpression())
-    val maxDurationTicks: ExpressionOrEntityVariable = Either.left("80".asExpression())
-    override fun getVariables(entity: LivingEntity) = listOf(condition, minDurationTicks, maxDurationTicks).asVariables()
+    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.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
-        return DoNothing(minDurationTicks.resolveInt(), maxDurationTicks.resolveInt())
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
+        return DoNothing(runtime.resolveInt(minDurationTicks), runtime.resolveInt(maxDurationTicks))
     }
 }

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

@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.battles.BattleRegistry
-import com.cobblemon.mod.common.entity.npc.NPCEntity
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-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 = booleanVariable(SharedEntityVariables.BATTLING_CATEGORY, "exit_battle_when_hurt", true).asExpressible()
-    var includePassiveDamage = booleanVariable(SharedEntityVariables.BATTLING_CATEGORY, "exit_battle_from_passive_damage", true).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        includePassiveDamage
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        val includePassiveDamage = includePassiveDamage.resolveBoolean()
-        if (!condition.resolveBoolean()) 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 if (entity is PokemonEntity) {
-            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_BATTLE))
-                        .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_BATTLE))
-                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelPokemonBattle(entity as PokemonEntity) } }
-                }
-            }
-        } else {
-            return null
-        }
-    }
-}

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

@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.FindRestingPlaceTask
-import com.cobblemon.mod.common.util.asExpression
-import com.mojang.datafixers.util.Either
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class FindRestingPlaceTaskConfig : SingleTaskConfig {
-    val horizontalSearchDistance: ExpressionOrEntityVariable = Either.left("16".asExpression())
-    val verticalSearchDistance: ExpressionOrEntityVariable = Either.left("5".asExpression())
-
-    override fun getVariables(entity: LivingEntity) = listOf(horizontalSearchDistance, verticalSearchDistance).asVariables()
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return WrapperLivingEntityTask(
-            FindRestingPlaceTask.create(horizontalSearchDistance.resolveInt(), verticalSearchDistance.resolveInt()),
-            PokemonEntity::class.java
-        )
-    }
-}

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

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

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

@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.FLEE_DESIRED_DISTANCE
-import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.FLEE_SPEED_MULTIPLIER
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.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 = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "flee_nearest_hostile", true).asExpressible()
-    var speedMultiplier = numberVariable(SharedEntityVariables.FEAR_CATEGORY, FLEE_SPEED_MULTIPLIER, 0.5).asExpressible()
-    var desiredDistance = numberVariable(SharedEntityVariables.FEAR_CATEGORY, FLEE_DESIRED_DISTANCE, 9).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(condition, speedMultiplier, desiredDistance).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PathfinderMob) return null
-        val speedMultiplier = speedMultiplier.resolveFloat()
-        val desiredDistance = desiredDistance.resolveInt()
-        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

@@ -8,31 +8,32 @@
 
 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.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+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 com.mojang.datafixers.util.Either
 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: ExpressionOrEntityVariable = Either.left("true".asExpression())
-    val minRunTicks: ExpressionOrEntityVariable = Either.left("150".asExpression())
-    val maxRunTicks: ExpressionOrEntityVariable = Either.left("250".asExpression())
-
-    override fun getVariables(entity: LivingEntity) = listOf(minRunTicks, maxRunTicks).asVariables()
+    val condition: ExpressionLike = "true".asExpressionLike()
+    val minRunTime: Expression = "150".asExpression()
+    val maxRunTime: Expression = "250".asExpression()
 
     override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
         return WrapperLivingEntityTask(
-            FollowWalkTargetTask(minRunTicks.resolveInt(), maxRunTicks.resolveInt()),
+            FollowWalkTargetTask(runtime.resolveInt(minRunTime), runtime.resolveInt(maxRunTime)),
             PathfinderMob::class.java
         )
     }

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

@@ -8,30 +8,26 @@
 
 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.asVariables
-import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.ATTACKING_CATEGORY
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+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 {
-    companion object {
-        const val GET_ANGRY_AT_ATTACKER = "get_angry_at_attacker"
-    }
-
-    val condition = booleanVariable(ATTACKING_CATEGORY, GET_ANGRY_AT_ATTACKER, true).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
+    val condition: ExpressionLike = "true".asExpressionLike()
 
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
+        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

@@ -8,43 +8,38 @@
 
 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.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+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 com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
-class GoToHealingMachineTaskConfig : SingleTaskConfig {
-    val condition = booleanVariable(SELF_HEALING, USE_HEALING_MACHINES, true).asExpressible()
-    val horizontalSearchRange: ExpressionOrEntityVariable = Either.left("10".asExpression())
-    val verticalSearchRange: ExpressionOrEntityVariable = Either.left("5".asExpression())
-    val completionRange: ExpressionOrEntityVariable = Either.left("1".asExpression())
-    val walkSpeed = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(condition, walkSpeed, horizontalSearchRange, verticalSearchRange, completionRange).asVariables()
-
-    companion object {
-        const val SELF_HEALING = "self_healing"
-        const val USE_HEALING_MACHINES = "use_healing_machines"
-    }
-
+class GoToHealingMachineTaskConfig(
+    val condition: ExpressionLike = "true".asExpressionLike(),
+    val horizontalSearchRange: Expression = "10".asExpression(),
+    val verticalSearchRange: Expression = "5".asExpression(),
+    val speedMultiplier: Expression = "0.33".asExpression(),
+    val completionRange: Expression = "1".asExpression()
+) : SingleTaskConfig {
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
 
         return GoToHealingMachineTask.create(
-            horizontalSearchRange = horizontalSearchRange.asExpression(),
-            verticalSearchRange = verticalSearchRange.asExpression(),
-            speedMultiplier = walkSpeed.asExpression(),
-            completionRange = completionRange.asExpression()
+            horizontalSearchRange = horizontalSearchRange,
+            verticalSearchRange = verticalSearchRange,
+            speedMultiplier = speedMultiplier,
+            completionRange = completionRange
         )
     }
 

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

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

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

@@ -8,33 +8,29 @@
 
 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.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.ai.config.task.GoToHealingMachineTaskConfig.Companion.SELF_HEALING
-import com.cobblemon.mod.common.api.ai.config.task.GoToHealingMachineTaskConfig.Companion.USE_HEALING_MACHINES
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+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 com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
 class HealUsingHealingMachineTaskConfig : SingleTaskConfig {
-    val condition = booleanVariable(SELF_HEALING, USE_HEALING_MACHINES, true).asExpressible()
-    val horizontalUseRange: ExpressionOrEntityVariable = Either.left("2".asExpression())
-    val verticalUseRange: ExpressionOrEntityVariable = Either.left("1".asExpression())
-
-    override fun getVariables(entity: LivingEntity) = listOf(condition, horizontalUseRange, verticalUseRange).asVariables()
+    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.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
-        return HealUsingHealingMachineTask(horizontalUseRange.asExpression(), verticalUseRange.asExpression())
+        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

@@ -8,41 +8,29 @@
 
 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.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+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 com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
 class LookAtBattlingPokemonTaskConfig : SingleTaskConfig {
-    companion object {
-        const val LOOK_AT_BATTLING_POKEMON = "look_at_battling_pokemon"
-    }
-
-    val condition = booleanVariable(SharedEntityVariables.BATTLING_CATEGORY, LOOK_AT_BATTLING_POKEMON, true).asExpressible()
-    val minDurationTicks: ExpressionOrEntityVariable = Either.left("40".asExpression())
-    val maxDurationTicks: ExpressionOrEntityVariable = Either.left("80".asExpression())
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        minDurationTicks,
-        maxDurationTicks
-    ).asVariables()
+    val minDurationTicks = "40".asExpression()
+    val maxDurationTicks = "80".asExpression()
 
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!resolveBooleanVariable(LOOK_AT_BATTLING_POKEMON)) return null
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
         return LookAtBattlingPokemonTask.create(
-            minDurationTicks = minDurationTicks.resolveInt(),
-            maxDurationTicks = maxDurationTicks.resolveInt()
+            minDurationTicks = runtime.resolveInt(minDurationTicks),
+            maxDurationTicks = runtime.resolveInt(maxDurationTicks)
         )
     }
+
 }

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

@@ -8,35 +8,29 @@
 
 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.asVariables
-import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.SEE_DISTANCE
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+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 {
-    companion object {
-        const val LOOK_AT_ENTITIES = "look_at_entities"
-    }
-
-    val condition = booleanVariable(SharedEntityVariables.LOOKING_CATEGORY, LOOK_AT_ENTITIES, true).asExpressible()
-    val maxDistance = numberVariable(SharedEntityVariables.LOOKING_CATEGORY, SEE_DISTANCE, 15).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        maxDistance
-    ).asVariables()
+    val condition: ExpressionLike = "true".asExpressionLike()
+    val maxDistance = "15".asExpression()
 
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
-        return SetEntityLookTarget.create(maxDistance.resolveFloat())
+        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

@@ -9,12 +9,10 @@
 package com.cobblemon.mod.common.api.ai.config.task
 
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.npc.ai.LookAtSpeakerTask
 import net.minecraft.world.entity.LivingEntity
 
 class LookAtSpeakerTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext

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

@@ -8,37 +8,33 @@
 
 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.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+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 com.mojang.datafixers.util.Either
 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: ExpressionOrEntityVariable = Either.left("true".asExpression())
-    val minDurationTicks: ExpressionOrEntityVariable = Either.left("80".asExpression())
-    val maxDurationTicks: ExpressionOrEntityVariable = Either.left("160".asExpression())
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        minDurationTicks,
-        maxDurationTicks
-    ).asVariables()
+    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.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
-        return WrapperLivingEntityTask(LookAtTargetSink(minDurationTicks.resolveInt(), maxDurationTicks.resolveInt()), Mob::class.java)
+        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/LookAtTargetedBattlePokemonTaskConfig.kt

@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.LookAtTargetedBattlePokemonTask
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class LookAtTargetedBattlePokemonTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity> {
-        return WrapperLivingEntityTask(LookAtTargetedBattlePokemonTask.create(), PokemonEntity::class.java)
-    }
-}

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

@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.LOOKING_CATEGORY
-import com.cobblemon.mod.common.entity.ai.LookInDirectionTask
-import net.minecraft.world.entity.LivingEntity
-
-class LookInDirectionTaskConfig : SingleTaskConfig {
-    var condition = booleanVariable(LOOKING_CATEGORY, "locked_rotation", true).asExpressible()
-    var yaw = numberVariable(LOOKING_CATEGORY, "locked_yaw", 0F).asExpressible()
-    var pitch = numberVariable(LOOKING_CATEGORY, "locked_pitch", 0F).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        yaw,
-        pitch
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ) = LookInDirectionTask(
-        shouldLock = condition.asExpression(),
-        yaw = yaw.asExpression(),
-        pitch = pitch.asExpression()
-    )
-}

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

@@ -8,36 +8,32 @@
 
 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.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+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 = booleanVariable(SharedEntityVariables.ATTACKING_CATEGORY, "attacks_melee", true).asExpressible()
-    val range = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "melee_range", 1.5F).asExpressible()
-    val cooldownTicks = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "melee_cooldown", 30).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        range,
-        cooldownTicks
-    ).asVariables()
+    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.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
 
         return MeleeAttackTask.create(
-            range = range.asExpression(),
-            cooldownTicks = cooldownTicks.asExpression()
+            range = range,
+            cooldownTicks = cooldownTicks
         )
     }
 }

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

@@ -9,28 +9,19 @@
 package com.cobblemon.mod.common.api.ai.config.task
 
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.ai.MoveToAttackTargetTask
 import com.cobblemon.mod.common.util.asExpression
-import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 
 class MoveToAttackTargetTaskConfig : SingleTaskConfig {
-    val speedMultiplier = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "attacking_movement_speed", 0.5).asExpressible()
-    val closeEnoughDistance: ExpressionOrEntityVariable = Either.left("1".asExpression())
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        speedMultiplier,
-        closeEnoughDistance
-    ).asVariables()
+    val speedMultiplier = "0.5".asExpression()
+    val closeEnoughDistance = "1".asExpression()
 
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
     ) = MoveToAttackTargetTask.create(
-        speedMultiplier = speedMultiplier.asExpression(),
-        closeEnoughDistance = closeEnoughDistance.asExpression()
+        speedMultiplier = speedMultiplier,
+        closeEnoughDistance = closeEnoughDistance
     )
 }

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

@@ -1,29 +0,0 @@
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.ai.FollowWalkTargetTask
-import com.cobblemon.mod.common.entity.ai.MoveToAttackTargetTask
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.MoveToItemAndEatTask
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.util.Either
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.PathfinderMob
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class MoveToItemAndEatTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
-
-    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<LivingEntity>? {
-        return WrapperLivingEntityTask(
-            MoveToItemAndEatTask(),
-            PokemonEntity::class.java
-        )
-    }
-}

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

@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.MoveToOwnerTask
-import com.cobblemon.mod.common.util.asExpression
-import com.mojang.datafixers.util.Either
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class MoveToOwnerTaskConfig : SingleTaskConfig {
-    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
-    var completionRange: ExpressionOrEntityVariable = Either.left("4.0".asExpression())
-    var speedMultiplier: ExpressionOrEntityVariable = Either.left("0.4".asExpression())
-    var teleportDistance: ExpressionOrEntityVariable = Either.left("24.0".asExpression())
-    var maxDistance: ExpressionOrEntityVariable = Either.left("14.0".asExpression())
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        completionRange,
-        speedMultiplier,
-        teleportDistance,
-        maxDistance
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return WrapperLivingEntityTask(
-            MoveToOwnerTask.create(
-                condition = condition.asExpression(),
-                completionRange = completionRange.asExpression(),
-                speedMultiplier = speedMultiplier.asExpression(),
-                teleportDistance = teleportDistance.asExpression(),
-                maxDistance = maxDistance.asExpression()
-            ),
-            PokemonEntity::class.java
-        )
-    }
-}

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

@@ -11,8 +11,6 @@ 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.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.resolveBoolean
@@ -36,16 +34,14 @@ import net.minecraft.world.entity.ai.behavior.RunOne
 class OneOfTaskConfig : SingleTaskConfig {
     class OneOfTaskOption {
         val weight: Int = 1
-        val task: TaskConfig = SingleTaskConfig.nothing()
+        val task: TaskConfig = SingleTaskConfig { _, _ -> DoNothing(0, 1) }
     }
 
     val condition: ExpressionLike = "true".asExpressionLike()
     val options = mutableListOf<OneOfTaskOption>()
 
-    override fun getVariables(entity: LivingEntity) = options.flatMap { it.task.getVariables(entity) }
-
     override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
         if (!runtime.resolveBoolean(condition)) return null
         return RunOne(options.map { it.task.createTasks(entity, brainConfigurationContext).first() toDF it.weight })
     }

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

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

@@ -11,8 +11,6 @@ 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.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.resolveBoolean
@@ -36,19 +34,17 @@ import net.minecraft.world.entity.ai.behavior.DoNothing
 class RandomTaskConfig : TaskConfig {
     class RandomTaskChoice {
         val weight = 1.0
-        val task: TaskConfig = SingleTaskConfig.nothing()
+        val task: TaskConfig = SingleTaskConfig { _, _ -> DoNothing(0, 1) }
     }
 
     val condition: ExpressionLike = "true".asExpressionLike()
     val choices = mutableListOf<RandomTaskChoice>()
 
-    override fun getVariables(entity: LivingEntity) = choices.flatMap { it.task.getVariables(entity) }
-
     override fun createTasks(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
     ): List<BehaviorControl<in LivingEntity>> {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        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

@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.scripting.CobblemonScripts
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-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 {
-    companion object {
-        const val SCRIPT_CATEGORY = "script"
-    }
-
-    val script = stringVariable(SCRIPT_CATEGORY, "script", "cobblemon:dummy_script").asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(script).asVariables()
-
-    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.asMostSpecificMoLangValue())
-                return@Trigger CobblemonScripts.run(script.resolveString().asIdentifierDefaultingNamespace(), runtime) == DoubleValue.ONE
-            }
-        }
-    }
-}

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

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-object SharedEntityVariables {
-    const val MOVEMENT_CATEGORY = "movement"
-    const val FEAR_CATEGORY = "fear"
-    const val ATTACKING_CATEGORY = "attacking"
-    const val BATTLING_CATEGORY = "battling"
-    const val LOOKING_CATEGORY = "looking"
-
-    const val WALK_SPEED = "walk_speed"
-    const val FLEE_SPEED_MULTIPLIER = "flee_speed_multiplier"
-    const val FLEE_DESIRED_DISTANCE = "flee_desired_distance"
-    const val SEE_DISTANCE = "see_distance"
-}

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

@@ -9,24 +9,10 @@
 package com.cobblemon.mod.common.api.ai.config.task
 
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.DoNothing
-
-interface SingleTaskConfig : TaskConfig {
-    companion object {
-        fun nothing() = object : SingleTaskConfig {
-            override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
-            override fun createTask(
-                entity: LivingEntity,
-                brainConfigurationContext: BrainConfigurationContext
-            ): BehaviorControl<in LivingEntity>? {
-                return DoNothing(0, 1)
-            }
-        }
-    }
 
+fun interface SingleTaskConfig : TaskConfig {
     override fun createTasks(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext

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

@@ -8,31 +8,31 @@
 
 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.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+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 = booleanVariable(SharedEntityVariables.MOVEMENT_CATEGORY, "can_float", true).asExpressible()
-    val chance = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, "float_chance", 0.8F).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        chance
-    ).asVariables()
-
+    val condition: ExpressionLike = "true".asExpressionLike()
+    val chance: Expression = "0.01".asExpression()
     override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
+        val chance = runtime.resolveFloat(chance)
         return WrapperLivingEntityTask(
-            StayAfloatTask(chance.resolveFloat()),
+            StayAfloatTask(chance),
             PathfinderMob::class.java
         )
     }

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

@@ -8,26 +8,26 @@
 
 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.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+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 = booleanVariable(SharedEntityVariables.ATTACKING_CATEGORY, "stop_being_angry_if_attacker_dead", true).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
+    val condition: ExpressionLike = "true".asExpressionLike()
 
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
+        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

@@ -8,26 +8,15 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.npc.ai.SwitchFromActionEffectTask
 import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
-import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.schedule.Activity
 
 class SwitchFromActionEffectTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    val activity = Activity.IDLE
     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
-            }
-        }
-    }
+    ) = SwitchFromActionEffectTask.create(activity)
 }

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

@@ -10,13 +10,13 @@ package com.cobblemon.mod.common.api.ai.config.task
 
 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.schedule.Activity
 
 class SwitchFromChattingTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    val activity = Activity.IDLE
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
@@ -24,8 +24,8 @@ class SwitchFromChattingTaskConfig : SingleTaskConfig {
         it.group(
             it.absent(CobblemonMemories.DIALOGUES)
         ).apply(it) { _ ->
-            Trigger { level, entity, _ ->
-                entity.brain.updateActivityFromSchedule(level.dayTime, level.gameTime)
+            Trigger { world, entity, _ ->
+                entity.brain.setActiveActivityIfPossible(activity)
                 return@Trigger true
             }
         }

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

@@ -9,14 +9,14 @@
 package com.cobblemon.mod.common.api.ai.config.task
 
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.schedule.Activity
 
 class SwitchFromFightTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    val activity = Activity.IDLE
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
@@ -24,8 +24,8 @@ class SwitchFromFightTaskConfig : SingleTaskConfig {
         it.group(
             it.absent(MemoryModuleType.ATTACK_TARGET)
         ).apply(it) { _ ->
-            Trigger { level, entity, _ ->
-                entity.brain.updateActivityFromSchedule(level.dayTime, level.gameTime)
+            Trigger { world, entity, _ ->
+                entity.brain.setActiveActivityIfPossible(activity)
                 return@Trigger true
             }
         }

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

@@ -8,27 +8,18 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.npc.ai.SwitchFromBattleTask
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
-import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.schedule.Activity
 
 class SwitchFromNPCBattleTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    val activity: Activity = Activity.IDLE
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        return BehaviorBuilder.create {
-            it.group(it.absent(CobblemonMemories.NPC_BATTLING)).apply(it) { _ ->
-                Trigger { level, entity, _ ->
-                    entity.brain.updateActivityFromSchedule(level.dayTime, level.gameTime)
-                    true
-                }
-            }
-        }
+        return SwitchFromBattleTask.create(activity)
     }
 }

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

@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
-import net.minecraft.world.entity.ai.behavior.declarative.Trigger
-
-class SwitchFromPokemonBattleTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return BehaviorBuilder.create {
-            it.group(it.absent(CobblemonMemories.POKEMON_BATTLE)).apply(it) { _ ->
-                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

@@ -11,14 +11,12 @@ 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 com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 
 class SwitchToActionEffectTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
@@ -28,7 +26,7 @@ class SwitchToActionEffectTaskConfig : SingleTaskConfig {
                 it.absent(CobblemonMemories.ACTIVE_ACTION_EFFECT)
             ).apply(it) { _ ->
                 Trigger { world, entity, time ->
-                    entity.brain.setActiveActivityIfPossible(CobblemonActivities.ACTION_EFFECT)
+                    entity.brain.setActiveActivityIfPossible(CobblemonActivities.NPC_ACTION_EFFECT)
                     return@Trigger true
                 }
             }

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

@@ -8,17 +8,21 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
+import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.CobblemonActivities
 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 
 class SwitchToChattingTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    val condition = "true".asExpressionLike()
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
@@ -28,6 +32,8 @@ class SwitchToChattingTaskConfig : SingleTaskConfig {
             it.registered(MemoryModuleType.WALK_TARGET)
         ).apply(it) { _, walkTarget ->
             Trigger { world, entity, _ ->
+                runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+                if (!runtime.resolveBoolean(condition)) return@Trigger false
                 walkTarget.erase()
                 entity.brain.setActiveActivityIfPossible(CobblemonActivities.NPC_CHATTING)
                 return@Trigger true

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

@@ -8,9 +8,11 @@
 
 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.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+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
@@ -20,10 +22,9 @@ 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 getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
-
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
@@ -32,7 +33,8 @@ class SwitchToFightTaskConfig : SingleTaskConfig {
             it.present(MemoryModuleType.ATTACK_TARGET)
         ).apply(it) { _ ->
             Trigger { world, entity, _ ->
-                runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+                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)

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

@@ -9,13 +9,11 @@
 package com.cobblemon.mod.common.api.ai.config.task
 
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.npc.ai.SwitchToBattleTask
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
 class SwitchToNPCBattleTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext

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

@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.util.asExpression
-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.Behavior
-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 SwitchToPanicWhenHostilesNearbyTaskConfig : SingleTaskConfig {
-    var condition = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "panic_when_hostiles_nearby", true).asExpressible()
-    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
-        return 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

@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.world.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 = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "panic_when_hurt", true).asExpressible()
-    var includePassiveDamage =  booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "panic_on_passive_damage", false).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        includePassiveDamage
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
-        return if (includePassiveDamage.resolveBoolean()) {
-            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/SwitchToPokemonBattleTaskConfig.kt

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

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

@@ -10,18 +10,7 @@ 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.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.lang
-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.resolveString
-import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
@@ -34,13 +23,11 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
  * @author Hiroku
  * @since October 14th, 2024
  */
-interface TaskConfig {
+fun interface TaskConfig {
     companion object {
         val types = mutableMapOf<String, Class<out TaskConfig>>(
             "one_of" to OneOfTaskConfig::class.java,
             "wander" to WanderTaskConfig::class.java,
-            "water_wander" to WaterWanderTaskConfig::class.java,
-            "air_wander" to AirWanderTaskConfig::class.java,
             "look_at_target" to LookAtTargetTaskConfig::class.java,
             "follow_walk_target" to FollowWalkTargetTaskConfig::class.java,
             "random" to RandomTaskConfig::class.java,
@@ -52,9 +39,6 @@ interface TaskConfig {
             "switch_npc_to_battle" to SwitchToNPCBattleTaskConfig::class.java,
             "look_at_battling_pokemon" to LookAtBattlingPokemonTaskConfig::class.java,
             "switch_npc_from_battle" to SwitchFromNPCBattleTaskConfig::class.java,
-            "switch_pokemon_to_battle" to SwitchToPokemonBattleTaskConfig::class.java,
-            "look_at_targeted_battle_pokemon" to LookAtTargetedBattlePokemonTaskConfig::class.java,
-            "switch_pokemon_from_battle" to SwitchFromPokemonBattleTaskConfig::class.java,
             "go_to_healing_machine" to GoToHealingMachineTaskConfig::class.java,
             "heal_using_healing_machine" to HealUsingHealingMachineTaskConfig::class.java,
             "all_of" to AllOfTaskConfig::class.java,
@@ -68,19 +52,6 @@ interface TaskConfig {
             "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,
-            "wake_up" to WakeUpTaskConfig::class.java,
-            "go_to_sleep" to GoToSleepTaskConfig::class.java,
-            "find_resting_place" to FindRestingPlaceTaskConfig::class.java,
-            "move_to_owner" to MoveToOwnerTaskConfig::class.java,
-            "move_to_item_and_eat" to MoveToItemAndEatTaskConfig::class.java,
         )
 
         val runtime = MoLangRuntime().setup()
@@ -89,38 +60,6 @@ interface TaskConfig {
     val runtime: MoLangRuntime
         get() = Companion.runtime
 
-    fun checkCondition(entity: LivingEntity, expressionOrEntityVariable: ExpressionOrEntityVariable): Boolean {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        return expressionOrEntityVariable.resolveBoolean()
-    }
-
-    fun ExpressionOrEntityVariable.asExpression() = map({ it }, { "q.entity.config.${it.variableName}".asExpression() })
-    fun ExpressionOrEntityVariable.resolveString() = runtime.resolveString(asExpression())
-    fun ExpressionOrEntityVariable.resolveBoolean() = runtime.resolveBoolean(asExpression())
-    fun ExpressionOrEntityVariable.resolveInt() = runtime.resolveInt(asExpression())
-    fun ExpressionOrEntityVariable.resolveDouble() = runtime.resolveDouble(asExpression())
-    fun ExpressionOrEntityVariable.resolveFloat() = runtime.resolveFloat(asExpression())
-
-    private fun variable(category: String, name: String, type: MoLangConfigVariable.MoLangVariableType, default: String) = MoLangConfigVariable(
-        variableName = name,
-        category = lang("entity.variable.category.$category"),
-        displayName = lang("entity.variable.$name.name"),
-        description = lang("entity.variable.$name.desc"),
-        type = type,
-        defaultValue = default
-    )
-
-    fun stringVariable(category: String, name: String, default: String) = variable(category = category, name = name, type = MoLangConfigVariable.MoLangVariableType.TEXT, default = default)
-    fun numberVariable(category: String, name: String, default: Number) = variable(category = category, name = name, type = MoLangConfigVariable.MoLangVariableType.NUMBER, default = default.toString())
-    fun booleanVariable(category: String, name: String, default: Boolean) = variable(category = category, name = name, type = MoLangConfigVariable.MoLangVariableType.BOOLEAN, default = default.toString())
-
-    fun getVariableExpression(name: String) = "q.entity.config.$name".asExpression()
-    fun resolveStringVariable(name: String) = runtime.resolveString(getVariableExpression(name))
-    fun resolveBooleanVariable(name: String) = runtime.resolveBoolean(getVariableExpression(name))
-    fun resolveNumberVariable(name: String) = runtime.resolveDouble(getVariableExpression(name))
-
-    /** The variables that this task config uses. These are used to declare variables on the entity cleanly. */
-    fun getVariables(entity: LivingEntity): List<MoLangConfigVariable>
     /** 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/WakeUpTaskConfig.kt

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

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

@@ -8,16 +8,23 @@
 
 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.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+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.RandomStroll
 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
@@ -25,31 +32,20 @@ import net.minecraft.world.entity.ai.memory.WalkTarget
 import net.minecraft.world.entity.ai.util.LandRandomPos
 
 class WanderTaskConfig : SingleTaskConfig {
-    companion object {
-        const val WANDER = "wander" // Category
-    }
-
-    val condition = booleanVariable(WANDER, "wanders", true).asExpressible()
-    val wanderChance = numberVariable(WANDER, "wander_chance", 1/(20 * 6F)).asExpressible()
-    val horizontalRange = numberVariable(WANDER, "horizontal_wander_range", 10).asExpressible()
-    val verticalRange = numberVariable(WANDER, "vertical_wander_range", 5).asExpressible()
-
-    val speedMultiplier = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        wanderChance,
-        horizontalRange,
-        verticalRange,
-        speedMultiplier
-    ).asVariables()
+    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.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
 
         return BehaviorBuilder.create {
             it.group(
@@ -61,13 +57,12 @@ class WanderTaskConfig : SingleTaskConfig {
                         return@Trigger false
                     }
 
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-                    val wanderChance = wanderChance.resolveFloat()
-                    if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) return@Trigger false
+                    runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+                    if (!runtime.resolveBoolean(shouldWander)) return@Trigger false
 
-                    val targetVec = LandRandomPos.getPos(entity, horizontalRange.resolveInt(), verticalRange.resolveInt(), { 0.0 }) ?: return@Trigger false
-                    walkTarget.set(WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1))
-                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
+                    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/ai/config/task/WaterWanderTaskConfig.kt

@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.ai.config.task.WanderTaskConfig.Companion.WANDER
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.util.Either
-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.BehaviorUtils
-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
-
-class WaterWanderTaskConfig : SingleTaskConfig {
-    val condition = booleanVariable(WANDER, "water_wanders", true).asExpressible()
-    val wanderChance = numberVariable(WANDER, "water_wander_chance", 1/(20 * 3F)).asExpressible()
-    val speedMultiplier = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
-    val horizontalRange: ExpressionOrEntityVariable = Either.left("10.0".asExpression())
-    val verticalRange: ExpressionOrEntityVariable = Either.left("3.0".asExpression())
-
-    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
-        return listOf(condition, wanderChance, speedMultiplier).asVariables()
-    }
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) 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 || !entity.isInWater) {
-                        return@Trigger false
-                    }
-
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-                    val wanderChance = wanderChance.resolveFloat()
-                    if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) return@Trigger false
-
-                    val target = BehaviorUtils.getRandomSwimmablePos(entity, horizontalRange.resolveInt(), verticalRange.resolveInt()) ?: return@Trigger false
-                    walkTarget.set(WalkTarget(target, speedMultiplier.resolveFloat(), 1))
-                    lookTarget.set(BlockPosTracker(target))
-                    return@Trigger true
-                }
-            }
-        }
-    }
-}