some shader stuff

testing
Add tropius
2026-10-23 07:36:25 -04:00 · 2025-08-31 11:37:55 -04:00 · 2025-08-28 01:11:03 -04:00 · 2025-08-26 16:58:05 -04:00 · 2025-08-26 16:57:52 -04:00 · 2025-08-20 13:03:49 -04:00
3398 changed files with 175540 additions and 42565 deletions
@@ -5,12 +5,18 @@
  - Dog Pokémon (Growlithe, Arcanine, etc.) intimidate Skeletons.
  - Cat Pokémon (Meowth, Persian, etc.) intimidate Creepers and Phantoms.
  - Sleep-related Pokémon (Munsharna, Komala, etc.) intimidate Phantoms.
+  - Some Pokémon naturally hunt each other.
 - Added a Behaviour Editor to the NPC editing screen.
 - Added /behaviouredit command for opening the Behaviour Editor on Pokémon and NPCs.
  - Editing variables for Pokémon is not yet supported.

+### Developer
+- baseScale in NPCs has been removed from classes and presets, and in the entity it is replaced with hitboxScale and renderScale.
+- Added `EntityCallbacks` to `NPCEntity` and `PokemonEntity`. You can trigger custom callback types by using `[Entity].callbacks.process(...)`
+
 ### MoLang & Datapacks
 - Added a `behaviours` datapack folder which motivates the Behaviour Editor screen on NPCs and Pokémon.
- Added many default behaviours.
+- Added "callback" support on PokemonEntity and NPCEntity that allows MoLang scripts to be executed in response to certain scenarios.
+- Added very many behaviours to choose from.
 - Removed many NPC presets that now exist as behaviours. This is a breaking change if you are using NPCs with these presets. 
  - NPCs with these presets should be modified to instead list under `"behaviours"` all the equivalent behaviours.
@@ -8,7 +8,8 @@
  - Lure Cakes can be used to modify the spawn rate of Pokémon in the wild.
 - Added the Saccharine Tree, which can be found in the wild and is used to obtain Honey Bottles.
  - The leaves of the tree can be harvested to obtain honey, which can be used in the Campfire Pot to make Lure Cakes.
-  - The Log of the tree can be clicked on with honey to create a Honey Log, which increases the change of spawning a Pokemon with an Hidden Ability.
+  - The Log of the tree can be interacted with using a honey bottle to create a Honey-Slathered Saccharine Log, which increases the change of spawning a Pokémon with a Hidden Ability.
+- Added Hearty Grains
 - Clicking on the Progress Arrow will show the JEI Recipe Book for the Campfire Pot, which will show all recipes that can be made with it.
 - Added a Ton of Redstone Compatibility.
   - Dispenser can now Honey and Unhoney:
@@ -4,10 +4,16 @@
  - The button on the right allows for changing the box wallpaper.
  - The option buttons on the left side allow for sorting the box by name, level, Pokédex number, gender, and type. Shift clicking allows for sorting in reverse order.
 - Added filter functionality in PC UI, which supports `PokemonProperties` (e.g. `shiny=yes` shows all shiny Pokémon).
+  - Names can be filtered by exact or partial matches, e.g. entering "cha" will show Charmander, Charmeleon, etc.
 - Added `/changewallpaper <player> <boxNumber> <wallpaper>` command to change a box wallpaper through commands.
 - Added `/renamebox <player> <boxNumber> <name>` command to rename a PC box through commands.
 - Added IVs and EVs stat displays in PC.
- improved filter by Name, now is available search by exact names or partial matches, for example "cha" will show Charmander, Charmeleon and Charizard among others that match.
+- Added ability to change boxes by scrolling.
+- PC will now open to last box viewed within a session.
+
+### Changes
+- Slots in pastures will now have darker backgrounds and italicised Pokémon names if the Pokémon is not owned by the player.
+- The pasture slot will show the name of the Pokémon owner when hovered if the Pokémon is not owned.

 ### Developer
 - Added `RenamePCBoxEvent.Pre` and `RenamePCBoxEvent.Post` events to prevent players from renaming a box or changing their input.
@@ -20,9 +20,8 @@
  - The player executing the command must be facing the target pokemon entity. Transformations are not persistent and will revert when resources are reloaded.
 - Added `legacy` and `special` sourced moves to Pokémon.
 - Added lang keys for all moves and abilities up to Generation 9.
- Fixed Moon Ball moon phase logic to actually work correctly
 - Added `translucent_cull` boolean option into resolver's layer to allow for translucent textures with culling
- Added [LambDynamicLights](https://modrinth.com/mod/lambdynamiclights) support for items held by Pokémon.
+- Added [LambDynamicLights](https://modrinth.com/mod/lambdynamiclights) support for items held by Pokémon, evolution stone blocks, evolution stone items, Pokédex, Luminous Moss, Flame Orb, and Magmarizer.
 - Added the Clear Amulet, Grip Claw, Lagging Tail, Luminous Moss, Metal Alloy, Scroll of Darkness, Scroll of Waters
 - Added Recipes for Masterpiece Cup, Eject Pack
 - Added modification to Minecraft Creative Inventory search to account for item names that contain `poké` when input contains `poke`.
@@ -33,18 +32,41 @@
 - Added `/pctake <player> <box> <slot>` command that takes a specific Pokémon from a player's PC. Removes the pokemon if target is self or ran from the server.
 - Added Hyper Training items (IV Modification) as well as some additional candy items to do so (Health Candy, Sickly Candy)
 - Added Galarica Nut Bushes
+- Many Pokémon (mostly cats) are now feared by phantoms
+- Lightning is now affected by a Pokemon's ability/typing
+  - Pokémon with the ability Lightning Rod draw in lightning similar to a lightning rod block albeit with a lower priority and range, gain immunity to lightning damage, and receive a temporary damage buff.
+  - Pokémon with the ability Motor Drive are immune to lightning damage and receive a temporary speed buff when struck by lightning
+  - Pokémon with the ability Volt Absorb are immune to lightning damage and receive Regeneration II for a short duration
+  - Ground type Pokémon are immune to lightning damage
+- Added functionality to Everstone when held by a Pokémon; suppresses evolution notification and hides evolve button in summary interface.
+- Added new optional property `attachment_options` for most EmitterShapes to be attached to the locator/entities scale, rotation, and/or position. Position is true by default.
+- Galarica Nut bushes now generate on beaches.
+- Some Pokémon now pitch their bodies in the direction they're moving.
+- Added new advancements Didn't Stop To Think, We Need To Cook, and Pokémon Jockey!.
+- Berries can now be smelted into their respective dyes.
+- Added Syrupy Apples.
+- Added `/runmolang <molang> [<npc>|<player>|<pokemon>]` command that executes a MoLang expression with the provided options as environment variables, as well as the entity (as `q.entity`) that executed the command.

 ### Pokémon Added

 #### Gen 2
 - Marill
 - Azumarill
+- Hoppip
+- Skiploom
+- Jumpluff
 - Dunsparce

 #### Gen 3
 - Azurill
+- Meditite
+- Medicham
+- Electrike
+- Manectric
 - Spoink
 - Grumpig
+- Swablu
+- Altaria
 - Snorunt
 - Glalie
 - Latias
@@ -58,6 +80,8 @@
 - Froslass
 - Glameow
 - Purugly
+- Skorupi
+- Drapion

 #### Gen 5
 - Pansage
@@ -80,10 +104,20 @@
 - Solosis
 - Duosion
 - Reuniclus
+- Tynamo
+- Eelektrik
+- Eelektross
 - Mienfoo
 - Mienshao
+- Sewaddle
+- Swadloon
+- Leavanny

 #### Gen 6
+- Skiddo
+- Gogoat
+- Espurr
+- Meowstic
 - Inkay
 - Malamar
 - Hawlucha
@@ -92,13 +126,25 @@
 - Noivern

 #### Gen 7
+- Yungoos
+- Gumshoos
 - Drampa
+- Alolan Grimer
+- Alolan Muk
+- Togedemaru

 #### Gen 8
+- Skwovet
+- Greedent
+- Toxel
+- Toxtricity
+- Morpeko
 - Silicobra
 - Sandaconda
 - Sinistea
 - Polteageist
+- Galarian Corsola
+- Cursola

 #### Gen 9
 - Smoliv
@@ -111,6 +157,12 @@
 - Cyclizar
 - Poltchageist
 - Sinistcha
+- Capsakid
+- Scovillain
+- Tadbulb
+- Bellibolt
+- Toedscool
+- Toedscruel

 ### Animation updates for the following Pokémon
 - Garchomp
@@ -132,6 +184,13 @@
 - Dratini
 - Dragonair
 - Dragonite
+- G. Corsola
+- Cursola
+- Dunsparce
+- Dudunsparce (both forms)
+- Porygon
+- Porygon2
+- Porygon-Z

 ### Model updates for the following Pokémon
 - Gyarados
@@ -179,12 +238,21 @@
 - Cacturne
 - Taillow
 - Swellow
- Added Syrupy Apples.
 - Seel
 - Dewgong
 - Honedge
 - Doublade
 - Aegislash
+- Drowzee
+- Hypno
+- Mudkip
+- Marshtomp
+- Swampert
+- Shelmet
+- Escavalier
+- Klink
+- Klank
+- Klinklang

 ### Changes
 - Changed pokemon caught and seen count to update based on the current pokedex being looked
@@ -226,6 +294,21 @@
 - Saccharine Leaves Age 1 or higher will now show Yellow particles when broken
 - Destroying a Saccharine Honey Log will now drop a Saccharine Log in stead of nothing
 - Reworked some compost chances
+- Updated interaction interface to include 4 more option spaces
+- Made lecterns that hold a Pokédex emit light.
+- Updated light levels for active PC, Pasture, Healing Machine, and Data Monitor.
+- Vivichokes now always drop one seed when harvested, and converting a fully grown Vivichoke to seeds via crafting results in 1 seed.
+- Healing Machine recipe rebalanced.
+- Reorganised the `block` texture folder to be more organised, in line with the `item` texture folder.
+- Offset in EmitterShape now ignores scale to be more like Blockbench by default. You can get this behaviour back by adding `"scale": true` in the `attachment_options` property in most EmitterShapes.
+- Not specifying a dex in `/pokedex printcalculations {player} {dex}` will now print the National Dex statistics instead of showing all dexes. `/pokedex printcalculations {player} all` is how to view all dex statistics in one command.
+- Removed Braised Vivichoke
+- Updated Pokémon state icons shown in party interfaces
+- MoLang `face` function can now be run on any `PosableEntity` (Like Pokémon!) instead of just NPCs.
+- MoLang `run_action_effect` now works on Pokémon.
+- Changed MoLang entity function `is_standing_on` to allow for block tags in the list.
+- Changed MoLang entity function `is_standing_on` to allow for block tags in the list. 
+- Added entity (as `q.entity`) that executed the command to the `executemolangscript` command.

 ### Fixes
 - Fixed game crashing when removing national pokedex using datapacks
@@ -269,8 +352,8 @@
 - Fix issue where locator X axis was not aligned with blockbench.
 - Fix issue where particle effects that play on frame 1 on sendout would never play (Gastly)
 - The Wiglett line will now sink in water again.
- Fixed the Sprigatito line's portraits being zoomed in too far. 
- Fixed Floragato's battle cry animation from breaking. 
+- Fixed the Sprigatito line's portraits being zoomed in too far.
+- Fixed Floragato's battle cry animation from breaking.
 - Fixed the block texture name for the Pep-Up Flower being inaccurate
 - Fixed issue where the restoration tank would not accept valid items from a hopper.
 - Fixed energy root not being shearable
@@ -280,15 +363,25 @@
 - Fixed Cobblemon crashing if it tries to load a bedrock model not meant for cobblemon (example: Qlipoth Awakening)
 - Fixed Berries (and thus mulches) not being plantable on Farmers delight rich soil farmland
 - Fixed wild Pokémon vanishing when third party mods try to tame them the "vanilla" way
- Fixed Pokemon not being able to path over skulk veins, pressure plates, fence gates, signs, lanterns, chains, and many other short blocks.
- Fixed some cases in which Pokemon could not path over fence posts situations.
+- Fixed Pokémon not being able to path over skulk veins, pressure plates, fence gates, signs, lanterns, chains, and many other short blocks.
+- Fixed some cases in which Pokémon could not path over fence posts situations.
 - Fixed flyers not being able to do vertical takeoff if surrounded by blocks.
- Fixed swimming Pokemon attempting to swim up through solid blocks.
- Fixed Pokemon surface swimming diving downward a block for the duration of the swim.
+- Fixed swimming Pokémon attempting to swim up through solid blocks.
+- Fixed Pokémon surface swimming diving downward a block for the duration of the swim.
 - Improved flyers avoiding getting stuck on fence posts.
+- Fixed air balloon battle text not correctly displaying the Pokémon or item name
+- Fixed an issue where items retrieved from a Display case would disappear if a player's inventory is full
+- Fixed Pokédex Scanner not respecting the "Invert Mouse" option
 - Fixed recoil eyes on Shellder & Cloyster.
 - Fixed Shroomish spinning at lightning speed when fainting (no longer allowed to let it rip.)
+- Fixed Pokédex Scanner not respecting the "Invert Mouse" option.
+- Fixed a crash due to a ConcurrentModificationException that could occur during world generation.
 - Fixed Quaxly's animations showing hidden wing sets
+- Fixed Moon Ball moon phase logic to actually work correctly
+- Fixed `/pokedex printcalculations` to now show the correct percentage completed of the Pokedex
+- Fixed mod incompatibility with the `Raised` mod
+- Fixed a vulnerability that could cause party and PC rollbacks under specific circumstances.
+- Fixed a rare edge case where sorting your PC could be rolled back later.

 ### Developer
 - A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
@@ -300,7 +393,7 @@
 - Renamed Cobblemon's creative tabs to start with "Cobblemon: " to distinguish Cobblemon's tabs from tabs for other mods.
 - Various items now have a rarity value.
 - Reworked observable handling in `Pokemon.kt` to cut down on RAM usage and clarify the file.
-  - Note: This will break mods that used our observable functionality there or in MoveSet, IVs, EVs, or BenchedMoves. 
+  - Note: This will break mods that used our observable functionality there or in MoveSet, IVs, EVs, or BenchedMoves.
  - Using `Pokemon#onChange()` is now the way to mark a Pokémon as needing a save.
  - Using `[Pokemon].changeObservable` is now the way to get an `Observable` for any save-worthy changes.
 - Updated NPCEntity beam positioning to properly account for the baseScale property.
@@ -323,8 +416,15 @@
 - The IVs class has now been extended to include Hyper Trained values.
 - Added `Pokemon#hyperTrainIV()` and `IVs#setHyperTrainedIV(Stat, Int)`.
 - Added `HyperTrainedIvEvent.Pre` and `HyperTrainedIvEvent.Post`.
+- Added `Pokemon#validateMoveSet()` to validate an existing Pokemon's moveset, clearing illegal moves.
 - Added a `hoverText` option to PartySelectCallback, to display a tooltip on hovering over a Pokémon in the selection screen.
-  
+- `PokemonEntity` instances spawned into the world now appropriately finalize the spawn for mod compatibility.
+- Added PokedexManager.obtain as a replacement for .catch which is not a friendly function name in Java.
+
+- Added `Pokemon#hyperTrainIV()` and `IVs#setHyperTrainedIV(Stat, Int)`
+- `ElementalType` now implements `ShowdownIdentifiable` to ensure the communcation with showdown stays consistent (also in regards to TeraTypes)
+- Pokemon no longer have a change observable
+
 ### MoLang & Datapacks
 - The following usages for item predicates can now use item conditions like advancements do, you can learn about them in the [Minecraft wiki](https://minecraft.wiki/w/Advancement_definition#minecraft:filled_bucket)
  - The `requiredContext` for an item interaction evolution
@@ -354,9 +454,26 @@
 - The format of the `remedies.json` file has changed to allow for individual friendshipDrop amounts per remedy
 - Fixed `entity.find_nearby_block` causing crashes when attempting to use a block tag
 - Spawn Filters can now access `v.spawn.class` to get the identifier of an NPC class for when trying to influence NPC spawns
+- Added Molang functions for Party and PC: `set_pokemon`
+- Added Molang functions for Pokémon: `pokeball`, `held_item`, `remove_held_item`, `hyper_train_iv`, `validate_moveset`, `initialize_moveset`, and `add_exp`.
+- Added Molang functions for Pokémon: `aspects`, `form_aspects`, `unlearn_move`, `teach_learnable_moves`, `cosmetic_item`, and `remove_cosmetic_item`.
+- Added Molang functions for Pokémon: `ability`, `set_iv`, `set_ev`, `teach_move`, and `can_learn_move`.
+- Added Molang function `q.delete_variable(<struct>, <variable_name>)` to delete a value from a variable structure in MoLang data.
+- Added Molang function `q.delete_variables(<struct>)` to delete all values from a variable structure in MoLang data.
+- Adds Flows for `STARTER_CHOSEN`, `SHOULDER_MOUNTED`, `EV_GAINED`, `POKEMON_RELEASED`, `POKEMON_NICKNAMED`, `HELD_ITEM`, and `TRADE_COMPLETED` events
+- Adds Flows for `POKEMON_HEALED`, `POKEMON_SCANNED`, `BERRY_HARVEST`, `LOOT_DROPPED`, `POKEMON_SEEN`, `COLLECT_EGG`, `HATCH_EGG`, and `EXPERIENCE_GAINED`.
+- Adds Flows for `POKEMON_CATCH_RATE`, `BAIT_SET`, `BAIT_SET_PRE`, `BAIT_CONSUMED`, `POKEROD_CAST_PRE`, `POKEROD_CAST_POST`, `POKEROD_REEL`, and `BOBBER_SPAWN_POKEMON_PRE`.
+- Adds Flows for `POKEMON_ASPECTS_CHANGED`, `FRIENDSHIP_UPDATED`, `CHANGE_PC_BOX_WALLPAPER_EVENT_PRE`, `CHANGE_PC_BOX_WALLPAPER_EVENT_POST`, and `FULLNESS_UPDATED`.
+- MoLang triggered battles may now set the battle format, whether to clone the player's party, set level, or heal prior.
+- Added Molang function for Player: `inventory`
 - Adds Flows for `STARTER_CHOSEN`, `EV_GAINED`, `POKEMON_RELEASED`, `POKEMON_NICKNAMED`, `HELD_ITEM`, and `TRADE_COMPLETED` events
- Adds Pokemon functions for `pokeball`, `held_item` and `remove_held_item`
+- Adds Pokemon functions for `pokeball`, `held_item`, `remove_held_item`, `add_aspects`, and `remove_aspects`
 - Added `pokemon.hyper_train_iv` as an available Molang function.
+- Added `prepare_{effect}` and `damage_{effect}` action effect hooks in battles for more battle particle effects.
+- Added `q.has_argument(<argument_name>, [argument_value])` MoLang function to several battle-related action effect contexts.
+- Added `q.has_argument_at(<index>, [argument_value])` MoLang function to several battle-related action effect contexts.
+- Added `q.hit_count` MoLang function to move action effect contexts.
+- Added `is_included`, `to_lower`, `to_upper`, and `string_length` as available Molang functions.

 ## [1.6.1 (January 26th, 2025)](#1-6-1)

@@ -369,7 +486,7 @@
 - Added optional box argument to the /pc command.
 - Pokédex and Dialogue screens now close when the inventory keybind is pressed.
 - Added config setting `maxPokedexScanningDetectionRange` to control from what distance the player can scan Pokémon using the Pokédex.
- Added config setting `hideUnimplementedPokemonInThePokedex` which hides unimplemented Pokémon from the Pokédex when set to true. 
+- Added config setting `hideUnimplementedPokemonInThePokedex` which hides unimplemented Pokémon from the Pokédex when set to true.
 - Added debug renderer for posable entity locators.
 - Added crossover paintings from Close Combat, Premonition, Altar, Slumber, and Nomad.
 - Added optional box argument to the /pc command
@@ -523,7 +640,7 @@
 - Fixed Vivichoke Dip and Leek & Potato Stew not returning a bowl upon consumption.
 - Fixed Fossil Restoration Tank not accepting Hay Bales as organic material.
 - Fixed Potion items applying double their intended healing value.
- Fixed Fast Ball capture bonuses applying to all Pokémon, making it the Best Ball instead of the Mediocre Edge-Case Ball. 
+- Fixed Fast Ball capture bonuses applying to all Pokémon, making it the Best Ball instead of the Mediocre Edge-Case Ball.
 - Fixed "learned new move" messages appearing for already-known moves on Pokémon evolutions.
 - Fixed Pokémon Item Models breaking shadows nearby when being placed in Display Cases or Item Frames.
 - Fixed berries not giving bonus yields when planted in their preferred biomes. I'm sure we've fixed that 5 times now.
@@ -532,7 +649,7 @@
 - Fixed players with shouldered Pokémon not being able to rejoin their 1.5.2 worlds using 1.6.
 - Fixed `PokemonProperties` utilizing `ability=<some ability>` being treated as a forced ability even when it is a legal ability for the Pokémon.
 - Fixed type formatting in Pokédex scanner mode when dual types require two lines.
- Fixed trading sometimes crashing the game or server. 
+- Fixed trading sometimes crashing the game or server.
 - Fixed Wild shiny sounds not respecting the `shinyNoticeParticlesDistance` config setting.
 - Fixed Pokémon being able to evolve mid-battle.
 - Fixed NPC held items being able to be stolen by players. Don't be a thief!
@@ -626,7 +743,7 @@
 - Stonjourner Henge Ruins, Luna Henge Ruins, and Sol Henge Ruins.
 - Submerged Shipwreck Cove and Lush Shipwreck Cove.
 - Pokémon Centers to all 5 village types.
- 
+
 ### Pokémon Added
 #### Gen 1
 - Alola Bias Cubone (built-in resource pack)
@@ -949,7 +1066,7 @@
 - Big Roots and Energy Roots now share the same sounds as intended.
 - Fixed sounds made by blocks playing at a lower pitch than intended.
 - Fixed Chimchar and Monferno comically T posing whenever they sleep.
- Fixed Cetitan's cry breaking its walk and sleep animations. 
+- Fixed Cetitan's cry breaking its walk and sleep animations.
 - Fixed the Magby line not having any placeholder walk animations.
 - Fixed Duskull and Dusclops using skylight levels for their nether spawn data. There is no sun in the Nether!
 - Fixed Hisuian Zoroark using base Zoroark stats.
@@ -965,7 +1082,7 @@
 - Fixed Trevenant T-posing after 8 seconds of sleeping. I also do that.
 - Fixed Bewear T-posing for a bit if a wild one faints where you can see.
 - Fixed Noctowl's placeholder fly animation.
- Corrected Lotad blinking animation. 
+- Corrected Lotad blinking animation.
 - Fixed reviving items causing errors when used in battle.
 - Fixed messages for Focus Sash, Confusion, Mummy, Ice Face, Own Tempo, and Revive.
 - Improve error handling when loading spawn-sets to ensure invalid configurations don't crash the server.
@@ -1055,7 +1172,7 @@
 - Added a new universal locator called "top".
 - Added `eggs_collected` and `eggs_hatched` Advancement triggers.
 - Added missing `minYaw` configuration to the `q.look()` function for JSON posers.
- Some pose condition names have been changed: 
+- Some pose condition names have been changed:
  - `isTouchingWaterOrRain` has been changed to `isInWaterOrRain`
  - `isSubermegedInWater` has been changed to `isUnderWater`

@@ -0,0 +1,13 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common;
+
+public interface DoubleJump {
+    boolean isDoubleJumping();
+}
@@ -9,15 +9,6 @@
 package com.cobblemon.mod.common;

 import com.cobblemon.mod.common.api.orientation.OrientationController;
-import net.minecraft.util.Mth;
-import net.minecraft.util.SmoothDouble;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.phys.Vec3;
-import org.jetbrains.annotations.Nullable;
-import org.joml.Matrix3f;
-import org.joml.Vector3f;
-
-import java.util.function.Function;

 public interface OrientationControllable {
    OrientationController getOrientationController();
@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.compat;
 import com.cobblemon.mod.common.CobblemonEntities;
 import com.cobblemon.mod.common.client.render.layer.PokemonOnShoulderRenderer;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.cobblemon.mod.common.item.PokedexItem;
 import com.cobblemon.mod.common.pokemon.FormData;
 import com.cobblemon.mod.common.pokemon.lighthing.LightingData;
 import dev.lambdaurora.lambdynlights.LambDynLights;
@@ -36,20 +37,20 @@ public class LambDynamicLightsCompat {
    public static void hookCompat() {
        // Pokémon entities
        DynamicLightHandlers.registerDynamicLightHandler(
-                CobblemonEntities.POKEMON,
-                DynamicLightHandler.makeHandler(
-                        LambDynamicLightsCompat::resolvedPokemonLightLevel,
-                        pokemon -> false
-                )
+            CobblemonEntities.POKEMON,
+            DynamicLightHandler.makeHandler(
+                LambDynamicLightsCompat::resolvedPokemonLightLevel,
+                pokemon -> false
+            )
        );

        // Shouldered Pokémon
        DynamicLightHandlers.registerDynamicLightHandler(
-                EntityType.PLAYER,
-                DynamicLightHandler.makeHandler(
-                        LambDynamicLightsCompat::resolvedShoulderLightLevel,
-                        player -> false
-                )
+            EntityType.PLAYER,
+            DynamicLightHandler.makeHandler(
+                LambDynamicLightsCompat::resolvedPlayerLightLevel,
+                player -> false
+            )
        );
    }

@@ -63,11 +64,13 @@ public class LambDynamicLightsCompat {
        return Math.max(itemLightLevel, formLightLevel);
    }

-    private static int resolvedShoulderLightLevel(Player player) {
+    private static int resolvedPlayerLightLevel(Player player) {
        var underwater = !player.level().getFluidState(BlockPos.containing(player.getX(), player.getEyeY(), player.getZ())).isEmpty();
-        final int leftLightLevel = extractShoulderLightLevel(PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityLeft()), underwater);
-        final int rightLightLevel = extractShoulderLightLevel(PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityRight()), underwater);
-        return Math.max(leftLightLevel, rightLightLevel);
+        final int leftShoulderLightLevel = extractShoulderLightLevel(PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityLeft()), underwater);
+        final int rightShoulderLightLevel = extractShoulderLightLevel(PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityRight()), underwater);
+        final int itemLightLevel = customHeldItemLightLevel(player.getMainHandItem(), player.getOffhandItem());
+
+        return Math.max(itemLightLevel, Math.max(leftShoulderLightLevel, rightShoulderLightLevel));
    }

    private static Optional<Integer> extractFormLightLevel(@NotNull FormData form, boolean underwater) {
@@ -83,14 +86,17 @@ public class LambDynamicLightsCompat {
        }

        ItemStack item = shoulderData.getShownItem();
-        int itemLightLevel = item.isEmpty()?0:LambDynLights.getLuminanceFromItemStack(item, underwater);
+        int itemLightLevel = item.isEmpty() ? 0 :LambDynLights.getLuminanceFromItemStack(item, underwater);
        int formLightLevel = extractFormLightLevel(shoulderData.getForm(), underwater).orElse(0);

        return Math.max(itemLightLevel, formLightLevel);
    }

+    private static int customHeldItemLightLevel(ItemStack mainhand, ItemStack offhand) {
+        return (mainhand.getItem() instanceof PokedexItem || offhand.getItem() instanceof PokedexItem) ? 13 : 0;
+    }
+
    private static boolean liquidGlowModeSupport(@NotNull LightingData.LiquidGlowMode liquidGlowMode, boolean underwater) {
        return underwater ? liquidGlowMode.getGlowsUnderwater() : liquidGlowMode.getGlowsInLand();
    }
-
 }
@@ -0,0 +1,17 @@
+/*
+ * 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;
+
+public interface ChannelDuck {
+    void cobblemon$applyLowPassFilter(float gain, float hfGain);
+    void cobblemon$inverseAttenuation(float rolloffFactor);
+    void cobblemon$clearFilters();
+
+//    void cobblemon$exponentialAttenuation(float rolloff, float refDistance, float maxDistance);
+}
@@ -0,0 +1,18 @@
+/*
+ * 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 org.joml.Vector3f;
+
+public interface PlayerDuck {
+	void setDriverInput(Vector3f driverInput);
+	Vector3f getDriverInput();
+	void setLastSentDriverInput(Vector3f driverInput);
+	Vector3f getLastSentDriverInput();
+}
@@ -12,14 +12,12 @@ import com.cobblemon.mod.common.block.SaccharineLeafBlock;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
-import org.objectweb.asm.Opcodes;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Desc;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

@@ -42,8 +40,9 @@ public abstract class BeeEntityMixin {
        if (block instanceof SaccharineLeafBlock) {

            int age = blockState.getValue(SaccharineLeafBlock.Companion.getAGE());
+            boolean waterlogged = blockState.getValue(BlockStateProperties.WATERLOGGED);

-            if (age < 2) {
+            if (age < 2 && !waterlogged) {
                this.cobblemon$result = blockState.setValue(SaccharineLeafBlock.Companion.getAGE(), age + 1);
            }
        }
@@ -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.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;
+        }
+    }
+}
@@ -0,0 +1,54 @@
+/*
+ * 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();
+        }
+    }
+
+}
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import net.minecraft.world.entity.monster.Phantom;
-import org.spongepowered.asm.mixin.Mixin;
-
-@Mixin(targets = "net/minecraft/world/entity/monster/Phantom$PhantomSweepAttackGoal")
-public class EntityPhantomMixin {
-    // TODO: Figure out how to access the outer class that wraps SwoopMovementGoal
-    // Need to find the cat mons that are near the phantom
-
-//    @Inject(method = "shouldContinue", at = @At(value = "RETURN"), cancellable = true)
-//    public void cobblemon$shouldContinue(CallbackInfoReturnable<Boolean> ci) {
-////        var goalSelectorField = PhantomEntity.class.getClasses();// PhantomEntity.class.getFields();// .class.getDeclaredField("goalSelector");
-//
-////        goalSelectorField.setAccessible(true);
-////        GoalSelector goalSelector = (GoalSelector) goalSelectorField.get(mobEntity);
-////        final SwoopMovementGoal phantom = (SwoopMovementGoal) (Object) this;
-////        if(ci.getReturnValue() == false) {
-////            var result = this$0.getWorld().getEntitiesByClass(
-////                    PokemonEntity.class,
-////                    this$0.getBoundingBox().expand(16.0),
-////                    entity ->  {
-////                        return ((PokemonEntity) entity).getBehaviour().getEntityInteract().getAvoidedByPhantom();
-////                    }
-////            ).isEmpty();
-////
-////                ci.setReturnValue(result);
-////        }
-//    }
-}
-
@@ -9,20 +9,19 @@
 package com.cobblemon.mod.common.mixin;

 import com.cobblemon.mod.common.client.CobblemonClient;
-import com.cobblemon.mod.common.client.render.MatrixWrapper;
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel;
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState;
 import com.cobblemon.mod.common.entity.PosableEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
+import net.minecraft.client.renderer.entity.EntityRenderer;
+import net.minecraft.client.resources.PlayerSkin;
+import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
-import org.joml.Vector3f;
-import org.spongepowered.asm.mixin.Debug;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -30,11 +29,6 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

 import java.util.Map;
-import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.resources.PlayerSkin;
-import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.world.entity.player.Player;

@Mixin(EntityRenderDispatcher.class)
 public class EntityRenderDispatcherMixin {
@@ -77,6 +71,23 @@ public class EntityRenderDispatcherMixin {
                        0F,
                        1F
                    );
+
+                    /*if (locator.contains("middle")){
+                        PoseStack.Pose pose = poseStack.last();
+                        Vector3f vec = matrix.getMatrix().getRotation(new AxisAngle4f()).transform(new Vector3f(0, 0, -1));
+                        buffer.addVertex(pose, pos.toVector3f()).setColor(0xffff00ff).setNormal(pose, vec.x, vec.y, vec.z); //Forward, pink
+                        buffer.addVertex(pose, (float)(pos.x() + vec.x), (float)(pos.y() + vec.y), (float)(pos.z() + vec.z)).setColor(0xffff00ff).setNormal(pose, vec.x, vec.y, vec.z);
+
+                        vec = matrix.getMatrix().getRotation(new AxisAngle4f()).transform(new Vector3f(0, 1, 0));
+                        buffer.addVertex(pose, pos.toVector3f()).setColor(0xffffff00).setNormal(pose, vec.x, vec.y, vec.z); //Up, yellow
+                        buffer.addVertex(pose, (float)(pos.x() + vec.x), (float)(pos.y() + vec.y), (float)(pos.z() + vec.z)).setColor(0xffffff00).setNormal(pose, vec.x, vec.y, vec.z);
+
+                        vec = matrix.getMatrix().getRotation(new AxisAngle4f()).transform(new Vector3f(-1, 0, 0));
+                        buffer.addVertex(pose, pos.toVector3f()).setColor(0xff00ffff).setNormal(pose, vec.x, vec.y, vec.z); //Left, cyan
+                        buffer.addVertex(pose, (float)(pos.x() + vec.x), (float)(pos.y() + vec.y), (float)(pos.z() + vec.z)).setColor(0xff00ffff).setNormal(pose, vec.x, vec.y, vec.z);
+                    }*/
+
+
                    poseStack.popPose();
                });

@@ -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.mixin;
+
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LightningBolt;
+import net.minecraft.world.phys.AABB;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.List;
+
+
+@Mixin(LightningBolt.class)
+public abstract class LightningBoltMixin {
+
+    @Inject(method = "spawnFire", at = @At(value = "Head"), cancellable = true)
+    private void cobblemon$spawnFire(int extraIgnitions, CallbackInfo ci) {
+        // This prevents fire from spawning around Pokemon who otherwise should be immune to lightning and effectively absorb the hit
+        final LightningBolt lightningBolt = (LightningBolt) (Object) this;
+        List<Entity> list = lightningBolt.level().getEntities(
+                lightningBolt,
+                new AABB(lightningBolt.getX() - 2.0, lightningBolt.getY() - 2.0, lightningBolt.getZ() - 2.0, lightningBolt.getX() + 2.0, lightningBolt.getY() + 2.0, lightningBolt.getZ() + 2.0),
+                it -> {
+                    if (!it.isAlive() || !(it instanceof PokemonEntity)) {
+                        return false;
+                    }
+                    String abilityName = ((PokemonEntity) it).getPokemon().getAbility().getName();
+                    return abilityName.equals("lightningrod") || abilityName.equals("voltabsorb") || abilityName.equals("motordrive");
+                });
+        if (!list.isEmpty()) {
+            ci.cancel();
+        }
+    }
+}
@@ -8,17 +8,44 @@

 package com.cobblemon.mod.common.mixin;

+import com.cobblemon.mod.common.OrientationControllable;
+import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffectRegistry;
+import com.cobblemon.mod.common.api.riding.Seat;
+import com.cobblemon.mod.common.client.entity.PokemonClientDelegate;
+import com.cobblemon.mod.common.client.render.MatrixWrapper;
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.level.ClipContext;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.Vec3;
+import org.jetbrains.annotations.NotNull;
+import org.joml.Quaternionf;
+import org.joml.Vector3f;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(LivingEntity.class)
-public abstract class LivingEntityMixin {
+public abstract class LivingEntityMixin extends Entity implements OrientationControllable {
+
+    public LivingEntityMixin(EntityType<?> entityType, Level level) {
+        super(entityType, level);
+    }
+
+    @Unique
+    private final OrientationController cobblemon$orientationController = new OrientationController((LivingEntity) (Object) this);
+
+    public OrientationController getOrientationController() {
+        return cobblemon$orientationController;
+    }

    @Inject(method = "onEffectRemoved", at = @At(value = "TAIL"))
    private void cobblemon$onEffectRemoved(MobEffectInstance effect, CallbackInfo ci) {
@@ -28,4 +55,67 @@ public abstract class LivingEntityMixin {
        }
    }

+    @Override
+    public @NotNull HitResult pick(double hitDistance, float partialTicks, boolean hitFluids) {
+        Entity vehicle = this.getVehicle();
+        if (vehicle instanceof PokemonEntity pokemonEntity) {
+            int seatIndex = pokemonEntity.getPassengers().indexOf(this);
+            Seat seat = pokemonEntity.getSeats().get(seatIndex);
+
+            PokemonClientDelegate delegate = (PokemonClientDelegate) pokemonEntity.getDelegate();
+            MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
+
+            Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
+
+            Vec3 eyePosition = cobblemon$getEyePosition(partialTicks, pokemonEntity, locatorOffset);
+
+            Vec3 viewVector = this.getViewVector(partialTicks);
+            Vec3 viewDistanceVector = eyePosition.add(viewVector.x * hitDistance, viewVector.y * hitDistance, viewVector.z * hitDistance);
+
+            return this.level()
+                    .clip(
+                            new ClipContext(
+                                    eyePosition, viewDistanceVector, ClipContext.Block.OUTLINE, hitFluids ? net.minecraft.world.level.ClipContext.Fluid.ANY : net.minecraft.world.level.ClipContext.Fluid.NONE, this
+                            )
+                    );
+        }
+
+        return super.pick(hitDistance, partialTicks, hitFluids);
+    }
+
+    @Unique
+    private Vec3 cobblemon$getEyePosition(float partialTicks, PokemonEntity pokemonEntity, Vec3 locatorOffset) {
+        OrientationController controller = this.getOrientationController();
+
+        float currEyeHeight = this.getEyeHeight();
+        Vec3 offset = locatorOffset.add(pokemonEntity.position());
+        if (controller.isActive() && controller.getOrientation() != null) {
+            Quaternionf orientation = controller.getRenderOrientation(partialTicks);
+            Vec3 rotatedEyeHeight = new Vec3(orientation.transform(new Vector3f(0f, currEyeHeight - (this.getBbHeight() / 2), 0f)));
+
+            offset.add(rotatedEyeHeight);
+        }
+
+        return offset;
+    }
+
+    @Inject(method = "tick", at = @At("HEAD"))
+    private void cobblemon$updateRenderOrientation(CallbackInfo ci) {
+        this.cobblemon$orientationController.tick();
+    }
+
+    @Override
+    public void absMoveTo(double x, double y, double z, float yaw, float pitch) {
+        if (cobblemon$orientationController.getActive()) {
+            this.absMoveTo(x, y, z);
+            this.setYRot(yaw % 360.0f);
+            this.setXRot(pitch % 360.0f);
+            this.yRotO = this.getYRot();
+            this.xRotO = this.getXRot();
+        } else {
+            this.absMoveTo(x, y, z);
+            this.absRotateTo(yaw, pitch);
+        }
+    }
+
 }
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.cobblemon.mod.common.pokemon.ai.EntityBehaviour;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.ai.goal.Goal;
+import net.minecraft.world.entity.monster.Phantom;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+
+
+@Mixin(targets = "net.minecraft.world.entity.monster.Phantom$PhantomSweepAttackGoal")
+public abstract class PhantomSweepAttackGoalMixin extends Goal {
+
+    @Unique
+    private Phantom phantomSelf; // Allows access to the outer class
+
+    @Inject(method = "<init>", at = @At("TAIL"))
+    private void onInit(Phantom phantom, CallbackInfo ci) {
+        this.phantomSelf = phantom;
+    }
+
+    @Inject(method = "canContinueToUse", at = @At("RETURN"), cancellable = true)
+    private void modifyCanContinueToUse(CallbackInfoReturnable<Boolean> cir) {
+        Phantom phantom = this.phantomSelf; // Outer class instance
+        if(phantom == null) return;
+
+        if (cir.getReturnValue()) {
+            var nearbyFearedEntities = phantom.level().getEntities(phantom, phantom.getBoundingBox().inflate(16.0),
+                    (entity -> ((entity instanceof PokemonEntity && ((PokemonEntity) entity).getBeamMode() == 0 && ((PokemonEntity) entity).getBehaviour().getEntityInteract().getAvoidedByPhantom())
+                            || (entity instanceof ServerPlayer && EntityBehaviour.Companion.hasPhantomFearedShoulderMount((ServerPlayer)entity)))));
+            if (!nearbyFearedEntities.isEmpty()) {
+               nearbyFearedEntities.forEach(entity -> {
+                   if (entity instanceof PokemonEntity) {
+                       ((PokemonEntity) entity).cry();
+                   }
+                   //TODO: Find a way to make shoulder mounted Pokemon cry
+               });
+                cir.setReturnValue(false);
+            }
+        }
+    }
+}
+
@@ -18,6 +18,7 @@ import com.cobblemon.mod.common.api.pokemon.PokemonSpecies;
 import com.cobblemon.mod.common.api.storage.party.PartyStore;
 import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore;
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags;
+import com.cobblemon.mod.common.duck.PlayerDuck;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData;
 import com.cobblemon.mod.common.pokedex.scanner.ScannableEntity;
@@ -47,6 +48,7 @@ import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.Nullable;
+import org.joml.Vector3f;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -61,7 +63,12 @@ import java.util.*;
 import java.util.stream.Collectors;

@Mixin(Player.class)
-public abstract class PlayerMixin extends LivingEntity implements ScannableEntity, OrientationControllable {
+public abstract class PlayerMixin extends LivingEntity implements ScannableEntity, OrientationControllable, PlayerDuck {
+
+    @Unique
+    private Vector3f cobblemon$driverInput;
+    @Unique
+    private Vector3f cobblemon$lastSentDriverInput;

    @Shadow public abstract CompoundTag getShoulderEntityLeft();

@@ -81,8 +88,8 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit

    @Shadow @Final private static Map<Pose, EntityDimensions> POSES;
    @Shadow @Final public static EntityDimensions STANDING_DIMENSIONS;
-    @Unique
-    private final OrientationController cobblemon$orientationController = new OrientationController(this);
+    @Shadow protected int jumpTriggerTime;
+    @Unique private final OrientationController cobblemon$orientationController = new OrientationController(this);

    protected PlayerMixin(EntityType<? extends LivingEntity> p_20966_, Level p_20967_) {
        super(p_20966_, p_20967_);
@@ -279,4 +286,25 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
    public OrientationController getOrientationController() {
        return cobblemon$orientationController;
    }
+
+    @Override
+    public void setDriverInput(Vector3f driverInput) {
+        cobblemon$driverInput = driverInput;
+    }
+
+    @Override
+    public Vector3f getDriverInput() {
+        return cobblemon$driverInput;
+    }
+
+    @Override
+    public void setLastSentDriverInput(Vector3f lastSentDriverInput) {
+        cobblemon$lastSentDriverInput = lastSentDriverInput;
+    }
+
+    @Override
+    public Vector3f getLastSentDriverInput() {
+        return cobblemon$lastSentDriverInput;
+    }
+
 }
@@ -12,9 +12,11 @@ import com.cobblemon.mod.common.CobblemonNetwork;
 import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.api.net.NetworkPacket;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
+import com.cobblemon.mod.common.duck.PlayerDuck;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.mixin.accessor.ChunkMapAccessor;
 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 it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@@ -26,6 +28,7 @@ import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerPlayerConnection;
 import net.minecraft.world.entity.Entity;
 import org.joml.Matrix3f;
+import org.joml.Vector3f;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -55,17 +58,20 @@ public abstract class ServerEntityMixin {
    private void cobblemon$sendChanges(CallbackInfo ci) {
        cobblemon$sendOrientationChanges();
        cobblemon$sendRidingStateChanges();
+        cobblemon$sendDriverInput();
    }

    private void cobblemon$sendRidingStateChanges() {
        if (!(this.entity instanceof PokemonEntity pokemonEntity)) return;
-        if (pokemonEntity.getRidingState() == null) return;
-        if (pokemonEntity.getRiding() == null) return;
-        var ridingBehaviour = pokemonEntity.getRiding();
-        var ridingState = pokemonEntity.getRidingState();
+        if (pokemonEntity.getRidingController() == null) return;
+        var ridingController = pokemonEntity.getRidingController();
+        if (ridingController.getContext() == null) return;
+        var context = ridingController.getContext();
+        var ridingBehaviour = context.getBehaviour();
+        var ridingState = context.getState();
        var previousRidingState = pokemonEntity.getPreviousRidingState();
        if (previousRidingState != null && !ridingState.shouldSync(previousRidingState)) return;
-        cobblemon$broadcast(new ClientboundUpdateRidingStatePacket(pokemonEntity.getId(), ridingBehaviour.getKey(), pokemonEntity.getRidingState(), null));
+        cobblemon$broadcast(new ClientboundUpdateRidingStatePacket(pokemonEntity.getId(), ridingBehaviour, ridingState, null));
    }

    private void cobblemon$sendOrientationChanges() {
@@ -82,6 +88,19 @@ public abstract class ServerEntityMixin {
        cobblemon$broadcast(new ClientboundUpdateOrientationPacket(currOrientation, currActive, entity.getId()));
    }

+    private void cobblemon$sendDriverInput() {
+        if (!(this.entity instanceof ServerPlayer serverPlayer)) return;
+        if(!(serverPlayer.getVehicle() instanceof PokemonEntity)) return;
+        Vector3f driverInput = ((PlayerDuck)serverPlayer).getDriverInput();
+        if(driverInput == null) return;
+
+        // If no change in input is detected then don't send a new packet
+        Vector3f lastSentDriverInput = ((PlayerDuck)serverPlayer).getLastSentDriverInput();
+        if (driverInput.equals(lastSentDriverInput)) return;
+        ((PlayerDuck)serverPlayer).setLastSentDriverInput(driverInput);
+        cobblemon$broadcast(new ClientboundUpdateDriverInputPacket(driverInput, entity.getId()));
+    }
+
    private void cobblemon$broadcast(NetworkPacket<?> packet) {
        if (!(entity.level() instanceof ServerLevel level)) return;
        ChunkMap chunkMap = level.getChunkSource().chunkMap;
@@ -97,5 +116,4 @@ public abstract class ServerEntityMixin {
        }
    }

-
 }
@@ -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.mixin;
+
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.phys.AABB;
+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;
+
+import java.util.List;
+import java.util.Optional;
+
+
+@Mixin(ServerLevel.class)
+public abstract class ServerLevelMixin {
+
+    @Inject(method = "findLightningRod", at = @At(value = "RETURN"), cancellable = true)
+    private void cobblemon$findLightningRod(BlockPos blockPos, CallbackInfoReturnable<Optional<BlockPos>> ci) {
+        final ServerLevel serverLevel = (ServerLevel) (Object) this;
+        if (ci.getReturnValue().isEmpty()) {
+            // Search for Pokemon with the ability Lightning Rod and redirect to them
+            AABB aABB = AABB.encapsulatingFullBlocks(blockPos, new BlockPos(blockPos.atY(serverLevel.getMaxBuildHeight()))).inflate(64.0);
+            List<LivingEntity> list = serverLevel.getEntitiesOfClass(LivingEntity.class, aABB, (livingEntity) -> livingEntity != null
+                    && livingEntity.isAlive()
+                    && livingEntity instanceof PokemonEntity
+                    && ((PokemonEntity) livingEntity).getBeamMode() == 0
+                    && ((PokemonEntity) livingEntity).getPokemon().getAbility().getName().equals("lightningrod"));
+            if (!list.isEmpty()) {
+                ci.setReturnValue(Optional.of((list.get(serverLevel.random.nextInt(list.size()))).blockPosition()));
+            }
+        }
+    }
+}
@@ -10,7 +10,10 @@ package com.cobblemon.mod.common.mixin;

 import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -43,4 +46,10 @@ public abstract class ServerPlayerMixin {
        controllable.getOrientationController().setActive(false);
    }

+    //TODO: Switch to sending out on load instead of preventing saving
+    @ModifyExpressionValue(method = "addAdditionalSaveData", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;hasExactlyOnePlayerPassenger()Z"))
+    private boolean cobblemon$cancelSavingPokemonMounts(boolean original, @Local(ordinal=0) Entity entity) {
+        return original && !(entity instanceof PokemonEntity);
+    }
+
 }
@@ -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.mixin;
+
+import com.cobblemon.mod.common.block.HeartyGrainsBlock;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.DoublePlantBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
+import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
+import net.minecraft.world.level.levelgen.feature.SimpleBlockFeature;
+import net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration;
+import org.spongepowered.asm.mixin.Debug;
+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(SimpleBlockFeature.class)
+@Debug(export = true, print = true)
+public class SimpleBlockFeatureMixin {
+    //this mixin inserts the logic needed to ensure that when hearty grains are of a certain age, they place with the upper block too
+    //similarly to what the doubleblock logic is here
+    @Inject(method = "place", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;canSurvive(Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;)Z", shift = At.Shift.AFTER), cancellable = true)
+    public void place(FeaturePlaceContext<SimpleBlockConfiguration> context, CallbackInfoReturnable<Boolean> cir,
+                      @Local BlockState blockState, @Local BlockPos blockPos, @Local WorldGenLevel worldGenLevel) {
+        if (!(blockState.getBlock() instanceof HeartyGrainsBlock)) {
+            return;
+        }
+        if (blockState.getValue(HeartyGrainsBlock.Companion.getAGE()) <= HeartyGrainsBlock.AGE_AFTER_HARVEST) {
+            return; //block is too young to be double
+        }
+        if (!worldGenLevel.isEmptyBlock(blockPos.above())) {
+            cir.setReturnValue(false); //no space for the 2nd block above
+            return;
+        }
+        DoublePlantBlock.placeAt(worldGenLevel, blockState, blockPos, Block.UPDATE_CLIENTS);
+        cir.setReturnValue(true);
+    }
+}
@@ -8,23 +8,33 @@

 package com.cobblemon.mod.common.mixin;

+import com.cobblemon.mod.common.api.riding.sound.RideAttenuationModel;
+import com.cobblemon.mod.common.api.riding.sound.RideLoopSound;
 import com.cobblemon.mod.common.client.sound.BattleMusicController;
+import com.cobblemon.mod.common.duck.ChannelDuck;
 import com.cobblemon.mod.common.duck.SoundEngineDuck;
 import com.google.common.collect.Multimap;
+import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.blaze3d.audio.Channel;
+import net.minecraft.client.resources.sounds.Sound;
 import net.minecraft.client.resources.sounds.SoundInstance;
+import net.minecraft.client.resources.sounds.TickableSoundInstance;
 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.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

+import java.util.Iterator;
 import java.util.Map;

@Mixin(SoundEngine.class)
@@ -45,6 +55,86 @@ public abstract class SoundEngineMixin implements SoundEngineDuck {
    @Shadow
    public abstract boolean isActive(SoundInstance sound);

+    @Inject(method = "play",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/sounds/ChannelAccess$ChannelHandle;execute(Ljava/util/function/Consumer;)V"
+            ),
+            cancellable = true
+    )
+    private void cobblemon$overrideChannelExecute(
+            SoundInstance sound,
+            CallbackInfo ci,
+            @Local(name = "h") float h,
+            @Local(name = "i") float i,
+            @Local(name = "g") float g,
+            @Local(name = "bl2") boolean bl2,
+            @Local(name = "bl3") boolean bl3,
+            @Local(name = "bl") boolean bl,
+            @Local(name = "vec3") Vec3 vec3,
+            @Local(name = "channelHandle") ChannelAccess.ChannelHandle handle
+    ) {
+        if (!(sound instanceof RideLoopSound rideSound)) return;
+
+        if (handle == null) return;
+
+        handle.execute((channel) -> {
+            channel.setPitch(i);
+            channel.setVolume(h);
+
+            if (rideSound.getRideAttenuation() == RideAttenuationModel.LINEAR) {
+                channel.linearAttenuation(g);
+            } else if (rideSound.getRideAttenuation() == RideAttenuationModel.EXPONENTIAL){
+                ((ChannelDuck) channel).cobblemon$inverseAttenuation(g);
+            } else {
+                channel.disableAttenuation();
+            }
+
+            // Apply low pass filter if the rideSound dictate that it should be muffled
+            if (rideSound.getShouldMuffle()) {
+                ((ChannelDuck) channel).cobblemon$applyLowPassFilter(1.0f, rideSound.getMuffleAmount());
+            } else {
+                ((ChannelDuck) channel).cobblemon$clearFilters();
+            }
+
+            channel.setLooping(bl2 && !bl3);
+            channel.setSelfPosition(vec3);
+            channel.setRelative(bl);
+        });
+    }
+
+    @Inject(
+            method = "tickNonPaused",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/sounds/ChannelAccess$ChannelHandle;execute(Ljava/util/function/Consumer;)V",
+                    ordinal = 0
+            )
+    )
+    private void cobblemon$tickableSoundTick(
+            CallbackInfo ci,
+            @Local(name = "tickableSoundInstance") TickableSoundInstance instance,
+            @Local(name = "channelHandle", ordinal = 0) ChannelAccess.ChannelHandle handle,
+            @Local(name = "f", ordinal = 0) float volume,
+            @Local(name = "g", ordinal = 0) float pitch,
+            @Local(name = "vec3", ordinal = 0) Vec3 vec3
+    ) {
+        if (!(instance instanceof RideLoopSound rideSound)) return;
+
+        handle.execute(channel -> {
+            channel.setVolume(volume);
+            channel.setPitch(pitch);
+            channel.setSelfPosition(vec3);
+
+            // Apply low pass filter if the rideSound dictate that it should be muffled
+            if (rideSound.getShouldMuffle()) {
+                ((ChannelDuck) channel).cobblemon$applyLowPassFilter(1.0f, rideSound.getMuffleAmount());
+            } else {
+                ((ChannelDuck) channel).cobblemon$clearFilters();
+            }
+        });
+    }
+
    /** Resumes the Source belonging to the queried SoundInstance. */
    private void resume(SoundInstance sound) {
        ChannelAccess.ChannelHandle sourceManager = this.instanceToChannel.get(sound);
@@ -8,6 +8,7 @@

 package com.cobblemon.mod.common.mixin.accessor;

+import net.minecraft.server.level.ServerEntity;
 import net.minecraft.server.network.ServerPlayerConnection;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -18,4 +19,7 @@ import java.util.Set;
 public interface TrackedEntityAccessor {
    @Accessor("seenBy")
    Set<ServerPlayerConnection> getSeenBy();
+
+    @Accessor("serverEntity")
+    ServerEntity getServerEntity();
 }
@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.mixin.client;
 import com.cobblemon.mod.common.CobblemonRecipeCategories;
 import com.cobblemon.mod.common.item.crafting.CookingPotBookCategory;
 import com.cobblemon.mod.common.item.crafting.CookingPotRecipe;
+import com.cobblemon.mod.common.item.crafting.CookingPotRecipeBase;
 import com.cobblemon.mod.common.item.crafting.CookingPotShapelessRecipe;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -48,10 +49,8 @@ public abstract class ClientRecipeBookMixin {
    @Inject(method = "getCategory", at = @At(value = "HEAD"), cancellable = true)
    private static void addCustomCategory(RecipeHolder<?> recipe, CallbackInfoReturnable<RecipeBookCategories> cir) {
        Recipe<?> recipe2 = recipe.value();
-        if (recipe2 instanceof CookingPotRecipe || recipe2 instanceof CookingPotShapelessRecipe) {
-            CookingPotBookCategory category = recipe2 instanceof CookingPotRecipe
-                    ? ((CookingPotRecipe) recipe2).getCategory()
-                    : ((CookingPotShapelessRecipe) recipe2).category();
+        if (recipe2 instanceof CookingPotRecipeBase) {
+            CookingPotBookCategory category = ((CookingPotRecipeBase) recipe2).getCategory();
            RecipeBookCategories var7;
            switch (category) {
                case MISC -> var7 = CobblemonRecipeCategories.COOKING_POT_MISC.toVanillaCategory();
@@ -9,22 +9,21 @@
 package com.cobblemon.mod.common.mixin.client;

 import com.cobblemon.mod.common.client.gui.ScrollingWidget;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import net.minecraft.client.gui.components.AbstractSelectionList;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.Constant;
-import org.spongepowered.asm.mixin.injection.ModifyConstant;
+import org.spongepowered.asm.mixin.injection.At;

@Mixin(AbstractSelectionList.class)
 public abstract class EntryListWidgetMixin {

    @SuppressWarnings("ConstantValue")
-    @ModifyConstant(method = "getEntryAtPosition", constant = @Constant(intValue = 4))
-    public int cobblemon$adjustOnlyIfNecessary(int input) {
+    @ModifyExpressionValue(method = "getEntryAtPosition", at = @At(value = "CONSTANT", args = {"intValue=4"}))
+    public int cobblemon$adjustOnlyIfNecessary(int original) {
        if(ScrollingWidget.class.isInstance(this)) {
            return 0;
        }

-        return input;
+        return original;
    }
-
 }
@@ -8,6 +8,7 @@

 package com.cobblemon.mod.common.mixin.client;

+import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.client.render.player.MountedPlayerRenderer;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import net.minecraft.client.model.HumanoidModel;
@@ -59,9 +60,9 @@ public class HumanoidModelMixin {
        }

        Entity vehicle = entity.getVehicle();
-        if (vehicle instanceof PokemonEntity pokemonEntity && entity instanceof AbstractClientPlayer) {
+        if (vehicle instanceof PokemonEntity pokemonEntity && entity instanceof OrientationControllable) {
            var shouldRotatePlayerHead = pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) -> {
-                return behaviour.shouldRotatePlayerHead(settings, state, pokemonEntity);
+                return behaviour.shouldRotateRiderHead(settings, state, pokemonEntity);
            });

            if (!shouldRotatePlayerHead) {
@@ -73,7 +74,9 @@ public class HumanoidModelMixin {
                }
            }

-            MountedPlayerRenderer.INSTANCE.animate(pokemonEntity, (AbstractClientPlayer) entity, relevantPartsByName, netHeadYaw, headPitch, ageInTicks, limbSwing, limbSwingAmount);
+            if (!(entity instanceof AbstractClientPlayer player)) return;
+
+            MountedPlayerRenderer.INSTANCE.animate(pokemonEntity, player, relevantPartsByName, netHeadYaw, headPitch, ageInTicks, limbSwing, limbSwingAmount);
        }
    }
 }
@@ -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.mixin.client;
+
+import com.cobblemon.mod.common.client.render.entity.MountedLivingEntityRenderer;
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.model.EntityModel;
+import net.minecraft.client.renderer.entity.LivingEntityRenderer;
+import net.minecraft.world.entity.LivingEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(LivingEntityRenderer.class)
+public class LivingEntityRendererMixin<T extends LivingEntity, M extends EntityModel<T>> {
+
+    @Inject(
+            method = "setupRotations",
+            at = @At("HEAD")
+    )
+    private void cobblemon$modifyRoll(LivingEntity entity, PoseStack poseStack, float bob, float yBodyRot, float partialTick, float scale, CallbackInfo ci) {
+        if (entity.isPassenger()) {
+            var vehicle = entity.getVehicle();
+            if (vehicle instanceof PokemonEntity pokemonEntity) {
+                MountedLivingEntityRenderer.INSTANCE.render(entity, pokemonEntity, poseStack, bob, yBodyRot, partialTick, scale);
+            }
+        }
+    }
+}
@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.mixin.client;

 import com.cobblemon.mod.common.CobblemonNetwork;
+import com.cobblemon.mod.common.DoubleJump;
 import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.riding.Seat;
@@ -17,17 +18,21 @@ import com.cobblemon.mod.common.client.render.MatrixWrapper;
 import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState;
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel;
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository;
+import com.cobblemon.mod.common.duck.PlayerDuck;
 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.mojang.authlib.GameProfile;
 import net.minecraft.client.CameraType;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.player.AbstractClientPlayer;
+import net.minecraft.client.player.Input;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.HitResult;
@@ -46,13 +51,23 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import java.util.Map;

@Mixin(LocalPlayer.class)
-public abstract class LocalPlayerMixin extends AbstractClientPlayer implements OrientationControllable{
+public abstract class LocalPlayerMixin extends AbstractClientPlayer implements OrientationControllable, DoubleJump {

    @Unique Matrix3f cobblemon$lastOrientation;

+    @Unique boolean cobblemon$isDoubleJumping = false;
+
    @Shadow
    private float jumpRidingScale;

+    @Shadow public Input input;
+
+    @Shadow private int autoJumpTime;
+
+    @Unique private int cobblemon$survivalJumpTriggerTime;
+
+    @Unique private boolean cobblemon$isJumping;
+
    public LocalPlayerMixin(ClientLevel clientLevel, GameProfile gameProfile) {
        super(clientLevel, gameProfile);
    }
@@ -83,6 +98,23 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
        controllable.getOrientationController().setActive(shouldUseCustomOrientation);
    }

+    @Inject(method = "rideTick", at = @At("HEAD"))
+    private void cobblemon$updateDriverInputRideTick(CallbackInfo ci) {
+        if (Minecraft.getInstance().player != (Object)this) return;
+        if (!(this.getVehicle() instanceof PokemonEntity pokemonEntity)) return;
+
+        // Gather driver Input
+        float vertInput = this.jumping ? 1.0f : (((Player)this).isShiftKeyDown() ? -1.0f : 0.0f);
+        Vector3f driverInput = new Vector3f(Math.signum(this.xxa), vertInput, Math.signum(this.zza));
+
+        // Check if player input has changed. If it has then update the last sent and send it
+        Vector3f lastSentDriverInput = ((PlayerDuck)this).getLastSentDriverInput();
+        if (driverInput.equals(lastSentDriverInput)) return;
+        ((PlayerDuck)this).setLastSentDriverInput(driverInput);
+
+        CobblemonNetwork.INSTANCE.sendToServer(new ServerboundUpdateDriverInputPacket(driverInput));
+    }
+
    @Unique
    private boolean cobblemon$shouldUseCustomOrientation(LocalPlayer player) {
        var playerVehicle = player.getVehicle();
@@ -115,21 +147,46 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
        }
    }

+    @Inject(method = "aiStep", at = @At("HEAD"))
+    private void cobblemon$aiStep(CallbackInfo ci) {
+        this.cobblemon$isDoubleJumping = false;
+        this.cobblemon$isJumping = this.input.jumping;
+    }
+
+    @Inject(method = "aiStep", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;isSprinting()Z", shift = At.Shift.BEFORE))
+    private void cobblemon$updateDoubleJumping(CallbackInfo ci) {
+        if (!this.cobblemon$isJumping && this.input.jumping && this.autoJumpTime <= 0 && !this.isSwimming()) {
+            if (this.cobblemon$survivalJumpTriggerTime != 0) {
+                this.cobblemon$isDoubleJumping = true;
+                this.cobblemon$survivalJumpTriggerTime = 0;
+            }
+            else {
+                this.cobblemon$survivalJumpTriggerTime = 7;
+            }
+        }
+        else if (this.cobblemon$survivalJumpTriggerTime > 0) {
+            this.cobblemon$survivalJumpTriggerTime--;
+        }
+    }
+
+    @Override
+    public boolean isDoubleJumping() {
+        return this.cobblemon$isDoubleJumping;
+    }
+
    @Override
    public HitResult pick(double hitDistance, float partialTicks, boolean hitFluids) {
        Entity vehicle = this.getVehicle();
        if (vehicle instanceof PokemonEntity pokemonEntity) {
-            int seatIndex = pokemonEntity.getPassengers().indexOf(this);
-            Seat seat = pokemonEntity.getSeats().get(seatIndex);
-
            PokemonClientDelegate delegate = (PokemonClientDelegate) pokemonEntity.getDelegate();
-            MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
+            String locatorName = delegate.getSeatLocator(this);
+            MatrixWrapper locator = delegate.getLocatorStates().get(locatorName);

            if (locator == null) {
-                super.pick(hitDistance, partialTicks, hitFluids);
+                return super.pick(hitDistance, partialTicks, hitFluids);
            }

-            Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
+            Vec3 locatorOffset = locator != null ? new Vec3(locator.getMatrix().getTranslation(new Vector3f())) : Vec3.ZERO;

            OrientationController controller = this.getOrientationController();

@@ -138,7 +195,7 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O

            if (Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON) {
                PosableModel model = VaryingModelRepository.INSTANCE.getPoser(pokemonEntity.getPokemon().getSpecies().getResourceIdentifier(), new FloatingState());
-                offset.add(cobblemon$getFirstPersonOffset(model, seat));
+                offset.add(cobblemon$getFirstPersonOffset(model, locatorName));
            }

            Matrix3f orientation = controller.isActive() && controller.getOrientation() != null ? controller.getOrientation() : new Matrix3f();
@@ -160,11 +217,11 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
    }

    @Unique
-    private static @NotNull Vector3f cobblemon$getFirstPersonOffset(PosableModel model, Seat seat) {
+    private static @NotNull Vector3f cobblemon$getFirstPersonOffset(PosableModel model, String locatorName) {
        Map<String, Vec3> cameraOffsets = model.getFirstPersonCameraOffset();

-        if (cameraOffsets.containsKey(seat.getLocator())) {
-            return cameraOffsets.get(seat.getLocator()).toVector3f();
+        if (cameraOffsets.containsKey(locatorName)) {
+            return cameraOffsets.get(locatorName).toVector3f();
        } else {
            return new Vector3f(0f, 0f, 0f);
        }
@@ -30,7 +30,6 @@ import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

@Mixin(MouseHandler.class)
 public abstract class MouseHandlerMixin {
@@ -121,11 +120,12 @@ public abstract class MouseHandlerMixin {
        if (usageContext.getScanningGuiOpen()) {
            this.smoothTurnY.reset();
            this.smoothTurnX.reset();
-            var defaultSensitivity = this.minecraft.options.sensitivity().get() * 0.6000000238418579 + 0.20000000298023224;
+            var defaultSensitivity = this.minecraft.options.sensitivity().get() * 0.6 + 0.2;
            var spyglassSensitivity = Math.pow(defaultSensitivity, 3);
            var lookSensitivity = spyglassSensitivity * 8.0;
            var sensitivity = Mth.lerp(usageContext.getFovMultiplier(), spyglassSensitivity, lookSensitivity);
-            player.turn(this.accumulatedDX * sensitivity, (this.accumulatedDY * sensitivity));
+            var yRotationFlip = this.minecraft.options.invertYMouse().get() ? -1 : 1;
+            player.turn(this.accumulatedDX * sensitivity, (this.accumulatedDY * sensitivity * yRotationFlip));
            return false;
        }

@@ -9,20 +9,16 @@
 package com.cobblemon.mod.common.mixin.client;

 import com.cobblemon.mod.common.client.render.ClientPlayerIcon;
-import com.cobblemon.mod.common.client.render.player.MountedPlayerRenderer;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.PlayerModel;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
 import net.minecraft.client.renderer.entity.LivingEntityRenderer;
 import net.minecraft.client.renderer.entity.player.PlayerRenderer;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -35,9 +31,9 @@ public abstract class PlayerRendererMixin extends LivingEntityRenderer<AbstractC
        super(context, model, shadowRadius);
    }

-    @Inject(method = "render(Lnet/minecraft/world/entity/LivingEntity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V", at = @At(value = "TAIL"))
-    public void cobblemon$clientPlayerIcon(LivingEntity entity, float entityYaw, float partialTicks, PoseStack poseStack, MultiBufferSource buffer, int packedLight, CallbackInfo ci) {
-        ClientPlayerIcon.Companion.onRenderPlayer((Player) entity);
+    @Inject(method = "render", at = @At(value = "TAIL"))
+    public void renderPlayer(AbstractClientPlayer player, float f, float g, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, CallbackInfo ci) {
+        ClientPlayerIcon.Companion.onRenderPlayer(player);
    }

    @WrapOperation(method = "getRenderOffset(Lnet/minecraft/client/player/AbstractClientPlayer;F)Lnet/minecraft/world/phys/Vec3;", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/AbstractClientPlayer;isCrouching()Z"))
@@ -55,17 +51,4 @@ public abstract class PlayerRendererMixin extends LivingEntityRenderer<AbstractC
            playerModel.crouching = false;
        }
    }
-
-    @Inject(
-            method = "setupRotations(Lnet/minecraft/client/player/AbstractClientPlayer;Lcom/mojang/blaze3d/vertex/PoseStack;FFFF)V",
-            at = @At("HEAD")
-    )
-    private void cobblemon$modifyRoll(AbstractClientPlayer player, PoseStack poseStack, float a, float b, float partialTicks, float i, CallbackInfo ci) {
-        if (player.isPassenger()) {
-            var vehicle = player.getVehicle();
-            if (vehicle instanceof PokemonEntity entity) {
-                MountedPlayerRenderer.INSTANCE.render(player, entity, poseStack, a, b, partialTicks, i);
-            }
-        }
-    }
 }
@@ -0,0 +1,72 @@
+/*
+ * 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.snapshots;
+
+import com.cobblemon.mod.common.CobblemonBuildDetails;
+import com.cobblemon.mod.common.client.gui.snapshots.SnapshotWarningScreen;
+import com.cobblemon.mod.common.client.snapshots.SnapshotAcknowledgementData;
+import com.cobblemon.mod.common.client.snapshots.SnapshotAcknowledgementReader;
+import kotlin.Unit;
+import net.minecraft.SharedConstants;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.Screen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.List;
+import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@Mixin(Minecraft.class)
+public final class SnapshotWarningMixin {
+
+    @Unique
+    private final Pattern VERSION = Pattern.compile("^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)$");
+
+    @Inject(method = "addInitialScreens", at = @At("TAIL"))
+    public void cobblemon$addSnapshotWarningScreen(List<Function<Runnable, Screen>> output, CallbackInfo callback) {
+        if (CobblemonBuildDetails.SNAPSHOT && !this.cobblemon$isAcknowledged() && !SharedConstants.IS_RUNNING_IN_IDE) {
+            output.add((runnable) -> new SnapshotWarningScreen((acknowledgement, dsa) -> {
+                if (acknowledgement == SnapshotWarningScreen.Acknowledgement.NO) {
+                    Minecraft.getInstance().stop();
+                    return Unit.INSTANCE;
+                }
+
+                SnapshotAcknowledgementReader.INSTANCE.write(new SnapshotAcknowledgementData(CobblemonBuildDetails.VERSION, dsa));
+
+                runnable.run();
+                return Unit.INSTANCE;
+            }));
+        }
+
+    }
+
+    @Unique
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    private boolean cobblemon$isAcknowledged() {
+        SnapshotAcknowledgementData data = SnapshotAcknowledgementReader.INSTANCE.read();
+        if (data == null) {
+            return false;
+        }
+
+        Matcher current = VERSION.matcher(CobblemonBuildDetails.VERSION);
+        current.find();
+
+        Matcher when = VERSION.matcher(data.getVersion());
+        when.find();
+
+        boolean alert = current.group("minor").compareTo(when.group("minor")) > 0 || current.group("major").compareTo(when.group("major")) > 0;
+        return !alert && data.getDontShowAgain();
+    }
+
+}
@@ -75,6 +75,7 @@ import com.cobblemon.mod.common.config.constraint.IntConstraint
 import com.cobblemon.mod.common.config.starter.StarterConfig
 import com.cobblemon.mod.common.data.CobblemonDataProvider
 import com.cobblemon.mod.common.events.AdvancementHandler
+import com.cobblemon.mod.common.events.EntityCallbackHandler
 import com.cobblemon.mod.common.events.FlowHandler
 import com.cobblemon.mod.common.events.PokedexHandler
 import com.cobblemon.mod.common.events.ServerTickHandler
@@ -313,6 +314,7 @@ object Cobblemon {
        CobblemonEvents.POKEMON_PROPERTY_INITIALISED.emit(Unit)

        FlowHandler.setup()
+        EntityCallbackHandler.setup()

        ifDedicatedServer {
            isDedicatedServer = true
@@ -19,6 +19,7 @@ object CobblemonActivities {
    val POKEMON_GROW_CROP = register(Activity("pokemon_grow_crop"))
    val POKEMON_SLEEP_ON_TRAINER_BED = register(Activity("pokemon_sleep_on_trainer_bed"))
    val POKEMON_HERD = register(Activity("pokemon_herd"))
+    val POKEMON_POLLINATION = register(Activity("pokemon_pollination"))

    fun register(activity: Activity): Activity {
        activities.add(activity)
@@ -25,6 +25,8 @@ import com.cobblemon.mod.common.util.adapters.ExpressionAdapter
 import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
 import com.cobblemon.mod.common.util.adapters.ExpressionOrEntityVariableAdapter
 import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
+import com.cobblemon.mod.common.util.adapters.MemoryModuleTypeAdapter
+import com.cobblemon.mod.common.util.adapters.SensorTypeAdapter
 import com.cobblemon.mod.common.util.adapters.TaskConfigAdapter
 import com.cobblemon.mod.common.util.adapters.TranslatedTextAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
@@ -39,6 +41,8 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.server.packs.resources.ResourceManager
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType
 import net.minecraft.world.entity.schedule.Activity

 object CobblemonBehaviours : JsonDataRegistry<CobblemonBehaviour> {
@@ -47,6 +51,8 @@ object CobblemonBehaviours : JsonDataRegistry<CobblemonBehaviour> {
        .registerTypeAdapter(Activity::class.java, ActivityAdapter)
        .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
+        .registerTypeAdapter(MemoryModuleType::class.java, MemoryModuleTypeAdapter)
+        .registerTypeAdapter(SensorType::class.java, SensorTypeAdapter)
        .registerTypeAdapter(BehaviourConfig::class.java, BehaviourConfigAdapter)
        .registerTypeAdapter(TaskConfig::class.java, TaskConfigAdapter)
        .registerTypeAdapter(
@@ -72,6 +78,9 @@ object CobblemonBehaviours : JsonDataRegistry<CobblemonBehaviour> {
     */
    val autoPokemonBehaviours = mutableListOf<CobblemonBehaviour>()

+    /** See [autoPokemonBehaviours] but think npc instead of pokemon*/
+    val autoNPCBehaviours = mutableListOf<CobblemonBehaviour>()
+
    val behaviours = mutableMapOf<ResourceLocation, CobblemonBehaviour>()

    override fun sync(player: ServerPlayer) {
@@ -80,6 +89,7 @@ object CobblemonBehaviours : JsonDataRegistry<CobblemonBehaviour> {

    override fun reload(manager: ResourceManager) {
        autoPokemonBehaviours.clear()
+        autoNPCBehaviours.clear()
        val data = mutableMapOf<ResourceLocation, CobblemonBehaviour>()
        manager.listResources(resourcePath) { path -> path.endsWith(JSON_EXTENSION) }.forEach { (identifier, resource) ->
            resource.open().use { stream ->
@@ -88,6 +98,8 @@ object CobblemonBehaviours : JsonDataRegistry<CobblemonBehaviour> {
                    val behaviour = parse(reader, resolvedIdentifier)
                    if ("pokemon/auto/" in identifier.path) {
                        autoPokemonBehaviours.add(behaviour)
+                    } else if ("npc/auto/" in identifier.path) {
+                        autoNPCBehaviours.add(behaviour)
                    }
                    data[resolvedIdentifier] = behaviour
                }
@@ -8,7 +8,6 @@

 package com.cobblemon.mod.common

-import com.cobblemon.mod.common.block.entity.PokeCakeBlockEntity
 import com.cobblemon.mod.common.block.entity.BerryBlockEntity
 import com.cobblemon.mod.common.block.entity.HealingMachineBlockEntity
 import com.cobblemon.mod.common.block.entity.PCBlockEntity
@@ -88,35 +87,23 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
        BlockEntityType.Builder.of(::DisplayCaseBlockEntity, CobblemonBlocks.DISPLAY_CASE).build(null)
    )

-    @JvmField
-    val INCENSE_SWEET: BlockEntityType<SweetIncenseBlockEntity> = this.create("incense_sweet",
-            BlockEntityType.Builder.of(::SweetIncenseBlockEntity, CobblemonBlocks.INCENSE_SWEET).build(null)
-    )
+    // TODO after 1.7
+//    @JvmField
+//    val INCENSE_SWEET: BlockEntityType<SweetIncenseBlockEntity> = this.create("incense_sweet",
+//            BlockEntityType.Builder.of(::SweetIncenseBlockEntity, CobblemonBlocks.INCENSE_SWEET).build(null)
+//    )

    @JvmField
    val CAMPFIRE: BlockEntityType<CampfireBlockEntity> = this.create("campfire_pot",
-            BlockEntityType.Builder.of(::CampfireBlockEntity, CobblemonBlocks.CAMPFIRE).build(null)
+            BlockEntityType.Builder.of(::CampfireBlockEntity,
+                CobblemonBlocks.CAMPFIRE,
+                CobblemonBlocks.SOUL_CAMPFIRE
+            ).build(null)
    )

-    /*@JvmField
-    val LURE_CAKE: BlockEntityType<LureCakeBlockEntity> =
-        BlockEntityType.Builder.of({ pos, state -> LureCakeBlockEntity(pos, state) },
-            CobblemonBlocks.LURE_CAKE
-        ).build(null)*/
-
    @JvmField
-    val LURE_CAKE: BlockEntityType<LureCakeBlockEntity> = this.create(
-        "lure_cake",
-        BlockEntityType.Builder.of(::LureCakeBlockEntity, CobblemonBlocks.LURE_CAKE).build(null)
-    )
-    @JvmField
-    val POKE_CAKE: BlockEntityType<PokeCakeBlockEntity> = this.create(
-        "poke_cake",
-        BlockEntityType.Builder.of(::PokeCakeBlockEntity, CobblemonBlocks.POKE_CAKE).build(null)
-    )
-    @JvmField
-    val CANDLE_POKE_CAKE: BlockEntityType<CandlePokeCakeBlockEntity> = this.create(
-        "candle_poke_cake",
-        BlockEntityType.Builder.of(::CandlePokeCakeBlockEntity, CobblemonBlocks.CANDLE_POKE_CAKE).build(null)
+    val POKE_SNACK: BlockEntityType<PokeSnackBlockEntity> = this.create(
+        "poke_snack",
+        BlockEntityType.Builder.of(::PokeSnackBlockEntity, CobblemonBlocks.POKE_SNACK, CobblemonBlocks.POKE_CAKE).build(null)
    )
 }
@@ -34,15 +34,13 @@ import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.valueproviders.UniformInt
 import net.minecraft.world.effect.MobEffects
-import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.EntityType
 import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.*
 import net.minecraft.world.level.block.state.BlockBehaviour
-import net.minecraft.world.level.block.state.BlockBehaviour.Properties
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.properties.BlockSetType
+import net.minecraft.world.level.block.state.properties.BlockStateProperties
 import net.minecraft.world.level.block.state.properties.BlockStateProperties.LIT
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument
 import net.minecraft.world.level.block.state.properties.WoodType
@@ -179,7 +177,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    @JvmField
    val SACCHARINE_LOG = this.create("saccharine_log", SaccharineLogBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD).ignitedByLava()))
    @JvmField
-    val SACCHARINE_HONEY_LOG = this.create("saccharine_honey_log", SaccharineHoneyLogBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD).ignitedByLava()))
+    val SACCHARINE_LOG_SLATHERED = this.create("saccharine_log_slathered", SaccharineLogSlatheredBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD).ignitedByLava()))

    @JvmField
    val STRIPPED_SACCHARINE_LOG = this.create("stripped_saccharine_log", RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD).ignitedByLava())) //log("stripped_saccharine_log")
@@ -208,7 +206,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    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)))
-
+    @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)))
@@ -233,8 +231,10 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<

    @JvmField
    val MEDICINAL_LEEK = this.create("medicinal_leek", MedicinalLeekBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.CRIMSON_NYLIUM).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MEDICINAL_LEEK_SOUNDS)))
-    @JvmField
-    val BUGWORT = this.create("bugwort", BugwortBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.COLOR_PURPLE).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MEDICINAL_LEEK_SOUNDS)))
+
+    // TODO after 1.7
+//    @JvmField
+//    val BUGWORT = this.create("bugwort", BugwortBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.COLOR_PURPLE).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MEDICINAL_LEEK_SOUNDS)))
    @JvmField
    val ENERGY_ROOT = this.create("energy_root", EnergyRootBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.DIRT).noCollission().randomTicks().instabreak().sound(CobblemonSounds.ENERGY_ROOT_SOUNDS)))
    @JvmField
@@ -243,11 +243,9 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    val REVIVAL_HERB = this.create("revival_herb", RevivalHerbBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.PLANT).ignitedByLava().noCollission().instabreak().sound(CobblemonSounds.REVIVAL_HERB_SOUNDS)))

    @JvmField
-    val LURE_CAKE = this.create("lure_cake", LureCakeBlock(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY)))
+    val POKE_CAKE = this.create("poke_cake", PokeSnackBlock(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY).lightLevel { if (it.getValue(LIT)) 3 else 0 }, false))
    @JvmField
-    val POKE_CAKE = this.create("poke_cake", PokeCakeBlock(BlockBehaviour.Properties.ofFullCopy(LURE_CAKE)))
-    @JvmField
-    val CANDLE_POKE_CAKE = this.create("candle_poke_cake", CandlePokeCakeBlock(BlockBehaviour.Properties.ofFullCopy(LURE_CAKE).lightLevel { blockState -> if (blockState.getValue(LIT) == true) 3 else 0 }))
+    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(LIT)) 3 else 0 }, true))

    @JvmField
    val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
@@ -452,7 +450,10 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    )

    @JvmField
-    val CAMPFIRE = create("campfire", CampfireBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOD).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.PODZOL).strength(2.0F).lightLevel { if ((it.getValue(CampfireBlock.SOUL) as Boolean)) 9 else 14 }))
+    val CAMPFIRE = create("campfire", CampfireBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOD).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.PODZOL).strength(2.0F).lightLevel{14}, false))
+
+    @JvmField
+    val SOUL_CAMPFIRE = create("soul_campfire", CampfireBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOD).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.PODZOL).strength(2.0F).lightLevel{9}, true))
    
    @JvmField
    val RELIC_COIN_POUCH = create("relic_coin_pouch", CoinPouchBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.RELIC_COIN_POUCH_SOUNDS).pushReaction(PushReaction.DESTROY).noOcclusion(), true))
@@ -477,29 +478,30 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    val GIMMIGHOUL_CHEST = create("gimmighoul_chest", GildedChestBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS), GildedChestBlock.Type.FAKE))

    @JvmField
-    val MONITOR = create("monitor", MonitorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(5.0F, 6.0F).lightLevel { if (it.getValue(MonitorBlock.SCREEN) != MonitorBlock.MonitorScreen.OFF) 15 else 0 }))
+    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 FOSSIL_ANALYZER = create("fossil_analyzer", FossilAnalyzerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(5.0F, 6.0F).noOcclusion()))
    @JvmField
    val RESTORATION_TANK = create("restoration_tank", RestorationTankBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.GLASS).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(5.0F, 6.0F).noOcclusion()))

    @JvmField
-    val HEALING_MACHINE = create("healing_machine", HealingMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2f).noOcclusion().lightLevel { if (it.getValue(HealingMachineBlock.CHARGE_LEVEL) >= HealingMachineBlock.MAX_CHARGE_LEVEL) 7 else 2 }))
+    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)) 10 else 0 }))
+    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 LECTERN = create("lectern", LecternBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).sound(SoundType.WOOD).strength(2.5F).ignitedByLava()))
+    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 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()))

-    @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)))
+    // 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)))

    @JvmField
-    val PASTURE = create("pasture", PastureBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).sound(SoundType.WOOD).strength(2F).noOcclusion().pushReaction(PushReaction.BLOCK).lightLevel { if ((it.getValue(PastureBlock.ON) as Boolean) && (it.getValue(PastureBlock.PART) == PastureBlock.PasturePart.TOP)) 10 else 0 }))
+    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 }))

    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
@@ -520,10 +522,10 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    @JvmField
    val POTTED_PEP_UP_FLOWER = this.create("potted_pep_up_flower", BlocksInvoker.createFlowerPotBlock(PEP_UP_FLOWER))
    @JvmField
-    val HEARTY_GRAINS = this.create("hearty_grains", HeartyGrainsBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.PLANT).noCollission().randomTicks().instabreak().sound(CobblemonSounds.VIVICHOKE_SOUNDS)))
+    val HEARTY_GRAINS = this.create("hearty_grains", HeartyGrainsBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.PLANT).noCollission().randomTicks().instabreak()))

    @JvmField
-    val GALARICA_NUT_BUSH = this.create("galarica_nut_bush", NutBushBlock(Properties.of().mapColor(MapColor.PLANT).randomTicks().noCollission().sound(SoundType.SWEET_BERRY_BUSH).pushReaction(PushReaction.DESTROY)))
+    val GALARICA_NUT_BUSH = this.create("galarica_nut_bush", NutBushBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).randomTicks().noCollission().sound(SoundType.SWEET_BERRY_BUSH).pushReaction(PushReaction.DESTROY)))

    @JvmField
    val POTTED_RED_APRICORN_SAPLING = this.create("potted_red_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(RED_APRICORN_SAPLING))
@@ -543,11 +545,11 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    val POTTED_SACCHARINE_SAPLING = this.create("potted_saccharine_sapling", BlocksInvoker.createFlowerPotBlock(SACCHARINE_SAPLING))

    @JvmField
-    val HEARTY_GRAIN_BALE = this.create("hearty_grain_bale", BaleBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).instrument(NoteBlockInstrument.BANJO).strength(0.5F).sound(SoundType.GRASS)))
+    val HEARTY_GRAIN_BALE = this.create("hearty_grain_bale", BaleBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).instrument(NoteBlockInstrument.BANJO).strength(0.5F).sound(CobblemonSounds.HEARTY_GRAIN_BALE_SOUNDS)))
    @JvmField
-    val TATAMI_BLOCK = this.create("tatami_block", HorizontalRotationalBlock(BlockBehaviour.Properties.of().ignitedByLava().mapColor(MapColor.PLANT).strength(0.1F).sound(SoundType.GRASS)))
+    val TATAMI_BLOCK = this.create("tatami_block", HorizontalRotationalBlock(BlockBehaviour.Properties.of().ignitedByLava().mapColor(MapColor.PLANT).strength(0.1F).sound(CobblemonSounds.TATAMI_BLOCK_SOUNDS)))
    @JvmField
-    val TATAMI_MAT = this.create("tatami_mat", HorizontalRotationCarpetBlock(BlockBehaviour.Properties.of().ignitedByLava().mapColor(MapColor.PLANT).strength(0.1F).sound(SoundType.GRASS)))
+    val TATAMI_MAT = this.create("tatami_mat", HorizontalRotationCarpetBlock(BlockBehaviour.Properties.of().ignitedByLava().mapColor(MapColor.PLANT).strength(0.1F).sound(CobblemonSounds.TATAMI_MAT_SOUNDS)))

    /**
     * Returns a map of all the blocks that can be stripped with an axe in the format of input - output.
@@ -559,11 +561,9 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
        APRICORN_LOG to STRIPPED_APRICORN_LOG,
        SACCHARINE_WOOD to STRIPPED_SACCHARINE_WOOD,
        SACCHARINE_LOG to STRIPPED_SACCHARINE_LOG,
-        SACCHARINE_HONEY_LOG to STRIPPED_SACCHARINE_LOG
+        SACCHARINE_LOG_SLATHERED to STRIPPED_SACCHARINE_LOG
    )

-
-
    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 {
@@ -663,7 +663,19 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
            Triple(APRICORN_FENCE, 5, 20),
            Triple(APRICORN_FENCE_GATE, 5, 20),
            Triple(APRICORN_SLAB, 5, 20),
-            Triple(APRICORN_STAIRS, 5, 20)
+            Triple(APRICORN_STAIRS, 5, 20),
+            Triple(SACCHARINE_LOG, 5, 5),
+            Triple(SACCHARINE_LOG_SLATHERED, 5, 5),
+            Triple(STRIPPED_SACCHARINE_LOG, 5, 5),
+            Triple(SACCHARINE_WOOD, 5, 5),
+            Triple(STRIPPED_SACCHARINE_WOOD, 5, 5),
+            Triple(SACCHARINE_PLANKS, 5, 20),
+            Triple(SACCHARINE_LEAVES, 30, 60),
+            Triple(SACCHARINE_FENCE, 5, 20),
+            Triple(SACCHARINE_FENCE_GATE, 5, 20),
+            Triple(SACCHARINE_SLAB, 5, 20),
+            Triple(SACCHARINE_STAIRS, 5, 20)
+
        ).onEach{ data -> setFlammable(data.first, data.second, data.third) }
    }

@@ -59,6 +59,7 @@ object CobblemonCommands {
        ApplyPlayerTextureCommand.register(dispatcher)
        RenameBoxCommand.register(dispatcher)
        ChangeBoxWallpaperCommand.register(dispatcher)
+        RunMolangCommand.register(dispatcher)
        RunMolangScriptCommand.register(dispatcher)
        SpectateBattleCommand.register(dispatcher)
        CobblemonConfigCommand.register(dispatcher)
@@ -93,6 +93,8 @@ object CobblemonFlows : DataRegistry {
        functions: Map<String, (MoParams) -> Any> = emptyMap(),
        cancelable: Cancelable? = null
    ) {
+        if (eventResourceLocation !in flows) return
+
        if (cancelable == null) {
            runtime.environment.query.functions.remove("cancel")
        } else {
@@ -310,7 +310,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val SACCHARINE_LOG = blockItem("saccharine_log", CobblemonBlocks.SACCHARINE_LOG)
    @JvmField
-    val SACCHARINE_HONEY_LOG = blockItem("saccharine_honey_log", CobblemonBlocks.SACCHARINE_HONEY_LOG)
+    val SACCHARINE_LOG_SLATHERED = blockItem("saccharine_log_slathered", CobblemonBlocks.SACCHARINE_LOG_SLATHERED)
    @JvmField
    val STRIPPED_SACCHARINE_LOG = blockItem("stripped_saccharine_log", CobblemonBlocks.STRIPPED_SACCHARINE_LOG)
    @JvmField
@@ -349,15 +349,15 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val SACCHARINE_SAPLING = compostableBlockItem("saccharine_sapling", CobblemonBlocks.SACCHARINE_SAPLING, 0.30f)

-    @JvmField
-    val BUGWORT = compostableBlockItem("bugwort", CobblemonBlocks.BUGWORT)
+//    @JvmField
+//    val BUGWORT = compostableBlockItem("bugwort", CobblemonBlocks.BUGWORT) // TODO after 1.7
    @JvmField
    val POKE_BAIT = noSettingsItem("poke_bait")

    @JvmField
-    val LURE_CAKE = blockItem("lure_cake", CobblemonBlocks.LURE_CAKE)
+    val POKE_CAKE = this.create("poke_cake", BlockItem(CobblemonBlocks.POKE_CAKE, Item.Properties().stacksTo(1)))
    @JvmField
-    val POKE_CAKE = blockItem("poke_cake", CobblemonBlocks.POKE_CAKE)
+    val POKE_SNACK = this.create("poke_snack", BlockItem(CobblemonBlocks.POKE_SNACK, Item.Properties().stacksTo(16)))

    val aprijuices = mutableListOf<AprijuiceItem>()
    @JvmField
@@ -386,43 +386,31 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It

    // FOODS
    @JvmField
-    val SWEET_HEART = noSettingsItem("sweet_heart") // todo make a SweetHeartItem class for breeding purposes
+    val SWEET_HEART = noSettingsItem("sweet_heart") // TODO make a SweetHeartItem class for breeding purposes

    @JvmField
-    val TASTY_TAIL = noSettingsItem("tasty_tail")
+    val TASTY_TAIL = create("tasty_tail", foodItem(3, 0.3f))

-    @JvmField // todo get final values for this from vera
-    val PEWTER_CRUNCHIES = regionalFoodItem("pewter_crunchies", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f, false)
-
-    @JvmField // todo get final values for this from vera
-    val RAGE_CANDY_BAR = regionalFoodItem("rage_candy_bar", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f, false)
-
-    @JvmField // todo get final values for this from vera
-    val LAVA_COOKIE = regionalFoodItem("lava_cookie", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    @JvmField // todo get final values for this from vera
-    val OLD_GATEAU = regionalFoodItem("old_gateau", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    @JvmField // todo get final values for this from vera
-    val CASTELIACONE = regionalFoodItem("casteliacone", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    @JvmField // todo get final values for this from vera
-    val SHALOUR_SABLE = regionalFoodItem("shalour_sable", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    @JvmField // todo get final values for this from vera
-    val LUMIOSE_GALETTE = regionalFoodItem("lumiose_galette", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    @JvmField // todo get final values for this from vera
-    val BIG_MALASADA = regionalFoodItem("big_malasada", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    @JvmField // todo get final values for this from vera
-    val SMOKED_TAIL_CURRY = regionalFoodItem("smoked_tail_curry", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f, false, ItemStack(Items.BOWL, 1))
-
-    @JvmField // todo get final values for this from vera
-    val JUBILIFE_MUFFIN = regionalFoodItem("jubilife_muffin", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    @JvmField // todo get final values for this from vera
-    val OPEN_FACED_SANDWICH = regionalFoodItem("open_faced_sandwich", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
+    @JvmField
+    val PEWTER_CRUNCHIES = regionalFoodItem("pewter_crunchies", 64, 7, 0.343f, false)
+    @JvmField
+    val RAGE_CANDY_BAR = regionalFoodItem("rage_candy_bar", 64, 8, 0.2f, false)
+    @JvmField
+    val LAVA_COOKIE = regionalFoodItem("lava_cookie", 64, 2, 0.3f, false)
+    @JvmField
+    val OLD_GATEAU = regionalFoodItem("old_gateau", 64, 9, 0.1335f, false)
+    @JvmField
+    val CASTELIACONE = regionalFoodItem("casteliacone", 64, 5, .28f, false)
+    @JvmField
+    val LUMIOSE_GALETTE = regionalFoodItem("lumiose_galette", 64, 4, 0.4f, false)
+    @JvmField
+    val BIG_MALASADA = regionalFoodItem("big_malasada", 64, 7, 0.343f, false)
+    @JvmField
+    val SMOKED_TAIL_CURRY = regionalFoodItem("smoked_tail_curry", 64, 10, 0.6f, false, ItemStack(Items.BOWL, 1))
+    @JvmField
+    val JUBILIFE_MUFFIN = regionalFoodItem("jubilife_muffin", 64, 8, 0.2f, false)
+    @JvmField
+    val OPEN_FACED_SANDWICH = regionalFoodItem("open_faced_sandwich", 64, 13, 0.5f, false)

    // todo we might need to wait on these for later? These impact battles and may be harder to do
    /*@JvmField
@@ -433,32 +421,24 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    val TWICE_SPICED_BEETROOT = noSettingsItem("twice_spiced_beetroot") // todo make a TwiceSpiceBeetrootItem class for battle purposes
 */
    @JvmField
-    val POTATO_MOCHI = create("potato_mochi", CobblemonItem(Properties().stacksTo(16)
+    val POTATO_MOCHI = create("potato_mochi", CobblemonItem(Properties().stacksTo(64)
        .food(FoodProperties.Builder()
-            .nutrition(10) // todo get final values for this from vera
-            .saturationModifier(1.2F) // todo get final values for this from vera
-            .alwaysEdible()
+            .nutrition(4)
+            .saturationModifier(0.4F)
            .build())))
    @JvmField
-    val FRIED_RICE = create("fried_rice", CobblemonItem(Properties().stacksTo(16)
+    val CANDIED_APPLE = create("candied_apple",  CobblemonItem(Properties().stacksTo(64)
        .food(FoodProperties.Builder()
-            .nutrition(10) // todo get final values for this from vera
-            .saturationModifier(1.2F) // todo get final values for this from vera
-            .alwaysEdible()
+            .nutrition(6)
+            .saturationModifier(0.2335F)
+            .usingConvertsTo(Items.STICK)
            .build())))
    @JvmField
-    val CANDIED_APPLE = create("candied_apple",  CobblemonItem(Properties().stacksTo(16)
+    val CANDIED_BERRY = create("candied_berry",  CobblemonItem(Properties().stacksTo(64)
        .food(FoodProperties.Builder()
-            .nutrition(10) // todo get final values for this from vera
-            .saturationModifier(1.2F) // todo get final values for this from vera
-            .alwaysEdible()
-            .build())))
-    @JvmField
-    val CANDIED_BERRY = create("candied_berry",  CobblemonItem(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10) // todo get final values for this from vera
-            .saturationModifier(1.2F) // todo get final values for this from vera
-            .alwaysEdible()
+            .nutrition(5)
+            .saturationModifier(0.22F)
+            .usingConvertsTo(Items.STICK)
            .build())))

    //@JvmField
@@ -480,8 +460,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    val PASTURE = blockItem("pasture", CobblemonBlocks.PASTURE)
    @JvmField
    val DISPLAY_CASE = blockItem("display_case", CobblemonBlocks.DISPLAY_CASE)
-    @JvmField
-    val INCENSE_SWEET = blockItem("incense_sweet", CobblemonBlocks.INCENSE_SWEET)
+//    @JvmField
+//    val INCENSE_SWEET = blockItem("incense_sweet", CobblemonBlocks.INCENSE_SWEET) // TODO after 1.7


    // Evolution items
@@ -685,14 +665,12 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val MEDICINAL_LEEK = heldItem("medicinal_leek", MedicinalLeekItem(CobblemonBlocks.MEDICINAL_LEEK, Item.Properties().food(FoodProperties.Builder().fast().nutrition(1).saturationModifier(0.2f).build())), "leek")
    @JvmField
-    val ROASTED_LEEK = compostableItem("roasted_leek", CobblemonItem(Item.Properties().food(FoodProperties.Builder().fast().nutrition(3).saturationModifier(0.3f).build())), 0.85f)
-    @JvmField
-    val BRAISED_VIVICHOKE = compostableItem("braised_vivichoke", foodItem(6, 0.6F), 0.85f)
+    val ROASTED_LEEK = compostableItem("roasted_leek", CobblemonItem(Item.Properties().food(FoodProperties.Builder().fast().nutrition(3).saturationModifier(0.2f).build())), 0.85f)
    @JvmField
    val VIVICHOKE_DIP = create("vivichoke_dip", object : CobblemonItem(Properties().stacksTo(1)
        .food(FoodProperties.Builder()
            .nutrition(10)
-            .saturationModifier(1.2F)
+            .saturationModifier(0.6F)
            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
            .alwaysEdible()
            .usingConvertsTo(Items.BOWL)
@@ -703,7 +681,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
        }
    })
    @JvmField
-    val ENERGY_ROOT = compostableItem("energy_root", EnergyRootItem(CobblemonBlocks.ENERGY_ROOT, Item.Properties().food(FoodProperties.Builder().nutrition(1).fast().saturationModifier(0.2f).build())), 0.60f)
+    val ENERGY_ROOT = compostableItem("energy_root", EnergyRootItem(CobblemonBlocks.ENERGY_ROOT, Properties()), 0.60f)
    @JvmField
    val REVIVAL_HERB = compostableItem("revival_herb", RevivalHerbItem(CobblemonBlocks.REVIVAL_HERB))
    @JvmField
@@ -717,7 +695,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val SUPERB_REMEDY = compostableItem("superb_remedy", RemedyItem(RemedyItem.SUPERB), 0.85f)
    @JvmField
-    val MOOMOO_MILK = noSettingsItem("moomoo_milk")
+    val MOOMOO_MILK = create("moomoo_milk", CobblemonItem(Item.Properties().craftRemainder(Items.GLASS_BOTTLE)))

    @JvmField
    val POTION = create("potion", PotionItem(PotionType.POTION))
@@ -733,7 +711,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val HEAL_POWDER = create("heal_powder", HealPowderItem())
    @JvmField
-    val LEEK_AND_POTATO_STEW = create("leek_and_potato_stew", CobblemonItem(Item.Properties().food(FoodProperties.Builder().nutrition(8).saturationModifier(0.6f).usingConvertsTo(Items.BOWL).build()).stacksTo(1)))
+    val LEEK_AND_POTATO_STEW = create("leek_and_potato_stew", CobblemonItem(Item.Properties().food(FoodProperties.Builder().nutrition(6).saturationModifier(0.6f).usingConvertsTo(Items.BOWL).build()).stacksTo(1)))
    @JvmField
    val REVIVE = create("revive", ReviveItem(max = false))
    @JvmField
@@ -1544,8 +1522,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
        stacksTo: Int,
        nutrition: Int,
        saturationModifier: Float,
-        effect: MobEffectInstance? = null,
-        effectChance: Float? = null,
        alwaysEdible: Boolean = false,
        convertsToOnUse: ItemStack? = null
    ): RegionalFoodItem {
@@ -1553,10 +1529,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
            .nutrition(nutrition)
            .saturationModifier(saturationModifier)

-        if (effect != null && effectChance != null) {
-            foodPropertiesBuilder.effect(effect, effectChance)
-        }
-
        if (alwaysEdible == true) {
            foodPropertiesBuilder.alwaysEdible()
        }
@@ -8,6 +8,8 @@

 package com.cobblemon.mod.common

+import com.cobblemon.mod.common.api.ai.CobblemonAttackTargetData
+import com.cobblemon.mod.common.api.ai.CobblemonWanderControl
 import com.cobblemon.mod.common.api.dialogue.ActiveDialogue
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
 import com.mojang.serialization.Codec
@@ -42,10 +44,16 @@ object CobblemonMemories {
    val NEAREST_VISIBLE_ATTACKER = register<LivingEntity>("nearest_visible_attacker")
    val NEARBY_GROWABLE_CROPS = register<BlockPos>("nearby_growable_crops")
    val RECENTLY_ATE_GRASS = register<Boolean>("recently_ate_grass")
+    val HIVE_LOCATION = register<BlockPos>("hive_location")
+    val HIVE_COOLDOWN = register<Boolean>("hive_cooldown")
+    val NEARBY_FLOWERS = register<List<BlockPos>>("nearby_flower")
+    val POLLINATED = register<Boolean>("pollinated", PrimitiveCodec.BOOL)
    /** who am i following rn? */
    val HERD_LEADER = register<String>("herd_leader", PrimitiveCodec.STRING)
    /** how many are following me rn? */
    val HERD_SIZE = register<Int>("herd_size") // Don't bother saving it, we'll try to keep count roughly.
+    val ATTACK_TARGET_DATA = register<CobblemonAttackTargetData>("attack_target_data") // This is used to store additional information about the attack target, such as when to give up pursuit.
+    val WANDER_CONTROL = register<CobblemonWanderControl>("wander_control")

    fun <U> register(id: String, codec: Codec<U>): MemoryModuleType<U> {
        val memoryModule = MemoryModuleType(Optional.of(codec))
@@ -23,7 +23,9 @@ import com.cobblemon.mod.common.client.net.data.DataRegistrySyncPacketHandler
 import com.cobblemon.mod.common.client.net.data.UnlockReloadPacketHandler
 import com.cobblemon.mod.common.client.net.dialogue.DialogueClosedHandler
 import com.cobblemon.mod.common.client.net.dialogue.DialogueOpenedHandler
+import com.cobblemon.mod.common.client.net.effect.PokeSnackBlockParticlesHandler
 import com.cobblemon.mod.common.client.net.effect.RunPosableMoLangHandler
+import com.cobblemon.mod.common.client.net.effect.SaccharineLogBlockParticlesHandler
 import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormEntityParticleHandler
 import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormParticleHandler
 import com.cobblemon.mod.common.client.net.gui.InteractPokemonUIPacketHandler
@@ -36,9 +38,11 @@ import com.cobblemon.mod.common.client.net.pasture.ClosePastureHandler
 import com.cobblemon.mod.common.client.net.pasture.OpenPastureHandler
 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.ClientboundUpdateRidingStateHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.PokemonUpdatePacketHandler
+import com.cobblemon.mod.common.client.net.riding.ClientboundUpdateDriverInputHandler
 import com.cobblemon.mod.common.client.net.settings.OpenCobblemonConfigEditorHandler
 import com.cobblemon.mod.common.client.net.settings.ServerSettingsPacketHandler
 import com.cobblemon.mod.common.client.net.sound.UnvalidatedPlaySoundS2CPacketHandler
@@ -75,16 +79,20 @@ import com.cobblemon.mod.common.net.messages.client.cooking.ToggleCookingPotLidP
 import com.cobblemon.mod.common.net.messages.client.data.*
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueClosedPacket
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueOpenedPacket
+import com.cobblemon.mod.common.net.messages.client.effect.PokeSnackBlockParticlesPacket
 import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
+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.npc.CloseNPCEditorPacket
 import com.cobblemon.mod.common.net.messages.client.npc.OpenNPCEditorPacket
+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.pasture.ClosePasturePacket
 import com.cobblemon.mod.common.net.messages.client.pasture.OpenPasturePacket
 import com.cobblemon.mod.common.net.messages.client.pasture.PokemonPasturedPacket
 import com.cobblemon.mod.common.net.messages.client.pasture.PokemonUnpasturedPacket
+import com.cobblemon.mod.common.net.messages.client.pasture.UpdatePastureConflictFlagPacket
 import com.cobblemon.mod.common.net.messages.client.pokedex.ServerConfirmedRegisterPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.*
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.AddEvolutionPacket
@@ -140,6 +148,7 @@ import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamRequestPack
 import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamResponsePacket
 import com.cobblemon.mod.common.net.messages.server.battle.RemoveSpectatorPacket
 import com.cobblemon.mod.common.net.messages.server.battle.SpectateBattlePacket
+import com.cobblemon.mod.common.net.messages.server.behaviour.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.callback.move.MoveSelectCancelledPacket
@@ -155,6 +164,7 @@ import com.cobblemon.mod.common.net.messages.server.dialogue.InputToDialoguePack
 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
+import com.cobblemon.mod.common.net.messages.server.pasture.SetPastureConflictPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.UnpastureAllPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.UnpasturePokemonPacket
 import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.FinishScanningPacket
@@ -166,6 +176,8 @@ import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetActiveMark
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetMarkingsPacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.ServerboundUpdateRidingStatePacket
 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.starter.RequestStarterScreenPacket
 import com.cobblemon.mod.common.net.messages.server.storage.SwapPCPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.MovePartyPokemonPacket
@@ -187,6 +199,7 @@ import com.cobblemon.mod.common.net.serverhandling.battle.SpectateBattleHandler
 import com.cobblemon.mod.common.net.serverhandling.battle.TeamLeaveHandler
 import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestHandler
 import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestResponseHandler
+import com.cobblemon.mod.common.net.serverhandling.behaviour.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.callback.move.MoveSelectCancelledHandler
@@ -203,6 +216,7 @@ import com.cobblemon.mod.common.net.serverhandling.evolution.AcceptEvolutionHand
 import com.cobblemon.mod.common.net.serverhandling.npc.SaveNPCHandler
 import com.cobblemon.mod.common.net.serverhandling.orientation.OrientationPacketHandler
 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
 import com.cobblemon.mod.common.net.serverhandling.pasture.UnpasturePokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.pokedex.scanner.FinishScanningHandler
@@ -213,6 +227,8 @@ import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetNicknameHan
 import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetActiveMarkHandler
 import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetMarkingsHandler
 import com.cobblemon.mod.common.net.serverhandling.pokemon.update.ServerboundUpdateRidingStateHandler
+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.starter.RequestStarterScreenHandler
 import com.cobblemon.mod.common.net.serverhandling.starter.SelectStarterPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.BenchMoveHandler
@@ -394,6 +410,8 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler))
        list.add(PacketRegisterInfo(SpawnSnowstormEntityParticlePacket.ID, SpawnSnowstormEntityParticlePacket::decode, SpawnSnowstormEntityParticleHandler))
        list.add(PacketRegisterInfo(RunPosableMoLangPacket.ID, RunPosableMoLangPacket::decode, RunPosableMoLangHandler))
+        list.add(PacketRegisterInfo(SaccharineLogBlockParticlesPacket.ID, SaccharineLogBlockParticlesPacket::decode, SaccharineLogBlockParticlesHandler))
+        list.add(PacketRegisterInfo(PokeSnackBlockParticlesPacket.ID, PokeSnackBlockParticlesPacket::decode, PokeSnackBlockParticlesHandler))

        // Hax
        list.add(PacketRegisterInfo(UnvalidatedPlaySoundS2CPacket.ID, UnvalidatedPlaySoundS2CPacket::decode, UnvalidatedPlaySoundS2CPacketHandler))
@@ -418,6 +436,7 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(ClosePasturePacket.ID, ClosePasturePacket::decode, ClosePastureHandler))
        list.add(PacketRegisterInfo(PokemonPasturedPacket.ID, PokemonPasturedPacket::decode, PokemonPasturedHandler))
        list.add(PacketRegisterInfo(PokemonUnpasturedPacket.ID, PokemonUnpasturedPacket::decode, PokemonUnpasturedHandler))
+        list.add(PacketRegisterInfo(UpdatePastureConflictFlagPacket.ID, UpdatePastureConflictFlagPacket::decode, UpdatePastureConflictFlagHandler))

        // Orientation
        list.add(PacketRegisterInfo(ClientboundUpdateOrientationPacket.ID, ClientboundUpdateOrientationPacket::decode, S2CUpdateOrientationHandler))
@@ -453,6 +472,7 @@ object CobblemonNetwork {

        // Riding
        list.add(PacketRegisterInfo(ClientboundUpdateRidingStatePacket.ID, ClientboundUpdateRidingStatePacket::decode, ClientboundUpdateRidingStateHandler))
+        list.add(PacketRegisterInfo(ClientboundUpdateDriverInputPacket.ID, ClientboundUpdateDriverInputPacket::decode, ClientboundUpdateDriverInputHandler))

        return list
    }
@@ -528,6 +548,8 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(PasturePokemonPacket.ID, PasturePokemonPacket::decode, PasturePokemonHandler))
        list.add(PacketRegisterInfo(UnpasturePokemonPacket.ID, UnpasturePokemonPacket::decode, UnpasturePokemonHandler))
        list.add(PacketRegisterInfo(UnpastureAllPokemonPacket.ID, UnpastureAllPokemonPacket::decode, UnpastureAllPokemonHandler))
+        list.add(PacketRegisterInfo(SetPastureConflictPacket.ID, SetPastureConflictPacket::decode, SetPastureConflictHandler))
+

        // Block entity
        list.add(PacketRegisterInfo(AdjustBlockEntityViewerCountPacket.ID, AdjustBlockEntityViewerCountPacket::decode, AdjustBlockEntityViewerCountHandler))
@@ -556,12 +578,15 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(ServerboundUpdateRidingStatePacket.ID, ServerboundUpdateRidingStatePacket::decode, ServerboundUpdateRidingStateHandler))
        list.add(PacketRegisterInfo(ServerboundUpdateRidingStatsPacket.ID, ServerboundUpdateRidingStatsPacket::decode, ServerboundUpdateRidingStatsHandler))
        list.add(PacketRegisterInfo(ServerboundUpdateRidingStatRangePacket.ID, ServerboundUpdateRidingStatRangePacket::decode, ServerboundUpdateRidingStatRangeHandler))
+        list.add(PacketRegisterInfo(DismountPokemonPacket.ID, DismountPokemonPacket::decode, DismountPokemonPacketHandler))
+        list.add(PacketRegisterInfo(ServerboundUpdateDriverInputPacket.ID, ServerboundUpdateDriverInputPacket::decode, DriverInputPacketHandler))

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

        // Behaviour Packets
        list.add(PacketRegisterInfo(SetEntityBehaviourPacket.ID, SetEntityBehaviourPacket::decode, SetEntityBehaviourHandler))
+        list.add(PacketRegisterInfo(DamageOnCollisionPacket.ID, DamageOnCollisionPacket::decode, DamageOnCollisionPacketHandler))

        return list
    }
@@ -24,23 +24,19 @@ object CobblemonPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Regist
    override val resourceKey: ResourceKey<Registry<PoiType>> = Registries.POINT_OF_INTEREST_TYPE

    @JvmField
-    val NURSE_KEY: ResourceKey<PoiType> = createKey("nurse")
+    val NURSE_KEY = createKey("nurse", CobblemonBlocks.HEALING_MACHINE, 1, 1)
    @JvmField
-    val NURSE = create(NURSE_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.HEALING_MACHINE), 1, 1))
+    val POKE_SNACK_KEY = createKey("poke_snack", CobblemonBlocks.POKE_SNACK, 0, 1)
    @JvmField
-    val LURE_CAKE_KEY: ResourceKey<PoiType> = createKey("lure_cake")
-    @JvmField
-    val LURE_CAKE = create(LURE_CAKE_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.LURE_CAKE), 0, 1))
-    @JvmField
-    val SACCHARINE_HONEY_LOG_KEY: ResourceKey<PoiType> = createKey("saccharine_honey_log")
-    @JvmField
-    val SACCHARINE_HONEY_LOG = create(SACCHARINE_HONEY_LOG_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.SACCHARINE_HONEY_LOG), 0, 1))
-    @JvmField
-    val INCENSE_SWEET_KEY: ResourceKey<PoiType> = createKey("incense_sweet")
-    @JvmField
-    val INCENSE_SWEET = create(INCENSE_SWEET_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.INCENSE_SWEET), 0, 1))
+    val SACCHARINE_LOG_SLATHERED_KEY = createKey("saccharine_log_slathered", CobblemonBlocks.SACCHARINE_LOG_SLATHERED, 0, 1)
+    // TODO after 1.7
+//    @JvmField
+//    val INCENSE_SWEET_KEY = createKey("incense_sweet", CobblemonBlocks.INCENSE_SWEET, 0, 1)

-    private fun createKey(string: String): ResourceKey<PoiType> = ResourceKey.create(Registries.POINT_OF_INTEREST_TYPE, cobblemonResource(string))
+    private fun createKey(string: String, block: Block, maxTickets: Int, validRange: Int ): ResourceKey<PoiType> =
+        ResourceKey.create(Registries.POINT_OF_INTEREST_TYPE, cobblemonResource(string)).also { resourceKey ->
+            create(resourceKey.location().path, PoiType(getBlockStates(block), maxTickets, validRange))
+        }

    private fun getBlockStates(block: Block): Set<BlockState> = ImmutableSet.copyOf(block.stateDefinition.possibleStates)
-}
+}
@@ -8,10 +8,7 @@

 package com.cobblemon.mod.common

-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.DefendOwnerSensor
-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.DrowsySensor
-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.PokemonAdultSensor
-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.PokemonGrowableCropSensor
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.*
 import com.cobblemon.mod.common.pokemon.ai.PokemonDisturbancesSensor
 import com.cobblemon.mod.common.entity.sensor.BattlingPokemonSensor
 import com.cobblemon.mod.common.entity.sensor.NPCBattlingSensor
@@ -36,6 +33,10 @@ object CobblemonSensors {

    val NEARBY_GROWABLE_CROPS = register("nearby_growable_crops", ::PokemonGrowableCropSensor)

+    val NEARBY_BEE_HIVE = register("nearby_bee_hive", ::BeeHiveSensor)
+
+    val NEARBY_FLOWER = register("nearby_flower", ::FlowerSensor)
+
    fun <E : Entity, U : Sensor<E>> register(id: String, supplier: Supplier<U>): SensorType<U> {
        val sensor = SensorType(supplier)
        sensors[id] = sensor
@@ -204,6 +204,19 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
    @JvmField
    val EVOLUTION_STONE_BLOCK_STEP = this.create("block.evolution_stone_block.step")

+    @JvmField
+    val TATAMI_BLOCK_BREAK = this.create("block.tatami.break")
+    @JvmField
+    val TATAMI_BLOCK_HIT = this.create("block.tatami.hit")
+    @JvmField
+    val TATAMI_BLOCK_PLACE = this.create("block.tatami.place")
+    @JvmField
+    val TATAMI_BLOCK_STEP = this.create("block.tatami.step")
+    @JvmField
+    val TATAMI_MAT_BREAK = this.create("block.tatami_mat.break")
+    @JvmField
+    val TATAMI_MAT_PLACE = this.create("block.tatami_mat.place")
+
    @JvmField
    val GIMMIGHOUL_GIVE_ITEM = this.create("pokemon.gimmighoul.give_item")
    @JvmField
@@ -230,6 +243,24 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
    @JvmField
    val VIVICHOKE_PLACE = this.create("block.vivichoke.place")

+    @JvmField
+    val HEARTY_GRAIN_BALE_BREAK = this.create("block.hearty_grain_bale.break")
+    @JvmField
+    val HEARTY_GRAIN_BALE_PLACE = this.create("block.hearty_grain_bale.place")
+    @JvmField
+    val HEARTY_GRAIN_BALE_HIT = this.create("block.hearty_grain_bale.hit")
+    @JvmField
+    val HEARTY_GRAIN_BALE_STEP = this.create("block.hearty_grain_bale.step")
+
+    @JvmField
+    val HEARTY_GRAINS_BREAK = this.create("block.hearty_grains.break")
+    @JvmField
+    val HEARTY_GRAINS_PLACE = this.create("block.hearty_grains.place")
+    @JvmField
+    val HEARTY_GRAINS_BREAK_WATER = this.create("block.hearty_grains.break_water")
+    @JvmField
+    val HEARTY_GRAINS_PLACE_WATER = this.create("block.hearty_grains.place_water")
+
    @JvmField
    val MINT_BREAK = this.create("block.mint.break")
    @JvmField
@@ -275,6 +306,11 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
        RELIC_COIN_SACK_STEP
    )

+    @JvmField
+    val RIDE_LOOP_LEATHER = create("ride.loop.leather")
+    @JvmField
+    val RIDE_LOOP_PLUMAGE = create("ride.loop.plumage")
+
    @JvmField
    val MOVE_QUICKATTACK_TARGET = this.create("move.quickattack.target")
    @JvmField
@@ -319,6 +355,8 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
    @JvmField
    val IMPACT_WATER = this.create("impact.water")

+    // Note to self or whoever's peeking, block sounds have to be at 1.1f pitch
+    // For some reason, the game pitches them down and compensating for it here returns them to normal
    @JvmField
    val TUMBLESTONE_SOUNDS = SoundType(1f, 1.1f,
        TUMBLESTONE_BREAK,
@@ -336,6 +374,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
        TUMBLESTONE_HIT,
        TUMBLESTONE_STEP
    )
+
    @JvmField
    val EVOLUTION_STONE_BLOCK_SOUNDS = SoundType(1f, 1.1f,
        EVOLUTION_STONE_BLOCK_BREAK,
@@ -345,6 +384,23 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
        EVOLUTION_STONE_BLOCK_STEP
    )

+    @JvmField
+    val TATAMI_BLOCK_SOUNDS = SoundType(1f, 1.1f,
+        TATAMI_BLOCK_BREAK,
+        TATAMI_BLOCK_STEP,
+        TATAMI_BLOCK_PLACE,
+        TATAMI_BLOCK_HIT,
+        TATAMI_BLOCK_STEP
+    )
+
+    @JvmField
+    val TATAMI_MAT_SOUNDS = SoundType(1f, 1.1f,
+        TATAMI_MAT_BREAK,
+        TATAMI_BLOCK_STEP,
+        TATAMI_MAT_PLACE,
+        TATAMI_BLOCK_HIT,
+        TATAMI_BLOCK_STEP
+    )

    @JvmField
    val BERRY_BUSH_SOUNDS = SoundType(0.8f, 1.1f,
@@ -391,6 +447,33 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
        SoundEvents.GRASS_FALL
    )

+    @JvmField
+    val HEARTY_GRAIN_BALE_SOUNDS = SoundType(0.6f, 1.1f,
+        HEARTY_GRAIN_BALE_BREAK,
+        HEARTY_GRAIN_BALE_STEP,
+        HEARTY_GRAIN_BALE_PLACE,
+        HEARTY_GRAIN_BALE_HIT,
+        HEARTY_GRAIN_BALE_STEP
+    )
+
+    @JvmField
+    val HEARTY_GRAINS_SOUNDS = SoundType(0.6f, 1.1f,
+        HEARTY_GRAINS_BREAK,
+        HEARTY_GRAIN_BALE_STEP,
+        HEARTY_GRAINS_PLACE,
+        HEARTY_GRAIN_BALE_HIT,
+        HEARTY_GRAIN_BALE_STEP
+    )
+
+    @JvmField
+    val HEARTY_GRAINS_WATER_SOUNDS = SoundType(0.6f, 1.1f,
+        HEARTY_GRAINS_BREAK_WATER,
+        SoundEvents.GRASS_STEP,
+        HEARTY_GRAINS_PLACE_WATER,
+        SoundEvents.GRASS_HIT,
+        SoundEvents.GRASS_FALL
+    )
+
    @JvmField
    val MINT_SOUNDS = SoundType(0.6f, 1.1f,
        MINT_BREAK,
@@ -430,7 +513,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
    val DISPLAY_CASE_PLACE = this.create("block.display_case.place")
    @JvmField
    val DISPLAY_CASE_STEP = this.create("block.display_case.step")
-
    @JvmField
    val DISPLAY_CASE_SOUNDS = SoundType(1f, 1f,
        DISPLAY_CASE_BREAK,
@@ -441,7 +523,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
    )

    @JvmField
-    val CAMPFIRE_POT_PLACE_CAMPFIRE = this.create("block.campfire_pot.place_campfire")
+    val CAMPFIRE_POT_SET = this.create("block.campfire_pot.set")
    @JvmField
    val CAMPFIRE_POT_RETRIEVE = this.create("block.campfire_pot.retrieve")
    @JvmField
@@ -449,12 +531,14 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
    @JvmField
    val CAMPFIRE_POT_CLOSE = this.create("block.campfire_pot.close")
    @JvmField
-    val CAMPFIRE_POT_USE = this.create("block.campfire_pot.use")
+    val CAMPFIRE_POT_TAKE_ITEM = this.create("block.campfire_pot.take_item")
+    @JvmField
+    val CAMPFIRE_POT_ACTIVE = this.create("block.campfire_pot.active")
+    @JvmField
+    val CAMPFIRE_POT_AMBIENT = this.create("block.campfire_pot.ambient")
    @JvmField
    val CAMPFIRE_POT_COOK = this.create("block.campfire_pot.cook")
    @JvmField
-    val CAMPFIRE_POT_CRAFT = this.create("block.campfire_pot.craft")
-    @JvmField
    val CAMPFIRE_POT_PLACE = this.create("block.campfire_pot.place")
    @JvmField
    val CAMPFIRE_POT_BREAK = this.create("block.campfire_pot.break")
@@ -15,9 +15,12 @@ import com.cobblemon.mod.common.battles.runner.ShowdownService
 import com.cobblemon.mod.common.net.messages.client.data.AbilityRegistrySyncPacket
 import com.cobblemon.mod.common.pokemon.abilities.HiddenAbilityType
 import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.server.packs.resources.ResourceManager
+import java.io.File
+import kotlin.collections.set

 /**
 * Registry for all known Abilities
@@ -31,15 +34,31 @@ object Abilities : DataRegistry {
    val DUMMY = AbilityTemplate(name = "dummy")

    private val abilityMap = mutableMapOf<String, AbilityTemplate>()
+    internal val abilityScripts = mutableMapOf<String, String>() // abilityId to JavaScript

    override fun reload(manager: ResourceManager) {
        PotentialAbility.types.clear()
        PotentialAbility.types.add(CommonAbilityType)
        PotentialAbility.types.add(HiddenAbilityType)
        this.abilityMap.clear()
-        val abilitiesJson = ShowdownService.service.getAbilityIds()
+        this.abilityScripts.clear()
+
+        ShowdownService.service.resetRegistryData("ability")
+        manager.listResources("abilities") { it.path.endsWith(".js") }.forEach { (identifier, resource) ->
+            resource.open().use { stream ->
+                stream.bufferedReader().use { reader ->
+                    val resolvedIdentifier = ResourceLocation.fromNamespaceAndPath(identifier.namespace, File(identifier.path).nameWithoutExtension)
+                    val js = reader.readText()
+                    abilityScripts[resolvedIdentifier.path] = js
+                }
+            }
+        }
+        ShowdownService.service.sendRegistryData(abilityScripts, "ability")
+
+        val abilitiesJson = ShowdownService.service.getRegistryData("ability")
        for (i in 0 until abilitiesJson.size()) {
-            val id = abilitiesJson[i].asString
+            val jsonAbility = abilitiesJson[i].asJsonObject
+            val id = jsonAbility.get("id").asString
            val ability = AbilityTemplate(id)
            this.register(ability)
        }
@@ -8,10 +8,20 @@

 package com.cobblemon.mod.common.api.ai

+import com.bedrockk.molang.runtime.MoLangRuntime
 import com.cobblemon.mod.common.api.ai.config.BehaviourConfig
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
+import com.cobblemon.mod.common.api.scripting.CobblemonScripts
 import com.cobblemon.mod.common.entity.MoLangScriptingEntity
+import com.cobblemon.mod.common.util.resolve
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.serialization.Dynamic
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType
 import net.minecraft.world.entity.schedule.Activity
 import net.minecraft.world.entity.schedule.Schedule

@@ -22,13 +32,41 @@ class BehaviourConfigurationContext {
    var coreActivities = setOf(Activity.CORE)
    val activities = mutableListOf<ActivityConfigurationContext>()
    val schedule = Schedule.EMPTY
+    val memories = mutableSetOf<MemoryModuleType<*>>()
+    val sensors = mutableSetOf<SensorType<*>>()
+
+    val onAddScripts = mutableListOf<ResourceLocation>()
+    val onAdd = mutableListOf<ExpressionLike>()

    fun getOrCreateActivity(activity: Activity): ActivityConfigurationContext {
        return activities.firstOrNull { it.activity == activity } ?: ActivityConfigurationContext(activity).also(activities::add)
    }

-    fun apply(entity: LivingEntity, behaviourConfigs: List<BehaviourConfig>) {
-        val brain = entity.brain
+    fun addMemories(vararg memory: MemoryModuleType<*>) {
+        memories.addAll(memory)
+    }
+
+    fun addMemories(memories: Collection<MemoryModuleType<*>>) {
+        this.memories.addAll(memories)
+    }
+
+    fun addSensors(vararg sensor: SensorType<*>) {
+        sensors.addAll(sensor)
+    }
+
+    fun addSensors(sensors: Collection<SensorType<*>>) {
+        this.sensors.addAll(sensors)
+    }
+
+    fun addOnAddScript(script: ResourceLocation) {
+        onAddScripts.add(script)
+    }
+
+    fun addOnAddScript(script: ExpressionLike) {
+        onAdd.add(script)
+    }
+
+    fun apply(entity: LivingEntity, behaviourConfigs: List<BehaviourConfig>, dynamic: Dynamic<*>) {

        if (entity is MoLangScriptingEntity) {
            entity.registerVariables(behaviourConfigs.flatMap { it.getVariables(entity) })
@@ -38,7 +76,16 @@ class BehaviourConfigurationContext {
        // Setup the brain config
        behaviourConfigs.forEach { it.configure(entity, this) }

+        var brain = entity.brain
        // Apply the brain config
+        if (entity is MoLangScriptingEntity) {
+            brain = entity.assignNewBrainWithMemoriesAndSensors(dynamic, memories, sensors)
+
+            val runtime = MoLangRuntime().setup()
+            runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+            onAddScripts.forEach { CobblemonScripts.run(it, runtime) }
+            onAdd.forEach { runtime.resolve(it) }
+        }
        activities.forEach { it.apply(entity) }
        brain.setCoreActivities(coreActivities)
        brain.setDefaultActivity(defaultActivity)
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai
+
+import com.bedrockk.molang.Expression
+import com.bedrockk.molang.runtime.MoLangRuntime
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
+import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.api.scripting.CobblemonScripts
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.resolve
+import net.minecraft.world.entity.Entity
+
+/**
+ * This is used in the AI system to store optional additional information about the attack target,
+ * mainly things like when to give up pursuit, what sort of attacks are permitted, whatever. It's
+ * a temporary memory, same as ATTACK_TARGET, so relogs will clear it and that's why it has no codec.
+ *
+ * To help you get a sense of a use case, imagine a Pidgeotto has an AI task that says it should hunt
+ * Magikarp that are close to the surface. Once they've found one and chosen them as the attack target,
+ * they should give up the target if the Magikarp goes too deep, but if it's attacking an entity because
+ * they attacked its owner, it shouldn't give up on the target for that reason. To address this, when
+ * hunting Magikarp, the Pidgeotto will set this memory to a CobblemonAttackTargetData with some
+ * [Expression] that encourages the entity to give up the target if the Magikarp goes too deep.
+ *
+ * To make this work, any transition from the FIGHT activity will erase this memory.
+ *
+ * @author Hiroku
+ * @since June 23rd, 2025
+ */
+class CobblemonAttackTargetData(
+    /** An expression that returns false when the target is no longer worth attacking. */
+    var shouldContinue: Expression = "true".asExpression(),
+    var hitsUntilDisengage: Int = -1, // -1 means no limit
+    var disengageAction: (entity: Entity) -> Unit = {}
+) {
+    val struct = ObjectValue<CobblemonAttackTargetData>(this).also {
+        it.addFunction("hits_until_disengage") { DoubleValue(hitsUntilDisengage.toDouble()) }
+        it.addFunction("set_hits_until_disengage") { params ->
+            val value = params.getDouble(0)
+            hitsUntilDisengage = value.toInt()
+            DoubleValue(hitsUntilDisengage.toDouble())
+        }
+        it.addFunction("set_disengage_action") { params ->
+            val script = params.getString(0).asIdentifierDefaultingNamespace()
+            val function = CobblemonScripts.scripts[script] ?: run {
+                Cobblemon.LOGGER.warn("set_disengage_action was given script '$script' which does not exist.")
+                return@addFunction DoubleValue.ZERO
+            }
+            disengageAction = { entity ->
+                val runtime = MoLangRuntime().setup()
+                runtime.environment.query.addFunction("entity") { entity.asMostSpecificMoLangValue() }
+                runtime.resolve(function)
+            }
+            DoubleValue.ONE
+        }
+        it.addFunction("unset_disengage_action") { params ->
+            disengageAction = {}
+        }
+    }
+}
@@ -17,6 +17,7 @@ import com.cobblemon.mod.common.api.scripting.CobblemonScripts
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.resolve
 import com.cobblemon.mod.common.util.withQueryValue
+import com.google.gson.annotations.SerializedName
 import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity
@@ -28,23 +29,35 @@ class CobblemonBehaviour(
    val visible: Boolean = true,
    val entityType: ResourceLocation? = null,
    val configurations: List<BehaviourConfig> = mutableListOf(),
-    val undo: ExpressionLike? = null,
-    val undoScript: ResourceLocation? = null,
+    // I feel like the onAdd+onAddScript etc could be merged using some interface and a clever deserializer,
+    // detect if it's a ResourceLocation and failing that, Expression. The on[..]Script fields are kinda fringe though.
+    @SerializedName("onRemove", alternate = ["undo"])
+    val onRemove: ExpressionLike? = null,
+    @SerializedName("onRemoveScript", alternate = ["undoScript"])
+    val onRemoveScript: ResourceLocation? = null,
+    val onAdd: ExpressionLike? = null,
+    val onAddScript: ResourceLocation? = null,
 ) {
    fun canBeApplied(entity: LivingEntity) = entityType?.let { entityType == entity.type.builtInRegistryHolder().unwrapKey().get().location() } != false
    fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) {
+        if (onAdd != null) {
+            behaviourConfigurationContext.addOnAddScript(onAdd)
+        }
+        if (onAddScript != null) {
+            behaviourConfigurationContext.addOnAddScript(onAddScript)
+        }
        configurations.forEach { it.configure(entity, behaviourConfigurationContext) }
    }

    /** Undoes anything that needs undoing once this configuration is being removed from an entity that had it before. */
-    fun undo(entity: LivingEntity) {
+    fun onRemove(entity: LivingEntity) {
        val runtime = MoLangRuntime().setup()
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (undoScript != null) {
-            CobblemonScripts.run(undoScript, runtime)
+        if (onRemoveScript != null) {
+            CobblemonScripts.run(onRemoveScript, runtime)
        }
-        if (undo != null) {
-            runtime.resolve(undo)
+        if (onRemove != null) {
+            runtime.resolve(onRemove)
        }
    }
 }
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai
+
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.phys.Vec3
+
+/**
+ * Wraps around [BlockPosTracker] to add additional flags for Cobblemon-specific behavior.
+ *
+ * @author Hiroku
+ * @since August 4th, 2025
+ */
+class CobblemonBlockPosTracker(
+    pos: Vec3,
+    val flags: Set<String> = emptySet(),
+) : BlockPosTracker(pos) {
+    companion object {
+        const val BATTLE_LOOK_BYPASS_FLAG = "battle_look_bypass"
+    }
+
+    fun isBattleLookBypass() = flags.contains(BATTLE_LOOK_BYPASS_FLAG)
+}
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai
+
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.util.getBooleanOrNull
+import com.cobblemon.mod.common.util.getDoubleOrNull
+import kotlin.math.sqrt
+import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.PathfinderMob
+
+/**
+ * Used to maintain some settings around how the entity should wander this tick. The idea is you
+ * reset this with some script task at priority 0 then some number of steps before it gets to the wander
+ * tasks you can have other conditional tasks jump in to configure parts of this.
+ *
+ * @author Hiroku
+ * @since July 18, 2025
+ */
+class CobblemonWanderControl(
+    var center: WanderCenter? = null,
+    var maxAttempts: Int = 4, // How many times to try to find a suitable point before giving up on that tick.
+    var allowLand: Boolean = true,
+    var allowWater: Boolean = false,
+    var allowAir: Boolean = false,
+    var pathCooldownTicks: Int = 20 * 5, // Used to mitigate the cost of pathfinding.
+    var wanderSpeed: Float = 0.35F,
+) {
+    class WanderCenter(val x: Number, val y: Number, val z: Number, val minRange: Float, val maxRange: Float)
+
+    @Transient
+    val struct: QueryStruct = QueryStruct(hashMapOf())
+        .addFunction("center_x") { center?.x ?: 0.0 }
+        .addFunction("center_y") { center?.y ?: 0.0 }
+        .addFunction("center_z") { center?.z ?: 0.0 }
+        .addFunction("max_attempts") { maxAttempts.toDouble() }
+        .addFunction("min_range") { center?.minRange ?: 0.0 }
+        .addFunction("max_range") { center?.maxRange ?: 0.0 }
+        .addFunction("allow_land") { if (allowLand) 1.0 else 0.0 }
+        .addFunction("allow_water") { if (allowWater) 1.0 else 0.0 }
+        .addFunction("allow_air") { if (allowAir) 1.0 else 0.0 }
+        .addFunction("path_cooldown_ticks") { pathCooldownTicks.toDouble() }
+        .addFunction("wander_speed") { wanderSpeed }
+        .addFunction("set_center") { params ->
+            if (params.params.size < 3) {
+                throw IllegalArgumentException("set_center requires at least 3 parameters: x, y, z")
+            }
+            val x = params.getDouble(0)
+            val y = params.getDouble(1)
+            val z = params.getDouble(2)
+            val minRange = params.getDoubleOrNull(3) ?: 0.0
+            val maxRange = params.getDoubleOrNull(4) ?: Float.MAX_VALUE.toDouble()
+            center = WanderCenter(
+                x = x,
+                y = y,
+                z = z,
+                minRange = minRange.toFloat(),
+                maxRange = maxRange.toFloat(),
+            )
+        }
+        .addFunction("set_max_attempts") { params -> maxAttempts = params.getDoubleOrNull(0)?.toInt() ?: 4 }
+        .addFunction("set_allow_land") { params -> allowLand = params.getBooleanOrNull(0) ?: true }
+        .addFunction("set_allow_water") { params -> allowWater = params.getBooleanOrNull(0) ?: false }
+        .addFunction("set_allow_air") { params -> allowAir = params.getBooleanOrNull(0) ?: false }
+        .addFunction("set_path_cooldown_ticks") { params -> pathCooldownTicks = params.getDoubleOrNull(0)?.toInt() ?: (20 * 5) }
+        .addFunction("set_wander_speed") { params -> wanderSpeed = params.getDoubleOrNull(0)?.toFloat() ?: 0.35F }
+        .addFunction("reset") {
+            center = null
+            allowLand = false
+            allowWater = false
+            allowAir = false
+            pathCooldownTicks = 20 * 5
+            wanderSpeed = 0.35F
+            maxAttempts = 4
+        }
+
+    fun isSuitable(position: BlockPos): Boolean {
+        val center = center ?: return true
+        val centerPos = BlockPos(center.x.toInt(), center.y.toInt(), center.z.toInt())
+        val distance = sqrt(centerPos.distSqr(position))
+        val suitable = distance >= center.minRange && distance <= center.maxRange
+        return suitable
+    }
+}
+
@@ -15,6 +15,11 @@ import kotlin.jvm.optionals.getOrNull

 typealias ExpressionOrEntityVariable = Either<Expression, MoLangConfigVariable>

+/**
+ * In the case of [ExpressionOrEntityVariable] the right side is the only one that requires visibility for a user,
+ * this function is a shorthand for finding all of the values in the list that have something to show the user to
+ * potentially edit.
+ */
 fun List<ExpressionOrEntityVariable>.asVariables() = mapNotNull { it.right().getOrNull() }


@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config
+
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.util.asExpression
+import com.mojang.datafixers.util.Either
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType
+
+/**
+ * Does nothing except conditionally add some memories and sensors to the brain of the entity.
+ *
+ * @author Hiroku
+ * @since June 27th, 2025
+ */
+class AddMemoriesAndSensorsConfig : BehaviourConfig {
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    val memories: Set<MemoryModuleType<*>> = emptySet()
+    val sensors: Set<SensorType<*>> = mutableSetOf()
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
+    override fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) {
+        if (!checkCondition(entity, condition)) return
+        behaviourConfigurationContext.addMemories(memories)
+        behaviourConfigurationContext.addSensors(sensors)
+    }
+}
@@ -23,8 +23,8 @@ class AddTasksToActivity : BehaviourConfig {
    val activities = mutableListOf<Activity>()
    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
    val tasksByPriority = mutableMapOf<Int, List<TaskConfig>>()
-    override fun getVariables(entity: LivingEntity) = tasksByPriority.values.flatten().flatMap { it.getVariables(entity) } + listOf(condition).asVariables()

+    override fun getVariables(entity: LivingEntity) = tasksByPriority.values.flatten().flatMap { it.getVariables(entity) } + listOf(condition).asVariables()
    override fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) {
        if (!checkCondition(entity, condition)) return

@@ -24,6 +24,7 @@ class ApplyBehaviours : BehaviourConfig {
    var condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
    @SerializedName("behaviours", alternate = ["behaviors"])
    val behaviours = mutableListOf<ResourceLocation>()
+
    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
        return if (checkCondition(entity, condition)) {
            behaviours.flatMap {
@@ -44,6 +44,7 @@ interface BehaviourConfig {
            cobblemonResource("set_core_activities") to SetCoreActivities::class.java,
            cobblemonResource("add_variables") to AddVariablesConfig::class.java,
            cobblemonResource("set_variables") to SetVariablesConfig::class.java,
+            cobblemonResource("add_memories_and_sensors") to AddMemoriesAndSensorsConfig::class.java,
        )
    }

@@ -21,19 +21,25 @@ import com.cobblemon.mod.common.util.resolve
 import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType

 class CustomScriptBehaviourConfig : BehaviourConfig {
-    var condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
-    val variables: List<MoLangConfigVariable> = emptyList()
-    val script: ExpressionLike = "0".asExpressionLike()
-
    companion object {
        val runtime = MoLangRuntime().setup()
    }

+    var condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    val variables: List<MoLangConfigVariable> = emptyList()
+    val script: ExpressionLike = "0".asExpressionLike()
+    val memories = emptySet<MemoryModuleType<*>>()
+    val sensors = emptySet<SensorType<*>>()
+
    override fun getVariables(entity: LivingEntity) = variables
    override fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) {
        if (!checkCondition(entity, condition)) return
+        behaviourConfigurationContext.addMemories(memories)
+        behaviourConfigurationContext.addSensors(sensors)
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        runtime.resolve(script)
    }
@@ -14,6 +14,7 @@ import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.ai.ActivityConfigurationContext
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
@@ -21,34 +22,42 @@ import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.scripting.CobblemonScripts
 import com.cobblemon.mod.common.util.activityRegistry
-import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.resolve
-import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import com.mojang.datafixers.util.Pair
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType

 class ScriptBehaviourConfig : BehaviourConfig {
-    val condition = "true".asExpressionLike()
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
    val script = cobblemonResource("dummy")
    val variables = mutableListOf<MoLangConfigVariable>()
+    val memories = emptySet<MemoryModuleType<*>>()
+    val sensors = emptySet<SensorType<*>>()

    override fun getVariables(entity: LivingEntity) = variables

-    override fun configure(entity: LivingEntity, context: BehaviourConfigurationContext) {
+    override fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) {
+        if (!checkCondition(entity, condition)) return
        val runtime = MoLangRuntime().setup()
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!runtime.resolveBoolean(condition)) return

-        val struct = createBrainStruct(entity, context)
+        val struct = createBrainStruct(entity, behaviourConfigurationContext)
        val script = CobblemonScripts.scripts[this.script]
            ?: run {
                Cobblemon.LOGGER.error("Tried loading script $script as part of an entity brain but that script does not exist")
                return
            }
+
+        behaviourConfigurationContext.addMemories(memories)
+        behaviourConfigurationContext.addSensors(sensors)
+
        runtime.resolve(script, mapOf("brain" to struct))
    }

@@ -15,6 +15,7 @@ import net.minecraft.world.entity.schedule.Activity

 class SetDefaultActivity : BehaviourConfig {
    val activity: Activity = Activity.IDLE
+
    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) {
        behaviourConfigurationContext.defaultActivity = activity
@@ -23,7 +23,6 @@ class SetVariablesConfig : BehaviourConfig {
    var variableValues = mutableMapOf<String, ExpressionLike>()

    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
-
    override fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) {
        val runtime = MoLangRuntime().setup()
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.OneShot
+import net.minecraft.world.entity.schedule.Activity
+
+class ActivityChangeTaskConfig : SingleTaskConfig {
+    val activity: Activity = Activity.IDLE
+    val condition: ExpressionLike = "false".asExpressionLike()
+
+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> = emptyList()
+
+    override fun createTask(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return object : OneShot<LivingEntity>() {
+            override fun trigger(serverLevel: ServerLevel, livingEntity: LivingEntity, l: Long): Boolean {
+                runtime.withQueryValue("entity", livingEntity.asMostSpecificMoLangValue())
+                if (condition.resolveBoolean(runtime)) {
+                    livingEntity.brain.setActiveActivityIfPossible(activity)
+                    return true
+                } else {
+                    return false
+                }
+            }
+        }
+    }
+}
@@ -15,8 +15,6 @@ import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.ai.config.task.WanderTaskConfig.Companion.WANDER
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.PokemonMoveControl
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.resolveFloat
 import com.cobblemon.mod.common.util.withQueryValue
@@ -50,6 +48,7 @@ class AirWanderTaskConfig : SingleTaskConfig {
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!condition.resolveBoolean()) return null
+        behaviourConfigurationContext.addMemories(MemoryModuleType.WALK_TARGET, MemoryModuleType.LOOK_TARGET, CobblemonMemories.PATH_COOLDOWN)
        val wanderChanceExpression = wanderChance.asSimplifiedExpression(entity)

        return BehaviorBuilder.create {
@@ -10,9 +10,7 @@ package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.datafixers.util.Either
@@ -23,19 +21,14 @@ class AllOfTaskConfig : TaskConfig {
    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
    val tasks: List<TaskConfig> = emptyList()

-    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
-        return if (checkCondition(entity, condition))
-            tasks.flatMap { it.getVariables(entity) } + listOf(condition).asVariables()
-        else
-            listOf(condition).asVariables()
-    }
-
+    override fun getVariables(entity: LivingEntity) = tasks.flatMap { it.getVariables(entity) }
    override fun createTasks(
        entity: LivingEntity,
        behaviourConfigurationContext: BehaviourConfigurationContext
    ): List<BehaviorControl<in LivingEntity>> {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!condition.resolveBoolean()) return emptyList()
+
        return tasks.flatMap { it.createTasks(entity, behaviourConfigurationContext) }
    }
 }
@@ -8,24 +8,21 @@

 package com.cobblemon.mod.common.api.ai.config.task

+import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.ai.AttackAngryAtTask
-import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class AttackAngryAtTaskConfig : SingleTaskConfig {
-    val condition = booleanVariable(SharedEntityVariables.ATTACKING_CATEGORY, "should_attack_angry_at", true).asExpressible()
-    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
-
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        behaviourConfigurationContext: BehaviourConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
+        behaviourConfigurationContext.addMemories(MemoryModuleType.ANGRY_AT, MemoryModuleType.ATTACK_TARGET, CobblemonMemories.POKEMON_SLEEPING)
        return AttackAngryAtTask.create()
    }
 }
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.AttackHostileMobsTask
+import com.mojang.serialization.Codec
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class AttackHostileMobsTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
+        return emptyList<MoLangConfigVariable>()
+    }
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return AttackHostileMobsTask.create()
+    }
+    
+    companion object {
+        val CODEC: Codec<AttackHostileMobsTaskConfig> = Codec.unit(AttackHostileMobsTaskConfig())
+    }
+}
@@ -12,22 +12,31 @@ import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.VillagerCalmDown
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType

 class CalmDownTaskConfig : SingleTaskConfig {
    var condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
-    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        behaviourConfigurationContext: BehaviourConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!condition.resolveBoolean()) return null
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.HURT_BY,
+            MemoryModuleType.HURT_BY_ENTITY,
+            MemoryModuleType.NEAREST_HOSTILE,
+        )
+        behaviourConfigurationContext.addSensors(SensorType.VILLAGER_HOSTILES)
        return VillagerCalmDown.create()
    }
 }
@@ -24,6 +24,7 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType

 /**
 * Checks nearby entities and counts how many have nominated this entity as their leader.
@@ -44,6 +45,12 @@ class CountFollowersTaskConfig : SingleTaskConfig {
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        val checkTicksValue = checkTicks.resolveInt()
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES,
+            CobblemonMemories.HERD_SIZE,
+            CobblemonMemories.HERD_LEADER
+        )
+        behaviourConfigurationContext.addSensors(SensorType.NEAREST_LIVING_ENTITIES)
        return BehaviorBuilder.create { instance ->
            instance.group(
                instance.present(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES),
@@ -55,9 +62,15 @@ class CountFollowersTaskConfig : SingleTaskConfig {
                    }
                    val myUUID = entity.uuid.toString()
                    val followersCount = instance.get(nearbyEntities).findAll {
-                        it is PokemonEntity && it.brain.getMemory(CobblemonMemories.HERD_LEADER).getOrNull() == myUUID
+                        it is PokemonEntity
+                                && it.brain.hasMemoryValue(CobblemonMemories.HERD_LEADER)
+                                && it.brain.getMemory(CobblemonMemories.HERD_LEADER).getOrNull() == myUUID
                    }.count()
-                    herdCount.set(followersCount)
+                    if (followersCount == 0) {
+                        herdCount.erase()
+                    } else {
+                        herdCount.set(followersCount)
+                    }
                    return@Trigger true
                }
            }
@@ -23,7 +23,7 @@ class DoNothingTaskConfig : SingleTaskConfig {
    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
    val minDurationTicks: ExpressionOrEntityVariable = Either.left("40".asExpression())
    val maxDurationTicks: ExpressionOrEntityVariable = Either.left("80".asExpression())
-    override fun getVariables(entity: LivingEntity) = listOf(condition, minDurationTicks, maxDurationTicks).asVariables()
+    override fun getVariables(entity: LivingEntity) = listOf(minDurationTicks, maxDurationTicks).asVariables()

    override fun createTask(
        entity: LivingEntity,
@@ -8,6 +8,7 @@

 package com.cobblemon.mod.common.api.ai.config.task

+import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
 import com.cobblemon.mod.common.api.ai.asVariables
@@ -16,6 +17,7 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.entity.pokemon.ai.tasks.EatGrassTask
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class EatGrassTaskConfig : SingleTaskConfig {
    companion object {
@@ -47,6 +49,8 @@ class EatGrassTaskConfig : SingleTaskConfig {
            return null
        }

+        behaviourConfigurationContext.addMemories(MemoryModuleType.WALK_TARGET, CobblemonMemories.RECENTLY_ATE_GRASS)
+
        return WrapperLivingEntityTask(
            EatGrassTask(
                chance,
@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.CobblemonSensors
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
@@ -21,6 +22,7 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType

 class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {
    var condition = booleanVariable(SharedEntityVariables.BATTLING_CATEGORY, "exit_battle_when_hurt", true).asExpressible()
@@ -36,10 +38,19 @@ class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {
        behaviourConfigurationContext: BehaviourConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        val includePassiveDamage = includePassiveDamage.resolveBoolean()
        if (!condition.resolveBoolean()) return null

+        val includePassiveDamage = includePassiveDamage.resolveBoolean()
+
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.HURT_BY,
+            MemoryModuleType.HURT_BY_ENTITY
+        )
+        behaviourConfigurationContext.addSensors(SensorType.HURT_BY)
+
        if (entity is NPCEntity) {
+            behaviourConfigurationContext.addMemories(CobblemonMemories.NPC_BATTLING)
+            behaviourConfigurationContext.addSensors(CobblemonSensors.NPC_BATTLING)
            fun cancelNPCBattles(npcEntity: NPCEntity): Boolean {
                val battles = npcEntity.battleIds.mapNotNull(BattleRegistry::getBattle)
                battles.forEach { it.end() }
@@ -58,6 +69,7 @@ class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {
                }
            }
        } else if (entity is PokemonEntity) {
+            behaviourConfigurationContext.addMemories(CobblemonMemories.POKEMON_BATTLE)
            fun cancelPokemonBattle(pokemonEntity: PokemonEntity): Boolean {
                val battle = BattleRegistry.getBattle(pokemonEntity.battleId ?: return false)
                battle?.end()
@@ -43,6 +43,10 @@ class FindAirTaskConfig : SingleTaskConfig {
        if (entity !is PathfinderMob) {
            return null
        }
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.WALK_TARGET,
+            CobblemonMemories.PATH_COOLDOWN
+        )
        return BehaviorBuilder.create {
            it.group(
                it.absent(MemoryModuleType.WALK_TARGET),
@@ -16,6 +16,7 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangV
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.storage.party.PartyStore
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.pokemon.ai.ToleratedHerdLeader
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.datafixers.util.Either
@@ -24,8 +25,58 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.NearestVisibleLivingEntities
+import net.minecraft.world.entity.ai.sensing.SensorType

 class FindHerdLeaderTaskConfig : SingleTaskConfig {
+    companion object {
+        /**
+         * Logic used to choose the best herd leader from nearby visible entities.
+         *
+         * - Higher tier leaders are always preferred.
+         * - Same-tier leaders that are closer are preferred except for when they're the same tier as the current leader.
+         * - We don't want to exceed the target's herd size limit.
+         * - We don't want to choose a leader that is themselves following a leader.
+         * - Some leader definitions allow lower-level Pokémon to lead them.
+         * - Leaders just have to not be in a party - pastured and wild Pokémon can mingle.
+         */
+        fun getBestHerdLeader(
+            currentLeader: Pair<PokemonEntity, ToleratedHerdLeader>?,
+            nearbyEntities: NearestVisibleLivingEntities,
+            entity: PokemonEntity
+        ): PokemonEntity? {
+            var bestLeader: PokemonEntity? = null
+            val (currentLeaderEntity, currentLeaderDefinition) = currentLeader ?: Pair(null, null)
+            var bestTier = currentLeaderDefinition?.tier?.let { it + 1 } ?: 0 // Only upgrade to a higher tier leader
+            var bestDistance = Float.MAX_VALUE
+            nearbyEntities.findAll {
+                it is PokemonEntity &&
+                        it != currentLeader &&
+                        it.pokemon.storeCoordinates.get()?.store !is PartyStore &&
+                        it.getHerdSize() < it.behaviour.herd.maxSize
+            }.forEach { possibleLeader ->
+                possibleLeader as PokemonEntity
+                val matchingHerdLeader = entity.behaviour.herd.bestMatchLeader(entity, possibleLeader) ?: return@forEach
+                val alreadyIsALeader = possibleLeader.brain.hasMemoryValue(CobblemonMemories.HERD_SIZE)
+                val nestedHerdTier = currentLeaderEntity?.getHerdTier() ?: 0
+                if (nestedHerdTier >= matchingHerdLeader.tier) {
+                    return@forEach // This leader is following a leader of a higher tier, we can't replace them
+                }
+                val distance = entity.distanceTo(possibleLeader)
+                if (matchingHerdLeader.tier < bestTier) {
+                    return@forEach // No need to check further if this leader is worse than the best found so far
+                } else if ((distance > bestDistance && !alreadyIsALeader) && matchingHerdLeader.tier == bestTier) {
+                    return@forEach // No need to check further if this leader is farther than the best found so far, unless they are already a leader - I'd prefer to join a pack
+                } else {
+                    bestLeader = possibleLeader
+                    bestDistance = distance
+                    bestTier = matchingHerdLeader.tier
+                }
+            }
+            return bestLeader ?: currentLeaderEntity
+        }
+    }
+
    // How frequently to check for whether it should herd. Probably isn't that expensive but might use this for chance.
    val checkTicks: ExpressionOrEntityVariable = Either.left("60".asExpression())

@@ -41,40 +92,33 @@ class FindHerdLeaderTaskConfig : SingleTaskConfig {
            return null
        }

+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES,
+            CobblemonMemories.HERD_LEADER,
+            MemoryModuleType.WALK_TARGET
+        )
+        behaviourConfigurationContext.addSensors(SensorType.NEAREST_LIVING_ENTITIES)
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        val checkTicksValue = checkTicks.resolveInt()
        return BehaviorBuilder.create { instance ->
            instance.group(
                instance.present(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES),
-                instance.absent(CobblemonMemories.HERD_LEADER),
-                instance.absent(MemoryModuleType.WALK_TARGET)
-            ).apply(instance) { nearbyEntities, herdLeader, _ ->
+                instance.absent(CobblemonMemories.HERD_LEADER)
+            ).apply(instance) { nearbyEntities, herdLeader ->
                Trigger { world, entity, _ ->
                    if (world.gameTime % checkTicksValue != 0L) {
                        return@Trigger false
                    }

                    entity as PokemonEntity
-                    val toleratedLeaders = entity.behaviour.herd.toleratedLeaders
-                    val nearbyLeaders = instance.get(nearbyEntities).findAll {
-                        it is PokemonEntity &&
-                                it.pokemon.storeCoordinates.get()?.store !is PartyStore &&
-                                it.exposedSpecies.resourceIdentifier in toleratedLeaders &&
-                                !it.brain.hasMemoryValue(CobblemonMemories.HERD_LEADER) &&
-                                it.pokemon.level >= entity.pokemon.level
-                    }.toList()
+                    val bestLeader = getBestHerdLeader(
+                        currentLeader = null,
+                        nearbyEntities = instance.get(nearbyEntities),
+                        entity = entity
+                    ) ?: return@Trigger false

-                    if (nearbyLeaders.isEmpty()) {
-                        return@Trigger false
-                    }
-
-                    val leader = nearbyLeaders
-                        .filterIsInstance<PokemonEntity>()
-                        .filter { it.getHerdSize() < entity.behaviour.herd.maxSize }
-                        .maxByOrNull { it.pokemon.level }
-                        ?: return@Trigger false
-
-                    herdLeader.set(leader.uuid.toString())
+                    herdLeader.set(bestLeader.uuid.toString())
+                    bestLeader.brain.eraseMemory(CobblemonMemories.HERD_LEADER)
                    return@Trigger true
                }
            }
@@ -8,6 +8,8 @@

 package com.cobblemon.mod.common.api.ai.config.task

+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.CobblemonSensors
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
@@ -18,6 +20,7 @@ import com.cobblemon.mod.common.util.asExpression
 import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class FindRestingPlaceTaskConfig : SingleTaskConfig {
    val horizontalSearchDistance: ExpressionOrEntityVariable = Either.left("16".asExpression())
@@ -28,6 +31,13 @@ class FindRestingPlaceTaskConfig : SingleTaskConfig {
        entity: LivingEntity,
        behaviourConfigurationContext: BehaviourConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
+        behaviourConfigurationContext.addMemories(
+            CobblemonMemories.PATH_COOLDOWN,
+            CobblemonMemories.POKEMON_DROWSY,
+            MemoryModuleType.WALK_TARGET
+        )
+        behaviourConfigurationContext.addSensors(CobblemonSensors.POKEMON_DROWSY)
+
        return WrapperLivingEntityTask(
            FindRestingPlaceTask.create(horizontalSearchDistance.resolveInt(), verticalSearchDistance.resolveInt()),
            PokemonEntity::class.java
@@ -20,6 +20,7 @@ import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType

 class FleeAttackerTaskConfig : SingleTaskConfig {
    var condition = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "flee_attacker", true).asExpressible()
@@ -38,6 +39,10 @@ class FleeAttackerTaskConfig : SingleTaskConfig {
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!condition.resolveBoolean() || entity !is PathfinderMob) return null
+
+        behaviourConfigurationContext.addMemories(MemoryModuleType.HURT_BY_ENTITY, MemoryModuleType.WALK_TARGET)
+        behaviourConfigurationContext.addSensors(SensorType.HURT_BY)
+
        val speedMultiplier = speedMultiplier.resolveFloat()
        val desiredDistance = desiredDistance.resolveInt()
        return WrapperLivingEntityTask(
@@ -20,6 +20,7 @@ import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType

 class FleeNearestHostileTaskConfig : SingleTaskConfig {
    var condition = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "flee_nearest_hostile", true).asExpressible()
@@ -34,6 +35,8 @@ class FleeNearestHostileTaskConfig : SingleTaskConfig {
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!condition.resolveBoolean() || entity !is PathfinderMob) return null
+        behaviourConfigurationContext.addMemories(MemoryModuleType.NEAREST_HOSTILE, MemoryModuleType.WALK_TARGET)
+        behaviourConfigurationContext.addSensors(SensorType.VILLAGER_HOSTILES)
        val speedMultiplier = speedMultiplier.resolveFloat()
        val desiredDistance = desiredDistance.resolveInt()
        return WrapperLivingEntityTask(
@@ -23,6 +23,7 @@ import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class FlyInCirclesTaskConfig : SingleTaskConfig {
    val poseTypes: Set<PoseType> = setOf(
@@ -31,7 +32,7 @@ class FlyInCirclesTaskConfig : SingleTaskConfig {
    )

    val minAngularVelocityDegrees = numberVariable(WANDER, "min_fly_circling_angular_velocity", 0.0).asExpressible()
-    val maxAngularVelocityDegrees = numberVariable(WANDER, "max_fly_circling_angular_velocity", 2.0).asExpressible()
+    val maxAngularVelocityDegrees = numberVariable(WANDER, "max_fly_circling_angular_velocity", 1.0).asExpressible()
    val speed = numberVariable(WANDER, "fly_circling_speed", 0.6).asExpressible()
    val verticalSpeed: ExpressionOrEntityVariable = Either.left("0.0".asExpression())
    val minDurationTicks: ExpressionOrEntityVariable = Either.left("60".asExpression())
@@ -55,6 +56,7 @@ class FlyInCirclesTaskConfig : SingleTaskConfig {
        if (entity !is PokemonEntity) {
            return null
        }
+        behaviourConfigurationContext.addMemories(MemoryModuleType.WALK_TARGET, MemoryModuleType.PATH)
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        return CircleAroundTask(
            poseTypes = poseTypes,
@@ -8,6 +8,7 @@

 package com.cobblemon.mod.common.api.ai.config.task

+import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask.Companion.wrapped
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
@@ -15,16 +16,22 @@ import com.cobblemon.mod.common.entity.ai.FollowHerdLeaderTask
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class FollowHerdLeaderTaskConfig : SingleTaskConfig {
    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
-        return listOf() // TODO add tooFar and closeEnough variables
+        return listOf()
    }

    override fun createTask(
        entity: LivingEntity,
        behaviourConfigurationContext: BehaviourConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
+        if (entity !is PokemonEntity) {
+            return null
+        }
+
+        behaviourConfigurationContext.addMemories(CobblemonMemories.HERD_LEADER, MemoryModuleType.WALK_TARGET)
        return FollowHerdLeaderTask().wrapped<PokemonEntity>()
    }
 }
@@ -20,6 +20,7 @@ import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class FollowWalkTargetTaskConfig : SingleTaskConfig {
    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
@@ -30,6 +31,7 @@ class FollowWalkTargetTaskConfig : SingleTaskConfig {

    override fun createTask(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext): BehaviorControl<LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        behaviourConfigurationContext.addMemories(MemoryModuleType.WALK_TARGET, MemoryModuleType.PATH, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE)
        return WrapperLivingEntityTask(
            FollowWalkTargetTask(minRunTicks.resolveInt(), maxRunTicks.resolveInt()),
            PathfinderMob::class.java
@@ -16,6 +16,8 @@ import com.cobblemon.mod.common.entity.ai.GetAngryAtAttackerTask
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType

 class GetAngryAtAttackerTaskConfig : SingleTaskConfig {
    companion object {
@@ -32,6 +34,11 @@ class GetAngryAtAttackerTaskConfig : SingleTaskConfig {
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!condition.resolveBoolean()) return null
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.HURT_BY_ENTITY,
+            MemoryModuleType.ANGRY_AT,
+        )
+        behaviourConfigurationContext.addSensors(SensorType.HURT_BY)
        return GetAngryAtAttackerTask.create()
    }
 }
@@ -8,6 +8,8 @@

 package com.cobblemon.mod.common.api.ai.config.task

+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.CobblemonSensors
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.asVariables
@@ -18,6 +20,8 @@ import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType

 class GoToHealingMachineTaskConfig : SingleTaskConfig {
    val condition = booleanVariable(SELF_HEALING, USE_HEALING_MACHINES, true).asExpressible()
@@ -39,7 +43,12 @@ class GoToHealingMachineTaskConfig : SingleTaskConfig {
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!condition.resolveBoolean()) return null
-
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.WALK_TARGET,
+            MemoryModuleType.LOOK_TARGET,
+            CobblemonMemories.NPC_BATTLING
+        )
+        behaviourConfigurationContext.addSensors(CobblemonSensors.NPC_BATTLING)
        return GoToHealingMachineTask.create(
            horizontalSearchRange = horizontalSearchRange.asExpression(),
            verticalSearchRange = verticalSearchRange.asExpression(),
@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.OmniPathingEntity
 import com.cobblemon.mod.common.util.closestPosition
 import kotlin.math.ceil
 import kotlin.math.floor
@@ -43,7 +44,10 @@ class GoToLandTaskConfig : SingleTaskConfig {
        if (entity !is PathfinderMob) {
            return null
        }
-
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.WALK_TARGET,
+            CobblemonMemories.PATH_COOLDOWN
+        )
        return BehaviorBuilder.create {
            it.group(
                it.absent(MemoryModuleType.WALK_TARGET),
@@ -56,6 +60,8 @@ class GoToLandTaskConfig : SingleTaskConfig {

                    entity as PathfinderMob

+                    val walkSpeedValue = walkSpeed.resolveFloat()
+
                    val iterable = BlockPos.betweenClosed(
                        Mth.floor(entity.x - 8.0),
                        entity.blockY,
@@ -71,7 +77,7 @@ class GoToLandTaskConfig : SingleTaskConfig {
                        isSafeLandPosAround(entity.level() as ServerLevel, it, entity)
                    } ?: return@Trigger false

-                    walkTarget.set(WalkTarget(blockPos.above(), 0.35F, 1))
+                    walkTarget.set(WalkTarget(blockPos.above(), walkSpeedValue, 0))
                    return@Trigger true
                }
            }
@@ -82,7 +88,7 @@ class GoToLandTaskConfig : SingleTaskConfig {
        val blockState = world.getBlockState(pos)

        val isFluid = world.getFluidState(pos.above()).isEmpty.not()
-        val solidBelow = blockState.isSolid
+        val solidBelow = blockState.isSolid || (mob is OmniPathingEntity && mob.canFly())

        if (isFluid || !solidBelow) {
            return false
@@ -8,6 +8,8 @@

 package com.cobblemon.mod.common.api.ai.config.task

+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.CobblemonSensors
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
@@ -15,6 +17,7 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.entity.pokemon.ai.tasks.GoToSleepTask
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class GoToSleepTaskConfig : SingleTaskConfig {
    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
@@ -22,6 +25,15 @@ class GoToSleepTaskConfig : SingleTaskConfig {
        entity: LivingEntity,
        behaviourConfigurationContext: BehaviourConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
+        if (entity !is PokemonEntity) {
+            return null
+        }
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.WALK_TARGET,
+            CobblemonMemories.POKEMON_DROWSY,
+            CobblemonMemories.POKEMON_SLEEPING
+        )
+        behaviourConfigurationContext.addSensors(CobblemonSensors.POKEMON_DROWSY)
        return WrapperLivingEntityTask(GoToSleepTask.create(), PokemonEntity::class.java)
    }
 }
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType
+
+/**
+ * Immediately gets angry at the nearest visible entity that matches the [entityCondition] and is within the [range].
+ *
+ * @author Hiroku
+ * @since June 23rd, 2025
+ */
+class HateEntityTaskConfig : SingleTaskConfig {
+    val entityCondition: Expression = "true".asExpression()
+    val range: ExpressionOrEntityVariable = Either.left("24".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    override fun createTask(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        val range = range.resolveFloat()
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES,
+            MemoryModuleType.ANGRY_AT
+        )
+        behaviourConfigurationContext.addSensors(SensorType.NEAREST_LIVING_ENTITIES)
+        return BehaviorBuilder.create { instance ->
+            instance.group(
+                instance.present(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES),
+                instance.registered(MemoryModuleType.ANGRY_AT)
+            ).apply(instance) { entities, angryAt ->
+                Trigger { world, entity, _ ->
+                    val target = instance.get(entities).findClosest {
+                        runtime.withQueryValue("entity", it.asMostSpecificMoLangValue())
+                        return@findClosest runtime.resolveBoolean(entityCondition)
+                    }.orElse(null)
+
+                    if (target != null && target.distanceTo(entity) <= range) {
+                        angryAt.set(target.uuid)
+                    }
+                    return@Trigger true
+                }
+            }
+        }
+    }
+}
@@ -8,6 +8,8 @@

 package com.cobblemon.mod.common.api.ai.config.task

+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.CobblemonSensors
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.asVariables
@@ -20,6 +22,7 @@ import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class HealUsingHealingMachineTaskConfig : SingleTaskConfig {
    val condition = booleanVariable(SELF_HEALING, USE_HEALING_MACHINES, true).asExpressible()
@@ -34,6 +37,8 @@ class HealUsingHealingMachineTaskConfig : SingleTaskConfig {
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!condition.resolveBoolean()) return null
+        behaviourConfigurationContext.addMemories(MemoryModuleType.WALK_TARGET, CobblemonMemories.NPC_BATTLING,)
+        behaviourConfigurationContext.addSensors(CobblemonSensors.NPC_BATTLING)
        return HealUsingHealingMachineTask(horizontalUseRange.asExpression(), verticalUseRange.asExpression())
    }
 }
@@ -8,6 +8,8 @@

 package com.cobblemon.mod.common.api.ai.config.task

+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.CobblemonSensors
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.asVariables
@@ -18,6 +20,7 @@ import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class LookAtBattlingPokemonTaskConfig : SingleTaskConfig {
    companion object {
@@ -40,6 +43,11 @@ class LookAtBattlingPokemonTaskConfig : SingleTaskConfig {
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!resolveBooleanVariable(LOOK_AT_BATTLING_POKEMON)) return null
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.LOOK_TARGET,
+            CobblemonMemories.BATTLING_POKEMON
+        )
+        behaviourConfigurationContext.addSensors(CobblemonSensors.BATTLING_POKEMON)
        return LookAtBattlingPokemonTask.create(
            minDurationTicks = minDurationTicks.resolveInt(),
            maxDurationTicks = maxDurationTicks.resolveInt()
@@ -16,6 +16,8 @@ import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.SetEntityLookTarget
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType

 class LookAtEntitiesTaskConfig : SingleTaskConfig {
    companion object {
@@ -36,6 +38,8 @@ class LookAtEntitiesTaskConfig : SingleTaskConfig {
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!condition.resolveBoolean()) return null
+        behaviourConfigurationContext.addMemories(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, MemoryModuleType.LOOK_TARGET)
+        behaviourConfigurationContext.addSensors(SensorType.NEAREST_LIVING_ENTITIES)
        return SetEntityLookTarget.create(maxDistance.resolveFloat())
    }
 }
@@ -8,15 +8,19 @@

 package com.cobblemon.mod.common.api.ai.config.task

+import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.npc.ai.LookAtSpeakerTask
 import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class LookAtSpeakerTaskConfig : SingleTaskConfig {
    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        behaviourConfigurationContext: BehaviourConfigurationContext
-    ) = LookAtSpeakerTask.create()
+    ) = LookAtSpeakerTask.create().also {
+        behaviourConfigurationContext.addMemories(MemoryModuleType.LOOK_TARGET, CobblemonMemories.DIALOGUES)
+    }
 }
@@ -20,6 +20,8 @@ import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.Mob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.LookAtTargetSink
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType

 class LookAtTargetTaskConfig : SingleTaskConfig {
    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
@@ -38,6 +40,8 @@ class LookAtTargetTaskConfig : SingleTaskConfig {
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!condition.resolveBoolean()) return null
+        behaviourConfigurationContext.addMemories(MemoryModuleType.LOOK_TARGET, MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES)
+        behaviourConfigurationContext.addSensors(SensorType.NEAREST_LIVING_ENTITIES)
        return WrapperLivingEntityTask(LookAtTargetSink(minDurationTicks.resolveInt(), maxDurationTicks.resolveInt()), Mob::class.java)
    }
 }
@@ -8,6 +8,7 @@

 package com.cobblemon.mod.common.api.ai.config.task

+import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
@@ -15,13 +16,22 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.entity.pokemon.ai.tasks.LookAtTargetedBattlePokemonTask
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class LookAtTargetedBattlePokemonTaskConfig : SingleTaskConfig {
    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        behaviourConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity> {
+    ): BehaviorControl<in LivingEntity>? {
+        if (entity !is PokemonEntity) {
+            return null
+        }
+        behaviourConfigurationContext.addMemories(
+            CobblemonMemories.POKEMON_BATTLE,
+            CobblemonMemories.TARGETED_BATTLE_POKEMON,
+            MemoryModuleType.LOOK_TARGET,
+        )
        return WrapperLivingEntityTask(LookAtTargetedBattlePokemonTask.create(), PokemonEntity::class.java)
    }
 }
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.LOOKING_CATEGORY
 import com.cobblemon.mod.common.entity.ai.LookInDirectionTask
 import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class LookInDirectionTaskConfig : SingleTaskConfig {
    var condition = booleanVariable(LOOKING_CATEGORY, "locked_rotation", true).asExpressible()
@@ -32,5 +33,7 @@ class LookInDirectionTaskConfig : SingleTaskConfig {
        shouldLock = condition.asExpression(),
        yaw = yaw.asExpression(),
        pitch = pitch.asExpression()
-    )
+    ).also {
+        behaviourConfigurationContext.addMemories(MemoryModuleType.LOOK_TARGET)
+    }
 }
@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.api.storage.party.PartyStore
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.withQueryValue
@@ -25,6 +24,7 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.sensing.SensorType

 /**
 * Task that looks around for a better herd leader or gives up on a leader
@@ -48,6 +48,11 @@ class MaintainHerdLeaderTaskConfig : SingleTaskConfig {
        if (entity !is PokemonEntity) {
            return null
        }
+        behaviourConfigurationContext.addMemories(
+            CobblemonMemories.HERD_LEADER,
+            MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES,
+        )
+        behaviourConfigurationContext.addSensors(SensorType.NEAREST_LIVING_ENTITIES)
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        val checkTicks = checkTicks.resolveInt()
        return BehaviorBuilder.create { instance ->
@@ -62,26 +67,22 @@ class MaintainHerdLeaderTaskConfig : SingleTaskConfig {
                    }

                    val leader = instance.get(herdLeader).let(UUID::fromString).let(world::getEntity) as? PokemonEntity
-                    if (leader == null) {
+                    val currentLeaderDefinition = leader?.let { leader ->
+                        entity.behaviour.herd.toleratedLeaders.find { it.pokemon.matches(leader) }
+                    }
+                    if (leader == null || currentLeaderDefinition == null) {
                        entity.brain.eraseMemory(CobblemonMemories.HERD_LEADER)
                        return@Trigger true // No leader, so we erase the memory
-                    } else if (leader.brain.hasMemoryValue(CobblemonMemories.HERD_LEADER)) {
-                        entity.brain.eraseMemory(CobblemonMemories.HERD_LEADER)
-                        return@Trigger true
-                    } else if (leader.exposedSpecies.resourceIdentifier !in entity.behaviour.herd.toleratedLeaders) {
-                        // Zoroark getting exposed then herd members pausing and saying "hey wait a minute"
-                        entity.brain.eraseMemory(CobblemonMemories.HERD_LEADER)
                    } else {
-                        val bestSurroundingLeader = instance.get(nearbyEntities).findAll {
-                            it is PokemonEntity &&
-                                    it != leader &&
-                                    it.pokemon.storeCoordinates.get()?.store !is PartyStore &&
-                                    it.exposedSpecies.resourceIdentifier in entity.behaviour.herd.toleratedLeaders &&
-                                    !it.brain.hasMemoryValue(CobblemonMemories.HERD_LEADER) &&
-                                    it.pokemon.level > leader.pokemon.level // Has to be a superior leader to the existing one
-                        }.maxByOrNull { (it as PokemonEntity).pokemon.level } as? PokemonEntity
-                        if (bestSurroundingLeader != null) {
-                            entity.brain.setMemory(CobblemonMemories.HERD_LEADER, bestSurroundingLeader.uuid.toString())
+                        val bestLeader = FindHerdLeaderTaskConfig.getBestHerdLeader(
+                            currentLeader = (leader to currentLeaderDefinition),
+                            nearbyEntities = instance.get(nearbyEntities),
+                            entity = entity
+                        )
+
+                        if (bestLeader != null && bestLeader != leader) {
+                            bestLeader.brain.eraseMemory(CobblemonMemories.HERD_LEADER)
+                            entity.brain.setMemory(CobblemonMemories.HERD_LEADER, bestLeader.uuid.toString())
                        }
                    }
                    return@Trigger true
@@ -89,5 +90,4 @@ class MaintainHerdLeaderTaskConfig : SingleTaskConfig {
            }
        }
    }
-
 }
@@ -8,22 +8,16 @@

 package com.cobblemon.mod.common.api.ai.config.task

+import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.npc.ai.MeleeAttackTask
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BattleFlightTask
-import com.cobblemon.mod.common.util.withQueryValue
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.ManageFlightInBattleTask
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

-class BattleFlightTaskConfig : SingleTaskConfig {
-
+class ManageFlightInBattleTaskConfig : SingleTaskConfig {
    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
-
    override fun createTask(
        entity: LivingEntity,
        behaviourConfigurationContext: BehaviourConfigurationContext
@@ -31,6 +25,7 @@ class BattleFlightTaskConfig : SingleTaskConfig {
        if (entity !is PokemonEntity) {
            return null
        }
-        return BattleFlightTask.create()
+        behaviourConfigurationContext.addMemories(CobblemonMemories.POKEMON_BATTLE)
+        return ManageFlightInBattleTask.create()
    }
 }
@@ -15,11 +15,12 @@ import com.cobblemon.mod.common.entity.npc.ai.MeleeAttackTask
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class MeleeAttackTaskConfig : SingleTaskConfig {
    val condition = booleanVariable(SharedEntityVariables.ATTACKING_CATEGORY, "attacks_melee", true).asExpressible()
    val range = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "melee_range", 1.5F).asExpressible()
-    val cooldownTicks = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "melee_cooldown", 30).asExpressible()
+    val cooldownTicks = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "melee_cooldown", 20).asExpressible()

    override fun getVariables(entity: LivingEntity) = listOf(
        condition,
@@ -33,7 +34,10 @@ class MeleeAttackTaskConfig : SingleTaskConfig {
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!condition.resolveBoolean()) return null
-
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.ATTACK_TARGET,
+            MemoryModuleType.ATTACK_COOLING_DOWN
+        )
        return MeleeAttackTask.create(
            range = range.asExpression(),
            cooldownTicks = cooldownTicks.asExpression()
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.bedrockk.molang.ast.StringExpression
+import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.entity.npc.NPCEntity
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.mojang.datafixers.util.Either
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.Behavior
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.MemoryStatus
+
+/**
+ * A task that modifies the aspects of a Pokémon or NPC based on a memory module.
+ * If the memory is registered, the aspect is added; if it is absent, the aspect is removed.
+ *
+ * @author Hiroku
+ * @since July 6th, 2025
+ */
+class MemoryAspectTaskConfig : SingleTaskConfig {
+    var memory: MemoryModuleType<*> = MemoryModuleType.DUMMY
+    var aspect: ExpressionOrEntityVariable = Either.left(StringExpression(StringValue("")))
+
+    override fun getVariables(entity: LivingEntity) = listOf(aspect).asVariables()
+    override fun createTask(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        if (entity !is PokemonEntity && entity !is NPCEntity) {
+            return null
+        } else if (memory == MemoryModuleType.DUMMY) {
+            Cobblemon.LOGGER.error("MemoryAspectTaskConfig: Memory module type is not set for ${entity.name.string}.")
+            return null
+        } else if (aspect.left().orElse(null)?.originalString == "") {
+            Cobblemon.LOGGER.error("MemoryAspectTaskConfig: Aspect is not set for ${entity.name.string}.")
+            return null
+        }
+
+        val aspect = aspect.resolveString()
+
+        return object : Behavior<LivingEntity>(
+            mapOf(memory to MemoryStatus.REGISTERED),
+            Int.MAX_VALUE,
+            Int.MAX_VALUE
+        ) {
+            override fun canStillUse(level: ServerLevel, entity: LivingEntity, gameTime: Long) = true
+
+            override fun tick(level: ServerLevel, owner: LivingEntity, gameTime: Long) {
+                val hasMemory = !owner.brain.hasMemoryValue(memory)
+                if (owner is PokemonEntity) {
+                    if (!hasMemory && aspect in owner.pokemon.forcedAspects) {
+                        owner.pokemon.forcedAspects -= aspect
+                    } else if (hasMemory && aspect !in owner.pokemon.forcedAspects) {
+                        owner.pokemon.forcedAspects += aspect
+                    } else return
+                    owner.pokemon.updateAspects()
+                } else if (owner is NPCEntity) {
+                    if (!hasMemory && aspect in owner.appliedAspects) {
+                        owner.appliedAspects -= aspect
+                    } else if (hasMemory && aspect !in owner.appliedAspects) {
+                        owner.appliedAspects += aspect
+                    } else return
+                    owner.updateAspects()
+                }
+            }
+        }
+    }
+}
@@ -63,6 +63,10 @@ class MoveIntoFluidTaskConfig : SingleTaskConfig {
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!condition.resolveBoolean()) return null
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.WALK_TARGET,
+            CobblemonMemories.PATH_COOLDOWN
+        )
        val movesIntoWater = this@MoveIntoFluidTaskConfig.movesIntoWater.resolveBoolean()
        val movesIntoLava = movesIntoLava.resolveBoolean()
        val speedModifier = speedModifier.resolveFloat()
@@ -15,10 +15,11 @@ import com.cobblemon.mod.common.entity.ai.MoveToAttackTargetTask
 import com.cobblemon.mod.common.util.asExpression
 import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class MoveToAttackTargetTaskConfig : SingleTaskConfig {
    val speedMultiplier = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "attacking_movement_speed", 0.5).asExpressible()
-    val closeEnoughDistance: ExpressionOrEntityVariable = Either.left("1".asExpression())
+    val closeEnoughDistance: ExpressionOrEntityVariable = Either.left("0".asExpression())

    override fun getVariables(entity: LivingEntity) = listOf(
        speedMultiplier,
@@ -31,5 +32,10 @@ class MoveToAttackTargetTaskConfig : SingleTaskConfig {
    ) = MoveToAttackTargetTask.create(
        speedMultiplier = speedMultiplier.asExpression(),
        closeEnoughDistance = closeEnoughDistance.asExpression()
-    )
+    ).also {
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.ATTACK_TARGET,
+            MemoryModuleType.WALK_TARGET
+        )
+    }
 }
@@ -18,6 +18,7 @@ import com.cobblemon.mod.common.util.asExpression
 import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class MoveToOwnerTaskConfig : SingleTaskConfig {
    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
@@ -38,6 +39,10 @@ class MoveToOwnerTaskConfig : SingleTaskConfig {
        entity: LivingEntity,
        behaviourConfigurationContext: BehaviourConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.WALK_TARGET,
+            MemoryModuleType.LOOK_TARGET
+        )
        return WrapperLivingEntityTask(
            MoveToOwnerTask.create(
                condition = condition.asExpression(),
@@ -9,12 +9,12 @@
 package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.toDF
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.RunOne
@@ -35,14 +35,14 @@ class OneOfTaskConfig : SingleTaskConfig {
        val task: TaskConfig = SingleTaskConfig.nothing()
    }

-    val condition: ExpressionLike = "true".asExpressionLike()
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
    val options = mutableListOf<OneOfTaskOption>()

    override fun getVariables(entity: LivingEntity) = options.flatMap { it.task.getVariables(entity) }

    override fun createTask(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!runtime.resolveBoolean(condition)) return null
+        if (!condition.resolveBoolean()) return null
        return RunOne(options.map { it.task.createTasks(entity, behaviourConfigurationContext).first() toDF it.weight })
    }
 }
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToBeeHiveTask
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class PathToBeeHiveTaskConfig : SingleTaskConfig {
+    companion object {
+        const val HONEY = "honey"
+    }
+
+    val condition = booleanVariable(HONEY, "can_add_honey", true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        if (entity !is PokemonEntity) {
+            return null
+        }
+        if (!checkCondition(entity, condition)) {
+            return null
+        }
+        return PathToBeeHiveTask.create()
+    }
+}
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.CobblemonSensors
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToFlowerTask
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class PathToFlowerTaskConfig : SingleTaskConfig {
+    companion object {
+        const val POLLINATE = "pollinate"
+    }
+
+    val condition = booleanVariable(POLLINATE, "can_pollinate", true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        if (entity !is PokemonEntity) {
+            return null
+        }
+
+        if (!checkCondition(entity, condition)) {
+            return null
+        }
+        behaviourConfigurationContext.addMemories(
+            CobblemonMemories.NEARBY_FLOWERS,
+            CobblemonMemories.HIVE_COOLDOWN,
+            CobblemonMemories.HIVE_LOCATION,
+            CobblemonMemories.POLLINATED
+        )
+        behaviourConfigurationContext.addSensors(CobblemonSensors.NEARBY_BEE_HIVE, CobblemonSensors.NEARBY_FLOWER)
+        return PathToFlowerTask.create()
+    }
+}
--- a/Show More
+++ b/Show More