Corrected Tail Whip's sound to play on the actor rather than the target

Some tweaks to Swords Dance, Close Combat and Aerial Ace
[skip-ci] tidy up changelog
2026-10-21 06:36:25 -04:00 · 2026-09-27 11:48:15 +02:00 · 2026-09-22 12:35:39 +02:00 · 2026-09-21 12:07:55 +01:00 · 2026-09-21 09:16:10 +00:00 · 2026-09-21 09:16:10 +00:00
12068 changed files with 817149 additions and 119892 deletions
@@ -24,6 +24,7 @@ eclipse
 run
 runClient
 runServer
+utilityscripts/implementation/*.txt

 # Files from Forge MDK
 forge*changelog.txt
@@ -36,9 +37,11 @@ common/src/main/resources/assets/cobblemon/showdown
 # Generated files
 */generated/resources/*
 /fabric/src/generated/resources/cobblemon-common.accesswidener
+/fabric/src/main/generated/*
 /.ignored/
 common/.fabric
 .kotlin/

 # MacOS
 .DS_Store
+/common/config/*
@@ -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
@@ -71,8 +72,8 @@ setup_packsquash:
    - echo "Installing wget & unzip"
    - yum install -y wget unzip
    - echo "Downloading PackSquash"
-    - wget https://github.com/ComunidadAylas/PackSquash/releases/download/v0.4.0/PackSquash.CLI.executable.x86_64-unknown-linux-musl.zip
-    - unzip PackSquash.CLI.executable.x86_64-unknown-linux-musl.zip -d ./packsquash_bin
+    - wget https://github.com/ComunidadAylas/PackSquash/releases/download/v0.4.1/packsquash-x86_64-unknown-linux-musl.zip
+    - unzip packsquash-x86_64-unknown-linux-musl.zip -d ./packsquash_bin
    - echo "Creating PackSquash options.toml"
    - |
      cat <<EOF > ./options.toml
@@ -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 {} ./
@@ -1,58 +1,98 @@
 # Changelog
-## [1.7.4 (MONTH Xth, 2026)](#1-7-4)
+## [1.8.2 (MONTH xth, 2026)](#1-8-2)

 ### 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 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
-
-### New rideable Pokémon
+- The following items can now be placed on the ground as blocks:
+  - King's Rock, Galarica Cuff, Unremarkable Teacup, Masterpiece Teacup, Chipped Pot, Cracked Pot, Sachet, Metal Powder, Quick Powder, Bright Powder, Icy Rock, Heat Rock, Smooth Rock, Damp Rock, Destiny Knot, Luminous Moss, Never-Melt Ice, Wide Lens, Scope Lens, and Zoom Lens.
+  - Iron Ball, Metal Coat, Throat Spray, HP Up, Protein, Iron, Carbos, Calcium, Zinc, PP Up, PP Max, Upgrade, Dubious Disc, and Loaded Dice.
+- The following items can now be placed on various surfaces:
+  - Galarica Wreath, Magnet, Flame Orb, Life Orb, Toxic Orb, Light Ball, and Smoke Ball.
+- The following items can now be placed as blocks and have additional functionality:
+  - Ring Target, Metronome, and Eject Button.
+- The following items can now be worn by Players and Pokémon:
+  - Galarica Wreath, Cleanse Tag, Spell Tag, Sharp Beak, Covert Cloak, Shell Helmet, and Never-Melt Ice.
+- Wearable items can now be equipped by a player by holding it and right-clicking (or rebound use/interact)
+  - Wearable items that can be placed down are exempt from this behaviour.

 ### Pokémon Added
+#### Generation 4
+- Snover
+- Abomasnow
+- Burmy
+- Wormadam
+- Mothim
+
+#### Generation 5
+- Tympole
+- Palpitoad
+- Seismitoad
+
+#### Generation 6
+- Helioptile
+- Heliolisk
+
+#### Generation 7
+- Grubbin
+- Charjabug
+- Vikavolt
+
+#### Generation 9
+- Greavard
+- Houndstone

 ### Model updates for the following Pokémon
+- Cacnea
+- Cacturne
+- Binacle
+- Barbaracle
+- Glimmet
+- Glimmora
+- Deerling
+- Sawsbuck (All forms)
+- Absol

 ### Animation updates for the following Pokémon
+- Cacnea
+- Cacturne

 ### Changes
- Restructured Botany Pots integration folder structure
- Decrease default pastured mon wander radius to 32.
- Factor in the weight of pokemon 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)
+- Updated various recipes to display in Recipe Groups within the Recipe Book
+- Updated most recipes to display more logically/consistently within the Recipe Book's categories
+- Make ride rotations less jittery in multiplayer.
+- Adjusted the timing and volume of sounds for Close Combat, Swords Dance and Aerial Ace

 ### Fixes
- Fixes https://gitlab.com/cable-mc/cobblemon/-/issues/1943
- Fix occasional crash on retrieving revived fossils
- 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 issue where particle like beam can disappear when you don't see the beginning of the beam or you look away
- - Fixes https://gitlab.com/cable-mc/cobblemon/-/issues/1943
- - Fix occasional crash on retrieving revived fossils
- - Fix brushing not working on Neoforge
- - [Various Submarine Ride Fixes](https://gitlab.com/cable-mc/cobblemon/-/merge_requests/2157)
- - Fix Pastured mons despawning and running away.
- - Fix Apricorn trees crashing when other mods bonemeal it
- - [Various UFO Ride Improvements](https://gitlab.com/cable-mc/cobblemon/-/merge_requests/2156)
- Fixed NeoForge brewing stand unexpectedly crashing users when shift clicking items within it's menu
- Fixed NPCs switching pokemon very often during battles
- Fixed Campfire pot causing crashes under certain circumstances
- Fixed Type Gems not being consumed upon use
- Fixed Ancient Pokeball's to their respective modifiers
- Fixed a Server warning when recalling Pokemon
+- Correctly grants "They're Minerals!" advancement when planting a type gem
+- Type Gem Blocks now have advancements to give you the recipe in the recipe book (the data for the advancements were inside the recipes somehow??)
+- Some other recipes without advancements have also been corrected
+- Corrected the TM Recipes for Charge Beam and Payday
+- Type Gem blocks now properly generate clusters off of the block.
+- Starter Screen Categories will no longer stop rendering if they are bigger than the viewport, and you are not viewing top or bottom edges
+- Random Starter option now properly handled in height calculation, so now it won't run off into other categories or be un-accessible due to scroll limits if it causes a new row
+- Mochi and Feathers no longer drop glass bottles on use
+- Fixed a rare set of concurrency bugs related to reloading packs on NeoForge; fixes a ModernFix issue
+- Removed unnecessary conditions for Mimikyu's standing pose. Hopefully fixes the rare instance of it using its shoulder animations during battle in multiplayer scenarios.
+- Fixed Rockruff line not blinking
+- Fixed Flygon sometimes using its running animation instead of walking
+- Fixed Bramblin always sleeping outside of battle
+- Fixed Dragonair using its battle idle as a normal idle
+- Fixed Lycanroc's head movement
+- Added head movement to Archaludon
+- Fixed Duraludon line not having any sleep animations
+- Fixed Diglett line not having their faint animations
+- Fixed Kingambit moving its legs while walking
+- Various Structure fixes
+- Tail Whip's sound now correctly plays on the Pokémon performing the move, rather than its target

 ### 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

 ### Molang & Datapacks
- q.item.is_enchanted()
- 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 pokemon
+- A new `negate` variant for evolution requirements has been added, which will negate (invert) the provided inner condition.
+- Added Molang functions for individual Pokédex ids, wherein a subdex is passed in as a string to `dex_caught_count` etc.
+
+### Particles
+
+#### New Move Animations

 ### Localization
- Updated translations for:
+- Updated translations for:
@@ -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
@@ -0,0 +1,41 @@
+# Changelog
+## [1.8.1 (September 13th, 2026)](#1-8-1)
+
+### Animation updates for the following Pokémon
+- Flapple, Appletun, Dipplin, Hydrapple (placeholder animations only).
+
+### Fixes
+- 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:
+  - Brazilian Portuguese
+  - Simplified Chinese
+  - Japanese
@@ -72,6 +72,10 @@ tasks.withType<Test> {
    }
 }

+tasks.processResources {
+    exclude("data/**/README.md")
+}
+
 sourceSets {
    main {
        blossom {
@@ -13,5 +13,6 @@ public interface ChannelDuck {
    void cobblemon$inverseAttenuation(float rolloffFactor);
    void cobblemon$clearFilters();

-//    void cobblemon$exponentialAttenuation(float rolloff, float refDistance, float maxDistance);
+    void cobblemon$applyReverb(float decayTime, float gain, float diffusion, float density);
+    void cobblemon$clearReverb();
 }
@@ -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);
+}
@@ -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();
+}
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.duck.ChannelDuck;
-import com.mojang.blaze3d.audio.Channel;
-import org.lwjgl.openal.AL10;
-import org.lwjgl.openal.EXTEfx;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-@Mixin(Channel.class)
-public abstract class ChannelMixin implements ChannelDuck {
-
-    @Shadow
-    private int source;
-
-    // Id of filter applied when sound is obstructed
-    private int cobblemon$lowPassFilterId = 0;
-
-    @Override
-    public void cobblemon$applyLowPassFilter(float gain, float hfGain) {
-        // Delete old filter if it exists
-        if (cobblemon$lowPassFilterId != 0) {
-            AL10.alSourcei(source, EXTEfx.AL_DIRECT_FILTER, 0); // Detach filter from source
-            EXTEfx.alDeleteFilters(cobblemon$lowPassFilterId);  // Delete old filter
-            cobblemon$lowPassFilterId = 0;
-        }
-
-        // Generate a fresh filter
-        int filterId = EXTEfx.alGenFilters();
-        if (!EXTEfx.alIsFilter(filterId)) {
-            System.err.println("Failed to create OpenAL low-pass filter");
-            return;
-        }
-
-        EXTEfx.alFilteri(filterId, EXTEfx.AL_FILTER_TYPE, EXTEfx.AL_FILTER_LOWPASS);
-        EXTEfx.alFilterf(filterId, EXTEfx.AL_LOWPASS_GAIN, gain);
-        EXTEfx.alFilterf(filterId, EXTEfx.AL_LOWPASS_GAINHF, hfGain);
-
-        AL10.alSourcei(source, EXTEfx.AL_DIRECT_FILTER, filterId);
-
-        // Save the new filter ID
-        cobblemon$lowPassFilterId = filterId;
-    }
-
-    @Override
-    public void cobblemon$inverseAttenuation(float rolloffFactor) {
-        AL10.alSourcei(source, AL10.AL_DISTANCE_MODEL, AL10.AL_INVERSE_DISTANCE);
-        AL10.alSourcef(source, AL10.AL_ROLLOFF_FACTOR,    rolloffFactor);
-        AL10.alSourcef(source, AL10.AL_REFERENCE_DISTANCE, 1.0f);
-        AL10.alSourcef(source, AL10.AL_MAX_DISTANCE,       0.0f);
-    }
-
-    @Override
-    public void cobblemon$clearFilters() {
-        AL10.alSourcei(source, EXTEfx.AL_DIRECT_FILTER, 0);
-
-        if (EXTEfx.alIsFilter(cobblemon$lowPassFilterId)) {
-            EXTEfx.alDeleteFilters(cobblemon$lowPassFilterId);
-            cobblemon$lowPassFilterId = 0;
-        }
-    }
-}
@@ -1,54 +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.Arrays;
-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));
-            }
-            Arrays
-                    .stream(pokemon.getOccupiedSeats())
-                    .filter(x -> !passengers.contains(x))
-                    .filter(Objects::nonNull)
-                    .forEach(Entity::stopRiding);
-
-            var occupiedSeats = Arrays.asList(pokemon.getOccupiedSeats());
-            passengers.stream()
-                    .filter(x -> !occupiedSeats.contains(x))
-                    .filter(Objects::nonNull)
-                    .forEach(x -> x.startRiding(pokemon, true));
-            ci.cancel();
-        }
-    }
-
-}
@@ -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();
+    }
+}
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.block.entity.DiscShelfBlockEntity;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Holder;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.NoteBlock;
+import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(NoteBlock.class)
+public abstract class NoteBlockMixin {
+    @Inject(method = "triggerEvent", at = @At("HEAD"), cancellable = true)
+    private void cobblemon$triggerTMShelfSequencer(BlockState state, Level level, BlockPos pos, int type, int data, CallbackInfoReturnable<Boolean> cir) {
+        final BlockPos shelfPos = pos.below();
+        final BlockEntity blockEntity = level.getBlockEntity(shelfPos);
+        if (!(blockEntity instanceof DiscShelfBlockEntity discShelfBlockEntity)) {
+            return;
+        }
+
+        if (!level.isClientSide) {
+            final BlockPos instrumentPos = shelfPos.below();
+            final SoundEvent soundEvent;
+            if (level.getBlockState(instrumentPos).isAir()) {
+                soundEvent = SoundEvents.NOTE_BLOCK_BIT.value();
+            } else {
+                final NoteBlockInstrument instrument = level.getBlockState(instrumentPos).instrument();
+                final Holder<SoundEvent> holder = instrument.getSoundEvent();
+                soundEvent = holder.value();
+            }
+            discShelfBlockEntity.onNoteBlockPulse(level, pos, soundEvent);
+        }
+
+        // Suppress vanilla note-block playback while it is on top of a TM Shelf.
+        cir.setReturnValue(false);
+    }
+}
@@ -19,8 +19,10 @@ import com.cobblemon.mod.common.mixin.accessor.TrackedEntityAccessor;
 import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateDriverInputPacket;
 import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateOrientationPacket;
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.ClientboundUpdateRidingStatePacket;
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClientboundSeatAssignmentPacket;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientGamePacketListener;
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.ServerEntity;
 import net.minecraft.server.level.ServerLevel;
@@ -37,6 +39,8 @@ 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.List;
+import java.util.LinkedHashMap;
 import java.util.Set;
 import java.util.function.Consumer;

@@ -53,12 +57,15 @@ public abstract class ServerEntityMixin {
    private Matrix3f cobblemon$lastSentOrientation;
    @Unique
    private boolean cobblemon$lastSentActive;
+    @Unique
+    private List<Entity> cobblemon$lastSeatPassengers = List.of();

    @Inject(method = "sendChanges", at = @At("TAIL"))
    private void cobblemon$sendChanges(CallbackInfo ci) {
        cobblemon$sendOrientationChanges();
        cobblemon$sendRidingStateChanges();
        cobblemon$sendDriverInput();
+        cobblemon$sendOccupiedSeatsChange();
    }

    private void cobblemon$sendRidingStateChanges() {
@@ -101,6 +108,22 @@ public abstract class ServerEntityMixin {
        cobblemon$broadcast(new ClientboundUpdateDriverInputPacket(driverInput, entity.getId()));
    }

+    private void cobblemon$sendOccupiedSeatsChange() {
+        if (!(this.entity instanceof PokemonEntity pokemon)) return;
+
+        List<Entity> currentPassengers = pokemon.getPassengers();
+        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;
+            assignments.put(seat.getLocator(), passenger.getId());
+        });
+        cobblemon$broadcast(new ClientboundSeatAssignmentPacket(pokemon.getId(), assignments));
+    }
+
    private void cobblemon$broadcast(NetworkPacket<?> packet) {
        if (!(entity.level() instanceof ServerLevel level)) return;
        ChunkMap chunkMap = level.getChunkSource().chunkMap;
@@ -115,5 +138,4 @@ public abstract class ServerEntityMixin {
            CobblemonNetwork.INSTANCE.sendPacketToPlayer(player, packet);
        }
    }
-
 }
@@ -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) {
@@ -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()
+                );
+    }
 }
@@ -23,6 +23,7 @@ import net.minecraft.client.sounds.ChannelAccess;
 import net.minecraft.client.sounds.SoundEngine;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundSource;
+import net.minecraft.util.Mth;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
@@ -32,6 +33,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

 import java.util.Iterator;
@@ -108,6 +110,17 @@ public abstract class SoundEngineMixin implements SoundEngineDuck {
        }
    }

+    /**
+     * TM Shelf can intentionally push note-block pitches above vanilla's 2.0f ceiling for octave-up playback.
+     * Keep vanilla clamping for all other sounds.
+     */
+    @Inject(method = "calculatePitch", at = @At("HEAD"), cancellable = true)
+    private void cobblemon$allowExtendedNoteblockPitch(SoundInstance sound, CallbackInfoReturnable<Float> cir) {
+        if (sound.getLocation().getPath().startsWith("block.note_block.")) {
+            cir.setReturnValue(Mth.clamp(sound.getPitch(), 0.5F, 4.0F));
+        }
+    }
+
    /** Different behavior for resuming SoundInstances while a BattleMusicInstance is being played. We do not want to resume filtered sounds. */
    @Inject(method = "resume()V", at = @At("HEAD"), cancellable = true)
    public void resume(CallbackInfo cb) {
@@ -8,21 +8,25 @@

 package com.cobblemon.mod.common.mixin;

-import com.cobblemon.mod.common.world.CobblemonStructureIDs;
+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.core.registries.Registries;
-import net.minecraft.resources.ResourceLocation;
 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;
@@ -30,38 +34,70 @@ 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.Arrays;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.Optional;
 import java.util.function.Predicate;

@Mixin(Structure.class)
 public abstract class StructureMixin {
-    // Define a set of structures that should not spawn below Sea Level
-    @Unique
-    private static final Set<ResourceLocation> RESTRICTED_STRUCTURES = new HashSet<>(Arrays.asList(
-            CobblemonStructureIDs.STONJOURNER_HENGE,
-            CobblemonStructureIDs.LUNA_HENGE,
-            CobblemonStructureIDs.SOL_HENGE
-    ));

-    @Inject(method = "generate", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/levelgen/structure/StructureStart;isValid()Z"),
-            cancellable = true)
-    public void cobblemon$isValid(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) {
-        ResourceLocation structureKey = registryAccess.registryOrThrow(Registries.STRUCTURE).getKey((Structure) (Object) this);
-        if(!RESTRICTED_STRUCTURES.contains(structureKey)) {
-            return;
-        }
-        for (StructurePiece piece : structureStart.getPieces()) {
-            if (piece.getBoundingBox().minY() < chunkGenerator.getSeaLevel()) {
-                cir.setReturnValue(StructureStart.INVALID_START);
-                return;
-            }
-        }
-    }
+	/**
+	 * 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();
+	}
 }
@@ -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();
+}
+
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.client;
+
+import com.cobblemon.mod.common.duck.ChannelDuck;
+import com.mojang.blaze3d.audio.Channel;
+import org.lwjgl.openal.AL10;
+import org.lwjgl.openal.AL11;
+import org.lwjgl.openal.EXTEfx;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(Channel.class)
+public abstract class ChannelMixin implements ChannelDuck {
+
+    @Shadow
+    private int source;
+
+    // Ids of effects applied to the channel
+    private int cobblemon$lowPassFilterId = 0;
+    private int cobblemon$reverbEffectId = 0;
+    private int cobblemon$reverbSlotId = 0;
+
+    @Override
+    public void cobblemon$applyLowPassFilter(float gain, float hfGain) {
+        // Delete old filter if it exists
+        if (cobblemon$lowPassFilterId != 0) {
+            AL10.alSourcei(source, EXTEfx.AL_DIRECT_FILTER, 0); // Detach filter from source
+            EXTEfx.alDeleteFilters(cobblemon$lowPassFilterId);  // Delete old filter
+            cobblemon$lowPassFilterId = 0;
+        }
+
+        // Generate a fresh filter
+        int filterId = EXTEfx.alGenFilters();
+        if (!EXTEfx.alIsFilter(filterId)) {
+            System.err.println("Failed to create OpenAL low-pass filter");
+            return;
+        }
+
+        EXTEfx.alFilteri(filterId, EXTEfx.AL_FILTER_TYPE, EXTEfx.AL_FILTER_LOWPASS);
+        EXTEfx.alFilterf(filterId, EXTEfx.AL_LOWPASS_GAIN, gain);
+        EXTEfx.alFilterf(filterId, EXTEfx.AL_LOWPASS_GAINHF, hfGain);
+
+        AL10.alSourcei(source, EXTEfx.AL_DIRECT_FILTER, filterId);
+
+        // Save the new filter ID
+        cobblemon$lowPassFilterId = filterId;
+    }
+
+    @Override
+    public void cobblemon$inverseAttenuation(float rolloffFactor) {
+        AL10.alSourcei(source, AL10.AL_DISTANCE_MODEL, AL10.AL_INVERSE_DISTANCE);
+        AL10.alSourcef(source, AL10.AL_ROLLOFF_FACTOR,    rolloffFactor);
+        AL10.alSourcef(source, AL10.AL_REFERENCE_DISTANCE, 1.0f);
+        AL10.alSourcef(source, AL10.AL_MAX_DISTANCE,       0.0f);
+    }
+
+    @Override
+    public void cobblemon$clearFilters() {
+        AL10.alSourcei(source, EXTEfx.AL_DIRECT_FILTER, 0);
+
+        if (EXTEfx.alIsFilter(cobblemon$lowPassFilterId)) {
+            EXTEfx.alDeleteFilters(cobblemon$lowPassFilterId);
+            cobblemon$lowPassFilterId = 0;
+        }
+    }
+
+    @Override
+    public void cobblemon$applyReverb(float decayTime, float gain, float diffusion, float density) {
+        // Clean up existing reverb first if it exists
+        cobblemon$clearReverb();
+
+        // Create the effect object
+        int effectId = EXTEfx.alGenEffects();
+        if (!EXTEfx.alIsEffect(effectId)) {
+            System.err.println("Failed to create OpenAL reverb effect");
+            return;
+        }
+
+        EXTEfx.alEffecti(effectId, EXTEfx.AL_EFFECT_TYPE, EXTEfx.AL_EFFECT_REVERB);
+        EXTEfx.alEffectf(effectId, EXTEfx.AL_REVERB_DECAY_TIME, decayTime);
+        EXTEfx.alEffectf(effectId, EXTEfx.AL_REVERB_GAIN, gain);
+        EXTEfx.alEffectf(effectId, EXTEfx.AL_REVERB_DIFFUSION, diffusion);
+        EXTEfx.alEffectf(effectId, EXTEfx.AL_REVERB_DENSITY, density);
+
+        // Create auxiliary effect slot and load effect into it
+        int slotId = EXTEfx.alGenAuxiliaryEffectSlots();
+        if (!EXTEfx.alIsAuxiliaryEffectSlot(slotId)) {
+            System.err.println("Failed to create OpenAL auxiliary effect slot");
+            EXTEfx.alDeleteEffects(effectId);
+            return;
+        }
+
+        EXTEfx.alAuxiliaryEffectSloti(slotId, EXTEfx.AL_EFFECTSLOT_EFFECT, effectId);
+
+        // Route source through the slot — send 0, no direct filter
+        AL11.alSource3i(source, EXTEfx.AL_AUXILIARY_SEND_FILTER, slotId, 0, EXTEfx.AL_FILTER_NULL);
+
+        cobblemon$reverbEffectId = effectId;
+        cobblemon$reverbSlotId = slotId;
+    }
+
+    @Override
+    public void cobblemon$clearReverb() {
+        if (cobblemon$reverbSlotId != 0) {
+            // Detach source from slot
+            AL11.alSource3i(source, EXTEfx.AL_AUXILIARY_SEND_FILTER,
+                    EXTEfx.AL_EFFECTSLOT_NULL, 0, EXTEfx.AL_FILTER_NULL);
+            EXTEfx.alDeleteAuxiliaryEffectSlots(cobblemon$reverbSlotId);
+            cobblemon$reverbSlotId = 0;
+        }
+        if (cobblemon$reverbEffectId != 0) {
+            EXTEfx.alDeleteEffects(cobblemon$reverbEffectId);
+            cobblemon$reverbEffectId = 0;
+        }
+    }
+}
@@ -9,10 +9,13 @@
 package com.cobblemon.mod.common.mixin.client;

 import com.cobblemon.mod.common.Cobblemon;
+import com.cobblemon.mod.common.CobblemonItemComponents;
+import com.cobblemon.mod.common.CobblemonItems;
 import com.cobblemon.mod.common.ModAPI;
 import com.cobblemon.mod.common.item.PokeBallItem;
 import com.cobblemon.mod.common.item.PokedexItem;
 import com.cobblemon.mod.common.item.WearableItem;
+import com.cobblemon.mod.common.item.components.TMMoveComponent;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.ItemModelShaper;
@@ -54,11 +57,17 @@ public abstract class ItemRendererMixin {
        cancellable = true
    )
    private void cobblemon$overrideItemModel(ItemStack stack, ItemDisplayContext renderMode, boolean leftHanded, PoseStack matrices, MultiBufferSource multiBufferSource, int light, int overlay, BakedModel model, CallbackInfo ci) {
-        boolean shouldBe2d = renderMode == ItemDisplayContext.GUI || renderMode == ItemDisplayContext.FIXED;
+        boolean shouldBe2d = renderMode == ItemDisplayContext.GUI || renderMode == ItemDisplayContext.FIXED || stack.getItem() == CobblemonItems.TECHNICAL_MACHINE;
        ResourceLocation resourceLocation = null;
        if (shouldBe2d) {
            if (stack.getItem() instanceof PokeBallItem pokeBallItem) resourceLocation = pokeBallItem.getPokeBall().getModel2d();
            else if (stack.getItem() instanceof PokedexItem pokedexItem) resourceLocation = pokedexItem.getType().getItemSpritePath();
+            else if (stack.getItem() == CobblemonItems.TECHNICAL_MACHINE) {
+                TMMoveComponent component = stack.get(CobblemonItemComponents.TM_MOVE);
+                if (component != null) {
+                    resourceLocation = new ResourceLocation(Cobblemon.MODID, "tm/" + component.getMove().getElementalType().showdownId() + "_tm");
+                }
+            }
        }
        if (renderMode != ItemDisplayContext.HEAD && stack.getItem() instanceof WearableItem wearableItem) resourceLocation = wearableItem.getModel2d();

@@ -23,6 +23,7 @@ import com.cobblemon.mod.common.duck.RidePassenger;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.net.messages.server.orientation.ServerboundUpdateOrientationPacket;
 import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateDriverInputPacket;
+import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdatePassengerPositionPacket;
 import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateRiderRotationPacket;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.CameraType;
@@ -148,10 +149,22 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
            cobblemon$lastRideYRot = rideYRot;
            cobblemon$lastRideEyePos = rideEyePos;

-            CobblemonNetwork.INSTANCE.sendToServer(new ServerboundUpdateRiderRotationPacket(rideXRot, rideYRot, rideEyePos));
+            CobblemonNetwork.INSTANCE.sendToServer(
+                    new ServerboundUpdateRiderRotationPacket(rideXRot, rideYRot, rideEyePos)
+            );
        }
+    }

+    @Inject(method = "rideTick", at = @At("TAIL"))
+    private void cobblemon$updatePassengerPosition(CallbackInfo ci) {
+        if (Minecraft.getInstance().player != (Object)this) return;
+        if (!(this.getVehicle() instanceof PokemonEntity pokemonEntity)) return;
+        if (pokemonEntity.getSeatForPassenger(this) == null) return;

+        var offset = this.position().subtract(pokemonEntity.position());
+        CobblemonNetwork.INSTANCE.sendToServer(
+                new ServerboundUpdatePassengerPositionPacket(this.getId(), offset)
+        );
    }

    @Unique
@@ -217,9 +230,10 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
    private void cobblemon$isHandsBusy(CallbackInfoReturnable<Boolean> cir) {
        Entity vehicle = this.getVehicle();
        if (vehicle instanceof PokemonEntity pokemonEntity) {
-            int seatIndex = pokemonEntity.getPassengers().indexOf(this);
-            Seat seat = pokemonEntity.getSeats().get(seatIndex);
-            cir.setReturnValue(seat.getHandsBusy());
+            Seat seat = pokemonEntity.getSeatForPassenger(this);;
+            if (seat != null) {
+                cir.setReturnValue(seat.getHandsBusy());
+            }
        }
    }

@@ -9,8 +9,7 @@
 package com.cobblemon.mod.common.mixin.client;

 import com.cobblemon.mod.common.client.CobblemonBakingOverrides;
-import java.util.List;
-import java.util.Map;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockStateModelLoader;
@@ -18,29 +17,76 @@ import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.packs.resources.Resource;
 import net.minecraft.util.profiling.ProfilerFiller;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
@Mixin(ModelBakery.class)
 public abstract class ModelLoaderMixin {
-
    @Shadow abstract UnbakedModel getModel(ResourceLocation resourceLocation);

    @Shadow protected abstract void registerModel(ModelResourceLocation modelId, UnbakedModel unbakedModel);

+    @Shadow protected abstract void loadItemModelAndDependencies(ResourceLocation resourceLocation);
+
+    @Unique
+    List<String> dynamicFolders = Arrays.asList("egg", "tm");
+
    @Inject(
-        method = "<init>",
-        at = @At("TAIL")
+            method = "<init>",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/util/profiling/ProfilerFiller;popPush(Ljava/lang/String;)V",
+                    ordinal = 1
+            )
+    )
+    public void loadCustomItemModels(BlockColors blockColors,
+                                     ProfilerFiller profiler,
+                                     Map<ResourceLocation, BlockModel> jsonUnbakedModels,
+                                     Map<ResourceLocation, List<BlockStateModelLoader.LoadedJson>> blockStates,
+                                     CallbackInfo ci
+    ) {
+        /*
+         * The models/item/*.json's only get loaded if there's an item in the registry that actually asks for it. It
+         * naively looks for things in the root with an item ID and calls upon it, and some of those JSONs reference
+         * other model JSONs and so it cascades a little bit. Used for block models but more importantly here, sprites.
+         *
+         * The thing about the eggs (and TMs) is, we really want the eggs to be addon-compatible in a way that doesn't restrict
+         * the species that can have eggs, so we can't pre-plan all of them. This mixin looks for the things inside the
+         * egg subfolder (which won't get loaded automagically) and manually inserts them into the unbaked model list so
+         * Minecraft loads them for us. We'll then dynamically call these models from the ItemRendererMixin; so it's
+         * hacky at the init stage and hacky at the render stage. Pretty cool in the gameplay stage though.
+         *
+         * - Hiro
+         */
+
+        dynamicFolders.forEach(folder -> {
+            Map<ResourceLocation, Resource> map = Minecraft.getInstance().getResourceManager().listResources("models/item/" + folder, (t) -> true);
+            map.forEach((key, value) -> {
+                ResourceLocation resourceLocation = new ResourceLocation(key.getNamespace(), key.getPath().replace("models/item/", "").replace(".json", ""));
+                this.loadItemModelAndDependencies(resourceLocation);
+            });
+        });
+    }
+
+    @Inject(
+            method = "<init>",
+            at = @At("TAIL")
    )
    public void init(BlockColors blockColors,
-        ProfilerFiller profiler,
-        Map<ResourceLocation, BlockModel> jsonUnbakedModels,
-        Map<ResourceLocation, List<BlockStateModelLoader.LoadedJson>> blockStates,
-        CallbackInfo ci) {
+                     ProfilerFiller profiler,
+                     Map<ResourceLocation, BlockModel> jsonUnbakedModels,
+                     Map<ResourceLocation, List<BlockStateModelLoader.LoadedJson>> blockStates,
+                     CallbackInfo ci) {
        CobblemonBakingOverrides.INSTANCE.getModels().forEach(bakingOverride -> {
            var unbakedModel = this.getModel(bakingOverride.getModelLocation());
            this.registerModel(bakingOverride.getModelIdentifier(), unbakedModel);
@@ -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
@@ -18,6 +18,7 @@ import com.cobblemon.mod.common.api.drop.EvolutionItemDropEntry
 import com.cobblemon.mod.common.api.drop.ItemDropEntry
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.CobblemonEvents.DATA_SYNCHRONIZED
+import com.cobblemon.mod.common.api.habitats.HabitatPools
 import com.cobblemon.mod.common.api.interaction.RequestManager
 import com.cobblemon.mod.common.api.molang.MoLangLoadedFilesCache
 import com.cobblemon.mod.common.api.molang.ObjectValue
@@ -33,6 +34,7 @@ import com.cobblemon.mod.common.api.pokemon.feature.ChoiceSpeciesFeatureProvider
 import com.cobblemon.mod.common.api.pokemon.feature.FlagSpeciesFeatureProvider
 import com.cobblemon.mod.common.api.pokemon.feature.IntSpeciesFeatureProvider
 import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeatures
+import com.cobblemon.mod.common.api.pokemon.feature.WeightedChoiceSpeciesFeatureProvider
 import com.cobblemon.mod.common.api.pokemon.helditem.HeldItemProvider
 import com.cobblemon.mod.common.api.pokemon.stats.EvCalculator
 import com.cobblemon.mod.common.api.pokemon.stats.Generation8EvCalculator
@@ -62,6 +64,8 @@ import com.cobblemon.mod.common.api.storage.player.adapter.DexDataMongoBackend
 import com.cobblemon.mod.common.api.storage.player.adapter.DexDataNbtBackend
 import com.cobblemon.mod.common.api.storage.player.adapter.PlayerDataJsonBackend
 import com.cobblemon.mod.common.api.storage.player.adapter.PlayerDataMongoBackend
+import com.cobblemon.mod.common.api.storage.player.adapter.TMMoveMongoBackend
+import com.cobblemon.mod.common.api.storage.player.adapter.TMMoveNbtBackend
 import com.cobblemon.mod.common.api.storage.player.factory.CachedPlayerDataStoreFactory
 import com.cobblemon.mod.common.api.tags.CobblemonEntityTypeTags
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
@@ -90,9 +94,11 @@ import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacke
 import com.cobblemon.mod.common.permission.LaxPermissionValidator
 import com.cobblemon.mod.common.platform.events.PlatformEvents
 import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.pokemon.aspects.ALPHA_ASPECT
 import com.cobblemon.mod.common.pokemon.aspects.CHARACTERISTIC_RAINBOW_ASPECT
 import com.cobblemon.mod.common.pokemon.aspects.COSMETIC_SLOT_ASPECT
 import com.cobblemon.mod.common.pokemon.aspects.GENDER_ASPECT
+import com.cobblemon.mod.common.pokemon.aspects.MARK_ASPECT
 import com.cobblemon.mod.common.pokemon.aspects.SHINY_ASPECT
 import com.cobblemon.mod.common.pokemon.evolution.variants.BlockClickEvolution
 import com.cobblemon.mod.common.pokemon.feature.SlowpokeTailRegrowthSpeciesFeature
@@ -102,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
@@ -109,13 +116,7 @@ import com.cobblemon.mod.common.pokemon.properties.UnaspectPropertyType
 import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
-import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.ifDedicatedServer
-import com.cobblemon.mod.common.util.isLaterVersion
-import com.cobblemon.mod.common.util.party
-import com.cobblemon.mod.common.util.requestWallpapers
-import com.cobblemon.mod.common.util.server
+import com.cobblemon.mod.common.util.*
 import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
 import com.cobblemon.mod.common.world.feature.ore.CobblemonOrePlacedFeatures
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
@@ -244,6 +245,8 @@ object Cobblemon {

        DATA_SYNCHRONIZED.subscribe {
            storage.onPlayerDataSync(it)
+            it.tmList().scheduleFullSyncFromStores(it.party(), it.pc())
+            it.pokedex().scheduleFullSyncFromStores(it.party(), it.pc())
            playerDataManager.syncAllToPlayer(it)
            starterHandler.handleJoin(it)
            it.requestWallpapers()
@@ -306,6 +309,9 @@ object Cobblemon {
            this.config.maxPokemonLevel,
            this.config.maxPokemonFriendship,
            this.config.maxDynamaxLevel,
+            this.config.unlockAllMoveDexMovesByDefault,
+            this.config.pokemonIntrinsicSizeMin,
+            this.config.pokemonIntrinsicSizeMax
        ).sendToPlayer(player)
    }

@@ -319,8 +325,11 @@ object Cobblemon {
        GENDER_ASPECT.register()
        COSMETIC_SLOT_ASPECT.register()
        CHARACTERISTIC_RAINBOW_ASPECT.register()
+        ALPHA_ASPECT.register()
+        MARK_ASPECT.register()

        SpeciesFeatures.types["choice"] = ChoiceSpeciesFeatureProvider::class.java
+        SpeciesFeatures.types["weighted_choice"] = WeightedChoiceSpeciesFeatureProvider::class.java
        SpeciesFeatures.types["flag"] = FlagSpeciesFeatureProvider::class.java
        SpeciesFeatures.types["integer"] = IntSpeciesFeatureProvider::class.java

@@ -342,6 +351,7 @@ object Cobblemon {
        CustomPokemonProperty.register(UnaspectPropertyType)
        CustomPokemonProperty.register(FreezeFrameProperty)
        CustomPokemonProperty.register(NoAIProperty)
+        CustomPokemonProperty.register(HeldItemVisibleProperty)

        CobblemonEvents.POKEMON_PROPERTY_INITIALISED.emit(Unit)

@@ -363,6 +373,7 @@ object Cobblemon {
            val server = event.server
            MoLangLoadedFilesCache.initialize(server)
            playerDataManager = PlayerInstancedDataStoreManager().also { it.setup(server) }
+            HabitatPools.onServerLoading(server)

            val mongoClient: MongoClient?

@@ -375,8 +386,12 @@ object Cobblemon {
                    val pokedexNbtFactory = CachedPlayerDataStoreFactory(DexDataNbtBackend())
                    pokedexNbtFactory.setup(server)

+                    val tmMoveFactory = CachedPlayerDataStoreFactory(TMMoveNbtBackend())
+                    tmMoveFactory.setup(server)
+
                    playerDataManager.setFactory(generalJsonFactory, PlayerInstancedDataStoreTypes.GENERAL)
                    playerDataManager.setFactory(pokedexNbtFactory, PlayerInstancedDataStoreTypes.POKEDEX)
+                    playerDataManager.setFactory(tmMoveFactory, PlayerInstancedDataStoreTypes.TM_MOVES)

                    if (config.storageFormat == "nbt") {
                        NBTStoreAdapter(pokemonStoreRoot.absolutePath, useNestedFolders = true, folderPerClass = true)
@@ -403,8 +418,14 @@ object Cobblemon {
                        val pokedexMongoFactory = CachedPlayerDataStoreFactory(DexDataMongoBackend(mongoClient, config.mongoDBDatabaseName, "PokeDexCollection"))
                        pokedexMongoFactory.setup(server)

+                        val tmMovesMongoFactory = CachedPlayerDataStoreFactory(
+                                TMMoveMongoBackend(mongoClient, config.mongoDBDatabaseName, "TMMovesCollection")
+                        )
+                        tmMovesMongoFactory.setup(server)
+
                        playerDataManager.setFactory(generalMongoFactory, PlayerInstancedDataStoreTypes.GENERAL)
                        playerDataManager.setFactory(pokedexMongoFactory, PlayerInstancedDataStoreTypes.POKEDEX)
+                        playerDataManager.setFactory(tmMovesMongoFactory, PlayerInstancedDataStoreTypes.TM_MOVES)
                        MongoDBStoreAdapter(mongoClient, config.mongoDBDatabaseName)
                    } catch (e: ClassNotFoundException) {
                        LOGGER.error("MongoDB driver not found.")
@@ -588,6 +609,7 @@ object Cobblemon {
        this.implementation.registerCommandArgument(cobblemonResource("mark"), MarkArgumentType::class, SingletonArgumentInfo.contextFree(MarkArgumentType::mark))
        this.implementation.registerCommandArgument(cobblemonResource("transform_type"), TransformTypeArgumentType::class, SingletonArgumentInfo.contextFree(TransformTypeArgumentType::transformType))
        this.implementation.registerCommandArgument(cobblemonResource("model_part"), ModelPartArgumentType::class, SingletonArgumentInfo.contextFree(ModelPartArgumentType::modelPart))
+        this.implementation.registerCommandArgument(cobblemonResource("tm"), TmArgumentType::class, SingletonArgumentInfo.contextFree(TmArgumentType::tm))
    }

 }
@@ -8,22 +8,15 @@

 package com.cobblemon.mod.common

-import com.cobblemon.mod.common.block.entity.BerryBlockEntity
-import com.cobblemon.mod.common.block.entity.HealingMachineBlockEntity
-import com.cobblemon.mod.common.block.entity.PCBlockEntity
-import com.cobblemon.mod.common.block.entity.PokemonPastureBlockEntity
-import com.cobblemon.mod.common.block.entity.FossilAnalyzerBlockEntity
-import com.cobblemon.mod.common.block.entity.FossilMultiblockEntity
-import com.cobblemon.mod.common.block.entity.RestorationTankBlockEntity
-import com.cobblemon.mod.common.block.multiblock.FossilMultiblockBuilder
 import com.cobblemon.mod.common.block.entity.*
-import com.cobblemon.mod.common.block.entity.DisplayCaseBlockEntity
+import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
+import com.cobblemon.mod.common.block.multiblock.FossilMultiblockBuilder
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
-import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.resources.ResourceKey
+import net.minecraft.world.level.block.entity.BlockEntityType

 object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, ResourceKey<Registry<BlockEntityType<*>>>, BlockEntityType<*>>() {

@@ -39,6 +32,9 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
    @JvmField
    val LECTERN: BlockEntityType<LecternBlockEntity> = this.create("lectern", BlockEntityType.Builder.of(::LecternBlockEntity, CobblemonBlocks.LECTERN).build(null))

+    @JvmField
+    val DISC_SHELF: BlockEntityType<DiscShelfBlockEntity> = this.create("disc_shelf", BlockEntityType.Builder.of(::DiscShelfBlockEntity, CobblemonBlocks.DISC_SHELF).build(null))
+
    @JvmField
    val BERRY = this.create("berry", BlockEntityType.Builder.of(::BerryBlockEntity, *CobblemonBlocks.berries().values.toTypedArray()).build(null))

@@ -48,6 +44,13 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
    val SIGN: BlockEntityType<CobblemonSignBlockEntity> = this.create("sign", BlockEntityType.Builder.of(::CobblemonSignBlockEntity, CobblemonBlocks.APRICORN_SIGN, CobblemonBlocks.APRICORN_WALL_SIGN, CobblemonBlocks.SACCHARINE_SIGN, CobblemonBlocks.SACCHARINE_WALL_SIGN).build(null))
    @JvmField
    val HANGING_SIGN: BlockEntityType<CobblemonHangingSignBlockEntity> = this.create("hanging_sign", BlockEntityType.Builder.of(::CobblemonHangingSignBlockEntity, CobblemonBlocks.APRICORN_HANGING_SIGN, CobblemonBlocks.APRICORN_WALL_HANGING_SIGN, CobblemonBlocks.SACCHARINE_HANGING_SIGN, CobblemonBlocks.SACCHARINE_WALL_HANGING_SIGN).build(null))
+    @JvmField
+    val TM_MACHINE: BlockEntityType<TMMachineBlockEntity> = this.create("tm_machine", BlockEntityType.Builder.of(::TMMachineBlockEntity, CobblemonBlocks.TM_MACHINE).build(null))
+
+    @JvmField
+    val HABITAT_BLOCK: BlockEntityType<HabitatBlockEntity> = this.create("habitat_block",
+            BlockEntityType.Builder.of(::HabitatBlockEntity, CobblemonBlocks.HABITAT_BLOCK).build(null)
+    )

    @JvmField
    val GILDED_CHEST: BlockEntityType<GildedChestBlockEntity> = this.create("chest", BlockEntityType.Builder.of(::GildedChestBlockEntity,
@@ -11,20 +11,29 @@ package com.cobblemon.mod.common
 import com.cobblemon.mod.common.api.apricorn.Apricorn
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.block.*
-import com.cobblemon.mod.common.block.campfirepot.CampfireBlock
 import com.cobblemon.mod.common.block.LecternBlock
 import com.cobblemon.mod.common.block.MintBlock.MintType
+import com.cobblemon.mod.common.block.campfirepot.CampfireBlock
 import com.cobblemon.mod.common.block.campfirepot.CampfirePotBlock
 import com.cobblemon.mod.common.block.chest.GildedChestBlock
+import com.cobblemon.mod.common.block.decor.ActivatableDecorationBlock
+import com.cobblemon.mod.common.block.decor.RingTargetBlock
 import com.cobblemon.mod.common.block.general.BaleBlock
+import com.cobblemon.mod.common.block.general.HorizontalRotationCarpetBlock
+import com.cobblemon.mod.common.block.general.HorizontalRotationalBlock
 import com.cobblemon.mod.common.block.grower.SaccharineTreeGrower
+import com.cobblemon.mod.common.block.habitat.HabitatBlock
 import com.cobblemon.mod.common.block.sign.CobblemonHangingSignBlock
 import com.cobblemon.mod.common.block.sign.CobblemonSignBlock
 import com.cobblemon.mod.common.block.sign.CobblemonWallHangingSignBlock
 import com.cobblemon.mod.common.block.sign.CobblemonWallSignBlock
-import com.cobblemon.mod.common.block.general.HorizontalRotationCarpetBlock
-import com.cobblemon.mod.common.block.general.HorizontalRotationalBlock
-import com.cobblemon.mod.common.mixin.invoker.*
+import com.cobblemon.mod.common.block.tmmachine.TMMachineBlock
+import com.cobblemon.mod.common.mixin.invoker.BlocksInvoker
+import com.cobblemon.mod.common.mixin.invoker.DoorBlockInvoker
+import com.cobblemon.mod.common.mixin.invoker.FireBlockInvoker
+import com.cobblemon.mod.common.mixin.invoker.PressurePlateBlockInvoker
+import com.cobblemon.mod.common.mixin.invoker.StairsBlockInvoker
+import com.cobblemon.mod.common.mixin.invoker.TrapdoorBlockInvoker
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.core.BlockPos
@@ -46,7 +55,6 @@ import net.minecraft.world.level.block.state.properties.NoteBlockInstrument
 import net.minecraft.world.level.block.state.properties.WoodType
 import net.minecraft.world.level.material.MapColor
 import net.minecraft.world.level.material.PushReaction
-import net.minecraft.world.phys.shapes.Shapes

@Suppress("SameParameterValue", "HasPlatformType", "MemberVisibilityCanBePrivate", "unused")
 object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<Block>>, Block>() {
@@ -121,19 +129,19 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    val APRICORN_PLANKS = this.create("apricorn_planks",
        Block(
            BlockBehaviour.Properties.of().mapColor(MapColor.DIRT).instrument(NoteBlockInstrument.BASS)
-                .strength(2.0f, 3.0f).sound(SoundType.WOOD)
+                .strength(2.0F, 3.0F).sound(SoundType.WOOD)
        )
    )
    @JvmField
    val APRICORN_LEAVES = leaves("apricorn_leaves")
    @JvmField
-    val APRICORN_FENCE = this.create("apricorn_fence", FenceBlock(BlockBehaviour.Properties.of().mapColor(APRICORN_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
+    val APRICORN_FENCE = this.create("apricorn_fence", FenceBlock(BlockBehaviour.Properties.of().mapColor(APRICORN_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD)))
    @JvmField
-    val APRICORN_FENCE_GATE = this.create("apricorn_fence_gate", FenceGateBlock(APRICORN_WOOD_TYPE, BlockBehaviour.Properties.of().mapColor(APRICORN_PLANKS.defaultMapColor()).strength(2.0f, 3.0f).sound(SoundType.WOOD).ignitedByLava().forceSolidOn()))
+    val APRICORN_FENCE_GATE = this.create("apricorn_fence_gate", FenceGateBlock(APRICORN_WOOD_TYPE, BlockBehaviour.Properties.of().mapColor(APRICORN_PLANKS.defaultMapColor()).strength(2.0F, 3.0F).sound(SoundType.WOOD).ignitedByLava().forceSolidOn()))
    @JvmField
    val APRICORN_BUTTON = this.create("apricorn_button", BlocksInvoker.createWoodenButtonBlock(APRICORN_BLOCK_SET_TYPE))
    @JvmField
-    val APRICORN_PRESSURE_PLATE = this.create("apricorn_pressure_plate", PressurePlateBlockInvoker.`cobblemon$create`(APRICORN_BLOCK_SET_TYPE, BlockBehaviour.Properties.of().mapColor(APRICORN_PLANKS.defaultMapColor()).noCollission().strength(0.5f).sound(SoundType.WOOD)))
+    val APRICORN_PRESSURE_PLATE = this.create("apricorn_pressure_plate", PressurePlateBlockInvoker.`cobblemon$create`(APRICORN_BLOCK_SET_TYPE, BlockBehaviour.Properties.of().mapColor(APRICORN_PLANKS.defaultMapColor()).noCollission().strength(0.5F).sound(SoundType.WOOD)))
    @JvmField
    val APRICORN_SIGN = this.create("apricorn_sign", CobblemonSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SIGN), APRICORN_WOOD_TYPE))

@@ -150,7 +158,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    @JvmField
    val APRICORN_WALL_HANGING_SIGN = this.create("apricorn_wall_hanging_sign", CobblemonWallHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_HANGING_SIGN), APRICORN_WOOD_TYPE))
    @JvmField
-    val APRICORN_SLAB = this.create("apricorn_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
+    val APRICORN_SLAB = this.create("apricorn_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD)))
    @JvmField
    val APRICORN_STAIRS = this.create("apricorn_stairs", StairsBlockInvoker.`cobblemon$create`(APRICORN_PLANKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(APRICORN_PLANKS)))
    @JvmField
@@ -187,12 +195,12 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    @JvmField
    val STRIPPED_SACCHARINE_WOOD = this.create("stripped_saccharine_wood", RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD).ignitedByLava())) //log("stripped_saccharine_log")
    @JvmField
-    val SACCHARINE_PLANKS = this.create("saccharine_planks", Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
+    val SACCHARINE_PLANKS = this.create("saccharine_planks", Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD)))
    @JvmField
    val SACCHARINE_LEAVES = this.create("saccharine_leaves", SaccharineLeafBlock(
        BlockBehaviour.Properties.of().mapColor(
            MapColor.PLANT
-        ).strength(0.2f).randomTicks().sound(SoundType.GRASS).noOcclusion()
+        ).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion()
            .isValidSpawn { _: BlockState?, _: BlockGetter?, _: BlockPos?, entity: EntityType<*>? ->
                entity === EntityType.OCELOT || entity === EntityType.PARROT
            }.isSuffocating { _: BlockState?, _: BlockGetter?, _: BlockPos? ->
@@ -204,13 +212,13 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
                false
            }))
    @JvmField
-    val SACCHARINE_FENCE = this.create("saccharine_fence", FenceBlock(BlockBehaviour.Properties.of().mapColor(SACCHARINE_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
+    val SACCHARINE_FENCE = this.create("saccharine_fence", FenceBlock(BlockBehaviour.Properties.of().mapColor(SACCHARINE_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD)))
    @JvmField
-    val SACCHARINE_FENCE_GATE = this.create("saccharine_fence_gate", FenceGateBlock(SACCHARINE_WOOD_TYPE, BlockBehaviour.Properties.of().mapColor(SACCHARINE_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD).ignitedByLava().forceSolidOn()))
+    val SACCHARINE_FENCE_GATE = this.create("saccharine_fence_gate", FenceGateBlock(SACCHARINE_WOOD_TYPE, BlockBehaviour.Properties.of().mapColor(SACCHARINE_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD).ignitedByLava().forceSolidOn()))
    @JvmField
    val SACCHARINE_BUTTON = this.create("saccharine_button", BlocksInvoker.createWoodenButtonBlock(BlockSetType.OAK))
    @JvmField
-    val SACCHARINE_PRESSURE_PLATE = this.create("saccharine_pressure_plate", PressurePlateBlockInvoker.`cobblemon$create`(SACCHARINE_BLOCK_SET_TYPE, BlockBehaviour.Properties.of().mapColor(SACCHARINE_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).noCollission().strength(0.5f).sound(SoundType.WOOD)))
+    val SACCHARINE_PRESSURE_PLATE = this.create("saccharine_pressure_plate", PressurePlateBlockInvoker.`cobblemon$create`(SACCHARINE_BLOCK_SET_TYPE, BlockBehaviour.Properties.of().mapColor(SACCHARINE_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).noCollission().strength(0.5F).sound(SoundType.WOOD)))
    @JvmField
    val SACCHARINE_SIGN = this.create("saccharine_sign", CobblemonSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SIGN), SACCHARINE_WOOD_TYPE))
    @JvmField
@@ -220,7 +228,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    @JvmField
    val SACCHARINE_WALL_HANGING_SIGN = this.create("saccharine_wall_hanging_sign", CobblemonWallHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_HANGING_SIGN), SACCHARINE_WOOD_TYPE))
    @JvmField
-    val SACCHARINE_SLAB = this.create("saccharine_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
+    val SACCHARINE_SLAB = this.create("saccharine_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F).sound(SoundType.WOOD)))
    @JvmField
    val SACCHARINE_STAIRS = this.create("saccharine_stairs", StairsBlockInvoker.`cobblemon$create`(SACCHARINE_PLANKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SACCHARINE_PLANKS)))
    @JvmField
@@ -249,31 +257,31 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    val POKE_SNACK = this.create("poke_snack", PokeSnackBlock(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY).lightLevel { if (it.getValue(BlockStateProperties.LIT)) 3 else 0 }, true))

    @JvmField
-    val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
+    val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null, MapColor.TERRACOTTA_ORANGE)
    @JvmField
-    val LARGE_BUDDING_TUMBLESTONE = tumblestoneBlock("large_budding_tumblestone", GrowableStoneBlock.STAGE_2, 5, 3, TUMBLESTONE_CLUSTER)
+    val LARGE_BUDDING_TUMBLESTONE = tumblestoneBlock("large_budding_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, TUMBLESTONE_CLUSTER, MapColor.TERRACOTTA_ORANGE)
    @JvmField
-    val MEDIUM_BUDDING_TUMBLESTONE = tumblestoneBlock("medium_budding_tumblestone", GrowableStoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_TUMBLESTONE)
+    val MEDIUM_BUDDING_TUMBLESTONE = tumblestoneBlock("medium_budding_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_TUMBLESTONE, MapColor.TERRACOTTA_ORANGE)
    @JvmField
-    val SMALL_BUDDING_TUMBLESTONE = tumblestoneBlock("small_budding_tumblestone", GrowableStoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_TUMBLESTONE)
+    val SMALL_BUDDING_TUMBLESTONE = tumblestoneBlock("small_budding_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_TUMBLESTONE, MapColor.TERRACOTTA_ORANGE)

    @JvmField
-    val SKY_TUMBLESTONE_CLUSTER = tumblestoneBlock("sky_tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
+    val SKY_TUMBLESTONE_CLUSTER = tumblestoneBlock("sky_tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null, MapColor.COLOR_LIGHT_BLUE)
    @JvmField
-    val LARGE_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("large_budding_sky_tumblestone", GrowableStoneBlock.STAGE_2, 5, 3, SKY_TUMBLESTONE_CLUSTER)
+    val LARGE_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("large_budding_sky_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, SKY_TUMBLESTONE_CLUSTER, MapColor.COLOR_LIGHT_BLUE)
    @JvmField
-    val MEDIUM_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("medium_budding_sky_tumblestone", GrowableStoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_SKY_TUMBLESTONE)
+    val MEDIUM_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("medium_budding_sky_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_SKY_TUMBLESTONE, MapColor.COLOR_LIGHT_BLUE)
    @JvmField
-    val SMALL_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("small_budding_sky_tumblestone", GrowableStoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_SKY_TUMBLESTONE)
+    val SMALL_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("small_budding_sky_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_SKY_TUMBLESTONE, MapColor.COLOR_LIGHT_BLUE)

    @JvmField
-    val BLACK_TUMBLESTONE_CLUSTER = tumblestoneBlock("black_tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
+    val BLACK_TUMBLESTONE_CLUSTER = tumblestoneBlock("black_tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null, MapColor.TERRACOTTA_BLACK)
    @JvmField
-    val LARGE_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("large_budding_black_tumblestone", GrowableStoneBlock.STAGE_2, 5, 3, BLACK_TUMBLESTONE_CLUSTER)
+    val LARGE_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("large_budding_black_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, BLACK_TUMBLESTONE_CLUSTER, MapColor.TERRACOTTA_BLACK)
    @JvmField
-    val MEDIUM_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("medium_budding_black_tumblestone", GrowableStoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_BLACK_TUMBLESTONE)
+    val MEDIUM_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("medium_budding_black_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_BLACK_TUMBLESTONE, MapColor.TERRACOTTA_BLACK)
    @JvmField
-    val SMALL_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("small_budding_black_tumblestone", GrowableStoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_BLACK_TUMBLESTONE)
+    val SMALL_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("small_budding_black_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_BLACK_TUMBLESTONE, MapColor.TERRACOTTA_BLACK)

    @JvmField
    val TUMBLESTONE_BLOCK = this.create("tumblestone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
@@ -282,6 +290,87 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    @JvmField
    val BLACK_TUMBLESTONE_BLOCK = this.create("black_tumblestone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))

+    @JvmField
+    val TYPE_GEM_CORE = this.create("deepslate_crystal_core", TypeGemCoreBlock(BlockBehaviour.Properties.of().strength(4.0F, 10.0F).requiresCorrectToolForDrops().mapColor(MapColor.DEEPSLATE)))
+
+    private val typeGemBlocks = mutableMapOf<ResourceLocation, Block>()
+
+    @JvmField
+    val TYPE_GEM_BLOCK_NORMAL = typeGemBlock("normal_gem_block", MapColor.QUARTZ)
+    @JvmField
+    val TYPE_GEM_BLOCK_FIRE = typeGemBlock("fire_gem_block", MapColor.FIRE)
+    @JvmField
+    val TYPE_GEM_BLOCK_WATER = typeGemBlock("water_gem_block", MapColor.WATER)
+    @JvmField
+    val TYPE_GEM_BLOCK_GRASS = typeGemBlock("grass_gem_block", MapColor.COLOR_LIGHT_GREEN)
+    @JvmField
+    val TYPE_GEM_BLOCK_ELECTRIC = typeGemBlock("electric_gem_block", MapColor.GOLD)
+    @JvmField
+    val TYPE_GEM_BLOCK_ICE = typeGemBlock("ice_gem_block", MapColor.ICE)
+    @JvmField
+    val TYPE_GEM_BLOCK_FIGHTING = typeGemBlock("fighting_gem_block", MapColor.COLOR_RED)
+    @JvmField
+    val TYPE_GEM_BLOCK_POISON = typeGemBlock("poison_gem_block", MapColor.COLOR_PURPLE)
+    @JvmField
+    val TYPE_GEM_BLOCK_GROUND = typeGemBlock("ground_gem_block", MapColor.PODZOL)
+    @JvmField
+    val TYPE_GEM_BLOCK_FLYING = typeGemBlock("flying_gem_block", MapColor.COLOR_LIGHT_BLUE)
+    @JvmField
+    val TYPE_GEM_BLOCK_PSYCHIC = typeGemBlock("psychic_gem_block", MapColor.COLOR_MAGENTA)
+    @JvmField
+    val TYPE_GEM_BLOCK_BUG = typeGemBlock("bug_gem_block", MapColor.TERRACOTTA_LIGHT_GREEN)
+    @JvmField
+    val TYPE_GEM_BLOCK_ROCK = typeGemBlock("rock_gem_block", MapColor.TERRACOTTA_LIGHT_GRAY)
+    @JvmField
+    val TYPE_GEM_BLOCK_GHOST = typeGemBlock("ghost_gem_block", MapColor.TERRACOTTA_MAGENTA)
+    @JvmField
+    val TYPE_GEM_BLOCK_DRAGON = typeGemBlock("dragon_gem_block", MapColor.COLOR_BLUE)
+    @JvmField
+    val TYPE_GEM_BLOCK_DARK = typeGemBlock("dark_gem_block", MapColor.TERRACOTTA_BLACK)
+    @JvmField
+    val TYPE_GEM_BLOCK_STEEL = typeGemBlock("steel_gem_block", MapColor.METAL)
+    @JvmField
+    val TYPE_GEM_BLOCK_FAIRY = typeGemBlock("fairy_gem_block", MapColor.COLOR_PINK)
+
+    private val typeGemClusters = mutableMapOf<ResourceLocation, TypeGemClusterBlock>()
+
+    @JvmField
+    val TYPE_GEM_CLUSTER_NORMAL = typeGemCluster("normal_gem_cluster", TYPE_GEM_BLOCK_NORMAL, cobblemonResource("normal_gem"), MapColor.QUARTZ)
+    @JvmField
+    val TYPE_GEM_CLUSTER_FIRE = typeGemCluster("fire_gem_cluster", TYPE_GEM_BLOCK_FIRE, cobblemonResource("fire_gem"), MapColor.FIRE)
+    @JvmField
+    val TYPE_GEM_CLUSTER_WATER = typeGemCluster("water_gem_cluster", TYPE_GEM_BLOCK_WATER, cobblemonResource("water_gem"), MapColor.WATER)
+    @JvmField
+    val TYPE_GEM_CLUSTER_GRASS = typeGemCluster("grass_gem_cluster", TYPE_GEM_BLOCK_GRASS, cobblemonResource("grass_gem"), MapColor.COLOR_LIGHT_GREEN)
+    @JvmField
+    val TYPE_GEM_CLUSTER_ELECTRIC = typeGemCluster("electric_gem_cluster", TYPE_GEM_BLOCK_ELECTRIC, cobblemonResource("electric_gem"), MapColor.GOLD)
+    @JvmField
+    val TYPE_GEM_CLUSTER_ICE = typeGemCluster("ice_gem_cluster", TYPE_GEM_BLOCK_ICE, cobblemonResource("ice_gem"), MapColor.ICE)
+    @JvmField
+    val TYPE_GEM_CLUSTER_FIGHTING = typeGemCluster("fighting_gem_cluster", TYPE_GEM_BLOCK_FIGHTING, cobblemonResource("fighting_gem"), MapColor.COLOR_RED)
+    @JvmField
+    val TYPE_GEM_CLUSTER_POISON = typeGemCluster("poison_gem_cluster", TYPE_GEM_BLOCK_POISON, cobblemonResource("poison_gem"), MapColor.COLOR_PURPLE)
+    @JvmField
+    val TYPE_GEM_CLUSTER_GROUND = typeGemCluster("ground_gem_cluster", TYPE_GEM_BLOCK_GROUND, cobblemonResource("ground_gem"), MapColor.PODZOL)
+    @JvmField
+    val TYPE_GEM_CLUSTER_FLYING = typeGemCluster("flying_gem_cluster", TYPE_GEM_BLOCK_FLYING, cobblemonResource("flying_gem"), MapColor.COLOR_LIGHT_BLUE)
+    @JvmField
+    val TYPE_GEM_CLUSTER_PSYCHIC = typeGemCluster("psychic_gem_cluster", TYPE_GEM_BLOCK_PSYCHIC, cobblemonResource("psychic_gem"), MapColor.COLOR_MAGENTA)
+    @JvmField
+    val TYPE_GEM_CLUSTER_BUG = typeGemCluster("bug_gem_cluster", TYPE_GEM_BLOCK_BUG, cobblemonResource("bug_gem"), MapColor.TERRACOTTA_LIGHT_GREEN)
+    @JvmField
+    val TYPE_GEM_CLUSTER_ROCK = typeGemCluster("rock_gem_cluster", TYPE_GEM_BLOCK_ROCK, cobblemonResource("rock_gem"), MapColor.TERRACOTTA_LIGHT_GRAY)
+    @JvmField
+    val TYPE_GEM_CLUSTER_GHOST = typeGemCluster("ghost_gem_cluster", TYPE_GEM_BLOCK_GHOST, cobblemonResource("ghost_gem"), MapColor.TERRACOTTA_MAGENTA)
+    @JvmField
+    val TYPE_GEM_CLUSTER_DRAGON = typeGemCluster("dragon_gem_cluster", TYPE_GEM_BLOCK_DRAGON, cobblemonResource("dragon_gem"), MapColor.COLOR_BLUE)
+    @JvmField
+    val TYPE_GEM_CLUSTER_DARK = typeGemCluster("dark_gem_cluster", TYPE_GEM_BLOCK_DARK, cobblemonResource("dark_gem"), MapColor.TERRACOTTA_BLACK)
+    @JvmField
+    val TYPE_GEM_CLUSTER_STEEL = typeGemCluster("steel_gem_cluster", TYPE_GEM_BLOCK_STEEL, cobblemonResource("steel_gem"), MapColor.METAL)
+    @JvmField
+    val TYPE_GEM_CLUSTER_FAIRY = typeGemCluster("fairy_gem_cluster", TYPE_GEM_BLOCK_FAIRY, cobblemonResource("fairy_gem"), MapColor.COLOR_PINK)
+
    @JvmField
    val POLISHED_TUMBLESTONE = this.create("polished_tumblestone", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
    @JvmField
@@ -450,6 +539,18 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
        )
    )

+    @JvmField
+    val HABITAT_BLOCK = this.create(
+        name = "habitat_block",
+        entry = HabitatBlock(
+            properties = BlockBehaviour.Properties.of()
+                .mapColor(MapColor.STONE)
+                .strength(1.5F, Blocks.OBSIDIAN.explosionResistance)
+                .pushReaction(PushReaction.BLOCK)
+        )
+    )
+
+
    @JvmField
    val CAMPFIRE = create("campfire", CampfireBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOD).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.PODZOL).strength(2.0F).lightLevel{14}, false))

@@ -459,7 +560,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    @JvmField
    val RELIC_COIN_POUCH = create("relic_coin_pouch", CoinPouchBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.RELIC_COIN_POUCH_SOUNDS).pushReaction(PushReaction.DESTROY).noOcclusion(), true))
    @JvmField
-    val RELIC_COIN_SACK = create("relic_coin_sack", CoinPouchBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.RELIC_COIN_SACK_SOUNDS).pushReaction(PushReaction.DESTROY).strength(0.4f), false))
+    val RELIC_COIN_SACK = create("relic_coin_sack", CoinPouchBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.RELIC_COIN_SACK_SOUNDS).pushReaction(PushReaction.DESTROY).strength(0.4F).mapColor(MapColor.GOLD), false))

    @JvmField
    val GILDED_CHEST = create("gilded_chest", GildedChestBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS), GildedChestBlock.Type.RED))
@@ -512,14 +613,96 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    val PINK_PLAQUE = create("pink_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))

    @JvmField
-    val CLEANSE_TAG = create("cleanse_tag", WallAttachedStackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOD).mapColor(MapColor.NONE).pushReaction(PushReaction.DESTROY).noOcclusion().noCollission(), WallAttachedStackableItemBlock.WallStackableItemBlockType.TAG))
+    val CLEANSE_TAG = create("cleanse_tag", WallAttachedStackableItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_PAPER_SMALL_SOUNDS).mapColor(MapColor.NONE).pushReaction(PushReaction.DESTROY).noOcclusion().noCollission(), WallAttachedStackableItemBlock.WallStackableItemBlockType.TAG))
    @JvmField
-    val SPELL_TAG = create("spell_tag", WallAttachedStackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOD).mapColor(MapColor.NONE).pushReaction(PushReaction.DESTROY).noOcclusion().noCollission(), WallAttachedStackableItemBlock.WallStackableItemBlockType.TAG))
+    val SPELL_TAG = create("spell_tag", WallAttachedStackableItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_PAPER_SMALL_SOUNDS).mapColor(MapColor.NONE).pushReaction(PushReaction.DESTROY).noOcclusion().noCollission(), WallAttachedStackableItemBlock.WallStackableItemBlockType.TAG))

    @JvmField
-    val BLUNDER_POLICY = create("blunder_policy", WallAttachedDirectionalShapeBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion().noCollission(), 14, 12, 1))
+    val BLUNDER_POLICY = create("blunder_policy", WallAttachedDirectionalShapeBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_PAPER_LARGE_SOUNDS).mapColor(MapColor.NONE).noOcclusion().noCollission(), 14, 12, 1))
    @JvmField
-    val WEAKNESS_POLICY = create("weakness_policy", WallAttachedDirectionalShapeBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion().noCollission(), 14, 12, 1))
+    val WEAKNESS_POLICY = create("weakness_policy", WallAttachedDirectionalShapeBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_PAPER_LARGE_SOUNDS).mapColor(MapColor.NONE).noOcclusion().noCollission(), 14, 12, 1))
+
+    @JvmField
+    val RING_TARGET = create("ring_target", RingTargetBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOD).mapColor(MapColor.NONE).noOcclusion().strength(0.125f)))
+    @JvmField
+    val MAGNET = create("magnet", MagnetBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.NONE).noOcclusion().strength(0.075f)))
+    @JvmField
+    val GALARICA_WREATH = create("galarica_wreath", GalaricaWreathBlock(BlockBehaviour.Properties.of().sound(SoundType.AZALEA_LEAVES).mapColor(MapColor.NONE).noOcclusion().noCollission()))
+
+    @JvmField
+    val FLAME_ORB = create("flame_orb", OrbBlock(BlockBehaviour.Properties.of().sound(SoundType.GLASS).mapColor(MapColor.NONE).noOcclusion().lightLevel{15}))
+    @JvmField
+    val TOXIC_ORB = create("toxic_orb", OrbBlock(BlockBehaviour.Properties.of().sound(SoundType.GLASS).mapColor(MapColor.NONE).noOcclusion()))
+    @JvmField
+    val LIFE_ORB = create("life_orb", OrbBlock(BlockBehaviour.Properties.of().sound(SoundType.GLASS).mapColor(MapColor.NONE).noOcclusion().lightLevel{7}))
+    @JvmField
+    val LIGHT_BALL = create("light_ball", OrbBlock(BlockBehaviour.Properties.of().sound(SoundType.GLASS).mapColor(MapColor.NONE).noOcclusion().lightLevel{13}))
+    @JvmField
+    val SMOKE_BALL = create("smoke_ball", OrbBlock(BlockBehaviour.Properties.of().sound(SoundType.GLASS).mapColor(MapColor.NONE).noOcclusion()))
+
+    @JvmField
+    val KINGS_ROCK = create("kings_rock", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.CENTERED_6x))
+
+    @JvmField
+    val GALARICA_CUFF = create("galarica_cuff", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.AZALEA_LEAVES).mapColor(MapColor.NONE).noCollission().noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.FLATTENED_10x4))
+    @JvmField
+    val UNREMARKABLE_TEACUP = create("unremarkable_teacup", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DECORATED_POT).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEACUP))
+    @JvmField
+    val MASTERPIECE_TEACUP = create("masterpiece_teacup", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DECORATED_POT).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEACUP))
+    @JvmField
+    val CHIPPED_POT = create("chipped_pot", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DECORATED_POT).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEAPOT))
+    @JvmField
+    val CRACKED_POT = create("cracked_pot", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DECORATED_POT).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEAPOT))
+
+    @JvmField
+    val SACHET = create("sachet", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOL).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.POUCH))
+    @JvmField
+    val METAL_POWDER = create("metal_powder", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOL).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.POUCH))
+    @JvmField
+    val QUICK_POWDER = create("quick_powder", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOL).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.POUCH))
+    @JvmField
+    val BRIGHT_POWDER = create("bright_powder", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOL).mapColor(MapColor.NONE).noOcclusion().lightLevel{3}, DecorativeItemBlock.DecorativeItemBlockType.POUCH))
+
+    @JvmField
+    val NEVER_MELT_ICE = create("never_melt_ice", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.GLASS).mapColor(MapColor.NONE).noOcclusion().friction(0.989F), DecorativeItemBlock.DecorativeItemBlockType.NEVERMELT))
+    @JvmField
+    val SCOPE_LENS = create("scope_lens", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.COPPER).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.SCOPE))
+    @JvmField
+    val WIDE_LENS = create("wide_lens", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.COPPER).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.WIDE))
+    @JvmField
+    val ZOOM_LENS = create("zoom_lens", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.COPPER).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.ZOOM))
+
+    @JvmField
+    val ICY_ROCK = create("icy_rock", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DEEPSLATE).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.FLATTENED_8x4))
+    @JvmField
+    val HEAT_ROCK = create("heat_rock", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DEEPSLATE).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.FLATTENED_8x4))
+    @JvmField
+    val SMOOTH_ROCK = create("smooth_rock", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DEEPSLATE).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.FLATTENED_8x4))
+    @JvmField
+    val DAMP_ROCK = create("damp_rock", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DEEPSLATE).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.FLATTENED_8x6))
+    @JvmField
+    val DESTINY_KNOT = create("destiny_knot", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOL).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.KNOT))
+    @JvmField
+    val LUMINOUS_MOSS = create("luminous_moss", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.MOSS).mapColor(MapColor.NONE).noOcclusion().lightLevel{5}, DecorativeItemBlock.DecorativeItemBlockType.CENTERED_8x))
+
+    @JvmField
+    val METRONOME = create("metronome", ActivatableDecorationBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.NONE).pushReaction(PushReaction.DESTROY).noOcclusion(), ActivatableDecorationBlock.ActivatableDecorationBlockType.METRONOME))
+    @JvmField
+    val EJECT_BUTTON = create("eject_button", EjectButtonBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.NONE).pushReaction(PushReaction.DESTROY).noOcclusion().strength(0.125f), 40))
+
+    @JvmField
+    val LOADED_DICE = create("loaded_dice", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.DICE))
+    @JvmField
+    val IRON_BALL = create("iron_ball", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.IRON_BALL))
+    @JvmField
+    val METAL_COAT = create("metal_coat", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.METAL_COAT))
+    @JvmField
+    val UPGRADE = create("upgrade", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.UPGRADE))
+    @JvmField
+    val DUBIOUS_DISC = create("dubious_disc", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.UPGRADE))
+
+    @JvmField
+    val THROAT_SPRAY = create("throat_spray", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.THROAT_SPRAY))

    @JvmField
    val FULL_HEAL = create("full_heal", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.STATUS_RESTORE))
@@ -571,32 +754,68 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    @JvmField
    val X_SPEED = create("x_${Stats.SPEED.identifier.path}", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.BATTLE_ITEM))

+    @JvmField
+    val HP_UP = create("hp_up", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
+    @JvmField
+    val PROTEIN = create("protein", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
+    @JvmField
+    val IRON = create("iron", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
+    @JvmField
+    val CARBOS = create("carbos", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
+    @JvmField
+    val CALCIUM = create("calcium", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
+    @JvmField
+    val ZINC = create("zinc", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
+    @JvmField
+    val PP_UP = create("pp_up", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
+    @JvmField
+    val PP_MAX = create("pp_max", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.VITAMIN))
+
    @JvmField
    val MONITOR = create("monitor", MonitorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(5.0F, 6.0F).lightLevel { if (it.getValue(MonitorBlock.SCREEN) != MonitorBlock.MonitorScreen.OFF) 13 else 0 }))
    @JvmField
+    val DAMAGED_MONITOR = create("damaged_monitor", DamagedMonitorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(5.0F, 6.0F).lightLevel { when (it.getValue(DamagedMonitorBlock.SCREEN)) { DamagedMonitorBlock.BrokenMonitorScreen.GLITCHING -> 10; else -> 0 } }))
+    @JvmField
    val FOSSIL_ANALYZER = create("fossil_analyzer", FossilAnalyzerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(5.0F, 6.0F).noOcclusion()))
    @JvmField
    val RESTORATION_TANK = create("restoration_tank", RestorationTankBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.GLASS).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(5.0F, 6.0F).noOcclusion()))

    @JvmField
-    val HEALING_MACHINE = create("healing_machine", HealingMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2f).noOcclusion().lightLevel { if (it.getValue(HealingMachineBlock.CHARGE_LEVEL) >= HealingMachineBlock.MAX_CHARGE_LEVEL) 12 else 5 }))
+    val HEALING_MACHINE = create("healing_machine", HealingMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2F).noOcclusion().lightLevel { if (it.getValue(HealingMachineBlock.CHARGE_LEVEL) >= HealingMachineBlock.MAX_CHARGE_LEVEL) 12 else 5 }))

    @JvmField
    val PC = create("pc", PCBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2F).noOcclusion().lightLevel { if ((it.getValue(PCBlock.ON) as Boolean) && (it.getValue(PCBlock.PART) == PCBlock.PCPart.TOP)) 13 else 0 }))

+    @JvmField
+    val TM_MACHINE = create(
+            "tm_machine",
+        TMMachineBlock(
+            BlockBehaviour.Properties.of()
+                .mapColor(MapColor.COLOR_GREEN)
+                .sound(SoundType.METAL)
+                .pushReaction(PushReaction.BLOCK)
+                .strength(2F)
+                .noOcclusion()
+        )
+    )
+
+
    @JvmField
    val LECTERN = create("lectern", LecternBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).sound(SoundType.WOOD).strength(2.5F).ignitedByLava().lightLevel { if (it.getValue(LecternBlock.EMIT_LIGHT) as Boolean) 13 else 0 }))

+    @JvmField
+    val DISC_SHELF = create("disc_shelf", DiscShelfBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).sound(SoundType.METAL).strength(2.5F)))
+
    @JvmField
    val DISPLAY_CASE = create("display_case", DisplayCaseBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.DISPLAY_CASE_SOUNDS).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.STONE).strength(0.3F).requiresCorrectToolForDrops()))

    // TODO after 1.7
 //    @JvmField
-//    val INCENSE_SWEET = create("incense_sweet", SweetIncenseBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.DISPLAY_CASE_SOUNDS).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.STONE).strength(0.3f)))
+//    val INCENSE_SWEET = create("incense_sweet", SweetIncenseBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.DISPLAY_CASE_SOUNDS).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.STONE).strength(0.3F)))

    @JvmField
    val PASTURE = create("pasture", PastureBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).sound(SoundType.WOOD).strength(2F).noOcclusion().pushReaction(PushReaction.BLOCK).lightLevel { if ((it.getValue(PastureBlock.ON) as Boolean) && (it.getValue(PastureBlock.PART) == PastureBlock.PasturePart.TOP)) 13 else 0 }))
-
+    @JvmField
    val RED_MINT = create("red_mint", MintBlock(MintType.RED, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MINT_SOUNDS).pushReaction(PushReaction.DESTROY)))
    @JvmField
    val BLUE_MINT = create("blue_mint", MintBlock(MintType.BLUE, BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MINT_SOUNDS).pushReaction(PushReaction.DESTROY)))
@@ -660,8 +879,9 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<

    private fun apricornBlock(name: String, apricorn: Apricorn): ApricornBlock = this.create(name, ApricornBlock(BlockBehaviour.Properties.of().mapColor(apricorn.mapColor()).randomTicks().strength(Blocks.OAK_LOG.defaultDestroyTime(), Blocks.OAK_LOG.explosionResistance).sound(SoundType.WOOD).noOcclusion(), apricorn))

-    private fun tumblestoneBlock(name: String, stage: Int, height: Int, xzOffset: Int, nextStage: Block?) : Block {
+    private fun tumblestoneBlock(name: String, stage: Int, height: Int, xzOffset: Int, nextStage: Block?, mapColor: MapColor) : Block {
        return this.create(name, TumblestoneBlock(BlockBehaviour.Properties.of()
+            .mapColor(mapColor)
            .pushReaction(PushReaction.DESTROY)
            .noOcclusion()
            .strength(1.5F)
@@ -890,4 +1110,28 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
        val block = BlocksInvoker.createLeavesBlock(SoundType.GRASS)
        return this.create(name, block)
    }
-}
+
+    private fun typeGemBlock(name: String, mapColor: MapColor): Block {
+        val typeGemBlock = this.create(name, Block(BlockBehaviour.Properties.of().mapColor(mapColor).strength(3.0F, 6.0F).sound(CobblemonSounds.TYPE_GEM_BLOCK_SOUNDS)))
+
+        val identifier = cobblemonResource(name)
+        typeGemBlocks[identifier] = typeGemBlock
+
+        return typeGemBlock
+    }
+
+    fun typeGemBlocks() = typeGemBlocks.toMap()
+
+    private fun typeGemCluster(name: String, gemBlock: Block, dropItemId: ResourceLocation, mapColor: MapColor): Block {
+        val gemClusterBlock = this.create(name, TypeGemClusterBlock(BlockBehaviour.Properties.of().mapColor(mapColor).strength(2.0F, 3.0F).sound(CobblemonSounds.TYPE_GEM_CLUSTER_SOUNDS).pushReaction(PushReaction.DESTROY), gemBlock, dropItemId))
+
+        TypeGemClusterBlock.gemToClusterMap[gemBlock] = gemClusterBlock
+
+        val identifier = cobblemonResource(name)
+        typeGemClusters[identifier] = gemClusterBlock
+
+        return gemClusterBlock
+    }
+
+    fun typeGemClusters() = typeGemClusters.toMap()
+}
@@ -71,10 +71,11 @@ object CobblemonCommands {
        MarkGiveAllCommand.register(dispatcher)
        PcSearchCommand.register(dispatcher)
        PcTakeCommand.register(dispatcher)
+        GiveTmCommand.register(dispatcher)
+        TmCommand.register(dispatcher)

        // Possibly lock down registration if and only if under dev environment or running in an environment
        // with a certain system environment variable set
        CobblemonInfoCommand.register(dispatcher)
-        CalculateSeatPositionCommand.register(dispatcher)
    }
-}
+}
@@ -19,6 +19,7 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.server.packs.resources.PreparableReloadListener
 import net.minecraft.tags.TagKey
+import net.minecraft.world.inventory.MenuType
 import net.minecraft.world.level.GameRules
 import net.minecraft.world.level.ItemLike
 import net.minecraft.world.level.biome.Biome
@@ -69,6 +69,12 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
        .networkSynchronized(FoodColourComponent.PACKET_CODEC)
        .build())

+    @JvmField
+    val TM_MOVE: DataComponentType<TMMoveComponent> = create("tm_move", DataComponentType.builder<TMMoveComponent>()
+        .persistent(TMMoveComponent.CODEC)
+        .networkSynchronized(TMMoveComponent.PACKET_CODEC)
+        .build())
+
    @JvmField
    val INGREDIENT: DataComponentType<IngredientComponent> = create("ingredient", DataComponentType.builder<IngredientComponent>()
            .persistent(IngredientComponent.CODEC)
@@ -101,6 +107,7 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:flavour"), FLAVOUR)
        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:ride_boosts"), RIDE_BOOST)
        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:food_colour"), FOOD_COLOUR)
+        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:tm_move"), TM_MOVE)
        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:ingredient"), INGREDIENT)
        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:food"), FOOD)
        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:mob_effects"), MOB_EFFECTS)
@@ -21,8 +21,8 @@ import com.cobblemon.mod.common.api.text.gray
 import com.cobblemon.mod.common.block.BerryBlock
 import com.cobblemon.mod.common.block.MintBlock
 import com.cobblemon.mod.common.block.MintBlock.MintType
-import com.cobblemon.mod.common.client.pokedex.PokedexType
 import com.cobblemon.mod.common.block.campfirepot.CampfirePotColor
+import com.cobblemon.mod.common.client.pokedex.PokedexType
 import com.cobblemon.mod.common.entity.boat.CobblemonBoatType
 import com.cobblemon.mod.common.item.*
 import com.cobblemon.mod.common.item.armor.CobblemonArmorTrims
@@ -35,7 +35,6 @@ import com.cobblemon.mod.common.item.berry.HealingBerryItem
 import com.cobblemon.mod.common.item.berry.PPRestoringBerryItem
 import com.cobblemon.mod.common.item.berry.PortionHealingBerryItem
 import com.cobblemon.mod.common.item.berry.StatusCuringBerryItem
-import com.cobblemon.mod.common.item.interactive.PonigiriItem
 import com.cobblemon.mod.common.item.food.SinisterTeaItem
 import com.cobblemon.mod.common.item.interactive.*
 import com.cobblemon.mod.common.item.interactive.ability.AbilityChangeItem
@@ -406,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
@@ -453,10 +452,16 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val MONITOR = blockItem("monitor", CobblemonBlocks.MONITOR)
    @JvmField
+    val DAMAGED_MONITOR = blockItem("damaged_monitor", CobblemonBlocks.DAMAGED_MONITOR)
+    @JvmField
    val HEALING_MACHINE = blockItem("healing_machine", CobblemonBlocks.HEALING_MACHINE, Rarity.UNCOMMON)
    @JvmField
    val PC = blockItem("pc", CobblemonBlocks.PC)
    @JvmField
+    val TM_MACHINE = blockItem("tm_machine", CobblemonBlocks.TM_MACHINE)
+    @JvmField
+    val DISC_SHELF = blockItem("disc_shelf", CobblemonBlocks.DISC_SHELF)
+    @JvmField
    val PASTURE = blockItem("pasture", CobblemonBlocks.PASTURE)
    @JvmField
    val DISPLAY_CASE = blockItem("display_case", CobblemonBlocks.DISPLAY_CASE)
@@ -467,9 +472,9 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    // Evolution items
    @JvmField val LINK_CABLE = create("link_cable", LinkCableItem())
    @JvmField val DRAGON_SCALE = noSettingsItem("dragon_scale")
-    @JvmField val METAL_COAT = noSettingsItem("metal_coat")
-    @JvmField val UPGRADE = noSettingsItem("upgrade")
-    @JvmField val DUBIOUS_DISC = noSettingsItem("dubious_disc")
+    @JvmField val METAL_COAT = itemNameBlockItem("metal_coat", CobblemonBlocks.METAL_COAT)
+    @JvmField val UPGRADE = itemNameBlockItem("upgrade", CobblemonBlocks.UPGRADE)
+    @JvmField val DUBIOUS_DISC = itemNameBlockItem("dubious_disc", CobblemonBlocks.DUBIOUS_DISC)
    @JvmField val DEEP_SEA_SCALE = noSettingsItem("deep_sea_scale")
    @JvmField val DEEP_SEA_TOOTH = noSettingsItem("deep_sea_tooth")
    @JvmField val ELECTIRIZER = noSettingsItem("electirizer")
@@ -478,7 +483,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField val PROTECTOR = noSettingsItem("protector")
    @JvmField val REAPER_CLOTH = noSettingsItem("reaper_cloth")
    @JvmField val PRISM_SCALE = noSettingsItem("prism_scale")
-    @JvmField val SACHET = noSettingsItem("sachet")
+    @JvmField val SACHET = itemNameBlockItem("sachet", CobblemonBlocks.SACHET)
    @JvmField val WHIPPED_DREAM = create("whipped_dream", foodItem(8, 0.3f))
    @JvmField val STRAWBERRY_SWEET = create("strawberry_sweet", foodItem(6, 0.125f))
    @JvmField val LOVE_SWEET = create("love_sweet", foodItem(6, 0.125f))
@@ -487,22 +492,20 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField val FLOWER_SWEET = create("flower_sweet", foodItem(6, 0.125f))
    @JvmField val STAR_SWEET = create("star_sweet", foodItem(6, 0.125f))
    @JvmField val RIBBON_SWEET = create("ribbon_sweet", foodItem(6, 0.125f))
-    @JvmField val CHIPPED_POT = noSettingsItem("chipped_pot")
-    @JvmField val CRACKED_POT = noSettingsItem("cracked_pot")
-    @JvmField val MASTERPIECE_TEACUP = noSettingsItem("masterpiece_teacup")
-    @JvmField val UNREMARKABLE_TEACUP = noSettingsItem("unremarkable_teacup")
+    @JvmField val CHIPPED_POT = itemNameBlockItem("chipped_pot", CobblemonBlocks.CHIPPED_POT)
+    @JvmField val CRACKED_POT = itemNameBlockItem("cracked_pot", CobblemonBlocks.CRACKED_POT)
+    @JvmField val MASTERPIECE_TEACUP = itemNameBlockItem("masterpiece_teacup", CobblemonBlocks.MASTERPIECE_TEACUP)
+    @JvmField val UNREMARKABLE_TEACUP = itemNameBlockItem("unremarkable_teacup", CobblemonBlocks.UNREMARKABLE_TEACUP)
    @JvmField val SWEET_APPLE = compostableItem("sweet_apple", foodItem(4, 0.3f), 0.65f)
    @JvmField val TART_APPLE = compostableItem("tart_apple", foodItem(4, 0.3f), 0.65f)
    @JvmField val SYRUPY_APPLE = compostableItem("syrupy_apple", foodItem(4, 0.3f), 0.65f)
-    @JvmField val GALARICA_CUFF = noSettingsItem("galarica_cuff")
-    @JvmField val GALARICA_WREATH = noSettingsItem("galarica_wreath")
+    @JvmField val GALARICA_CUFF = itemNameBlockItem("galarica_cuff", CobblemonBlocks.GALARICA_CUFF)
    @JvmField val BLACK_AUGURITE = noSettingsItem("black_augurite")
    @JvmField val PEAT_BLOCK = noSettingsItem("peat_block")
    @JvmField val RAZOR_CLAW = noSettingsItem("razor_claw")
    @JvmField val RAZOR_FANG = noSettingsItem("razor_fang")
    @JvmField val AUSPICIOUS_ARMOR = heldItem("auspicious_armor")
    @JvmField val MALICIOUS_ARMOR = heldItem("malicious_armor")
-    @JvmField val SHELL_HELMET = heldItem("shell_helmet")
    @JvmField val METAL_ALLOY = noSettingsItem("metal_alloy")
    @JvmField val SCROLL_OF_DARKNESS = noSettingsItem("scroll_of_darkness")
    @JvmField val SCROLL_OF_WATERS = noSettingsItem("scroll_of_waters")
@@ -599,6 +602,9 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It

    @JvmField val BERRY_JUICE = this.create("berry_juice", BerryJuiceItem())

+    @JvmField
+    val HABITAT_BLOCK = blockItem("habitat_block", CobblemonBlocks.HABITAT_BLOCK)
+
    @JvmField
    val GALARICA_NUTS = compostableItemNameBlockItem("galarica_nuts", CobblemonBlocks.GALARICA_NUT_BUSH)

@@ -643,17 +649,17 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val EXPERIENCE_CANDY_XL = candyItem("exp_candy_xl") { _, _ -> CandyItem.DEFAULT_XL_CANDY_YIELD }
    @JvmField
-    val CALCIUM = create("calcium", VitaminItem(Stats.SPECIAL_ATTACK))
+    val CALCIUM = create("calcium", VitaminItem(Stats.SPECIAL_ATTACK, CobblemonBlocks.CALCIUM))
    @JvmField
-    val CARBOS = create("carbos", VitaminItem(Stats.SPEED))
+    val CARBOS = create("carbos", VitaminItem(Stats.SPEED, CobblemonBlocks.CARBOS))
    @JvmField
-    val HP_UP = create("hp_up", VitaminItem(Stats.HP))
+    val HP_UP = create("hp_up", VitaminItem(Stats.HP, CobblemonBlocks.HP_UP))
    @JvmField
-    val IRON = create("iron", VitaminItem(Stats.DEFENCE))
+    val IRON = create("iron", VitaminItem(Stats.DEFENCE, CobblemonBlocks.IRON))
    @JvmField
-    val PROTEIN = create("protein", VitaminItem(Stats.ATTACK))
+    val PROTEIN = create("protein", VitaminItem(Stats.ATTACK, CobblemonBlocks.PROTEIN))
    @JvmField
-    val ZINC = create("zinc", VitaminItem(Stats.SPECIAL_DEFENCE))
+    val ZINC = create("zinc", VitaminItem(Stats.SPECIAL_DEFENCE, CobblemonBlocks.ZINC))
    @JvmField
    val HEALTH_MOCHI = create("health_mochi", MochiItem(Stats.HP))
    @JvmField
@@ -735,9 +741,9 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val MAX_REVIVE = create("max_revive", ReviveItem(max = true))
    @JvmField
-    val PP_UP = create("pp_up", PPUpItem(1))
+    val PP_UP = create("pp_up", PPUpItem(1, CobblemonBlocks.PP_UP))
    @JvmField
-    val PP_MAX = create("pp_max", PPUpItem(3))
+    val PP_MAX = create("pp_max", PPUpItem(3, CobblemonBlocks.PP_MAX))

    @JvmField
    val RED_MINT_SEEDS = mintSeed("red", MintType.RED.getCropBlock())
@@ -819,7 +825,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField val DIRE_HIT = create("dire_hit", DireHitItem(CobblemonBlocks.DIRE_HIT))
    @JvmField val GUARD_SPEC = create("guard_spec", GuardSpecItem(CobblemonBlocks.GUARD_SPEC))

-    @JvmField val FULL_HEAL = create("full_heal", StatusCureItem("item.cobblemon.full_heal", block = CobblemonBlocks.FULL_HEAL))
+    @JvmField val FULL_HEAL = create("full_heal", StatusCureItem("item.cobblemon.full_heal", *Statuses.getPersistentStatuses().toTypedArray(), block = CobblemonBlocks.FULL_HEAL))
    @JvmField val ANTIDOTE = create("antidote", StatusCureItem("item.cobblemon.antidote", Statuses.POISON, Statuses.POISON_BADLY, block = CobblemonBlocks.ANTIDOTE))
    @JvmField val AWAKENING = create("awakening", StatusCureItem("item.cobblemon.awakening", Statuses.SLEEP, block = CobblemonBlocks.AWAKENING))
    @JvmField val BURN_HEAL = create("burn_heal", StatusCureItem("item.cobblemon.burn_heal", Statuses.BURN, block = CobblemonBlocks.BURN_HEAL))
@@ -914,11 +920,18 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField val CHOICE_SPECS = wearableItem("choice_specs")
    @JvmField val EXP_SHARE = wearableItem("exp_share")
    @JvmField val FOCUS_BAND = wearableItem("focus_band")
-    @JvmField val KINGS_ROCK = wearableItem("kings_rock")
+    @JvmField val KINGS_ROCK = wearableBlockItem("kings_rock", CobblemonBlocks.KINGS_ROCK)
+    @JvmField val NEVER_MELT_ICE = wearableBlockItem("never_melt_ice", CobblemonBlocks.NEVER_MELT_ICE)
    @JvmField val MUSCLE_BAND = wearableItem("muscle_band")
    @JvmField val ROCKY_HELMET = wearableItem("rocky_helmet")
    @JvmField val SAFETY_GOGGLES = wearableItem("safety_goggles")
    @JvmField val WISE_GLASSES = wearableItem("wise_glasses")
+    @JvmField val SHARP_BEAK = wearableItem("sharp_beak")
+    @JvmField val COVERT_CLOAK = wearableItem("covert_cloak")
+    @JvmField val SHELL_HELMET = wearableItem("shell_helmet")
+    @JvmField val GALARICA_WREATH = wearableBlockItem("galarica_wreath", CobblemonBlocks.GALARICA_WREATH)
+    @JvmField val CLEANSE_TAG = wearableBlockItem("cleanse_tag", CobblemonBlocks.CLEANSE_TAG)
+    @JvmField val SPELL_TAG = wearableBlockItem("spell_tag", CobblemonBlocks.SPELL_TAG)

    // Held Items
    @JvmField
@@ -946,17 +959,13 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val CHOICE_SCARF = heldItem("choice_scarf")
    @JvmField
-    val CLEANSE_TAG = itemNameBlockItem("cleanse_tag", CobblemonBlocks.CLEANSE_TAG)
-    @JvmField
    val CLEAR_AMULET = heldItem("clear_amulet")
    @JvmField
-    val COVERT_CLOAK = heldItem("covert_cloak")
-    @JvmField
-    val DESTINY_KNOT = heldItem("destiny_knot")
+    val DESTINY_KNOT = itemNameBlockItem("destiny_knot", CobblemonBlocks.DESTINY_KNOT)
    @JvmField
    val DRAGON_FANG = heldItem("dragon_fang")
    @JvmField
-    val EJECT_BUTTON = heldItem("eject_button")
+    val EJECT_BUTTON = itemNameBlockItem("eject_button", CobblemonBlocks.EJECT_BUTTON)
    @JvmField
    val EJECT_PACK = heldItem("eject_pack")
    @JvmField
@@ -970,7 +979,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val FAIRY_FEATHER = heldItem("fairy_feather")
    @JvmField
-    val FLAME_ORB = heldItem("flame_orb")
+    val FLAME_ORB = itemNameBlockItem("flame_orb", CobblemonBlocks.FLAME_ORB)
    @JvmField
    val FLOAT_STONE = heldItem("float_stone")
    @JvmField
@@ -984,34 +993,32 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val HEAVY_DUTY_BOOTS = heldItem("heavy_duty_boots")
    @JvmField
-    val IRON_BALL = heldItem("iron_ball")
+    val IRON_BALL = itemNameBlockItem("iron_ball", CobblemonBlocks.IRON_BALL)
    @JvmField
    val LAGGING_TAIL = heldItem("lagging_tail")
    @JvmField
    val LEFTOVERS = compostableHeldItem("leftovers", null, 0.50f)
    @JvmField
-    val LIFE_ORB = heldItem("life_orb")
+    val LIFE_ORB = itemNameBlockItem("life_orb", CobblemonBlocks.LIFE_ORB)
    @JvmField
-    val LIGHT_BALL = heldItem("light_ball")
+    val LIGHT_BALL = itemNameBlockItem("light_ball", CobblemonBlocks.LIGHT_BALL)
    @JvmField
    val LIGHT_CLAY = heldItem("light_clay")
    @JvmField
-    val LOADED_DICE = heldItem("loaded_dice")
+    val LOADED_DICE = itemNameBlockItem("loaded_dice", CobblemonBlocks.LOADED_DICE)
    @JvmField
    val LUCKY_EGG = heldItem("lucky_egg")
    @JvmField
-    val LUMINOUS_MOSS = heldItem("luminous_moss")
+    val LUMINOUS_MOSS = itemNameBlockItem("luminous_moss", CobblemonBlocks.LUMINOUS_MOSS)
    @JvmField
-    val MAGNET = heldItem("magnet")
+    val MAGNET = itemNameBlockItem("magnet", CobblemonBlocks.MAGNET)
    @JvmField
-    val METRONOME = heldItem("metronome")
+    val METRONOME = itemNameBlockItem("metronome", CobblemonBlocks.METRONOME)
    @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 POISON_BARB = heldItem("poison_barb")
    @JvmField
    val POWER_ANKLET = heldItem("power_anklet")
@@ -1036,13 +1043,11 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val RED_CARD = heldItem("red_card")
    @JvmField
-    val RING_TARGET = heldItem("ring_target")
+    val RING_TARGET = itemNameBlockItem("ring_target", CobblemonBlocks.RING_TARGET)
    @JvmField
    val ROOM_SERVICE = heldItem("room_service")
    @JvmField
-    val SCOPE_LENS = heldItem("scope_lens")
-    @JvmField
-    val SHARP_BEAK = heldItem("sharp_beak")
+    val SCOPE_LENS = itemNameBlockItem("scope_lens", CobblemonBlocks.SCOPE_LENS)
    @JvmField
    val SHED_SHELL = heldItem("shed_shell")
    @JvmField
@@ -1054,9 +1059,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val SOFT_SAND = heldItem("soft_sand")
    @JvmField
-    val SPELL_TAG = itemNameBlockItem("spell_tag", CobblemonBlocks.SPELL_TAG)
-    @JvmField
-    val SMOKE_BALL = heldItem("smoke_ball")
+    val SMOKE_BALL = itemNameBlockItem("smoke_ball", CobblemonBlocks.SMOKE_BALL)
    @JvmField
    val SOOTHE_BELL = heldItem("soothe_bell")
    @JvmField
@@ -1064,9 +1067,9 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val TERRAIN_EXTENDER = heldItem("terrain_extender")
    @JvmField
-    val THROAT_SPRAY = heldItem("throat_spray")
+    val THROAT_SPRAY = itemNameBlockItem("throat_spray", CobblemonBlocks.THROAT_SPRAY)
    @JvmField
-    val TOXIC_ORB = heldItem("toxic_orb")
+    val TOXIC_ORB = itemNameBlockItem("toxic_orb", CobblemonBlocks.TOXIC_ORB)
    @JvmField
    val TWISTED_SPOON = heldItem("twisted_spoon")
    @JvmField
@@ -1074,9 +1077,9 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val WEAKNESS_POLICY = itemNameBlockItem("weakness_policy", CobblemonBlocks.WEAKNESS_POLICY)
    @JvmField
-    val WIDE_LENS = heldItem("wide_lens")
+    val WIDE_LENS = itemNameBlockItem("wide_lens", CobblemonBlocks.WIDE_LENS)
    @JvmField
-    val ZOOM_LENS = heldItem("zoom_lens")
+    val ZOOM_LENS = itemNameBlockItem("zoom_lens", CobblemonBlocks.ZOOM_LENS)
    @JvmField
    val MENTAL_HERB = compostableHeldItem("mental_herb", null, 0.85F)
    @JvmField
@@ -1088,19 +1091,19 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val WHITE_HERB = compostableHeldItem("white_herb", null, 0.85F)
    @JvmField
-    val BRIGHT_POWDER = heldItem("bright_powder")
+    val BRIGHT_POWDER = itemNameBlockItem("bright_powder", CobblemonBlocks.BRIGHT_POWDER)
    @JvmField
-    val METAL_POWDER = heldItem("metal_powder")
+    val METAL_POWDER = itemNameBlockItem("metal_powder", CobblemonBlocks.METAL_POWDER)
    @JvmField
-    val QUICK_POWDER = heldItem("quick_powder")
+    val QUICK_POWDER = itemNameBlockItem("quick_powder", CobblemonBlocks.QUICK_POWDER)
    @JvmField
-    val DAMP_ROCK = heldItem("damp_rock")
+    val DAMP_ROCK = itemNameBlockItem("damp_rock", CobblemonBlocks.DAMP_ROCK)
    @JvmField
-    val HEAT_ROCK = heldItem("heat_rock")
+    val HEAT_ROCK = itemNameBlockItem("heat_rock", CobblemonBlocks.HEAT_ROCK)
    @JvmField
-    val SMOOTH_ROCK = heldItem("smooth_rock")
+    val SMOOTH_ROCK = itemNameBlockItem("smooth_rock", CobblemonBlocks.SMOOTH_ROCK)
    @JvmField
-    val ICY_ROCK = heldItem("icy_rock")
+    val ICY_ROCK = itemNameBlockItem("icy_rock", CobblemonBlocks.ICY_ROCK)

    // Mulch
    @JvmField
@@ -1208,6 +1211,83 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val BLACK_TUMBLESTONE_BLOCK = blockItem("black_tumblestone_block", CobblemonBlocks.BLACK_TUMBLESTONE_BLOCK)

+    @JvmField
+    val TYPE_GEM_CORE = blockItem("deepslate_crystal_core", CobblemonBlocks.TYPE_GEM_CORE)
+
+    @JvmField
+    val TYPE_GEM_CLUSTER_NORMAL = blockItem("normal_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_NORMAL)
+    @JvmField
+    val TYPE_GEM_CLUSTER_FIRE = blockItem("fire_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_FIRE)
+    @JvmField
+    val TYPE_GEM_CLUSTER_WATER = blockItem("water_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_WATER)
+    @JvmField
+    val TYPE_GEM_CLUSTER_ELECTRIC = blockItem("electric_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_ELECTRIC)
+    @JvmField
+    val TYPE_GEM_CLUSTER_GRASS = blockItem("grass_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_GRASS)
+    @JvmField
+    val TYPE_GEM_CLUSTER_ICE = blockItem("ice_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_ICE)
+    @JvmField
+    val TYPE_GEM_CLUSTER_FIGHTING = blockItem("fighting_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_FIGHTING)
+    @JvmField
+    val TYPE_GEM_CLUSTER_POISON = blockItem("poison_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_POISON)
+    @JvmField
+    val TYPE_GEM_CLUSTER_GROUND = blockItem("ground_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_GROUND)
+    @JvmField
+    val TYPE_GEM_CLUSTER_FLYING = blockItem("flying_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_FLYING)
+    @JvmField
+    val TYPE_GEM_CLUSTER_PSYCHIC = blockItem("psychic_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_PSYCHIC)
+    @JvmField
+    val TYPE_GEM_CLUSTER_BUG = blockItem("bug_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_BUG)
+    @JvmField
+    val TYPE_GEM_CLUSTER_ROCK = blockItem("rock_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_ROCK)
+    @JvmField
+    val TYPE_GEM_CLUSTER_GHOST = blockItem("ghost_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_GHOST)
+    @JvmField
+    val TYPE_GEM_CLUSTER_DRAGON = blockItem("dragon_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_DRAGON)
+    @JvmField
+    val TYPE_GEM_CLUSTER_DARK = blockItem("dark_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_DARK)
+    @JvmField
+    val TYPE_GEM_CLUSTER_STEEL = blockItem("steel_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_STEEL)
+    @JvmField
+    val TYPE_GEM_CLUSTER_FAIRY = blockItem("fairy_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY)
+
+    @JvmField
+    val TYPE_GEM_BLOCK_NORMAL = blockItem("normal_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_NORMAL)
+    @JvmField
+    val TYPE_GEM_BLOCK_FIRE = blockItem("fire_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_FIRE)
+    @JvmField
+    val TYPE_GEM_BLOCK_WATER = blockItem("water_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_WATER)
+    @JvmField
+    val TYPE_GEM_BLOCK_ELECTRIC = blockItem("electric_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_ELECTRIC)
+    @JvmField
+    val TYPE_GEM_BLOCK_GRASS = blockItem("grass_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_GRASS)
+    @JvmField
+    val TYPE_GEM_BLOCK_ICE = blockItem("ice_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_ICE)
+    @JvmField
+    val TYPE_GEM_BLOCK_FIGHTING = blockItem("fighting_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_FIGHTING)
+    @JvmField
+    val TYPE_GEM_BLOCK_POISON = blockItem("poison_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_POISON)
+    @JvmField
+    val TYPE_GEM_BLOCK_GROUND = blockItem("ground_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_GROUND)
+    @JvmField
+    val TYPE_GEM_BLOCK_FLYING = blockItem("flying_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_FLYING)
+    @JvmField
+    val TYPE_GEM_BLOCK_PSYCHIC = blockItem("psychic_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_PSYCHIC)
+    @JvmField
+    val TYPE_GEM_BLOCK_BUG = blockItem("bug_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_BUG)
+    @JvmField
+    val TYPE_GEM_BLOCK_ROCK = blockItem("rock_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_ROCK)
+    @JvmField
+    val TYPE_GEM_BLOCK_GHOST = blockItem("ghost_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_GHOST)
+    @JvmField
+    val TYPE_GEM_BLOCK_DRAGON = blockItem("dragon_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_DRAGON)
+    @JvmField
+    val TYPE_GEM_BLOCK_DARK = blockItem("dark_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_DARK)
+    @JvmField
+    val TYPE_GEM_BLOCK_STEEL = blockItem("steel_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_STEEL)
+    @JvmField
+    val TYPE_GEM_BLOCK_FAIRY = blockItem("fairy_gem_block", CobblemonBlocks.TYPE_GEM_BLOCK_FAIRY)
+
    @JvmField
    val POKEROD_SMITHING_TEMPLATE = create("pokerod_smithing_template", SmithingTemplateItem(
        Component.translatable("item.minecraft.fishing_rod").blue(),
@@ -1432,44 +1512,49 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    val RELIC_COIN_POUCH = blockItem("relic_coin_pouch", CobblemonBlocks.RELIC_COIN_POUCH)
    @JvmField
    val RELIC_COIN_SACK = blockItem("relic_coin_sack", CobblemonBlocks.RELIC_COIN_SACK)
+    @JvmField
+    val TECHNICAL_MACHINE = this.create("technical_machine", TechnicalMachineItem(Properties()))
+    @JvmField
+    val BLANK_TM = this.create("blank_tm", CobblemonItem(Item.Properties()))

    // Type Gems
    @JvmField
-    val NORMAL_GEM = noSettingsItem("normal_gem")
+    val NORMAL_GEM = this.create("normal_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_NORMAL))
    @JvmField
-    val FIRE_GEM = noSettingsItem("fire_gem")
+    val FIRE_GEM = this.create("fire_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_FIRE))
    @JvmField
-    val WATER_GEM = noSettingsItem("water_gem")
+    val WATER_GEM = this.create("water_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_WATER))
    @JvmField
-    val GRASS_GEM = noSettingsItem("grass_gem")
+    val GRASS_GEM = this.create("grass_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_GRASS))
    @JvmField
-    val ELECTRIC_GEM = noSettingsItem("electric_gem")
+    val ELECTRIC_GEM = this.create("electric_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_ELECTRIC))
    @JvmField
-    val ICE_GEM = noSettingsItem("ice_gem")
+    val ICE_GEM = this.create("ice_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_ICE))
    @JvmField
-    val FIGHTING_GEM = noSettingsItem("fighting_gem")
+    val FIGHTING_GEM = this.create("fighting_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_FIGHTING))
    @JvmField
-    val POISON_GEM = noSettingsItem("poison_gem")
+    val POISON_GEM = this.create("poison_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_POISON))
    @JvmField
-    val GROUND_GEM = noSettingsItem("ground_gem")
+    val GROUND_GEM = this.create("ground_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_GROUND))
    @JvmField
-    val FLYING_GEM = noSettingsItem("flying_gem")
+    val FLYING_GEM = this.create("flying_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_FLYING))
    @JvmField
-    val PSYCHIC_GEM = noSettingsItem("psychic_gem")
+    val PSYCHIC_GEM = this.create("psychic_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_PSYCHIC))
    @JvmField
-    val BUG_GEM = noSettingsItem("bug_gem")
+    val BUG_GEM = this.create("bug_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_BUG))
    @JvmField
-    val ROCK_GEM = noSettingsItem("rock_gem")
+    val ROCK_GEM = this.create("rock_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_ROCK))
    @JvmField
-    val GHOST_GEM = noSettingsItem("ghost_gem")
+    val GHOST_GEM = this.create("ghost_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_GHOST))
    @JvmField
-    val DRAGON_GEM = noSettingsItem("dragon_gem")
+    val DRAGON_GEM = this.create("dragon_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_DRAGON))
    @JvmField
-    val DARK_GEM = noSettingsItem("dark_gem")
+    val DARK_GEM = this.create("dark_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_DARK))
    @JvmField
-    val STEEL_GEM = noSettingsItem("steel_gem")
+    val STEEL_GEM = this.create("steel_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_STEEL))
    @JvmField
-    val FAIRY_GEM = noSettingsItem("fairy_gem")
+    val FAIRY_GEM = this.create("fairy_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY))
+
    //@JvmField
    //val BINDING_SOIL = blockItem("binding_soil", CobblemonBlocks.BINDING_SOIL)

@@ -1509,7 +1594,16 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It

    private fun wearableItem(name: String, heldItemRemappedName: String? = null): CobblemonItem = create(
        name,
-        WearableItem(name).also {
+        WearableHatItem(name).also {
+            wearables.add(it)
+            if (heldItemRemappedName != null) {
+                CobblemonHeldItemManager.registerRemap(it, heldItemRemappedName)
+            }
+        }
+    )
+    private fun wearableBlockItem(name: String, block: Block, heldItemRemappedName: String? = null): WearableBlockItem = create(
+        name,
+        WearableBlockItem(name, block).also {
            wearables.add(it)
            if (heldItemRemappedName != null) {
                CobblemonHeldItemManager.registerRemap(it, heldItemRemappedName)
@@ -10,6 +10,7 @@ package com.cobblemon.mod.common


 import com.cobblemon.mod.common.block.campfirepot.CookingPotMenu
+import com.cobblemon.mod.common.block.tmmachine.TMMachineMenu
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
@@ -19,7 +20,8 @@ import net.minecraft.world.inventory.MenuType

 object CobblemonMenuType : PlatformRegistry<Registry<MenuType<*>>, ResourceKey<Registry<MenuType<*>>>, MenuType<*>>() {

-    val COOKING_POT = MenuType.register("cooking_pot", ::CookingPotMenu)
+    val COOKING_POT = MenuType.register("cooking_pot_menu", ::CookingPotMenu)
+    val TM_MACHINE = MenuType.register("tm_machine_menu", ::TMMachineMenu)

    override val registry: Registry<MenuType<*>>
        get() = BuiltInRegistries.MENU
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common
+
+import com.cobblemon.mod.common.api.data.JsonDataRegistry
+import com.cobblemon.mod.common.api.moves.MoveSelector
+import com.cobblemon.mod.common.api.moves.MovesetBuilder
+import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
+import com.cobblemon.mod.common.util.adapters.MovesetBuilderAdapter
+import com.cobblemon.mod.common.util.adapters.StringToObjectAdapter
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.server.packs.PackType
+
+object CobblemonMovesetBuilders : JsonDataRegistry<MovesetBuilder> {
+    override val gson: Gson = GsonBuilder()
+        .setPrettyPrinting()
+        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+        .registerTypeAdapter(MovesetBuilder::class.java, MovesetBuilderAdapter)
+        .registerTypeAdapter(MoveSelector::class.java, StringToObjectAdapter(MoveSelector.selectors))
+        .create()
+
+    override val typeToken = TypeToken.get(MovesetBuilder::class.java)
+    override val resourcePath = "moveset_builders"
+    override val id: ResourceLocation = cobblemonResource("moveset_builders")
+    override val type = PackType.SERVER_DATA
+    override val observable = SimpleObservable<CobblemonMovesetBuilders>()
+
+    val movesetBuilders = mutableMapOf<ResourceLocation, MovesetBuilder>()
+
+    fun getOrThrow(id: ResourceLocation): MovesetBuilder {
+        return movesetBuilders[id]
+            ?: throw IllegalArgumentException("Unknown MovesetBuilder id: $id")
+    }
+
+    override fun sync(player: ServerPlayer) { /* These don't sync. But what if they did? Nah probably shouldn't sync. */ }
+
+    override fun reload(data: Map<ResourceLocation, MovesetBuilder>) {
+        movesetBuilders.clear()
+        data.forEach { (id, value) -> value.id = id }
+        movesetBuilders.putAll(data)
+        observable.emit(this)
+    }
+}
@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common

 import com.cobblemon.mod.common.api.net.NetworkPacket
-import com.cobblemon.mod.common.client.net.CalculateSeatPositionsHandler
 import com.cobblemon.mod.common.client.net.OpenBehaviourEditorHandler
 import com.cobblemon.mod.common.client.net.PlayerInteractOptionsHandler
 import com.cobblemon.mod.common.client.net.SetClientPlayerDataHandler
@@ -33,7 +32,11 @@ import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormParticleHandler
 import com.cobblemon.mod.common.client.net.gui.ExpGainedDataPacketHandler
 import com.cobblemon.mod.common.client.net.gui.InteractPokemonUIPacketHandler
 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
 import com.cobblemon.mod.common.client.net.orientation.ClientboundUpdateOrientationHandler
@@ -43,6 +46,7 @@ import com.cobblemon.mod.common.client.net.pasture.PokemonPasturedHandler
 import com.cobblemon.mod.common.client.net.pasture.PokemonUnpasturedHandler
 import com.cobblemon.mod.common.client.net.pasture.UpdatePastureConflictFlagHandler
 import com.cobblemon.mod.common.client.net.pokedex.ServerConfirmedRegisterHandler
+import com.cobblemon.mod.common.client.net.pokemon.update.ClientboundSeatAssignmentPacketHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.ClientboundUpdateRidingStateHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.PokemonUpdatePacketHandler
 import com.cobblemon.mod.common.client.net.riding.ClientboundUpdateDriverInputHandler
@@ -68,7 +72,6 @@ import com.cobblemon.mod.common.client.net.trade.TradeProcessStartedHandler
 import com.cobblemon.mod.common.client.net.trade.TradeStartedHandler
 import com.cobblemon.mod.common.client.net.trade.TradeUpdatedHandler
 import com.cobblemon.mod.common.net.PacketRegisterInfo
-import com.cobblemon.mod.common.net.messages.client.CalculateSeatPositionsPacket
 import com.cobblemon.mod.common.net.messages.client.OpenBehaviourEditorPacket
 import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket
 import com.cobblemon.mod.common.net.messages.client.SetClientPlayerDataPacket
@@ -88,6 +91,7 @@ import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacke
 import com.cobblemon.mod.common.net.messages.client.effect.SaccharineLogBlockParticlesPacket
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormParticlePacket
+import com.cobblemon.mod.common.net.messages.client.habitat.OpenHabitatBlockEditorPacket
 import com.cobblemon.mod.common.net.messages.client.npc.CloseNPCEditorPacket
 import com.cobblemon.mod.common.net.messages.client.npc.OpenNPCEditorPacket
 import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateDriverInputPacket
@@ -101,6 +105,7 @@ import com.cobblemon.mod.common.net.messages.client.pokedex.ServerConfirmedRegis
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.*
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.AddEvolutionPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClearEvolutionsPacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClientboundSeatAssignmentPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.RemoveEvolutionPacket
 import com.cobblemon.mod.common.net.messages.client.settings.OpenCobblemonConfigScreenPacket
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
@@ -127,6 +132,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
@@ -139,8 +145,17 @@ import com.cobblemon.mod.common.net.messages.client.trade.TradeUpdatedPacket
 import com.cobblemon.mod.common.net.messages.client.ui.ExpGainedDataPacket
 import com.cobblemon.mod.common.net.messages.client.ui.InteractPokemonUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.PokedexUIPacket
+import com.cobblemon.mod.common.net.messages.client.ui.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.server.*
+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
+import com.cobblemon.mod.common.net.messages.server.RequestMoveSwapPacket
+import com.cobblemon.mod.common.net.messages.server.RequestPlayerInteractionsPacket
+import com.cobblemon.mod.common.net.messages.server.SelectStarterPacket
+import com.cobblemon.mod.common.net.messages.server.SendOutPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.battle.BattleSelectActionsPacket
 import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamLeavePacket
 import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamRequestPacket
@@ -150,6 +165,7 @@ import com.cobblemon.mod.common.net.messages.server.battle.SpectateBattlePacket
 import com.cobblemon.mod.common.net.messages.server.behaviour.DamageOnCollisionPacket
 import com.cobblemon.mod.common.net.messages.server.behaviour.SetEntityBehaviourPacket
 import com.cobblemon.mod.common.net.messages.server.block.AdjustBlockEntityViewerCountPacket
+import com.cobblemon.mod.common.net.messages.server.block.TMMachineTeachMovePacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectedPacket
 import com.cobblemon.mod.common.net.messages.server.callback.party.PartyPokemonSelectedPacket
@@ -162,6 +178,7 @@ import com.cobblemon.mod.common.net.messages.server.debug.ServerboundUpdateRidin
 import com.cobblemon.mod.common.net.messages.server.debug.ServerboundUpdateRidingStatsPacket
 import com.cobblemon.mod.common.net.messages.server.dialogue.EscapeDialoguePacket
 import com.cobblemon.mod.common.net.messages.server.dialogue.InputToDialoguePacket
+import com.cobblemon.mod.common.net.messages.server.habitat.SaveHabitatBlockSettingsPacket
 import com.cobblemon.mod.common.net.messages.server.npc.SaveNPCPacket
 import com.cobblemon.mod.common.net.messages.server.orientation.ServerboundUpdateOrientationPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.PasturePokemonPacket
@@ -179,6 +196,7 @@ import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetNicknamePa
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
 import com.cobblemon.mod.common.net.messages.server.riding.DismountPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateDriverInputPacket
+import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdatePassengerPositionPacket
 import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateRiderRotationPacket
 import com.cobblemon.mod.common.net.messages.server.starter.RequestStarterScreenPacket
 import com.cobblemon.mod.common.net.messages.server.storage.SwapPCPartyPokemonPacket
@@ -205,6 +223,7 @@ import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestResponseHan
 import com.cobblemon.mod.common.net.serverhandling.behaviour.DamageOnCollisionPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.behaviour.SetEntityBehaviourHandler
 import com.cobblemon.mod.common.net.serverhandling.block.AdjustBlockEntityViewerCountHandler
+import com.cobblemon.mod.common.net.serverhandling.block.TMMachineTeachMoveHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectCancelledHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectedHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.party.PartyPokemonSelectedHandler
@@ -218,9 +237,9 @@ import com.cobblemon.mod.common.net.serverhandling.debug.ServerboundUpdateRiding
 import com.cobblemon.mod.common.net.serverhandling.dialogue.EscapeDialogueHandler
 import com.cobblemon.mod.common.net.serverhandling.dialogue.InputToDialogueHandler
 import com.cobblemon.mod.common.net.serverhandling.evolution.AcceptEvolutionHandler
+import com.cobblemon.mod.common.net.serverhandling.habitat.SaveHabitatBlockSettingsHandler
 import com.cobblemon.mod.common.net.serverhandling.npc.SaveNPCHandler
 import com.cobblemon.mod.common.net.serverhandling.orientation.ServerboundUpdateOrientationHandler
-import com.cobblemon.mod.common.net.serverhandling.storage.party.PartyTutorialPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.pasture.PasturePokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.pasture.SetPastureConflictHandler
 import com.cobblemon.mod.common.net.serverhandling.pasture.UnpastureAllPokemonHandler
@@ -235,6 +254,7 @@ import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetMarkingsHan
 import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetNicknameHandler
 import com.cobblemon.mod.common.net.serverhandling.riding.DismountPokemonPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.riding.DriverInputPacketHandler
+import com.cobblemon.mod.common.net.serverhandling.riding.ServerboundUpdatePassengerPositionHandler
 import com.cobblemon.mod.common.net.serverhandling.riding.ServerboundUpdateRiderRotationHandler
 import com.cobblemon.mod.common.net.serverhandling.starter.RequestStarterScreenHandler
 import com.cobblemon.mod.common.net.serverhandling.starter.SelectStarterPacketHandler
@@ -243,6 +263,7 @@ import com.cobblemon.mod.common.net.serverhandling.storage.RequestMoveSwapHandle
 import com.cobblemon.mod.common.net.serverhandling.storage.SendOutPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.SwapPCPartyPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.party.MovePartyPokemonHandler
+import com.cobblemon.mod.common.net.serverhandling.storage.party.PartyTutorialPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.party.ReleasePCPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.party.SwapPartyPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.pc.*
@@ -321,6 +342,8 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(MarkingsUpdatePacket.ID, MarkingsUpdatePacket::decode, PokemonUpdatePacketHandler()))
        list.add(PacketRegisterInfo(RideBoostsUpdatePacket.ID, RideBoostsUpdatePacket::decode, PokemonUpdatePacketHandler()))
        list.add(PacketRegisterInfo(RideStaminaUpdatePacket.ID, RideStaminaUpdatePacket::decode, PokemonUpdatePacketHandler()))
+        list.add(PacketRegisterInfo(AlphaUpdatePacket.ID, AlphaUpdatePacket::decode, PokemonUpdatePacketHandler()))
+        list.add(PacketRegisterInfo(ScaleModifierUpdatePacket.ID, ScaleModifierUpdatePacket::decode, PokemonUpdatePacketHandler()))

        // Evolution start
        list.add(PacketRegisterInfo(AddEvolutionPacket.ID, AddEvolutionPacket::decode, PokemonUpdatePacketHandler()))
@@ -354,6 +377,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))
@@ -419,6 +443,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))
@@ -481,16 +506,18 @@ object CobblemonNetwork {
        // Pokédex scanning
        list.add(PacketRegisterInfo(ServerConfirmedRegisterPacket.ID, ServerConfirmedRegisterPacket::decode, ServerConfirmedRegisterHandler))

-        // Debug / cheats
-        list.add(PacketRegisterInfo(CalculateSeatPositionsPacket.ID, CalculateSeatPositionsPacket::decode, CalculateSeatPositionsHandler))
-
        // Riding
        list.add(PacketRegisterInfo(ClientboundUpdateRidingStatePacket.ID, ClientboundUpdateRidingStatePacket::decode, ClientboundUpdateRidingStateHandler))
        list.add(PacketRegisterInfo(ClientboundUpdateDriverInputPacket.ID, ClientboundUpdateDriverInputPacket::decode, ClientboundUpdateDriverInputHandler))
+        list.add(PacketRegisterInfo(ClientboundSeatAssignmentPacket.ID, ClientboundSeatAssignmentPacket::decode, ClientboundSeatAssignmentPacketHandler))
+
+        // Habitat blocks
+        list.add(PacketRegisterInfo(OpenHabitatBlockEditorPacket.ID, OpenHabitatBlockEditorPacket::decode, OpenHabitatBlockEditorHandler))

        // Debug
        list.add(PacketRegisterInfo(OpenRidingStatsDebugGUIPacket.ID, OpenRidingStatsDebugGUIPacket::decode, OpenRidingStatsDebugGUIHandler))

+
        return list
    }

@@ -570,6 +597,7 @@ object CobblemonNetwork {

        // Block entity
        list.add(PacketRegisterInfo(AdjustBlockEntityViewerCountPacket.ID, AdjustBlockEntityViewerCountPacket::decode, AdjustBlockEntityViewerCountHandler))
+        list.add(PacketRegisterInfo(TMMachineTeachMovePacket.ID, TMMachineTeachMovePacket::decode, TMMachineTeachMoveHandler))

        // Move select packets
        list.add(PacketRegisterInfo(MoveSelectedPacket.ID, MoveSelectedPacket::decode, MoveSelectedHandler))
@@ -602,17 +630,26 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(DismountPokemonPacket.ID, DismountPokemonPacket::decode, DismountPokemonPacketHandler))
        list.add(PacketRegisterInfo(ServerboundUpdateDriverInputPacket.ID, ServerboundUpdateDriverInputPacket::decode, DriverInputPacketHandler))
        list.add(PacketRegisterInfo(ServerboundUpdateRiderRotationPacket.ID, ServerboundUpdateRiderRotationPacket::decode, ServerboundUpdateRiderRotationHandler))
+        list.add(PacketRegisterInfo(ServerboundUpdatePassengerPositionPacket.ID, ServerboundUpdatePassengerPositionPacket::decode, ServerboundUpdatePassengerPositionHandler))

        // Cooking
        list.add(PacketRegisterInfo(ToggleCookingPotLidPacket.ID, ToggleCookingPotLidPacket::decode, ToggleCookingPotLidHandler))

+        // TM Machine
+        list.add(PacketRegisterInfo(SetActiveTMPacket.ID, SetActiveTMPacket::decode, SetActiveTMPacketHandler))
+        list.add(PacketRegisterInfo(SetTMMachineContainerDataPacket.ID, SetTMMachineContainerDataPacket::decode, SetTMMachineContainerDataPacketHandler))
+
        // Behaviour Packets
        list.add(PacketRegisterInfo(SetEntityBehaviourPacket.ID, SetEntityBehaviourPacket::decode, SetEntityBehaviourHandler))
        list.add(PacketRegisterInfo(DamageOnCollisionPacket.ID, DamageOnCollisionPacket::decode, DamageOnCollisionPacketHandler))

-        // Debug
+        // Habitat blocks
+        list.add(PacketRegisterInfo(SaveHabitatBlockSettingsPacket.ID, SaveHabitatBlockSettingsPacket::decode, SaveHabitatBlockSettingsHandler))
+
+        // Debug / cheats
        list.add(PacketRegisterInfo(RequestOpenRidingStatsDebugGUIPacket.ID, RequestOpenRidingStatsDebugGUIPacket::decode, RequestOpenRidingStatsDebugGUIHandler))

+
        return list
    }

@@ -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
+
+import com.cobblemon.mod.common.api.data.JsonDataRegistry
+import com.cobblemon.mod.common.api.npc.PartyComposition
+import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.server.packs.PackType
+
+object CobblemonPartyCompositions : JsonDataRegistry<PartyComposition> {
+    override val id: ResourceLocation = cobblemonResource("party_compositions")
+    override val type = PackType.SERVER_DATA
+    override val typeToken: TypeToken<PartyComposition> = TypeToken.get(PartyComposition::class.java)
+    override val resourcePath: String = "party_compositions"
+    override val observable = SimpleObservable<CobblemonPartyCompositions>()
+    override val gson: Gson = GsonBuilder()
+        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+        .setPrettyPrinting()
+        .create()
+
+    val partyCompositions = mutableMapOf<ResourceLocation, PartyComposition>()
+
+    override fun sync(player: ServerPlayer) {
+        // probably worth syncing which exist, yeah. the deeper details probably not. I'll get to this eventually.
+    }
+
+    override fun reload(data: Map<ResourceLocation, PartyComposition>) {
+        data.entries.forEach { it.value.id = it.key }
+        partyCompositions.clear()
+        partyCompositions.putAll(data)
+        observable.emit(this)
+        Cobblemon.LOGGER.info("Loaded ${data.size} party compositions.")
+    }
+}
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common
+
+import com.cobblemon.mod.common.api.data.JsonDataRegistry
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.moves.MovesetBuilder
+import com.cobblemon.mod.common.api.npc.PartyPool
+import com.cobblemon.mod.common.api.pokemon.PokemonProperties
+import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.util.ScriptableIntRange
+import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
+import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
+import com.cobblemon.mod.common.util.adapters.IntRangeAdapter
+import com.cobblemon.mod.common.util.adapters.MovesetBuilderReferenceAdapter
+import com.cobblemon.mod.common.util.adapters.PokemonPropertiesAdapter
+import com.cobblemon.mod.common.util.adapters.ScriptableIntRangeAdapter
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.server.packs.PackType
+
+object CobblemonPartyPools : JsonDataRegistry<PartyPool> {
+    override val id: ResourceLocation = cobblemonResource("party_pools")
+    override val type = PackType.SERVER_DATA
+    override val typeToken: TypeToken<PartyPool> = TypeToken.get(PartyPool::class.java)
+    override val resourcePath: String = "party_pools"
+    override val observable = SimpleObservable<CobblemonPartyPools>()
+    override val gson: Gson = GsonBuilder()
+        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+        .registerTypeAdapter(PokemonProperties::class.java, PokemonPropertiesAdapter(saveLong = false))
+        .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
+        .registerTypeAdapter(ScriptableIntRange::class.java, ScriptableIntRangeAdapter)
+        .registerTypeAdapter(MovesetBuilder::class.java, MovesetBuilderReferenceAdapter)
+        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
+        .setPrettyPrinting()
+        .create()
+
+    val partyPools = mutableMapOf<ResourceLocation, PartyPool>()
+
+    override fun sync(player: ServerPlayer) {
+        // probably worth syncing. Knowing the details might help exploit the server? lot of effort for little though.
+    }
+
+    override fun reload(data: Map<ResourceLocation, PartyPool>) {
+        data.entries.forEach { it.value.id = it.key }
+        partyPools.clear()
+        partyPools.putAll(data)
+        observable.emit(this)
+    }
+}
@@ -30,6 +30,10 @@ object CobblemonPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Regist
    // TODO after 1.7
 //    @JvmField
 //    val INCENSE_SWEET_KEY = createKey("incense_sweet", CobblemonBlocks.INCENSE_SWEET, 0, 1)
+    @JvmField
+    val HABITAT_BLOCK_KEY: ResourceKey<PoiType> = createKey("habitat_block", CobblemonBlocks.HABITAT_BLOCK, 0, 1)
+    @JvmField
+    val HABITAT_BLOCK = create(HABITAT_BLOCK_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.HABITAT_BLOCK), 0, 1))

    private fun createKey(string: String, block: Block, maxTickets: Int, validRange: Int ): ResourceKey<PoiType> =
        ResourceKey.create(Registries.POINT_OF_INTEREST_TYPE, cobblemonResource(string)).also { resourceKey ->
@@ -37,6 +37,9 @@ object CobblemonSensors {
    @JvmField
    val POKEMON_DEFEND_OWNER = register("pokemon_owner_under_attack", ::DefendOwnerSensor)

+    @JvmField
+    val ALPHA_LEVEL_MATCHING = register("alpha_level_matching", ::AlphaLevelMatchingSensor)
+
    @JvmField
    val NEARBY_GROWABLE_CROPS = register("nearby_growable_crops", ::PokemonGrowableCropSensor)

@@ -108,6 +108,9 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
    @JvmField
    val LEVELUP = this.create("gui.levelup")

+    @JvmField
+    val MOVE_LEARN = this.create("gui.move_learn")
+
    @JvmField
    val PVN_BATTLE = this.create("battle.pvn.default")
    @JvmField
@@ -136,6 +139,15 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
    @JvmField
    val MULCH_REMOVE = this.create("block.mulch.remove")

+    @JvmField
+    val MONITOR_BREAK = this.create("block.monitor.break")
+    @JvmField
+    val MONITOR_INSERT = this.create("block.monitor.insert")
+    @JvmField
+    val MONITOR_LOADING = this.create("block.monitor.loading")
+    @JvmField
+    val MONITOR_GLITCHING = this.create("block.monitor.glitching")
+
    @JvmField
    val FOSSIL_MACHINE_ACTIVATE = this.create("block.fossil_machine.activate")
    @JvmField
@@ -200,6 +212,28 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
    @JvmField
    val TUMBLESTONE_STEP = this.create("block.tumblestone.step")

+    @JvmField
+    val TM_USE = this.create("item.tm.use")
+    @JvmField
+    val TM_MACHINE_BURN_LOOP = this.create("block.tm_machine.burn_loop")
+    @JvmField
+    val TM_MACHINE_CRAFT = this.create("block.tm_machine.craft")
+    @JvmField
+    val TM_MACHINE_START = this.create("block.tm_machine.start")
+    @JvmField
+    val TM_MACHINE_OPEN = this.create("block.tm_machine.open")
+    @JvmField
+    val TM_MACHINE_CLOSE = this.create("block.tm_machine.close")
+    @JvmField
+    val TM_MACHINE_TM_INSERT = this.create("block.tm_machine.tm_insert")
+    @JvmField
+    val TM_MACHINE_TM_RETRIEVE = this.create("block.tm_machine.tm_retrieve")
+    @JvmField
+    val TM_MACHINE_ITEM_INSERT = this.create("block.tm_machine.item_insert")
+    @JvmField
+    val TM_MACHINE_ITEM_RETRIEVE = this.create("block.tm_machine.item_retrieve")
+
+
    @JvmField
    val EVOLUTION_STONE_BLOCK_BREAK = this.create("block.evolution_stone_block.break")
    @JvmField
@@ -238,6 +272,9 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
    @JvmField
    val BERRY_EAT_FULL = this.create("item.berry.eat.full")

+    @JvmField
+    val APRICORN_HARVEST = this.create("block.apricorn.harvest")
+
    @JvmField
    val BIG_ROOT_BREAK = this.create("block.big_root.break")
    @JvmField
@@ -312,9 +349,13 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
    )

    @JvmField
-    val RIDE_LOOP_LEATHER = create("ride.loop.leather")
+    val RIDE_LOOP_LEATHER_MONO = create("ride.loop.leather.mono")
    @JvmField
-    val RIDE_LOOP_PLUMAGE = create("ride.loop.plumage")
+    val RIDE_LOOP_PLUMAGE_MONO = create("ride.loop.plumage.mono")
+    @JvmField
+    val RIDE_LOOP_LEATHER_STEREO = create("ride.loop.leather.stereo")
+    @JvmField
+    val RIDE_LOOP_PLUMAGE_STEREO = create("ride.loop.plumage.stereo")

    @JvmField
    val MOVE_QUICKATTACK_TARGET = this.create("move.quickattack.target")
@@ -380,6 +421,35 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
        TUMBLESTONE_STEP
    )

+    @JvmField
+    val TYPE_GEM_BLOCK_BREAK = this.create("block.type_gem_block.break")
+    @JvmField
+    val TYPE_GEM_CLUSTER_BREAK = this.create("block.type_gem_cluster.break")
+    @JvmField
+    val TYPE_GEM_BLOCK_HIT = this.create("block.type_gem_block.hit")
+    @JvmField
+    val TYPE_GEM_BLOCK_PLACE = this.create("block.type_gem_block.place")
+    @JvmField
+    val TYPE_GEM_BLOCK_STEP = this.create("block.type_gem_block.step")
+
+    @JvmField
+    val TYPE_GEM_CLUSTER_SOUNDS = SoundType(1f, 1.1f,
+        TYPE_GEM_CLUSTER_BREAK,
+        TYPE_GEM_BLOCK_STEP,
+        TYPE_GEM_BLOCK_PLACE,
+        TYPE_GEM_BLOCK_HIT,
+        TYPE_GEM_BLOCK_STEP
+    )
+
+    @JvmField
+    val TYPE_GEM_BLOCK_SOUNDS = SoundType(1f, 1.1f,
+        TYPE_GEM_BLOCK_BREAK,
+        TYPE_GEM_BLOCK_STEP,
+        TYPE_GEM_BLOCK_PLACE,
+        TYPE_GEM_BLOCK_HIT,
+        TYPE_GEM_BLOCK_STEP
+    )
+
    @JvmField
    val EVOLUTION_STONE_BLOCK_SOUNDS = SoundType(1f, 1.1f,
        EVOLUTION_STONE_BLOCK_BREAK,
@@ -561,5 +631,31 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
        CAMPFIRE_POT_STEP
    )

+    @JvmField
+    val ITEM_BLOCK_PAPER_SMALL_PLACE = this.create("block.item_block.paper_small.place")
+    @JvmField
+    val ITEM_BLOCK_PAPER_SMALL_BREAK = this.create("block.item_block.paper_small.break")
+    @JvmField
+    val ITEM_BLOCK_PAPER_SMALL_SOUNDS = SoundType(1f, 1.1f,
+        ITEM_BLOCK_PAPER_SMALL_BREAK,
+        SoundEvents.WOOL_STEP,
+        ITEM_BLOCK_PAPER_SMALL_PLACE,
+        SoundEvents.WOOL_HIT,
+        SoundEvents.WOOL_FALL
+    )
+
+    @JvmField
+    val ITEM_BLOCK_PAPER_LARGE_PLACE = this.create("block.item_block.paper_large.place")
+    @JvmField
+    val ITEM_BLOCK_PAPER_LARGE_BREAK = this.create("block.item_block.paper_large.break")
+    @JvmField
+    val ITEM_BLOCK_PAPER_LARGE_SOUNDS = SoundType(1f, 1.1f,
+        ITEM_BLOCK_PAPER_LARGE_BREAK,
+        SoundEvents.WOOL_STEP,
+        ITEM_BLOCK_PAPER_LARGE_PLACE,
+        SoundEvents.WOOL_HIT,
+        SoundEvents.WOOL_FALL
+    )
+
    private fun create(name: String): SoundEvent = this.create(name, SoundEvent.createVariableRangeEvent(cobblemonResource(name)))
 }
@@ -32,6 +32,9 @@ object CobblemonCriteria : PlatformRegistry<Registry<CriterionTrigger<*>>, Resou
    @JvmField
    val CATCH_SHINY_POKEMON = this.create("catch_shiny_pokemon", SimpleCriterionTrigger(CountableCriterion.CODEC))

+    @JvmField
+    val CATCH_ALPHA_POKEMON = this.create("catch_alpha_pokemon", SimpleCriterionTrigger(CountableCriterion.CODEC))
+
    @JvmField
    val EGG_COLLECT = this.create("eggs_collected", SimpleCriterionTrigger(CountableCriterion.CODEC))

@@ -78,8 +81,20 @@ object CobblemonCriteria : PlatformRegistry<Registry<CriterionTrigger<*>>, Resou
    @JvmField
    val PLANT_TUMBLESTONE = this.create("plant_tumblestone", SimpleCriterionTrigger(PlantTumblestoneCriterion.CODEC))

+    @JvmField
+    val PLANT_TYPE_GEM = this.create("plant_type_gem", SimpleCriterionTrigger(PlantTypeGemCriterion.CODEC))
+
    val RIDING_STAT_BOOST = this.create("riding_stat_boost", SimpleCriterionTrigger(RidingStatBoostCriterion.CODEC))

+    @JvmField
+    val LEARN_TM = this.create("has_learn_specific_tm", SimpleCriterionTrigger(LearnTMCriterion.CODEC))
+
+    @JvmField
+    val LEARN_ALL_TM = this.create("has_learn_all_tm", SimpleCriterionTrigger(LearnAllTMCriterion.CODEC))
+
+    @JvmField
+    val LEARN_TM_COUNT = this.create("tms_learned", SimpleCriterionTrigger(CountableCriterion.CODEC))
+
    override val registry = BuiltInRegistries.TRIGGER_TYPES
    override val resourceKey = Registries.TRIGGER_TYPE
 }
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.advancement.criterion
+
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.mojang.serialization.Codec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import net.minecraft.advancements.critereon.ContextAwarePredicate
+import net.minecraft.advancements.critereon.EntityPredicate
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.level.ServerPlayer
+import java.util.Optional
+
+class LearnTMContext(val tm: ResourceLocation)
+
+class LearnTMCriterion(
+    playerCtx: Optional<ContextAwarePredicate>,
+    val tm: String
+) : SimpleCriterionCondition<LearnTMContext>(playerCtx) {
+    companion object {
+        val CODEC: Codec<LearnTMCriterion> = RecordCodecBuilder.create { it.group(
+            EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(LearnTMCriterion::playerCtx),
+            Codec.STRING.optionalFieldOf("tm", "any").forGetter(LearnTMCriterion::tm)
+        ).apply(it, ::LearnTMCriterion) }
+    }
+
+    override fun matches(player: ServerPlayer, context: LearnTMContext): Boolean {
+        return tm == "any" || context.tm == tm.asIdentifierDefaultingNamespace()
+    }
+}
+
+class LearnAllTMContext
+
+class LearnAllTMCriterion(
+    playerCtx: Optional<ContextAwarePredicate>
+) : SimpleCriterionCondition<LearnAllTMContext>(playerCtx) {
+    companion object {
+        val CODEC: Codec<LearnAllTMCriterion> = RecordCodecBuilder.create { it.group(
+            EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(LearnAllTMCriterion::playerCtx)
+        ).apply(it, ::LearnAllTMCriterion) }
+    }
+
+    override fun matches(player: ServerPlayer, context: LearnAllTMContext) = true
+}
@@ -14,7 +14,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder
 import net.minecraft.advancements.critereon.ContextAwarePredicate
 import net.minecraft.core.BlockPos
 import net.minecraft.server.level.ServerPlayer
-import java.util.Optional
+import java.util.*

 class PlantTumblestoneContext(val pos: BlockPos, val block: TumblestoneBlock)

@@ -29,42 +29,6 @@ class PlantTumblestoneCriterion(
    }

    override fun matches(player: ServerPlayer, context: PlantTumblestoneContext): Boolean {
-        return context.block.canGrow(context.pos, player.level())
+        return context.block.canGrow(player.level().getBlockState(context.pos), context.pos, player.level())
    }
-}
-
-///**
-// * A criterion condition for when a tumblestone block is planted
-// * @param id The identifier of the criterion
-// * @param predicate The predicate for the criterion
-// *
-// * @author Aethen
-// * @since 02/28/2024
-// */
-//class PlantTumblestoneCriterionCondition(id: Identifier, predicate: LootContextPredicate) :
-//    SimpleCriterionCondition<PlantTumblestoneContext>(id, predicate) {
-//    override fun toJson(json: JsonObject) {
-//        // Add properties to json if needed. None needed for this criterion
-//    }
-//
-//    override fun fromJson(json: JsonObject) {
-//        // Parse properties from json if needed. None needed for this criterion
-//    }
-//
-//    /**
-//     * Checks if the tumblestone block can grow at the given position
-//     * @param player The player that planted the tumblestone block
-//     * @param context The context of the criterion
-//     * @return True if the tumblestone block can grow at the given position, false otherwise
-//     */
-//    override fun matches(player: ServerPlayer, context: PlantTumblestoneContext): Boolean {
-//        return context.tumbleStoneBlock.canGrow(context.pos, player.level())
-//    }
-//}
-//
-///**
-// * The context of the [PlantTumblestoneCriterionCondition]
-// * @param pos The position of the tumblestone block
-// * @param tumbleStoneBlock The tumblestone block
-// */
-//open class PlantTumblestoneContext(var pos: BlockPos, var tumbleStoneBlock: TumblestoneBlock)
+}
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.advancement.criterion
+
+import com.cobblemon.mod.common.block.TypeGemClusterBlock
+import com.cobblemon.mod.common.block.TypeGemCoreBlock
+import com.mojang.serialization.Codec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import net.minecraft.advancements.critereon.ContextAwarePredicate
+import net.minecraft.core.BlockPos
+import net.minecraft.server.level.ServerPlayer
+import java.util.*
+
+class PlantTypeGemContext(val pos: BlockPos, val block: TypeGemClusterBlock)
+
+class PlantTypeGemCriterion(
+    playerCtx: Optional<ContextAwarePredicate>
+): SimpleCriterionCondition<PlantTypeGemContext>(playerCtx) {
+
+    companion object {
+        val CODEC: Codec<PlantTypeGemCriterion> = RecordCodecBuilder.create { it.group(
+            ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(PlantTypeGemCriterion::playerCtx)
+        ).apply(it, ::PlantTypeGemCriterion) }
+    }
+
+    override fun matches(player: ServerPlayer, context: PlantTypeGemContext): Boolean {
+        return player.level().getBlockState(context.pos).block is TypeGemCoreBlock
+    }
+}
@@ -48,7 +48,7 @@ class RidingStatBoostCriterion(
                    val max = context.pokemon.pokemon.getMaxRideBoost(rideStat).toDouble()
                    val min = context.pokemon.pokemon.getBaseRideStat(rideStat).toDouble()
                    val value = context.pokemon.getRideStat(rideStat, ridingStyle, min, max)
-                    val isSufficient = (value >= this.statValue && this.statValue > 0.0) || !context.pokemon.pokemon.canAddRideBoost(rideStat)
+                    val isSufficient = (value >= this.statValue && this.statValue > 0.0) || !context.pokemon.pokemon.canApplyRideBoost(rideStat)
                    if (isSufficient && this.rideStat == "any") {
                        return true
                    } else if (!isSufficient && this.rideStat == "all") {
@@ -133,11 +133,10 @@ 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>()
-    val afterDispatches = mutableListOf<() -> Unit>()

    val captureActions = mutableListOf<BattleCaptureAction>()

@@ -400,12 +399,10 @@ open class PokemonBattle(

    fun dispatch(dispatcher: () -> DispatchResult) {
        dispatches.add(BattleDispatch { dispatcher() })
-
    }

    fun dispatchToFront(dispatcher: () -> DispatchResult) {
        dispatches.addFirst(BattleDispatch { dispatcher() })
-
    }

    fun dispatchWaitingToFront(delaySeconds: Float = 1F, dispatcher: () -> Unit) {
@@ -456,21 +453,12 @@ open class PokemonBattle(
        dispatches.addFirst(dispatcher)
    }

-    fun doWhenClear(action: () -> Unit) {
-        afterDispatches.add(action)
-    }
-
    fun tick() {
        try {
            while (dispatchResult.canProceed()) {
                val dispatch = dispatches.poll() ?: break
                dispatchResult = dispatch(this)
            }
-
-            if (dispatches.isEmpty()) {
-                afterDispatches.toList().forEach { it() }
-                afterDispatches.clear()
-            }
        } catch (e: Exception) {
            LOGGER.error("Exception while ticking a battle. Saving battle log.", e)
            val message = battleLang("crash").red()
@@ -8,8 +8,6 @@

 package com.cobblemon.mod.common.api.battles.model.actor

-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.net.NetworkPacket
@@ -76,7 +74,7 @@ abstract class BattleActor(
  fun turn() {
        val request = request ?: return
        responses.clear()
-        if(activePokemon.any { it.isAlive() }) {
+        if (activePokemon.any { it.isAlive() }) {
            mustChoose = true
            sendUpdate(BattleMakeChoicePacket())
        }
@@ -90,15 +88,15 @@ abstract class BattleActor(
        }
    }

-    fun upkeep() {
+    fun postUpdate() {
        val request = request ?: return
        val forceSwitchPokemon = request.forceSwitch.mapIndexedNotNull { index, b -> if (b) activePokemon[index] else null }
        if (forceSwitchPokemon.isEmpty()) {
            return
        }

+        mustChoose = true // This must happen before the sendUpdate, not after, otherwise AI-driven actors will get locked (they may reply instantly)
        sendUpdate(BattleMakeChoicePacket())
-        mustChoose = true
    }

    fun setActionResponses(responses: List<ShowdownActionResponse>) {
@@ -154,6 +152,11 @@ abstract class BattleActor(
    open fun sendMessage(component: Component) {
        sendUpdate(BattleMessagePacket(component))
    }
+    /**
+     * Called when this actor's Pokemon uses a move. Default implementation does nothing.
+     * Subclasses (NPC-backed actors, players, etc) may override to trigger animations or UI.
+     */
+    open fun onUseMove(user: BattlePokemon, target: BattlePokemon?) {}
    open fun awardExperience(battlePokemon: BattlePokemon, experience: Int) {}
    open fun sendUpdate(packet: NetworkPacket<*>) {}

@@ -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
 }
@@ -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
 }
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.data
-
-import com.cobblemon.mod.common.api.net.Decodable
-import com.cobblemon.mod.common.api.net.Encodable
-
-// TODO this is implemented in multiple places but unused. Can we scratch this?
-/**
- * Represents an object that will possibly be synchronized to the client during datapack synchronization.
- *
- * @param T The type of the object being synchronized.
- *
- * @author Licious
- * @since October 14th, 2022
- */
-interface ClientDataSynchronizer<T> : Decodable, Encodable {
-
-    /**
-     * Compares an object of type [T] with this instance to see if synchronization is necessary.
-     *
-     * @param other The other instance of type [T].
-     * @return If synchronization is necessary.
-     */
-    fun shouldSynchronize(other: T): Boolean
-
-}
@@ -14,9 +14,11 @@ import com.cobblemon.mod.common.api.text.green
 import com.cobblemon.mod.common.api.text.red
 import com.cobblemon.mod.common.util.lang
 import com.cobblemon.mod.common.util.toBlockPos
-import net.minecraft.core.component.DataComponentMap
+import com.google.gson.JsonElement
+import com.mojang.serialization.JsonOps
 import net.minecraft.core.component.DataComponentPatch
 import net.minecraft.core.registries.Registries
+import net.minecraft.resources.RegistryOps
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerLevel
@@ -40,7 +42,7 @@ open class ItemDropEntry : DropEntry {
    override var maxSelectableTimes = 1
    open val dropMethod: ItemDropMethod? = null
    open var item = ResourceLocation.parse("minecraft:fish")
-    open val components: DataComponentMap? = null
+    open val components: JsonElement? = null

    override fun drop(entity: LivingEntity?, world: ServerLevel, pos: Vec3, player: ServerPlayer?) {
        val item = world.registryAccess().registryOrThrow(Registries.ITEM).get(item) ?: return LOGGER.error("Unable to load drop item: $item")
@@ -53,11 +55,15 @@ open class ItemDropEntry : DropEntry {
                it
            }
        }
-        val builder = DataComponentPatch.builder()
-        components?.forEach {
-            builder.set(it)
+        if (components != null) {
+            val registryOps = RegistryOps.create(JsonOps.INSTANCE, world.registryAccess())
+            val decodeResult = DataComponentPatch.CODEC.parse(registryOps, components)
+            decodeResult.ifSuccess { patch ->
+                stack.applyComponentsAndValidate(patch)
+            }.ifError { error ->
+                LOGGER.error("Unable to parse components for drop item $item: ${error.message()}")
+            }
        }
-        stack.applyComponentsAndValidate(builder.build())

        if (dropMethod == ItemDropMethod.ON_PLAYER && player != null) {
            world.addFreshEntity(ItemEntity(player.level(), player.x, player.y, player.z, stack))
@@ -23,9 +23,21 @@ import com.cobblemon.mod.common.api.events.berry.BerryMutationResultEvent
 import com.cobblemon.mod.common.api.events.berry.BerryYieldCalculationEvent
 import com.cobblemon.mod.common.api.events.cooking.PokeSnackSpawnPokemonEvent
 import com.cobblemon.mod.common.api.events.drops.LootDroppedEvent
-import com.cobblemon.mod.common.api.events.entity.*
+import com.cobblemon.mod.common.api.events.entity.PokemonEntityLoadEvent
+import com.cobblemon.mod.common.api.events.entity.PokemonEntitySaveEvent
+import com.cobblemon.mod.common.api.events.entity.PokemonEntitySaveToWorldEvent
+import com.cobblemon.mod.common.api.events.entity.SpawnBucketChosenEvent
+import com.cobblemon.mod.common.api.events.entity.SpawnEvent
 import com.cobblemon.mod.common.api.events.farming.ApricornHarvestEvent
-import com.cobblemon.mod.common.api.events.fishing.*
+import com.cobblemon.mod.common.api.events.fishing.BaitConsumedEvent
+import com.cobblemon.mod.common.api.events.fishing.BaitEffectFunctionRegistryEvent
+import com.cobblemon.mod.common.api.events.fishing.BaitSetEvent
+import com.cobblemon.mod.common.api.events.fishing.BaitSpawnPokemonEvent
+import com.cobblemon.mod.common.api.events.fishing.BobberSpawnPokemonEvent
+import com.cobblemon.mod.common.api.events.fishing.PokerodCastEvent
+import com.cobblemon.mod.common.api.events.fishing.PokerodReelEvent
+import com.cobblemon.mod.common.api.events.habitats.HabitatSpawnActivatedEvent
+import com.cobblemon.mod.common.api.events.habitats.SaveHabitatBlockSettingsEvent
 import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent
 import com.cobblemon.mod.common.api.events.pokeball.PokeBallCaptureCalculatedEvent
 import com.cobblemon.mod.common.api.events.pokeball.PokemonCatchRateEvent
@@ -40,7 +52,11 @@ import com.cobblemon.mod.common.api.events.pokemon.healing.PokemonHealedEvent
 import com.cobblemon.mod.common.api.events.pokemon.interaction.ExperienceCandyUseEvent
 import com.cobblemon.mod.common.api.events.pokemon.interaction.PokemonInteractionGUICreationEvent
 import com.cobblemon.mod.common.api.events.starter.StarterChosenEvent
-import com.cobblemon.mod.common.api.events.storage.*
+import com.cobblemon.mod.common.api.events.storage.ChangePCBoxWallpaperEvent
+import com.cobblemon.mod.common.api.events.storage.ReleasePokemonEvent
+import com.cobblemon.mod.common.api.events.storage.RenamePCBoxEvent
+import com.cobblemon.mod.common.api.events.storage.WallpaperCollectionEvent
+import com.cobblemon.mod.common.api.events.storage.WallpaperUnlockedEvent
 import com.cobblemon.mod.common.api.events.world.BigRootPropagatedEvent
 import com.cobblemon.mod.common.api.reactive.CancelableObservable
 import com.cobblemon.mod.common.api.reactive.EventObservable
@@ -365,4 +381,12 @@ object CobblemonEvents {
    // -------------------------------------------------------------------------------------
    @JvmField
    val SELECT_DRIVER = EventObservable<SelectDriverEvent>()
+
+    // Habitats
+    @JvmField
+    val HABITAT_SPAWN_ACTIVATED = CancelableObservable<HabitatSpawnActivatedEvent>()
+    @JvmField
+    val HABITAT_SETTINGS_SAVED_PRE = CancelableObservable<SaveHabitatBlockSettingsEvent.Pre>()
+    @JvmField
+    val HABITAT_SETTINGS_SAVED_POST = EventObservable<SaveHabitatBlockSettingsEvent.Post>()
 }
@@ -8,7 +8,6 @@

 package com.cobblemon.mod.common.api.events.entity

-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.SpawnCause
 import com.cobblemon.mod.common.api.spawning.spawner.Spawner

@@ -21,7 +20,7 @@ class SpawnBucketChosenEvent(
    /** The cause of the spawn. */
    val spawnCause: SpawnCause,
    /** The bucket that was chosen. You can alter this. */
-    var bucket: SpawnBucket,
+    var bucket: String,
    /** The final weights that were used to make the choice. */
-    val bucketWeights: Map<SpawnBucket, Float>
+    val bucketWeights: Map<String, Float>
 )
@@ -10,7 +10,9 @@ package com.cobblemon.mod.common.api.events.entity

 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.spawning.BestSpawner
+import com.cobblemon.mod.common.api.spawning.SpawnCause
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
+import com.cobblemon.mod.common.api.spawning.spawner.Spawner
 import net.minecraft.world.entity.Entity

 /**
@@ -21,4 +23,9 @@ import net.minecraft.world.entity.Entity
 * @author Hiroku
 * @since April 22nd, 2023
 */
-class SpawnEvent<T : Entity>(val entity: T, val spawnablePosition: SpawnablePosition) : Cancelable()
+class SpawnEvent<T : Entity>(val entity: T, val spawnablePosition: SpawnablePosition) : Cancelable() {
+    val cause: SpawnCause
+        get() = spawnablePosition.cause
+    val spawner: Spawner
+        get() = spawnablePosition.spawner
+}
@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.events.fishing

 import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.world.item.ItemStack
@@ -27,7 +26,7 @@ interface BaitSpawnPokemonEvent {
     */
    data class Pre(
        val bobber: PokeRodFishingBobberEntity, // todo replace this with the bait entity
-        val chosenBucket: SpawnBucket,
+        val chosenBucket: String,
        val rod: ItemStack
    ) : Cancelable(), BobberSpawnPokemonEvent

@@ -38,7 +37,7 @@ interface BaitSpawnPokemonEvent {
     * @param pokemon The Pokemon that is modified.
     */
    data class Modify(
-        val chosenBucket: SpawnBucket,
+        val chosenBucket: String,
        val rod: ItemStack,
        val pokemon: PokemonEntity
    ) : BobberSpawnPokemonEvent
@@ -52,7 +51,7 @@ interface BaitSpawnPokemonEvent {
     */
    data class Post(
        val bobber: PokeRodFishingBobberEntity,
-        val chosenBucket: SpawnBucket,
+        val chosenBucket: String,
        val bait: ItemStack,
        val pokemon: PokemonEntity
    ) : BobberSpawnPokemonEvent
@@ -8,12 +8,10 @@

 package com.cobblemon.mod.common.api.events.fishing

-import com.cobblemon.mod.common.api.spawning.SpawnBucket
-
 /**
 * Event that is fired when a bucket is chosen by the bobber.
 * @param chosenBucket The bucket that is chosen.
 * @param buckets The list of buckets that the bobber can choose from.
 * @param luckOfTheSeaLevel The level of the Luck of the Sea enchantment on the rod.
 */
-class BobberBucketChosenEvent(var chosenBucket: SpawnBucket, val buckets: MutableList<SpawnBucket>, val luckOfTheSeaLevel: Int)
+class BobberBucketChosenEvent(var chosenBucket: String, val buckets: MutableList<String>, val luckOfTheSeaLevel: Int)
@@ -12,10 +12,7 @@ import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
-import com.cobblemon.mod.common.api.molang.ObjectValue
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
 import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -73,8 +70,8 @@ interface BobberSpawnPokemonEvent {
        val bait: ItemStack,
        val pokemon: PokemonEntity
    ) : BobberSpawnPokemonEvent {
-        val context = mutableMapOf<String, MoValue>(
-            "chosen_bucket" to ObjectValue(spawnAction.bucket, { it.name }),
+        val context = mutableMapOf(
+            "chosen_bucket" to StringValue(spawnAction.bucket),
            "bait" to pokemon.level().itemRegistry.wrapAsHolder(bait.item).asMoLangValue(Registries.ITEM),
            "pokemon_entity" to pokemon.asMoLangValue()
        )
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.habitats
+
+import com.cobblemon.mod.common.api.events.Cancelable
+import com.cobblemon.mod.common.api.habitats.spawningstyle.ActivatedHabitatSpawning
+import com.cobblemon.mod.common.api.spawning.SpawnCause
+import com.cobblemon.mod.common.api.spawning.spawner.FixedAreaSpawner
+import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
+
+/**
+ * Event that fires when a habitat is about to attempt to spawn Pokémon. Cancelling this event will prevent
+ * the habitat block from attempting to spawn anything for this activation.
+ *
+ * @author Hiroku
+ * @since February 15th,2026
+ */
+class HabitatSpawnActivatedEvent(
+    /** The habitat block entity that is responsible for the spawn. */
+    val habitatBlockEntity: HabitatBlockEntity,
+    /** The activation settings. You could have got it from the block entity but this is easier. */
+    val activatedHabitatSpawning: ActivatedHabitatSpawning,
+    /** The [SpawnCause] that will be used in the spawn action. This may contain a player that is nearest to the block. */
+    var cause: SpawnCause,
+    /** The maximum number of Pokémon the block will consider spawning (provided there is space). */
+    var maxSpawns: Int
+) : Cancelable() {
+    /** The spawner representing the habitat. */
+    val spawner: FixedAreaSpawner
+        get() = activatedHabitatSpawning.spawner
+}
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.habitats
+
+import com.cobblemon.mod.common.api.events.Cancelable
+import com.cobblemon.mod.common.api.habitats.dto.HabitatSettingsDTO
+import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
+import net.minecraft.core.BlockPos
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.server.level.ServerPlayer
+
+interface SaveHabitatBlockSettingsEvent {
+    val player: ServerPlayer
+    val world: ServerLevel
+    val blockPos: BlockPos
+    val habitatBlockEntity: HabitatBlockEntity
+    val settings: HabitatSettingsDTO
+
+    class Pre(
+        override val player: ServerPlayer,
+        override val world: ServerLevel,
+        override val blockPos: BlockPos,
+        override val habitatBlockEntity: HabitatBlockEntity,
+        override val settings: HabitatSettingsDTO
+    ) : SaveHabitatBlockSettingsEvent, Cancelable()
+
+     class Post(
+        override val player: ServerPlayer,
+        override val world: ServerLevel,
+        override val blockPos: BlockPos,
+        override val habitatBlockEntity: HabitatBlockEntity,
+        override val settings: HabitatSettingsDTO
+    ) : SaveHabitatBlockSettingsEvent
+}
@@ -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) {
@@ -68,11 +68,14 @@ class SpawnBait(
        val TYPING = cobblemonResource("typing")
        val EGG_GROUP = cobblemonResource("egg_group")
        val SHINY_REROLL = cobblemonResource("shiny_reroll")
+        val MARK_CHANCE = cobblemonResource("mark_chance")
        val DROPS_REROLL = cobblemonResource("drops_reroll")
        val HIDDEN_ABILITY_CHANCE = cobblemonResource("ha_chance")
+        val ALPHA_CHANCE = cobblemonResource("alpha_chance")
        val POKEMON_CHANCE = cobblemonResource("pokemon_chance")
        val FRIENDSHIP = cobblemonResource("friendship")
        val RARITY_BUCKET = cobblemonResource("rarity_bucket")
+        val SIZE = cobblemonResource("size")

        fun registerEffect(type: ResourceLocation, effect: (PokemonEntity, Effect) -> Unit) {
            EFFECT_FUNCTIONS[type] = effect
@@ -86,11 +89,14 @@ class SpawnBait(
            registerEffect(NATURE) { entity, effect -> FishingSpawnCause.alterNatureAttempt(entity, effect) }
            registerEffect(IV) { entity, effect -> FishingSpawnCause.alterIVAttempt(entity, effect) }
            registerEffect(SHINY_REROLL) { entity, effect -> FishingSpawnCause.shinyReroll(entity, effect) }
+            registerEffect(MARK_CHANCE) { entity, effect -> FishingSpawnCause.alterMarksAttempt(entity, effect) }
            registerEffect(DROPS_REROLL) { entity, effect -> FishingSpawnCause.saveDropsReroll(entity, effect) }
            registerEffect(GENDER_CHANCE) { entity, effect -> FishingSpawnCause.alterGenderAttempt(entity, effect) }
            registerEffect(LEVEL_RAISE) { entity, effect -> FishingSpawnCause.alterLevelAttempt(entity, effect) }
            registerEffect(HIDDEN_ABILITY_CHANCE) { entity, _ -> FishingSpawnCause.alterHAAttempt(entity) }
+            registerEffect(ALPHA_CHANCE) { entity, effect -> FishingSpawnCause.alterAlphaAttempt(entity) }
            registerEffect(FRIENDSHIP) { entity, effect -> FishingSpawnCause.alterFriendshipAttempt(entity, effect) }
+            registerEffect(SIZE) { entity, effect -> FishingSpawnCause.alterSize(entity, effect) }
            CobblemonEvents.BAIT_EFFECT_REGISTRATION.post(BaitEffectFunctionRegistryEvent()) { event ->
                event.functions.forEach { (type, function) -> registerEffect(type, function) }
            }
@@ -0,0 +1,30 @@
+/*
+ * 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.habitats
+
+import com.cobblemon.mod.common.api.habitats.spawningstyle.ActivatedHabitatSpawning
+import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
+import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import net.minecraft.world.entity.Entity
+
+/**
+ * Influence added to the activated habitat spawner blocks so that they can track the entity and apply block modifiers.
+ *
+ * @author Hiroku
+ * @since February 15th, 2026
+ */
+class ActivatedHabitatSpawningInfluence(val activatedHabitatSpawning: ActivatedHabitatSpawning) : SpawningInfluence {
+    override fun affectSpawn(action: SpawnAction<*>, entity: Entity) {
+        if (entity is PokemonEntity) {
+            activatedHabitatSpawning.habitatBlockEntity.modifiers.apply(entity)
+            activatedHabitatSpawning.habitatBlockEntity.spawnedEntityIDs.add(entity.id)
+        }
+    }
+}
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.habitats
+
+/**
+ * Controls how habitats change through all the possible phases.
+ *
+ * @author Hiroku
+ * @since February 23rd, 2026
+ */
+enum class HabitatPhaseOrder {
+    /** Literally in ascending order, 1-2-3-4. */
+    SIMPLE,
+    /** It randomly chooses an order then uses that order predictably. 3-1-4-2-3-1-4-2 for example */
+    FIXED_RANDOM,
+    /** Completely random phase each day. Like, 1-1-2-4-1-2-1-2-4-1-3 */
+    FULL_RANDOM
+}
@@ -0,0 +1,116 @@
+/*
+ * 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.habitats
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.spawning.detail.PokemonSpawnDetail
+import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
+import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
+import com.cobblemon.mod.common.util.DataKeys
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.ListTag
+import net.minecraft.nbt.Tag
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.resources.ResourceLocation
+
+/**
+ * A pool of [HabitatSpawn]s. This is filled with [HabitatSpawn]s. The pool is responsible for converting
+ * its spawns into [PokemonSpawnDetail]s.
+ *
+ * @author Hiroku
+ * @since February 13th, 2026
+ */
+class HabitatPool {
+    companion object {
+        fun default() = HabitatPool().apply {
+            id = ResourceLocation("cobblemon", "custom__default_pool")
+            name = "Custom"
+        }
+
+        fun writePoolToNBT(pool: HabitatPool, nbt: CompoundTag) {
+            nbt.putString(DataKeys.HABITAT_POOL_ID, pool.id.toString())
+            if (pool.id.path.startsWith("custom__")) {
+                nbt.putString(DataKeys.HABITAT_POOL_NAME, pool.name)
+                val spawnsListNBT = ListTag()
+                for (spawn in pool.spawns) {
+                    val spawnTag = CompoundTag()
+                    spawn.writeToNBT(spawnTag)
+                    spawnsListNBT.add(spawnTag)
+                }
+                nbt.put(DataKeys.HABITAT_POOL_SPAWNS, spawnsListNBT)
+            }
+        }
+
+        fun readPoolFromNBT(nbt: CompoundTag): HabitatPool {
+            val poolId = nbt.getString(DataKeys.HABITAT_POOL_ID).asIdentifierDefaultingNamespace()
+            if (nbt.contains(DataKeys.HABITAT_POOL_NAME)) {
+                // It's one that was stored on the block
+                val pool = HabitatPool()
+                pool.id = poolId
+                pool.name = nbt.getString(DataKeys.HABITAT_POOL_NAME)
+                val spawnsListNBT = nbt.getList(DataKeys.HABITAT_POOL_SPAWNS, Tag.TAG_COMPOUND.toInt())
+                val spawns = mutableListOf<HabitatSpawn>()
+                spawnsListNBT.forEach { spawnTag ->
+                    try {
+                        val spawn = HabitatSpawn().apply { readFromNBT(spawnTag as CompoundTag) }
+                        spawns.add(spawn)
+                    } catch (_: Exception) {
+                        // If there's an error reading a spawn, skip it and log the error.
+                        Cobblemon.LOGGER.error("Error reading activated habitat spawn from NBT for habitat block, skipping.")
+                    }
+                }
+                pool.spawns = spawns
+                return pool
+            } else {
+                return HabitatPools.habitatPoolsById[poolId] ?: default()
+            }
+        }
+    }
+
+    lateinit var id: ResourceLocation
+    var name: String = ""
+    var spawns: List<HabitatSpawn> = listOf()
+
+    /** Whether a pool is editable is just down to whether it's not from a datapack. */
+    @Transient
+    var editable: Boolean = false
+
+    fun validate() {
+        for (spawn in spawns) {
+            if (SpawnablePosition.getByName(spawn.spawnablePositionType) == null) {
+                throw IllegalArgumentException("$id mentions non-existent spawnable position type ${spawn.spawnablePositionType} on spawn for ${spawn.species}")
+            }
+        }
+    }
+
+    fun createSpawnDetails(habitatBlockEntity: HabitatBlockEntity): List<PokemonSpawnDetail> {
+        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)
+        buffer.writeCollection(spawns) { _, it -> it.encode(buffer) }
+    }
+
+    fun decode(buffer: RegistryFriendlyByteBuf) {
+        id = buffer.readResourceLocation()
+        name = buffer.readUtf()
+        spawns = buffer.readList { HabitatSpawn().apply { decode(buffer) } }
+    }
+}
@@ -0,0 +1,96 @@
+/*
+ * 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.habitats
+
+import com.cobblemon.mod.common.api.data.JsonDataRegistry
+import com.cobblemon.mod.common.api.pokemon.PokemonProperties
+import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.api.spawning.IntRanges
+import com.cobblemon.mod.common.api.spawning.TimeRange
+import com.cobblemon.mod.common.api.spawning.position.SpawnablePositionType
+import com.cobblemon.mod.common.pokemon.Species
+import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
+import com.cobblemon.mod.common.util.adapters.IntRangeAdapter
+import com.cobblemon.mod.common.util.adapters.IntRangesAdapter
+import com.cobblemon.mod.common.util.adapters.RegisteredSpawnablePositionAdapter
+import com.cobblemon.mod.common.util.adapters.SpeciesAdapter
+import com.cobblemon.mod.common.util.adapters.pokemonPropertiesShortAdapter
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.fromJson
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import java.io.File
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.MinecraftServer
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.server.packs.PackType
+import net.minecraft.world.level.storage.LevelResource
+
+object HabitatPools : JsonDataRegistry<HabitatPool> {
+    override val id = cobblemonResource("habitat_pools")
+    override val type = PackType.SERVER_DATA
+    override val observable = SimpleObservable<HabitatPools>()
+    override val typeToken: TypeToken<HabitatPool> = TypeToken.get(HabitatPool::class.java)
+    override val resourcePath = "habitat_pools"
+
+    override val gson: Gson = GsonBuilder()
+        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+        .registerTypeAdapter(SpawnablePositionType::class.java, RegisteredSpawnablePositionAdapter)
+        .registerTypeAdapter(Species::class.java, SpeciesAdapter)
+        .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
+        .registerTypeAdapter(TimeRange::class.java, TimeRange.adapter)
+        .registerTypeAdapter(IntRanges::class.java, IntRangesAdapter.basic)
+        .registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
+        .setPrettyPrinting()
+        .create()
+
+    private val datapacked = mutableMapOf<ResourceLocation, HabitatPool>()
+    private val worldSaved = mutableMapOf<ResourceLocation, HabitatPool>()
+
+    val habitatPoolsById = mutableMapOf<ResourceLocation, HabitatPool>()
+
+    private lateinit var worldSavedPoolsFolder: File
+
+    override fun sync(player: ServerPlayer) {}
+
+    fun onServerLoading(server: MinecraftServer) {
+        worldSavedPoolsFolder = server.getWorldPath(LevelResource.ROOT).resolve("habitat_pools").toFile()
+        if (!worldSavedPoolsFolder.exists()) {
+            return
+        }
+
+        worldSavedPoolsFolder.listFiles { it.endsWith(".json") }.forEach {
+            val identifier = ResourceLocation.parse(it.nameWithoutExtension)
+            val habitat = gson.fromJson<HabitatPool>(it.reader())
+            habitat.id = identifier
+            habitat.validate()
+            habitat.editable = true
+            worldSaved[identifier] = habitat
+        }
+        setupHabitatPoolsById()
+    }
+
+    override fun reload(data: Map<ResourceLocation, HabitatPool>) {
+        datapacked.clear()
+        datapacked.putAll(data)
+        data.entries.forEach { (identifier, habitat) ->
+            habitat.id = identifier
+            habitat.validate()
+            habitat.editable = false
+        }
+        setupHabitatPoolsById()
+    }
+
+    fun setupHabitatPoolsById() {
+        habitatPoolsById.clear()
+        habitatPoolsById.putAll(datapacked)
+        habitatPoolsById.putAll(worldSaved)
+    }
+}
@@ -0,0 +1,166 @@
+/*
+ * 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.habitats
+
+import com.cobblemon.mod.common.api.pokemon.PokemonProperties
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
+import com.cobblemon.mod.common.api.spawning.IntRanges
+import com.cobblemon.mod.common.api.spawning.TimeRange
+import com.cobblemon.mod.common.api.spawning.condition.AppendageCondition
+import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
+import com.cobblemon.mod.common.api.spawning.detail.PokemonSpawnDetail
+import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
+import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
+import com.cobblemon.mod.common.pokemon.Species
+import com.cobblemon.mod.common.util.DataKeys
+import com.cobblemon.mod.common.util.adapters.IntRangeAdapter
+import com.cobblemon.mod.common.util.adapters.IntRangesAdapter
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.math.intersection
+import com.cobblemon.mod.common.util.math.intersects
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.network.RegistryFriendlyByteBuf
+
+/**
+ * A kind of simplified spawn definition for the purposes of spawning from [HabitatBlockEntity] instances.
+ *
+ * These have only a small subset of the properties that a regular [PokemonSpawnDetail] would have to align with the
+ * fact that these are configured from a simple GUI. There are limits to how many properties and conditions could be
+ * exposed in a GUI before it becomes too difficult for the average user to understand what's going on.
+ *
+ * [HabitatSpawn]s are loaded from datapacks as pools of spawns but can also be modified from in-game, though those
+ * made from in-game are stored separately to datapacks. Only non-datapacked habitat spawns can be modified.
+ *
+ * Upon edits to a habitat block, the spawn details are regenerated based off of these definitions.
+ *
+ * @author Hiroku
+ * @since February 13th, 2026
+ */
+class HabitatSpawn {
+    /** The species that will be spawned. */
+    lateinit var species: Species
+    /** The kind of position the Pokémon will spawn in. Things like "grounded", "seafloor", "fishing". */
+    lateinit var spawnablePositionType: String
+    /** The bucket to spawn from. */
+    var bucket: String = "common"
+
+    /** Selection weight. */
+    var weight: Float = 1F
+    /** The possible levels for this spawn. */
+    var levelRange: IntRange = 1..Int.MAX_VALUE // I can't access the up-to-date config value here.
+    /** Additional modifiers to apply to the Pokémon, such as alolan=true, ability=intimidate, etc. */
+    var modifiers: PokemonProperties? = null
+    /** Which phases of the habitat this spawn will run in. See [HabitatBlockEntity] for more information. */
+    var phases: IntRanges? = null
+    /** The Minecraft time ranges for this spawn. */
+    var timeRange: TimeRange? = null
+    /** The minimum light level that the Pokémon can spawn in. */
+    var minLight: Int? = null
+    /** The maximum light level that the Pokémon can spawn in. */
+    var maxLight: Int? = null
+
+    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)
+        nbt.putString(DataKeys.HABITAT_POOL_SPAWN_LEVEL_RANGE, IntRangeAdapter.serialize(levelRange))
+        modifiers?.let { nbt.putString(DataKeys.HABITAT_POOL_SPAWN_MODIFIERS, it.asString()) }
+        phases?.let { nbt.putString(DataKeys.HABITAT_POOL_SPAWN_PHASES, IntRangesAdapter.basic.serialize(it)) }
+        timeRange?.let { nbt.putString(DataKeys.HABITAT_POOL_SPAWN_TIMES, TimeRange.adapter.serialize(it)) }
+        minLight?.let { nbt.putInt(DataKeys.HABITAT_POOL_SPAWN_MIN_LIGHT, it) }
+        maxLight?.let { nbt.putInt(DataKeys.HABITAT_POOL_SPAWN_MAX_LIGHT, it) }
+        nbt.putString(DataKeys.HABITAT_POOL_SPAWN_BUCKET, bucket)
+    }
+
+    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)
+        levelRange = IntRangeAdapter.deserialize(nbt.getString(DataKeys.HABITAT_POOL_SPAWN_LEVEL_RANGE))
+        modifiers = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_MODIFIERS)) PokemonProperties.parse(nbt.getString(DataKeys.HABITAT_POOL_SPAWN_MODIFIERS)) else null
+        phases = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_PHASES)) IntRangesAdapter.basic.deserialize(nbt.getString(DataKeys.HABITAT_POOL_SPAWN_PHASES)) else null
+        timeRange = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_TIMES)) TimeRange.adapter.deserialize(nbt.getString(DataKeys.HABITAT_POOL_SPAWN_TIMES)) else null
+        minLight = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_MIN_LIGHT)) nbt.getInt(DataKeys.HABITAT_POOL_SPAWN_MIN_LIGHT) else null
+        maxLight = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_MAX_LIGHT)) nbt.getInt(DataKeys.HABITAT_POOL_SPAWN_MAX_LIGHT) else null
+        bucket = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_BUCKET)) nbt.getString(DataKeys.HABITAT_POOL_SPAWN_BUCKET) else "common"
+    }
+
+    fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(species.resourceIdentifier)
+        buffer.writeUtf(spawnablePositionType)
+        buffer.writeFloat(weight)
+        buffer.writeUtf(IntRangeAdapter.serialize(levelRange))
+        buffer.writeNullable(modifiers) { _, value -> buffer.writeUtf(value.asString()) }
+        buffer.writeNullable(phases) { _, value -> buffer.writeUtf(IntRangesAdapter.basic.serialize(value)) }
+        buffer.writeNullable(timeRange) { _, value -> buffer.writeUtf(TimeRange.adapter.serialize(value)) }
+        buffer.writeNullable(minLight) { _, value -> buffer.writeInt(value) }
+        buffer.writeNullable(maxLight) { _, value -> buffer.writeInt(value) }
+        buffer.writeUtf(bucket)
+    }
+
+    fun decode(buffer: RegistryFriendlyByteBuf) {
+        species = PokemonSpecies.getByIdentifier(buffer.readResourceLocation())!!
+        spawnablePositionType = buffer.readUtf()
+        weight = buffer.readFloat()
+        levelRange = IntRangeAdapter.deserialize(buffer.readUtf())
+        modifiers = buffer.readNullable { _ -> PokemonProperties.parse(buffer.readUtf()) }
+        phases = buffer.readNullable { _ -> IntRangesAdapter.basic.deserialize(buffer.readUtf()) }
+        timeRange = buffer.readNullable { _ -> TimeRange.adapter.deserialize(buffer.readUtf()) }
+        minLight = buffer.readNullable { _ -> buffer.readInt() }
+        maxLight = buffer.readNullable { _ -> buffer.readInt() }
+        bucket = buffer.readUtf()
+    }
+
+    /** Creates the [PokemonSpawnDetail] that will be used in the spawner. This is done per habitat block. */
+    fun createSpawnDetail(habitatBlockEntity: HabitatBlockEntity): PokemonSpawnDetail? {
+        val spawnDetail = PokemonSpawnDetail()
+
+        // If the habitat block specifies a level range, it restricts how and if this spawn exists
+        if (!levelRange.intersects(habitatBlockEntity.levelRange)) {
+            return null
+        }
+
+        val spawnablePositionType = SpawnablePosition.getByName(this.spawnablePositionType) ?: return null // How'd they get bad data into here
+
+        val levelRange = levelRange.intersection(habitatBlockEntity.levelRange)
+
+        val condition = createCondition(habitatBlockEntity)
+        val properties = modifiers?.copy() ?: PokemonProperties()
+        properties.species = species.resourceIdentifier.path
+
+        spawnDetail.apply {
+            this.id = "habitat_${species.resourceIdentifier}"
+            this.pokemon = properties
+            this.bucket = this@HabitatSpawn.bucket
+            this.weight = this@HabitatSpawn.weight
+            this.levelRange = levelRange
+            this.conditions = mutableListOf(condition)
+            this.spawnablePositionType = spawnablePositionType
+        }
+
+        return spawnDetail
+    }
+
+    fun createCondition(habitatBlockEntity: HabitatBlockEntity): SpawningCondition<*> {
+        val clazz = SpawningCondition.getByName(SpawnablePosition.getByName(this.spawnablePositionType)!!.defaultCondition)!!
+        val condition = clazz.getConstructor().newInstance()
+        condition.timeRange = timeRange
+        condition.minLight = minLight
+        condition.maxLight = maxLight
+        val phases = phases
+        if (phases != null) {
+            condition.appendages.add(PhaseAppendageCondition(habitatBlockEntity, phases))
+        }
+        return condition
+    }
+
+    class PhaseAppendageCondition(val habitatBlockEntity: HabitatBlockEntity, val phases: IntRanges) : AppendageCondition {
+        override fun fits(spawnablePosition: SpawnablePosition) = habitatBlockEntity.currentPhase in phases
+    }
+}
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.habitats.dto
+
+import com.cobblemon.mod.common.api.habitats.spawningstyle.ActivatedHabitatSpawning
+import net.minecraft.network.RegistryFriendlyByteBuf
+
+class ActivatedHabitatSettingsDTO() {
+    var chance = 1F
+    var trigger: ActivatedHabitatSpawning.Trigger = ActivatedHabitatSpawning.Trigger.REDSTONE
+    var cancelledNaturalSpawningRange = -1
+    var spawnRange = 16
+    var maxSpawns = -1
+    var maxSpawnsPerActivation = 1
+
+    constructor(activatedHabitatSpawning: ActivatedHabitatSpawning): this() {
+        this.chance = activatedHabitatSpawning.chance
+        this.trigger = activatedHabitatSpawning.trigger
+        this.cancelledNaturalSpawningRange = activatedHabitatSpawning.cancelledNaturalSpawningRange
+        this.spawnRange = activatedHabitatSpawning.spawnRange
+        this.maxSpawns = activatedHabitatSpawning.maxSpawns
+        this.maxSpawnsPerActivation = activatedHabitatSpawning.maxSpawnsPerActivation
+    }
+
+    fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeFloat(chance)
+        buffer.writeEnum(trigger)
+        buffer.writeInt(cancelledNaturalSpawningRange)
+        buffer.writeInt(spawnRange)
+        buffer.writeInt(maxSpawns)
+        buffer.writeInt(maxSpawnsPerActivation)
+    }
+
+    fun decode(buffer: RegistryFriendlyByteBuf) {
+        this.chance = buffer.readFloat()
+        this.trigger = buffer.readEnum(ActivatedHabitatSpawning.Trigger::class.java)
+        this.cancelledNaturalSpawningRange = buffer.readInt()
+        this.spawnRange = buffer.readInt()
+        this.maxSpawns = buffer.readInt()
+        this.maxSpawnsPerActivation = buffer.readInt()
+    }
+}
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.habitats.dto
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.habitats.HabitatPool
+import com.cobblemon.mod.common.api.habitats.HabitatPools
+import com.cobblemon.mod.common.api.habitats.HabitatSpawn
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.resources.ResourceLocation
+
+class HabitatPoolSettingsDTO() {
+    lateinit var id: ResourceLocation
+    var isReference = false
+
+    // Below properties are only there when it's not a reference, otherwise the handler will have to look them up from the id
+    var name: String? = null
+    var spawns: MutableList<HabitatSpawn>? = null
+
+    constructor(habitatPool: HabitatPool): this() {
+        this.id = habitatPool.id
+        this.isReference = !id.path.startsWith("custom__")
+        if (!this.isReference) {
+            this.name = habitatPool.name
+            this.spawns = habitatPool.spawns.toMutableList()
+        }
+    }
+
+    fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(id)
+        buffer.writeBoolean(isReference)
+        if (!isReference) {
+            buffer.writeUtf(name!!)
+            buffer.writeCollection(spawns!!) { _, spawn ->
+                spawn.encode(buffer)
+            }
+        }
+    }
+
+    fun decode(
+        buffer: RegistryFriendlyByteBuf
+    ) {
+        this.id = buffer.readResourceLocation()
+        this.isReference = buffer.readBoolean()
+        if (!isReference) {
+            this.name = buffer.readUtf()
+            this.spawns = buffer.readList {
+                val spawn = HabitatSpawn()
+                spawn.decode(buffer)
+                spawn
+            }.toMutableList()
+        }
+    }
+
+    fun toHabitatPool(): HabitatPool? {
+        if (isReference) {
+            val pool = HabitatPools.habitatPoolsById[id]
+            if (pool == null) {
+                Cobblemon.LOGGER.error("Could not find habitat pool with id $id")
+            }
+            return pool
+        }
+        val pool = HabitatPool()
+        pool.id = id
+        pool.name = name!!
+        pool.spawns = spawns!!
+        return pool
+    }
+}
@@ -0,0 +1,81 @@
+/*
+ * 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.habitats.dto
+
+import com.cobblemon.mod.common.api.habitats.HabitatPhaseOrder
+import com.cobblemon.mod.common.api.habitats.HabitatPool
+import com.cobblemon.mod.common.api.habitats.spawningstyle.ActivatedHabitatSpawning
+import com.cobblemon.mod.common.api.habitats.spawningstyle.NaturalHabitatSpawning
+import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.resources.ResourceLocation
+
+class HabitatSettingsDTO() {
+    var phaseOrder = HabitatPhaseOrder.SIMPLE
+    lateinit var levelRange: IntRange
+    var modifiers: String = ""
+    lateinit var mimicId: ResourceLocation
+    var isActivatedSpawning = false
+    var pool: HabitatPoolSettingsDTO = HabitatPoolSettingsDTO(HabitatPool.default())
+    var activatedSettings: ActivatedHabitatSettingsDTO? = null
+    var naturalSettings: NaturalHabitatSettingsDTO? = null
+
+    constructor(habitatBlockEntity: HabitatBlockEntity) : this() {
+        this.phaseOrder = habitatBlockEntity.phaseOrder
+        this.levelRange = habitatBlockEntity.levelRange
+        this.modifiers = habitatBlockEntity.modifiers.asString()
+        this.mimicId = habitatBlockEntity.mimicId
+        this.pool = HabitatPoolSettingsDTO(habitatBlockEntity.pool)
+        val style = habitatBlockEntity.spawningStyle
+        if (style is ActivatedHabitatSpawning) {
+            this.isActivatedSpawning = true
+            this.activatedSettings = ActivatedHabitatSettingsDTO(style)
+        } else if (style is NaturalHabitatSpawning) {
+            this.naturalSettings = NaturalHabitatSettingsDTO(style)
+        }
+    }
+
+    fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeEnum(phaseOrder)
+        buffer.writeInt(levelRange.first)
+        buffer.writeInt(levelRange.last)
+        buffer.writeUtf(modifiers)
+        buffer.writeResourceLocation(mimicId)
+        pool.encode(buffer)
+        buffer.writeBoolean(isActivatedSpawning)
+        if (isActivatedSpawning) {
+            activatedSettings?.encode(buffer)
+        } else {
+            naturalSettings?.encode(buffer)
+        }
+    }
+
+    fun decode(buffer: RegistryFriendlyByteBuf) {
+        this.phaseOrder = buffer.readEnum(HabitatPhaseOrder::class.java)
+        val levelRangeStart = buffer.readInt()
+        val levelRangeEnd = buffer.readInt()
+        this.levelRange = levelRangeStart..levelRangeEnd
+        this.modifiers = buffer.readUtf()
+        this.mimicId = buffer.readResourceLocation()
+        this.pool = HabitatPoolSettingsDTO()
+        this.pool.decode(buffer)
+        if (buffer.readBoolean()) {
+            this.isActivatedSpawning = true
+            this.naturalSettings = null
+            val activatedSettings = ActivatedHabitatSettingsDTO()
+            activatedSettings.decode(buffer)
+            this.activatedSettings = activatedSettings
+        } else {
+            this.activatedSettings = null
+            val naturalSettings = NaturalHabitatSettingsDTO()
+            naturalSettings.decode(buffer)
+            this.naturalSettings = naturalSettings
+        }
+    }
+}
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.habitats.dto
+
+import com.cobblemon.mod.common.api.habitats.spawningstyle.NaturalHabitatSpawning
+import net.minecraft.network.RegistryFriendlyByteBuf
+
+class NaturalHabitatSettingsDTO() {
+    var replaceSpawns = false
+    var rangeOfInfluence = 16
+
+    constructor(naturalHabitatSpawning: NaturalHabitatSpawning): this() {
+        this.replaceSpawns = naturalHabitatSpawning.replaceSpawns
+        this.rangeOfInfluence = naturalHabitatSpawning.rangeOfInfluence
+    }
+
+    fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeBoolean(replaceSpawns)
+        buffer.writeInt(rangeOfInfluence)
+    }
+
+    fun decode(buffer: RegistryFriendlyByteBuf, ) {
+        this.replaceSpawns = buffer.readBoolean()
+        this.rangeOfInfluence = buffer.readInt()
+    }
+}
@@ -0,0 +1,152 @@
+/*
+ * 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.habitats.spawningstyle
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.events.CobblemonEvents
+import com.cobblemon.mod.common.api.events.habitats.HabitatSpawnActivatedEvent
+import com.cobblemon.mod.common.api.habitats.ActivatedHabitatSpawningInfluence
+import com.cobblemon.mod.common.api.spawning.SpawnCause
+import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
+import com.cobblemon.mod.common.api.spawning.spawner.FixedAreaSpawner
+import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
+import com.cobblemon.mod.common.util.DataKeys
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.core.BlockPos
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.server.level.ServerLevel
+
+/**
+ * A habitat spawning style defined by being triggered by something. The activation trigger, [trigger], is either
+ * a redstone pulse, every tick, or every random tick.
+ *
+ * The spawn details are generated from the pool every time there is some change to the habitat block's settings,
+ * then those spawn details are used for spawning Pokémon when the habitat block is triggered.
+ *
+ * The [chance] property is applied after the trigger logic so that not every activation necessarily results in a spawn
+ * attempt.
+ *
+ * @author Hiroku
+ * @since February 14th, 2026
+ */
+class ActivatedHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : HabitatSpawningStyle {
+    companion object {
+        val TYPE = cobblemonResource("activated")
+    }
+
+    enum class Trigger {
+        /** Requires a redstone pulse. */
+        REDSTONE,
+        /** Tries every tick. */
+        TICK,
+        /** Tries every random tick. */
+        RANDOM_TICK
+    }
+
+    @Transient
+    override val type = TYPE
+
+    /** The chance that an activation by the [trigger] will result in a spawn attempt. The spawn attempt may still fail. */
+    var chance = 1F
+    /** The thing that will activate the habitat block into attempting to spawn something. */
+    var trigger = Trigger.REDSTONE
+    /** What range, in blocks, around the habitat block in which natural spawning will not occur. */
+    var cancelledNaturalSpawningRange = -1
+    /** The range, in blocks, around the habitat block in which spawning will be attempted. */
+    var spawnRange = 16
+    /** The maximum number of Pokémon that can exist from this block's spawning before it pauses. -1 for infinite. */
+    var maxSpawns = -1
+    /** The maximum number of Pokémon that can spawn in a single activation. This will still be capped by [maxSpawns]. */
+    var maxSpawnsPerActivation = 1
+
+    lateinit var spawner: FixedAreaSpawner
+
+    override fun writeToNBT(nbt: CompoundTag) {
+        nbt.putString(DataKeys.HABITAT_SPAWNING_STYLE, type.toString())
+        nbt.putFloat(DataKeys.HABITAT_ACTIVATED_CHANCE, chance)
+        nbt.putString(DataKeys.HABITAT_ACTIVATED_TRIGGER, trigger.name)
+        nbt.putInt(DataKeys.HABITAT_ACTIVATED_CANCEL_RANGE, cancelledNaturalSpawningRange)
+        nbt.putInt(DataKeys.HABITAT_ACTIVATED_SPAWN_RANGE, spawnRange)
+        nbt.putInt(DataKeys.HABITAT_ACTIVATED_MAX_SPAWNS, maxSpawns)
+        nbt.putInt(DataKeys.HABITAT_ACTIVATED_MAX_SPAWNS_PER_ACTIVATION, maxSpawnsPerActivation)
+    }
+
+    override fun readFromNBT(nbt: CompoundTag) {
+        chance = nbt.getFloat(DataKeys.HABITAT_ACTIVATED_CHANCE)
+        trigger = Trigger.valueOf(nbt.getString(DataKeys.HABITAT_ACTIVATED_TRIGGER) ?: Trigger.REDSTONE.name)
+        cancelledNaturalSpawningRange = nbt.getInt(DataKeys.HABITAT_ACTIVATED_CANCEL_RANGE)
+        spawnRange = nbt.getInt(DataKeys.HABITAT_ACTIVATED_SPAWN_RANGE)
+        maxSpawns = nbt.getInt(DataKeys.HABITAT_ACTIVATED_MAX_SPAWNS)
+        maxSpawnsPerActivation = nbt.getInt(DataKeys.HABITAT_ACTIVATED_MAX_SPAWNS_PER_ACTIVATION)
+    }
+
+    fun generateSpawnDetails(world: ServerLevel, pos: BlockPos) {
+        spawner = FixedAreaSpawner(
+            name = "habitat_spawner_$pos",
+            world = world,
+            position = pos,
+            spawnPool = SpawnPool("habitat_block").also {
+                it.details.addAll(habitatBlockEntity.spawnDetails)
+                it.precalculate()
+            },
+            buckets = Cobblemon.bestSpawner.config.activatedHabitatBuckets,
+            maxPokemonPerChunk = 16F,
+            verticalRadius = spawnRange,
+            horizontalRadius = spawnRange
+        )
+        spawner.influences.add(ActivatedHabitatSpawningInfluence(this))
+    }
+
+    fun activate(world: ServerLevel, pos: BlockPos) {
+        // Check if the spawn attempt should even happen based on chance.
+        if (chance < 1F && world.random.nextFloat() >= chance) {
+            return
+        } else if (habitatBlockEntity.spawnDetails.isEmpty()) {
+            // If there are no spawn details, then there's no point in trying to spawn anything.
+            return
+        }
+
+        // Check if the max spawns has been reached.
+        if (maxSpawns != -1) {
+            val existingSpawns = habitatBlockEntity.spawnedEntityIDs.size
+            if (existingSpawns >= maxSpawns) {
+                return
+            }
+        }
+
+        val cause = SpawnCause(
+            spawner = spawner,
+            entity = world.getNearestPlayer(
+                pos.x.toDouble(),
+                pos.y.toDouble(),
+                pos.z.toDouble(),
+                64.0,
+                true
+            )
+        )
+
+        val remainingUntilMaxSpawns = if (maxSpawns == -1) Int.MAX_VALUE else maxSpawns - habitatBlockEntity.spawnedEntityIDs.size
+        val maxSpawnsForActivation = if (maxSpawnsPerActivation == -1) Int.MAX_VALUE else maxSpawnsPerActivation
+        val maxSpawns = minOf(remainingUntilMaxSpawns, maxSpawnsForActivation)
+
+        val event = HabitatSpawnActivatedEvent(
+            habitatBlockEntity = habitatBlockEntity,
+            activatedHabitatSpawning = this,
+            cause = cause,
+            maxSpawns = maxSpawns
+        )
+
+        CobblemonEvents.HABITAT_SPAWN_ACTIVATED.postThen(event = event) {
+            spawner.run(
+                cause = event.cause,
+                maxSpawns = event.maxSpawns
+            )
+        }
+    }
+}
@@ -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.habitats.spawningstyle
+
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.resources.ResourceLocation
+
+/**
+ * Holds habitat block specific details about the methodology behind how the habitat block will spawn Pokémon. This is
+ * either an [ActivatedHabitatSpawning] or a [NaturalHabitatSpawning].
+ *
+ * @see ActivatedHabitatSpawning
+ * @see NaturalHabitatSpawning
+ * @author Hiroku
+ * @since February 14th, 2026
+ */
+sealed interface HabitatSpawningStyle {
+    val type: ResourceLocation
+
+    fun writeToNBT(nbt: CompoundTag)
+    fun readFromNBT(nbt: CompoundTag)
+}
@@ -0,0 +1,61 @@
+/*
+ * 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.habitats.spawningstyle
+
+import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
+import com.cobblemon.mod.common.util.DataKeys
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.resources.ResourceLocation
+
+/**
+ * A habitat spawning style defined by tapping into regular spawning methods. This works by adding to the spawn list
+ * for spawning that's occurring nearby. When [replaceSpawns] is set to true, the original spawns will be
+ * removed completely in favour of the spawns provided in this habitat's pool.
+ *
+ * The spawn details are generated from the pool every time there is some change to the habitat block's settings,
+ * then those spawn details are used for spawning Pokémon when world spawning is occurring nearby.
+ *
+ * Whether or not this interactions with overworld or fishing spawns is determined by whether the habitat pool has
+ * overworld or fishing spawns respectively.
+ *
+ * @author Hiroku
+ * @since February 22nd, 2026
+ */
+class NaturalHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : HabitatSpawningStyle {
+    companion object {
+        val TYPE = cobblemonResource("natural")
+    }
+
+    @Transient
+    override val type: ResourceLocation = TYPE
+
+    var replaceSpawns = false
+    var rangeOfInfluence = 16
+
+    @Transient
+    var affectsFishing = false
+    @Transient
+    var affectsOverworld = false
+
+    fun generateSpawnDetails() {
+        affectsFishing = habitatBlockEntity.spawnDetails.any { it.spawnablePositionType.name == "fishing" }
+        affectsOverworld = habitatBlockEntity.spawnDetails.any { it.spawnablePositionType.name != "fishing" }
+    }
+
+    override fun writeToNBT(nbt: CompoundTag) {
+        nbt.putBoolean(DataKeys.HABITAT_NATURAL_REPLACE_SPAWNS, replaceSpawns)
+        nbt.putInt(DataKeys.HABITAT_NATURAL_RANGE_OF_INFLUENCE, rangeOfInfluence)
+    }
+
+    override fun readFromNBT(nbt: CompoundTag) {
+        replaceSpawns = nbt.getBoolean(DataKeys.HABITAT_NATURAL_REPLACE_SPAWNS)
+        rangeOfInfluence = nbt.getInt(DataKeys.HABITAT_NATURAL_RANGE_OF_INFLUENCE)
+    }
+}
@@ -51,11 +51,15 @@ data class PokemonInteractionSet(
 }

 data class PokemonInteraction(
-    val grouping: ResourceLocation,
    val requirements: List<Requirement> = listOf(),
    val effects: List<InteractionEffect> = listOf(),
    val cooldown: ExpressionLike = "0".asExpressionLike()
 ) {
+    // Not put as a necessary constructor parameter because then there isn't a default constructor
+    // and that means Gson just gives null for everything in the constructor and falls back to the JSON
+    // properties - completely ignoring the default values above.
+    lateinit var grouping: ResourceLocation
+
    fun encode(buffer: FriendlyByteBuf) {
        buffer.writeResourceLocation(grouping)
        buffer.writeCollection(requirements) { it, requirement ->
@@ -76,11 +80,12 @@ data class PokemonInteraction(
            val cooldown = buffer.readExpressionLike()

            return PokemonInteraction(
-                grouping,
                requirements,
                effects,
                cooldown,
-            )
+            ).also {
+                it.grouping = grouping
+            }
        }
    }
 }
@@ -38,7 +38,7 @@ import net.minecraft.world.phys.AABB
 * @since July 29th, 2023
 */
 interface PokemonSelectingItem {
-    fun use(player: ServerPlayer, stack: ItemStack): InteractionResultHolder<ItemStack> {
+    fun use(player: ServerPlayer, stack: ItemStack, ignoreShift: Boolean = false): InteractionResultHolder<ItemStack> {
        val range = player.entityInteractionRange()
        val entity = player.level()
            .getEntities(player, AABB.ofSize(player.position(), range, range, range))
@@ -60,7 +60,7 @@ interface PokemonSelectingItem {
                return interactWithSpecificBattle(player, stack, battlePokemon)
            }
        } ?: run {
-            if (!player.isShiftKeyDown) {
+            if (ignoreShift || !player.isShiftKeyDown) {
                return if (entity != null) {
                    val pokemon = entity.pokemon
                    if (entity.ownerUUID == player.uuid) {
@@ -27,7 +27,9 @@ class Mark(
    val replace: List<ResourceLocation>?,
    val group: String?,
    val chance: Float = 0F,
-    val indexNumber: Int?
+    val indexNumber: Int?,
+    val aspects: List<String>?,
+    val sortOrder: Int = 0,
 ): StringRepresentable {

    companion object {
@@ -42,7 +44,9 @@ class Mark(
                buffer.readNullable { buffer.readList { buffer.readResourceLocation() } },
                buffer.readNullable { buffer.readString() },
                buffer.readFloat(),
-                buffer.readNullable { buffer.readInt() }
+                buffer.readNullable { buffer.readInt() },
+                buffer.readNullable { buffer.readList { buffer.readString() } },
+                buffer.readInt(),
            )
        }
    }
@@ -83,5 +87,7 @@ class Mark(
        buffer.writeNullable(group) { _, v -> buffer.writeString(v) }
        buffer.writeFloat(chance)
        buffer.writeNullable(indexNumber) { _, v -> buffer.writeInt(v) }
+        buffer.writeNullable(aspects) { _, v -> buffer.writeCollection(v) { _, aspect -> buffer.writeString(aspect) } }
+        buffer.writeInt(sortOrder)
    }
 }
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+
+
+/**
+ * Abstract MoLang function holder
+ * Effectively allows to attach molang functions to almost anything by extending it
+ *
+ * @sample BattleActorMoLangFunctions
+ * @author Gito
+ */
+abstract class AbstractMoLangFunctionHolder<T> {
+    val custom: MutableList<(T) -> Map<String, (MoParams) -> Any>> = mutableListOf()
+
+    protected abstract fun T.moLangFunctions(): MutableMap<String, (MoParams) -> Any>
+
+    fun attach(value: T): Map<String, (MoParams) -> Any> {
+        return value.moLangFunctions().also { functions ->
+            custom.forEach { definition ->
+                functions.putAll(definition(value))
+            }
+        }
+    }
+}
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.cobblemon.mod.common.api.battles.model.actor.ActorType
+import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
+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 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 -> {
+                functions["npc"] = { actor.entity.struct }
+            }
+
+            is PlayerBattleActor -> {
+                functions["player"] = { actor.entity?.asMoLangValue() ?: DoubleValue.ZERO }
+            }
+
+            is PokemonBattleActor -> {
+                functions["pokemon"] = { actor.entity?.asMoLangValue() ?: DoubleValue.ZERO }
+            }
+        }
+
+        return functions
+    }
+}
@@ -0,0 +1,34 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
+import com.cobblemon.mod.common.util.getStringOrNull
+
+object BattleMessageMoLangFunctions : AbstractMoLangFunctionHolder<BattleMessage>() {
+    override fun BattleMessage.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val battleMessage = this
+        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
+    }
+}
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.api.battles.model.PokemonBattle
+import com.cobblemon.mod.common.util.asArrayValue
+import java.util.*
+
+object BattleMoLangFunctions : AbstractMoLangFunctionHolder<PokemonBattle>() {
+    override fun PokemonBattle.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val battle = this
+        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
+    }
+}
@@ -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.api.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import net.minecraft.core.Holder
+import net.minecraft.world.level.biome.Biome
+
+object BiomeMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Biome>>() {
+    override fun Holder<Biome>.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val biome = this
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        return functions
+    }
+}
@@ -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.api.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import net.minecraft.core.Holder
+import net.minecraft.world.level.block.Block
+
+object BlockMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Block>>() {
+    override fun Holder<Block>.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val block = this
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        return functions
+    }
+}
@@ -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.api.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import net.minecraft.core.Holder
+import net.minecraft.world.level.dimension.DimensionType
+
+object DimensionTypeMoLangFunctions : AbstractMoLangFunctionHolder<Holder<DimensionType>>() {
+    override fun Holder<DimensionType>.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val dimension = this
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        return functions
+    }
+}
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.cobblemon.mod.common.api.drop.DropEntry
+import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.getOrNull
+
+object DropEntryMoLangFunctions : AbstractMoLangFunctionHolder<DropEntry>() {
+    override fun DropEntry.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val drop = this
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        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 functions
+    }
+}
@@ -0,0 +1,355 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoLangRuntime
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.struct.ArrayStruct
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.MoValue
+import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.api.dialogue.ReferenceDialogueFaceProvider
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asBiomeMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asWorldMoLangValue
+import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.api.scheduling.Schedulable
+import com.cobblemon.mod.common.api.text.text
+import com.cobblemon.mod.common.entity.MoLangScriptingEntity
+import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
+import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
+import com.cobblemon.mod.common.util.asArrayValue
+import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.asResource
+import com.cobblemon.mod.common.util.asUUID
+import com.cobblemon.mod.common.util.cloneFrom
+import com.cobblemon.mod.common.util.effectiveName
+import com.cobblemon.mod.common.util.getBlockStatesWithPos
+import com.cobblemon.mod.common.util.getBooleanOrNull
+import com.cobblemon.mod.common.util.getDoubleOrNull
+import com.cobblemon.mod.common.util.getIsSubmerged
+import com.cobblemon.mod.common.util.getOrNull
+import com.cobblemon.mod.common.util.getStringOrNull
+import com.cobblemon.mod.common.util.isStandingOn
+import com.cobblemon.mod.common.util.resolve
+import com.cobblemon.mod.common.util.worldRegistry
+import net.minecraft.core.registries.Registries
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.tags.TagKey
+import net.minecraft.world.damagesource.DamageSource
+import net.minecraft.world.damagesource.DamageTypes
+import net.minecraft.world.entity.Entity
+import net.minecraft.world.entity.TamableAnimal
+import net.minecraft.world.phys.AABB
+import net.minecraft.world.phys.Vec3
+import java.util.UUID
+import kotlin.math.sqrt
+
+object EntityMoLangFunctions : AbstractMoLangFunctionHolder<Entity>() {
+    override fun Entity.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        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(),
+                )
+            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
+        }
+        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,
+                                    ),
+                                )
+                            } else {
+                                it.`is`(type)
+                            }
+                        }
+                    }.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
+        }
+        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()
+        }
+        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 (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.
+        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 -> entity.level().getPlayerByUUID(UUID.fromString(it.value))
+                        is ObjectValue<*> -> it.obj
+                        else -> null
+                    }
+                } as? ServerPlayer
+
+            val packet = SpawnSnowstormEntityParticlePacket(particle, entity.id, listOf(locator))
+            if (player == null) {
+                packet.sendToPlayersAround(
+                    entity.x,
+                    entity.y,
+                    entity.z,
+                    64.0,
+                    entity.level().dimension(),
+                )
+            } else {
+                packet.sendToPlayer(player)
+            }
+        }
+        functions["make_intangible"] = { params ->
+            val intangible = params.getBooleanOrNull(0) ?: true
+            entity.noPhysics = intangible
+            DoubleValue.ONE
+        }
+
+        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 {
+                        packet.sendToPlayersAround(
+                            entity.x,
+                            entity.y,
+                            entity.z,
+                            64.0,
+                            entity.level().dimension(),
+                        )
+                        return@playAnimation DoubleValue.ONE
+                    }
+                }
+
+                functions["face"] = { params ->
+                    ObjectValue(ReferenceDialogueFaceProvider(entity.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)
+                    }
+                }
+            }
+
+            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
+                }
+            }
+        }
+
+        return functions
+    }
+}
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolution
+import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
+import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
+
+object EvolutionMoLangFunctions : AbstractMoLangFunctionHolder<Evolution>() {
+    override fun Evolution.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val evolution = this
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["result"] = { evolution.result.asMoLangValue() }
+        functions["is_optional"] = { DoubleValue(evolution.optional) }
+        functions["consumes_held_item"] = { DoubleValue(evolution.consumeHeldItem) }
+
+        when (evolution) {
+            is LevelUpEvolution -> {
+                functions["is_level_up"] = { DoubleValue.ONE }
+            }
+
+            is TradeEvolution -> {
+                functions["is_trade"] = { DoubleValue.ONE }
+            }
+
+            is ItemInteractionEvolution -> {
+                functions["is_item"] = { DoubleValue.ONE }
+            }
+        }
+
+        return functions
+    }
+}
@@ -0,0 +1,317 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoLangRuntime
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.struct.ArrayStruct
+import com.bedrockk.molang.runtime.struct.ContextStruct
+import com.bedrockk.molang.runtime.struct.VariableStruct
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.MoValue
+import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.Cobblemon.LOGGER
+import com.cobblemon.mod.common.Environment
+import com.cobblemon.mod.common.api.molang.MoLangLoadedFilesCache
+import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.api.moves.Moves
+import com.cobblemon.mod.common.api.npc.partyproviders.SimplePartyProvider
+import com.cobblemon.mod.common.api.scheduling.ClientTaskTracker
+import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
+import com.cobblemon.mod.common.api.scripting.CobblemonScripts
+import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunctions
+import com.cobblemon.mod.common.pokemon.ai.ObtainableItem
+import com.cobblemon.mod.common.pokemon.ai.ObtainableItemCondition
+import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.getDoubleOrNull
+import com.cobblemon.mod.common.util.getIntOrNull
+import com.cobblemon.mod.common.util.getOrNull
+import com.cobblemon.mod.common.util.isInt
+import com.cobblemon.mod.common.util.resolve
+import com.cobblemon.mod.common.util.server
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.world.item.ItemStack
+import java.text.ParseException
+
+object GeneralMoLangFunctions {
+    val functions: MutableMap<String, (MoParams) -> Any> = mutableMapOf()
+
+    init {
+        functions["print"] = { params ->
+            val message = params.get<MoValue>(0).asString()
+            LOGGER.info(message)
+        }
+        functions["delete_variable"] = { params ->
+            val struct = params.get<VariableStruct>(0)
+            val variable = params.getString(1)
+            struct.map.remove(variable)
+            DoubleValue.ONE
+        }
+        functions["delete_variables"] = { params ->
+            val struct = params.get<VariableStruct>(0)
+            struct.map.clear()
+            DoubleValue.ONE
+        }
+        functions["get_variable"] = { params ->
+            val struct = params.get<VariableStruct>(0)
+            val variable = params.getString(1)
+            struct.map[variable] ?: DoubleValue.ZERO
+        }
+        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
+        }
+        functions["set_query"] = { params ->
+            val variable = params.getString(0)
+            val value = params.get<MoValue>(1)
+            params.environment.query.addFunction(variable) { value }
+            value
+        }
+        functions["replace"] = { params ->
+            val text = params.getString(0)
+            val search = params.getString(1)
+            val replace = params.getString(2)
+            StringValue(text.replace(search, replace))
+        }
+        functions["is_included"] = { params ->
+            val text = params.getString(0)
+            val search = params.getString(1)
+            DoubleValue(text.contains(search))
+        }
+        functions["to_lower"] = { params ->
+            StringValue(params.getString(0).lowercase())
+        }
+        functions["to_upper"] = { params ->
+            StringValue(params.getString(0).uppercase())
+        }
+        functions["string_length"] = { params ->
+            DoubleValue(params.getString(0).length)
+        }
+        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
+        }
+        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),
+            )
+        }
+        functions["run_command"] = { params ->
+            val command = params.getString(0)
+            try {
+                server()!!.commands.performPrefixedCommand(server()!!.createCommandSourceStack(), command)
+            } catch (_: NullPointerException) {
+                DoubleValue.ZERO
+            }
+        }
+        functions["is_int"] = { params -> DoubleValue(params.get<MoValue>(0).asString().isInt()) }
+        functions["is_number"] = { params ->
+            DoubleValue(
+                params.get<MoValue>(0).asString().toDoubleOrNull() != null,
+            )
+        }
+        functions["to_number"] = { params ->
+            DoubleValue(
+                params.get<MoValue>(0).asString().toDoubleOrNull() ?: 0.0,
+            )
+        }
+        functions["to_int"] = { params ->
+            DoubleValue(
+                params.get<MoValue>(0).asString().toIntOrNull() ?: 0,
+            )
+        }
+        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)) {
+                options.add(params.get(index))
+                index++
+            }
+            options.random() // Can throw an exception if they specified no args. They'd be idiots though.
+        }
+        functions["curve"] = { params ->
+            val curveName = params.getString(0)
+            val curve =
+                WaveFunctions.functions[curveName] ?: throw IllegalArgumentException("Unknown curve: $curveName")
+            ObjectValue(curve)
+        }
+        functions["array"] = { params ->
+            val values = params.params
+            val array = ArrayStruct(hashMapOf())
+            values.forEachIndexed { index, moValue -> array.setDirectly("$index", moValue) }
+            array
+        }
+        functions["length"] = { params ->
+            val array = (params.getOrNull<MoValue>(0) as? VariableStruct)
+            if (array == null) {
+                DoubleValue.ZERO
+            } else {
+                DoubleValue(array.map.size.toDouble())
+            }
+        }
+        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
+        }
+        functions["insert"] = { params ->
+            val array = params.get<ArrayStruct>(0)
+            val index = params.getInt(1)
+            val value = params.get<MoValue>(2)
+            val size = array.map.size
+
+            // Shift elements at and after index up by 1
+            for (i in (size - 1) downTo index) {
+                val current = array.map[i.toString()]
+                if (current != null) {
+                    array.map[(i + 1).toString()] = current
+                }
+            }
+            array.map[index.toString()] = value
+            array
+        }
+        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() }
+                    .sorted()
+                    .forEachIndexed { i, k -> newMap[i.toString()] = array.map[k.toString()]!! }
+                array.map.clear()
+                array.map.putAll(newMap)
+            }
+            array
+        }
+        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(),
+                )
+            val script = params.getString(0).asIdentifierDefaultingNamespace()
+            // store the args in the
+            CobblemonScripts.run(script, runtime) ?: DoubleValue.ZERO
+        }
+        functions["run_molang"] = { params ->
+            val runtime = MoLangRuntime()
+            runtime.environment.query = params.environment.query
+            runtime.environment.variable = params.environment.variable
+            runtime.environment.context = params.environment.context
+            val expression = params.getString(0).asExpressionLike()
+            val delayInSeconds = params.getDoubleOrNull(1)?.toFloat() ?: 0.0f
+
+            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,
+                    )
+                    DoubleValue.ZERO
+                }
+
+            if (delayInSeconds > 0.0f) {
+                val tracker =
+                    if (Cobblemon.implementation.environment() == Environment.SERVER) ServerTaskTracker else ClientTaskTracker
+                tracker.after(delayInSeconds) {
+                    evaluate()
+                }
+                DoubleValue.ONE
+            } else {
+                evaluate()
+            }
+        }
+        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)
+        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)
+        }
+        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)
+        }
+        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")
+                }
+            DoubleValue(a.after(b))
+        }
+        functions["get_move_from_id"] = { params ->
+            val moveId = params.getString(0)
+            val moveTemplate = Moves.getByName(moveId)
+            moveTemplate?.struct ?: DoubleValue.ZERO
+        }
+        functions["create_simple_party_provider"] = {
+            val partyProvider = SimplePartyProvider()
+            partyProvider.struct
+        }
+        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
+        }
+        functions["create_itemstack"] = { params ->
+            val itemId = params.getString(0).asIdentifierDefaultingNamespace()
+            try {
+                val item = BuiltInRegistries.ITEM.get(itemId)
+                val count = params.getIntOrNull(1) ?: 1
+                val itemStack = ItemStack(item, count)
+                ObjectValue(itemStack)
+            } catch (_: NullPointerException) {
+                LOGGER.error("Cannot create item stack from identifier: $itemId, item with that ID does not exist. Possible typo?")
+                DoubleValue.ZERO
+            }
+        }
+        functions["file"] = { MoLangLoadedFilesCache.struct }
+    }
+}
@@ -0,0 +1,69 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.getIntOrNull
+import net.minecraft.core.RegistryAccess
+import net.minecraft.core.component.DataComponents
+import net.minecraft.core.registries.Registries
+import net.minecraft.tags.TagKey
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.item.enchantment.EnchantmentHelper
+
+object ItemStackMoLangFunctions : AbstractMoLangFunctionHolder<Pair<ItemStack, RegistryAccess>>() {
+    override fun Pair<ItemStack, RegistryAccess>.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val stack = this.first
+        val registryAccess = this.second
+        val itemRegistry = registryAccess.registryOrThrow(Registries.ITEM)
+        val holder = itemRegistry.wrapAsHolder(stack.item)
+        val functions = mutableMapOf<String, (MoParams) -> Any>()
+
+        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(),
+                ),
+            )
+        }
+        functions["is_in"] = { params ->
+            DoubleValue(
+                holder.`is`(
+                    TagKey.create(
+                        Registries.ITEM,
+                        params.getString(0).replace("#", "").asIdentifierDefaultingNamespace(),
+                    ),
+                ),
+            )
+        }
+        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@hasEnchantment DoubleValue.ZERO
+            val level = EnchantmentHelper.getItemEnchantmentLevel(holder, stack)
+            DoubleValue(level >= minLevel)
+        }
+
+        return functions
+    }
+}
@@ -0,0 +1,295 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.struct.VariableStruct
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.MoValue
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.CobblemonBlockPosTracker
+import com.cobblemon.mod.common.api.ai.CobblemonWanderControl
+import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.entity.npc.NPCEntity
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.asUUID
+import com.cobblemon.mod.common.util.getBooleanOrNull
+import com.cobblemon.mod.common.util.getDoubleOrNull
+import com.cobblemon.mod.common.util.getIntOrNull
+import com.cobblemon.mod.common.util.getMemorySafely
+import com.cobblemon.mod.common.util.hasMemoryFromString
+import com.cobblemon.mod.common.util.isDoingActivityFromString
+import com.cobblemon.mod.common.util.isLookingAt
+import com.cobblemon.mod.common.util.traceEntityCollision
+import net.minecraft.core.Position
+import net.minecraft.core.Vec3i
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.world.effect.MobEffectInstance
+import net.minecraft.world.entity.Entity
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.Mob
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.TamableAnimal
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.MemoryStatus
+import net.minecraft.world.entity.ai.memory.WalkTarget
+import net.minecraft.world.entity.animal.Animal
+import net.minecraft.world.entity.monster.Monster
+import net.minecraft.world.entity.player.Player
+import net.minecraft.world.level.ClipContext
+import net.minecraft.world.level.pathfinder.PathType
+import net.minecraft.world.phys.Vec3
+import java.util.*
+
+object LivingEntityMoLangFunctions : AbstractMoLangFunctionHolder<LivingEntity>() {
+    override fun LivingEntity.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val entity = this
+        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@removeEffect DoubleValue.ONE
+            }
+        }
+        functions["add_effect"] = addEffect@{ params ->
+            val effectId = params.getString(0).asIdentifierDefaultingNamespace()
+            val duration = params.getInt(1)
+            val amplifier = params.getIntOrNull(2) ?: 0
+            val ambient = params.getBooleanOrNull(3) ?: false
+            val visible = params.getBooleanOrNull(4) ?: true
+            val effectHolder = BuiltInRegistries.MOB_EFFECT.getHolder(effectId).orElse(null)
+            if (effectHolder != null) {
+                entity.addEffect(MobEffectInstance(effectHolder, duration, amplifier, ambient, visible))
+                return@addEffect DoubleValue.ONE
+            }
+        }
+        functions["has_effect"] = { params ->
+            val effectId = params.getString(0).asIdentifierDefaultingNamespace()
+            val effectHolder = BuiltInRegistries.MOB_EFFECT.getHolder(effectId).orElse(null)
+            DoubleValue(effectHolder != null && entity.hasEffect(effectHolder))
+        }
+        functions["heal"] = { params ->
+            val amount = params.getDouble(0)
+            entity.heal(amount.toFloat())
+        }
+        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@isLookingAt DoubleValue.ZERO
+                }
+
+            DoubleValue(entity.isLookingAt(entity, maxDistance))
+        }
+        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)
+            val duration = params.getIntOrNull(3) ?: 20
+            val flags = params.params.subList(4, params.params.size).map { it.asString() }
+            val brain = entity.brain
+            brain.setMemoryWithExpiry(
+                MemoryModuleType.LOOK_TARGET,
+                CobblemonBlockPosTracker(Vec3(x, y, z), flags.toSet()),
+                duration.toLong(),
+            )
+        }
+        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.setMemory(CobblemonMemories.WANDER_CONTROL, value)
+            }
+            value.struct
+        }
+        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@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()),
+                            ),
+                        )
+                    }
+
+                    else -> {
+                        DoubleValue.ZERO
+                    }
+                }
+            }
+
+            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)
+            }
+            DoubleValue.ONE
+        }
+        functions["erase_memory"] = { params ->
+            val memories =
+                params.params
+                    .map { it.asString().asIdentifierDefaultingNamespace() }
+                    .map(BuiltInRegistries.MEMORY_MODULE_TYPE::get)
+            memories.forEach { entity.brain.eraseMemory(it) }
+            DoubleValue.ONE
+        }
+        functions["has_memory_value"] = hasMemoryValue@{ params ->
+            for (param in params.params) {
+                if (!entity.hasMemoryFromString(param.asString())) {
+                    return@hasMemoryValue DoubleValue.ZERO
+                }
+            }
+            DoubleValue.ONE
+        }
+        functions["lacks_memory_value"] = lacksMemoryValue@{ params ->
+            for (param in params.params) {
+                if (entity.hasMemoryFromString(param.asString())) {
+                    return@lacksMemoryValue DoubleValue.ZERO
+                }
+            }
+            DoubleValue.ONE
+        }
+        functions["is_doing_activity"] = isDoingActivity@{ params ->
+            for (param in params.params) {
+                if (entity.isDoingActivityFromString(param.asString())) {
+                    return@isDoingActivity DoubleValue.ONE
+                }
+            }
+            DoubleValue.ZERO
+        }
+        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@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@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
+                }
+            }
+        }
+
+        return functions
+    }
+}
@@ -0,0 +1,282 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoLangRuntime
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.struct.ArrayStruct
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.MoValue
+import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.CobblemonActivities
+import com.cobblemon.mod.common.CobblemonBlockEntities
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
+import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
+import com.cobblemon.mod.common.api.moves.animations.ActionEffects
+import com.cobblemon.mod.common.api.moves.animations.NPCProvider
+import com.cobblemon.mod.common.api.npc.NPCClasses
+import com.cobblemon.mod.common.api.npc.configuration.interaction.DialogueNPCInteractionConfiguration
+import com.cobblemon.mod.common.api.npc.configuration.interaction.ScriptNPCInteractionConfiguration
+import com.cobblemon.mod.common.api.scripting.CobblemonScripts
+import com.cobblemon.mod.common.api.storage.party.NPCPartyStore
+import com.cobblemon.mod.common.battles.BattleRegistry
+import com.cobblemon.mod.common.entity.npc.NPCEntity
+import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
+import com.cobblemon.mod.common.util.asArrayValue
+import com.cobblemon.mod.common.util.asBlockPos
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.asResource
+import com.cobblemon.mod.common.util.cloneFrom
+import com.cobblemon.mod.common.util.getBooleanOrNull
+import com.cobblemon.mod.common.util.getDoubleOrNull
+import com.cobblemon.mod.common.util.getStringOrNull
+import com.cobblemon.mod.common.util.withNPCValue
+import net.minecraft.commands.arguments.EntityAnchorArgument
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.world.entity.EntityDimensions
+import net.minecraft.world.phys.Vec3
+import kotlin.collections.any
+
+object NPCMoLangFunctions : AbstractMoLangFunctionHolder<NPCEntity>() {
+    override fun NPCEntity.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val npc = this
+        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(),
+            )
+        }
+        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)
+                val packet = RunPosableMoLangPacket(npc.id, setOf("q.run_script('$script')"))
+                packet.sendToPlayers(world.players().toList())
+            }
+            Unit
+        }
+        functions["run_script"] = { params ->
+            val script = params.getString(0).asIdentifierDefaultingNamespace()
+            val runtime = MoLangRuntime()
+            runtime.environment.cloneFrom(params.environment)
+            CobblemonScripts.run(script, runtime) ?: DoubleValue(0)
+        }
+        functions["set_movable"] = { params ->
+            val movable = params.getBooleanOrNull(0) != false
+            npc.isMovable = movable
+            DoubleValue.ONE
+        }
+        functions["set_invulnerable"] = { params ->
+            val invulnerable = params.getBooleanOrNull(0) != false
+            npc.isInvulnerable = invulnerable
+            DoubleValue.ONE
+        }
+        functions["set_leashable"] = { params ->
+            val leashable = params.getBooleanOrNull(0) != false
+            npc.isLeashable = leashable
+            DoubleValue.ONE
+        }
+        functions["set_allow_projectile_hits"] = { params ->
+            val allowProjectileHits = params.getBooleanOrNull(0) != false
+            npc.allowProjectileHits = allowProjectileHits
+            DoubleValue.ONE
+        }
+        functions["set_name_tag_visible"] = { params ->
+            val nameTagVisible = params.getBooleanOrNull(0) != false
+            npc.hideNameTag = !nameTagVisible
+            DoubleValue.ONE
+        }
+        functions["unset_interaction"] = {
+            npc.interaction = null
+            DoubleValue.ONE
+        }
+        functions["set_dialogue_interaction"] = { params ->
+            val dialogue = params.getString(0).asIdentifierDefaultingNamespace()
+            npc.interaction =
+                DialogueNPCInteractionConfiguration().also {
+                    it.dialogue = dialogue
+                }
+            DoubleValue.ONE
+        }
+        functions["set_script_interaction"] = { params ->
+            val script = params.getString(0).asIdentifierDefaultingNamespace()
+            npc.interaction =
+                ScriptNPCInteractionConfiguration().also {
+                    it.script = script
+                }
+            DoubleValue.ONE
+        }
+        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@setPlayerTexture DoubleValue.ZERO
+            }
+            npc.loadTextureFromGameProfileName(username)
+            DoubleValue.ONE
+        }
+        functions["unset_player_texture"] = {
+            npc.unloadTexture()
+            DoubleValue.ONE
+        }
+        functions["set_resource_identifier"] = { params ->
+            val identifier = params.getStringOrNull(0)?.asIdentifierDefaultingNamespace()
+            npc.forcedResourceIdentifier = identifier
+            DoubleValue.ONE
+        }
+        functions["unset_resource_identifier"] = {
+            npc.forcedResourceIdentifier = null
+            DoubleValue.ONE
+        }
+        functions["set_class"] = setClass@{ params ->
+            val identifier = params.getString(0).asIdentifierDefaultingNamespace()
+            val npcClass = NPCClasses.getByIdentifier(identifier)
+            if (npcClass != null) {
+                npc.npc = npcClass
+                return@setClass DoubleValue.ONE
+            }
+            Cobblemon.LOGGER.error("Unknown NPC class: $identifier")
+            DoubleValue.ZERO
+        }
+        functions["set_render_scale"] = { params ->
+            val scale = params.getDouble(0)
+            npc.renderScale = scale.toFloat()
+            DoubleValue.ONE
+        }
+        functions["render_scale"] = { DoubleValue(npc.renderScale) }
+        functions["set_hitbox_scale"] = { params ->
+            val scale = params.getDouble(0).toFloat()
+            npc.hitboxScale = scale
+            npc.refreshDimensions()
+            DoubleValue.ONE
+        }
+        functions["hitbox_scale"] = { DoubleValue(npc.hitboxScale) }
+        functions["set_hitbox"] = setHitbox@{ params ->
+            if (params.params.isEmpty()) {
+                npc.hitbox = null
+                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)
+            DoubleValue.ONE
+        }
+        functions["unset_hitbox"] = {
+            npc.hitbox = null
+            DoubleValue.ONE
+        }
+        functions["aspects"] = {
+            val aspects = npc.aspects
+            aspects.asArrayValue { StringValue(it) }
+        }
+        functions["add_aspect"] = { params ->
+            val aspects = params.params.map { it.asString() }
+            npc.appliedAspects.addAll(aspects)
+            npc.updateAspects()
+            DoubleValue.ONE
+        }
+        functions["remove_aspect"] = { params ->
+            val aspects = params.params.map { it.asString() }
+            npc.appliedAspects.removeAll(aspects.toSet())
+            npc.updateAspects()
+            DoubleValue.ONE
+        }
+        functions["party"] = party@{
+            val party = npc.party ?: return@party DoubleValue.ZERO
+            party.asMoLangValue()
+        }
+        functions["create_npc_party"] = {
+            val party = NPCPartyStore(npc)
+            party.asMoLangValue()
+        }
+        functions["set_npc_party"] = { params ->
+            val party = params.get<MoValue>(0)
+            if (party is ObjectValue<*>) {
+                npc.party = party.obj as NPCPartyStore
+            } else {
+                npc.party = null
+            }
+            DoubleValue.ONE
+        }
+        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(),
+                    )
+                npc.actionEffect = context
+                npc.brain.setMemory(CobblemonMemories.ACTIVE_ACTION_EFFECT, context)
+                npc.brain.setActiveActivityIfPossible(CobblemonActivities.ACTION_EFFECT)
+                actionEffect.run(context).thenRun {
+                    val npcActionEffect = npc.brain.getMemory(CobblemonMemories.ACTIVE_ACTION_EFFECT).orElse(null)
+                    if (npcActionEffect == context && npc.brain.isActive(CobblemonActivities.ACTION_EFFECT)) {
+                        npc.brain.eraseMemory(CobblemonMemories.ACTIVE_ACTION_EFFECT)
+                        npc.actionEffect = null
+                    }
+                }
+
+                return@runActionEffect DoubleValue.ONE
+            }
+            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@putPokeInHealer DoubleValue.ONE
+            }
+            DoubleValue.ZERO
+        }
+        functions["look_at_position"] = { params ->
+            val pos = Vec3(params.getDouble(0), params.getDouble(1), params.getDouble(2))
+            npc.lookAt(EntityAnchorArgument.Anchor.EYES, pos)
+        }
+        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
+            DoubleValue.ONE
+        }
+
+        return functions
+    }
+}
@@ -0,0 +1,62 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.CobblemonUnlockableWallpapers
+import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.api.storage.pc.PCPosition
+import com.cobblemon.mod.common.api.storage.pc.PCStore
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.asArrayValue
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.getBooleanOrNull
+
+object PCMoLangFunctions : AbstractMoLangFunctionHolder<PCStore>() {
+    override fun PCStore.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val pc = this
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        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
+            pokemon.struct
+        }
+        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
+        }
+        functions["resize"] = { params ->
+            val newSize = params.getInt(0)
+            val lockNewSize = params.getBooleanOrNull(1) == true
+            pc.resize(newSize, lockNewSize)
+            DoubleValue.ONE
+        }
+        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))
+        }
+        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
+            DoubleValue(pc.unlockWallpaper(wallpaper, playSound))
+        }
+
+        return functions
+    }
+}
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.value.DoubleValue
+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>() {
+    override fun PartyStore.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val party = this
+        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
+        }
+        functions["set_pokemon"] = { params ->
+            val index = params.getInt(0)
+            val pokemon = params.get<ObjectValue<Pokemon>>(1).obj
+            party.set(index, pokemon)
+            DoubleValue.ONE
+        }
+
+        return functions
+    }
+}
@@ -0,0 +1,440 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoLangEnvironment
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.struct.ArrayStruct
+import com.bedrockk.molang.runtime.struct.VariableStruct
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.MoValue
+import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.Cobblemon
+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
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.net.messages.client.battle.BattleMusicPacket
+import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.activeDialogue
+import com.cobblemon.mod.common.util.asBlockPos
+import com.cobblemon.mod.common.util.asResource
+import com.cobblemon.mod.common.util.asUUID
+import com.cobblemon.mod.common.util.getBattleState
+import com.cobblemon.mod.common.util.getBooleanOrNull
+import com.cobblemon.mod.common.util.getDoubleOrNull
+import com.cobblemon.mod.common.util.getIntOrNull
+import com.cobblemon.mod.common.util.getOrNull
+import com.cobblemon.mod.common.util.getStringOrNull
+import com.cobblemon.mod.common.util.isInBattle
+import com.cobblemon.mod.common.util.isInDialogue
+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
+
+object PlayerMoLangFunctions : AbstractMoLangFunctionHolder<Player>() {
+    override fun Player.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val player = this
+        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()))
+            }
+            items
+        }
+        functions["has_inventory_space"] = {
+            val inventory = player.inventory
+            if (inventory.freeSlot != -1) DoubleValue.ONE else DoubleValue.ZERO
+        }
+        functions["set_inventory_slot"] = setInvSlot@{ params ->
+            val slot = params.getInt(0)
+            val inventory = player.inventory
+            if (slot !in 0 until inventory.containerSize) return@setInvSlot 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@setInvSlot DoubleValue.ZERO
+                        ItemStack(item)
+                    }
+
+                    else -> {
+                        null
+                    }
+                }
+
+            if (stack == null) return@setInvSlot DoubleValue.ZERO
+
+            inventory.setItem(slot, stack)
+            DoubleValue.ONE
+        }
+        functions["give_item"] = giveItem@{ params ->
+            val inventory = player.inventory
+            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@giveItem DoubleValue.ZERO
+                        ItemStack(item)
+                    }
+
+                    else -> {
+                        null
+                    }
+                }
+
+            if (stack == null) return@giveItem DoubleValue.ZERO
+
+            if (freeSlot == -1) {
+                if (dropIfFull) {
+                    player.drop(stack, false)
+                    return@giveItem DoubleValue.ONE
+                } else {
+                    return@giveItem DoubleValue.ZERO
+                }
+            }
+
+            inventory.setItem(freeSlot, stack)
+            DoubleValue.ONE
+        }
+        functions["face"] = { params ->
+            ObjectValue(
+                PlayerDialogueFaceProvider(
+                    player.uuid,
+                    params.getBooleanOrNull(0) != false,
+                ),
+            )
+        }
+        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)
+        }
+        functions["teleport"] = { params ->
+            val x = params.getDouble(0)
+            val y = params.getDouble(1)
+            val z = params.getDouble(2)
+            val playParticleOptions = params.getBooleanOrNull(3) ?: false
+            player.randomTeleport(x, y, z, playParticleOptions)
+        }
+        functions["heal"] = { params ->
+            val amount = params.getDoubleOrNull(0) ?: player.maxHealth
+            player.heal(amount.toFloat())
+        }
+        functions["environment"] = {
+            val environment = MoLangEnvironment()
+            environment.query = player.asMoLangValue()
+            environment
+        }
+        functions["is_player"] = { DoubleValue.ONE }
+        functions["riding_pokemon"] = ridingPokemon@{
+            val vehicle = player.vehicle
+            if (vehicle is PokemonEntity) {
+                return@ridingPokemon vehicle.struct
+            }
+            DoubleValue.ZERO
+        }
+
+        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
+                }
+                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)
+                        packet.sendToPlayer(player)
+                        return@battleMusic DoubleValue.ONE
+                    }
+                    DoubleValue.ZERO
+                }
+                functions["stop_battle_music"] = {
+                    val packet = BattleMusicPacket(null)
+                    packet.sendToPlayer(player)
+                    DoubleValue.ONE
+                }
+                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)
+                }
+                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,
+                        ),
+                    )
+                }
+                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
+                    vars
+                }
+                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
+                }
+                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
+                }
+                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 rules =
+                        params
+                            .getStringOrNull(5)
+                            ?.split(",")
+                            ?.toSet()
+                            ?: emptySet()
+
+                    val modifiedBattleFormat =
+                        BattleFormat.setBattleRules(
+                            battleFormat = format,
+                            rules = rules,
+                        )
+
+                    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 }
+                    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)
+                }
+            }
+        }
+
+        return functions
+    }
+}
@@ -0,0 +1,117 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
+import com.cobblemon.mod.common.api.pokedex.CaughtCount
+import com.cobblemon.mod.common.api.pokedex.CaughtPercent
+import com.cobblemon.mod.common.api.pokedex.Dexes
+import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
+import com.cobblemon.mod.common.api.pokedex.PokedexManager
+import com.cobblemon.mod.common.api.pokedex.SeenCount
+import com.cobblemon.mod.common.api.pokedex.SeenPercent
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.getStringOrNull
+
+object PokedexMoLangFunctions : AbstractMoLangFunctionHolder<AbstractPokedexManager>() {
+    override fun AbstractPokedexManager.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val pokedex = this
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["get_species_record"] = { params ->
+            val speciesId = params.getString(0).asIdentifierDefaultingNamespace()
+            pokedex.speciesRecords[speciesId]?.struct ?: QueryStruct(hashMapOf())
+        }
+
+        functions["has_seen"] = hasSeen@{ params ->
+            val speciesId = params.getString(0).asIdentifierDefaultingNamespace()
+            val formName =
+                params.getStringOrNull(1)
+                    ?: return@hasSeen DoubleValue(
+                        pokedex.getHighestKnowledgeForSpecies(speciesId).ordinal >= PokedexEntryProgress.SEEN.ordinal,
+                    )
+
+            DoubleValue(
+                (
+                    pokedex
+                        .getSpeciesRecord(speciesId)
+                        ?.getFormRecord(formName)
+                        ?.knowledge
+                        ?.ordinal
+                        ?: 0
+                ) >= PokedexEntryProgress.SEEN.ordinal,
+            )
+        }
+
+        functions["has_caught"] = hasCaught@{ params ->
+            val speciesId = params.getString(0).asIdentifierDefaultingNamespace()
+            val formName =
+                params.getStringOrNull(1) ?: return@hasCaught DoubleValue(
+                    pokedex.getHighestKnowledgeForSpecies(
+                        speciesId,
+                    ) == PokedexEntryProgress.OWNED,
+                )
+            DoubleValue(
+                pokedex
+                    .getSpeciesRecord(speciesId)
+                    ?.getFormRecord(formName)
+                    ?.knowledge == PokedexEntryProgress.OWNED,
+            )
+        }
+        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)) }
+
+        functions["dex_caught_count"] = { params ->
+            val dexId = params.getString(0).asIdentifierDefaultingNamespace()
+            if (Dexes.dexEntryMap.containsKey(dexId)) DoubleValue(pokedex.getDexCalculatedValue(dexId, CaughtCount))
+            else DoubleValue.ZERO
+        }
+        functions["dex_seen_count"] = { params ->
+            val dexId = params.getString(0).asIdentifierDefaultingNamespace()
+            if (Dexes.dexEntryMap.containsKey(dexId)) DoubleValue(pokedex.getDexCalculatedValue(dexId, SeenCount))
+            else DoubleValue.ZERO
+        }
+        functions["dex_caught_percent"] = { params ->
+            val dexId = params.getString(0).asIdentifierDefaultingNamespace()
+            if (Dexes.dexEntryMap.containsKey(dexId)) DoubleValue(pokedex.getDexCalculatedValue(dexId, CaughtPercent).toDouble())
+            else DoubleValue.ZERO
+        }
+        functions["dex_seen_percent"] = { params ->
+            val dexId = params.getString(0).asIdentifierDefaultingNamespace()
+            if (Dexes.dexEntryMap.containsKey(dexId)) DoubleValue(pokedex.getDexCalculatedValue(dexId, SeenPercent).toDouble())
+            else DoubleValue.ZERO
+        }
+
+        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 functions
+    }
+}
@@ -0,0 +1,163 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoLangRuntime
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.MoValue
+import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.CobblemonActivities
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
+import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
+import com.cobblemon.mod.common.api.moves.animations.ActionEffects
+import com.cobblemon.mod.common.api.moves.animations.TargetsProvider
+import com.cobblemon.mod.common.api.storage.party.PartyStore
+import com.cobblemon.mod.common.api.tags.CobblemonItemTags
+import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.PokemonMoveControl
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.cloneFrom
+import com.cobblemon.mod.common.util.getStringOrNull
+import com.cobblemon.mod.common.util.withQueryValue
+
+object PokemonEntityMoLangFunctions : AbstractMoLangFunctionHolder<PokemonEntity>() {
+    override fun PokemonEntity.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val pokemonEntity = this
+        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
+            }
+        }
+        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
+            }
+        }
+        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
+            }
+        }
+        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
+            }
+        }
+        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
+            }
+        }
+        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
+            }
+        }
+        functions["is_wild"] = { DoubleValue(pokemonEntity.ownerUUID == null) }
+        functions["is_in_party"] = {
+            DoubleValue(
+                pokemonEntity.pokemon.storeCoordinates
+                    .get()
+                    ?.store is PartyStore,
+            )
+        }
+        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)
+                },
+            )
+        }
+        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),
+            )
+        }
+        functions["is_wearing_face"] = {
+            DoubleValue(
+                pokemonEntity.entityData
+                    .get(PokemonEntity.SHOWN_HELD_ITEM)
+                    .`is`(CobblemonItemTags.WEARABLE_FACE_ITEMS),
+            )
+        }
+        functions["is_pastured"] = {
+            DoubleValue((pokemonEntity.tethering != null))
+        }
+        functions["pasture_conflict_enabled"] = {
+            DoubleValue(pokemonEntity.getBehaviourFlag(PokemonBehaviourFlag.PASTURE_CONFLICT))
+        }
+        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(),
+                    )
+                // 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)
+                pokemonEntity.brain.setActiveActivityIfPossible(CobblemonActivities.ACTION_EFFECT)
+                actionEffect.run(context).thenRun {
+                    val pokemonActionEffect =
+                        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
+                    }
+                }
+
+                return@runActionEffect DoubleValue.ONE
+            }
+
+            DoubleValue.ZERO
+        }
+
+        return functions
+    }
+}
@@ -0,0 +1,458 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.MoValue
+import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.CobblemonMovesetBuilders
+import com.cobblemon.mod.common.api.mark.Marks
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
+import com.cobblemon.mod.common.api.moves.BenchedMove
+import com.cobblemon.mod.common.api.moves.Moves
+import com.cobblemon.mod.common.api.pokemon.experience.SidemodExperienceSource
+import com.cobblemon.mod.common.api.pokemon.moves.LearnsetQuery
+import com.cobblemon.mod.common.api.pokemon.stats.Stats
+import com.cobblemon.mod.common.api.riding.stats.RidingStat
+import com.cobblemon.mod.common.api.storage.party.PartyStore
+import com.cobblemon.mod.common.pokemon.IVs
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.asArrayValue
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.getBooleanOrNull
+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 net.minecraft.resources.ResourceLocation
+import kotlin.random.Random
+
+object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
+    override fun Pokemon.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val pokemon = this
+        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())
+        }
+        functions["feed_pokemon"] = { params ->
+            val amount = params.getDouble(0)
+            val playSound = params.getBooleanOrNull(1) ?: true
+            pokemon.feedPokemon(amount.toInt(), playSound)
+        }
+        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@hasLearned DoubleValue.ONE
+            DoubleValue.ZERO
+        }
+        functions["moveset"] = {
+            val struct = QueryStruct(hashMapOf())
+            for ((index, move) in pokemon.moveSet.withIndex()) {
+                struct.addFunction(index.toString()) { move.struct }
+            }
+            struct
+        }
+        functions["evs"] = {
+            val struct = QueryStruct(hashMapOf())
+            for (stat in Stats.PERMANENT) {
+                struct.addFunction(stat.showdownId) { DoubleValue(pokemon.evs.getOrDefault(stat).toDouble()) }
+            }
+            struct
+        }
+        functions["ivs"] = {
+            val struct = QueryStruct(hashMapOf())
+            for (stat in Stats.PERMANENT) {
+                struct.addFunction(stat.showdownId) { DoubleValue(pokemon.ivs.getOrDefault(stat).toDouble()) }
+            }
+            struct
+        }
+        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
+        }
+        functions["ride_boosts"] = {
+            val struct = QueryStruct(hashMapOf())
+            for (stat in RidingStat.entries) {
+                struct.addFunction(stat.name.lowercase()) { DoubleValue(pokemon.getRideBoost(stat)) }
+            }
+            struct
+        }
+        functions["natdex_number"] = {
+            DoubleValue(pokemon.species.nationalPokedexNumber.toDouble())
+        }
+        functions["types"] = {
+            pokemon.form.types
+                .map { it.showdownId }
+                .asArrayValue(::StringValue)
+        }
+        functions["gender_ratio"] = {
+            DoubleValue(pokemon.form.maleRatio.toDouble())
+        }
+        functions["ev_yield"] = {
+            val struct = QueryStruct(hashMapOf())
+            for (stat in Stats.PERMANENT) {
+                struct.addFunction(stat.showdownId) { DoubleValue(pokemon.form.evYield[stat]?.toDouble()) }
+            }
+            struct
+        }
+        functions["base_stats"] = {
+            val struct = QueryStruct(hashMapOf())
+            for (stat in Stats.PERMANENT) {
+                struct.addFunction(stat.showdownId) { DoubleValue(pokemon.form.baseStats[stat]?.toDouble()) }
+            }
+            struct
+        }
+        functions["catch_rate"] = {
+            DoubleValue(pokemon.form.catchRate.toDouble())
+        }
+        functions["base_experience_yield"] = {
+            DoubleValue(pokemon.form.baseExperienceYield.toDouble())
+        }
+        functions["drops"] = {
+            val struct = QueryStruct(hashMapOf())
+            for ((index, drop) in pokemon.form.drops.entries
+                .withIndex()) {
+                struct.addFunction(index.toString()) { drop }
+            }
+            struct
+        }
+        functions["tm_learnset"] = {
+            val struct = QueryStruct(hashMapOf())
+            for ((index, move) in pokemon.form.moves.tmMoves
+                .withIndex()) {
+                struct.addFunction(index.toString()) { move.struct }
+            }
+            struct
+        }
+        functions["egg_learnset"] = {
+            val struct = QueryStruct(hashMapOf())
+            for ((index, move) in pokemon.form.moves.eggMoves
+                .withIndex()) {
+                struct.addFunction(index.toString()) { move.struct }
+            }
+            struct
+        }
+        functions["tutor_learnset"] = {
+            val struct = QueryStruct(hashMapOf())
+            for ((index, move) in pokemon.form.moves.tutorMoves
+                .withIndex()) {
+                struct.addFunction(index.toString()) { move.struct }
+            }
+            struct
+        }
+        functions["level_learnset"] = {
+            val struct = QueryStruct(hashMapOf())
+            for ((index, move) in pokemon.form.moves.levelUpMoves) {
+                struct.addFunction(index.toString()) { move }
+            }
+            struct
+        }
+        functions["ability_pool"] = {
+            val struct = QueryStruct(hashMapOf())
+            for ((index, ability) in pokemon.form.abilities.withIndex()) {
+                struct.addFunction(index.toString()) { StringValue(ability.toString()) }
+            }
+            struct
+        }
+        functions["egg_groups"] = {
+            val struct = QueryStruct(hashMapOf())
+            for ((index, group) in pokemon.form.eggGroups.withIndex()) {
+                struct.addFunction(index.toString()) { StringValue(group.toString()) }
+            }
+            struct
+        }
+        functions["egg_cycles"] = {
+            DoubleValue(pokemon.species.eggCycles.toDouble())
+        }
+        functions["labels"] = {
+            val struct = QueryStruct(hashMapOf())
+            for ((index, label) in pokemon.form.labels.withIndex()) {
+                struct.addFunction(index.toString()) { StringValue(label) }
+            }
+            struct
+        }
+        functions["aspects"] = {
+            val aspects = pokemon.aspects
+            aspects.asArrayValue { StringValue(it) }
+        }
+        functions["form_aspects"] = {
+            val aspects = pokemon.form.aspects
+            aspects.asArrayValue { StringValue(it) }
+        }
+        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].
+        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
+        }
+        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()
+        }
+        functions["remove_aspects"] = { params ->
+            for (aspect in params.params) pokemon.forcedAspects -= aspect.asString()
+            pokemon.updateAspects()
+        }
+        functions["cosmetic_item"] = {
+            pokemon.cosmeticItem().asMoLangValue(server()!!.registryAccess())
+        }
+        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)
+            if (mark != null) {
+                hasMark = pokemon.marks.contains(mark)
+            }
+
+            DoubleValue(hasMark)
+        }
+        functions["remove_marks"] = { params ->
+            var removedMark = false
+            for (param in params.params) {
+                val identifier = param.asString().asIdentifierDefaultingNamespace()
+                val mark = Marks.getByIdentifier(identifier)
+                if (mark != null) {
+                    pokemon.exchangeMark(mark, false)
+                    removedMark = true
+                }
+            }
+
+            DoubleValue(removedMark)
+        }
+        functions["add_marks"] = { params ->
+            var appliedMark = false
+            for (param in params.params) {
+                val identifier = param.asString().asIdentifierDefaultingNamespace()
+                val mark = Marks.getByIdentifier(identifier)
+                if (mark != null) {
+                    pokemon.exchangeMark(mark, true)
+                    appliedMark = true
+                }
+            }
+
+            DoubleValue(appliedMark)
+        }
+        functions["add_marks_with_chance"] = { params ->
+            var appliedMark = false
+            for (param in params.params) {
+                val identifier = param.asString().asIdentifierDefaultingNamespace()
+                val mark = Marks.getByIdentifier(identifier)
+
+                mark?.let {
+                    val probability = it.chance.coerceIn(0F, 1F) * 100
+                    val randomValue = Random.nextDouble(0.0, 100.0)
+                    if (randomValue < probability) {
+                        pokemon.exchangeMark(it, true)
+                        appliedMark = true
+                    }
+                }
+            }
+
+            DoubleValue(appliedMark)
+        }
+        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)
+            }
+        }
+        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
+
+            if (Stats.PERMANENT.contains(stat)) {
+                pokemon.hyperTrainIV(stat, value)
+                return@hyperTrainIv DoubleValue.ONE
+            } else {
+                Cobblemon.LOGGER.error("Unknown or non-permanent stat: $stat")
+                return@hyperTrainIv DoubleValue.ZERO
+            }
+        }
+        functions["add_exp"] = { params ->
+            val exp = params.getDouble(0).toInt()
+            pokemon.addExperience(SidemodExperienceSource("molang"), exp)
+            DoubleValue.ONE
+        }
+        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
+
+            if (Stats.PERMANENT.contains(stat)) {
+                pokemon.setIV(stat, value)
+                return@setIv DoubleValue.ONE
+            } else {
+                return@setIv DoubleValue.ZERO
+            }
+        }
+        functions["set_ev"] = setEv@{ params ->
+            val statId = params.getString(0)
+            val stat = Stats.getStat(statId)
+            val value = (params.getIntOrNull(1) ?: 0).coerceIn(0, 255)
+
+            if (Stats.PERMANENT.contains(stat)) {
+                pokemon.setEV(stat, value)
+                return@setEv DoubleValue.ONE
+            } else {
+                return@setEv DoubleValue.ZERO
+            }
+        }
+        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 value = params.getDoubleOrNull(1)?.toFloat() ?: return@setRideBoost DoubleValue.ZERO
+
+            pokemon.setRideBoost(stat, value)
+            DoubleValue.ONE
+        }
+        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 value = params.getDoubleOrNull(1)?.toFloat() ?: return@addRideBoost DoubleValue.ZERO
+
+            DoubleValue(if (pokemon.addRideBoost(stat, value)) 1.0 else 0.0)
+        }
+        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@initializeMoveset DoubleValue.ZERO
+                        }
+                pokemon.initializeMovesetFrom(movesetBuilder)
+            }
+            DoubleValue.ONE
+        }
+        functions["validate_moveset"] = { params ->
+            val includeLegacy = params.getBooleanOrNull(0) ?: true
+            pokemon.validateMoveset(includeLegacy)
+            DoubleValue.ONE
+        }
+        functions["teach_learnable_moves"] = { params ->
+            val includeLegacy = params.getBooleanOrNull(0) ?: true
+            pokemon.teachLearnableMoves(includeLegacy)
+            DoubleValue.ONE
+        }
+        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
+
+            val canLearn = bypass || LearnsetQuery.ANY.canLearn(moveTemplate, pokemon.form.moves)
+            if (!canLearn) {
+                return@teachMove DoubleValue.ZERO
+            }
+
+            val alreadyKnows =
+                pokemon.moveSet.getMoves().any { it.template == moveTemplate } ||
+                    pokemon.benchedMoves.any { it.moveTemplate == moveTemplate }
+            if (alreadyKnows) {
+                return@teachMove DoubleValue.ZERO
+            }
+
+            if (pokemon.moveSet.hasSpace()) {
+                pokemon.moveSet.add(moveTemplate.create())
+            } else {
+                pokemon.benchedMoves.add(BenchedMove(moveTemplate, 0))
+            }
+
+            DoubleValue.ONE
+        }
+        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)
+                }
+
+            DoubleValue(if (canLearn) 1.0 else 0.0)
+        }
+        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
+            }
+
+            DoubleValue.ZERO
+        }
+        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
+            evolution?.forceEvolve(pokemon)
+            StringValue(evolution.toString())
+        }
+
+        functions["entity"] = { pokemon.entity?.asMoLangValue() ?: DoubleValue.ZERO }
+        functions["is_alpha"] = { DoubleValue(pokemon.isAlpha) }
+        functions["size_category"] = { StringValue(pokemon.getSizeCategory().name) }
+
+        return functions
+    }
+}
@@ -0,0 +1,69 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.api.pokemon.PokemonProperties
+import com.cobblemon.mod.common.pokemon.Gender
+import com.cobblemon.mod.common.util.getBooleanOrNull
+import com.cobblemon.mod.common.util.getIntOrNull
+import com.cobblemon.mod.common.util.getStringOrNull
+
+object PokemonPropertiesMoLangFunctions : AbstractMoLangFunctionHolder<PokemonProperties>() {
+    override fun PokemonProperties.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val props = this
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["level"] = { DoubleValue(props.level?.toDouble() ?: 0) }
+        functions["set_level"] = { params ->
+            props.level = params.getIntOrNull(0)
+            DoubleValue.ONE
+        }
+        functions["shiny"] = { DoubleValue(props.shiny) }
+        functions["set_shiny"] = { params ->
+            props.shiny = params.getBooleanOrNull(0)
+            DoubleValue.ONE
+        }
+        functions["species"] = { props.species?.let { StringValue(it) } ?: DoubleValue.ZERO }
+        functions["set_species"] = { params ->
+            props.species = params.getStringOrNull(0)
+            DoubleValue.ONE
+        }
+        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
+        }
+        functions["form"] = { props.form?.let { StringValue(it) } ?: DoubleValue.ZERO }
+        functions["ivs"] = ivs@{
+            val ivs = props.ivs ?: return@ivs DoubleValue.ZERO
+
+            ivs.struct
+        }
+        functions["evs"] = evs@{
+            val evs = props.evs ?: return@evs DoubleValue.ZERO
+
+            evs.struct
+        }
+        functions["friendship"] = { DoubleValue(props.friendship?.toDouble() ?: DoubleValue.ZERO) }
+        functions["set_friendship"] = { params ->
+            props.friendship = params.getIntOrNull(0)
+            DoubleValue.ONE
+        }
+        functions["create"] = { (props.create()).struct }
+        functions["to_string"] = { params ->
+            val separator = params.getStringOrNull(0) ?: " "
+            StringValue(props.asString(separator = separator))
+        }
+
+        return functions
+    }
+}
@@ -0,0 +1,105 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.struct.ArrayStruct
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asStruct
+import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.api.storage.PokemonStore
+import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.asArrayValue
+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<*>>() {
+    override fun PokemonStore<*>.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val store = this
+        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))
+        }
+        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 pokemon = props.create(player = player)
+            DoubleValue(store.add(pokemon))
+        }
+        functions["find_by_properties"] = { params ->
+            val props = params.getString(0).toProperties()
+            val pokemon = store.find { props.matches(it) }
+            pokemon?.asStruct() ?: DoubleValue.ZERO
+        }
+        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())
+        }
+        functions["find_by_id"] = { params ->
+            val id = params.getString(0).asUUID
+            val pokemon = store.find { it.uuid == id }
+            pokemon?.asStruct() ?: DoubleValue.ZERO
+        }
+        functions["remove_by_id"] = removeById@{ params ->
+            val id = params.getString(0).asUUID
+            val pokemon = store.find { it.uuid == id } ?: return@removeById DoubleValue.ZERO
+            DoubleValue(store.remove(pokemon))
+        }
+        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
+
+            DoubleValue(totalLevel.toDouble() / numberOfPokemon)
+        }
+        functions["count"] = { DoubleValue(store.count()) }
+        functions["count_by_properties"] = { params ->
+            val props = params.getString(0).toProperties()
+            DoubleValue(store.count { props.matches(it) })
+        }
+        functions["highest_level"] = {
+            val highest = store.maxOfOrNull { it.level } ?: 0
+            DoubleValue(highest)
+        }
+        functions["lowest_level"] = {
+            val lowest = store.minOfOrNull { it.level } ?: 0
+            DoubleValue(lowest)
+        }
+        functions["heal"] = {
+            for (pokemon in store) {
+                pokemon.heal()
+            }
+            DoubleValue.ONE
+        }
+        functions["healing_remainder_percent"] = {
+            var totalPercent = 0.0f
+            for (pokemon in store) {
+                totalPercent += (1.0f - (pokemon.currentHealth.toFloat() / pokemon.maxHealth))
+            }
+            DoubleValue(totalPercent)
+        }
+        functions["has_usable_pokemon"] = { DoubleValue(store.any { !it.isFainted() }) }
+        functions["pokemon"] = { store.map { it.asStruct() }.asArrayValue() }
+
+        return functions
+    }
+}
@@ -0,0 +1,87 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asWorldMoLangValue
+import com.cobblemon.mod.common.api.text.text
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.getBooleanOrNull
+import com.cobblemon.mod.common.util.getStringOrNull
+import net.minecraft.core.registries.Registries
+import net.minecraft.resources.ResourceKey
+import net.minecraft.server.MinecraftServer
+import java.util.*
+
+object ServerMoLangFunctions : AbstractMoLangFunctionHolder<MinecraftServer>() {
+    override fun MinecraftServer.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val server = this
+        val functions = hashMapOf<String, (MoParams) -> Any>()
+
+        functions["get_world"] = getWorld@{ params ->
+            val world =
+                server.getLevel(
+                    ResourceKey.create(
+                        Registries.DIMENSION,
+                        params.getString(0).asIdentifierDefaultingNamespace(namespace = "minecraft"),
+                    ),
+                ) ?: return@getWorld DoubleValue.ZERO
+
+            world
+                .registryAccess()
+                .registryOrThrow(Registries.DIMENSION)
+                .wrapAsHolder(world)
+                .asWorldMoLangValue()
+        }
+
+        functions["broadcast"] = { params ->
+            val message = params.getString(0)
+            server.playerList.broadcastSystemMessage(message.text(), params.getBooleanOrNull(1) == true)
+            DoubleValue.ONE
+        }
+
+        functions["get_player_by_uuid"] = getPlayerByUuid@{ params ->
+            val uuid = UUID.fromString(params.getString(0))
+            val player = server.playerList.getPlayer(uuid) ?: return@getPlayerByUuid DoubleValue.ZERO
+            player.asMoLangValue()
+        }
+
+        functions["get_player_by_username"] = getPlayerByUsername@{ params ->
+            val username = params.getString(0)
+            val player = server.playerList.getPlayerByName(username) ?: return@getPlayerByUsername DoubleValue.ZERO
+            player.asMoLangValue()
+        }
+
+        functions["data"] = { params ->
+            Cobblemon.molangData.load(
+                UUID(0L, 0L),
+                params.getStringOrNull(0),
+            )
+        }
+
+        functions["save_data"] = { params ->
+            Cobblemon.molangData.save(
+                UUID(0L, 0L),
+                params.getStringOrNull(index = 0),
+            )
+            DoubleValue.ONE
+        }
+
+        // Maybe later...
+//            functions.put("stop") { params ->
+//                Cobblemon.LOGGER.warn("Server is being stopped from a MoLang script.")
+//                server.stopServer()
+//            }
+
+        return functions
+    }
+}
@@ -0,0 +1,53 @@
+/*
+ * 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.molang.function
+
+import com.bedrockk.molang.runtime.MoParams
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asBiomeMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asWorldMoLangValue
+import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
+import net.minecraft.core.registries.Registries
+import net.minecraft.server.level.ServerPlayer
+
+object SpawnablePositionMoLangFunctions : AbstractMoLangFunctionHolder<SpawnablePosition>() {
+    override fun SpawnablePosition.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
+        val spawningContext = this
+        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 functions
+    }
+}
--- a/Show More
+++ b/Show More