Added eating particles.

I broked the branch. :( So I deleted it and remade it. :)
Added the wisdom of broccoli to the new water and air wander tasks
2026-10-21 22:56:23 -04:00 · 2025-02-03 20:31:41 -05:00 · 2025-02-03 13:40:51 -05:00 · 2025-01-31 20:48:35 +10:00 · 2025-01-31 20:10:17 +10:00 · 2025-01-31 08:28:55 +10:00
465 changed files with 8047 additions and 6695 deletions
@@ -1,16 +0,0 @@
-### Additions
-
- Added ability to rename PC Boxes by clicking on the name of a box
- Added ability to set wallpapers per PC Box by clicking the button right to the box name
- Added sorting by Name, Level and type by clicking the button left of the box name (shift reverses order)
- Added filtering/search functionality in PC UI, which also supports pokemon properties (e.g. shiny=yes shows all shinies)
- Added /changewallpaper <player> <boxNumber> <wallpaper> command to change a wallpaper through commands
- Added /renamebox <player> <boxNumber> <name> command to rename a PC box through commands
-
-### Developer
-
- Added RenamePCBoxEvent.Pre/Post events to prevent players from renaming a box or change their input
- Added ChangePCBoxWallpaperEvent.Pre/Post to prevent players from changing to a wallpaper or change their selection
- Added WallpaperCollectionEvent which gets called when clients connect to a server, allowing the server which of the clients found wallpapers it's allowed to move (collected wallpapers can be removed for example to make it "vanish" client-side)
- Wallpapers are loaded from `assets/<namespace>/textures/gui/pc/wallpaper/` and all wallpapers in this folder are available to the client to  choose by default
- Renamed `SetPCBoxPokemonPacket` and the respective handler to `SetPCBoxPacket`
@@ -1,10 +0,0 @@
-
-### Additions
- Added support for NPCs to use Pokémon models and vice versa. This will require changes in addons that add fossil types due to naming conflicts between fossils and the Pokémon species.
- Added `/changejointscale` command to change the scale of a joint in a model. Unbelievably funny.
-
-### Developer
- Removed all VaryingModelRepository subclasses into the parent class. 
-
-### Addons
- Added `transformedParts` to the root of poser JSONs so it now exists in both poses and the model overall. 
@@ -1,44 +1,14 @@
 # Changelog
 ## [1.7.0 (Month xth, 2025)](#1-7-0)

-### Additions
- Added an in-game configuration screen, allowing all settings from `main.json` to be edited directly in-game.
- Added `/cobblemonconfig reload` command to reload `main.json` configuration. **Note:** Some settings require a server restart to take effect; use this command cautiously.
- Added `blacklisted_items_to_hold` and `whitelisted_items_to_hold` tags to allow for controlling which items players can give to their Pokémon. If the whitelist is empty, it will consider all item as allowed (unless they are in the blacklist).
- Pokémon now follow the mouse cursor on the Summary screen, with an option to disable this in the settings.
-
-### Changes
- Renamed `chargeGainedPerTick` config to `secondsToChargeHealingMachine`.
-
 ### Fixes
 - Fixed Particles sometimes facing the wrong direction (looking at you, Swords Dance)
 - Fixed PCs always opening at box 2 instead of box 1.
- Fixed not being able to do complex item requirements aside from just NBT with evolution conditions, requirements and fossil items.
- Fixed the usage `hiddenability` in `pokegive` or other spawn commands resulting in a forced hidden ability
- Fixed the consumption of friendship berries (or EV berries) not making any noise
- Fixed Instantly breaking and replacing a fossil analyzer with any block entity crashing the game in a complete multi-structure
- Fixed players getting disconnected when sidemods update a Pokémon's teratype
- Fixed fling not using Item Names for minecraft held items that substitute Pokémon items
- Fixed evolutions sometimes preventing players from logging in to servers
- Fixed rendering of shoulder-mounted Pokémon desyncing between clients

 ### Developer
 - A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
 - Dialogues are correctly removed from memory when they are stopped.
 - Dialogues with variably-set initial pages now properly start timeout tracking.
- Added `EvGainedEvent.Pre` and `EvGainedEvent.Post`.
- Deprecated `EVs#add(Stat, Int)`, you will not be able to compile against this code please migrate to the `EVs#add(Stat, Int, EvSource)` you most likely want to use `SidemodEvSource` but please check other implementations or make your own.
- Removed the NbtItemPredicate class, all the mod usages now use the vanilla item predicate solution, this causes breaking changes on Fossil, HeldItemRequirement & ItemInteractionEvolution
- Renamed Cobblemon's creative tabs to start with "Cobblemon: " to distinguish Cobblemon's tabs from tabs for other mods.
- Various items now have a rarity value.
-
-### Changes
- When using the `cobblemon` or `generation_9` capture calculators a critical capture with a single shake will always play for successful captures when you've already registered the Pokémon as caught in your Pokédex.
-### MoLang & Datapacks
- The following usages for item predicates can now use item conditions like advancements do, you can learn about them in the [Minecraft wiki](https://minecraft.wiki/w/Advancement_definition#minecraft:filled_bucket)
-  - The `requiredContext` for an item interaction evolution
-  - The `itemCondition` for a held item evolution requirement
-  - The `fossils` for a fossil entry

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

@@ -1,6 +1,6 @@
 # Cobblemon

-An open-source Pokémon mod for Minecraft Java Edition, written in Kotlin for Fabric and NeoForge.
+An open-source Pokémon mod for Minecraft Java Edition, written in Kotlin for Fabric and Forge.

 ## Getting started

@@ -5,7 +5,7 @@ plugins {

 version = "${project.property("mod_version")}+${project.property("mc_version")}"

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

    // Integrations
    compileOnlyApi(libs.jei.api)
-    modCompileOnly(libs.bundles.common.integrations.compileOnly) {
+    modCompileOnly(libs.bundles.fabric.integrations.compileOnly) {
        isTransitive = false
    }
    // Flywheel has no common dep so just pick one and don't use any platform specific code in common
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.cobblemon.mod.common.pokemon.ai.EntityBehaviour;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
+import net.minecraft.world.entity.monster.Creeper;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Creeper.class)
+public class EntityCreeperMixin extends Mob {
+
+    private EntityCreeperMixin(net.minecraft.world.entity.EntityType<? extends Creeper> entityType, Level world) {
+        super(entityType, world);
+    }
+
+    @Inject(method = "registerGoals", at = @At(value = "TAIL"), cancellable = false)
+    private void cobblemon$initGoals(CallbackInfo callbackInfo) {
+        final Creeper creeper = (Creeper) (Object) this;
+        // Pokemon Entities
+        this.goalSelector.addGoal(
+            3,
+            new AvoidEntityGoal<>(
+                creeper,
+                PokemonEntity.class,
+                6.0f,
+                1.0,
+                1.2,
+                 entity -> ((PokemonEntity)entity).getBehaviour().getEntityInteract().getAvoidedByCreeper() && ((PokemonEntity)entity).getBeamMode() != 1
+            )
+        );
+
+        // Players with shoulder mounted Pokemon
+        this.goalSelector.addGoal(
+            3,
+            new AvoidEntityGoal<>(
+                creeper,
+                ServerPlayer.class,
+                6.0f,
+                1.0,
+                1.2,
+                entity -> EntityBehaviour.Companion.hasCreeperFearedShoulderMount((ServerPlayer)entity)
+            )
+        );
+
+    }
+}
+
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import net.minecraft.world.entity.monster.Phantom;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(targets = "net/minecraft/world/entity/monster/Phantom$PhantomSweepAttackGoal")
+public class EntityPhantomMixin {
+    // TODO: Figure out how to access the outer class that wraps SwoopMovementGoal
+    // Need to find the cat mons that are near the phantom
+
+//    @Inject(method = "shouldContinue", at = @At(value = "RETURN"), cancellable = true)
+//    public void cobblemon$shouldContinue(CallbackInfoReturnable<Boolean> ci) {
+////        var goalSelectorField = PhantomEntity.class.getClasses();// PhantomEntity.class.getFields();// .class.getDeclaredField("goalSelector");
+//
+////        goalSelectorField.setAccessible(true);
+////        GoalSelector goalSelector = (GoalSelector) goalSelectorField.get(mobEntity);
+////        final SwoopMovementGoal phantom = (SwoopMovementGoal) (Object) this;
+////        if(ci.getReturnValue() == false) {
+////            var result = this$0.getWorld().getEntitiesByClass(
+////                    PokemonEntity.class,
+////                    this$0.getBoundingBox().expand(16.0),
+////                    entity ->  {
+////                        return ((PokemonEntity) entity).getBehaviour().getEntityInteract().getAvoidedByPhantom();
+////                    }
+////            ).isEmpty();
+////
+////                ci.setReturnValue(result);
+////        }
+//    }
+}
+
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.cobblemon.mod.common.pokemon.ai.EntityBehaviour;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
+import net.minecraft.world.entity.monster.AbstractSkeleton;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(AbstractSkeleton.class)
+public class EntitySkeletonMixin extends Mob {
+
+    private EntitySkeletonMixin(EntityType<? extends Mob> entityType, Level world) {
+        super(entityType, world);
+    }
+
+    @Inject(method = "registerGoals", at = @At(value = "TAIL"), 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)
+            )
+        );
+
+    }
+}
+
@@ -62,7 +62,11 @@ import com.cobblemon.mod.common.api.storage.player.adapter.PlayerDataMongoBacken
 import com.cobblemon.mod.common.api.storage.player.factory.CachedPlayerDataStoreFactory
 import com.cobblemon.mod.common.api.tags.CobblemonEntityTypeTags
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
-import com.cobblemon.mod.common.battles.*
+import com.cobblemon.mod.common.battles.BagItems
+import com.cobblemon.mod.common.battles.BattleFormat
+import com.cobblemon.mod.common.battles.BattleRegistry
+import com.cobblemon.mod.common.battles.BattleSide
+import com.cobblemon.mod.common.battles.ShowdownThread
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.client.CobblemonPack
@@ -85,11 +89,22 @@ 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.*
+import com.cobblemon.mod.common.pokemon.properties.AspectPropertyType
+import com.cobblemon.mod.common.pokemon.properties.BattleCloneProperty
+import com.cobblemon.mod.common.pokemon.properties.FreezeFrameProperty
+import com.cobblemon.mod.common.pokemon.properties.HiddenAbilityPropertyType
+import com.cobblemon.mod.common.pokemon.properties.NoAIProperty
+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.starter.CobblemonStarterHandler
-import com.cobblemon.mod.common.util.*
+import com.cobblemon.mod.common.util.DataKeys
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.ifDedicatedServer
+import com.cobblemon.mod.common.util.isLaterVersion
+import com.cobblemon.mod.common.util.party
+import com.cobblemon.mod.common.util.server
 import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
 import com.cobblemon.mod.common.world.feature.ore.CobblemonOrePlacedFeatures
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
@@ -97,27 +112,25 @@ import com.mongodb.ConnectionString
 import com.mongodb.MongoClientSettings
 import com.mongodb.client.MongoClient
 import com.mongodb.client.MongoClients
+import java.io.File
+import java.io.FileReader
+import java.io.FileWriter
+import java.io.PrintWriter
+import java.util.UUID
+import kotlin.math.roundToInt
+import kotlin.properties.Delegates
+import kotlin.reflect.full.memberProperties
+import kotlin.reflect.jvm.isAccessible
+import kotlin.reflect.jvm.javaField
 import net.minecraft.client.Minecraft
 import net.minecraft.commands.synchronization.SingletonArgumentInfo
 import net.minecraft.resources.ResourceKey
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.world.item.NameTagItem
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.storage.LevelResource
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
-import java.io.File
-import java.io.FileReader
-import java.io.FileWriter
-import java.io.PrintWriter
-import java.util.*
-import kotlin.math.roundToInt
-import kotlin.properties.Delegates
-import kotlin.reflect.full.memberProperties
-import kotlin.reflect.jvm.isAccessible
-import kotlin.reflect.jvm.javaField

 object Cobblemon {
    const val MODID = CobblemonBuildDetails.MOD_ID
@@ -151,7 +164,6 @@ object Cobblemon {
    var permissionValidator: PermissionValidator by Delegates.observable(LaxPermissionValidator().also { it.initialize() }) { _, _, newValue -> newValue.initialize() }
    var statProvider: StatProvider = CobblemonStatProvider
    var seasonResolver: SeasonResolver = TagSeasonResolver
-    var wallpapers = mapOf<UUID, List<ResourceLocation>>()

    @JvmStatic
    val builtinPacks = listOf<CobblemonPack>(
@@ -208,8 +220,7 @@ object Cobblemon {
            storage.onPlayerDataSync(it)
            playerDataManager.syncAllToPlayer(it)
            starterHandler.handleJoin(it)
-            it.requestWallpapers()
-            sendServerSettingsPacketToPlayer(it)
+            ServerSettingsPacket(this.config.preventCompletePartyDeposit, this.config.displayEntityLevelLabel, this.config.displayEntityNameLabel, this.config.maxPokemonLevel, this.config.maxPokemonFriendship, this.config.maxDynamaxLevel).sendToPlayer(it)
        }
        PlatformEvents.SERVER_PLAYER_LOGOUT.subscribe {
            PCLinkManager.removeLink(it.player.uuid)
@@ -257,17 +268,8 @@ object Cobblemon {
        }

        HeldItemProvider.register(CobblemonHeldItemManager, Priority.LOWEST)
-    }

-    fun sendServerSettingsPacketToPlayer(player: ServerPlayer) {
-        ServerSettingsPacket(
-            this.config.preventCompletePartyDeposit,
-            this.config.displayEntityLevelLabel,
-            this.config.displayEntityNameLabel,
-            this.config.maxPokemonLevel,
-            this.config.maxPokemonFriendship,
-            this.config.maxDynamaxLevel,
-        ).sendToPlayer(player)
+
    }

    fun initialize() {
@@ -427,23 +429,7 @@ object Cobblemon {
        }
    }

-    private fun initializeConfig() {
-        loadCobblemonConfig()
-        saveConfig(this.config)
-        PokemonSpecies.observable.subscribe { starterConfig = this.loadStarterConfig() }
-    }
-
    fun loadConfig() {
-        initializeConfig()
-        bestSpawner.init()
-    }
-
-    fun reloadConfig() {
-        initializeConfig()
-        bestSpawner.reloadConfig()
-    }
-
-    private fun loadCobblemonConfig() {
        val configFile = File(CONFIG_PATH)
        configFile.parentFile.mkdirs()

@@ -486,6 +472,12 @@ object Cobblemon {
        } else {
            this.config = CobblemonConfig()
        }
+
+        config.lastSavedVersion = VERSION
+        this.saveConfig()
+
+        bestSpawner.loadConfig()
+        PokemonSpecies.observable.subscribe { starterConfig = this.loadStarterConfig() }
    }

    fun loadStarterConfig(): StarterConfig {
@@ -508,14 +500,12 @@ object Cobblemon {
        }
    }

-    fun saveConfig(config: CobblemonConfig) {
-        config.lastSavedVersion = VERSION
-
+    fun saveConfig() {
        try {
            val configFile = File(CONFIG_PATH)
            val fileWriter = FileWriter(configFile)
            // Put the config to json then flush the writer to commence writing.
-            CobblemonConfig.GSON.toJson(config, fileWriter)
+            CobblemonConfig.GSON.toJson(this.config, fileWriter)
            fileWriter.flush()
            fileWriter.close()
        } catch (exception: Exception) {
@@ -537,4 +527,4 @@ object Cobblemon {
        this.implementation.registerCommandArgument(cobblemonResource("npc_class"), NPCClassArgumentType::class, SingletonArgumentInfo.contextFree(NPCClassArgumentType::npcClass))
    }

-}
+}
@@ -15,6 +15,8 @@ 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"))

    fun register(activity: Activity): Activity {
        activities.add(activity)
@@ -36,9 +36,6 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
    @JvmField
    val PC: BlockEntityType<PCBlockEntity> = this.create("pc", BlockEntityType.Builder.of(::PCBlockEntity, CobblemonBlocks.PC).build(null))

-    @JvmField
-    val STADIUM: BlockEntityType<StadiumBlockEntity> = this.create("stadium_terminal", BlockEntityType.Builder.of(::StadiumBlockEntity, CobblemonBlocks.STADIUM).build(null))
-
    @JvmField
    val LECTERN: BlockEntityType<LecternBlockEntity> = this.create("lectern", BlockEntityType.Builder.of(::LecternBlockEntity, CobblemonBlocks.LECTERN).build(null))

@@ -354,9 +354,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    @JvmField
    val PC = create("pc", PCBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2F).noOcclusion().lightLevel { if ((it.getValue(PCBlock.ON) as Boolean) && (it.getValue(PCBlock.PART) == PCBlock.PCPart.TOP)) 10 else 0 }))

-    @JvmField
-    val STADIUM = create("stadium_terminal", StadiumBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2F)))
-
    @JvmField
    val LECTERN = create("lectern", LecternBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).sound(SoundType.WOOD).strength(2.5F).ignitedByLava()))

@@ -9,27 +9,35 @@
 package com.cobblemon.mod.common

 import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
+import com.cobblemon.mod.common.api.ai.BrainPreset
 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.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.net.messages.client.data.BrainPresetSyncPacket
 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.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
+import com.mojang.datafixers.util.Either
+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.world.entity.schedule.Activity

-object CobblemonBrainConfigs : JsonDataRegistry<List<BrainConfig>> {
+object CobblemonBrainConfigs : JsonDataRegistry<BrainPreset> {
    override val gson: Gson = GsonBuilder()
        .setPrettyPrinting()
        .registerTypeAdapter(Activity::class.java, ActivityAdapter)
@@ -37,21 +45,27 @@ object CobblemonBrainConfigs : JsonDataRegistry<List<BrainConfig>> {
        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
        .registerTypeAdapter(BrainConfig::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.getParameterized(List::class.java, BrainConfig::class.java) as TypeToken<List<BrainConfig>>
+    override val typeToken = TypeToken.get(BrainPreset::class.java)
    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>>()
+    val presets = mutableMapOf<ResourceLocation, BrainPreset>()

    override fun sync(player: ServerPlayer) {
-        // TODO implement probs ay
+        player.sendPacket(BrainPresetSyncPacket(presets))
    }

-    override fun reload(data: Map<ResourceLocation, List<BrainConfig>>) {
+    override fun reload(data: Map<ResourceLocation, BrainPreset>) {
        presets.clear()
        presets.putAll(data)
    }
@@ -23,7 +23,6 @@ object CobblemonCommands {
        ChangeEyeHeight.register(dispatcher)
        ChangeScaleAndSize.register(dispatcher)
        ChangeWalkSpeed.register(dispatcher)
-        ChangeJointScaleCommand.register(dispatcher)
        TestCommand.register(dispatcher)
        ReloadShowdownCommand.register(dispatcher)
        ClickTextCommand.register(dispatcher)
@@ -57,10 +56,8 @@ object CobblemonCommands {
        AbandonMultiTeam.register(dispatcher)
        FreezePokemonCommand.register(dispatcher)
        ApplyPlayerTextureCommand.register(dispatcher)
-        RenameBoxCommand.register(dispatcher)
-        ChangeBoxWallpaperCommand.register(dispatcher)
        RunMolangScriptCommand.register(dispatcher)
-        CobblemonConfigCommand.register(dispatcher)
+        BrainEditCommand.register(dispatcher)

        // Possibly lock down registration if and only if under dev environment or running in an environment
        // with a certain system environment variable set
@@ -35,6 +35,7 @@ import com.cobblemon.mod.common.pokeball.PokeBall
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.core.Registry
+import net.minecraft.core.component.DataComponents
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
 import net.minecraft.network.chat.Component
@@ -268,12 +269,10 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val MONITOR = blockItem("monitor", CobblemonBlocks.MONITOR)
    @JvmField
-    val HEALING_MACHINE = blockItem("healing_machine", CobblemonBlocks.HEALING_MACHINE, Rarity.UNCOMMON)
+    val HEALING_MACHINE = blockItem("healing_machine", CobblemonBlocks.HEALING_MACHINE)
    @JvmField
    val PC = blockItem("pc", CobblemonBlocks.PC)
    @JvmField
-    val STADIUM = blockItem("stadium_terminal", CobblemonBlocks.STADIUM)
-    @JvmField
    val PASTURE = blockItem("pasture", CobblemonBlocks.PASTURE)
    @JvmField
    val DISPLAY_CASE = blockItem("display_case", CobblemonBlocks.DISPLAY_CASE)
@@ -399,7 +398,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It

    // Medicine
    @JvmField
-    val RARE_CANDY = candyItem("rare_candy", Rarity.RARE) { _, pokemon -> pokemon.getExperienceToNextLevel() }
+    val RARE_CANDY = candyItem("rare_candy") { _, pokemon -> pokemon.getExperienceToNextLevel() }
    @JvmField
    val EXPERIENCE_CANDY_XS = candyItem("exp_candy_xs") { _, _ -> CandyItem.DEFAULT_XS_CANDY_YIELD }
    @JvmField
@@ -884,48 +883,48 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It

    // Archaeology
    @JvmField
-    val ARMOR_FOSSIL = itemWithRarity("armor_fossil", Rarity.UNCOMMON)
+    val ARMOR_FOSSIL = noSettingsItem("armor_fossil")
    @JvmField
-    val FOSSILIZED_BIRD = itemWithRarity("fossilized_bird", Rarity.UNCOMMON)
+    val FOSSILIZED_BIRD = noSettingsItem("fossilized_bird")
    @JvmField
-    val CLAW_FOSSIL = itemWithRarity("claw_fossil", Rarity.UNCOMMON)
+    val CLAW_FOSSIL = noSettingsItem("claw_fossil")
    @JvmField
-    val COVER_FOSSIL = itemWithRarity("cover_fossil", Rarity.UNCOMMON)
+    val COVER_FOSSIL = noSettingsItem("cover_fossil")
    @JvmField
-    val FOSSILIZED_DINO = itemWithRarity("fossilized_dino", Rarity.UNCOMMON)
+    val FOSSILIZED_DINO = noSettingsItem("fossilized_dino")
    @JvmField
-    val DOME_FOSSIL = itemWithRarity("dome_fossil", Rarity.UNCOMMON)
+    val DOME_FOSSIL = noSettingsItem("dome_fossil")
    @JvmField
-    val FOSSILIZED_DRAKE = itemWithRarity("fossilized_drake", Rarity.UNCOMMON)
+    val FOSSILIZED_DRAKE = noSettingsItem("fossilized_drake")
    @JvmField
-    val FOSSILIZED_FISH = itemWithRarity("fossilized_fish", Rarity.UNCOMMON)
+    val FOSSILIZED_FISH = noSettingsItem("fossilized_fish")
    @JvmField
-    val HELIX_FOSSIL = itemWithRarity("helix_fossil", Rarity.UNCOMMON)
+    val HELIX_FOSSIL = noSettingsItem("helix_fossil")
    @JvmField
-    val JAW_FOSSIL = itemWithRarity("jaw_fossil", Rarity.UNCOMMON)
+    val JAW_FOSSIL = noSettingsItem("jaw_fossil")
    @JvmField
-    val OLD_AMBER_FOSSIL = itemWithRarity("old_amber_fossil", Rarity.UNCOMMON)
+    val OLD_AMBER_FOSSIL = noSettingsItem("old_amber_fossil")
    @JvmField
-    val PLUME_FOSSIL = itemWithRarity("plume_fossil", Rarity.UNCOMMON)
+    val PLUME_FOSSIL = noSettingsItem("plume_fossil")
    @JvmField
-    val ROOT_FOSSIL = itemWithRarity("root_fossil", Rarity.UNCOMMON)
+    val ROOT_FOSSIL = noSettingsItem("root_fossil")
    @JvmField
-    val SAIL_FOSSIL = itemWithRarity("sail_fossil", Rarity.UNCOMMON)
+    val SAIL_FOSSIL = noSettingsItem("sail_fossil")
    @JvmField
-    val SKULL_FOSSIL = itemWithRarity("skull_fossil", Rarity.UNCOMMON)
+    val SKULL_FOSSIL = noSettingsItem("skull_fossil")

    @JvmField
-    val BYGONE_SHERD = itemWithRarity("bygone_sherd", Rarity.UNCOMMON)
+    val BYGONE_SHERD = noSettingsItem("bygone_sherd")
    @JvmField
-    val CAPTURE_SHERD = itemWithRarity("capture_sherd",Rarity.UNCOMMON)
+    val CAPTURE_SHERD = noSettingsItem("capture_sherd")
    @JvmField
-    val DOME_SHERD = itemWithRarity("dome_sherd", Rarity.UNCOMMON)
+    val DOME_SHERD = noSettingsItem("dome_sherd")
    @JvmField
-    val HELIX_SHERD = itemWithRarity("helix_sherd", Rarity.UNCOMMON)
+    val HELIX_SHERD = noSettingsItem("helix_sherd")
    @JvmField
-    val NOSTALGIC_SHERD = itemWithRarity("nostalgic_sherd",Rarity.UNCOMMON)
+    val NOSTALGIC_SHERD = noSettingsItem("nostalgic_sherd")
    @JvmField
-    val SUSPICIOUS_SHERD = itemWithRarity("suspicious_sherd", Rarity.UNCOMMON)
+    val SUSPICIOUS_SHERD = noSettingsItem("suspicious_sherd")

    @JvmField
    val TUMBLESTONE = this.create("tumblestone", TumblestoneItem(Item.Properties(), CobblemonBlocks.SMALL_BUDDING_TUMBLESTONE))
@@ -1145,11 +1144,11 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val DREAM_ROD = pokerodItem(cobblemonResource("dream_rod"))
    @JvmField
-    val BEAST_ROD = pokerodItem(cobblemonResource("beast_rod"), Rarity.RARE)
+    val BEAST_ROD = pokerodItem(cobblemonResource("beast_rod"))
    @JvmField
-    val MASTER_ROD = pokerodItem(cobblemonResource("master_rod"), Rarity.EPIC)
+    val MASTER_ROD = pokerodItem(cobblemonResource("master_rod"))
    @JvmField
-    val CHERISH_ROD = pokerodItem(cobblemonResource("cherish_rod"), Rarity.EPIC)
+    val CHERISH_ROD = pokerodItem(cobblemonResource("cherish_rod"))
    @JvmField
    val ANCIENT_POKE_ROD = pokerodItem(cobblemonResource("ancient_poke_rod"))
    @JvmField
@@ -1181,7 +1180,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val ANCIENT_GIGATON_ROD = pokerodItem(cobblemonResource("ancient_gigaton_rod"))
    @JvmField
-    val ANCIENT_ORIGIN_ROD = pokerodItem(cobblemonResource("ancient_origin_rod"), Rarity.EPIC)
+    val ANCIENT_ORIGIN_ROD = pokerodItem(cobblemonResource("ancient_origin_rod"))

    // Misc
    @JvmField
@@ -1233,12 +1232,10 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    //@JvmField
    //val BINDING_SOIL = blockItem("binding_soil", CobblemonBlocks.BINDING_SOIL)

-    private fun blockItem(name: String, block: Block, rarity: Rarity = Rarity.COMMON): BlockItem = this.create(name, BlockItem(block, Item.Properties().rarity(rarity)))
+    private fun blockItem(name: String, block: Block): BlockItem = this.create(name, BlockItem(block, Item.Properties()))

    private fun noSettingsItem(name: String): CobblemonItem = this.create(name, CobblemonItem(Item.Properties()))

-    private fun itemWithRarity(name: String, rarity: Rarity): CobblemonItem = this.create(name, CobblemonItem(Item.Properties().rarity(rarity)))
-    
    fun berries() = this.berries.toMap()

    private fun mulchItem(name: String, mulchVariant: MulchVariant): MulchItem = this.create(name, MulchItem(mulchVariant))
@@ -1250,10 +1247,10 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
        return item
    }

-    private fun candyItem(name: String, rarity: Rarity = Rarity.COMMON, calculator: CandyItem.Calculator): CandyItem  = this.create(name, CandyItem(rarity, calculator))
+    private fun candyItem(name: String, calculator: CandyItem.Calculator): CandyItem  = this.create(name, CandyItem(calculator))

-    private fun pokerodItem(pokeRodId: ResourceLocation, rarity: Rarity = Rarity.COMMON): PokerodItem {
-        val settings = Item.Properties().stacksTo(1).durability(256).rarity(rarity)
+    private fun pokerodItem(pokeRodId: ResourceLocation): PokerodItem {
+        val settings = Item.Properties().stacksTo(1).durability(256)
        val item = create(pokeRodId.path, PokerodItem(pokeRodId, settings))
        pokeRods.add(item)
        return item
@@ -16,14 +16,31 @@ import com.mojang.serialization.codecs.PrimitiveCodec
 import net.minecraft.core.UUIDUtil
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import java.util.Optional
+import java.util.UUID
+import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.LivingEntity

 object CobblemonMemories {
    val memories = mutableMapOf<String, MemoryModuleType<*>>()

+    /*
+     * When a memory doesn't have a codec provided, it's because it doesn't
+     * get serialized during relogs. This makes sense for things like battles which
+     * do not survive a relog therefore any memory of it should be temporary.
+     */
+
    val BATTLING_POKEMON = register("battling_pokemon", ListCodec(UUIDUtil.CODEC, 0, 31))
    val NPC_BATTLING = register("npc_battling", PrimitiveCodec.BOOL)
    val DIALOGUES = register<List<ActiveDialogue>>("npc_dialogues")
    val ACTIVE_ACTION_EFFECT = register<ActionEffectContext>("active_action_effect")
+    val POKEMON_FLYING = register("pokemon_flying", PrimitiveCodec.BOOL)
+    val POKEMON_DROWSY = register("pokemon_drowsy", PrimitiveCodec.BOOL)
+    val POKEMON_SLEEPING = register("pokemon_sleeping", PrimitiveCodec.BOOL)
+    val POKEMON_BATTLE = register<UUID>("pokemon_battle")
+    val REST_PATH_COOLDOWN = register("rest_path_cooldown", PrimitiveCodec.BOOL)
+    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")

    fun <U> register(id: String, codec: Codec<U>): MemoryModuleType<U> {
        val memoryModule = MemoryModuleType(Optional.of(codec))
@@ -36,4 +53,4 @@ object CobblemonMemories {
        memories[id] = memoryModule
        return memoryModule
    }
-}
+}
@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common

 import com.cobblemon.mod.common.api.net.NetworkPacket
+import com.cobblemon.mod.common.client.net.OpenBehaviourEditorHandler
 import com.cobblemon.mod.common.client.net.PlayerInteractOptionsHandler
 import com.cobblemon.mod.common.client.net.SetClientPlayerDataHandler
 import com.cobblemon.mod.common.client.net.animation.PlayPosableAnimationHandler
@@ -34,7 +35,6 @@ import com.cobblemon.mod.common.client.net.pasture.PokemonPasturedHandler
 import com.cobblemon.mod.common.client.net.pasture.PokemonUnpasturedHandler
 import com.cobblemon.mod.common.client.net.pokedex.ServerConfirmedRegisterHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.PokemonUpdatePacketHandler
-import com.cobblemon.mod.common.client.net.settings.OpenCobblemonConfigEditorHandler
 import com.cobblemon.mod.common.client.net.settings.ServerSettingsPacketHandler
 import com.cobblemon.mod.common.client.net.sound.UnvalidatedPlaySoundS2CPacketHandler
 import com.cobblemon.mod.common.client.net.spawn.SpawnExtraDataEntityHandler
@@ -45,10 +45,23 @@ import com.cobblemon.mod.common.client.net.storage.party.InitializePartyHandler
 import com.cobblemon.mod.common.client.net.storage.party.MoveClientPartyPokemonHandler
 import com.cobblemon.mod.common.client.net.storage.party.SetPartyPokemonHandler
 import com.cobblemon.mod.common.client.net.storage.party.SetPartyReferenceHandler
-import com.cobblemon.mod.common.client.net.storage.pc.*
+import com.cobblemon.mod.common.client.net.storage.pc.ClosePCHandler
+import com.cobblemon.mod.common.client.net.storage.pc.InitializePCHandler
+import com.cobblemon.mod.common.client.net.storage.pc.MoveClientPCPokemonHandler
+import com.cobblemon.mod.common.client.net.storage.pc.OpenPCHandler
+import com.cobblemon.mod.common.client.net.storage.pc.SetPCBoxPokemonHandler
+import com.cobblemon.mod.common.client.net.storage.pc.SetPCPokemonHandler
 import com.cobblemon.mod.common.client.net.toast.ToastPacketHandler
-import com.cobblemon.mod.common.client.net.trade.*
+import com.cobblemon.mod.common.client.net.trade.TradeAcceptanceChangedHandler
+import com.cobblemon.mod.common.client.net.trade.TradeCancelledHandler
+import com.cobblemon.mod.common.client.net.trade.TradeCompletedHandler
+import com.cobblemon.mod.common.client.net.trade.TradeOfferExpiredHandler
+import com.cobblemon.mod.common.client.net.trade.TradeOfferNotificationHandler
+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.PlayerInteractOptionsPacket
 import com.cobblemon.mod.common.net.messages.client.SetClientPlayerDataPacket
 import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
@@ -62,6 +75,9 @@ import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueOpenedPacke
 import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormParticlePacket
+import com.cobblemon.mod.common.net.messages.client.fishing.FishingBaitRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.fossil.FossilRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.fossil.NaturalMaterialRegistrySyncPacket
 import com.cobblemon.mod.common.net.messages.client.npc.CloseNPCEditorPacket
 import com.cobblemon.mod.common.net.messages.client.npc.OpenNPCEditorPacket
 import com.cobblemon.mod.common.net.messages.client.pasture.ClosePasturePacket
@@ -73,7 +89,6 @@ import com.cobblemon.mod.common.net.messages.client.pokemon.update.*
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.AddEvolutionPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClearEvolutionsPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.RemoveEvolutionPacket
-import com.cobblemon.mod.common.net.messages.client.settings.OpenCobblemonConfigScreenPacket
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
 import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
 import com.cobblemon.mod.common.net.messages.client.spawn.SpawnGenericBedrockPacket
@@ -87,17 +102,38 @@ import com.cobblemon.mod.common.net.messages.client.storage.party.InitializePart
 import com.cobblemon.mod.common.net.messages.client.storage.party.MoveClientPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyReferencePacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.*
-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
+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.SetPCBoxPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.toast.ToastPacket
-import com.cobblemon.mod.common.net.messages.client.trade.*
+import com.cobblemon.mod.common.net.messages.client.trade.TradeAcceptanceChangedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeCancelledPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeCompletedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferExpiredPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferNotificationPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeProcessStartedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeStartedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeUpdatedPacket
 import com.cobblemon.mod.common.net.messages.client.ui.InteractPokemonUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.PokedexUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
-import com.cobblemon.mod.common.net.messages.server.*
-import com.cobblemon.mod.common.net.messages.server.battle.*
+import com.cobblemon.mod.common.net.messages.server.BattleChallengePacket
+import com.cobblemon.mod.common.net.messages.server.BattleChallengeResponsePacket
+import com.cobblemon.mod.common.net.messages.server.BenchMovePacket
+import com.cobblemon.mod.common.net.messages.server.RequestMoveSwapPacket
+import com.cobblemon.mod.common.net.messages.server.RequestPlayerInteractionsPacket
+import com.cobblemon.mod.common.net.messages.server.SelectStarterPacket
+import com.cobblemon.mod.common.net.messages.server.SendOutPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.battle.BattleSelectActionsPacket
+import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamLeavePacket
+import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamRequestPacket
+import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamResponsePacket
+import com.cobblemon.mod.common.net.messages.server.battle.RemoveSpectatorPacket
+import com.cobblemon.mod.common.net.messages.server.battle.SpectateBattlePacket
+import com.cobblemon.mod.common.net.messages.server.behaviour.SetEntityBehaviourPacket
 import com.cobblemon.mod.common.net.messages.server.block.AdjustBlockEntityViewerCountPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectedPacket
@@ -124,16 +160,25 @@ import com.cobblemon.mod.common.net.messages.server.storage.party.SwapPartyPokem
 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.PCBoxWallpapersPacket
 import com.cobblemon.mod.common.net.messages.server.storage.pc.ReleasePCPokemonPacket
-import com.cobblemon.mod.common.net.messages.server.storage.pc.RequestChangePCBoxWallpaperPacket
-import com.cobblemon.mod.common.net.messages.server.storage.pc.RequestRenamePCBoxPacket
-import com.cobblemon.mod.common.net.messages.server.storage.pc.SortPCBoxPacket
 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.trade.*
-import com.cobblemon.mod.common.net.serverhandling.*
-import com.cobblemon.mod.common.net.serverhandling.battle.*
+import com.cobblemon.mod.common.net.messages.server.trade.AcceptTradeRequestPacket
+import com.cobblemon.mod.common.net.messages.server.trade.CancelTradePacket
+import com.cobblemon.mod.common.net.messages.server.trade.ChangeTradeAcceptancePacket
+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.serverhandling.block.AdjustBlockEntityViewerCountHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectCancelledHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectedHandler
@@ -161,8 +206,18 @@ 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.*
-import com.cobblemon.mod.common.net.serverhandling.trade.*
+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.serverhandling.trade.AcceptTradeRequestHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.CancelTradeHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.ChangeTradeAcceptanceHandler
+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.util.server
 import net.minecraft.server.level.ServerPlayer

@@ -217,9 +272,6 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(SpeciesFeatureUpdatePacket.ID, SpeciesFeatureUpdatePacket::decode, PokemonUpdatePacketHandler()))
        list.add(PacketRegisterInfo(OriginalTrainerUpdatePacket.ID, OriginalTrainerUpdatePacket::decode, PokemonUpdatePacketHandler()))
        list.add(PacketRegisterInfo(FormUpdatePacket.ID, FormUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(TeraTypeUpdatePacket.ID, TeraTypeUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(DmaxLevelUpdatePacket.ID, DmaxLevelUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(GmaxFactorUpdatePacket.ID, GmaxFactorUpdatePacket::decode, PokemonUpdatePacketHandler()))

        // Evolution start
        list.add(PacketRegisterInfo(AddEvolutionPacket.ID, AddEvolutionPacket::decode, PokemonUpdatePacketHandler()))
@@ -234,18 +286,13 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(SetPartyReferencePacket.ID, SetPartyReferencePacket::decode, SetPartyReferenceHandler))
        list.add(PacketRegisterInfo(InitializePCPacket.ID, InitializePCPacket::decode, InitializePCHandler))
        list.add(PacketRegisterInfo(MoveClientPCPokemonPacket.ID, MoveClientPCPokemonPacket::decode, MoveClientPCPokemonHandler))
-        list.add(PacketRegisterInfo(SetPCBoxPacket.ID, SetPCBoxPacket::decode, SetPCBoxHandler))
+        list.add(PacketRegisterInfo(SetPCBoxPokemonPacket.ID, SetPCBoxPokemonPacket::decode, SetPCBoxPokemonHandler))
        list.add(PacketRegisterInfo(SetPCPokemonPacket.ID, SetPCPokemonPacket::decode, SetPCPokemonHandler))
        list.add(PacketRegisterInfo(OpenPCPacket.ID, OpenPCPacket::decode, OpenPCHandler))
        list.add(PacketRegisterInfo(ClosePCPacket.ID, ClosePCPacket::decode, ClosePCHandler))
        list.add(PacketRegisterInfo(SwapClientPokemonPacket.ID, SwapClientPokemonPacket::decode, SwapClientPokemonHandler))
        list.add(PacketRegisterInfo(RemoveClientPokemonPacket.ID, RemoveClientPokemonPacket::decode, RemoveClientPokemonHandler))

-        list.add(PacketRegisterInfo(RenamePCBoxPacket.ID, RenamePCBoxPacket::decode, RenamePCBoxHandler))
-        list.add(PacketRegisterInfo(RequestPCBoxWallpapersPacket.ID, RequestPCBoxWallpapersPacket::decode, RequestPCBoxWallpapersHandler))
-        list.add(PacketRegisterInfo(SetPCBoxWallpapersPacket.ID, SetPCBoxWallpapersPacket::decode, SetPCBoxWallpapersHandler))
-        list.add(PacketRegisterInfo(ChangePCBoxWallpaperPacket.ID, ChangePCBoxWallpaperPacket::decode, ChangePCBoxWallpaperHandler))
-
        // UI Packets
        list.add(PacketRegisterInfo(SummaryUIPacket.ID, SummaryUIPacket::decode, SummaryUIPacketHandler))
        list.add(PacketRegisterInfo(InteractPokemonUIPacket.ID, InteractPokemonUIPacket::decode, InteractPokemonUIPacketHandler))
@@ -283,13 +330,11 @@ object CobblemonNetwork {
        // MultiBattleTeam Packets
        list.add(PacketRegisterInfo(TeamRequestNotificationPacket.ID, TeamRequestNotificationPacket::decode, TeamRequestNotificationHandler))
        list.add(PacketRegisterInfo(TeamRequestExpiredPacket.ID, TeamRequestExpiredPacket::decode, TeamRequestExpiredHandler))
-        list.add(PacketRegisterInfo(TeamMemberAddNotificationPacket.ID, TeamMemberAddNotificationPacket::decode, TeamMemberAddNotificationHandler))
        list.add(PacketRegisterInfo(TeamMemberRemoveNotificationPacket.ID, TeamMemberRemoveNotificationPacket::decode, TeamMemberRemoveNotificationHandler))
        list.add(PacketRegisterInfo(TeamJoinNotificationPacket.ID, TeamJoinNotificationPacket::decode, TeamJoinNotificationHandler))

        // Settings packets
        list.add(PacketRegisterInfo(ServerSettingsPacket.ID, ServerSettingsPacket::decode, ServerSettingsPacketHandler))
-        list.add(PacketRegisterInfo(OpenCobblemonConfigScreenPacket.ID, OpenCobblemonConfigScreenPacket::decode, OpenCobblemonConfigEditorHandler))

        // Data registries
        list.add(PacketRegisterInfo(AbilityRegistrySyncPacket.ID, AbilityRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
@@ -310,6 +355,7 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(DexEntrySyncPacket.ID, DexEntrySyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(FishingBaitRegistrySyncPacket.ID, FishingBaitRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(FlowRegistrySyncPacket.ID, FlowRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
+        list.add(PacketRegisterInfo(BrainPresetSyncPacket.ID, BrainPresetSyncPacket::decode, DataRegistrySyncPacketHandler()))

        // Effects
        list.add(PacketRegisterInfo(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler))
@@ -360,6 +406,9 @@ 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))
        return list
@@ -393,10 +442,6 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(ReleasePCPokemonPacket.ID, ReleasePCPokemonPacket::decode, ReleasePCPokemonHandler))
        list.add(PacketRegisterInfo(UnlinkPlayerFromPCPacket.ID, UnlinkPlayerFromPCPacket::decode, UnlinkPlayerFromPCHandler))

-        list.add(PacketRegisterInfo(RequestRenamePCBoxPacket.Companion.ID, RequestRenamePCBoxPacket.Companion::decode, RequestRenamePCBoxHandler))
-        list.add(PacketRegisterInfo(PCBoxWallpapersPacket.ID, PCBoxWallpapersPacket::decode, PCBoxWallpapersHandler))
-        list.add(PacketRegisterInfo(RequestChangePCBoxWallpaperPacket.ID, RequestChangePCBoxWallpaperPacket::decode, RequestChangePCBoxWallpaperHandler))
-
        // Starter packets
        list.add(PacketRegisterInfo(SelectStarterPacket.ID, SelectStarterPacket::decode, SelectStarterPacketHandler))
        list.add(PacketRegisterInfo(RequestStarterScreenPacket.ID, RequestStarterScreenPacket::decode, RequestStarterScreenHandler))
@@ -409,8 +454,6 @@ object CobblemonNetwork {

        list.add(PacketRegisterInfo(SwapPCPartyPokemonPacket.ID, SwapPCPartyPokemonPacket::decode, SwapPCPartyPokemonHandler))

-        list.add(PacketRegisterInfo(SortPCBoxPacket.ID, SortPCBoxPacket::decode, SortPCBoxHandler))
-
        // Battle packets
        list.add(PacketRegisterInfo(BattleSelectActionsPacket.ID, BattleSelectActionsPacket::decode, BattleSelectActionsHandler))
        list.add(PacketRegisterInfo(SpectateBattlePacket.ID, SpectateBattlePacket::decode, SpectateBattleHandler))
@@ -455,6 +498,9 @@ object CobblemonNetwork {
        // NPC packets
        list.add(PacketRegisterInfo(SaveNPCPacket.ID, SaveNPCPacket::decode, SaveNPCHandler))

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

@@ -8,6 +8,12 @@

 package com.cobblemon.mod.common

+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.DefendOwnerSensor
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.DrowsySensor
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.ItemEntitySensor
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.PokemonAdultSensor
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.PokemonGrowableCropSensor
+import com.cobblemon.mod.common.pokemon.ai.PokemonDisturbancesSensor
 import com.cobblemon.mod.common.entity.sensor.BattlingPokemonSensor
 import com.cobblemon.mod.common.entity.sensor.NPCBattlingSensor
 import java.util.function.Supplier
@@ -20,10 +26,22 @@ object CobblemonSensors {

    val NPC_BATTLING = register("npc_battling", ::NPCBattlingSensor)
    val BATTLING_POKEMON = register("battling_pokemon", ::BattlingPokemonSensor)
+//    val NPC_BATTLING = register("npc_battling", ::NPCBattlingSensor)
+    val POKEMON_DROWSY = register("pokemon_drowsy", ::DrowsySensor)
+
+    val POKEMON_ADULT = register("pokemon_adult_sensor", ::PokemonAdultSensor)
+
+    val POKEMON_DISTURBANCE = register("pokemon_disturbance_sensor", ::PokemonDisturbancesSensor)
+
+    val POKEMON_DEFEND_OWNER = register("pokemon_owner_under_attack", ::DefendOwnerSensor)
+
+    val NEARBY_GROWABLE_CROPS = register("nearby_growable_crops", ::PokemonGrowableCropSensor)
+
+    val ITEM_SENSOR = register("item_sensor", ::ItemEntitySensor)

    fun <E : Entity, U : Sensor<E>> register(id: String, supplier: Supplier<U>): SensorType<U> {
        val sensor = SensorType(supplier)
        sensors[id] = sensor
        return sensor
    }
-}
+}
@@ -9,11 +9,14 @@
 package com.cobblemon.mod.common.api.ai

 import com.cobblemon.mod.common.api.ai.config.BrainConfig
+import com.cobblemon.mod.common.entity.MoLangScriptingEntity
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity
 import net.minecraft.world.entity.schedule.Schedule

 class BrainConfigurationContext {
+    var appliedBrainPresets: MutableSet<ResourceLocation> = mutableSetOf()

    var defaultActivity = Activity.IDLE
    var coreActivities = setOf(Activity.CORE)
@@ -27,6 +30,11 @@ class BrainConfigurationContext {
    fun apply(entity: LivingEntity, brainConfigs: List<BrainConfig>) {
        val brain = entity.brain

+        if (entity is MoLangScriptingEntity) {
+            entity.registerVariables(brainConfigs.flatMap { it.getVariables(entity) })
+            entity.initializeScripting()
+        }
+
        // Setup the brain config
        brainConfigs.forEach { it.configure(entity, this) }

@@ -0,0 +1,25 @@
+/*
+ * 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.cobblemon.mod.common.api.ai.config.BrainConfig
+import com.cobblemon.mod.common.util.asTranslated
+import com.cobblemon.mod.common.util.entityTypeRegistry
+import net.minecraft.network.chat.Component
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.entity.LivingEntity
+
+class BrainPreset(
+    val name: Component = "dummy".asTranslated(),
+    val description: Component = "".asTranslated(),
+    val entityType: ResourceLocation? = null,
+    val configurations: List<BrainConfig> = mutableListOf()
+) {
+    fun canBeApplied(entity: LivingEntity) = entityType?.let { entity.type == entity.level().entityTypeRegistry.get(it) } != false
+}
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai
+
+import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.mojang.datafixers.util.Either
+import kotlin.jvm.optionals.getOrNull
+
+typealias ExpressionOrEntityVariable = Either<Expression, MoLangConfigVariable>
+
+fun List<ExpressionOrEntityVariable>.asVariables() = mapNotNull { it.right().getOrNull() }
+
+
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai
+
+/**
+ * The medium that an entity might be in which motivates what type of wandering it should do.
+ *
+ * If you've discovered this in main and it's not being used outside of that unused extension function, delete me
+ *
+ * @author Hiroku
+ * @since January 25th, 2025
+ */
+enum class PathfindingMedium {
+    LAND,
+    WATER,
+    LAVA,
+    AIR
+}
@@ -43,8 +43,7 @@ interface SleepDepth {
            "comatose" to comatose,
            "normal" to normal
        )
-
-        val adapter = StringIdentifiedObjectAdapter({ depths[it] ?: throw IllegalArgumentException("Unknown sleep depth: $it") })
+        val adapter = StringIdentifiedObjectAdapter { depths[it] ?: throw IllegalArgumentException("Unknown sleep depth: $it") }
    }

    fun canSleep(pokemonEntity: PokemonEntity): Boolean
@@ -8,27 +8,23 @@

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

-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.ai.config.task.TaskConfig
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
+import com.cobblemon.mod.common.util.asExpression
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity

 class AddTasksToActivity : BrainConfig {
    val activity = Activity.IDLE
-    val condition = "true".asExpressionLike()
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
    val tasksByPriority = mutableMapOf<Int, List<TaskConfig>>()
+    override fun getVariables(entity: LivingEntity) = tasksByPriority.values.flatten().flatMap { it.getVariables(entity) } + listOf(condition).asVariables()

    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
-        val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return
+        if (!checkCondition(entity, condition)) return

        val activity = brainConfigurationContext.getOrCreateActivity(activity)
        tasksByPriority.forEach { (priority, taskConfigs) ->
@@ -9,8 +9,13 @@
 package com.cobblemon.mod.common.api.ai.config

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.MoLangScriptingEntity
 import net.minecraft.world.entity.LivingEntity

-object DummyBrainConfig : BrainConfig {
+class AddVariablesConfig : BrainConfig {
+    override fun getVariables(entity: LivingEntity) = mutableListOf<MoLangConfigVariable>()
+
+    // Configuration happens naturally through the override on variables
    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {}
 }
@@ -8,28 +8,42 @@

 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 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.mojang.datafixers.util.Either
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity

 class ApplyPresets : BrainConfig {
-    val condition = "true".asExpressionLike()
+    var condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
    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
+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
+        return if (checkCondition(entity, condition)) {
+            presets.flatMap {
+                CobblemonBrainConfigs.presets[it]?.configurations?.flatMap { it.getVariables(entity) } ?: emptyList()
+            } + listOf(condition).asVariables()
+        } else {
+            listOf(condition).asVariables()
+        }
+    }

-        val presetConfigs = presets.flatMap { CobblemonBrainConfigs.presets[it] ?: return Cobblemon.LOGGER.warn("Preset $it not found") }
-        presetConfigs.forEach { it.configure(entity, brainConfigurationContext) }
+    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
+        if (!checkCondition(entity, condition)) return
+
+        val presetConfigs = presets.flatMap { CobblemonBrainConfigs.presets[it]?.takeIf { it.canBeApplied(entity) }?.configurations ?: return Cobblemon.LOGGER.warn("Preset $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 originalContextPresets = brainConfigurationContext.appliedBrainPresets.toMutableSet()
+        presetConfigs.forEach {
+            it.configure(entity, brainConfigurationContext)
+        }
+        originalContextPresets.addAll(presets)
+        brainConfigurationContext.appliedBrainPresets = originalContextPresets
    }
 }
@@ -8,7 +8,15 @@

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

+import com.bedrockk.molang.runtime.MoLangRuntime
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+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

 /**
@@ -30,12 +38,21 @@ interface BrainConfig {
            "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
+            "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 encode(buffer: RegistryFriendlyByteBuf)
 //    fun decode(buffer: RegistryFriendlyByteBuf)
+    fun getVariables(entity: LivingEntity): List<MoLangConfigVariable>
    fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext)
 }
@@ -117,3 +117,49 @@ Example brain preset (`uses_healing_machine.json`):
  }
 ]
 ```
+
+### 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"
+  }
+}
+```
@@ -15,8 +15,10 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.ai.ActivityConfigurationContext
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import com.cobblemon.mod.common.api.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
@@ -33,10 +35,11 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
 class ScriptBrainConfig : BrainConfig {
    val condition = "true".asExpressionLike()
    val script = cobblemonResource("dummy")
+    override fun getVariables(entity: LivingEntity) = mutableListOf<MoLangConfigVariable>()

    override fun configure(entity: LivingEntity, context: BrainConfigurationContext) {
        val runtime = MoLangRuntime().setup()
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!runtime.resolveBoolean(condition)) return

        val struct = createBrainStruct(entity, context)
@@ -50,7 +53,7 @@ class ScriptBrainConfig : BrainConfig {

    fun createBrainStruct(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): QueryStruct {
        return QueryStruct(hashMapOf()).addStandardFunctions()
-            .addFunction("entity") { (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()) }
+            .addFunction("entity") { entity.asMostSpecificMoLangValue() }
            .addFunction("create_activity") { params ->
                val name = params.getString(0).asIdentifierDefaultingNamespace()
                val activity = entity.level().activityRegistry.get(name) ?: return@addFunction run {
@@ -9,11 +9,13 @@
 package com.cobblemon.mod.common.api.ai.config

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity

 class SetCoreActivities : BrainConfig {
    val activities = mutableListOf<Activity>()
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
        brainConfigurationContext.coreActivities = activities.toSet()
    }
@@ -9,11 +9,13 @@
 package com.cobblemon.mod.common.api.ai.config

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.schedule.Activity

 class SetDefaultActivity : BrainConfig {
    val activity: Activity = Activity.IDLE
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
        brainConfigurationContext.defaultActivity = activity
    }
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config
+
+import com.bedrockk.molang.runtime.MoLangRuntime
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+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 : BrainConfig {
+    var variableValues = mutableMapOf<String, ExpressionLike>()
+
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+
+    override fun configure(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext) {
+        val runtime = MoLangRuntime().setup()
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (entity is MoLangScriptingEntity) {
+            variableValues.forEach { (variableName, valueExpression) ->
+                entity.config.setDirectly(variableName, runtime.resolve(valueExpression))
+            }
+        }
+    }
+}
@@ -0,0 +1,74 @@
+/*
+ * 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.BrainConfigurationContext
+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,
+        brainConfigurationContext: BrainConfigurationContext
+    ): 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
+                }
+            }
+        }
+    }
+}
@@ -8,25 +8,36 @@

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

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.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 = "true".asExpressionLike()
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
    val tasks: List<TaskConfig> = emptyList()

+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
+        return if (checkCondition(entity, condition))
+            tasks.flatMap { it.getVariables(entity) } + listOf(condition).asVariables()
+        else
+            listOf(condition).asVariables()
+    }
+
    override fun createTasks(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): List<BehaviorControl<in LivingEntity>> {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return emptyList()
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return emptyList()
        return tasks.flatMap { it.createTasks(entity, brainConfigurationContext) }
    }
 }
@@ -8,9 +8,10 @@

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

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.ai.AttackAngryAtTask
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.resolveBoolean
@@ -19,13 +20,15 @@ import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class AttackAngryAtTaskConfig : SingleTaskConfig {
-    val condition = "true".asExpressionLike()
+    val condition = booleanVariable(SharedEntityVariables.ATTACKING_CATEGORY, "should_attack_angry_at", true).asExpressible()
+    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
+
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
        return AttackAngryAtTask.create()
    }
 }
@@ -8,24 +8,28 @@

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

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.VillagerCalmDown

 class CalmDownTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
+    var condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
        return VillagerCalmDown.create()
    }
 }
@@ -8,30 +8,34 @@

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

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.resolveInt
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.DoNothing

 class DoNothingTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val minDurationTicks = "40".asExpression()
-    val maxDurationTicks = "80".asExpression()
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    val minDurationTicks: ExpressionOrEntityVariable = Either.left("40".asExpression())
+    val maxDurationTicks: ExpressionOrEntityVariable = Either.left("80".asExpression())
+    override fun getVariables(entity: LivingEntity) = listOf(condition, minDurationTicks, maxDurationTicks).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return DoNothing(runtime.resolveInt(minDurationTicks), runtime.resolveInt(maxDurationTicks))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return DoNothing(minDurationTicks.resolveInt(), maxDurationTicks.resolveInt())
    }
 }
@@ -8,14 +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.BrainConfigurationContext
+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.battles.BattleRegistry
-import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.entity.npc.NPCEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
@@ -24,15 +24,21 @@ import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    var includePassiveDamage = true
+    var condition = booleanVariable(SharedEntityVariables.BATTLING_CATEGORY, "exit_battle_when_hurt", true).asExpressible()
+    var includePassiveDamage = booleanVariable(SharedEntityVariables.BATTLING_CATEGORY, "exit_battle_from_passive_damage", true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        includePassiveDamage
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        val includePassiveDamage = includePassiveDamage.resolveBoolean()
+        if (!condition.resolveBoolean()) return null

        if (entity is NPCEntity) {
            fun cancelNPCBattles(npcEntity: NPCEntity): Boolean {
@@ -52,7 +58,7 @@ class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {
                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelNPCBattles(entity as NPCEntity) } }
                }
            }
-        } else { return null }/* else if (entity is PokemonEntity) { TODO uncomment when pokemon have brain :)
+        } else if (entity is PokemonEntity) {
            fun cancelPokemonBattle(pokemonEntity: PokemonEntity): Boolean {
                val battle = BattleRegistry.getBattle(pokemonEntity.battleId ?: return false)
                battle?.end()
@@ -61,15 +67,17 @@ class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {

            return if (includePassiveDamage) {
                BehaviorBuilder.create {
-                    it.group(it.present(MemoryModuleType.HURT_BY), it.present(CobblemonMemories.POKEMON_BATTLING))
+                    it.group(it.present(MemoryModuleType.HURT_BY), it.present(CobblemonMemories.POKEMON_BATTLE))
                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelPokemonBattle(entity as PokemonEntity) } }
                }
            } else {
                BehaviorBuilder.create {
-                    it.group(it.present(MemoryModuleType.HURT_BY_ENTITY), it.present(CobblemonMemories.POKEMON_BATTLING))
+                    it.group(it.present(MemoryModuleType.HURT_BY_ENTITY), it.present(CobblemonMemories.POKEMON_BATTLE))
                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelPokemonBattle(entity as PokemonEntity) } }
                }
            }
-        }*/
+        } else {
+            return null
+        }
    }
 }
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+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,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(
+            FindRestingPlaceTask.create(horizontalSearchDistance.resolveInt(), verticalSearchDistance.resolveInt()),
+            PokemonEntity::class.java
+        )
+    }
+}
@@ -8,14 +8,12 @@

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

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.resolveInt
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.FLEE_DESIRED_DISTANCE
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.FLEE_SPEED_MULTIPLIER
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
@@ -24,18 +22,24 @@ import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
 import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class FleeAttackerTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    var speedMultiplier = "0.5".asExpression()
-    var desiredDistance = "9".asExpression()
+    var condition = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "flee_attacker", true).asExpressible()
+    var speedMultiplier = numberVariable(SharedEntityVariables.FEAR_CATEGORY, FLEE_SPEED_MULTIPLIER, 0.5).asExpressible()
+    var desiredDistance = numberVariable(SharedEntityVariables.FEAR_CATEGORY, FLEE_DESIRED_DISTANCE, 9).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        speedMultiplier,
+        desiredDistance
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition) || entity !is PathfinderMob) return null
-        val speedMultiplier = runtime.resolveFloat(speedMultiplier)
-        val desiredDistance = runtime.resolveInt(desiredDistance)
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PathfinderMob) return null
+        val speedMultiplier = speedMultiplier.resolveFloat()
+        val desiredDistance = desiredDistance.resolveInt()
        return WrapperLivingEntityTask(
            SetWalkTargetAwayFrom.entity(MemoryModuleType.HURT_BY_ENTITY, speedMultiplier, desiredDistance, false),
            PathfinderMob::class.java
@@ -8,14 +8,13 @@

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

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.resolveInt
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.FLEE_DESIRED_DISTANCE
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.FLEE_SPEED_MULTIPLIER
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
@@ -24,18 +23,20 @@ import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
 import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class FleeNearestHostileTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    var speedMultiplier = "0.5".asExpression()
-    var desiredDistance = "9".asExpression()
+    var condition = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "flee_nearest_hostile", true).asExpressible()
+    var speedMultiplier = numberVariable(SharedEntityVariables.FEAR_CATEGORY, FLEE_SPEED_MULTIPLIER, 0.5).asExpressible()
+    var desiredDistance = numberVariable(SharedEntityVariables.FEAR_CATEGORY, FLEE_DESIRED_DISTANCE, 9).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition, speedMultiplier, desiredDistance).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition) || entity !is PathfinderMob) return null
-        val speedMultiplier = runtime.resolveFloat(speedMultiplier)
-        val desiredDistance = runtime.resolveInt(desiredDistance)
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PathfinderMob) return null
+        val speedMultiplier = speedMultiplier.resolveFloat()
+        val desiredDistance = desiredDistance.resolveInt()
        return WrapperLivingEntityTask(
            SetWalkTargetAwayFrom.entity(MemoryModuleType.NEAREST_HOSTILE, speedMultiplier, desiredDistance, false),
            PathfinderMob::class.java
@@ -8,32 +8,31 @@

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

-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.ai.FollowWalkTargetTask
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveInt
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class FollowWalkTargetTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val minRunTicks: Expression = "150".asExpression()
-    val maxRunTicks: Expression = "250".asExpression()
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    val minRunTicks: ExpressionOrEntityVariable = Either.left("150".asExpression())
+    val maxRunTicks: ExpressionOrEntityVariable = Either.left("250".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(minRunTicks, maxRunTicks).asVariables()

    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        return WrapperLivingEntityTask(
-            FollowWalkTargetTask(runtime.resolveInt(minRunTicks), runtime.resolveInt(maxRunTicks)),
+            FollowWalkTargetTask(minRunTicks.resolveInt(), maxRunTicks.resolveInt()),
            PathfinderMob::class.java
        )
    }
@@ -8,26 +8,30 @@

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

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.ATTACKING_CATEGORY
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.entity.ai.GetAngryAtAttackerTask
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class GetAngryAtAttackerTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
+    companion object {
+        const val GET_ANGRY_AT_ATTACKER = "get_angry_at_attacker"
+    }
+
+    val condition = booleanVariable(ATTACKING_CATEGORY, GET_ANGRY_AT_ATTACKER, true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
        return GetAngryAtAttackerTask.create()
    }
 }
@@ -8,38 +8,43 @@

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

-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.entity.npc.ai.GoToHealingMachineTask
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

-class GoToHealingMachineTaskConfig(
-    val condition: ExpressionLike = "true".asExpressionLike(),
-    val horizontalSearchRange: Expression = "10".asExpression(),
-    val verticalSearchRange: Expression = "5".asExpression(),
-    val speedMultiplier: Expression = "0.35".asExpression(),
-    val completionRange: Expression = "1".asExpression()
-) : SingleTaskConfig {
+class GoToHealingMachineTaskConfig : SingleTaskConfig {
+    val condition = booleanVariable(SELF_HEALING, USE_HEALING_MACHINES, true).asExpressible()
+    val horizontalSearchRange: ExpressionOrEntityVariable = Either.left("10".asExpression())
+    val verticalSearchRange: ExpressionOrEntityVariable = Either.left("5".asExpression())
+    val completionRange: ExpressionOrEntityVariable = Either.left("1".asExpression())
+    val walkSpeed = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition, walkSpeed, horizontalSearchRange, verticalSearchRange, completionRange).asVariables()
+
+    companion object {
+        const val SELF_HEALING = "self_healing"
+        const val USE_HEALING_MACHINES = "use_healing_machines"
+    }
+
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null

        return GoToHealingMachineTask.create(
-            horizontalSearchRange = horizontalSearchRange,
-            verticalSearchRange = verticalSearchRange,
-            speedMultiplier = speedMultiplier,
-            completionRange = completionRange
+            horizontalSearchRange = horizontalSearchRange.asExpression(),
+            verticalSearchRange = verticalSearchRange.asExpression(),
+            speedMultiplier = walkSpeed.asExpression(),
+            completionRange = completionRange.asExpression()
        )
    }

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+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,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(GoToSleepTask.create(), PokemonEntity::class.java)
+    }
+}
@@ -8,29 +8,33 @@

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

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.GoToHealingMachineTaskConfig.Companion.SELF_HEALING
+import com.cobblemon.mod.common.api.ai.config.task.GoToHealingMachineTaskConfig.Companion.USE_HEALING_MACHINES
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.npc.ai.HealUsingHealingMachineTask
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class HealUsingHealingMachineTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val horizontalUseRange = "3".asExpression()
-    val verticalUseRange = "2".asExpression()
+    val condition = booleanVariable(SELF_HEALING, USE_HEALING_MACHINES, true).asExpressible()
+    val horizontalUseRange: ExpressionOrEntityVariable = Either.left("2".asExpression())
+    val verticalUseRange: ExpressionOrEntityVariable = Either.left("1".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition, horizontalUseRange, verticalUseRange).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return HealUsingHealingMachineTask(horizontalUseRange, verticalUseRange)
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return HealUsingHealingMachineTask(horizontalUseRange.asExpression(), verticalUseRange.asExpression())
    }
 }
@@ -8,29 +8,41 @@

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

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.entity.npc.ai.LookAtBattlingPokemonTask
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveInt
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class LookAtBattlingPokemonTaskConfig : SingleTaskConfig {
-    val minDurationTicks = "40".asExpression()
-    val maxDurationTicks = "80".asExpression()
+    companion object {
+        const val LOOK_AT_BATTLING_POKEMON = "look_at_battling_pokemon"
+    }
+
+    val condition = booleanVariable(SharedEntityVariables.BATTLING_CATEGORY, LOOK_AT_BATTLING_POKEMON, true).asExpressible()
+    val minDurationTicks: ExpressionOrEntityVariable = Either.left("40".asExpression())
+    val maxDurationTicks: ExpressionOrEntityVariable = Either.left("80".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        minDurationTicks,
+        maxDurationTicks
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!resolveBooleanVariable(LOOK_AT_BATTLING_POKEMON)) return null
        return LookAtBattlingPokemonTask.create(
-            minDurationTicks = runtime.resolveInt(minDurationTicks),
-            maxDurationTicks = runtime.resolveInt(maxDurationTicks)
+            minDurationTicks = minDurationTicks.resolveInt(),
+            maxDurationTicks = maxDurationTicks.resolveInt()
        )
    }
-
 }
@@ -8,29 +8,35 @@

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

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.SEE_DISTANCE
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.SetEntityLookTarget

 class LookAtEntitiesTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val maxDistance = "15".asExpression()
+    companion object {
+        const val LOOK_AT_ENTITIES = "look_at_entities"
+    }
+
+    val condition = booleanVariable(SharedEntityVariables.LOOKING_CATEGORY, LOOK_AT_ENTITIES, true).asExpressible()
+    val maxDistance = numberVariable(SharedEntityVariables.LOOKING_CATEGORY, SEE_DISTANCE, 15).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        maxDistance
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return SetEntityLookTarget.create(runtime.resolveFloat(maxDistance))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return SetEntityLookTarget.create(maxDistance.resolveFloat())
    }
 }
@@ -9,10 +9,12 @@
 package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.npc.ai.LookAtSpeakerTask
 import net.minecraft.world.entity.LivingEntity

 class LookAtSpeakerTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -8,33 +8,37 @@

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

-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveInt
 import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.Mob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.LookAtTargetSink

 class LookAtTargetTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val minDurationTicks: Expression = "40".asExpression()
-    val maxDurationTicks: Expression = "80".asExpression()
+    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
+    val minDurationTicks: ExpressionOrEntityVariable = Either.left("80".asExpression())
+    val maxDurationTicks: ExpressionOrEntityVariable = Either.left("160".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        minDurationTicks,
+        maxDurationTicks
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        return WrapperLivingEntityTask(LookAtTargetSink(runtime.resolveInt(minDurationTicks), runtime.resolveInt(maxDurationTicks)), Mob::class.java)
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return WrapperLivingEntityTask(LookAtTargetSink(minDurationTicks.resolveInt(), maxDurationTicks.resolveInt()), Mob::class.java)
    }
 }
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+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,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity> {
+        return WrapperLivingEntityTask(LookAtTargetedBattlePokemonTask.create(), PokemonEntity::class.java)
+    }
+}
@@ -8,18 +8,29 @@

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

-import com.bedrockk.molang.Expression
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.ai.config.task.SharedEntityVariables.LOOKING_CATEGORY
 import com.cobblemon.mod.common.entity.ai.LookInDirectionTask
-import com.cobblemon.mod.common.util.asExpression
 import net.minecraft.world.entity.LivingEntity

 class LookInDirectionTaskConfig : SingleTaskConfig {
-    var yaw: Expression = "0".asExpression()
-    var pitch: Expression = "0".asExpression()
+    var condition = booleanVariable(LOOKING_CATEGORY, "locked_rotation", true).asExpressible()
+    var yaw = numberVariable(LOOKING_CATEGORY, "locked_yaw", 0F).asExpressible()
+    var pitch = numberVariable(LOOKING_CATEGORY, "locked_pitch", 0F).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        yaw,
+        pitch
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
-    ) = LookInDirectionTask(yaw, pitch)
+    ) = LookInDirectionTask(
+        shouldLock = condition.asExpression(),
+        yaw = yaw.asExpression(),
+        pitch = pitch.asExpression()
+    )
 }
@@ -8,32 +8,36 @@

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

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.npc.ai.MeleeAttackTask
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class MeleeAttackTaskConfig : SingleTaskConfig {
-    val condition = "true".asExpressionLike()
-    val range = "1.5".asExpression()
-    val cooldownTicks = "30".asExpression()
+    val condition = booleanVariable(SharedEntityVariables.ATTACKING_CATEGORY, "attacks_melee", true).asExpressible()
+    val range = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "melee_range", 1.5F).asExpressible()
+    val cooldownTicks = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "melee_cooldown", 30).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        range,
+        cooldownTicks
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null

        return MeleeAttackTask.create(
-            range = range,
-            cooldownTicks = cooldownTicks
+            range = range.asExpression(),
+            cooldownTicks = cooldownTicks.asExpression()
        )
    }
 }
@@ -9,19 +9,28 @@
 package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.ai.MoveToAttackTargetTask
 import com.cobblemon.mod.common.util.asExpression
+import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity

 class MoveToAttackTargetTaskConfig : SingleTaskConfig {
-    val speedMultiplier = "0.5".asExpression()
-    val closeEnoughDistance = "1".asExpression()
+    val speedMultiplier = numberVariable(SharedEntityVariables.ATTACKING_CATEGORY, "attacking_movement_speed", 0.5).asExpressible()
+    val closeEnoughDistance: ExpressionOrEntityVariable = Either.left("1".asExpression())
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        speedMultiplier,
+        closeEnoughDistance
+    ).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ) = MoveToAttackTargetTask.create(
-        speedMultiplier = speedMultiplier,
-        closeEnoughDistance = closeEnoughDistance
+        speedMultiplier = speedMultiplier.asExpression(),
+        closeEnoughDistance = closeEnoughDistance.asExpression()
    )
 }
@@ -0,0 +1,29 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+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.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.ai.FollowWalkTargetTask
+import com.cobblemon.mod.common.entity.ai.MoveToAttackTargetTask
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.MoveToItemAndEatTask
+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
+
+class MoveToItemAndEatTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+
+    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<LivingEntity>? {
+        return WrapperLivingEntityTask(
+            MoveToItemAndEatTask(),
+            PokemonEntity::class.java
+        )
+    }
+}
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+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,
+        brainConfigurationContext: BrainConfigurationContext
+    ): 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
+        )
+    }
+}
@@ -11,6 +11,8 @@ package com.cobblemon.mod.common.api.ai.config.task
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.resolveBoolean
@@ -34,14 +36,16 @@ import net.minecraft.world.entity.ai.behavior.RunOne
 class OneOfTaskConfig : SingleTaskConfig {
    class OneOfTaskOption {
        val weight: Int = 1
-        val task: TaskConfig = SingleTaskConfig { _, _ -> DoNothing(0, 1) }
+        val task: TaskConfig = SingleTaskConfig.nothing()
    }

    val condition: ExpressionLike = "true".asExpressionLike()
    val options = mutableListOf<OneOfTaskOption>()

+    override fun getVariables(entity: LivingEntity) = options.flatMap { it.task.getVariables(entity) }
+
    override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!runtime.resolveBoolean(condition)) return null
        return RunOne(options.map { it.task.createTasks(entity, brainConfigurationContext).first() toDF it.weight })
    }
@@ -11,6 +11,8 @@ package com.cobblemon.mod.common.api.ai.config.task
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.resolveBoolean
@@ -34,17 +36,19 @@ import net.minecraft.world.entity.ai.behavior.DoNothing
 class RandomTaskConfig : TaskConfig {
    class RandomTaskChoice {
        val weight = 1.0
-        val task: TaskConfig = SingleTaskConfig { _, _ -> DoNothing(0, 1) }
+        val task: TaskConfig = SingleTaskConfig.nothing()
    }

    val condition: ExpressionLike = "true".asExpressionLike()
    val choices = mutableListOf<RandomTaskChoice>()

+    override fun getVariables(entity: LivingEntity) = choices.flatMap { it.task.getVariables(entity) }
+
    override fun createTasks(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): List<BehaviorControl<in LivingEntity>> {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!runtime.resolveBoolean(condition)) return emptyList()
        val task = choices.weightedSelection { it.weight }?.task ?: throw IllegalStateException("No tasks to choose from in random_task config")
        return task.createTasks(entity, brainConfigurationContext)
@@ -10,10 +10,10 @@ package com.cobblemon.mod.common.api.ai.config.task

 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.scripting.CobblemonScripts
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
@@ -31,7 +31,13 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType
 * @since December 2nd, 2024
 */
 class RunScript : SingleTaskConfig {
-    val script = cobblemonResource("dummy")
+    companion object {
+        const val SCRIPT_CATEGORY = "script"
+    }
+
+    val script = stringVariable(SCRIPT_CATEGORY, "script", "cobblemon:dummy_script").asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(script).asVariables()

    override fun createTask(
        entity: LivingEntity,
@@ -41,8 +47,8 @@ class RunScript : SingleTaskConfig {
            it.registered(MemoryModuleType.LOOK_TARGET) // I think I need to have at least something here?
        ).apply(it) { _ ->
            Trigger { world, entity, _ ->
-                runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: entity.asMostSpecificMoLangValue())
-                return@Trigger CobblemonScripts.run(script, runtime) == DoubleValue.ONE
+                runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+                return@Trigger CobblemonScripts.run(script.resolveString().asIdentifierDefaultingNamespace(), runtime) == DoubleValue.ONE
            }
        }
    }
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+object SharedEntityVariables {
+    const val MOVEMENT_CATEGORY = "movement"
+    const val FEAR_CATEGORY = "fear"
+    const val ATTACKING_CATEGORY = "attacking"
+    const val BATTLING_CATEGORY = "battling"
+    const val LOOKING_CATEGORY = "looking"
+
+    const val WALK_SPEED = "walk_speed"
+    const val FLEE_SPEED_MULTIPLIER = "flee_speed_multiplier"
+    const val FLEE_DESIRED_DISTANCE = "flee_desired_distance"
+    const val SEE_DISTANCE = "see_distance"
+}
@@ -9,10 +9,24 @@
 package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.DoNothing
+
+interface SingleTaskConfig : TaskConfig {
+    companion object {
+        fun nothing() = object : SingleTaskConfig {
+            override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+            override fun createTask(
+                entity: LivingEntity,
+                brainConfigurationContext: BrainConfigurationContext
+            ): BehaviorControl<in LivingEntity>? {
+                return DoNothing(0, 1)
+            }
+        }
+    }

-fun interface SingleTaskConfig : TaskConfig {
    override fun createTasks(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -8,31 +8,31 @@

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

-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.ai.StayAfloatTask
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class StayAfloatTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val chance: Expression = "0.01".asExpression()
+    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, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
-        val chance = runtime.resolveFloat(chance)
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
        return WrapperLivingEntityTask(
-            StayAfloatTask(chance),
+            StayAfloatTask(chance.resolveFloat()),
            PathfinderMob::class.java
        )
    }
@@ -8,26 +8,26 @@

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

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.api.ai.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.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.StopBeingAngryIfTargetDead

 class StopBeingAngryIfAttackerDeadTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
+    val condition = booleanVariable(SharedEntityVariables.ATTACKING_CATEGORY, "stop_being_angry_if_attacker_dead", true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()

    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
    ): BehaviorControl<in LivingEntity>? {
-        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-        if (!runtime.resolveBoolean(condition)) return null
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
        return StopBeingAngryIfTargetDead.create()
    }
 }
@@ -10,11 +10,13 @@ package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger

 class SwitchFromActionEffectTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -10,11 +10,13 @@ package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger

 class SwitchFromChattingTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -9,12 +9,14 @@
 package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class SwitchFromFightTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -10,12 +10,14 @@ package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.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 SwitchFromNPCBattleTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+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,
+        brainConfigurationContext: BrainConfigurationContext
+    ): 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
+                }
+            }
+        }
+    }
+}
@@ -11,12 +11,14 @@ package com.cobblemon.mod.common.api.ai.config.task
 import com.cobblemon.mod.common.CobblemonActivities
 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+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 SwitchToActionEffectTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -11,12 +11,14 @@ package com.cobblemon.mod.common.api.ai.config.task
 import com.cobblemon.mod.common.CobblemonActivities
 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType

 class SwitchToChattingTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -8,11 +8,9 @@

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

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.Difficulty
 import net.minecraft.world.entity.LivingEntity
@@ -22,9 +20,10 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.entity.schedule.Activity

 class SwitchToFightTaskConfig : SingleTaskConfig {
-    val condition = "true".asExpressionLike()
    val activity = Activity.FIGHT

+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -33,8 +32,7 @@ class SwitchToFightTaskConfig : SingleTaskConfig {
            it.present(MemoryModuleType.ATTACK_TARGET)
        ).apply(it) { _ ->
            Trigger { world, entity, _ ->
-                runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-                if (!runtime.resolveBoolean(condition)) return@Trigger false
+                runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
                if (entity.commandSenderWorld.getCurrentDifficultyAt(entity.blockPosition()).difficulty == Difficulty.PEACEFUL) return@Trigger false

                entity.brain.setActiveActivityIfPossible(activity)
@@ -9,11 +9,13 @@
 package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.entity.npc.ai.SwitchToBattleTask
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

 class SwitchToNPCBattleTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
@@ -9,27 +9,39 @@
 package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.Behavior
+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.schedule.Activity

 class SwitchToPanicWhenHostilesNearbyTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
+    var condition = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "panic_when_hostiles_nearby", true).asExpressible()
+    override fun getVariables(entity: LivingEntity) = listOf(condition).asVariables()
+
    override fun createTask(
        entity: LivingEntity,
        brainConfigurationContext: BrainConfigurationContext
-    ) = BehaviorBuilder.create {
-        it.group(it.present(MemoryModuleType.NEAREST_HOSTILE))
-            .apply(it) { nearestHostile ->
-                Trigger { world, entity, _ ->
-                    (entity as? PathfinderMob)?.navigation?.stop()
-                    entity.brain.setActiveActivityIfPossible(Activity.PANIC)
-                    return@Trigger true
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return BehaviorBuilder.create {
+            it.group(it.present(MemoryModuleType.NEAREST_HOSTILE))
+                .apply(it) { nearestHostile ->
+                    Trigger { world, entity, _ ->
+                        (entity as? PathfinderMob)?.navigation?.stop()
+                        entity.brain.setActiveActivityIfPossible(Activity.PANIC)
+                        return@Trigger true
+                    }
                }
-            }
+        }
    }
 }
@@ -8,11 +8,10 @@

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

-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
+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.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
@@ -23,16 +22,21 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.entity.schedule.Activity

 class SwitchToPanicWhenHurtTaskConfig : SingleTaskConfig {
-    var condition = "true".asExpression()
-    var includePassiveDamage = false
+    var condition = booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "panic_when_hurt", true).asExpressible()
+    var includePassiveDamage =  booleanVariable(SharedEntityVariables.FEAR_CATEGORY, "panic_on_passive_damage", false).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        includePassiveDamage
+    ).asVariables()

    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 if (includePassiveDamage) {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null
+        return if (includePassiveDamage.resolveBoolean()) {
            BehaviorBuilder.create {
                it.group(it.present(MemoryModuleType.HURT_BY))
                    .apply(it) { _ ->
@@ -0,0 +1,25 @@
+/*
+ * 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.BrainConfigurationContext
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.npc.ai.SwitchToBattleTask
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class SwitchToPokemonBattleTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity> {
+        return SwitchToBattleTask.createForPokemon()
+    }
+}
@@ -10,7 +10,18 @@ package com.cobblemon.mod.common.api.ai.config.task

 import com.bedrockk.molang.runtime.MoLangRuntime
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+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.lang
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.resolveDouble
+import com.cobblemon.mod.common.util.resolveFloat
+import com.cobblemon.mod.common.util.resolveInt
+import com.cobblemon.mod.common.util.resolveString
+import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl

@@ -23,11 +34,13 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
 * @author Hiroku
 * @since October 14th, 2024
 */
-fun interface TaskConfig {
+interface TaskConfig {
    companion object {
        val types = mutableMapOf<String, Class<out TaskConfig>>(
            "one_of" to OneOfTaskConfig::class.java,
            "wander" to WanderTaskConfig::class.java,
+            "water_wander" to WaterWanderTaskConfig::class.java,
+            "air_wander" to AirWanderTaskConfig::class.java,
            "look_at_target" to LookAtTargetTaskConfig::class.java,
            "follow_walk_target" to FollowWalkTargetTaskConfig::class.java,
            "random" to RandomTaskConfig::class.java,
@@ -39,6 +52,9 @@ fun interface TaskConfig {
            "switch_npc_to_battle" to SwitchToNPCBattleTaskConfig::class.java,
            "look_at_battling_pokemon" to LookAtBattlingPokemonTaskConfig::class.java,
            "switch_npc_from_battle" to SwitchFromNPCBattleTaskConfig::class.java,
+            "switch_pokemon_to_battle" to SwitchToPokemonBattleTaskConfig::class.java,
+            "look_at_targeted_battle_pokemon" to LookAtTargetedBattlePokemonTaskConfig::class.java,
+            "switch_pokemon_from_battle" to SwitchFromPokemonBattleTaskConfig::class.java,
            "go_to_healing_machine" to GoToHealingMachineTaskConfig::class.java,
            "heal_using_healing_machine" to HealUsingHealingMachineTaskConfig::class.java,
            "all_of" to AllOfTaskConfig::class.java,
@@ -60,6 +76,11 @@ fun interface TaskConfig {
            "flee_nearest_hostile" to FleeNearestHostileTaskConfig::class.java,
            "run_script" to RunScript::class.java,
            "look_in_direction" to LookInDirectionTaskConfig::class.java,
+            "wake_up" to WakeUpTaskConfig::class.java,
+            "go_to_sleep" to GoToSleepTaskConfig::class.java,
+            "find_resting_place" to FindRestingPlaceTaskConfig::class.java,
+            "move_to_owner" to MoveToOwnerTaskConfig::class.java,
+            "move_to_item_and_eat" to MoveToItemAndEatTaskConfig::class.java,
        )

        val runtime = MoLangRuntime().setup()
@@ -68,6 +89,38 @@ fun interface TaskConfig {
    val runtime: MoLangRuntime
        get() = Companion.runtime

+    fun checkCondition(entity: LivingEntity, expressionOrEntityVariable: ExpressionOrEntityVariable): Boolean {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        return expressionOrEntityVariable.resolveBoolean()
+    }
+
+    fun ExpressionOrEntityVariable.asExpression() = map({ it }, { "q.entity.config.${it.variableName}".asExpression() })
+    fun ExpressionOrEntityVariable.resolveString() = runtime.resolveString(asExpression())
+    fun ExpressionOrEntityVariable.resolveBoolean() = runtime.resolveBoolean(asExpression())
+    fun ExpressionOrEntityVariable.resolveInt() = runtime.resolveInt(asExpression())
+    fun ExpressionOrEntityVariable.resolveDouble() = runtime.resolveDouble(asExpression())
+    fun ExpressionOrEntityVariable.resolveFloat() = runtime.resolveFloat(asExpression())
+
+    private fun variable(category: String, name: String, type: MoLangConfigVariable.MoLangVariableType, default: String) = MoLangConfigVariable(
+        variableName = name,
+        category = lang("entity.variable.category.$category"),
+        displayName = lang("entity.variable.$name.name"),
+        description = lang("entity.variable.$name.desc"),
+        type = type,
+        defaultValue = default
+    )
+
+    fun stringVariable(category: String, name: String, default: String) = variable(category = category, name = name, type = MoLangConfigVariable.MoLangVariableType.TEXT, default = default)
+    fun numberVariable(category: String, name: String, default: Number) = variable(category = category, name = name, type = MoLangConfigVariable.MoLangVariableType.NUMBER, default = default.toString())
+    fun booleanVariable(category: String, name: String, default: Boolean) = variable(category = category, name = name, type = MoLangConfigVariable.MoLangVariableType.BOOLEAN, default = default.toString())
+
+    fun getVariableExpression(name: String) = "q.entity.config.$name".asExpression()
+    fun resolveStringVariable(name: String) = runtime.resolveString(getVariableExpression(name))
+    fun resolveBooleanVariable(name: String) = runtime.resolveBoolean(getVariableExpression(name))
+    fun resolveNumberVariable(name: String) = runtime.resolveDouble(getVariableExpression(name))
+
+    /** The variables that this task config uses. These are used to declare variables on the entity cleanly. */
+    fun getVariables(entity: LivingEntity): List<MoLangConfigVariable>
    /** Given the entity in construction, returns a list of tasks. */
    fun createTasks(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): List<BehaviorControl<in LivingEntity>>
 }
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+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.WakeUpTask
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+
+class WakeUpTaskConfig : SingleTaskConfig {
+    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(WakeUpTask.create(), PokemonEntity::class.java)
+    }
+}
@@ -8,23 +8,16 @@

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

-import com.bedrockk.molang.Expression
-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.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.resolveDouble
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.resolveInt
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.RandomStroll
 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
@@ -32,20 +25,31 @@ import net.minecraft.world.entity.ai.memory.WalkTarget
 import net.minecraft.world.entity.ai.util.LandRandomPos

 class WanderTaskConfig : SingleTaskConfig {
-    val condition: ExpressionLike = "true".asExpressionLike()
-    val shouldWander: ExpressionLike = "math.random(0, 20 * 8) <= 1".asExpressionLike()
-    val horizontalRange: Expression = "10".asExpression()
-    val verticalRange: Expression = "5".asExpression()
-    val speedMultiplier: Expression = "0.35".asExpression()
-    val completionRange: Expression = "1".asExpression()
-    val lookTargetYOffset: Expression = "1.5".asExpression()
+    companion object {
+        const val WANDER = "wander" // Category
+    }
+
+    val condition = booleanVariable(WANDER, "wanders", true).asExpressible()
+    val wanderChance = numberVariable(WANDER, "wander_chance", 1/(20 * 6F)).asExpressible()
+    val horizontalRange = numberVariable(WANDER, "horizontal_wander_range", 10).asExpressible()
+    val verticalRange = numberVariable(WANDER, "vertical_wander_range", 5).asExpressible()
+
+    val speedMultiplier = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        wanderChance,
+        horizontalRange,
+        verticalRange,
+        speedMultiplier
+    ).asVariables()

    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
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean()) return null

        return BehaviorBuilder.create {
            it.group(
@@ -57,12 +61,13 @@ class WanderTaskConfig : SingleTaskConfig {
                        return@Trigger false
                    }

-                    runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-                    if (!runtime.resolveBoolean(shouldWander)) return@Trigger false
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+                    val wanderChance = wanderChance.resolveFloat()
+                    if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) return@Trigger false

-                    val targetVec = LandRandomPos.getPos(entity, runtime.resolveInt(horizontalRange), runtime.resolveInt(verticalRange)) ?: return@Trigger false
-                    walkTarget.set(WalkTarget(targetVec, runtime.resolveFloat(speedMultiplier), runtime.resolveInt(completionRange)))
-                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, runtime.resolveDouble(lookTargetYOffset), 0.0)))
+                    val targetVec = LandRandomPos.getPos(entity, horizontalRange.resolveInt(), verticalRange.resolveInt(), { 0.0 }) ?: return@Trigger false
+                    walkTarget.set(WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1))
+                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
                    return@Trigger true
                }
            }
@@ -0,0 +1,70 @@
+/*
+ * 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.BrainConfigurationContext
+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.BehaviorUtils
+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
+
+class WaterWanderTaskConfig : SingleTaskConfig {
+    val condition = booleanVariable(WANDER, "water_wanders", true).asExpressible()
+    val wanderChance = numberVariable(WANDER, "water_wander_chance", 1/(20 * 3F)).asExpressible()
+    val speedMultiplier = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
+    val horizontalRange: ExpressionOrEntityVariable = Either.left("10.0".asExpression())
+    val verticalRange: ExpressionOrEntityVariable = Either.left("3.0".asExpression())
+
+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
+        return listOf(condition, wanderChance, speedMultiplier).asVariables()
+    }
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): 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 target = BehaviorUtils.getRandomSwimmablePos(entity, horizontalRange.resolveInt(), verticalRange.resolveInt()) ?: return@Trigger false
+                    walkTarget.set(WalkTarget(target, speedMultiplier.resolveFloat(), 1))
+                    lookTarget.set(BlockPosTracker(target))
+                    return@Trigger true
+                }
+            }
+        }
+    }
+}
@@ -23,7 +23,6 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.battles.BattleFledEvent
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.net.NetworkPacket
-import com.cobblemon.mod.common.api.pokemon.stats.BattleEvSource
 import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.api.text.red
@@ -273,7 +272,7 @@ open class PokemonBattle(
                            opponent.awardExperience(opponentPokemon, experience)
                        }
                        Cobblemon.evYieldCalculator.calculate(opponentPokemon, faintedPokemon).forEach { (stat, amount) ->
-                            pokemon.evs.add(stat, amount, BattleEvSource(this, opponentPokemon.facedOpponents.toList(), pokemon))
+                            pokemon.evs.add(stat, amount)
                        }

                    }
@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.drop

 import com.cobblemon.mod.common.api.serialization.StringIdentifiedObjectAdapter
-import com.google.gson.annotations.SerializedName

 /**
 * The way an item will be dropped.
@@ -29,9 +28,6 @@ enum class ItemDropMethod(val methodName: String) {
    TO_INVENTORY("to-inventory");

    companion object {
-        val adapter = StringIdentifiedObjectAdapter(
-            { str -> ItemDropMethod.entries.firstOrNull { it.methodName == str } },
-            { value -> (value ?: ON_ENTITY).methodName },
-        )
+        val adapter = StringIdentifiedObjectAdapter { str -> values().firstOrNull { it.methodName == str } }
    }
 }
@@ -42,10 +42,7 @@ import com.cobblemon.mod.common.api.events.pokemon.healing.PokemonHealedEvent
 import com.cobblemon.mod.common.api.events.pokemon.interaction.ExperienceCandyUseEvent
 import com.cobblemon.mod.common.api.events.pokemon.interaction.PokemonInteractionGUICreationEvent
 import com.cobblemon.mod.common.api.events.starter.StarterChosenEvent
-import com.cobblemon.mod.common.api.events.storage.ChangePCBoxWallpaperEvent
 import com.cobblemon.mod.common.api.events.storage.ReleasePokemonEvent
-import com.cobblemon.mod.common.api.events.storage.RenamePCBoxEvent
-import com.cobblemon.mod.common.api.events.storage.WallpaperCollectionEvent
 import com.cobblemon.mod.common.api.events.world.BigRootPropagatedEvent
 import com.cobblemon.mod.common.api.reactive.CancelableObservable
 import com.cobblemon.mod.common.api.reactive.EventObservable
@@ -161,29 +158,11 @@ object CobblemonEvents {
    @JvmField
    val EXPERIENCE_CANDY_USE_POST = EventObservable<ExperienceCandyUseEvent.Post>()

-    @JvmField
-    val EV_GAINED_EVENT_PRE = CancelableObservable<EvGainedEvent.Pre>()
-    @JvmField
-    val EV_GAINED_EVENT_POST = EventObservable<EvGainedEvent.Post>()
-
    @JvmField
    val POKEMON_RELEASED_EVENT_PRE = CancelableObservable<ReleasePokemonEvent.Pre>()
    @JvmField
    val POKEMON_RELEASED_EVENT_POST = EventObservable<ReleasePokemonEvent.Post>()

-    @JvmField
-    val RENAME_PC_BOX_EVENT_PRE = CancelableObservable<RenamePCBoxEvent.Pre>()
-    @JvmField
-    val RENAME_PC_BOX_EVENT_POST = EventObservable<RenamePCBoxEvent.Post>()
-
-    @JvmField
-    val WALLPAPER_COLLECTION_EVENT = EventObservable<WallpaperCollectionEvent>()
-
-    @JvmField
-    val CHANGE_PC_BOX_WALLPAPER_EVENT_PRE = CancelableObservable<ChangePCBoxWallpaperEvent.Pre>()
-    @JvmField
-    val CHANGE_PC_BOX_WALLPAPER_EVENT_POST = EventObservable<ChangePCBoxWallpaperEvent.Post>()
-
    @JvmField
    val LOOT_DROPPED = CancelableObservable<LootDroppedEvent>()
    @JvmField
@@ -13,9 +13,13 @@ import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.battles.model.actor.ActorType
 import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
+import com.cobblemon.mod.common.api.battles.model.actor.EntityBackedBattleActor
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
+import com.cobblemon.mod.common.entity.MoLangScriptingEntity
 import com.cobblemon.mod.common.entity.npc.NPCBattleActor
 import com.cobblemon.mod.common.util.asArrayValue
+import net.minecraft.world.entity.LivingEntity

 /**
 * Event fired when a battle is won by some number of [BattleActor]s.
@@ -40,6 +44,8 @@ data class BattleVictoryEvent (
        "npc_losers" to losers.filter { it.type == ActorType.NPC }.asArrayValue { it.struct },
        "wild_pokemon_winners" to winners.filter { it.type == ActorType.WILD }.asArrayValue { it.struct },
        "wild_pokemon_losers" to losers.filter { it.type == ActorType.WILD }.asArrayValue { it.struct },
+        "scriptable_winners" to winners.filterIsInstance<EntityBackedBattleActor<*>>().mapNotNull { it.entity as? MoLangScriptingEntity }.asArrayValue { (it as LivingEntity).asMostSpecificMoLangValue() },
+        "scriptable_losers" to losers.filterIsInstance<EntityBackedBattleActor<*>>().mapNotNull { it.entity as? MoLangScriptingEntity }.asArrayValue { (it as LivingEntity).asMostSpecificMoLangValue() },
        "players" to battle.actors.filter { it.type == ActorType.PLAYER }.asArrayValue { it.struct },
        "npcs" to battle.actors.filter { it.type == ActorType.NPC }.asArrayValue { it.struct },
        "wild_pokemon" to battle.actors.filter { it.type == ActorType.WILD }.asArrayValue { it.struct }
@@ -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.events.pokemon
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.pokemon.stats.EvSource
-import com.cobblemon.mod.common.api.pokemon.stats.Stat
-import com.cobblemon.mod.common.pokemon.Pokemon
-
-/**
- * Fired during EV mutation.
- *
- * @see [Pre]
- * @see [Post]
- */
-interface EvGainedEvent {
-
-    /**
-     * The [Stat] having EVs added to itself.
-     */
-    val stat: Stat
-
-    /**
-     * @see EvSource.pokemon
-     */
-    val pokemon: Pokemon get() = this.source.pokemon
-
-    /**
-     * The [EvSource] that fired this event.
-     */
-    val source: EvSource
-
-    /**
-     * Fired before EV mutation occurs, cancelling will cause the mutation to be flagged as not successful (returns 0).
-     *
-     * @property stat See [EvGainedEvent.stat].
-     * @property amount The amount of EVs that will be gained.
-     * @property source See [EvGainedEvent.source].
-     */
-    class Pre(override val stat: Stat, var amount: Int, override val source: EvSource) : EvGainedEvent, Cancelable()
-
-    /**
-     * Fired after EV mutation occurs, this is purely for notification purposes.
-     *
-     * @property stat See [EvGainedEvent.stat].
-     * @property amount The final amount of EVs gained.
-     * @property source See [EvGainedEvent.source].
-     */
-    class Post(override val stat: Stat, val amount: Int, override val source: EvSource) : EvGainedEvent
-
-}
@@ -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.events.storage
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.storage.pc.PCBox
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-
-/**
- * Events fired whenever a player changes their PC Wallpaper.
- * Has a cancelable [Pre] event and a [Post] which gets fired after the change.
- *
- * @author JustAHuman-xD
- * @since February 14th, 2025
- */
-interface ChangePCBoxWallpaperEvent {
-
-    /**
-     * The [ServerPlayer] who is changing their wallpaper
-     */
-    val player: ServerPlayer
-
-    /**
-     * The [PCBox] whose wallpaper is being changed
-     */
-    val box: PCBox
-
-    /**
-     * The location of the wallpaper that is being changed to. Can be modified in the [Pre] event.
-     * NOTE: Changing this to a wallpaper that does not exist on the client, will result in a purple/black fallback texture being displayed.
-     */
-    val wallpaper: ResourceLocation
-
-    class Pre(
-        override val player: ServerPlayer,
-        override val box: PCBox,
-        override var wallpaper: ResourceLocation
-    ) : ChangePCBoxWallpaperEvent, Cancelable()
-
-    class Post(
-        override val player: ServerPlayer,
-        override val box: PCBox,
-        override val wallpaper: ResourceLocation
-    ) : ChangePCBoxWallpaperEvent
-}
@@ -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.events.storage
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.storage.pc.PCBox
-import net.minecraft.server.level.ServerPlayer
-
-/**
- * Events fired whenever a player renames one of their PC boxes.
- * Has a cancelable [Pre] event and a [Post] which gets fired after the change.
- *
- * @author JustAHuman-xD
- * @since February 14th, 2025
- */
-interface RenamePCBoxEvent {
-
-    /**
-     * The [ServerPlayer] who is changing their wallpaper
-     */
-    val player: ServerPlayer
-
-    /**
-     * The [PCBox] whose wallpaper is being changed
-     */
-    val box: PCBox
-
-    /**
-     * The new box name being used. This can be modified in the [Pre] event.
-     */
-    val name: String
-
-    class Pre(
-        override val player: ServerPlayer,
-        override val box: PCBox,
-        override var name: String
-    ) : RenamePCBoxEvent, Cancelable()
-
-    class Post(
-        override val player: ServerPlayer,
-        override val box: PCBox,
-        override val name: String
-    ) : RenamePCBoxEvent
-}
@@ -1,26 +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.events.storage
-
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-
-/**
- * Event being fired whenever the client connects to a server and "requests" what wallpapers are available for it to choose from.
- * Mods can listen to this event and remove available options from the client when they connect, essentially causing them to not exist client-side
- *
- * NOTE: Adding wallpapers here that do not exist on the client, will result in the purple/black fallback texture being displayed client-side.
- *
- * @author JustAHuman-xD
- * @since February 14th, 2025
- */
-data class WallpaperCollectionEvent(
-    val player: ServerPlayer,
-    val wallpapers: MutableList<ResourceLocation>
-)
@@ -11,7 +11,7 @@ package com.cobblemon.mod.common.api.fishing
 import com.cobblemon.mod.common.CobblemonItemComponents
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.data.FishingBaitRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.fishing.FishingBaitRegistrySyncPacket
 import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.Gson
@@ -9,7 +9,7 @@
 package com.cobblemon.mod.common.api.fossil

 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import net.minecraft.advancements.critereon.ItemPredicate
+import com.cobblemon.mod.common.pokemon.evolution.predicate.NbtItemPredicate
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
 import net.minecraft.resources.ResourceLocation
@@ -19,7 +19,7 @@ import net.minecraft.world.item.ItemStack
 class Fossil(
    identifier: ResourceLocation,
    val result: PokemonProperties,
-    val fossils: List<ItemPredicate>
+    val fossils: List<NbtItemPredicate>
 ): StringRepresentable {

    @Transient
@@ -13,15 +13,15 @@ import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.data.FossilRegistrySyncPacket
-import com.cobblemon.mod.common.pokemon.evolution.adapters.LegacyItemConditionWrapperAdapter
+import com.cobblemon.mod.common.net.messages.client.fossil.FossilRegistrySyncPacket
+import com.cobblemon.mod.common.pokemon.evolution.adapters.NbtItemPredicateAdapter
+import com.cobblemon.mod.common.pokemon.evolution.predicate.NbtItemPredicate
 import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.adapters.ItemLikeConditionAdapter
 import com.cobblemon.mod.common.util.adapters.pokemonPropertiesShortAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
-import net.minecraft.advancements.critereon.ItemPredicate
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
@@ -40,7 +40,7 @@ object Fossils: JsonDataRegistry<Fossil> {
        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
        .registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
-        .registerTypeAdapter(ItemPredicate::class.java, LegacyItemConditionWrapperAdapter)
+        .registerTypeAdapter(NbtItemPredicate::class.java, NbtItemPredicateAdapter)
        .create()

    override val typeToken: TypeToken<Fossil> = TypeToken.get(Fossil::class.java)
@@ -10,7 +10,7 @@ package com.cobblemon.mod.common.api.fossil

 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.data.NaturalMaterialRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.fossil.NaturalMaterialRegistrySyncPacket
 import com.cobblemon.mod.common.registry.ItemTagCondition
 import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.adapters.ItemLikeConditionAdapter
@@ -12,10 +12,12 @@ import com.cobblemon.mod.common.api.text.font
 import com.cobblemon.mod.common.client.gui.battle.BattleOverlay.Companion.PORTRAIT_DIAMETER
 import com.cobblemon.mod.common.client.render.SpriteType
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.util.toHex
+import com.mojang.authlib.minecraft.client.MinecraftClient
 import com.mojang.blaze3d.platform.GlStateManager
 import com.mojang.blaze3d.platform.Lighting
 import com.mojang.blaze3d.systems.RenderSystem
@@ -207,6 +209,7 @@ fun drawPosablePortrait(
    contextScale: Float = 1F,
    reversed: Boolean = false,
    state: PosableState,
+    repository: VaryingModelRepository<*>,
    partialTicks: Float,
    limbSwing: Float = 0F,
    limbSwingAmount: Float = 0F,
@@ -224,16 +227,16 @@ fun drawPosablePortrait(
    matrixStack.scale(scale, scale, -scale)
    matrixStack.translate(0.0, -PORTRAIT_DIAMETER / 18.0, 0.0)

-    val sprite = VaryingModelRepository.getSprite(identifier, state, SpriteType.PORTRAIT);
+    val sprite = repository.getSprite(identifier, state, SpriteType.PORTRAIT);

    if (sprite == null) {
-        val model = VaryingModelRepository.getPoser(identifier, state)
+        val model = repository.getPoser(identifier, state)
        state.currentModel = model
-        val texture = VaryingModelRepository.getTexture(identifier, state)
+        val texture = repository.getTexture(identifier, state)

        val context = RenderContext()
        model.context = context
-        VaryingModelRepository.getTextureNoSubstitute(identifier, state).let { context.put(RenderContext.TEXTURE, it) }
+        repository.getTextureNoSubstitute(identifier, state).let { context.put(RenderContext.TEXTURE, it) }
        context.put(RenderContext.SCALE, contextScale)
        context.put(RenderContext.SPECIES, identifier)
        context.put(RenderContext.ASPECTS, state.currentAspects)
@@ -252,7 +255,7 @@ fun drawPosablePortrait(

        matrixStack.translate(
            model.portraitTranslation.x * if (reversed) -1F else 1F,
-            model.portraitTranslation.y + 1.5 * model.portraitScale,
+            model.portraitTranslation.y,
            model.portraitTranslation.z - 4
        )
        matrixStack.scale(model.portraitScale, model.portraitScale, 1 / model.portraitScale)
@@ -269,7 +272,7 @@ fun drawPosablePortrait(
        val packedLight = LightTexture.pack(11, 7)

        val colour = toHex(r, g, b, a)
-        model.withLayerContext(immediate, state, VaryingModelRepository.getLayers(identifier, state)) {
+        model.withLayerContext(immediate, state, repository.getLayers(identifier, state)) {
            model.render(context, matrixStack, buffer, packedLight, OverlayTexture.NO_OVERLAY, colour)
            immediate.endBatch()
        }
@@ -285,6 +288,7 @@ fun drawPosablePortrait(
 }

 fun drawProfile(
+    repository: VaryingModelRepository<*>,
    resourceIdentifier: ResourceLocation,
    matrixStack: PoseStack,
    state: PosableState,
@@ -294,16 +298,16 @@ fun drawProfile(
    RenderSystem.applyModelViewMatrix()
    matrixStack.scale(scale, scale, -scale)

-    val sprite = VaryingModelRepository.getSprite(resourceIdentifier, state, SpriteType.PROFILE)
+    val sprite = repository.getSprite(resourceIdentifier, state, SpriteType.PROFILE)

    if (sprite == null) {

-        val model = VaryingModelRepository.getPoser(resourceIdentifier, state)
-        val texture = VaryingModelRepository.getTexture(resourceIdentifier, state)
+        val model = repository.getPoser(resourceIdentifier, state)
+        val texture = repository.getTexture(resourceIdentifier, state)

        val context = RenderContext()
        model.context = context
-        VaryingModelRepository.getTextureNoSubstitute(resourceIdentifier, state).let { context.put(RenderContext.TEXTURE, it) }
+        repository.getTextureNoSubstitute(resourceIdentifier, state).let { context.put(RenderContext.TEXTURE, it) }
        context.put(RenderContext.SCALE, 1F)
        context.put(RenderContext.SPECIES, resourceIdentifier)
        context.put(RenderContext.ASPECTS, state.currentAspects)
@@ -315,11 +319,7 @@ fun drawProfile(
        state.setPoseToFirstSuitable(PoseType.PORTRAIT)
        state.updatePartialTicks(partialTicks)
        model.applyAnimations(null, state, 0F, 0F, 0F, 0F, 0F)
-        matrixStack.translate(
-            model.profileTranslation.x,
-            model.profileTranslation.y + 1.5 * model.profileScale,
-            model.profileTranslation.z - 4.0
-        )
+        matrixStack.translate(model.profileTranslation.x, model.profileTranslation.y, model.profileTranslation.z - 4.0)
        matrixStack.scale(model.profileScale, model.profileScale, 1 / model.profileScale)
 //    matrixStack.multiply(rotation)
        val quaternion1 = Axis.YP.rotationDegrees(-32F * if (false) -1F else 1F)
@@ -337,7 +337,7 @@ fun drawProfile(
        RenderSystem.setShaderLights(light1, light2)
        val packedLight = LightTexture.pack(11, 7)

-        model.withLayerContext(bufferSource, state, VaryingModelRepository.getLayers(resourceIdentifier, state)) {
+        model.withLayerContext(bufferSource, state, repository.getLayers(resourceIdentifier, state)) {
            model.render(context, matrixStack, buffer, packedLight, OverlayTexture.NO_OVERLAY, -0x1)
            bufferSource.endBatch()
        }
@@ -1,29 +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.interaction
-
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonSerializer
-import kotlin.reflect.KClass
-import net.minecraft.resources.ResourceLocation
-
-/**
- * A type adapter for [EntityInteraction]s.
- * For the default implementation with Pokémon entities see [CobblemonPokemonEntityInteractionTypeAdapter].
- *
- * @param T The type of [EntityInteraction].
- *
- * @author Licious
- * @since November 30th, 2022
- */
-interface EntityInteractionTypeAdapter<T : EntityInteraction<*>> : JsonDeserializer<T>, JsonSerializer<T> {
-
-    fun registerInteraction(identifier: ResourceLocation, type: KClass<out T>)
-
-}
@@ -90,11 +90,13 @@ import net.minecraft.world.entity.EntityType
 import net.minecraft.world.entity.LightningBolt
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.TamableAnimal
 import net.minecraft.world.entity.ai.behavior.BlockPosTracker
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.entity.ai.memory.MemoryStatus
 import net.minecraft.world.entity.ai.memory.WalkTarget
 import net.minecraft.world.entity.player.Player
+import net.minecraft.world.level.ClipContext
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.Level.ExplosionInteraction
 import net.minecraft.world.level.biome.Biome
@@ -419,6 +421,38 @@ object MoLangFunctions {
                val source = DamageSource(entity.level().registryAccess().registryOrThrow(Registries.DAMAGE_TYPE).getHolder(DamageTypes.GENERIC).get())
                entity.hurt(source, amount.toFloat())
            }
+            map.put("distance_to_owner") {
+                if (entity !is TamableAnimal) {
+                    return@put DoubleValue.ZERO
+                }
+                val owner = entity.owner ?: return@put DoubleValue.ZERO
+                return@put DoubleValue(entity.distanceTo(owner))
+            }
+            map.put("owner") {
+                if (entity !is TamableAnimal) {
+                    return@put DoubleValue.ZERO
+                }
+                val owner = entity.owner
+                return@put owner?.asMostSpecificMoLangValue() ?: DoubleValue.ZERO
+            }
+            map.put("can_see") { params ->
+                val target = params.get<MoValue>(0)
+                val range = params.getDoubleOrNull(1) ?: 32.0
+                if (target is ObjectValue<*>) {
+                    val targetEntity = target.obj as? LivingEntity ?: return@put DoubleValue.ZERO
+                    val vector = targetEntity.eyePosition.subtract(entity.eyePosition).normalize()
+                    val trace = entity.traceEntityCollision(
+                        maxDistance = range.toFloat(),
+                        stepDistance = 0.1F,
+                        direction = vector,
+                        entityClass = targetEntity.javaClass,
+                        collideBlock = ClipContext.Fluid.NONE
+                    )
+                    return@put DoubleValue(targetEntity in (trace?.entities ?: emptyList()))
+                } else {
+                    return@put DoubleValue.ZERO
+                }
+            }
            map.put("walk_to") { params ->
                val x = params.getDouble(0)
                val y = params.getDouble(1)
@@ -698,6 +732,8 @@ object MoLangFunctions {
            map.put("max_hp") { DoubleValue(pokemon.maxHealth.toDouble()) }
            map.put("current_hp") { DoubleValue(pokemon.currentHealth.toDouble()) }
            map.put("friendship") { DoubleValue(pokemon.friendship.toDouble()) }
+            map.put("behaviour") { pokemon.form.behaviour.struct }
+            map.put("behavior") { pokemon.form.behaviour.struct } // Inferior
            map.put("evs") {
                val struct = QueryStruct(hashMapOf())
                for (stat in Stats.PERMANENT) {
@@ -714,6 +750,7 @@ object MoLangFunctions {
            }
            map.put("is_wild") { DoubleValue(pokemon.entity?.let { it.ownerUUID == null } == true) }
            map.put("is_shiny") { DoubleValue(pokemon.shiny) }
+            map.put("is_in_party") { DoubleValue(pokemon.storeCoordinates.get()?.store is PartyStore) }
            map.put("species") { pokemon.species.struct }
            map.put("form") { StringValue(pokemon.form.name) }
            map.put("weight") { DoubleValue(pokemon.species.weight.toDouble()) }
@@ -997,7 +1034,6 @@ object MoLangFunctions {
            map.put("hitbox_height") { DoubleValue(species.hitbox.height) }
            map.put("hitbox_fixed") { DoubleValue(species.hitbox.fixed) }
            map.put("catch_rate") { DoubleValue(species.catchRate) }
-
            map
        }
    )
@@ -1093,7 +1129,7 @@ object MoLangFunctions {
    }

    /**
-     * Different functions exist depending on
+     * Different functions exist depending on the entity type, this tries to make the struct that's most specific to the type.
     */
    fun LivingEntity.asMostSpecificMoLangValue(): ObjectValue<out LivingEntity> {
        return when (this) {
@@ -1162,6 +1198,7 @@ object MoLangFunctions {
            .flatMap { it.invoke(pokemonEntity).entries }
            .associate { it.key to it.value }
        functions.putAll(addedFunctions)
+        pokemonEntity.registerFunctionsForScripting(this)
        return this
    }

@@ -13,7 +13,7 @@ import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.ai.config.BrainConfig
 import com.cobblemon.mod.common.api.npc.configuration.NPCBattleConfiguration
-import com.cobblemon.mod.common.api.npc.configuration.NPCConfigVariable
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.npc.configuration.NPCInteractConfiguration
 import com.cobblemon.mod.common.api.npc.variation.NPCVariationProvider
 import com.cobblemon.mod.common.api.npc.variation.RandomNPCVariationProvider
@@ -45,7 +45,7 @@ class NPCClass {
    var interaction: NPCInteractConfiguration? = null
    var canDespawn = true
    var variations: MutableMap<String, NPCVariationProvider> = mutableMapOf()
-    var config: MutableList<NPCConfigVariable> = mutableListOf()
+    var config: MutableList<MoLangConfigVariable> = mutableListOf()
    var variables = mutableMapOf<String, MoValue>() // Questionable whether this should be here.
    var party: NPCPartyProvider? = null
    var skill: Int = 0
@@ -81,6 +81,7 @@ class NPCClass {
        }
        buffer.writeCollection(config) { _, v ->
            buffer.writeString(v.variableName)
+            buffer.writeText(v.category)
            buffer.writeText(v.displayName)
            buffer.writeText(v.description)
            buffer.writeEnumConstant(v.type)
@@ -127,11 +128,12 @@ class NPCClass {
        }
        config = buffer.readList {
            val variableName = buffer.readString()
+            val category = buffer.readText()
            val displayName = buffer.readText()
            val description = buffer.readText()
-            val type = buffer.readEnumConstant(NPCConfigVariable.NPCVariableType::class.java)
+            val type = buffer.readEnumConstant(MoLangConfigVariable.MoLangVariableType::class.java)
            val defaultValue = buffer.readString()
-            NPCConfigVariable(variableName, displayName, description, type, defaultValue)
+            MoLangConfigVariable(variableName, category, displayName, description, type, defaultValue)
        }.toMutableList()
        skill = buffer.readInt()
        autoHealParty = buffer.readBoolean()
@@ -20,6 +20,8 @@ import com.cobblemon.mod.common.api.drop.DropEntry
 import com.cobblemon.mod.common.api.drop.ItemDropMethod
 import com.cobblemon.mod.common.api.entity.EntityDimensionsAdapter
 import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.npc.NPCClasses.getByIdentifier
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.npc.configuration.NPCInteractConfiguration
 import com.cobblemon.mod.common.api.npc.variation.NPCVariationProvider
 import com.cobblemon.mod.common.api.npc.variation.WeightedAspect
@@ -74,6 +76,10 @@ object NPCClasses : JsonDataRegistry<NPCClass> {
        .registerTypeAdapter(WeightedAspect::class.java, WeightedAspectAdapter)
        .registerTypeAdapter(BrainConfig::class.java, BrainConfigAdapter)
        .registerTypeAdapter(TaskConfig::class.java, TaskConfigAdapter)
+        .registerTypeAdapter(
+            TypeToken.getParameterized(Either::class.java, Expression::class.java, MoLangConfigVariable::class.java).type,
+            ExpressionOrEntityVariableAdapter
+        )
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
@@ -90,14 +96,6 @@ object NPCClasses : JsonDataRegistry<NPCClass> {
    val classes: Collection<NPCClass>
        get() = this.npcClassesByIdentifier.values

-    init {
-        // NPC additions would be useful
-//        SpeciesAdditions.observable.subscribe {
-//            this.species.forEach(Species::initialize)
-//            this.species.forEach(Species::resolveEvolutionMoves)
-//        }
-    }
-
    /**
     * Finds an NPC class by the pathname of their [ResourceLocation].
     * This method exists for the convenience of finding Cobble default NPC classes.
@@ -9,7 +9,7 @@
 package com.cobblemon.mod.common.api.npc

 import com.cobblemon.mod.common.api.ai.config.BrainConfig
-import com.cobblemon.mod.common.api.npc.configuration.NPCConfigVariable
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.npc.configuration.NPCInteractConfiguration
 import com.cobblemon.mod.common.api.npc.variation.NPCVariationProvider
 import net.minecraft.network.chat.Component
@@ -21,7 +21,7 @@ class NPCPreset {
    var resourceIdentifier: ResourceLocation? = null
    var aspects: Set<String>? = null
    var variations: Map<String, NPCVariationProvider>? = null
-    var config: List<NPCConfigVariable>? = null
+    var config: List<MoLangConfigVariable>? = null
    var party: NPCPartyProvider? = null
    var canDespawn: Boolean? = null
    var interaction: NPCInteractConfiguration? = null
@@ -19,6 +19,7 @@ import com.cobblemon.mod.common.api.drop.DropEntry
 import com.cobblemon.mod.common.api.drop.ItemDropMethod
 import com.cobblemon.mod.common.api.entity.EntityDimensionsAdapter
 import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.npc.configuration.NPCInteractConfiguration
 import com.cobblemon.mod.common.api.npc.variation.NPCVariationProvider
 import com.cobblemon.mod.common.api.npc.variation.WeightedAspect
@@ -70,6 +71,10 @@ object NPCPresets : JsonDataRegistry<NPCPreset> {
        .registerTypeAdapter(Component::class.java, TranslatedTextAdapter)
        .registerTypeAdapter(BrainConfig::class.java, BrainConfigAdapter)
        .registerTypeAdapter(TaskConfig::class.java, TaskConfigAdapter)
+        .registerTypeAdapter(
+            TypeToken.getParameterized(Either::class.java, Expression::class.java, MoLangConfigVariable::class.java).type,
+            ExpressionOrEntityVariableAdapter
+        )
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
@@ -8,46 +8,52 @@

 package com.cobblemon.mod.common.api.npc.configuration

+import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.readString
 import com.cobblemon.mod.common.util.readText
 import com.cobblemon.mod.common.util.writeString
 import com.cobblemon.mod.common.util.writeText
+import com.mojang.datafixers.util.Either
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.network.chat.Component

 /**
- * A predefined variable that will be declared and filled in on any NPC that extends from the class or preset
- * that specifies this variable. This gives the client a cleaner way to represent a variable that should exist
- * on the NPC.
+ * A predefined variable that will be declared and filled in on any assigned entities. This gives the client
+ * a cleaner way to represent a variable that should exist on the entity.
 *
 * @author Hiroku
 * @since August 14th, 2023
 */
-class NPCConfigVariable(
+class MoLangConfigVariable(
    val variableName: String = "variable",
+    val category: Component = "Variables".asTranslated(),
    val displayName: Component = "Variable".asTranslated(),
-    val description: Component = "A variable that can be used in the NPC's configuration.".asTranslated(),
-    val type: NPCVariableType = NPCVariableType.NUMBER,
+    val description: Component = "A variable that can be used in the entity's configuration.".asTranslated(),
+    val type: MoLangVariableType = MoLangVariableType.NUMBER,
    val defaultValue: String = "0",
 ) {
    companion object {
-        fun decode(buffer: RegistryFriendlyByteBuf): NPCConfigVariable {
-            return NPCConfigVariable(
+        fun decode(buffer: RegistryFriendlyByteBuf): MoLangConfigVariable {
+            return MoLangConfigVariable(
                buffer.readString(),
                buffer.readText(),
                buffer.readText(),
-                buffer.readEnum(NPCVariableType::class.java),
+                buffer.readText(),
+                buffer.readEnum(MoLangVariableType::class.java),
                buffer.readString()
            )
        }
    }

-    enum class NPCVariableType {
+    fun asExpressible(): ExpressionOrEntityVariable = Either.right(this)
+
+    enum class MoLangVariableType {
        NUMBER,
        TEXT,
        BOOLEAN;
@@ -63,17 +69,10 @@ class NPCConfigVariable(

    fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeString(variableName)
+        buffer.writeText(category)
        buffer.writeText(displayName)
        buffer.writeText(description)
        buffer.writeEnum(type)
        buffer.writeString(defaultValue)
    }
-
-    fun apply(npc: NPCEntity, value: MoValue) {
-        npc.config.setDirectly(variableName, value)
-    }
-
-    fun applyDefault(npc: NPCEntity) {
-        npc.config.setDirectly(variableName, type.toMoValue(defaultValue))
-    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tyzillion	f298f7a157	Added eating particles.	2025-02-03 20:31:41 -05:00
Tyzillion	7ac54d6d6a	I broked the branch. :( So I deleted it and remade it. :)	2025-02-03 13:40:51 -05:00
Paul	a9ed3750ad	Added the wisdom of broccoli to the new water and air wander tasks	2025-01-31 20:48:35 +10:00
Paul	24fdae725e	Merge branch 'main' into smarterer-pokemons	2025-01-31 20:10:17 +10:00
Paul	71fc844905	Wander water, air wander	2025-01-31 08:28:55 +10:00
Paul	24910778d4	Shoved molang structs in more places, you can't stop me	2025-01-27 16:53:44 +10:00
Paul	363c3e5f0a	Merge remote-tracking branch 'origin/main' into smarterer-pokemons	2025-01-27 16:36:52 +10:00
Paul	8d336fca3e	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/pokemon/FormData.kt # common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Species.kt # common/src/main/kotlin/com/cobblemon/mod/common/util/EntityExtensions.kt # common/src/main/resources/data/cobblemon/flows/battle_victory/npc_battle_end_scripts.molang # common/src/main/resources/data/cobblemon/species/generation1/growlithe.json # common/src/main/resources/data/cobblemon/species/generation1/raticate.json # common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json	2025-01-25 11:25:57 +10:00
Paul	ff27676187	Started playing around with more generalised wandering through mediums	2025-01-25 09:48:23 +10:00
Paul	1fd5d0ff4b	Added following owner, resting to Brain AI, restructured base Species AI definitions, fixed DrowsySensor not modulo'ing time	2025-01-24 09:24:15 +10:00
Paul	46752a3911	Pokemon pausing in battles (like the good old days)	2025-01-19 20:31:37 +10:00
Paul	76ad22b53d	License and registration please	2025-01-18 10:01:10 +10:00
Paul	a2ddcaebf8	Minor refactors for Pokemon brains to use brain configs rather than pure presets, translated sleep tasks to data	2025-01-18 09:59:28 +10:00
Paul	6fc725b6ff	Fixed wandering being busted due to the pathfinding malus override (will make fliers less keen to land)	2025-01-15 20:49:58 +10:00
Paul	01efc8d9e0	Task and brain configs are able to check the entity when providing variable list	2025-01-14 22:19:12 +10:00
Paul	3a05bd5e2e	Updating variables now reinitializes brains, fixed too-low default on float chance in StayAfloat tasks	2025-01-08 20:10:32 +10:00
Paul	439c9647ca	Moved Pokémon more properly to the data driven AI, with basic defaults so far, added /brainedit to debug pokemon brains	2025-01-06 14:17:46 +10:00
Paul	eb952319e0	Major refactor of data-driven AI, added variables declarations to task configs, GUI for editing brain presets	2025-01-04 16:26:48 +10:00
Paul	4787c1d35b	Merge remote-tracking branch 'origin/main' into smarterer-pokemons	2024-12-25 15:04:33 +10:00
Paul	98394333da	More variable conversions for the task configs	2024-12-16 19:04:56 +10:00
Paul	653b9be4a3	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/client/gui/npc/widgets/ConfigVariableList.kt	2024-12-16 10:03:13 +10:00
Paul	a3460a4b8f	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/client/gui/npc/widgets/ConfigVariableList.kt # common/src/main/resources/assets/cobblemon/lang/en_us.json	2024-12-15 20:50:05 +10:00
Paul	fd74f157a8	Work on generalised entity brain configurations to apply to pokemon	2024-12-14 10:06:39 +10:00
Paul	885cde045a	Merge remote-tracking branch 'origin/main' into smarterer-pokemons	2024-12-09 11:32:36 +10:00
Paul	bfcaa4bda4	pokemon AI tweaking	2024-12-07 12:23:13 +10:00
Paul	7370841e62	Ported up to latest main	2024-12-06 20:23:28 +10:00
Paul	3c347214a8	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonActivities.kt # common/src/main/kotlin/com/cobblemon/mod/common/command/GiveAllPokemon.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/AttackAngryAtTask.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/MoveToAttackTargetTask.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/npc/NPCEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonMoveControl.kt # common/src/main/kotlin/com/cobblemon/mod/common/util/WorldExtensions.kt	2024-12-06 20:12:55 +10:00
Paul	592b4276c8	Added some combat behaviour and reworked activity swapping logic for pokemon brains	2024-10-05 10:47:42 +10:00
Paul	a73cdfbb4f	Removed duplicate class (baffling)	2024-09-29 18:57:36 +10:00
Paul	770a2e52f6	Pokemon but dangerous	2024-09-29 11:41:01 +10:00
Paul	6629b27f33	Fixed issues from merging main	2024-09-29 10:08:06 +10:00
Paul	73b06d2f99	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonActivities.kt # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonMemories.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/npc/NPCEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/util/WorldExtensions.kt	2024-09-29 09:28:03 +10:00
Paul	a07a9a75c0	Ported to mojmaps	2024-08-17 19:19:20 +10:00
Paul	d6fdb4c6da	Merge branch 'sega_bass_pro_fishing_2' into smarterer-pokemons # Conflicts: # common/src/main/java/com/cobblemon/mod/common/GenericsCheatClass.java # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonActivities.kt # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonMemories.kt # common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSensors.kt # common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MoveInstruction.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/AttackAngryAtTask.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/FollowWalkTargetTask.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/GetAngryAtAttackerTask.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/MoveToAttackTargetTask.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/StayAfloatTask.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonMoveControl.kt # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonNavigation.kt # common/src/main/kotlin/com/cobblemon/mod/common/util/WorldExtensions.kt # common/src/main/resources/cobblemon-common.accesswidener # fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt # forge/src/main/kotlin/com/cobblemon/mod/forge/CobblemonForge.kt	2024-08-17 10:57:53 +10:00
JazzMcNade	c5e036934a	Added Logic to allow specific pokemon to cause Creepers and Skeletons to flee	2024-07-14 21:18:49 -05:00
JazzMcNade	d9938a5cfd	Added flee on failed capture behavior, prevented sleepwalking, wake up and attack if harmed while sleeping	2024-07-06 03:27:52 -05:00
Tyzillion	fc5d9615fc	Moved the bonemeal detection out of the task and put it in its own sensor.	2024-06-27 14:59:21 -04:00
Tyzillion	e160a42b83	Fixed pokemon class not passing the correct pokemon to the brain upon Pokemon Entity initialization.	2024-06-21 11:32:11 -04:00
Plastered_Crab	fa68aa44c5	- commented out 1 brain task to test other tasks	2024-05-24 09:18:40 -07:00
Plastered_Crab	f3de9840b5	- party pokemon will try to defend their owners better (still wip)	2024-05-23 22:17:00 -07:00
Plastered_Crab	64e3909cea	- party pokemon will try to defend their owners (still wip)	2024-05-22 23:30:16 -07:00
Plastered_Crab	735c4b910e	- pokemon are kill (almost still)	2024-05-22 15:43:02 -07:00
Plastered_Crab	26a9a1f9e1	- pokemon is kill (almost)	2024-05-21 18:02:18 -07:00
amo	832ab8db95	RANDOM BULLSHIT GO	2024-05-20 02:46:43 +01:00
broccoli	1d9029ef51	feature: add fertilizing task	2024-05-16 19:05:07 +01:00
broccoli	a875ba7536	remove comment	2024-05-16 00:22:39 +01:00
broccoli	93de4785b4	use resourceIdentifier instead of pokedex id	2024-05-16 00:22:12 +01:00
broccoli	765f0e5494	feature: make baby pokemon follow more evolved pokemon	2024-05-16 00:13:42 +01:00
broccoli	4fc232ff31	fix: resolve mapping issues by downgrading loom fixes regression in `fd7b82dbe3`	2024-05-14 23:28:33 +01:00
broccoli	a4d75e9f32	refactor: split brain out of entity	2024-05-13 17:38:08 +01:00
broccoli	a86ae09dc9	Merge branch 'main' into smarterer-pokemons	2024-05-12 15:18:56 +01:00
Paul	a5fbafe64d	Import corrections	2024-04-11 12:48:43 +10:00
Paul	1de93b4933	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt	2024-04-11 12:46:21 +10:00
Paul	f8dfc7c6cc	Implemented owner following on Brain pokemon AI	2024-04-11 11:58:46 +10:00
Paul	accbed9c2b	Set up entity AI for battles on Brain system	2024-04-08 13:15:33 +10:00
Paul	8b0e615777	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt	2024-04-08 11:13:12 +10:00
Paul	746f12c724	Migrated the eat grass goal to the brain system	2024-04-06 21:22:26 +10:00
Paul	a11d306a1b	Merge remote-tracking branch 'origin/main' into smarterer-pokemons # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt	2024-04-06 17:49:24 +10:00
Paul	40d140e84d	Added find resting place AI task	2024-03-25 10:08:55 +10:00
Paul	ffdb4842ac	Merge remote-tracking branch 'origin/main' into smarterer-pokemons	2024-03-18 15:48:32 +10:00
Paul	6baf60d07c	Added CobblemonMemories and Sensors from NPC branch (merge conflicts are future me's problem)	2024-03-18 10:04:43 +10:00
Paul	cb3b7784b0	Fixed pokemon speeds on new brain	2024-03-18 10:04:20 +10:00
Paul	ee4f3b1629	Started giving pokemon brains	2024-03-17 16:43:32 +10:00
Paul	518a7daa0e	Reverted partial run change	2024-03-17 12:46:08 +10:00