add multibattle NPC test command for debugging

Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>

CHANGELOG-AI.md

@@ -1,13 +0,0 @@
-### 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.
-- 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-PC.md

@@ -6,6 +6,7 @@
 - Added filter functionality in PC UI, which supports `PokemonProperties` (e.g. `shiny=yes` shows all shiny Pokémon).
 - Added `/changewallpaper <player> <boxNumber> <wallpaper>` command to change a box wallpaper through commands.
 - Added `/renamebox <player> <boxNumber> <name>` command to rename a PC box through commands.
+- Added IVs and EVs stat displays in PC.
 
 ### Developer
 - Added `RenamePCBoxEvent.Pre` and `RenamePCBoxEvent.Post` events to prevent players from renaming a box or changing their input.

CHANGELOG.md

@@ -19,6 +19,8 @@
   - The player executing the command must be facing the target pokemon entity. Transformations are not persistent and will revert when resources are reloaded.
 - Added lang keys for all moves and abilities up to Generation 9.
 - Fixed Moon Ball moon phase logic to actually work correctly
+- Added `translucent_cull` boolean option into resolver's layer to allow for translucent textures with culling
+- Added [LambDynamicLights](https://modrinth.com/mod/lambdynamiclights) support for items held by Pokémon.
 
 ### Pokémon Added
 
@@ -127,6 +129,10 @@
 - Shulker shell Forretress is now a cosmetic rather than a special evo and thus all shulker Forretress will revert back to normal until a shulker shell is put in their cosmetic slot.
 - Updated `doPokemonSpawning` gamerule to support per-dimension configurations.
 - The Pokedex now displays a form name of a "normal" Pokémon for when the base form is still a named form.
+- Improved the zoom functionality of the Pokédex Scanner by giving the levels logarithmic scaling.
+- Added a subtle rotation effect to the Pokédex Scanner's wheel when zooming.
+- 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.
 
 ### Fixes
 - Fixed Particles sometimes facing the wrong direction (looking at you, Swords Dance)
@@ -156,8 +162,8 @@
 - Fixed an issue with newer versions of Fabric API where underground Pokémon were spawning in The End.
 - Fixed spawning not working well when you're at high points surrounded by lower altitude spawning areas, such as flying.
 - 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.
 
 ### Developer
 - A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.

ai_bugs.txt

@@ -1,9 +0,0 @@
-
-- 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") == true
+val isSnapshot = project.property("snapshot")?.equals("true") ?: false
 if (isSnapshot) {
     val fixedBranchName = versioning.info.branch.substringAfter("/")
     version = "$version-${fixedBranchName}-${versioning.info.build}"

common/src/main/java/com/cobblemon/mod/common/compat/LambDynamicLightsCompat.java

@@ -13,10 +13,12 @@ import com.cobblemon.mod.common.client.render.layer.PokemonOnShoulderRenderer;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.pokemon.FormData;
 import com.cobblemon.mod.common.pokemon.lighthing.LightingData;
+import dev.lambdaurora.lambdynlights.LambDynLights;
 import dev.lambdaurora.lambdynlights.api.DynamicLightHandler;
 import dev.lambdaurora.lambdynlights.api.DynamicLightHandlers;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -53,15 +55,19 @@ public class LambDynamicLightsCompat {
 
     private static int resolvedPokemonLightLevel(PokemonEntity pokemon) {
         var underwater = !pokemon.level().getFluidState(BlockPos.containing(pokemon.getX(), pokemon.getEyeY(), pokemon.getZ())).isEmpty();
-        return extractFormLightLevel(pokemon.getForm(), underwater).orElse(0);
+
+        ItemStack item = pokemon.getShownItem();
+        int itemLightLevel = item.isEmpty()?0:LambDynLights.getLuminanceFromItemStack(item, underwater);
+        int formLightLevel = extractFormLightLevel(pokemon.getForm(), underwater).orElse(0);
+
+        return Math.max(itemLightLevel, formLightLevel);
     }
 
     private static int resolvedShoulderLightLevel(Player player) {
-        final var shoulderDataPair = PokemonOnShoulderRenderer.shoulderDataOf(player);
         var underwater = !player.level().getFluidState(BlockPos.containing(player.getX(), player.getEyeY(), player.getZ())).isEmpty();
-        final Optional<Integer> leftLightLevel = extractShoulderLightLevel(shoulderDataPair.getFirst(), underwater);
-        final Optional<Integer> rightLightLevel = extractShoulderLightLevel(shoulderDataPair.getSecond(), underwater);
-        return Math.max(leftLightLevel.orElse(0), rightLightLevel.orElse(0));
+        final int leftLightLevel = extractShoulderLightLevel(PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityLeft()), underwater);
+        final int rightLightLevel = extractShoulderLightLevel(PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityRight()), underwater);
+        return Math.max(leftLightLevel, rightLightLevel);
     }
 
     private static Optional<Integer> extractFormLightLevel(@NotNull FormData form, boolean underwater) {
@@ -71,11 +77,16 @@ public class LambDynamicLightsCompat {
         return Optional.of(form.getLightingData().getLightLevel());
     }
 
-    private static Optional<Integer> extractShoulderLightLevel(@Nullable PokemonOnShoulderRenderer.ShoulderData shoulderData, boolean underwater) {
+    private static int extractShoulderLightLevel(@Nullable PokemonOnShoulderRenderer.ShoulderData shoulderData, boolean underwater) {
         if (shoulderData == null) {
-            return Optional.empty();
+            return 0;
         }
-        return extractFormLightLevel(shoulderData.getForm(), underwater);
+
+        ItemStack item = shoulderData.getShownItem();
+        int itemLightLevel = item.isEmpty()?0:LambDynLights.getLuminanceFromItemStack(item, underwater);
+        int formLightLevel = extractFormLightLevel(shoulderData.getForm(), underwater).orElse(0);
+
+        return Math.max(itemLightLevel, formLightLevel);
     }
 
     private static boolean liquidGlowModeSupport(@NotNull LightingData.LiquidGlowMode liquidGlowMode, boolean underwater) {

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

@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import 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

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

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

@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import 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"), cancellable = false)
-    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/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 = "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;"))
+            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;"))
     )
     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,10 +8,12 @@
 
 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.SoundEngineDuck;
 import com.cobblemon.mod.common.duck.SoundManagerDuck;
+import com.cobblemon.mod.common.duck.SoundEngineDuck;
 import net.minecraft.client.resources.sounds.BiomeAmbientSoundsHandler;
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.resources.sounds.UnderwaterAmbientSoundInstances;

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

@@ -86,9 +86,9 @@ import com.cobblemon.mod.common.permission.LaxPermissionValidator
 import com.cobblemon.mod.common.platform.events.PlatformEvents
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.pokemon.aspects.COSMETIC_SLOT_ASPECT
+import com.cobblemon.mod.common.pokemon.aspects.FORM_ASPECTS
 import com.cobblemon.mod.common.pokemon.aspects.GENDER_ASPECT
 import com.cobblemon.mod.common.pokemon.aspects.SHINY_ASPECT
-import com.cobblemon.mod.common.pokemon.evolution.variants.BlockClickEvolution
 import com.cobblemon.mod.common.pokemon.feature.TagSeasonResolver
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.pokemon.properties.AspectPropertyType
@@ -100,6 +100,7 @@ import com.cobblemon.mod.common.pokemon.properties.UnaspectPropertyType
 import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
 import com.cobblemon.mod.common.pokemon.properties.tags.PokemonFlagProperty
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
+import com.cobblemon.mod.common.pokemon.transformation.triggers.BlockClickTrigger
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
 import com.cobblemon.mod.common.util.DataKeys
 import com.cobblemon.mod.common.util.cobblemonResource
@@ -194,8 +195,6 @@ object Cobblemon {
             this.LOGGER.info("  - Branch: ${CobblemonBuildDetails.BRANCH}")
         }
 
-        this.loadConfig()
-
         implementation.registerPermissionValidator()
         implementation.registerSoundEvents()
         implementation.registerDataComponents()
@@ -218,6 +217,7 @@ object Cobblemon {
         ExperienceGroups.registerDefaults()
         CaptureCalculators.registerDefaults()
 
+        this.loadConfig()
 //        CobblemonBlockPredicates.touch()
         CobblemonOrePlacedFeatures.register()
         CobblemonPlacedFeatures.register()
@@ -255,13 +255,8 @@ object Cobblemon {
         PlatformEvents.RIGHT_CLICK_BLOCK.subscribe { event ->
             val player = event.player
             val block = player.level().getBlockState(event.pos).block
-            player.party().forEach { pokemon ->
-                pokemon.lockedEvolutions
-                    .filterIsInstance<BlockClickEvolution>()
-                    .forEach { evolution ->
-                        evolution.attemptEvolution(pokemon, BlockClickEvolution.BlockInteractionContext(block, player.level()))
-                    }
-            }
+            val context = BlockClickTrigger.Context(block, player.level())
+            player.party().forEach { pokemon -> pokemon.triggerTransformations(BlockClickTrigger::class.java, context) }
         }
 
         PlatformEvents.CHANGE_DIMENSION.subscribe {
@@ -302,6 +297,7 @@ object Cobblemon {
 
         SHINY_ASPECT.register()
         GENDER_ASPECT.register()
+        FORM_ASPECTS.register()
         COSMETIC_SLOT_ASPECT.register()
 
         SpeciesFeatures.types["choice"] = ChoiceSpeciesFeatureProvider::class.java

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

@@ -15,10 +15,6 @@ 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"))
-    val GUARD_NEST = register(Activity("guard_nest"))
 
     fun register(activity: Activity): Activity {
         activities.add(activity)

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

@@ -1,106 +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.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.BrainConfigAdapter
-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, BrainConfigAdapter)
-        .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

@@ -49,11 +49,6 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
     @JvmField
     val HANGING_SIGN: BlockEntityType<CobblemonHangingSignBlockEntity> = this.create("hanging_sign", BlockEntityType.Builder.of(::CobblemonHangingSignBlockEntity, CobblemonBlocks.APRICORN_HANGING_SIGN, CobblemonBlocks.APRICORN_WALL_HANGING_SIGN).build(null))
 
-    @JvmField
-    val GROTTO_BLOCK: BlockEntityType<GrottoBlockEntity> = this.create("grotto_block",
-            BlockEntityType.Builder.of(::GrottoBlockEntity, CobblemonBlocks.GROTTO_BLOCK).build(null)
-    )
-
     @JvmField
     val GILDED_CHEST: BlockEntityType<GildedChestBlockEntity> = this.create("chest", BlockEntityType.Builder.of(::GildedChestBlockEntity,
         CobblemonBlocks.GILDED_CHEST,
@@ -87,46 +82,6 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
         ).build(null)
     )
 
-    val NEST: BlockEntityType<NestBlockEntity> = this.create("nest",
-        BlockEntityType.Builder.of(
-            ::NestBlockEntity,
-            CobblemonBlocks.NEST_STICK,
-            CobblemonBlocks.NEST_LEAF,
-            CobblemonBlocks.NEST_STONE,
-            CobblemonBlocks.NEST_DEEPSLATE,
-            CobblemonBlocks.NEST_BASALT,
-            CobblemonBlocks.NEST_SNOW,
-            CobblemonBlocks.NEST_NETHER,
-            CobblemonBlocks.NEST_SOUL_SAND,
-            CobblemonBlocks.NEST_WARM_OCEAN,
-            CobblemonBlocks.NEST_SEAGRASS,
-            CobblemonBlocks.NEST_LUSH,
-            CobblemonBlocks.NEST_HAY,
-            CobblemonBlocks.NEST_SAND,
-            CobblemonBlocks.NEST_RED_SAND,
-            CobblemonBlocks.NEST_CHORUS,
-
-            CobblemonBlocks.WATER_NEST,
-            CobblemonBlocks.CAVE_NEST,
-            CobblemonBlocks.BASIC_NEST
-        ).build(null))
-
-    val EGG: BlockEntityType<EggBlockEntity> = this.create("egg",
-            BlockEntityType.Builder.of(
-                ::EggBlockEntity,
-                CobblemonBlocks.EGG
-            ).build(null)
-        )
-
-    @JvmField
-    val INCUBATOR: BlockEntityType<IncubatorBlockEntity> = this.create("incubator",
-        BlockEntityType.Builder.of(
-            ::IncubatorBlockEntity,
-            CobblemonBlocks.INCUBATOR
-        ).build(null)
-    )
-
-
     @JvmField
     val DISPLAY_CASE: BlockEntityType<DisplayCaseBlockEntity> = this.create("display_case",
         BlockEntityType.Builder.of(::DisplayCaseBlockEntity, CobblemonBlocks.DISPLAY_CASE).build(null)

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

@@ -478,61 +478,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val YACHE_BERRY = this.berryBlock("yache")
     //val BINDING_SOIL = this.create("binding_soil", BindingSoilBlock(BlockBehaviour.Properties.of()))
 
-    val NEST_STICK = nestBlock(NestBlock.NestVariant.STICK)
-    val NEST_LEAF = nestBlock(NestBlock.NestVariant.LEAF)
-    val NEST_STONE = nestBlock(NestBlock.NestVariant.STONE)
-    val NEST_DEEPSLATE = nestBlock(NestBlock.NestVariant.DEEPSLATE)
-    val NEST_BASALT = nestBlock(NestBlock.NestVariant.BASALT)
-    val NEST_SNOW = nestBlock(NestBlock.NestVariant.SNOW)
-
-    val NEST_NETHER = this.create(
-            "nest_nether",
-            NestBlock(NestBlock.NestVariant.NETHER, BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).lightLevel { 2 })
-    )
-    val NEST_SOUL_SAND = nestBlock(NestBlock.NestVariant.SOUL_SAND)
-    val NEST_WARM_OCEAN = this.create(
-            "nest_warm_ocean",
-            NestBlock(NestBlock.NestVariant.WARM_OCEAN, BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).lightLevel { 6 })
-    )
-    val NEST_SEAGRASS = nestBlock(NestBlock.NestVariant.SEAGRASS)
-    val NEST_LUSH = nestBlock(NestBlock.NestVariant.LUSH)
-    val NEST_HAY = nestBlock(NestBlock.NestVariant.HAY)
-    val NEST_SAND = nestBlock(NestBlock.NestVariant.SAND)
-    val NEST_RED_SAND = nestBlock(NestBlock.NestVariant.RED_SAND)
-    val NEST_CHORUS = nestBlock(NestBlock.NestVariant.CHORUS)
-
-
-
-    val BASIC_NEST = nestBlock(NestBlock.NestVariant.BASIC)
-    val CAVE_NEST = nestBlock(NestBlock.NestVariant.CAVE)
-    //val NETHER_NEST = nestBlock(NestBlock.NestVariant.NETHER)
-    val WATER_NEST = nestBlock(NestBlock.NestVariant.WATER)
-
-    val EGG = this.create("egg", EggBlock(BlockBehaviour.Properties
-        .ofFullCopy(Blocks.DRAGON_EGG)
-        .pushReaction(PushReaction.BLOCK)
-        .sound(SoundType.BONE_BLOCK)
-    ))
-
-    @JvmField
-    val GROTTO_BLOCK = this.create("grotto_block", GrottoBlock(BlockBehaviour.Properties.of()
-            .mapColor(MapColor.STONE)
-            .strength(1.5F)
-            .pushReaction(PushReaction.BLOCK)
-    ))
-
-    @JvmField
-    val INCUBATOR = this.create("incubator", IncubatorBlock(BlockBehaviour.Properties.of()
-        .mapColor(MapColor.COLOR_LIGHT_GRAY)
-        .sound(SoundType.METAL)
-        .strength(Blocks.COAL_BLOCK.defaultDestroyTime(), Blocks.DIAMOND_ORE.explosionResistance)
-        .noOcclusion()
-        .pushReaction(PushReaction.BLOCK)
-        .lightLevel { state ->
-            if (state.getValue(IncubatorBlock.HAS_EGG)) 5 else 0 // Emit 5 light when HAS_EGG is true
-        }
-    ))
-
     init {
         /**
          * Makes all blocks in array flammable by adding them to FireBlock's flammableRegistry.
@@ -561,12 +506,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
         return block
     }
 
-    private fun nestBlock(variant: NestBlock.NestVariant): NestBlock {
-        val identifier = cobblemonResource(variant.serializedName)
-        val block = NestBlock(variant, BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY))
-        return this.create(identifier.path, block)
-    }
-
     /**
      * Calls helper method from Vanilla
      */

common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBrainConfigs.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
+
+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

@@ -60,12 +60,9 @@ object CobblemonCommands {
         RenameBoxCommand.register(dispatcher)
         ChangeBoxWallpaperCommand.register(dispatcher)
         RunMolangScriptCommand.register(dispatcher)
-        GivePokemonEggCommand.register(dispatcher)
-        GiveAllPokemonEggCommand.register(dispatcher)
         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

@@ -8,12 +8,9 @@
 
 package com.cobblemon.mod.common
 
-import com.cobblemon.mod.common.api.pokemon.breeding.Egg
-import com.cobblemon.mod.common.block.entity.EggBlockEntity
 import com.cobblemon.mod.common.item.components.HeldItemCapableComponent
 import com.cobblemon.mod.common.item.components.PokemonItemComponent
 import com.cobblemon.mod.common.item.RodBaitComponent
-import com.cobblemon.mod.common.item.components.EggComponent
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import net.minecraft.core.Registry
 import net.minecraft.core.component.DataComponentType
@@ -39,18 +36,11 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
         .networkSynchronized(RodBaitComponent.PACKET_CODEC)
         .build())
 
-    val EGG_DATA: DataComponentType<EggComponent> = create("egg", DataComponentType.builder<EggComponent>()
-            .persistent(EggComponent.CODEC) // For saving/loading
-            .networkSynchronized(EggComponent.PACKET_CODEC) // For network synchronization
-            .build())
-
-
 
 
     fun register() {
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:pokemon_item"), POKEMON_ITEM)
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:bait"), BAIT)
-        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:egg_data"), EGG_DATA)
     }
 
     override val registry = BuiltInRegistries.DATA_COMPONENT_TYPE

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

@@ -19,7 +19,6 @@ import com.cobblemon.mod.common.api.text.gray
 import com.cobblemon.mod.common.block.BerryBlock
 import com.cobblemon.mod.common.block.MintBlock
 import com.cobblemon.mod.common.block.MintBlock.MintType
-import com.cobblemon.mod.common.block.NestBlock
 import com.cobblemon.mod.common.client.pokedex.PokedexType
 import com.cobblemon.mod.common.entity.boat.CobblemonBoatType
 import com.cobblemon.mod.common.item.*
@@ -42,7 +41,6 @@ import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.effect.MobEffectInstance
-import net.minecraft.world.item.Item.Properties
 import net.minecraft.world.effect.MobEffects
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.food.FoodProperties
@@ -394,33 +392,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
 
     @JvmField val BERRY_JUICE = this.create("berry_juice", BerryJuiceItem())
 
-    val NEST_STICK = blockItem(NestBlock.NestVariant.STICK.serializedName, CobblemonBlocks.NEST_STICK)
-    val NEST_LEAF = blockItem(NestBlock.NestVariant.LEAF.serializedName, CobblemonBlocks.NEST_LEAF)
-    val NEST_STONE = blockItem(NestBlock.NestVariant.STONE.serializedName, CobblemonBlocks.NEST_STONE)
-    val NEST_DEEPSLATE = blockItem(NestBlock.NestVariant.DEEPSLATE.serializedName, CobblemonBlocks.NEST_DEEPSLATE)
-    val NEST_BASALT = blockItem(NestBlock.NestVariant.BASALT.serializedName, CobblemonBlocks.NEST_BASALT)
-    val NEST_SNOW = blockItem(NestBlock.NestVariant.SNOW.serializedName, CobblemonBlocks.NEST_SNOW)
-
-    val NEST_NETHER = blockItem(NestBlock.NestVariant.NETHER.serializedName, CobblemonBlocks.NEST_NETHER)
-    val NEST_SOUL_SAND = blockItem(NestBlock.NestVariant.SOUL_SAND.serializedName, CobblemonBlocks.NEST_SOUL_SAND)
-    val NEST_WARM_OCEAN = blockItem(NestBlock.NestVariant.WARM_OCEAN.serializedName, CobblemonBlocks.NEST_WARM_OCEAN)
-    val NEST_SEAGRASS = blockItem(NestBlock.NestVariant.SEAGRASS.serializedName, CobblemonBlocks.NEST_SEAGRASS)
-    val NEST_LUSH = blockItem(NestBlock.NestVariant.LUSH.serializedName, CobblemonBlocks.NEST_LUSH)
-    val NEST_HAY = blockItem(NestBlock.NestVariant.HAY.serializedName, CobblemonBlocks.NEST_HAY)
-    val NEST_SAND = blockItem(NestBlock.NestVariant.SAND.serializedName, CobblemonBlocks.NEST_SAND)
-    val NEST_RED_SAND = blockItem(NestBlock.NestVariant.RED_SAND.serializedName, CobblemonBlocks.NEST_RED_SAND)
-    val NEST_CHORUS = blockItem(NestBlock.NestVariant.CHORUS.serializedName, CobblemonBlocks.NEST_CHORUS)
-
-    val BASIC_NEST = blockItem(NestBlock.NestVariant.BASIC.serializedName, CobblemonBlocks.BASIC_NEST)
-    val CAVE_NEST = blockItem(NestBlock.NestVariant.CAVE.serializedName, CobblemonBlocks.CAVE_NEST)
-    val WATER_NEST = blockItem(NestBlock.NestVariant.WATER.serializedName, CobblemonBlocks.WATER_NEST)
-
-    @JvmField
-    val INCUBATOR = blockItem("incubator", CobblemonBlocks.INCUBATOR)
-
-    @JvmField
-    val GROTTO_BLOCK = blockItem("grotto_block", CobblemonBlocks.GROTTO_BLOCK)
-
     @JvmField
     val GALARICA_NUTS = create("galarica_nuts", GalaricaNutItem())
 
@@ -734,7 +705,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val COVERT_CLOAK = heldItem("covert_cloak")
     @JvmField
-    val DESTINY_KNOT = heldItem("destiny_knot", null, if (Cobblemon.config.canDestinyKnotBreak) Properties().durability(Cobblemon.config.destinyKnotDurability) else Properties())
+    val DESTINY_KNOT = heldItem("destiny_knot")
     @JvmField
     val DRAGON_FANG = heldItem("dragon_fang")
     @JvmField
@@ -1254,10 +1225,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     val FAIRY_GEM = noSettingsItem("fairy_gem")
     //@JvmField
     //val BINDING_SOIL = blockItem("binding_soil", CobblemonBlocks.BINDING_SOIL)
-    @JvmField
-    val POKEMON_EGG = eggItem("egg", CobblemonBlocks.EGG, Item.Properties().stacksTo(1))
-
-    private fun eggItem(name: String, block: Block, settings: Item.Properties = Item.Properties()): BlockItem = this.create(name, BlockItem(block, settings))
 
     private fun blockItem(name: String, block: Block, rarity: Rarity = Rarity.COMMON): BlockItem = this.create(name, BlockItem(block, Item.Properties().rarity(rarity)))
 
@@ -1301,9 +1268,9 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
         }
     )
 
-    private fun heldItem(name: String, remappedName: String? = null, settings:Item.Properties = Item.Properties()): CobblemonItem = create(
+    private fun heldItem(name: String, remappedName: String? = null): CobblemonItem = create(
         name,
-        CobblemonItem(settings).also {
+        CobblemonItem(Item.Properties()).also {
             if (remappedName != null) {
                 CobblemonHeldItemManager.registerRemap(it, remappedName)
             }

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

@@ -10,56 +10,20 @@ package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.api.dialogue.ActiveDialogue
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.ListCodec
 import com.mojang.serialization.codecs.PrimitiveCodec
-import net.minecraft.core.BlockPos
 import net.minecraft.core.UUIDUtil
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import java.util.Optional
-import java.util.UUID
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.item.ItemEntity
-import net.minecraft.world.entity.player.Player
 
 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 POTENTIAL_MATE = register<PokemonEntity>("potential_mate")
-    val MATE_SCAN_COOLDOWN = register("mate_scan_cooldown", PrimitiveCodec.BOOL)
-    val NEST_LOCATION = register<BlockPos>("nest_location")
-    val PATERNAL_NEST_LOCATION = register<BlockPos>("paternal_nest")
-    val IRRITATED_AT = register<UUID>("irritated_at")
-    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 EGG_THIEF = register<Player>("egg_thief") // Stores the player stealing the egg
-    val EGG_LOCATION = register<BlockPos>("egg_location") // Stores the last known location of the egg
-    val EGG_IN_NEST = register("egg_in_nest", PrimitiveCodec.BOOL)
-    val READY_TO_GRAB_EGG = register("ready_to_grab_egg", PrimitiveCodec.BOOL)
-    val HOLDING_EGG = register("holding_egg", PrimitiveCodec.BOOL)
-    val EGG_SEARCH_COUNTDOWN = register ("egg_search_countdown", PrimitiveCodec.BOOL)
-    val NESTING_MATERIAL_LOCATION = register<BlockPos>("nesting_material_location")
-    val SENSED_NEST_MATERIAL = register<ItemEntity>("sensed_nest_material")
-    val IDEAL_NEST_LOCATION = register<BlockPos>("ideal_nest_location")
-    val READY_TO_BUILD_NEST = register("ready_to_build_nest", PrimitiveCodec.BOOL)
-    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))
@@ -72,4 +36,4 @@ object CobblemonMemories {
         memories[id] = memoryModule
         return memoryModule
     }
-}
+}

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

@@ -9,7 +9,6 @@
 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,13 +59,11 @@ 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
 import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
 import com.cobblemon.mod.common.net.messages.client.battle.*
-import com.cobblemon.mod.common.net.messages.client.breeding.BreedingRuleRegistrySyncPacket
 import com.cobblemon.mod.common.net.messages.client.callback.OpenMoveCallbackPacket
 import com.cobblemon.mod.common.net.messages.client.callback.OpenPartyCallbackPacket
 import com.cobblemon.mod.common.net.messages.client.callback.OpenPartyMoveCallbackPacket
@@ -106,9 +103,9 @@ import com.cobblemon.mod.common.net.messages.client.storage.pc.ClosePCPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.InitializePCPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.MoveClientPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.OpenPCPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.RenamePCBoxPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCBoxPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.ChangePCBoxWallpaperPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.RequestPCBoxWallpapersPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.SetPCBoxWallpapersPacket
@@ -138,9 +135,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.breeding.TriggerEggHatchPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectedPacket
 import com.cobblemon.mod.common.net.messages.server.callback.party.PartyPokemonSelectedPacket
@@ -168,12 +163,6 @@ import com.cobblemon.mod.common.net.messages.server.storage.SwapPCPartyPokemonPa
 import com.cobblemon.mod.common.net.messages.server.storage.party.MovePartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.ReleasePartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.SwapPartyPokemonPacket
-import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonPacket
-import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonToPartyPacket
-import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePartyPokemonToPCPacket
-import com.cobblemon.mod.common.net.messages.server.storage.pc.ReleasePCPokemonPacket
-import com.cobblemon.mod.common.net.messages.server.storage.pc.SwapPCPokemonPacket
-import com.cobblemon.mod.common.net.messages.server.storage.pc.UnlinkPlayerFromPCPacket
 import com.cobblemon.mod.common.net.messages.server.storage.pc.*
 import com.cobblemon.mod.common.net.messages.server.trade.AcceptTradeRequestPacket
 import com.cobblemon.mod.common.net.messages.server.trade.CancelTradePacket
@@ -181,19 +170,13 @@ import com.cobblemon.mod.common.net.messages.server.trade.ChangeTradeAcceptanceP
 import com.cobblemon.mod.common.net.messages.server.trade.OfferTradePacket
 import com.cobblemon.mod.common.net.messages.server.trade.PerformTradePacket
 import com.cobblemon.mod.common.net.messages.server.trade.UpdateTradeOfferPacket
-import com.cobblemon.mod.common.net.serverhandling.ChallengeHandler
-import com.cobblemon.mod.common.net.serverhandling.ChallengeResponseHandler
-import com.cobblemon.mod.common.net.serverhandling.RequestInteractionsHandler
 import com.cobblemon.mod.common.net.serverhandling.battle.BattleSelectActionsHandler
 import com.cobblemon.mod.common.net.serverhandling.battle.RemoveSpectatorHandler
 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.messages.server.storage.pc.*
 import com.cobblemon.mod.common.net.serverhandling.block.AdjustBlockEntityViewerCountHandler
-import com.cobblemon.mod.common.net.serverhandling.breeding.TriggerEggHatchHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectCancelledHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectedHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.party.PartyPokemonSelectedHandler
@@ -225,12 +208,12 @@ import com.cobblemon.mod.common.net.serverhandling.storage.SwapPCPartyPokemonHan
 import com.cobblemon.mod.common.net.serverhandling.storage.party.MovePartyPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.party.ReleasePCPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.party.SwapPartyPokemonHandler
-import com.cobblemon.mod.common.net.serverhandling.storage.pc.MovePCPokemonHandler
-import com.cobblemon.mod.common.net.serverhandling.storage.pc.MovePCPokemonToPartyHandler
-import com.cobblemon.mod.common.net.serverhandling.storage.pc.MovePartyPokemonToPCHandler
-import com.cobblemon.mod.common.net.serverhandling.storage.pc.ReleasePartyPokemonHandler
-import com.cobblemon.mod.common.net.serverhandling.storage.pc.SwapPCPokemonHandler
-import com.cobblemon.mod.common.net.serverhandling.storage.pc.UnlinkPlayerFromPCHandler
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.form.AddFormPacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.form.ClearFormsPacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.form.RemoveFormPacket
+import com.cobblemon.mod.common.net.messages.server.pokemon.update.form.AcceptFormPacket
+import com.cobblemon.mod.common.net.messages.server.pokemon.update.form.RevertFormPacket
+import com.cobblemon.mod.common.net.serverhandling.*
 import com.cobblemon.mod.common.net.serverhandling.storage.pc.*
 import com.cobblemon.mod.common.net.serverhandling.trade.AcceptTradeRequestHandler
 import com.cobblemon.mod.common.net.serverhandling.trade.CancelTradeHandler
@@ -238,7 +221,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.net.serverhandling.storage.pc.*
 import com.cobblemon.mod.common.util.server
 import net.minecraft.server.level.ServerPlayer
 
@@ -392,11 +374,8 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(PokedexDexSyncPacket.ID, PokedexDexSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(DexEntrySyncPacket.ID, DexEntrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(FishingBaitRegistrySyncPacket.ID, FishingBaitRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(BreedingRuleRegistrySyncPacket.ID, BreedingRuleRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(HabitatSyncPacket.ID, HabitatSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(FlowRegistrySyncPacket.ID, FlowRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(CosmeticItemAssignmentSyncPacket.ID, CosmeticItemAssignmentSyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(BehaviourSyncPacket.ID, BehaviourSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(MarkRegistrySyncPacket.ID, MarkRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
 
         // Effects
@@ -451,12 +430,14 @@ 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))
 
+        // Form packets
+        list.add(PacketRegisterInfo(AddFormPacket.ID, AddFormPacket::decode, PokemonUpdatePacketHandler()))
+        list.add(PacketRegisterInfo(ClearFormsPacket.ID, ClearFormsPacket::decode, PokemonUpdatePacketHandler()))
+        list.add(PacketRegisterInfo(RemoveFormPacket.ID, RemoveFormPacket::decode, PokemonUpdatePacketHandler()))
+
         // Debug / cheats
         list.add(PacketRegisterInfo(CalculateSeatPositionsPacket.ID, CalculateSeatPositionsPacket::decode, CalculateSeatPositionsHandler))
 
@@ -560,16 +541,14 @@ object CobblemonNetwork {
         // NPC packets
         list.add(PacketRegisterInfo(SaveNPCPacket.ID, SaveNPCPacket::decode, SaveNPCHandler))
 
+        // Form Packets
+        list.add(PacketRegisterInfo(AcceptFormPacket.ID, AcceptFormPacket::decode, AcceptFormHandler))
+        list.add(PacketRegisterInfo(RevertFormPacket.ID, RevertFormPacket::decode, RevertFormHandler))
+
         // Riding packet(s)
         list.add(PacketRegisterInfo(ServerboundUpdateOrientationPacket.ID, ServerboundUpdateOrientationPacket::decode, OrientationPacketHandler))
         list.add(PacketRegisterInfo(ServerboundUpdateRidingStatePacket.ID, ServerboundUpdateRidingStatePacket::decode, ServerboundUpdateRidingStateHandler))
 
-        // Breeding Packets
-        list.add(PacketRegisterInfo(TriggerEggHatchPacket.ID, TriggerEggHatchPacket::decode, TriggerEggHatchHandler))
-
-        // Behaviour Packets
-        list.add(PacketRegisterInfo(SetEntityBehaviourPacket.ID, SetEntityBehaviourPacket::decode, SetEntityBehaviourHandler))
-
         return list
     }
 

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

@@ -8,8 +8,6 @@
 
 package com.cobblemon.mod.common
 
-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.*
-import com.cobblemon.mod.common.pokemon.ai.PokemonDisturbancesSensor
 import com.cobblemon.mod.common.entity.sensor.BattlingPokemonSensor
 import com.cobblemon.mod.common.entity.sensor.NPCBattlingSensor
 import java.util.function.Supplier
@@ -22,25 +20,10 @@ object CobblemonSensors {
 
     val NPC_BATTLING = register("npc_battling", ::NPCBattlingSensor)
     val BATTLING_POKEMON = register("battling_pokemon", ::BattlingPokemonSensor)
-    val MATE_SENSOR = register("mate_sensor", ::MateSensor)
-    val NEST_SENSOR = register("nest_sensor", ::NestSensor)
-    val EGG_SENSOR = register("egg_sensor", :: EggSensor)
-    val NEST_MATERIAL_SENSOR = register("nest_material_sensor", :: NestMaterialSensor)
-    val IDEAL_NEST_LOCATION_SENSOR = register("ideal_nest_location_sensor", ::IdealNestPlacementSensor)
-//    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

@@ -84,9 +84,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val POKEDEX_SCAN_ZOOM_INCREMENT = this.create("item.pokedex.scan_zoom_increment")
 
-    @JvmField
-    val BREEDING_EGG_HATCH = this.create("breeding.egg_hatch")
-
     @JvmField
     val ITEM_USE = this.create("item.use")
     @JvmField

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

@@ -19,7 +19,7 @@ import net.minecraft.world.entity.ai.village.poi.PoiType
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.BlockState
 
-object CobblemonPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Registry<PoiType>>, PoiType>() {
+object CobblemonVillagerPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Registry<PoiType>>, PoiType>() {
     override val registry: Registry<PoiType> = BuiltInRegistries.POINT_OF_INTEREST_TYPE
     override val resourceKey: ResourceKey<Registry<PoiType>> = Registries.POINT_OF_INTEREST_TYPE
 
@@ -27,11 +27,6 @@ object CobblemonPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Regist
     val NURSE_KEY: ResourceKey<PoiType> = createKey("nurse")
     @JvmField
     val NURSE = create(NURSE_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.HEALING_MACHINE), 1, 1))
-    @JvmField
-    val GROTTO_BLOCK_KEY: ResourceKey<PoiType> = createKey("grotto_block")
-    @JvmField
-    val GROTTO_BLOCK = create(GROTTO_BLOCK_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.GROTTO_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/CobblemonVillagerProfessions.kt

@@ -24,7 +24,7 @@ object CobblemonVillagerProfessions: PlatformRegistry<Registry<VillagerProfessio
     override val resourceKey: ResourceKey<Registry<VillagerProfession>> = Registries.VILLAGER_PROFESSION
 
     @JvmField
-    val NURSE = profession(CobblemonPoiTypes.NURSE_KEY, CobblemonSounds.VILLAGER_WORK_NURSE)
+    val NURSE = profession(CobblemonVillagerPoiTypes.NURSE_KEY, CobblemonSounds.VILLAGER_WORK_NURSE)
 
     /**
      * Register a villager profession texture override for Cobblemon villagers of the given [VillagerProfession] for specified names.

common/src/main/kotlin/com/cobblemon/mod/common/api/abilities/AbilityTemplate.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.api.abilities
 
 import com.cobblemon.mod.common.api.Priority
+import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
 import com.cobblemon.mod.common.util.codec.CodecUtils
 import com.google.gson.JsonObject
 import com.mojang.serialization.Codec
@@ -25,7 +26,7 @@ class AbilityTemplate(
     var builder: (AbilityTemplate, forced: Boolean, priority: Priority) -> Ability = { template, forced, priority -> Ability(template, forced, priority) },
     val displayName: String = "cobblemon.ability.$name",
     val description: String = "cobblemon.ability.$name.desc"
-) {
+) : ShowdownIdentifiable {
     /**
      * Returns the Ability or if applicable the extension connected to this template
      */
@@ -45,6 +46,8 @@ class AbilityTemplate(
      */
     fun create(json: JsonObject) = create().loadFromJSON(json)
 
+    override fun showdownId(): String = ShowdownIdentifiable.REGEX.replace(this.name.lowercase(), "")
+
     companion object {
 
         @JvmStatic

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

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

@@ -1,50 +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
-
-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

@@ -1,20 +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
-
-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,34 +8,32 @@
 
 package com.cobblemon.mod.common.api.ai.config
 
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
+import com.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.config.task.TaskConfig
-import com.cobblemon.mod.common.util.asExpression
-import com.mojang.datafixers.util.Either
+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.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity
 
-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())
+class AddTasksToActivity : BrainConfig {
+    val activity = Activity.IDLE
+    val condition = "true".asExpressionLike()
     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, behaviourConfigurationContext: BehaviourConfigurationContext) {
-        if (!checkCondition(entity, condition)) return
-
-        val activities = if (activity != null) (activities + activity) else activities
+    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 activity = brainConfigurationContext.getOrCreateActivity(activity)
         tasksByPriority.forEach { (priority, taskConfigs) ->
-            val tasks = taskConfigs.flatMap { it.createTasks(entity, behaviourConfigurationContext) }
-            for (activity in activities) {
-                val activityContext = behaviourConfigurationContext.getOrCreateActivity(activity)
-                activityContext.addTasks(priority, *tasks.toTypedArray())
-            }
+            val tasks = taskConfigs.flatMap { it.createTasks(entity, brainConfigurationContext) }
+            activity.addTasks(priority, *tasks.toTypedArray())
         }
     }
 }

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

@@ -1,20 +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.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

@@ -1,51 +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.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

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.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

@@ -1,57 +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.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.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-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<String, Class<out BehaviourConfig>>(
-            "script" to ScriptBehaviourConfig::class.java,
-            "custom_script" to CustomScriptBehaviourConfig::class.java,
-            "add_tasks_to_activity" to AddTasksToActivity::class.java,
-            "apply_behaviours" to ApplyBehaviours::class.java,
-            "set_default_activity" to SetDefaultActivity::class.java,
-            "set_core_activities" to SetCoreActivities::class.java,
-            "add_variables" to AddVariablesConfig::class.java,
-            "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

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config
+
+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

@@ -1,40 +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.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

@@ -0,0 +1,16 @@
+/*
+ * 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,13 +1,12 @@
-# Behaviour Configuration
+# Brain Configuration
 
-A "Brain" is a Java Edition AI concept for more modern entities. It has tasks that are listed inside 'activities',
+A "Brain" is a Java Edition AI concept for more modern entities. It has tasks that are listed inside of '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 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.
+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. 
 
 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.
@@ -49,18 +48,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.
 
-## 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.
+## 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.
 
 ### script
-The `script` type executes a MoLang script which will apply some changes to the entity or brain.
+The `script` type executes a MoLang script which will apply some changes to the 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 behaviour configuration cannot
+- `activity`: The activity to add the tasks to. This must be a pre-existing activity - a brain 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.
@@ -97,107 +96,24 @@ 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_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..
+### 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"`.
 
-Example behaviour (`uses_healing_machine.json`):
+Example brain preset (`uses_healing_machine.json`):
 ```json
-{
-  "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"
-        ]
-      }
+[
+  {
+    "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/ScriptBrainConfig.kt

@@ -13,13 +13,12 @@ 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.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 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
@@ -31,16 +30,13 @@ import com.mojang.datafixers.util.Pair
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
-class ScriptBehaviourConfig : BehaviourConfig {
+class ScriptBrainConfig : BrainConfig {
     val condition = "true".asExpressionLike()
     val script = cobblemonResource("dummy")
-    val variables = mutableListOf<MoLangConfigVariable>()
 
-    override fun getVariables(entity: LivingEntity) = variables
-
-    override fun configure(entity: LivingEntity, context: BehaviourConfigurationContext) {
+    override fun configure(entity: LivingEntity, context: BrainConfigurationContext) {
         val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
         if (!runtime.resolveBoolean(condition)) return
 
         val struct = createBrainStruct(entity, context)
@@ -52,30 +48,30 @@ class ScriptBehaviourConfig : BehaviourConfig {
         runtime.resolve(script, mapOf("brain" to struct))
     }
 
-    fun createBrainStruct(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext): QueryStruct {
+    fun createBrainStruct(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): QueryStruct {
         return QueryStruct(hashMapOf()).addStandardFunctions()
-            .addFunction("entity") { entity.asMostSpecificMoLangValue() }
+            .addFunction("entity") { (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()) }
             .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 = behaviourConfigurationContext.activities.find { it.activity == activity }
+                val existingActivityBuilder = brainConfigurationContext.activities.find { it.activity == activity }
                 if (existingActivityBuilder != null) {
                     return@addFunction createActivityStruct(existingActivityBuilder)
                 } else {
                     val activityConfigurationContext = ActivityConfigurationContext(activity)
-                    behaviourConfigurationContext.activities.add(activityConfigurationContext)
+                    brainConfigurationContext.activities.add(activityConfigurationContext)
                     return@addFunction createActivityStruct(activityConfigurationContext)
                 }
             }
             .addFunction("set_core_activities") { params ->
-                behaviourConfigurationContext.coreActivities = params.params.map { (it as ObjectValue<ActivityConfigurationContext>).obj.activity }.toSet()
+                brainConfigurationContext.coreActivities = params.params.map { (it as ObjectValue<ActivityConfigurationContext>).obj.activity }.toSet()
                 return@addFunction DoubleValue.ONE
             }
             .addFunction("set_default_activity") { params ->
-                behaviourConfigurationContext.defaultActivity = params.get<ObjectValue<ActivityConfigurationContext>>(0).obj.activity
+                brainConfigurationContext.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,15 +8,13 @@
 
 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 com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity
 
-class SetCoreActivities : BehaviourConfig {
+class SetCoreActivities : BrainConfig {
     val activities = mutableListOf<Activity>()
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
-    override fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) {
-        behaviourConfigurationContext.coreActivities = activities.toSet()
+    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
+        brainConfigurationContext.coreActivities = activities.toSet()
     }
 }

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

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

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

@@ -1,36 +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.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

@@ -1,74 +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.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.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
-
-        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 = wanderChance.resolveFloat()
-                    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,34 +8,25 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.util.asExpression
+import com.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.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: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    val condition = "true".asExpressionLike()
     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,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ): List<BehaviorControl<in LivingEntity>> {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return emptyList()
-        return tasks.flatMap { it.createTasks(entity, behaviourConfigurationContext) }
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return emptyList()
+        return tasks.flatMap { it.createTasks(entity, brainConfigurationContext) }
     }
 }

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.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.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.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 = booleanVariable(SharedEntityVariables.ATTACKING_CATEGORY, "should_attack_angry_at", true).asExpressible()
-    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
-
+    val condition = "true".asExpressionLike()
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
         return AttackAngryAtTask.create()
     }
 }

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

@@ -1,148 +0,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.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.pokemon.breeding.Egg
-import com.cobblemon.mod.common.api.text.green
-import com.cobblemon.mod.common.block.entity.NestBlockEntity
-import com.cobblemon.mod.common.breeding.BreedingLogicManager
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.AttackEggThiefTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BreedAtNestTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.SearchForEggTask
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.kinds.IdF
-import net.minecraft.core.BlockPos
-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.item.ItemStack
-import net.minecraft.world.phys.Vec3
-
-class AttackEggThiefTaskConfig : SingleTaskConfig {
-    companion object {
-        const val BREED = "breed_at_nest" // Category
-    }
-
-    val condition = booleanVariable(BREED, "can_breed", true).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return WrapperLivingEntityTask(AttackEggThiefTask.create(), PokemonEntity::class.java)
-    }
-}
-
-    /*override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
-
-        return BehaviorBuilder.create {
-            it.group(
-                it.present(CobblemonMemories.NEST_LOCATION),
-                it.present(CobblemonMemories.POTENTIAL_MATE),
-                it.absent(MemoryModuleType.WALK_TARGET)
-            ).apply(it) { nestMemory, mateMemory, walkTarget ->
-                Trigger { world, entity, time ->
-                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
-
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-
-                    // Retrieve nest location and mate entity from memory
-                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
-                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
-
-                    // Convert nest location to Vec3
-                    val targetVec = Vec3.atCenterOf(nestLocation)
-
-                    // Check proximity to the nest
-                    if (entity.distanceToSqr(targetVec) > 2.0 && mate.distanceToSqr(targetVec) > 2.0) {
-                        return@Trigger false
-                    }
-
-                    // Access the nest block entity
-                    val nestBlockEntity = world.getBlockEntity(nestLocation) as? NestBlockEntity
-                        ?: return@Trigger false
-
-                    // double check to make sure the nest is not taken yet and cancel if it is
-                    if (nestBlockEntity.getItem(0) != ItemStack.EMPTY) return@Trigger false
-
-                    // Generate the egg using BreedingLogicManager
-                    val parentOne = (entity as PokemonEntity).pokemon
-                    val parentTwo = mate.pokemon
-                    val breedingResult = BreedingLogicManager.breed(parentOne, parentTwo)
-                    val form = BreedingLogicManager.calculateForm(parentOne, parentTwo)
-
-                    // Ensure the breeding result is valid
-                    val egg = breedingResult.pokemon?.let { result ->
-                        Egg(
-                            species = result.species.resourceIdentifier,
-                            parentOne = parentOne,
-                            parentTwo = parentTwo,
-                            form = form.name.lowercase(),
-                            timeToHatch = 6000F
-                        )
-                    } ?: return@Trigger false
-
-                    // Set the egg in the nest
-                    nestBlockEntity.setItem(egg.createEggItemStack())
-
-                    // set the parents of the nest if it/they are wild so they guard it
-                    if (nestBlockEntity.ownerUUID == null)
-                        nestBlockEntity.parents = Pair((entity as PokemonEntity).uuid, mate.uuid)
-
-
-                    // set breeding cooldown for both
-                    parentOne.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentOne)
-                    parentTwo.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentTwo)
-
-                    // Display heart particles above parents
-
-                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
-                            net.minecraft.core.particles.ParticleTypes.HEART,
-                            entity.getRandomX(1.0), // Particle X position with slight randomness
-                            entity.getRandomY() + 0.5, // Slightly raised Y position
-                            entity.getRandomZ(1.0), // Particle Z position with slight randomness
-                            4 + kotlin.random.Random.nextInt(2), // Particle count
-                            0.2 * entity.random.nextGaussian(), // X velocity with slight variance
-                            0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
-                            0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
-                            0.02 // Particle speed
-                    )
-                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
-                            net.minecraft.core.particles.ParticleTypes.HEART,
-                            mate.getRandomX(1.0), // Particle X position with slight randomness
-                            mate.getRandomY() + 0.5, // Slightly raised Y position
-                            mate.getRandomZ(1.0), // Particle Z position with slight randomness
-                            4 + kotlin.random.Random.nextInt(2), // Particle count
-                            0.2 * mate.random.nextGaussian(), // X velocity with slight variance
-                            0.1 * mate.random.nextGaussian(), // Y velocity with upwards variance
-                            0.2 * mate.random.nextGaussian(), // Z velocity with slight variance
-                            0.02 // Particle speed
-                    )
-
-                    // Notify nearby players
-                    world.players().forEach { player ->
-                        player.displayClientMessage("An egg has been laid in the nest!".green(), true)
-                    }
-
-                    // todo maybe have them fall asleep after?
-
-                    return@Trigger true
-                }
-            }
-        }*/

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

@@ -1,146 +0,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.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.pokemon.breeding.Egg
-import com.cobblemon.mod.common.api.text.green
-import com.cobblemon.mod.common.block.entity.NestBlockEntity
-import com.cobblemon.mod.common.breeding.BreedingLogicManager
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BreedAtNestTask
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.kinds.IdF
-import net.minecraft.core.BlockPos
-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.item.ItemStack
-import net.minecraft.world.phys.Vec3
-
-class BreedAtNestTaskConfig : SingleTaskConfig {
-    companion object {
-        const val BREED = "breed_at_nest" // Category
-    }
-
-    val condition = booleanVariable(BREED, "can_breed", true).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return WrapperLivingEntityTask(BreedAtNestTask.create(), PokemonEntity::class.java)
-    }
-}
-
-    /*override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
-
-        return BehaviorBuilder.create {
-            it.group(
-                it.present(CobblemonMemories.NEST_LOCATION),
-                it.present(CobblemonMemories.POTENTIAL_MATE),
-                it.absent(MemoryModuleType.WALK_TARGET)
-            ).apply(it) { nestMemory, mateMemory, walkTarget ->
-                Trigger { world, entity, time ->
-                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
-
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-
-                    // Retrieve nest location and mate entity from memory
-                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
-                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
-
-                    // Convert nest location to Vec3
-                    val targetVec = Vec3.atCenterOf(nestLocation)
-
-                    // Check proximity to the nest
-                    if (entity.distanceToSqr(targetVec) > 2.0 && mate.distanceToSqr(targetVec) > 2.0) {
-                        return@Trigger false
-                    }
-
-                    // Access the nest block entity
-                    val nestBlockEntity = world.getBlockEntity(nestLocation) as? NestBlockEntity
-                        ?: return@Trigger false
-
-                    // double check to make sure the nest is not taken yet and cancel if it is
-                    if (nestBlockEntity.getItem(0) != ItemStack.EMPTY) return@Trigger false
-
-                    // Generate the egg using BreedingLogicManager
-                    val parentOne = (entity as PokemonEntity).pokemon
-                    val parentTwo = mate.pokemon
-                    val breedingResult = BreedingLogicManager.breed(parentOne, parentTwo)
-                    val form = BreedingLogicManager.calculateForm(parentOne, parentTwo)
-
-                    // Ensure the breeding result is valid
-                    val egg = breedingResult.pokemon?.let { result ->
-                        Egg(
-                            species = result.species.resourceIdentifier,
-                            parentOne = parentOne,
-                            parentTwo = parentTwo,
-                            form = form.name.lowercase(),
-                            timeToHatch = 6000F
-                        )
-                    } ?: return@Trigger false
-
-                    // Set the egg in the nest
-                    nestBlockEntity.setItem(egg.createEggItemStack())
-
-                    // set the parents of the nest if it/they are wild so they guard it
-                    if (nestBlockEntity.ownerUUID == null)
-                        nestBlockEntity.parents = Pair((entity as PokemonEntity).uuid, mate.uuid)
-
-
-                    // set breeding cooldown for both
-                    parentOne.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentOne)
-                    parentTwo.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentTwo)
-
-                    // Display heart particles above parents
-
-                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
-                            net.minecraft.core.particles.ParticleTypes.HEART,
-                            entity.getRandomX(1.0), // Particle X position with slight randomness
-                            entity.getRandomY() + 0.5, // Slightly raised Y position
-                            entity.getRandomZ(1.0), // Particle Z position with slight randomness
-                            4 + kotlin.random.Random.nextInt(2), // Particle count
-                            0.2 * entity.random.nextGaussian(), // X velocity with slight variance
-                            0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
-                            0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
-                            0.02 // Particle speed
-                    )
-                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
-                            net.minecraft.core.particles.ParticleTypes.HEART,
-                            mate.getRandomX(1.0), // Particle X position with slight randomness
-                            mate.getRandomY() + 0.5, // Slightly raised Y position
-                            mate.getRandomZ(1.0), // Particle Z position with slight randomness
-                            4 + kotlin.random.Random.nextInt(2), // Particle count
-                            0.2 * mate.random.nextGaussian(), // X velocity with slight variance
-                            0.1 * mate.random.nextGaussian(), // Y velocity with upwards variance
-                            0.2 * mate.random.nextGaussian(), // Z velocity with slight variance
-                            0.02 // Particle speed
-                    )
-
-                    // Notify nearby players
-                    world.players().forEach { player ->
-                        player.displayClientMessage("An egg has been laid in the nest!".green(), true)
-                    }
-
-                    // todo maybe have them fall asleep after?
-
-                    return@Trigger true
-                }
-            }
-        }*/

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

@@ -1,106 +0,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.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BuildNestTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToNestTask
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.kinds.IdF
-import net.minecraft.core.BlockPos
-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.phys.Vec3
-
-class BuildNestTaskConfig : SingleTaskConfig {
-    companion object {
-        const val BREED = "breed" // Category
-    }
-
-    val condition = booleanVariable(BREED, "breeds", true).asExpressible()
-    val speedMultiplier = numberVariable(BREED, "speed_multiplier", 0.6).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        speedMultiplier
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return WrapperLivingEntityTask(BuildNestTask.create(), PokemonEntity::class.java)
-    }
-}
-
-    /*override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
-
-        return BehaviorBuilder.create {
-            it.group(
-                 it.present(MemoryModuleType.LOOK_TARGET), // todo This might need to be it.absent but only it.present works atm
-                it.absent(MemoryModuleType.WALK_TARGET),
-                it.present(CobblemonMemories.NEST_LOCATION),
-                it.present(CobblemonMemories.POTENTIAL_MATE)
-            ).apply(it) { lookTarget, walkTarget, nestMemory, mateMemory ->
-                Trigger { world, entity, time ->
-                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
-
-                    // Don't do anything if the pokemon has a breeding cooldown
-                    if ((entity as PokemonEntity).pokemon.breedingCooldown != 0) return@Trigger false
-
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-
-                    // Retrieve nest location and mate entity from memory
-                    //val nestLocation = it.get(nestMemory)
-                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
-
-                    //val mate = it.get(mateMemory) as? PokemonEntity ?: return@Trigger false
-                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
-
-                    // todo try to find a way to only have pairs of mates instead of an orgy
-
-                    // Create a target vector at the nest location
-                    val targetVec = Vec3.atCenterOf(nestLocation)
-
-                    // Check if Pokémon are close enough to the nest
-                    if (entity.distanceToSqr(targetVec) <= 2.0 && mate.distanceToSqr(targetVec) <= 2.0) {
-                        return@Trigger false // Task ends when both are close enough
-                    }
-
-                    *//*if ((entity as PokemonEntity).tethering.tetheringId != null) {
-                        val test1 = 1 // for breakpointing here to test my pastured mons
-                    }*//*
-
-                    // try to get the main pokemon to path and look at the nest
-
-                    walkTarget.set(WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1))
-                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
-
-                    // try to find a way to get the mate to pathfind and look at the nest too...
-                    mate.brain.setMemory(
-                        MemoryModuleType.WALK_TARGET,
-                        WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1)
-                    )
-                    mate.brain.setMemory(MemoryModuleType.LOOK_TARGET, BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
-
-                    return@Trigger true
-                }
-            }
-        }
-    }
-}*/

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

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

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

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

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

@@ -1,86 +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.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

@@ -1,36 +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.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,12 +8,14 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-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.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.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
@@ -22,24 +24,18 @@ import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 
 class FleeAttackerTaskConfig : SingleTaskConfig {
-    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()
+    var condition = "true".asExpression()
+    var speedMultiplier = "0.5".asExpression()
+    var desiredDistance = "9".asExpression()
 
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PathfinderMob) return null
-        val speedMultiplier = speedMultiplier.resolveFloat()
-        val desiredDistance = desiredDistance.resolveInt()
+        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)
         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,12 +8,14 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-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.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.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
@@ -22,20 +24,18 @@ import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 
 class FleeNearestHostileTaskConfig : SingleTaskConfig {
-    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()
+    var condition = "true".asExpression()
+    var speedMultiplier = "0.5".asExpression()
+    var desiredDistance = "9".asExpression()
 
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PathfinderMob) return null
-        val speedMultiplier = speedMultiplier.resolveFloat()
-        val desiredDistance = desiredDistance.resolveInt()
+        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)
         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,30 +8,32 @@
 
 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.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.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.entity.PosableEntity
 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: ExpressionOrEntityVariable = Either.left("true".asExpression())
-    val minRunTicks: ExpressionOrEntityVariable = Either.left("150".asExpression())
-    val maxRunTicks: ExpressionOrEntityVariable = Either.left("250".asExpression())
+    val condition: ExpressionLike = "true".asExpressionLike()
+    val minRunTicks: Expression = "150".asExpression()
+    val maxRunTicks: Expression = "250".asExpression()
 
-    override fun getVariables(entity: LivingEntity) = listOf(minRunTicks, maxRunTicks).asVariables()
-
-    override fun createTask(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext): BehaviorControl<LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<LivingEntity>? {
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
         return WrapperLivingEntityTask(
-            FollowWalkTargetTask(minRunTicks.resolveInt(), maxRunTicks.resolveInt()),
+            FollowWalkTargetTask(runtime.resolveInt(minRunTicks), runtime.resolveInt(maxRunTicks)),
             PathfinderMob::class.java
         )
     }

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

@@ -8,30 +8,26 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.ATTACKING_CATEGORY
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+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.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 {
-    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()
+    val condition: ExpressionLike = "true".asExpressionLike()
 
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
         return GetAngryAtAttackerTask.create()
     }
 }

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

@@ -8,43 +8,38 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.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.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 : 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"
-    }
-
+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 {
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
 
         return GoToHealingMachineTask.create(
-            horizontalSearchRange = horizontalSearchRange.asExpression(),
-            verticalSearchRange = verticalSearchRange.asExpression(),
-            speedMultiplier = walkSpeed.asExpression(),
-            completionRange = completionRange.asExpression()
+            horizontalSearchRange = horizontalSearchRange,
+            verticalSearchRange = verticalSearchRange,
+            speedMultiplier = speedMultiplier,
+            completionRange = completionRange
         )
     }
 

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

@@ -1,122 +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.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

@@ -1,27 +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.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/GuardNestTaskConfig.kt

@@ -1,173 +0,0 @@
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.GuardNestTask
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.kinds.IdF
-import net.minecraft.core.BlockPos
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.server.level.ServerPlayer
-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.player.Player
-import net.minecraft.world.phys.Vec3
-
-class GuardNestTaskConfig : SingleTaskConfig {
-    // todo make new variables
-    companion object {
-        const val BREED = "breed"
-    }
-
-    val condition = booleanVariable(BREED, "breeds", true).asExpressible()
-    val speedMultiplier = numberVariable(BREED, "speed_multiplier", 0.6).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        speedMultiplier
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return WrapperLivingEntityTask(GuardNestTask.create(), PokemonEntity::class.java)
-    }
-
-    /*override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
-
-        return BehaviorBuilder.create {
-            it.group(
-                it.present(MemoryModuleType.LOOK_TARGET),
-                it.absent(MemoryModuleType.WALK_TARGET),
-                it.present(CobblemonMemories.PATERNAL_NEST_LOCATION),
-                it.registered(MemoryModuleType.NEAREST_VISIBLE_PLAYER), // if player is invisible they do not patrol
-                it.registered(MemoryModuleType.ANGRY_AT),
-                it.absent(MemoryModuleType.ATTACK_TARGET),
-                it.registered(CobblemonMemories.IRRITATED_AT)
-            ).apply(it) { lookTarget, walkTarget, paternalNest, nearestVisiblePlayer, angryAt, attackTarget, irritatedAt ->
-                Trigger { world, entity, time ->
-                    if (entity !is PathfinderMob || !entity.isAlive || entity !is PokemonEntity) return@Trigger false
-
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-
-                    // Retrieve nest location and mate entity from memory
-                    //val nestLocation = it.get(nestMemory)
-                    val nestLocation: BlockPos = (paternalNest.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
-                    val nestCenter = Vec3.atCenterOf(nestLocation)
-
-                    // todo maybe cancel task if player is close to nest and set angry at task to that player
-                    val nearestPlayerOptional = entity.brain.getMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER)
-                    val player = nearestPlayerOptional.orElse(null) as? ServerPlayer
-                    val irritatedAtTarget = entity.brain.getMemory(CobblemonMemories.IRRITATED_AT)
-
-                    if (player != null) {
-                        val playerDistanceSquared = player.position().distanceToSqr(nestCenter)
-
-                        if (!irritatedAtTarget.isPresent && playerDistanceSquared <= 15 * 15) {
-                            // Player is within 15 blocks, set angry and cry
-                            entity.cry()
-
-                            // set irritated at target to player near egg
-                            irritatedAt.set(player.uuid)
-
-                            // Display angry particles above parent
-                            (world as net.minecraft.server.level.ServerLevel).sendParticles(
-                                    net.minecraft.core.particles.ParticleTypes.ANGRY_VILLAGER,
-                                    entity.getRandomX(1.0), // Particle X position with slight randomness
-                                    entity.getRandomY() + 0.5, // Slightly raised Y position
-                                    entity.getRandomZ(1.0), // Particle Z position with slight randomness
-                                    4 + kotlin.random.Random.nextInt(2), // Particle count
-                                    0.2 * entity.random.nextGaussian(), // X velocity with slight variance
-                                    0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
-                                    0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
-                                    0.02 // Particle speed
-                            )
-                        }
-
-                        if (playerDistanceSquared <= 8 * 8) {
-                            // Player is within 8 blocks, attack
-                            entity.cry()
-
-                            // Display angry particles above parent
-                            (world as net.minecraft.server.level.ServerLevel).sendParticles(
-                                    net.minecraft.core.particles.ParticleTypes.ANGRY_VILLAGER,
-                                    entity.getRandomX(1.0), // Particle X position with slight randomness
-                                    entity.getRandomY() + 0.5, // Slightly raised Y position
-                                    entity.getRandomZ(1.0), // Particle Z position with slight randomness
-                                    4 + kotlin.random.Random.nextInt(2), // Particle count
-                                    0.2 * entity.random.nextGaussian(), // X velocity with slight variance
-                                    0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
-                                    0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
-                                    0.02 // Particle speed
-                            )
-                            angryAt.set(player.uuid)
-                            attackTarget.set(player)
-                            return@Trigger false // Cancel the task
-                        }
-                    }
-
-
-
-                    // Scan for a valid walkable position within an 8-block sphere
-                    val validPosition = findValidWalkablePosition(world, nestCenter, entity, 8)
-                    if (validPosition == null) {
-                        return@Trigger false // No valid position found
-                    }
-
-                    // Set the entity's walk and look targets
-                    walkTarget.set(WalkTarget(validPosition, speedMultiplier.resolveFloat(), 1))
-                    lookTarget.set(BlockPosTracker(validPosition.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
-
-                    return@Trigger true
-                }
-            }
-        }
-    }
-
-    private fun findValidWalkablePosition(
-        world: ServerLevel,
-        center: Vec3,
-        entity: PathfinderMob,
-        radius: Int
-    ): Vec3? {
-        val random = world.random
-
-        // Try a number of random positions within the radius
-        repeat(20) { // Attempt up to 20 random positions
-            val offsetX = random.nextDouble() * 2 * radius - radius
-            val offsetY = random.nextDouble() * 2 * radius - radius
-            val offsetZ = random.nextDouble() * 2 * radius - radius
-            val candidate = center.add(offsetX, offsetY, offsetZ)
-
-            // Convert to block position
-            val blockPos = BlockPos(candidate.x.toInt(), candidate.y.toInt(), candidate.z.toInt())
-
-            // Check if the position is walkable and not inside a solid block
-            if (world.getBlockState(blockPos).isSolidRender(world, blockPos).not() &&
-                entity.navigation.isStableDestination(blockPos)
-            ) {
-                return Vec3.atCenterOf(blockPos) // Return the valid position
-            }
-        }
-
-        return null // No valid position found
-    }*/
-}

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

@@ -8,32 +8,29 @@
 
 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.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.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.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 = 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()
+    val condition: ExpressionLike = "true".asExpressionLike()
+    val horizontalUseRange = "3".asExpression()
+    val verticalUseRange = "2".asExpression()
 
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
-        return HealUsingHealingMachineTask(horizontalUseRange.asExpression(), verticalUseRange.asExpression())
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
+        return HealUsingHealingMachineTask(horizontalUseRange, verticalUseRange)
     }
 }

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

@@ -1,139 +0,0 @@
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.kinds.IdF
-import net.minecraft.core.BlockPos
-import net.minecraft.server.level.ServerLevel
-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.player.Player
-import net.minecraft.world.phys.Vec3
-import java.util.UUID
-
-class HuntPlayerTaskConfig : SingleTaskConfig {
-    // todo make new variables
-    companion object {
-        const val BREED = "breed"
-    }
-
-    val condition = booleanVariable(BREED, "breeds", true).asExpressible()
-    val speedMultiplier = numberVariable(BREED, "speed_multiplier", 0.6).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        speedMultiplier
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
-
-        return BehaviorBuilder.create {
-            it.group(
-                it.present(MemoryModuleType.LOOK_TARGET),
-                it.absent(MemoryModuleType.WALK_TARGET),
-                it.present(MemoryModuleType.NEAREST_PLAYERS), // this will be null most of the time
-                it.present(MemoryModuleType.ANGRY_AT),
-                it.registered(MemoryModuleType.ATTACK_TARGET),
-                it.registered(MemoryModuleType.DISTURBANCE_LOCATION),
-            ).apply(it) { lookTarget, walkTarget, nearestPlayers, angryAt, attackTarget, disturbanceLocation ->
-                Trigger { world, entity, time ->
-                    if (entity !is PathfinderMob || !entity.isAlive || entity !is PokemonEntity) return@Trigger false
-
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-
-                    val angryAtUuid = (angryAt.value() as? IdF<UUID?>)?.value() ?: return@Trigger false
-                    val disturbancePos = (disturbanceLocation.value() as? IdF<BlockPos>)?.value()
-
-                    val players = (nearestPlayers.value() as? IdF<List<Player?>?>)?.value()
-                    val targetPlayer = players?.find { it?.uuid == angryAtUuid }
-
-                    if (targetPlayer != null) {
-                        // If the angry player is nearby, set them as the attack target
-                        entity.cry()
-                        attackTarget.set(targetPlayer)
-                        return@Trigger true
-                    }
-
-                    // If the angry player is not nearby, search around the Pokémon
-                    val maxTicksToSearch = 200L
-                    if (time > maxTicksToSearch) {
-                        // Timeout after 200 ticks
-                        return@Trigger false
-                    }
-
-                    // If no disturbance location or it is caused by a nearby player, skip
-                    if (disturbancePos != null) {
-                        val disturberCausingDisturbance = players?.any {
-                            it?.position()?.distanceToSqr(Vec3.atCenterOf(disturbancePos))!! <= 4.0 * 4.0
-                        }
-                        disturberCausingDisturbance?.let { it1 ->
-                            if (!it1) {
-                                // Pathfind toward disturbance location
-                                walkTarget.set(WalkTarget(Vec3.atCenterOf(disturbancePos), speedMultiplier.resolveFloat(), 1))
-                                lookTarget.set(BlockPosTracker(Vec3.atCenterOf(disturbancePos)))
-                                return@Trigger true
-                            }
-                        }
-                    }
-
-                    // If no valid disturbance location, pathfind randomly within proximity
-                    val validPosition = findValidWalkablePosition(world, entity.position(), entity, 8)
-                    if (validPosition == null) {
-                        return@Trigger false // No valid position found
-                    }
-
-                    walkTarget.set(WalkTarget(validPosition, speedMultiplier.resolveFloat(), 1))
-                    lookTarget.set(BlockPosTracker(validPosition.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
-
-                    return@Trigger true
-                }
-            }
-        }
-    }
-
-    private fun findValidWalkablePosition(
-        world: ServerLevel,
-        center: Vec3,
-        entity: PathfinderMob,
-        radius: Int
-    ): Vec3? {
-        val random = world.random
-
-        // Try a number of random positions within the radius
-        repeat(20) { // Attempt up to 20 random positions
-            val offsetX = random.nextDouble() * 2 * radius - radius
-            val offsetY = random.nextDouble() * 2 * radius - radius
-            val offsetZ = random.nextDouble() * 2 * radius - radius
-            val candidate = center.add(offsetX, offsetY, offsetZ)
-
-            // Convert to block position
-            val blockPos = BlockPos(candidate.x.toInt(), candidate.y.toInt(), candidate.z.toInt())
-
-            // Check if the position is walkable and not inside a solid block
-            if (world.getBlockState(blockPos).isSolidRender(world, blockPos).not() &&
-                entity.navigation.isStableDestination(blockPos)
-            ) {
-                return Vec3.atCenterOf(blockPos) // Return the valid position
-            }
-        }
-
-        return null // No valid position found
-    }
-}

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

@@ -8,41 +8,29 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.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.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 {
-    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()
+    val minDurationTicks = "40".asExpression()
+    val maxDurationTicks = "80".asExpression()
 
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!resolveBooleanVariable(LOOK_AT_BATTLING_POKEMON)) return null
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
         return LookAtBattlingPokemonTask.create(
-            minDurationTicks = minDurationTicks.resolveInt(),
-            maxDurationTicks = maxDurationTicks.resolveInt()
+            minDurationTicks = runtime.resolveInt(minDurationTicks),
+            maxDurationTicks = runtime.resolveInt(maxDurationTicks)
         )
     }
+
 }

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

@@ -8,34 +8,29 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.SEE_DISTANCE
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+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.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 {
-    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()
+    val condition: ExpressionLike = "true".asExpressionLike()
+    val maxDistance = "15".asExpression()
 
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
-        return SetEntityLookTarget.create(maxDistance.resolveFloat())
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
+        return SetEntityLookTarget.create(runtime.resolveFloat(maxDistance))
     }
 }

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

@@ -8,15 +8,13 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 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,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ) = LookAtSpeakerTask.create()
 }

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

@@ -8,36 +8,33 @@
 
 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.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.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+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.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: 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()
+    val condition: ExpressionLike = "true".asExpressionLike()
+    val minDurationTicks: Expression = "40".asExpression()
+    val maxDurationTicks: Expression = "80".asExpression()
 
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
-        return WrapperLivingEntityTask(LookAtTargetSink(minDurationTicks.resolveInt(), maxDurationTicks.resolveInt()), Mob::class.java)
+        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)
     }
 }

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

@@ -1,27 +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.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,29 +8,18 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.LOOKING_CATEGORY
+import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 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 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()
+    var yaw: Expression = "0".asExpression()
+    var pitch: Expression = "0".asExpression()
 
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
-    ) = LookInDirectionTask(
-        shouldLock = condition.asExpression(),
-        yaw = yaw.asExpression(),
-        pitch = pitch.asExpression()
-    )
+        brainConfigurationContext: BrainConfigurationContext
+    ) = LookInDirectionTask(yaw, pitch)
 }

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

@@ -8,35 +8,32 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+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.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 = 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()
+    val condition = "true".asExpressionLike()
+    val range = "1.5".asExpression()
+    val cooldownTicks = "30".asExpression()
 
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean()) return null
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
 
         return MeleeAttackTask.create(
-            range = range.asExpression(),
-            cooldownTicks = cooldownTicks.asExpression()
+            range = range,
+            cooldownTicks = cooldownTicks
         )
     }
 }

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

@@ -8,28 +8,20 @@
 
 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.BrainConfigurationContext
 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 = 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()
+    val speedMultiplier = "0.5".asExpression()
+    val closeEnoughDistance = "1".asExpression()
 
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ) = MoveToAttackTargetTask.create(
-        speedMultiplier = speedMultiplier.asExpression(),
-        closeEnoughDistance = closeEnoughDistance.asExpression()
+        speedMultiplier = speedMultiplier,
+        closeEnoughDistance = closeEnoughDistance
     )
 }

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

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

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

@@ -1,45 +0,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.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToIdealNestLocationTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToNestMaterialTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToNestTask
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.kinds.IdF
-import net.minecraft.core.BlockPos
-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.phys.Vec3
-
-class PathToIdealNestLocationTaskConfig : SingleTaskConfig {
-    companion object {
-        const val BREED = "breed" // Category
-    }
-
-    val condition = booleanVariable(BREED, "breeds", true).asExpressible()
-    val speedMultiplier = numberVariable(BREED, "speed_multiplier", 0.6).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        speedMultiplier
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return WrapperLivingEntityTask(PathToIdealNestLocationTask.create(), PokemonEntity::class.java)
-    }
-}

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

@@ -1,106 +0,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.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToNestMaterialTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToNestTask
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.kinds.IdF
-import net.minecraft.core.BlockPos
-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.phys.Vec3
-
-class PathToNestMaterialTaskConfig : SingleTaskConfig {
-    companion object {
-        const val BREED = "breed" // Category
-    }
-
-    val condition = booleanVariable(BREED, "breeds", true).asExpressible()
-    val speedMultiplier = numberVariable(BREED, "speed_multiplier", 0.6).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        speedMultiplier
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return WrapperLivingEntityTask(PathToNestMaterialTask.create(), PokemonEntity::class.java)
-    }
-}
-
-    /*override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
-
-        return BehaviorBuilder.create {
-            it.group(
-                 it.present(MemoryModuleType.LOOK_TARGET), // todo This might need to be it.absent but only it.present works atm
-                it.absent(MemoryModuleType.WALK_TARGET),
-                it.present(CobblemonMemories.NEST_LOCATION),
-                it.present(CobblemonMemories.POTENTIAL_MATE)
-            ).apply(it) { lookTarget, walkTarget, nestMemory, mateMemory ->
-                Trigger { world, entity, time ->
-                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
-
-                    // Don't do anything if the pokemon has a breeding cooldown
-                    if ((entity as PokemonEntity).pokemon.breedingCooldown != 0) return@Trigger false
-
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-
-                    // Retrieve nest location and mate entity from memory
-                    //val nestLocation = it.get(nestMemory)
-                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
-
-                    //val mate = it.get(mateMemory) as? PokemonEntity ?: return@Trigger false
-                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
-
-                    // todo try to find a way to only have pairs of mates instead of an orgy
-
-                    // Create a target vector at the nest location
-                    val targetVec = Vec3.atCenterOf(nestLocation)
-
-                    // Check if Pokémon are close enough to the nest
-                    if (entity.distanceToSqr(targetVec) <= 2.0 && mate.distanceToSqr(targetVec) <= 2.0) {
-                        return@Trigger false // Task ends when both are close enough
-                    }
-
-                    *//*if ((entity as PokemonEntity).tethering.tetheringId != null) {
-                        val test1 = 1 // for breakpointing here to test my pastured mons
-                    }*//*
-
-                    // try to get the main pokemon to path and look at the nest
-
-                    walkTarget.set(WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1))
-                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
-
-                    // try to find a way to get the mate to pathfind and look at the nest too...
-                    mate.brain.setMemory(
-                        MemoryModuleType.WALK_TARGET,
-                        WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1)
-                    )
-                    mate.brain.setMemory(MemoryModuleType.LOOK_TARGET, BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
-
-                    return@Trigger true
-                }
-            }
-        }
-    }
-}*/

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

@@ -1,105 +0,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.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToNestTask
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.kinds.IdF
-import net.minecraft.core.BlockPos
-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.phys.Vec3
-
-class PathToNestTaskConfig : SingleTaskConfig {
-    companion object {
-        const val BREED = "breed" // Category
-    }
-
-    val condition = booleanVariable(BREED, "breeds", true).asExpressible()
-    val speedMultiplier = numberVariable(BREED, "speed_multiplier", 0.6).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        speedMultiplier
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return WrapperLivingEntityTask(PathToNestTask.create(), PokemonEntity::class.java)
-    }
-}
-
-    /*override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
-
-        return BehaviorBuilder.create {
-            it.group(
-                 it.present(MemoryModuleType.LOOK_TARGET), // todo This might need to be it.absent but only it.present works atm
-                it.absent(MemoryModuleType.WALK_TARGET),
-                it.present(CobblemonMemories.NEST_LOCATION),
-                it.present(CobblemonMemories.POTENTIAL_MATE)
-            ).apply(it) { lookTarget, walkTarget, nestMemory, mateMemory ->
-                Trigger { world, entity, time ->
-                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
-
-                    // Don't do anything if the pokemon has a breeding cooldown
-                    if ((entity as PokemonEntity).pokemon.breedingCooldown != 0) return@Trigger false
-
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-
-                    // Retrieve nest location and mate entity from memory
-                    //val nestLocation = it.get(nestMemory)
-                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
-
-                    //val mate = it.get(mateMemory) as? PokemonEntity ?: return@Trigger false
-                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
-
-                    // todo try to find a way to only have pairs of mates instead of an orgy
-
-                    // Create a target vector at the nest location
-                    val targetVec = Vec3.atCenterOf(nestLocation)
-
-                    // Check if Pokémon are close enough to the nest
-                    if (entity.distanceToSqr(targetVec) <= 2.0 && mate.distanceToSqr(targetVec) <= 2.0) {
-                        return@Trigger false // Task ends when both are close enough
-                    }
-
-                    *//*if ((entity as PokemonEntity).tethering.tetheringId != null) {
-                        val test1 = 1 // for breakpointing here to test my pastured mons
-                    }*//*
-
-                    // try to get the main pokemon to path and look at the nest
-
-                    walkTarget.set(WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1))
-                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
-
-                    // try to find a way to get the mate to pathfind and look at the nest too...
-                    mate.brain.setMemory(
-                        MemoryModuleType.WALK_TARGET,
-                        WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1)
-                    )
-                    mate.brain.setMemory(MemoryModuleType.LOOK_TARGET, BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
-
-                    return@Trigger true
-                }
-            }
-        }
-    }
-}*/

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

@@ -1,149 +0,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.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.pokemon.breeding.Egg
-import com.cobblemon.mod.common.api.text.green
-import com.cobblemon.mod.common.block.entity.NestBlockEntity
-import com.cobblemon.mod.common.breeding.BreedingLogicManager
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BreedAtNestTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PickUpEggTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PlaceEggInNestTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.SearchForEggTask
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.kinds.IdF
-import net.minecraft.core.BlockPos
-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.item.ItemStack
-import net.minecraft.world.phys.Vec3
-
-class PickUpEggTaskConfig : SingleTaskConfig {
-    companion object {
-        const val BREED = "breed_at_nest" // Category
-    }
-
-    val condition = booleanVariable(BREED, "can_breed", true).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return WrapperLivingEntityTask(PickUpEggTask.create(), PokemonEntity::class.java)
-    }
-}
-
-    /*override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
-
-        return BehaviorBuilder.create {
-            it.group(
-                it.present(CobblemonMemories.NEST_LOCATION),
-                it.present(CobblemonMemories.POTENTIAL_MATE),
-                it.absent(MemoryModuleType.WALK_TARGET)
-            ).apply(it) { nestMemory, mateMemory, walkTarget ->
-                Trigger { world, entity, time ->
-                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
-
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-
-                    // Retrieve nest location and mate entity from memory
-                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
-                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
-
-                    // Convert nest location to Vec3
-                    val targetVec = Vec3.atCenterOf(nestLocation)
-
-                    // Check proximity to the nest
-                    if (entity.distanceToSqr(targetVec) > 2.0 && mate.distanceToSqr(targetVec) > 2.0) {
-                        return@Trigger false
-                    }
-
-                    // Access the nest block entity
-                    val nestBlockEntity = world.getBlockEntity(nestLocation) as? NestBlockEntity
-                        ?: return@Trigger false
-
-                    // double check to make sure the nest is not taken yet and cancel if it is
-                    if (nestBlockEntity.getItem(0) != ItemStack.EMPTY) return@Trigger false
-
-                    // Generate the egg using BreedingLogicManager
-                    val parentOne = (entity as PokemonEntity).pokemon
-                    val parentTwo = mate.pokemon
-                    val breedingResult = BreedingLogicManager.breed(parentOne, parentTwo)
-                    val form = BreedingLogicManager.calculateForm(parentOne, parentTwo)
-
-                    // Ensure the breeding result is valid
-                    val egg = breedingResult.pokemon?.let { result ->
-                        Egg(
-                            species = result.species.resourceIdentifier,
-                            parentOne = parentOne,
-                            parentTwo = parentTwo,
-                            form = form.name.lowercase(),
-                            timeToHatch = 6000F
-                        )
-                    } ?: return@Trigger false
-
-                    // Set the egg in the nest
-                    nestBlockEntity.setItem(egg.createEggItemStack())
-
-                    // set the parents of the nest if it/they are wild so they guard it
-                    if (nestBlockEntity.ownerUUID == null)
-                        nestBlockEntity.parents = Pair((entity as PokemonEntity).uuid, mate.uuid)
-
-
-                    // set breeding cooldown for both
-                    parentOne.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentOne)
-                    parentTwo.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentTwo)
-
-                    // Display heart particles above parents
-
-                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
-                            net.minecraft.core.particles.ParticleTypes.HEART,
-                            entity.getRandomX(1.0), // Particle X position with slight randomness
-                            entity.getRandomY() + 0.5, // Slightly raised Y position
-                            entity.getRandomZ(1.0), // Particle Z position with slight randomness
-                            4 + kotlin.random.Random.nextInt(2), // Particle count
-                            0.2 * entity.random.nextGaussian(), // X velocity with slight variance
-                            0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
-                            0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
-                            0.02 // Particle speed
-                    )
-                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
-                            net.minecraft.core.particles.ParticleTypes.HEART,
-                            mate.getRandomX(1.0), // Particle X position with slight randomness
-                            mate.getRandomY() + 0.5, // Slightly raised Y position
-                            mate.getRandomZ(1.0), // Particle Z position with slight randomness
-                            4 + kotlin.random.Random.nextInt(2), // Particle count
-                            0.2 * mate.random.nextGaussian(), // X velocity with slight variance
-                            0.1 * mate.random.nextGaussian(), // Y velocity with upwards variance
-                            0.2 * mate.random.nextGaussian(), // Z velocity with slight variance
-                            0.02 // Particle speed
-                    )
-
-                    // Notify nearby players
-                    world.players().forEach { player ->
-                        player.displayClientMessage("An egg has been laid in the nest!".green(), true)
-                    }
-
-                    // todo maybe have them fall asleep after?
-
-                    return@Trigger true
-                }
-            }
-        }*/

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

@@ -1,106 +0,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.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToNestTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PickUpNestMaterialTask
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.kinds.IdF
-import net.minecraft.core.BlockPos
-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.phys.Vec3
-
-class PickUpNestMaterialTaskConfig : SingleTaskConfig {
-    companion object {
-        const val BREED = "breed" // Category
-    }
-
-    val condition = booleanVariable(BREED, "breeds", true).asExpressible()
-    val speedMultiplier = numberVariable(BREED, "speed_multiplier", 0.6).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-        speedMultiplier
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return WrapperLivingEntityTask(PickUpNestMaterialTask.create(), PokemonEntity::class.java)
-    }
-}
-
-    /*override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
-
-        return BehaviorBuilder.create {
-            it.group(
-                 it.present(MemoryModuleType.LOOK_TARGET), // todo This might need to be it.absent but only it.present works atm
-                it.absent(MemoryModuleType.WALK_TARGET),
-                it.present(CobblemonMemories.NEST_LOCATION),
-                it.present(CobblemonMemories.POTENTIAL_MATE)
-            ).apply(it) { lookTarget, walkTarget, nestMemory, mateMemory ->
-                Trigger { world, entity, time ->
-                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
-
-                    // Don't do anything if the pokemon has a breeding cooldown
-                    if ((entity as PokemonEntity).pokemon.breedingCooldown != 0) return@Trigger false
-
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-
-                    // Retrieve nest location and mate entity from memory
-                    //val nestLocation = it.get(nestMemory)
-                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
-
-                    //val mate = it.get(mateMemory) as? PokemonEntity ?: return@Trigger false
-                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
-
-                    // todo try to find a way to only have pairs of mates instead of an orgy
-
-                    // Create a target vector at the nest location
-                    val targetVec = Vec3.atCenterOf(nestLocation)
-
-                    // Check if Pokémon are close enough to the nest
-                    if (entity.distanceToSqr(targetVec) <= 2.0 && mate.distanceToSqr(targetVec) <= 2.0) {
-                        return@Trigger false // Task ends when both are close enough
-                    }
-
-                    *//*if ((entity as PokemonEntity).tethering.tetheringId != null) {
-                        val test1 = 1 // for breakpointing here to test my pastured mons
-                    }*//*
-
-                    // try to get the main pokemon to path and look at the nest
-
-                    walkTarget.set(WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1))
-                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
-
-                    // try to find a way to get the mate to pathfind and look at the nest too...
-                    mate.brain.setMemory(
-                        MemoryModuleType.WALK_TARGET,
-                        WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1)
-                    )
-                    mate.brain.setMemory(MemoryModuleType.LOOK_TARGET, BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
-
-                    return@Trigger true
-                }
-            }
-        }
-    }
-}*/

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

@@ -1,148 +0,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.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.pokemon.breeding.Egg
-import com.cobblemon.mod.common.api.text.green
-import com.cobblemon.mod.common.block.entity.NestBlockEntity
-import com.cobblemon.mod.common.breeding.BreedingLogicManager
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BreedAtNestTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PlaceEggInNestTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.SearchForEggTask
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.kinds.IdF
-import net.minecraft.core.BlockPos
-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.item.ItemStack
-import net.minecraft.world.phys.Vec3
-
-class PlaceEggInNestTaskConfig : SingleTaskConfig {
-    companion object {
-        const val BREED = "breed_at_nest" // Category
-    }
-
-    val condition = booleanVariable(BREED, "can_breed", true).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return WrapperLivingEntityTask(PlaceEggInNestTask.create(), PokemonEntity::class.java)
-    }
-}
-
-    /*override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
-
-        return BehaviorBuilder.create {
-            it.group(
-                it.present(CobblemonMemories.NEST_LOCATION),
-                it.present(CobblemonMemories.POTENTIAL_MATE),
-                it.absent(MemoryModuleType.WALK_TARGET)
-            ).apply(it) { nestMemory, mateMemory, walkTarget ->
-                Trigger { world, entity, time ->
-                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
-
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-
-                    // Retrieve nest location and mate entity from memory
-                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
-                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
-
-                    // Convert nest location to Vec3
-                    val targetVec = Vec3.atCenterOf(nestLocation)
-
-                    // Check proximity to the nest
-                    if (entity.distanceToSqr(targetVec) > 2.0 && mate.distanceToSqr(targetVec) > 2.0) {
-                        return@Trigger false
-                    }
-
-                    // Access the nest block entity
-                    val nestBlockEntity = world.getBlockEntity(nestLocation) as? NestBlockEntity
-                        ?: return@Trigger false
-
-                    // double check to make sure the nest is not taken yet and cancel if it is
-                    if (nestBlockEntity.getItem(0) != ItemStack.EMPTY) return@Trigger false
-
-                    // Generate the egg using BreedingLogicManager
-                    val parentOne = (entity as PokemonEntity).pokemon
-                    val parentTwo = mate.pokemon
-                    val breedingResult = BreedingLogicManager.breed(parentOne, parentTwo)
-                    val form = BreedingLogicManager.calculateForm(parentOne, parentTwo)
-
-                    // Ensure the breeding result is valid
-                    val egg = breedingResult.pokemon?.let { result ->
-                        Egg(
-                            species = result.species.resourceIdentifier,
-                            parentOne = parentOne,
-                            parentTwo = parentTwo,
-                            form = form.name.lowercase(),
-                            timeToHatch = 6000F
-                        )
-                    } ?: return@Trigger false
-
-                    // Set the egg in the nest
-                    nestBlockEntity.setItem(egg.createEggItemStack())
-
-                    // set the parents of the nest if it/they are wild so they guard it
-                    if (nestBlockEntity.ownerUUID == null)
-                        nestBlockEntity.parents = Pair((entity as PokemonEntity).uuid, mate.uuid)
-
-
-                    // set breeding cooldown for both
-                    parentOne.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentOne)
-                    parentTwo.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentTwo)
-
-                    // Display heart particles above parents
-
-                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
-                            net.minecraft.core.particles.ParticleTypes.HEART,
-                            entity.getRandomX(1.0), // Particle X position with slight randomness
-                            entity.getRandomY() + 0.5, // Slightly raised Y position
-                            entity.getRandomZ(1.0), // Particle Z position with slight randomness
-                            4 + kotlin.random.Random.nextInt(2), // Particle count
-                            0.2 * entity.random.nextGaussian(), // X velocity with slight variance
-                            0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
-                            0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
-                            0.02 // Particle speed
-                    )
-                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
-                            net.minecraft.core.particles.ParticleTypes.HEART,
-                            mate.getRandomX(1.0), // Particle X position with slight randomness
-                            mate.getRandomY() + 0.5, // Slightly raised Y position
-                            mate.getRandomZ(1.0), // Particle Z position with slight randomness
-                            4 + kotlin.random.Random.nextInt(2), // Particle count
-                            0.2 * mate.random.nextGaussian(), // X velocity with slight variance
-                            0.1 * mate.random.nextGaussian(), // Y velocity with upwards variance
-                            0.2 * mate.random.nextGaussian(), // Z velocity with slight variance
-                            0.02 // Particle speed
-                    )
-
-                    // Notify nearby players
-                    world.players().forEach { player ->
-                        player.displayClientMessage("An egg has been laid in the nest!".green(), true)
-                    }
-
-                    // todo maybe have them fall asleep after?
-
-                    return@Trigger true
-                }
-            }
-        }*/

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

@@ -1,42 +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.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

@@ -183,17 +183,4 @@ 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`.
-
-### 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.
+- `pitch`: A MoLang expression that determines the pitch angle (degrees) of the entity. Defaults to `0`.

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

@@ -8,15 +8,17 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+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.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+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.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
@@ -32,21 +34,19 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
 class RandomTaskConfig : TaskConfig {
     class RandomTaskChoice {
         val weight = 1.0
-        val task: TaskConfig = SingleTaskConfig.nothing()
+        val task: TaskConfig = SingleTaskConfig { _, _ -> DoNothing(0, 1) }
     }
 
     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,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ): List<BehaviorControl<in LivingEntity>> {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
         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, behaviourConfigurationContext)
+        return task.createTasks(entity, brainConfigurationContext)
     }
 }

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

@@ -1,148 +0,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.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.pokemon.breeding.Egg
-import com.cobblemon.mod.common.api.text.green
-import com.cobblemon.mod.common.block.entity.NestBlockEntity
-import com.cobblemon.mod.common.breeding.BreedingLogicManager
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BreedAtNestTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.RetrieveEggTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.SearchForEggTask
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.kinds.IdF
-import net.minecraft.core.BlockPos
-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.item.ItemStack
-import net.minecraft.world.phys.Vec3
-
-class RetrieveEggTaskConfig : SingleTaskConfig {
-    companion object {
-        const val BREED = "breed_at_nest" // Category
-    }
-
-    val condition = booleanVariable(BREED, "can_breed", true).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return WrapperLivingEntityTask(RetrieveEggTask.create(), PokemonEntity::class.java)
-    }
-}
-
-    /*override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
-
-        return BehaviorBuilder.create {
-            it.group(
-                it.present(CobblemonMemories.NEST_LOCATION),
-                it.present(CobblemonMemories.POTENTIAL_MATE),
-                it.absent(MemoryModuleType.WALK_TARGET)
-            ).apply(it) { nestMemory, mateMemory, walkTarget ->
-                Trigger { world, entity, time ->
-                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
-
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-
-                    // Retrieve nest location and mate entity from memory
-                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
-                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
-
-                    // Convert nest location to Vec3
-                    val targetVec = Vec3.atCenterOf(nestLocation)
-
-                    // Check proximity to the nest
-                    if (entity.distanceToSqr(targetVec) > 2.0 && mate.distanceToSqr(targetVec) > 2.0) {
-                        return@Trigger false
-                    }
-
-                    // Access the nest block entity
-                    val nestBlockEntity = world.getBlockEntity(nestLocation) as? NestBlockEntity
-                        ?: return@Trigger false
-
-                    // double check to make sure the nest is not taken yet and cancel if it is
-                    if (nestBlockEntity.getItem(0) != ItemStack.EMPTY) return@Trigger false
-
-                    // Generate the egg using BreedingLogicManager
-                    val parentOne = (entity as PokemonEntity).pokemon
-                    val parentTwo = mate.pokemon
-                    val breedingResult = BreedingLogicManager.breed(parentOne, parentTwo)
-                    val form = BreedingLogicManager.calculateForm(parentOne, parentTwo)
-
-                    // Ensure the breeding result is valid
-                    val egg = breedingResult.pokemon?.let { result ->
-                        Egg(
-                            species = result.species.resourceIdentifier,
-                            parentOne = parentOne,
-                            parentTwo = parentTwo,
-                            form = form.name.lowercase(),
-                            timeToHatch = 6000F
-                        )
-                    } ?: return@Trigger false
-
-                    // Set the egg in the nest
-                    nestBlockEntity.setItem(egg.createEggItemStack())
-
-                    // set the parents of the nest if it/they are wild so they guard it
-                    if (nestBlockEntity.ownerUUID == null)
-                        nestBlockEntity.parents = Pair((entity as PokemonEntity).uuid, mate.uuid)
-
-
-                    // set breeding cooldown for both
-                    parentOne.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentOne)
-                    parentTwo.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentTwo)
-
-                    // Display heart particles above parents
-
-                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
-                            net.minecraft.core.particles.ParticleTypes.HEART,
-                            entity.getRandomX(1.0), // Particle X position with slight randomness
-                            entity.getRandomY() + 0.5, // Slightly raised Y position
-                            entity.getRandomZ(1.0), // Particle Z position with slight randomness
-                            4 + kotlin.random.Random.nextInt(2), // Particle count
-                            0.2 * entity.random.nextGaussian(), // X velocity with slight variance
-                            0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
-                            0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
-                            0.02 // Particle speed
-                    )
-                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
-                            net.minecraft.core.particles.ParticleTypes.HEART,
-                            mate.getRandomX(1.0), // Particle X position with slight randomness
-                            mate.getRandomY() + 0.5, // Slightly raised Y position
-                            mate.getRandomZ(1.0), // Particle Z position with slight randomness
-                            4 + kotlin.random.Random.nextInt(2), // Particle count
-                            0.2 * mate.random.nextGaussian(), // X velocity with slight variance
-                            0.1 * mate.random.nextGaussian(), // Y velocity with upwards variance
-                            0.2 * mate.random.nextGaussian(), // Z velocity with slight variance
-                            0.02 // Particle speed
-                    )
-
-                    // Notify nearby players
-                    world.players().forEach { player ->
-                        player.displayClientMessage("An egg has been laid in the nest!".green(), true)
-                    }
-
-                    // todo maybe have them fall asleep after?
-
-                    return@Trigger true
-                }
-            }
-        }*/

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

@@ -9,12 +9,11 @@
 package com.cobblemon.mod.common.api.ai.config.task
 
 import com.bedrockk.molang.runtime.value.DoubleValue
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 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.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
@@ -32,25 +31,18 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType
  * @since December 2nd, 2024
  */
 class RunScript : SingleTaskConfig {
-    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
+    val script = cobblemonResource("dummy")
 
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ): 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.asMostSpecificMoLangValue())
-                return@Trigger CobblemonScripts.run(script.resolveString().asIdentifierDefaultingNamespace(), runtime) == DoubleValue.ONE
+                runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: entity.asMostSpecificMoLangValue())
+                return@Trigger CobblemonScripts.run(script, runtime) == DoubleValue.ONE
             }
         }
     }

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

@@ -1,147 +0,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.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.pokemon.breeding.Egg
-import com.cobblemon.mod.common.api.text.green
-import com.cobblemon.mod.common.block.entity.NestBlockEntity
-import com.cobblemon.mod.common.breeding.BreedingLogicManager
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BreedAtNestTask
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.SearchForEggTask
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.datafixers.kinds.IdF
-import net.minecraft.core.BlockPos
-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.item.ItemStack
-import net.minecraft.world.phys.Vec3
-
-class SearchForEggTaskConfig : SingleTaskConfig {
-    companion object {
-        const val BREED = "breed_at_nest" // Category
-    }
-
-    val condition = booleanVariable(BREED, "can_breed", true).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return WrapperLivingEntityTask(SearchForEggTask.create(), PokemonEntity::class.java)
-    }
-}
-
-    /*override fun createTask(
-        entity: LivingEntity,
-        brainConfigurationContext: BrainConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
-
-        return BehaviorBuilder.create {
-            it.group(
-                it.present(CobblemonMemories.NEST_LOCATION),
-                it.present(CobblemonMemories.POTENTIAL_MATE),
-                it.absent(MemoryModuleType.WALK_TARGET)
-            ).apply(it) { nestMemory, mateMemory, walkTarget ->
-                Trigger { world, entity, time ->
-                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
-
-                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-
-                    // Retrieve nest location and mate entity from memory
-                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
-                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
-
-                    // Convert nest location to Vec3
-                    val targetVec = Vec3.atCenterOf(nestLocation)
-
-                    // Check proximity to the nest
-                    if (entity.distanceToSqr(targetVec) > 2.0 && mate.distanceToSqr(targetVec) > 2.0) {
-                        return@Trigger false
-                    }
-
-                    // Access the nest block entity
-                    val nestBlockEntity = world.getBlockEntity(nestLocation) as? NestBlockEntity
-                        ?: return@Trigger false
-
-                    // double check to make sure the nest is not taken yet and cancel if it is
-                    if (nestBlockEntity.getItem(0) != ItemStack.EMPTY) return@Trigger false
-
-                    // Generate the egg using BreedingLogicManager
-                    val parentOne = (entity as PokemonEntity).pokemon
-                    val parentTwo = mate.pokemon
-                    val breedingResult = BreedingLogicManager.breed(parentOne, parentTwo)
-                    val form = BreedingLogicManager.calculateForm(parentOne, parentTwo)
-
-                    // Ensure the breeding result is valid
-                    val egg = breedingResult.pokemon?.let { result ->
-                        Egg(
-                            species = result.species.resourceIdentifier,
-                            parentOne = parentOne,
-                            parentTwo = parentTwo,
-                            form = form.name.lowercase(),
-                            timeToHatch = 6000F
-                        )
-                    } ?: return@Trigger false
-
-                    // Set the egg in the nest
-                    nestBlockEntity.setItem(egg.createEggItemStack())
-
-                    // set the parents of the nest if it/they are wild so they guard it
-                    if (nestBlockEntity.ownerUUID == null)
-                        nestBlockEntity.parents = Pair((entity as PokemonEntity).uuid, mate.uuid)
-
-
-                    // set breeding cooldown for both
-                    parentOne.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentOne)
-                    parentTwo.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentTwo)
-
-                    // Display heart particles above parents
-
-                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
-                            net.minecraft.core.particles.ParticleTypes.HEART,
-                            entity.getRandomX(1.0), // Particle X position with slight randomness
-                            entity.getRandomY() + 0.5, // Slightly raised Y position
-                            entity.getRandomZ(1.0), // Particle Z position with slight randomness
-                            4 + kotlin.random.Random.nextInt(2), // Particle count
-                            0.2 * entity.random.nextGaussian(), // X velocity with slight variance
-                            0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
-                            0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
-                            0.02 // Particle speed
-                    )
-                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
-                            net.minecraft.core.particles.ParticleTypes.HEART,
-                            mate.getRandomX(1.0), // Particle X position with slight randomness
-                            mate.getRandomY() + 0.5, // Slightly raised Y position
-                            mate.getRandomZ(1.0), // Particle Z position with slight randomness
-                            4 + kotlin.random.Random.nextInt(2), // Particle count
-                            0.2 * mate.random.nextGaussian(), // X velocity with slight variance
-                            0.1 * mate.random.nextGaussian(), // Y velocity with upwards variance
-                            0.2 * mate.random.nextGaussian(), // Z velocity with slight variance
-                            0.02 // Particle speed
-                    )
-
-                    // Notify nearby players
-                    world.players().forEach { player ->
-                        player.displayClientMessage("An egg has been laid in the nest!".green(), true)
-                    }
-
-                    // todo maybe have them fall asleep after?
-
-                    return@Trigger true
-                }
-            }
-        }*/

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

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

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

@@ -1,52 +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.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,30 +8,31 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+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.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.entity.PosableEntity
 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 = 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
+    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)
         return WrapperLivingEntityTask(
-            StayAfloatTask(chance.resolveFloat()),
+            StayAfloatTask(chance),
             PathfinderMob::class.java
         )
     }

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

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

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

@@ -9,17 +9,15 @@
 package com.cobblemon.mod.common.api.ai.config.task
 
 import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 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,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ) = BehaviorBuilder.create {
         it.group(
             it.absent(CobblemonMemories.ACTIVE_ACTION_EFFECT)

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

@@ -9,17 +9,15 @@
 package com.cobblemon.mod.common.api.ai.config.task
 
 import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 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 SwitchFromChattingTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ) = BehaviorBuilder.create {
         it.group(
             it.absent(CobblemonMemories.DIALOGUES)

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

@@ -8,18 +8,16 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import net.minecraft.world.entity.LivingEntity
 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 SwitchFromFightTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ) = BehaviorBuilder.create {
         it.group(
             it.absent(MemoryModuleType.ATTACK_TARGET)

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

@@ -9,18 +9,16 @@
 package com.cobblemon.mod.common.api.ai.config.task
 
 import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 
 class SwitchFromNPCBattleTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
     override fun createTask(
         entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
+        brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
         return BehaviorBuilder.create {
             it.group(it.absent(CobblemonMemories.NPC_BATTLING)).apply(it) { _ ->

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

@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.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.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
-import net.minecraft.world.entity.ai.behavior.declarative.Trigger
-
-class SwitchFromPokemonBattleTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
-    override fun createTask(
-        entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        return BehaviorBuilder.create {
-            it.group(it.absent(CobblemonMemories.POKEMON_BATTLE)).apply(it) { _ ->
-                Trigger { level, entity, _ ->
-                    entity.brain.updateActivityFromSchedule(level.dayTime, level.gameTime)
-                    true
-                }
-            }
-        }
-    }
-}

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

@@ -1,63 +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.task
-
-import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.api.pokemon.status.Statuses
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-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
-
-class SwitchFromSleepOnTrainerBedTaskConfig : SingleTaskConfig {
-    override fun createTask(
-        entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity> {
-        return BehaviorBuilder.create {
-            it.group(
-                it.registered(CobblemonMemories.POKEMON_SLEEPING)
-            ).apply(it) { pokemonSleeping ->
-                Trigger { world, entity, _ ->
-                    // Why'd you give them this task then, dipshit?
-                    if (entity !is TamableAnimal) {
-                        return@Trigger false
-                    }
-
-                    // If they're owner is gone then we can consider that a reason to wake up, dogs do this too
-                    val owner = entity.owner
-
-                    val isCurrentlySleeping = entity.brain.getMemory(CobblemonMemories.POKEMON_SLEEPING).orElse(false)
-                    // If we should move back to regular behaviours...
-                    if (owner == null || !owner.isSleeping) {
-                        // If it's willingly sleeping then it can lose the sleeping memory
-                        if (isCurrentlySleeping && (entity !is PokemonEntity || entity.pokemon.status?.status != Statuses.SLEEP)) {
-                            pokemonSleeping.erase()
-                            return@Trigger false
-                        }
-
-                        // Go back to your usual behaviours
-                        entity.brain.useDefaultActivity()
-                        return@Trigger false
-                    }
-
-                    return@Trigger true
-                }
-            }
-        }
-    }
-
-    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
-        return emptyList()
-    }
-}