not snap

[1.6] Add entity type id molang function

See merge request cable-mc/cobblemon!1415

.gitlab-ci.yml

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

CHANGELOG.md

@@ -4,59 +4,54 @@
 
 ### Additions
 - Added the Pokédex as a craftable item that can be placed on lecterns.
-- Added Pokémon (and item) fishing using modified fishing rods - Poké Rods! You'll need a Poké Rod smithing template, a fishing rod, and some type of Poké Ball. Each Poké Ball makes a differently themed rod. Why not?
+- Added Pokémon (and item) fishing using modified fishing rods - Poké Rods! You'll need a Poké Rod smithing template, a fishing rod, and some type of Poké Ball. Each Poké Ball makes a differently themed rod because it's cool.
 - Added Lure Ball functionality, increasing the catch rate of Pokémon that were caught on a fishing rod.
 - Added Repeat Ball functionality, increasing the catch rate of Pokémon that are already registered as caught in a player's Pokédex.
-- Added property chaining support for duplicate CustomPokemonPropertyType elements.
 - Added flat level battling with options to set all Pokémon to level 50, 100, or 5 for the duration of a battle. No experience or EVs are granted for a flat battle.
-- Added `aspect` and `unaspect` PokemonProperty arguments (which also includes commands such as `/pokemonedit`, `/spawnpokemon`, and `/givepokemon`) to allow forcing or un-forcing an aspect on a Pokémon.
-- Added `type` alternatively `elemental_type` PokemonProperty argument, this is only used for filtering and is not applied to Pokémon. Example `type=fire` would be true for Charmander but false for Squirtle.
 - Added support for Double Battles, Triple Battles, and Multi-battles.
+- 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 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 Pokémon Centers to all 5 village types.
-- Added a `natural` block state property for the healing machine block; when property is set to true, the block will have a different texture and drop an iron ingot instead of itself.
-- New config setting `displayEntityNameLabel` and `displayEntityLabelsWhenCrouchingOnly` to control what and when is displayed for the pokemon label
-- `/freezepokemon` command to pause a Pokémon's animation at a specific point in time.
-- Added `no_ai` and `freeze_frame` options to the `/spawnpokemon` command.
-- Added shiny Pokémon effects.
-- Added effects for the burn status effect.
-- Added effects for the moves: Psychic, Water Sport, and Mud Sport.
-- Added a new universal locator called `top`.
-- Added `moves` option to Pokémon properties, allowing you to set the moves of a Pokémon in commands and spawn files using comma-separated move names.
-- Added shiny Pokémon effects.
+- Added 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 a new universal locator called `top`.
-- Added shiny Pokémon particles with sound effects.
+- 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.
-- Added `/spawnnpc` and `/spawnnpcat` commands.
-- Pokémon are now animated when seen in any GUI that isn't the party GUI.
 - Quirk animations can now occur for Pokémon that are shoulder mounted.
-- Added `fishing boat` structures that contain an Explorer Map leading to a shipwreck cove and a Poké Rod Smithing Template.
-- Added `submerged_shipwreck_cove` and `lush_shipwreck_cove` structures.
 - Added new sounds for Poké Balls bouncing off of Pokémon and landing on the ground during capture.
 - Added a unique set of sounds for Ancient Poké Balls.
 - Added a sound for using Exp Candy and Rare Candy items.
-- Added raft platforms for non-swimming, non-flying Pokémon to stand on during battles that take place on the water's surface. (Flying Pokémon will fly over water in battle, and water breathing Pokémon will swim in water during battle.)
+- Added 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 `aspect` and `unaspect` PokemonProperty arguments (which also includes commands such as `/pokemonedit`, `/spawnpokemon`, and `/givepokemon`) to allow forcing or un-forcing an aspect on a Pokémon.
+- Added `type` alternatively `elemental_type` PokemonProperty argument, this is only used for filtering and is not applied to Pokémon. Example `type=fire` would be true for Charmander but false for Squirtle.
 
+### Structures Added
+- Fishing boat structure that contain an Explorer Map leading to a shipwreck cove and a Poké Rod Smithing Template.
+- Stonjourner Henge Ruins, Luna Henge Ruins, and Sol Henge Ruins.
+- Submerged Shipwreck Cove and Lush Shipwreck Cove.
+- Pokémon Centers to all 5 village types.
+ 
 ### Pokémon Added
 #### Gen 1
-- Alola Bias Cubone
+- Alola Bias Cubone (built-in resource pack)
 - Alolan Marowak
 
 #### Gen 2
@@ -71,6 +66,7 @@
 - Octillery
 - Mantine
 - Smeargle
+- Delibird
 
 #### Gen 3
 - Slakoth
@@ -142,8 +138,8 @@
 - Dondozo
 
 #### Unique Forms
-- Magikarp Jump Variants
-- Gyarados Jump Variants
+- Magikarp Jump variants for Magikarp
+- Magikarp Jump variants for Gyarados (built-in resource pack, enabled by default on Fabric)
 
 ### Added cries to the following Pokémon
 - Sandshrew, Sandslash
@@ -250,6 +246,7 @@
 ### Model updates for the following Pokémon
 - Bulbasaur, Ivysaur, Venusaur
 - Charmander, Charmeleon, Charizard
+- Caterpie
 - Kakuna, Beedrill
 - Lapras
 - Porygon, Porygon2, Porygon-Z
@@ -285,9 +282,11 @@
 - Phantump, Trevenant
 - Litten, Torracat, Incineroar
 - Popplio, Brionne, Primarina
+- Mudbray
 - Lurantis
 - Scorbunny, Cinderace
 - Quaxly
+- Skeledirge
 - Tatsugiri
 
 ### Changes
@@ -297,43 +296,37 @@
 - Adjusted volumes of sounds made by Display Cases, Berry Bushes, Energy Root, Medicinal Leek, Vivichoke, Mints, Revival Herbs and Gilded Chests.
 - Changes to mulch buffs/durations.
 - Updated potion sprites.
-- Link Cable recipe has been redesigned.
+- Changed Link Cable recipe to be much cheaper.
 - Updated sounds for Medicinal Leeks, Big Roots, Energy Roots and Revival Herbs.
 - Updated UI sounds for clicking and evolving Pokémon.
 - Updated cries for Chansey, Crobat, Hoothoot, Noctowl.
 - Removed the interchangeable evolution results for the first stage Hisuian starters to prevent confusion. The method still exists for stage 2 to 3, but stage 1 to 2 was not distinguishable enough for many users.
-- Bulbasaur, Ivysaur, Venusaur, Kakuna, Beedrill, Snorlax, Munchlax, Krabby, Kingler, Lurantis, Horsea, Seadra, Kingdra, Litten, Torracat, Incineroar, Mudkip, Marshtomp, Swampert, Scorbunny, Cinderace, Prinplup, Empoleon, Relicanth, Goldeen, Seaking, Shellder, Cloyster, Tatsugiri, Igglybuff, Jigglypuff, Wigglytuff, Krookodile, Gible, Gabite, Garchomp, Rhyhorn, Rhydon, Rhyperior, and Carvanha received model updates.
 - Vivillon wings will stop being clear when you remove any Vivillon related resourcepacks. The default pattern will be the meadow wings.
-- Adjusted Pokémon sendout positions for single battles.
 - Wild Pokémon interaction range increased to 12 blocks (from 10 blocks).
 - Player trade range increased to 12 blocks (from 10 blocks).
 - PvP battle range increased to 32 blocks (from 10 blocks).
 - Spectate range increased to 64 blocks (from 10 blocks).
 - The inventory key now closes our GUIs if they are open, mirroring how Minecraft screens usually work.
 - The noise from the pasture and PC blocks being interacted with now activates Sculk sensors.
-- Updated dialogue GUI assets with proper assets.
+- Updated dialogue GUI assets with proper assets not made by a programmer. Well, it was still a programmer, but- someone who can also draw!
 - Updated party switching interface when in battle.
 - Relic coin pouches can now be waterlogged.
-- 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 "Press R to start battle prompt" will now disappear after a player's first battle has been won. You've probably figured that detail out by then.
+- The default number of digits for the Pokédex number in the summary has been increased, from 3 to 4. There sure are a lot of Pokémon these days.
 - The pasture block model's screen is now off by default.
 - The Poké Balls creative tab is now named Utility Items as it also encompasses Poké Rod and Pokédex items.
 - Moves can now be benched without specifying a replacement move, allowing for empty move slots.
 - Moves learned via Sketch now persist after battle.
-- Updated potion sprites
-- Removed the interchangeable evolution results for the first stage Hisuian starters to prevent confusion. The method still exists for stage 2 to 3, but stage 1 to 2 was not distinguishable enough for many users.
 - Hidden Power now displays its effective typing.
 - Updated particles for moves: Confusion, Protect, Sand Attack, and Quick Attack.
 - Updated particles for status effects: Paralysis, Poison, and Sleep.
 - Updated particles on Gastly.
 - Revamped stat buff and de-buff particles.
 - Improved the performance of display cases that contain Pokémon photos.
-- Updated sounds for Poké Balls.
-- Updated the Poké Ball animation for Pokémon breaking out.
+- 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.
+- 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.
@@ -343,12 +336,15 @@
     - A short jump indicates that you caught the Pokémon.
 - Pokémon sent out during battle will spawn facing their opponent.
 - Pokémon sent out outside a battle will spawn facing their trainer.
+- Wailord is now 25% bigger. ... [But I have an idea.](https://tenor.com/view/star-wars-more-gif-21856591)
+- Region-biased Pokémon forms are now optional to a built-in resource pack. This pack is enabled by default for Fabric. For NeoForge users, all our built-in resource packs default to disabled because that's all it supports right now.
+- Update item sprites for Cell Battery, Chipped Pot, Covert Cloak, Cracked Pot, Masterpiece Teacup, Red Card, Sachet, and Unremarkable Teacup.
 
 ### Fixes
 - Fixed Ability Patches not reverting Hidden Abilities back to Normal Abilities.
 - Fixed awarding Pokémon experience upon forfeiting battles.
 - Scaled down Amaura's fetus model to avoid clipping through the tank while animating.
-- Fixed Cubone's cry not having a sound.
+- Fixed Cubone's cry not having a sound (as if that Pokémon needed to be more tragic).
 - Fixed the sendout sound erroneously playing when a wild Pokémon breaks out of a Poké ball.
 - Flamethrower is no longer missing sounds.
 - Fixed the Seafloor spawning context not being a usable context.
@@ -356,61 +352,58 @@
 - Fixed Gilded Chests not dropping the chest itself when broken, only the contents.
 - Fixed Pokémon losing their Hidden Ability through evolution if the middle stage did not have a Hidden Ability.
 - Hidden Power no longer plays the water type action effect (It now plays the normal type action effect).
-- Fixed Chimchar and Monferno T-posing whenever they sleep.
-- Fixed Cetitan's cry breaking its walk and sleep animations. 
-- Fixed Crumbling Arch not blending in with the world.
-- Fixed Energy Root applying being usable on a fainted Pokémon.
-- Fixed Pokémon entity not spawning when starting a battle while recalling said Pokémon.
+- Fixed Crumbling Arch structures not blending in with the world.
+- Fixed Energy Root being usable on a fainted Pokémon.
+- Fixed Pokémon not being sent out when starting a battle while recalling said Pokémon.
 - Fixed species comparison not using namespace for both sides in `PokemonProperties.isSubsetOf`.
 - Fixed `PokemonProperties#asString` prefixing nicknames with a '$'.
-- Fixed PC not saving when Pokémon was changed outside.
 - Fixed shearable Pokémon not dropping correct wool colors.
 - Fixed pasture spawning Pokémon inside solid blocks when closest spawning position is blocked off.
 - Fixed Tumbling Down advancement not being granted by tumblestone variants.
 - Improve error handling when loading spawn sets to ensure invalid configurations don't crash the server.
 - Fixed empty `JsonPlayerData` files resulting in players being unable to join server/world.
-- Evolution notification and UI sound is now correctly playing (again).
+- Sound for evolving Pokémon through the Summary Menu is now correctly playing again.
 - Fix Starter prompt not showing up.
-- Fix evolution now granting Pokédex entries.
-- Fix Pokédex crash when a form is looked up without ever seeing the "normal" form.
-- Fixed owned poké balls floating upwards if pausing mid-transition.
+- Fixed owned Poké balls floating upwards if pausing the game mid-transition (which looked absolutely hilarious).
 - Fixed all mouse buttons working for Battle UI navigation (now it's only primary/left click).
 - Fixed trading Pokémon setting their friendship to 0 instead of the base value.
-- Fixed a scenario where a Pokémon that rolled to spawn with a special Tera type sometimes has a Tera type that is already a part of their natural typing.
+- Fixed a scenario where a Pokémon that rolled to spawn with a special Tera type sometimes having a Tera type that is already a part of their natural typing.
 - Fixed PokemonProperty argument suggestions for `tera` and `tera_type` not suggesting `stellar`.
 - Fixed being able to stack Relic Coin Pouches on top of each other.
-- Fixed Model loader generating misleading crash-reports when client is crashing.
+- Fixed model loader generating misleading crash-reports when client is crashing - that resurrection tank error wasn't our fault! We're innocent, your honour!
 - Big Roots and Energy Roots now share the same sounds as intended.
 - Fixed sounds made by blocks playing at a lower pitch than intended.
-- Fixed Chimchar and Monferno T posing whenever they sleep.
+- Fixed Chimchar and Monferno comically T posing whenever they sleep.
+- Fixed Cetitan's cry breaking its walk and sleep animations. 
 - Fixed the Magby line not having any placeholder walk animations.
 - Fixed Duskull and Dusclops using skylight levels for their nether spawn data. There is no sun in the Nether!
 - Fixed Hisuian Zoroark using base Zoroark stats.
 - Fixed Bellossom clipping into the player head when shoulder mounted.
 - Fixed Shroomish's look range to prevent it from looking higher than it should.
-- Fixed Maushold's faint animations not playing. It's sadder than Tandemaus!
+- Fixed Maushold's faint animations not playing. It's even sadder than Tandemaus!
 - Fixed Slowking's battle idle.
 - Fixed Grafaiai's walk speed to prevent model sliding.
-- Fixed Maushold's faint animations not playing. It's sadder than Tandemaus! 
-- Fixed Slowking's battle idle. 
-- Fixed Grafaiai's walk speed to prevent model sliding. 
 - Fixed Alolan Exeggutor's tail not showing in the party UI. It will now also stand in front of all Pokémon in the party menu :)
 - Fixed Timburr duplicating its log while fainting.
 - Fixed hitbox sizes for Grotle and Torterra being set to default values.
-- Fixed reviving items throwing an exception when used in battle.
+- Fixed Hisuian Sneasel using Johtonian Sneasel's cry. Johto-nian. Jotonion. Jotunheim?
+- Fixed Trevenant T-posing after 8 seconds of sleeping. I also do that.
+- Fixed Bewear T-posing for a bit if a wild one faints where you can see.
+- Fixed Noctowl's placeholder fly animation.
+- Corrected Lotad blinking animation. 
+- Fixed reviving items causing errors when used in battle.
 - Fixed messages for Focus Sash, Confusion, Mummy, Ice Face, Own Tempo, and Revive.
 - Improve error handling when loading spawn-sets to ensure invalid configurations don't crash the server.
-- Fixed `crumbling_arch_ruins` from generating a giant cube of air and removed the chest.
+- Fixed Crumbling Arch Ruins generating a giant cube of air and removed the chest.
 - Fixed possible crash on large population servers due to concurrent access of data.
 - Quickly sending out and recalling Pokémon now looks smoother and can no longer be spammed to cause desync issues.
 - Pokémon are now invulnerable during sendout animation and intangible during recall animation.
-- Pokémon are now invincible during sendout animation and intangible during recall animation.
 - Scrolling with party keybinding now behaves properly when using high scroll speed or scroll sensitivity.
 - Fixed battle log GUI flashing when Battle GUI is opened.
 - Bag Items used during a turn will now be refunded if the battle ends before the next turn begins.
-- Pokémon whose current owner is not its Original Trainer now gains extra experience.
+- Pokémon whose current owner is not its Original Trainer now gain extra experience.
 - Fixed Fossil Resurrection advancement not being granted.
-- Fixed village generation caps not applying for berry farms. You were not meant to see more than two berry farms per village!
+- Fixed village generation caps not applying for berry farms. You were not meant to see more than two berry farms per village! This has been broken for ages but no one noticed... Hmmm... We could just remove it from here...
 - Fixed the Ice Face ability activation being displayed incorrectly in a battle.
 - Fixed edge case of F1 and R locking you in battle with no R functionality (requiring ESC to get out).
 - Fixed Poké Ball render orientation in battle interface when capturing.
@@ -423,26 +416,23 @@
 - Fixed top black border rendering in scroll interfaces in summary UI.
 - Fixed aspect tracking for Advancements.
 - Fixed illusion not copying aspects or caught ball.
-- Delay when successfully catching a Pokémon in an Ancient Poké Ball has been increased to account for the new sounds and particles.
 - Prevent summary stats tab from making sounds when clicking on an already open tab.
 - Fixed display case not being able to be fed items from underneath.
 - Fixed Pokémon battling in water continuously sinking to the bottom.
+- 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
@@ -458,34 +448,42 @@
     - 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)
+- 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" folder has been renamed to "sounds/move"
+- `sounds/attacks` directory has been renamed to `sounds/move`.
 - Moves sharing generic sounds now have unique sound events, allowing them to be changed with resource packs.
-- All move sound events have been renamed to "move.NAME.SOURCE" for consistency.
-- Status moves have been moved out of the 'attacks' 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."
+- All move sound events have been renamed to `move.<NAME>.<SOURCE>` for consistency.
+- Status moves have been moved out of the `attacks` directory and split into volatile and nonvolatile.
+- `status.badlypoison.actor` sound event has been renamed to `status.toxpoison.actor`
+- Mulch and berry harvesting sound events have been renamed and moved to their respective directories in `sounds/block`.
+- All sounds related to evolving Pokémon have been moved to the `sounds/evolution` directory.
+- Sound events for all blocks now start with `block`.
 - Gimmighoul chest and item interaction sounds have been moved to where its cry is.
 - Unused sound files and sound events have been removed.
 - Poké Ball sounds are now in their animation files, making them more flexible to edit.
 - Added MoLang compatibility in the isVisible property for transformed parts.
-- Added q.has_aspect('some_aspect') function to animations, posers, and entity particle effects.
+- Added `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:
@@ -1720,6 +1718,7 @@ Thank you so much to all of our community translators that bring the mod to the
 - Lowered spawn rate of Tauros.
 - Sableye now spawns near gem ores as well as amethyst.
 - Added evolution stones and items to item tags
+- Pokémon now play their cry animations when clicked on the starter selection screen.
 
 ### Fixes
 - Fixed catch rates being entirely too difficult.

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

@@ -54,7 +54,10 @@ import com.cobblemon.mod.common.api.storage.pc.PCStore
 import com.cobblemon.mod.common.api.storage.pc.link.PCLinkManager
 import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreManager
 import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import com.cobblemon.mod.common.api.storage.player.adapter.*
+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
@@ -65,16 +68,7 @@ import com.cobblemon.mod.common.battles.BattleSide
 import com.cobblemon.mod.common.battles.ShowdownThread
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
-import com.cobblemon.mod.common.command.argument.DexArgumentType
-import com.cobblemon.mod.common.command.argument.DialogueArgumentType
-import com.cobblemon.mod.common.command.argument.FormArgumentType
-import com.cobblemon.mod.common.command.argument.MoveArgumentType
-import com.cobblemon.mod.common.command.argument.NPCClassArgumentType
-import com.cobblemon.mod.common.command.argument.PartySlotArgumentType
-import com.cobblemon.mod.common.command.argument.PokemonPropertiesArgumentType
-import com.cobblemon.mod.common.command.argument.PokemonStoreArgumentType
-import com.cobblemon.mod.common.command.argument.SpawnBucketArgumentType
-import com.cobblemon.mod.common.command.argument.SpeciesArgumentType
+import com.cobblemon.mod.common.command.argument.*
 import com.cobblemon.mod.common.config.CobblemonConfig
 import com.cobblemon.mod.common.config.LastChangedVersion
 import com.cobblemon.mod.common.config.constraint.IntConstraint
@@ -94,17 +88,21 @@ 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.trade.TradeManager
-import com.cobblemon.mod.common.util.*
+import com.cobblemon.mod.common.util.DataKeys
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.ifDedicatedServer
+import com.cobblemon.mod.common.util.isLaterVersion
+import com.cobblemon.mod.common.util.party
+import com.cobblemon.mod.common.util.server
 import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
 import com.cobblemon.mod.common.world.feature.ore.CobblemonOrePlacedFeatures
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
@@ -116,7 +114,7 @@ import java.io.File
 import java.io.FileReader
 import java.io.FileWriter
 import java.io.PrintWriter
-import java.util.*
+import java.util.UUID
 import kotlin.math.roundToInt
 import kotlin.properties.Delegates
 import kotlin.reflect.full.memberProperties
@@ -386,8 +384,13 @@ object Cobblemon {
                 BattleFormat.GEN_9_SINGLES,
                 BattleSide(PokemonBattleActor(UUID.randomUUID(), BattlePokemon(Pokemon().initialize()), -1F)),
                 BattleSide(PokemonBattleActor(UUID.randomUUID(), BattlePokemon(Pokemon().initialize()), -1F)),
-                true
-            ).ifSuccessful { it.mute = true }
+                false
+            ).ifSuccessful {
+                it.mute = true
+            }.ifErrored {
+                val errors = it.errors.joinToString("\n") { it.javaClass.name }
+                LOGGER.error("Failed to start dummy Showdown battle: $errors")
+            }
         }
 
         registerEventHandlers()

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

@@ -121,10 +121,17 @@ 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_WALL_SIGN = this.create("apricorn_wall_sign", CobblemonWallSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_WALL_SIGN), APRICORN_WOOD_TYPE))
-    @JvmField
-    val APRICORN_HANGING_SIGN = this.create("apricorn_hanging_sign", CobblemonHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN), APRICORN_WOOD_TYPE))
+    val APRICORN_HANGING_SIGN = this.create(
+        "apricorn_hanging_sign",
+        CobblemonHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_HANGING_SIGN), APRICORN_WOOD_TYPE)
+    )
     @JvmField
     val APRICORN_WALL_HANGING_SIGN = this.create("apricorn_wall_hanging_sign", CobblemonWallHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_HANGING_SIGN), APRICORN_WOOD_TYPE))
     @JvmField

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

@@ -56,6 +56,7 @@ object CobblemonCommands {
         AbandonMultiTeam.register(dispatcher)
         FreezePokemonCommand.register(dispatcher)
         ApplyPlayerTextureCommand.register(dispatcher)
+        RunMolangScriptCommand.register(dispatcher)
 
         // Possibly lock down registration if and only if under dev environment or running in an environment
         // with a certain system environment variable set

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

@@ -12,6 +12,7 @@ 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
@@ -48,19 +49,23 @@ object CobblemonFlows : DataRegistry {
     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.")
-                        if (identifier.path.startsWith("flows/client/")) {
-                            clientFlows.getOrPut(ResourceLocation.fromNamespaceAndPath(identifier.namespace, event)) { mutableListOf() }.add(expression)
-                        } else {
-                            flows.getOrPut(ResourceLocation.fromNamespaceAndPath(identifier.namespace, event)) { mutableListOf() }.add(expression)
-                        }
+
+                        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)
                     }
@@ -68,11 +73,31 @@ object CobblemonFlows : DataRegistry {
             }
         }
 
-        Cobblemon.LOGGER.info("Loaded ${CobblemonScripts.scripts.size} flows and ${CobblemonScripts.clientScripts.size} client flows")
+        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>) {
-        flows[eventResourceLocation]?.forEach { it.resolve(runtime, context) }
+    fun run(eventResourceLocation: ResourceLocation, context: Map<String, MoValue>, cancelable: Cancelable? = null) {
+        if (cancelable == null) {
+            runtime.environment.query.functions.remove("cancel")
+        } else {
+            runtime.environment.query.addFunction("cancel") { cancelable }
+        }
+
+        flows[eventResourceLocation]?.forEach {
+            if (cancelable != null && cancelable.isCanceled) {
+                return
+            }
+            it.resolve(runtime, context)
+        }
     }
 }

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

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

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

@@ -54,6 +54,9 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     override val registry: Registry<Item> = BuiltInRegistries.ITEM
     override val resourceKey: ResourceKey<Registry<Item>> = Registries.ITEM
 
+    @JvmField
+    val NPC_EDITOR = create("npc_editor", CobblemonItem(Item.Properties().stacksTo(1)))
+
     @JvmField
     val pokeBalls = mutableListOf<PokeBallItem>()
     @JvmField

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

@@ -55,6 +55,8 @@ 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))
 

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

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

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

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

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

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

common/src/main/kotlin/com/cobblemon/mod/common/api/drop/ItemDropEntry.kt

@@ -61,7 +61,7 @@ open class ItemDropEntry : DropEntry {
 
         if (dropMethod == ItemDropMethod.ON_PLAYER && player != null) {
             world.addFreshEntity(ItemEntity(player.level(), player.x, player.y, player.z, stack))
-        } else if (dropMethod == ItemDropMethod.TO_INVENTORY && player != null) {
+        } else if (dropMethod == ItemDropMethod.TO_INVENTORY && player != null && !stack.isEmpty) {
             val name = stack.hoverName
             val count = stack.count
             val succeeded = player.addItem(stack)

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

@@ -192,6 +192,10 @@ object CobblemonEvents {
     val POKEMON_GAINED = EventObservable<PokemonGainedEvent>()
     @JvmField
     val POKEMON_SEEN = EventObservable<PokemonSeenEvent>()
+    @JvmField
+    val POKEDEX_DATA_CHANGED_PRE = CancelableObservable<PokedexDataChangedEvent.Pre>()
+    @JvmField
+    val POKEDEX_DATA_CHANGED_POST = EventObservable<PokedexDataChangedEvent.Post>()
 
     // Fishing
     @JvmField

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

@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.pokemon
+
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.MoValue
+import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.api.events.Cancelable
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
+import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
+import com.cobblemon.mod.common.api.pokedex.FormDexRecord
+import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
+import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.getPlayer
+import com.mojang.datafixers.util.Either
+import java.util.UUID
+
+/**
+ * Event that fires when a Pokémon's information is gained or updated in the Pokédex.
+ */
+sealed interface PokedexDataChangedEvent {
+    val dataSource: Either<PokedexEntityData, Pokemon>
+    val knowledge: PokedexEntryProgress
+    val playerUUID: UUID
+    val record: FormDexRecord
+
+    val pokedexManager: AbstractPokedexManager
+        get() = record.speciesDexRecord.pokedexManager
+
+    fun getContext(): MutableMap<String, MoValue> {
+        return mutableMapOf(
+            "player" to (playerUUID.getPlayer()?.asMoLangValue() ?: DoubleValue.ZERO),
+            "pokemon" to dataSource.map({ DoubleValue.ZERO }, { it.struct }),
+            "data" to dataSource.map({ it.struct }, { DoubleValue.ZERO }),
+            "knowledge" to StringValue(knowledge.name.lowercase()),
+            "pokedex" to pokedexManager.struct
+        )
+    }
+
+    class Pre(
+        override val dataSource: Either<PokedexEntityData, Pokemon>,
+        override val knowledge: PokedexEntryProgress,
+        override val playerUUID: UUID,
+        override val record: FormDexRecord
+    ) : PokedexDataChangedEvent, Cancelable()
+
+    class Post(
+        override val dataSource: Either<PokedexEntityData, Pokemon>,
+        override val knowledge: PokedexEntryProgress,
+        override val playerUUID: UUID,
+        override val record: FormDexRecord
+    ) : PokedexDataChangedEvent
+}

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

@@ -14,5 +14,4 @@ import java.util.UUID
 data class PokemonGainedEvent(
     val playerId: UUID,
     val pokemon: Pokemon
-) {
-}
+)

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

@@ -9,11 +9,9 @@
 package com.cobblemon.mod.common.api.events.pokemon
 
 import com.cobblemon.mod.common.pokemon.Pokemon
-import net.minecraft.server.level.ServerPlayer
 import java.util.UUID
 
 data class PokemonSeenEvent(
     val playerId: UUID,
     val pokemon: Pokemon
-) {
-}
+)

common/src/main/kotlin/com/cobblemon/mod/common/api/gui/ParentWidget.kt

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.api.gui
 
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import net.minecraft.client.gui.components.AbstractWidget
 import net.minecraft.client.gui.components.Renderable
 import net.minecraft.client.gui.components.events.GuiEventListener
@@ -22,7 +23,7 @@ abstract class ParentWidget(
     pX: Int, pY: Int,
     pWidth: Int, pHeight: Int,
     component: Component
-): Renderable, AbstractWidget(pX, pY, pWidth, pHeight, component) {
+): CobblemonRenderable, AbstractWidget(pX, pY, pWidth, pHeight, component) {
 
     val children: MutableList<GuiEventListener> = mutableListOf()
 

common/src/main/kotlin/com/cobblemon/mod/common/api/interaction/RequestManager.kt

@@ -74,7 +74,7 @@ abstract class RequestManager<T : ServerPlayerActionRequest> {
         ?: this.getInboundRequest(receiver.uuid, requestID)
 
     /** Determines whether [player] can receive a [T]. */
-    open fun isBusy(player: ServerPlayer): Boolean = player.isInBattle() || player.isTrading()
+    open fun isBusy(player: ServerPlayer): Boolean = player.isInBattle() || player.isTrading() || player.party().find { it.entity?.isBusy == true } != null
 
     /** Determines if the [target] is a valid interaction request target. */
     abstract fun isValidInteraction(player: ServerPlayer, target: ServerPlayer): Boolean
@@ -176,7 +176,7 @@ abstract class RequestManager<T : ServerPlayerActionRequest> {
         else if (!this.isValidInteraction(player, target ?: request.sender))    // with teams anyone can accept
             request.notify(player, true, "ui.interact.failed")
         // if sending player is occupied, can't accept response
-        else if (this.isBusy(request.sender))                                   // TODO enhancement: allow retries - modify client so we don't remove request when sending acceptance
+        else if (this.isBusy(request.sender) || this.isBusy(request.receiver))  // TODO enhancement: allow retries - modify client so we don't remove request when sending acceptance
             request.notify(player, true, "ui.interact.unavailable")
         // if no condition is blocking acceptance, accept
         else if (this.canAccept(request))

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

@@ -38,8 +38,9 @@ import net.minecraft.world.phys.AABB
  */
 interface PokemonSelectingItem {
     fun use(player: ServerPlayer, stack: ItemStack): InteractionResultHolder<ItemStack> {
+        val range = player.entityInteractionRange()
         val entity = player.level()
-            .getEntities(player, AABB.ofSize(player.position(), 16.0, 16.0, 16.0))
+            .getEntities(player, AABB.ofSize(player.position(), range, range, range))
             .filter { player.isLookingAt(it, stepDistance = 0.1F) }
             .minByOrNull { it.distanceTo(player) } as? PokemonEntity?
 

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

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.api.item.ability
 
+import com.cobblemon.mod.common.api.Priority
 import com.cobblemon.mod.common.api.abilities.*
 import com.cobblemon.mod.common.item.interactive.ability.AbilityTypeChanger
 import com.cobblemon.mod.common.pokemon.Pokemon
@@ -33,7 +34,7 @@ interface AbilityChanger<T : PotentialAbility> {
      * @param pokemon The [Pokemon] being queried.
      * @return A set containing all their legal abilities associated with [type], can be empty.
      */
-    fun queryPossible(pokemon: Pokemon): Set<AbilityTemplate>
+    fun queryPossible(pokemon: Pokemon): Set<Pair<AbilityTemplate, Priority>>
 
     /**
      * Attempts to update the ability of the given [pokemon].

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

@@ -29,6 +29,13 @@ import com.cobblemon.mod.common.api.dialogue.ReferenceDialogueFaceProvider
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
 import com.cobblemon.mod.common.api.moves.animations.ActionEffects
 import com.cobblemon.mod.common.api.moves.animations.NPCProvider
+import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
+import com.cobblemon.mod.common.api.pokedex.CaughtCount
+import com.cobblemon.mod.common.api.pokedex.CaughtPercent
+import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
+import com.cobblemon.mod.common.api.pokedex.PokedexManager
+import com.cobblemon.mod.common.api.pokedex.SeenCount
+import com.cobblemon.mod.common.api.pokedex.SeenPercent
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.scripting.CobblemonScripts
 import com.cobblemon.mod.common.api.spawning.context.SpawningContext
@@ -40,6 +47,8 @@ import com.cobblemon.mod.common.api.storage.pc.PCStore
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.battles.BattleRegistry
 import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
+import com.cobblemon.mod.common.client.particle.BedrockParticleOptionsRepository
+import com.cobblemon.mod.common.client.particle.ParticleStorm
 import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunctions
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.entity.npc.NPCBattleActor
@@ -49,11 +58,15 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.entity.pokemon.ai.PokemonMoveControl
 import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
 import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
+import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
+import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormParticlePacket
 import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.pokemon.Species
 import com.cobblemon.mod.common.util.*
 import com.mojang.datafixers.util.Either
 import java.util.UUID
 import kotlin.math.sqrt
+import net.minecraft.client.multiplayer.ClientLevel
 import net.minecraft.commands.arguments.EntityAnchorArgument
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Holder
@@ -102,6 +115,12 @@ object MoLangFunctions {
             val message = params.get<MoValue>(0).asString()
             Cobblemon.LOGGER.info(message)
         },
+        "set_query" to java.util.function.Function { params ->
+            val variable = params.getString(0)
+            val value = params.get<MoValue>(1)
+            params.environment.query.addFunction(variable) { value }
+            return@Function value
+        },
         "replace" to java.util.function.Function { params ->
             val text = params.getString(0)
             val search = params.getString(1)
@@ -161,6 +180,30 @@ object MoLangFunctions {
             val expression = params.getString(0).asExpressionLike()
             runtime.resolve(expression)
         },
+        "system_time_millis" to java.util.function.Function { _ ->
+            DoubleValue(System.currentTimeMillis())
+        },
+        // the rest of the world use dd/MM/yyyy grow up america (this comment was generated by copilot)
+        "date_local_time" to java.util.function.Function { _ ->
+            val time = System.currentTimeMillis()
+            val date = java.util.Date(time)
+            val formatted = java.text.SimpleDateFormat("DD/MM/YYYY").format(date)
+            StringValue(formatted)
+        },
+        "date_of" to java.util.function.Function { params ->
+            val time = params.getDouble(0).toLong()
+            val date = java.util.Date(time)
+            val formatted = java.text.SimpleDateFormat("DD/MM/YYYY").format(date)
+            StringValue(formatted)
+        },
+        "date_is_after" to java.util.function.Function { params ->
+            val dateA = params.getString(0)
+            val dateB = params.getString(1)
+            val format = java.text.SimpleDateFormat("DD/MM/YYYY")
+            val a = format.parse(dateA)
+            val b = format.parse(dateB)
+            DoubleValue(a.after(b))
+        }
     )
     val biomeFunctions = mutableListOf<(Holder<Biome>) -> HashMap<String, java.util.function.Function<MoParams, Any>>>()
     val worldFunctions = mutableListOf<(Holder<Level>) -> HashMap<String, java.util.function.Function<MoParams, Any>>>(
@@ -221,6 +264,31 @@ object MoLangFunctions {
                 world.addFreshEntity(lightning)
                 return@put DoubleValue.ONE
             }
+            // q.entity.world.spawn_bedrock_particles(effect, x, y, z, [player]) - sends to everyone nearby or just to the player if they're set.
+            map.put("spawn_bedrock_particles") { params ->
+                val particle = params.getString(0).asResource()
+                val x = params.getDouble(1)
+                val y = params.getDouble(2)
+                val z = params.getDouble(3)
+                val player = params.getOrNull<MoValue>(4)?.let {
+                    if (it is StringValue) world.getPlayerByUUID(UUID.fromString(it.value))
+                    else if (it is ObjectValue<*>) it.obj
+                    else null
+                } as? ServerPlayer
+                val pos = Vec3(x, y, z)
+
+                if (world !is ClientLevel) {
+                    val packet = SpawnSnowstormParticlePacket(particle, pos)
+                    if (player != null) {
+                        packet.sendToPlayer(player)
+                    } else {
+                        packet.sendToPlayersAround(x, y, z, 64.0, world.dimension())
+                    }
+                } else {
+                    val effect = BedrockParticleOptionsRepository.getEffect(particle) ?: return@put DoubleValue.ZERO
+                    ParticleStorm.createAtPosition(world, effect, pos).spawn()
+                }
+            }
             map.put("get_entities_around") { params ->
                 val x = params.getDouble(0)
                 val y = params.getDouble(1)
@@ -320,6 +388,8 @@ object MoLangFunctions {
                     val data = Cobblemon.molangData.load(player.uuid)
                     if (data.map.containsKey(npcId)) {
                         return@put (data.map[npcId] as VariableStruct).map[variable] ?: DoubleValue.ZERO
+                    } else {
+                        return@put DoubleValue.ZERO
                     }
                 }
                 map.put("set_npc_variable") { params ->
@@ -328,16 +398,14 @@ object MoLangFunctions {
                     val value = params.get<MoValue>(2)
                     val saveAfterwards = params.getBooleanOrNull(3) != false
                     val data = Cobblemon.molangData.load(player.uuid)
-                    if (data.map.containsKey(npcId)) {
-                        (data.map[npcId] as VariableStruct).map[variable] = value
-                        if (saveAfterwards) {
-                            Cobblemon.molangData.save(player.uuid)
-                        }
-                        return@put DoubleValue.ONE
-                    } else {
-                        return@put DoubleValue.ZERO
+                    val npcData = data.map.getOrPut(npcId) { VariableStruct() } as VariableStruct
+                    npcData.map[variable] = value
+                    if (saveAfterwards) {
+                        Cobblemon.molangData.save(player.uuid)
                     }
+                    return@put DoubleValue.ONE
                 }
+                map.put("pokedex") { player.pokedex().struct }
             }
             map
         }
@@ -394,6 +462,11 @@ object MoLangFunctions {
             }
             map.put("max_health") { _ -> DoubleValue(entity.maxHealth) }
             map.put("name") { _ -> StringValue(entity.effectiveName().string) }
+            map.put("type") { _ ->
+                entity.registryAccess().registry(Registries.ENTITY_TYPE).get().getKey(entity.type)?.toString()?.let {
+                    StringValue(it)
+                } ?: DoubleValue.ZERO
+            }
             map.put("yaw") { _ -> DoubleValue(entity.yRot.toDouble()) }
             map.put("pitch") { _ -> DoubleValue(entity.xRot.toDouble()) }
             map.put("x") { _ -> DoubleValue(entity.x) }
@@ -445,7 +518,42 @@ object MoLangFunctions {
                 map.put("play_animation") { params ->
                     val animation = params.getString(0)
                     val packet = PlayPosableAnimationPacket(entity.id, setOf(animation), emptyList())
+                    val target = params.getStringOrNull(1)
+                    if (target != null) {
+                        val targetPlayer = if (target.asUUID != null) {
+                            entity.level().getPlayerByUUID(target.asUUID!!) as ServerPlayer
+                        } else if (entity.level() is ServerLevel) {
+                            entity.level().server!!.playerList.getPlayerByName(target)
+                        } else {
+                            null
+                        }
+                        if (targetPlayer != null) {
+                            packet.sendToPlayer(targetPlayer)
+                            return@put DoubleValue.ONE
+                        } else {
+                            return@put DoubleValue.ZERO
+                        }
+                    } else {
+                        packet.sendToPlayersAround(entity.x, entity.y, entity.z, 64.0, entity.level().dimension())
+                        return@put DoubleValue.ONE
+                    }
+                }
+            }
+            // q.entity.spawn_bedrock_particles(effect, locator, [player]) - sends to everyone nearby or just to the player if they're set. Locator is necessary even if unused on non-posables.
+            map.put("spawn_bedrock_particles") { params ->
+                val particle = params.getString(0).asResource()
+                val locator = params.getString(1)
+                val player = params.getOrNull<MoValue>(2)?.let {
+                    if (it is StringValue) entity.level().getPlayerByUUID(UUID.fromString(it.value))
+                    else if (it is ObjectValue<*>) it.obj
+                    else null
+                } as? ServerPlayer
+
+                val packet = SpawnSnowstormEntityParticlePacket(particle, entity.id, listOf(locator))
+                if (player == null) {
                     packet.sendToPlayersAround(entity.x, entity.y, entity.z, 64.0, entity.level().dimension())
+                } else {
+                    packet.sendToPlayer(player)
                 }
             }
             map
@@ -594,6 +702,7 @@ object MoLangFunctions {
             }
             map.put("is_wild") { DoubleValue(pokemon.entity?.let { it.ownerUUID == null } == true) }
             map.put("is_shiny") { DoubleValue(pokemon.shiny) }
+            map.put("species") { pokemon.species.struct }
             map.put("form") { StringValue(pokemon.form.name) }
             map.put("weight") { DoubleValue(pokemon.species.weight.toDouble()) }
             map.put("matches") { params -> DoubleValue(params.getString(0).toProperties().matches(pokemon)) }
@@ -804,6 +913,78 @@ object MoLangFunctions {
         }
     )
 
+    val pokedexFunctions: MutableList<(AbstractPokedexManager) -> HashMap<String, java.util.function.Function<MoParams, Any>>> = mutableListOf(
+        { pokedex ->
+            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
+            map.put("get_species_record") { params ->
+                val speciesId = params.getString(0).asIdentifierDefaultingNamespace()
+                pokedex.speciesRecords[speciesId]?.struct ?: QueryStruct(hashMapOf())
+            }
+
+            map.put("has_seen") { params ->
+                val speciesId = params.getString(0).asIdentifierDefaultingNamespace()
+                val formName = params.getStringOrNull(1)
+
+                if (formName == null) {
+                    return@put DoubleValue(pokedex.getHighestKnowledgeForSpecies(speciesId).ordinal >= PokedexEntryProgress.ENCOUNTERED.ordinal)
+                } else {
+                    return@put DoubleValue((pokedex.getSpeciesRecord(speciesId)?.getFormRecord(formName)?.knowledge?.ordinal ?: 0) >= PokedexEntryProgress.ENCOUNTERED.ordinal)
+                }
+            }
+
+            map.put("has_caught") { params ->
+                val speciesId = params.getString(0).asIdentifierDefaultingNamespace()
+                val formName = params.getStringOrNull(1)
+                if (formName == null) {
+                    return@put DoubleValue(pokedex.getHighestKnowledgeForSpecies(speciesId) == PokedexEntryProgress.CAUGHT)
+                } else {
+                    return@put DoubleValue(pokedex.getSpeciesRecord(speciesId)?.getFormRecord(formName)?.knowledge == PokedexEntryProgress.CAUGHT)
+                }
+            }
+            map.put("caught_count") { DoubleValue(pokedex.getGlobalCalculatedValue(CaughtCount)) }
+            map.put("seen_count") { DoubleValue(pokedex.getGlobalCalculatedValue(SeenCount)) }
+            map.put("caught_percent") { DoubleValue(pokedex.getGlobalCalculatedValue(CaughtPercent)) }
+            map.put("seen_percent") { DoubleValue(pokedex.getGlobalCalculatedValue(SeenPercent)) }
+
+            if (pokedex is PokedexManager) {
+                map.put("player_id") { StringValue(pokedex.uuid.toString()) }
+                map.put("see") { params ->
+                    val pokemon = params.get<ObjectValue<Pokemon>>(0).obj
+                    pokedex.encounter(pokemon)
+                    return@put DoubleValue.ONE
+                }
+                map.put("catch") { params ->
+                    val pokemon = params.get<ObjectValue<Pokemon>>(0).obj
+                    pokedex.catch(pokemon)
+                    return@put DoubleValue.ONE
+                }
+            }
+
+            map
+        }
+    )
+
+    val speciesFunctions: MutableList<(Species) -> HashMap<String, java.util.function.Function<MoParams, Any>>> = mutableListOf(
+        { species ->
+            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
+
+            map.put("identifier") { StringValue(species.resourceIdentifier.toString()) }
+            map.put("name") { StringValue(species.name) }
+            map.put("primary_type") { StringValue(species.primaryType.name) }
+            map.put("secondary_type") { StringValue(species.secondaryType?.name ?: "null") }
+            map.put("experience_group") { StringValue(species.experienceGroup.name) }
+            map.put("height") { DoubleValue(species.height) }
+            map.put("weight") { DoubleValue(species.weight) }
+            map.put("base_scale") { DoubleValue(species.baseScale) }
+            map.put("hitbox_width") { DoubleValue(species.hitbox.width) }
+            map.put("hitbox_height") { DoubleValue(species.hitbox.height) }
+            map.put("hitbox_fixed") { DoubleValue(species.hitbox.fixed) }
+            map.put("catch_rate") { DoubleValue(species.catchRate) }
+
+            map
+        }
+    )
+
     fun Holder<Biome>.asBiomeMoLangValue() = asMoLangValue(Registries.BIOME).addFunctions(biomeFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
     fun Holder<Level>.asWorldMoLangValue() = asMoLangValue(Registries.DIMENSION).addFunctions(worldFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
     fun Holder<Block>.asBlockMoLangValue() = asMoLangValue(Registries.BLOCK).addFunctions(blockFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
@@ -935,6 +1116,22 @@ object MoLangFunctions {
         return this
     }
 
+    fun QueryStruct.addPokedexFunctions(pokedexManager: AbstractPokedexManager): QueryStruct {
+        val addedFunctions = pokedexFunctions
+            .flatMap { it.invoke(pokedexManager).entries }
+            .associate { it.key to it.value }
+        functions.putAll(addedFunctions)
+        return this
+    }
+
+    fun QueryStruct.addSpeciesFunctions(species: Species): QueryStruct {
+        val addedFunctions = speciesFunctions
+            .flatMap { it.invoke(species).entries }
+            .associate { it.key to it.value }
+        functions.putAll(addedFunctions)
+        return this
+    }
+
     fun QueryStruct.addPokemonFunctions(pokemon: Pokemon): QueryStruct {
         val addedFunctions = pokemonFunctions
             .flatMap { it.invoke(pokemon).entries }

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/AnimationActionEffectKeyframe.kt

@@ -36,7 +36,7 @@ class AnimationActionEffectKeyframe : ConditionalActionEffectKeyframe(), EntityC
         // Treat them as expressions if possible but otherwise yeah just send them as strings
         val animation = animation.map {
             try {
-                it.asExpressionLike().resolveString(context.runtime).takeIf { it != "0.0" } ?: it
+                it.asExpressionLike().resolveString(context.runtime).takeIf { it != "0" } ?: it
             } catch (e: Exception) {
                 it
             }

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityParticlesActionEffectKeyframe.kt

@@ -42,7 +42,7 @@ class EntityParticlesActionEffectKeyframe : ConditionalActionEffectKeyframe(), E
             .flatMap { prov -> prov.entities.filter { test(context, it, isUser = prov is UsersProvider) } }
 
         val effectIdentifier = try {
-            effect?.asExpressionLike()?.resolveString(context.runtime)?.takeIf { it != "0.0" } ?: effect
+            effect?.asExpressionLike()?.resolveString(context.runtime)?.takeIf { it != "0" } ?: effect
         } catch (e: Exception) {
             effect
         }?.asIdentifierDefaultingNamespace() ?: return skip()

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntitySoundActionEffectKeyframe.kt

@@ -35,7 +35,7 @@ class EntitySoundActionEffectKeyframe : ConditionalActionEffectKeyframe(), Entit
             .flatMap { prov -> prov.entities.filter { test(context, it, isUser = prov is UsersProvider) } }
 
         val soundIdentifier = try {
-            sound?.asExpressionLike()?.resolveString(context.runtime)?.takeIf { it != "0.0" } ?: sound
+            sound?.asExpressionLike()?.resolveString(context.runtime)?.takeIf { it != "0" } ?: sound
         } catch (e: Exception) {
             sound
         }?.asIdentifierDefaultingNamespace() ?: return skip()

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

@@ -38,7 +38,8 @@ class NPCClass {
     var resourceIdentifier: ResourceLocation = cobblemonResource("dummy")
     var names: MutableList<Component> = mutableListOf()
     var aspects: MutableSet<String> = mutableSetOf() // These only make sense when applied via presets
-    var hitbox = EntityDimensions.scalable(0.6F, 1.8F)
+    var hitbox = EntityDimensions.scalable(0.6F, 1.8F).withEyeHeight(1.62F)
+    var modelScale: Float = 0.94F
     var battleConfiguration = NPCBattleConfiguration()
     var interaction: NPCInteractConfiguration? = null
     var canDespawn = true
@@ -48,6 +49,7 @@ class NPCClass {
     var party: NPCPartyProvider? = null
     var skill: Int = 0
     var autoHealParty: Boolean = true
+    var randomizePartyOrder: Boolean = false
     var battleTheme: ResourceLocation? = null
     var ai: MutableList<BrainConfig> = mutableListOf()
     var isMovable: Boolean = true
@@ -60,9 +62,9 @@ class NPCClass {
     fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeString(resourceIdentifier.toString())
         buffer.writeCollection(names) { _, v -> buffer.writeText(v) }
-        buffer.writeFloat(this.hitbox.width)
-        buffer.writeFloat(this.hitbox.height)
-        buffer.writeBoolean(this.hitbox.fixed)
+        buffer.writeFloat(hitbox.width)
+        buffer.writeFloat(hitbox.height)
+        buffer.writeBoolean(hitbox.fixed)
         battleConfiguration.encode(buffer)
         buffer.writeNullable(interaction) { _, value ->
             buffer.writeString(value.type)
@@ -83,6 +85,7 @@ class NPCClass {
         }
         buffer.writeInt(skill)
         buffer.writeBoolean(autoHealParty)
+        buffer.writeBoolean(randomizePartyOrder)
         buffer.writeMapK(size = IntSize.U_BYTE, map = variables) { (key, value) ->
             buffer.writeString(key)
             buffer.writeString(value.asString())
@@ -127,6 +130,7 @@ class NPCClass {
         }.toMutableList()
         skill = buffer.readInt()
         autoHealParty = buffer.readBoolean()
+        randomizePartyOrder = buffer.readBoolean()
         buffer.readMapK(size = IntSize.U_BYTE, map = variables) {
             val key = buffer.readString()
             val value = buffer.readString()

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

@@ -30,6 +30,7 @@ class NPCPreset {
     var ai: List<BrainConfig>? = null
     var skill: Int? = null
     var autoHealParty: Boolean? = null
+    var randomizePartyOrder: Boolean? = null
     var battleTheme: ResourceLocation? = null
     var isMovable: Boolean? = null
     var isInvulnerable: Boolean? = null
@@ -53,6 +54,7 @@ class NPCPreset {
         hitbox?.let { npcClass.hitbox = it }
         skill?.let { npcClass.skill = it }
         autoHealParty?.let { npcClass.autoHealParty = it }
+        randomizePartyOrder?.let { npcClass.randomizePartyOrder = it }
         battleTheme?.let { npcClass.battleTheme = it }
         ai?.let { npcClass.ai.addAll(it) }
         isMovable?.let { npcClass.isMovable = it }

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

@@ -77,6 +77,7 @@ any number of presets and the properties of those presets will be merged into th
       "canDespawn": false,
       "skill": 5,
       "autoHealParty": true,
+      "randomizePartyOrder": true,
       "party": {
         "type": "simple",
         "pokemon": [
@@ -282,15 +283,20 @@ is not mentioned in the Pokémon properties will be set to the seed level.
 The "pool" party type is a way to define a party of Pokémon using a more complicated format that involves some
 randomization and weighting to different Pokémon options.
 
-A pool party provider can be static or dynamic depending on the value of `isStatic`. It specifies the minimum
-and maximum number of Pokémon that can be in the party using `minPokemon` and `maxPokemon`. The `pool` property dictates all of the possible Pokémon, with
-each being an object with several properties.
+A pool party provider can be static or dynamic depending on the value of `isStatic`. If `useFixedRandom` is true, the Pokémon it selects
+from the pool will be constant for a single spawned NPC entity. This is slightly different to a static party because
+the level of the Pokémon can still be modified dynamically using MoLang values inside each entry's `level` field. 
+
+The pool specifies the minimum and maximum number of Pokémon that can be in the party using `minPokemon` and `maxPokemon`.
+
+The `pool` property dictates all the possible Pokémon with each being an object with several properties.
 
 - The `pokemon` property is the Pokémon properties as used in commands and spawn files that will generate the Pokémon. 
 - The `weight` property is a decimal number that represents how likely that Pokémon is to be chosen. If the weight is -1, it will be guaranteed to be selected. Defaults to 1. The larger the value, the more likely it will be chosen.
 - The `selectableTimes` property is the maximum number of times that the entry can be selected in the party. Defaults to 1.
 - The `npcLevels` property is a range of seed levels that the Pokémon can be generated at. For example, if the NPC is spawned with seed level 10, and the range is 5-9, the Pokémon will not be selected. The actual level of the Pokémon will be the seed level. Defaults to "1-100".
 - The `levelVariation` property is the amount of variation the Pokémon's level can have from the NPC seed level. For example, a value of 2 will mean that for an NPC generated with seed level 10, the Pokémon will be generated somewhere between level 8 and 12 inclusive. Defaults to zero.
+- The `level` property can be used instead of `levelVariation` to force a specific level. This is a MoLang expression.
 
 For `minPokemon`, `maxPokemon`, `weight`, `selectableTimes`, and `levelVariation`, the values can be a simple number or be full MoLang expressions. At the time
 of seeding an NPC, the cosmetic variations have already been applied. Therefore, it's possible to make these properties
@@ -306,7 +312,8 @@ a single battle challenge and this is a dynamic party, there will also be a `q.p
         "type": "pool",
         "minPokemon": "3",
         "maxPokemon": "6",
-        "isStatic": true,
+        "isStatic": false,
+        "useFixedRandom": true,
         "pool": [
           {
             "pokemon": "weedle",
@@ -343,7 +350,9 @@ a single battle challenge and this is a dynamic party, there will also be a `q.p
             "pokemon": "butterfree",
             "weight": "5",
             "npcLevels": "10-15",
-            "selectableTimes": "1"
+            "selectableTimes": "1",
+            "level": "q.player.party.highest_level"
+
           }
         ]
       }
@@ -395,6 +404,11 @@ the NPC and move them using leads.
 Controls whether the NPC can be hit by projectiles. Disabling this option prevents unwanted 
 interactions, such as players moving the NPC with fishing rods or other projectiles.
 
+### randomizePartyOrder
+Whether the NPC's party order will be randomized between battles. When true, this NPC's party (regardless of
+whether it was dynamic or static) will choose its initial send-out Pokémon randomly instead of always choosing the first
+Pokémon in the party.
+
 ### ai
 The AI property is an array of brain configurations. This is used to configure the behaviours of the NPC. See
 the documentation for brain configurations at [AI Configuration](../ai/config/README.md).

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

@@ -26,6 +26,7 @@ import com.cobblemon.mod.common.util.withQueryValue
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import com.google.gson.JsonPrimitive
+import kotlin.random.Random
 import net.minecraft.server.level.ServerPlayer
 
 /**
@@ -50,6 +51,7 @@ class PoolPartyProvider : NPCPartyProvider {
     override val type = TYPE
 
     override var isStatic: Boolean = false
+    var useFixedRandom: Boolean = false
     var minPokemon: Expression = "1".asExpression()
     var maxPokemon: Expression = "6".asExpression()
     var pool = mutableListOf<DynamicPokemon>()
@@ -63,6 +65,7 @@ class PoolPartyProvider : NPCPartyProvider {
                 return@map DynamicPokemon(
                     PokemonProperties.parse(it.asString),
                     "0".asExpression(),
+                    null,
                     1..100,
                     "1".asExpression(),
                     "1".asExpression()
@@ -71,19 +74,22 @@ class PoolPartyProvider : NPCPartyProvider {
 
             it as JsonObject
             DynamicPokemon(
-                PokemonProperties.parse(it.getAsJsonPrimitive("pokemon").asString),
-                it.getAsJsonPrimitive("levelVariation")?.asString?.asExpression() ?: "0".asExpression(),
-                it.getAsJsonPrimitive("npcLevels")?.asString?.split("-")?.let { it[0].toInt()..it[1].toInt() } ?: 1..100,
-                it.getAsJsonPrimitive("selectableTimes")?.asString?.asExpression() ?: "1".asExpression(),
-                it.getAsJsonPrimitive("weight")?.asString?.asExpression() ?: "1".asExpression()
+                PokemonProperties.parse(it.get("pokemon").asString),
+                it.get("levelVariation")?.asString?.asExpression() ?: "0".asExpression(),
+                it.get("level")?.asString?.asExpression(),
+                it.get("npcLevels")?.asString?.split("-")?.let { it[0].toInt()..it[1].toInt() } ?: 1..100,
+                it.get("selectableTimes")?.asString?.asExpression() ?: "1".asExpression(),
+                it.get("weight")?.asString?.asExpression() ?: "1".asExpression()
             )
         }.toMutableList()
-        isStatic = json.getAsJsonPrimitive("isStatic").asBoolean
+        isStatic = json.get("isStatic").asBoolean
+        json.get("useFixedRandom")?.asBoolean?.let { useFixedRandom = it }
     }
 
     class DynamicPokemon(
         val pokemon: PokemonProperties,
         val levelVariation: Expression,
+        val level: Expression? = null,
         val npcLevels: IntRange,
         val selectableTimes: Expression,
         val weight: Expression = "1".asExpression()
@@ -99,6 +105,7 @@ class PoolPartyProvider : NPCPartyProvider {
 
     fun formulateParty(npc: NPCEntity, level: Int, players: List<ServerPlayer>, party: NPCPartyStore) {
         val runtime = MoLangRuntime().setup().withQueryValue("npc", npc.struct)
+        val random = if (useFixedRandom) Random(npc.uuid.hashCode()) else Random.Default
         runtime.withQueryValue("level", DoubleValue(level))
         runtime.withQueryValue("players", players.asArrayValue { it.asMoLangValue() })
         if (players.size == 1) {
@@ -107,14 +114,14 @@ class PoolPartyProvider : NPCPartyProvider {
         }
         val minPokemon = runtime.resolveInt(this.minPokemon)
         val maxPokemon = runtime.resolveInt(this.maxPokemon)
-        var desiredPokemonCount = (minPokemon..maxPokemon).random()
+        var desiredPokemonCount = (minPokemon..maxPokemon).random(random)
 
         val workingPool = pool.filter { level in it.npcLevels && runtime.resolveInt(it.selectableTimes) > 0 }.toMutableList()
         val useCounts = mutableMapOf<DynamicPokemon, Int>()
 
         while (desiredPokemonCount > 0 && workingPool.any { it.hasWeight(runtime) }) {
-            val selected = workingPool.filter { it.getWeight(runtime) == -1F }.randomOrNull()
-                ?: workingPool.weightedSelection { it.getWeight(runtime) }
+            val selected = workingPool.filter { it.getWeight(runtime) == -1F }.randomOrNull(random)
+                ?: workingPool.weightedSelection(random = random) { it.getWeight(runtime) }
                 ?: break
             useCounts[selected] = useCounts.getOrDefault(selected, 0) + 1
             val allowedSelections = runtime.resolveInt(selected.selectableTimes)
@@ -124,9 +131,10 @@ class PoolPartyProvider : NPCPartyProvider {
             desiredPokemonCount--
 
             // If the Pokémon's props specifies a level then use that, otherwise choose a random level within the range
-            val levelVariation = (0..runtime.resolveInt(selected.levelVariation)).random()
+            val levelVariation = (0..runtime.resolveInt(selected.levelVariation)).random(random)
             val randomLevel = level + levelVariation
-            val instance = selected.pokemon.copy().also { it.level = it.level ?: randomLevel }.create()
+            val dictatedLevel = selected.level?.let { runtime.resolveInt(it) }
+            val instance = selected.pokemon.copy().also { it.level = it.level ?: dictatedLevel ?: randomLevel }.create()
             party.add(instance)
         }
     }

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

@@ -32,5 +32,5 @@ class WeightedNPCVariationProvider : NPCVariationProvider {
     override val aspects: Set<String>
         get() = options.flatMap(WeightedAspect::aspects).toSet()
 
-    override fun provideAspects(npcEntity: NPCEntity) = options.weightedSelection(WeightedAspect::weight)?.aspects ?: emptySet()
+    override fun provideAspects(npcEntity: NPCEntity) = options.weightedSelection { it.weight }?.aspects ?: emptySet()
 }

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

@@ -82,6 +82,8 @@ object CobblemonPermissions {
 
     val ABANDON_MULTITEAM = this.create("${COMMAND_PREFIX}abandonmultiteam", PermissionLevel.NONE)
 
+    val RUN_MOLANG_SCRIPT = this.create("${COMMAND_PREFIX}runmolangscript", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
+
     fun all(): Iterable<Permission> = this.permissions
 
     private fun create(node: String, level: PermissionLevel): Permission {

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

@@ -8,13 +8,13 @@
 
 package com.cobblemon.mod.common.api.pokedex
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.addPokedexFunctions
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions
+import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexForm
 import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData
 import com.cobblemon.mod.common.pokemon.Gender
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import net.minecraft.resources.ResourceLocation
 
 abstract class AbstractPokedexManager {
@@ -23,11 +23,9 @@ abstract class AbstractPokedexManager {
     private val globalCalculatedValues = mutableMapOf<GlobalPokedexValueCalculator<*>, Any>()
 
     @Transient
-    val struct = QueryStruct(hashMapOf()).addStandardFunctions()
-        .addFunction("get_species_record") { params ->
-            val speciesId = params.getString(0).asIdentifierDefaultingNamespace()
-            speciesRecords[speciesId]?.struct ?: QueryStruct(hashMapOf())
-        }
+    val struct = ObjectValue<AbstractPokedexManager>(this)
+        .addStandardFunctions()
+        .addPokedexFunctions(this)
 
     fun deleteSpeciesRecord(speciesId: ResourceLocation) {
         speciesRecords.remove(speciesId)
@@ -152,25 +150,4 @@ abstract class AbstractPokedexManager {
     open fun markDirty() {
         // Save stuff
     }
-
-    companion object {
-        const val NUM_CAUGHT_KEY = "cobblemon.pokedex.entries.caught"
-        const val NUM_SEEN_KEY = "cobblemon.pokedex.entries.seen"
-
-        fun getKeyForSpeciesBase(speciesId: ResourceLocation): String {
-            return "cobblemon.pokedex.${speciesId.path}"
-        }
-
-        fun getKnowledgeKeyForSpecies(speciesId: ResourceLocation): String {
-            return "${getKeyForSpeciesBase(speciesId)}.knowledge"
-        }
-
-        fun getKnowledgeKeyForForm(speciesId: ResourceLocation, formName: String): String {
-            return "${getKnowledgeKeyForSpecies(speciesId)}.${formName.lowercase()}"
-        }
-
-        fun getCaptureMethodKeyForSpecies(speciesId: ResourceLocation): String {
-            return "${getKeyForSpeciesBase(speciesId)}.capturemethod"
-        }
-    }
 }

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

@@ -11,6 +11,8 @@ package com.cobblemon.mod.common.api.pokedex
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.bedrockk.molang.runtime.struct.VariableStruct
 import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.api.events.CobblemonEvents
+import com.cobblemon.mod.common.api.events.pokemon.PokedexDataChangedEvent
 import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData
 import com.cobblemon.mod.common.pokemon.Gender
 import com.cobblemon.mod.common.pokemon.Pokemon
@@ -19,6 +21,7 @@ import com.cobblemon.mod.common.util.readString
 import com.cobblemon.mod.common.util.writeEnumConstant
 import com.cobblemon.mod.common.util.writeString
 import com.google.common.collect.Sets
+import com.mojang.datafixers.util.Either
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.ListCodec
 import com.mojang.serialization.codecs.RecordCodecBuilder
@@ -50,8 +53,11 @@ class FormDexRecord {
 
     /** The genders that the dex is aware of. */
     private val genders: MutableSet<Gender> = mutableSetOf()
+
     /** Shiny states could be shiny or non-shiny - on the off chance they only saw the shiny, they shouldn't know what the normal looks like. */
-    private val seenShinyStates = mutableSetOf<String>() // consider: radiants in the future (radiants should just be a resource pack tbh)
+    private val seenShinyStates =
+        mutableSetOf<String>() // consider: radiants in the future (radiants should just be a resource pack tbh)
+
     /** The current awareness of the form that the dex has. */
     var knowledge = PokedexEntryProgress.NONE
         private set
@@ -116,32 +122,71 @@ class FormDexRecord {
     }
 
     private fun addInformation(pokemon: Pokemon, knowledge: PokedexEntryProgress) {
-        genders.add(pokemon.gender)
-        seenShinyStates.add(if (pokemon.shiny) "shiny" else "normal")
-        if (knowledge.ordinal > this.knowledge.ordinal) {
-            this.knowledge = knowledge
+        (speciesDexRecord.pokedexManager as? PokedexManager)?.let { pokedexManager ->
+            CobblemonEvents.POKEDEX_DATA_CHANGED_PRE.postThen(
+                PokedexDataChangedEvent.Pre(
+                        Either.right(pokemon),
+                        knowledge,
+                        pokedexManager.uuid,
+                        this
+                ),
+                ifSucceeded = {
+                    genders.add(pokemon.gender)
+                    seenShinyStates.add(if (pokemon.shiny) "shiny" else "normal")
+                    if (knowledge.ordinal > this.knowledge.ordinal) {
+                        this.knowledge = knowledge
+                    }
+                    speciesDexRecord.addInformation(pokemon, knowledge)
+                    speciesDexRecord.onFormRecordUpdated(this)
+                    CobblemonEvents.POKEDEX_DATA_CHANGED_POST.post(
+                        PokedexDataChangedEvent.Post(
+                                Either.right(pokemon),
+                                knowledge,
+                                pokedexManager.uuid,
+                                this
+                        )
+                    )
+                })
         }
-        speciesDexRecord.addInformation(pokemon, knowledge)
-        speciesDexRecord.onFormRecordUpdated(this)
     }
 
     private fun addInformation(pokedexEntityData: PokedexEntityData, knowledge: PokedexEntryProgress) {
-        genders.add(pokedexEntityData.gender)
-        seenShinyStates.add(if (pokedexEntityData.shiny) "shiny" else "normal")
-        if (knowledge.ordinal > this.knowledge.ordinal) {
-            this.knowledge = knowledge
+        (speciesDexRecord.pokedexManager as? PokedexManager)?.let { pokedexManager ->
+            CobblemonEvents.POKEDEX_DATA_CHANGED_PRE.postThen(
+                PokedexDataChangedEvent.Pre(
+                        Either.left(pokedexEntityData),
+                        knowledge,
+                        pokedexManager.uuid,
+                        this
+                ),
+                ifSucceeded = {
+                    genders.add(pokedexEntityData.gender)
+                    seenShinyStates.add(if (pokedexEntityData.shiny) "shiny" else "normal")
+                    if (knowledge.ordinal > this.knowledge.ordinal) {
+                        this.knowledge = knowledge
+                    }
+                    speciesDexRecord.addInformation(pokedexEntityData, knowledge)
+                    speciesDexRecord.onFormRecordUpdated(this)
+                    CobblemonEvents.POKEDEX_DATA_CHANGED_POST.post(
+                        PokedexDataChangedEvent.Post(
+                                Either.left(pokedexEntityData),
+                                knowledge,
+                                pokedexManager.uuid,
+                                this
+                        )
+                    )
+                }
+            )
         }
-        speciesDexRecord.addInformation(pokedexEntityData, knowledge)
-        speciesDexRecord.onFormRecordUpdated(this)
     }
 
     /** Returns whether the given [Pokemon] and [knowledge] would add new information to the Pokédex.*/
     fun wouldBeDifferent(pokemon: Pokemon, knowledge: PokedexEntryProgress): Boolean {
         return pokemon.gender !in genders
-            || (pokemon.shiny && "shiny" !in seenShinyStates)
-            || (!pokemon.shiny && "normal" !in seenShinyStates)
-            || knowledge.ordinal > this.knowledge.ordinal
-            || speciesDexRecord.wouldBeDifferent(pokemon)
+                || (pokemon.shiny && "shiny" !in seenShinyStates)
+                || (!pokemon.shiny && "normal" !in seenShinyStates)
+                || knowledge.ordinal > this.knowledge.ordinal
+                || speciesDexRecord.wouldBeDifferent(pokemon)
     }
 
     fun wouldBeDifferent(pokedexEntityData: PokedexEntityData, knowledge: PokedexEntryProgress): Boolean {

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

@@ -22,6 +22,7 @@ import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.evolution.requirement.EvolutionRequirement
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.item.PokeBallItem
 import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
 import com.cobblemon.mod.common.pokemon.Pokemon
@@ -162,7 +163,7 @@ interface Evolution : EvolutionLike {
             evolutionMethod(pokemon)
             pokemon.getOwnerPlayer()?.sendSystemMessage(lang("ui.evolve.into", preEvoName, pokemon.species.translatedName))
         } else {
-            pokemonEntity.busyLocks.add("evolving")
+            pokemonEntity.entityData.set(PokemonEntity.EVOLUTION_STARTED, true)
             pokemonEntity.navigation.stop()
             pokemonEntity.after(1F) {
                 evolutionAnimation(pokemonEntity)
@@ -172,7 +173,7 @@ interface Evolution : EvolutionLike {
             }
             pokemonEntity.after( seconds = 12F ) {
                 cryAnimation(pokemonEntity)
-                pokemonEntity.busyLocks.remove("evolving")
+                pokemonEntity.entityData.set(PokemonEntity.EVOLUTION_STARTED, false)
                 pokemon.getOwnerPlayer()?.sendSystemMessage(lang("ui.evolve.into", preEvoName, pokemon.species.translatedName))
             }
         }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/FishingSpawningCondition.kt

@@ -12,6 +12,8 @@ import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
 import com.cobblemon.mod.common.api.spawning.context.FishingSpawningContext
 import com.cobblemon.mod.common.util.itemRegistry
 import net.minecraft.world.item.Item
+import net.minecraft.world.item.enchantment.EnchantmentHelper
+import net.minecraft.world.item.enchantment.Enchantments
 import net.minecraft.world.level.block.Block
 
 /**
@@ -33,9 +35,43 @@ class FishingSpawningCondition: SpawningCondition<FishingSpawningContext>() {
             return false
         } else if (neededNearbyBlocks != null && neededNearbyBlocks!!.none { cond -> ctx.nearbyBlockTypes.any { cond.fits(it, ctx.blockRegistry) } }) {
             return false
-        } else {
-            return true
         }
+
+        if (minLureLevel != null) { // check for the lureLevel of the rod
+            val pokerodStack = ctx.rodStack
+            val lureLevel = EnchantmentHelper.getItemEnchantmentLevel(
+                ctx.enchantmentRegistry.getHolder(Enchantments.LURE).get(),
+                pokerodStack
+            )
+            if (lureLevel < minLureLevel!!) {
+                return false
+            } else if (maxLureLevel != null && lureLevel > maxLureLevel!!) {
+                return false
+            }
+        }
+        if (bait != null) { // check for the bait on the bobber
+            val pokerodBait = ctx.rodBait?.item
+            if (pokerodBait != bait) {
+                return false
+            }
+        }
+        if (rodType != null) { // check for the type of pokerod being used
+            val pokerodItem = ctx.rodItem
+            if (pokerodItem?.pokeRodId != rodType) {
+                return false
+            }
+        }
+
+        /*if (ctx is FishingSpawningContext && (ctx as FishingSpawningContext).rodItem != null) { // check if the bait attracts certain EV yields
+            val pokerodItem = (ctx as FishingSpawningContext).rodItem
+
+            // todo check if the EV yield of the berry matches the bait EV attract maybe?
+
+            if (// todo if bait EV yield != EV yield of pokemon consideration        //Registries.ITEM.getId(pokerodItem?.bait?.item).path == )
+                return false
+        }*/
+
+        return true
     }
 
     companion object {

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SpawningCondition.kt

@@ -116,24 +116,6 @@ abstract class SpawningCondition<T : SpawningContext> {
             }
         ) {
             return false
-        } else if (minLureLevel != null && ctx is FishingSpawningContext) { // check for the lureLevel of the rod
-            val pokerodStack = (ctx as FishingSpawningContext).rodStack
-            val lureLevel = EnchantmentHelper.getItemEnchantmentLevel(ctx.enchantmentRegistry.getHolder(Enchantments.LURE).get(), pokerodStack)
-            if (lureLevel < minLureLevel!!) {
-                return false
-            } else if (maxLureLevel != null && lureLevel > maxLureLevel!!) {
-                return false
-            }
-        } else if (bait != null && ctx is FishingSpawningContext) { // check for the bait on the bobber
-            val pokerodBait = (ctx as FishingSpawningContext).rodBait?.item
-            if (pokerodBait != bait) {
-                return false
-            }
-        } else if (rodType != null && ctx is FishingSpawningContext) { // check for the type of pokerod being used
-            val pokerodItem = (ctx as FishingSpawningContext).rodItem
-            if (pokerodItem?.pokeRodId != rodType) {
-                return false
-            }
         } else if (isSlimeChunk != null && isSlimeChunk != false) {
             val isSlimeChunk = WorldgenRandom.seedSlimeChunk(ctx.position.x shr 4, ctx.position.z shr 4, ctx.world.seed, 987234911L).nextInt(10) == 0
 
@@ -152,15 +134,6 @@ abstract class SpawningCondition<T : SpawningContext> {
             return random.nextInt(10) == 0*/
         }
 
-        /*else if (ctx is FishingSpawningContext && (ctx as FishingSpawningContext).rodItem != null) { // check if the bait attracts certain EV yields
-            val pokerodItem = (ctx as FishingSpawningContext).rodItem
-
-            // todo check if the EV yield of the berry matches the bait EV attract maybe?
-
-            if (// todo if bait EV yield != EV yield of pokemon consideration        //Registries.ITEM.getId(pokerodItem?.bait?.item).path == )
-                return false
-        }*/
-
         return true
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/PokemonSpawnAction.kt

@@ -16,7 +16,6 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.feature.SeasonFeatureHandler
 import com.cobblemon.mod.common.util.weightedSelection
 import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.entity.player.Player
 
 /**
  * A [SpawnAction] that will spawn a single [PokemonEntity].

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/influence/PlayerLevelRangeInfluence.kt

@@ -33,6 +33,11 @@ open class PlayerLevelRangeInfluence(
     val noPokemonRange: IntRange = 1 .. config.minimumLevelRangeMax,
     val recalculationMillis: Long = 5000L
 ) : SpawningInfluence {
+    companion object {
+        /** The internally tuned variation for player level range influences */
+        val TYPICAL_VARIATION = 5
+    }
+
     val uuid = player.uuid
     var lastCalculatedTime: Long = 0
     var previousRange: IntRange = noPokemonRange

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/spawner/PlayerSpawnerFactory.kt

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.api.spawning.CobblemonSpawnRules
 import com.cobblemon.mod.common.api.spawning.SpawnerManager
 import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
 import com.cobblemon.mod.common.api.spawning.influence.PlayerLevelRangeInfluence
+import com.cobblemon.mod.common.api.spawning.influence.PlayerLevelRangeInfluence.Companion.TYPICAL_VARIATION
 import com.cobblemon.mod.common.api.spawning.influence.RestrictedSpawnBlocksInfluence
 import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
 import com.cobblemon.mod.common.api.spawning.rules.SpawnRule
@@ -42,7 +43,7 @@ object PlayerSpawnerFactory {
     var influenceBuilders = mutableListOf<(player: ServerPlayer) -> SpawningInfluence?>({
         PlayerLevelRangeInfluence(
             it,
-            variation = 5
+            variation = TYPICAL_VARIATION
         )
     }, { RestrictedSpawnBlocksInfluence() })
 

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/spawner/TriggerSpawner.kt

@@ -30,8 +30,9 @@ abstract class TriggerSpawner<T : SpawnCause>(override val name: String, var spa
     private var selector: SpawningSelector = FlatContextWeightedSelector()
     override val influences = mutableListOf<SpawningInfluence>()
 
-    open fun run(cause: T, world: ServerLevel, pos: BlockPos): CompletableFuture<*>? {
+    open fun run(cause: T, world: ServerLevel, pos: BlockPos, influences: List<SpawningInfluence> = emptyList()): CompletableFuture<*>? {
         val context = parseContext(cause, world, pos) ?: return null
+        context.influences.addAll(influences)
         selector.select(this, listOf(context))?.let { (_, spawn) ->
             val action = spawn.doSpawn(context)
             action.complete()

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/party/PartyStore.kt

@@ -269,7 +269,7 @@ open class PartyStore(override val uuid: UUID) : PokemonStore<PartyPosition>() {
                 BattlePokemon.playerOwned(it)
             }.also { if (healPokemon) it.effectedPokemon.heal() }
         }.toMutableList()
-        if(leadingPokemon != null) {
+        if (leadingPokemon != null) {
             Collections.rotate(result, result.size - this.indexOfFirst { it.uuid == leadingPokemon })
         }
         return result

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/party/PlayerPartyStore.kt

@@ -102,20 +102,32 @@ open class PlayerPartyStore(
             for (pokemon in this) {
                 // Awake from fainted
                 if (pokemon.isFainted()) {
-                    pokemon.faintedTimer -= 1
-                    if (pokemon.faintedTimer <= -1) {
-                        val php = ceil(pokemon.maxHealth * Cobblemon.config.faintAwakenHealthPercent)
-                        pokemon.currentHealth = php.toInt()
-                        player.sendSystemMessage(Component.translatable("cobblemon.party.faintRecover", pokemon.getDisplayName()))
+                    //Skip awaken logic check if config value is 0
+                    if (Cobblemon.config.faintAwakenHealthPercent > 0) {
+                        pokemon.faintedTimer -= 1
+                        if (pokemon.faintedTimer <= -1) {
+                            val php = ceil(pokemon.maxHealth * Cobblemon.config.faintAwakenHealthPercent)
+                            pokemon.currentHealth = php.toInt()
+                            player.sendSystemMessage(
+                                Component.translatable(
+                                    "cobblemon.party.faintRecover",
+                                    pokemon.getDisplayName()
+                                )
+                            )
+                        }
                     }
                 }
                 // Passive healing while less than full health
                 else if (pokemon.currentHealth < pokemon.maxHealth) {
-                    pokemon.healTimer--
-                    if (pokemon.healTimer <= -1) {
-                        pokemon.healTimer = Cobblemon.config.healTimer
-                        val healAmount = 1.0.coerceAtLeast(pokemon.maxHealth.toDouble() * Cobblemon.config.healPercent)
-                        pokemon.currentHealth = pokemon.currentHealth + round(healAmount).toInt()
+                    //Skip passive healing logic check if config value is 0
+                    if (Cobblemon.config.healPercent > 0) {
+                        pokemon.healTimer--
+                        if (pokemon.healTimer <= -1) {
+                            pokemon.healTimer = Cobblemon.config.healTimer
+                            val healAmount =
+                                1.0.coerceAtLeast(pokemon.maxHealth.toDouble() * Cobblemon.config.healPercent)
+                            pokemon.currentHealth = pokemon.currentHealth + round(healAmount).toInt()
+                        }
                     }
                 }
 
@@ -204,4 +216,4 @@ open class PlayerPartyStore(
         super.set(position, pokemon)
         pokemon.getOwnerPlayer()?.let { CobblemonCriteria.PARTY_CHECK.trigger(it, this) }
     }
-}
+}

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

@@ -100,6 +100,10 @@ object BattleBuilder {
                 )
             }
 
+            if (actor.pokemonList.any { it.entity?.isBusy == true }) {
+                errors.participantErrors[actor] += BattleStartError.targetIsBusy(player.displayName ?: player.name)
+            }
+
             if (BattleRegistry.getBattleByParticipatingPlayer(player) != null) {
                 errors.participantErrors[actor] += BattleStartError.alreadyInBattle(player)
             }
@@ -109,16 +113,13 @@ object BattleBuilder {
         player2Actor.battleTheme = player1.getBattleTheme()
 
         return if (errors.isEmpty) {
-            var result: BattleStartResult = errors
             BattleRegistry.startBattle(
                 battleFormat = battleFormat,
                 side1 = BattleSide(player1Actor),
                 side2 = BattleSide(player2Actor)
             ).ifSuccessful {
                 it.battlePartyStores.addAll(battlePartyStores)
-                result = SuccessfulBattleStart(it)
             }
-            result
         } else {
             errors
         }
@@ -178,6 +179,10 @@ object BattleBuilder {
                 )
             }
 
+            if (actor.pokemonList.any { it.entity?.isBusy == true }) {
+                errors.participantErrors[actor] += BattleStartError.targetIsBusy(player.displayName ?: player.name)
+            }
+
             if (BattleRegistry.getBattleByParticipatingPlayer(player) != null) {
                 errors.participantErrors[actor] += BattleStartError.alreadyInBattle(player)
             }
@@ -206,13 +211,12 @@ object BattleBuilder {
 
         return if (errors.isEmpty) {
             BattleRegistry.startBattle(
-                    battleFormat = battleFormat,
-                    side1 = BattleSide(playerActors[0], playerActors[1]),
-                    side2 = BattleSide(playerActors[2], playerActors[3])
+                battleFormat = battleFormat,
+                side1 = BattleSide(playerActors[0], playerActors[1]),
+                side2 = BattleSide(playerActors[2], playerActors[3])
             ).ifSuccessful {
                 it.battlePartyStores.addAll(battlePartyStores)
             }
-            errors
         } else {
             errors
         }
@@ -248,7 +252,7 @@ object BattleBuilder {
         val wildActor = PokemonBattleActor(pokemonEntity.pokemon.uuid, BattlePokemon(pokemonEntity.pokemon), fleeDistance)
         val errors = ErroredBattleStart()
 
-        if(playerTeam.isNotEmpty() && playerTeam[0].health <= 0){
+        if (playerTeam.isNotEmpty() && playerTeam[0].health <= 0){
             errors.participantErrors[playerActor] += BattleStartError.insufficientPokemon(
                actorEntity = player,
                 requiredCount = battleFormat.battleType.slotsPerActor,
@@ -264,6 +268,10 @@ object BattleBuilder {
             )
         }
 
+        if (playerActor.pokemonList.any { it.entity?.isBusy == true }) {
+            errors.participantErrors[playerActor] += BattleStartError.targetIsBusy(player.displayName ?: player.name)
+        }
+
         if (BattleRegistry.getBattleByParticipatingPlayer(player) != null) {
             errors.participantErrors[playerActor] += BattleStartError.alreadyInBattle(playerActor)
         }
@@ -275,7 +283,6 @@ object BattleBuilder {
         playerActor.battleTheme = pokemonEntity.getBattleTheme()
 
         return if (errors.isEmpty) {
-            var result: BattleStartResult = errors
             BattleRegistry.startBattle(
                 battleFormat = battleFormat,
                 side1 = BattleSide(playerActor),
@@ -284,9 +291,7 @@ object BattleBuilder {
                 if (!cloneParties) {
                     pokemonEntity.battleId = it.battleId
                 }
-                result = SuccessfulBattleStart(it)
             }
-            result
         } else {
             errors
         }
@@ -348,19 +353,20 @@ object BattleBuilder {
             )
         }
 
+        if (playerActor.pokemonList.any { it.entity?.isBusy == true }) {
+            errors.participantErrors[playerActor] += BattleStartError.targetIsBusy(player.displayName ?: player.name)
+        }
+
         playerActor.battleTheme = npcEntity.getBattleTheme()
 
         return if (errors.isEmpty) {
-            var result: BattleStartResult = errors
             BattleRegistry.startBattle(
                 battleFormat = battleFormat,
                 side1 = BattleSide(playerActor),
                 side2 = BattleSide(npcActor)
             ).ifSuccessful { battle ->
                 npcEntity.entityData.update(NPCEntity.BATTLE_IDS) { it + battle.battleId }
-                result = SuccessfulBattleStart(battle)
             }
-            result
         } else {
             errors
         }
@@ -394,7 +400,7 @@ interface BattleStartError {
         fun alreadyInBattle(pokemonEntity: PokemonEntity) = AlreadyInBattleError(pokemonEntity.uuid, pokemonEntity.effectiveName())
         fun alreadyInBattle(actor: BattleActor) = AlreadyInBattleError(actor.uuid, actor.getName())
         fun noParty(npcEntity: NPCEntity) = NoPartyError(npcEntity)
-        fun targetIsBusy(targetName: MutableComponent) = BusyError(targetName)
+        fun targetIsBusy(targetName: Component) = BusyError(targetName)
         fun insufficientPokemon(
             actorEntity: Entity,
             requiredCount: Int,
@@ -474,7 +480,7 @@ class AlreadyInBattleError(
     }
 }
 class BusyError(
-    val targetName: MutableComponent
+    val targetName: Component
 ): BattleStartError {
     override fun getMessageFor(entity: Entity) = battleLang("errors.busy", targetName)
 }

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

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.battles
 
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.battles.BattleStartedPostEvent
@@ -178,19 +179,35 @@ object BattleRegistry {
         ShowdownService.service.startBattle(battle, messages.toTypedArray())
     }
 
+    /**
+     * Instantiates a new [PokemonBattle] and launches the Showdown service.
+     *
+     * @param battleFormat The format to use for the battle.
+     * @param side1 The first side for the battle.
+     * @param side2 The second side for the battle.
+     * @param canPreempt Whether the battle can be blocked by subscribers to [CobblemonEvents.BATTLE_STARTED_PRE].
+     *
+     * NOTE: this does NOT validate the [battleFormat] or sides before launching Showdown.
+     * This creates the battle and hands it off to Showdown - YOU WILL GET ISSUES IF THE BATTLE IS INVALID!
+     * See [BattleBuilder] functions for how the various types of battles are built and validated.
+     */
     fun startBattle(
         battleFormat: BattleFormat,
         side1: BattleSide,
         side2: BattleSide,
-        silent: Boolean = false
+        canPreempt: Boolean = true
     ): BattleStartResult {
         val battle = PokemonBattle(battleFormat, side1, side2)
-        if (silent) return SuccessfulBattleStart(battle)
+        val start: () -> Unit = {
+            battleMap[battle.battleId] = battle
+            startShowdown(battle)
+        }
+
+        if (!canPreempt) start().also { return SuccessfulBattleStart(battle) }
 
         val preBattleEvent = BattleStartedPreEvent(battle)
         CobblemonEvents.BATTLE_STARTED_PRE.postThen(preBattleEvent) {
-            battleMap[battle.battleId] = battle
-            startShowdown(battle)
+            start()
             CobblemonEvents.BATTLE_STARTED_POST.post(BattleStartedPostEvent(battle))
             return SuccessfulBattleStart(battle)
         }

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

@@ -107,7 +107,7 @@ interface Targetable {
             MoveTarget.adjacentAllyOrSelf -> null
             MoveTarget.adjacentFoe -> null
             MoveTarget.foeSide -> getAllActivePokemon().filter { !it.isAllied(this) }
-            MoveTarget.scripted -> null
+            MoveTarget.scripted -> listOf(this)
             else -> null
         }
     }

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

@@ -69,7 +69,7 @@ object ShowdownInterpreter {
         updateInstructionParser["-copyboost"]            = { _, _, message, _ -> CopyBoostInstruction(message) }
         updateInstructionParser["-crit"]                 = { _, instructionSet, message, _ -> CritInstruction(message, instructionSet) }
         updateInstructionParser["-curestatus"]           = { _, _, message, _ -> CureStatusInstruction(message) }
-        updateInstructionParser["detailschange"]         = { _, _, message, _ -> DetailsChangeInstruction(message) }
+        updateInstructionParser["detailschange"]         = { _, _, message, _ -> FormeChangeInstruction(message) }
         updateInstructionParser["-endability"]           = { _, _, message, _ -> EndAbilityInstruction(message) }
         updateInstructionParser["-end"]                  = { _, _, message, _ -> EndInstruction(message) }
         updateInstructionParser["-enditem"]              = { _, _, message, _ -> EndItemInstruction(message) }
@@ -78,6 +78,7 @@ object ShowdownInterpreter {
         updateInstructionParser["-fieldactivate"]        = { _, _, message, _ -> FieldActivateInstruction(message) }
         updateInstructionParser["-fieldend"]             = { _, _, message, _ -> FieldEndInstruction(message) }
         updateInstructionParser["-fieldstart"]           = { _, _, message, _ -> FieldStartInstruction(message) }
+        updateInstructionParser["-formechange"]          = { _, _, message, _ -> FormeChangeInstruction(message) }
         updateInstructionParser["-hitcount"]             = { _, _, message, _ -> HitCountInstruction(message) }
         updateInstructionParser["-immune"]               = { _, _, message, _ -> ImmuneInstruction(message) }
         updateInstructionParser["-invertboost"]          = { _, _, message, _ -> InvertBoostInstruction(message) }

common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/DetailsChangeInstruction.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.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |detailschange|POKEMON|DETAILS|HP STATUS
- *
- * POKEMON has changed formes permanently (i.e. Mega Evolution) to DETAILS.
- * @author Segfault Guy
- * @since September 10th, 2023
- */
-class DetailsChangeInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        val battlePokemon = message.battlePokemon(0, battle) ?: return
-        val formName = message.argumentAt(1)?.split(',')?.get(0)?.substringAfter('-')?.lowercase() ?: return
-        battle.dispatchWaiting {
-            val pokemonName = battlePokemon.getName()
-            battle.broadcastChatMessage(battleLang("detailschange.$formName", pokemonName))
-            battle.majorBattleActions[battlePokemon.uuid] = message
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/FormeChangeInstruction.kt

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.battles.interpreter.instructions
+
+import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
+import com.cobblemon.mod.common.api.battles.model.PokemonBattle
+import com.cobblemon.mod.common.battles.ShowdownInterpreter
+import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
+import com.cobblemon.mod.common.util.battleLang
+
+/**
+ * Format: |-formechange|POKEMON|SPECIES|HP STATUS or |detailschange|POKEMON|DETAILS|HP STATUS
+ *
+ * POKEMON has temporarily (-formechange) or permanently (detailschange) changed form to SPECIES/DETAILS.
+ * @author Segfault Guy
+ * @since December 9th, 2024
+ */
+class FormeChangeInstruction(val message: BattleMessage): InterpreterInstruction {
+
+    override fun invoke(battle: PokemonBattle) {
+        val battlePokemon = message.battlePokemon(0, battle) ?: return
+        val details = message.argumentAt(1)?.split(',')?.get(0)?.lowercase() ?: return
+        val speciesName = details.substringBefore('-')
+        val formName = details.substringAfterLast('-').ifBlank { speciesName }
+        val typeKey = if (message.id == "detailschange") "permanent" else "temporary"
+
+        ShowdownInterpreter.broadcastOptionalAbility(battle, message.effect(), battlePokemon)
+
+        battle.dispatchWaiting {
+            battle.minorBattleActions[battlePokemon.uuid] = message
+
+            val pokemonName = battlePokemon.getName()
+            val lang = when(formName) {
+                "busted", "hero", "complete" -> return@dispatchWaiting
+                "school", "wishiwashi", "meteor", "minior" -> battleLang("formechange.$formName", pokemonName)
+                speciesName -> battleLang("formechange.default.temporary.end", pokemonName)
+                else -> battleLang("formechange.default.$typeKey", pokemonName, formName)
+            }
+            battle.broadcastChatMessage(lang)
+        }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/block/PCBlock.kt

@@ -55,7 +55,6 @@ class PCBlock(properties: Properties): BaseEntityBlock(properties), SimpleWaterl
         val CODEC = simpleCodec(::PCBlock)
         val PART = EnumProperty.create("part", PCPart::class.java)
         val ON = BooleanProperty.create("on")
-        val WATERLOGGED = BooleanProperty.create("waterlogged")
         val NATURAL = BooleanProperty.create("natural")
 
         private val NORTH_AABB_TOP = Shapes.or(
@@ -235,7 +234,7 @@ class PCBlock(properties: Properties): BaseEntityBlock(properties), SimpleWaterl
 
     @Deprecated("Deprecated in Java")
     override fun isPathfindable(
-        blockState: BlockState?,
+        blockState: BlockState,
         pathComputationType: PathComputationType
     ): Boolean = false
 

common/src/main/kotlin/com/cobblemon/mod/common/block/chest/GildedChestBlock.kt

@@ -157,7 +157,7 @@ class GildedChestBlock(settings: Properties, val type: Type = Type.RED) : BaseEn
         // The yaw based on the block's facing direction
         val yaw = facingToYaw[state.getValue(HorizontalDirectionalBlock.FACING)] ?: 0.0F
 
-        entity.entityData.set(PokemonEntity.SPAWN_DIRECTION, facingToYaw[state.getValue(HorizontalDirectionalBlock.FACING)])
+        entity.entityData.set(PokemonEntity.SPAWN_DIRECTION, yaw)
         val offsetDir = state.getValue(HorizontalDirectionalBlock.FACING)
         val vec = pos.toVec3d().add(offsetDir.stepX * 0.1 + 0.5, 0.0, offsetDir.stepZ * 0.1 + 0.5)
         entity.moveTo(vec.x, vec.y, vec.z, yaw, entity.xRot)

common/src/main/kotlin/com/cobblemon/mod/common/brewing/BrewingRecipes.kt

@@ -17,9 +17,9 @@ import net.minecraft.world.item.alchemy.Potions
 
 object BrewingRecipes {
 
-    val recipes: List<Triple<CobblemonIngredient, CobblemonIngredient, Item>> by lazy {
+    val recipes: List<Triple<CobblemonIngredient, Item, Item>> by lazy {
         listOf(
-            Triple(CobblemonPotionIngredient(Potions.WATER), CobblemonItemIngredient(CobblemonItems.MEDICINAL_LEEK), CobblemonItems.MEDICINAL_BREW),
+            Triple(CobblemonPotionIngredient(Potions.WATER), CobblemonItems.MEDICINAL_LEEK, CobblemonItems.MEDICINAL_BREW),
             convert(CobblemonItems.MEDICINAL_BREW, CobblemonItems.LEPPA_BERRY, CobblemonItems.ETHER),
             convert(CobblemonItems.MEDICINAL_BREW, CobblemonItems.HOPO_BERRY, CobblemonItems.ELIXIR),
             convert(CobblemonItems.MEDICINAL_BREW, CobblemonItems.ORAN_BERRY, CobblemonItems.POTION),
@@ -50,8 +50,8 @@ object BrewingRecipes {
         )
     }
     
-    private fun convert(input: Item, ingredient: Item, output: Item): Triple<CobblemonIngredient, CobblemonIngredient, Item> {
-        return Triple(CobblemonItemIngredient(input), CobblemonItemIngredient(ingredient), output)
+    private fun convert(input: Item, ingredient: Item, output: Item): Triple<CobblemonIngredient, Item, Item> {
+        return Triple(CobblemonItemIngredient(input), ingredient, output)
     }
 
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/ClientMoLangFunctions.kt

@@ -125,6 +125,7 @@ object ClientMoLangFunctions {
                 val maxPitch = params.getDoubleOrNull(3) ?: 70F
                 val minPitch = params.getDoubleOrNull(4) ?: -45F
                 val maxYaw = params.getDoubleOrNull(5) ?: 45F
+                val minYaw = params.getDoubleOrNull(6) ?: -45F
                 ObjectValue(
                     SingleBoneLookAnimation(
                         bone = model.getPart(boneName),
@@ -132,7 +133,8 @@ object ClientMoLangFunctions {
                         yawMultiplier = yawMultiplier.toFloat(),
                         maxPitch = maxPitch.toFloat(),
                         minPitch = minPitch.toFloat(),
-                        maxYaw = maxYaw.toFloat()
+                        maxYaw = maxYaw.toFloat(),
+                        minYaw = minYaw.toFloat()
                     )
                 )
             }

common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt

@@ -8,12 +8,17 @@
 
 package com.cobblemon.mod.common.client
 
-import com.cobblemon.mod.common.*
 import com.cobblemon.mod.common.Cobblemon.LOGGER
+import com.cobblemon.mod.common.CobblemonBlockEntities
+import com.cobblemon.mod.common.CobblemonBlocks
+import com.cobblemon.mod.common.CobblemonClientImplementation
+import com.cobblemon.mod.common.CobblemonEntities
+import com.cobblemon.mod.common.CobblemonItems
+import com.cobblemon.mod.common.ResourcePackActivationBehaviour
 import com.cobblemon.mod.common.api.berry.Berries
 import com.cobblemon.mod.common.api.scheduling.ClientTaskTracker
-import com.cobblemon.mod.common.api.storage.player.client.ClientPokedexManager
 import com.cobblemon.mod.common.api.storage.player.client.ClientGeneralPlayerData
+import com.cobblemon.mod.common.api.storage.player.client.ClientPokedexManager
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.client.battle.ClientBattle
 import com.cobblemon.mod.common.client.gui.PartyOverlay
@@ -21,7 +26,13 @@ import com.cobblemon.mod.common.client.gui.battle.BattleOverlay
 import com.cobblemon.mod.common.client.particle.BedrockParticleOptionsRepository
 import com.cobblemon.mod.common.client.render.ClientPlayerIcon
 import com.cobblemon.mod.common.client.render.DeferredRenderer
-import com.cobblemon.mod.common.client.render.block.*
+import com.cobblemon.mod.common.client.render.block.BerryBlockRenderer
+import com.cobblemon.mod.common.client.render.block.DisplayCaseRenderer
+import com.cobblemon.mod.common.client.render.block.FossilAnalyzerRenderer
+import com.cobblemon.mod.common.client.render.block.GildedChestBlockRenderer
+import com.cobblemon.mod.common.client.render.block.HealingMachineRenderer
+import com.cobblemon.mod.common.client.render.block.LecternBlockEntityRenderer
+import com.cobblemon.mod.common.client.render.block.RestorationTankRenderer
 import com.cobblemon.mod.common.client.render.boat.CobblemonBoatRenderer
 import com.cobblemon.mod.common.client.render.entity.PokeBobberEntityRenderer
 import com.cobblemon.mod.common.client.render.generic.GenericBedrockRenderer
@@ -29,7 +40,14 @@ import com.cobblemon.mod.common.client.render.item.CobblemonBuiltinItemRendererR
 import com.cobblemon.mod.common.client.render.item.PokemonItemRenderer
 import com.cobblemon.mod.common.client.render.layer.PokemonOnShoulderRenderer
 import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockAnimationRepository
-import com.cobblemon.mod.common.client.render.models.blockbench.repository.*
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.BerryModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.BlockEntityModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.FossilModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.GenericBedrockEntityModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.MiscModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.NPCModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokeBallModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository
 import com.cobblemon.mod.common.client.render.npc.NPCRenderer
 import com.cobblemon.mod.common.client.render.pokeball.PokeBallRenderer
 import com.cobblemon.mod.common.client.render.pokemon.PokemonRenderer
@@ -86,6 +104,13 @@ object CobblemonClient {
         GenericBedrockEntityModelRepository
     )
 
+    @JvmStatic
+    val builtinResourcePacks = listOf<CobblemonResourcePack>(
+        CobblemonResourcePack(id = "adorncompatibility", name = "Adorn Compatibility", activationBehaviour = ResourcePackActivationBehaviour.DEFAULT_ENABLED, neededMods = setOf("adorn")),
+        CobblemonResourcePack(id = "gyaradosjump", name = "Gyarados Jump Patterns", activationBehaviour = ResourcePackActivationBehaviour.DEFAULT_ENABLED),
+        CobblemonResourcePack(id = "regionbiasforms", name = "Region Bias Forms", activationBehaviour = ResourcePackActivationBehaviour.DEFAULT_ENABLED),
+        CobblemonResourcePack(id = "uniqueshinyforms", name = "Shinies for Magikarp Jump", activationBehaviour = ResourcePackActivationBehaviour.NORMAL),
+    )
 
     val overlay: PartyOverlay by lazy { PartyOverlay() }
     val battleOverlay: BattleOverlay by lazy { BattleOverlay() }

common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonResourcePack.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client
+
+import com.cobblemon.mod.common.ResourcePackActivationBehaviour
+import net.minecraft.network.chat.Component
+
+class CobblemonResourcePack(
+    val id: String,
+    val name: String,
+    val activationBehaviour: ResourcePackActivationBehaviour,
+    val neededMods: Set<String> = setOf()
+) {
+    val displayName = Component.literal(name)
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/CobblemonRenderable.kt

@@ -0,0 +1,13 @@
+/*
+ * 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.client.gui
+
+import net.minecraft.client.gui.components.Renderable
+
+interface CobblemonRenderable : Renderable

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/ExitButton.kt

@@ -18,7 +18,7 @@ import net.minecraft.network.chat.Component
 class ExitButton(
     pX: Int, pY: Int,
     onPress: OnPress
-): Button(pX, pY, WIDTH.toInt(), HEIGHT.toInt(), Component.literal("Exit"), onPress, DEFAULT_NARRATION) {
+): Button(pX, pY, WIDTH.toInt(), HEIGHT.toInt(), Component.literal("Exit"), onPress, DEFAULT_NARRATION), CobblemonRenderable {
 
     companion object {
         private const val WIDTH = 26F

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/ScrollingWidget.kt

@@ -31,7 +31,7 @@ abstract class ScrollingWidget<T : ObjectSelectionList.Entry<T>>(
     height, // Height
     top, // Top
     slotHeight // Slot Height
-) {
+), CobblemonRenderable {
     override fun renderListBackground(guiGraphics: GuiGraphics) {}
     override fun renderSelection(context: GuiGraphics, y: Int, entryWidth: Int, entryHeight: Int, borderColor: Int, fillColor: Int) {}
     override fun renderDecorations(context: GuiGraphics, mouseX: Int, mouseY: Int) {}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/BattleGUI.kt

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.battles.ShowdownActionResponse
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.battle.ClientBattleActor
 import com.cobblemon.mod.common.client.battle.SingleActionRequest
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.battle.subscreen.BattleActionSelection
 import com.cobblemon.mod.common.client.gui.battle.subscreen.BattleBackButton
 import com.cobblemon.mod.common.client.gui.battle.subscreen.BattleGeneralActionSelection
@@ -29,7 +30,7 @@ import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.screens.Screen
 
-class BattleGUI : Screen(battleLang("gui.title")) {
+class BattleGUI : Screen(battleLang("gui.title")), CobblemonRenderable {
     companion object {
         const val OPTION_VERTICAL_SPACING = 3
         const val OPTION_HORIZONTAL_SPACING = 3
@@ -183,15 +184,16 @@ class BattleGUI : Screen(battleLang("gui.title")) {
 
     override fun charTyped(chr: Char, modifiers: Int): Boolean {
         if (chr.toString().equals(PartySendBinding.boundKey().displayName.string, ignoreCase = true) && CobblemonClient.battleOverlay.opacity == BattleOverlay.MAX_OPACITY && PartySendBinding.canAction()) {
-            val battle = CobblemonClient.battle ?: return false
-            battle.minimised = !battle.minimised
-            PartySendBinding.actioned()
-            return true
+            return minimizeBattle()
         }
         return super.charTyped(chr, modifiers)
     }
 
     override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
+        if (button == PartySendBinding.boundKey().value && CobblemonClient.battleOverlay.opacity == BattleOverlay.MAX_OPACITY && PartySendBinding.canAction()) {
+            return minimizeBattle()
+        }
+
         val battle = CobblemonClient.battle
         if (battle?.spectating == true && specBackButton.isHovered(mouseX, mouseY)) {
             RemoveSpectatorPacket(battle.battleId).sendToServer()
@@ -199,4 +201,11 @@ class BattleGUI : Screen(battleLang("gui.title")) {
         }
         return super.mouseClicked(mouseX, mouseY, button)
     }
+
+    private fun minimizeBattle(): Boolean {
+        val battle = CobblemonClient.battle ?: return false
+        battle.minimised = !battle.minimised
+        PartySendBinding.actioned()
+        return true
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleBackButton.kt

@@ -9,18 +9,19 @@
 package com.cobblemon.mod.common.client.gui.battle.subscreen
 
 import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.gui.GuiGraphics
 
-class BattleBackButton(val x: Float, val y: Float) {
+class BattleBackButton(val x: Float, val y: Float) : CobblemonRenderable {
     companion object {
         const val WIDTH = 58
         const val HEIGHT = 34
         const val SCALE = 0.5F
     }
 
-    fun render(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+    override fun render(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
         blitk(
             matrixStack = context.pose(),
             texture = cobblemonResource("textures/gui/battle/battle_back.png"),

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleTargetSelection.kt

@@ -89,7 +89,7 @@ class BattleTargetSelection(
         val isAlly = target.isAllied(request.activePokemon)
         val teamSize = request.activePokemon.getSidePokemon().count()
         val fieldPos = if(isAlly) index % teamSize else teamSize - 1 - (index % teamSize)
-        val verticalAligned = true
+        val verticalAligned = false
         val x: Float
         val y: Float
         val arrowDirection: ArrowDirection

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/widgets/BattleMessagePane.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.gui.battle.widgets
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.client.battle.ClientBattleMessageQueue
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.client.Minecraft
@@ -32,7 +33,7 @@ class BattleMessagePane(
     FRAME_HEIGHT, // height
     1, // top
     LINE_HEIGHT
-) {
+), CobblemonRenderable {
     var opacity = 1F
     private var scrolling = false
 

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/widgets/BattleOptionTile.kt

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.client.gui.battle.widgets
 
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.client.CobblemonClient
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.battle.BattleGUI
 import com.cobblemon.mod.common.client.render.drawScaledText
 import net.minecraft.client.gui.GuiGraphics
@@ -28,7 +29,7 @@ class BattleOptionTile(
     val resource: ResourceLocation,
     val text: MutableComponent,
     val onClick: () -> Unit
-) : Renderable, GuiEventListener, NarratableEntry {
+) : CobblemonRenderable, GuiEventListener, NarratableEntry {
     companion object {
         const val  OPTION_WIDTH = 90
         const val OPTION_HEIGHT = 26

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/dialogue/DialogueScreen.kt

@@ -17,6 +17,7 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunctions
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.client.ClientMoLangFunctions.setupClient
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.dialogue.widgets.DialogueBox
 import com.cobblemon.mod.common.client.gui.dialogue.widgets.DialoguePortraitWidget
 import com.cobblemon.mod.common.client.gui.dialogue.widgets.DialogueNameWidget
@@ -36,7 +37,7 @@ import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.screens.Screen
 
-class DialogueScreen(var dialogueDTO: DialogueDTO) : Screen("gui.dialogue".asTranslated()) {
+class DialogueScreen(var dialogueDTO: DialogueDTO) : Screen("gui.dialogue".asTranslated()), CobblemonRenderable {
     val speakers = dialogueDTO.speakers?.mapNotNull { (key, value) ->
         val name = value.name
         when (val face = value.face) {
@@ -200,7 +201,7 @@ class DialogueScreen(var dialogueDTO: DialogueDTO) : Screen("gui.dialogue".asTra
         addRenderableOnly(dialoguePortraitWidget)
 
         if (dialogueDTO.dialogueInput.inputType == DialogueInputDTO.InputType.TEXT) {
-            //focusOn(dialogueTextInputWidget)
+            setInitialFocus(dialogueTextInputWidget)
         }
 
         dialogueDTO.currentPageDTO.clientActions.flatMap(String::asExpressions).resolve(runtime)

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/dialogue/widgets/DialogueNameWidget.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.gui.dialogue.widgets
 
 import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.client.gui.GuiGraphics
@@ -22,7 +23,7 @@ class DialogueNameWidget(
     val width: Int,
     val height: Int,
     val text: MutableComponent?
-) : Renderable, GuiEventListener {
+) : CobblemonRenderable, GuiEventListener {
     companion object {
         val nameResource = cobblemonResource("textures/gui/dialogue/dialogue_name.png")
     }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/dialogue/widgets/DialoguePortraitWidget.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.gui.dialogue.widgets
 
 import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.dialogue.DialogueScreen
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.client.gui.GuiGraphics
@@ -22,7 +23,7 @@ class DialoguePortraitWidget(
     val y: Int,
     val width: Int,
     val height: Int
-) : Renderable, GuiEventListener {
+) : CobblemonRenderable, GuiEventListener {
     companion object {
         val DIALOGUE_ARROW_HEIGHT = 11
         val DIALOGUE_ARROW_WIDTH = 6

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/dialogue/widgets/DialogueTextInputWidget.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.gui.dialogue.widgets
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.gui.drawCenteredText
 import com.cobblemon.mod.common.api.text.text
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.dialogue.DialogueScreen
 import com.cobblemon.mod.common.net.messages.client.dialogue.dto.DialogueInputDTO
 import com.cobblemon.mod.common.net.messages.server.dialogue.InputToDialoguePacket
@@ -36,7 +37,7 @@ class DialogueTextInputWidget(
     width,
     height,
     "gui_dialogue_text_input".text()
-) {
+), CobblemonRenderable {
     init {
         setMaxLength(maxLength)
         isFocused = true

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/dialogue/widgets/DialogueTimerWidget.kt

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.client.gui.dialogue.widgets
 
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.dialogue.DialogueScreen
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.client.gui.GuiGraphics
@@ -22,7 +23,7 @@ class DialogueTimerWidget(
     val y: Int,
     val width: Int,
     val height: Int,
-) : Renderable, GuiEventListener {
+) : CobblemonRenderable, GuiEventListener {
     companion object {
         val timerResource = cobblemonResource("textures/gui/dialogue/dialogue_timer_bar.png")
     }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/battleRequest/BattleConfigureGUI.kt

@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.battles.BattleFormat
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.battle.ClientBattleChallenge
 import com.cobblemon.mod.common.client.battle.ClientTeamRequest
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket
 import com.cobblemon.mod.common.net.messages.server.*
@@ -35,7 +36,7 @@ class BattleConfigureGUI(
         private val packet: PlayerInteractOptionsPacket,
         private val activeRequest: ClientBattleChallenge? = null,
         private val activeTeamRequest: ClientTeamRequest? = null
-) : Screen(lang("ui.challenge.challenge_title")) {
+) : Screen(lang("ui.challenge.challenge_title")), CobblemonRenderable {
     companion object {
         const val SIZE = 113
         private val backgroundResource = cobblemonResource("textures/gui/interact/request/battle_request.png")

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/battleRequest/BattleRequestNavigationButton.kt

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.client.gui.interact.battleRequest
 
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
@@ -25,7 +26,7 @@ class BattleRequestNavigationButton(
     private val forwardIcon: ResourceLocation = forwardButtonResource,
     private val backwardIcon: ResourceLocation = backwardsButtonResource,
     onPress: OnPress
-): Button(pX.toInt(), pY.toInt(), (WIDTH * SCALE).toInt(), (clickHeight * SCALE).toInt(), Component.literal("Navigation"), onPress, DEFAULT_NARRATION) {
+): Button(pX.toInt(), pY.toInt(), (WIDTH * SCALE).toInt(), (clickHeight * SCALE).toInt(), Component.literal("Navigation"), onPress, DEFAULT_NARRATION), CobblemonRenderable {
 
     companion object {
         const val HEIGHT = 16

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/battleRequest/BattleResponseButton.kt

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.client.gui.interact.battleRequest
 
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
@@ -21,7 +22,7 @@ class BattleResponseButton(
         pX: Int, pY: Int,
         private val accept: Boolean,
         onPress: OnPress
-): Button(pX, pY, (WIDTH * SCALE).toInt(), (HEIGHT * SCALE).toInt(), Component.literal("Navigation"), onPress, DEFAULT_NARRATION) {
+): Button(pX, pY, (WIDTH * SCALE).toInt(), (HEIGHT * SCALE).toInt(), Component.literal("Navigation"), onPress, DEFAULT_NARRATION), CobblemonRenderable {
 
     companion object {
         private const val WIDTH = 34F

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/battleRequest/BatttleRequestButton.kt

@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.client.gui.GuiGraphics
@@ -24,7 +25,7 @@ class BattleRequestButton(
         pX: Int, pY: Int,
         var text: MutableComponent,
         onPress: OnPress
-): Button(pX, pY, (WIDTH * SCALE).toInt(), (HEIGHT * SCALE).toInt(), text, onPress, DEFAULT_NARRATION) {
+): Button(pX, pY, (WIDTH * SCALE).toInt(), (HEIGHT * SCALE).toInt(), text, onPress, DEFAULT_NARRATION), CobblemonRenderable {
 
     companion object {
         private const val WIDTH = 69F

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/moveselect/MoveSelectGUI.kt

@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.CobblemonNetwork
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.callback.MoveSelectDTO
 import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.ExitButton
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectedPacket
@@ -35,7 +36,7 @@ class MoveSelectConfiguration(
 
 class MoveSelectGUI(
     val config: MoveSelectConfiguration
-) : Screen(Component.translatable("cobblemon.ui.interact.moveselect")) {
+) : Screen(Component.translatable("cobblemon.ui.interact.moveselect")), CobblemonRenderable {
     companion object {
         const val WIDTH = 122
         const val HEIGHT = 133

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/moveselect/MoveSlotButton.kt

@@ -16,6 +16,7 @@ import com.cobblemon.mod.common.api.text.gold
 import com.cobblemon.mod.common.api.text.red
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.MoveCategoryIcon
 import com.cobblemon.mod.common.client.gui.TypeIcon
 import com.cobblemon.mod.common.client.render.drawScaledText
@@ -35,7 +36,7 @@ class MoveSlotButton(
     val ppMax: Int,
     val enabled: Boolean = true,
     onPress: OnPress
-) : Button(x, y, WIDTH, HEIGHT, Component.literal("Move"), onPress, CreateNarration { "".text() }) {
+) : Button(x, y, WIDTH, HEIGHT, Component.literal("Move"), onPress, CreateNarration { "".text() }), CobblemonRenderable {
 
     companion object {
         private val moveResource = cobblemonResource("textures/gui/summary/summary_move.png")

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/partyselect/PartySelectGUI.kt

@@ -14,6 +14,7 @@ import com.cobblemon.mod.common.api.callback.PartySelectPokemonDTO
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.ExitButton
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.net.messages.server.callback.party.PartyPokemonSelectedPacket
@@ -37,7 +38,7 @@ class PartySelectConfiguration(
 )
 class PartySelectGUI(
     val config: PartySelectConfiguration
-) : Screen(Component.translatable("cobblemon.ui.interact.moveselect")) {
+) : Screen(Component.translatable("cobblemon.ui.interact.moveselect")), CobblemonRenderable {
     companion object {
         const val WIDTH = 163
         const val HEIGHT = 132

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/partyselect/PartySlotButton.kt

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.drawProfilePokemon
 import com.cobblemon.mod.common.client.gui.summary.widgets.PartySlotWidget
 import com.cobblemon.mod.common.client.render.drawScaledText
@@ -42,7 +43,7 @@ class PartySlotButton(
     val enabled: Boolean = true,
     val parent: PartySelectGUI,
     onPress: OnPress
-) : Button(x, y, WIDTH, HEIGHT, Component.literal("Pokemon"), onPress, CreateNarration { "".text() }) {
+) : Button(x, y, WIDTH, HEIGHT, Component.literal("Pokemon"), onPress, CreateNarration { "".text() }), CobblemonRenderable {
 
     companion object {
         private val slotResource = cobblemonResource("textures/gui/interact/party_select_slot.png")

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/wheel/InteractWheelButton.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.gui.interact.wheel
 
 import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
@@ -29,7 +30,7 @@ class InteractWheelButton(
         private val colour: () -> Vector3f?,
         onPress: OnPress,
         private val canHover: (Double, Double) -> Boolean
-) : Button(x, y, BUTTON_SIZE, BUTTON_SIZE, Component.literal("Interact"), onPress, DEFAULT_NARRATION) {
+) : Button(x, y, BUTTON_SIZE, BUTTON_SIZE, Component.literal("Interact"), onPress, DEFAULT_NARRATION), CobblemonRenderable {
 
     companion object {
         const val BUTTON_SIZE = 69

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/wheel/InteractWheelGUI.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.gui.interact.wheel
 
 import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.startselection.widgets.preview.ArrowButton
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.common.collect.Multimap
@@ -20,7 +21,7 @@ import net.minecraft.client.gui.screens.Screen
 import net.minecraft.network.chat.Component
 import kotlin.math.max
 
-class InteractWheelGUI(private val options: Multimap<Orientation, InteractWheelOption>, title: Component) : Screen(title) {
+class InteractWheelGUI(private val options: Multimap<Orientation, InteractWheelOption>, title: Component) : Screen(title), CobblemonRenderable {
     companion object {
         const val SIZE = 140
         const val OPTION_SIZE = 71

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/npc/NPCEditorButton.kt

@@ -0,0 +1,109 @@
+/*
+ * 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.client.gui.npc
+
+import com.cobblemon.mod.common.CobblemonSounds
+import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.api.text.text
+import com.cobblemon.mod.common.client.render.drawScaledText
+import com.cobblemon.mod.common.util.asTranslated
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.lang
+import net.minecraft.client.Minecraft
+import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.components.Button
+import net.minecraft.client.resources.sounds.SimpleSoundInstance
+import net.minecraft.client.sounds.SoundManager
+import net.minecraft.network.chat.MutableComponent
+
+class NPCEditorButton(
+    var buttonX: Float,
+    var buttonY: Float,
+    var label: MutableComponent,
+    var cycleButtonState: Boolean? = null,
+    var buttonWidth: Int = Minecraft.getInstance().font.width(label) + (BUTTON_PADDING * 2),
+    val silent: Boolean = false,
+    val alignRight: Boolean = false,
+    val clickAction: OnPress
+): Button(if (alignRight) (buttonX - buttonWidth).toInt() else buttonX.toInt(), buttonY.toInt(), buttonWidth, HEIGHT, "".text(), clickAction, DEFAULT_NARRATION) {
+
+    companion object {
+        val HEIGHT = 16
+        val BORDER_WIDTH = 2
+        val BUTTON_PADDING = 6
+        val buttonResource = cobblemonResource("textures/gui/npc/button_base.png")
+        val buttonBorderResource = cobblemonResource("textures/gui/npc/button_border.png")
+    }
+
+    var isWidgetActive = false
+
+    override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, partialTicks: Float) {
+        val matrices = context.pose()
+
+        // Left border
+        blitk(
+            matrixStack = matrices,
+            texture = buttonBorderResource,
+            x = x,
+            y = y,
+            width = BORDER_WIDTH,
+            height = HEIGHT,
+            vOffset = if (isMouseOver(mouseX.toDouble(), mouseY.toDouble()) || isWidgetActive) HEIGHT else 0,
+            textureWidth = 3,
+            textureHeight = HEIGHT * 2,
+        )
+        // Base
+        blitk(
+            matrixStack = matrices,
+            texture = buttonResource,
+            x = x + BORDER_WIDTH,
+            y = y,
+            width = buttonWidth - (BORDER_WIDTH * 2),
+            height = HEIGHT,
+            vOffset = if (isMouseOver(mouseX.toDouble(), mouseY.toDouble()) || isWidgetActive) HEIGHT else 0,
+            textureHeight = HEIGHT * 2,
+        )
+        // Right border
+        blitk(
+            matrixStack = matrices,
+            texture = buttonBorderResource,
+            x = x + (buttonWidth - BORDER_WIDTH),
+            y = y,
+            width = BORDER_WIDTH,
+            height = HEIGHT,
+            uOffset = 1,
+            vOffset = if (isMouseOver(mouseX.toDouble(), mouseY.toDouble()) || isWidgetActive) HEIGHT else 0,
+            textureWidth = 3,
+            textureHeight = HEIGHT * 2,
+        )
+
+        var buttonLabel = if (cycleButtonState != null) "options.${if (cycleButtonState as Boolean) "on" else "off"}.composed".asTranslated(label) else label
+        drawScaledText(
+            context = context,
+            text = buttonLabel,
+            x = x + (buttonWidth / 2),
+            y = y + 4,
+            centered = true,
+            shadow = true
+        )
+    }
+
+    override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
+        if (active && isMouseOver(mouseX, mouseY)) {
+            super.mouseClicked(mouseX, mouseY, button)
+        }
+        return false
+    }
+
+    override fun playDownSound(soundManager: SoundManager) {
+        if (active && !this.silent) {
+            soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.GUI_CLICK, 1.0F))
+        }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/npc/NPCEditorScreen.kt

@@ -8,25 +8,36 @@
 
 package com.cobblemon.mod.common.client.gui.npc
 
+import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.api.gui.drawText
 import com.cobblemon.mod.common.api.text.text
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.npc.widgets.ConfigVariableList
 import com.cobblemon.mod.common.client.gui.npc.widgets.NPCRenderWidget
+import com.cobblemon.mod.common.client.gui.npc.widgets.NPCRenderWidget.Companion.HEIGHT
+import com.cobblemon.mod.common.client.gui.npc.widgets.NPCRenderWidget.Companion.WIDTH
 import com.cobblemon.mod.common.client.gui.npc.widgets.SimpleNPCTextInputWidget
+import com.cobblemon.mod.common.client.render.drawScaledText
+import com.cobblemon.mod.common.client.render.drawScaledTextJustifiedRight
 import com.cobblemon.mod.common.net.messages.client.npc.dto.NPCConfigurationDTO
 import com.cobblemon.mod.common.net.messages.server.npc.SaveNPCPacket
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.lang
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
 import net.minecraft.client.gui.screens.Screen
+import java.util.UUID
 
 class NPCEditorScreen(
     val npcId: Int,
     val dto: NPCConfigurationDTO
-) : Screen("gui.npc_editor.title".asTranslated()) {
+) : Screen("gui.npc_editor.title".asTranslated()), CobblemonRenderable {
     companion object {
-        const val BASE_WIDTH = 331
-        const val BASE_HEIGHT = 161
+        const val BASE_WIDTH = 360
+        const val BASE_HEIGHT = 220
+
+        val baseResource = cobblemonResource("textures/gui/npc/base.png")
     }
 
     val middleX: Int
@@ -41,53 +52,73 @@ class NPCEditorScreen(
 
     override fun init() {
         super.init()
-        addRenderableOnly(NPCRenderWidget(leftX + 6, topY + 22, dto.npcClass, dto.aspects))
+        addRenderableOnly(NPCRenderWidget(leftX + 12, topY + 35, dto.npcClass, dto.aspects))
         addRenderableWidget(SimpleNPCTextInputWidget(
-            texture = cobblemonResource("textures/gui/npc/basic_text_input.png"),
             getter = { dto.npcName.string },
             setter = { dto.npcName = it.text() },
-            x = leftX + 6,
-            y = topY + 80,
-            width = 130,
-            height = 22
+            posX = leftX + 12,
+            posY = topY + 9,
+            width = 192,
+            height = 22,
+            maxLength = 32
         ))
+
         addRenderableWidget(SimpleNPCTextInputWidget(
-            texture = cobblemonResource("textures/gui/npc/aspects_text_input.png"),
             getter = { dto.aspects.joinToString() },
             setter = {
                 dto.aspects.clear()
                 dto.aspects.addAll(it.split(",").map { it.trim() })
             },
-            x = leftX + 6,
-            y = topY + 100,
-            width = 130,
+            posX = leftX + 12,
+            posY = topY + 155,
+            width = 116,
             height = 40,
-            maxLength = 75,
+            maxLength = 72,
             wrap = true
         ))
+
         addRenderableWidget(
-            Button
-                .builder("Save".text()) {
-                    SaveNPCPacket(npcId, dto).sendToServer()
-                    this.minecraft!!.setScreen(null)
-                }
-                .pos(leftX + BASE_WIDTH - 42, topY + BASE_HEIGHT - 8)
-                .size(40, 16)
-                .build()
+            NPCEditorButton(
+                buttonX = leftX + 348F,
+                buttonY = topY + 201F,
+                label = lang("ui.generic.save"),
+                alignRight = true
+            ) {
+                SaveNPCPacket(npcId, dto).sendToServer()
+                this.minecraft!!.setScreen(null)
+            }
         )
 
-        addRenderableWidget(ConfigVariableList(leftX + 200, topY + 30, this))
+        addRenderableWidget(ConfigVariableList(leftX + 134, topY + 35, this))
     }
 
+    override fun renderBlurredBackground(delta: Float) {}
+
+    override fun renderMenuBackground(context: GuiGraphics) {}
+
+    override fun isPauseScreen() = false
+
     override fun render(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-//        blitk(
-//            matrixStack = context.pose(),
-//            texture = baseResource,
-//            x = leftX,
-//            y = topY,
-//            height = BASE_HEIGHT,
-//            width = BASE_WIDTH
-//        )
+        blitk(
+            matrixStack = context.pose(),
+            texture = baseResource,
+            x = leftX,
+            y = topY,
+            height = BASE_HEIGHT,
+            width = BASE_WIDTH
+        )
+
+        var extendedId = npcId.toString()
+        while (extendedId.length < 12) extendedId = "0$extendedId"
+
+        drawScaledTextJustifiedRight(
+            context = context,
+            text = extendedId.text(),
+            x = leftX + 348,
+            y = topY + 9,
+            shadow = true
+        )
+
         super.render(context, mouseX, mouseY, delta)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/npc/widgets/ConfigVariableList.kt

@@ -8,16 +8,19 @@
 
 package com.cobblemon.mod.common.client.gui.npc.widgets
 
+import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.npc.NPCClasses
 import com.cobblemon.mod.common.api.npc.configuration.NPCConfigVariable
 import com.cobblemon.mod.common.api.npc.configuration.NPCConfigVariable.NPCVariableType
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
+import com.cobblemon.mod.common.client.gui.npc.NPCEditorButton
 import com.cobblemon.mod.common.client.gui.npc.NPCEditorScreen
 import com.cobblemon.mod.common.client.gui.npc.widgets.ConfigVariableList.ConfigVariable
 import com.cobblemon.mod.common.client.render.drawScaledText
+import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.ContainerObjectSelectionList
-import net.minecraft.client.gui.components.CycleButton
 import net.minecraft.client.gui.components.EditBox
 import net.minecraft.client.gui.components.Tooltip
 import net.minecraft.client.gui.components.events.GuiEventListener
@@ -25,7 +28,7 @@ import net.minecraft.client.gui.narration.NarratableEntry
 
 class ConfigVariableList(
     val listX: Int,
-    val listY: Int,
+    var listY: Int,
     val parent: NPCEditorScreen
 ) : ContainerObjectSelectionList<ConfigVariable>(
     Minecraft.getInstance(),
@@ -33,13 +36,15 @@ class ConfigVariableList(
     HEIGHT, // height
     0, // top
     SLOT_HEIGHT + SLOT_SPACING
-) {
+), CobblemonRenderable {
     companion object {
-        const val WIDTH = 200
-        const val HEIGHT = 120
-        const val SLOT_WIDTH = 160
+        const val WIDTH = 211
+        const val HEIGHT = 160
+        const val SLOT_WIDTH = 196
         const val SLOT_HEIGHT = 33
         const val SLOT_SPACING = 0
+
+        val textInputBackground = cobblemonResource("textures/gui/npc/text_input_base.png")
     }
 
     private var scrolling = false
@@ -47,15 +52,16 @@ class ConfigVariableList(
     override fun getRowWidth() = SLOT_WIDTH
 
     init {
+        listY += 4
         this.x = listX
         this.y = listY
         correctSize()
         setRenderHeader(false, 0)
         val npcClass = NPCClasses.getByIdentifier(parent.dto.npcClass)
         if (npcClass != null) {
-            npcClass.config.forEach { t ->
-                val value = parent.dto.variables[t.variableName] ?: t.defaultValue
-                addEntry(ConfigVariable(t, value, this))
+            npcClass.config.forEach { variable ->
+                val value = parent.dto.variables[variable.variableName] ?: variable.defaultValue
+                addEntry(ConfigVariable(variable, value, this))
             }
         }
     }
@@ -65,20 +71,12 @@ class ConfigVariableList(
     public override fun addEntry(entry: ConfigVariable) = super.addEntry(entry)
     public override fun removeEntry(entry: ConfigVariable) = super.removeEntry(entry)
 
+    override fun renderListSeparators(guiGraphics: GuiGraphics) {}
+
     override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, partialTicks: Float) {
         correctSize()
 
         super.renderWidget(context, mouseX, mouseY, partialTicks)
-
-        // Scroll Overlay
-//        blitk(
-//            matrixStack = context.pose(),
-//            texture = scrollOverlayResource,
-//            x = listX,
-//            y = listY - 13,
-//            height = 131,
-//            width = WIDTH
-//        )
     }
 
     override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
@@ -114,7 +112,6 @@ class ConfigVariableList(
 
     private fun correctSize() {
         setRectangle(WIDTH, HEIGHT, listX, (listY - 4))
-//        setX(listX)
     }
 
     fun isHovered(mouseX: Double, mouseY: Double) = mouseX.toFloat() in (x.toFloat()..(x.toFloat() + WIDTH)) && mouseY.toFloat() in (y.toFloat()..(y.toFloat() + HEIGHT))
@@ -130,11 +127,12 @@ class ConfigVariableList(
         val editBox = EditBox(
             client.font,
             parent.listX,
-            parent.listY + 4,
-            if (variable.type == NPCVariableType.NUMBER) SLOT_WIDTH - 100 else SLOT_WIDTH,
+            parent.listY + 8,
+            SLOT_WIDTH - 8,
             SLOT_HEIGHT - 8,
             variable.displayName,
         ).also {
+            it.isBordered = false
             it.tooltip = Tooltip.create(variable.description)
             it.height = SLOT_HEIGHT - 16
             it.setMaxLength(250)
@@ -147,18 +145,23 @@ class ConfigVariableList(
                 it.setFilter { value -> value.toDoubleOrNull() != null || value.isBlank() || value == "." || value == "-" }
             }
         }
-        val cycleButton = CycleButton.onOffBuilder(booleanValue).create(variable.displayName) { _, value ->
-            booleanValue = value
-            parent.parent.dto.variables[variable.variableName] = if (value) "1" else "0"
+        val toggleButton = NPCEditorButton(
+            parent.listX.toFloat(),
+            parent.listY + 6F,
+            variable.displayName.copy(),
+            booleanValue,
+            SLOT_WIDTH
+        ) {
+            booleanValue = !booleanValue
+            parent.parent.dto.variables[variable.variableName] = if (booleanValue) "1" else "0"
+            (it as NPCEditorButton).cycleButtonState = booleanValue
         }.also {
-            it.height = SLOT_HEIGHT - 14
-            it.width = SLOT_WIDTH - 8
             it.tooltip = Tooltip.create(variable.description)
         }
 
         init {
             if (variable.type == NPCVariableType.BOOLEAN) {
-                children.add(cycleButton)
+                children.add(toggleButton) // children.add(cycleButton)
             } else {
                 children.add(editBox)
             }
@@ -188,42 +191,27 @@ class ConfigVariableList(
         ) {
             val x = rowLeft - 4
             val y = rowTop
-            val matrixStack = context.pose()
-//            blitk(
-//                matrixStack = matrixStack,
-//                texture = slotResource,
-//                x = x,
-//                y = y,
-//                height = SLOT_HEIGHT,
-//                width = rowWidth,
-//                vOffset = if (isHovered) SLOT_HEIGHT else 0,
-//                textureHeight = SLOT_HEIGHT * 2
-//            )
-
             if (variable.type == NPCVariableType.BOOLEAN) {
-                cycleButton.x = x
-                cycleButton.y = y + 6
-                cycleButton.render(context, mouseX, mouseY, partialTicks)
+                toggleButton.x = x
+                toggleButton.y = y + 9
+                toggleButton.render(context, mouseX, mouseY, partialTicks)
             } else {
                 drawScaledText(
                     context = context,
                     text = variable.displayName.visualOrderText,
                     x = x,
-                    y = y + 4
+                    y = y + 4,
+                    shadow = true
                 )
-                editBox.x = x
-                editBox.y = y + 14
+
+                blitk(matrixStack = context.pose(), texture = textInputBackground, x = x, y = y + 16, height = 12, width = 1)
+                blitk(matrixStack = context.pose(), texture = textInputBackground, x = x + 1, y = y + 15, height = 14, width = SLOT_WIDTH - 2)
+                blitk(matrixStack = context.pose(), texture = textInputBackground, x = x + SLOT_WIDTH - 1, y = y + 16, height = 12, width = 1)
+
+                editBox.x = x + 4
+                editBox.y = y + 18
                 editBox.render(context, mouseX, mouseY, partialTicks)
             }
         }
-
-
-//        override fun mouseClicked(mouseX: Double, mouseY: Double, delta: Int): Boolean {
-//            if (moveButton.isHovered(mouseX, mouseY) && canUnpasture()) {
-//                moveButton.onPress()
-//                return true
-//            }
-//            return false
-//        }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/npc/widgets/NPCRenderWidget.kt

@@ -8,11 +8,10 @@
 
 package com.cobblemon.mod.common.client.gui.npc.widgets
 
-import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.gui.drawProfile
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.NPCModelRepository
-import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Renderable
 import net.minecraft.client.gui.components.events.GuiEventListener
@@ -23,41 +22,40 @@ class NPCRenderWidget(
     val y: Int,
     var identifier: ResourceLocation,
     val aspects: MutableSet<String>
-) : Renderable, GuiEventListener {
+) : CobblemonRenderable, GuiEventListener {
     val state = FloatingState().also {
         it.currentAspects = aspects
     }
 
     companion object {
-        val profileBackgroundResource = cobblemonResource("textures/gui/npc/profile_background.png")
-        const val WIDTH = 66
-        const val HEIGHT = 66
+        const val WIDTH = 116
+        const val HEIGHT = 112
     }
 
     override fun isFocused() = false
     override fun setFocused(focused: Boolean) {}
     override fun render(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        blitk(
-            matrixStack = context.pose(),
-            texture = profileBackgroundResource,
-            x = x,
-            y = y,
-            width = WIDTH,
-            height = HEIGHT
-        )
 
+        context.enableScissor(
+            x,
+            y,
+            x + WIDTH,
+            y + HEIGHT
+        )
         context.pose().pushPose()
-        context.pose().translate(x + WIDTH / 2F, y + HEIGHT / 2F, 0F)
+        // Decrease on Z-axis to prevent model from rendering above other components like tooltips
+        context.pose().translate(x + (WIDTH / 2F), y + HEIGHT + (HEIGHT / 4F), -500F)
 
         drawProfile(
             repository = NPCModelRepository,
             resourceIdentifier = identifier,
             matrixStack = context.pose(),
             partialTicks = delta,
-            scale = 30F,
+            scale = 120F,
             state = state
         )
 
         context.pose().popPose()
+        context.disableScissor()
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/npc/widgets/SimpleNPCTextInputWidget.kt

@@ -9,89 +9,142 @@
 package com.cobblemon.mod.common.client.gui.npc.widgets
 
 import com.cobblemon.mod.common.api.gui.blitk
-import com.cobblemon.mod.common.api.gui.drawCenteredText
 import com.cobblemon.mod.common.api.text.text
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
+import com.cobblemon.mod.common.client.render.drawScaledText
+import net.minecraft.Util
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.EditBox
-import net.minecraft.network.chat.MutableComponent
-import net.minecraft.network.chat.contents.PlainTextContents.LiteralContents
+import net.minecraft.client.gui.screens.Screen
+import net.minecraft.client.renderer.RenderType
+import net.minecraft.network.chat.Style
 import net.minecraft.resources.ResourceLocation
+import kotlin.math.floor
 
 class SimpleNPCTextInputWidget(
     getter: () -> String,
-    val texture: ResourceLocation,
+    val texture: ResourceLocation? = null,
     private val setter: (String) -> Unit,
-    x: Int,
-    y: Int,
+    posX: Int,
+    posY: Int,
     width: Int,
     height: Int,
     maxLength: Int = 100,
+    val shadow: Boolean = true,
     val wrap: Boolean = false
 ) : EditBox(
     Minecraft.getInstance().font,
-    x,
-    y,
+    posX + TEXT_PADDING,
+    posY,
     width,
     height,
     "input".text()
-) {
+), CobblemonRenderable {
+    companion object {
+        const val TEXT_PADDING = 4
+    }
+
+    var focusedTime: Long = 0
 
     init {
         setMaxLength(maxLength)
         isFocused = true
+        focusedTime = Util.getMillis()
         value = getter()
-        this.setResponder { setter(it) }
+        setResponder { setter(it) }
+        setFocused(false)
+        isBordered = false
+    }
+
+    override fun setFocused(focused: Boolean) {
+        if (focused) focusedTime = Util.getMillis()
+        super.setFocused(focused)
     }
 
     override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
-        return if (mouseX.toInt() in x..(x + width) && mouseY.toInt() in y..(y + height)) {
-            isFocused = true
-            true
-        } else {
-            false
+        val clickedState = super.mouseClicked(mouseX, mouseY, button)
+
+        if (wrap) {
+            val splitLines = Minecraft.getInstance().font.splitter.splitLines(value, width - 8, Style.EMPTY)
+            val clickedLineIndex = floor((mouseY - y)/11).toInt()
+
+            if (clickedLineIndex >= 0 && splitLines.size > clickedLineIndex) {
+                val lineAtIndex = splitLines.get(clickedLineIndex)
+                var lineSubstring = ""
+                for (char in lineAtIndex.string) {
+                    lineSubstring += char
+                    val startToLineWidth = Minecraft.getInstance().font.width(lineSubstring.text())
+                    if ((mouseX - x) <= startToLineWidth) break
+                }
+                var unwrappedLine = ""
+                splitLines.forEachIndexed { index, line ->
+                    if (index == clickedLineIndex) {
+                        unwrappedLine += lineSubstring
+                    } else if (index < clickedLineIndex) {
+                        unwrappedLine += line.string
+                    }
+                }
+
+                this.moveCursorTo(maxOf(0, unwrappedLine.length - 1), Screen.hasShiftDown())
+            }
         }
+
+        return clickedState
     }
 
     override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        if (cursorPosition != value.length) {
-            moveCursorToEnd(false)
+        if (texture != null) {
+            blitk(
+                matrixStack = context.pose(),
+                x = x,
+                y = y,
+                width = width,
+                height = height,
+                texture = texture
+            )
         }
 
-        blitk(
-            matrixStack = context.pose(),
-            x = x,
-            y = y,
-            width = width,
-            height = height,
-            texture = texture
-        )
-
-        context.pose().pushPose()
-        val scale = 0.8F
-        context.pose().scale(scale, scale, 1F)
         if (wrap) {
-            val wrappedLines = Minecraft.getInstance().font.split(MutableComponent.create(LiteralContents(value)), ((width - 8) / scale).toInt())
+            val showCursor = isFocused && ((Util.getMillis() - this.focusedTime) / 300L % 2L == 0L)
+            val input = (if (isFocused) "${value}${if ((cursorPosition == value.length) && showCursor) "_" else ""}" else value)
+
+            var cursorLine = ""
+            var cursorLineIndex = -1
+            var cursorLinePos = 0
+            var accumlatedLength = 0
+            val wrappedLines = Minecraft.getInstance().font.splitter.splitLines(input, width - (TEXT_PADDING * 2), Style.EMPTY)
+
             for ((index, line) in wrappedLines.withIndex()) {
-                context.drawString(
-                    Minecraft.getInstance().font,
-                    line,
-                    ((x + 4) / scale).toInt(),
-                    ((y + index * 10 + 5) / scale).toInt(),
-                    0xFFFFFF,
-                    false
+                accumlatedLength += line.string.length
+                if (cursorLineIndex < 0 && accumlatedLength > cursorPosition) {
+                    cursorLineIndex = index
+                    cursorLine = line.string
+                    cursorLinePos = if (cursorLineIndex > 0) cursorPosition - (accumlatedLength - line.string.length) else cursorPosition
+                }
+                drawScaledText(
+                    context = context,
+                    text = line.string.text(),
+                    x = x,
+                    y = y + index * 10 + 1,
+                    colour = 0xDDDDDD,
+                    shadow = true
+                )
+            }
+
+            if (showCursor && !value.isEmpty() && cursorPosition != value.length) {
+                val startToCursorWidth = Minecraft.getInstance().font.width((cursorLine.substring(0, cursorLinePos).text()))
+                context.fill(
+                    RenderType.guiTextHighlight(),
+                    x + startToCursorWidth - 1,
+                    y + cursorLineIndex * 10 + 1,
+                    x + startToCursorWidth,
+                    y + (cursorLineIndex * 10 + 1) + 9,
+                    -3092272
                 )
             }
         } else {
-            drawCenteredText(
-                context = context,
-                text = value.text(),
-                x = (x + width / 2F) / scale,
-                y = (y + height / 2 - 4) / scale,
-                shadow = true,
-                colour = 0xFFFFFF
-            )
+            super.renderWidget(context, mouseX, mouseY, delta)
         }
-        context.pose().popPose()
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pasture/PasturePokemonScrollList.kt

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.drawProfilePokemon
 import com.cobblemon.mod.common.client.gui.pc.StorageSlot
 import com.cobblemon.mod.common.client.gui.summary.widgets.PartySlotWidget
@@ -40,7 +41,7 @@ class PasturePokemonScrollList(
     HEIGHT, // height
     0, // top
     SLOT_HEIGHT + SLOT_SPACING
-) {
+), CobblemonRenderable {
     companion object {
         const val WIDTH = 70
         const val HEIGHT = 120

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pasture/PastureSlotIconButton.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.gui.pasture
 
 import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
@@ -18,7 +19,7 @@ import net.minecraft.network.chat.Component
 class PastureSlotIconButton(
     var xPos: Int, var yPos: Int,
     onPress: OnPress
-) : Button(xPos, yPos, (SIZE * SCALE).toInt(), (SIZE * SCALE).toInt(), Component.literal("Pasture Move"), onPress, DEFAULT_NARRATION) {
+) : Button(xPos, yPos, (SIZE * SCALE).toInt(), (SIZE * SCALE).toInt(), Component.literal("Pasture Move"), onPress, DEFAULT_NARRATION), CobblemonRenderable {
 
     companion object {
         const val SIZE = 14

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pasture/RecallButton.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.gui.pasture
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
@@ -22,7 +23,7 @@ import net.minecraft.network.chat.Component
 class RecallButton(
     x: Int, y: Int,
     onPress: OnPress
-) : Button(x, y, WIDTH, HEIGHT, Component.literal("Retrieve"), onPress, DEFAULT_NARRATION) {
+) : Button(x, y, WIDTH, HEIGHT, Component.literal("Retrieve"), onPress, DEFAULT_NARRATION), CobblemonRenderable {
 
     companion object {
         private const val WIDTH = 70

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/NavigationButton.kt

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.client.gui.pc
 
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
@@ -21,7 +22,7 @@ class NavigationButton(
     pX: Int, pY: Int,
     private val forward: Boolean,
     onPress: OnPress
-): Button(pX, pY, (WIDTH * SCALE).toInt(), (HEIGHT * SCALE).toInt(), Component.literal("Navigation"), onPress, DEFAULT_NARRATION) {
+): Button(pX, pY, (WIDTH * SCALE).toInt(), (HEIGHT * SCALE).toInt(), Component.literal("Navigation"), onPress, DEFAULT_NARRATION), CobblemonRenderable {
 
     companion object {
         private const val WIDTH = 8F

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.ExitButton
 import com.cobblemon.mod.common.client.gui.TypeIcon
 import com.cobblemon.mod.common.client.gui.summary.Summary
@@ -40,7 +41,7 @@ class PCGUI(
     val pc: ClientPC,
     val party: ClientParty,
     val configuration: PCGUIConfiguration
-) : Screen(Component.translatable("cobblemon.ui.pc.title")) {
+) : Screen(Component.translatable("cobblemon.ui.pc.title")), CobblemonRenderable {
 
     companion object {
         const val BASE_WIDTH = 349

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/ReleaseButton.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.gui.pc
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
@@ -23,7 +24,7 @@ class ReleaseButton(
     x: Int, y: Int,
     private val parent: StorageWidget,
     onPress: OnPress
-) : Button(x, y, WIDTH, HEIGHT, Component.literal("Release"), onPress, DEFAULT_NARRATION) {
+) : Button(x, y, WIDTH, HEIGHT, Component.literal("Release"), onPress, DEFAULT_NARRATION), CobblemonRenderable {
 
     companion object {
         private const val WIDTH = 58