mega keystone? more like iron helmet

# Conflicts:
#	common/src/main/java/com/cobblemon/mod/common/mixin/ClientPacketListenerMixin.java
#	common/src/main/kotlin/com/cobblemon/mod/common/api/molang/function/EvolutionMoLangFunctions.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/molang/function/PokemonMoLangFunctions.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/tms/TechnicalMachines.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PokeSnackBlockEntity.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/block/tmmachine/TMMachineMenu.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/Summary.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataAlolanModel.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataModel.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/evolution/ClientboundSeatAssignmentPacket.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/pokemon/requirements/StatCompareRequirement.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/pokemon/requirements/StatEqualRequirement.kt
#	common/src/main/resources/data/cobblemon/species/generation5/panpour.json
#	common/src/main/resources/data/cobblemon/species/generation8/duraludon.json

.gitignore

@@ -24,6 +24,7 @@ eclipse
 run
 runClient
 runServer
+utilityscripts/implementation/*.txt
 
 # Files from Forge MDK
 forge*changelog.txt

.gitlab-ci.yml

@@ -16,6 +16,7 @@ check_assets_cache:
   stage: preprocessing
   script:
     - echo "Checking if cached hash matches current hash"
+    - yum install -y findutils
 
     # 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
@@ -148,6 +149,7 @@ build:
   dependencies:
     - replace_resources
   script:
+    - yum install -y findutils
     - export GRADLE_OPTS="-Xmx4G -Xms4G"
     - chmod +x ./gradlew
     - ./gradlew build
@@ -163,6 +165,7 @@ publish:
   rules:
     - if: '$CI_PROJECT_PATH == "cable-mc/cobblemon" && $CI_COMMIT_BRANCH == "main"'
   script:
+    - yum install -y findutils
     - export GRADLE_OPTS="-Xmx4G -Xms4G"
     - chmod +x ./gradlew
     - ./gradlew publish
@@ -176,6 +179,7 @@ deploy_artifacts:
   dependencies:
     - build
   script:
+    - yum install -y findutils
     - echo "Collecting artifacts..."
     - find neoforge/build/libs/ -type f -name "*.jar" | grep -vE "dev-shadow|sources|javadoc" | xargs -I {} mv {} ./
     - find fabric/build/libs/ -type f -name "*.jar" | grep -vE "dev-shadow|sources|javadoc" | xargs -I {} mv {} ./

CHANGELOG.md

@@ -1,385 +1,41 @@
 # Changelog
-## [1.8.0 (MONTH Xth, 2026)](#1-8-0)
-
-### Additions
-- Added config options to award experience to fainted Pokémon for opponents they helped defeat (`awardExperienceToFaintedPokemon`) and to still award experience for defeated enemies even after battle loss/forfeit (`awardExperienceOnBattleLoss`)
-- Party Overlay Exp Gained Animation will now display the amount of EXP the Pokémon gained
-- Added a toast to notify players of how they can scroll through their party. Did you know you can hold R and scroll instead of using arrow keys??!
-- Added a new layer property that makes a layer scroll in a direction. "scrolling": {"speedU": 0.1, "speedV": 0.1}
-- Added missing crops to Botany Pots integration
-- Added a way to obtain Porygon by inserting the Upgrade or Dubious Disc into a data monitor
-- Added a new `cobblemon:structure`, which is a feature without any restrictions allowing the Builders to place certain structures in much more specific manner.
-- Added Configs for Infinite Use TMs and Unlocking all TMs
-- Added Type Gem blocks
-- Added Type Gem Clusters
-- Added TMs
-- Added TM Machine
-- Added Deepslate Core Block
-- Added /givetm Command
-- Added advancement triggers for learning TMs: `cobblemon:has_learn_specific_tm` (per-TM), `cobblemon:has_learn_all_tm` (all TMs learned), and `cobblemon:tms_learned` (count-based), backed by a new `totalTMLearnedCount` on player advancement data.
-- Added `cobblemon:catch_alpha_pokemon` advancement trigger and `totalAlphaCaptureCount` tracking for capturing Alpha Pokémon.
-- Added Move Dex to Pokédex
-- Added the Habitat Block, a spawner block for servers and adventure maps that controls spawning in an area.
-- Added Disk Rack for storing disks and being an audio sequencer for Noteblocks
-- Added intrinsic scaling to all mons (+-5%). Some rendering cases, such as shoulder mounting, revert to 1.0 scaling to preserve animation accuracy.
-- Added scaling to "baby" Pokémon (smaller (-20%) at level 1 → normally sized at level 10)
-- Added conditional seats for riding. Seats can be gated by molang such as "is_alpha".
-- Added Alpha Pokémon
-    - Added alpha scaling (alphas are larger than their normal counterparts)
-    - Alphas will always lead herds and will spawn in herds
-    - Alphas spawn with two random TM moves from their learnset
-    - Alpha Pokémon will always defend themselves from players that attack them
-    - Added alpha level matching and stat boost (based on level)
-    - Added pitch-down and reverb to alpha cries
-    - Added alpha Pokémon bait effect
-    - Added alpha eye rendering including eye overlay, bloom, eye trail, and particles.
-- Added cobweb block slowness immunity for spider Pokémon
-- Added 49 new habitat structures. 34 as typical Minecraft structures and 15 as structures that get placed as biome features to allow for more natural placement in generation. Structures placed as biome features will not be able to be located with the `/locate structure` command.
-- Vanilla village house template pools have been adjusted to account for the new abandoned village structure habitat. Weights have changed within the JSON file for every piece to ensure too many habitats don't generate in a single village.
-- Added 10 new ruin structures.
-- rooted_arch_ruins & crumbling_arch_ruins have been transferred over to biome features, allowing for better placement in generation.
-- All ruin structures that did not generate with a gimmighoul/gilded chest before will now generate with one.
-- All ruin structures gilded chest loot tables have been updated to include a guaranteed TM not learned naturally by any Pokémon through their level-up moveset. Each ruin gets its own specific TM, so you can now go hunting ruins to complete your move dex!
-- All fossil structures have been transferred over to biome features, allowing for better placement in generation.
-- The prehistoric_underwater_fissure & prehistoric_submerged_impact fossil structures now use the biome tag `#cobblemon:is_temperate_ocean`.
-- A new Biome tag called `#cobblemon:is_stony_beach` has been added.
-- Gimmighoul towers now generate at ground level rather than sinking one block into the ground.
-- 1 New shipwreck cove structure called the "magma_shipwreck_cove" has been added.
-- Shipwreck coves now generate slightly more frequently.
-- Added equipment loot tables for shipwreck cove enemies.
-- Maps from abandoned fishing boats leading to shipwreck coves now will skip explored chunks, allowing the player to find more shipwreck coves easier.
-- The lush shipwreck cove's phantom mob spawner has been replaced with breezes.
-- The lush shipwreck cove structure itself has been slightly cleaned up to be less noisy with the blocks it is built out of.
-- All shipwreck coves' spawners have been adjusted to give compatible mobs enchanted iron or diamond armour and weapons while in its ominous state. The armour given to the mobs will also use the automaton trim. We upped the difficulty because it was too easy now that your Pokémon can fight for you.
-- One TM of the elemental hyper beams has been added as guaranteed loot to the main treasure chest in every shipwreck cove. (Magma cove gets blast burn, lush cove gets frenzy plant, and submerged cove gets hydro cannon)
-- Added 7 new advancements
-- Pressing the inventory key now closes the Pokémon interact wheel GUI
-- Pokémon cries now play when clicking Pokémon in the summary screen.
-- Pressing the Summary key while either the starter selection or summary screen are open now closes those screens
-
-### New rideable Pokémon
-- Drampa
-- Archeops
-- Skarmory
-- Crobat
-- Goodra
-- Hisuian Goodra
-- Milotic
-
-### Pokémon Added
-- Wurmple
-- Silcoon
-- Beautifly
-- Cascoon
-- Dustox
-- Skitty
-- Delcatty
-
-- Seviper
-- Zangoose
-- Cherubi
-- Cherrim
-- Stunky
-- Skuntank
-
-- Audino
-- Pawniard
-- Bisharp
-- Kingambit
-
-- Pancham (+ Cosmetic with Black Glasses)
-- Pangoro (+ Cosmetic with Black Glasses)
-
-- Rockruff
-- Lycanroc
-
-- Rolycoly
-- Carkol
-- Coalossal
-
-- Snom
-- Frosmoth
-
-- Duraludon
-- Archaludon
-
-- Applin
-- Flapple
-- Appletun
-- Dipplin
-- Hydrapple
-
-- Nymble
-- Lokix
-
-#### Regional Forms
-- Sandshrew (Alolan)
-- Sandslash (Alolan)
-- Avalugg (Hisuian)
-
-### Model updates for the following Pokémon
-- Goomy
-- Sliggoo
-- Goodra
-- Porygon
-- Porygon2
-- Porygon-Z
-- Zubat
-- Golbat
-- Crobat
-
-### Model updates for the following Pokémon
-
-- Sandshrew
-- Sandslash
-- Nidoking
-- Zubat
-- Golbat
-- Crobat
-- Porygon
-- Porygon2
-- Porygon-Z
-
-- Skarmory
-- Jynx
-- Popplio
-- Brionne
-- Primarina
-- Fletchling
-- Fletchinder
-- Talonflame
-
-- Sableye
-- Mawile
-
-- Goomy
-- Sliggoo
-- Goodra
-
-- Nacli
-- Naclstack
-- Garganacl
-
-#### Model changes to the regional bias resource pack:
-
-- Added Mime Jr. (Galar Bias)
-- Added Bergmite (Hisui Bias)
-- Changed models for every existing regional bias
+## [1.8.1 (September 13th, 2026)](#1-8-1)
 
 ### Animation updates for the following Pokémon
-- Skarmory
-- Skitty
-- Flygon
-- Shellos
-- Riolu
-- Lucario
-- Purrloin
-- Liepard
-- Joltik
-- Galvantula
-- Nidoking
-- Fletchling
-- Fletchinder
-- Talonflame
-- Archeops
-- Drampa
-- Sewaddle
-- Swadloon
-- Leavanny
-- Goomy
-- Sliggoo
-- Goodra
-- Shedinja
-- Skwovet
-- Greedent
-
-#### Added sounds to the following moves
-- Absorb
-- Aurora Beam
-- Double Team
-- Draco Meteor
-- Fire Punch
-- Fire Spin
-- Flame Charge
-- Flame Wheel
-- Giga Drain
-- Ice Punch
-- Leech Life
-- Magical Leaf
-- Mega Drain
-- Minimize
-- Poison Gas
-- Rock Throw
-- Scary Face
-- Seed bomb
-- Smokescreen
-- String Shot
-- Tail Whip
-
-### Changes
-- Stat increase and decrease particles have been changed, with the addition of alpha boost particles. 
-- Dragonite's mailbag cosmetic can now also be obtained with a chest in the cosmetic slot
+- Flapple, Appletun, Dipplin, Hydrapple (placeholder animations only).
 
 ### Fixes
-- Adjusted Croagunk's walkspeed
-- Fixed Blitzle's base scale being `1` rather than the intended `0.8`
-- Fixed Magnezone's emissive layer for the shiny having the wrong name, thus displaying wrongly
-- Fixed Litleo not blinking
-- Fixed Garchomp T-posing when sleeping while out of battle.
-- Sharp Beak can now be crafted
-- Metal Alloy can now be crafted
-- Ability Capsules can now be brewed
-- Using an Ability Capsule will now return an Empty Bottle
-- The following items can now be obtained by brushing the following Pokémon:
-  - Pink Wool - Wigglytuff
-  - White Wool - Swablu, Altaria
-  - Shed Shell - Ekans, Arbok, Dratini, Dragonair, Dunsparce, Treecko, Grovyle, Sceptile, Seviper, Scraggy, Scrafty, Helioptile, Heliolisk, Salandit, Salazzle, Sobble, Drizzile, Inteleon, Silicoblra, Sandaconda, Toxel, Toxtricity, Orthworm, Dudunsparce
-  - Phantom Membrane - Dreepy, Drakloak, Dragapult
-- The following items can now be obtained by evolving the following Pokémon into any of their evolutions:
-  - Turtle Scute - Squirtle, Wartortle, Turtwig, Grotle, Tirtouga, Chewtle
-  - Shed Shell - Metapod, Kakuna, Ekans, Paras, Venonat, Krabby, Scyther, Kabuto, Dratini, Dragonair, Ledyba, Spinarak, Yanma, Pineco, Dunsparce, GLigar, Pupitar, Treecko, Grovyle, Silcoon, Cascoon, Surskit, Nincada, Trapinch, Vibrava, Corphish, Anorith, Bagon, Shelgon, Kricketot, Burmy, Combee, Skorupi, Swadloon, Whirlipede, Dwebble, Scraggy, Karrablast, Joltik, Larvesta, Spewpa, Clauncher, Helioptile, Charjabug, Crabrawler, Cutiefly, Dewpider, Salandit, Wimpod, Poipole, Sobble, Drizzile, Dottler, Silicobra, Toxel, Sizzlipede, Snom, Tarountula, Nymble, Rellor
-- Saccharine Leaves now drop Tart, Sweet, or Syrupy Apples, depending on their honey coating stage, instead of vanilla Apples
-- Fixed the height of the Tumblestone Bud items when held in hand, placed on head, viewed in a GUI, and placed in an Item Frame
-- Refactored all advancements, removing several deemed unnecessary. Due to this refactor, all previously obtained advancements will be reset besides the root (for picking a starter Pokémon). We are sorry for the inconvience, but it makes the tab cleaner and simplifies future advancements.
-- Restructured Botany Pots integration folder structure
-- Decrease the default pastured mon wander radius to 32.
-- Factor in the weight of Pokémon when calculating pushing forces between hitboxes.
-- Remade the Starter Selection Screen with new assets
-- Refactored berry trees to be less impactful on TPS (more performant)
-- Changed the bait effects of the following items: (Vanilla) Sweet & Glow Berries, Golden & Enchanted Golden Apples (Cobblemon) Custap, Eggant, Hopo & Micle Berries, Sweet Hearts
-- Wild Pokémon now reliably have at least one offensive move if they can have offensive moves at that level.
-- Data Monitor can accept Disks (TMs, Music Disks, Upgrade, Dubious Disk, etc.) to change what's being displayed on the screen
-- Rider positioning is now client-driven (Remove poseOffsets and offset per seat/pose) in favour of sending real-time passenger position.
-- Cleaned up seat data. Removed all now unused fields from seats in all species files. Also made locator seat names explicit in the species files (however, this doesn't break the legacy format)
-- Marks can now provide aspects.
-- Added new shiny and Alpha chance configs
-- Apricorns now make a new sound when harvested
-- Lowered the volume of harvesting berries
-- Added alternate versions of the basic PC Wallpapers based on the original design of Cobblemon's PC, before public release
-- Improved compatibility with various mods
-    - Farmer's Delight's cutting board can now be used to strip Apricorn and Saccharine's logs, or salvage their planks from various blocks. It can also separate their boats from chests
-    - Farmer's Delight's cutting board can be used to get two white dye from Pep-Up Flowers and two magenta dye from Medicinal Leeks
-    - Farmer's Delight's cutting board can separate Tumblestone Blocks back into Tumblestones
-    - Farmer's Delight's cutting board can salvage Type Gems from their Gem Blocks
-    - Farmer's Delight's Onions, Tomatoes, and Cabbages can be used to cook Open-Faced Sandwiches. Nature's Spirit's Olives also can be used
-    - Farmer's Delight's cutting board can be used on Hearty Grains to obtain rice and straw, similarly to Farmer's Delight's Rice Panicles
-    - Farmer's Delight's Apple Pies and Apple Ciders can now be made using Applin Apples, alongside the Vanilla counterpart
-    - Amendments allows for cooking Leek and Potato Stew in a Cauldron
-    - Any mods that utilise Moonlight's Soft Fluid system can store Leek and Potato Stew, Medicinal Brew, Antidote, Awakening, Burn Heal, Ice Heal, Paralyze Heal, Full Heal, Potion, Super Potion, Hyper Potion, Max Potion, Full Restore, Ability Capsules, Moomoo Milk, and Berry Juice in liquid form (such as Suplementaries' Jar or Goblet, or Cauldrons while using Amendments)
-    - Supplementaries' Hourglass can now use Bright Powder, Quick Powder, Metal Powder, Heal Powder, Silver Powder, and Remedy
-    - Berry Trees are now compatible with the Planter properly
-    - Saccharine Way Signs (added by Supplementaries automagically) now use a premade texture to prevent odd visual issues
-    - Supplementaries' Jar can now store various Cobblemon cookies, candies, and similar items
-    - Some of Supplementaries' items have been added to the `#cobblemon:held/container_held_items` item tag, including sacks, safes, and lunch baskets
-    - Experience Nuggets can be used in place of Sculk for making the EXP Candies if using Create
-    - Rage Candy Bar has a Create Mixing recipe
-    - All Cobblemon ores can now be crushed in Create's Crushing Wheels
-    - All Gem and Tumblestone Clusters can be crushed for automatic, low return, gems
-    - Hearty Grains can be milled like Farmer's Delight Rice Panicles if both Farmer's Delight and Create are installed
-    - Big Roots and Revival Herbs can be milled to their respective powders
-    - Pep-Up Flowers, Medicinal Leeks, and all 70 berries can be milled in Create's Millstone for additional dye drops
-    - Auspicious Armor and Upgrades can be Haunted using Create's crafting systems
-    - Applin Apples can be used to make Honeyed Apples in Create
-- Golden Apples can now be crafted using the Applin Apples
-- Prismarine Crystals and Amethyst Shards can now be used to craft Pokedexes
-- Updated Pokedex Screens item tag to support tagged variants of Redstone and Glowstone Dust
-- Sounds for interacting with various Cobblemon blocks now play from the center of the block, rather than the corner
-- The `/pc` command no longer plays PC activation sounds
-- Lowered the volume of Blitzle and Zebstrika's cry
-- Fixed Raichu (male) and Alolan Raichu (both genders) not displaying the correct Partner Cap when Pewter Crunchies are in the cosmetic slot.
-- Regional Foods will now prioritize being eaten instead of used for healing Pokémon, shift clicking will use it as healing
-
-### Fixes
-- Fixed Croagunk's walkspeed
-- Fixed Blitzle's base scale being `1` rather than the intended `0.8`
-- Fixed Magnezone's emissive layer for the shiny having the wrong name, thus displaying wrongly
-- Fixed Litleo not blinking
-- Fixed Pokédex layout for genderless variations
-- Fixed odd stacking behaviour with the poke_bait item.
-- Fixed a compatibility issue with World Game Rules which caused some log spam in specific cases.
-- Fixed improper validation of Pokémon when performing a trade.
-- Fixed an issue where particle like beam can disappear when you don't see the beginning of the beam, or you look away
-- Fixed Bedrock particle materials (alpha/opaque/blend/add) sharing one render batch, which caused incorrect culling on mixed batches; each material now batches and draws with its own blend and cull state, and the alpha material renders as a true cutout
-- Fixed an occasional crash on retrieving revived fossils
-- Fixed brushing not working on Neoforge
-- Fixed braking not working for submarines (whoops).
-- Fixed strafing not having the same friction as forward movement (funny whoops).
-- Fixed submarine's surface-water animations not playing when supposed to.
-- Fixed submarine camera freaking out when looking up or down on the surface.
-- Fixed pastured mons despawning and running away.
-- Fixed Apricorn trees crashing when other mods bonemeal it
-- Fixed the issue that caused Hover Behaviour rides without a ground style to be rendered useless upon touching the ground on a server.
-- Removed the "inAir" penalty for block destruction speed when on a hover mount.
-- Fixed horizontal and vertical collisions with hover mounts so they no longer accumulate or retain momentum
-- Fixed NeoForge brewing stand unexpectedly crashing users when shift clicking items within its menu
-- Fixed NPCs switching Pokémon very often during battles
-- Fixed Campfire pot causing crashes under certain circumstances
-- Fixed Type Gems not being consumed upon use
-- Fixed Ancient Pokéball's to their respective modifiers
-- Fixed a Server warning when recalling Pokémon
-- Fixed sliding particles incorrectly handling block collision
-- Fixed Full Heal not curing status conditions in battle
-- Fixed a rare issue with battles locking up when you are forced to switch, with the switch menu appearing instantly.
-- Fixed the combined effects of Pledge moves having broken Showdown message handling and localisation
-- Fixed rare Pokémon being far too likely to spawn multiple times in a single spawn cycle. The dev told me that the exact bug is too complicated to explain.
-- Resolved the niche issue where Structures would spawn in an incorrect location, creating very funky world gen.
-- Fixed Galarian Ponyta missing its cry.
-- Fixed various log warnings caused by redundant files and sound events.
-- Traded Pokémon will now retain the original friendship level when traded back to its OT
-- Clusters now display correctly on maps
-- Fixed removing mulch from berry trees with a shovel not working.
-- Fixed collecting honey from Saccharine Leaf blocks deleting Honey Bottles when the inventory was full
-- Fixed Stripped Saccharine Wood recipe being missing
-- Fixed CancelableSoundInstance causing lag by attempting to create sounds every tick when out of range of hearing
-- Fixed Stat Reducing Aprijuice not being possible to apply on a max out Pokémon, and the possibility of going into negatives
-- Fixed Exploit where you could take out the bait or drop your Pokérod with bait to avoid consuming bait, now the bobber will just disappear if you do so
-- Fixed Apricorn and Saccharine boats incorrectly using chest boat models
-- Fixed wild and trainer battle AI refusing to select moves with the `adjacentAlly` target type, even when it's their only option
-- Fixed Guilded chests being more accessible than intended
-- Fixed fished up Pokémon not being added as "seen" to the Pokedex
-- Fixed surprised Gimmighoul encounters not being added as "seen" to the Pokedex
-
-### Developer
-- Added `PokeSnackSpawnerFactory` which allows influence registration on PokeSnack encounters
-- Added `FishingSpawnerFactory` which allows influence registration on fishing encounters
-- Added `BattleFleeAttemptEvent` fired from `PokemonBattle.checkFleeAttempt`, allowing developers to intercept and control flee attempts
-- Tweaked the spawning selector interface to take a bucket function rather than a bucket directly.
-- Added a new `cobblemon:height_range` processor type to allow developers to restrict structure-spawning ranges.
-- Separated all the functions of MoLangFunctions.kt into their own files.
-- Spawn buckets and their base weights are now provided by the spawner, with different base weights for world, fishing, snack, and habitat spawn buckets.
-- Removed "SpawnBucket" class in favour of just storing maps of bucket names to weights.
-
-### Molang & Datapacks
-- Added `moveset_builders` datapack folder for different styles of movesets.
-- Added `party_pools` datapack folder for defining groups of Pokémon for complex NPC party definitions.
-- Added `party_compositions` datapack folder for arranging parties on NPCs that rely on party pools.
-- Added `composed_pool` NPC party provider type which combines a party pool with a party composition to create more complex NPC parties.
-- Added basic chatter NPC Behaviour
-- Added `q.item.is_enchanted()`
-- Added `q.item.has_enchantment(minecraft:sharpness, 3)`
-- Added `has_chosen_starter` & `get_starter_uuid` as available Molang functions
-- Added `marks`, `has_mark`, & `remove_marks` as available Molang functions for Pokémon
-- Added Data Component support for species drops, eg `"components": {"minecraft:custom_model_data": 123}`
-- Added the new `sortOrder` field to mark entries, (defaults to 0 if not specified) which controls the order in which marks are rendered on the HUD, with higher numbers being rendered on top of lower numbers
-- Added optional `order` field to starter categories. It will allow explicitly sorting categories in the starter selection screen
-- SpeciesAdditions append vs override now matches wiki documentation
-- Added `weighted_choice` as a new feature type. It requires setting weights for each choice and allows developers to simplify the process of assigning random aspect choice based on marble chance
-- Added `q.world.spawn_loot_table_items(loot_table_id, x, y, z)` which spawns the items from the loot table at the position. (Use type: "minecraft:chest" for the loot table.)
-- Added `q.pokemon.entity` to access the entity of Pokémon.
-- Flamethrower and Seismic Toss had their action effect JSON cleaned up
-- Ride sounds can now be set as exclusive to passengers
-- Ride sounds no longer play when submerged unless specified with a new setting
-- NPC Trainers can now call a `command` animation when issuing a command in battle.
-- Added a q.failed function to move action effects.
-- Herd spawned Pokémon have their levels controlled differently. The `levelRange` property now acts as a clamp instead of a filter, with a new `herdLevelRange` property to do the filter behaviour. 
-
-### Particles
+- Fixed a potential world generation stall caused by Type Gem clusters.
+- Fixed Pokémon on shoulders not animating if they are visibly holding a held item.
+- Fixed NPCs getting their own TM progress file.
+- Fixed odd NeoForge crash due to a dependency being outdated. It will now correctly flag the dependency for being outdated.
+- Fixed the TM Machine refusing move selections that the `unlockAllMoveDexMovesByDefault` config had made visible, leaving the move slot blank and the craft button unresponsive.
+- Fixed the Beast Ball not applying its 0.1× penalty to Pokémon that are not Ultra Beasts.
+- Fixed the Moon Ball reading the world's total elapsed time instead of the time of day, so its bonus applied during the day instead.
+- Fixed the Love Ball never awarding its 2.5× opposite gender bonus, and matching species by display name instead of identifier.
+- Fixed the Timer Ball being weaker than a regular Poké Ball on early turns and only reaching 4× on turn 14 instead of turn 10.
+- Fixed the Luxury Ball only doubling Friendship gains of 1, leaving level up and berry gains unaffected.
+- Fixed Rufflet, Braviary, and Hisuian Braviary flooding logs with errors about missing sound events.
+- Fixed Pokémon property typos in Pangoro and Dedenne herd spawn files.
+- Fixed unintentional watermelon cosmetic for Hisuian Electrode. 
+- Fixed Blastoise having an unintentional passenger seat.
+- Fixed form typo in Rockruff-Dusk spawn, preventing it from being able to spawn.
+- Fixed the `stat_compare` and `stat_equal` evolution requirements crashing the game when given `special_attack` or `special_defence`, and made them treat any non-permanent stat as a failed requirement instead of crashing.
+- Fixed Rowap and Jacoba berries not correctly altering Pokémon sizes when used as bait.
+- Fixed Ampharos' eyes not emitting particles.
+- Fixed Alolan Raticate's cry not playing.
+- Fixed several incorrect light-based spawning conditions for ghosts and bugs. 
+- Removed unused, placeholder habitat pools.
+- Fixed Mantyke, Mantine, and Quaxly getting stuck in a recoil 'expression' during battles due to having an expression assigned as a recoil animation. 
+- Fixed Lucario's aura particles not emitting.
+- Fixed Lycanroc's head movement.
+- Added head movement to Archaludon.
+- Fixed Duraludon line not having their sleep animations.
+- Fixed Diglett line not having their faint animations.
+- Fixed Kingambit moving its legs while walking.
 
 ### Localization
 - Updated translations for:
-  - Japanese
-  - German
-  - Ecuadorian Spanish
+  - Brazilian Portuguese
   - Simplified Chinese
-  - Traditional Chinese
-  - Korean
+  - Japanese

changelogs/CHANGELOG-1.8.0.md

@@ -0,0 +1,529 @@
+# Changelog
+## [1.8.0 - Make Your Move Update (September 6th, 2026)](#1-8-0)
+#### I think the red eyes mean they're friendly!
+
+### Additions
+- Added Alpha Pokémon
+    - Alpha Pokémon are bigger, stronger, and more aggressive than regular Pokémon.
+    - They are also scarier.
+    - They always know a TM move and will adapt to be stronger than your party.
+    - Alphas will always lead herds and spawn in herds.
+- Added alpha Pokémon attraction bait effect to Hopo Berries.
+- Added intrinsic scaling to all Pokémon (anywhere from 5% smaller to 5% bigger than normal). Some cases, such as shoulder mounting, will not scale so that the shoulder animations don't look silly.
+- Added scaling to "baby" Pokémon (10% smaller at level 1 → normally sized at level 10).
+- Added TMs.
+    - Added TM Machine. TMs are made from elemental type gems, and their recipes are unlocked by having Pokémon that know the move.
+    - Added config options for making TMs infinite-use and instant unlocking of all TM recipes.
+    - Added Type Gem blocks as well as crystal clusters and deepslate core blocks that are used for growing elemental type gems.
+- Added a new Starter Selection menu that looks way better.
+- Added a "Move Dex" to the Pokédex to help identify what moves a Pokémon can learn and what Pokémon can get a move.
+- Added the Habitat Block, a spawner block for servers and adventure maps that controls spawning in an area.
+- Added 49 new habitat structures. In these habitats you will find rarer Pokémon and sometimes different Pokémon will appear on different days.
+- Added a toast to notify players of how they can scroll through their party. Did you know you can hold R and scroll instead of using arrow keys? It's true!!!
+- Added a way to obtain Porygon by inserting an Upgrade or Dubious Disc into a data monitor.
+- Added Disk Rack for storing disks and being an audio sequencer for Noteblocks. What does that have to do with Pokémon? How about you mind your own business!
+- Added missing crops to Botany Pots integration.
+- Added conditional seats for riding. Seats can be gated by Molang such as "is_alpha".
+- Added 10 new ruin structures.
+- Added a new shipwreck cove structure called the Magma Shipwreck Cove.
+- Added 7 new advancements.
+- Pokémon cries now play when clicking Pokémon in the summary screen.
+- Held item visibility can now be controlled by the `held_item_visible` command argument.
+- Added config option to disable Pokémon spawning on a per-world basis.
+- Added config options to award experience to fainted Pokémon for opponents they helped defeat (`awardExperienceToFaintedPokemon`) and to still award experience for defeated enemies even after battle loss/forfeit (`awardExperienceOnBattleLoss`).
+- Added `/givetm` command.
+- Added advancement triggers for learning TMs: `cobblemon:has_learn_specific_tm` (per-TM), `cobblemon:has_learn_all_tm` (all TMs learned), and `cobblemon:tms_learned` (count-based), backed by a new `totalTMLearnedCount` on player advancement data.
+- Added `cobblemon:catch_alpha_pokemon` advancement trigger and `totalAlphaCaptureCount` stat for captured Alpha Pokémon.
+
+### New rideable Pokémon
+- Crobat
+- Skarmory
+- Milotic
+- Archeops
+- Goodra
+- Goodra (Hisuian Form)
+- Drampa
+- Duraludon
+- Archaludon
+
+### Pokémon Added
+#### Generation 3
+- Wurmple
+- Silcoon
+- Beautifly
+- Cascoon
+- Dustox
+- Skitty
+- Delcatty
+- Seviper
+- Zangoose
+
+#### Generation 4
+- Cherubi
+- Cherrim
+- Stunky
+- Skuntank
+
+#### Generation 5
+- Audino
+- Pawniard
+- Bisharp
+
+#### Generation 6
+- Pancham (+ Cosmetic with Black Glasses)
+- Pangoro (+ Cosmetic with Black Glasses)
+
+#### Generation 7
+- Rockruff
+- Lycanroc
+
+#### Generation 8
+- Rolycoly
+- Carkol
+- Coalossal
+- Runerigus
+- Snom
+- Frosmoth
+- Indeedee
+- Duraludon
+- Applin
+- Flapple
+- Appletun
+
+#### Generation 9
+
+- Nymble
+- Lokix
+- Kingambit
+- Dipplin
+- Archaludon
+- Hydrapple
+
+#### Regional Forms
+- Sandshrew (Alolan Form)
+- Sandslash (Alolan Form)
+- Yamask (Galarian Form)
+- Avalugg (Hisuian Form)
+
+### Model updates for the following Pokémon
+
+- Sandshrew
+- Sandslash
+- Nidoking
+- Zubat
+- Golbat
+- Crobat
+- Ditto
+- Porygon
+- Porygon2
+- Porygon-Z
+- Skarmory
+- Smoochum
+- Jynx
+- Popplio
+- Brionne
+- Primarina
+- Fletchling
+- Fletchinder
+- Talonflame
+- Sableye
+- Mawile
+- Goomy
+- Sliggoo
+- Goodra
+- Nacli
+- Naclstack
+- Garganacl
+- Bidoof
+- Cranidos
+- Chatot
+- Yamask
+- Cofagrigus
+- Tyranitar
+- Turtonator
+- Golett
+- Corsola
+- Arbok (New Patterns: Angry, Cartoon, Clown, Comedic, Crow, Grin, Ink, Modern, Rain, Scribble, Silence, Sloth, Suspicious, Will)
+- ... and Substitute
+
+#### Model changes to the regional bias resource pack:
+- Added Mime Jr. (Galar Bias)
+- Added Bergmite (Hisui Bias)
+- Changed models for every existing regional bias
+
+### Animation updates for the following Pokémon
+
+- Kakuna
+- Grimer
+- Nidoran♀ (+ New shoulder mount)
+- Nidorina
+- Nidoran♂ (+ New shoulder mount)
+- Sandshrew
+- Diglett
+- Dugtrio
+- Graveler
+- Happiny
+- Chansey
+- Blissey
+- Poliwhirl
+- Poliwrath
+- Zubat
+- Vulpix
+- Drowzee
+- Hypno
+- Noctowl
+- Skarmory
+- Skitty
+- Flygon
+- Shellos
+- Riolu
+- Lucario
+- Purrloin
+- Liepard
+- Joltik
+- Galvantula
+- Nidoking
+- Fletchling
+- Fletchinder
+- Talonflame
+- Archeops
+- Drampa
+- Sewaddle
+- Swadloon
+- Leavanny
+- Goomy
+- Sliggoo
+- Goodra
+- Shedinja
+- Skwovet
+- Greedent
+- Bidoof
+- Cranidos
+- Chatot
+- Yamask
+- Cofagrigus
+- Luvdisc
+- Staryu
+- Starmie
+- Togetic
+- Rellor
+- Rabsca
+- Yungoos
+- Gumshoos
+- Cottonee
+- Whimsicott
+- Corsola
+
+#### Added sounds to the following moves
+
+- Absorb
+- Aurora Beam
+- Double Team
+- Draco Meteor
+- Fire Punch
+- Fire Spin
+- Flame Charge
+- Flame Wheel
+- Giga Drain
+- Ice Punch
+- Leech Life
+- Magical Leaf
+- Mega Drain
+- Minimize
+- Poison Gas
+- Rock Throw
+- Scary Face
+- Seed bomb
+- Smokescreen
+- String Shot
+- Tail Whip
+
+### Changes
+- Removed the penalty for block destruction speed when on a hover mount, making them better for digging.
+- Golden Apples can now be crafted using the Applin Apples.
+- Prismarine Crystals and Amethyst Shards can now be used to craft Pokedexes.
+- Updated Pokédex Screens item tag to support tagged variants of Redstone and Glowstone Dust.
+- Sharp Beak can now be crafted using bones and Flying Gems.
+- Metal Alloy can now be crafted using iron and Thunder Stones.
+- Ability Capsules can now be brewed from Medicinal Brew and Dragon Breath.
+- Using an Ability Capsule will now return an Empty Bottle.
+- Decreased the default pastured wander radius to 32 blocks.
+- Added alternate versions of the basic PC Wallpapers based on the original design of Cobblemon's PC, before public release.
+- Rooted Arch Ruins, Crumbling Arch Ruins, and all fossil structures have been improved so that they generate more naturally in terrain.
+- Gimmighoul towers now generate at ground-level rather than sinking one block into the ground.
+- All ruin structures that did not generate with a gimmighoul/gilded chest before will now generate with one.
+- All ruin structures gilded chest loot tables have been updated to include a guaranteed TM not learned naturally by any Pokémon through their level-up moveset. Each ruin gets its own specific TM, so you can now go hunting ruins to complete your move dex!
+- The Prehistoric Underwater Fissure and Prehistoric Submerged Impact fossil structures now use the biome tag `#cobblemon:is_temperate_ocean`.
+- The lush shipwreck cove's phantom mob spawner has been replaced with breezes.
+- Shipwreck coves now generate slightly more frequently.
+- Added equipment loot tables for shipwreck cove enemies.
+- Maps from abandoned fishing boats leading to shipwreck coves now will skip explored chunks, allowing the player to find more shipwreck coves more easily.
+- All shipwreck coves' spawners have been adjusted to give compatible mobs enchanted iron or diamond armour and weapons while in its ominous state. The armour given to the mobs will also use the automaton trim. We upped the difficulty because it was too easy now that your Pokémon can fight for you.
+- One TM of the elemental hyper beams has been added as guaranteed loot to the main treasure chest in every shipwreck cove. (Magma Cove gets Blast Burn, Lush Cove gets Frenzy Plant, and Submerged Cove gets Hydro Cannon.)
+- The following items can now be obtained by brushing the following Pokémon:
+    - Pink Wool - Wigglytuff
+    - White Wool - Swablu, Altaria
+    - Shed Shell - Ekans, Arbok, Dratini, Dragonair, Dunsparce, Treecko, Grovyle, Sceptile, Seviper, Scraggy, Scrafty, Helioptile, Heliolisk, Salandit, Salazzle, Sobble, Drizzile, Inteleon, Silicoblra, Sandaconda, Toxel, Toxtricity, Orthworm, Dudunsparce
+    - Phantom Membrane - Dreepy, Drakloak, Dragapult
+- The following items can now be obtained by evolving the following Pokémon into any of their evolutions:
+    - Turtle Scute - Squirtle, Wartortle, Turtwig, Grotle, Tirtouga, Chewtle
+    - Shed Shell - Metapod, Kakuna, Ekans, Paras, Venonat, Krabby, Scyther, Kabuto, Dratini, Dragonair, Ledyba, Spinarak, Yanma, Pineco, Dunsparce, GLigar, Pupitar, Treecko, Grovyle, Silcoon, Cascoon, Surskit, Nincada, Trapinch, Vibrava, Corphish, Anorith, Bagon, Shelgon, Kricketot, Burmy, Combee, Skorupi, Swadloon, Whirlipede, Dwebble, Scraggy, Karrablast, Joltik, Larvesta, Spewpa, Clauncher, Helioptile, Charjabug, Crabrawler, Cutiefly, Dewpider, Salandit, Wimpod, Poipole, Sobble, Drizzile, Dottler, Silicobra, Toxel, Sizzlipede, Snom, Tarountula, Nymble, Rellor
+- Saccharine Leaves now drop Tart, Sweet, or Syrupy Apples, depending on their honey coating stage, instead of vanilla Apples.
+- Fixed the height of the Tumblestone Bud items when held in hand, placed on head, viewed in a GUI, and placed in an Item Frame.
+- Refactored all advancements, removing several deemed unnecessary. Due to this cleanup, all previously obtained advancements will be reset besides the root (for picking a starter Pokémon). This sucks, and we're sorry. We had to do this eventually so better now than later.
+- Forces between colliding hitboxes now factors in the weight of Pokémon.
+- Improved berry tree performance on singleplayer and servers.
+- Updated stat increase and decrease particle effects with the addition of alpha boost particles.
+- Improved the performance of pasture blocks on singleplayer and servers.
+- Changed the bait effects of the following items: (Vanilla) Sweet & Glow Berries, Golden & Enchanted Golden Apples (Cobblemon) Custap, Eggant, Hopo & Micle Berries, Sweet Hearts.
+- Wild Pokémon now reliably have at least one offensive move if they can have offensive moves at that level. No more free lunches with Pokémon that can't even hurt you.
+- Data Monitor can accept Disks (TMs, Music Disks, Upgrade, Dubious Disk, etc.) to change what's being displayed on the screen.
+- The party overlay's experience-gained animation now displays the amount of EXP the Pokémon gained.
+- Pressing the inventory key now closes the Pokémon interact wheel GUI.
+- Updated the sound for harvesting Apricorns.
+- Lowered the volume of harvesting berries.
+- Improved compatibility with various mods
+    - Farmer's Delight's cutting board can now be used to strip Apricorn and Saccharine's logs, or salvage their planks from various blocks. It can also separate their boats from chests.
+    - Farmer's Delight's cutting board can be used to get two white dye from Pep-Up Flowers and two magenta dye from Medicinal Leeks.
+    - Farmer's Delight's cutting board can separate Tumblestone Blocks back into Tumblestones.
+    - Farmer's Delight's cutting board can salvage Type Gems from their Gem Blocks.
+    - Farmer's Delight's Onions, Tomatoes, and Cabbages can be used to cook Open-Faced Sandwiches. Nature's Spirit's Olives also can be used.
+    - Farmer's Delight's cutting board can be used on Hearty Grains to obtain rice and straw, similarly to Farmer's Delight's Rice Panicles.
+    - Farmer's Delight's Apple Pies and Apple Ciders can now be made using Applin Apples, alongside the Vanilla counterpart.
+    - Amendments allows for cooking Leek and Potato Stew in a Cauldron.
+    - Any mods that utilise Moonlight's Soft Fluid system can store Leek and Potato Stew, Medicinal Brew, Antidote, Awakening, Burn Heal, Ice Heal, Paralyze Heal, Full Heal, Potion, Super Potion, Hyper Potion, Max Potion, Full Restore, Ability Capsules, Moomoo Milk, and Berry Juice in liquid form (such as Suplementaries' Jar or Goblet, or Cauldrons while using Amendments).
+    - Supplementaries' Hourglass can now use Bright Powder, Quick Powder, Metal Powder, Heal Powder, Silver Powder, and Remedy.
+    - Berry Trees are now compatible with the Planter properly
+    - Saccharine Way Signs (added by Supplementaries automagically) now use a premade texture to prevent odd visual issues.
+    - Supplementaries' Jar can now store various Cobblemon cookies, candies, and similar items.
+    - Some of Supplementaries' items have been added to the `#cobblemon:held/container_held_items` item tag, including sacks, safes, and lunch baskets.
+    - Experience Nuggets can be used in place of Sculk for making the EXP Candies if using Create.
+    - Rage Candy Bar has a Create Mixing recipe.
+    - All Cobblemon ores can now be crushed in Create's Crushing Wheels. All Gem and Tumblestone Clusters can be crushed for automatic, low return, gems.
+    - Hearty Grains can be milled like Farmer's Delight Rice Panicles if both Farmer's Delight and Create are installed.
+    - Big Roots and Revival Herbs can be milled to their respective powders.
+    - Pep-Up Flowers, Medicinal Leeks, and all 70 berries can be milled in Create's Millstone for additional dye drops.
+    - Auspicious Armour and Upgrades can be Haunted using Create's crafting systems.
+    - Applin Apples can be used to make Honeyed Apples in Create.
+- Sounds for interacting with various Cobblemon blocks now play from the centre of the block, rather than the corner. You probably didn't notice.
+- Dragonite's mailbag cosmetic can now also be obtained with a chest in the cosmetic slot.
+- Adjusted the walk speed for Croagunk and Aerodactyl.
+- The `/pc` command no longer plays PC activation sounds
+- Pressing the Summary key while either the starter selection or summary screen are open now closes those screens.
+- Ice type Pokémon are now immune to Packed Snow.
+- Added cobweb block slowness immunity for spider Pokémon
+
+### Fixes
+- Fixed rare Pokémon being far too likely to spawn multiple times in a single spawn cycle. The dev told me that the exact bug is too complicated to explain.
+- Fixed Omanyte and Omastar incorrectly using water animations on land.
+- Fixed Pokédex layout for genderless variations.
+- Fixed odd stacking behaviour with Poké Baits.
+- Fixed a compatibility issue with World Game Rules which caused some log spam in specific cases.
+- Fixed improper validation of Pokémon when performing a trade.
+- Fixed an issue where particles like beams can disappear when you don't see the beginning of the beam, or you look away.
+- Fixed Bedrock particle materials sometimes being incorrectly invisible from some sides.
+- Fixed an occasional crash on retrieving revived fossils.
+- Fixed brushing not working on Neoforge. Again.
+- Fixed braking not working for submarine-style mounts (whoops).
+- Fixed strafing not having the same friction as forward movement (funny whoops).
+- Fixed submarine-style mounts' surface-water animations not playing when supposed to.
+- Fixed submarine-style mounts' camera freaking out when looking up or down on the surface.
+- Fixed pastured Pokémon despawning and running away.
+- Fixed Apricorn trees crashing when other mods bonemeal them.
+- Fixed the issue that caused hover-style mounts without a ground style to be rendered useless upon touching the ground on a server.
+- Fixed horizontal and vertical collisions with hover-style mounts so they no longer accumulate or retain momentum.
+- Fixed NeoForge brewing stand unexpectedly crashing users when shift clicking items within its menu. Well, I suppose all crashes are unexpected. You know what I mean.
+- Fixed NPCs switching Pokémon very often during battles.
+- Fixed Campfire Pot causing crashes under certain circumstances.
+- Fixed Type Gems not being consumed upon use in battles.
+- Fixed several Ancient Pokéball's not using the correct capture multiplier.
+- Fixed a server warning that could occur when recalling Pokémon.
+- Fixed sliding particles incorrectly handling block collision.
+- Fixed Full Heal not curing status conditions in battle. Literally it's one job.
+- Fixed a rare issue with battles locking up when you are forced to switch, with the switch menu appearing instantly.
+- Fixed the combined effects of Pledge moves having broken Showdown message handling and localisation.
+- Fixed a very niche issue where structures would spawn in an incorrect location, creating very funky world gen.
+- Fixed Galarian Ponyta missing its cry.
+- Fixed various log warnings caused by redundant files and sound events.
+- Traded Pokémon will now retain the original friendship level when traded back to its OT.
+- Tumblestone Clusters now display correctly on maps.
+- Fixed removing mulch from berry trees with a shovel not working. That was meant to be a thing.
+- Fixed collecting honey from Saccharine Leaf blocks deleting Honey Bottles when the inventory was full.
+- Fixed Stripped Saccharine Wood recipe being... not there.
+- Fixed some performance issues with a kind of sound event causing lag by attempting to create sounds every tick when out of range of hearing.
+- Fixed stat-reducing Aprijuice not being possible to apply on a maxed out Pokémon. Also fixed the possibility of going into negatives.
+- Fixed exploit where you could take out the bait or drop your Pokérod with bait to avoid consuming bait, now the bobber will just disappear if you do so.
+- Fixed Apricorn and Saccharine boats incorrectly using chest boat models.
+- Fixed wild and trainer battle AI refusing to select moves with the `adjacentAlly` target type, even when it's their only option.
+- Fixed gilded chests being more accessible than intended.
+- Fixed fished up Pokémon not being added as "seen" to the Pokédex.
+- Fixed surprised Gimmighoul encounters not being added as "seen" to the Pokédex.
+- Fixed a crash involving berry trees that have been world edited.
+- Fixed visual desync in multiplayer for players mounting Pokémon outside other players' loaded chunks.
+- Fixed Pokémon entities leveled by rare candy not getting stronger as Minecraft entities unless recalled.
+- Fixed a freeze during game load that occurred when multiple mods tried to load Cobblemon API classes at the same time.
+- Lowered the volume of Blitzle and Zebstrika's cry (shut up!).
+- Regional Foods will now prioritise being eaten instead of used for healing Pokémon - shift clicking will use it as healing.
+- Resolved z-fighting (texture flickering) on Pokédex Models.
+- Restored Ninjask's ability to do barrel rolls.
+- Fixed Raichu (male) and Alolan Raichu (both genders) not displaying the correct Partner Cap when Pewter Crunchies are in the cosmetic slot.
+- Fixed a crash caused by adding enchanted items to the Resurrection Machine.
+- Fixed a crash that could occur when starting a PvN battle with only fainted Pokémon.
+- Fixed the Remember Riding Camera config not being respected when dismounting and resolved the incompatibility with the Auto Third Person mod.
+- Fixed Full Heal block not dropping Full Heals. Lmao.
+- Fixed status cure items not returning an empty bottle when used.
+- Fixed Panpour consuming its held item when evolving with a Water Stone.
+- Fixed Smoked Tail Curry returning a Wooden Bowl when consumed despite it not being included in the recipe. Free bowls!
+- Fixed `/giveallpokemon` not respecting the min and max arguments.
+- Fixed the choose starter toast not disappearing when capturing a Pokémon instead of opening the starter selection screen.
+- Fixed an issue where certain Sinister Tea seasonings were only applying as instant effects and would not apply over time.
+- Long config option labels now scroll instead of overflowing in the configuration menu.
+- Fixed some z-fighting and clipping on Dewott and Hisui-Bias Dewott.
+- Eggant Berries can now be composted properly on NeoForge.
+- Composting chances are now the same on NeoForge as on Fabric.
+- Fixed problem where furnaces which had smelted Revival Herbs into Heal Powder in older versions would glitch out on trying to get the experience out of the block.
+- Fixed the Battle AI not recognizing Surging Strikes as a multistrike move.
+- Fixed Tentacool not using its swim animation when on water surface.
+- Fixed Eevee using its left shoulder pose when in battle.
+- Fixed Magikarp and Gyarados Jump Pattern resourcepacks replacing shiny textures of addons targeting Magikarp or Gyarados.
+- Fixed Combee's pollinated texture overwriting the shiny and female textures.
+- Fixed a colour mistake with Dracovish's shiny.
+- Fixed Togedemaru's back spikes z-fighting.
+- Fixed Sliggoo (+ Hisuian) evolving in the Nether and End where it can't actually rain.
+- Corrected the scales, hitbox sizes, and eye heights for Ariados, Cetoddle, Durant, Galvantula, Klink, Lanturn, Lumineon, Mantine, Mantyke, Mudbray, Numel, Staravia, and Torkoal.
+- Fixed Torkoal's walk speed not matching its animation. He will no longer move faster than Bunnelby and Buneary. This tortoise would've won.
+- Fixed Lanturn T-posing due to missing ground walk and sleep animations.
+- Fixed Oshawott and Dewott using their sleep animation in unintended scenarios.
+- Fixed Dudunsparce and Maushold always having the same form instead of having the 1 in 100 chance of being different.
+- Fixed bird mounts rapidly switching between their flying and gliding animations when flying at low speed.
+- Fixed some battles being startable with fainted Pokémon in the initial sendout.
+- Fixed random gender selection for forms with strict gender divides (such as Meowstic and Oinkologne) never choosing female (that's sexist).
+- Fixed the "Press R to battle" prompt not disappearing after you finish your first battle, at least until you relogged.
+- Fixed the composter block being listed as "composer" in the cosmetic items species feature
+- Fixed Castform's forms being tagged as introduced in generation 4 instead of 3.
+- Fixed Blitzle's base scale being `1` rather than the intended `0.8`.
+- Fixed Magnezone's emissive layer for the shiny having the wrong name, thus displaying wrongly.
+- Fixed Litleo not blinking.
+
+### Developer
+- Added `PokeSnackSpawnerFactory` which allows influence registration on PokeSnack encounters.
+- Added `FishingSpawnerFactory` which allows influence registration on fishing encounters.
+- Added `BattleFleeAttemptEvent` fired from `PokemonBattle.checkFleeAttempt`, allowing developers to intercept and control flee attempts.
+- Tweaked the spawning selector interface to take a bucket function rather than a bucket directly.
+- Added a new `cobblemon:height_range` processor type to allow developers to restrict structure-spawning ranges.
+- Separated all the functions of MoLangFunctions.kt into their own files.
+- Spawn buckets and their base weights are now provided by the spawner, with different base weights for world, fishing, snack, and habitat spawn buckets.
+- Removed "SpawnBucket" class in favour of just storing maps of bucket names to weights.
+- Fixed nicknames not being applied to Pokémon spawned from `spawn_pool_world` files.
+- Added support for `profilePokedexScale`, `profilePokedexTranslation`, `profileSummaryScale`, and `profileSummaryTranslation` in poser files for finer control over profile displays.
+- Fixed riding camera offsets defined on Pokémon forms not being applied.
+- Marks can now provide aspects.
+
+### Molang & Datapacks
+- Added `moveset_builders` datapack folder for different styles of movesets.
+- Added `party_pools` datapack folder for defining groups of Pokémon for complex NPC party definitions.
+- Added `party_compositions` datapack folder for arranging parties on NPCs that rely on party pools.
+- Added `composed_pool` NPC party provider type which combines a party pool with a party composition to create more complex NPC parties.
+- Added basic chatter NPC Behaviour.
+- Added `q.item.is_enchanted()`.
+- Added `q.item.has_enchantment(minecraft:sharpness, 3)`.
+- Added `has_chosen_starter` and `get_starter_uuid` as available Molang functions.
+- Added `has_tm_move_unlocked`, `unlock_tm_move`, and `lock_tm_move` as available Molang functions for Players.
+- Added `marks`, `has_mark`, and `remove_marks` as available Molang functions for Pokémon.
+- Added Data Component support for species drops, eg `"components": {"minecraft:custom_model_data": 123}`
+- Added the new `sortOrder` field to mark entries, (defaults to 0 if not specified) which controls the order in which marks are rendered on the HUD, with higher numbers being rendered on top of lower numbers.
+- Added optional `order` field to starter categories. It will allow explicitly sorting categories in the starter selection screen.
+- SpeciesAdditions append vs override now matches the wiki documentation.
+- Added `weighted_choice` as a new feature type. It requires setting weights for each choice and allows developers to simplify the process of assigning random aspect choice based on marble chance.
+- Added `q.world.spawn_loot_table_items(loot_table_id, x, y, z)` which spawns the items from the loot table at the position. Use type: `minecraft:chest` for the loot table.
+- Added `q.pokemon.entity` to access the entity of Pokémon.
+- Flamethrower and Seismic Toss had their action effect JSON cleaned up.
+- Ride sounds can now be set as exclusive to passengers.
+- Ride sounds no longer play when submerged unless specified with a new setting.
+- NPC Trainers can now call a `command` animation when issuing a command in battle.
+- Added a q.failed function to move action effects.
+- Herd spawned Pokémon have their levels controlled differently. The `levelRange` property now acts as a pre-offset clamp instead of a filter, with a new `herdLevelRange` property to do the filter behaviour.
+- `q.sound` now accepts three parameters (sound event, volume, and pitch) instead of just the sound event and pitch.
+- Added a new layer property that makes a layer scroll in a direction. "scrolling": {"speedU": 0.1, "speedV": 0.1}
+- Cleaned up seat data. Removed all now unused fields from seats in all species files. Also made locator seat names explicit in the species files (however, this doesn't break the legacy format)
+
+### Particles
+
+#### New Move Animations
+- Blizzard
+- Disarming Voice
+- Draco Meteor
+- Dragon Breath
+- Dragon Rage
+- Drain Punch
+- Fairy Wind
+- Fire Fang
+- Gust
+- Horn Drill
+- Hydro Pump
+- Ice Fang
+- Leafage
+- Leaf Storm
+- Light Screen
+- Night Shade
+- Play Rough
+- Pyro Ball
+- Reflect
+- Rock Slide
+- Sonic Boom
+- Sucker Punch
+- Supersonic
+- Thunder Fang
+
+#### Tweaks and Fixes (Moves)
+
+- Confusion
+- Dragon Claw
+- Eruption
+- Fire Punch
+- Flame Burst
+- Flame Charge
+- Flamethrower
+- Frost Breath
+- Hypnosis
+- Ice Punch
+- Icy Wind
+- Mud Sport
+- Poison Fang
+- Protect
+- Psychic
+- Quick Attack
+- Rage Powder
+- Razor Leaf
+- Sand Attack
+- Scratch
+- Shadow Claw
+- Sing
+- Spore
+- String Shot
+- Tackle
+- Tail Whip
+- Thunder
+- Thunder Punch
+- Thunder Wave
+- Water Gun
+- Water Pulse
+- Water Sport
+
+#### Miscellaneous Particles
+
+- Added Wild Might particles for Alpha Pokémon.
+- Updated stat increase and decrease particles.
+
+### Localization
+- Updated translations for:
+    - Japanese
+    - German
+    - Spanish
+    - Ecuadorian Spanish
+    - Portuguese
+    - Brazilian Portuguese
+    - Simplified Chinese
+    - Traditional Chinese
+    - Korean
+    - Russian

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.duck;
+
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.Level;
+
+import java.util.Optional;
+
+/**
+ * Duck that facilitates getting a level key for a given level.
+ *
+ * @author dualspiral
+ * @since August 30th, 2026
+ */
+public interface MinecraftServerDuck {
+    Optional<ResourceKey<Level>> cobblemon$getLevelKey(Level level);
+}

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

@@ -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.duck;
+
+import net.minecraft.resources.ResourceLocation;
+
+/**
+ * Duck that facilitates getting a level key that we store on the level.
+ *
+ * @author dualspiral
+ * @since August 30th, 2026
+ */
+public interface ServerLevelDuck {
+    ResourceLocation cobblemon$getLevelResourceLocation();
+}

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

@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.network.protocol.game.ClientboundSetPassengersPacket;
-import net.minecraft.world.entity.Entity;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-@Mixin(ClientPacketListener.class)
-public class ClientPacketListenerMixin {
-
-    @Shadow private ClientLevel level;
-
-    @Inject(method = "handleSetEntityPassengersPacket", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/world/entity/Entity;hasIndirectPassenger(Lnet/minecraft/world/entity/Entity;)Z", shift = At.Shift.BEFORE), cancellable = true)
-    private void cobblemon$handlePokemonPassengers(ClientboundSetPassengersPacket packet, CallbackInfo ci) {
-        Entity entity = this.level.getEntity(packet.getVehicle());
-        if (entity instanceof PokemonEntity pokemon) {
-            var passengers = new ArrayList<Entity>();
-            for (int passenger : packet.getPassengers()) {
-                passengers.add(this.level.getEntity(passenger));
-            }
-            pokemon.getOccupiedSeats().values().stream()
-                    .filter(x -> !passengers.contains(x))
-                    .filter(Objects::nonNull)
-                    .forEach(Entity::stopRiding);
-
-            // Mount passengers not yet in the map
-            var currentPassengers = new ArrayList<>(pokemon.getOccupiedSeats().values());
-            passengers.stream()
-                    .filter(x -> !currentPassengers.contains(x))
-                    .filter(Objects::nonNull)
-                    .forEach(x -> x.startRiding(pokemon, true));
-            ci.cancel();
-        }
-    }
-
-}

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

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common.mixin;
 
-import com.cobblemon.mod.common.CobblemonNetwork;
 import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffectRegistry;
@@ -18,7 +17,6 @@ import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.SubmarineBehav
 import com.cobblemon.mod.common.client.entity.PokemonClientDelegate;
 import com.cobblemon.mod.common.client.render.MatrixWrapper;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.net.messages.server.orientation.ServerboundUpdateOrientationPacket;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.server.level.ServerPlayer;

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

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.duck.MinecraftServerDuck;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.util.Map;
+import java.util.Optional;
+
+@Mixin(MinecraftServer.class)
+public class MinecraftServerMixin implements MinecraftServerDuck {
+
+    @Shadow
+    @Final
+    private Map<ResourceKey<Level>, ServerLevel> levels;
+
+    @Override
+    public Optional<ResourceKey<Level>> cobblemon$getLevelKey(final Level level) {
+        return this.levels.entrySet()
+                .stream()
+                // Reference equality is intended here, the level we're handed is the same one as in the
+                // map so we don't need to check value semantics.
+                .filter(entry -> entry.getValue() == level)
+                .map(Map.Entry::getKey)
+                .findFirst();
+    }
+}

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

@@ -40,6 +40,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.List;
+import java.util.LinkedHashMap;
 import java.util.Set;
 import java.util.function.Consumer;
 
@@ -114,15 +115,13 @@ public abstract class ServerEntityMixin {
         if (currentPassengers.equals(cobblemon$lastSeatPassengers)) return;
         cobblemon$lastSeatPassengers = List.copyOf(currentPassengers);
 
+        var assignments = new LinkedHashMap<String, Integer>();
         pokemon.getOccupiedSeats().forEach((seat, passenger) -> {
             if (seat.getLocator() == null) return;
             if (passenger == null) return;
-            cobblemon$broadcast(new ClientboundSeatAssignmentPacket(
-                    passenger.getId(),
-                    pokemon.getId(),
-                    seat.getLocator()
-            ));
+            assignments.put(seat.getLocator(), passenger.getId());
         });
+        cobblemon$broadcast(new ClientboundSeatAssignmentPacket(pokemon.getId(), assignments));
     }
 
     private void cobblemon$broadcast(NetworkPacket<?> packet) {

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

@@ -8,22 +8,69 @@
 
 package com.cobblemon.mod.common.mixin;
 
+import com.cobblemon.mod.common.duck.MinecraftServerDuck;
+import com.cobblemon.mod.common.duck.ServerLevelDuck;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Holder;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.storage.WritableLevelData;
 import net.minecraft.world.phys.AABB;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 
 @Mixin(ServerLevel.class)
-public abstract class ServerLevelMixin {
+public abstract class ServerLevelMixin extends Level implements ServerLevelDuck {
+
+    // Ignored by Mixin, fulfils Java contract
+    protected ServerLevelMixin(
+            WritableLevelData levelData,
+            ResourceKey<Level> dimension,
+            RegistryAccess registryAccess,
+            Holder<DimensionType> dimensionTypeRegistration,
+            Supplier<ProfilerFiller> profiler,
+            boolean isClientSide,
+            boolean isDebug,
+            long biomeZoomSeed,
+            int maxChainedNeighborUpdates
+    ) {
+        super(levelData, dimension, registryAccess, dimensionTypeRegistration, profiler, isClientSide, isDebug, biomeZoomSeed, maxChainedNeighborUpdates);
+    }
+
+    @Shadow
+    public abstract MinecraftServer shadow$getServer();
+
+    /**
+     * Cached to speed up level world key checks every tick.
+     */
+    private ResourceLocation cobblemon$levelResourceLocation;
+
+    @Override
+    public ResourceLocation cobblemon$getLevelResourceLocation() {
+        if (this.cobblemon$levelResourceLocation == null) {
+            this.cobblemon$levelResourceLocation = ((MinecraftServerDuck) this.shadow$getServer())
+                    .cobblemon$getLevelKey(this)
+                    .map(ResourceKey::location)
+                    .orElse(null);
+        }
+        return this.cobblemon$levelResourceLocation;
+    }
 
     @Inject(method = "findLightningRod", at = @At(value = "RETURN"), cancellable = true)
     private void cobblemon$findLightningRod(BlockPos blockPos, CallbackInfoReturnable<Optional<BlockPos>> ci) {

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

@@ -15,15 +15,18 @@ import com.cobblemon.mod.common.api.riding.RidingStyle;
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner;
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory;
 import com.cobblemon.mod.common.api.stats.CobblemonStats;
+import com.cobblemon.mod.common.duck.ServerLevelDuck;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -33,9 +36,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerPlayer.class)
 public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
+
     @Shadow
     public abstract ServerLevel serverLevel();
 
+    @Shadow
+    @Final
+    public MinecraftServer server;
     @Unique
     public PlayerSpawner cobblemon$spawner;
 
@@ -55,12 +62,9 @@ public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
 
     @Inject(method = "tick", at = @At("TAIL"))
     private void cobblemon$tickSpawner(CallbackInfo ci) {
-        if (!Cobblemon.config.getEnableSpawning()) {
-            return;
-        } else if (!serverLevel().getGameRules().getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING)) {
-            return;
+        if (cobblemon$canSpawn()) {
+            getPlayerSpawner().tick();
         }
-        getPlayerSpawner().tick();
     }
 
     @Inject(method = "rideTick", at = @At("HEAD"))
@@ -121,4 +125,21 @@ public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
 
         return entity;
     }
+
+    /**
+     * Gets whether we should spawn Cobblemon entities here.
+     *
+     * @return true if we can spawn cobblemon in the current level,
+     *         false otherwise
+     */
+    @SuppressWarnings("resource")
+    @Unique
+    private boolean cobblemon$canSpawn() {
+        return Cobblemon.config.getEnableSpawning() &&
+                this.serverLevel().getGameRules().getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING) &&
+                // intentionally last as this is a more expensive check, even with all the caching
+                !Cobblemon.config.getWorldSpawningBlocklist().contains(
+                        ((ServerLevelDuck) this.serverLevel()).cobblemon$getLevelResourceLocation()
+                );
+    }
 }

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

@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.mixin.accessor.SinglePoolElementAccessor;
+import com.cobblemon.mod.common.world.structureprocessors.HeightRangeStructureProcessor;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.core.Holder;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.LevelHeightAccessor;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.levelgen.RandomState;
+import net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece;
+import net.minecraft.world.level.levelgen.structure.Structure;
+import net.minecraft.world.level.levelgen.structure.StructurePiece;
+import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.world.level.levelgen.structure.pools.SinglePoolElement;
+import net.minecraft.world.level.levelgen.structure.pools.StructurePoolElement;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorList;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Optional;
+import java.util.function.Predicate;
+
+@Mixin(Structure.class)
+public abstract class StructureMixin {
+
+	/**
+	 * Discards a structure start when any of its pieces carries a {@link HeightRangeStructureProcessor}
+	 * whose range the piece does not fit in.
+	 * Crab Note: We have to make this has to happen here rather than in the processor itself. Terrain adaptation and {@code /locate}
+	 * both read the start, so by the time processors run the terrain has already been generated and the
+	 * structure is already on the map which previously were left behdind when we were trying to make some structures not generate via processor. Now
+	 * Returning {@link StructureStart#INVALID_START} keeps the start from ever existing, which makes sure that weird generation isn't left behind.
+	 */
+	@Inject(
+			method = "generate",
+			at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/levelgen/structure/StructureStart;isValid()Z"),
+			cancellable = true
+	)
+	private void cobblemon$rejectStartsOutsideHeightRange(
+			RegistryAccess registryAccess, ChunkGenerator chunkGenerator, BiomeSource biomeSource,
+			RandomState randomState, StructureTemplateManager structureTemplateManager, long seed,
+			ChunkPos chunkPos, int references, LevelHeightAccessor heightAccessor,
+			Predicate<Holder<Biome>> validBiome,
+			CallbackInfoReturnable<StructureStart> cir,
+			@Local StructureStart structureStart
+	) {
+		for (StructurePiece piece : structureStart.getPieces()) {
+			if (!(piece instanceof PoolElementStructurePiece poolPiece)) {
+				continue;
+			}
+
+			Optional<HeightRangeStructureProcessor> heightRangeProcessor = cobblemon$getHeightRangeProcessor(poolPiece.getElement());
+			if (heightRangeProcessor.isEmpty()) {
+				continue;
+			}
+
+			boolean valid = heightRangeProcessor.get().isValidPlacement(
+					chunkGenerator,
+					heightAccessor,
+					randomState,
+					piece.getBoundingBox()
+			);
+
+			if (!valid) {
+				cir.setReturnValue(StructureStart.INVALID_START);
+				return;
+			}
+		}
+	}
+
+	@Unique
+	private static Optional<HeightRangeStructureProcessor> cobblemon$getHeightRangeProcessor(StructurePoolElement element) {
+		if (!(element instanceof SinglePoolElement)) {
+			return Optional.empty();
+		}
+
+		StructureProcessorList processorList = ((SinglePoolElementAccessor) element).getProcessors().value();
+		for (StructureProcessor processor : processorList.list()) {
+			if (processor instanceof HeightRangeStructureProcessor heightRangeStructureProcessor) {
+				return Optional.of(heightRangeStructureProcessor);
+			}
+		}
+
+		return Optional.empty();
+	}
+}

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

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.accessor;
+
+import net.minecraft.core.Holder;
+import net.minecraft.world.level.levelgen.structure.pools.SinglePoolElement;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorList;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(SinglePoolElement.class)
+public interface SinglePoolElementAccessor {
+    @Accessor("processors")
+    Holder<StructureProcessorList> getProcessors();
+}
+

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

@@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-//This is a yucky hack but better than what we were doing before
+// There appears to be a data driven way to do this now, however I am not sure how it works since there is no wiki or anything so yolo
 @Mixin(BlockVariantSets.class)
 public abstract class AdornRegisterInvoker {
     @Final

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

@@ -108,6 +108,7 @@ 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.HeldItemVisibleProperty
 import com.cobblemon.mod.common.pokemon.properties.HiddenAbilityPropertyType
 import com.cobblemon.mod.common.pokemon.properties.LabelProperty
 import com.cobblemon.mod.common.pokemon.properties.NoAIProperty
@@ -304,7 +305,9 @@ object Cobblemon {
             this.config.maxPokemonLevel,
             this.config.maxPokemonFriendship,
             this.config.maxDynamaxLevel,
-            this.config.unlockAllMoveDexMovesByDefault
+            this.config.unlockAllMoveDexMovesByDefault,
+            this.config.pokemonIntrinsicSizeMin,
+            this.config.pokemonIntrinsicSizeMax
         ).sendToPlayer(player)
     }
 
@@ -345,6 +348,7 @@ object Cobblemon {
         CustomPokemonProperty.register(UnaspectPropertyType)
         CustomPokemonProperty.register(FreezeFrameProperty)
         CustomPokemonProperty.register(NoAIProperty)
+        CustomPokemonProperty.register(HeldItemVisibleProperty)
 
         CobblemonEvents.POKEMON_PROPERTY_INITIALISED.emit(Unit)
 

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

@@ -41,6 +41,8 @@ object CobblemonCommands {
         HeldItemCommand.register(dispatcher, registry)
         PcCommand.register(dispatcher)
         SpawnPokemonFromPool.register(dispatcher)
+        SpawnMeteorCommand.register(dispatcher)
+        SetMegaBondCommand.register(dispatcher)
         PokeboxCommand.register(dispatcher)
         PokedexCommand.register(dispatcher)
         TestStoreCommand.register(dispatcher)

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

@@ -16,6 +16,7 @@ import com.cobblemon.mod.common.entity.generic.GenericBedrockEntity
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.projectile.FallingStarEntity
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.core.Registry
@@ -95,6 +96,15 @@ object CobblemonEntities : PlatformRegistry<Registry<EntityType<*>>, ResourceKey
         EntityType.Builder.of({ _, world -> NPCEntity(world) }, MobCategory.CREATURE).build("$NPC_KEY")
     )
 
+    @JvmField
+    val FALLING_STAR_KEY = cobblemonResource("falling_star")
+    @JvmField
+    val FALLING_STAR: EntityType<FallingStarEntity> = create(
+        FALLING_STAR_KEY.path,
+        EntityType.Builder.of(::FallingStarEntity, MobCategory.MISC).sized(0.5F, 0.5F).clientTrackingRange(8)
+            .build(FALLING_STAR_KEY.toString())
+    )
+
     fun registerAttributes(consumer: (EntityType<out LivingEntity>, AttributeSupplier.Builder) -> Unit) {
         consumer(POKEMON, PokemonEntity.createAttributes())
         consumer(NPC, NPCEntity.createAttributes())

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

@@ -33,6 +33,12 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
         .networkSynchronized(HeldItemEffectComponent.PACKET_CODEC)
         .build())
 
+    @JvmField
+    val MEGA_BOND: DataComponentType<MegaBondComponent> = create("mega_bond", DataComponentType.builder<MegaBondComponent>()
+        .persistent(MegaBondComponent.CODEC)
+        .networkSynchronized(MegaBondComponent.PACKET_CODEC)
+        .build())
+
     @JvmField
     val BAIT: DataComponentType<RodBaitComponent> = create("bait", DataComponentType.builder<RodBaitComponent>()
         .persistent(RodBaitComponent.CODEC)

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

@@ -405,7 +405,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val BIG_MALASADA = regionalFoodItem("big_malasada", 64, 7, 0.3f, false)
     @JvmField
-    val SMOKED_TAIL_CURRY = regionalFoodItem("smoked_tail_curry", 64, 10, 0.6f, false, ItemStack(Items.BOWL, 1))
+    val SMOKED_TAIL_CURRY = regionalFoodItem("smoked_tail_curry", 64, 10, 0.6f, false)
     @JvmField
     val JUBILIFE_MUFFIN = regionalFoodItem("jubilife_muffin", 64, 7, 0.3f, false)
     @JvmField
@@ -914,6 +914,10 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     val THUNDER_STONE = noSettingsItem("thunder_stone")
     @JvmField
     val WATER_STONE = noSettingsItem("water_stone")
+    @JvmField
+    val MEGA_SHARD = noSettingsItem("mega_shard")
+    @JvmField
+    val DORMANT_MEGA_STONE = heldItem("dormant_mega_stone")
 
     val wearables = mutableListOf<WearableItem>()
     //Wearable items (these items should have a corresponding 3D model)
@@ -932,14 +936,34 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val ABILITY_SHIELD = heldItem("ability_shield")
     @JvmField
+    val ABOMASITE = heldItem("abomasite")
+    @JvmField
+    val ABSOLITE = heldItem("absolite")
+    @JvmField
     val ABSORB_BULB = heldItem("absorb_bulb")
     @JvmField
+    val AERODACTYLITE = heldItem("aerodactylite")
+    @JvmField
+    val AGGRONITE = heldItem("aggronite")
+    @JvmField
     val AIR_BALLOON = heldItem("air_balloon")
     @JvmField
+    val ALAKAZITE = heldItem("alakazite")
+    @JvmField
+    val ALTARIANITE = heldItem("altarianite")
+    @JvmField
+    val AMPHAROSITE = heldItem("ampharosite")
+    @JvmField
     val ASSAULT_VEST = heldItem("assault_vest")
     @JvmField
     val BIG_ROOT = compostableBlockItem("big_root", CobblemonBlocks.BIG_ROOT, 0.30f)
     @JvmField
+    val AUDINITE = heldItem("audinite")
+    @JvmField
+    val BANETTITE = heldItem("banettite")
+    @JvmField
+    val BEEDRILLITE = heldItem("beedrillite")
+    @JvmField
     val BINDING_BAND = heldItem("binding_band")
     @JvmField
     val BLACK_BELT = heldItem("black_belt")
@@ -948,10 +972,20 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val BLUNDER_POLICY = itemNameBlockItem("blunder_policy", CobblemonBlocks.BLUNDER_POLICY)
     @JvmField
+    val BLASTOISINITE = heldItem("blastoisinite")
+    @JvmField
+    val BLAZIKENITE = heldItem("blazikenite")
+    @JvmField
+    val CAMERUPTITE = heldItem("cameruptite")
+    @JvmField
     val CELL_BATTERY = heldItem("cell_battery")
     @JvmField
     val CHARCOAL = heldItem("charcoal_stick", remappedName = "charcoal")
     @JvmField
+    val CHARIZARDITE_X = heldItem("charizardite_x")
+    @JvmField
+    val CHARIZARDITE_Y = heldItem("charizardite_y")
+    @JvmField
     val CHOICE_SCARF = heldItem("choice_scarf")
     @JvmField
     val CLEANSE_TAG = itemNameBlockItem("cleanse_tag", CobblemonBlocks.CLEANSE_TAG)
@@ -962,6 +996,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val DESTINY_KNOT = heldItem("destiny_knot")
     @JvmField
+    val DIANCITE = heldItem("diancite")
+    @JvmField
     val DRAGON_FANG = heldItem("dragon_fang")
     @JvmField
     val EJECT_BUTTON = heldItem("eject_button")
@@ -984,20 +1020,42 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val FOCUS_SASH = heldItem("focus_sash")
     @JvmField
+    val GALLADITE = heldItem("galladite")
+    @JvmField
+    val GARCHOMPITE = heldItem("garchompite")
+    @JvmField
+    val GARDEVOIRITE = heldItem("gardevoirite")
+    @JvmField
+    val GENGARITE = heldItem("gengarite")
+    @JvmField
+    val GLALITITE = heldItem("glalitite")
+    @JvmField
     val GRASSY_SEED = heldItem("grassy_seed")
     @JvmField
     val GRIP_CLAW = heldItem("grip_claw")
     @JvmField
+    val GYARADOSITE = heldItem("gyaradosite")
+    @JvmField
     val HARD_STONE = heldItem("hard_stone")
     @JvmField
     val HEAVY_DUTY_BOOTS = heldItem("heavy_duty_boots")
     @JvmField
+    val HERACRONITE = heldItem("heracronite")
+    @JvmField
+    val HOUNDOOMINITE = heldItem("houndoominite")
+    @JvmField
     val IRON_BALL = heldItem("iron_ball")
     @JvmField
+    val KANGASKHANITE = heldItem("kangaskhanite")
+    @JvmField
     val LAGGING_TAIL = heldItem("lagging_tail")
     @JvmField
     val LEFTOVERS = compostableHeldItem("leftovers", null, 0.50f)
     @JvmField
+    val LATIASITE = heldItem("latiasite")
+    @JvmField
+    val LATIOSITE = heldItem("latiosite")
+    @JvmField
     val LIFE_ORB = heldItem("life_orb")
     @JvmField
     val LIGHT_BALL = heldItem("light_ball")
@@ -1006,20 +1064,40 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val LOADED_DICE = heldItem("loaded_dice")
     @JvmField
+    val LOPUNNITE = heldItem("lopunnite")
+    @JvmField
+    val LUCARIONITE = heldItem("lucarionite")
+    @JvmField
     val LUCKY_EGG = heldItem("lucky_egg")
     @JvmField
     val LUMINOUS_MOSS = heldItem("luminous_moss")
     @JvmField
     val MAGNET = heldItem("magnet")
     @JvmField
+    val MANECTITE = heldItem("manectite")
+    @JvmField
+    val MAWILITE = heldItem("mawilite")
+    @JvmField
+    val MEDICHAMITE = heldItem("medichamite")
+    @JvmField
+    val METAGROSSITE = heldItem("metagrossite")
+    @JvmField
     val METRONOME = heldItem("metronome")
     @JvmField
+    val MEWTWONITE_X = heldItem("mewtwonite_x")
+    @JvmField
+    val MEWTWONITE_Y = heldItem("mewtwonite_y")
+    @JvmField
     val MIRACLE_SEED = heldItem("miracle_seed")
     @JvmField
     val MYSTIC_WATER = heldItem("mystic_water")
     @JvmField
     val NEVER_MELT_ICE = heldItem("never_melt_ice")
     @JvmField
+    val PIDGEOTITE = heldItem("pidgeotite")
+    @JvmField
+    val PINSIRITE = heldItem("pinsirite")
+    @JvmField
     val POISON_BARB = heldItem("poison_barb")
     @JvmField
     val POWER_ANKLET = heldItem("power_anklet")
@@ -1048,10 +1126,20 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val ROOM_SERVICE = heldItem("room_service")
     @JvmField
+    val SABLENITE = heldItem("sablenite")
+    @JvmField
+    val SALAMENCITE = heldItem("salamencite")
+    @JvmField
+    val SCEPTILITE = heldItem("sceptilite")
+    @JvmField
+    val SCIZORITE = heldItem("scizorite")
+    @JvmField
     val SCOPE_LENS = heldItem("scope_lens")
     @JvmField
     val SHARP_BEAK = heldItem("sharp_beak")
     @JvmField
+    val SHARPEDONITE = heldItem("sharpedonite")
+    @JvmField
     val SHED_SHELL = heldItem("shed_shell")
     @JvmField
     val SHELL_BELL = heldItem("shell_bell")
@@ -1060,6 +1148,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val SILVER_POWDER = heldItem("silver_powder")
     @JvmField
+    val SLOWBRONITE = heldItem("slowbronite")
+    @JvmField
     val SOFT_SAND = heldItem("soft_sand")
     @JvmField
     val SPELL_TAG = itemNameBlockItem("spell_tag", CobblemonBlocks.SPELL_TAG)
@@ -1068,8 +1158,12 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val SOOTHE_BELL = heldItem("soothe_bell")
     @JvmField
+    val STEELIXITE = heldItem("steelixite")
+    @JvmField
     val STICKY_BARB = heldItem("sticky_barb")
     @JvmField
+    val SWAMPERTITE = heldItem("swampertite")
+    @JvmField
     val TERRAIN_EXTENDER = heldItem("terrain_extender")
     @JvmField
     val THROAT_SPRAY = heldItem("throat_spray")
@@ -1078,10 +1172,14 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val TWISTED_SPOON = heldItem("twisted_spoon")
     @JvmField
+    val TYRANITARITE = heldItem("tyranitarite")
+    @JvmField
     val UTILITY_UMBRELLA = heldItem("utility_umbrella")
     @JvmField
     val WEAKNESS_POLICY = itemNameBlockItem("weakness_policy", CobblemonBlocks.WEAKNESS_POLICY)
     @JvmField
+    val VENUSAURITE = heldItem("venusaurite")
+    @JvmField
     val WIDE_LENS = heldItem("wide_lens")
     @JvmField
     val ZOOM_LENS = heldItem("zoom_lens")
@@ -1756,4 +1854,4 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     private fun foodItem(nutrition: Int, saturationModifier: Float): Item {
         return CobblemonItem(Item.Properties().food(FoodProperties.Builder().nutrition(nutrition).saturationModifier(saturationModifier).build()))
     }
-}
+}

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

@@ -35,6 +35,7 @@ import com.cobblemon.mod.common.client.net.gui.PokedexUIPacketHandler
 import com.cobblemon.mod.common.client.net.gui.SetActiveTMPacketHandler
 import com.cobblemon.mod.common.client.net.gui.SetTMMachineContainerDataPacketHandler
 import com.cobblemon.mod.common.client.net.gui.SummaryUIPacketHandler
+import com.cobblemon.mod.common.client.net.gui.SynchronizeActiveTMHandler
 import com.cobblemon.mod.common.client.net.habitat.OpenHabitatBlockEditorHandler
 import com.cobblemon.mod.common.client.net.npc.CloseNPCEditorHandler
 import com.cobblemon.mod.common.client.net.npc.OpenNPCEditorHandler
@@ -113,6 +114,7 @@ import com.cobblemon.mod.common.net.messages.client.settings.OpenCobblemonConfig
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
 import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
 import com.cobblemon.mod.common.net.messages.client.spawn.SpawnGenericBedrockPacket
+import com.cobblemon.mod.common.net.messages.client.spawn.SpawnFallingStarPacket
 import com.cobblemon.mod.common.net.messages.client.spawn.SpawnNPCPacket
 import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokeballPacket
 import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokemonPacket
@@ -134,6 +136,7 @@ import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.ChangeP
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.RequestPCBoxWallpapersPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.SetPCBoxWallpapersPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.UnlockPCBoxWallpaperPacket
+import com.cobblemon.mod.common.net.messages.client.tms.TechnicalMachineRegistrySyncPacket
 import com.cobblemon.mod.common.net.messages.client.toast.ToastPacket
 import com.cobblemon.mod.common.net.messages.client.trade.TradeAcceptanceChangedPacket
 import com.cobblemon.mod.common.net.messages.client.trade.TradeCancelledPacket
@@ -149,6 +152,7 @@ import com.cobblemon.mod.common.net.messages.client.ui.PokedexUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SetActiveTMPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SetTMMachineContainerDataPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
+import com.cobblemon.mod.common.net.messages.client.ui.SynchronizeActiveTMPacket
 import com.cobblemon.mod.common.net.messages.server.BattleChallengePacket
 import com.cobblemon.mod.common.net.messages.server.BattleChallengeResponsePacket
 import com.cobblemon.mod.common.net.messages.server.BenchMovePacket
@@ -381,6 +385,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(PlayerInteractOptionsPacket.ID, PlayerInteractOptionsPacket::decode, PlayerInteractOptionsHandler))
         list.add(PacketRegisterInfo(PokedexUIPacket.ID, PokedexUIPacket::decode, PokedexUIPacketHandler))
         list.add(PacketRegisterInfo(ExpGainedDataPacket.ID, ExpGainedDataPacket::decode, ExpGainedDataPacketHandler))
+        list.add(PacketRegisterInfo(SynchronizeActiveTMPacket.ID, SynchronizeActiveTMPacket::decode, SynchronizeActiveTMHandler))
 
         // Starter packets
         list.add(PacketRegisterInfo(OpenStarterUIPacket.ID, OpenStarterUIPacket::decode, StarterUIPacketHandler))
@@ -446,6 +451,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(BehaviourSyncPacket.ID, BehaviourSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(MarkRegistrySyncPacket.ID, MarkRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(RideSettingsSyncPacket.ID, RideSettingsSyncPacket::decode, RideSettingsSyncHandler))
+        list.add(PacketRegisterInfo(TechnicalMachineRegistrySyncPacket.ID, TechnicalMachineRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
 
         // Effects
         list.add(PacketRegisterInfo(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler))
@@ -459,6 +465,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(SpawnPokemonPacket.ID, SpawnPokemonPacket::decode, SpawnExtraDataEntityHandler()))
         list.add(PacketRegisterInfo(SpawnPokeballPacket.ID, SpawnPokeballPacket::decode, SpawnExtraDataEntityHandler()))
         list.add(PacketRegisterInfo(SpawnGenericBedrockPacket.ID, SpawnGenericBedrockPacket::decode, SpawnExtraDataEntityHandler()))
+        list.add(PacketRegisterInfo(SpawnFallingStarPacket.ID, SpawnFallingStarPacket::decode, SpawnExtraDataEntityHandler()))
         list.add(PacketRegisterInfo(SpawnNPCPacket.ID, SpawnNPCPacket::decode, SpawnExtraDataEntityHandler()))
         list.add(PacketRegisterInfo(ToastPacket.ID, ToastPacket::decode, ToastPacketHandler))
 

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

@@ -133,7 +133,7 @@ open class PokemonBattle(
         set(value) { field = value.coerceAtMost(Int.MAX_VALUE) } // go outside
 
     /** The current duration of the battle in seconds. */
-    val time: Int get() = ticks % 20
+    val time: Int get() = ticks / 20
 
     var dispatchResult = GO
     val dispatches = ConcurrentLinkedDeque<BattleDispatch>()

common/src/main/kotlin/com/cobblemon/mod/common/api/cooking/effects/CleanseAllEffect.kt

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.api.cooking.effects
 
+import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.effect.MobEffect
 import net.minecraft.world.effect.MobEffectCategory
 import net.minecraft.world.entity.Entity
@@ -18,5 +19,13 @@ class CleanseAllEffect : MobEffect(MobEffectCategory.BENEFICIAL, 0xFFFFFF) {
     override fun applyInstantenousEffect(source: Entity?, indirect: Entity?, target: LivingEntity, amplifier: Int, proximity: Double) {
         target.removeAllEffects()
     }
-    override fun shouldApplyEffectTickThisTick(duration: Int, amplifier: Int) = false
+
+    override fun applyEffectTick(livingEntity: LivingEntity, amplifier: Int): Boolean {
+        if (livingEntity is ServerPlayer){
+            livingEntity.removeAllEffects()
+        }
+        return true
+    }
+
+    override fun shouldApplyEffectTickThisTick(duration: Int, amplifier: Int) = true
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/cooking/effects/CleanseNegativeEffect.kt

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.api.cooking.effects
 
+import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.effect.MobEffect
 import net.minecraft.world.effect.MobEffectCategory
 import net.minecraft.world.entity.Entity
@@ -23,5 +24,18 @@ class CleanseNegativeEffect : MobEffect(MobEffectCategory.BENEFICIAL, 0xFFFFFF)
             }
         }
     }
-    override fun shouldApplyEffectTickThisTick(duration: Int, amplifier: Int) = false
+
+    override fun applyEffectTick(livingEntity: LivingEntity, amplifier: Int): Boolean {
+        if (livingEntity is ServerPlayer){
+            val snapshot = livingEntity.activeEffects.toList()
+            for (ei in snapshot) {
+                if (ei.effect.value().category == MobEffectCategory.HARMFUL) {
+                    livingEntity.removeEffect(ei.effect)
+                }
+            }
+        }
+        return true
+    }
+
+    override fun shouldApplyEffectTickThisTick(duration: Int, amplifier: Int) = true
 }

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

@@ -21,7 +21,8 @@ import com.cobblemon.mod.common.pokemon.Pokemon
  */
 data class FriendshipUpdatedEvent(
     val pokemon: Pokemon,
-    val newFriendshipInitial: Int
+    val newFriendshipInitial: Int,
+    val earned: Boolean = false
 ) {
     var newFriendship: Int = newFriendshipInitial
         set(value) {

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/HabitatPool.kt

@@ -69,7 +69,7 @@ class HabitatPool {
                 pool.spawns = spawns
                 return pool
             } else {
-                return HabitatPools.habitatPoolsById[poolId] ?: HabitatPool.default()
+                return HabitatPools.habitatPoolsById[poolId] ?: default()
             }
         }
     }
@@ -94,6 +94,14 @@ class HabitatPool {
         return spawns.mapNotNull { it.createSpawnDetail(habitatBlockEntity) }
     }
 
+    fun getPhaseCount(): Int {
+        return spawns
+            .flatMap { it.phases?.ranges?.flatten() ?: emptySet() }
+            .toSet()
+            .count()
+            .coerceAtLeast(1)
+    }
+
     fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeResourceLocation(id)
         buffer.writeUtf(name)

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/HabitatSpawn.kt

@@ -65,7 +65,7 @@ class HabitatSpawn {
     /** The maximum light level that the Pokémon can spawn in. */
     var maxLight: Int? = null
 
-    open fun writeToNBT(nbt: CompoundTag) {
+    fun writeToNBT(nbt: CompoundTag) {
         nbt.putString(DataKeys.HABITAT_POOL_SPAWN_SPECIES, species.resourceIdentifier.toString())
         nbt.putString(DataKeys.HABITAT_POOL_SPAWN_POSITION_TYPE, spawnablePositionType)
         nbt.putFloat(DataKeys.HABITAT_POOL_SPAWN_WEIGHT, weight)
@@ -78,7 +78,7 @@ class HabitatSpawn {
         nbt.putString(DataKeys.HABITAT_POOL_SPAWN_BUCKET, bucket)
     }
 
-    open fun readFromNBT(nbt: CompoundTag) {
+    fun readFromNBT(nbt: CompoundTag) {
         species = PokemonSpecies.getByIdentifier(nbt.getString(DataKeys.HABITAT_POOL_SPAWN_SPECIES).asIdentifierDefaultingNamespace())!!
         spawnablePositionType = nbt.getString(DataKeys.HABITAT_POOL_SPAWN_POSITION_TYPE)
         weight = nbt.getFloat(DataKeys.HABITAT_POOL_SPAWN_WEIGHT)
@@ -91,7 +91,7 @@ class HabitatSpawn {
         bucket = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_BUCKET)) nbt.getString(DataKeys.HABITAT_POOL_SPAWN_BUCKET) else "common"
     }
 
-    open fun encode(buffer: RegistryFriendlyByteBuf) {
+    fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeResourceLocation(species.resourceIdentifier)
         buffer.writeUtf(spawnablePositionType)
         buffer.writeFloat(weight)
@@ -104,7 +104,7 @@ class HabitatSpawn {
         buffer.writeUtf(bucket)
     }
 
-    open fun decode(buffer: RegistryFriendlyByteBuf) {
+    fun decode(buffer: RegistryFriendlyByteBuf) {
         species = PokemonSpecies.getByIdentifier(buffer.readResourceLocation())!!
         spawnablePositionType = buffer.readUtf()
         weight = buffer.readFloat()
@@ -118,7 +118,7 @@ class HabitatSpawn {
     }
 
     /** Creates the [PokemonSpawnDetail] that will be used in the spawner. This is done per habitat block. */
-    open fun createSpawnDetail(habitatBlockEntity: HabitatBlockEntity): PokemonSpawnDetail? {
+    fun createSpawnDetail(habitatBlockEntity: HabitatBlockEntity): PokemonSpawnDetail? {
         val spawnDetail = PokemonSpawnDetail()
 
         // If the habitat block specifies a level range, it restricts how and if this spawn exists

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/dto/HabitatSettingsDTO.kt

@@ -17,7 +17,6 @@ import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 
 class HabitatSettingsDTO() {
-    var numberOfPhases = 1
     var phaseOrder = HabitatPhaseOrder.SIMPLE
     lateinit var levelRange: IntRange
     var modifiers: String = ""
@@ -28,7 +27,6 @@ class HabitatSettingsDTO() {
     var naturalSettings: NaturalHabitatSettingsDTO? = null
 
     constructor(habitatBlockEntity: HabitatBlockEntity) : this() {
-        this.numberOfPhases = habitatBlockEntity.numberOfPhases
         this.phaseOrder = habitatBlockEntity.phaseOrder
         this.levelRange = habitatBlockEntity.levelRange
         this.modifiers = habitatBlockEntity.modifiers.asString()
@@ -44,7 +42,6 @@ class HabitatSettingsDTO() {
     }
 
     fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeInt(numberOfPhases)
         buffer.writeEnum(phaseOrder)
         buffer.writeInt(levelRange.first)
         buffer.writeInt(levelRange.last)
@@ -60,7 +57,6 @@ class HabitatSettingsDTO() {
     }
 
     fun decode(buffer: RegistryFriendlyByteBuf) {
-        this.numberOfPhases = buffer.readInt()
         this.phaseOrder = buffer.readEnum(HabitatPhaseOrder::class.java)
         val levelRangeStart = buffer.readInt()
         val levelRangeEnd = buffer.readInt()

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

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.api.item
 
 import com.cobblemon.mod.common.api.data.DataRegistry
+import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.battles.runner.ShowdownService
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
@@ -29,9 +30,11 @@ object HeldItems : DataRegistry {
     // val heldItems = PrioritizedList<BagItemLike>()
     internal val heldItemsScripts = mutableMapOf<String, String>() // showdown item ID to JavaScript
     val showdownItems = hashSetOf<String>()
+    val megaStones = hashMapOf<String, String>()
 
     override fun reload(manager: ResourceManager) {
         heldItemsScripts.clear()
+        megaStones.clear()
         ShowdownService.service.resetRegistryData("heldItem")
         manager.listResources("held_items") { it.path.endsWith(".js") }.forEach { (identifier, resource) ->
             resource.open().use { stream ->
@@ -48,6 +51,9 @@ object HeldItems : DataRegistry {
         for (i in 0 until itemsJson.size()) {
             val jsItem = itemsJson[i].asJsonObject
             showdownItems += jsItem.get("id").asString
+            if (jsItem.has("megaEvolves")) {
+                megaStones[jsItem.get("id").asString] = ShowdownIdentifiable.REGEX.replace(jsItem.get("megaEvolves").asString.lowercase(), "")
+            }
         }
 
         CobblemonHeldItemManager.load()

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

@@ -69,25 +69,31 @@ import net.minecraft.world.phys.Vec3
  * @since October 2nd, 2023
  */
 object MoLangFunctions {
-    fun ItemStack.asMoLangValue(registryAccess: RegistryAccess) = ObjectValue(this)
-        .addStandardFunctions()
-        .addFunctions(ItemStackMoLangFunctions.attach(Pair(this, registryAccess)))
+    fun ItemStack.asMoLangValue(registryAccess: RegistryAccess) =
+        ObjectValue(this)
+            .addStandardFunctions()
+            .addFunctions(ItemStackMoLangFunctions.attach(Pair(this, registryAccess)))
 
-    fun Holder<Biome>.asBiomeMoLangValue() = asMoLangValue(Registries.BIOME)
-        .addFunctions(BiomeMoLangFunctions.attach(this))
+    fun Holder<Biome>.asBiomeMoLangValue() =
+        asMoLangValue(Registries.BIOME)
+            .addFunctions(BiomeMoLangFunctions.attach(this))
 
-    fun Holder<Level>.asWorldMoLangValue() = asMoLangValue(Registries.DIMENSION)
-        .addFunctions(WorldMoLangFunctions.attach(this))
+    fun Holder<Level>.asWorldMoLangValue() =
+        asMoLangValue(Registries.DIMENSION)
+            .addFunctions(WorldMoLangFunctions.attach(this))
 
-    fun Holder<Block>.asBlockMoLangValue() = asMoLangValue(Registries.BLOCK)
-        .addFunctions(BlockMoLangFunctions.attach(this))
+    fun Holder<Block>.asBlockMoLangValue() =
+        asMoLangValue(Registries.BLOCK)
+            .addFunctions(BlockMoLangFunctions.attach(this))
 
-    fun MinecraftServer.asMoLangValue() = ObjectValue(this)
-        .addStandardFunctions()
-        .addFunctions(ServerMoLangFunctions.attach(this))
+    fun MinecraftServer.asMoLangValue() =
+        ObjectValue(this)
+            .addStandardFunctions()
+            .addFunctions(ServerMoLangFunctions.attach(this))
 
-    fun Holder<DimensionType>.asDimensionTypeMoLangValue() = asMoLangValue(Registries.DIMENSION_TYPE)
-        .addFunctions(DimensionTypeMoLangFunctions.attach(this))
+    fun Holder<DimensionType>.asDimensionTypeMoLangValue() =
+        asMoLangValue(Registries.DIMENSION_TYPE)
+            .addFunctions(DimensionTypeMoLangFunctions.attach(this))
 
     fun Player.asMoLangValue(): ObjectValue<Player> {
         if (this is ServerPlayer && uuid in Cobblemon.serverPlayerStructs) {
@@ -99,10 +105,11 @@ object MoLangFunctions {
             }
         }
 
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.effectiveName().string }
-        )
+        val value =
+            ObjectValue(
+                obj = this,
+                stringify = { it.effectiveName().string },
+            )
 
         value.addFunctions(EntityMoLangFunctions.attach(this))
         value.addFunctions(LivingEntityMoLangFunctions.attach(this))
@@ -123,57 +130,63 @@ object MoLangFunctions {
     }
 
     fun PartyStore.asMoLangValue(): ObjectValue<PartyStore> {
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.toString() }
-        )
+        val value =
+            ObjectValue(
+                obj = this,
+                stringify = { it.toString() },
+            )
         value.addFunctions(PokemonStoreMoLangFunctions.attach(this))
         value.addFunctions(PartyMoLangFunctions.attach(this))
         return value
     }
 
     fun DropEntry.asMoLangValue(): ObjectValue<DropEntry> {
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.toString() }
-        )
+        val value =
+            ObjectValue(
+                obj = this,
+                stringify = { it.toString() },
+            )
         value.addFunctions(DropEntryMoLangFunctions.attach(this))
         return value
     }
 
     fun PokemonProperties.asMoLangValue(): ObjectValue<PokemonProperties> {
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.asString() }
-        )
+        val value =
+            ObjectValue(
+                obj = this,
+                stringify = { it.asString() },
+            )
         value.addFunctions(PokemonPropertiesMoLangFunctions.attach(this))
         return value
     }
 
     fun Evolution.asMoLangValue(): ObjectValue<Evolution> {
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.toString() }
-        )
+        val value =
+            ObjectValue(
+                obj = this,
+                stringify = { it.toString() },
+            )
         value.addFunctions(EvolutionMoLangFunctions.attach(this))
         return value
     }
 
     fun PCStore.asMoLangValue(): ObjectValue<PCStore> {
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.toString() }
-        )
+        val value =
+            ObjectValue(
+                obj = this,
+                stringify = { it.toString() },
+            )
         value.addFunctions(PokemonStoreMoLangFunctions.attach(this))
         value.addFunctions(PCMoLangFunctions.attach(this))
         return value
     }
 
     fun NPCEntity.asMoLangValue(): ObjectValue<NPCEntity> {
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.name.string }
-        )
+        val value =
+            ObjectValue(
+                obj = this,
+                stringify = { it.name.string },
+            )
         value.addFunctions(EntityMoLangFunctions.attach(this))
         value.addFunctions(LivingEntityMoLangFunctions.attach(this))
         value.addFunctions(NPCMoLangFunctions.attach(this))
@@ -181,10 +194,11 @@ object MoLangFunctions {
     }
 
     fun PokemonEntity.asMoLangValue(): ObjectValue<PokemonEntity> {
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.pokemon.uuid.toString() }
-        )
+        val value =
+            ObjectValue(
+                obj = this,
+                stringify = { it.pokemon.uuid.toString() },
+            )
 
         value.addFunctions(EntityMoLangFunctions.attach(this))
         value.addFunctions(LivingEntityMoLangFunctions.attach(this))
@@ -195,36 +209,40 @@ object MoLangFunctions {
     }
 
     fun PokemonBattle.asMoLangValue(): ObjectValue<PokemonBattle> {
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.battleId.toString() }
-        )
+        val value =
+            ObjectValue(
+                obj = this,
+                stringify = { it.battleId.toString() },
+            )
         value.addFunctions(BattleMoLangFunctions.attach(this))
         return value
     }
 
     fun BattleActor.asMoLangValue(): ObjectValue<BattleActor> {
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.toString() }
-        )
+        val value =
+            ObjectValue(
+                obj = this,
+                stringify = { it.toString() },
+            )
         value.addFunctions(BattleActorMoLangFunctions.attach(this))
         return value
     }
 
     fun SpawnablePosition.asMoLangValue(): ObjectValue<SpawnablePosition> {
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.toString() }
-        )
+        val value =
+            ObjectValue(
+                obj = this,
+                stringify = { it.toString() },
+            )
         value.addFunctions(SpawnablePositionMoLangFunctions.attach(this))
         return value
     }
 
     fun Vec3.asMoLangValue(): ObjectValue<Vec3> {
-        val value = ObjectValue(
-            obj = this
-        )
+        val value =
+            ObjectValue(
+                obj = this,
+            )
         value.addFunction("x") { this.x }
         value.addFunction("y") { this.y }
         value.addFunction("z") { this.z }
@@ -235,45 +253,66 @@ object MoLangFunctions {
     /**
      * Different functions exist depending on the entity type, this tries to make the struct that's most specific to the type.
      */
-    fun Entity.asMostSpecificMoLangValue(): ObjectValue<out Entity> {
-        return when (this) {
-            is Player -> asMoLangValue()
-            is PokemonEntity -> struct
-            is NPCEntity -> struct
-            is ItemEntity -> ObjectValue(this).also { item ->
-                item.addStandardFunctions()
-                item.addFunctions(EntityMoLangFunctions.attach(this))
-                item.addFunctions(ItemStackMoLangFunctions.attach(Pair(this.item, this.registryAccess())))
+    fun Entity.asMostSpecificMoLangValue(): ObjectValue<out Entity> =
+        when (this) {
+            is Player -> {
+                asMoLangValue()
             }
 
-            else -> ObjectValue(this).also { objectValue ->
-                objectValue.addStandardFunctions()
-                objectValue.addFunctions(EntityMoLangFunctions.attach(this))
-                if (this is LivingEntity) {
-                    objectValue.addFunctions(LivingEntityMoLangFunctions.attach(this))
+            is PokemonEntity -> {
+                struct
+            }
+
+            is NPCEntity -> {
+                struct
+            }
+
+            is ItemEntity -> {
+                ObjectValue(this).also { item ->
+                    item.addStandardFunctions()
+                    item.addFunctions(EntityMoLangFunctions.attach(this))
+                    item.addFunctions(ItemStackMoLangFunctions.attach(Pair(this.item, this.registryAccess())))
+                }
+            }
+
+            else -> {
+                ObjectValue(this).also { objectValue ->
+                    objectValue.addStandardFunctions()
+                    objectValue.addFunctions(EntityMoLangFunctions.attach(this))
+                    if (this is LivingEntity) {
+                        objectValue.addFunctions(LivingEntityMoLangFunctions.attach(this))
+                    }
                 }
             }
         }
-    }
 
     fun <T> Holder<T>.asMoLangValue(key: ResourceKey<Registry<T>>): ObjectValue<Holder<T>> {
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.unwrapKey().get().location().toString() }
-        )
-        value.functions["is_in"] = Function put@{ params: MoParams ->
-            val tag = TagKey.create(key, ResourceLocation.parse(params.getString(0).replace("#", "")))
-            return@put DoubleValue(if (value.obj.`is`(tag)) 1.0 else 0.0)
-        }
-        value.functions["is_of"] = Function put@{ params: MoParams ->
-            val identifier = ResourceLocation.parse(params.getString(0))
-            return@put DoubleValue(if (value.obj.`is`(identifier)) 1.0 else 0.0)
-        }
+        val value =
+            ObjectValue(
+                obj = this,
+                stringify = {
+                    it
+                        .unwrapKey()
+                        .get()
+                        .location()
+                        .toString()
+                },
+            )
+        value.functions["is_in"] =
+            Function put@{ params: MoParams ->
+                val tag = TagKey.create(key, ResourceLocation.parse(params.getString(0).replace("#", "")))
+                return@put DoubleValue(if (value.obj.`is`(tag)) 1.0 else 0.0)
+            }
+        value.functions["is_of"] =
+            Function put@{ params: MoParams ->
+                val identifier = ResourceLocation.parse(params.getString(0))
+                return@put DoubleValue(if (value.obj.`is`(identifier)) 1.0 else 0.0)
+            }
         return value
     }
 
     fun QueryStruct.addStandardFunctions(): QueryStruct {
-        addFunctions(GeneralMoLangFunctions.holder)
+        addFunctions(GeneralMoLangFunctions.functions)
         return this
     }
 
@@ -340,23 +379,17 @@ object MoLangFunctions {
         return this
     }
 
-    fun moLangFunctionMap(
-        vararg functions: Pair<String, (MoParams) -> MoValue>
-    ): Map<String, (MoParams) -> MoValue> {
-        return functions.toMap()
-    }
+    fun moLangFunctionMap(vararg functions: Pair<String, (MoParams) -> MoValue>): Map<String, (MoParams) -> MoValue> = functions.toMap()
 
-    fun queryStructOf(
-        vararg functions: Pair<String, (MoParams) -> MoValue>
-    ): QueryStruct {
-        return QueryStruct(
+    fun queryStructOf(vararg functions: Pair<String, (MoParams) -> MoValue>): QueryStruct =
+        QueryStruct(
             hashMapOf<String, Function<MoParams, Any>>(
-                *functions.map { (name, func) ->
-                    name to Function<MoParams, Any> { params -> func(params) }
-                }.toTypedArray()
-            )
+                *functions
+                    .map { (name, func) ->
+                        name to Function<MoParams, Any> { params -> func(params) }
+                    }.toTypedArray(),
+            ),
         )
-    }
 
     fun MoLangRuntime.setup(): MoLangRuntime {
         environment.query.addStandardFunctions()
@@ -365,8 +398,14 @@ object MoLangFunctions {
 
     fun writeMoValueToNBT(value: MoValue): Tag? {
         return when (value) {
-            is DoubleValue -> DoubleTag.valueOf(value.value)
-            is StringValue -> StringTag.valueOf(value.value)
+            is DoubleValue -> {
+                DoubleTag.valueOf(value.value)
+            }
+
+            is StringValue -> {
+                StringTag.valueOf(value.value)
+            }
+
             is ArrayStruct -> {
                 val list = value.map.values
                 val nbtList = ListTag()
@@ -383,14 +422,22 @@ object MoLangFunctions {
                 nbt
             }
 
-            else -> null
+            else -> {
+                null
+            }
         }
     }
 
-    fun readMoValueFromNBT(nbt: Tag): MoValue {
-        return when (nbt) {
-            is DoubleTag -> DoubleValue(nbt.asDouble)
-            is StringTag -> StringValue(nbt.asString)
+    fun readMoValueFromNBT(nbt: Tag): MoValue =
+        when (nbt) {
+            is DoubleTag -> {
+                DoubleValue(nbt.asDouble)
+            }
+
+            is StringTag -> {
+                StringValue(nbt.asString)
+            }
+
             is ListTag -> {
                 val array = ArrayStruct(hashMapOf())
                 var index = 0
@@ -411,11 +458,12 @@ object MoLangFunctions {
                 variable
             }
 
-            else -> VariableStruct()
+            else -> {
+                VariableStruct()
+            }
         }
-    }
 }
 
 // TODO: this one is unused. Should we move it to [MoLangFunctions] object?
 fun Either<ResourceLocation, ExpressionLike>.runScript(runtime: MoLangRuntime) =
-    map({ CobblemonScripts.run(it, runtime) }, { it.resolve(runtime) })
+    map({ CobblemonScripts.run(it, runtime) }, { it.resolve(runtime) })

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

@@ -17,30 +17,29 @@ import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
 import com.cobblemon.mod.common.entity.npc.NPCBattleActor
 
-
 object BattleActorMoLangFunctions : AbstractMoLangFunctionHolder<BattleActor>() {
     override fun BattleActor.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val actor = this
-        val map = mutableMapOf<String, (MoParams) -> Any>(
-            "is_npc" to { DoubleValue(actor.type == ActorType.NPC) },
-            "is_player" to { DoubleValue(actor.type == ActorType.PLAYER) },
-            "is_wild" to { DoubleValue(actor.type == ActorType.WILD) }
-        )
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["is_npc"] = { DoubleValue(actor.type == ActorType.NPC) }
+        functions["is_player"] = { DoubleValue(actor.type == ActorType.PLAYER) }
+        functions["is_wild"] = { DoubleValue(actor.type == ActorType.WILD) }
 
         when (actor) {
             is NPCBattleActor -> {
-                map["npc"] = { actor.entity.struct }
+                functions["npc"] = { actor.entity.struct }
             }
 
             is PlayerBattleActor -> {
-                map["player"] = { actor.entity?.asMoLangValue() ?: DoubleValue.ZERO }
+                functions["player"] = { actor.entity?.asMoLangValue() ?: DoubleValue.ZERO }
             }
 
             is PokemonBattleActor -> {
-                map["pokemon"] = { actor.entity?.asMoLangValue() ?: DoubleValue.ZERO }
+                functions["pokemon"] = { actor.entity?.asMoLangValue() ?: DoubleValue.ZERO }
             }
         }
 
-        return map
+        return functions
     }
 }

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

@@ -16,17 +16,19 @@ import com.cobblemon.mod.common.util.getStringOrNull
 object BattleMessageMoLangFunctions : AbstractMoLangFunctionHolder<BattleMessage>() {
     override fun BattleMessage.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val battleMessage = this
-        return mutableMapOf(
-            "has_argument_at" to { params ->
-                val index = params.getInt(0)
-                val value = params.getStringOrNull(1) ?: ""
-                DoubleValue(value == battleMessage.argumentAt(index))
-            },
-            "has_argument" to { params ->
-                val argumentName = params.getString(0)
-                val value = params.getStringOrNull(1) ?: ""
-                DoubleValue(value == battleMessage.optionalArgument(argumentName))
-            }
-        )
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["has_argument_at"] = { params ->
+            val index = params.getInt(0)
+            val value = params.getStringOrNull(1) ?: ""
+            DoubleValue(value == battleMessage.argumentAt(index))
+        }
+        functions["has_argument"] = { params ->
+            val argumentName = params.getString(0)
+            val value = params.getStringOrNull(1) ?: ""
+            DoubleValue(value == battleMessage.optionalArgument(argumentName))
+        }
+
+        return functions
     }
 }

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

@@ -18,20 +18,22 @@ import java.util.UUID
 object BattleMoLangFunctions : AbstractMoLangFunctionHolder<PokemonBattle>() {
     override fun PokemonBattle.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val battle = this
-        return mutableMapOf(
-            "environment" to { battle.runtime.environment },
-            "battle_id" to { StringValue(battle.battleId.toString()) },
-            "battle_type" to { StringValue(battle.format.toString()) },
-            "is_pvn" to { DoubleValue(battle.isPvN) },
-            "is_pvp" to { DoubleValue(battle.isPvP) },
-            "is_pvw" to { DoubleValue(battle.isPvW) },
-            "stop" to { battle.stop() },
-            "actors" to { battle.actors.toList().asArrayValue { it.struct } },
-            "get_actor" to getActor@{ params ->
-                val uuid = UUID.fromString(params.getString(0))
-                val actor = battle.actors.find { it.uuid == uuid } ?: return@getActor DoubleValue.ZERO
-                actor.struct
-            }
-        )
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["environment"] = { battle.runtime.environment }
+        functions["battle_id"] = { StringValue(battle.battleId.toString()) }
+        functions["battle_type"] = { StringValue(battle.format.toString()) }
+        functions["is_pvn"] = { DoubleValue(battle.isPvN) }
+        functions["is_pvp"] = { DoubleValue(battle.isPvP) }
+        functions["is_pvw"] = { DoubleValue(battle.isPvW) }
+        functions["stop"] = { battle.stop() }
+        functions["actors"] = { battle.actors.toList().asArrayValue { it.struct } }
+        functions["get_actor"] = getActor@{ params ->
+            val uuid = UUID.fromString(params.getString(0))
+            val actor = battle.actors.find { it.uuid == uuid } ?: return@getActor DoubleValue.ZERO
+            actor.struct
+        }
+
+        return functions
     }
 }

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

@@ -12,8 +12,11 @@ import com.bedrockk.molang.runtime.MoParams
 import net.minecraft.core.Holder
 import net.minecraft.world.level.biome.Biome
 
-object BiomeMoLangFunctions: AbstractMoLangFunctionHolder<Holder<Biome>>() {
+object BiomeMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Biome>>() {
     override fun Holder<Biome>.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
-        return mutableMapOf()
+        val biome = this
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        return functions
     }
 }

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

@@ -12,8 +12,11 @@ import com.bedrockk.molang.runtime.MoParams
 import net.minecraft.core.Holder
 import net.minecraft.world.level.block.Block
 
-object BlockMoLangFunctions: AbstractMoLangFunctionHolder<Holder<Block>>() {
+object BlockMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Block>>() {
     override fun Holder<Block>.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
-        return mutableMapOf()
+        val block = this
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        return functions
     }
 }

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

@@ -14,6 +14,9 @@ import net.minecraft.world.level.dimension.DimensionType
 
 object DimensionTypeMoLangFunctions : AbstractMoLangFunctionHolder<Holder<DimensionType>>() {
     override fun Holder<DimensionType>.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
-        return mutableMapOf()
+        val dimension = this
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        return functions
     }
 }

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

@@ -18,15 +18,16 @@ import com.cobblemon.mod.common.util.getOrNull
 object DropEntryMoLangFunctions : AbstractMoLangFunctionHolder<DropEntry>() {
     override fun DropEntry.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val drop = this
-        val map = mutableMapOf<String, (MoParams) -> Any>()
+        val functions = hashMapOf<String, (MoParams) -> Any>()
 
-        map["percentage"] = { DoubleValue(drop.percentage.toDouble()) }
-        map["quantity"] = { DoubleValue(drop.quantity.toDouble()) }
-        map["max_selectable_times"] = { DoubleValue(drop.maxSelectableTimes.toDouble()) }
-        map["can_drop"] = { params ->
+        functions["percentage"] = { DoubleValue(drop.percentage.toDouble()) }
+        functions["quantity"] = { DoubleValue(drop.quantity.toDouble()) }
+        functions["max_selectable_times"] = { DoubleValue(drop.maxSelectableTimes.toDouble()) }
+        functions["can_drop"] = { params ->
             val pokemon = params.getOrNull<ObjectValue<Pokemon>>(0)?.obj
             DoubleValue(if (drop.canDrop(pokemon)) 1.0 else 0.0)
         }
-        return map
+
+        return functions
     }
 }

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

@@ -56,258 +56,300 @@ import kotlin.math.sqrt
 
 object EntityMoLangFunctions : AbstractMoLangFunctionHolder<Entity>() {
     override fun Entity.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
-        val thisEntity = this
-        val map = mutableMapOf<String, (MoParams) -> Any>(
-            "uuid" to { StringValue(thisEntity.uuid.toString()) },
-            "name" to { _ -> StringValue(thisEntity.effectiveName().string) },
-            "yaw" to { _ -> DoubleValue(thisEntity.yRot.toDouble()) },
-            "pitch" to { _ -> DoubleValue(thisEntity.xRot.toDouble()) },
-            "x" to { _ -> DoubleValue(thisEntity.x) },
-            "y" to { _ -> DoubleValue(thisEntity.y) },
-            "z" to { _ -> DoubleValue(thisEntity.z) },
-            "velocity_x" to { _ -> DoubleValue(thisEntity.deltaMovement.x) },
-            "velocity_y" to { _ -> DoubleValue(thisEntity.deltaMovement.y) },
-            "velocity_z" to { _ -> DoubleValue(thisEntity.deltaMovement.z) },
-            "width" to { DoubleValue(thisEntity.boundingBox.xsize) },
-            "height" to { DoubleValue(thisEntity.boundingBox.ysize) },
-            "this_size" to { DoubleValue(thisEntity.boundingBox.run { if (xsize > ysize) xsize else ysize }) },
-            "this_width" to { DoubleValue(thisEntity.boundingBox.xsize) },
-            "this_height" to { DoubleValue(thisEntity.boundingBox.ysize) },
-            "id_modulo" to { params -> DoubleValue(thisEntity.uuid.hashCode() % params.getDouble(0)) },
-            "horizontal_velocity" to { _ -> DoubleValue(thisEntity.deltaMovement.horizontalDistance()) },
-            "vertical_velocity" to { DoubleValue(thisEntity.deltaMovement.y) },
-            "is_on_ground" to { _ -> DoubleValue(thisEntity.onGround()) },
-            "world" to { _ -> thisEntity.level().worldRegistry.wrapAsHolder(thisEntity.level()).asWorldMoLangValue() },
-            "biome" to { _ -> thisEntity.level().getBiome(thisEntity.blockPosition()).asBiomeMoLangValue() },
-            "is_passenger" to { DoubleValue(thisEntity.isPassenger) },
-            "discard" to { thisEntity.discard() },
-            "is_sneaking" to { _ -> DoubleValue(thisEntity.isShiftKeyDown) },
-            "is_sprinting" to { _ -> DoubleValue(thisEntity.isSprinting) },
-            "is_in_water" to { _ -> DoubleValue(thisEntity.isUnderWater) },
-            "is_in_rain" to { _ -> DoubleValue(thisEntity.isInWaterOrRain && !thisEntity.isInWater) },
-            "is_touching_water_or_rain" to { _ -> DoubleValue(thisEntity.isInWaterRainOrBubble) },
-            "is_touching_water" to { _ -> DoubleValue(thisEntity.isInWater) },
-            "is_underwater" to { DoubleValue(thisEntity.getIsSubmerged()) },
-            "is_in_lava" to { _ -> DoubleValue(thisEntity.isInLava) },
-            "is_on_fire" to { _ -> DoubleValue(thisEntity.isOnFire) },
-            "is_invisible" to { _ -> DoubleValue(thisEntity.isInvisible) },
-            "is_riding" to { _ -> DoubleValue(thisEntity.isPassenger) },
-            "set_name" to { params ->
-                val name = params.getString(0)
-                thisEntity.customName = name.text()
-                DoubleValue.ONE
-            },
-            "damage" to { params ->
-                val amount = params.getDouble(0)
-                val source = DamageSource(
-                    thisEntity.level().registryAccess().registryOrThrow(Registries.DAMAGE_TYPE)
-                        .getHolder(DamageTypes.GENERIC).get()
+        val entity = this
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["uuid"] = { StringValue(entity.uuid.toString()) }
+        functions["name"] = { StringValue(entity.effectiveName().string) }
+        functions["yaw"] = { DoubleValue(entity.yRot.toDouble()) }
+        functions["pitch"] = { DoubleValue(entity.xRot.toDouble()) }
+        functions["x"] = { DoubleValue(entity.x) }
+        functions["y"] = { DoubleValue(entity.y) }
+        functions["z"] = { DoubleValue(entity.z) }
+        functions["velocity_x"] = { DoubleValue(entity.deltaMovement.x) }
+        functions["velocity_y"] = { DoubleValue(entity.deltaMovement.y) }
+        functions["velocity_z"] = { DoubleValue(entity.deltaMovement.z) }
+        functions["width"] = { DoubleValue(entity.boundingBox.xsize) }
+        functions["height"] = { DoubleValue(entity.boundingBox.ysize) }
+        functions["this_size"] = { DoubleValue(entity.boundingBox.run { if (xsize > ysize) xsize else ysize }) }
+        functions["this_width"] = { DoubleValue(entity.boundingBox.xsize) }
+        functions["this_height"] = { DoubleValue(entity.boundingBox.ysize) }
+        functions["id_modulo"] = { params -> DoubleValue(entity.uuid.hashCode() % params.getDouble(0)) }
+        functions["horizontal_velocity"] = { DoubleValue(entity.deltaMovement.horizontalDistance()) }
+        functions["vertical_velocity"] = { DoubleValue(entity.deltaMovement.y) }
+        functions["is_on_ground"] = { DoubleValue(entity.onGround()) }
+        functions["world"] = {
+            entity
+                .level()
+                .worldRegistry
+                .wrapAsHolder(entity.level())
+                .asWorldMoLangValue()
+        }
+        functions["biome"] = { entity.level().getBiome(entity.blockPosition()).asBiomeMoLangValue() }
+        functions["is_passenger"] = { DoubleValue(entity.isPassenger) }
+        functions["discard"] = { entity.discard() }
+        functions["is_sneaking"] = { DoubleValue(entity.isShiftKeyDown) }
+        functions["is_sprinting"] = { DoubleValue(entity.isSprinting) }
+        functions["is_in_water"] = { DoubleValue(entity.isUnderWater) }
+        functions["is_in_rain"] = { DoubleValue(entity.isInWaterOrRain && !entity.isInWater) }
+        functions["is_touching_water_or_rain"] = { DoubleValue(entity.isInWaterRainOrBubble) }
+        functions["is_touching_water"] = { DoubleValue(entity.isInWater) }
+        functions["is_underwater"] = { DoubleValue(entity.getIsSubmerged()) }
+        functions["is_in_lava"] = { DoubleValue(entity.isInLava) }
+        functions["is_on_fire"] = { DoubleValue(entity.isOnFire) }
+        functions["is_invisible"] = { DoubleValue(entity.isInvisible) }
+        functions["is_riding"] = { DoubleValue(entity.isPassenger) }
+        functions["set_name"] = { params ->
+            val name = params.getString(0)
+            entity.customName = name.text()
+            DoubleValue.ONE
+        }
+        functions["damage"] = { params ->
+            val amount = params.getDouble(0)
+            val source =
+                DamageSource(
+                    entity
+                        .level()
+                        .registryAccess()
+                        .registryOrThrow(Registries.DAMAGE_TYPE)
+                        .getHolder(DamageTypes.GENERIC)
+                        .get(),
                 )
-                thisEntity.hurt(source, amount.toFloat())
-            },
-            "distance_to_owner" to distanceToOwner@{
-                if (thisEntity !is TamableAnimal) {
-                    return@distanceToOwner DoubleValue.ZERO
-                }
-                val owner = thisEntity.owner ?: return@distanceToOwner DoubleValue.ZERO
-                DoubleValue(thisEntity.distanceTo(owner))
-            },
-            "owner" to owner@{
-                if (thisEntity !is TamableAnimal) return@owner DoubleValue.ZERO
-                val owner = thisEntity.owner
-                owner?.asMostSpecificMoLangValue() ?: DoubleValue.ZERO
-            },
-            "delta_movement" to {
-                listOf(thisEntity.deltaMovement.x, thisEntity.deltaMovement.y, thisEntity.deltaMovement.z)
-                    .asArrayValue(::DoubleValue)
-            },
-            "tags" to {
-                val tags = thisEntity.tags
-                val array = ArrayStruct(hashMapOf())
-                tags.forEachIndexed { index, tag -> array.setDirectly("$index", StringValue(tag)) }
-                array
-            },
-            "add_tag" to { params ->
-                val tag = params.getString(0)
-                thisEntity.addTag(tag)
-                DoubleValue.ONE
-            },
-            "remove_tag" to { params ->
-                val tag = params.getString(0)
-                thisEntity.removeTag(tag)
-                DoubleValue.ONE
-            },
-            "has_tag" to { params ->
-                val tag = params.getString(0)
-                DoubleValue(thisEntity.tags.contains(tag))
-            },
-            "distance_to_pos" to { params ->
-                val x = params.getDouble(0)
-                val y = params.getDouble(1)
-                val z = params.getDouble(2)
-                DoubleValue(sqrt(thisEntity.distanceToSqr(Vec3(x, y, z))))
-            },
-            "type" to { _ ->
-                thisEntity.registryAccess().registry(Registries.ENTITY_TYPE).get().getKey(thisEntity.type)?.toString()?.let {
+            entity.hurt(source, amount.toFloat())
+        }
+        functions["distance_to_owner"] = distanceToOwner@{
+            if (entity !is TamableAnimal) {
+                return@distanceToOwner DoubleValue.ZERO
+            }
+            val owner = entity.owner ?: return@distanceToOwner DoubleValue.ZERO
+            DoubleValue(entity.distanceTo(owner))
+        }
+        functions["owner"] = owner@{
+            if (entity !is TamableAnimal) return@owner DoubleValue.ZERO
+            val owner = entity.owner
+            owner?.asMostSpecificMoLangValue() ?: DoubleValue.ZERO
+        }
+        functions["delta_movement"] = {
+            listOf(entity.deltaMovement.x, entity.deltaMovement.y, entity.deltaMovement.z)
+                .asArrayValue(::DoubleValue)
+        }
+        functions["tags"] = {
+            val tags = entity.tags
+            val array = ArrayStruct(hashMapOf())
+            tags.forEachIndexed { index, tag -> array.setDirectly("$index", StringValue(tag)) }
+            array
+        }
+        functions["add_tag"] = { params ->
+            val tag = params.getString(0)
+            entity.addTag(tag)
+            DoubleValue.ONE
+        }
+        functions["remove_tag"] = { params ->
+            val tag = params.getString(0)
+            entity.removeTag(tag)
+            DoubleValue.ONE
+        }
+        functions["has_tag"] = { params ->
+            val tag = params.getString(0)
+            DoubleValue(entity.tags.contains(tag))
+        }
+        functions["distance_to_pos"] = { params ->
+            val x = params.getDouble(0)
+            val y = params.getDouble(1)
+            val z = params.getDouble(2)
+            DoubleValue(sqrt(entity.distanceToSqr(Vec3(x, y, z))))
+        }
+        functions["type"] = {
+            entity
+                .registryAccess()
+                .registry(Registries.ENTITY_TYPE)
+                .get()
+                .getKey(entity.type)
+                ?.toString()
+                ?.let {
                     StringValue(it)
                 } ?: DoubleValue.ZERO
-            },
-            "find_nearby_block" to findNearbyBlock@{ params ->
-                val input = params.getString(0)
-                val isTag = input.contains("#")
-                val type = input.replace("#", "").asIdentifierDefaultingNamespace(namespace = "minecraft")
-                val range = params.getDoubleOrNull(1) ?: 10
-                val blockPos = thisEntity.level().getBlockStatesWithPos(
-                    AABB.ofSize(
-                        thisEntity.position(),
-                        range.toDouble(),
-                        range.toDouble(),
-                        range.toDouble()
-                    )
-                )
-                    .filter { blockPosPair ->
+        }
+        functions["find_nearby_block"] = findNearbyBlock@{ params ->
+            val input = params.getString(0)
+            val isTag = input.contains("#")
+            val type = input.replace("#", "").asIdentifierDefaultingNamespace(namespace = "minecraft")
+            val range = params.getDoubleOrNull(1) ?: 10
+            val blockPos =
+                entity
+                    .level()
+                    .getBlockStatesWithPos(
+                        AABB.ofSize(
+                            entity.position(),
+                            range.toDouble(),
+                            range.toDouble(),
+                            range.toDouble(),
+                        ),
+                    ).filter { blockPosPair ->
                         blockPosPair.first.blockHolder.let {
-                            if (isTag) it.`is`(
-                                TagKey.create(
-                                    Registries.BLOCK,
-                                    type
+                            if (isTag) {
+                                it.`is`(
+                                    TagKey.create(
+                                        Registries.BLOCK,
+                                        type,
+                                    ),
                                 )
-                            ) else it.`is`(type)
+                            } else {
+                                it.`is`(type)
+                            }
                         }
-                    }
-                    .minByOrNull { it.second.distSqr(thisEntity.blockPosition()) }
+                    }.minByOrNull { it.second.distSqr(entity.blockPosition()) }
                     ?.second
-                if (blockPos != null) {
-                    return@findNearbyBlock ArrayStruct(
-                        mapOf(
-                            "0" to DoubleValue(blockPos.x),
-                            "1" to DoubleValue(blockPos.y),
-                            "2" to DoubleValue(blockPos.z)
-                        )
-                    )
-                }
-                return@findNearbyBlock DoubleValue.ZERO
-            },
-            "get_nearby_entities" to { params ->
-                val distance = params.getDouble(0)
-                val entities =
-                    thisEntity.level().getEntities(thisEntity, AABB.ofSize(thisEntity.position(), distance, distance, distance))
+            if (blockPos != null) {
+                return@findNearbyBlock ArrayStruct(
+                    mapOf(
+                        "0" to DoubleValue(blockPos.x),
+                        "1" to DoubleValue(blockPos.y),
+                        "2" to DoubleValue(blockPos.z),
+                    ),
+                )
+            }
+            return@findNearbyBlock DoubleValue.ZERO
+        }
+        functions["get_nearby_entities"] = { params ->
+            val distance = params.getDouble(0)
+            val entities =
+                entity
+                    .level()
+                    .getEntities(entity, AABB.ofSize(entity.position(), distance, distance, distance))
 
-                entities
-                    .filterIsInstance<Entity>()
-                    .map { it.asMostSpecificMoLangValue() }
-                    .asArrayValue()
-            },
-            "is_standing_on_blocks" to { params ->
-                val depth = params.getDouble(0).toInt()
-                val blockStrings: MutableSet<String> = mutableSetOf()
-                for (blockIndex in 1..<params.params.size) {
-                    blockStrings.add(params.getString(blockIndex))
-                }
+            entities
+                .filterIsInstance<Entity>()
+                .map { it.asMostSpecificMoLangValue() }
+                .asArrayValue()
+        }
+        functions["is_standing_on_blocks"] = { params ->
+            val depth = params.getDouble(0).toInt()
+            val blockStrings: MutableSet<String> = mutableSetOf()
+            for (blockIndex in 1..<params.params.size) {
+                blockStrings.add(params.getString(blockIndex))
+            }
 
-                if (thisEntity.isStandingOn(blockStrings, depth)) DoubleValue.ONE else DoubleValue.ZERO
-            },
+            if (entity.isStandingOn(blockStrings, depth)) DoubleValue.ONE else DoubleValue.ZERO
+        }
 
-            // 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.
-            "spawn_bedrock_particles" to { params ->
-                val particle = params.getString(0).asResource()
-                val locator = params.getString(1)
-                val player = params.getOrNull<MoValue>(2)?.let {
+        // 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.
+        functions["spawn_bedrock_particles"] = { params ->
+            val particle = params.getString(0).asResource()
+            val locator = params.getString(1)
+            val player =
+                params.getOrNull<MoValue>(2)?.let {
                     when (it) {
-                        is StringValue -> thisEntity.level().getPlayerByUUID(UUID.fromString(it.value))
+                        is StringValue -> entity.level().getPlayerByUUID(UUID.fromString(it.value))
                         is ObjectValue<*> -> it.obj
                         else -> null
                     }
                 } as? ServerPlayer
 
-                val packet = SpawnSnowstormEntityParticlePacket(particle, thisEntity.id, listOf(locator))
-                if (player == null) {
-                    packet.sendToPlayersAround(thisEntity.x, thisEntity.y, thisEntity.z, 64.0, thisEntity.level().dimension())
-                } else {
-                    packet.sendToPlayer(player)
-                }
-            },
-            "make_intangible" to { params ->
-                val intangible = params.getBooleanOrNull(0) ?: true
-                thisEntity.noPhysics = intangible
-                DoubleValue.ONE
+            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)
             }
-        )
+        }
+        functions["make_intangible"] = { params ->
+            val intangible = params.getBooleanOrNull(0) ?: true
+            entity.noPhysics = intangible
+            DoubleValue.ONE
+        }
 
-
-        if (thisEntity is PosableEntity) {
-            map["play_animation"] = playAnimation@{ params ->
-                val animation = params.getString(0)
-                val packet = PlayPosableAnimationPacket(thisEntity.id, setOf(animation), emptyList())
-                val target = params.getStringOrNull(1)
-                if (target != null) {
-                    val targetPlayer = if (target.asUUID != null) {
-                        thisEntity.level().getPlayerByUUID(target.asUUID!!) as ServerPlayer
-                    } else if (thisEntity.level() is ServerLevel) {
-                        thisEntity.level().server!!.playerList.getPlayerByName(target)
+        when (entity) {
+            is PosableEntity -> {
+                functions["play_animation"] = playAnimation@{ 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@playAnimation DoubleValue.ONE
+                        } else {
+                            return@playAnimation DoubleValue.ZERO
+                        }
                     } else {
-                        null
-                    }
-                    if (targetPlayer != null) {
-                        packet.sendToPlayer(targetPlayer)
+                        packet.sendToPlayersAround(
+                            entity.x,
+                            entity.y,
+                            entity.z,
+                            64.0,
+                            entity.level().dimension(),
+                        )
                         return@playAnimation DoubleValue.ONE
-                    } else {
-                        return@playAnimation DoubleValue.ZERO
                     }
-                } else {
-                    packet.sendToPlayersAround(thisEntity.x, thisEntity.y, thisEntity.z, 64.0, thisEntity.level().dimension())
-                    return@playAnimation DoubleValue.ONE
+                }
+
+                functions["face"] = { params ->
+                    ObjectValue(ReferenceDialogueFaceProvider(entity.id, params.getBooleanOrNull(0) != false))
                 }
             }
 
-            map["face"] = { params ->
-                ObjectValue(ReferenceDialogueFaceProvider(thisEntity.id, params.getBooleanOrNull(0) != false))
-
+            is Schedulable -> {
+                functions["run_molang_after"] = { params ->
+                    val expression = params.getString(0).asExpressionLike()
+                    val delayInSeconds = params.getDouble(1).toFloat()
+                    val runtime = MoLangRuntime()
+                    runtime.environment.cloneFrom(params.environment)
+                    entity.after(delayInSeconds) {
+                        runtime.resolve(expression)
+                    }
+                }
             }
-        }
 
-        if (thisEntity is Schedulable) {
-            map["run_molang_after"] = { params ->
-                val expression = params.getString(0).asExpressionLike()
-                val delayInSeconds = params.getDouble(1).toFloat()
-                val runtime = MoLangRuntime()
-                runtime.environment.cloneFrom(params.environment)
-                thisEntity.after(delayInSeconds) {
-                    runtime.resolve(expression)
+            is MoLangScriptingEntity -> {
+                functions["add_callback"] = { params ->
+                    val type = params.getString(0).asIdentifierDefaultingNamespace()
+                    val callback = params.getString(1).asIdentifierDefaultingNamespace()
+                    val allowDuplicates = params.getBooleanOrNull(2) ?: false
+                    entity.callbacks.addCallback(type, callback, allowDuplicates)
+                }
+                functions["remove_callback"] = { params ->
+                    val type = params.getString(0).asIdentifierDefaultingNamespace()
+                    val callback = params.getString(1).asIdentifierDefaultingNamespace()
+                    entity.callbacks.removeCallback(type, callback)
+                }
+                functions["has_callback"] = { params ->
+                    val type = params.getString(0).asIdentifierDefaultingNamespace()
+                    val callback = params.getString(1).asIdentifierDefaultingNamespace()
+                    DoubleValue(callback in (entity.callbacks[type] ?: emptySet()))
+                }
+                functions["clear_callbacks"] = { params ->
+                    val type = params.getStringOrNull(0)?.asIdentifierDefaultingNamespace()
+                    if (type != null) {
+                        entity.callbacks[type]?.clear()
+                    } else {
+                        entity.callbacks.clear()
+                    }
+                    DoubleValue.ONE
                 }
             }
         }
 
-        if (thisEntity is MoLangScriptingEntity) {
-            map["add_callback"] = { params ->
-                val type = params.getString(0).asIdentifierDefaultingNamespace()
-                val callback = params.getString(1).asIdentifierDefaultingNamespace()
-                val allowDuplicates = params.getBooleanOrNull(2) ?: false
-                thisEntity.callbacks.addCallback(type, callback, allowDuplicates)
-            }
-            map["remove_callback"] = { params ->
-                val type = params.getString(0).asIdentifierDefaultingNamespace()
-                val callback = params.getString(1).asIdentifierDefaultingNamespace()
-                thisEntity.callbacks.removeCallback(type, callback)
-            }
-            map["has_callback"] = { params ->
-                val type = params.getString(0).asIdentifierDefaultingNamespace()
-                val callback = params.getString(1).asIdentifierDefaultingNamespace()
-                DoubleValue(callback in (thisEntity.callbacks[type] ?: emptySet()))
-            }
-            map["clear_callbacks"] = { params ->
-                val type = params.getStringOrNull(0)?.asIdentifierDefaultingNamespace()
-                if (type != null) {
-                    thisEntity.callbacks[type]?.clear()
-                } else {
-                    thisEntity.callbacks.clear()
-                }
-                DoubleValue.ONE
-            }
-        }
-
-        return map
+        return functions
     }
 }

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

@@ -20,28 +20,28 @@ import com.cobblemon.mod.common.pokemon.transformation.triggers.TradeTrigger
 object EvolutionMoLangFunctions : AbstractMoLangFunctionHolder<Transformation>() {
     override fun Transformation.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val evolution = this
-        val map = hashMapOf<String, (MoParams) -> Any>()
+        val functions = hashMapOf<String, (MoParams) -> Any>()
 
-        map["is_optional"] = { DoubleValue(evolution.optional) }
-        map["reevaluate"] = { DoubleValue(evolution.reevaluate) }
+        functions["reevaluate"] = { DoubleValue(evolution.reevaluate) }
+        functions["is_optional"] = { DoubleValue(evolution.optional) }
 
         if (evolution is Evolution) {
-            map["result"] = { evolution.result.asMoLangValue() }
+            functions["result"] = { evolution.result.asMoLangValue() }
             when (evolution.trigger) {
                 is LevelUpTrigger -> {
-                    map["is_level_up"] = { DoubleValue.ONE }
+                    functions["is_level_up"] = { DoubleValue.ONE }
                 }
 
                 is TradeTrigger -> {
-                    map["is_trade"] = { DoubleValue.ONE }
+                    functions["is_trade"] = { DoubleValue.ONE }
                 }
 
                 is ItemInteractionTrigger -> {
-                    map["is_item"] = { DoubleValue.ONE }
+                    functions["is_item"] = { DoubleValue.ONE }
                 }
             }
         }
 
-        return map
+        return functions
     }
 }

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

@@ -42,101 +42,99 @@ import net.minecraft.world.item.ItemStack
 import java.text.ParseException
 
 object GeneralMoLangFunctions {
-    val holder: HashMap<String, (MoParams) -> Any> = hashMapOf(
-        "print" to { params ->
+    val functions: MutableMap<String, (MoParams) -> Any> = mutableMapOf()
+
+    init {
+        functions["print"] = { params ->
             val message = params.get<MoValue>(0).asString()
             LOGGER.info(message)
-        },
-        "delete_variable" to deleteVar@{ params ->
+        }
+        functions["delete_variable"] = { params ->
             val struct = params.get<VariableStruct>(0)
             val variable = params.getString(1)
             struct.map.remove(variable)
-            return@deleteVar DoubleValue.ONE
-        },
-        "delete_variables" to { params ->
-            val struct = params.get<VariableStruct>(0)
-            struct.map.clear()
             DoubleValue.ONE
-        },
-        "get_variable" to { params ->
+        }
+        functions["get_variable"] = { params ->
             val struct = params.get<VariableStruct>(0)
             val variable = params.getString(1)
             struct.map[variable] ?: DoubleValue.ZERO
-        },
-        "set_variable" to { params ->
+        }
+        functions["set_variable"] = { params ->
             val struct = params.get<VariableStruct>(0)
             val variable = params.getString(1)
             val value = params.get<MoValue>(2)
             struct.map[variable] = value
             value
-        },
-        "set_query" to { params ->
+        }
+        functions["set_query"] = { params ->
             val variable = params.getString(0)
             val value = params.get<MoValue>(1)
             params.environment.query.addFunction(variable) { value }
             value
-        },
-        "replace" to { params ->
+        }
+        functions["replace"] = { params ->
             val text = params.getString(0)
             val search = params.getString(1)
             val replace = params.getString(2)
             StringValue(text.replace(search, replace))
-        },
-        "is_included" to { params ->
+        }
+        functions["is_included"] = { params ->
             val text = params.getString(0)
             val search = params.getString(1)
             DoubleValue(text.contains(search))
-        },
-        "to_lower" to { params ->
+        }
+        functions["to_lower"] = { params ->
             StringValue(params.getString(0).lowercase())
-        },
-        "to_upper" to { params ->
+        }
+        functions["to_upper"] = { params ->
             StringValue(params.getString(0).uppercase())
-        },
-        "string_length" to { params ->
+        }
+        functions["string_length"] = { params ->
             DoubleValue(params.getString(0).length)
-        },
-        "split_string" to { params ->
+        }
+        functions["split_string"] = { params ->
             val text = params.getString(0)
             val delimiter = params.getString(1)
             val parts = text.split(delimiter).map { StringValue(it) }
             val struct = ArrayStruct(hashMapOf())
             parts.forEachIndexed { index, moValue -> struct.setDirectly("$index", moValue) }
             struct
-        },
-        "is_blank" to { params ->
+        }
+        functions["is_blank"] = { params ->
             val arg = params.get<MoValue>(0)
-            DoubleValue((arg is StringValue && (arg.value.isBlank() || arg.value.toDoubleOrNull() == 0.0)) || (arg is DoubleValue && arg.value == 0.0))
-        },
-        "run_command" to { params ->
+            DoubleValue(
+                (arg is StringValue && (arg.value.isBlank() || arg.value.toDoubleOrNull() == 0.0)) ||
+                    (arg is DoubleValue && arg.value == 0.0),
+            )
+        }
+        functions["run_command"] = { params ->
             val command = params.getString(0)
             try {
                 server()!!.commands.performPrefixedCommand(server()!!.createCommandSourceStack(), command)
             } catch (_: NullPointerException) {
                 DoubleValue.ZERO
             }
-        },
-        "is_int" to { params -> DoubleValue(params.get<MoValue>(0).asString().isInt()) },
-        "is_number" to { params ->
+        }
+        functions["is_int"] = { params -> DoubleValue(params.get<MoValue>(0).asString().isInt()) }
+        functions["is_number"] = { params ->
             DoubleValue(
-                params.get<MoValue>(0).asString().toDoubleOrNull() != null
+                params.get<MoValue>(0).asString().toDoubleOrNull() != null,
             )
-        },
-        "to_number" to { params ->
+        }
+        functions["to_number"] = { params ->
             DoubleValue(
-                params.get<MoValue>(0).asString().toDoubleOrNull() ?: 0.0
+                params.get<MoValue>(0).asString().toDoubleOrNull() ?: 0.0,
             )
-        },
-        "to_int" to { params ->
+        }
+        functions["to_int"] = { params ->
             DoubleValue(
-                params.get<MoValue>(0).asString().toIntOrNull() ?: 0
+                params.get<MoValue>(0).asString().toIntOrNull() ?: 0,
             )
-        },
-        "to_string" to { params -> StringValue(params.get<MoValue>(0).asString()) },
-        "do_effect_walks" to { _ ->
-            DoubleValue(Cobblemon.config.walkingInBattleAnimations)
-        },
-        "random" to { params ->
+        }
+        functions["to_string"] = { params -> StringValue(params.get<MoValue>(0).asString()) }
+        functions["do_effect_walks"] = { DoubleValue(Cobblemon.config.walkingInBattleAnimations) }
+        functions["random"] = { params ->
             val options = mutableListOf<MoValue>()
             var index = 0
             while (params.contains(index)) {
@@ -144,35 +142,35 @@ object GeneralMoLangFunctions {
                 index++
             }
             options.random() // Can throw an exception if they specified no args. They'd be idiots though.
-        },
-        "curve" to { params ->
+        }
+        functions["curve"] = { params ->
             val curveName = params.getString(0)
             val curve =
                 WaveFunctions.functions[curveName] ?: throw IllegalArgumentException("Unknown curve: $curveName")
             ObjectValue(curve)
-        },
-        "array" to { params ->
+        }
+        functions["array"] = { params ->
             val values = params.params
             val array = ArrayStruct(hashMapOf())
             values.forEachIndexed { index, moValue -> array.setDirectly("$index", moValue) }
             array
-        },
-        "length" to { params ->
+        }
+        functions["length"] = { params ->
             val array = (params.getOrNull<MoValue>(0) as? VariableStruct)
             if (array == null) {
                 DoubleValue.ZERO
             } else {
                 DoubleValue(array.map.size.toDouble())
             }
-        },
-        "append" to { params ->
+        }
+        functions["append"] = { params ->
             val array = params.get<ArrayStruct>(0)
             val value = params.get<MoValue>(1)
             val nextIndex = array.map.size
             array.setDirectly("$nextIndex", value)
             array
-        },
-        "insert" to { params ->
+        }
+        functions["insert"] = { params ->
             val array = params.get<ArrayStruct>(0)
             val index = params.getInt(1)
             val value = params.get<MoValue>(2)
@@ -187,36 +185,40 @@ object GeneralMoLangFunctions {
             }
             array.map[index.toString()] = value
             array
-        },
-        "delete" to { params ->
+        }
+        functions["delete"] = { params ->
             val array = params.get<ArrayStruct>(0)
             val index = params.getInt(1)
             if (index in 0 until array.map.size) {
                 array.map.remove(index.toString())
                 // Re-index the array to keep keys sequential in numerical order
                 val newMap = hashMapOf<String, MoValue>()
-                array.map.keys.mapNotNull { it.toIntOrNull() }
+                array.map.keys
+                    .mapNotNull { it.toIntOrNull() }
                     .sorted()
                     .forEachIndexed { i, k -> newMap[i.toString()] = array.map[k.toString()]!! }
                 array.map.clear()
                 array.map.putAll(newMap)
             }
             array
-        },
-        "run_script" to { params ->
+        }
+        functions["run_script"] = { params ->
             val runtime = MoLangRuntime()
             runtime.environment.query = params.environment.query
             runtime.environment.variable = params.environment.variable
             val args = params.params.subList(1, params.params.size)
-            runtime.environment.context = ContextStruct(
-                (params.environment.context?.map
-                    ?: emptyMap()) + args.mapIndexed { index, value -> "arg_${index + 1}" to value }.toMap()
-            )
+            runtime.environment.context =
+                ContextStruct(
+                    (
+                        params.environment.context?.map
+                            ?: emptyMap()
+                    ) + args.mapIndexed { index, value -> "arg_${index + 1}" to value }.toMap(),
+                )
             val script = params.getString(0).asIdentifierDefaultingNamespace()
             // store the args in the
             CobblemonScripts.run(script, runtime) ?: DoubleValue.ZERO
-        },
-        "run_molang" to { params ->
+        }
+        functions["run_molang"] = { params ->
             val runtime = MoLangRuntime()
             runtime.environment.query = params.environment.query
             runtime.environment.variable = params.environment.variable
@@ -224,17 +226,16 @@ object GeneralMoLangFunctions {
             val expression = params.getString(0).asExpressionLike()
             val delayInSeconds = params.getDoubleOrNull(1)?.toFloat() ?: 0.0f
 
-            fun evaluate(): MoValue {
-                return try {
+            fun evaluate(): MoValue =
+                try {
                     runtime.resolve(expression)
                 } catch (ex: Exception) {
                     LOGGER.warn(
                         "Failed to evaluate MoLang expression${if (delayInSeconds > 0.0f) " (delayed)" else ""}: $expression",
-                        ex
+                        ex,
                     )
                     DoubleValue.ZERO
                 }
-            }
 
             if (delayInSeconds > 0.0f) {
                 val tracker =
@@ -246,55 +247,55 @@ object GeneralMoLangFunctions {
             } else {
                 evaluate()
             }
-        },
-        "system_time_millis" to { _ ->
-            DoubleValue(System.currentTimeMillis())
-        },
+        }
+        functions["system_time_millis"] = { 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 { _ ->
+        functions["date_local_time"] = {
             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 { params ->
+        }
+        functions["date_of"] = { 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 { params ->
+        }
+        functions["date_is_after"] = { params ->
             val dateA = params.getString(0)
             val dateB = params.getString(1)
             val format = java.text.SimpleDateFormat("dd/MM/yyyy")
-            val a = try {
-                 format.parse(dateA)
-            } catch (_: ParseException) {
-                throw RuntimeException("Cannot parse date ${dateA}, expected it to be in dd/MM/yyyy format, other provided")
-            }
-            val b = try {
-                format.parse(dateB)
-            } catch (_: ParseException) {
-                throw RuntimeException("Cannot parse date ${dateB}, expected it to be in dd/MM/yyyy format, other provided")
-            }
+            val a =
+                try {
+                    format.parse(dateA)
+                } catch (_: ParseException) {
+                    throw RuntimeException("Cannot parse date $dateA, expected it to be in dd/MM/yyyy format, other provided")
+                }
+            val b =
+                try {
+                    format.parse(dateB)
+                } catch (_: ParseException) {
+                    throw RuntimeException("Cannot parse date $dateB, expected it to be in dd/MM/yyyy format, other provided")
+                }
             DoubleValue(a.after(b))
-        },
-        "get_move_from_id" to { params ->
+        }
+        functions["get_move_from_id"] = { params ->
             val moveId = params.getString(0)
             val moveTemplate = Moves.getByName(moveId)
             moveTemplate?.struct ?: DoubleValue.ZERO
-        },
-        "create_simple_party_provider" to { _ ->
+        }
+        functions["create_simple_party_provider"] = {
             val partyProvider = SimplePartyProvider()
             partyProvider.struct
-        },
-        "create_pickup_item" to { params ->
+        }
+        functions["create_pickup_item"] = { params ->
             val item = params.getOrNull<MoValue>(0)?.asString()?.let(ObtainableItemCondition::parseFromString)
             val pickupPriority = params.getIntOrNull(1) ?: 0
             val pickupItem = ObtainableItem(item = item, pickupPriority = pickupPriority)
             pickupItem.struct
-        },
-        "create_itemstack" to { params ->
+        }
+        functions["create_itemstack"] = { params ->
             val itemId = params.getString(0).asIdentifierDefaultingNamespace()
             try {
                 val item = BuiltInRegistries.ITEM.get(itemId)
@@ -305,7 +306,7 @@ object GeneralMoLangFunctions {
                 LOGGER.error("Cannot create item stack from identifier: $itemId, item with that ID does not exist. Possible typo?")
                 DoubleValue.ZERO
             }
-        },
-        "file" to { MoLangLoadedFilesCache.struct }
-    )
+        }
+        functions["file"] = { MoLangLoadedFilesCache.struct }
+    }
 }

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

@@ -26,43 +26,44 @@ object ItemStackMoLangFunctions : AbstractMoLangFunctionHolder<Pair<ItemStack, R
         val registryAccess = this.second
         val itemRegistry = registryAccess.registryOrThrow(Registries.ITEM)
         val holder = itemRegistry.wrapAsHolder(stack.item)
+        val functions = mutableMapOf<String, (MoParams) -> Any>()
 
-        val map = hashMapOf<String, (MoParams) -> Any>()
-        map["item"] = { _ -> holder.asMoLangValue(Registries.ITEM) }
-        map["count"] = { _ -> DoubleValue(stack.count.toDouble()) }
-        map["damage_value"] = { _ -> DoubleValue(stack.damageValue) }
-        map["max_damage"] = { _ -> DoubleValue(stack.maxDamage) }
-        map["is_empty"] = { _ -> DoubleValue(stack.isEmpty) }
-        map["shrink"] = { params -> stack.shrink(params.getInt(0)) }
-        map["grow"] = { params -> stack.grow(params.getInt(0)) }
-        map["is_of"] = { params ->
+        functions["item"] = { holder.asMoLangValue(Registries.ITEM) }
+        functions["count"] = { DoubleValue(stack.count.toDouble()) }
+        functions["damage_value"] = { DoubleValue(stack.damageValue) }
+        functions["max_damage"] = { DoubleValue(stack.maxDamage) }
+        functions["is_empty"] = { DoubleValue(stack.isEmpty) }
+        functions["shrink"] = { params -> stack.shrink(params.getInt(0)) }
+        functions["grow"] = { params -> stack.grow(params.getInt(0)) }
+        functions["is_of"] = { params ->
             DoubleValue(
                 holder.`is`(
-                    params.getString(0).asIdentifierDefaultingNamespace()
-                )
+                    params.getString(0).asIdentifierDefaultingNamespace(),
+                ),
             )
         }
-        map["is_in"] = { params ->
+        functions["is_in"] = { params ->
             DoubleValue(
                 holder.`is`(
                     TagKey.create(
                         Registries.ITEM,
-                        params.getString(0).replace("#", "").asIdentifierDefaultingNamespace()
-                    )
-                )
+                        params.getString(0).replace("#", "").asIdentifierDefaultingNamespace(),
+                    ),
+                ),
             )
         }
-        map["is_food"] = { _ -> DoubleValue(stack.has(DataComponents.FOOD)) }
-        map["is_enchanted"] = { _ -> DoubleValue(stack.hasFoil()) }
-        map["has_enchantment"] = put@{ params ->
+        functions["is_food"] = { DoubleValue(stack.has(DataComponents.FOOD)) }
+        functions["is_enchanted"] = { DoubleValue(stack.hasFoil()) }
+        functions["has_enchantment"] = hasEnchantment@{ params ->
             val enchantmentId = params.getString(0).asIdentifierDefaultingNamespace()
             val minLevel = params.getIntOrNull(1) ?: 1
             val enchantmentRegistry = registryAccess.registryOrThrow(Registries.ENCHANTMENT)
             val holder =
-                enchantmentRegistry.getHolder(enchantmentId).orElse(null) ?: return@put DoubleValue.ZERO
+                enchantmentRegistry.getHolder(enchantmentId).orElse(null) ?: return@hasEnchantment DoubleValue.ZERO
             val level = EnchantmentHelper.getItemEnchantmentLevel(holder, stack)
-            return@put DoubleValue(level >= minLevel)
+            DoubleValue(level >= minLevel)
         }
-        return map
+
+        return functions
     }
 }

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

@@ -53,26 +53,27 @@ import java.util.*
 object LivingEntityMoLangFunctions : AbstractMoLangFunctionHolder<LivingEntity>() {
     override fun LivingEntity.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val entity = this
-        val map = mutableMapOf<String, (MoParams) -> Any>()
-        map["is_player"] = { _ -> DoubleValue(entity is Player) }
-        map["is_npc"] = { _ -> DoubleValue(entity is NPCEntity) }
-        map["is_mob"] = { _ -> DoubleValue(entity is Mob) }
-        map["is_pokemon"] = { _ -> DoubleValue(entity is PokemonEntity) }
-        map["is_animal"] = { _ -> DoubleValue(entity is Animal) }
-        map["is_tamable"] = { _ -> DoubleValue(entity is TamableAnimal) }
-        map["is_tamed"] = { _ -> DoubleValue(entity is TamableAnimal && entity.isTame) }
-        map["is_hostile"] = { _ -> DoubleValue(entity is Monster) }
-        map["is_baby"] = { _ -> DoubleValue(entity.isBaby) }
-        map["is_adult"] = { _ -> DoubleValue(!entity.isBaby) }
-        map["remove_effect"] = put@{ params ->
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["is_player"] = { DoubleValue(entity is Player) }
+        functions["is_npc"] = { DoubleValue(entity is NPCEntity) }
+        functions["is_mob"] = { DoubleValue(entity is Mob) }
+        functions["is_pokemon"] = { DoubleValue(entity is PokemonEntity) }
+        functions["is_animal"] = { DoubleValue(entity is Animal) }
+        functions["is_tamable"] = { DoubleValue(entity is TamableAnimal) }
+        functions["is_tamed"] = { DoubleValue(entity is TamableAnimal && entity.isTame) }
+        functions["is_hostile"] = { DoubleValue(entity is Monster) }
+        functions["is_baby"] = { DoubleValue(entity.isBaby) }
+        functions["is_adult"] = { DoubleValue(!entity.isBaby) }
+        functions["remove_effect"] = removeEffect@{ params ->
             val effectId = params.getString(0).asIdentifierDefaultingNamespace()
             val effectHolder = BuiltInRegistries.MOB_EFFECT.getHolder(effectId).orElse(null)
             if (effectHolder != null) {
                 entity.removeEffect(effectHolder)
-                return@put DoubleValue.ONE
+                return@removeEffect DoubleValue.ONE
             }
         }
-        map["add_effect"] = put@{ params ->
+        functions["add_effect"] = addEffect@{ params ->
             val effectId = params.getString(0).asIdentifierDefaultingNamespace()
             val duration = params.getInt(1)
             val amplifier = params.getIntOrNull(2) ?: 0
@@ -81,36 +82,37 @@ object LivingEntityMoLangFunctions : AbstractMoLangFunctionHolder<LivingEntity>(
             val effectHolder = BuiltInRegistries.MOB_EFFECT.getHolder(effectId).orElse(null)
             if (effectHolder != null) {
                 entity.addEffect(MobEffectInstance(effectHolder, duration, amplifier, ambient, visible))
-                return@put DoubleValue.ONE
+                return@addEffect DoubleValue.ONE
             }
         }
-        map["has_effect"] = put@{ params ->
+        functions["has_effect"] = { params ->
             val effectId = params.getString(0).asIdentifierDefaultingNamespace()
             val effectHolder = BuiltInRegistries.MOB_EFFECT.getHolder(effectId).orElse(null)
-            return@put DoubleValue(if (effectHolder != null) entity.hasEffect(effectHolder) else false)
+            DoubleValue(effectHolder != null && entity.hasEffect(effectHolder))
         }
-        map["heal"] = { params ->
+        functions["heal"] = { params ->
             val amount = params.getDouble(0)
             entity.heal(amount.toFloat())
         }
-        map["is_looking_at"] = put@{ params ->
+        functions["is_looking_at"] = isLookingAt@{ params ->
             val targetEntity = params.get<MoValue>(0)
             val maxDistance = params.getDoubleOrNull(1)?.toFloat() ?: 2.0F
 
-            val entity = if (targetEntity is ObjectValue<*> && targetEntity.obj is Entity) {
-                targetEntity.obj as Entity
-            } else {
-                return@put DoubleValue.ZERO
-            }
+            val entity =
+                if (targetEntity is ObjectValue<*> && targetEntity.obj is Entity) {
+                    targetEntity.obj as Entity
+                } else {
+                    return@isLookingAt DoubleValue.ZERO
+                }
 
-            return@put DoubleValue(entity.isLookingAt(entity, maxDistance))
+            DoubleValue(entity.isLookingAt(entity, maxDistance))
         }
-        map["is_living_entity"] = { DoubleValue.ONE }
-        map["is_flying"] = { _ -> DoubleValue(entity.isFallFlying) }
-        map["is_sleeping"] = { _ -> DoubleValue(entity.isSleeping) }
-        map["health"] = { _ -> DoubleValue(entity.health) }
-        map["max_health"] = { _ -> DoubleValue(entity.maxHealth) }
-        map["look_at_position"] = { params ->
+        functions["is_living_entity"] = { DoubleValue.ONE }
+        functions["is_flying"] = { DoubleValue(entity.isFallFlying) }
+        functions["is_sleeping"] = { DoubleValue(entity.isSleeping) }
+        functions["health"] = { DoubleValue(entity.health) }
+        functions["max_health"] = { DoubleValue(entity.maxHealth) }
+        functions["look_at_position"] = { params ->
             val x = params.getDouble(0)
             val y = params.getDouble(1)
             val z = params.getDouble(2)
@@ -120,159 +122,174 @@ object LivingEntityMoLangFunctions : AbstractMoLangFunctionHolder<LivingEntity>(
             brain.setMemoryWithExpiry(
                 MemoryModuleType.LOOK_TARGET,
                 CobblemonBlockPosTracker(Vec3(x, y, z), flags.toSet()),
-                duration.toLong()
+                duration.toLong(),
             )
         }
-        map["get_wander_control_memory"] = put@{
-            val value = entity.brain.getMemorySafely(CobblemonMemories.WANDER_CONTROL).orElse(null)
-                ?: CobblemonWanderControl()
+        functions["get_wander_control_memory"] = {
+            val value =
+                entity.brain.getMemorySafely(CobblemonMemories.WANDER_CONTROL).orElse(null)
+                    ?: CobblemonWanderControl()
             if (
-                !entity.brain.checkMemory(CobblemonMemories.WANDER_CONTROL, MemoryStatus.VALUE_PRESENT)
-                && entity.brain.checkMemory(CobblemonMemories.WANDER_CONTROL, MemoryStatus.REGISTERED)
+                !entity.brain.checkMemory(CobblemonMemories.WANDER_CONTROL, MemoryStatus.VALUE_PRESENT) &&
+                entity.brain.checkMemory(CobblemonMemories.WANDER_CONTROL, MemoryStatus.REGISTERED)
             ) {
                 entity.brain.setMemory(CobblemonMemories.WANDER_CONTROL, value)
             }
-            return@put value.struct
+            value.struct
         }
-        map["get_position_memory"] = put@{ params ->
+        functions["get_position_memory"] = getPosMemory@{ params ->
             val id = params.getString(0).asIdentifierDefaultingNamespace()
             val memoryType = BuiltInRegistries.MEMORY_MODULE_TYPE.get(id)
             if (entity.brain.checkMemory(memoryType, MemoryStatus.VALUE_PRESENT)) {
-                return@put when (val memory = entity.brain.getMemory(memoryType).get()) {
-                    is Vec3i -> VariableStruct(
-                        mapOf(
-                            "x" to DoubleValue(memory.x),
-                            "y" to DoubleValue(memory.y),
-                            "z" to DoubleValue(memory.z)
+                return@getPosMemory when (val memory = entity.brain.getMemory(memoryType).get()) {
+                    is Vec3i -> {
+                        VariableStruct(
+                            mapOf(
+                                "x" to DoubleValue(memory.x),
+                                "y" to DoubleValue(memory.y),
+                                "z" to DoubleValue(memory.z),
+                            ),
                         )
-                    )
+                    }
 
-                    is Position -> VariableStruct(
-                        mapOf(
-                            "x" to DoubleValue(memory.x()),
-                            "y" to DoubleValue(memory.y()),
-                            "z" to DoubleValue(memory.z())
+                    is Position -> {
+                        VariableStruct(
+                            mapOf(
+                                "x" to DoubleValue(memory.x()),
+                                "y" to DoubleValue(memory.y()),
+                                "z" to DoubleValue(memory.z()),
+                            ),
                         )
-                    )
+                    }
 
-                    else -> DoubleValue.ZERO
+                    else -> {
+                        DoubleValue.ZERO
+                    }
                 }
-            } else {
-                return@put DoubleValue.ZERO
             }
+
+            DoubleValue.ZERO
         }
-        map["set_uuid_memory"] = put@{ params ->
-            val memory = params.getString(0).asIdentifierDefaultingNamespace()
-                .let(BuiltInRegistries.MEMORY_MODULE_TYPE::get) as MemoryModuleType<UUID>
-            val uuid = params.getString(1).asUUID ?: return@put DoubleValue.ZERO
+        functions["set_uuid_memory"] = setUuidMemory@{ params ->
+            val memory =
+                params
+                    .getString(0)
+                    .asIdentifierDefaultingNamespace()
+                    .let(BuiltInRegistries.MEMORY_MODULE_TYPE::get) as MemoryModuleType<UUID>
+            val uuid = params.getString(1).asUUID ?: return@setUuidMemory DoubleValue.ZERO
             val expiry = params.getIntOrNull(2) ?: -1
             if (expiry != -1) {
                 entity.brain.setMemoryWithExpiry(memory, uuid, expiry.toLong())
             } else {
                 entity.brain.setMemory(memory, uuid)
             }
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["erase_memory"] = put@{ params ->
-            val memories = params.params.map { it.asString().asIdentifierDefaultingNamespace() }
-                .map(BuiltInRegistries.MEMORY_MODULE_TYPE::get)
+        functions["erase_memory"] = { params ->
+            val memories =
+                params.params
+                    .map { it.asString().asIdentifierDefaultingNamespace() }
+                    .map(BuiltInRegistries.MEMORY_MODULE_TYPE::get)
             memories.forEach { entity.brain.eraseMemory(it) }
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["has_memory_value"] = put@{ params ->
+        functions["has_memory_value"] = hasMemoryValue@{ params ->
             for (param in params.params) {
                 if (!entity.hasMemoryFromString(param.asString())) {
-                    return@put DoubleValue.ZERO
+                    return@hasMemoryValue DoubleValue.ZERO
                 }
             }
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["lacks_memory_value"] = put@{ params ->
+        functions["lacks_memory_value"] = lacksMemoryValue@{ params ->
             for (param in params.params) {
                 if (entity.hasMemoryFromString(param.asString())) {
-                    return@put DoubleValue.ZERO
+                    return@lacksMemoryValue DoubleValue.ZERO
                 }
             }
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["is_doing_activity"] = put@{ params ->
+        functions["is_doing_activity"] = isDoingActivity@{ params ->
             for (param in params.params) {
                 if (entity.isDoingActivityFromString(param.asString())) {
-                    return@put DoubleValue.ONE
+                    return@isDoingActivity DoubleValue.ONE
                 }
             }
-            return@put DoubleValue.ZERO
+            DoubleValue.ZERO
         }
-        map["can_see"] = put@{ params ->
+        functions["can_see"] = canSee@{ params ->
             val target = params.get<MoValue>(0)
             val range = params.getDoubleOrNull(1) ?: 32.0
             if (target is ObjectValue<*>) {
-                val targetEntity = target.obj as? LivingEntity ?: return@put DoubleValue.ZERO
+                val targetEntity = target.obj as? LivingEntity ?: return@canSee DoubleValue.ZERO
                 val vector = targetEntity.eyePosition.subtract(entity.eyePosition).normalize()
-                val trace = entity.traceEntityCollision(
-                    maxDistance = range.toFloat(),
-                    stepDistance = 0.1F,
-                    direction = vector,
-                    entityClass = targetEntity.javaClass,
-                    collideBlock = ClipContext.Fluid.NONE
-                )
-                return@put DoubleValue(targetEntity in (trace?.entities ?: emptyList()))
-            } else {
-                return@put DoubleValue.ZERO
+                val trace =
+                    entity.traceEntityCollision(
+                        maxDistance = range.toFloat(),
+                        stepDistance = 0.1F,
+                        direction = vector,
+                        entityClass = targetEntity.javaClass,
+                        collideBlock = ClipContext.Fluid.NONE,
+                    )
+                return@canSee DoubleValue(targetEntity in (trace?.entities ?: emptyList()))
+            }
+            DoubleValue.ZERO
+        }
+
+        when (entity) {
+            is PathfinderMob -> {
+                functions["walk_to"] = { params ->
+                    val x = params.getDouble(0)
+                    val y = params.getDouble(1)
+                    val z = params.getDouble(2)
+                    val speedMultiplier = params.getDoubleOrNull(3) ?: 0.35
+
+                    if (entity.brain.checkMemory(MemoryModuleType.WALK_TARGET, MemoryStatus.REGISTERED)) {
+                        entity.brain.setMemory(
+                            MemoryModuleType.WALK_TARGET,
+                            WalkTarget(Vec3(x, y, z), speedMultiplier.toFloat(), 1),
+                        )
+                        entity.brain.setMemory(
+                            MemoryModuleType.LOOK_TARGET,
+                            BlockPosTracker(Vec3(x, y + entity.eyeHeight, z)),
+                        )
+                    } else {
+                        entity.navigation.moveTo(x, y, z, speedMultiplier)
+                        entity.lookControl.setLookAt(Vec3(x, y + entity.eyeHeight, z))
+                    }
+                }
+
+                functions["has_walk_target"] = {
+                    DoubleValue(entity.brain.getMemorySafely(MemoryModuleType.WALK_TARGET).isPresent || entity.isPathFinding)
+                }
+
+                functions["set_can_float"] = { params ->
+                    val canFloat = params.getBooleanOrNull(0) != false
+                    entity.navigation.setCanFloat(canFloat)
+                    DoubleValue.ONE
+                }
+
+                functions["get_pathfinding_malus"] = getPfMalus@{ params ->
+                    val type = PathType.entries.find { it.name == params.getString(0).uppercase() }
+                    if (type != null) {
+                        return@getPfMalus DoubleValue(entity.getPathfindingMalus(type))
+                    }
+                    Cobblemon.LOGGER.error("Cannot get pathfinding type, unknown value: ${params.getString(0)}")
+                    DoubleValue.ZERO
+                }
+                functions["set_pathfinding_malus"] = setPfMalus@{ params ->
+                    val type = PathType.entries.find { it.name == params.getString(0).uppercase() }
+                    val malus = params.getDouble(1).toFloat()
+                    if (type != null) {
+                        entity.setPathfindingMalus(type, malus)
+                        return@setPfMalus DoubleValue.ONE
+                    }
+                    Cobblemon.LOGGER.error("Cannot set pathfinding type, unknown value: ${params.getString(0)}")
+                    DoubleValue.ZERO
+                }
             }
         }
 
-        if (entity is PathfinderMob) {
-            map["walk_to"] = { params ->
-                val x = params.getDouble(0)
-                val y = params.getDouble(1)
-                val z = params.getDouble(2)
-                val speedMultiplier = params.getDoubleOrNull(3) ?: 0.35
-
-                if (entity.brain.checkMemory(MemoryModuleType.WALK_TARGET, MemoryStatus.REGISTERED)) {
-                    entity.brain.setMemory(
-                        MemoryModuleType.WALK_TARGET,
-                        WalkTarget(Vec3(x, y, z), speedMultiplier.toFloat(), 1)
-                    )
-                    entity.brain.setMemory(
-                        MemoryModuleType.LOOK_TARGET,
-                        BlockPosTracker(Vec3(x, y + entity.eyeHeight, z))
-                    )
-                } else {
-                    entity.navigation.moveTo(x, y, z, speedMultiplier)
-                    entity.lookControl.setLookAt(Vec3(x, y + entity.eyeHeight, z))
-                }
-            }
-
-            map["has_walk_target"] = { _ ->
-                DoubleValue(entity.brain.getMemorySafely(MemoryModuleType.WALK_TARGET).isPresent || entity.isPathFinding)
-            }
-
-            map["set_can_float"] = { params ->
-                val canFloat = params.getBooleanOrNull(0) != false
-                entity.navigation.setCanFloat(canFloat)
-                DoubleValue.ONE
-            }
-
-            map["get_pathfinding_malus"] = put@{ params ->
-                val type = PathType.entries.find { it.name == params.getString(0).uppercase() }
-                if (type != null) {
-                    return@put DoubleValue(entity.getPathfindingMalus(type))
-                }
-                Cobblemon.LOGGER.error("Unknown pathfinding type: ${params.getString(0)}")
-                return@put DoubleValue.ZERO
-            }
-            map["set_pathfinding_malus"] = put@{ params ->
-                val type = PathType.entries.find { it.name == params.getString(0).uppercase() }
-                val malus = params.getDouble(1).toFloat()
-                if (type != null) {
-                    entity.setPathfindingMalus(type, malus)
-                    return@put DoubleValue.ONE
-                }
-                Cobblemon.LOGGER.error("Unknown pathfinding type: ${params.getString(0)}")
-                return@put DoubleValue.ZERO
-            }
-        }
-        return map
+        return functions
     }
 }

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

@@ -50,18 +50,23 @@ import kotlin.collections.any
 object NPCMoLangFunctions : AbstractMoLangFunctionHolder<NPCEntity>() {
     override fun NPCEntity.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val npc = this
-        val map = hashMapOf<String, (MoParams) -> Any>()
-        map["class"] = { StringValue(npc.npc.id.toString()) }
-        map["name"] = { StringValue(npc.name.string) }
-        map["level"] = { DoubleValue(npc.level) }
-        map["has_aspect"] = { params -> DoubleValue(npc.aspects.contains(params.getString(0))) }
-        map["in_battle"] = { DoubleValue(npc.isInBattle()) }
-        map["battles"] = {
-            ArrayStruct(npc.battleIds.mapNotNull { BattleRegistry.getBattle(it)?.struct }
-                .mapIndexed { index, value -> "$index" to value }.toMap())
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["class"] = { StringValue(npc.npc.id.toString()) }
+        functions["name"] = { StringValue(npc.name.string) }
+        functions["level"] = { DoubleValue(npc.level) }
+        functions["has_aspect"] = { params -> DoubleValue(npc.aspects.contains(params.getString(0))) }
+        functions["in_battle"] = { DoubleValue(npc.isInBattle()) }
+        functions["battles"] = {
+            ArrayStruct(
+                npc.battleIds
+                    .mapNotNull { BattleRegistry.getBattle(it)?.struct }
+                    .mapIndexed { index, value -> "$index" to value }
+                    .toMap(),
+            )
         }
-        map["stop_battles"] = { _ -> npc.battleIds.forEach { BattleRegistry.getBattle(it)?.stop() } }
-        map["run_script_on_client"] = { params ->
+        functions["stop_battles"] = { npc.battleIds.forEach { BattleRegistry.getBattle(it)?.stop() } }
+        functions["run_script_on_client"] = { params ->
             val world = npc.level()
             if (world is ServerLevel) {
                 val script = params.getString(0)
@@ -70,141 +75,142 @@ object NPCMoLangFunctions : AbstractMoLangFunctionHolder<NPCEntity>() {
             }
             Unit
         }
-        map["run_script"] = { params ->
+        functions["run_script"] = { params ->
             val script = params.getString(0).asIdentifierDefaultingNamespace()
             val runtime = MoLangRuntime()
             runtime.environment.cloneFrom(params.environment)
             CobblemonScripts.run(script, runtime) ?: DoubleValue(0)
         }
-        map["set_movable"] = put@{ params ->
+        functions["set_movable"] = { params ->
             val movable = params.getBooleanOrNull(0) != false
             npc.isMovable = movable
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["set_invulnerable"] = put@{ params ->
+        functions["set_invulnerable"] = { params ->
             val invulnerable = params.getBooleanOrNull(0) != false
             npc.isInvulnerable = invulnerable
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["set_leashable"] = put@{ params ->
+        functions["set_leashable"] = { params ->
             val leashable = params.getBooleanOrNull(0) != false
             npc.isLeashable = leashable
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["set_allow_projectile_hits"] = put@{ params ->
+        functions["set_allow_projectile_hits"] = { params ->
             val allowProjectileHits = params.getBooleanOrNull(0) != false
             npc.allowProjectileHits = allowProjectileHits
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["set_name_tag_visible"] = put@{ params ->
+        functions["set_name_tag_visible"] = { params ->
             val nameTagVisible = params.getBooleanOrNull(0) != false
             npc.hideNameTag = !nameTagVisible
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["unset_interaction"] = put@{
+        functions["unset_interaction"] = {
             npc.interaction = null
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["set_dialogue_interaction"] = put@{ params ->
+        functions["set_dialogue_interaction"] = { params ->
             val dialogue = params.getString(0).asIdentifierDefaultingNamespace()
-            npc.interaction = DialogueNPCInteractionConfiguration().also {
-                it.dialogue = dialogue
-            }
-            return@put DoubleValue.ONE
+            npc.interaction =
+                DialogueNPCInteractionConfiguration().also {
+                    it.dialogue = dialogue
+                }
+            DoubleValue.ONE
         }
-        map["set_script_interaction"] = put@{ params ->
+        functions["set_script_interaction"] = { params ->
             val script = params.getString(0).asIdentifierDefaultingNamespace()
-            npc.interaction = ScriptNPCInteractionConfiguration().also {
-                it.script = script
-            }
-            return@put DoubleValue.ONE
+            npc.interaction =
+                ScriptNPCInteractionConfiguration().also {
+                    it.script = script
+                }
+            DoubleValue.ONE
         }
-        map["set_player_texture"] = put@{ params ->
+        functions["set_player_texture"] = setPlayerTexture@{ params ->
             val username = params.getString(0)
             // Re-applying it would be unnecessarily laggy.
             if (username == npc.data.map["player_texture_username"]?.asString()) {
-                return@put DoubleValue.ZERO
+                return@setPlayerTexture DoubleValue.ZERO
             }
             npc.loadTextureFromGameProfileName(username)
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["unset_player_texture"] = put@{
+        functions["unset_player_texture"] = {
             npc.unloadTexture()
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["set_resource_identifier"] = put@{ params ->
+        functions["set_resource_identifier"] = { params ->
             val identifier = params.getStringOrNull(0)?.asIdentifierDefaultingNamespace()
             npc.forcedResourceIdentifier = identifier
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["unset_resource_identifier"] = put@{
+        functions["unset_resource_identifier"] = {
             npc.forcedResourceIdentifier = null
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["set_class"] = put@{ params ->
+        functions["set_class"] = setClass@{ params ->
             val identifier = params.getString(0).asIdentifierDefaultingNamespace()
             val npcClass = NPCClasses.getByIdentifier(identifier)
             if (npcClass != null) {
                 npc.npc = npcClass
-                return@put DoubleValue.ONE
-            } else {
-                Cobblemon.LOGGER.error("Unknown NPC class: $identifier")
-                return@put DoubleValue.ZERO
+                return@setClass DoubleValue.ONE
             }
+            Cobblemon.LOGGER.error("Unknown NPC class: $identifier")
+            DoubleValue.ZERO
         }
-        map["set_render_scale"] = put@{ params ->
+        functions["set_render_scale"] = { params ->
             val scale = params.getDouble(0)
             npc.renderScale = scale.toFloat()
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["render_scale"] = { _ -> DoubleValue(npc.renderScale) }
-        map["set_hitbox_scale"] = put@{ params ->
+        functions["render_scale"] = { DoubleValue(npc.renderScale) }
+        functions["set_hitbox_scale"] = { params ->
             val scale = params.getDouble(0).toFloat()
             npc.hitboxScale = scale
             npc.refreshDimensions()
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["hitbox_scale"] = { _ -> DoubleValue(npc.hitboxScale) }
-        map["set_hitbox"] = put@{ params ->
+        functions["hitbox_scale"] = { DoubleValue(npc.hitboxScale) }
+        functions["set_hitbox"] = setHitbox@{ params ->
             if (params.params.isEmpty()) {
                 npc.hitbox = null
-                return@put DoubleValue.ONE
+                return@setHitbox DoubleValue.ONE
             }
             val width = params.getDouble(0).toFloat()
             val height = params.getDouble(1).toFloat()
             val eyeHeight = params.getDoubleOrNull(2)?.toFloat() ?: (height * 0.85F)
             npc.hitbox = EntityDimensions.scalable(width, height).withEyeHeight(eyeHeight)
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["unset_hitbox"] = put@{
+        functions["unset_hitbox"] = {
             npc.hitbox = null
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["aspects"] = put@{
+        functions["aspects"] = {
             val aspects = npc.aspects
-            return@put aspects.asArrayValue { StringValue(it) }
+            aspects.asArrayValue { StringValue(it) }
         }
-        map["add_aspect"] = put@{ params ->
+        functions["add_aspect"] = { params ->
             val aspects = params.params.map { it.asString() }
             npc.appliedAspects.addAll(aspects)
             npc.updateAspects()
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["remove_aspect"] = put@{ params ->
+        functions["remove_aspect"] = { params ->
             val aspects = params.params.map { it.asString() }
             npc.appliedAspects.removeAll(aspects.toSet())
             npc.updateAspects()
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["party"] = put@{
-            val party = npc.party ?: return@put DoubleValue.ZERO
-            return@put party.asMoLangValue()
+        functions["party"] = party@{
+            val party = npc.party ?: return@party DoubleValue.ZERO
+            party.asMoLangValue()
         }
-        map["create_npc_party"] = put@{
+        functions["create_npc_party"] = {
             val party = NPCPartyStore(npc)
-            return@put party.asMoLangValue()
+            party.asMoLangValue()
         }
-        map["set_npc_party"] = { params ->
+        functions["set_npc_party"] = { params ->
             val party = params.get<MoValue>(0)
             if (party is ObjectValue<*>) {
                 npc.party = party.obj as NPCPartyStore
@@ -213,18 +219,19 @@ object NPCMoLangFunctions : AbstractMoLangFunctionHolder<NPCEntity>() {
             }
             DoubleValue.ONE
         }
-        map["run_action_effect"] = put@{ params ->
+        functions["run_action_effect"] = runActionEffect@{ params ->
             val runtime = MoLangRuntime().setup()
             runtime.environment.cloneFrom(params.environment)
             runtime.withNPCValue(value = npc)
             val actionEffect = ActionEffects.actionEffects[params.getString(0).asIdentifierDefaultingNamespace()]
             if (actionEffect != null) {
-                val context = ActionEffectContext(
-                    actionEffect = actionEffect,
-                    providers = mutableListOf(NPCProvider(npc)),
-                    runtime = runtime,
-                    level = npc.level()
-                )
+                val context =
+                    ActionEffectContext(
+                        actionEffect = actionEffect,
+                        providers = mutableListOf(NPCProvider(npc)),
+                        runtime = runtime,
+                        level = npc.level(),
+                    )
                 npc.actionEffect = context
                 npc.brain.setMemory(CobblemonMemories.ACTIVE_ACTION_EFFECT, context)
                 npc.brain.setActiveActivityIfPossible(CobblemonActivities.ACTION_EFFECT)
@@ -236,37 +243,40 @@ object NPCMoLangFunctions : AbstractMoLangFunctionHolder<NPCEntity>() {
                     }
                 }
 
-                return@put DoubleValue.ONE
+                return@runActionEffect DoubleValue.ONE
             }
-            return@put DoubleValue.ZERO
+            DoubleValue.ZERO
         }
-        map["put_pokemon_in_healer"] = put@{ params ->
-            val healer = npc.level()
-                .getBlockEntity(params.get<ArrayStruct>(0).asBlockPos(), CobblemonBlockEntities.HEALING_MACHINE)
-                .orElse(null) ?: return@put DoubleValue.ZERO
-            val party = npc.party ?: return@put DoubleValue.ZERO
+        functions["put_pokemon_in_healer"] = putPokeInHealer@{ params ->
+            val healer =
+                npc
+                    .level()
+                    .getBlockEntity(params.get<ArrayStruct>(0).asBlockPos(), CobblemonBlockEntities.HEALING_MACHINE)
+                    .orElse(null) ?: return@putPokeInHealer DoubleValue.ZERO
+            val party = npc.party ?: return@putPokeInHealer DoubleValue.ZERO
             if (healer.canHeal(party)) {
                 healer.activate(npc.uuid, party)
-                return@put DoubleValue.ONE
-            } else {
-                return@put DoubleValue.ZERO
+                return@putPokeInHealer DoubleValue.ONE
             }
+            DoubleValue.ZERO
         }
-        map["look_at_position"] = { params ->
+        functions["look_at_position"] = { params ->
             val pos = Vec3(params.getDouble(0), params.getDouble(1), params.getDouble(2))
             npc.lookAt(EntityAnchorArgument.Anchor.EYES, pos)
         }
-        map["environment"] = { _ -> npc.runtime.environment }
-        map["party"] = { npc.party?.struct ?: DoubleValue.ZERO }
-        map["has_party"] = { DoubleValue(npc.party != null) }
-        map["is_npc"] = { DoubleValue.ONE }
-        map["can_battle"] =
-            { DoubleValue(npc.party?.any { it.currentHealth > 0 } == true || npc.npc.party?.isStatic == false) }
-        map["set_battle_theme"] = put@{ params ->
+        functions["environment"] = { npc.runtime.environment }
+        functions["party"] = { npc.party?.struct ?: DoubleValue.ZERO }
+        functions["has_party"] = { DoubleValue(npc.party != null) }
+        functions["is_npc"] = { DoubleValue.ONE }
+        functions["can_battle"] = {
+            DoubleValue(npc.party?.any { it.currentHealth > 0 } == true || npc.npc.party?.isStatic == false)
+        }
+        functions["set_battle_theme"] = { params ->
             val soundId = params.getString(0).asResource()
             npc.npc.battleTheme = soundId
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        return map
+
+        return functions
     }
 }

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

@@ -23,40 +23,40 @@ import com.cobblemon.mod.common.util.getBooleanOrNull
 object PCMoLangFunctions : AbstractMoLangFunctionHolder<PCStore>() {
     override fun PCStore.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val pc = this
-        val map = mutableMapOf<String, (MoParams) -> Any>()
+        val functions = hashMapOf<String, (MoParams) -> Any>()
 
-        map["get_pokemon"] = getPokemon@{ params ->
+        functions["get_pokemon"] = getPokemon@{ params ->
             val box = params.getInt(0)
             val slot = params.getInt(1)
             val pokemon = pc[PCPosition(box, slot)] ?: return@getPokemon DoubleValue.ZERO
-            return@getPokemon pokemon.struct
+            pokemon.struct
         }
-        map["set_pokemon"] = { params ->
+        functions["set_pokemon"] = { params ->
             val box = params.getInt(0)
             val slot = params.getInt(1)
             val pokemon = params.get<ObjectValue<Pokemon>>(2).obj
             pc[PCPosition(box, slot)] = pokemon
             DoubleValue.ONE
         }
-        map["resize"] = { params ->
+        functions["resize"] = { params ->
             val newSize = params.getInt(0)
             val lockNewSize = params.getBooleanOrNull(1) == true
             pc.resize(newSize, lockNewSize)
             DoubleValue.ONE
         }
-        map["get_box_count"] = { DoubleValue(pc.boxes.size.toDouble()) }
-        map["has_unlocked_wallpaper"] = { params ->
+        functions["get_box_count"] = { DoubleValue(pc.boxes.size.toDouble()) }
+        functions["has_unlocked_wallpaper"] = { params ->
             val wallpaper = params.getString(0).asIdentifierDefaultingNamespace()
             DoubleValue(pc.unlockedWallpapers.contains(wallpaper))
         }
-        map["get_unlocked_wallpapers"] = { pc.unlockedWallpapers.asArrayValue { StringValue(it.toString()) } }
-        map["unlock_wallpaper"] = unlockWallpaper@{
+        functions["get_unlocked_wallpapers"] = { pc.unlockedWallpapers.asArrayValue { StringValue(it.toString()) } }
+        functions["unlock_wallpaper"] = unlockWallpaper@{
             val wallpaper = it.getString(0).asIdentifierDefaultingNamespace()
             val playSound = it.getBooleanOrNull(1) != false
             CobblemonUnlockableWallpapers.unlockableWallpapers[wallpaper] ?: return@unlockWallpaper DoubleValue.ZERO
-            return@unlockWallpaper DoubleValue(pc.unlockWallpaper(wallpaper, playSound))
+            DoubleValue(pc.unlockWallpaper(wallpaper, playSound))
         }
 
-        return map
+        return functions
     }
 }

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

@@ -14,21 +14,23 @@ import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.storage.party.PartyStore
 import com.cobblemon.mod.common.pokemon.Pokemon
 
-object PartyMoLangFunctions: AbstractMoLangFunctionHolder<PartyStore>() {
+object PartyMoLangFunctions : AbstractMoLangFunctionHolder<PartyStore>() {
     override fun PartyStore.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val party = this
-        val map = hashMapOf<String, (MoParams) -> Any>()
-        map["get_pokemon"] = getPokemon@{ params ->
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["get_pokemon"] = getPokemon@{ params ->
             val index = params.getInt(0)
             val pokemon = party.get(index) ?: return@getPokemon DoubleValue.ZERO
             pokemon.struct
         }
-        map["set_pokemon"] = { params ->
+        functions["set_pokemon"] = { params ->
             val index = params.getInt(0)
             val pokemon = params.get<ObjectValue<Pokemon>>(1).obj
             party.set(index, pokemon)
             DoubleValue.ONE
         }
-        return map
+
+        return functions
     }
 }

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

@@ -20,7 +20,9 @@ import com.cobblemon.mod.common.CobblemonBlockEntities
 import com.cobblemon.mod.common.api.dialogue.PlayerDialogueFaceProvider
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.api.moves.Moves
 import com.cobblemon.mod.common.api.text.text
+import com.cobblemon.mod.common.api.tms.TechnicalMachines
 import com.cobblemon.mod.common.battles.BattleBuilder
 import com.cobblemon.mod.common.battles.BattleFormat
 import com.cobblemon.mod.common.entity.npc.NPCEntity
@@ -44,343 +46,395 @@ import com.cobblemon.mod.common.util.party
 import com.cobblemon.mod.common.util.pc
 import com.cobblemon.mod.common.util.pokedex
 import com.cobblemon.mod.common.util.server
+import com.cobblemon.mod.common.util.tmList
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.sounds.SoundSource
+import net.minecraft.stats.Stats
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.GameType
-import kotlin.collections.iterator
 
 object PlayerMoLangFunctions : AbstractMoLangFunctionHolder<Player>() {
     override fun Player.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val player = this
-        val map = mutableMapOf<String, (MoParams) -> Any>()
-        map["username"] = { _ -> StringValue(player.gameProfile.name) }
-        map["uuid"] = { _ -> StringValue(player.gameProfile.id.toString()) }
-        map["main_held_item"] = { _ -> player.mainHandItem.asMoLangValue(player.registryAccess()) }
-        map["off_held_item"] = { _ -> player.offhandItem.asMoLangValue(player.registryAccess()) }
-        map["inventory"] = put@{ _ ->
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["username"] = { StringValue(player.gameProfile.name) }
+        functions["uuid"] = { StringValue(player.gameProfile.id.toString()) }
+        functions["main_held_item"] = { player.mainHandItem.asMoLangValue(player.registryAccess()) }
+        functions["off_held_item"] = { player.offhandItem.asMoLangValue(player.registryAccess()) }
+        functions["inventory"] = {
             val inventory = player.inventory
             val items = ArrayStruct(hashMapOf())
             for (i in 0 until inventory.containerSize) {
                 items.setDirectly("$i", inventory.getItem(i).asMoLangValue(player.registryAccess()))
             }
-            return@put items
+            items
         }
-        map["has_inventory_space"] = put@{ _ ->
+        functions["has_inventory_space"] = {
             val inventory = player.inventory
-            return@put if (inventory.getFreeSlot() != -1) DoubleValue.ONE else DoubleValue.ZERO
+            if (inventory.freeSlot != -1) DoubleValue.ONE else DoubleValue.ZERO
         }
-        map["set_inventory_slot"] = put@{ params ->
+        functions["set_inventory_slot"] = setInvSlot@{ params ->
             val slot = params.getInt(0)
             val inventory = player.inventory
-            if (slot !in 0 until inventory.containerSize) return@put DoubleValue.ZERO
+            if (slot !in 0 until inventory.containerSize) return@setInvSlot DoubleValue.ZERO
 
-            val value = params.getOrNull<MoValue>(1) ?: return@put DoubleValue.ZERO
+            val value = params.getOrNull<MoValue>(1) ?: return@setInvSlot DoubleValue.ZERO
 
-            val stack: ItemStack? = when (value) {
-                is ObjectValue<*> -> value.obj as? ItemStack
-                is StringValue -> {
-                    val id = ResourceLocation.parse(value.value)
-                    val item = player.registryAccess().registryOrThrow(Registries.ITEM).get(id)
-                        ?: return@put DoubleValue.ZERO
-                    ItemStack(item)
+            val stack: ItemStack? =
+                when (value) {
+                    is ObjectValue<*> -> {
+                        value.obj as? ItemStack
+                    }
+
+                    is StringValue -> {
+                        val id = ResourceLocation.parse(value.value)
+                        val item =
+                            player.registryAccess().registryOrThrow(Registries.ITEM).get(id)
+                                ?: return@setInvSlot DoubleValue.ZERO
+                        ItemStack(item)
+                    }
+
+                    else -> {
+                        null
+                    }
                 }
 
-                else -> null
-            }
-
-            if (stack == null) return@put DoubleValue.ZERO
+            if (stack == null) return@setInvSlot DoubleValue.ZERO
 
             inventory.setItem(slot, stack)
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["give_item"] = put@{ params ->
+        functions["give_item"] = giveItem@{ params ->
             val inventory = player.inventory
-            val freeSlot = inventory.getFreeSlot()
-            val value = params.getOrNull<MoValue>(0) ?: return@put DoubleValue.ZERO
+            val freeSlot = inventory.freeSlot
+            val value = params.getOrNull<MoValue>(0) ?: return@giveItem DoubleValue.ZERO
             val dropIfFull = params.getBooleanOrNull(1) ?: false
 
-            val stack: ItemStack? = when (value) {
-                is ObjectValue<*> -> value.obj as? ItemStack
-                is StringValue -> {
-                    val id = ResourceLocation.parse(value.value)
-                    val item = player.registryAccess().registryOrThrow(Registries.ITEM).get(id)
-                        ?: return@put DoubleValue.ZERO
-                    ItemStack(item)
+            val stack: ItemStack? =
+                when (value) {
+                    is ObjectValue<*> -> {
+                        value.obj as? ItemStack
+                    }
+
+                    is StringValue -> {
+                        val id = ResourceLocation.parse(value.value)
+                        val item =
+                            player.registryAccess().registryOrThrow(Registries.ITEM).get(id)
+                                ?: return@giveItem DoubleValue.ZERO
+                        ItemStack(item)
+                    }
+
+                    else -> {
+                        null
+                    }
                 }
 
-                else -> null
-            }
-
-            if (stack == null) return@put DoubleValue.ZERO
+            if (stack == null) return@giveItem DoubleValue.ZERO
 
             if (freeSlot == -1) {
                 if (dropIfFull) {
                     player.drop(stack, false)
-                    return@put DoubleValue.ONE
+                    return@giveItem DoubleValue.ONE
                 } else {
-                    return@put DoubleValue.ZERO
+                    return@giveItem DoubleValue.ZERO
                 }
             }
 
             inventory.setItem(freeSlot, stack)
-            return@put DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["face"] = { params ->
+        functions["face"] = { params ->
             ObjectValue(
                 PlayerDialogueFaceProvider(
                     player.uuid,
-                    params.getBooleanOrNull(0) != false
-                )
+                    params.getBooleanOrNull(0) != false,
+                ),
             )
         }
-        map["swing_hand"] = { _ -> player.swing(player.usedItemHand) }
-        map["food_level"] = { _ -> DoubleValue(player.foodData.foodLevel) }
-        map["saturation_level"] = { _ -> DoubleValue(player.foodData.saturationLevel) }
-        map["tell"] = { params ->
+        functions["swing_hand"] = { player.swing(player.usedItemHand) }
+        functions["food_level"] = { DoubleValue(player.foodData.foodLevel) }
+        functions["saturation_level"] = { DoubleValue(player.foodData.saturationLevel) }
+        functions["tell"] = { params ->
             val message = params.getString(0).text()
             val overlay = params.getBooleanOrNull(1) == true
             player.displayClientMessage(message, overlay)
         }
-        map["teleport"] = { params ->
+        functions["teleport"] = { params ->
             val x = params.getDouble(0)
             val y = params.getDouble(1)
             val z = params.getDouble(2)
-            val playParticleOptionss = params.getBooleanOrNull(3) ?: false
-            player.randomTeleport(x, y, z, playParticleOptionss)
+            val playParticleOptions = params.getBooleanOrNull(3) ?: false
+            player.randomTeleport(x, y, z, playParticleOptions)
         }
-        map["heal"] = { params ->
+        functions["heal"] = { params ->
             val amount = params.getDoubleOrNull(0) ?: player.maxHealth
             player.heal(amount.toFloat())
         }
-        map["environment"] = {
+        functions["environment"] = {
             val environment = MoLangEnvironment()
             environment.query = player.asMoLangValue()
             environment
         }
-        map["is_player"] = { DoubleValue.ONE }
-        map["riding_pokemon"] = put@{
+        functions["is_player"] = { DoubleValue.ONE }
+        functions["riding_pokemon"] = ridingPokemon@{
             val vehicle = player.vehicle
             if (vehicle is PokemonEntity) {
-                return@put vehicle.struct
-            } else {
-                return@put DoubleValue.ZERO
+                return@ridingPokemon vehicle.struct
             }
+            DoubleValue.ZERO
         }
-        if (player is ServerPlayer) {
-            map["seen_credits"] = { _ ->
-                DoubleValue(player.seenCredits)
-            }
-            map["is_in_dialogue"] = { _ ->
-                DoubleValue(player.isInDialogue)
-            }
-            map["active_dialogue"] = put@{ _ ->
-                if (player.isInDialogue) {
-                    return@put player.activeDialogue?.toMoLangStruct() ?: DoubleValue.ZERO
-                } else {
+
+        when (player) {
+            is ServerPlayer -> {
+                functions["seen_credits"] = { DoubleValue(player.seenCredits) }
+                functions["is_in_dialogue"] = { DoubleValue(player.isInDialogue) }
+                functions["active_dialogue"] = activeDialogue@{
+                    if (player.isInDialogue) {
+                        return@activeDialogue player.activeDialogue?.toMoLangStruct() ?: DoubleValue.ZERO
+                    }
                     DoubleValue.ZERO
                 }
-            }
-            map["is_spectator"] = { DoubleValue(player.isSpectator) }
-            map["is_creative"] = { DoubleValue(player.isCreative) }
-            map["is_survival"] = { DoubleValue(player.gameMode.isSurvival) }
-            map["is_adventure"] = { DoubleValue(player.gameMode.gameModeForPlayer == GameType.ADVENTURE) }
-            map["run_command"] = { params ->
-                val command = params.getString(0)
-                player.server.commands.performPrefixedCommand(player.createCommandSourceStack(), command)
-            }
-            map["set_battle_theme"] = put@{ params ->
-                val soundId = params.getString(0).asResource()
-                Cobblemon.playerDataManager.getGenericData(player).battleTheme = soundId
-                return@put DoubleValue.ONE
-            }
-            map["battle_music"] = put@{ params ->
-                val soundId = params.getString(0).asResource()
-                val volume = params.getDoubleOrNull(1)?.toFloat() ?: 1.0f
-                val pitch = params.getDoubleOrNull(2)?.toFloat() ?: 1.0f
-                val restart = params.getBooleanOrNull(3) ?: true
+                functions["is_spectator"] = { DoubleValue(player.isSpectator) }
+                functions["is_creative"] = { DoubleValue(player.isCreative) }
+                functions["is_survival"] = { DoubleValue(player.gameMode.isSurvival) }
+                functions["is_adventure"] = { DoubleValue(player.gameMode.gameModeForPlayer == GameType.ADVENTURE) }
+                functions["run_command"] = { params ->
+                    val command = params.getString(0)
+                    player.server.commands.performPrefixedCommand(player.createCommandSourceStack(), command)
+                }
+                functions["set_battle_theme"] = { params ->
+                    val soundId = params.getString(0).asResource()
+                    Cobblemon.playerDataManager.getGenericData(player).battleTheme = soundId
+                    DoubleValue.ONE
+                }
+                functions["battle_music"] = battleMusic@{ params ->
+                    val soundId = params.getString(0).asResource()
+                    val volume = params.getDoubleOrNull(1)?.toFloat() ?: 1.0f
+                    val pitch = params.getDoubleOrNull(2)?.toFloat() ?: 1.0f
+                    val restart = params.getBooleanOrNull(3) ?: true
 
-                if (soundId != null) {
-                    val packet = BattleMusicPacket(soundId, volume, pitch, restart)
+                    if (soundId != null) {
+                        val packet = BattleMusicPacket(soundId, volume, pitch, restart)
+                        packet.sendToPlayer(player)
+                        return@battleMusic DoubleValue.ONE
+                    }
+                    DoubleValue.ZERO
+                }
+                functions["stop_battle_music"] = {
+                    val packet = BattleMusicPacket(null)
                     packet.sendToPlayer(player)
-                    return@put DoubleValue.ONE
-                } else {
-                    return@put DoubleValue.ZERO
+                    DoubleValue.ONE
                 }
-            }
-            map["stop_battle_music"] = put@{ _ ->
-                val packet = BattleMusicPacket(null)
-                packet.sendToPlayer(player)
-                return@put DoubleValue.ONE
-            }
-            map["play_sound_on_server"] = { params ->
-                val sound = params.getString(0).asResource()
-                val soundSource = SoundSource.valueOf(params.getString(1).uppercase())
-                val volume = params.getDoubleOrNull(2)?.toFloat() ?: 1.0f
-                val pitch = params.getDoubleOrNull(3)?.toFloat() ?: 1.0f
+                functions["play_sound_on_server"] = { params ->
+                    val sound = params.getString(0).asResource()
+                    val soundSource = SoundSource.valueOf(params.getString(1).uppercase())
+                    val volume = params.getDoubleOrNull(2)?.toFloat() ?: 1.0f
+                    val pitch = params.getDoubleOrNull(3)?.toFloat() ?: 1.0f
 
-                val packet =
-                    UnvalidatedPlaySoundS2CPacket(sound, soundSource, player.x, player.y, player.z, volume, pitch)
-                packet.sendToPlayer(player)
-            }
-            map["is_party_at_full_health"] = { _ ->
-                DoubleValue(player.party().none(Pokemon::canBeHealed))
-            }
-            map["can_heal_at_healer"] = put@{ params ->
-                val pos = params.get<ArrayStruct>(0).asBlockPos()
-                val healer = player.level().getBlockEntity(pos, CobblemonBlockEntities.HEALING_MACHINE).orElse(null)
-                    ?: return@put DoubleValue.ZERO
-                val party = player.party()
-                return@put DoubleValue(healer.canHeal(party))
-            }
-            map["put_pokemon_in_healer"] = put@{ params ->
-                val healer = player.level()
-                    .getBlockEntity(params.get<ArrayStruct>(0).asBlockPos(), CobblemonBlockEntities.HEALING_MACHINE)
-                    .orElse(null) ?: return@put DoubleValue.ZERO
-                val party = player.party()
-                if (healer.canHeal(party)) {
-                    healer.activate(player.uuid, party)
-                    return@put DoubleValue.ONE
-                } else {
-                    return@put DoubleValue.ZERO
+                    val packet =
+                        UnvalidatedPlaySoundS2CPacket(
+                            sound,
+                            soundSource,
+                            player.x,
+                            player.y,
+                            player.z,
+                            volume,
+                            pitch,
+                        )
+
+                    packet.sendToPlayer(player)
                 }
-            }
-            map["party"] = { player.party().struct }
-            map["pc"] = { player.pc().struct }
-            map["has_permission"] = { params ->
-                DoubleValue(
-                    Cobblemon.permissionValidator.hasPermission(
-                        player,
-                        params.getString(0),
-                        params.getIntOrNull(1) ?: 4
+                functions["is_party_at_full_health"] = { DoubleValue(player.party().none(Pokemon::canBeHealed)) }
+                functions["can_heal_at_healer"] = canHealAtHealer@{ params ->
+                    val pos = params.get<ArrayStruct>(0).asBlockPos()
+                    val healer =
+                        player.level().getBlockEntity(pos, CobblemonBlockEntities.HEALING_MACHINE).orElse(null)
+                            ?: return@canHealAtHealer DoubleValue.ZERO
+                    val party = player.party()
+                    DoubleValue(healer.canHeal(party))
+                }
+                functions["put_pokemon_in_healer"] = putPokemonAtHealer@{ params ->
+                    val healer =
+                        player
+                            .level()
+                            .getBlockEntity(
+                                params.get<ArrayStruct>(0).asBlockPos(),
+                                CobblemonBlockEntities.HEALING_MACHINE,
+                            ).orElse(null) ?: return@putPokemonAtHealer DoubleValue.ZERO
+                    val party = player.party()
+                    if (healer.canHeal(party)) {
+                        healer.activate(player.uuid, party)
+                        return@putPokemonAtHealer DoubleValue.ONE
+                    }
+                    DoubleValue.ZERO
+                }
+                functions["party"] = { player.party().struct }
+                functions["pc"] = { player.pc().struct }
+                functions["has_permission"] = { params ->
+                    DoubleValue(
+                        Cobblemon.permissionValidator.hasPermission(
+                            player,
+                            params.getString(0),
+                            params.getIntOrNull(1) ?: 4,
+                        ),
                     )
-                )
-            }
-            map["data"] = { params -> Cobblemon.molangData.load(player.uuid, params.getStringOrNull(0)) }
-            map["save_data"] = { params -> Cobblemon.molangData.save(player.uuid, params.getStringOrNull(0)) }
-            map["in_battle"] = { DoubleValue(player.isInBattle()) }
-            map["battle"] = { player.getBattleState()?.first?.struct ?: DoubleValue.ZERO }
-            map["get_npc_data"] = put@{ params ->
-                val npcId = ((params.get<MoValue>(0) as? ObjectValue<*>)?.obj as? NPCEntity)?.stringUUID
-                    ?: params.getString(0)
-                val data = Cobblemon.molangData.load(player.uuid, params.getStringOrNull(1))
-                if (data.map.containsKey(npcId)) {
-                    return@put data.map[npcId]!!
-                } else {
+                }
+                functions["data"] = { params -> Cobblemon.molangData.load(player.uuid, params.getStringOrNull(0)) }
+                functions["save_data"] = { params -> Cobblemon.molangData.save(player.uuid, params.getStringOrNull(0)) }
+                functions["in_battle"] = { DoubleValue(player.isInBattle()) }
+                functions["battle"] = { player.getBattleState()?.first?.struct ?: DoubleValue.ZERO }
+                functions["get_npc_data"] = getNpcData@{ params ->
+                    val npcId =
+                        ((params.get<MoValue>(0) as? ObjectValue<*>)?.obj as? NPCEntity)?.stringUUID
+                            ?: params.getString(0)
+                    val data = Cobblemon.molangData.load(player.uuid, params.getStringOrNull(1))
+                    if (data.map.containsKey(npcId)) {
+                        return@getNpcData data.map[npcId]!!
+                    }
+
                     val vars = VariableStruct()
                     data.map[npcId] = vars
-                    return@put vars
+                    vars
                 }
-            }
-            map["get_npc_variable"] = put@{ params ->
-                val npcId = ((params.get<MoValue>(0) as? ObjectValue<*>)?.obj as? NPCEntity)?.stringUUID
-                    ?: params.getString(0)
-                val variable = params.getString(1)
-                val data = Cobblemon.molangData.load(player.uuid, params.getStringOrNull(2))
-                if (data.map.containsKey(npcId)) {
-                    return@put (data.map[npcId] as VariableStruct).map[variable] ?: DoubleValue.ZERO
-                } else {
-                    return@put DoubleValue.ZERO
-                }
-            }
-            map["set_npc_variable"] = put@{ params ->
-                val npcId = ((params.get<MoValue>(0) as? ObjectValue<*>)?.obj as? NPCEntity)?.stringUUID
-                    ?: params.getString(0)
-                val variable = params.getString(1)
-                val value = params.get<MoValue>(2)
-                val saveAfterwards = params.getBooleanOrNull(3) != false
-                val path = params.getStringOrNull(4)
-                val data = Cobblemon.molangData.load(player.uuid, path)
-                val npcData = data.map.getOrPut(npcId) { VariableStruct() } as VariableStruct
-                npcData.map[variable] = value
-                if (saveAfterwards) {
-                    Cobblemon.molangData.save(player.uuid, path)
-                }
-                return@put DoubleValue.ONE
-            }
-            map["pokedex"] = { player.pokedex().struct }
-            map["has_advancement"] = put@{ params ->
-                val requiredAdvancement = ResourceLocation.parse(params.getString(0))
-                for (entry in player.advancements.progress) {
-                    if (entry.key.id == requiredAdvancement && entry.value.isDone) {
-                        return@put DoubleValue.ONE
+                functions["get_npc_variable"] = getNpcVariable@{ params ->
+                    val npcId =
+                        ((params.get<MoValue>(0) as? ObjectValue<*>)?.obj as? NPCEntity)?.stringUUID
+                            ?: params.getString(0)
+                    val variable = params.getString(1)
+                    val data = Cobblemon.molangData.load(player.uuid, params.getStringOrNull(2))
+                    if (data.map.containsKey(npcId)) {
+                        return@getNpcVariable (data.map[npcId] as VariableStruct).map[variable] ?: DoubleValue.ZERO
                     }
+                    DoubleValue.ZERO
                 }
-                return@put DoubleValue.ZERO
-            }
-            map["start_battle"] = put@{ params ->
-                val opponentValue = params.get<MoValue>(0)
-                val opponent = if (opponentValue is ObjectValue<*>) {
-                    opponentValue.obj as ServerPlayer
-                } else {
-                    val paramString = opponentValue.asString()
-                    val playerUUID = paramString.asUUID
-                    if (playerUUID != null) {
-                        server()?.playerList?.getPlayer(playerUUID) ?: return@put DoubleValue.ZERO
-                    } else {
-                        server()?.playerList?.getPlayerByName(paramString) ?: return@put DoubleValue.ZERO
+                functions["set_npc_variable"] = { params ->
+                    val npcId =
+                        ((params.get<MoValue>(0) as? ObjectValue<*>)?.obj as? NPCEntity)?.stringUUID
+                            ?: params.getString(0)
+                    val variable = params.getString(1)
+                    val value = params.get<MoValue>(2)
+                    val saveAfterwards = params.getBooleanOrNull(3) != false
+                    val path = params.getStringOrNull(4)
+                    val data = Cobblemon.molangData.load(player.uuid, path)
+                    val npcData = data.map.getOrPut(npcId) { VariableStruct() } as VariableStruct
+                    npcData.map[variable] = value
+                    if (saveAfterwards) {
+                        Cobblemon.molangData.save(player.uuid, path)
                     }
+                    DoubleValue.ONE
                 }
-                val format = params.getStringOrNull(1)
-                    ?.let(BattleFormat::fromFormatIdentifier)
-                    ?: BattleFormat.GEN_9_SINGLES
+                functions["pokedex"] = { player.pokedex().struct }
+                functions["has_advancement"] = hasAdvancement@{ params ->
+                    val requiredAdvancement = ResourceLocation.parse(params.getString(0))
+                    player.advancements.progress.forEach { (holder, progress) ->
+                        if (holder.id == requiredAdvancement && progress.isDone) {
+                            return@hasAdvancement DoubleValue.ONE
+                        }
+                    }
+                    DoubleValue.ZERO
+                }
+                functions["has_tm_move_unlocked"] = hasTmMoveUnlocked@{ params ->
+                    val move = Moves.getByName(params.getString(0)) ?: return@hasTmMoveUnlocked DoubleValue.ZERO
+                    val tm = TechnicalMachines.moveToTM[move] ?: return@hasTmMoveUnlocked DoubleValue.ZERO
+                    DoubleValue(if (player.tmList().learnedTMs.contains(tm.id)) 1.0 else 0.0)
+                }
+                functions["unlock_tm_move"] = unlockTmMove@{ params ->
+                    val move = Moves.getByName(params.getString(0)) ?: return@unlockTmMove DoubleValue.ZERO
+                    val tm = TechnicalMachines.moveToTM[move] ?: return@unlockTmMove DoubleValue.ZERO
+                    player.tmList().syncTMFromMove(move)
+                    DoubleValue(if (player.tmList().learnedTMs.contains(tm.id)) 1.0 else 0.0)
+                }
+                functions["lock_tm_move"] = lockTmMove@{ params ->
+                    val move = Moves.getByName(params.getString(0)) ?: return@lockTmMove DoubleValue.ZERO
+                    val tm = TechnicalMachines.moveToTM[move] ?: return@lockTmMove DoubleValue.ZERO
+                    player.tmList().syncTMLockFromMove(move)
+                    DoubleValue(if (player.tmList().learnedTMs.contains(tm.id)) 0.0 else 1.0)
+                }
+                functions["start_battle"] = startBattle@{ params ->
+                    val opponentValue = params.get<MoValue>(0)
+                    val opponent =
+                        if (opponentValue is ObjectValue<*>) {
+                            opponentValue.obj as ServerPlayer
+                        } else {
+                            val paramString = opponentValue.asString()
+                            val playerUUID = paramString.asUUID
+                            if (playerUUID != null) {
+                                server()?.playerList?.getPlayer(playerUUID) ?: return@startBattle DoubleValue.ZERO
+                            } else {
+                                server()?.playerList?.getPlayerByName(paramString)
+                                    ?: return@startBattle DoubleValue.ZERO
+                            }
+                        }
+                    val format =
+                        params
+                            .getStringOrNull(1)
+                            ?.let(BattleFormat::fromFormatIdentifier)
+                            ?: BattleFormat.GEN_9_SINGLES
 
-                val setLevel = params.getIntOrNull(2) ?: -1
-                format.adjustLevel = setLevel
+                    val setLevel = params.getIntOrNull(2) ?: -1
+                    format.adjustLevel = setLevel
 
-                val rules = params.getStringOrNull(5)
-                    ?.split(",")
-                    ?.toSet()
-                    ?: emptySet()
+                    val rules =
+                        params
+                            .getStringOrNull(5)
+                            ?.split(",")
+                            ?.toSet()
+                            ?: emptySet()
 
-                val modifiedBattleFormat = BattleFormat.setBattleRules(
-                    battleFormat = format,
-                    rules = rules
-                )
+                    val modifiedBattleFormat =
+                        BattleFormat.setBattleRules(
+                            battleFormat = format,
+                            rules = rules,
+                        )
 
-                val cloneParties = (setLevel != -1) || (params.getBooleanOrNull(3) ?: false)
-                val healFirst = params.getBooleanOrNull(4) ?: false
+                    val cloneParties = (setLevel != -1) || (params.getBooleanOrNull(3) ?: false)
+                    val healFirst = params.getBooleanOrNull(4) ?: false
 
-                val battleStartResult = BattleBuilder.pvp1v1(
-                    player1 = player,
-                    player2 = opponent,
-                    battleFormat = modifiedBattleFormat,
-                    cloneParties = cloneParties,
-                    healFirst = healFirst
-                )
-                var returnValue: MoValue = DoubleValue.ZERO
-                battleStartResult.ifSuccessful { returnValue = it.struct }
-                return@put returnValue
+                    val battleStartResult =
+                        BattleBuilder.pvp1v1(
+                            player1 = player,
+                            player2 = opponent,
+                            battleFormat = modifiedBattleFormat,
+                            cloneParties = cloneParties,
+                            healFirst = healFirst,
+                        )
+                    var returnValue: MoValue = DoubleValue.ZERO
+                    battleStartResult.ifSuccessful { returnValue = it.struct }
+                    returnValue
+                }
+                functions["get_custom_stat"] = getCustomStat@{ params ->
+                    val statName = params.getString(0)
+
+                    val resourceLocation = ResourceLocation.tryParse(statName) ?: return@getCustomStat DoubleValue.ZERO
+                    val statResourceLocation =
+                        BuiltInRegistries.CUSTOM_STAT.get(resourceLocation) ?: return@getCustomStat DoubleValue.ZERO
+
+                    val exists = Stats.CUSTOM.contains(statResourceLocation)
+                    if (!exists) return@getCustomStat DoubleValue.ZERO
+
+                    val stat = Stats.CUSTOM.get(statResourceLocation)
+                    val value = player.stats.getValue(stat)
+
+                    DoubleValue(value)
+                }
+                functions["get_starter_uuid"] = {
+                    Cobblemon.playerDataManager.getGenericData(player).starterUUID?.let {
+                        StringValue(
+                            it.toString(),
+                        )
+                    } ?: DoubleValue.ZERO
+                }
+                functions["has_chosen_starter"] = {
+                    DoubleValue(Cobblemon.playerDataManager.getGenericData(player).starterSelected)
+                }
             }
-            map["get_custom_stat"] = put@{ params ->
-                val statName = params.getString(0)
-
-                val resourceLocation = ResourceLocation.tryParse(statName) ?: return@put DoubleValue.ZERO
-                val statResourceLocation =
-                    BuiltInRegistries.CUSTOM_STAT.get(resourceLocation) ?: return@put DoubleValue.ZERO
-
-                val exists = net.minecraft.stats.Stats.CUSTOM.contains(statResourceLocation)
-                if (!exists) return@put DoubleValue.ZERO
-
-                val stat = net.minecraft.stats.Stats.CUSTOM.get(statResourceLocation)
-                val value = player.stats.getValue(stat)
-
-                DoubleValue(value)
-            }
-            map["get_starter_uuid"] = { _ ->
-                Cobblemon.playerDataManager.getGenericData(player).starterUUID?.let {
-                    StringValue(
-                        it.toString()
-                    )
-                } ?: DoubleValue.ZERO
-            }
-            map["has_chosen_starter"] = { _ -> DoubleValue(Cobblemon.playerDataManager.getGenericData(player).starterSelected) }
         }
 
-        return map
+        return functions
     }
 }

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

@@ -27,57 +27,69 @@ import com.cobblemon.mod.common.util.getStringOrNull
 object PokedexMoLangFunctions : AbstractMoLangFunctionHolder<AbstractPokedexManager>() {
     override fun AbstractPokedexManager.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val pokedex = this
-        val map = mutableMapOf<String, (MoParams) -> Any>()
-        map["get_species_record"] = { params ->
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["get_species_record"] = { params ->
             val speciesId = params.getString(0).asIdentifierDefaultingNamespace()
             pokedex.speciesRecords[speciesId]?.struct ?: QueryStruct(hashMapOf())
         }
 
-        map["has_seen"] = put@{ params ->
+        functions["has_seen"] = hasSeen@{ params ->
             val speciesId = params.getString(0).asIdentifierDefaultingNamespace()
-            val formName = params.getStringOrNull(1)
+            val formName =
+                params.getStringOrNull(1)
+                    ?: return@hasSeen DoubleValue(
+                        pokedex.getHighestKnowledgeForSpecies(speciesId).ordinal >= PokedexEntryProgress.SEEN.ordinal,
+                    )
 
-            if (formName == null) {
-                return@put DoubleValue(pokedex.getHighestKnowledgeForSpecies(speciesId).ordinal >= PokedexEntryProgress.SEEN.ordinal)
-            } else {
-                return@put DoubleValue(
-                    (pokedex.getSpeciesRecord(speciesId)?.getFormRecord(formName)?.knowledge?.ordinal
-                        ?: 0) >= PokedexEntryProgress.SEEN.ordinal
-                )
-            }
+            DoubleValue(
+                (
+                    pokedex
+                        .getSpeciesRecord(speciesId)
+                        ?.getFormRecord(formName)
+                        ?.knowledge
+                        ?.ordinal
+                        ?: 0
+                ) >= PokedexEntryProgress.SEEN.ordinal,
+            )
         }
 
-        map["has_caught"] = put@{ params ->
+        functions["has_caught"] = hasCaught@{ params ->
             val speciesId = params.getString(0).asIdentifierDefaultingNamespace()
-            val formName = params.getStringOrNull(1)
-            if (formName == null) {
-                return@put DoubleValue(pokedex.getHighestKnowledgeForSpecies(speciesId) == PokedexEntryProgress.OWNED)
-            } else {
-                return@put DoubleValue(
-                    pokedex.getSpeciesRecord(speciesId)
-                        ?.getFormRecord(formName)?.knowledge == PokedexEntryProgress.OWNED
+            val formName =
+                params.getStringOrNull(1) ?: return@hasCaught DoubleValue(
+                    pokedex.getHighestKnowledgeForSpecies(
+                        speciesId,
+                    ) == PokedexEntryProgress.OWNED,
                 )
-            }
+            DoubleValue(
+                pokedex
+                    .getSpeciesRecord(speciesId)
+                    ?.getFormRecord(formName)
+                    ?.knowledge == PokedexEntryProgress.OWNED,
+            )
         }
-        map["caught_count"] = { DoubleValue(pokedex.getGlobalCalculatedValue(CaughtCount)) }
-        map["seen_count"] = { DoubleValue(pokedex.getGlobalCalculatedValue(SeenCount)) }
-        map["caught_percent"] = { DoubleValue(pokedex.getGlobalCalculatedValue(CaughtPercent)) }
-        map["seen_percent"] = { DoubleValue(pokedex.getGlobalCalculatedValue(SeenPercent)) }
+        functions["caught_count"] = { DoubleValue(pokedex.getGlobalCalculatedValue(CaughtCount)) }
+        functions["seen_count"] = { DoubleValue(pokedex.getGlobalCalculatedValue(SeenCount)) }
+        functions["caught_percent"] = { DoubleValue(pokedex.getGlobalCalculatedValue(CaughtPercent)) }
+        functions["seen_percent"] = { DoubleValue(pokedex.getGlobalCalculatedValue(SeenPercent)) }
 
-        if (pokedex is PokedexManager) {
-            map["player_id"] = { StringValue(pokedex.uuid.toString()) }
-            map["see"] = put@{ params ->
-                val pokemon = params.get<ObjectValue<Pokemon>>(0).obj
-                pokedex.encounter(pokemon)
-                return@put DoubleValue.ONE
-            }
-            map["catch"] = put@{ params ->
-                val pokemon = params.get<ObjectValue<Pokemon>>(0).obj
-                pokedex.obtain(pokemon)
-                return@put DoubleValue.ONE
+        when (pokedex) {
+            is PokedexManager -> {
+                functions["player_id"] = { StringValue(pokedex.uuid.toString()) }
+                functions["see"] = { params ->
+                    val pokemon = params.get<ObjectValue<Pokemon>>(0).obj
+                    pokedex.encounter(pokemon)
+                    DoubleValue.ONE
+                }
+                functions["catch"] = { params ->
+                    val pokemon = params.get<ObjectValue<Pokemon>>(0).obj
+                    pokedex.obtain(pokemon)
+                    DoubleValue.ONE
+                }
             }
         }
 
-        return map
+        return functions
     }
 }

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

@@ -32,100 +32,113 @@ import com.cobblemon.mod.common.util.withQueryValue
 object PokemonEntityMoLangFunctions : AbstractMoLangFunctionHolder<PokemonEntity>() {
     override fun PokemonEntity.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val pokemonEntity = this
-        val map = mutableMapOf<String, (MoParams) -> Any>()
-        map["is_busy"] = { DoubleValue(pokemonEntity.isBusy) }
-        map["in_battle"] = { DoubleValue(pokemonEntity.isBattling) }
-        map["is_moving"] = { DoubleValue((pokemonEntity.moveControl as? PokemonMoveControl)?.hasWanted() == true) }
-        map["is_flying"] = { DoubleValue(pokemonEntity.getBehaviourFlag(PokemonBehaviourFlag.FLYING)) }
-        map["get_riding_state"] = { params ->
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["is_busy"] = { DoubleValue(pokemonEntity.isBusy) }
+        functions["in_battle"] = { DoubleValue(pokemonEntity.isBattling) }
+        functions["is_moving"] =
+            { DoubleValue((pokemonEntity.moveControl as? PokemonMoveControl)?.hasWanted() == true) }
+        functions["is_flying"] = { DoubleValue(pokemonEntity.getBehaviourFlag(PokemonBehaviourFlag.FLYING)) }
+        functions["get_riding_state"] = { params ->
             val name = params.getStringOrNull(0)
             pokemonEntity.ifRidingAvailableSupply(DoubleValue.ZERO) { behaviour, settings, state ->
                 val moValue = behaviour.asMoLangValue(settings, state, pokemonEntity)
                 return@ifRidingAvailableSupply moValue.functions[name]?.apply(MoParams.EMPTY) as? MoValue ?: moValue
             }
         }
-        map["is_gliding"] = {
+        functions["is_gliding"] = {
             pokemonEntity.ifRidingAvailableSupply(DoubleValue.ZERO) { behaviour, settings, state ->
                 val moValue = behaviour.asMoLangValue(settings, state, pokemonEntity)
                 return@ifRidingAvailableSupply moValue.functions["gliding"]?.apply(MoParams.EMPTY) as? MoValue
                     ?: DoubleValue.ZERO
             }
         }
-        map["is_sprinting"] = {
+        functions["is_sprinting"] = {
             pokemonEntity.ifRidingAvailableSupply(DoubleValue.ZERO) { behaviour, settings, state ->
                 val moValue = behaviour.asMoLangValue(settings, state, pokemonEntity)
                 return@ifRidingAvailableSupply moValue.functions["sprinting"]?.apply(MoParams.EMPTY) as? MoValue
                     ?: DoubleValue.ZERO
             }
         }
-        map["is_drifting"] = {
+        functions["is_drifting"] = {
             pokemonEntity.ifRidingAvailableSupply(DoubleValue.ZERO) { behaviour, settings, state ->
                 val moValue = behaviour.asMoLangValue(settings, state, pokemonEntity)
                 return@ifRidingAvailableSupply moValue.functions["drifting"]?.apply(MoParams.EMPTY) as? MoValue
                     ?: DoubleValue.ZERO
             }
         }
-        map["is_powered_drifting"] = {
+        functions["is_powered_drifting"] = {
             pokemonEntity.ifRidingAvailableSupply(DoubleValue.ZERO) { behaviour, settings, state ->
                 val moValue = behaviour.asMoLangValue(settings, state, pokemonEntity)
                 return@ifRidingAvailableSupply moValue.functions["powered_drifting"]?.apply(MoParams.EMPTY) as? MoValue
                     ?: DoubleValue.ZERO
             }
         }
-        map["in_air"] = {
+        functions["in_air"] = {
             pokemonEntity.ifRidingAvailableSupply(DoubleValue.ZERO) { behaviour, settings, state ->
                 val moValue = behaviour.asMoLangValue(settings, state, pokemonEntity)
                 return@ifRidingAvailableSupply moValue.functions["in_air"]?.apply(MoParams.EMPTY) as? MoValue
                     ?: DoubleValue.ZERO
             }
         }
-        map["is_wild"] = { DoubleValue(pokemonEntity.ownerUUID == null) }
-        map["is_in_party"] = { DoubleValue(pokemonEntity.pokemon.storeCoordinates.get()?.store is PartyStore) }
-        map["is_ridden"] = { DoubleValue(pokemonEntity.hasControllingPassenger()) }
-        map["has_aspect"] = { DoubleValue(it.getString(0) in pokemonEntity.aspects) }
-        map["is_pokemon"] = { DoubleValue.ONE }
-        map["is_holding_item"] = {
-            DoubleValue(!pokemonEntity.entityData.get(PokemonEntity.SHOWN_HELD_ITEM).let {
-                it.isEmpty || it.`is`(CobblemonItemTags.WEARABLE_HAT_ITEMS) || it.`is`(CobblemonItemTags.WEARABLE_FACE_ITEMS)
-            })
+        functions["is_wild"] = { DoubleValue(pokemonEntity.ownerUUID == null) }
+        functions["is_in_party"] = {
+            DoubleValue(
+                pokemonEntity.pokemon.storeCoordinates
+                    .get()
+                    ?.store is PartyStore,
+            )
         }
-        map["riding_style"] = {
-            StringValue(pokemonEntity.ifRidingAvailableSupply("") { behaviour, settings, state ->
-                behaviour.getRidingStyle(settings, state).name
-            })
+        functions["is_ridden"] = { DoubleValue(pokemonEntity.hasControllingPassenger()) }
+        functions["has_aspect"] = { DoubleValue(it.getString(0) in pokemonEntity.aspects) }
+        functions["is_pokemon"] = { DoubleValue.ONE }
+        functions["is_holding_item"] = {
+            DoubleValue(
+                !pokemonEntity.entityData.get(PokemonEntity.SHOWN_HELD_ITEM).let {
+                    it.isEmpty || it.`is`(CobblemonItemTags.WEARABLE_HAT_ITEMS) || it.`is`(CobblemonItemTags.WEARABLE_FACE_ITEMS)
+                },
+            )
         }
-        map["is_wearing_hat"] = {
+        functions["riding_style"] = {
+            StringValue(
+                pokemonEntity.ifRidingAvailableSupply("") { behaviour, settings, state ->
+                    behaviour.getRidingStyle(settings, state).name
+                },
+            )
+        }
+        functions["is_wearing_hat"] = {
             DoubleValue(
                 pokemonEntity.entityData
                     .get(PokemonEntity.SHOWN_HELD_ITEM)
-                    .`is`(CobblemonItemTags.WEARABLE_HAT_ITEMS)
+                    .`is`(CobblemonItemTags.WEARABLE_HAT_ITEMS),
             )
         }
-        map["is_wearing_face"] = {
+        functions["is_wearing_face"] = {
             DoubleValue(
                 pokemonEntity.entityData
                     .get(PokemonEntity.SHOWN_HELD_ITEM)
-                    .`is`(CobblemonItemTags.WEARABLE_FACE_ITEMS)
+                    .`is`(CobblemonItemTags.WEARABLE_FACE_ITEMS),
             )
         }
-        map["is_pastured"] = {
+        functions["is_pastured"] = {
             DoubleValue((pokemonEntity.tethering != null))
         }
-        map["pasture_conflict_enabled"] = {
+        functions["pasture_conflict_enabled"] = {
             DoubleValue(pokemonEntity.getBehaviourFlag(PokemonBehaviourFlag.PASTURE_CONFLICT))
         }
-        map["run_action_effect"] = runActionEffect@{ params ->
+        functions["run_action_effect"] = runActionEffect@{ params ->
             val runtime = MoLangRuntime().setup()
             runtime.environment.cloneFrom(params.environment)
             runtime.withQueryValue("entity", pokemonEntity.struct)
             val actionEffect = ActionEffects.actionEffects[params.getString(0).asIdentifierDefaultingNamespace()]
             if (actionEffect != null) {
-                val context = ActionEffectContext(
-                    actionEffect = actionEffect,
-                    providers = mutableListOf(TargetsProvider(pokemonEntity)),
-                    runtime = runtime,
-                    level = pokemonEntity.level()
-                )
+                val context =
+                    ActionEffectContext(
+                        actionEffect = actionEffect,
+                        providers = mutableListOf(TargetsProvider(pokemonEntity)),
+                        runtime = runtime,
+                        level = pokemonEntity.level(),
+                    )
                 // This was taken from NPC run_action_effect but this variable isn't used, so I just commented it out.
                 // pokemonEntity.actionEffect = context
                 pokemonEntity.brain.setMemory(CobblemonMemories.ACTIVE_ACTION_EFFECT, context)
@@ -135,14 +148,16 @@ object PokemonEntityMoLangFunctions : AbstractMoLangFunctionHolder<PokemonEntity
                         pokemonEntity.brain.getMemory(CobblemonMemories.ACTIVE_ACTION_EFFECT).orElse(null)
                     if (pokemonActionEffect == context && pokemonEntity.brain.isActive(CobblemonActivities.ACTION_EFFECT)) {
                         pokemonEntity.brain.eraseMemory(CobblemonMemories.ACTIVE_ACTION_EFFECT)
-                        //pokemonEntity.actionEffect = null
+                        // pokemonEntity.actionEffect = null
                     }
                 }
 
                 return@runActionEffect DoubleValue.ONE
             }
-            return@runActionEffect DoubleValue.ZERO
+
+            DoubleValue.ZERO
         }
-        return map
+
+        return functions
     }
 }

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

@@ -33,218 +33,214 @@ import com.cobblemon.mod.common.util.getDoubleOrNull
 import com.cobblemon.mod.common.util.getIntOrNull
 import com.cobblemon.mod.common.util.server
 import com.cobblemon.mod.common.util.toProperties
-import kotlin.random.Random
 import net.minecraft.resources.ResourceLocation
+import kotlin.random.Random
 
 object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
     override fun Pokemon.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val pokemon = this
-        val map = mutableMapOf<String, (MoParams) -> Any>()
-        map["id"] = { StringValue(pokemon.uuid.toString()) }
-        map["nickname"] = { StringValue(pokemon.nickname.toString()) }
-        map["level"] = { DoubleValue(pokemon.level.toDouble()) }
-        map["max_hp"] = { DoubleValue(pokemon.maxHealth.toDouble()) }
-        map["current_hp"] = { DoubleValue(pokemon.currentHealth.toDouble()) }
-        map["friendship"] = { DoubleValue(pokemon.friendship.toDouble()) }
-        map["max_fullness"] = { DoubleValue(pokemon.getMaxFullness().toDouble()) }
-        map["fullness"] = { DoubleValue(pokemon.currentFullness.toDouble()) }
-        map["lose_fullness"] = { params ->
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["id"] = { StringValue(pokemon.uuid.toString()) }
+        functions["nickname"] = { StringValue(pokemon.nickname.toString()) }
+        functions["level"] = { DoubleValue(pokemon.level.toDouble()) }
+        functions["max_hp"] = { DoubleValue(pokemon.maxHealth.toDouble()) }
+        functions["current_hp"] = { DoubleValue(pokemon.currentHealth.toDouble()) }
+        functions["friendship"] = { DoubleValue(pokemon.friendship.toDouble()) }
+        functions["max_fullness"] = { DoubleValue(pokemon.getMaxFullness().toDouble()) }
+        functions["fullness"] = { DoubleValue(pokemon.currentFullness.toDouble()) }
+        functions["lose_fullness"] = { params ->
             val amount = params.getDouble(0)
             pokemon.loseFullness(amount.toInt())
         }
-        map["feed_pokemon"] = { params ->
+        functions["feed_pokemon"] = { params ->
             val amount = params.getDouble(0)
             val playSound = params.getBooleanOrNull(1) ?: true
             pokemon.feedPokemon(amount.toInt(), playSound)
         }
-        map["behaviour"] = { pokemon.form.behaviour.struct }
-        map["behavior"] = { pokemon.form.behaviour.struct } // Inferior
-        map["pokeball"] = { StringValue(pokemon.caughtBall.toString()) }
-        map["ability"] = { StringValue(pokemon.ability.name) }
-        map["has_learned"] = put@{ params ->
+        functions["behaviour"] = { pokemon.form.behaviour.struct }
+        functions["behavior"] = { pokemon.form.behaviour.struct } // Inferior
+        functions["pokeball"] = { StringValue(pokemon.caughtBall.toString()) }
+        functions["ability"] = { StringValue(pokemon.ability.name) }
+        functions["has_learned"] = hasLearned@{ params ->
             val moveName = params.getString(0)
             val move = pokemon.allAccessibleMoves.find { it.name == moveName }
-            if (move != null) {
-                return@put DoubleValue.ONE
-            } else {
-                return@put DoubleValue.ZERO
-            }
+            if (move != null) return@hasLearned DoubleValue.ONE
+            DoubleValue.ZERO
         }
-        map["moveset"] = {
+        functions["moveset"] = {
             val struct = QueryStruct(hashMapOf())
             for ((index, move) in pokemon.moveSet.withIndex()) {
                 struct.addFunction(index.toString()) { move.struct }
             }
             struct
         }
-        map["evs"] = {
+        functions["evs"] = {
             val struct = QueryStruct(hashMapOf())
             for (stat in Stats.PERMANENT) {
                 struct.addFunction(stat.showdownId) { DoubleValue(pokemon.evs.getOrDefault(stat).toDouble()) }
             }
             struct
         }
-        map["ivs"] = {
+        functions["ivs"] = {
             val struct = QueryStruct(hashMapOf())
             for (stat in Stats.PERMANENT) {
                 struct.addFunction(stat.showdownId) { DoubleValue(pokemon.ivs.getOrDefault(stat).toDouble()) }
             }
             struct
         }
-        map["hyper_trained_ivs"] = {
+        functions["hyper_trained_ivs"] = {
             val struct = QueryStruct(hashMapOf())
             for (stat in Stats.PERMANENT) {
                 struct.addFunction(stat.showdownId) { DoubleValue(pokemon.ivs.hyperTrainedIVs[stat] ?: -1.0) }
             }
             struct
         }
-        map["ride_boosts"] = {
+        functions["ride_boosts"] = {
             val struct = QueryStruct(hashMapOf())
             for (stat in RidingStat.entries) {
                 struct.addFunction(stat.name.lowercase()) { DoubleValue(pokemon.getRideBoost(stat)) }
             }
             struct
         }
-        map["natdex_number"] = {
+        functions["natdex_number"] = {
             DoubleValue(pokemon.species.nationalPokedexNumber.toDouble())
         }
-        map["types"] = {
-            pokemon.form.types.map { it.toString() }.asArrayValue(::StringValue)
+        functions["types"] = {
+            pokemon.form.types
+                .map { it.showdownId }
+                .asArrayValue(::StringValue)
         }
-        map["gender_ratio"] = {
+        functions["gender_ratio"] = {
             DoubleValue(pokemon.form.maleRatio.toDouble())
         }
-        map["ev_yield"] = {
+        functions["ev_yield"] = {
             val struct = QueryStruct(hashMapOf())
             for (stat in Stats.PERMANENT) {
                 struct.addFunction(stat.showdownId) { DoubleValue(pokemon.form.evYield[stat]?.toDouble()) }
             }
             struct
         }
-        map["base_stats"] = {
+        functions["base_stats"] = {
             val struct = QueryStruct(hashMapOf())
             for (stat in Stats.PERMANENT) {
                 struct.addFunction(stat.showdownId) { DoubleValue(pokemon.form.baseStats[stat]?.toDouble()) }
             }
             struct
         }
-        map["catch_rate"] = {
+        functions["catch_rate"] = {
             DoubleValue(pokemon.form.catchRate.toDouble())
         }
-        map["base_experience_yield"] = {
+        functions["base_experience_yield"] = {
             DoubleValue(pokemon.form.baseExperienceYield.toDouble())
         }
-        map["drops"] = {
+        functions["drops"] = {
             val struct = QueryStruct(hashMapOf())
-            for ((index, drop) in pokemon.form.drops.entries.withIndex()) {
+            for ((index, drop) in pokemon.form.drops.entries
+                .withIndex()) {
                 struct.addFunction(index.toString()) { drop }
             }
             struct
         }
-        map["tm_learnset"] = {
+        functions["tm_learnset"] = {
             val struct = QueryStruct(hashMapOf())
-            for ((index, move) in pokemon.form.moves.tmMoves.withIndex()) {
+            for ((index, move) in pokemon.form.moves.tmMoves
+                .withIndex()) {
                 struct.addFunction(index.toString()) { move.struct }
             }
             struct
         }
-        map["egg_learnset"] = {
+        functions["egg_learnset"] = {
             val struct = QueryStruct(hashMapOf())
-            for ((index, move) in pokemon.form.moves.eggMoves.withIndex()) {
+            for ((index, move) in pokemon.form.moves.eggMoves
+                .withIndex()) {
                 struct.addFunction(index.toString()) { move.struct }
             }
             struct
         }
-        map["tutor_learnset"] = {
+        functions["tutor_learnset"] = {
             val struct = QueryStruct(hashMapOf())
-            for ((index, move) in pokemon.form.moves.tutorMoves.withIndex()) {
+            for ((index, move) in pokemon.form.moves.tutorMoves
+                .withIndex()) {
                 struct.addFunction(index.toString()) { move.struct }
             }
             struct
         }
-        map["level_learnset"] = {
+        functions["level_learnset"] = {
             val struct = QueryStruct(hashMapOf())
             for ((index, move) in pokemon.form.moves.levelUpMoves) {
                 struct.addFunction(index.toString()) { move }
             }
             struct
         }
-        map["ability_pool"] = {
+        functions["ability_pool"] = {
             val struct = QueryStruct(hashMapOf())
             for ((index, ability) in pokemon.form.abilities.withIndex()) {
                 struct.addFunction(index.toString()) { StringValue(ability.toString()) }
             }
             struct
         }
-        map["egg_groups"] = {
+        functions["egg_groups"] = {
             val struct = QueryStruct(hashMapOf())
             for ((index, group) in pokemon.form.eggGroups.withIndex()) {
                 struct.addFunction(index.toString()) { StringValue(group.toString()) }
             }
             struct
         }
-        map["egg_cycles"] = {
+        functions["egg_cycles"] = {
             DoubleValue(pokemon.species.eggCycles.toDouble())
         }
-        map["labels"] = {
+        functions["labels"] = {
             val struct = QueryStruct(hashMapOf())
             for ((index, label) in pokemon.form.labels.withIndex()) {
                 struct.addFunction(index.toString()) { StringValue(label) }
             }
             struct
         }
-        map["aspects"] = {
+        functions["aspects"] = {
             val aspects = pokemon.aspects
             aspects.asArrayValue { StringValue(it) }
         }
-        map["form_aspects"] = {
+        functions["form_aspects"] = {
             val aspects = pokemon.form.aspects
             aspects.asArrayValue { StringValue(it) }
         }
-        map["form_name"] = {
+        functions["form_name"] = {
             StringValue(pokemon.form.name)
         }
         // Yes, this is the lazy call for a single hardcoded pre-evolution.
         // Lol. Lmao, even.
         // TO-DO: Subscribe to [PokemonSpecies.observable].
-        // Gito: surely this is just a typo, right? not touching the function name just in case
-        map["prevolution"] = preEvolution@{
-            val preEvolution = pokemon.species.preEvolution ?: return@preEvolution DoubleValue.ZERO
-            return@preEvolution preEvolution
-        }
-        map["nature"] = { StringValue(pokemon.nature.toString()) }
-        map["is_wild"] = { DoubleValue(pokemon.entity?.let { it.ownerUUID == null } == true) }
-        map["is_shiny"] = { DoubleValue(pokemon.shiny) }
-        map["is_in_party"] = { DoubleValue(pokemon.storeCoordinates.get()?.store is PartyStore) }
-        map["species"] = { pokemon.species.struct }
-        map["form"] = { StringValue(pokemon.form.name) }
-        map["weight"] = { DoubleValue(pokemon.species.weight.toDouble()) }
-        map["matches"] = { params -> DoubleValue(params.getString(0).toProperties().matches(pokemon)) }
-        map["apply"] = { params ->
+        functions["pre_evolution"] = { pokemon.species.preEvolution ?: DoubleValue.ZERO }
+        functions["nature"] = { StringValue(pokemon.nature.toString()) }
+        functions["is_wild"] = { DoubleValue(pokemon.entity?.let { it.ownerUUID == null } == true) }
+        functions["is_shiny"] = { DoubleValue(pokemon.shiny) }
+        functions["is_in_party"] = { DoubleValue(pokemon.storeCoordinates.get()?.store is PartyStore) }
+        functions["species"] = { pokemon.species.struct }
+        functions["form"] = { StringValue(pokemon.form.name) }
+        functions["weight"] = { DoubleValue(pokemon.species.weight.toDouble()) }
+        functions["matches"] = { params -> DoubleValue(params.getString(0).toProperties().matches(pokemon)) }
+        functions["apply"] = { params ->
             params.getString(0).toProperties().apply(pokemon)
             DoubleValue.ONE
         }
-        map["owner"] = { pokemon.getOwnerPlayer()?.asMoLangValue() ?: DoubleValue.ZERO }
-        map["held_item"] = { pokemon.heldItem().asMoLangValue(server()!!.registryAccess()) }
-        map["remove_held_item"] = { _ ->
-            pokemon.removeHeldItem()
-        }
-        map["add_aspects"] = { params ->
+        functions["owner"] = { pokemon.getOwnerPlayer()?.asMoLangValue() ?: DoubleValue.ZERO }
+        functions["held_item"] = { pokemon.heldItem().asMoLangValue(server()!!.registryAccess()) }
+        functions["remove_held_item"] = { pokemon.removeHeldItem() }
+        functions["add_aspects"] = { params ->
             for (aspect in params.params) pokemon.forcedAspects += aspect.asString()
             pokemon.updateAspects()
         }
-        map["remove_aspects"] = { params ->
+        functions["remove_aspects"] = { params ->
             for (aspect in params.params) pokemon.forcedAspects -= aspect.asString()
             pokemon.updateAspects()
         }
-        map["cosmetic_item"] = {
+        functions["cosmetic_item"] = {
             pokemon.cosmeticItem().asMoLangValue(server()!!.registryAccess())
         }
-        map["remove_cosmetic_item"] = { _ ->
-            pokemon.removeCosmeticItem()
-        }
-        map["marks"] = { _ -> pokemon.marks.asArrayValue { StringValue(it.identifier.toString()) } }
-        map["has_mark"] = { params ->
+        functions["remove_cosmetic_item"] = { pokemon.removeCosmeticItem() }
+        functions["marks"] = { pokemon.marks.asArrayValue { StringValue(it.identifier.toString()) } }
+        functions["has_mark"] = { params ->
             var hasMark = false
             val identifier = params.getString(0).asIdentifierDefaultingNamespace()
             val mark = Marks.getByIdentifier(identifier)
@@ -254,7 +250,7 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
 
             DoubleValue(hasMark)
         }
-        map["remove_marks"] = { params ->
+        functions["remove_marks"] = { params ->
             var removedMark = false
             for (param in params.params) {
                 val identifier = param.asString().asIdentifierDefaultingNamespace()
@@ -267,7 +263,7 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
 
             DoubleValue(removedMark)
         }
-        map["add_marks"] = { params ->
+        functions["add_marks"] = { params ->
             var appliedMark = false
             for (param in params.params) {
                 val identifier = param.asString().asIdentifierDefaultingNamespace()
@@ -280,7 +276,7 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
 
             DoubleValue(appliedMark)
         }
-        map["add_marks_with_chance"] = { params ->
+        functions["add_marks_with_chance"] = { params ->
             var appliedMark = false
             for (param in params.params) {
                 val identifier = param.asString().asIdentifierDefaultingNamespace()
@@ -298,17 +294,15 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
 
             DoubleValue(appliedMark)
         }
-        map["add_potential_marks"] = { params ->
+        functions["add_potential_marks"] = { params ->
             for (param in params.params) {
                 val identifier = param.asString().asIdentifierDefaultingNamespace()
                 val mark = Marks.getByIdentifier(identifier)
                 if (mark != null) pokemon.addPotentialMark(mark)
             }
         }
-        map["apply_potential_marks"] = put@{
-            return@put DoubleValue(pokemon.applyPotentialMarks())
-        }
-        map["hyper_train_iv"] = hyperTrainIv@{ params ->
+        functions["apply_potential_marks"] = { DoubleValue(pokemon.applyPotentialMarks()) }
+        functions["hyper_train_iv"] = hyperTrainIv@{ params ->
             val statId = params.getString(0)
             val stat = Stats.getStat(statId)
             val value = params.getIntOrNull(1) ?: IVs.MAX_VALUE
@@ -321,12 +315,12 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
                 return@hyperTrainIv DoubleValue.ZERO
             }
         }
-        map["add_exp"] = { params ->
+        functions["add_exp"] = { params ->
             val exp = params.getDouble(0).toInt()
             pokemon.addExperience(SidemodExperienceSource("molang"), exp)
             DoubleValue.ONE
         }
-        map["set_iv"] = setIv@{ params ->
+        functions["set_iv"] = setIv@{ params ->
             val statId = params.getString(0)
             val stat = Stats.getStat(statId)
             val value = params.getIntOrNull(1)?.coerceIn(0, IVs.MAX_VALUE) ?: IVs.MAX_VALUE
@@ -338,7 +332,7 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
                 return@setIv DoubleValue.ZERO
             }
         }
-        map["set_ev"] = setEv@{ params ->
+        functions["set_ev"] = setEv@{ params ->
             val statId = params.getString(0)
             val stat = Stats.getStat(statId)
             val value = (params.getIntOrNull(1) ?: 0).coerceIn(0, 255)
@@ -350,49 +344,54 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
                 return@setEv DoubleValue.ZERO
             }
         }
-        map["set_ride_boost"] = setRideBoost@{ params ->
+        functions["set_ride_boost"] = setRideBoost@{ params ->
             val statName = params.getString(0).uppercase()
-            val stat = RidingStat.entries.find { it.name.equals(statName, ignoreCase = true) }
-                ?: return@setRideBoost DoubleValue.ZERO
+            val stat =
+                RidingStat.entries.find { it.name.equals(statName, ignoreCase = true) }
+                    ?: return@setRideBoost DoubleValue.ZERO
             val value = params.getDoubleOrNull(1)?.toFloat() ?: return@setRideBoost DoubleValue.ZERO
 
             pokemon.setRideBoost(stat, value)
-            return@setRideBoost DoubleValue.ONE
+            DoubleValue.ONE
         }
-        map["add_ride_boost"] = addRideBoost@{ params ->
+        functions["add_ride_boost"] = addRideBoost@{ params ->
             val statName = params.getString(0).uppercase()
-            val stat = RidingStat.entries.find { it.name.equals(statName, ignoreCase = true) }
-                ?: return@addRideBoost DoubleValue.ZERO
+            val stat =
+                RidingStat.entries.find { it.name.equals(statName, ignoreCase = true) }
+                    ?: return@addRideBoost DoubleValue.ZERO
             val value = params.getDoubleOrNull(1)?.toFloat() ?: return@addRideBoost DoubleValue.ZERO
 
-            return@addRideBoost DoubleValue(if (pokemon.addRideBoost(stat, value)) 1.0 else 0.0)
+            DoubleValue(if (pokemon.addRideBoost(stat, value)) 1.0 else 0.0)
         }
-        map["initialize_moveset"] = put@{ params ->
+        functions["initialize_moveset"] = initializeMoveset@{ params ->
             val param = params.get<MoValue>(0) ?: StringValue(pokemon.form.defaultWildMovesetBuilder.toString())
             if (param is DoubleValue) {
                 pokemon.initializeMoveset(param == DoubleValue.ONE)
             } else {
                 val movesetBuilderId = ResourceLocation.parse(param.asString())
-                val movesetBuilder = CobblemonMovesetBuilders.movesetBuilders[movesetBuilderId]
-                    ?: run {
-                        Cobblemon.LOGGER.error("Tried initializing moveset from moveset builder ${param.asString()} but it does not exist.")
-                        return@put DoubleValue.ZERO
-                    }
+                val movesetBuilder =
+                    CobblemonMovesetBuilders.movesetBuilders[movesetBuilderId]
+                        ?: run {
+                            Cobblemon.LOGGER.error(
+                                "Tried initializing moveset from moveset builder ${param.asString()} but it does not exist.",
+                            )
+                            return@initializeMoveset DoubleValue.ZERO
+                        }
                 pokemon.initializeMovesetFrom(movesetBuilder)
             }
             DoubleValue.ONE
         }
-        map["validate_moveset"] = { params ->
+        functions["validate_moveset"] = { params ->
             val includeLegacy = params.getBooleanOrNull(0) ?: true
             pokemon.validateMoveset(includeLegacy)
             DoubleValue.ONE
         }
-        map["teach_learnable_moves"] = { params ->
+        functions["teach_learnable_moves"] = { params ->
             val includeLegacy = params.getBooleanOrNull(0) ?: true
             pokemon.teachLearnableMoves(includeLegacy)
             DoubleValue.ONE
         }
-        map["teach_move"] = teachMove@{ params ->
+        functions["teach_move"] = teachMove@{ params ->
             val moveName = params.getString(0)
             val moveTemplate = Moves.getByName(moveName) ?: return@teachMove DoubleValue.ZERO
             val bypass = params.getBooleanOrNull(1) ?: false
@@ -402,8 +401,9 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
                 return@teachMove DoubleValue.ZERO
             }
 
-            val alreadyKnows = pokemon.moveSet.getMoves().any { it.template == moveTemplate } ||
-                pokemon.benchedMoves.any { it.moveTemplate == moveTemplate }
+            val alreadyKnows =
+                pokemon.moveSet.getMoves().any { it.template == moveTemplate } ||
+                    pokemon.benchedMoves.any { it.moveTemplate == moveTemplate }
             if (alreadyKnows) {
                 return@teachMove DoubleValue.ZERO
             }
@@ -416,42 +416,43 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
 
             DoubleValue.ONE
         }
-        map["can_learn_move"] = canLearnMove@{ params ->
+        functions["can_learn_move"] = canLearnMove@{ params ->
             val moveName = params.getString(0)
             val moveTemplate = Moves.getByName(moveName) ?: return@canLearnMove DoubleValue.ZERO
             val includeLegacy = params.getBooleanOrNull(1) ?: true
 
-            val canLearn = if (includeLegacy) {
-                LearnsetQuery.ANY.canLearn(moveTemplate, pokemon.form.moves)
-            } else {
-                LearnsetQuery.LEGAL.canLearn(moveTemplate, pokemon.form.moves)
-            }
-            return@canLearnMove DoubleValue(if (canLearn) 1.0 else 0.0)
+            val canLearn =
+                if (includeLegacy) {
+                    LearnsetQuery.ANY.canLearn(moveTemplate, pokemon.form.moves)
+                } else {
+                    LearnsetQuery.LEGAL.canLearn(moveTemplate, pokemon.form.moves)
+                }
+
+            DoubleValue(if (canLearn) 1.0 else 0.0)
         }
-        map["unlearn_move"] = unlearnMove@{ params ->
+        functions["unlearn_move"] = unlearnMove@{ params ->
             val moveName = params.getString(0)
             val moveTemplate = Moves.getByName(moveName)
             if (moveTemplate != null) {
                 pokemon.unlearnMove(moveTemplate)
                 return@unlearnMove DoubleValue.ONE
-            } else {
-                return@unlearnMove DoubleValue.ZERO
             }
+
+            DoubleValue.ZERO
         }
-        map["can_evolve"] = { _ ->
-            DoubleValue(pokemon.evolutions.any())
-        }
-        map["force_evolve"] = forceEvolve@{ params ->
+        functions["can_evolve"] = { DoubleValue(pokemon.evolutions.any()) }
+        functions["force_evolve"] = forceEvolve@{ params ->
             val idx = params.getInt(0)
-            val evolution = if (idx >= 0) pokemon.evolutions.elementAtOrNull(idx) else return@forceEvolve DoubleValue.ZERO
+            val evolution =
+                if (idx >= 0) pokemon.evolutions.elementAtOrNull(idx) else return@forceEvolve DoubleValue.ZERO
             evolution?.perform(pokemon)
             StringValue(evolution.toString())
         }
 
-        map["entity"] = { pokemon.entity?.asMoLangValue() ?: DoubleValue.ZERO }
-        map["is_alpha"] = { DoubleValue(pokemon.isAlpha) }
-        map["size_category"] = { _ -> StringValue(pokemon.getSizeCategory().name) }
+        functions["entity"] = { pokemon.entity?.asMoLangValue() ?: DoubleValue.ZERO }
+        functions["is_alpha"] = { DoubleValue(pokemon.isAlpha) }
+        functions["size_category"] = { StringValue(pokemon.getSizeCategory().name) }
 
-        return map
+        return functions
     }
 }

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

@@ -20,52 +20,50 @@ import com.cobblemon.mod.common.util.getStringOrNull
 object PokemonPropertiesMoLangFunctions : AbstractMoLangFunctionHolder<PokemonProperties>() {
     override fun PokemonProperties.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val props = this
-        val map = mutableMapOf<String, (MoParams) -> Any>()
+        val functions = hashMapOf<String, (MoParams) -> Any>()
 
-        map["level"] = { DoubleValue(props.level?.toDouble() ?: 0) }
-        map["set_level"] = { params ->
+        functions["level"] = { DoubleValue(props.level?.toDouble() ?: 0) }
+        functions["set_level"] = { params ->
             props.level = params.getIntOrNull(0)
             DoubleValue.ONE
         }
-        map["shiny"] = { DoubleValue(props.shiny) }
-        map["set_shiny"] = { params ->
+        functions["shiny"] = { DoubleValue(props.shiny) }
+        functions["set_shiny"] = { params ->
             props.shiny = params.getBooleanOrNull(0)
             DoubleValue.ONE
         }
-        map["species"] = { props.species?.let { StringValue(it) } ?: DoubleValue.ZERO }
-        map["set_species"] = { params ->
+        functions["species"] = { props.species?.let { StringValue(it) } ?: DoubleValue.ZERO }
+        functions["set_species"] = { params ->
             props.species = params.getStringOrNull(0)
             DoubleValue.ONE
         }
-        map["gender"] = { props.gender?.let { StringValue(it.name) } ?: DoubleValue.ZERO }
-        map["set_gender"] = { params ->
+        functions["gender"] = { props.gender?.let { StringValue(it.name) } ?: DoubleValue.ZERO }
+        functions["set_gender"] = { params ->
             props.gender = params.getStringOrNull(0)?.let { Gender.valueOf(it) }
             DoubleValue.ONE
         }
-        map["form"] = { props.form?.let { StringValue(it) } ?: DoubleValue.ZERO }
-        map["ivs"] = ivs@{
+        functions["form"] = { props.form?.let { StringValue(it) } ?: DoubleValue.ZERO }
+        functions["ivs"] = ivs@{
             val ivs = props.ivs ?: return@ivs DoubleValue.ZERO
 
-            return@ivs ivs.struct
+            ivs.struct
         }
-        map["evs"] = evs@{
+        functions["evs"] = evs@{
             val evs = props.evs ?: return@evs DoubleValue.ZERO
 
-            return@evs evs.struct
+            evs.struct
         }
-        map["friendship"] = { DoubleValue(props.friendship?.toDouble() ?: DoubleValue.ZERO) }
-        map["set_friendship"] = { params ->
+        functions["friendship"] = { DoubleValue(props.friendship?.toDouble() ?: DoubleValue.ZERO) }
+        functions["set_friendship"] = { params ->
             props.friendship = params.getIntOrNull(0)
             DoubleValue.ONE
         }
-        map["create"] = {
-            val pokemon = props.create()
-            pokemon.struct
-        }
-        map["to_string"] = { params ->
+        functions["create"] = { (props.create()).struct }
+        functions["to_string"] = { params ->
             val separator = params.getStringOrNull(0) ?: " "
             StringValue(props.asString(separator = separator))
         }
-        return map
+
+        return functions
     }
 }

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

@@ -22,83 +22,84 @@ import com.cobblemon.mod.common.util.asUUID
 import com.cobblemon.mod.common.util.getPlayer
 import com.cobblemon.mod.common.util.toProperties
 
-object PokemonStoreMoLangFunctions: AbstractMoLangFunctionHolder<PokemonStore<*>>() {
+object PokemonStoreMoLangFunctions : AbstractMoLangFunctionHolder<PokemonStore<*>>() {
     override fun PokemonStore<*>.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val store = this
-        val map = mutableMapOf<String, (MoParams) -> Any>()
-        map["uuid"] = { StringValue(store.uuid.toString()) }
-        map["add"] = { params ->
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["uuid"] = { StringValue(store.uuid.toString()) }
+        functions["add"] = { params ->
             val pokemon = params.get<ObjectValue<Pokemon>>(0)
             DoubleValue(store.add(pokemon.obj))
         }
-        map["add_by_properties"] = { params ->
+        functions["add_by_properties"] = { params ->
             val props = params.getString(0).toProperties()
-            val player = (store as? PlayerPartyStore)?.playerUUID?.getPlayer() // Only really know for sure when it's a player party store
+            val player =
+                (store as? PlayerPartyStore)?.playerUUID?.getPlayer() // Only really know for sure when it's a player party store
             val pokemon = props.create(player = player)
             DoubleValue(store.add(pokemon))
         }
-        map["find_by_properties"] = { params ->
+        functions["find_by_properties"] = { params ->
             val props = params.getString(0).toProperties()
             val pokemon = store.find { props.matches(it) }
             pokemon?.asStruct() ?: DoubleValue.ZERO
         }
-        map["find_all_by_properties"] = { params ->
+        functions["find_all_by_properties"] = { params ->
             val props = params.getString(0).toProperties()
             val pokemon = store.filter { props.matches(it) }
             ArrayStruct(pokemon.mapIndexed { index, value -> "$index" to value.asStruct() }.toMap())
         }
-        map["find_by_id"] = { params ->
+        functions["find_by_id"] = { params ->
             val id = params.getString(0).asUUID
             val pokemon = store.find { it.uuid == id }
             pokemon?.asStruct() ?: DoubleValue.ZERO
         }
-        map["remove_by_id"] = removeById@{ params ->
+        functions["remove_by_id"] = removeById@{ params ->
             val id = params.getString(0).asUUID
             val pokemon = store.find { it.uuid == id } ?: return@removeById DoubleValue.ZERO
-            return@removeById DoubleValue(store.remove(pokemon))
+            DoubleValue(store.remove(pokemon))
         }
-        map["average_level"] = averageLevel@{ _ ->
+        functions["average_level"] = averageLevel@{
             var numberOfPokemon = 0
             var totalLevel = 0
             for (pokemon in store) {
                 totalLevel += pokemon.level
                 numberOfPokemon++
             }
-            if (numberOfPokemon == 0) {
-                return@averageLevel DoubleValue.ZERO
-            }
-            return@averageLevel DoubleValue(totalLevel.toDouble() / numberOfPokemon)
+
+            if (numberOfPokemon == 0) return@averageLevel DoubleValue.ZERO
+
+            DoubleValue(totalLevel.toDouble() / numberOfPokemon)
         }
-        map["count"] = { _ -> DoubleValue(store.count()) }
-        map["count_by_properties"] = { params ->
+        functions["count"] = { DoubleValue(store.count()) }
+        functions["count_by_properties"] = { params ->
             val props = params.getString(0).toProperties()
             DoubleValue(store.count { props.matches(it) })
         }
-        map["highest_level"] = {
+        functions["highest_level"] = {
             val highest = store.maxOfOrNull { it.level } ?: 0
             DoubleValue(highest)
         }
-        map["lowest_level"] = {
+        functions["lowest_level"] = {
             val lowest = store.minOfOrNull { it.level } ?: 0
             DoubleValue(lowest)
         }
-        map["heal"] = {
+        functions["heal"] = {
             for (pokemon in store) {
                 pokemon.heal()
             }
             DoubleValue.ONE
         }
-        map["healing_remainder_percent"] = { _ ->
+        functions["healing_remainder_percent"] = {
             var totalPercent = 0.0f
             for (pokemon in store) {
                 totalPercent += (1.0f - (pokemon.currentHealth.toFloat() / pokemon.maxHealth))
             }
             DoubleValue(totalPercent)
         }
-        map["has_usable_pokemon"] = { _ -> DoubleValue(store.any { !it.isFainted() }) }
-        map["pokemon"] = {
-            store.map { it.asStruct() }.asArrayValue()
-        }
-        return map
+        functions["has_usable_pokemon"] = { DoubleValue(store.any { !it.isFainted() }) }
+        functions["pokemon"] = { store.map { it.asStruct() }.asArrayValue() }
+
+        return functions
     }
 }

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

@@ -25,62 +25,63 @@ import java.util.*
 object ServerMoLangFunctions : AbstractMoLangFunctionHolder<MinecraftServer>() {
     override fun MinecraftServer.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val server = this
-        val map = mutableMapOf<String, (MoParams) -> Any>()
+        val functions = hashMapOf<String, (MoParams) -> Any>()
 
-        map["get_world"] = getWorld@{ params ->
-            val world = server.getLevel(
-                ResourceKey.create(
-                    Registries.DIMENSION,
-                    params.getString(0).asIdentifierDefaultingNamespace(namespace = "minecraft")
-                )
-            ) ?: return@getWorld DoubleValue.ZERO
+        functions["get_world"] = getWorld@{ params ->
+            val world =
+                server.getLevel(
+                    ResourceKey.create(
+                        Registries.DIMENSION,
+                        params.getString(0).asIdentifierDefaultingNamespace(namespace = "minecraft"),
+                    ),
+                ) ?: return@getWorld DoubleValue.ZERO
 
-            return@getWorld world
+            world
                 .registryAccess()
                 .registryOrThrow(Registries.DIMENSION)
                 .wrapAsHolder(world)
                 .asWorldMoLangValue()
         }
 
-        map["broadcast"] = { params ->
+        functions["broadcast"] = { params ->
             val message = params.getString(0)
             server.playerList.broadcastSystemMessage(message.text(), params.getBooleanOrNull(1) == true)
             DoubleValue.ONE
         }
 
-        map["get_player_by_uuid"] = getPlayerByUuid@{ params ->
+        functions["get_player_by_uuid"] = getPlayerByUuid@{ params ->
             val uuid = UUID.fromString(params.getString(0))
             val player = server.playerList.getPlayer(uuid) ?: return@getPlayerByUuid DoubleValue.ZERO
-            return@getPlayerByUuid player.asMoLangValue()
+            player.asMoLangValue()
         }
 
-        map["get_player_by_username"] = getPlayerByUsername@{ params ->
+        functions["get_player_by_username"] = getPlayerByUsername@{ params ->
             val username = params.getString(0)
             val player = server.playerList.getPlayerByName(username) ?: return@getPlayerByUsername DoubleValue.ZERO
-            return@getPlayerByUsername player.asMoLangValue()
+            player.asMoLangValue()
         }
 
-        map["data"] = { params ->
+        functions["data"] = { params ->
             Cobblemon.molangData.load(
                 UUID(0L, 0L),
-                params.getStringOrNull(0)
+                params.getStringOrNull(0),
             )
         }
 
-        map["save_data"] = { params ->
+        functions["save_data"] = { params ->
             Cobblemon.molangData.save(
                 UUID(0L, 0L),
-                params.getStringOrNull(index = 0)
+                params.getStringOrNull(index = 0),
             )
             DoubleValue.ONE
         }
 
         // Maybe later...
-//            map.put("stop") { params ->
+//            functions.put("stop") { params ->
 //                Cobblemon.LOGGER.warn("Server is being stopped from a MoLang script.")
 //                server.stopServer()
 //            }
 
-        return map
+        return functions
     }
 }

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

@@ -20,27 +20,34 @@ import net.minecraft.server.level.ServerPlayer
 object SpawnablePositionMoLangFunctions : AbstractMoLangFunctionHolder<SpawnablePosition>() {
     override fun SpawnablePosition.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val spawningContext = this
-        val map = mutableMapOf<String, (MoParams) -> Any>()
-        val worldValue = spawningContext.world.registryAccess().registryOrThrow(Registries.DIMENSION)
-            .wrapAsHolder(spawningContext.world).asWorldMoLangValue()
-        val biomeValue = spawningContext.biomeHolder.asBiomeMoLangValue()
-        map["biome"] = { _ -> biomeValue }
-        map["world"] = { _ -> worldValue }
-        map["light"] = { _ -> DoubleValue(spawningContext.light.toDouble()) }
-        map["x"] = { _ -> DoubleValue(spawningContext.position.x.toDouble()) }
-        map["y"] = { _ -> DoubleValue(spawningContext.position.y.toDouble()) }
-        map["z"] = { _ -> DoubleValue(spawningContext.position.z.toDouble()) }
-        map["moon_phase"] = { _ -> DoubleValue(spawningContext.moonPhase.toDouble()) }
-        map["can_see_sky"] = { _ -> DoubleValue(spawningContext.canSeeSky) }
-        map["sky_light"] = { _ -> DoubleValue(spawningContext.skyLight.toDouble()) }
-        map["player"] = put@{ _ ->
-            val causeEntity = spawningContext.cause.entity ?: return@put DoubleValue.ZERO
-            if (causeEntity is ServerPlayer) {
-                return@put causeEntity.asMoLangValue()
-            } else {
-                return@put DoubleValue.ZERO
-            }
+        val worldValue =
+            spawningContext
+                .world
+                .registryAccess()
+                .registryOrThrow(Registries.DIMENSION)
+                .wrapAsHolder(spawningContext.world)
+                .asWorldMoLangValue()
+        val biomeValue =
+            spawningContext
+                .biomeHolder
+                .asBiomeMoLangValue()
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["biome"] = { biomeValue }
+        functions["world"] = { worldValue }
+        functions["light"] = { DoubleValue(spawningContext.light.toDouble()) }
+        functions["x"] = { DoubleValue(spawningContext.position.x.toDouble()) }
+        functions["y"] = { DoubleValue(spawningContext.position.y.toDouble()) }
+        functions["z"] = { DoubleValue(spawningContext.position.z.toDouble()) }
+        functions["moon_phase"] = { DoubleValue(spawningContext.moonPhase.toDouble()) }
+        functions["can_see_sky"] = { DoubleValue(spawningContext.canSeeSky) }
+        functions["sky_light"] = { DoubleValue(spawningContext.skyLight.toDouble()) }
+        functions["player"] = player@{
+            val causeEntity = spawningContext.cause.entity ?: return@player DoubleValue.ZERO
+            if (causeEntity is ServerPlayer) return@player causeEntity.asMoLangValue()
+            DoubleValue.ZERO
         }
-        return map
+
+        return functions
     }
 }

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

@@ -17,23 +17,23 @@ import com.cobblemon.mod.common.util.asArrayValue
 object SpeciesMoLangFunctions : AbstractMoLangFunctionHolder<Species>() {
     override fun Species.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
         val species = this
-        val map = mutableMapOf<String, (MoParams) -> Any>(
-            "identifier" to { StringValue(species.resourceIdentifier.toString()) },
-            "name" to { StringValue(species.name) },
-            "primary_type" to { StringValue(species.primaryType.showdownId) },
-            "secondary_type" to { StringValue(species.secondaryType?.showdownId ?: "null") },
-            "experience_group" to { StringValue(species.experienceGroup.name) },
-            "height" to { DoubleValue(species.height) },
-            "weight" to { DoubleValue(species.weight) },
-            "base_scale" to { DoubleValue(species.baseScale) },
-            "hitbox_width" to { DoubleValue(species.hitbox.width) },
-            "hitbox_height" to { DoubleValue(species.hitbox.height) },
-            "hitbox_fixed" to { DoubleValue(species.hitbox.fixed) },
-            "catch_rate" to { DoubleValue(species.catchRate) },
-            "labels" to { species.labels.asArrayValue { StringValue(it) } },
-            "has_label" to { params -> DoubleValue(species.labels.contains(params.getString(0))) }
-        )
+        val functions = hashMapOf<String, (MoParams) -> Any>()
 
-        return map
+        functions["identifier"] = { StringValue(species.resourceIdentifier.toString()) }
+        functions["name"] = { StringValue(species.name) }
+        functions["primary_type"] = { StringValue(species.primaryType.showdownId) }
+        functions["secondary_type"] = { StringValue(species.secondaryType?.showdownId ?: "null") }
+        functions["experience_group"] = { StringValue(species.experienceGroup.name) }
+        functions["height"] = { DoubleValue(species.height) }
+        functions["weight"] = { DoubleValue(species.weight) }
+        functions["base_scale"] = { DoubleValue(species.baseScale) }
+        functions["hitbox_width"] = { DoubleValue(species.hitbox.width) }
+        functions["hitbox_height"] = { DoubleValue(species.hitbox.height) }
+        functions["hitbox_fixed"] = { DoubleValue(species.hitbox.fixed) }
+        functions["catch_rate"] = { DoubleValue(species.catchRate) }
+        functions["labels"] = { species.labels.asArrayValue { StringValue(it) } }
+        functions["has_label"] = { params -> DoubleValue(species.labels.contains(params.getString(0))) }
+
+        return functions
     }
 }

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

@@ -24,7 +24,6 @@ import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormParticlePacket
 import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
 import com.cobblemon.mod.common.util.*
-import java.util.UUID
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Holder
 import net.minecraft.core.registries.Registries
@@ -46,85 +45,89 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams
 import net.minecraft.world.phys.AABB
 import net.minecraft.world.phys.Vec3
+import java.util.UUID
 
 object WorldMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Level>>() {
     override fun Holder<Level>.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
-
         val world = this.value()
-        val map = mutableMapOf<String, (MoParams) -> Any>(
-        )
+        val functions = hashMapOf<String, (MoParams) -> Any>()
 
-        map["is_time_of_day"] = put@{ params ->
+        functions["is_time_of_day"] = isTimeOfDay@{ params ->
+            val timeOfDay =
+                TimeRange.timeRanges[params.getString(0).lowercase()]
+                    ?: return@isTimeOfDay DoubleValue.ZERO
+            val time = world.dayTime % 24000
 
-            val timeOfDay = TimeRange.timeRanges[params.getString(0).lowercase()]
-                ?: return@put DoubleValue.ZERO
-            val time = world.dayTime % 24000
-            return@put DoubleValue(timeOfDay.contains(time.toInt()))
+            DoubleValue(timeOfDay.contains(time.toInt()))
         }
-        map["game_time"] = { _ -> DoubleValue(world.gameTime.toDouble()) }
-        map["time_of_day"] = put@{
-            val time = world.dayTime % 24000
-            return@put DoubleValue(time.toDouble())
-        }
-        map["server"] = { _ -> server()?.asMoLangValue() ?: DoubleValue.ZERO }
-        map["is_raining_at"] = put@{ params ->
+        functions["game_time"] = { DoubleValue(world.gameTime.toDouble()) }
+        functions["time_of_day"] = { DoubleValue((world.dayTime % 24000).toDouble()) }
+        functions["server"] = { server()?.asMoLangValue() ?: DoubleValue.ZERO }
+        functions["is_raining_at"] = { params ->
             val x = params.getInt(0)
             val y = params.getInt(1)
             val z = params.getInt(2)
-            return@put DoubleValue(world.isRainingAt(BlockPos(x, y, z)))
+            DoubleValue(world.isRainingAt(BlockPos(x, y, z)))
         }
-        map["is_snowing_at"] = put@{ params ->
+        functions["is_snowing_at"] = { params ->
             val x = params.getInt(0)
             val y = params.getInt(1)
             val z = params.getInt(2)
             val blockPos = BlockPos(x, y, z)
             when {
-                !world.isRaining -> return@put DoubleValue.ZERO
-                !world.canSeeSky(blockPos) -> return@put DoubleValue.ZERO
+                !world.isRaining -> {
+                    DoubleValue.ZERO
+                }
+
+                !world.canSeeSky(blockPos) -> {
+                    DoubleValue.ZERO
+                }
+
                 (world.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, blockPos).y > blockPos.y) -> {
-                    return@put DoubleValue.ZERO
+                    DoubleValue.ZERO
                 }
 
                 else -> {
                     val biome = world.getBiome(blockPos).value() as Biome
-                    return@put DoubleValue(biome.getPrecipitationAt(blockPos) == Biome.Precipitation.SNOW)
+                    DoubleValue(biome.getPrecipitationAt(blockPos) == Biome.Precipitation.SNOW)
                 }
             }
         }
-        map["is_chunk_loaded_at"] = put@{ params ->
+        functions["is_chunk_loaded_at"] = { params ->
             val x = params.getInt(0)
             val y = params.getInt(1)
             val z = params.getInt(2)
-            return@put DoubleValue(world.isLoaded(BlockPos(x, y, z)))
+            DoubleValue(world.isLoaded(BlockPos(x, y, z)))
         }
-        map["is_thundering"] = { _ -> DoubleValue(world.isThundering) }
-        map["is_raining"] = { _ -> DoubleValue(world.isRaining) }
-        map["set_block"] = put@{ params ->
+        functions["is_thundering"] = { DoubleValue(world.isThundering) }
+        functions["is_raining"] = { DoubleValue(world.isRaining) }
+        functions["set_block"] = setBlock@{ params ->
             val x = params.getInt(0)
             val y = params.getInt(1)
             val z = params.getInt(2)
-            val block = world.blockRegistry.get(params.getString(3).asIdentifierDefaultingNamespace())
-                ?: run {
-                    Cobblemon.LOGGER.error("Unknown block: ${params.getString(3)}")
-                    return@put DoubleValue.ZERO
-                }
+            val block =
+                world.blockRegistry.get(params.getString(3).asIdentifierDefaultingNamespace())
+                    ?: run {
+                        Cobblemon.LOGGER.error("Unknown block: ${params.getString(3)}")
+                        return@setBlock DoubleValue.ZERO
+                    }
             world.setBlock(BlockPos(x, y, z), block.defaultBlockState(), Block.UPDATE_ALL)
         }
-        map["is_air"] = put@{ params ->
+        functions["is_air"] = { params ->
             val x = params.getDouble(0).toInt()
             val y = params.getDouble(1).toInt()
             val z = params.getDouble(2).toInt()
             val blockState = world.getBlockState(BlockPos(x, y, z))
-            return@put DoubleValue(blockState.isAir)
+            DoubleValue(blockState.isAir)
         }
-        map["get_block"] = put@{ params ->
+        functions["get_block"] = { params ->
             val x = params.getInt(0)
             val y = params.getInt(1)
             val z = params.getInt(2)
             val block = world.getBlockState(BlockPos(x, y, z)).block
-            return@put world.blockRegistry.wrapAsHolder(block).asMoLangValue(Registries.BLOCK)
+            world.blockRegistry.wrapAsHolder(block).asMoLangValue(Registries.BLOCK)
         }
-        map["spawn_explosion"] = { params ->
+        functions["spawn_explosion"] = { params ->
             val x = params.getDouble(0)
             val y = params.getDouble(1)
             val z = params.getDouble(2)
@@ -136,32 +139,33 @@ object WorldMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Level>>() {
                 z,
                 range,
                 ExplosionInteraction.valueOf(
-                    params.getStringOrNull(4)?.uppercase() ?: ExplosionInteraction.TNT.name
-                )
+                    params.getStringOrNull(4)?.uppercase() ?: ExplosionInteraction.TNT.name,
+                ),
             )
         }
-        map["spawn_lightning"] = put@{ params ->
+        functions["spawn_lightning"] = { params ->
             val x = params.getDouble(0)
             val y = params.getDouble(1)
             val z = params.getDouble(2)
             val lightning = LightningBolt(EntityType.LIGHTNING_BOLT, world)
             lightning.setPos(x, y, z)
             world.addFreshEntity(lightning)
-            return@put DoubleValue.ONE
+            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["spawn_bedrock_particles"] = { params ->
+        functions["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 {
-                when (it) {
-                    is StringValue -> world.getPlayerByUUID(UUID.fromString(it.value))
-                    is ObjectValue<*> -> it.obj
-                    else -> null
-                }
-            } as? ServerPlayer
+            val player =
+                params.getOrNull<MoValue>(4)?.let {
+                    when (it) {
+                        is StringValue -> world.getPlayerByUUID(UUID.fromString(it.value))
+                        is ObjectValue<*> -> it.obj
+                        else -> null
+                    }
+                } as? ServerPlayer
             val pos = Vec3(x, y, z)
 
             val packet = SpawnSnowstormParticlePacket(particle, pos)
@@ -171,7 +175,7 @@ object WorldMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Level>>() {
                 packet.sendToPlayersAround(x, y, z, 64.0, world.dimension())
             }
         }
-        map["spawn_pokemon"] = put@{ params ->
+        functions["spawn_pokemon"] = spawnPokemon@{ params ->
             val x = params.getInt(0)
             val y = params.getInt(1)
             val z = params.getInt(2)
@@ -179,49 +183,50 @@ object WorldMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Level>>() {
 
             val pos = BlockPos(x, y, z)
 
-            if (!Level.isInSpawnableBounds(pos)) {
-                return@put DoubleValue.ZERO
-            }
+            if (!Level.isInSpawnableBounds(pos)) return@spawnPokemon DoubleValue.ZERO
 
             val pokemon = props.createEntity(world)
             pokemon.moveTo(pos, pokemon.yRot, pokemon.xRot)
 
-            if (world.addFreshEntity(pokemon)) {
-                return@put pokemon.struct
-            } else {
-                return@put DoubleValue.ZERO
-            }
+            if (world.addFreshEntity(pokemon)) return@spawnPokemon pokemon.struct
+
+            DoubleValue.ZERO
         }
-        map["spawn_npc"] = put@{ params ->
+        functions["spawn_npc"] = spawnNpc@{ params ->
             val x = params.getDouble(0)
             val y = params.getDouble(1)
             val z = params.getDouble(2)
-            val npcClass = params.getStringOrNull(3)
-                ?.let { NPCClasses.getByIdentifier(it.asIdentifierDefaultingNamespace()) }
+            val npcClass =
+                params
+                    .getStringOrNull(3)
+                    ?.let { NPCClasses.getByIdentifier(it.asIdentifierDefaultingNamespace()) }
             val level = params.getInt(4)
-            if (npcClass == null) return@put DoubleValue.ZERO
+
+            if (npcClass == null) return@spawnNpc DoubleValue.ZERO
+
             val npc = NPCEntity(world)
             npc.moveTo(x, y, z, npc.yRot, npc.xRot)
             npc.npc = npcClass
             npc.initialize(level)
-            if (world.addFreshEntity(npc)) {
-                return@put npc.asMoLangValue()
-            }
-            return@put DoubleValue.ZERO
+
+            if (world.addFreshEntity(npc)) return@spawnNpc npc.asMoLangValue()
+
+            DoubleValue.ZERO
         }
-        map["play_sound_on_server"] = { params ->
+        functions["play_sound_on_server"] = { params ->
             val sound = params.getString(0).asResource()
             val soundSource = params.getString(1).uppercase()
             val x = params.getDouble(2)
             val y = params.getDouble(3)
             val z = params.getDouble(4)
-            val player = params.getOrNull<MoValue>(5)?.let {
-                when (it) {
-                    is StringValue -> world.getPlayerByUUID(UUID.fromString(it.value))
-                    is ObjectValue<*> -> it.obj
-                    else -> null
-                }
-            } as? ServerPlayer
+            val player =
+                params.getOrNull<MoValue>(5)?.let {
+                    when (it) {
+                        is StringValue -> world.getPlayerByUUID(UUID.fromString(it.value))
+                        is ObjectValue<*> -> it.obj
+                        else -> null
+                    }
+                } as? ServerPlayer
             val volume = params.getDoubleOrNull(6)?.toFloat() ?: 1.0f
             val pitch = params.getDoubleOrNull(7)?.toFloat() ?: 1.0f
 
@@ -233,29 +238,30 @@ object WorldMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Level>>() {
                 packet.sendToPlayersAround(x, y, z, 16.0, world.dimension())
             }
         }
-        map["get_entities_around"] = put@{ params ->
+        functions["get_entities_around"] = { params ->
             val x = params.getDouble(0)
             val y = params.getDouble(1)
             val z = params.getDouble(2)
             val range = params.getDouble(3) * 2
             val entities = world.getEntities(null, AABB.ofSize(Vec3(x, y, z), range, range, range))
-            return@put entities
+            entities
                 .filterIsInstance<LivingEntity>()
                 .map { it.asMostSpecificMoLangValue() }
                 .asArrayValue()
         }
-        map["is_healer_in_use"] = put@{ params ->
+        functions["is_healer_in_use"] = isHealerInUse@{ params ->
             val pos = params.get<ArrayStruct>(0).asBlockPos()
-            val healer = world.getBlockEntity(pos, CobblemonBlockEntities.HEALING_MACHINE).orElse(null)
-                ?: return@put DoubleValue.ONE
-            return@put DoubleValue(healer.isInUse)
+            val healer =
+                world.getBlockEntity(pos, CobblemonBlockEntities.HEALING_MACHINE).orElse(null)
+                    ?: return@isHealerInUse DoubleValue.ONE
+            return@isHealerInUse DoubleValue(healer.isInUse)
         }
 
-        map["spawn_loot_table_items"] = put@{ params ->
+        functions["spawn_loot_table_items"] = spawnLootTableItems@{ params ->
             val serverLevel = world as? ServerLevel
             if (serverLevel == null) {
                 Cobblemon.LOGGER.warn("spawn_loot_table_items: world is not a ServerLevel")
-                return@put DoubleValue.ZERO
+                return@spawnLootTableItems DoubleValue.ZERO
             }
             val lootTableId = params.getString(0).asIdentifierDefaultingNamespace()
             val x = params.getDouble(1)
@@ -265,9 +271,11 @@ object WorldMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Level>>() {
             val lootTableKey = ResourceKey.create(Registries.LOOT_TABLE, lootTableId)
             val lootTable = serverLevel.server.reloadableRegistries().getLootTable(lootTableKey)
 
-            val lootParams = LootParams.Builder(serverLevel)
-                .withParameter(LootContextParams.ORIGIN, Vec3(x, y, z))
-                .create(LootContextParamSets.COMMAND)
+            val lootParams =
+                LootParams
+                    .Builder(serverLevel)
+                    .withParameter(LootContextParams.ORIGIN, Vec3(x, y, z))
+                    .create(LootContextParamSets.COMMAND)
 
             val items = lootTable.getRandomItems(lootParams)
             val spawnedItems = ArrayStruct(hashMapOf())
@@ -285,9 +293,10 @@ object WorldMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Level>>() {
                     }
                 }
             }
-            return@put spawnedItems
+
+            spawnedItems
         }
 
-        return map
+        return functions
     }
 }

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

@@ -67,6 +67,10 @@ object CobblemonPermissions {
     val SPAWN_POKEMON = this.create("${COMMAND_PREFIX}spawnpokemon", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
     @JvmStatic
     val SPAWN_NPC = this.create("${COMMAND_PREFIX}spawnnpc", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
+    @JvmStatic
+    val SPAWN_METEOR = this.create("${COMMAND_PREFIX}spawnmeteor", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
+    @JvmStatic
+    val SET_MEGA_BOND = this.create("${COMMAND_PREFIX}setmegabond", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
 
 
     @JvmStatic

common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt

@@ -269,7 +269,7 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
         createDefault("dive_ball", CatchRateModifiers.SUBMERGED_IN_WATER, waterDragValue = 0.99F)
         createDefault("nest_ball", CatchRateModifiers.NEST)
         createDefault("repeat_ball", CatchRateModifiers.REPEAT)
-        createDefault("timer_ball", CatchRateModifiers.turnBased { turn -> (1F * turn * (1229F / 4096F)).coerceAtMost(4F) })
+        createDefault("timer_ball", CatchRateModifiers.turnBased { turn -> (1F + turn * (1229F / 4096F)).coerceAtMost(4F) })
         createDefault("luxury_ball", effects = listOf(FriendshipEarningBoostEffect(2F)))
         createDefault("premier_ball")
         createDefault("dusk_ball", CatchRateModifiers.LIGHT_LEVEL)
@@ -278,7 +278,7 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
         createDefault("cherish_ball")
         createDefault("park_ball", CatchRateModifiers.PARK)
         createDefault("dream_ball", CatchRateModifiers.statusBoosting(4F, Statuses.SLEEP))
-        createDefault("beast_ball", LabelModifier(5F, true, CobblemonPokemonLabels.ULTRA_BEAST)/*, LabelModifier(0.1F, false, CobblemonPokemonLabels.ULTRA_BEAST))*/)
+        createDefault("beast_ball", DynamicMultiplierModifier({ _, pokemon -> if (pokemon.hasLabels(CobblemonPokemonLabels.ULTRA_BEAST)) 5F else 0.1F }) { _, _ -> true })
         createDefault("ancient_poke_ball", ancient = true)
         createDefault("ancient_citrine_ball", ancient = true)
         createDefault("ancient_verdant_ball", ancient = true)
@@ -297,13 +297,15 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
         createDefault("ancient_origin_ball", GuaranteedModifier(), ancient = true)
         // Luxury ball effect, low priority as it must be triggered before soothe bell as of gen 4
         CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(priority = Priority.LOW) { event ->
-            var increment = (event.newFriendship - event.pokemon.friendship).toFloat()
-            if (increment <= 0) //these affects are only meant to affect positive gains
+            if (!event.earned) {
                 return@subscribe
-            if (increment <= 1F) {
-                event.pokemon.caughtBall.effects.filterIsInstance<FriendshipEarningBoostEffect>()
-                    .forEach { increment *= it.multiplier }
             }
+            var increment = (event.newFriendship - event.pokemon.friendship).toFloat()
+            if (increment <= 0) {
+                return@subscribe
+            }
+            event.pokemon.caughtBall.effects.filterIsInstance<FriendshipEarningBoostEffect>()
+                .forEach { increment *= it.multiplier }
             event.newFriendship = event.pokemon.friendship + increment.roundToInt()
         }
     }
@@ -338,7 +340,6 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
         ancient: Boolean = false
     ): PokeBall {
         val identifier = cobblemonResource(name)
-        //val finalModifiers = if (appendUltraBeastPenalty) modifiers + listOf(LabelModifier(0.1F, true, CobblemonPokemonLabels.ULTRA_BEAST)) else modifiers
         val pokeball = PokeBall(identifier, modifier, effects, waterDragValue, model2d, model3d, throwPower, ancient)
         this.defaults[identifier] = pokeball
         return pokeball

common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/modifiers/CatchRateModifiers.kt

@@ -54,22 +54,20 @@ object CatchRateModifiers {
 
     /**
      * Used by [PokeBalls.LOVE_BALL].
-     * Boosts the catch rate if the Pokémon is of the same species and opposite gender
+     * Boosts the catch rate 2.5× if any of the player's active Pokémon is of the opposite gender,
+     * or 8× if that Pokémon is also of the same species.
      */
     val LOVE = BattleModifier { _, playerPokemon, pokemon ->
-        if (
-            pokemon.gender != Gender.GENDERLESS
-            && playerPokemon.mapNotNull { it.battlePokemon?.originalPokemon }
-                .any {
-                    it.gender != Gender.GENDERLESS &&
-                            it.species.name.equals(pokemon.species.name, true) &&
-                            it.gender != pokemon.gender
-                }
-        ) {
-            if (playerPokemon.any { it.battlePokemon?.originalPokemon?.species?.resourceIdentifier == pokemon.species.resourceIdentifier }) 8F else 2.5F
+        if (pokemon.gender == Gender.GENDERLESS) {
+            return@BattleModifier 1F
         }
-        else {
-            1F
+        val oppositeGender = playerPokemon
+            .mapNotNull { it.battlePokemon?.originalPokemon }
+            .filter { it.gender != Gender.GENDERLESS && it.gender != pokemon.gender }
+        when {
+            oppositeGender.any { it.species.resourceIdentifier == pokemon.species.resourceIdentifier } -> 8F
+            oppositeGender.isNotEmpty() -> 2.5F
+            else -> 1F
         }
     }
 
@@ -81,7 +79,7 @@ object CatchRateModifiers {
      * 1× otherwise.
      */
     val MOON_PHASES: CatchRateModifier = WorldStateModifier { _, entity ->
-        if (entity.level().gameTime in 12000..24000)
+        if (entity.level().dayTime % 24000 < 12000)
             return@WorldStateModifier 1F
         when (entity.level().moonPhase) {
             2, 6 -> 1.5F

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

@@ -42,7 +42,7 @@ class PokedexManager(
     }
 
     // Java interop isn't great lol
-    @Deprecated("Use encounter(PokedexEntityData) instead")
+    @Deprecated("Use obtain(Pokemon) instead")
     fun catch(pokemon: Pokemon) {
         obtain(pokemon)
     }

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

@@ -778,6 +778,7 @@ open class PokemonProperties {
         shiny?.let { json.addProperty(DataKeys.POKEMON_SHINY, it) }
         gender?.let { json.addProperty(DataKeys.POKEMON_GENDER, it.name) }
         species?.let { json.addProperty(DataKeys.POKEMON_SPECIES_TEXT, it) }
+        nickname?.let { json.addProperty(DataKeys.POKEMON_NICKNAME, it.string) }
         form?.let { json.addProperty(DataKeys.POKEMON_FORM_ID, it) }
         friendship?.let { json.addProperty(DataKeys.POKEMON_FRIENDSHIP, it) }
         fullness?.let { json.addProperty(DataKeys.POKEMON_FULLNESS, it) }
@@ -814,6 +815,7 @@ open class PokemonProperties {
         shiny = json.get(DataKeys.POKEMON_SHINY)?.asBoolean
         gender = json.get(DataKeys.POKEMON_GENDER)?.asString?.let { Gender.valueOf(it) }
         species = json.get(DataKeys.POKEMON_SPECIES_TEXT)?.asString
+        nickname = json.get(DataKeys.POKEMON_NICKNAME)?.asString?.let(Component::literal)
         form = json.get(DataKeys.POKEMON_FORM_ID)?.asString
         friendship = json.get(DataKeys.POKEMON_FRIENDSHIP)?.asInt
         fullness = json.get(DataKeys.POKEMON_FULLNESS)?.asInt

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

@@ -109,8 +109,10 @@ open class Learnset {
                 evolutionMoves
     }
 
-    // We only sync level up moves atm
+    // Syncs level up, TM, and egg moves.
     fun shouldSynchronize(other: Learnset) = other.levelUpMoves != this.levelUpMoves
+            || other.tmMoves != this.tmMoves
+            || other.eggMoves != this.eggMoves
 
     fun decode(buffer: RegistryFriendlyByteBuf) {
         this.levelUpMoves.clear()
@@ -122,6 +124,8 @@ open class Learnset {
             }
             levelUpMoves[level] = moves
         }
+        decodeMoveList(buffer, this.tmMoves)
+        decodeMoveList(buffer, this.eggMoves)
     }
 
     fun encode(buffer: RegistryFriendlyByteBuf) {
@@ -133,5 +137,21 @@ open class Learnset {
                 buffer.writeInt(move.num)
             }
         }
+        encodeMoveList(buffer, this.tmMoves)
+        encodeMoveList(buffer, this.eggMoves)
+    }
+
+    private fun decodeMoveList(buffer: RegistryFriendlyByteBuf, list: MutableList<MoveTemplate>) {
+        list.clear()
+        repeat(times = buffer.readSizedInt(IntSize.U_SHORT)) {
+            Moves.getByNumericalId(buffer.readInt())?.let(list::add)
+        }
+    }
+
+    private fun encodeMoveList(buffer: RegistryFriendlyByteBuf, list: List<MoveTemplate>) {
+        buffer.writeSizedInt(IntSize.U_SHORT, list.size)
+        for (move in list) {
+            buffer.writeInt(move.num)
+        }
     }
 }

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

@@ -54,8 +54,8 @@ enum class Stats(override val identifier: ResourceLocation, override val display
             "hp" -> HP
             "atk", "attack" -> ATTACK // Hyper Cutter states the full stat name "Attack"
             "def", "defense", "defence" -> DEFENCE // Big Pecks states the full stat name "Defense"
-            "spa" -> SPECIAL_ATTACK
-            "spd" -> SPECIAL_DEFENCE
+            "spa", "special_attack" -> SPECIAL_ATTACK
+            "spd", "special_defence", "special_defense" -> SPECIAL_DEFENCE
             "spe", "speed" -> SPEED
             "evasion" -> EVASION
             else -> ACCURACY

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/air/BirdBehaviour.kt

@@ -52,6 +52,10 @@ import org.joml.Vector3f
 class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
     companion object {
         val KEY = cobblemonResource("air/bird")
+
+        private const val FLY_POSE_SPEED = 0.1
+        private const val GLIDE_ENTRY_SPEED = 0.19
+        private const val GLIDE_EXIT_SPEED = 0.13
     }
 
     override val key: ResourceLocation = KEY
@@ -61,7 +65,7 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
     }
 
     val poseProvider = PoseProvider<BirdSettings, BirdState>(PoseType.HOVER)
-        .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVelocity.get().z > 0.2 })
+        .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVelocity.get().z > FLY_POSE_SPEED })
 
     val globalBird: BirdSettings
         get() = CobblemonRideSettings.bird
@@ -204,21 +208,23 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         }
 
         // speed up and slow down based on input
-        if (driver.zza != 0.0f && state.stamina.get() > 0.0 && newVelocity.length() < glideTopSpeed) {
-            //make sure it can't exceed top speed
-            val forwardInput = when {
-                state.stamina.get() == 0.0f -> 0.0
-                driver.zza > 0 && newVelocity.z > topSpeed -> 0.0
-                driver.zza < 0 && newVelocity.z < (-topSpeed / 3.0) -> 0.0
-                else -> driver.zza.sign
-            }
-
-            newVelocity = Vec3(
-                newVelocity.x,
-                newVelocity.y,
-                (newVelocity.z + (accel * forwardInput.toDouble())))
-
+        if (driver.zza != 0.0f && state.stamina.get() > 0.0) {
             activeInput = true
+
+            if (newVelocity.length() < glideTopSpeed) {
+                //make sure it can't exceed top speed
+                val forwardInput = when {
+                    state.stamina.get() == 0.0f -> 0.0
+                    driver.zza > 0 && newVelocity.z > topSpeed -> 0.0
+                    driver.zza < 0 && newVelocity.z < (-topSpeed / 3.0) -> 0.0
+                    else -> driver.zza.sign
+                }
+
+                newVelocity = Vec3(
+                    newVelocity.x,
+                    newVelocity.y,
+                    (newVelocity.z + (accel * forwardInput.toDouble())))
+            }
         }
 
         val controller = (vehicle as? OrientationControllable)?.orientationController
@@ -276,11 +282,9 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
 
         //Check if the ride should be gliding
         if (driver.isLocalPlayer) {
-            if ((activeInput && state.stamina.get() > 0.0) || state.rideVelocity.get().z < 0.2) {
-                state.gliding.set(false)
-            } else {
-                state.gliding.set(true)
-            }
+            val powered = activeInput && state.stamina.get() > 0.0
+            val requiredSpeed = if (state.gliding.get()) GLIDE_EXIT_SPEED else GLIDE_ENTRY_SPEED
+            state.gliding.set(!powered && newVelocity.z >= requiredSpeed)
         }
 
         //air resistance

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/land/HorseBehaviour.kt

@@ -193,7 +193,7 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
         val newStam = if (state.sprinting.get()) {
             max(0.0f,stam - stamDrainRate)
         } else {
-            min(1.0f,stam + stamDrainRate * 4)
+            min(1.0f,stam + stamDrainRate * 8) // Need to change this to probably be in seconds eventually? idk something that isn't this magic number.
         }
 
         state.stamina.set(newStam.coerceIn(0F, 1F))

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/liquid/DolphinBehaviour.kt

@@ -147,7 +147,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         val stamDrainRate = (1.0f / boostTime).toFloat()
 
         val newStam = if (state.boosting.get()) max(0.0f,stam - stamDrainRate)
-            else (stam + stamDrainRate).coerceIn(0F, 1F)
+            else (stam + stamDrainRate * 2).coerceIn(0F, 1F)
 
         state.stamina.set(newStam)
     }

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

@@ -19,6 +19,7 @@ import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
 import com.cobblemon.mod.common.api.spawning.condition.SubmergedSpawningCondition
 import com.cobblemon.mod.common.api.spawning.condition.SurfaceSpawningCondition
 import com.cobblemon.mod.common.api.spawning.detail.EmptySpawnDetail
+import com.cobblemon.mod.common.api.spawning.detail.FallingStarSpawnDetail
 import com.cobblemon.mod.common.api.spawning.detail.NPCSpawnDetail
 import com.cobblemon.mod.common.api.spawning.detail.PokemonHerdSpawnDetail
 import com.cobblemon.mod.common.api.spawning.detail.PokemonSpawnDetail
@@ -122,6 +123,7 @@ object BestSpawner {
         SpawnDetail.registerSpawnType(name = NPCSpawnDetail.TYPE, NPCSpawnDetail::class.java)
         SpawnDetail.registerSpawnType(name = PokemonHerdSpawnDetail.TYPE, PokemonHerdSpawnDetail::class.java)
         SpawnDetail.registerSpawnType(name = EmptySpawnDetail.TYPE, EmptySpawnDetail::class.java)
+        SpawnDetail.registerSpawnType(name = FallingStarSpawnDetail.TYPE, FallingStarSpawnDetail::class.java)
         LOGGER.info("Loaded ${SpawnDetail.spawnDetailTypes.size} spawn detail types.")
 
         loadConfig()

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

@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
 import com.cobblemon.mod.common.api.spawning.MoonPhaseRange
 import com.cobblemon.mod.common.api.spawning.TimeRange
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
+import com.cobblemon.mod.common.block.entity.PokeSnackBlockEntity
 import com.cobblemon.mod.common.util.Merger
 import com.cobblemon.mod.common.util.math.orMax
 import com.cobblemon.mod.common.util.math.orMin
@@ -59,6 +60,7 @@ abstract class SpawningCondition<T : SpawnablePosition> {
     var structures: MutableList<Either<ResourceLocation, TagKey<Structure>>>? = null
     var isSlimeChunk: Boolean? = null
     var markers: MutableList<String>? = null
+    var isPokeSnack: Boolean? = null
 
     @Transient
     var appendages = mutableListOf<AppendageCondition>()
@@ -75,7 +77,9 @@ abstract class SpawningCondition<T : SpawnablePosition> {
     }
 
     protected open fun fits(spawnablePosition: T): Boolean {
-        if (spawnablePosition.position.x < minX.orMin() || spawnablePosition.position.x > maxX.orMax()) {
+        if (isPokeSnack != null && (spawnablePosition.spawner is PokeSnackBlockEntity.Spawner != isPokeSnack!!)) {
+            return false
+        } else if (spawnablePosition.position.x < minX.orMin() || spawnablePosition.position.x > maxX.orMax()) {
             return false
         } else if (spawnablePosition.position.y < minY.orMin() || spawnablePosition.position.y > maxY.orMax()) {
             return false

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

@@ -32,6 +32,7 @@ import com.cobblemon.mod.common.api.spawning.selection.SpawnSelectionData
 class EmptySpawnDetail : SpawnDetail() {
     companion object {
         val TYPE = "empty"
+        val EMPTY = EmptySpawnDetail()
     }
 
     override val type: String = TYPE

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

@@ -0,0 +1,47 @@
+/*
+ * 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.spawning.detail
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.CobblemonEntities
+import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
+import com.cobblemon.mod.common.entity.projectile.FallingStarEntity
+import kotlin.math.min
+import kotlin.random.Random
+import net.minecraft.world.phys.Vec3
+
+class FallingStarSpawnAction(
+    spawnablePosition: SpawnablePosition,
+    bucket: String,
+    override val detail: FallingStarSpawnDetail
+) : SpawnAction<EntitySpawnResult>(spawnablePosition, bucket, detail) {
+
+    override fun run(): EntitySpawnResult {
+        Cobblemon.LOGGER.info("Falling towards ${spawnablePosition.position}")
+        val world = spawnablePosition.world
+        val fallingStar = FallingStarEntity(CobblemonEntities.FALLING_STAR, world)
+        fallingStar.resultType = detail.resultType
+
+        val spawnPos = spawnablePosition.position
+        fallingStar.horizontalDirection = Random.nextDouble(2 * Math.PI).toFloat()
+        
+        val skyHeight = min(spawnPos.y + 64, world.maxBuildHeight - 10).toDouble()
+        val fallDistance = skyHeight - spawnPos.y
+        val ticksToFall = kotlin.math.sqrt(fallDistance / 0.015)
+        val horizontalDistance = ticksToFall * 0.8
+        
+        val offsetX = -kotlin.math.sin(fallingStar.horizontalDirection) * horizontalDistance
+        val offsetZ = -kotlin.math.cos(fallingStar.horizontalDirection) * horizontalDistance
+        val skyPos = Vec3(spawnPos.x + 0.5 + offsetX, skyHeight, spawnPos.z + 0.5 + offsetZ)
+        fallingStar.setPos(skyPos)
+        
+        world.addFreshEntity(fallingStar)
+        return EntitySpawnResult(listOf(fallingStar))
+    }
+}

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

@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.spawning.detail
+
+import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
+import com.cobblemon.mod.common.api.spawning.selection.SpawnSelectionData
+import com.cobblemon.mod.common.entity.projectile.FallingStarResultType
+
+class FallingStarSpawnDetail : SpawnDetail() {
+    companion object {
+        const val TYPE = "falling_star"
+    }
+
+    override val type = TYPE
+    var resultType: FallingStarResultType = FallingStarResultType.MINIOR
+
+    override fun createSpawnAction(
+        spawnablePosition: SpawnablePosition,
+        bucket: String,
+        selectionData: SpawnSelectionData
+    ) = FallingStarSpawnAction(spawnablePosition, bucket, this)
+}

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

@@ -11,14 +11,19 @@ package com.cobblemon.mod.common.api.spawning.detail
 import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.api.drop.DropTable
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
+import com.cobblemon.mod.common.api.spawning.position.AreaSpawnablePosition
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.api.spawning.selection.SpawnSelectionData
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.weightedSelection
 import com.google.gson.annotations.SerializedName
 import net.minecraft.core.registries.Registries
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.util.Mth.clamp
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
+import kotlin.math.ceil
 
 /**
  * A spawn detail that spawns a herd of Pokémon. This relies on the same [PokemonSpawnAction]s as
@@ -36,7 +41,6 @@ import net.minecraft.world.item.Items
 class PokemonHerdSpawnDetail : SpawnDetail() {
     companion object {
         val TYPE = "pokemon-herd"
-        const val HERD_LEADER = "leader"
     }
 
     override val type: String = TYPE
@@ -50,14 +54,14 @@ class PokemonHerdSpawnDetail : SpawnDetail() {
         get() = "${id}__LEVEL"
 
     class Herdable {
-        var pokemon: PokemonProperties = PokemonProperties()
+        var pokemon = PokemonProperties()
         val levelRange: IntRange? = null
         var levelRangeOffset: IntRange? = null
         val herdLevelRange: IntRange? = null
         var dropTable: DropTable? = null
-        var isLeader: Boolean = false
-        var isFollower: Boolean = true
-        var weight: Float = 1F
+        var isLeader = false
+        var isFollower = true
+        var weight = 1F
         var maxTimes = 10
         var heldItem: ResourceLocation? = null
     }
@@ -69,22 +73,23 @@ class PokemonHerdSpawnDetail : SpawnDetail() {
         selectionData: SpawnSelectionData
     ) {
         selectionData.removeSpawnDetails { it != this }
+        selectionData.guaranteedBucket = bucket
         selectionData.removeSpawnablePositions { _, pos -> pos.distanceTo(spawnablePosition) < minDistanceBetweenSpawns }
 
         val herdSpawnCount = selectionData.spawnActions.count { it.detail == this } + 1
+        val lacksPossibleLeader = lacksPossibleLeader(selectionData)
 
-        if (herdSpawnCount >= maxHerdSize || getValidHerdMembers(selectionData).isEmpty()) {
+        if (herdSpawnCount >= maxHerdSize || getValidHerdMembersForRole(selectionData, useLeaderRole = lacksPossibleLeader).isEmpty()) {
             // We can't spawn any more in the herd so remove this spawn from the selection pool.
             selectionData.removeSpawnDetails { it == this }
         }
     }
 
     fun lacksPossibleLeader(selectionData: SpawnSelectionData): Boolean {
-        val level = getOrSetHerdLevel(selectionData)
         val herdable = getValidHerdMembers(selectionData)
         val herdCounts = getHerdMemberCounts(selectionData)
 
-        val leaderIsPossible = herdable.any { it.herdLevelRange?.contains(level) != false && it.isLeader }
+        val leaderIsPossible = herdable.any { it.isLeader }
         val leaderIsSelected = herdCounts.any { it.key?.isLeader == true && it.value > 0 }
         return leaderIsPossible && !leaderIsSelected
     }
@@ -93,25 +98,42 @@ class PokemonHerdSpawnDetail : SpawnDetail() {
         return (selectionData.context[herdLevelKey] as? Int) ?: run {
             val level = levelRange.random()
             selectionData.context[herdLevelKey] = level
-            return level
+            level
         }
     }
 
+    private fun getValidHerdMembersForRole(selectionData: SpawnSelectionData, useLeaderRole: Boolean): List<Herdable> {
+        return getValidHerdMembers(selectionData).filter { (useLeaderRole && it.isLeader) || (!useLeaderRole && it.isFollower) }
+    }
+
     override fun createSpawnAction(
         spawnablePosition: SpawnablePosition,
         bucket: String,
         selectionData: SpawnSelectionData
-    ): PokemonSpawnAction {
-        val validHerdMembers = getValidHerdMembers(selectionData)
-        var searchedForLeader = false
-        val herdable = if (lacksPossibleLeader(selectionData)) {
-            searchedForLeader = true
-            validHerdMembers.filter { it.isLeader }
-        } else {
-            validHerdMembers.filter { it.isFollower }
-        }.weightedSelection { it.weight } ?: herdablePokemon[0]
+    ): SpawnAction<*> {
+        val herdable = getValidHerdMembersForRole(
+            selectionData = selectionData,
+            useLeaderRole = lacksPossibleLeader(selectionData)
+        ).weightedSelection { it.weight } ?: herdablePokemon[0]
+
+        var level = selectionData.context[herdLevelKey] as? Int ?: 1
+
+        // Attempt to do more detailed anti-wall-spawn logic. Herd members could spawn in walls because
+        // we've just been assuming they're 1 block wide (or at least, all in the herd have the same size).
+        // Some pokemon are not that though.
+        if (spawnablePosition is AreaSpawnablePosition) {
+            val species = herdable.pokemon.species?.let { PokemonSpecies.getByIdentifier(it.asIdentifierDefaultingNamespace()) }
+            if (species != null) {
+                val height = ceil(species.hitbox.height * species.baseScale).toInt()
+                val width = ceil(species.hitbox.width * species.baseScale).toInt()
+                if (!spawnablePosition.hasSpace(width, height)) {
+                    return EmptySpawnAction(spawnablePosition, bucket, EmptySpawnDetail.EMPTY)
+                }
+            }
+        }
+
+        level = herdable.levelRange?.let { clamp(level, it.first, it.last) } ?: level
 
-        val level = selectionData.context[herdLevelKey] as? Int ?: 1
         val levelRange = herdable.levelRangeOffset?.let { offset ->
             val min = level + offset.first
             val max = level + offset.last
@@ -136,11 +158,7 @@ class PokemonHerdSpawnDetail : SpawnDetail() {
             drops = herdable.dropTable,
             heldItem = heldItem,
             levelRange = levelRange
-        ).also {
-            if (herdable.isLeader && searchedForLeader) {
-                it.labels += HERD_LEADER
-            }
-        }
+        )
     }
 
     fun getHerdMemberCounts(selectionData: SpawnSelectionData): Map<Herdable?, Int> {

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

@@ -71,7 +71,7 @@ class FishingSpawnCause(
         }
 
         fun alterSize(pokemonEntity: PokemonEntity, effect: SpawnBait.Effect) {
-            pokemonEntity.pokemon.scaleModifier *= effect.value.toFloat() / 1000.0f
+            pokemonEntity.pokemon.scaleModifier += effect.value.toFloat() / 1000.0f
         }
 
         fun saveDropsReroll(pokemonEntity: PokemonEntity, effect: SpawnBait.Effect) {

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/position/AreaSpawnablePosition.kt

@@ -53,34 +53,39 @@ open class AreaSpawnablePosition(
      */
     open fun isSafeSpace(world: ServerLevel, pos: BlockPos, state: BlockState): Boolean = !state.isSolid
 
+    fun hasSpace(width: Int, height: Int): Boolean {
+        val sizeX = width.takeIf { it > 0 } ?: 1
+        val sizeY = height.takeIf { it > 0 } ?: 1
+
+        val minX = floor(position.x + 0.5 - (sizeX - 1) / 2F).toInt() - 1
+        val maxX = ceil(position.x + 0.5 + (sizeX + 1) / 2F).toInt() + 1
+
+        val maxY = ceil(position.y + (sizeY + 1) / 2F).toInt() + 1
+
+        val minZ = floor(position.z + 0.5 - (sizeX - 1) / 2F).toInt() - 1
+        val maxZ = ceil(position.z + 0.5 + (sizeX + 1) / 2F).toInt() + 1
+
+        val mutable = BlockPos.MutableBlockPos()
+        for (x in minX until maxX) {
+            for (y in (position.y + 1)..maxY) {
+                for (z in minZ until maxZ) {
+                    val state = zone.getBlockState(mutable.set(x, y, z))
+                    if (!isSafeSpace(world, mutable, state)) {
+                        return false
+                    }
+                }
+            }
+        }
+        return true
+    }
+
     override fun postFilter(detail: SpawnDetail): Boolean {
         if (!super.postFilter(detail)) {
             return false
         }
 
         if (detail.width > 1 || detail.height > 1) {
-            val sizeX = detail.width.takeIf { it > 0 } ?: 1
-            val sizeY = detail.height.takeIf { it > 0 } ?: 1
-
-            val minX = floor(position.x + 0.5 - (sizeX - 1) / 2F).toInt() - 1
-            val maxX = ceil(position.x + 0.5 + (sizeX + 1) / 2F).toInt() + 1
-
-            val maxY = ceil(position.y + (sizeY + 1) / 2F).toInt() + 1
-
-            val minZ = floor(position.z + 0.5 - (sizeX - 1) / 2F).toInt() - 1
-            val maxZ = ceil(position.z + 0.5 + (sizeX + 1) / 2F).toInt() + 1
-
-            val mutable = BlockPos.MutableBlockPos()
-            for (x in minX until maxX) {
-                for (y in (position.y + 1)..maxY) {
-                    for (z in minZ until maxZ) {
-                        val state = zone.getBlockState(mutable.set(x, y, z))
-                        if (!isSafeSpace(world, mutable, state)) {
-                            return false
-                        }
-                    }
-                }
-            }
+            return hasSpace(detail.width, detail.height)
         }
 
         return true

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/preset/BestSpawnerConfig.kt

@@ -28,7 +28,7 @@ import java.io.InputStreamReader
  * @since July 8th, 2022
  */
 class BestSpawnerConfig {
-    val version = 0
+    val version = 2
     /** Whether an external config will be replaced by an internal one once [version] is higher on the internal. */
     val replaceWithNewVersion = true
     @SerializedName("spawnablePositionTypeWeights", alternate = ["contextWeights"])
@@ -40,11 +40,11 @@ class BestSpawnerConfig {
     )
 
     val worldBuckets = mutableMapOf(
-        "common" to 94F,
+        "common" to 94.05F,
         "uncommon" to 5F,
         "rare" to 0.5F,
         "ultra-rare" to 0.2F,
-        "boss" to 0.3F,
+        "boss" to 0.25F,
     )
 
     val fishingBuckets = mutableMapOf(

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/selection/FlatSelector.kt

@@ -89,6 +89,7 @@ open class FlatSelector : SpawningSelector<FlatSelector.SpawnablePositionSelecti
         val spawnablePositions: List<SpawnablePosition>,
         val selectingSpawnInformation: MutableMap<String, SpawnablePositionBucketSelectionData>,
     ): SpawnSelectionData {
+        override var guaranteedBucket: String? = null
         override val spawnActions = mutableListOf<SpawnAction<*>>()
         override val context = mutableMapOf<String, Any>()
 

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/selection/FlatSpawnablePositionWeightedSelector.kt

@@ -101,6 +101,7 @@ open class FlatSpawnablePositionWeightedSelector : SpawningSelector<FlatSpawnabl
         val spawner: Spawner,
         val spawnablePositions: List<SpawnablePosition>
     ) : SpawnSelectionData {
+        override var guaranteedBucket: String? = null
         override val spawnActions = mutableListOf<SpawnAction<*>>()
         override val context = mutableMapOf<String, Any>()
 

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/selection/SpawnSelectionData.kt

@@ -21,6 +21,7 @@ import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
  * @since April 21st, 2025
  */
 interface SpawnSelectionData {
+    var guaranteedBucket: String?
     val context: MutableMap<String, Any>
     val spawnActions: MutableList<SpawnAction<*>>
     fun removeSpawnDetails(shouldRemove: (SpawnDetail) -> Boolean)
@@ -28,6 +29,7 @@ interface SpawnSelectionData {
 
     companion object {
         val EMPTY = object : SpawnSelectionData {
+            override var guaranteedBucket: String? = null
             override val context: MutableMap<String, Any> = mutableMapOf()
             override val spawnActions: MutableList<SpawnAction<*>> = mutableListOf()
             override fun removeSpawnDetails(shouldRemove: (SpawnDetail) -> Boolean) {}

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/selection/SpawningSelector.kt

@@ -47,7 +47,7 @@ interface SpawningSelector<T : SpawnSelectionData> {
         val spawnActions = selectionData.spawnActions
 
         while (spawnActions.size < maxSpawns) {
-            val bucket = bucketSelector()
+            val bucket = selectionData.guaranteedBucket ?: bucketSelector()
             val spawnAction = selectSpawnAction(
                 spawner = spawner,
                 bucket = bucket,

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

@@ -17,6 +17,7 @@ import com.cobblemon.mod.common.api.spawning.influence.BucketNormalizingInfluenc
 import com.cobblemon.mod.common.api.spawning.influence.SpawnBaitInfluence
 import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
 import com.cobblemon.mod.common.api.spawning.rules.SpawnRule
+import com.cobblemon.mod.common.block.entity.PokeSnackBlockEntity
 import com.cobblemon.mod.common.util.mutableLazy
 import net.minecraft.core.BlockPos
 import net.minecraft.server.level.ServerLevel
@@ -66,10 +67,10 @@ object PokeSnackSpawnerFactory {
         },
     )
 
-    fun create(ctx: Context): FixedAreaSpawner {
+    fun create(ctx: Context): PokeSnackBlockEntity.Spawner {
         val influences = influenceBuilders.mapNotNull { it(ctx) }
 
-        return FixedAreaSpawner(
+        return PokeSnackBlockEntity.Spawner(
             name = ctx.name,
             spawnPool = spawnPool,
             buckets = Cobblemon.bestSpawner.config.pokeSnackBuckets,

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

@@ -46,6 +46,7 @@ open class BottomlessStore(override val uuid: UUID) : PokemonStore<BottomlessPos
         pokemon.forEachIndexed { index, pokemon ->
             pokemon.storeCoordinates.set(StoreCoordinates(this, BottomlessPosition(index)))
         }
+        rebuildPokemonByUuid()
     }
 
     override fun saveToNBT(nbt: CompoundTag, registryAccess: RegistryAccess): CompoundTag {

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

@@ -17,10 +17,10 @@ import com.cobblemon.mod.common.api.storage.factory.PokemonStoreFactory
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.DataKeys
 import com.google.gson.JsonObject
-import java.util.UUID
 import net.minecraft.core.RegistryAccess
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.server.level.ServerPlayer
+import java.util.UUID
 
 /**
  * The base class for all stores of [Pokemon]. A store specifies the kind of coordinate it needs to be given
@@ -53,7 +53,7 @@ abstract class PokemonStore<T : StorePosition> : Iterable<Pokemon> {
      * Runs initialization logic for this store, knowing that it has just been constructed in a [PokemonStoreFactory].
      *
      * The minimum of what this function should do is iterate over all the Pokémon in this store and set their store
-     * coordinates.
+     * coordinates. Built-in stores then rebuild the UUID index via [rebuildPokemonByUuid].
      *
      * If this does not get called, or it does not do its job properly, serious de-sync issues may follow.
      */
@@ -77,7 +77,6 @@ abstract class PokemonStore<T : StorePosition> : Iterable<Pokemon> {
         remove(pokemon)
         val position = getFirstAvailablePosition() ?: return false // Couldn't fit, shrug emoji
         set(position, pokemon)
-        Cobblemon.playerDataManager.getTMData(uuid)?.syncTMsFromPokemon(pokemon)
         return true
     }
 
@@ -99,6 +98,7 @@ abstract class PokemonStore<T : StorePosition> : Iterable<Pokemon> {
 
         setAtPosition(position, pokemon)
         pokemon.storeCoordinates.set(StoreCoordinates(this, position))
+        pokemonByUuid[pokemon.uuid] = pokemon
     }
 
     /** Swaps the Pokémon at the specified positions. If one of the spaces is empty, it will simply move the not-null one to that space. */
@@ -147,10 +147,26 @@ abstract class PokemonStore<T : StorePosition> : Iterable<Pokemon> {
         pokemon.recall()
         pokemon.storeCoordinates.set(null)
         setAtPosition(currentPosition.position, null)
+        pokemonByUuid.remove(pokemon.uuid)
         return true
     }
 
-    operator fun get(uuid: UUID) = find { it.uuid.equals(uuid) }
+    /** In-memory UUID index. Not serialized; rebuilt by [rebuildPokemonByUuid]. */
+    private val pokemonByUuid = hashMapOf<UUID, Pokemon>()
+
+    /** Gets the [Pokemon] with this UUID, or null if it is not in this store. */
+    operator fun get(uuid: UUID): Pokemon? = pokemonByUuid[uuid]
+
+    /**
+     * Rebuilds the UUID index from the store's current contents.
+     *
+     * Call after load or any structural mutation that does not go through [set] / [remove], such as
+     * filling slots directly from NBT/JSON or shrinking a PC.
+     */
+    protected fun rebuildPokemonByUuid() {
+        pokemonByUuid.clear()
+        forEach { pokemonByUuid[it.uuid] = it }
+    }
 
     open fun handleInvalidSpeciesNBT(nbt: CompoundTag) {
         Cobblemon.LOGGER.error("Failed to read unknown species: ${nbt.getString(DataKeys.POKEMON_SPECIES_IDENTIFIER)}")

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

@@ -138,6 +138,7 @@ open class PartyStore(override val uuid: UUID) : PokemonStore<PartyPosition>() {
             val pokemon = get(slot) ?: continue
             pokemon.storeCoordinates.set(StoreCoordinates(this, PartyPosition(slot)))
         }
+        rebuildPokemonByUuid()
     }
 
     override fun onPokemonChanged(pokemon: Pokemon) {
@@ -279,7 +280,7 @@ open class PartyStore(override val uuid: UUID) : PokemonStore<PartyPosition>() {
             }
         }
 
-        return result
+        return result.sortedBy { it.health <= 0 }
     }
     fun clearParty() {
         forEach {

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/pc/PCStore.kt

@@ -105,6 +105,7 @@ open class PCStore(
     override fun initialize() {
         boxes.forEach { it.initialize() }
         backupStore.initialize()
+        rebuildPokemonByUuid()
     }
 
     fun relocateEvictedBoxPokemon(pokemon: Pokemon) {
@@ -135,6 +136,7 @@ open class PCStore(
 
             tryRestoreBackedUpPokemon()
         }
+        rebuildPokemonByUuid()
         pcChangeObservable.emit(Unit)
     }
 
@@ -142,6 +144,7 @@ open class PCStore(
         this.lockedSize = lockNewSize
         boxes.removeAll(boxList)
         boxList.flatMap { it.asIterable() }.forEach(overflowHandler)
+        rebuildPokemonByUuid()
         pcChangeObservable.emit(Unit)
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/tags/CobblemonBiomeTags.kt

@@ -66,6 +66,8 @@ object CobblemonBiomeTags {
     val IS_WARM_OCEAN = create("is_warm_ocean")
     @JvmField
     val IS_DEEP_DARK = create("is_deep_dark")
+    @JvmField
+    val IS_MOUNTAIN = create("is_mountain")
 
     // Has Block tags
     @JvmField

common/src/main/kotlin/com/cobblemon/mod/common/api/tms/ObtainMethod.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.api.tms
 
 import com.cobblemon.mod.common.tms.obtain.DefaultObtainMethod
+import com.cobblemon.mod.common.tms.obtain.ImpossibleObtainMethod
 import com.cobblemon.mod.common.tms.obtain.PlayerHasAdvancementObtainMethod
 import com.cobblemon.mod.common.tms.obtain.PlayerYObtainMethod
 import com.cobblemon.mod.common.tms.obtain.UnlockableObtainMethod
@@ -36,6 +37,7 @@ interface ObtainMethod {
             val variant = buffer.readUtf()
             return when (variant) {
                 "cobblemon:unlockable" -> UnlockableObtainMethod()
+                "cobblemon:impossible" -> ImpossibleObtainMethod()
                 "cobblemon:default" -> DefaultObtainMethod()
                 "cobblemon:advancement" -> {
                     val advancement = buffer.readResourceLocation()

common/src/main/kotlin/com/cobblemon/mod/common/api/tms/TMMoveManager.kt

@@ -14,6 +14,8 @@ import com.cobblemon.mod.common.advancement.CobblemonCriteria
 import com.cobblemon.mod.common.advancement.criterion.CountableContext
 import com.cobblemon.mod.common.advancement.criterion.LearnAllTMContext
 import com.cobblemon.mod.common.advancement.criterion.LearnTMContext
+import com.cobblemon.mod.common.api.abilities.Ability
+import com.cobblemon.mod.common.api.abilities.AbilityPool
 import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.scheduling.ScheduledTask
 import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
@@ -50,6 +52,11 @@ class TMMoveManager(
         learn(listOf(tmId))
     }
 
+    fun syncTMLockFromMove(moveTemplate: MoveTemplate) {
+        val tmId = TechnicalMachines.moveToTM[moveTemplate]?.id ?: return
+        unlearn(listOf(tmId))
+    }
+
     fun getLearnableTMsFromPokemon(pokemon: Pokemon): Collection<ResourceLocation> {
         val learnableMoves = pokemon.allAccessibleMoves.toMutableSet()
         learnableMoves.addAll(pokemon.moveSet.map { it.template })

common/src/main/kotlin/com/cobblemon/mod/common/api/tms/TechnicalMachines.kt

@@ -12,8 +12,9 @@ import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.moves.adapters.MoveTemplateAdapter
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
+import com.cobblemon.mod.common.net.messages.client.tms.TechnicalMachineRegistrySyncPacket
 import com.cobblemon.mod.common.util.adapters.TMObtainMethodAdapter
+import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
@@ -70,5 +71,7 @@ object TechnicalMachines : JsonDataRegistry<TechnicalMachine> {
 
     fun getByResourceLocation(resourceLocation: ResourceLocation) = tmMap[resourceLocation]
     fun getAllResourceLocations() = tmMap.keys.toSet()
-    override fun sync(player: ServerPlayer) {}
+    override fun sync(player: ServerPlayer) {
+        TechnicalMachineRegistrySyncPacket(tmMap.values.toList()).sendToPlayer(player)
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/types/ElementalType.kt

@@ -42,10 +42,12 @@ class ElementalType(
 
     companion object {
         @JvmStatic
-        val BY_STRING_CODEC: Codec<ElementalType> = CodecUtils.createByStringCodec(
-            ElementalTypes::get,
-            {it.showdownId}
-        ) { id -> "No ElementalType for ID $id" }
+        val BY_STRING_CODEC: Codec<ElementalType> by lazy {
+            CodecUtils.createByStringCodec(
+                ElementalTypes::get,
+                { it.showdownId }
+            ) { id -> "No ElementalType for ID $id" }
+        }
     }
 
-}
+}

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

@@ -336,11 +336,12 @@ object BattleBuilder {
             npcPartyStores.add(npcParty)
         }
 
-        if (playerActor.pokemonList.size < battleFormat.battleType.slotsPerActor) {
+        val playerAvailablePokemon = playerActor.pokemonList.count { it.health > 0 }
+        if (playerAvailablePokemon < battleFormat.battleType.slotsPerActor) {
             errors.participantErrors[playerActor] += BattleStartError.insufficientPokemon(
                 actorEntity = player,
                 requiredCount = battleFormat.battleType.slotsPerActor,
-                hadCount = playerActor.pokemonList.size
+                hadCount = playerAvailablePokemon
             )
         }
 

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

@@ -17,6 +17,8 @@ import com.cobblemon.mod.common.util.*
 import com.google.gson.*
 import com.google.gson.reflect.TypeToken
 import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.world.entity.EquipmentSlot
+import net.minecraft.world.item.Items
 import java.lang.Integer.max
 import java.lang.reflect.Type
 import java.util.*
@@ -80,7 +82,8 @@ class ShowdownActionRequest(
                     ShowdownMoveset.Gimmick.TERASTALLIZATION -> cobblemonResource("tera_orb")
                     else -> cobblemonResource("z_ring")
                 }
-                if (!player.hasKeyItem(triggerItem)) moveset.blockGimmick(gimmick)
+                // lets do something silly like an iron helmet for now in place of a keystone TODO change this later lol
+                if (!player.hasKeyItem(triggerItem) && !player.getItemBySlot(EquipmentSlot.HEAD).`is`(Items.IRON_HELMET)) moveset.blockGimmick(gimmick)
             }
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/battles/ai/strongBattleAI/AIUtility.kt

@@ -166,7 +166,7 @@ object AIUtility {
         "geargrind" to Pair(2, 2),
         "twinbeam" to Pair(2, 2),
         "twineedle" to Pair(2, 2),
-        "suringstrikes" to Pair(3, 3),
+        "surgingstrikes" to Pair(3, 3),
         "tripledive" to Pair(3, 3),
         "watershuriken" to Pair(3, 3),
 

common/src/main/kotlin/com/cobblemon/mod/common/battles/ai/strongBattleAI/ActiveTracker.kt

@@ -163,7 +163,8 @@ class TrackerActor(val uuid: UUID) {
             //we assume that AI knows it all about our allies
             trackerActor.party.addAll(actor.pokemonList.map { createAllied(it) })
             actor.activePokemon.forEach {
-                val active = trackerActor.party.first { trackMon -> trackMon.id == it.battlePokemon!!.uuid }
+                val battlePokemon = it.battlePokemon ?: return@forEach
+                val active = trackerActor.party.first { trackMon -> trackMon.id == battlePokemon.uuid }
                 trackerActor.party.remove(active)
                 trackerActor.activePokemon.add(active)
             }
@@ -176,7 +177,8 @@ class TrackerActor(val uuid: UUID) {
             //only know basics of what we see right now
             trackerActor.party.addAll(actor.pokemonList.map { createOpposing(it) })
             actor.activePokemon.forEach {
-                val active = trackerActor.party.first { trackMon -> trackMon.id == it.battlePokemon!!.uuid }
+                val battlePokemon = it.battlePokemon ?: return@forEach
+                val active = trackerActor.party.first { trackMon -> trackMon.id == battlePokemon.uuid }
                 trackerActor.party.remove(active)
                 trackerActor.activePokemon.add(active)
             }

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

@@ -39,7 +39,6 @@ class FaintInstruction(battle: PokemonBattle, val message: BattleMessage) : Inte
         battle.dispatchFuture {
             val (pnx, _) = message.pnxAndUuid(0) ?: return@dispatchFuture CompletableFuture.completedFuture(Unit)
             val pokemon = message.battlePokemon(0, battle) ?: return@dispatchFuture CompletableFuture.completedFuture(Unit)
-            battle.sendUpdate(BattleFaintPacket(pnx))
             val actor = pokemon.actor
             pokemon.effectedPokemon.currentHealth = 0
             val preamble = if (actor is EntityBackedBattleActor<*>) {
@@ -50,6 +49,8 @@ class FaintInstruction(battle: PokemonBattle, val message: BattleMessage) : Inte
             val context = ShowdownInterpreter.getContextFromFaint(faintingPokemon, battle)
 
             preamble.thenAccept {
+                // Sent after the faint/recall animation so clients don't learn about the KO early
+                battle.sendUpdate(BattleFaintPacket(pnx))
                 faintingPokemon.effectedPokemon.currentHealth = 0
                 faintingPokemon.faintedAt = battle.faintCounter++
                 faintingPokemon.sendUpdate()

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

@@ -73,7 +73,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
     override fun playerWillDestroy(world: Level, pos: BlockPos, state: BlockState, player: Player): BlockState {
         if (!player.isCreative && state.getValue(AGE) == FRUIT_AGE) {
             val treeEntity = world.getBlockEntity(pos) as BerryBlockEntity
-            treeEntity.harvest(world, state, pos, player).forEach { drop -> Block.popResource(world, pos, drop) }
+            treeEntity.harvest(world, state, pos, player).forEach { drop -> popResource(world, pos, drop) }
         }
         return super.playerWillDestroy(world, pos, state, player)
     }
@@ -95,7 +95,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
     // Random Tick handler: uses time compensation to ensure correct growth speed
     @Deprecated("Deprecated in Java")
     override fun randomTick(state: BlockState, world: ServerLevel, pos: BlockPos, random: RandomSource) {
-        val blockEntity = world.getBlockEntity(pos) as? BerryBlockEntity ?: return
+        val blockEntity = world.getBlockEntity(pos) as? BerryBlockEntity? ?: return
         
         // processTick calculates elapsed time and updates timer, returns whether growth is needed
         if (blockEntity.processTick(world, pos, state) && !world.getBlockTicks().hasScheduledTick(pos, this)) {
@@ -131,7 +131,10 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
         val newAge = curAge + 1
         if (newAge > FRUIT_AGE) return
         val newState = state.setValue(AGE, newAge)
-        val treeEntity = world.getBlockEntity(pos) as BerryBlockEntity
+        val treeEntity = world.getBlockEntity(pos) as? BerryBlockEntity? ?: run {
+            world.setBlock(pos, Blocks.AIR.defaultBlockState(), UPDATE_CLIENTS)
+            return
+        }
         if (curAge == MATURE_AGE) {
             treeEntity.generateGrowthPoints(world, newState, pos, null)
             determineMutation(world, random, pos, newState)
@@ -149,7 +152,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
         for (direction in this.lookupDirections) {
             val redirectedPos = pos.offset(direction.normal)
             val redirectedState = world.getBlockState(redirectedPos)
-            val berryBlock = redirectedState.block as? BerryBlock ?: continue
+            val berryBlock = redirectedState.block as? BerryBlock? ?: continue
             val berry = berryBlock.berry() ?: continue
             val mutation = this.berry()?.mutationWith(berry) ?: continue
             mutations += mutation
@@ -163,7 +166,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
                         treeEntity.decrementMulchDuration(world, pos, state)
                     }
                     val mutation = if (random.nextInt(1000) < mutateChance) mutations.random() else null
-                    (world.getBlockEntity(pos) as? BerryBlockEntity)?.let { blockEntity ->
+                    (world.getBlockEntity(pos) as? BerryBlockEntity?)?.let { blockEntity ->
                         CobblemonEvents.BERRY_MUTATION_RESULT.post(BerryMutationResultEvent(berry, world, state, pos, berryMutationOffer.mutations, mutation)) { berryMutationResult ->
                             berryMutationResult.pickedMutation?.let { mutation -> blockEntity.mutate(mutation) }
                         }
@@ -181,7 +184,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
     ): Boolean {
         val underBlockState = world.getBlockState(pos.below())
         val validSoil = state.getValue(IS_ROOTED) || underBlockState.`is`(CobblemonBlockTags.BERRY_SOIL)
-        val treeEntity = world.getBlockEntity(pos) as? BerryBlockEntity ?: return false
+        val treeEntity = world.getBlockEntity(pos) as? BerryBlockEntity? ?: return false
         return getMulch(treeEntity) == MulchVariant.NONE && state.getValue(AGE) < FLOWER_AGE && validSoil
     }
 
@@ -356,7 +359,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
         fun getMulch(entity: BerryBlockEntity) = entity.mulchVariant
 
         fun convertMulchToEntity(world: ServerLevel, state: BlockState, pos: BlockPos) {
-            val entity = world.getBlockEntity(pos) as? BerryBlockEntity ?: return
+            val entity = world.getBlockEntity(pos) as? BerryBlockEntity? ?: return
             if (state.getValue(MULCH) != MulchVariant.NONE && state.getValue(MULCH) != entity.mulchVariant) {
                 entity.mulchVariant = state.getValue(MULCH)
                 world.setBlockAndUpdate(pos, state.setValue(MULCH, MulchVariant.NONE))
@@ -373,9 +376,9 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
     }
 
     private fun harvestBerry(world: Level, state: BlockState, pos: BlockPos, player: Player? = null): Boolean {
-        val blockEntity = world.getBlockEntity(pos) as? BerryBlockEntity ?: return false
+        val blockEntity = world.getBlockEntity(pos) as? BerryBlockEntity? ?: return false
         blockEntity.harvest(world, state, pos, player).forEach { drop ->
-            Block.popResource(world, pos, drop)
+            popResource(world, pos, drop)
         }
 
         val sound = if (player != null) CobblemonSounds.BERRY_HARVEST else SoundEvents.SHEEP_SHEAR

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

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.block
 
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonBlocks
 import com.cobblemon.mod.common.api.tags.CobblemonBlockTags
 import com.cobblemon.mod.common.block.TypeGemClusterBlock.Companion.SHOULD_GROW
@@ -34,6 +35,9 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
         const val MIN_DISTANCE_BETWEEN_GEMS = 1
         const val CONTINUATION_CHANCE = 0.8f
 
+        // Upper safety check to prevent infinite loops
+        const val MAX_FORCE_GROW_ATTEMPTS = 64
+
         val BLOCK_TO_CLUSTER: Map<ResourceLocation, Block> by lazy {
             mapOf(
                 ResourceLocation.parse("cobblemon:normal_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_NORMAL,
@@ -113,13 +117,16 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
     fun forceGrow(level: WorldGenLevel, pos: BlockPos, random: RandomSource, percentage: Float) {
         val desiredLength = MAX_CONNECTED_GEMS * percentage
 
-        while (true) {
-            val growInfo = grow(level, pos, random, true)
-            val grown = growInfo.first
-            val clusterSize = growInfo.second
-
-            if (!grown || clusterSize >= desiredLength) break
+        repeat(MAX_FORCE_GROW_ATTEMPTS) {
+            val (grown, clusterSize) = grow(level, pos, random, true)
+            if (!grown || clusterSize >= desiredLength) return
         }
+
+        Cobblemon.LOGGER.warn(
+            "Forced type gem growth at {} stopped after {} attempts without reaching its target size; keeping the partial formation.",
+            pos,
+            MAX_FORCE_GROW_ATTEMPTS
+        )
     }
 
     private fun grow(
@@ -131,7 +138,7 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
         val connectedGems = getConnectedGemBlocks(level, pos) // maybe we can store this and access it for better performance? check for changes in list rather than checking each time grow is called? idk
         val gemCount = connectedGems.size
         val overLimit = gemCount >= MAX_CONNECTED_GEMS
-        
+
         if (overLimit) {
             // if there is no open air pockets to grow any new clusters then exit early
             if (!hasBreathingRoom(level, connectedGems)) {
@@ -166,6 +173,11 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
 
                 level.setBlock(targetPos, placeState, UPDATE_ALL)
 
+                // During world gen, the region silently discards writes into neighboring chunks that are already fully generated.
+                // Through ImposterProtoChunk with writes set to disabled. Checks if the block is still air after the write and skips if so as it can't be filled.
+                // Preventing infinite loops.
+                if (!level.getBlockState(targetPos).`is`(clusterBlock)) continue
+
                 if (forced) {
                     forceAdvanceClusterGrowth(level, targetPos, random)
                 }
@@ -211,4 +223,4 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
     }
 
     override fun isRandomlyTicking(state: BlockState): Boolean = true
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/block/entity/DiscShelfBlockEntity.kt

@@ -16,24 +16,20 @@ import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.core.HolderLookup
 import net.minecraft.core.NonNullList
+import net.minecraft.core.component.DataComponents
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket
 import net.minecraft.sounds.SoundEvent
 import net.minecraft.sounds.SoundSource
-import net.minecraft.world.ContainerHelper
-import net.minecraft.world.Containers
-import net.minecraft.world.InteractionResult
-import net.minecraft.world.ItemInteractionResult
-import net.minecraft.world.WorldlyContainer
+import net.minecraft.world.*
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.Items
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.phys.BlockHitResult
 import net.minecraft.world.level.gameevent.GameEvent
-import java.util.OptionalInt
+import net.minecraft.world.phys.BlockHitResult
+import java.util.*
 import kotlin.math.pow
 
 class DiscShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(CobblemonBlockEntities.DISC_SHELF, pos, state), WorldlyContainer {
@@ -134,25 +130,7 @@ class DiscShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobbl
         return stack.item is TechnicalMachineItem
                 || stack.item == CobblemonItems.UPGRADE
                 || stack.item == CobblemonItems.DUBIOUS_DISC
-                || stack.item == Items.MUSIC_DISC_13
-                || stack.item == Items.MUSIC_DISC_CAT
-                || stack.item == Items.MUSIC_DISC_BLOCKS
-                || stack.item == Items.MUSIC_DISC_CHIRP
-                || stack.item == Items.MUSIC_DISC_FAR
-                || stack.item == Items.MUSIC_DISC_MALL
-                || stack.item == Items.MUSIC_DISC_MELLOHI
-                || stack.item == Items.MUSIC_DISC_STAL
-                || stack.item == Items.MUSIC_DISC_STRAD
-                || stack.item == Items.MUSIC_DISC_WARD
-                || stack.item == Items.MUSIC_DISC_11
-                || stack.item == Items.MUSIC_DISC_WAIT
-                || stack.item == Items.MUSIC_DISC_OTHERSIDE
-                || stack.item == Items.MUSIC_DISC_5
-                || stack.item == Items.MUSIC_DISC_RELIC
-                || stack.item == Items.MUSIC_DISC_PRECIPICE
-                || stack.item == Items.MUSIC_DISC_CREATOR
-                || stack.item == Items.MUSIC_DISC_CREATOR_MUSIC_BOX
-                || stack.item == Items.MUSIC_DISC_PIGSTEP
+                || stack.has(DataComponents.JUKEBOX_PLAYABLE)
     }
 
     fun onNoteBlockPulse(level: Level, noteBlockPos: BlockPos, soundEvent: SoundEvent) {

common/src/main/kotlin/com/cobblemon/mod/common/block/entity/FossilMultiblockEntity.kt

@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.api.multiblock.MultiblockEntity
 import com.cobblemon.mod.common.api.multiblock.MultiblockStructure
 import com.cobblemon.mod.common.api.multiblock.builder.MultiblockStructureBuilder
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.api.tms.TechnicalMachines
 import com.cobblemon.mod.common.api.types.ElementalTypes
 import com.cobblemon.mod.common.block.MonitorBlock
 import com.cobblemon.mod.common.block.multiblock.FossilMultiblockStructure
@@ -307,8 +306,7 @@ open class FossilMultiblockEntity(
     private fun unlockTmForPlayer(player: ServerPlayer, stack: ItemStack) {
         if (stack.item !is TechnicalMachineItem) return
         val move = TMMoveComponent.getTMMove(stack) ?: return
-        val tmId = TechnicalMachines.moveToTM[move]?.id ?: return
-        player.tmList()?.learn(listOf(tmId))
+        player.tmList().syncTMFromMove(move)
     }
 
     private fun updateMonitorScreen() {

common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PokeSnackBlockEntity.kt

@@ -18,10 +18,7 @@ import com.cobblemon.mod.common.api.fishing.SpawnBait
 import com.cobblemon.mod.common.api.fishing.SpawnBait.Effect
 import com.cobblemon.mod.common.api.fishing.SpawnBaitEffects
 import com.cobblemon.mod.common.api.spawning.SpawnCause
-import com.cobblemon.mod.common.api.spawning.detail.EntitySpawnResult
-import com.cobblemon.mod.common.api.spawning.detail.PokemonHerdSpawnDetail
-import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
-import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
+import com.cobblemon.mod.common.api.spawning.detail.*
 import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.api.spawning.spawner.FixedAreaSpawner
@@ -33,7 +30,6 @@ import com.cobblemon.mod.common.item.components.FoodColourComponent
 import com.cobblemon.mod.common.item.components.IngredientComponent
 import com.cobblemon.mod.common.net.messages.client.effect.PokeSnackBlockParticlesPacket
 import com.cobblemon.mod.common.util.DataKeys
-import java.util.UUID
 import net.minecraft.core.BlockPos
 import net.minecraft.core.HolderLookup
 import net.minecraft.nbt.CompoundTag
@@ -47,6 +43,7 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.state.BlockState
+import java.util.*
 
 open class PokeSnackBlockEntity(pos: BlockPos, state: BlockState) :
     BlockEntity(CobblemonBlockEntities.POKE_SNACK, pos, state), TintBlockEntity,
@@ -59,9 +56,29 @@ open class PokeSnackBlockEntity(pos: BlockPos, state: BlockState) :
         const val POKE_SNACK_CRUMBED_ASPECT = "poke_snack_crumbed"
     }
 
+    class Spawner(
+        name: String,
+        spawnPool: SpawnPool,
+        buckets: Map<String, Float>,
+        world: ServerLevel,
+        position: BlockPos,
+        horizontalRadius: Int,
+        verticalRadius: Int,
+        maxPokemonPerChunk: Float
+    ) : FixedAreaSpawner(
+        name = name,
+        spawnPool = spawnPool,
+        buckets = buckets,
+        world = world,
+        position = position,
+        horizontalRadius = horizontalRadius,
+        verticalRadius = verticalRadius,
+        maxPokemonPerChunk = maxPokemonPerChunk
+    )
+
     override var tint: Int? = null
 
-    val spawner: FixedAreaSpawner by lazy {
+    val spawner: Spawner by lazy {
         val server = level as ServerLevel
 
         val baitEffects = getBaitEffects()

common/src/main/kotlin/com/cobblemon/mod/common/block/habitat/HabitatBlock.kt

@@ -25,6 +25,7 @@ import net.minecraft.world.level.block.SoundType
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityTicker
 import net.minecraft.world.level.block.entity.BlockEntityType
+import net.minecraft.world.level.block.entity.CommandBlockEntity
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.level.block.state.properties.BooleanProperty
@@ -80,11 +81,13 @@ class HabitatBlock(properties: Properties) : Block(properties), EntityBlock {
     }
 
     override fun useWithoutItem(state: BlockState, level: Level, pos: BlockPos, player: Player, hitResult: BlockHitResult): InteractionResult {
-        if (!level.isClientSide) {
-            val be = level.getBlockEntity(pos) as? HabitatBlockEntity ?: return InteractionResult.PASS
-            return be.onUse(player, hitResult)
+        val blockEntity = level.getBlockEntity(pos)
+        val be = level.getBlockEntity(pos) as? HabitatBlockEntity ?: return InteractionResult.PASS
+        return if (blockEntity is HabitatBlockEntity && player.canUseGameMasterBlocks()) {
+            be.onUse(player, hitResult)
+        } else {
+            InteractionResult.PASS
         }
-        return InteractionResult.SUCCESS
     }
 
     override fun getDrops(state: BlockState, params: LootParams.Builder): MutableList<ItemStack> {

common/src/main/kotlin/com/cobblemon/mod/common/block/habitat/HabitatBlockEntity.kt

@@ -60,10 +60,12 @@ class HabitatBlockEntity(pos: BlockPos, state: BlockState) :
 
     var spawningStyle: HabitatSpawningStyle = ActivatedHabitatSpawning(this)
 
-    var numberOfPhases: Int = 1
     var phaseOrder = HabitatPhaseOrder.SIMPLE
     var currentPhase = 1
 
+    val numberOfPhases: Int
+        get() = pool.getPhaseCount()
+
     var levelRange: IntRange = 1..Cobblemon.config.maxPokemonLevel
     var modifiers: PokemonProperties = PokemonProperties()
     var pool: HabitatPool = HabitatPool.default()
@@ -139,7 +141,6 @@ class HabitatBlockEntity(pos: BlockPos, state: BlockState) :
         val activatedSettings = habitatSettingsDTO.activatedSettings
         val naturalSettings = habitatSettingsDTO.naturalSettings
         val isActivated = habitatSettingsDTO.isActivatedSpawning
-        this.numberOfPhases = habitatSettingsDTO.numberOfPhases
         this.phaseOrder = habitatSettingsDTO.phaseOrder
         this.levelRange = habitatSettingsDTO.levelRange
         this.modifiers = PokemonProperties.parse(habitatSettingsDTO.modifiers)
@@ -169,7 +170,6 @@ class HabitatBlockEntity(pos: BlockPos, state: BlockState) :
     override fun saveAdditional(tag: CompoundTag, registryLookup: HolderLookup.Provider) {
         super.saveAdditional(tag, registryLookup)
         tag.putString(DataKeys.HABITAT_MIMIC, mimicId.toString())
-        tag.putInt(DataKeys.HABITAT_PHASE_COUNT, numberOfPhases)
         tag.putString(DataKeys.HABITAT_PHASE_ORDER, phaseOrder.toString())
         // Only save the level range when it's a non-trivial one
         if (levelRange.first != 1 || levelRange.last != Cobblemon.config.maxPokemonLevel) {
@@ -201,7 +201,6 @@ class HabitatBlockEntity(pos: BlockPos, state: BlockState) :
             return // Client doesn't need to try loading the rest
         }
 
-        numberOfPhases = tag.getInt(DataKeys.HABITAT_PHASE_COUNT)
         phaseOrder = HabitatPhaseOrder.valueOf(tag.getString(DataKeys.HABITAT_PHASE_ORDER))
         levelRange = tag.getString(DataKeys.HABITAT_LEVEL_RANGE).takeIf { it.isNotBlank() }?.let(IntRangeAdapter::deserialize) ?: 1..Cobblemon.config.maxPokemonLevel
         modifiers = tag.getString(DataKeys.HABITAT_MODIFIERS).takeIf { it.isNotBlank() }?.let(PokemonProperties::parse) ?: PokemonProperties()
@@ -279,7 +278,7 @@ class HabitatBlockEntity(pos: BlockPos, state: BlockState) :
     override fun injectSpawns(bucket: String, spawnablePosition: SpawnablePosition): List<SpawnDetail>? {
         val spawningStyle = spawningStyle
         return if (spawningStyle is NaturalHabitatSpawning) {
-            spawnDetails.filter { it.spawnablePositionType.clazz == spawnablePosition::class.java && it.isSatisfiedBy(spawnablePosition) }
+            spawnDetails.filter { it.bucket == bucket && it.spawnablePositionType.clazz == spawnablePosition::class.java && it.isSatisfiedBy(spawnablePosition) }
         } else {
             null
         }