chore: cleanup imports & add license headers

forgot the optional any check

See merge request cable-mc/cobblemon!1671

CHANGELOG-AI.md

@@ -0,0 +1,15 @@
+### Additions
+- Rebuilt Pokémon AI to use Minecraft's Brain system, allowing for more complex behaviours and interactions.
+  - As an early pass of this, pastured Pokémon will now sleep when appropriate, and may come up to you when they see you.
+  - Probably also added a whole bunch of bugs.
+  - Growlithe and Arcanine intimidate Skeletons.
+  - Meowth intimidate Creepers and Phantoms.
+- 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.
+
+### MoLang & Datapacks
+- Added a `behaviours` datapack folder which motivates the Behaviour Editor screen on NPCs and Pokémon.
+- Added many default behaviours.
+- 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.

CHANGELOG-SPAWNING.md

@@ -0,0 +1,16 @@
+
+### Additions
+- Pokémon can now spawn in herds, either as distinct herd groupings or simply several Pokémon spawning at once.
+
+### Fixes
+- Fixed the "enabled" property in spawn files not actually being respected. Where do they find these devs?
+
+### Developer
+- Spawning Influences now have the context of what the other buckets are when adjusting bucket weights. This will break existing influences that do bucket weight adjustment.
+- Renamed heaps of things in the spawning system to make more sense.
+  - SpawningContext is now SpawnablePosition
+  - WorldSlice is SpawningZone
+  - SpawningProspector is now SpawningZoneGenerator
+- Renamed things in Spawn Rules to go with the other renames:
+  - contextSelector is now spawnablePositionSelector
+  - context is now spawnable_position

CHANGELOG.md

@@ -21,6 +21,8 @@
 - 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 modification to Minecraft Creative Inventory search to account for item names that contain `poké` when input contains `poke`.
+- Added Campfire Pot as well as loads of new food items (Poke Puffs, Ponigiri, Sinister Tea, etc)
 
 ### Pokémon Added
 
@@ -134,6 +136,10 @@
 - Improved parity with vanilla mobs' drop behavior; loot and XP drop on death instead of after the entire death sequence finishes.
 - Quirk animations no longer play in the battle GUI since they were pretty distracting.
 - A number of Pokemon that float above the ground visually (Gastly, Klingklang, etc.)  are no longer considered to be touching the ground
+- Renamed `pokemonId` and `type` to `species` in relevant Advancement triggers for conformity, this is a breaking change.
+- Added a separate `species` argument to the `pick_starter`, `pasture_use` and `resurrect_pokemon` Advancement triggers.
+- Made `CobblemonAgingDespawner` thresholds configurable via the config file.
+- Tweaked Berry flavor data to balance cooking pot mechanics
 
 ### Fixes
 - Fixed Particles sometimes facing the wrong direction (looking at you, Swords Dance)
@@ -165,7 +171,15 @@
 - Fixed certain Pokémon with forms not having appropriate stock Pokédex entries.
 - Fixed issue with Pokédex Scanner that caused the open/close overlay to have the wrong opacity values
 - Fixed dragon's breath not being usable on the restoration tank when it should be
+- Fixed Moon Stones not interacting properly with dripstone blocks.
 - Fixed some effects like particles from fishing rods appearing for players in the same coordinates in another world.
+- Fixed an issue with Sketch where the Pokémon using Sketch would not properly learn moves with special characters in their name (e.g. King's Shield, Baby-Doll Eyes, etc.)
+- Fixed wild Pokémon sometimes spawning with incorrect friendship values
+- Fixed typo while saving/loading NPCEntity causes data loss
+- Fixed an issue where catching a Pokémon while it was leashed to a fence would not update the fence.
+- Fixed the `dimensions` spawning condition using the incorrect ResourceLocation, causing it to not function properly.
+- 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)
 
 ### Developer
 - A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
@@ -211,6 +225,9 @@
 - Fixed `heldItem` property inside spawn files not working and causing crashes
 - Fixed `spawn_bedrock_particles` MoLang causing crashes when used in a server environment
 - The Pokédex form lang key definition now follows `cobblemon.ui.pokedex.info.form.{species}-{formname}` instead of `cobblemon.ui.pokedex.info.form.{formname}`.
+- Added `labels` & `has_label` as available Molang functions for the `speciesFunctions`
+- Added datapack-defined starter categories via `data/<namespace>/starters/*.json`, with built-in fallback and `useConfigStarters` merge option.
+- Fixed `entity.find_nearby_block` causing crashes when attempting to use a block tag
 
 ## [1.6.1 (January 26th, 2025)](#1-6-1)
 

ai_bugs.txt

@@ -0,0 +1,9 @@
+
+- Nodemaker bug, it thinks jumps are possible from water up an entire block - they aint
+   https://gyazo.com/759b8285e7c07046ff2e54adf0d7a7ac
+
+- Why is magikarp trying to path through ice
+  https://gyazo.com/ae230758c529f885eeb0dd91e60530d2
+
+- We should use mixins to put the path node filtering from OmniPathNodeMaker in the base classes otherwise
+  NPC wandering will be jank too.

build.gradle.kts

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

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

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

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

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

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

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

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

@@ -25,7 +25,7 @@ public abstract class EntityVillagerMixin {
     @Inject(method = "wantsToPickUp", at = @At(value = "RETURN"), cancellable = true)
     private void cobblemon$canGather(ItemStack stack, CallbackInfoReturnable<Boolean> ci) {
         final Villager villager = (Villager) (Object) this;
-        if(ci.getReturnValue() == false && Objects.equals(villager.getVillagerData().getProfession(), VillagerProfession.FARMER) && villager.getInventory().canAddItem(stack)) {
+        if (ci.getReturnValue() == false && Objects.equals(villager.getVillagerData().getProfession(), VillagerProfession.FARMER) && villager.getInventory().canAddItem(stack)) {
             if(VillagerGatherableItems.INSTANCE.getVillagerGatherableItems().contains(stack.getItem()))
                 ci.setReturnValue(true);
         }

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

@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.OrientationControllable;
-import com.cobblemon.mod.common.api.orientation.OrientationController;
-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.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.entity.pokemon.PokemonEntity;
-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.LocalPlayer;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
-import org.jetbrains.annotations.NotNull;
-import org.joml.Matrix3f;
-import org.joml.Vector3f;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.Map;
-
-@Mixin(LocalPlayer.class)
-public abstract class LocalPlayerMixin extends AbstractClientPlayer implements OrientationControllable {
-    @Shadow
-    private float jumpRidingScale;
-
-    public LocalPlayerMixin(ClientLevel clientLevel, GameProfile gameProfile) {
-        super(clientLevel, gameProfile);
-    }
-
-    @Inject(method = "getJumpRidingScale", at = @At("HEAD"), cancellable = true)
-    public void modifyJumpRidingScale(CallbackInfoReturnable<Float> cir) {
-        LocalPlayer player = (LocalPlayer) (Object) this;
-        if (player.isPassenger() && player.getVehicle() instanceof PokemonEntity pokemonEntity) {
-            var rideValue = pokemonEntity.<Float>ifRidingAvailableSupply(null, (behaviour, settings, state) -> {
-                if (behaviour.canJump(settings, state, pokemonEntity, player)) return null;
-                return behaviour.setRideBar(settings, state, pokemonEntity, player);
-            });
-            if (rideValue != null) {
-                cir.setReturnValue(rideValue);
-            }
-        }
-    }
-
-    @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());
-
-            if (locator == null) {
-                super.pick(hitDistance, partialTicks, hitFluids);
-            }
-
-            Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
-
-            OrientationController controller = this.getOrientationController();
-
-            float currEyeHeight = this.getEyeHeight();
-            Vector3f offset = new Vector3f(new Vector3f(0f, currEyeHeight - (this.getBbHeight() / 2), 0f));
-
-            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));
-            }
-
-            Matrix3f orientation = controller.isActive() && controller.getOrientation() != null ? controller.getOrientation() : new Matrix3f();
-            Vec3 rotatedEyeHeight = new Vec3(orientation.transform(offset));
-
-            Vec3 eyePosition = locatorOffset.add(pokemonEntity.position()).add(rotatedEyeHeight);
-
-            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 static @NotNull Vector3f cobblemon$getFirstPersonOffset(PosableModel model, Seat seat) {
-        Map<String, Vec3> cameraOffsets = model.getFirstPersonCameraOffset();
-
-        if (cameraOffsets.containsKey(seat.getLocator())) {
-            return cameraOffsets.get(seat.getLocator()).toVector3f();
-        } else {
-            return new Vector3f(0f, 0f, 0f);
-        }
-    }
-}

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

@@ -22,9 +22,9 @@ public class PiglinBarterMixin {
 
     @Inject(method = "isBarterCurrency", at = @At(value = "RETURN"), cancellable = true)
     private static void cobblemon$acceptsForBarter(ItemStack stack, CallbackInfoReturnable<Boolean> ci) {
-        if(!ci.getReturnValue()) {
+        if (!ci.getReturnValue()) {
             //TODO: Make a tag?
-            if(stack.is(CobblemonItems.RELIC_COIN_POUCH))
+            if (stack.is(CobblemonItems.RELIC_COIN_POUCH))
                 ci.setReturnValue(true);
         }
     }

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

@@ -21,9 +21,9 @@ import org.spongepowered.asm.mixin.injection.Slice;
 public abstract class PointedDripstoneBlockMixin {
 
     @Redirect(
-            method = "canTipGrow(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;)Z",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;is(Lnet/minecraft/world/level/Block;)Z", ordinal = 0),
-            slice = @Slice(from = @At(value = "FIELD", target = "Lnet/minecraft/world/level/block/Blocks;DRIPSTONE_BLOCK:Lnet/minecraft/world/level/Block;"))
+            method = "canGrow(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;)Z",
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;is(Lnet/minecraft/world/level/block/Block;)Z", ordinal = 0),
+            slice = @Slice(from = @At(value = "FIELD", target = "Lnet/minecraft/world/level/block/Blocks;DRIPSTONE_BLOCK:Lnet/minecraft/world/level/block/Block;"))
     )
     private static boolean cobblemon$validateMoonStoneDripstone(BlockState instance, Block block) {
         return instance.is(CobblemonBlockTags.DRIPSTONE_GROWABLE);

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

@@ -8,12 +8,10 @@
 
 package com.cobblemon.mod.common.mixin;
 
-import com.cobblemon.mod.common.client.sound.BlockEntitySoundTracker;
-import com.cobblemon.mod.common.client.sound.EntitySoundTracker;
 import com.cobblemon.mod.common.client.sound.BattleMusicController;
 import com.cobblemon.mod.common.client.sound.SoundTracker;
-import com.cobblemon.mod.common.duck.SoundManagerDuck;
 import com.cobblemon.mod.common.duck.SoundEngineDuck;
+import com.cobblemon.mod.common.duck.SoundManagerDuck;
 import net.minecraft.client.resources.sounds.BiomeAmbientSoundsHandler;
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.resources.sounds.UnderwaterAmbientSoundInstances;

common/src/main/java/com/cobblemon/mod/common/mixin/block/entity/SculkShriekerBlockEntityMixin.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.block.entity;
+
+import com.cobblemon.mod.common.Cobblemon;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.block.entity.SculkShriekerBlockEntity;
+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(SculkShriekerBlockEntity.class)
+public abstract class SculkShriekerBlockEntityMixin {
+  @Inject(method = "tryShriek", at = @At("HEAD"), cancellable = true)
+  // Cancel warden spawn by preventing the shrieker from activating
+  void cobblemon$cancelWardenSpawn(ServerLevel level, ServerPlayer player, CallbackInfo ci) {
+    if (Cobblemon.spawnConfig.isBlacklisted(EntityType.WARDEN)) ci.cancel();
+  }
+}

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

@@ -56,7 +56,7 @@ public abstract class ClientRecipeBookMixin {
                 case MISC -> var7 = CobblemonRecipeCategories.COOKING_POT_MISC.toVanillaCategory();
                 case FOODS -> var7 = CobblemonRecipeCategories.COOKING_POT_FOODS.toVanillaCategory();
                 case MEDICINES -> var7 = CobblemonRecipeCategories.COOKING_POT_MEDICINES.toVanillaCategory();
-                case BAITS -> var7 = CobblemonRecipeCategories.COOKING_POT_BAITS.toVanillaCategory();
+                case COMPLEX_DISHES -> var7 = CobblemonRecipeCategories.COOKING_POT_COMPLEX_DISHES.toVanillaCategory();
                 default -> throw new MatchException(null, null);
             }
             cir.setReturnValue(var7);

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

@@ -9,20 +9,10 @@
 package com.cobblemon.mod.common.mixin.client;
 
 import com.cobblemon.mod.common.api.scheduling.ClientTaskTracker;
-import com.cobblemon.mod.common.stadium.BattleCameraManagerClient;
-import com.cobblemon.mod.common.util.CameraExtensionsKt;
-import net.minecraft.client.Camera;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.renderer.LightTexture;
-import net.minecraft.world.entity.Entity;
-import org.joml.Matrix4f;
-import org.joml.Quaternionf;
-import org.joml.Vector3f;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -30,17 +20,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(GameRenderer.class)
 public class GameRendererMixin {
-    @Shadow @Final Minecraft minecraft;
-    @Shadow float renderDistance;
-    @Shadow @Final private LightTexture lightTexture;
-    @Shadow private boolean renderHand;
-
-    @Shadow private double getFov(Camera activeRenderInfo, float partialTicks, boolean useFOVSetting) { return 0.0; }
-    @Shadow public void resetProjectionMatrix(Matrix4f matrix) {}
-    @Shadow public Matrix4f getProjectionMatrix(double fov) { return new Matrix4f(); }
-    @Shadow private void renderItemInHand(Camera camera, float partialTick, Matrix4f projectionMatrix) {}
-    @Shadow public void pick(float partialTicks) {}
-
     @Unique
     long lastTime = -1;
 
@@ -63,44 +42,4 @@ public class GameRendererMixin {
         lastTime = newTime;
     }
 
-    @Inject(method = "renderLevel", at = @At(value = "HEAD"), cancellable = true)
-    public void renderLevel(DeltaTracker deltaTracker, CallbackInfo ci) {
-        if (BattleCameraManagerClient.INSTANCE.shouldUseStadiumCamera()) {
-            float f = deltaTracker.getGameTimeDeltaPartialTick(true);
-            this.lightTexture.updateLightTexture(f);
-            if (this.minecraft.getCameraEntity() == null) {
-                this.minecraft.setCameraEntity(this.minecraft.player);
-            }
-
-            this.minecraft.getProfiler().push("camera");
-            Camera stadiumCamera = new Camera();
-            Entity entity = (Entity) this.minecraft.player;
-            stadiumCamera.setup(this.minecraft.level, entity, true, false, 1.0F);
-
-            //adjust camera
-            BattleCameraManagerClient.INSTANCE.updateCameraData(f);
-            stadiumCamera.setPosition(BattleCameraManagerClient.INSTANCE.getCameraPosition());
-            Vector3f rotations = BattleCameraManagerClient.INSTANCE.getCameraRotation();
-            CameraExtensionsKt.setRotation(stadiumCamera, rotations.x, rotations.y, rotations.z);
-
-            this.renderDistance = (float)(this.minecraft.options.getEffectiveRenderDistance() * 16);
-            double d = this.getFov(stadiumCamera, f, true);
-            Matrix4f matrix4f = this.getProjectionMatrix(d);
-
-            this.resetProjectionMatrix(matrix4f);
-            Quaternionf quaternionf = stadiumCamera.rotation().conjugate(new Quaternionf());
-            Matrix4f matrix4f2 = (new Matrix4f()).rotation(quaternionf);
-            this.minecraft.levelRenderer.prepareCullFrustum(stadiumCamera.getPosition(), matrix4f2, this.getProjectionMatrix(Math.max(d, (double)(Integer)this.minecraft.options.fov().get())));
-            this.minecraft.levelRenderer.renderLevel(deltaTracker, false, stadiumCamera, (GameRenderer) (Object) this, this.lightTexture, matrix4f2, matrix4f);
-
-            this.minecraft.getProfiler().pop();
-
-            ci.cancel();
-        }
-    }
-
-    @Inject(method = "tick", at = @At(value = "TAIL"))
-    public void tick(CallbackInfo ci) {
-        BattleCameraManagerClient.INSTANCE.tickCameraManager();
-    }
 }

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

@@ -10,27 +10,51 @@ package com.cobblemon.mod.common.mixin.client;
 
 import com.cobblemon.mod.common.CobblemonNetwork;
 import com.cobblemon.mod.common.OrientationControllable;
+import com.cobblemon.mod.common.api.orientation.OrientationController;
+import com.cobblemon.mod.common.api.riding.Seat;
+import com.cobblemon.mod.common.client.entity.PokemonClientDelegate;
+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.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.net.messages.server.orientation.ServerboundUpdateOrientationPacket;
+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.LocalPlayer;
+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.Matrix3f;
+import org.joml.Vector3f;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Map;
 
 @Mixin(LocalPlayer.class)
-public abstract class LocalPlayerMixin extends LivingEntity {
+public abstract class LocalPlayerMixin extends AbstractClientPlayer implements OrientationControllable{
 
     @Unique Matrix3f cobblemon$lastOrientation;
 
-    protected LocalPlayerMixin(EntityType<? extends LivingEntity> entityType, Level level) {
-        super(entityType, level);
+    @Shadow
+    private float jumpRidingScale;
+
+    public LocalPlayerMixin(ClientLevel clientLevel, GameProfile gameProfile) {
+        super(clientLevel, gameProfile);
     }
 
 //    @Inject(method = "sendPosition", at = @At("TAIL"))
@@ -76,4 +100,73 @@ public abstract class LocalPlayerMixin extends LivingEntity {
         if (!(this instanceof OrientationControllable controllable)) return;
         controllable.getOrientationController().setActive(false);
     }
+
+    @Inject(method = "getJumpRidingScale", at = @At("HEAD"), cancellable = true)
+    public void modifyJumpRidingScale(CallbackInfoReturnable<Float> cir) {
+        LocalPlayer player = (LocalPlayer) (Object) this;
+        if (player.isPassenger() && player.getVehicle() instanceof PokemonEntity pokemonEntity) {
+            var rideValue = pokemonEntity.<Float>ifRidingAvailableSupply(null, (behaviour, settings, state) -> {
+                if (behaviour.canJump(settings, state, pokemonEntity, player)) return null;
+                return behaviour.setRideBar(settings, state, pokemonEntity, player);
+            });
+            if (rideValue != null) {
+                cir.setReturnValue(rideValue);
+            }
+        }
+    }
+
+    @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());
+
+            if (locator == null) {
+                super.pick(hitDistance, partialTicks, hitFluids);
+            }
+
+            Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
+
+            OrientationController controller = this.getOrientationController();
+
+            float currEyeHeight = this.getEyeHeight();
+            Vector3f offset = new Vector3f(new Vector3f(0f, currEyeHeight - (this.getBbHeight() / 2), 0f));
+
+            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));
+            }
+
+            Matrix3f orientation = controller.isActive() && controller.getOrientation() != null ? controller.getOrientation() : new Matrix3f();
+            Vec3 rotatedEyeHeight = new Vec3(orientation.transform(offset));
+
+            Vec3 eyePosition = locatorOffset.add(pokemonEntity.position()).add(rotatedEyeHeight);
+
+            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 static @NotNull Vector3f cobblemon$getFirstPersonOffset(PosableModel model, Seat seat) {
+        Map<String, Vec3> cameraOffsets = model.getFirstPersonCameraOffset();
+
+        if (cameraOffsets.containsKey(seat.getLocator())) {
+            return cameraOffsets.get(seat.getLocator()).toVector3f();
+        } else {
+            return new Vector3f(0f, 0f, 0f);
+        }
+    }
 }

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

@@ -50,10 +50,10 @@ public class RecipeBookCategoriesMixin {
     private static void cobblemon$addRecipeBookType(CallbackInfo ci) {
         ArrayList<RecipeBookCategories> types = new ArrayList<>(List.of($VALUES));
         types.add(cobblemon$createCategory("COOKING_POT_SEARCH", $VALUES.length, new ItemStack(Items.COMPASS)));
-        types.add(cobblemon$createCategory("COOKING_POT_FOODS", $VALUES.length + 1, new ItemStack(CobblemonItems.ROASTED_LEEK)));
-        types.add(cobblemon$createCategory("COOKING_POT_MEDICINES", $VALUES.length + 2, new ItemStack(CobblemonItems.HP_UP)));
-        types.add(cobblemon$createCategory("COOKING_POT_BAITS", $VALUES.length + 3, new ItemStack(CobblemonItems.PERSIM_BERRY)));
-        types.add(cobblemon$createCategory("COOKING_POT_MISC", $VALUES.length + 4, new ItemStack(CobblemonItems.MIRROR_HERB)));
+        types.add(cobblemon$createCategory("COOKING_POT_FOODS", $VALUES.length + 1, new ItemStack(CobblemonItems.LEEK_AND_POTATO_STEW)));
+        types.add(cobblemon$createCategory("COOKING_POT_MEDICINES", $VALUES.length + 2, new ItemStack(CobblemonItems.POTION)));
+        types.add(cobblemon$createCategory("COOKING_POT_COMPLEX_DISHES", $VALUES.length + 3, new ItemStack(CobblemonItems.POKE_PUFF)));
+        types.add(cobblemon$createCategory("COOKING_POT_MISC", $VALUES.length + 4, new ItemStack(CobblemonItems.PROTEIN)));
         $VALUES = types.toArray(RecipeBookCategories[]::new);
     }
 
@@ -64,7 +64,7 @@ public class RecipeBookCategoriesMixin {
                     CobblemonRecipeCategories.COOKING_POT_SEARCH.toVanillaCategory(),
                     CobblemonRecipeCategories.COOKING_POT_FOODS.toVanillaCategory(),
                     CobblemonRecipeCategories.COOKING_POT_MEDICINES.toVanillaCategory(),
-                    CobblemonRecipeCategories.COOKING_POT_BAITS.toVanillaCategory(),
+                    CobblemonRecipeCategories.COOKING_POT_COMPLEX_DISHES.toVanillaCategory(),
                     CobblemonRecipeCategories.COOKING_POT_MISC.toVanillaCategory());
             cir.setReturnValue(var10000);
             return;

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

@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.client;
+
+import net.minecraft.client.searchtree.IdSearchTree;
+import net.minecraft.client.searchtree.SearchTree;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+@Mixin(IdSearchTree.class)
+public abstract class SearchTreeMixin {
+    @Unique
+    private static final ThreadLocal<Boolean> reentryFlag = ThreadLocal.withInitial(() -> false);
+
+    /**
+     * Runs an additional search using the original search term where every instance of 'e' is replaced with 'é'
+     * Appends additional search results to original search results.
+     */
+    @Inject(method = "search(Ljava/lang/String;)Ljava/util/List;", at = @At("RETURN"), cancellable = true)
+    private void onSearch(String string, CallbackInfoReturnable<List> cir) {
+        // If flag is true, skip to avoid infinite loop
+        if (reentryFlag.get()) {
+            return;
+        }
+
+        try {
+            reentryFlag.set(true);
+            List originalResults = cir.getReturnValue();
+
+            if (!string.contains("poke")) {
+                return;
+            }
+
+            String modifiedString = string.replace("poke", "poké");
+            List additionalResults = ((SearchTree)this).search(modifiedString);
+
+            Set combinedSet = new LinkedHashSet<>();
+            combinedSet.addAll(originalResults);
+            combinedSet.addAll(additionalResults);
+
+            cir.setReturnValue(new ArrayList<>(combinedSet));
+        } finally {
+            reentryFlag.set(false);
+        }
+    }
+}

common/src/main/java/com/cobblemon/mod/common/mixin/entity/SpawnPlacementsMixin.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.entity;
+
+import com.cobblemon.mod.common.Cobblemon;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.SpawnPlacements;
+import net.minecraft.world.level.LevelReader;
+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(SpawnPlacements.class)
+public class SpawnPlacementsMixin {
+  @Inject(method = "isSpawnPositionOk", at = @At("HEAD"), cancellable = true)
+  // Cancel general mob spawn by returning false
+  private static void cobblemon$cancelMobSpawns(EntityType<?> entityType, LevelReader level, BlockPos pos, CallbackInfoReturnable<Boolean> cir) {
+    if (Cobblemon.spawnConfig.isBlacklisted(entityType)) cir.setReturnValue(false);
+  }
+}

common/src/main/java/com/cobblemon/mod/common/mixin/structure/StructureTemplateMixin.java

@@ -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.structure;
+
+import com.cobblemon.mod.common.Cobblemon;
+
+import com.google.common.collect.Iterators;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.StructureEntityInfo;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import java.util.Iterator;
+
+@Mixin(StructureTemplate.class)
+public abstract class StructureTemplateMixin {
+  @ModifyExpressionValue(
+    method = "placeEntities",
+    at = @At(value = "INVOKE",
+      target = "Ljava/util/List;iterator()Ljava/util/Iterator;"
+    )) // Modifies the iterator to ignore entities that are blacklisted
+  private Iterator<StructureEntityInfo> cobblemon$cancelStructureSpawn(Iterator<StructureEntityInfo> original) {
+    return Iterators.filter(original, info ->
+      Cobblemon.spawnConfig.isBlacklisted(info.nbt.getString("id"))
+    );
+  }
+}

common/src/main/java/com/cobblemon/mod/common/mixin/structure/structures/EndCityPieceMixin.java

@@ -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.structure.structures;
+
+import com.cobblemon.mod.common.Cobblemon;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.ServerLevelAccessor;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.world.level.levelgen.structure.structures.EndCityPieces;
+
+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(EndCityPieces.EndCityPiece.class)
+public abstract class EndCityPieceMixin {
+    @Inject(
+        method = "handleDataMarker",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/world/entity/EntityType;create(Lnet/minecraft/world/level/Level;)Lnet/minecraft/world/entity/Entity;"
+        ),
+        cancellable = true) // Cancel the function if name == "Sentry" to prevent Shulker from spawning
+    void cobblemon$cancelShulkerSpawn(String name, BlockPos pos, ServerLevelAccessor level, RandomSource random, BoundingBox box, CallbackInfo ci) {
+        if (Cobblemon.spawnConfig.isBlacklisted(EntityType.SHULKER)) ci.cancel();
+    }
+}

common/src/main/java/com/cobblemon/mod/common/mixin/structure/structures/OceanMonumentPieceMixin.java

@@ -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.mixin.structure.structures;
+
+import com.cobblemon.mod.common.Cobblemon;
+
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.world.level.levelgen.structure.structures.OceanMonumentPieces;
+
+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(OceanMonumentPieces.OceanMonumentPiece.class)
+public abstract class OceanMonumentPieceMixin {
+    @Inject(method = "spawnElder", at = @At("HEAD"), cancellable = true)
+    void cobblemon$cancelElderGuardianSpawn(WorldGenLevel level, BoundingBox box, int x, int y, int z, CallbackInfo ci) {
+        if (Cobblemon.spawnConfig.isBlacklisted(EntityType.ELDER_GUARDIAN)) ci.cancel();
+    }
+}

common/src/main/java/com/cobblemon/mod/common/mixin/structure/structures/OceanRuinPieceMixin.java

@@ -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.structure.structures;
+
+import com.cobblemon.mod.common.Cobblemon;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.ServerLevelAccessor;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.world.level.levelgen.structure.structures.OceanRuinPieces;
+
+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(OceanRuinPieces.OceanRuinPiece.class)
+public abstract class OceanRuinPieceMixin {
+  @Inject(
+    method = "handleDataMarker",
+    at = @At(
+      value = "INVOKE",
+      target = "Lnet/minecraft/world/entity/EntityType;create(Lnet/minecraft/world/level/Level;)Lnet/minecraft/world/entity/Entity;"
+    ),
+    cancellable = true) // Cancel the function if name == "drowned" to prevent Drowned from spawning
+  void cobblemon$cancelDrownedSpawn(String name, BlockPos pos, ServerLevelAccessor level, RandomSource random, BoundingBox box, CallbackInfo ci) {
+    if (Cobblemon.spawnConfig.isBlacklisted(EntityType.DROWNED)) ci.cancel();
+  }
+}

common/src/main/java/com/cobblemon/mod/common/mixin/structure/structures/SwampHutPieceMixin.java

@@ -0,0 +1,46 @@
+/*
+ * 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.structure.structures;
+
+import com.cobblemon.mod.common.Cobblemon;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.ServerLevelAccessor;
+import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.world.level.levelgen.structure.structures.SwampHutPiece;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(SwampHutPiece.class)
+public abstract class SwampHutPieceMixin {
+  @WrapOperation(
+    method = "postProcess",
+    at = @At(
+      value = "INVOKE",
+      target = "Lnet/minecraft/world/level/levelgen/structure/BoundingBox;isInside(Lnet/minecraft/core/Vec3i;)Z"
+    )) // Prevent witch spawn by making box.isInside return false
+  boolean cobblemon$cancelWitchSpawn(BoundingBox box, Vec3i vector, Operation<Boolean> original) {
+    return !Cobblemon.spawnConfig.isBlacklisted(EntityType.WITCH) && original.call(box, vector);
+  }
+
+  @WrapOperation(method = "postProcess",
+    at = @At(
+      value = "INVOKE",
+      target = "Lnet/minecraft/world/level/levelgen/structure/structures/SwampHutPiece;spawnCat(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/level/levelgen/structure/BoundingBox;)V"
+    )) // Prevent cat spawn by calling nothing
+  void cobblemon$cancelWitchCatSpawn(SwampHutPiece piece, ServerLevelAccessor level, BoundingBox box, Operation<Void> original) {
+    if (Cobblemon.spawnConfig.isBlacklisted(EntityType.CAT)) return;
+    original.call(piece, level, box);
+  }
+}

common/src/main/java/com/cobblemon/mod/common/mixin/structure/structures/WoodlandMansionPieceMixin.java

@@ -0,0 +1,38 @@
+/*
+ * 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.structure.structures;
+
+import com.cobblemon.mod.common.Cobblemon;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.level.levelgen.structure.structures.WoodlandMansionPieces;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import java.util.List;
+
+@Mixin(WoodlandMansionPieces.WoodlandMansionPiece.class)
+public abstract class WoodlandMansionPieceMixin {
+  @WrapOperation(
+    method = "handleDataMarker",
+    at = @At(
+      value = "INVOKE",
+      target = "Ljava/util/List;add(Ljava/lang/Object;)Z"
+    )) // Wraps calls to add to the list and ignores it if the mob to add is blacklisted
+  boolean cobblemon$cancelMansionSpawns(List instance, Object entity, Operation<Boolean> original) {
+    if (Cobblemon.spawnConfig.isBlacklisted(((Mob) entity).getType())) {
+      return true;
+    }
+    return original.call(instance, entity);
+  }
+}

common/src/main/java/com/cobblemon/mod/common/mixin/worldgen/BeeHiveDecoratorMixin.java

@@ -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.worldgen;
+
+import com.cobblemon.mod.common.Cobblemon;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.levelgen.feature.treedecorators.BeehiveDecorator;
+import org.jetbrains.annotations.NotNull;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import java.util.Optional;
+import java.util.function.Consumer;
+
+@Mixin(BeehiveDecorator.class)
+public abstract class BeeHiveDecoratorMixin {
+  @WrapOperation(
+    method = "place",
+    at = @At(
+      value = "INVOKE",
+      target = "Ljava/util/Optional;ifPresent(Ljava/util/function/Consumer;)V"
+    )
+  )
+  <T> void cobblemon$cancelBeeSpawn(Optional instance, Consumer<? super @NotNull T> action, Operation<Void> original) {
+    if (Cobblemon.spawnConfig.isBlacklisted(EntityType.BEE)) return;
+    original.call(instance, action);
+  }
+
+}

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

@@ -40,9 +40,9 @@ import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
 import com.cobblemon.mod.common.api.scheduling.ServerRealTimeTaskTracker
 import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
 import com.cobblemon.mod.common.api.spawning.BestSpawner
-import com.cobblemon.mod.common.api.spawning.CobblemonSpawningProspector
-import com.cobblemon.mod.common.api.spawning.context.AreaContextResolver
-import com.cobblemon.mod.common.api.spawning.prospecting.SpawningProspector
+import com.cobblemon.mod.common.api.spawning.CobblemonSpawningZoneGenerator
+import com.cobblemon.mod.common.api.spawning.position.AreaSpawnablePositionResolver
+import com.cobblemon.mod.common.api.spawning.SpawningZoneGenerator
 import com.cobblemon.mod.common.api.starter.StarterHandler
 import com.cobblemon.mod.common.api.storage.PokemonStoreManager
 import com.cobblemon.mod.common.api.storage.adapter.conversions.ReforgedConversion
@@ -73,6 +73,7 @@ import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.client.CobblemonPack
 import com.cobblemon.mod.common.command.argument.*
 import com.cobblemon.mod.common.config.CobblemonConfig
+import com.cobblemon.mod.common.config.CobblemonSpawnConfig
 import com.cobblemon.mod.common.config.LastChangedVersion
 import com.cobblemon.mod.common.config.constraint.IntConstraint
 import com.cobblemon.mod.common.config.starter.StarterConfig
@@ -160,8 +161,9 @@ object Cobblemon {
     var isDedicatedServer = false
     val showdownThread = ShowdownThread()
     lateinit var config: CobblemonConfig
-    var prospector: SpawningProspector = CobblemonSpawningProspector
-    var areaContextResolver: AreaContextResolver = object : AreaContextResolver {}
+    lateinit var spawnConfig: CobblemonSpawnConfig
+    var spawningZoneGenerator: SpawningZoneGenerator = CobblemonSpawningZoneGenerator
+    var areaSpawnablePositionResolver: AreaSpawnablePositionResolver = object : AreaSpawnablePositionResolver {}
     val bestSpawner = BestSpawner
     val battleRegistry = BattleRegistry
     var storage = PokemonStoreManager()
@@ -466,11 +468,13 @@ object Cobblemon {
 
     fun loadConfig() {
         initializeConfig()
+        this.spawnConfig = CobblemonSpawnConfig("config/$MODID/blacklisted_mobs.json")
         bestSpawner.init()
     }
 
     fun reloadConfig() {
         initializeConfig()
+        spawnConfig.load()
         bestSpawner.reloadConfig()
     }
 

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

@@ -15,6 +15,9 @@ object CobblemonActivities {
     val BATTLING = register(Activity("battling"))
     val ACTION_EFFECT = register(Activity("action_effect"))
     val NPC_CHATTING = register(Activity("npc_chatting"))
+    val POKEMON_SLEEPING_ACTIVITY = register(Activity("pokemon_sleeping"))
+    val POKEMON_GROW_CROP = register(Activity("pokemon_grow_crop"))
+    val POKEMON_SLEEP_ON_TRAINER_BED = register(Activity("pokemon_sleep_on_trainer_bed"))
 
     fun register(activity: Activity): Activity {
         activities.add(activity)

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

@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common
+
+import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
+import com.cobblemon.mod.common.api.ai.CobblemonBehaviour
+import com.cobblemon.mod.common.api.ai.config.BehaviourConfig
+import com.cobblemon.mod.common.api.ai.config.task.TaskConfig
+import com.cobblemon.mod.common.api.data.JsonDataRegistry
+import com.cobblemon.mod.common.api.data.JsonDataRegistry.Companion.JSON_EXTENSION
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.net.messages.client.data.BehaviourSyncPacket
+import com.cobblemon.mod.common.util.adapters.ActivityAdapter
+import com.cobblemon.mod.common.util.adapters.BehaviourConfigAdapter
+import com.cobblemon.mod.common.util.adapters.ExpressionAdapter
+import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
+import com.cobblemon.mod.common.util.adapters.ExpressionOrEntityVariableAdapter
+import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
+import com.cobblemon.mod.common.util.adapters.TaskConfigAdapter
+import com.cobblemon.mod.common.util.adapters.TranslatedTextAdapter
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.endsWith
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import com.mojang.datafixers.util.Either
+import java.io.File
+import net.minecraft.network.chat.Component
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.server.packs.PackType
+import net.minecraft.server.packs.resources.ResourceManager
+import net.minecraft.world.entity.schedule.Activity
+
+object CobblemonBehaviours : JsonDataRegistry<CobblemonBehaviour> {
+    override val gson: Gson = GsonBuilder()
+        .setPrettyPrinting()
+        .registerTypeAdapter(Activity::class.java, ActivityAdapter)
+        .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
+        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
+        .registerTypeAdapter(BehaviourConfig::class.java, BehaviourConfigAdapter)
+        .registerTypeAdapter(TaskConfig::class.java, TaskConfigAdapter)
+        .registerTypeAdapter(
+            TypeToken.getParameterized(Either::class.java, Expression::class.java, MoLangConfigVariable::class.java).type,
+            ExpressionOrEntityVariableAdapter
+        )
+        .registerTypeAdapter(Component::class.java, TranslatedTextAdapter)
+        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+        .create()
+
+    override val typeToken = TypeToken.get(CobblemonBehaviour::class.java)
+    override val resourcePath = "behaviours"
+    override val id: ResourceLocation = cobblemonResource("behaviours")
+    override val type = PackType.SERVER_DATA
+    override val observable = SimpleObservable<CobblemonBehaviours>()
+
+    /**
+     * Any behaviours that are put into /pokemon/auto will be automatically
+     * applied to all Pokémon species/forms that don't define a baseAI list of
+     * behaviour configurations. This is an addon-friendly way of defining the general
+     * rules of Pokémon AI without it being unavoidable for specific
+     * species.
+     */
+    val autoPokemonBehaviours = mutableListOf<CobblemonBehaviour>()
+
+    val behaviours = mutableMapOf<ResourceLocation, CobblemonBehaviour>()
+
+    override fun sync(player: ServerPlayer) {
+        player.sendPacket(BehaviourSyncPacket(behaviours.filter { it.value.visible }))
+    }
+
+    override fun reload(manager: ResourceManager) {
+        autoPokemonBehaviours.clear()
+        val data = mutableMapOf<ResourceLocation, CobblemonBehaviour>()
+        manager.listResources(resourcePath) { path -> path.endsWith(JSON_EXTENSION) }.forEach { (identifier, resource) ->
+            resource.open().use { stream ->
+                stream.bufferedReader().use { reader ->
+                    val resolvedIdentifier = ResourceLocation.fromNamespaceAndPath(identifier.namespace, File(identifier.path).nameWithoutExtension)
+                    val behaviour = parse(reader, resolvedIdentifier)
+                    if ("pokemon/auto/" in identifier.path) {
+                        autoPokemonBehaviours.add(behaviour)
+                    }
+                    data[resolvedIdentifier] = behaviour
+                }
+            }
+        }
+
+        reload(data)
+        Cobblemon.LOGGER.info("Loaded ${behaviours.size} entity behaviours")
+        observable.emit(this)
+    }
+
+    override fun reload(data: Map<ResourceLocation, CobblemonBehaviour>) {
+        behaviours.clear()
+        behaviours.putAll(data)
+    }
+}

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

@@ -37,9 +37,6 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
     @JvmField
     val PC: BlockEntityType<PCBlockEntity> = this.create("pc", BlockEntityType.Builder.of(::PCBlockEntity, CobblemonBlocks.PC).build(null))
 
-    @JvmField
-    val STADIUM: BlockEntityType<StadiumBlockEntity> = this.create("stadium_block", BlockEntityType.Builder.of(::StadiumBlockEntity, CobblemonBlocks.STADIUM_BLOCK).build(null))
-
     @JvmField
     val LECTERN: BlockEntityType<LecternBlockEntity> = this.create("lectern", BlockEntityType.Builder.of(::LecternBlockEntity, CobblemonBlocks.LECTERN).build(null))
 

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

@@ -482,9 +482,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @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 }))
 
-    @JvmField
-    val STADIUM_BLOCK = create("stadium_block", StadiumBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2F)))
-
     @JvmField
     val LECTERN = create("lectern", LecternBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).sound(SoundType.WOOD).strength(2.5F).ignitedByLava()))
 

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

@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common
-
-import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.api.ai.config.BrainConfig
-import com.cobblemon.mod.common.api.ai.config.task.TaskConfig
-import com.cobblemon.mod.common.api.data.DataRegistry
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.util.adapters.ActivityAdapter
-import com.cobblemon.mod.common.util.adapters.BrainConfigAdapter
-import com.cobblemon.mod.common.util.adapters.ExpressionAdapter
-import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
-import com.cobblemon.mod.common.util.adapters.TaskConfigAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-import net.minecraft.world.entity.schedule.Activity
-
-object CobblemonBrainConfigs : JsonDataRegistry<List<BrainConfig>> {
-    override val gson: Gson = GsonBuilder()
-        .setPrettyPrinting()
-        .registerTypeAdapter(Activity::class.java, ActivityAdapter)
-        .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
-        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
-        .registerTypeAdapter(BrainConfig::class.java, BrainConfigAdapter)
-        .registerTypeAdapter(TaskConfig::class.java, TaskConfigAdapter)
-        .create()
-
-    override val typeToken = TypeToken.getParameterized(List::class.java, BrainConfig::class.java) as TypeToken<List<BrainConfig>>
-    override val resourcePath = "brain_presets"
-    override val id: ResourceLocation = cobblemonResource("brain_presets")
-    override val type = PackType.SERVER_DATA
-    override val observable = SimpleObservable<CobblemonBrainConfigs>()
-
-    val presets = mutableMapOf<ResourceLocation, List<BrainConfig>>()
-
-    override fun sync(player: ServerPlayer) {
-        // TODO implement probs ay
-    }
-
-    override fun reload(data: Map<ResourceLocation, List<BrainConfig>>) {
-        presets.clear()
-        presets.putAll(data)
-    }
-}

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

@@ -63,6 +63,7 @@ object CobblemonCommands {
         SpectateBattleCommand.register(dispatcher)
         CobblemonConfigCommand.register(dispatcher)
         UnlockPCBoxWallpaperCommand.register(dispatcher)
+        BehaviourEditCommand.register(dispatcher)
         ChangePCBoxesCommand.register(dispatcher)
         MarkGiveCommand.register(dispatcher)
         MarkTakeCommand.register(dispatcher)

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

@@ -9,12 +9,7 @@
 package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.block.PotComponent
-import com.cobblemon.mod.common.item.components.BaitEffectsComponent
-import com.cobblemon.mod.common.item.components.FlavourComponent
-import com.cobblemon.mod.common.item.components.FoodColourComponent
-import com.cobblemon.mod.common.item.components.HeldItemCapableComponent
-import com.cobblemon.mod.common.item.components.PokemonItemComponent
-import com.cobblemon.mod.common.item.components.RodBaitComponent
+import com.cobblemon.mod.common.item.components.*
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import net.minecraft.core.Registry
 import net.minecraft.core.component.DataComponentType
@@ -60,6 +55,20 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
         .networkSynchronized(FoodColourComponent.PACKET_CODEC)
         .build())
 
+    val INGREDIENT: DataComponentType<IngredientComponent> = create("ingredient", DataComponentType.builder<IngredientComponent>()
+            .persistent(IngredientComponent.CODEC)
+            .networkSynchronized(IngredientComponent.PACKET_CODEC)
+            .build())
+
+    val FOOD: DataComponentType<FoodComponent> = create("food", DataComponentType.builder<FoodComponent>()
+            .persistent(FoodComponent.CODEC)
+            .networkSynchronized(FoodComponent.PACKET_CODEC)
+            .build())
+
+    val MOB_EFFECTS: DataComponentType<MobEffectsComponent> = create("mob_effects", DataComponentType.builder<MobEffectsComponent>()
+        .persistent(MobEffectsComponent.CODEC)
+        .networkSynchronized(MobEffectsComponent.PACKET_CODEC)
+        .build())
 
     fun register() {
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:pokemon_item"), POKEMON_ITEM)
@@ -68,6 +77,9 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:bait_effects"), BAIT_EFFECTS)
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:flavour"), FLAVOUR)
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:food_colour"), FOOD_COLOUR)
+        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:ingredient"), INGREDIENT)
+        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:food"), FOOD)
+        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:mob_effects"), MOB_EFFECTS)
     }
 
     override val registry = BuiltInRegistries.DATA_COMPONENT_TYPE

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

@@ -34,6 +34,8 @@ import com.cobblemon.mod.common.item.berry.PPRestoringBerryItem
 import com.cobblemon.mod.common.item.berry.PortionHealingBerryItem
 import com.cobblemon.mod.common.item.berry.StatusCuringBerryItem
 import com.cobblemon.mod.common.item.berry.VolatileCuringBerryItem
+import com.cobblemon.mod.common.item.food.PonigiriItem
+import com.cobblemon.mod.common.item.food.SinisterTeaItem
 import com.cobblemon.mod.common.item.interactive.*
 import com.cobblemon.mod.common.item.interactive.ability.AbilityChangeItem
 import com.cobblemon.mod.common.platform.PlatformRegistry
@@ -53,6 +55,7 @@ import net.minecraft.world.food.FoodProperties
 import net.minecraft.world.item.BlockItem
 import net.minecraft.world.item.HangingSignItem
 import net.minecraft.world.item.Item
+import net.minecraft.world.item.Item.Properties
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
 import net.minecraft.world.item.Rarity
@@ -363,245 +366,90 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     val APRIJUICE_PINK = aprijuiceItem(Apricorn.PINK)
 
     @JvmField
-    val POKE_PUFF = noSettingsItem("poke_puff") // todo make a PokePuffItem class for friendship boosting purposes
+    val PONIGIRI = create("ponigiri", PonigiriItem())
+
+    @JvmField
+    val SINISTER_TEA = create("sinister_tea", SinisterTeaItem())
+
+    @JvmField
+    val POKE_PUFF = pokepuffItem("poke_puff")
 
     // FOODS
     @JvmField
     val SWEET_HEART = noSettingsItem("sweet_heart") // todo make a SweetHeartItem class for breeding purposes
 
     @JvmField
-    val PEWTER_CRUNCHIES = create("pewter_crunchies", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
+    val TASTY_TAIL = noSettingsItem("tasty_tail")
 
-    @JvmField
-    val RAGE_CANDY_BAR = create("rage_candy_bar", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
+    @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
-    val LAVA_COOKIE = create("lava_cookie", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
+    @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
-    val OLD_GATEAU = create("old_gateau", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
+    @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
-    val CASTELIACONE = create("casteliacone", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
+    @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
-    val SHALOR_SABLE = create("shalor_sable", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
+    @JvmField // todo get final values for this from vera
+    val CASTELIACONE = regionalFoodItem("casteliacone", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
 
-    @JvmField
-    val LUMIOSE_GALETTE = create("lumiose_galette", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
+    @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
-    val BIG_MALASADA = create("big_malasada", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
+    @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 see what we are doing for these (are there different kinds?)
-    val CURRY = create("curry", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .usingConvertsTo(Items.BOWL)
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })*/
+    @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
-    val JUBILIFE_MUFFIN = create("jubilife_muffin", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
+    @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 see what we are doing for these (are there different kinds?)
-    val SANDWICH = create("sandwich", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .usingConvertsTo(Items.BOWL)
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })*/
+    @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)
 
-    // todo we might need to wait on these for later?
+    @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)
+
+    // todo we might need to wait on these for later? These impact battles and may be harder to do
     /*@JvmField
-    val CHOICE_DUMPLING = noSettingsItem("choice_dumpling") // todo make a ChoiceDumpingItem class for breeding purposes
+    val CHOICE_DUMPLING = noSettingsItem("choice_dumpling") // todo make a ChoiceDumpingItem class for battle purposes
     @JvmField
-    val SWAP_SNACK = noSettingsItem("swap_snack") // todo make a SwapSnackItem class for breeding purposes
+    val SWAP_SNACK = noSettingsItem("swap_snack") // todo make a SwapSnackItem class for battle purposes
     @JvmField
-    val TWICE_SPICED_BEETROOT = noSettingsItem("twice_spiced_beetroot") // todo make a TwiceSpiceBeetrootItem class for breeding purposes
+    val TWICE_SPICED_BEETROOT = noSettingsItem("twice_spiced_beetroot") // todo make a TwiceSpiceBeetrootItem class for battle purposes
 */
     @JvmField
     val POTATO_MOCHI = create("potato_mochi", object : Item(Properties().stacksTo(16)
         .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
+            .nutrition(10) // todo get final values for this from vera
+            .saturationModifier(1.2F) // todo get final values for this from vera
             .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
+            .build())) {})
     @JvmField
     val FRIED_RICE = create("fried_rice", object : Item(Properties().stacksTo(16)
         .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
+            .nutrition(10) // todo get final values for this from vera
+            .saturationModifier(1.2F) // todo get final values for this from vera
             .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
+            .build())) {})
     @JvmField
     val CANDIED_APPLE = create("candied_apple", object : Item(Properties().stacksTo(16)
         .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
+            .nutrition(10) // todo get final values for this from vera
+            .saturationModifier(1.2F) // todo get final values for this from vera
             .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
+            .build())) {})
     @JvmField
     val CANDIED_BERRY = create("candied_berry", object : Item(Properties().stacksTo(16)
         .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
+            .nutrition(10) // todo get final values for this from vera
+            .saturationModifier(1.2F) // todo get final values for this from vera
             .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-    @JvmField
-    val JELLY_DOUGHNUT = create("jelly_doughnut", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-            .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-
-
-    // todo etc?
+            .build())) {})
 
     //@JvmField
     //val SCATTER_BANG = this.create("scatter_bang", ScatterBangItem(Item.Settings()))
@@ -619,8 +467,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val PC = blockItem("pc", CobblemonBlocks.PC)
     @JvmField
-    val STADIUM_BLOCK = blockItem("stadium_block", CobblemonBlocks.STADIUM_BLOCK)
-    @JvmField
     val PASTURE = blockItem("pasture", CobblemonBlocks.PASTURE)
     @JvmField
     val DISPLAY_CASE = blockItem("display_case", CobblemonBlocks.DISPLAY_CASE)
@@ -830,6 +676,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     val FINE_REMEDY = create("fine_remedy", RemedyItem(RemedyItem.FINE))
     @JvmField
     val SUPERB_REMEDY = create("superb_remedy", RemedyItem(RemedyItem.SUPERB))
+    @JvmField
+    val MOOMOO_MILK = create("moomoo_milk", Item(Item.Properties()))
 
     @JvmField
     val POTION = create("potion", PotionItem(PotionType.POTION))
@@ -1644,6 +1492,44 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
         return item
     }
 
+    private fun pokepuffItem(name: String): PokePuffItem {
+        val item = create("poke_puff", PokePuffItem())
+        return item
+    }
+
+    private fun regionalFoodItem(
+        name: String,
+        stacksTo: Int,
+        nutrition: Int,
+        saturationModifier: Float,
+        effect: MobEffectInstance? = null,
+        effectChance: Float? = null,
+        alwaysEdible: Boolean = false,
+        convertsToOnUse: ItemStack? = null
+    ): RegionalFoodItem {
+        val foodPropertiesBuilder = FoodProperties.Builder()
+            .nutrition(nutrition)
+            .saturationModifier(saturationModifier)
+
+        if (effect != null && effectChance != null) {
+            foodPropertiesBuilder.effect(effect, effectChance)
+        }
+
+        if (alwaysEdible == true) {
+            foodPropertiesBuilder.alwaysEdible()
+        }
+
+        if (convertsToOnUse != null && !convertsToOnUse.isEmpty) {
+            foodPropertiesBuilder.usingConvertsTo(convertsToOnUse.item)
+        }
+
+        val properties = Item.Properties()
+            .stacksTo(stacksTo)
+            .food(foodPropertiesBuilder.build())
+
+        return create(name, RegionalFoodItem(properties))
+    }
+
     private fun heldItem(name: String, remappedName: String? = null): CobblemonItem = create(
         name,
         CobblemonItem(Item.Properties()).also {

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

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

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

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.api.net.NetworkPacket
+import com.cobblemon.mod.common.client.net.OpenBehaviourEditorHandler
 import com.cobblemon.mod.common.client.net.CalculateSeatPositionsHandler
 import com.cobblemon.mod.common.client.net.PlayerInteractOptionsHandler
 import com.cobblemon.mod.common.client.net.SetClientPlayerDataHandler
@@ -60,6 +61,7 @@ import com.cobblemon.mod.common.client.net.trade.TradeProcessStartedHandler
 import com.cobblemon.mod.common.client.net.trade.TradeStartedHandler
 import com.cobblemon.mod.common.client.net.trade.TradeUpdatedHandler
 import com.cobblemon.mod.common.net.PacketRegisterInfo
+import com.cobblemon.mod.common.net.messages.client.OpenBehaviourEditorPacket
 import com.cobblemon.mod.common.net.messages.client.CalculateSeatPositionsPacket
 import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket
 import com.cobblemon.mod.common.net.messages.client.SetClientPlayerDataPacket
@@ -138,6 +140,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.SetEntityBehaviourPacket
 import com.cobblemon.mod.common.net.messages.server.block.AdjustBlockEntityViewerCountPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectedPacket
@@ -184,6 +187,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.SetEntityBehaviourHandler
 import com.cobblemon.mod.common.net.serverhandling.block.AdjustBlockEntityViewerCountHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectCancelledHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectedHandler
@@ -225,10 +229,6 @@ import com.cobblemon.mod.common.net.serverhandling.trade.ChangeTradeAcceptanceHa
 import com.cobblemon.mod.common.net.serverhandling.trade.OfferTradeHandler
 import com.cobblemon.mod.common.net.serverhandling.trade.PerformTradeHandler
 import com.cobblemon.mod.common.net.serverhandling.trade.UpdateTradeOfferHandler
-import com.cobblemon.mod.common.stadium.BattleCamerasSyncPacket
-import com.cobblemon.mod.common.stadium.BattleCameraSetupHandler
-import com.cobblemon.mod.common.stadium.BattleCameraPacket
-import com.cobblemon.mod.common.stadium.BattleCameraManagersSyncPacket
 import com.cobblemon.mod.common.util.server
 import net.minecraft.server.level.ServerPlayer
 
@@ -259,6 +259,7 @@ object CobblemonNetwork {
 
         // Pokemon Update Packets
         list.add(PacketRegisterInfo(FriendshipUpdatePacket.ID, FriendshipUpdatePacket::decode, PokemonUpdatePacketHandler()))
+        list.add(PacketRegisterInfo(FullnessUpdatePacket.ID, FullnessUpdatePacket::decode, PokemonUpdatePacketHandler()))
         list.add(PacketRegisterInfo(MoveSetUpdatePacket.ID, MoveSetUpdatePacket::decode, PokemonUpdatePacketHandler()))
         list.add(PacketRegisterInfo(NatureUpdatePacket.ID, NatureUpdatePacket::decode, PokemonUpdatePacketHandler()))
         list.add(PacketRegisterInfo(ShinyUpdatePacket.ID, ShinyUpdatePacket::decode, PokemonUpdatePacketHandler()))
@@ -386,8 +387,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(SeasoningRegistrySyncPacket.ID, SeasoningRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(FlowRegistrySyncPacket.ID, FlowRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(CosmeticItemAssignmentSyncPacket.ID, CosmeticItemAssignmentSyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(BattleCamerasSyncPacket.ID, BattleCamerasSyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(BattleCameraManagersSyncPacket.ID, BattleCameraManagersSyncPacket::decode, DataRegistrySyncPacketHandler()))
+        list.add(PacketRegisterInfo(BehaviourSyncPacket.ID, BehaviourSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(MarkRegistrySyncPacket.ID, MarkRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
 
         // Effects
@@ -442,15 +442,15 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(CloseNPCEditorPacket.ID, CloseNPCEditorPacket::decode, CloseNPCEditorHandler))
         list.add(PacketRegisterInfo(OpenNPCEditorPacket.ID, OpenNPCEditorPacket::decode, OpenNPCEditorHandler))
 
+        // Behaviours
+        list.add(PacketRegisterInfo(OpenBehaviourEditorPacket.ID, OpenBehaviourEditorPacket::decode, OpenBehaviourEditorHandler))
+
         // Pokédex scanning
         list.add(PacketRegisterInfo(ServerConfirmedRegisterPacket.ID, ServerConfirmedRegisterPacket::decode, ServerConfirmedRegisterHandler))
 
         // Debug / cheats
         list.add(PacketRegisterInfo(CalculateSeatPositionsPacket.ID, CalculateSeatPositionsPacket::decode, CalculateSeatPositionsHandler))
 
-        // Stadium packets
-        list.add(PacketRegisterInfo(BattleCameraPacket.ID, BattleCameraPacket::decode, BattleCameraSetupHandler))
-
         // Riding
         list.add(PacketRegisterInfo(ClientboundUpdateRidingStatePacket.ID, ClientboundUpdateRidingStatePacket::decode, ClientboundUpdateRidingStateHandler))
 
@@ -560,6 +560,9 @@ object CobblemonNetwork {
         // Cooking
         list.add(PacketRegisterInfo(ToggleCookingPotLidPacket.ID, ToggleCookingPotLidPacket::decode, ToggleCookingPotLidHandler))
 
+        // Behaviour Packets
+        list.add(PacketRegisterInfo(SetEntityBehaviourPacket.ID, SetEntityBehaviourPacket::decode, SetEntityBehaviourHandler))
+
         return list
     }
 

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

@@ -36,13 +36,9 @@ object CobblemonPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Regist
     @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("saccharine_honey_log")
+    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))
-    @JvmField
-    val STADIUM_BLOCK_KEY: ResourceKey<PoiType> = createKey("stadium_block")
-    @JvmField
-    val STADIUM_BLOCK = create(STADIUM_BLOCK_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.STADIUM_BLOCK), 0, 1))
 
     private fun createKey(string: String): ResourceKey<PoiType> = ResourceKey.create(Registries.POINT_OF_INTEREST_TYPE, cobblemonResource(string))
 

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

@@ -15,13 +15,13 @@ enum class CobblemonRecipeCategories {
     COOKING_POT_SEARCH("COOKING_POT_SEARCH"),
     COOKING_POT_FOODS("COOKING_POT_FOODS"),
     COOKING_POT_MEDICINES("COOKING_POT_MEDICINES"),
-    COOKING_POT_BAITS("COOKING_POT_BAITS"),
+    COOKING_POT_COMPLEX_DISHES("COOKING_POT_COMPLEX_DISHES"),
     COOKING_POT_MISC("COOKING_POT_MISC");
 
     companion object {
         val customAggregateCategories: Map<RecipeBookCategories, List<RecipeBookCategories>> = mapOf(
             COOKING_POT_SEARCH.toVanillaCategory() to listOf(
-                COOKING_POT_FOODS.toVanillaCategory(), COOKING_POT_MISC.toVanillaCategory(), COOKING_POT_MEDICINES.toVanillaCategory(), COOKING_POT_BAITS.toVanillaCategory()
+                COOKING_POT_FOODS.toVanillaCategory(), COOKING_POT_MISC.toVanillaCategory(), COOKING_POT_MEDICINES.toVanillaCategory(), COOKING_POT_COMPLEX_DISHES.toVanillaCategory()
             )
         )
     }

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

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

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

@@ -125,6 +125,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val MOCHI_USE = this.create("item.medicine.feather.use")
 
+
     @JvmField
     val MULCH_PLACE = this.create("block.mulch.place")
     @JvmField
@@ -216,6 +217,8 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val BERRY_HARVEST = this.create("block.berry_bush.harvest")
     @JvmField
     val BERRY_EAT = this.create("item.berry.eat")
+    @JvmField
+    val BERRY_EAT_FULL = this.create("item.berry.eat.full")
 
     @JvmField
     val BIG_ROOT_BREAK = this.create("block.big_root.break")

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

@@ -18,7 +18,7 @@ import java.util.Optional
 
 class AspectCriterion(
     playerCtx: Optional<ContextAwarePredicate>,
-    val pokemon: ResourceLocation,
+    val species: ResourceLocation,
     val aspects: List<String>
 ): SimpleCriterionCondition<MutableMap<ResourceLocation, MutableSet<String>>>(playerCtx) {
 
@@ -26,42 +26,13 @@ class AspectCriterion(
         val CODEC: Codec<AspectCriterion> = RecordCodecBuilder.create { it.group(
             //All three of these codecs used to use Codecs.createStrictOptionalFieldCodec, that no longer exists
             ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(AspectCriterion::playerCtx),
-            ResourceLocation.CODEC.optionalFieldOf("pokemon", cobblemonResource("pikachu")).forGetter(AspectCriterion::pokemon),
+            ResourceLocation.CODEC.optionalFieldOf("species", cobblemonResource("pikachu")).forGetter(AspectCriterion::species),
             Codec.STRING.listOf().optionalFieldOf("aspects", listOf()).forGetter(AspectCriterion::aspects)
         ) .apply(it, ::AspectCriterion) }
     }
 
     override fun matches(player: ServerPlayer, context: MutableMap<ResourceLocation, MutableSet<String>>): Boolean {
-        val caughtAspects = context.getOrDefault(pokemon, mutableSetOf())
+        val caughtAspects = context.getOrDefault(species, mutableSetOf())
         return this.aspects.all { it in caughtAspects }
     }
 }
-
-//open class AspectCriterionTrigger(identifier: Identifier, criterionClass: Class<AspectCriterionCondition>) : SimpleCriterionTrigger<MutableMap<Identifier, MutableSet<String>>, AspectCriterionCondition>(identifier, criterionClass) {
-//
-//}
-//
-//class AspectCriterionCondition(id: Identifier, predicate: LootContextPredicate) : SimpleCriterionCondition<MutableMap<Identifier, MutableSet<String>>>(id, predicate) {
-//    var pokemon = Identifier.of("cobblemon:pikachu")
-//    var aspects = mutableListOf<String>()
-//    override fun toJson(json: JsonObject) {
-//        json.add("aspects", JsonArray(aspects.size).also {
-//            aspects.forEach { aspect -> it.add(aspect) }
-//        })
-//        json.addProperty("pokemon", pokemon.toString())
-//    }
-//
-//    override fun fromJson(json: JsonObject) {
-//        aspects.clear()
-//        json.getAsJsonArray("aspects").forEach { element ->
-//            aspects.add(element.asString)
-//        }
-//        pokemon = json.get("pokemon").asString.asIdentifierDefaultingNamespace()
-//    }
-//
-//    override fun matches(player: ServerPlayer, context: MutableMap<Identifier, MutableSet<String>>): Boolean {
-//        val caughtAspects = context.getOrDefault(pokemon, mutableSetOf())
-//        return this.aspects.all { it in caughtAspects }
-//    }
-//
-//}

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

@@ -21,40 +21,23 @@ import java.util.Optional
  * @author Hiroku
  * @since November 4th, 2022
  */
-open class CountablePokemonTypeContext(times: Int, var type: String) : CountableContext(times)
+open class CountablePokemonTypeContext(times: Int, var species: String) : CountableContext(times)
 
 class CaughtPokemonCriterion(
     playerCtx: Optional<ContextAwarePredicate>,
-    val type: String,
+    val species: String,
     count: Int
 ): CountableCriterion<CountablePokemonTypeContext>(playerCtx, count) {
 
     companion object {
         val CODEC: Codec<CaughtPokemonCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(CaughtPokemonCriterion::playerCtx),
-            Codec.STRING.optionalFieldOf("type", "any").forGetter(CaughtPokemonCriterion::type),
+            Codec.STRING.optionalFieldOf("species", "any").forGetter(CaughtPokemonCriterion::species),
             Codec.INT.optionalFieldOf("count", 0).forGetter(CaughtPokemonCriterion::count)
         ).apply(it, ::CaughtPokemonCriterion) }
     }
 
     override fun matches(player: ServerPlayer, context: CountablePokemonTypeContext): Boolean {
-        return super.matches(player, context) && (context.type == type || type == "any")
+        return super.matches(player, context) && (context.species == species || species == "any")
     }
 }
-
-//class CaughtPokemonCriterionCondition(id: Identifier, predicate: LootContextPredicate) : CountableCriterionCondition<CountablePokemonTypeContext>(id, predicate) {
-//    var type = "any"
-//    override fun toJson(json: JsonObject) {
-//        super.toJson(json)
-//        json.addProperty("type", type)
-//    }
-//
-//    override fun fromJson(json: JsonObject) {
-//        super.fromJson(json)
-//        type = json.get("type")?.asString ?: "any"
-//    }
-//
-//    override fun matches(player: ServerPlayer, context: CountablePokemonTypeContext): Boolean {
-//        return super.matches(player, context) && (context.type == type || type == "any")
-//    }
-//}

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

@@ -19,17 +19,20 @@ import java.util.Optional
 
 class PokemonCriterion(
     playerCtx: Optional<ContextAwarePredicate>,
+    val species: String,
     val properties: PokemonProperties
 ): SimpleCriterionCondition<Pokemon>(playerCtx) {
 
     companion object {
         val CODEC: Codec<PokemonCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PokemonCriterion::playerCtx),
+            Codec.STRING.optionalFieldOf("species", "any").forGetter(PokemonCriterion::species),
             PokemonProperties.CODEC.optionalFieldOf("properties", PokemonProperties()).forGetter(PokemonCriterion::properties)
         ).apply(it, ::PokemonCriterion) }
     }
 
     override fun matches(player: ServerPlayer, context: Pokemon): Boolean {
-        return properties.matches(context)
+        var speciesCheck = (species.equals(context.species.resourceIdentifier.path) || species.equals(context.species.resourceIdentifier.toString())) || species.equals("any")
+        return speciesCheck && properties.matches(context)
     }
-}
+}

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

@@ -17,22 +17,22 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.resources.ResourceLocation
 import java.util.Optional
 
-class PokemonInteractContext(val type: ResourceLocation, val item: ResourceLocation)
+class PokemonInteractContext(val species: ResourceLocation, val item: ResourceLocation)
 
 class PokemonInteractCriterion(
     playerCtx: Optional<ContextAwarePredicate>,
-    val type: String,
+    val species: String,
     val item: String
 ): SimpleCriterionCondition<PokemonInteractContext>(playerCtx) {
     companion object {
         val CODEC: Codec<PokemonInteractCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PokemonInteractCriterion::playerCtx),
-            Codec.STRING.optionalFieldOf("type", "any").forGetter(PokemonInteractCriterion::type),
+            Codec.STRING.optionalFieldOf("species", "any").forGetter(PokemonInteractCriterion::species),
             Codec.STRING.optionalFieldOf("item", "any").forGetter(PokemonInteractCriterion::item)
         ).apply(it, ::PokemonInteractCriterion) }
     }
 
     override fun matches(player: ServerPlayer, context: PokemonInteractContext): Boolean {
-        return (context.type == this.type.asIdentifierDefaultingNamespace() || this.type == "any") && (context.item == this.item.asIdentifierDefaultingNamespace() || this.item == "any")
+        return (context.species == this.species.asIdentifierDefaultingNamespace() || this.species == "any") && (context.item == this.item.asIdentifierDefaultingNamespace() || this.item == "any")
     }
-}
+}

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

@@ -17,23 +17,23 @@ import net.minecraft.advancements.critereon.EntityPredicate
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.resources.ResourceLocation
 
-class ReelInPokemonContext(val pokemonId : ResourceLocation, val baitId: ResourceLocation)
+class ReelInPokemonContext(val species : ResourceLocation, val baitId: ResourceLocation)
 
 class ReelInPokemonCriterionCondition(
         playerCtx: Optional<ContextAwarePredicate>,
-        val pokemonId: String,
+        val species: String,
         val baitId: String
 ) : SimpleCriterionCondition<ReelInPokemonContext>(playerCtx) {
 
     companion object {
         val CODEC: Codec<ReelInPokemonCriterionCondition> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter { it.playerCtx },
-            Codec.STRING.optionalFieldOf("pokemonId", "any").forGetter { it.pokemonId },
+            Codec.STRING.optionalFieldOf("species", "any").forGetter { it.species },
             Codec.STRING.optionalFieldOf("baitId", "empty_bait").forGetter { it.baitId }
         ).apply(it, { playerCtx, pokemonId, baitId -> ReelInPokemonCriterionCondition(playerCtx, pokemonId, baitId.ifEmpty { "empty_bait" }) }) }
     }
 
     override fun matches(player: ServerPlayer, context: ReelInPokemonContext): Boolean {
-        return (context.pokemonId == this.pokemonId.asIdentifierDefaultingNamespace() || this.pokemonId == "any") && (context.baitId == this.baitId.asIdentifierDefaultingNamespace() || this.baitId == "empty_bait")
+        return (context.species == this.species.asIdentifierDefaultingNamespace() || this.species == "any") && (context.baitId == this.baitId.asIdentifierDefaultingNamespace() || this.baitId == "empty_bait")
     }
 }

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

@@ -8,12 +8,15 @@
 
 package com.cobblemon.mod.common.api.ai
 
-import com.cobblemon.mod.common.api.ai.config.BrainConfig
+import com.cobblemon.mod.common.api.ai.config.BehaviourConfig
+import com.cobblemon.mod.common.entity.MoLangScriptingEntity
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity
 import net.minecraft.world.entity.schedule.Schedule
 
-class BrainConfigurationContext {
+class BehaviourConfigurationContext {
+    var appliedBehaviours: Set<ResourceLocation> = setOf()
 
     var defaultActivity = Activity.IDLE
     var coreActivities = setOf(Activity.CORE)
@@ -24,11 +27,16 @@ class BrainConfigurationContext {
         return activities.firstOrNull { it.activity == activity } ?: ActivityConfigurationContext(activity).also(activities::add)
     }
 
-    fun apply(entity: LivingEntity, brainConfigs: List<BrainConfig>) {
+    fun apply(entity: LivingEntity, behaviourConfigs: List<BehaviourConfig>) {
         val brain = entity.brain
 
+        if (entity is MoLangScriptingEntity) {
+            entity.registerVariables(behaviourConfigs.flatMap { it.getVariables(entity) })
+            entity.initializeScripting()
+        }
+
         // Setup the brain config
-        brainConfigs.forEach { it.configure(entity, this) }
+        behaviourConfigs.forEach { it.configure(entity, this) }
 
         // Apply the brain config
         activities.forEach { it.apply(entity) }

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

@@ -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.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.util.asTranslated
+import com.cobblemon.mod.common.util.resolve
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.network.chat.Component
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.entity.LivingEntity
+
+class CobblemonBehaviour(
+    val name: Component = "".asTranslated(),
+    val description: Component = "".asTranslated(),
+    /** Some behaviours aren't really worth showing on the client, namely ones that are simply conditional bundles of other behaviours. */
+    val visible: Boolean = true,
+    val entityType: ResourceLocation? = null,
+    val configurations: List<BehaviourConfig> = mutableListOf(),
+    val undo: ExpressionLike? = null,
+    val undoScript: ResourceLocation? = null,
+) {
+    fun canBeApplied(entity: LivingEntity) = entityType?.let { entityType == entity.type.builtInRegistryHolder().unwrapKey().get().location() } != false
+    fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) {
+        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) {
+        val runtime = MoLangRuntime().setup()
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (undoScript != null) {
+            CobblemonScripts.run(undoScript, runtime)
+        }
+        if (undo != null) {
+            runtime.resolve(undo)
+        }
+    }
+}

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

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

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

@@ -8,32 +8,34 @@
 
 package com.cobblemon.mod.common.api.ai.config
 
-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.ai.config.task.TaskConfig
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
+import com.cobblemon.mod.common.util.asExpression
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity
 
-class AddTasksToActivity : BrainConfig {
-    val activity = Activity.IDLE
-    val condition = "true".asExpressionLike()
+class AddTasksToActivity : BehaviourConfig {
+    val activity: Activity? = null
+    // Can be useful to add to multiple activities at once
+    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 configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
-        val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return
+    override fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) {
+        if (!checkCondition(entity, condition)) return
+
+        val activities = if (activity != null) (activities + activity) else activities
 
-        val activity = brainConfigurationContext.getOrCreateActivity(activity)
         tasksByPriority.forEach { (priority, taskConfigs) ->
-            val tasks = taskConfigs.flatMap { it.createTasks(entity, brainConfigurationContext) }
-            activity.addTasks(priority, *tasks.toTypedArray())
+            val tasks = taskConfigs.flatMap { it.createTasks(entity, behaviourConfigurationContext) }
+            for (activity in activities) {
+                val activityContext = behaviourConfigurationContext.getOrCreateActivity(activity)
+                activityContext.addTasks(priority, *tasks.toTypedArray())
+            }
         }
     }
 }

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

@@ -0,0 +1,20 @@
+/*
+ * 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.npc.configuration.MoLangConfigVariable
+import net.minecraft.world.entity.LivingEntity
+
+class AddVariablesConfig(val variables: List<MoLangConfigVariable> = emptyList()) : BehaviourConfig {
+    override fun getVariables(entity: LivingEntity) = variables
+
+    // Configuration happens naturally through the override on variables
+    override fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) {}
+}

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

@@ -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
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.CobblemonBehaviours
+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.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.asExpression
+import com.google.gson.annotations.SerializedName
+import com.mojang.datafixers.util.Either
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.entity.LivingEntity
+
+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 {
+                CobblemonBehaviours.behaviours[it]?.configurations?.flatMap { it.getVariables(entity) } ?: emptyList()
+            } + listOf(condition).asVariables()
+        } else {
+            listOf(condition).asVariables()
+        }
+    }
+
+    override fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) {
+        if (!checkCondition(entity, condition)) return
+
+        val configurations = behaviours.map { CobblemonBehaviours.behaviours[it]?.takeIf { it.canBeApplied(entity) } ?: return Cobblemon.LOGGER.warn("Behaviour $it not found") }
+        // Why not just add the presets to the context directly?
+        // Nested preset application is a thing, and I only want to track the top level presets.
+        // i.e. if a preset applies another preset, I don't want to track the inner preset, since it's redundant if we track the top one.
+        val originalContextBehaviours = behaviourConfigurationContext.appliedBehaviours.toMutableSet()
+        configurations.forEach {
+            it.configure(entity, behaviourConfigurationContext)
+        }
+        originalContextBehaviours.addAll(behaviours)
+        behaviourConfigurationContext.appliedBehaviours = originalContextBehaviours
+    }
+}

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

@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config
-
-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.CobblemonBrainConfigs
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.entity.LivingEntity
-
-class ApplyPresets : BrainConfig {
-    val condition = "true".asExpressionLike()
-    val presets = mutableListOf<ResourceLocation>()
-    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
-        val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return
-
-        val presetConfigs = presets.flatMap { CobblemonBrainConfigs.presets[it] ?: return Cobblemon.LOGGER.warn("Preset $it not found") }
-        presetConfigs.forEach { it.configure(entity, brainConfigurationContext) }
-    }
-}

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

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config
+
+import com.bedrockk.molang.runtime.MoLangRuntime
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.entity.LivingEntity
+
+/**
+ * Something that contributes to the construction of an entity's brain. Implementations are expected to make
+ * their changes using the provided [BehaviourConfigurationContext] which helps stage the details of the entity's
+ * brain before locking into the highly immutable structure that Mojang uses.
+ *
+ * A brain config has access to the [LivingEntity] it's for but note that this is, in most cases, an extremely
+ * young version of the entity that is not fully initialized and might die if you try getting exotic with it.
+ *
+ * @see BehaviourConfigurationContext
+ * @author Hiroku
+ * @since October 13th, 2024
+ */
+interface BehaviourConfig {
+    companion object {
+        val types = mutableMapOf<ResourceLocation, Class<out BehaviourConfig>>(
+            cobblemonResource("script") to ScriptBehaviourConfig::class.java,
+            cobblemonResource("custom_script") to CustomScriptBehaviourConfig::class.java,
+            cobblemonResource("add_tasks_to_activity") to AddTasksToActivity::class.java,
+            cobblemonResource("apply_behaviours") to ApplyBehaviours::class.java,
+            cobblemonResource("set_default_activity") to SetDefaultActivity::class.java,
+            cobblemonResource("set_core_activities") to SetCoreActivities::class.java,
+            cobblemonResource("add_variables") to AddVariablesConfig::class.java,
+            cobblemonResource("set_variables") to SetVariablesConfig::class.java,
+        )
+    }
+
+    fun checkCondition(entity: LivingEntity, expressionOrEntityVariable: ExpressionOrEntityVariable): Boolean {
+        val runtime = MoLangRuntime().setup()
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        return runtime.resolveBoolean(expressionOrEntityVariable.map({ it }, { "q.entity.config.${it.variableName}".asExpression() }))
+    }
+
+    fun getVariables(entity: LivingEntity): List<MoLangConfigVariable>
+    fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext)
+}

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

@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import net.minecraft.world.entity.LivingEntity
-
-/**
- * Something that contributes to the construction of an entity's brain. Implementations are expected to make
- * their changes using the provided [BrainConfigurationContext] which helps stage the details of the entity's
- * brain before locking into the highly immutable structure that Mojang uses.
- *
- * A brain config has access to the [LivingEntity] it's for but note that this is, in most cases, an extremely
- * young version of the entity that is not fully initialized and might die if you try getting exotic with it.
- *
- * @see BrainConfigurationContext
- * @author Hiroku
- * @since October 13th, 2024
- */
-interface BrainConfig {
-    companion object {
-        val types = mutableMapOf<String, Class<out BrainConfig>>(
-            "script" to ScriptBrainConfig::class.java,
-            "add_tasks_to_activity" to AddTasksToActivity::class.java,
-            "apply_presets" to ApplyPresets::class.java,
-            "set_default_activity" to SetDefaultActivity::class.java,
-            "set_core_activities" to SetCoreActivities::class.java
-        )
-
-    }
-
-//    fun encode(buffer: RegistryFriendlyByteBuf)
-//    fun decode(buffer: RegistryFriendlyByteBuf)
-    fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext)
-}

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

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config
+
+import com.bedrockk.molang.runtime.MoLangRuntime
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.asExpressionLike
+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
+
+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()
+    }
+
+    override fun getVariables(entity: LivingEntity) = variables
+    override fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) {
+        if (!checkCondition(entity, condition)) return
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        runtime.resolve(script)
+    }
+}

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

@@ -1,16 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config
-
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import net.minecraft.world.entity.LivingEntity
-
-object DummyBrainConfig : BrainConfig {
-    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {}
-}

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

@@ -1,12 +1,13 @@
-# Brain Configuration
+# Behaviour Configuration
 
-A "Brain" is a Java Edition AI concept for more modern entities. It has tasks that are listed inside of 'activities',
+A "Brain" is a Java Edition AI concept for more modern entities. It has tasks that are listed inside 'activities',
 and in some cases a schedule which determines which activities will occur during different times of the day. There is
 also a set of core activities, and a default activity. In Minecraft, the most complex usage of the Brain AI system 
 is on villagers which have schedules that control their behaviour during the day and night as well as child villager play behaviours.
 
-Cobblemon's NPCs use the Brain AI system. As part of that, Cobblemon added the concept of a Brain Configuration
-that allows Java Edition brains to be configured in a more data-driven way. 
+Cobblemon's Pokémon and NPCs use the Brain AI system. As part of that, Cobblemon added the concept of a Behaviour Configuration
+that allows Java Edition brains to be configured in a more data-driven way, as well as to support the configuration of
+other logical properties of entities that are configured at the same initialization step.
 
 By default, without any brain configuration, the default activity will be `minecraft:idle` and the core activities will be `[minecraft:core]`.
 The activities would not have any tasks though.
@@ -48,18 +49,18 @@ The activities that were added by Cobblemon are:
 - `cobblemon:action_effect`: For when the entity is performing an action effect. Usually registered as an almost empty activity that simply prevents the entity from doing other things.
 - `cobblemon:npc_chatting`: Intended for NPC entities using dialogue so that they look at their chat partner and do nothing else.
 
-## Brain Configuration Format
-A brain is configured using a series of "Brain Configurations". Each configuration is a JSON object that contains
-a "type" field which determines the action to perform when configuring a brain. Many different types are available.
+## Behaviour Configuration Format
+A Behaviour is configured using a series of "Behaviour Configurations". Each configuration is a JSON object that contains
+a "type" field which determines the action to perform when configuring an entity. Many different types are available.
 
 ### script
-The `script` type executes a MoLang script which will apply some changes to the brain.
+The `script` type executes a MoLang script which will apply some changes to the entity or brain.
 - `script`: The MoLang script to execute. This will be a resource location for the `molang` datapack folder. Something like `cobblemon:some_script`.
 - `condition`: A MoLang expression (with `q.entity` as the entity) that determines if the script should be executed. Defaults to `"true"`.
 
 ### add_tasks_to_activity
 The 'add_tasks_to_activity' type adds a list of tasks to an activity.
-- `activity`: The activity to add the tasks to. This must be a pre-existing activity - a brain configuration cannot
+- `activity`: The activity to add the tasks to. This must be a pre-existing activity - a behaviour configuration cannot
     create new activities. 
 - `condition`: A MoLang expression (with `q.entity` as the entity) that determines if the tasks should be added. If this
     is not present, the tasks will always be added.
@@ -96,24 +97,107 @@ The `set_core_activities` type sets the core activities of the brain. It has onl
 ### set_default_activity
 The `set_default_activity` type sets the default activity of the brain. It has only one property, `activity`, which is the activity to set as the default.
 
-### apply_preset
-The `apply_preset` type applies a preset to the brain. Brain presets are JSON arrays under the `brain_presets` datapack folder. 
-This is a way to apply a set of configurations to the brain.
-- `preset`: The name of the preset to apply. This is the name of the file in the `brain_presets` folder without the `.json` extension.
-- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if the preset should be applied. Defaults to `"true"`.
+### apply_behaviours
+The `apply_behaviours` type applies some number of other Behaviours to the entity. These behaviours are JSONs under the `behaviours` datapack folder. 
+This is a way to apply a set of configurations to the entity.
+- `behaviours`: A list of behaviour resource locations to apply. This is the name of the file in the `behaviours` folder without the `.json` extension.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if the behaviour should be applied. Defaults to `"true"`.
+- `visible`: Whether the behaviour should be visible in the UI. Defaults to `true`. If it is not visible, name and description can be left out.
+- `name`: The name of the behaviour. This is used in the UI to label the behaviour. This can be a translation key.
+- `description`: A description of the behaviour. This is used in the UI to describe what the behaviour does. This can be a translation key.
+- `entityType`: The entity type that the behaviour applies to. Defaults to null. This is used to determine if the behaviour should be applied to the entity type..
 
-Example brain preset (`uses_healing_machine.json`):
+Example behaviour (`uses_healing_machine.json`):
 ```json
-[
-  {
-    "type": "add_tasks_to_activity",
-    "activity": "idle",
-    "tasksByPriority": {
-      "1": [
-        "heal_using_healing_machine",
-        "go_to_healing_machine"
-      ]
+{
+  "name": "cobblemon.behaviour.uses_healing_machine.name",
+  "description": "cobblemon.behaviour.uses_healing_machine.desc",
+  "entityType": "cobblemon:npc",
+  "visible": true,
+  "configurations": [
+    {
+      "type": "add_tasks_to_activity",
+      "activity": "idle",
+      "tasksByPriority": {
+        "1": [
+          "heal_using_healing_machine",
+          "go_to_healing_machine"
+        ]
+      }
     }
-  }
-]
+  ]
+}
 ```
+
+### add_variables
+The `add_variables` type adds some number of MoLang variables to the entity that can be configured in-game or left with defaults.
+- `variables`: A list of objects, each representing a variable that can be configured.
+
+Each variable has the following properties:
+- `variableName`: The name of the variable. This is the name that will be accessible from MoLang scripts.
+- `defaultValue`: The default value of the variable. This is a MoLang expression that will be used if the variable is not set.
+- `displayName`: The display name of the variable. This is used in the UI to label the variable. This can be a translation key.
+- `description`: A description of the variable. This is used in the UI to describe what the variable does. This can be a translation key.
+- `type`: The type of the variable. This can be `TEXT`, `NUMBER`, or `BOOLEAN`.
+
+Example:
+```json
+{
+  "type": "add_variables",
+  "variables": [
+    {
+      "variableName": "can_heal_using_machine",
+      "defaultValue": "false",
+      "displayName": "Can Use Healing Machine",
+      "description": "Whether or not the entity can use a healing machine.",
+      "type": "BOOLEAN"
+    }
+  ]
+}
+```
+
+### set_variables
+The `set_variables` type sets some values for pre-established variables. This is useful in cases where a preset has defined a variable
+but it's locked in by a specific entity using that preset. This strongly forces the variable to a specific value. In future this
+probably should deregister the variable so that the client cannot edit them once they've been forced, as currently that will
+be possible yet the value will get repeatedly overwritten.
+
+The values inside the variables map can be MoLang expressions (with `q.entity` as the entity) or simple JSON primitives.
+
+Example:
+```json
+{
+  "type": "set_variables",
+  "variables": {
+    "aggressive": true,
+    "attack_range": "10"
+  }
+}
+```
+
+### script
+The `script` type executes a registered MoLang script which will apply some changes to the brain or entity. This can be 
+useful if the goal is to apply some kind of configuration to the entity that would otherwise be performed by an NPC preset
+or NPC class. `q.entity` will refer to the entity. This is powerful when combined with [add_variables](#add_variables)
+configs in the same behaviour preset.
+
+Example:
+```json
+{
+  "type": "script",
+  "script": "cobblemon:configure_npc_party"
+}
+```
+
+### custom_script
+The `custom_script` type executes a custom MoLang script from this config which will apply some changes to the brain or
+entity. This is useful for when you want to apply some kind of configuration to the entity that would otherwise be
+by an NPC preset or NPC class. `q.entity` will refer to the entity.
+
+Example:
+```json
+{
+  "type": "custom_script",
+  "script": "q.entity.set_pathfinding_malus('WATER', -1);"
+}
+```

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

@@ -13,12 +13,13 @@ import com.bedrockk.molang.runtime.struct.QueryStruct
 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.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.scripting.CobblemonScripts
-import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.util.activityRegistry
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
@@ -30,13 +31,16 @@ import com.mojang.datafixers.util.Pair
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
-class ScriptBrainConfig : BrainConfig {
+class ScriptBehaviourConfig : BehaviourConfig {
     val condition = "true".asExpressionLike()
     val script = cobblemonResource("dummy")
+    val variables = mutableListOf<MoLangConfigVariable>()
 
-    override fun configure(entity: LivingEntity, context: BrainConfigurationContext) {
+    override fun getVariables(entity: LivingEntity) = variables
+
+    override fun configure(entity: LivingEntity, context: BehaviourConfigurationContext) {
         val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
         if (!runtime.resolveBoolean(condition)) return
 
         val struct = createBrainStruct(entity, context)
@@ -48,30 +52,30 @@ class ScriptBrainConfig : BrainConfig {
         runtime.resolve(script, mapOf("brain" to struct))
     }
 
-    fun createBrainStruct(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): QueryStruct {
+    fun createBrainStruct(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext): QueryStruct {
         return QueryStruct(hashMapOf()).addStandardFunctions()
-            .addFunction("entity") { (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()) }
+            .addFunction("entity") { entity.asMostSpecificMoLangValue() }
             .addFunction("create_activity") { params ->
                 val name = params.getString(0).asIdentifierDefaultingNamespace()
                 val activity = entity.level().activityRegistry.get(name) ?: return@addFunction run {
                     Cobblemon.LOGGER.error("Tried loading activity $name as part of an entity brain but that activity does not exist")
                     DoubleValue.ZERO
                 }
-                val existingActivityBuilder = brainConfigurationContext.activities.find { it.activity == activity }
+                val existingActivityBuilder = behaviourConfigurationContext.activities.find { it.activity == activity }
                 if (existingActivityBuilder != null) {
                     return@addFunction createActivityStruct(existingActivityBuilder)
                 } else {
                     val activityConfigurationContext = ActivityConfigurationContext(activity)
-                    brainConfigurationContext.activities.add(activityConfigurationContext)
+                    behaviourConfigurationContext.activities.add(activityConfigurationContext)
                     return@addFunction createActivityStruct(activityConfigurationContext)
                 }
             }
             .addFunction("set_core_activities") { params ->
-                brainConfigurationContext.coreActivities = params.params.map { (it as ObjectValue<ActivityConfigurationContext>).obj.activity }.toSet()
+                behaviourConfigurationContext.coreActivities = params.params.map { (it as ObjectValue<ActivityConfigurationContext>).obj.activity }.toSet()
                 return@addFunction DoubleValue.ONE
             }
             .addFunction("set_default_activity") { params ->
-                brainConfigurationContext.defaultActivity = params.get<ObjectValue<ActivityConfigurationContext>>(0).obj.activity
+                behaviourConfigurationContext.defaultActivity = params.get<ObjectValue<ActivityConfigurationContext>>(0).obj.activity
                 return@addFunction DoubleValue.ONE
             }
     }

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

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

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

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

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

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

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

@@ -0,0 +1,76 @@
+/*
+ * 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.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.WanderTaskConfig.Companion.WANDER
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.resolveFloat
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.WalkTarget
+import net.minecraft.world.entity.ai.util.HoverRandomPos
+
+class AirWanderTaskConfig : SingleTaskConfig {
+    val condition = booleanVariable(WANDER, "air_wanders", true).asExpressible()
+    val wanderChance = numberVariable(WANDER, "air_wander_chance", 1/(20 * 1F)).asExpressible()
+    val horizontalRange = numberVariable(WANDER, "horizontal_wander_range", 20).asExpressible()
+    val verticalRange = numberVariable(WANDER, "vertical_wander_range", 5).asExpressible()
+    val speedMultiplier = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
+    val minUpwardsMovement: ExpressionOrEntityVariable = Either.left("3.0".asExpression())
+    val minDownwardsMovement: ExpressionOrEntityVariable = Either.left("3.0".asExpression())
+
+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
+        return listOf(condition, wanderChance, horizontalRange, verticalRange, speedMultiplier, minUpwardsMovement, minDownwardsMovement).asVariables()
+    }
+
+    override fun createTask(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        val wanderChanceExpression = wanderChance.asSimplifiedExpression(entity)
+
+        return BehaviorBuilder.create {
+            it.group(
+                it.absent(MemoryModuleType.WALK_TARGET),
+                it.registered(MemoryModuleType.LOOK_TARGET)
+            ).apply(it) { walkTarget, lookTarget ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || entity.isInWater) {
+                        return@Trigger false
+                    }
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+                    val wanderChance = runtime.resolveFloat(wanderChanceExpression)
+                    if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) return@Trigger false
+
+                    val rotVec = entity.getViewVector(0F)
+                    val target = HoverRandomPos.getPos(entity, horizontalRange.resolveInt(), verticalRange.resolveInt(), rotVec.x, rotVec.y, 1.5707964f, minUpwardsMovement.resolveInt(), minDownwardsMovement.resolveInt())
+                        ?: return@Trigger false
+                    walkTarget.set(WalkTarget(target, speedMultiplier.resolveFloat(), 3))
+                    lookTarget.set(BlockPosTracker(target))
+                    return@Trigger true
+                }
+            }
+        }
+    }
+}

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

@@ -8,25 +8,34 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
+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
 
 class AllOfTaskConfig : TaskConfig {
-    val condition = "true".asExpressionLike()
+    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 createTasks(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ): List<BehaviorControl<in LivingEntity>> {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return emptyList()
-        return tasks.flatMap { it.createTasks(entity, brainConfigurationContext) }
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return emptyList()
+        return tasks.flatMap { it.createTasks(entity, behaviourConfigurationContext) }
     }
 }

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

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

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

@@ -8,24 +8,26 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
+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.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.VillagerCalmDown
 
 class CalmDownTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
+    var condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
         return VillagerCalmDown.create()
     }
 }

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

@@ -8,30 +8,29 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+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.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveInt
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.DoNothing
 
 class DoNothingTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val minDurationTicks = "40".asExpression()
-    val maxDurationTicks = "80".asExpression()
+    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 createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return DoNothing(runtime.resolveInt(minDurationTicks), runtime.resolveInt(maxDurationTicks))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return DoNothing(minDurationTicks.resolveInt(), maxDurationTicks.resolveInt())
     }
 }

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

@@ -0,0 +1,58 @@
+/*
+ * 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.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.EatGrassTask
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class EatGrassTaskConfig : SingleTaskConfig {
+    companion object {
+        const val EATING_GRASS = "eating_grass"
+        const val COOLDOWN = "eating_grass_cooldown_ticks"
+        const val EAT_GRASS_CHANCE = "eat_grass_chance"
+    }
+
+    val cooldown = numberVariable(category = EATING_GRASS, name = COOLDOWN, default = 20 * 20).asExpressible()
+    val eatGrassChance = numberVariable(category = EATING_GRASS, name = EAT_GRASS_CHANCE, default = 1 / (20 * 20F)).asExpressible()
+
+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
+        return listOf(
+            cooldown,
+            eatGrassChance
+        ).asVariables()
+    }
+
+    override fun createTask(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        if (entity !is PokemonEntity) {
+            return null
+        }
+
+        val chance = eatGrassChance.resolveFloat()
+        if (chance == 0F) {
+            return null
+        }
+
+        return WrapperLivingEntityTask(
+            EatGrassTask(
+                chance,
+                cooldown.resolveInt().toLong()
+            ),
+            PokemonEntity::class.java
+        )
+    }
+}

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

@@ -8,14 +8,13 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+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.battles.BattleRegistry
-import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.entity.npc.NPCEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
@@ -24,15 +23,21 @@ import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 
 class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    var includePassiveDamage = true
+    var condition = booleanVariable(SharedEntityVariables.BATTLING_CATEGORY, "exit_battle_when_hurt", true).asExpressible()
+    var includePassiveDamage = booleanVariable(SharedEntityVariables.BATTLING_CATEGORY, "exit_battle_from_passive_damage", true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        includePassiveDamage
+    ).asVariables()
 
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        val includePassiveDamage = includePassiveDamage.resolveBoolean()
+        if (!condition.resolveBoolean()) return null
 
         if (entity is NPCEntity) {
             fun cancelNPCBattles(npcEntity: NPCEntity): Boolean {
@@ -52,7 +57,7 @@ class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {
                         .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelNPCBattles(entity as NPCEntity) } }
                 }
             }
-        } else { return null }/* else if (entity is PokemonEntity) { TODO uncomment when pokemon have brain :)
+        } else if (entity is PokemonEntity) {
             fun cancelPokemonBattle(pokemonEntity: PokemonEntity): Boolean {
                 val battle = BattleRegistry.getBattle(pokemonEntity.battleId ?: return false)
                 battle?.end()
@@ -61,15 +66,17 @@ class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {
 
             return if (includePassiveDamage) {
                 BehaviorBuilder.create {
-                    it.group(it.present(MemoryModuleType.HURT_BY), it.present(CobblemonMemories.POKEMON_BATTLING))
+                    it.group(it.present(MemoryModuleType.HURT_BY), it.present(CobblemonMemories.POKEMON_BATTLE))
                         .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelPokemonBattle(entity as PokemonEntity) } }
                 }
             } else {
                 BehaviorBuilder.create {
-                    it.group(it.present(MemoryModuleType.HURT_BY_ENTITY), it.present(CobblemonMemories.POKEMON_BATTLING))
+                    it.group(it.present(MemoryModuleType.HURT_BY_ENTITY), it.present(CobblemonMemories.POKEMON_BATTLE))
                         .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelPokemonBattle(entity as PokemonEntity) } }
                 }
             }
-        }*/
+        } else {
+            return null
+        }
     }
 }

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

@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.closestPosition
+import com.cobblemon.mod.common.util.getIsSubmerged
+import net.minecraft.core.BlockPos
+import net.minecraft.util.Mth
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.WalkTarget
+import net.minecraft.world.level.LevelReader
+import net.minecraft.world.level.block.Blocks
+import net.minecraft.world.level.pathfinder.PathComputationType
+
+/**
+ * Moves to the nearest surface it can find so it can breathe.
+ */
+class FindAirTaskConfig : SingleTaskConfig {
+    val walkSpeed = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
+        return listOf(walkSpeed).asVariables()
+    }
+
+    override fun createTask(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        if (entity !is PathfinderMob) {
+            return null
+        }
+        return BehaviorBuilder.create {
+            it.group(
+                it.absent(MemoryModuleType.WALK_TARGET),
+                it.absent(CobblemonMemories.PATH_COOLDOWN)
+            ).apply(it) { walkTarget, pathCooldown ->
+                Trigger { world, entity, time ->
+                    if (!entity.getIsSubmerged()) {
+                        return@Trigger false
+                    }
+
+                    val iterable = BlockPos.betweenClosed(
+                        Mth.floor(entity.x - 4.0),
+                        entity.blockY - 1,
+                        Mth.floor(entity.z - 4.0),
+                        Mth.floor(entity.x + 4.0),
+                        Mth.floor(entity.y + 8.0),
+                        Mth.floor(entity.z + 4.0)
+                    )
+
+                    pathCooldown.setWithExpiry(true, 20L)
+
+                    val blockPos = entity.closestPosition(iterable) { isAirPos(entity.level(), it) }
+                        ?: return@Trigger false
+
+                    walkTarget.set(WalkTarget(blockPos.above(), 0.35F, 0))
+                    return@Trigger true
+                }
+            }
+        }
+    }
+
+    private fun isAirPos(world: LevelReader, pos: BlockPos): Boolean {
+        val blockState = world.getBlockState(pos)
+        val aboveState = world.getBlockState(pos.above())
+        val notFluid = world.getFluidState(pos.above()).isEmpty || blockState.`is`(Blocks.BUBBLE_COLUMN)
+        val canPathfindThroughAbove = aboveState.isPathfindable(PathComputationType.LAND)
+        val solidBelow = !blockState.isPathfindable(PathComputationType.LAND)
+
+        return notFluid && canPathfindThroughAbove && solidBelow
+    }
+}

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

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

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

@@ -8,14 +8,12 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.resolveInt
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.FLEE_DESIRED_DISTANCE
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.FLEE_SPEED_MULTIPLIER
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
@@ -24,18 +22,24 @@ import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 
 class FleeAttackerTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    var speedMultiplier = "0.5".asExpression()
-    var desiredDistance = "9".asExpression()
+    var condition = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "flee_attacker", true).asExpressible()
+    var speedMultiplier = numberVariable(SharedEntityVariables.FEAR_CATEGORY, FLEE_SPEED_MULTIPLIER, 0.5).asExpressible()
+    var desiredDistance = numberVariable(SharedEntityVariables.FEAR_CATEGORY, FLEE_DESIRED_DISTANCE, 9).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        speedMultiplier,
+        desiredDistance
+    ).asVariables()
 
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition) || entity !is PathfinderMob) return null
-        val speedMultiplier = runtime.resolveFloat(speedMultiplier)
-        val desiredDistance = runtime.resolveInt(desiredDistance)
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PathfinderMob) return null
+        val speedMultiplier = speedMultiplier.resolveFloat()
+        val desiredDistance = desiredDistance.resolveInt()
         return WrapperLivingEntityTask(
             SetWalkTargetAwayFrom.entity(MemoryModuleType.HURT_BY_ENTITY, speedMultiplier, desiredDistance, false),
             PathfinderMob::class.java

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

@@ -8,14 +8,12 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.resolveInt
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.FLEE_DESIRED_DISTANCE
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.FLEE_SPEED_MULTIPLIER
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
@@ -24,18 +22,20 @@ import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 
 class FleeNearestHostileTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    var speedMultiplier = "0.5".asExpression()
-    var desiredDistance = "9".asExpression()
+    var condition = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "flee_nearest_hostile", true).asExpressible()
+    var speedMultiplier = numberVariable(SharedEntityVariables.FEAR_CATEGORY, FLEE_SPEED_MULTIPLIER, 0.5).asExpressible()
+    var desiredDistance = numberVariable(SharedEntityVariables.FEAR_CATEGORY, FLEE_DESIRED_DISTANCE, 9).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition, speedMultiplier, desiredDistance).asVariables()
 
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition) || entity !is PathfinderMob) return null
-        val speedMultiplier = runtime.resolveFloat(speedMultiplier)
-        val desiredDistance = runtime.resolveInt(desiredDistance)
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PathfinderMob) return null
+        val speedMultiplier = speedMultiplier.resolveFloat()
+        val desiredDistance = desiredDistance.resolveInt()
         return WrapperLivingEntityTask(
             SetWalkTargetAwayFrom.entity(MemoryModuleType.NEAREST_HOSTILE, speedMultiplier, desiredDistance, false),
             PathfinderMob::class.java

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

@@ -8,32 +8,30 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.entity.ai.FollowWalkTargetTask
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveInt
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
 class FollowWalkTargetTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val minRunTicks: Expression = "150".asExpression()
-    val maxRunTicks: Expression = "250".asExpression()
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    val minRunTicks: ExpressionOrEntityVariable = Either.left("150".asExpression())
+    val maxRunTicks: ExpressionOrEntityVariable = Either.left("250".asExpression())
 
-    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+    override fun getVariables(entity: LivingEntity) = listOf(minRunTicks, maxRunTicks).asVariables()
+
+    override fun createTask(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext): BehaviorControl<LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
         return WrapperLivingEntityTask(
-            FollowWalkTargetTask(runtime.resolveInt(minRunTicks), runtime.resolveInt(maxRunTicks)),
+            FollowWalkTargetTask(minRunTicks.resolveInt(), maxRunTicks.resolveInt()),
             PathfinderMob::class.java
         )
     }

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

@@ -8,26 +8,30 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.ATTACKING_CATEGORY
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.entity.ai.GetAngryAtAttackerTask
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
 class GetAngryAtAttackerTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
+    companion object {
+        const val GET_ANGRY_AT_ATTACKER = "get_angry_at_attacker"
+    }
+
+    val condition = booleanVariable(ATTACKING_CATEGORY, GET_ANGRY_AT_ATTACKER, true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
 
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
         return GetAngryAtAttackerTask.create()
     }
 }

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

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

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

@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.closestPosition
+import kotlin.math.ceil
+import kotlin.math.floor
+import net.minecraft.core.BlockPos
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.util.Mth
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.WalkTarget
+import net.minecraft.world.level.pathfinder.PathComputationType
+
+/**
+ * Seeks land if it's underwater.
+ */
+class GoToLandTaskConfig : SingleTaskConfig {
+    val walkSpeed = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
+        return listOf(walkSpeed).asVariables()
+    }
+
+    override fun createTask(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        if (entity !is PathfinderMob) {
+            return null
+        }
+
+        return BehaviorBuilder.create {
+            it.group(
+                it.absent(MemoryModuleType.WALK_TARGET),
+                it.absent(CobblemonMemories.PATH_COOLDOWN)
+            ).apply(it) { walkTarget, pathCooldown ->
+                Trigger { world, entity, time ->
+                    if (!entity.isInLiquid) {
+                        return@Trigger false
+                    }
+
+                    entity as PathfinderMob
+
+                    val iterable = BlockPos.betweenClosed(
+                        Mth.floor(entity.x - 8.0),
+                        entity.blockY,
+                        Mth.floor(entity.z - 8.0),
+                        Mth.floor(entity.x + 8.0),
+                        Mth.floor(entity.y + 2.0),
+                        Mth.floor(entity.z + 8.0)
+                    )
+
+                    pathCooldown.setWithExpiry(true, 40L)
+
+                    val blockPos = entity.closestPosition(iterable) {
+                        isSafeLandPosAround(entity.level() as ServerLevel, it, entity)
+                    } ?: return@Trigger false
+
+                    walkTarget.set(WalkTarget(blockPos.above(), 0.35F, 1))
+                    return@Trigger true
+                }
+            }
+        }
+    }
+
+    fun isSafeLandPos(world: ServerLevel, pos: BlockPos, mob: PathfinderMob): Boolean {
+        val blockState = world.getBlockState(pos)
+
+        val isFluid = world.getFluidState(pos.above()).isEmpty.not()
+        val solidBelow = blockState.isSolid
+
+        if (isFluid || !solidBelow) {
+            return false
+        } else {
+            val mutable = BlockPos.MutableBlockPos()
+            val minY = pos.y + 1
+            val maxY = minY + ceil(mob.bbHeight).toInt()
+            for (y in minY..maxY) {
+                val aboveState = world.getBlockState(mutable.set(pos.x, y, pos.z))
+                val canPathfindThroughAbove = aboveState.isPathfindable(PathComputationType.LAND)
+                if (!canPathfindThroughAbove) {
+                    return false
+                }
+            }
+
+            return true
+        }
+    }
+
+    fun isSafeLandPosAround(world: ServerLevel, pos: BlockPos, mob: PathfinderMob): Boolean {
+        val minX = pos.x
+        val maxX = minX + floor(mob.bbWidth).toInt()
+        val minZ = pos.z
+        val maxZ = minZ + floor(mob.bbWidth).toInt()
+
+        val mutable = BlockPos.MutableBlockPos()
+        for (x in minX..maxX) {
+            for (z in minZ..maxZ) {
+                if (!isSafeLandPos(world, mutable.set(x, pos.y, z), mob)) {
+                    return false
+                }
+            }
+        }
+
+        return true
+    }
+}

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

@@ -0,0 +1,27 @@
+/*
+ * 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.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.GoToSleepTask
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class GoToSleepTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    override fun createTask(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(GoToSleepTask.create(), PokemonEntity::class.java)
+    }
+}

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

@@ -8,29 +8,32 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+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.ai.config.task.GoToHealingMachineTaskConfig.Companion.SELF_HEALING
+import com.cobblemon.mod.common.api.ai.config.task.GoToHealingMachineTaskConfig.Companion.USE_HEALING_MACHINES
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.entity.npc.ai.HealUsingHealingMachineTask
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
 class HealUsingHealingMachineTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val horizontalUseRange = "3".asExpression()
-    val verticalUseRange = "2".asExpression()
+    val condition = booleanVariable(SELF_HEALING, USE_HEALING_MACHINES, true).asExpressible()
+    val horizontalUseRange: ExpressionOrEntityVariable = Either.left("2".asExpression())
+    val verticalUseRange: ExpressionOrEntityVariable = Either.left("1".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition, horizontalUseRange, verticalUseRange).asVariables()
 
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return HealUsingHealingMachineTask(horizontalUseRange, verticalUseRange)
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return HealUsingHealingMachineTask(horizontalUseRange.asExpression(), verticalUseRange.asExpression())
     }
 }

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

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

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

@@ -8,29 +8,34 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.SEE_DISTANCE
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.SetEntityLookTarget
 
 class LookAtEntitiesTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val maxDistance = "15".asExpression()
+    companion object {
+        const val LOOK_AT_ENTITIES = "look_at_entities"
+    }
+
+    val condition = booleanVariable(SharedEntityVariables.LOOKING_CATEGORY, LOOK_AT_ENTITIES, true).asExpressible()
+    val maxDistance = numberVariable(SharedEntityVariables.LOOKING_CATEGORY, SEE_DISTANCE, 15).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        maxDistance
+    ).asVariables()
 
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return SetEntityLookTarget.create(runtime.resolveFloat(maxDistance))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return SetEntityLookTarget.create(maxDistance.resolveFloat())
     }
 }

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

@@ -8,13 +8,15 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+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
 
 class LookAtSpeakerTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ) = LookAtSpeakerTask.create()
 }

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

@@ -8,33 +8,36 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveInt
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.Mob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.LookAtTargetSink
 
 class LookAtTargetTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val minDurationTicks: Expression = "40".asExpression()
-    val maxDurationTicks: Expression = "80".asExpression()
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    val minDurationTicks: ExpressionOrEntityVariable = Either.left("80".asExpression())
+    val maxDurationTicks: ExpressionOrEntityVariable = Either.left("160".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        minDurationTicks,
+        maxDurationTicks
+    ).asVariables()
 
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return WrapperLivingEntityTask(LookAtTargetSink(runtime.resolveInt(minDurationTicks), runtime.resolveInt(maxDurationTicks)), Mob::class.java)
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return WrapperLivingEntityTask(LookAtTargetSink(minDurationTicks.resolveInt(), maxDurationTicks.resolveInt()), Mob::class.java)
     }
 }

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

@@ -0,0 +1,27 @@
+/*
+ * 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.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.LookAtTargetedBattlePokemonTask
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class LookAtTargetedBattlePokemonTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    override fun createTask(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity> {
+        return WrapperLivingEntityTask(LookAtTargetedBattlePokemonTask.create(), PokemonEntity::class.java)
+    }
+}

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

@@ -8,18 +8,29 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+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 com.cobblemon.mod.common.util.asExpression
 import net.minecraft.world.entity.LivingEntity
 
 class LookInDirectionTaskConfig : SingleTaskConfig {
-    var yaw: Expression = "0".asExpression()
-    var pitch: Expression = "0".asExpression()
+    var condition = booleanVariable(LOOKING_CATEGORY, "locked_rotation", true).asExpressible()
+    var yaw = numberVariable(LOOKING_CATEGORY, "locked_yaw", 0F).asExpressible()
+    var pitch = numberVariable(LOOKING_CATEGORY, "locked_pitch", 0F).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        yaw,
+        pitch
+    ).asVariables()
 
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ) = LookInDirectionTask(yaw, pitch)
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ) = LookInDirectionTask(
+        shouldLock = condition.asExpression(),
+        yaw = yaw.asExpression(),
+        pitch = pitch.asExpression()
+    )
 }

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

@@ -8,32 +8,35 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
+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.entity.npc.ai.MeleeAttackTask
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
 class MeleeAttackTaskConfig : SingleTaskConfig {
-    val condition = "true".asExpressionLike()
-    val range = "1.5".asExpression()
-    val cooldownTicks = "30".asExpression()
+    val condition = booleanVariable(SharedEntityVariables.ATTACKING_CATEGORY, "attacks_melee", true).asExpressible()
+    val range = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "melee_range", 1.5F).asExpressible()
+    val cooldownTicks = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "melee_cooldown", 30).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        range,
+        cooldownTicks
+    ).asVariables()
 
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
 
         return MeleeAttackTask.create(
-            range = range,
-            cooldownTicks = cooldownTicks
+            range = range.asExpression(),
+            cooldownTicks = cooldownTicks.asExpression()
         )
     }
 }

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

@@ -8,20 +8,28 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+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.ai.MoveToAttackTargetTask
 import com.cobblemon.mod.common.util.asExpression
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 
 class MoveToAttackTargetTaskConfig : SingleTaskConfig {
-    val speedMultiplier = "0.5".asExpression()
-    val closeEnoughDistance = "1".asExpression()
+    val speedMultiplier = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "attacking_movement_speed", 0.5).asExpressible()
+    val closeEnoughDistance: ExpressionOrEntityVariable = Either.left("1".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        speedMultiplier,
+        closeEnoughDistance
+    ).asVariables()
 
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ) = MoveToAttackTargetTask.create(
-        speedMultiplier = speedMultiplier,
-        closeEnoughDistance = closeEnoughDistance
+        speedMultiplier = speedMultiplier.asExpression(),
+        closeEnoughDistance = closeEnoughDistance.asExpression()
     )
 }

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

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

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

@@ -8,17 +8,15 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+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.toDF
 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.DoNothing
 import net.minecraft.world.entity.ai.behavior.RunOne
 
 /**
@@ -34,15 +32,17 @@ import net.minecraft.world.entity.ai.behavior.RunOne
 class OneOfTaskConfig : SingleTaskConfig {
     class OneOfTaskOption {
         val weight: Int = 1
-        val task: TaskConfig = SingleTaskConfig { _, _ -> DoNothing(0, 1) }
+        val task: TaskConfig = SingleTaskConfig.nothing()
     }
 
     val condition: ExpressionLike = "true".asExpressionLike()
     val options = mutableListOf<OneOfTaskOption>()
 
-    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+    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
-        return RunOne(options.map { it.task.createTasks(entity, brainConfigurationContext).first() toDF it.weight })
+        return RunOne(options.map { it.task.createTasks(entity, behaviourConfigurationContext).first() toDF it.weight })
     }
 }

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

@@ -0,0 +1,42 @@
+/*
+ * 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 net.minecraft.core.Direction
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.phys.Vec3
+
+class PointToSpawnTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    override fun createTask(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext): BehaviorControl<in LivingEntity>? {
+        return BehaviorBuilder.create {
+            it.group(
+                it.registered(MemoryModuleType.LOOK_TARGET),
+                it.absent(MemoryModuleType.WALK_TARGET)
+            ).apply(it) { lookTargetMemory, _ ->
+                Trigger { world, entity, _ ->
+                    val lookTarget = entity.brain.getMemory(MemoryModuleType.LOOK_TARGET).orElse(null)
+                    if (lookTarget == null) {
+                        lookTargetMemory.set(BlockPosTracker(Vec3.atCenterOf(entity.level().sharedSpawnPos).with(Direction.Axis.Y, entity.eyeY)))
+                        return@Trigger true
+                    } else {
+                        return@Trigger false
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -1,7 +1,7 @@
 # Task Configuration
 
 A task configuration is responsible for producing one or multiple tasks as part of a
-[BrainConfiguration](../README.md). Tasks are the smallest unit of behaviour in a brain and are executed
+[Behaviour Configuration](../README.md). Tasks are the smallest unit of behaviour in a brain and are executed
 as part of an activity.
 
 A task configuration can be a simple string that represents the type of task to create, or a JSON object
@@ -183,4 +183,17 @@ the script to avoid lagging the game.
 ### look_in_direction
 The 'look_in_direction' type creates a task that will make the entity look in a specific direction at all times where they aren't being told to look elsewhere.
 - `yaw`: A MoLang expression that determines the yaw angle (degrees) of the entity. Defaults to `0`.
-- `pitch`: A MoLang expression that determines the pitch angle (degrees) of the entity. Defaults to `0`.
+- `pitch`: A MoLang expression that determines the pitch angle (degrees) of the entity. Defaults to `0`.
+
+### move_to_owner
+The 'move_to_owner' type creates a task that will make the entity move to its owner. This will only work for entities that
+can be owned, like Pokémon.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `completionRange`: A MoLang expression that determines the distance from the owner that the entity needs to be for the path to be considered complete. Defaults to 4.
+- `speedMultiplier`: A MoLang expression that determines the speed multiplier for moving to the owner. Defaults to 0.4 which is slightly above the normal walk speed.
+- `teleportDistance`: A MoLang expression that determines the distance from the owner the entity must be before it resorts to teleporting. A value of -1 will cause it to never teleport. Defaults to 24.
+- `maxDistance`: A MoLang expression that determines the maximum distance from the owner that the entity can be to move to them. Defaults to 14.
+
+### point_to_spawn
+The 'point_to_spawn' type creates a task that will make the entity point to the spawn point of the world whenever they
+are not moving and are idling. This is basically only here for Nosepass.

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

@@ -8,17 +8,15 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+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.weightedSelection
 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.DoNothing
 
 /**
  * Randomly chooses one of the possible tasks to add to the brain. This differs from [OneOfTaskConfig] in that
@@ -34,19 +32,21 @@ import net.minecraft.world.entity.ai.behavior.DoNothing
 class RandomTaskConfig : TaskConfig {
     class RandomTaskChoice {
         val weight = 1.0
-        val task: TaskConfig = SingleTaskConfig { _, _ -> DoNothing(0, 1) }
+        val task: TaskConfig = SingleTaskConfig.nothing()
     }
 
     val condition: ExpressionLike = "true".asExpressionLike()
     val choices = mutableListOf<RandomTaskChoice>()
 
+    override fun getVariables(entity: LivingEntity) = choices.flatMap { it.task.getVariables(entity) }
+
     override fun createTasks(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ): List<BehaviorControl<in LivingEntity>> {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
         if (!runtime.resolveBoolean(condition)) return emptyList()
         val task = choices.weightedSelection { it.weight }?.task ?: throw IllegalStateException("No tasks to choose from in random_task config")
-        return task.createTasks(entity, brainConfigurationContext)
+        return task.createTasks(entity, behaviourConfigurationContext)
     }
 }

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

@@ -9,11 +9,12 @@
 package com.cobblemon.mod.common.api.ai.config.task
 
 import com.bedrockk.molang.runtime.value.DoubleValue
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.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.api.scripting.CobblemonScripts
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
@@ -31,18 +32,28 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType
  * @since December 2nd, 2024
  */
 class RunScript : SingleTaskConfig {
-    val script = cobblemonResource("dummy")
+    companion object {
+        const val SCRIPT_CATEGORY = "script"
+    }
+
+    val script = stringVariable(SCRIPT_CATEGORY, "script", "cobblemon:dummy_script").asExpressible()
+    val variables = mutableListOf<MoLangConfigVariable>()
+
+    override fun getVariables(entity: LivingEntity) = listOf(script).asVariables() + variables
 
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ): BehaviorControl<in LivingEntity>? = BehaviorBuilder.create {
         it.group(
             it.registered(MemoryModuleType.LOOK_TARGET) // I think I need to have at least something here?
         ).apply(it) { _ ->
             Trigger { world, entity, _ ->
-                runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: entity.asMostSpecificMoLangValue())
-                return@Trigger CobblemonScripts.run(script, runtime) == DoubleValue.ONE
+                runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+                return@Trigger CobblemonScripts.run(
+                    identifier = script.resolveString().asIdentifierDefaultingNamespace(),
+                    runtime = runtime
+                ) == DoubleValue.ONE
             }
         }
     }

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

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

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

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

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

@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.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 net.minecraft.tags.BlockTags
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.TamableAnimal
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+
+class SleepIfOnTrainerBedTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable>  = emptyList()
+    override fun createTask(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity> {
+        return BehaviorBuilder.create {
+            it.group(
+                it.registered(MemoryModuleType.WALK_TARGET),
+                it.absent(CobblemonMemories.POKEMON_SLEEPING)
+            ).apply(it) { walkTarget, pokemonSleeping ->
+                Trigger { world, entity, _ ->
+                    if (entity !is TamableAnimal) {
+                        return@Trigger false
+                    }
+
+                    val owner = entity.owner ?: return@Trigger false
+                    // If it's no longer moving and is generally within range, cancel any outstanding movement targeting and sleep.
+                    if (!entity.moveControl.hasWanted() && owner.distanceTo(entity) < 1.5 && owner.isSleeping && entity.blockStateOn.`is`(BlockTags.BEDS)) {
+                        pokemonSleeping.set(true)
+                        walkTarget.erase()
+                        entity.onPathfindingDone()
+                        return@Trigger true
+                    }
+
+                    return@Trigger false
+                }
+            }
+        }
+    }
+}

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

@@ -8,31 +8,30 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.entity.ai.StayAfloatTask
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
 class StayAfloatTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val chance: Expression = "0.01".asExpression()
-    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        val chance = runtime.resolveFloat(chance)
+    val condition = booleanVariable(SharedEntityVariables.MOVEMENT_CATEGORY, "can_float", true).asExpressible()
+    val chance = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, "float_chance", 0.8F).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        chance
+    ).asVariables()
+
+    override fun createTask(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext): BehaviorControl<LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
         return WrapperLivingEntityTask(
-            StayAfloatTask(chance),
+            StayAfloatTask(chance.resolveFloat()),
             PathfinderMob::class.java
         )
     }

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

@@ -8,26 +8,25 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.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.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.StopBeingAngryIfTargetDead
 
 class StopBeingAngryIfAttackerDeadTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
+    val condition = booleanVariable(SharedEntityVariables.ATTACKING_CATEGORY, "stop_being_angry_if_attacker_dead", true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
 
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
         return StopBeingAngryIfTargetDead.create()
     }
 }

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

@@ -9,15 +9,17 @@
 package com.cobblemon.mod.common.api.ai.config.task
 
 import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 
 class SwitchFromActionEffectTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
     override fun createTask(
         entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
+        behaviourConfigurationContext: BehaviourConfigurationContext
     ) = BehaviorBuilder.create {
         it.group(
             it.absent(CobblemonMemories.ACTIVE_ACTION_EFFECT)