Add the ability for piglins to fear pokemon tagged with avoidedByPiglin

Code cleanup of old mixin
Piglins are now infatuated by Gholdengo
2026-10-25 16:46:25 -04:00 · 2025-07-18 23:44:46 -05:00 · 2025-07-18 00:01:13 -05:00 · 2025-07-17 23:49:29 -05:00
1299 changed files with 5777 additions and 33349 deletions
@@ -12,11 +12,9 @@

 ### Developer
 - baseScale in NPCs has been removed from classes and presets, and in the entity it is replaced with hitboxScale and renderScale.
- Added `EntityCallbacks` to `NPCEntity` and `PokemonEntity`. You can trigger custom callback types by using `[Entity].callbacks.process(...)`

 ### MoLang & Datapacks
 - Added a `behaviours` datapack folder which motivates the Behaviour Editor screen on NPCs and Pokémon.
- Added "callback" support on PokemonEntity and NPCEntity that allows MoLang scripts to be executed in response to certain scenarios.
 - Added very many behaviours to choose from.
 - Removed many NPC presets that now exist as behaviours. This is a breaking change if you are using NPCs with these presets. 
  - NPCs with these presets should be modified to instead list under `"behaviours"` all the equivalent behaviours.
@@ -8,8 +8,7 @@
  - Lure Cakes can be used to modify the spawn rate of Pokémon in the wild.
 - Added the Saccharine Tree, which can be found in the wild and is used to obtain Honey Bottles.
  - The leaves of the tree can be harvested to obtain honey, which can be used in the Campfire Pot to make Lure Cakes.
-  - The Log of the tree can be interacted with using a honey bottle to create a Honey-Slathered Saccharine Log, which increases the change of spawning a Pokémon with a Hidden Ability.
- Added Hearty Grains
+  - The Log of the tree can be clicked on with honey to create a Honey Log, which increases the change of spawning a Pokemon with an Hidden Ability.
 - Clicking on the Progress Arrow will show the JEI Recipe Book for the Campfire Pot, which will show all recipes that can be made with it.
 - Added a Ton of Redstone Compatibility.
   - Dispenser can now Honey and Unhoney:
@@ -18,7 +18,6 @@
 - Added cosmetics for Gurdurr, Conkeldurr, Squirtle Line, Sneasler, Sandle line, Treecko line, Braixen, Delphox, and Dragonite.
 - Added `/transformmodelpart (position|rotation|scale) <modelPart> <transform: x y z>` command that can add transformations to a pokemon's model part.
  - The player executing the command must be facing the target pokemon entity. Transformations are not persistent and will revert when resources are reloaded.
- Added `legacy` and `special` sourced moves to Pokémon.
 - Added lang keys for all moves and abilities up to Generation 9.
 - Added `translucent_cull` boolean option into resolver's layer to allow for translucent textures with culling
 - Added [LambDynamicLights](https://modrinth.com/mod/lambdynamiclights) support for items held by Pokémon, evolution stone blocks, evolution stone items, Pokédex, Luminous Moss, Flame Orb, and Magmarizer.
@@ -33,14 +32,8 @@
 - Added Hyper Training items (IV Modification) as well as some additional candy items to do so (Health Candy, Sickly Candy)
 - Added Galarica Nut Bushes
 - Many Pokémon (mostly cats) are now feared by phantoms
- Lightning is now affected by a Pokemon's ability/typing
-  - Pokémon with the ability Lightning Rod draw in lightning similar to a lightning rod block albeit with a lower priority and range, gain immunity to lightning damage, and receive a temporary damage buff.
-  - Pokémon with the ability Motor Drive are immune to lightning damage and receive a temporary speed buff when struck by lightning
-  - Pokémon with the ability Volt Absorb are immune to lightning damage and receive Regeneration II for a short duration
-  - Ground type Pokémon are immune to lightning damage
 - Added functionality to Everstone when held by a Pokémon; suppresses evolution notification and hides evolve button in summary interface.
 - Added new optional property `attachment_options` for most EmitterShapes to be attached to the locator/entities scale, rotation, and/or position. Position is true by default.
- Galarica Nut bushes now generate on beaches

 ### Pokémon Added

@@ -238,9 +231,6 @@
 - Healing Machine recipe rebalanced.
 - Reorganised the `block` texture folder to be more organised, in line with the `item` texture folder.
 - Offset in EmitterShape now ignores scale to be more like Blockbench by default. You can get this behaviour back by adding `"scale": true` in the `attachment_options` property in most EmitterShapes.
- Not specifying a dex in `/pokedex printcalculations {player} {dex}` will now print the National Dex statistics instead of showing all dexes. `/pokedex printcalculations {player} all` is how to view all dex statistics in one command.
- Removed Braised Vivichoke
- Updated Pokémon state icons shown in party interfaces

 ### Fixes
 - Fixed game crashing when removing national pokedex using datapacks
@@ -270,7 +260,6 @@
 - Fixed Pokémon marked as silent still playing shiny sounds and effects.
 - Fixed an issue with newer versions of Fabric API where underground Pokémon were spawning in The End.
 - Fixed spawning not working well when you're at high points surrounded by lower altitude spawning areas, such as flying.
- Fixed some Pokémon having erroneous tutor moves if another move included a valid tutor move as a substring.
 - Fixed certain Pokémon with forms not having appropriate stock Pokédex entries.
 - Fixed issue with Pokédex Scanner that caused the open/close overlay to have the wrong opacity values
 - Fixed dragon's breath not being usable on the restoration tank when it should be
@@ -306,10 +295,6 @@
 - Fixed Pokédex Scanner not respecting the "Invert Mouse" option.
 - Fixed a crash due to a ConcurrentModificationException that could occur during world generation.
 - Fixed Moon Ball moon phase logic to actually work correctly
- Fixed `/pokedex printcalculations` to now show the correct percentage completed of the Pokedex
- Fixed mod incompatibility with the `Raised` mod
- Fixed a vulnerability that could cause party and PC rollbacks under specific circumstances.
- Fixed a rare edge case where sorting your PC could be rolled back later.

 ### Developer
 - A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
@@ -328,11 +313,6 @@
 - Updated NPCEntity pokeball throw positioning to properly account for the baseScale property.
 - Fixed `[Pokemon].copyFrom` error causing forms, IVs, and EVs to not be applied properly when using `[Pokemon].loadFromJSON` or `[Pokemon].loadFromNBT`
 - Added new item class, `WearableItem`. Instances of this class should have a corresponding 3D model. These models render when the items display context is `HEAD`.
- Added new LearnsetQuery types:
-  - `LEGAL` for moves that are innately compatible and learnable by the Pokémon.
-  - `LEGACY` for moves that were once officially learnable by the Pokémon but aren't due to GameFreak's re-balancing.
-  - `SPECIAL` for moves that are not learnable by the Pokémon but may have appeared in a special event or distribution.
-
 - Pokemon now have a fireImmune attribute in their behaviour that can be set to true to ignore all fire damage (lava, magma blocks, etc.)
  `JSON
  {
@@ -344,14 +324,12 @@
 - The IVs class has now been extended to include Hyper Trained values.
 - Added `Pokemon#hyperTrainIV()` and `IVs#setHyperTrainedIV(Stat, Int)`.
 - Added `HyperTrainedIvEvent.Pre` and `HyperTrainedIvEvent.Post`.
- Added `Pokemon#validateMoveSet()` to validate an existing Pokemon's moveset, clearing illegal moves.
 - Added a `hoverText` option to PartySelectCallback, to display a tooltip on hovering over a Pokémon in the selection screen.
 - `PokemonEntity` instances spawned into the world now appropriately finalize the spawn for mod compatibility.
 - Added PokedexManager.obtain as a replacement for .catch which is not a friendly function name in Java.

 - Added `Pokemon#hyperTrainIV()` and `IVs#setHyperTrainedIV(Stat, Int)`
- `ElementalType` now implements `ShowdownIdentifiable` to ensure the communcation with showdown stays consistent (also in regards to TeraTypes)
- Pokemon no longer have a change observable
+- `ElementalType` now implelments `ShowdownIdentifiable` to ensure the communcation with showdown stays consistent (also in regards to TeraTypes)
  
 ### 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)
@@ -370,9 +348,6 @@
 - Added `pokemon` as an available Molang function for the `battleActor` functions.
 - Fixed `heldItem` property inside spawn files not working and causing crashes
 - Fixed `spawn_bedrock_particles` MoLang causing crashes when used in a server environment
- The following move sources are now valid for the `moves` array in species data:
-  - `legacy:{move}`
-  - `special:{move}`
 - The Pokédex form lang key definition now follows `cobblemon.ui.pokedex.info.form.{species}-{formname}` instead of `cobblemon.ui.pokedex.info.form.{formname}`.
 - Added `play_sound_on_server` as an available Molang function for the `worldHolder` & `player` functions.
 - Added `run_molang_after` as an available Molang function for the `entity` functions when schedulable.
@@ -382,23 +357,9 @@
 - The format of the `remedies.json` file has changed to allow for individual friendshipDrop amounts per remedy
 - Fixed `entity.find_nearby_block` causing crashes when attempting to use a block tag
 - Spawn Filters can now access `v.spawn.class` to get the identifier of an NPC class for when trying to influence NPC spawns
- Added Molang functions for Party and PC: `set_pokemon`
- Added Molang functions for Pokémon: `pokeball`, `held_item`, `remove_held_item`, `hyper_train_iv`, `validate_moveset`, `initialize_moveset`, and `add_exp`.
- Added Molang functions for Pokémon: `aspects`, `form_aspects`, `unlearn_move`, `teach_learnable_moves`, `cosmetic_item`, and `remove_cosmetic_item`.
- Added Molang functions for Pokémon: `ability`, `set_iv`, `set_ev`, `teach_move`, and `can_learn_move`.
- Adds Flows for `STARTER_CHOSEN`, `SHOULDER_MOUNTED`, `EV_GAINED`, `POKEMON_RELEASED`, `POKEMON_NICKNAMED`, `HELD_ITEM`, and `TRADE_COMPLETED` events
- Adds Flows for `POKEMON_HEALED`, `POKEMON_SCANNED`, `BERRY_HARVEST`, `LOOT_DROPPED`, `POKEMON_SEEN`, `COLLECT_EGG`, `HATCH_EGG`, and `EXPERIENCE_GAINED`.
- Adds Flows for `POKEMON_CATCH_RATE`, `BAIT_SET`, `BAIT_SET_PRE`, `BAIT_CONSUMED`, `POKEROD_CAST_PRE`, `POKEROD_CAST_POST`, `POKEROD_REEL`, and `BOBBER_SPAWN_POKEMON_PRE`.
- Adds Flows for `POKEMON_ASPECTS_CHANGED`, `FRIENDSHIP_UPDATED`, `CHANGE_PC_BOX_WALLPAPER_EVENT_PRE`, `CHANGE_PC_BOX_WALLPAPER_EVENT_POST`, and `FULLNESS_UPDATED`.
- MoLang triggered battles may now set the battle format, whether to clone the player's party, set level, or heal prior.
- Added Molang function for Player: `inventory`
 - Adds Flows for `STARTER_CHOSEN`, `EV_GAINED`, `POKEMON_RELEASED`, `POKEMON_NICKNAMED`, `HELD_ITEM`, and `TRADE_COMPLETED` events
- Adds Pokemon functions for `pokeball`, `held_item`, `remove_held_item`, `add_aspects`, and `remove_aspects`
+- Adds Pokemon functions for `pokeball`, `held_item` and `remove_held_item`
 - Added `pokemon.hyper_train_iv` as an available Molang function.
- Added `prepare_{effect}` and `damage_{effect}` action effect hooks in battles for more battle particle effects.
- Added `q.has_argument(<argument_name>, [argument_value])` MoLang function to several battle-related action effect contexts.
- Added `q.has_argument_at(<index>, [argument_value])` MoLang function to several battle-related action effect contexts.
- Added `q.hit_count` MoLang function to move action effect contexts.

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

@@ -1,17 +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.duck;
-
-public interface ChannelDuck {
-    void cobblemon$applyLowPassFilter(float gain, float hfGain);
-    void cobblemon$inverseAttenuation(float rolloffFactor);
-    void cobblemon$clearFilters();
-
-//    void cobblemon$exponentialAttenuation(float rolloff, float refDistance, float maxDistance);
-}
@@ -1,15 +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.duck;
-
-import org.joml.Vector3f;
-
-public interface ServerEntityDuck {
-	void setDriverInput(Vector3f driverInput);
-}
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-import com.cobblemon.mod.common.duck.ChannelDuck;
-import com.mojang.blaze3d.audio.Channel;
-import org.lwjgl.openal.AL10;
-import org.lwjgl.openal.EXTEfx;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-@Mixin(Channel.class)
-public abstract class ChannelMixin implements ChannelDuck {
-
-    @Shadow
-    private int source;
-
-    // Id of filter applied when sound is obstructed
-    private int cobblemon$lowPassFilterId = 0;
-
-    @Override
-    public void cobblemon$applyLowPassFilter(float gain, float hfGain) {
-        // Delete old filter if it exists
-        if (cobblemon$lowPassFilterId != 0) {
-            AL10.alSourcei(source, EXTEfx.AL_DIRECT_FILTER, 0); // Detach filter from source
-            EXTEfx.alDeleteFilters(cobblemon$lowPassFilterId);  // Delete old filter
-            cobblemon$lowPassFilterId = 0;
-        }
-
-        // Generate a fresh filter
-        int filterId = EXTEfx.alGenFilters();
-        if (!EXTEfx.alIsFilter(filterId)) {
-            System.err.println("Failed to create OpenAL low-pass filter");
-            return;
-        }
-
-        EXTEfx.alFilteri(filterId, EXTEfx.AL_FILTER_TYPE, EXTEfx.AL_FILTER_LOWPASS);
-        EXTEfx.alFilterf(filterId, EXTEfx.AL_LOWPASS_GAIN, gain);
-        EXTEfx.alFilterf(filterId, EXTEfx.AL_LOWPASS_GAINHF, hfGain);
-
-        AL10.alSourcei(source, EXTEfx.AL_DIRECT_FILTER, filterId);
-
-        // Save the new filter ID
-        cobblemon$lowPassFilterId = filterId;
-    }
-
-    @Override
-    public void cobblemon$inverseAttenuation(float rolloffFactor) {
-        AL10.alSourcei(source, AL10.AL_DISTANCE_MODEL, AL10.AL_INVERSE_DISTANCE);
-        AL10.alSourcef(source, AL10.AL_ROLLOFF_FACTOR,    rolloffFactor);
-        AL10.alSourcef(source, AL10.AL_REFERENCE_DISTANCE, 1.0f);
-        AL10.alSourcef(source, AL10.AL_MAX_DISTANCE,       0.0f);
-    }
-
-    @Override
-    public void cobblemon$clearFilters() {
-        AL10.alSourcei(source, EXTEfx.AL_DIRECT_FILTER, 0);
-
-        if (EXTEfx.alIsFilter(cobblemon$lowPassFilterId)) {
-            EXTEfx.alDeleteFilters(cobblemon$lowPassFilterId);
-            cobblemon$lowPassFilterId = 0;
-        }
-    }
-}
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.LightningBolt;
-import net.minecraft.world.phys.AABB;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.List;
-
-
-@Mixin(LightningBolt.class)
-public abstract class LightningBoltMixin {
-
-    @Inject(method = "spawnFire", at = @At(value = "Head"), cancellable = true)
-    private void cobblemon$spawnFire(int extraIgnitions, CallbackInfo ci) {
-        // This prevents fire from spawning around Pokemon who otherwise should be immune to lightning and effectively absorb the hit
-        final LightningBolt lightningBolt = (LightningBolt) (Object) this;
-        List<Entity> list = lightningBolt.level().getEntities(
-                lightningBolt,
-                new AABB(lightningBolt.getX() - 2.0, lightningBolt.getY() - 2.0, lightningBolt.getZ() - 2.0, lightningBolt.getX() + 2.0, lightningBolt.getY() + 2.0, lightningBolt.getZ() + 2.0),
-                it -> {
-                    if (!it.isAlive() || !(it instanceof PokemonEntity)) {
-                        return false;
-                    }
-                    String abilityName = ((PokemonEntity) it).getPokemon().getAbility().getName();
-                    return abilityName.equals("lightningrod") || abilityName.equals("voltabsorb") || abilityName.equals("motordrive");
-                });
-        if (!list.isEmpty()) {
-            ci.cancel();
-        }
-    }
-}
@@ -9,13 +9,21 @@
 package com.cobblemon.mod.common.mixin;

 import com.cobblemon.mod.common.CobblemonItems;
-import net.minecraft.world.entity.monster.piglin.PiglinAi;
+import com.cobblemon.mod.common.CobblemonMemories;
+import com.cobblemon.mod.common.entity.ai.PiglinDanceTarget;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.world.entity.monster.piglin.*;
+import net.minecraft.world.entity.schedule.Activity;
 import net.minecraft.world.item.ItemStack;
 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

+import java.util.*;
+

@Mixin(PiglinAi.class)
 public class PiglinBarterMixin {
@@ -29,5 +37,31 @@ public class PiglinBarterMixin {
        }
    }

+    @Inject(method = "makeBrain", at = @At("TAIL"), cancellable = true)
+    private static void cobblemon$makeBrain(Piglin piglin, Brain<Piglin> brain, CallbackInfoReturnable<Brain<?>> cir) {
+        // Get access to private task map
+        brain.addActivityAndRemoveMemoryWhenStopped(Activity.INVESTIGATE, 10,
+                ImmutableList.of(
+                        new PiglinDanceTarget()
+                ), CobblemonMemories.INSTANCE.getNEAREST_LOVED_ENTITY());
+    }

+    @Redirect(
+            method = "updateActivity(Lnet/minecraft/world/entity/monster/piglin/Piglin;)V",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/world/entity/ai/Brain;setActiveActivityToFirstValid(Ljava/util/List;)V"
+            )
+    )
+    private static void redirectSetActiveActivityToFirstValid(
+            Brain<Piglin> brain,
+            List<Activity> originalList
+    ) {
+        // Add new activity to the front
+        List<Activity> newList = new ArrayList<>(List.of(Activity.INVESTIGATE));
+        newList.addAll(originalList);
+
+        // Call original method with modified list
+        brain.setActiveActivityToFirstValid(newList);
+    }
 }
@@ -9,10 +9,19 @@
 package com.cobblemon.mod.common.mixin;

 import com.cobblemon.mod.common.CobblemonItems;
+import com.cobblemon.mod.common.CobblemonMemories;
+import com.cobblemon.mod.common.CobblemonSensors;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.sensing.Sensor;
+import net.minecraft.world.entity.ai.sensing.SensorType;
 import net.minecraft.world.entity.monster.piglin.Piglin;
 import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -28,4 +37,27 @@ public abstract class PiglinEntityMixin  {
            ci.cancel();
        }
    }
+
+    @Shadow
+    @Final
+    @Mutable
+    private static ImmutableList<SensorType<? extends Sensor<? super Piglin>>> SENSOR_TYPES;
+
+    @Shadow
+    @Final
+    @Mutable
+    private static ImmutableList<MemoryModuleType<?>> MEMORY_TYPES;
+
+    @Inject(method = "<clinit>", at = @At("TAIL"))
+    private static void cobblemon$onInit(CallbackInfo ci) {
+        SENSOR_TYPES = ImmutableList.<SensorType<? extends Sensor<? super Piglin>>>builder()
+                .addAll(SENSOR_TYPES)
+                .add(CobblemonSensors.INSTANCE.getNEARBY_PIGLIN_LOVED_POKEMON())
+                .build();
+        MEMORY_TYPES = ImmutableList.<MemoryModuleType<?>>builder()
+                .addAll(MEMORY_TYPES)
+                .add(CobblemonMemories.INSTANCE.getNEAREST_LOVED_ENTITY())
+                .build();
+
+    }
 }
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.memory.NearestVisibleLivingEntities;
+import net.minecraft.world.entity.ai.sensing.PiglinSpecificSensor;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Optional;
+
+@Mixin(PiglinSpecificSensor.class)
+public abstract class PiglinSpecificSensorMixin {
+
+    @Inject(method = "doTick", at = @At("TAIL"))
+    protected void cobblemon$doTick(ServerLevel level, LivingEntity entity, CallbackInfo ci) {
+        Brain<?> brain = entity.getBrain();
+        if (!brain.hasMemoryValue(MemoryModuleType.NEAREST_VISIBLE_ZOMBIFIED)) {
+            NearestVisibleLivingEntities nearestVisibleLivingEntities = brain.getMemory(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES).orElse(NearestVisibleLivingEntities.empty());
+            Optional<LivingEntity> fearedEntity = Optional.empty();
+            for (LivingEntity livingEntity : nearestVisibleLivingEntities.findAll((x) -> true)) {
+                if (fearedEntity.isEmpty() && livingEntity instanceof PokemonEntity && ((PokemonEntity) livingEntity).getPokemon().getSpecies().getBehaviour().getEntityInteract().getAvoidedByPiglin()) {
+                    fearedEntity = Optional.of(livingEntity);
+                    brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_ZOMBIFIED, livingEntity);
+                }
+            }
+        }
+    }
+}
@@ -12,11 +12,9 @@ import com.cobblemon.mod.common.CobblemonNetwork;
 import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.api.net.NetworkPacket;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
-import com.cobblemon.mod.common.duck.ServerEntityDuck;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.mixin.accessor.ChunkMapAccessor;
 import com.cobblemon.mod.common.mixin.accessor.TrackedEntityAccessor;
-import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateDriverInputPacket;
 import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateOrientationPacket;
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.ClientboundUpdateRidingStatePacket;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@@ -28,7 +26,6 @@ import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerPlayerConnection;
 import net.minecraft.world.entity.Entity;
 import org.joml.Matrix3f;
-import org.joml.Vector3f;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -41,7 +38,7 @@ import java.util.Set;
 import java.util.function.Consumer;

@Mixin(ServerEntity.class)
-public abstract class ServerEntityMixin implements ServerEntityDuck {
+public abstract class ServerEntityMixin {

    @Shadow
    @Final
@@ -53,16 +50,11 @@ public abstract class ServerEntityMixin implements ServerEntityDuck {
    private Matrix3f cobblemon$lastSentOrientation;
    @Unique
    private boolean cobblemon$lastSentActive;
-    @Unique
-    private Vector3f cobblemon$driverInput;
-    @Unique
-    private Vector3f cobblemon$lastSentDriverInput;

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

    private void cobblemon$sendRidingStateChanges() {
@@ -90,17 +82,6 @@ public abstract class ServerEntityMixin implements ServerEntityDuck {
        cobblemon$broadcast(new ClientboundUpdateOrientationPacket(currOrientation, currActive, entity.getId()));
    }

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

-    @Override
-    public void setDriverInput(Vector3f driverInput) {
-        cobblemon$driverInput = driverInput;
-    }

 }
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.phys.AABB;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.List;
-import java.util.Optional;
-
-
-@Mixin(ServerLevel.class)
-public abstract class ServerLevelMixin {
-
-    @Inject(method = "findLightningRod", at = @At(value = "RETURN"), cancellable = true)
-    private void cobblemon$findLightningRod(BlockPos blockPos, CallbackInfoReturnable<Optional<BlockPos>> ci) {
-        final ServerLevel serverLevel = (ServerLevel) (Object) this;
-        if (ci.getReturnValue().isEmpty()) {
-            // Search for Pokemon with the ability Lightning Rod and redirect to them
-            AABB aABB = AABB.encapsulatingFullBlocks(blockPos, new BlockPos(blockPos.atY(serverLevel.getMaxBuildHeight()))).inflate(64.0);
-            List<LivingEntity> list = serverLevel.getEntitiesOfClass(LivingEntity.class, aABB, (livingEntity) -> livingEntity != null
-                    && livingEntity.isAlive()
-                    && livingEntity instanceof PokemonEntity
-                    && ((PokemonEntity) livingEntity).getBeamMode() == 0
-                    && ((PokemonEntity) livingEntity).getPokemon().getAbility().getName().equals("lightningrod"));
-            if (!list.isEmpty()) {
-                ci.setReturnValue(Optional.of((list.get(serverLevel.random.nextInt(list.size()))).blockPosition()));
-            }
-        }
-    }
-}
@@ -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.mixin;
-
-import com.cobblemon.mod.common.block.HeartyGrainsBlock;
-import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.WorldGenLevel;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.DoublePlantBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
-import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
-import net.minecraft.world.level.levelgen.feature.SimpleBlockFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration;
-import org.spongepowered.asm.mixin.Debug;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(SimpleBlockFeature.class)
-@Debug(export = true, print = true)
-public class SimpleBlockFeatureMixin {
-    //this mixin inserts the logic needed to ensure that when hearty grains are of a certain age, they place with the upper block too
-    //similarly to what the doubleblock logic is here
-    @Inject(method = "place", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;canSurvive(Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;)Z", shift = At.Shift.AFTER), cancellable = true)
-    public void place(FeaturePlaceContext<SimpleBlockConfiguration> context, CallbackInfoReturnable<Boolean> cir,
-                      @Local BlockState blockState, @Local BlockPos blockPos, @Local WorldGenLevel worldGenLevel) {
-        if (!(blockState.getBlock() instanceof HeartyGrainsBlock)) {
-            return;
-        }
-        if (blockState.getValue(HeartyGrainsBlock.Companion.getAGE()) <= HeartyGrainsBlock.AGE_AFTER_HARVEST) {
-            return; //block is too young to be double
-        }
-        if (!worldGenLevel.isEmptyBlock(blockPos.above())) {
-            cir.setReturnValue(false); //no space for the 2nd block above
-            return;
-        }
-        DoublePlantBlock.placeAt(worldGenLevel, blockState, blockPos, Block.UPDATE_CLIENTS);
-        cir.setReturnValue(true);
-    }
-}
@@ -8,33 +8,23 @@

 package com.cobblemon.mod.common.mixin;

-import com.cobblemon.mod.common.api.riding.sound.RideAttenuationModel;
-import com.cobblemon.mod.common.api.riding.sound.RideLoopSound;
 import com.cobblemon.mod.common.client.sound.BattleMusicController;
-import com.cobblemon.mod.common.duck.ChannelDuck;
 import com.cobblemon.mod.common.duck.SoundEngineDuck;
 import com.google.common.collect.Multimap;
-import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.blaze3d.audio.Channel;
-import net.minecraft.client.resources.sounds.Sound;
 import net.minecraft.client.resources.sounds.SoundInstance;
-import net.minecraft.client.resources.sounds.TickableSoundInstance;
 import net.minecraft.client.sounds.ChannelAccess;
 import net.minecraft.client.sounds.SoundEngine;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

-import java.util.Iterator;
 import java.util.Map;

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

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

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

-import net.minecraft.server.level.ServerEntity;
 import net.minecraft.server.network.ServerPlayerConnection;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -19,7 +18,4 @@ import java.util.Set;
 public interface TrackedEntityAccessor {
    @Accessor("seenBy")
    Set<ServerPlayerConnection> getSeenBy();
-
-    @Accessor("serverEntity")
-    ServerEntity getServerEntity();
 }
@@ -9,21 +9,22 @@
 package com.cobblemon.mod.common.mixin.client;

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

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

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

-        return original;
+        return input;
    }
+
 }
@@ -19,7 +19,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel;
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.net.messages.server.orientation.ServerboundUpdateOrientationPacket;
-import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateDriverInputPacket;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.CameraType;
 import net.minecraft.client.Minecraft;
@@ -84,13 +83,6 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
        controllable.getOrientationController().setActive(shouldUseCustomOrientation);
    }

-    @Inject(method = "rideTick", at = @At("HEAD"))
-    private void cobblemon$updateDriverInputRideTick(CallbackInfo ci) {
-        if (Minecraft.getInstance().player != (Object)this) return;
-        if (!(this.getVehicle() instanceof PokemonEntity pokemonEntity)) return;
-        CobblemonNetwork.INSTANCE.sendToServer(new ServerboundUpdateDriverInputPacket(this.xxa, this.zza, this.jumping, this.isShiftKeyDown()));
-    }
-
    @Unique
    private boolean cobblemon$shouldUseCustomOrientation(LocalPlayer player) {
        var playerVehicle = player.getVehicle();
@@ -135,7 +127,7 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
                return super.pick(hitDistance, partialTicks, hitFluids);
            }

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

            OrientationController controller = this.getOrientationController();

@@ -15,7 +15,6 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(Entity.class)
@@ -30,19 +29,4 @@ public abstract class EntityMixin {
        }
    }

-    @Redirect(
-            method = "collide(Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3;",
-            at = @At(
-                    value = "INVOKE",
-            target = "Lnet/minecraft/world/entity/Entity;onGround()Z"
-    )
-    )
-    private boolean cobblemon$forceOnGroundForStepUp(Entity entity) {
-        if (entity instanceof PokemonEntity pokemon && entity.hasControllingPassenger()) {
-            return true;
-        }
-        return entity.onGround();
-    }
-
-
 }
@@ -75,7 +75,6 @@ import com.cobblemon.mod.common.config.constraint.IntConstraint
 import com.cobblemon.mod.common.config.starter.StarterConfig
 import com.cobblemon.mod.common.data.CobblemonDataProvider
 import com.cobblemon.mod.common.events.AdvancementHandler
-import com.cobblemon.mod.common.events.EntityCallbackHandler
 import com.cobblemon.mod.common.events.FlowHandler
 import com.cobblemon.mod.common.events.PokedexHandler
 import com.cobblemon.mod.common.events.ServerTickHandler
@@ -314,7 +313,6 @@ object Cobblemon {
        CobblemonEvents.POKEMON_PROPERTY_INITIALISED.emit(Unit)

        FlowHandler.setup()
-        EntityCallbackHandler.setup()

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

    fun register(activity: Activity): Activity {
        activities.add(activity)
@@ -78,9 +78,6 @@ object CobblemonBehaviours : JsonDataRegistry<CobblemonBehaviour> {
     */
    val autoPokemonBehaviours = mutableListOf<CobblemonBehaviour>()

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

    override fun sync(player: ServerPlayer) {
@@ -97,8 +94,6 @@ object CobblemonBehaviours : JsonDataRegistry<CobblemonBehaviour> {
                    val behaviour = parse(reader, resolvedIdentifier)
                    if ("pokemon/auto/" in identifier.path) {
                        autoPokemonBehaviours.add(behaviour)
-                    } else if ("npc/auto/" in identifier.path) {
-                        autoNPCBehaviours.add(behaviour)
                    }
                    data[resolvedIdentifier] = behaviour
                }
@@ -93,8 +93,6 @@ object CobblemonFlows : DataRegistry {
        functions: Map<String, (MoParams) -> Any> = emptyMap(),
        cancelable: Cancelable? = null
    ) {
-        if (eventResourceLocation !in flows) return
-
        if (cancelable == null) {
            runtime.environment.query.functions.remove("cancel")
        } else {
@@ -389,28 +389,40 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    val SWEET_HEART = noSettingsItem("sweet_heart") // todo make a SweetHeartItem class for breeding purposes

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

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

    // todo we might need to wait on these for later? These impact battles and may be harder to do
    /*@JvmField
@@ -423,22 +435,30 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val POTATO_MOCHI = create("potato_mochi", CobblemonItem(Properties().stacksTo(16)
        .food(FoodProperties.Builder()
-            .nutrition(8)
-            .saturationModifier(0.2375F)
+            .nutrition(10) // todo get final values for this from vera
+            .saturationModifier(1.2F) // todo get final values for this from vera
+            .alwaysEdible()
+            .build())))
+    @JvmField
+    val FRIED_RICE = create("fried_rice", CobblemonItem(Properties().stacksTo(16)
+        .food(FoodProperties.Builder()
+            .nutrition(10) // todo get final values for this from vera
+            .saturationModifier(1.2F) // todo get final values for this from vera
+            .alwaysEdible()
            .build())))
    @JvmField
    val CANDIED_APPLE = create("candied_apple",  CobblemonItem(Properties().stacksTo(16)
        .food(FoodProperties.Builder()
-            .nutrition(6)
-            .saturationModifier(0.2335F)
-            .usingConvertsTo(Items.STICK)
+            .nutrition(10) // todo get final values for this from vera
+            .saturationModifier(1.2F) // todo get final values for this from vera
+            .alwaysEdible()
            .build())))
    @JvmField
    val CANDIED_BERRY = create("candied_berry",  CobblemonItem(Properties().stacksTo(16)
        .food(FoodProperties.Builder()
-            .nutrition(5)
-            .saturationModifier(0.22F)
-            .usingConvertsTo(Items.STICK)
+            .nutrition(10) // todo get final values for this from vera
+            .saturationModifier(1.2F) // todo get final values for this from vera
+            .alwaysEdible()
            .build())))

    //@JvmField
@@ -665,12 +685,14 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val MEDICINAL_LEEK = heldItem("medicinal_leek", MedicinalLeekItem(CobblemonBlocks.MEDICINAL_LEEK, Item.Properties().food(FoodProperties.Builder().fast().nutrition(1).saturationModifier(0.2f).build())), "leek")
    @JvmField
-    val ROASTED_LEEK = compostableItem("roasted_leek", CobblemonItem(Item.Properties().food(FoodProperties.Builder().fast().nutrition(3).saturationModifier(0.2f).build())), 0.85f)
+    val ROASTED_LEEK = compostableItem("roasted_leek", CobblemonItem(Item.Properties().food(FoodProperties.Builder().fast().nutrition(3).saturationModifier(0.3f).build())), 0.85f)
+    @JvmField
+    val BRAISED_VIVICHOKE = compostableItem("braised_vivichoke", foodItem(6, 0.6F), 0.85f)
    @JvmField
    val VIVICHOKE_DIP = create("vivichoke_dip", object : CobblemonItem(Properties().stacksTo(1)
        .food(FoodProperties.Builder()
            .nutrition(10)
-            .saturationModifier(0.6F)
+            .saturationModifier(1.2F)
            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
            .alwaysEdible()
            .usingConvertsTo(Items.BOWL)
@@ -681,7 +703,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
        }
    })
    @JvmField
-    val ENERGY_ROOT = compostableItem("energy_root", EnergyRootItem(CobblemonBlocks.ENERGY_ROOT, Properties()), 0.60f)
+    val ENERGY_ROOT = compostableItem("energy_root", EnergyRootItem(CobblemonBlocks.ENERGY_ROOT, Item.Properties().food(FoodProperties.Builder().nutrition(1).fast().saturationModifier(0.2f).build())), 0.60f)
    @JvmField
    val REVIVAL_HERB = compostableItem("revival_herb", RevivalHerbItem(CobblemonBlocks.REVIVAL_HERB))
    @JvmField
@@ -711,7 +733,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val HEAL_POWDER = create("heal_powder", HealPowderItem())
    @JvmField
-    val LEEK_AND_POTATO_STEW = create("leek_and_potato_stew", CobblemonItem(Item.Properties().food(FoodProperties.Builder().nutrition(6).saturationModifier(0.6f).usingConvertsTo(Items.BOWL).build()).stacksTo(1)))
+    val LEEK_AND_POTATO_STEW = create("leek_and_potato_stew", CobblemonItem(Item.Properties().food(FoodProperties.Builder().nutrition(8).saturationModifier(0.6f).usingConvertsTo(Items.BOWL).build()).stacksTo(1)))
    @JvmField
    val REVIVE = create("revive", ReviveItem(max = false))
    @JvmField
@@ -1522,6 +1544,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
        stacksTo: Int,
        nutrition: Int,
        saturationModifier: Float,
+        effect: MobEffectInstance? = null,
+        effectChance: Float? = null,
        alwaysEdible: Boolean = false,
        convertsToOnUse: ItemStack? = null
    ): RegionalFoodItem {
@@ -1529,6 +1553,10 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
            .nutrition(nutrition)
            .saturationModifier(saturationModifier)

+        if (effect != null && effectChance != null) {
+            foodPropertiesBuilder.effect(effect, effectChance)
+        }
+
        if (alwaysEdible == true) {
            foodPropertiesBuilder.alwaysEdible()
        }
@@ -9,9 +9,9 @@
 package com.cobblemon.mod.common

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

    fun <U> register(id: String, codec: Codec<U>): MemoryModuleType<U> {
        val memoryModule = MemoryModuleType(Optional.of(codec))
@@ -24,7 +24,6 @@ import com.cobblemon.mod.common.client.net.data.UnlockReloadPacketHandler
 import com.cobblemon.mod.common.client.net.dialogue.DialogueClosedHandler
 import com.cobblemon.mod.common.client.net.dialogue.DialogueOpenedHandler
 import com.cobblemon.mod.common.client.net.effect.RunPosableMoLangHandler
-import com.cobblemon.mod.common.client.net.effect.SaccharineLogBlockParticlesHandler
 import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormEntityParticleHandler
 import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormParticleHandler
 import com.cobblemon.mod.common.client.net.gui.InteractPokemonUIPacketHandler
@@ -41,7 +40,6 @@ import com.cobblemon.mod.common.client.net.pasture.UpdatePastureConflictFlagHand
 import com.cobblemon.mod.common.client.net.pokedex.ServerConfirmedRegisterHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.ClientboundUpdateRidingStateHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.PokemonUpdatePacketHandler
-import com.cobblemon.mod.common.client.net.riding.ClientboundUpdateDriverInputHandler
 import com.cobblemon.mod.common.client.net.settings.OpenCobblemonConfigEditorHandler
 import com.cobblemon.mod.common.client.net.settings.ServerSettingsPacketHandler
 import com.cobblemon.mod.common.client.net.sound.UnvalidatedPlaySoundS2CPacketHandler
@@ -79,12 +77,10 @@ import com.cobblemon.mod.common.net.messages.client.data.*
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueClosedPacket
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueOpenedPacket
 import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
-import com.cobblemon.mod.common.net.messages.client.effect.SaccharineLogBlockParticlesPacket
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormParticlePacket
 import com.cobblemon.mod.common.net.messages.client.npc.CloseNPCEditorPacket
 import com.cobblemon.mod.common.net.messages.client.npc.OpenNPCEditorPacket
-import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateDriverInputPacket
 import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateOrientationPacket
 import com.cobblemon.mod.common.net.messages.client.pasture.ClosePasturePacket
 import com.cobblemon.mod.common.net.messages.client.pasture.OpenPasturePacket
@@ -175,7 +171,6 @@ import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetMarkingsPa
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.ServerboundUpdateRidingStatePacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
 import com.cobblemon.mod.common.net.messages.server.riding.DismountPokemonPacket
-import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateDriverInputPacket
 import com.cobblemon.mod.common.net.messages.server.starter.RequestStarterScreenPacket
 import com.cobblemon.mod.common.net.messages.server.storage.SwapPCPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.MovePartyPokemonPacket
@@ -226,7 +221,6 @@ import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetActiveMarkH
 import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetMarkingsHandler
 import com.cobblemon.mod.common.net.serverhandling.pokemon.update.ServerboundUpdateRidingStateHandler
 import com.cobblemon.mod.common.net.serverhandling.riding.DismountPokemonPacketHandler
-import com.cobblemon.mod.common.net.serverhandling.riding.DriverInputPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.starter.RequestStarterScreenHandler
 import com.cobblemon.mod.common.net.serverhandling.starter.SelectStarterPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.BenchMoveHandler
@@ -408,7 +402,6 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler))
        list.add(PacketRegisterInfo(SpawnSnowstormEntityParticlePacket.ID, SpawnSnowstormEntityParticlePacket::decode, SpawnSnowstormEntityParticleHandler))
        list.add(PacketRegisterInfo(RunPosableMoLangPacket.ID, RunPosableMoLangPacket::decode, RunPosableMoLangHandler))
-        list.add(PacketRegisterInfo(SaccharineLogBlockParticlesPacket.ID, SaccharineLogBlockParticlesPacket::decode, SaccharineLogBlockParticlesHandler))

        // Hax
        list.add(PacketRegisterInfo(UnvalidatedPlaySoundS2CPacket.ID, UnvalidatedPlaySoundS2CPacket::decode, UnvalidatedPlaySoundS2CPacketHandler))
@@ -469,7 +462,6 @@ object CobblemonNetwork {

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

        return list
    }
@@ -576,7 +568,6 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(ServerboundUpdateRidingStatsPacket.ID, ServerboundUpdateRidingStatsPacket::decode, ServerboundUpdateRidingStatsHandler))
        list.add(PacketRegisterInfo(ServerboundUpdateRidingStatRangePacket.ID, ServerboundUpdateRidingStatRangePacket::decode, ServerboundUpdateRidingStatRangeHandler))
        list.add(PacketRegisterInfo(DismountPokemonPacket.ID, DismountPokemonPacket::decode, DismountPokemonPacketHandler))
-        list.add(PacketRegisterInfo(ServerboundUpdateDriverInputPacket.ID, ServerboundUpdateDriverInputPacket::decode, DriverInputPacketHandler))

        // Cooking
        list.add(PacketRegisterInfo(ToggleCookingPotLidPacket.ID, ToggleCookingPotLidPacket::decode, ToggleCookingPotLidHandler))
@@ -8,7 +8,11 @@

 package com.cobblemon.mod.common

-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.*
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.DefendOwnerSensor
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.DrowsySensor
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.PokemonAdultSensor
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.PokemonGrowableCropSensor
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.PokemonPiglinLovedSensor
 import com.cobblemon.mod.common.pokemon.ai.PokemonDisturbancesSensor
 import com.cobblemon.mod.common.entity.sensor.BattlingPokemonSensor
 import com.cobblemon.mod.common.entity.sensor.NPCBattlingSensor
@@ -33,9 +37,7 @@ object CobblemonSensors {

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

-    val NEARBY_BEE_HIVE = register("nearby_bee_hive", ::BeeHiveSensor)
-
-    val NEARBY_FLOWER = register("nearby_flower", ::FlowerSensor)
+    val NEARBY_PIGLIN_LOVED_POKEMON = register("nearby_golden_pokemon", ::PokemonPiglinLovedSensor)

    fun <E : Entity, U : Sensor<E>> register(id: String, supplier: Supplier<U>): SensorType<U> {
        val sensor = SensorType(supplier)
@@ -275,11 +275,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
        RELIC_COIN_SACK_STEP
    )

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

-
-
    @JvmField
    val TUMBLESTONE_SOUNDS = SoundType(1f, 1.1f,
        TUMBLESTONE_BREAK,
@@ -8,15 +8,8 @@

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

-import com.bedrockk.molang.runtime.MoLangRuntime
 import com.cobblemon.mod.common.api.ai.config.BehaviourConfig
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.api.scripting.CobblemonScripts
 import com.cobblemon.mod.common.entity.MoLangScriptingEntity
-import com.cobblemon.mod.common.util.resolve
-import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.serialization.Dynamic
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity
@@ -35,9 +28,6 @@ class BehaviourConfigurationContext {
    val memories = mutableSetOf<MemoryModuleType<*>>()
    val sensors = mutableSetOf<SensorType<*>>()

-    val onAddScripts = mutableListOf<ResourceLocation>()
-    val onAdd = mutableListOf<ExpressionLike>()
-
    fun getOrCreateActivity(activity: Activity): ActivityConfigurationContext {
        return activities.firstOrNull { it.activity == activity } ?: ActivityConfigurationContext(activity).also(activities::add)
    }
@@ -58,14 +48,6 @@ class BehaviourConfigurationContext {
        this.sensors.addAll(sensors)
    }

-    fun addOnAddScript(script: ResourceLocation) {
-        onAddScripts.add(script)
-    }
-
-    fun addOnAddScript(script: ExpressionLike) {
-        onAdd.add(script)
-    }
-
    fun apply(entity: LivingEntity, behaviourConfigs: List<BehaviourConfig>, dynamic: Dynamic<*>) {

        if (entity is MoLangScriptingEntity) {
@@ -80,11 +62,6 @@ class BehaviourConfigurationContext {
        // Apply the brain config
        if (entity is MoLangScriptingEntity) {
            brain = entity.assignNewBrainWithMemoriesAndSensors(dynamic, memories, sensors)
-
-            val runtime = MoLangRuntime().setup()
-            runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-            onAddScripts.forEach { CobblemonScripts.run(it, runtime) }
-            onAdd.forEach { runtime.resolve(it) }
        }
        activities.forEach { it.apply(entity) }
        brain.setCoreActivities(coreActivities)
@@ -9,17 +9,7 @@
 package com.cobblemon.mod.common.api.ai

 import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.api.molang.ObjectValue
-import com.cobblemon.mod.common.api.scripting.CobblemonScripts
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import com.cobblemon.mod.common.util.resolve
-import net.minecraft.world.entity.Entity

 /**
 * This is used in the AI system to store optional additional information about the attack target,
@@ -40,32 +30,5 @@ import net.minecraft.world.entity.Entity
 */
 class CobblemonAttackTargetData(
    /** An expression that returns false when the target is no longer worth attacking. */
-    var shouldContinue: Expression = "true".asExpression(),
-    var hitsUntilDisengage: Int = -1, // -1 means no limit
-    var disengageAction: (entity: Entity) -> Unit = {}
-) {
-    val struct = ObjectValue<CobblemonAttackTargetData>(this).also {
-        it.addFunction("hits_until_disengage") { DoubleValue(hitsUntilDisengage.toDouble()) }
-        it.addFunction("set_hits_until_disengage") { params ->
-            val value = params.getDouble(0)
-            hitsUntilDisengage = value.toInt()
-            DoubleValue(hitsUntilDisengage.toDouble())
-        }
-        it.addFunction("set_disengage_action") { params ->
-            val script = params.getString(0).asIdentifierDefaultingNamespace()
-            val function = CobblemonScripts.scripts[script] ?: run {
-                Cobblemon.LOGGER.warn("set_disengage_action was given script '$script' which does not exist.")
-                return@addFunction DoubleValue.ZERO
-            }
-            disengageAction = { entity ->
-                val runtime = MoLangRuntime().setup()
-                runtime.environment.query.addFunction("entity") { entity.asMostSpecificMoLangValue() }
-                runtime.resolve(function)
-            }
-            DoubleValue.ONE
-        }
-        it.addFunction("unset_disengage_action") { params ->
-            disengageAction = {}
-        }
-    }
-}
+    val shouldContinue: Expression = "true".asExpression()
+)
@@ -17,7 +17,6 @@ import com.cobblemon.mod.common.api.scripting.CobblemonScripts
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.resolve
 import com.cobblemon.mod.common.util.withQueryValue
-import com.google.gson.annotations.SerializedName
 import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity
@@ -29,35 +28,23 @@ class CobblemonBehaviour(
    val visible: Boolean = true,
    val entityType: ResourceLocation? = null,
    val configurations: List<BehaviourConfig> = mutableListOf(),
-    // I feel like the onAdd+onAddScript etc could be merged using some interface and a clever deserializer,
-    // detect if it's a ResourceLocation and failing that, Expression. The on[..]Script fields are kinda fringe though.
-    @SerializedName("onRemove", alternate = ["undo"])
-    val onRemove: ExpressionLike? = null,
-    @SerializedName("onRemoveScript", alternate = ["undoScript"])
-    val onRemoveScript: ResourceLocation? = null,
-    val onAdd: ExpressionLike? = null,
-    val onAddScript: ResourceLocation? = null,
+    val undo: ExpressionLike? = null,
+    val undoScript: ResourceLocation? = null,
 ) {
    fun canBeApplied(entity: LivingEntity) = entityType?.let { entityType == entity.type.builtInRegistryHolder().unwrapKey().get().location() } != false
    fun configure(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) {
-        if (onAdd != null) {
-            behaviourConfigurationContext.addOnAddScript(onAdd)
-        }
-        if (onAddScript != null) {
-            behaviourConfigurationContext.addOnAddScript(onAddScript)
-        }
        configurations.forEach { it.configure(entity, behaviourConfigurationContext) }
    }

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

 class LookAtTargetTaskConfig : SingleTaskConfig {
    val condition: ExpressionOrEntityVariable = Either.left("true".asExpression())
@@ -40,8 +39,7 @@ class LookAtTargetTaskConfig : SingleTaskConfig {
    ): BehaviorControl<in LivingEntity>? {
        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
        if (!condition.resolveBoolean()) return null
-        behaviourConfigurationContext.addMemories(MemoryModuleType.LOOK_TARGET, MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES)
-        behaviourConfigurationContext.addSensors(SensorType.NEAREST_LIVING_ENTITIES)
+        behaviourConfigurationContext.addMemories(MemoryModuleType.LOOK_TARGET)
        return WrapperLivingEntityTask(LookAtTargetSink(minDurationTicks.resolveInt(), maxDurationTicks.resolveInt()), Mob::class.java)
    }
 }
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.bedrockk.molang.ast.StringExpression
-import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.entity.npc.NPCEntity
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.mojang.datafixers.util.Either
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.Behavior
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.memory.MemoryModuleType
-import net.minecraft.world.entity.ai.memory.MemoryStatus
-
-/**
- * A task that modifies the aspects of a Pokémon or NPC based on a memory module.
- * If the memory is registered, the aspect is added; if it is absent, the aspect is removed.
- *
- * @author Hiroku
- * @since July 6th, 2025
- */
-class MemoryAspectTaskConfig : SingleTaskConfig {
-    var memory: MemoryModuleType<*> = MemoryModuleType.DUMMY
-    var aspect: ExpressionOrEntityVariable = Either.left(StringExpression(StringValue("")))
-
-    override fun getVariables(entity: LivingEntity) = listOf(aspect).asVariables()
-    override fun createTask(
-        entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        if (entity !is PokemonEntity && entity !is NPCEntity) {
-            return null
-        } else if (memory == MemoryModuleType.DUMMY) {
-            Cobblemon.LOGGER.error("MemoryAspectTaskConfig: Memory module type is not set for ${entity.name.string}.")
-            return null
-        } else if (aspect.left().orElse(null)?.originalString == "") {
-            Cobblemon.LOGGER.error("MemoryAspectTaskConfig: Aspect is not set for ${entity.name.string}.")
-            return null
-        }
-
-        val aspect = aspect.resolveString()
-
-        return object : Behavior<LivingEntity>(
-            mapOf(memory to MemoryStatus.REGISTERED),
-            Int.MAX_VALUE,
-            Int.MAX_VALUE
-        ) {
-            override fun canStillUse(level: ServerLevel, entity: LivingEntity, gameTime: Long) = true
-
-            override fun tick(level: ServerLevel, owner: LivingEntity, gameTime: Long) {
-                val hasMemory = !owner.brain.hasMemoryValue(memory)
-                if (owner is PokemonEntity) {
-                    if (!hasMemory && aspect in owner.pokemon.forcedAspects) {
-                        owner.pokemon.forcedAspects -= aspect
-                    } else if (hasMemory && aspect !in owner.pokemon.forcedAspects) {
-                        owner.pokemon.forcedAspects += aspect
-                    } else return
-                    owner.pokemon.updateAspects()
-                } else if (owner is NPCEntity) {
-                    if (!hasMemory && aspect in owner.appliedAspects) {
-                        owner.appliedAspects -= aspect
-                    } else if (hasMemory && aspect !in owner.appliedAspects) {
-                        owner.appliedAspects += aspect
-                    } else return
-                    owner.updateAspects()
-                }
-            }
-        }
-    }
-}
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToBeeHiveTask
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class PathToBeeHiveTaskConfig : SingleTaskConfig {
-    companion object {
-        const val HONEY = "honey"
-    }
-
-    val condition = booleanVariable(HONEY, "can_add_honey", true).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition,
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        if (entity !is PokemonEntity) {
-            return null
-        }
-        if (!checkCondition(entity, condition)) {
-            return null
-        }
-        return PathToBeeHiveTask.create()
-    }
-}
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.CobblemonSensors
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToFlowerTask
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class PathToFlowerTaskConfig : SingleTaskConfig {
-    companion object {
-        const val POLLINATE = "pollinate"
-    }
-
-    val condition = booleanVariable(POLLINATE, "can_pollinate", true).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        if (entity !is PokemonEntity) {
-            return null
-        }
-
-        if (!checkCondition(entity, condition)) {
-            return null
-        }
-        behaviourConfigurationContext.addMemories(
-            CobblemonMemories.NEARBY_FLOWERS,
-            CobblemonMemories.HIVE_COOLDOWN,
-            CobblemonMemories.HIVE_LOCATION,
-            CobblemonMemories.POLLINATED
-        )
-        behaviourConfigurationContext.addSensors(CobblemonSensors.NEARBY_BEE_HIVE, CobblemonSensors.NEARBY_FLOWER)
-        return PathToFlowerTask.create()
-    }
-}
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PlaceHoneyInHiveTask
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class PlaceHoneyInHiveTaskConfig : SingleTaskConfig {
-    companion object {
-        const val HONEY = "honey"
-    }
-
-    val condition = booleanVariable(HONEY, "can_add_honey", true).asExpressible()
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        if (entity !is PokemonEntity) {
-            return null
-        }
-        if (!checkCondition(entity, condition)) {
-            return null
-        }
-        return PlaceHoneyInHiveTask.create()
-    }
-}
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
-import com.cobblemon.mod.common.api.ai.asVariables
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.getMemorySafely
-import com.cobblemon.mod.common.util.sendParticlesServer
-import com.mojang.datafixers.util.Either
-import net.minecraft.core.particles.ParticleTypes
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.Behavior
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.memory.MemoryModuleType
-import net.minecraft.world.entity.ai.memory.MemoryStatus
-import net.minecraft.world.phys.Vec3
-
-class PollinateFlowerTaskConfig : SingleTaskConfig {
-    companion object {
-        const val POLLINATE = "pollinate"
-    }
-
-    val condition = booleanVariable(POLLINATE, "can_pollinate", true).asExpressible()
-    val durationTicks: ExpressionOrEntityVariable = Either.left("30".asExpression())
-
-    override fun getVariables(entity: LivingEntity) = listOf(
-        condition
-    ).asVariables()
-
-    override fun createTask(
-        entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        if (entity !is PokemonEntity) {
-            return null
-        }
-        if (!checkCondition(entity, condition)) {
-            return null
-        }
-
-        return object : Behavior<LivingEntity>(
-            mapOf(
-                CobblemonMemories.NEARBY_FLOWERS to MemoryStatus.VALUE_PRESENT,
-                MemoryModuleType.WALK_TARGET to MemoryStatus.VALUE_ABSENT,
-                CobblemonMemories.POLLINATED to MemoryStatus.VALUE_ABSENT,
-                CobblemonMemories.HIVE_COOLDOWN to MemoryStatus.VALUE_ABSENT,
-            ),
-            15,
-            45
-        ) {
-            override fun checkExtraStartConditions(level: ServerLevel, owner: LivingEntity): Boolean {
-                return entity.brain.getMemorySafely(CobblemonMemories.NEARBY_FLOWERS).orElse(emptyList()).any {
-                    Vec3.atCenterOf(it).distanceTo(entity.position()) <= 1.0
-                }
-            }
-
-            override fun canStillUse(level: ServerLevel, entity: LivingEntity, gameTime: Long): Boolean {
-                return checkExtraStartConditions(level, entity)
-            }
-
-            override fun start(level: ServerLevel, entity: LivingEntity, gameTime: Long) {
-                super.start(level, entity, gameTime)
-            }
-
-            override fun tick(level: ServerLevel, owner: LivingEntity, gameTime: Long) {
-                level.sendParticlesServer(
-                    particleType = ParticleTypes.DRIPPING_HONEY,
-                    position = owner.eyePosition,
-                    particles = 3,
-                    offset = Vec3.ZERO,
-                    speed = 0.0
-                )
-            }
-
-            override fun stop(level: ServerLevel, entity: LivingEntity, gameTime: Long) {
-                val flowerStillThere = canStillUse(level, entity, gameTime)
-                if (flowerStillThere) {
-                    entity.brain.setMemory(CobblemonMemories.POLLINATED, true)
-                }
-            }
-        }
-    }
-}
@@ -99,11 +99,6 @@ interface TaskConfig {
            cobblemonResource("eat_grass") to EatGrassTaskConfig::class.java,
            cobblemonResource("find_air") to FindAirTaskConfig::class.java,
            cobblemonResource("go_to_land") to GoToLandTaskConfig::class.java,
-            cobblemonResource("path_to_hive") to PathToBeeHiveTaskConfig::class.java,
-            cobblemonResource("place_honey_in_hive") to PlaceHoneyInHiveTaskConfig::class.java,
-            cobblemonResource("path_to_flower") to PathToFlowerTaskConfig::class.java,
-            cobblemonResource("pollinate_flower") to PollinateFlowerTaskConfig::class.java,
-            cobblemonResource("go_to_land") to GoToLandTaskConfig::class.java,
            cobblemonResource("manage_flight_in_battle") to ManageFlightInBattleTaskConfig::class.java,
            cobblemonResource("attack_hostile_mobs") to AttackHostileMobsTaskConfig::class.java,
            cobblemonResource("move_into_fluid") to MoveIntoFluidTaskConfig::class.java,
@@ -115,8 +110,6 @@ interface TaskConfig {
            cobblemonResource("count_followers") to CountFollowersTaskConfig::class.java,
            cobblemonResource("hate_entity") to HateEntityTaskConfig::class.java,
            cobblemonResource("target_entity") to TargetEntityTaskConfig::class.java,
-            cobblemonResource("memory_aspect") to MemoryAspectTaskConfig::class.java,
-            cobblemonResource("activity_change") to ActivityChangeTaskConfig::class.java,
        )

        val runtime = MoLangRuntime().setup()
@@ -10,14 +10,12 @@ package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.CobblemonWanderControl
 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.ai.CobblemonWalkTarget
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.toVec3d
 import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.datafixers.util.Either
 import net.minecraft.core.BlockPos
@@ -25,11 +23,9 @@ import net.minecraft.server.level.ServerLevel
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.BlockPosTracker
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
-import net.minecraft.world.entity.ai.util.HoverRandomPos
 import net.minecraft.world.entity.ai.util.LandRandomPos
 import net.minecraft.world.level.pathfinder.PathType

@@ -105,70 +101,45 @@ class WanderTaskConfig : SingleTaskConfig {
        behaviourConfigurationContext.addMemories(
            MemoryModuleType.WALK_TARGET,
            MemoryModuleType.LOOK_TARGET,
-            CobblemonMemories.PATH_COOLDOWN,
-            CobblemonMemories.WANDER_CONTROL
+            CobblemonMemories.PATH_COOLDOWN
        )

        return BehaviorBuilder.create {
            it.group(
                it.absent(MemoryModuleType.WALK_TARGET),
                it.registered(MemoryModuleType.LOOK_TARGET),
-                it.absent(CobblemonMemories.PATH_COOLDOWN),
-                it.registered(CobblemonMemories.WANDER_CONTROL)
-            ).apply(it) { walkTarget, lookTarget, pathCooldown, wanderControl ->
+                it.absent(CobblemonMemories.PATH_COOLDOWN)
+            ).apply(it) { walkTarget, lookTarget, pathCooldown ->
                Trigger { world, entity, time ->
                    if (entity !is PathfinderMob || entity.isUnderWater) {
                        return@Trigger false
                    }

-                    val wanderControl = it.tryGet(wanderControl).orElse(null) ?: CobblemonWanderControl()
-                    val avoidsTargetingAir = avoidTargetingAir.resolveBoolean()
-
                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
                    val wanderChance = runtime.resolveFloat(wanderChanceExpression)
-                    if (wanderChance <= 0 || world.random.nextFloat() > wanderChance || !wanderControl.allowLand) {
+                    if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) {
                        return@Trigger false
                    }

-                    pathCooldown.setWithExpiry(true, wanderControl.pathCooldownTicks.toLong())
+                    pathCooldown.setWithExpiry(true, 40L)
+                    val avoidsTargetingAir = avoidTargetingAir.resolveBoolean()
+
+//                    val targetVec = getLandTarget(entity) ?: return@Trigger true
+                    val targetVec = LandRandomPos.getPos(
+                        entity,
+                        horizontalRange.resolveInt(),
+                        verticalRange.resolveInt()
+                    ) ?: return@Trigger false
+
                    val minimumHeight = minimumHeight.resolveInt()
                    val maximumHeight = maximumHeight.resolveInt()

-                    var attempts = 0
-                    var pos: BlockPos? = null
-                    while (attempts++ < wanderControl.maxAttempts && pos == null) {
-//                    val targetVec = getLandTarget(entity) ?: return@Trigger true
-                        val targetVec = if (maximumHeight != -1) {
-                            HoverRandomPos.getPos(
-                                entity,
-                                horizontalRange.resolveInt(),
-                                maxOf(verticalRange.resolveInt(), maximumHeight), // In case they fly up pretty high and need to find a way down
-                                entity.random.nextFloat() - 0.5,
-                                entity.random.nextFloat() - 0.5,
-                                Math.PI.toFloat(),
-                                maximumHeight,
-                                minimumHeight
-                            )
-                        } else {
-                                LandRandomPos.getPos(
-                                    entity,
-                                    horizontalRange.resolveInt(),
-                                    verticalRange.resolveInt()
-                                )
-                        } ?: continue
-
-                        pos = applyHeightConstraints(
-                            pos = BlockPos.containing(targetVec),
-                            minimumHeight = minimumHeight,
-                            maximumHeight = maximumHeight,
-                            world = world
-                        ).takeIf(wanderControl::isSuitable)
-                    }
-
-                    if (pos == null) {
-                        return@Trigger false
-                    }
-
+                    val pos = applyHeightConstraints(
+                        pos = BlockPos.containing(targetVec),
+                        minimumHeight = minimumHeight,
+                        maximumHeight = maximumHeight,
+                        world = world
+                    )
                    walkTarget.set(
                        CobblemonWalkTarget(
                            pos = pos,
@@ -178,7 +149,7 @@ class WanderTaskConfig : SingleTaskConfig {
                            destinationNodeTypeFilter = { nodeType -> !avoidsTargetingAir || nodeType !in listOf(PathType.OPEN) }
                        )
                    )
-                    lookTarget.set(BlockPosTracker(pos.toVec3d().add(0.0, entity.eyeHeight.toDouble(), 0.0)))
+                    lookTarget.erase()
                    return@Trigger true
                }
            }
@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.ai.config.task

 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.CobblemonWanderControl
 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
@@ -31,7 +30,6 @@ 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.level.pathfinder.PathType
-import net.minecraft.world.phys.Vec3

 class WaterWanderTaskConfig : SingleTaskConfig {
    val condition = booleanVariable(WANDER, "water_wanders", true).asExpressible()
@@ -56,56 +54,35 @@ class WaterWanderTaskConfig : SingleTaskConfig {
        behaviourConfigurationContext.addMemories(
            MemoryModuleType.WALK_TARGET,
            MemoryModuleType.LOOK_TARGET,
-            CobblemonMemories.PATH_COOLDOWN,
-            CobblemonMemories.WANDER_CONTROL
+            CobblemonMemories.PATH_COOLDOWN
        )

        return BehaviorBuilder.create {
            it.group(
                it.absent(MemoryModuleType.WALK_TARGET),
                it.registered(MemoryModuleType.LOOK_TARGET),
-                it.registered(CobblemonMemories.PATH_COOLDOWN),
-                it.registered(CobblemonMemories.WANDER_CONTROL)
-            ).apply(it) { walkTarget, lookTarget, pathCooldown, wanderControlData ->
+                it.registered(CobblemonMemories.PATH_COOLDOWN)
+            ).apply(it) { walkTarget, lookTarget, pathCooldown ->
                Trigger { world, entity, time ->
                    if (entity !is PathfinderMob || !entity.isInWater) {
                        return@Trigger false
                    }

-                    val wanderControl = it.tryGet(wanderControlData).orElse(null) ?: CobblemonWanderControl()
-                    if (!wanderControl.allowWater) {
-                        return@Trigger false
-                    }
-
                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
                    val wanderChance = runtime.resolveFloat(wanderChanceExpression)
                    if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) {
                        return@Trigger false
                    }

-                    pathCooldown.setWithExpiry(true, wanderControl.pathCooldownTicks.toLong())
-
-                    var pos: BlockPos? = null
-                    var target: Vec3? = null
-                    var attempts = 0
-
-                    while (attempts < wanderControl.maxAttempts && pos == null) {
-                        attempts++
-                        target = BehaviorUtils.getRandomSwimmablePos(entity, horizontalRange.resolveInt(), verticalRange.resolveInt())
-                            ?: continue
-                        pos = BlockPos.containing(target).takeIf(wanderControl::isSuitable)
-                    }
-
-                    if (pos == null || target == null) {
-                        return@Trigger false
-                    }
+                    pathCooldown.setWithExpiry(true, 60L)

+                    val target = BehaviorUtils.getRandomSwimmablePos(entity, horizontalRange.resolveInt(), verticalRange.resolveInt()) ?: return@Trigger false
                    walkTarget.set(
                        CobblemonWalkTarget(
-                            pos = pos,
+                            pos = BlockPos.containing(target),
                            nodeTypeFilter = { it == PathType.WATER || it == PathType.WATER_BORDER },
                            speedModifier = speedMultiplier.resolveFloat(),
-                            completionRange = 0
+                            completionRange = 1
                        )
                    )
                    lookTarget.set(BlockPosTracker(target))
@@ -13,7 +13,6 @@ import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.LOGGER
-import com.cobblemon.mod.common.CobblemonBuildDetails
 import com.cobblemon.mod.common.CobblemonNetwork
 import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
 import com.cobblemon.mod.common.api.battles.model.actor.ActorType
@@ -78,7 +77,7 @@ open class PokemonBattle(
    val side2: BattleSide
 ) {
    /** Whether logging will be silenced for this battle. */
-    var mute = !CobblemonBuildDetails.SNAPSHOT
+    var mute = true
    val struct = this.asMoLangValue()
    val runtime = MoLangRuntime().also { it.environment.query = struct }

@@ -12,17 +12,9 @@ import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.api.battles.model.ai.BattleAI
 import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.battles.PassActionResponse
-import com.cobblemon.mod.common.battles.ShowdownActionResponse
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.exception.IllegalActionChoiceException
-import com.cobblemon.mod.common.net.messages.client.battle.BattleFaintPacket
-import com.cobblemon.mod.common.net.messages.client.battle.BattleHealthChangePacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
-import com.cobblemon.mod.common.net.messages.client.battle.BattlePersistentStatusPacket
-import com.cobblemon.mod.common.net.messages.client.battle.BattleReplacePokemonPacket
-import com.cobblemon.mod.common.net.messages.client.battle.BattleSwapPokemonPacket
-import com.cobblemon.mod.common.net.messages.client.battle.BattleSwitchPokemonPacket
-import com.cobblemon.mod.common.net.messages.client.battle.BattleTransformPokemonPacket
 import java.util.UUID

 abstract class AIBattleActor(
@@ -33,15 +25,8 @@ abstract class AIBattleActor(
    override fun sendUpdate(packet: NetworkPacket<*>) {
        super.sendUpdate(packet)

-        when (packet) {
-            is BattleMakeChoicePacket -> this.onChoiceRequested()
-            is BattlePersistentStatusPacket -> {}
-            is BattleFaintPacket -> {}
-            is BattleSwitchPokemonPacket -> if (!packet.isAlly) { /* TODO this might be redundant; switch on opposing site should be visible during turn */ }
-            is BattleSwapPokemonPacket -> { /* TODO CONSIDER MULTI SHIFTING */ }
-            is BattleHealthChangePacket -> battleAI.onHealthChange(packet)
-            is BattleTransformPokemonPacket -> if (!packet.isAlly) { /* TODO this might be redundant; switch on opposing site should be visible during turn */ }
-            is BattleReplacePokemonPacket -> if (!packet.isAlly) { /* TODO this might be redundant; switch on opposing site should be visible during turn */ }
+        if (packet is BattleMakeChoicePacket) {
+            this.onChoiceRequested()
        }
    }

@@ -50,35 +35,11 @@ abstract class AIBattleActor(
     */
    open fun onChoiceRequested() {
        try {
-            request?.let {
-                setActionResponses(it.iterate(this.activePokemon) { battleMon, moveset, forceSwitch ->
-                    battleAI.choose(battleMon, battle, getSide(), moveset, forceSwitch)
-                })
-                pokemonList.forEach { pokemon ->
-                    pokemon.willBeSwitchedIn = false
-                }
-            } ?: {
-                val response = mutableListOf<ShowdownActionResponse>()
-                repeat(activePokemon.size) {
-                    response.add(PassActionResponse)
-                }
-                setActionResponses(response)
-                LOGGER.warn("AI requested choice, but no request was set. Returning PassActionResponses.")
-            }
+            setActionResponses(request!!.iterate(this.activePokemon, battleAI::choose))
        } catch (exception: IllegalActionChoiceException) {
-            LOGGER.error("AI was unable to choose an action, we're going to need to pass!")
+            LOGGER.error("AI was unable to choose a move, we're going to need to pass!")
            exception.printStackTrace()
-            request?.let {
-                setActionResponses(it.iterate(this.activePokemon) { _, _ , _->
-                    PassActionResponse
-                })
-            } ?: {
-                val response = mutableListOf<ShowdownActionResponse>()
-                repeat(activePokemon.size) {
-                    response.add(PassActionResponse)
-                }
-                setActionResponses(response)
-            }
+            setActionResponses(request!!.iterate(this.activePokemon) { _, _, _ -> PassActionResponse })
        }
    }
 }
@@ -8,36 +8,23 @@

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

-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.battles.ActiveBattlePokemon
-import com.cobblemon.mod.common.battles.BattleSide
 import com.cobblemon.mod.common.battles.ShowdownActionResponse
 import com.cobblemon.mod.common.battles.ShowdownMoveset
-import com.cobblemon.mod.common.net.messages.client.battle.BattleHealthChangePacket

 /**
- * Interface for an actor battle AI
+ * Interface for an actors battle AI
 *
 * @since January 16th, 2022
- * @author Deltric, Polymeta
+ * @author Deltric
 */
 interface BattleAI {
    /**
     * Requests that the AI choose an action for the given Pokémon
     * @param activeBattlePokemon The Pokémon slot that is choosing an action
-     * @param battle The ongoing [PokemonBattle]
-     * @param aiSide The [BattleSide] the AI is fighting on, useful for allies and opponent determination
-     * @param moveset The [ShowdownMoveset] for this slot. This can be null if [forceSwitch] is true. Otherwise, it is the available move information from Showdown.
-     * @param forceSwitch Whether this is a force switch situation.
+     * @param moveset The [ShowdownMoveset] for this slot. This can be null if [forceSwitch] is true. Otherwise it is the available move information from Showdown.
+     * @param forceSwitch Whether or not this is a force switch situation.
     * @return the action response
     */
-    fun choose(
-        activeBattlePokemon: ActiveBattlePokemon,
-        battle: PokemonBattle,
-        aiSide: BattleSide,
-        moveset: ShowdownMoveset?,
-        forceSwitch: Boolean
-    ): ShowdownActionResponse
-
-    fun onHealthChange(packet: BattleHealthChangePacket) {}
+    fun choose(activeBattlePokemon: ActiveBattlePokemon, moveset: ShowdownMoveset?, forceSwitch: Boolean): ShowdownActionResponse
 }
@@ -21,7 +21,6 @@ interface PokemonSideDelegate : EntitySideDelegate<PokemonEntity> {
    fun updatePostDeath() {}
    fun handleStatus(status: Byte) {}
    fun spawnShinyParticle(player: Player) {}
-    fun spawnAspectParticle() {}
    fun positionRider(passenger: Entity, positionUpdater: MoveFunction)
    fun updateAge(age: Int) {}
 }
@@ -231,7 +231,7 @@ object CobblemonEvents {
    @JvmField
    val POKEMON_GAINED = EventObservable<PokemonGainedEvent>()
    @JvmField
-    val POKEMON_SEEN = CancelableObservable<PokemonSeenEvent>()
+    val POKEMON_SEEN = EventObservable<PokemonSeenEvent>()
    @JvmField
    val POKEMON_ASPECTS_CHANGED = EventObservable<PokemonAspectsChangedEvent>()
    @JvmField
@@ -8,14 +8,9 @@

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

-import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.berry.Berry
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.block.entity.BerryBlockEntity
-import com.cobblemon.mod.common.util.toArrayStruct
-import com.cobblemon.mod.common.util.worldRegistry
 import net.minecraft.core.BlockPos
-import net.minecraft.core.registries.Registries
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.Level
@@ -43,11 +38,4 @@ data class BerryHarvestEvent(
    val state: BlockState,
    val blockEntity: BerryBlockEntity,
    val drops: MutableList<ItemStack>
-) : BerryEvent {
-    val context = mutableMapOf(
-        "player" to player.asMoLangValue(),
-        "berry" to StringValue(berry.identifier.toString()),
-        "world" to world.worldRegistry.wrapAsHolder(world).asMoLangValue(Registries.DIMENSION),
-        "pos" to pos.toArrayStruct()
-    )
-}
+) : BerryEvent
@@ -8,16 +8,10 @@

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

-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.api.drop.DropEntry
 import com.cobblemon.mod.common.api.drop.DropTable
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.events.CobblemonEvents
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
-import com.cobblemon.mod.common.util.asArrayValue
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.entity.LivingEntity

@@ -44,14 +38,4 @@ class LootDroppedEvent(
    val player: ServerPlayer?,
    val entity: LivingEntity?,
    val drops: MutableList<DropEntry>
-) : Cancelable() {
-    val context = mapOf<String, MoValue>(
-        "player" to (player?.asMoLangValue() ?: DoubleValue.ZERO),
-        "entity" to (entity?.asMostSpecificMoLangValue() ?: DoubleValue.ZERO),
-        "drops" to drops.asArrayValue { it.asMoLangValue() }
-    )
-
-    val functions = moLangFunctionMap(
-        cancelFunc
-    )
-}
+) : Cancelable()
@@ -9,21 +9,10 @@
 package com.cobblemon.mod.common.api.events.fishing

 import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
-import com.cobblemon.mod.common.util.server
 import net.minecraft.world.item.ItemStack

 /**
 * Event that is fired when a bait is consumed.
 * @param rod The ItemStack of the rod that consumed the bait.
 */
-class BaitConsumedEvent(val rod: ItemStack) : Cancelable() {
-    val context = mutableMapOf(
-        "rod" to rod.asMoLangValue(server()!!.registryAccess())
-    )
-
-    val functions = moLangFunctionMap(
-        cancelFunc
-    )
-}
+class BaitConsumedEvent(val rod: ItemStack) : Cancelable()
@@ -8,12 +8,8 @@

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

-import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.api.reactive.CancelableObservable
-import com.cobblemon.mod.common.util.server
 import net.minecraft.world.item.ItemStack

 /**
@@ -21,12 +17,4 @@ import net.minecraft.world.item.ItemStack
 * @param rod The ItemStack of the rod that the bait is set on.
 * @param bait The ItemStack of the bait that is set on the rod.
 */
-class BaitSetEvent(val rod: ItemStack, val bait: ItemStack) : Cancelable() {
-    val context = mutableMapOf(
-        "rod" to rod.asMoLangValue(server()!!.registryAccess()),
-        "bait" to bait.asMoLangValue(server()!!.registryAccess())
-    )
-    val functions = moLangFunctionMap(
-        cancelFunc
-    )
-}
+class BaitSetEvent(val rod: ItemStack, val bait: ItemStack) : Cancelable()
@@ -9,18 +9,14 @@
 package com.cobblemon.mod.common.api.events.fishing

 import com.bedrockk.molang.runtime.value.MoValue
-import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
 import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.itemRegistry
-import com.cobblemon.mod.common.util.server
 import net.minecraft.core.registries.Registries
 import net.minecraft.world.item.ItemStack

@@ -39,14 +35,7 @@ interface BobberSpawnPokemonEvent {
        val bobber: PokeRodFishingBobberEntity,
        val spawnAction: SpawnAction<*>,
        val rod: ItemStack
-    ) : Cancelable(), BobberSpawnPokemonEvent {
-        val context = mutableMapOf<String, MoValue>(
-            "rod" to rod.asMoLangValue(server()!!.registryAccess())
-        )
-        val functions = moLangFunctionMap(
-            cancelFunc
-        )
-    }
+    ) : Cancelable(), BobberSpawnPokemonEvent

    /**
     * Event that is fired when a Pokemon is modified before it is spawned by a bobber.
@@ -8,12 +8,8 @@

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

-import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
-import com.cobblemon.mod.common.util.server
 import net.minecraft.world.item.ItemStack

 /**
@@ -32,15 +28,7 @@ interface PokerodCastEvent {
        override var rod: ItemStack,
        var bobber: PokeRodFishingBobberEntity,
        var bait: ItemStack
-    ) : PokerodCastEvent, Cancelable() {
-        val context = mutableMapOf<String, MoValue>(
-            "rod" to rod.asMoLangValue(server()!!.registryAccess()),
-            "bait" to bait.asMoLangValue(server()!!.registryAccess())
-        )
-        val functions = moLangFunctionMap(
-            cancelFunc
-        )
-    }
+    ) : PokerodCastEvent, Cancelable()

    /**
     * Event that is fired after a fishing rod is cast.
@@ -52,10 +40,5 @@ interface PokerodCastEvent {
        override var rod: ItemStack,
        var bobber: PokeRodFishingBobberEntity,
        var bait: ItemStack
-    ) : PokerodCastEvent {
-        val context = mutableMapOf<String, MoValue>(
-            "rod" to rod.asMoLangValue(server()!!.registryAccess()),
-            "bait" to bait.asMoLangValue(server()!!.registryAccess())
-        )
-    }
+    ) : PokerodCastEvent
 }
@@ -9,9 +9,6 @@
 package com.cobblemon.mod.common.api.events.fishing

 import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
-import com.cobblemon.mod.common.util.server
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack

@@ -19,13 +16,4 @@ import net.minecraft.world.item.ItemStack
 * Event that is fired when a fishing rod is reeled.
 * @param rod The ItemStack of the rod that is being reeled.
 */
-class PokerodReelEvent(val player: Player, val rod: ItemStack) : Cancelable() {
-    val context = mutableMapOf(
-        "player" to player.asMoLangValue(),
-        "rod" to rod.asMoLangValue(server()!!.registryAccess())
-    )
-
-    val functions = moLangFunctionMap(
-        cancelFunc
-    )
-}
+class PokerodReelEvent(val player: Player, val rod: ItemStack) : Cancelable()
@@ -8,9 +8,6 @@

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

-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.world.entity.LivingEntity
@@ -30,17 +27,4 @@ class PokemonCatchRateEvent(
    val pokeBallEntity: EmptyPokeBallEntity,
    val pokemonEntity: PokemonEntity,
    var catchRate: Float
-) {
-    val context = mutableMapOf(
-        "thrower" to thrower.asMostSpecificMoLangValue(),
-        "poke_ball_entity" to pokeBallEntity.struct,
-        "pokemon_entity" to pokemonEntity.struct,
-        "catch_rate" to DoubleValue(catchRate.toDouble())
-    )
-    val functions = moLangFunctionMap(
-        "set_catch_rate" to {
-            catchRate = it.getDouble(0).toFloat()
-            DoubleValue.ONE
-        }
-    )
-}
+)
@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.events.pokeball

 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity

@@ -21,9 +20,8 @@ class ThrownPokeballHitEvent(
    val pokeBall : EmptyPokeBallEntity,
    val pokemon : PokemonEntity
 ) : Cancelable() {
-    val functions = moLangFunctionMap(
-        "pokeball" to { pokeBall.struct },
-        "pokemon" to { pokemon.asMoLangValue() },
-        cancelFunc
+    val context = mutableMapOf(
+        "pokeball" to pokeBall.struct,
+        "pokemon" to pokemon.asMoLangValue()
    )
 }
@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.events.pokedex.scanning

 import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -22,14 +21,15 @@ data class PokemonScannedEvent(val player: ServerPlayer, val scannedPokemonEntit
    val isOwned: Boolean
        get() = scannedPokemonEntityData.pokemon.getOwnerUUID() == player.uuid

-    val context: MutableMap<String, MoValue> = mutableMapOf(
+    val context = mutableMapOf(
        "player" to player.asMoLangValue(),
        "pokemon" to scannedPokemonEntityData.pokemon.struct,
        "disguise" to (scannedPokemonEntityData.disguise?.struct ?: DoubleValue.ZERO),
-        "entity" to when (scannedEntity) {
-            is LivingEntity -> scannedEntity.asMostSpecificMoLangValue()
-            else -> DoubleValue.ZERO
+        "entity" to {
+            when (scannedEntity) {
+                is LivingEntity -> scannedEntity.asMostSpecificMoLangValue()
+                else -> DoubleValue.ZERO
+            }
        },
-        "is_owned" to DoubleValue(if (isOwned) 1.0 else 0.0)
    )
 }
@@ -8,13 +8,9 @@

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

-import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.getPlayer
 import net.minecraft.server.level.ServerPlayer

 class CollectEggEvent (
@@ -22,13 +18,4 @@ class CollectEggEvent (
    val maleParent : Pokemon,
    val femaleParent : Pokemon,
    val player : ServerPlayer
-) : Cancelable() {
-    val context = mutableMapOf(
-        "male_parent" to maleParent.struct,
-        "female_parent" to femaleParent.struct,
-        "player" to (player.uuid.getPlayer()?.asMoLangValue() ?: DoubleValue.ZERO)
-    )
-    val functions = moLangFunctionMap(
-        cancelFunc
-    )
-}
+) : Cancelable()
@@ -14,7 +14,9 @@ import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
-import com.cobblemon.mod.common.api.pokemon.stats.*
+import com.cobblemon.mod.common.api.pokemon.stats.EvSource
+import com.cobblemon.mod.common.api.pokemon.stats.ItemEvSource
+import com.cobblemon.mod.common.api.pokemon.stats.Stat
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.getPlayer
 import com.cobblemon.mod.common.util.ifIsType
@@ -54,15 +56,7 @@ interface EvGainedEvent {
        val context = mutableMapOf(
            "pokemon" to source.pokemon.struct,
            "stat" to StringValue(stat.identifier.toString()),
-            "amount" to DoubleValue(amount.toDouble()),
-            "source" to StringValue(
-                when (source) {
-                    is BattleEvSource -> "battle"
-                    is ItemEvSource -> "interaction"
-                    is SidemodEvSource -> source.sidemodId
-                    else -> "unknown"
-                }
-            )
+            "amount" to DoubleValue(amount.toDouble())
        )
        val functions = moLangFunctionMap(
            cancelFunc,
@@ -84,15 +78,7 @@ interface EvGainedEvent {
        val context = mutableMapOf(
            "pokemon" to source.pokemon.struct,
            "stat" to StringValue(stat.identifier.toString()),
-            "amount" to DoubleValue(amount.toDouble()),
-            "source" to StringValue(
-                when (source) {
-                    is BattleEvSource -> "battle"
-                    is ItemEvSource -> "interaction"
-                    is SidemodEvSource -> source.sidemodId
-                    else -> "unknown"
-                }
-            )
+            "amount" to DoubleValue(amount.toDouble())
        )
    }

@@ -8,12 +8,9 @@

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

-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.api.moves.MoveTemplate
-import com.cobblemon.mod.common.api.pokemon.experience.*
+import com.cobblemon.mod.common.api.pokemon.experience.ExperienceSource
 import com.cobblemon.mod.common.pokemon.Pokemon

 /**
@@ -27,28 +24,7 @@ class ExperienceGainedPreEvent(
    val pokemon: Pokemon,
    val source: ExperienceSource,
    var experience: Int
-) : Cancelable() {
-    val context = mutableMapOf(
-        "pokemon" to pokemon.struct,
-        "source" to StringValue(
-            when (source) {
-                is BattleExperienceSource -> "battle"
-                is CandyExperienceSource -> "interaction"
-                is CommandExperienceSource -> "command"
-                is SidemodExperienceSource -> source.sidemodId
-                else -> "unknown"
-            }
-        ),
-        "experience" to DoubleValue(experience.toDouble())
-    )
-    val functions = moLangFunctionMap(
-        cancelFunc,
-        "set_amount" to {
-            experience = it.getInt(0)
-            DoubleValue.ONE
-        }
-    )
-}
+) : Cancelable()

 /**
 * Event fired when experience has been gained. Information about whether it leveled up or not is
@@ -64,20 +40,4 @@ class ExperienceGainedPostEvent(
    val previousLevel: Int,
    val currentLevel: Int,
    val learnedMoves: MutableSet<MoveTemplate>
-) {
-    val context = mutableMapOf(
-        "pokemon" to pokemon.struct,
-        "source" to StringValue(
-            when (source) {
-                is BattleExperienceSource -> "battle"
-                is CandyExperienceSource -> "interaction"
-                is CommandExperienceSource -> "command"
-                is SidemodExperienceSource -> source.sidemodId
-                else -> "unknown"
-            }
-        ),
-        "experience" to DoubleValue(experience.toDouble()),
-        "previous_level" to DoubleValue(previousLevel.toDouble()),
-        "current_level" to DoubleValue(currentLevel.toDouble())
-    )
-}
+)
@@ -8,9 +8,7 @@

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

-import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.pokemon.Pokemon

 /**
@@ -27,16 +25,4 @@ data class FriendshipUpdatedEvent(
        set(value) {
            field = value.coerceIn(0, Cobblemon.config.maxPokemonFriendship)
        }
-
-    val context = mutableMapOf(
-        "pokemon" to pokemon.struct,
-        "new_friendship" to DoubleValue(newFriendship.toDouble())
-    )
-
-    val functions = moLangFunctionMap(
-        "set_new_friendship" to {
-            newFriendship = it.getInt(0)
-            DoubleValue.ONE
-        }
-    )
 }
@@ -10,8 +10,6 @@ package com.cobblemon.mod.common.api.events.pokemon

 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
-import com.bedrockk.molang.runtime.value.DoubleValue

 /**
 * Event that is fired when a player owned Pokémon has its fullness changed
@@ -24,16 +22,4 @@ data class FullnessUpdatedEvent(
        set(value) {
            field = value.coerceIn(0, pokemon.getMaxFullness())
        }
-
-    val context = mutableMapOf(
-        "pokemon" to pokemon.struct,
-        "new_fullness" to DoubleValue(newFullness.toDouble())
-    )
-
-    val functions = moLangFunctionMap(
-        "set_new_fullness" to {
-            newFullness = it.getInt(0)
-            DoubleValue.ONE
-        }
-    )
 }
@@ -8,30 +8,15 @@

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

-import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.util.getPlayer
 import net.minecraft.server.level.ServerPlayer

 interface HatchEggEvent {
    val egg: PokemonProperties
    val player: ServerPlayer

-    data class Pre(override var egg : PokemonProperties, override var player: ServerPlayer) : HatchEggEvent, Cancelable() {
-        val context = mutableMapOf(
-            "player" to (player.uuid.getPlayer()?.asMoLangValue() ?: DoubleValue.ZERO)
-        )
-        val functions = moLangFunctionMap(
-            cancelFunc
-        )
-    }
+    data class Pre(override var egg : PokemonProperties, override var player: ServerPlayer) : HatchEggEvent, Cancelable()

-    data class Post(override var egg : PokemonProperties, override var player: ServerPlayer) : HatchEggEvent {
-        val context = mutableMapOf(
-            "player" to (player.uuid.getPlayer()?.asMoLangValue() ?: DoubleValue.ZERO)
-        )
-    }
+    data class Post(override var egg : PokemonProperties, override var player: ServerPlayer) : HatchEggEvent
 }
@@ -50,7 +50,7 @@ interface HeldItemEvent {
                "pokemon" to pokemon.struct,
                "receiving" to receiving.asMoLangValue(server()!!.registryAccess()),
                "returning" to returning.asMoLangValue(server()!!.registryAccess()),
-                "decrement" to DoubleValue(if (decrement) 1.0 else 0.0)
+                "decrement" to DoubleValue(if (decrement) 1.0 else 0.0),
            )
        }
        val functions = moLangFunctionMap(
@@ -74,7 +74,7 @@ interface HeldItemEvent {
                "pokemon" to pokemon.struct,
                "received" to received.asMoLangValue(server()!!.registryAccess()),
                "returned" to returned.asMoLangValue(server()!!.registryAccess()),
-                "decremented" to DoubleValue(if (decremented) 1.0 else 0.0)
+                "decremented" to DoubleValue(if (decremented) 1.0 else 0.0),
            )
        }
    }
@@ -8,18 +8,10 @@

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

-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.getPlayer
 import java.util.*

 data class PokemonAspectsChangedEvent(
    val ownerId: UUID?,
    val pokemon: Pokemon,
-) {
-    val context = mutableMapOf(
-        "player" to (ownerId?.getPlayer()?.asMoLangValue() ?: DoubleValue.ZERO),
-        "pokemon" to pokemon.struct
-    )
-}
+)
@@ -8,23 +8,10 @@

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

-import com.bedrockk.molang.runtime.value.MoValue
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.getPlayer
 import java.util.UUID

 data class PokemonSeenEvent(
    val playerId: UUID,
    val pokemon: Pokemon
-) : Cancelable() {
-    val context = mapOf<String, MoValue>(
-        "player" to playerId.getPlayer()!!.asMoLangValue(),
-        "pokemon" to pokemon.struct
-    )
-    val functions = moLangFunctionMap(
-        cancelFunc
-    )
-}
+)
@@ -8,9 +8,7 @@

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

-import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.Pokemon
 import net.minecraft.server.level.ServerLevel
@@ -27,15 +25,7 @@ data class PokemonSentPreEvent(
    val pokemon: Pokemon,
    val level: ServerLevel,
    val position: Vec3
-) : Cancelable() {
-    val context = mutableMapOf(
-        "pokemon" to pokemon.struct,
-        "position" to StringValue(position.toString())
-    )
-    val functions = moLangFunctionMap(
-        cancelFunc
-    )
-}
+) : Cancelable()

 /**
 * Event fired after a [PokemonEntity] is spawned from a player's party and after its animations are finished.
@@ -47,9 +37,4 @@ data class PokemonSentPreEvent(
 data class PokemonSentPostEvent(
    val pokemon: Pokemon,
    val pokemonEntity: PokemonEntity
-) {
-    val context = mutableMapOf(
-        "pokemon" to pokemon.struct,
-        "pokemon_entity" to pokemonEntity.struct
-    )
-}
+)
@@ -8,10 +8,7 @@

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

-import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.pokemon.Pokemon
 import net.minecraft.server.level.ServerPlayer

@@ -25,13 +22,4 @@ data class ShoulderMountEvent(
    val player: ServerPlayer,
    val pokemon: Pokemon,
    val isLeft: Boolean
-) : Cancelable() {
-    val context = mutableMapOf(
-        "player" to (player.asMoLangValue() ?: DoubleValue.ZERO),
-        "pokemon" to pokemon.struct,
-        "is_left" to DoubleValue(if (isLeft) 1.0 else 0.0),
-    )
-    val functions = moLangFunctionMap(
-        cancelFunc
-    )
-}
+) : Cancelable()
@@ -8,12 +8,9 @@

 package com.cobblemon.mod.common.api.events.pokemon.healing

-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.item.HealingSource
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.item.berry.HealingBerryItem
 import com.cobblemon.mod.common.item.interactive.PotionItem
 import com.cobblemon.mod.common.item.interactive.PotionType
@@ -34,14 +31,4 @@ class PokemonHealedEvent(
 ) : Cancelable() {
    fun isFullHeal() = amount == -1
    fun isHealed() = amount > 0
-
-    val context = mutableMapOf(
-        "pokemon" to pokemon.struct,
-        "amount" to DoubleValue(amount),
-        "source" to StringValue(source.toString())
-    )
-
-    val functions = moLangFunctionMap(
-        cancelFunc
-    )
 }
@@ -8,10 +8,7 @@

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

-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.storage.pc.PCBox
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
@@ -45,26 +42,11 @@ interface ChangePCBoxWallpaperEvent {
        override val player: ServerPlayer,
        override val box: PCBox,
        override var wallpaper: ResourceLocation
-    ) : ChangePCBoxWallpaperEvent, Cancelable() {
-        val context = mutableMapOf(
-            "player" to player.asMoLangValue(),
-            "box" to StringValue(box.toString()),
-            "wallpaper" to StringValue(wallpaper.toString())
-        )
-        val functions = mapOf(
-            cancelFunc
-        )
-    }
+    ) : ChangePCBoxWallpaperEvent, Cancelable()

    class Post(
        override val player: ServerPlayer,
        override val box: PCBox,
        override val wallpaper: ResourceLocation
-    ) : ChangePCBoxWallpaperEvent {
-        val context = mutableMapOf(
-            "player" to player.asMoLangValue(),
-            "box" to StringValue(box.toString()),
-            "wallpaper" to StringValue(wallpaper.toString())
-        )
-    }
+    ) : ChangePCBoxWallpaperEvent
 }
@@ -23,18 +23,12 @@ import com.cobblemon.mod.common.CobblemonBlockEntities
 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.CobblemonUnlockableWallpapers
 import com.cobblemon.mod.common.Environment
-import com.cobblemon.mod.common.api.ai.CobblemonBlockPosTracker
-import com.cobblemon.mod.common.api.ai.CobblemonWanderControl
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
 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.dialogue.PlayerDialogueFaceProvider
 import com.cobblemon.mod.common.api.dialogue.ReferenceDialogueFaceProvider
-import com.cobblemon.mod.common.api.drop.DropEntry
 import com.cobblemon.mod.common.api.mark.Marks
-import com.cobblemon.mod.common.api.moves.BenchedMove
-import com.cobblemon.mod.common.api.moves.Moves
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
 import com.cobblemon.mod.common.api.moves.animations.ActionEffects
 import com.cobblemon.mod.common.api.moves.animations.NPCProvider
@@ -51,14 +45,11 @@ import com.cobblemon.mod.common.api.pokedex.SeenCount
 import com.cobblemon.mod.common.api.pokedex.SeenPercent
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
-import com.cobblemon.mod.common.api.pokemon.experience.SidemodExperienceSource
-import com.cobblemon.mod.common.api.pokemon.moves.LearnsetQuery
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.scheduling.ClientTaskTracker
 import com.cobblemon.mod.common.api.scheduling.Schedulable
 import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
 import com.cobblemon.mod.common.api.scripting.CobblemonScripts
-import com.cobblemon.mod.common.api.spawning.TimeRange
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.api.storage.PokemonStore
 import com.cobblemon.mod.common.api.storage.party.NPCPartyStore
@@ -68,13 +59,10 @@ import com.cobblemon.mod.common.api.storage.pc.PCPosition
 import com.cobblemon.mod.common.api.storage.pc.PCStore
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.api.text.text
-import com.cobblemon.mod.common.battles.BattleBuilder
-import com.cobblemon.mod.common.battles.BattleFormat
 import com.cobblemon.mod.common.battles.BattleRegistry
 import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
 import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunctions
-import com.cobblemon.mod.common.entity.MoLangScriptingEntity
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.entity.npc.NPCBattleActor
 import com.cobblemon.mod.common.entity.npc.NPCEntity
@@ -103,7 +91,6 @@ import net.minecraft.core.BlockPos
 import net.minecraft.core.Holder
 import net.minecraft.core.Registry
 import net.minecraft.core.RegistryAccess
-import net.minecraft.core.Vec3i
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
 import net.minecraft.nbt.CompoundTag
@@ -205,48 +192,6 @@ object MoLangFunctions {
            values.forEachIndexed { index, moValue -> array.setDirectly("$index", moValue) }
            return@Function array
        },
-        "length" to java.util.function.Function { params ->
-            val array = params.get<ArrayStruct>(0)
-            return@Function DoubleValue(array.map.size.toDouble())
-        },
-        "append" to java.util.function.Function { params ->
-            val array = params.get<ArrayStruct>(0)
-            val value = params.get<MoValue>(1)
-            val nextIndex = array.map.size
-            array.setDirectly("$nextIndex", value)
-            return@Function array
-        },
-        "insert" to java.util.function.Function { params ->
-            val array = params.get<ArrayStruct>(0)
-            val index = params.getInt(1)
-            val value = params.get<MoValue>(2)
-            val size = array.map.size
-
-            // Shift elements at and after index up by 1
-            for (i in (size - 1) downTo index) {
-                val current = array.map[i.toString()]
-                if (current != null) {
-                    array.map[(i + 1).toString()] = current
-                }
-            }
-            array.map[index.toString()] = value
-            return@Function array
-        },
-        "delete" to java.util.function.Function { params ->
-            val array = params.get<ArrayStruct>(0)
-            val index = params.getInt(1)
-            if (index in 0 until array.map.size) {
-                array.map.remove(index.toString())
-                // Re-index the array to keep keys sequential in numerical order
-                val newMap = hashMapOf<String, MoValue>()
-                array.map.keys.mapNotNull { it.toIntOrNull() }
-                    .sorted()
-                    .forEachIndexed { i, k -> newMap[i.toString()] = array.map[k.toString()]!! }
-                array.map.clear()
-                array.map.putAll(newMap)
-            }
-            return@Function array
-        },
        "run_script" to java.util.function.Function { params ->
            val runtime = MoLangRuntime()
            runtime.environment.query = params.environment.query
@@ -305,12 +250,6 @@ object MoLangFunctions {
        { worldHolder ->
            val world = worldHolder.value()
            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
-            map.put("is_time_of_day") { params ->
-                val timeOfDay = TimeRange.timeRanges[params.getString(0).lowercase()]
-                    ?: return@put DoubleValue.ZERO
-                val time = world.dayTime % 24000
-                return@put DoubleValue(timeOfDay.contains(time.toInt()))
-            }
            map.put("game_time") { _ -> DoubleValue(world.gameTime.toDouble()) }
            map.put("time_of_day") {
                val time = world.dayTime % 24000
@@ -479,14 +418,6 @@ object MoLangFunctions {
            map.put("uuid") { _ -> StringValue(player.gameProfile.id.toString()) }
            map.put("main_held_item") { _ -> player.mainHandItem.asMoLangValue(player.registryAccess()) }
            map.put("off_held_item") { _ -> player.offhandItem.asMoLangValue(player.registryAccess()) }
-            map.put("inventory") { _ ->
-                val inventory = player.inventory
-                val items = ArrayStruct(hashMapOf())
-                for (i in 0 until inventory.containerSize) {
-                    items.setDirectly("$i", inventory.getItem(i).asMoLangValue(player.registryAccess()))
-                }
-                return@put items
-            }
            map.put("face") { params -> ObjectValue(PlayerDialogueFaceProvider(player.uuid, params.getBooleanOrNull(0) != false)) }
            map.put("swing_hand") { _ -> player.swing(player.usedItemHand) }
            map.put("food_level") { _ -> DoubleValue(player.foodData.foodLevel) }
@@ -598,50 +529,6 @@ object MoLangFunctions {
                    }
                    return@put DoubleValue.ZERO
                }
-                map.put("start_battle") { params ->
-                    val opponentValue = params.get<MoValue>(0)
-                    val opponent = if (opponentValue is ObjectValue<*>) {
-                        opponentValue.obj as ServerPlayer
-                    } else {
-                        val paramString = opponentValue.asString()
-                        val playerUUID = paramString.asUUID
-                        if (playerUUID != null) {
-                            server()?.playerList?.getPlayer(playerUUID) ?: return@put DoubleValue.ZERO
-                        } else {
-                            server()?.playerList?.getPlayerByName(paramString) ?: return@put DoubleValue.ZERO
-                        }
-                    }
-                    val format = params.getStringOrNull(1)
-                        ?.let(BattleFormat::fromFormatIdentifier)
-                        ?: BattleFormat.GEN_9_SINGLES
-
-                    val setLevel = params.getIntOrNull(2) ?: -1
-                    format.adjustLevel = setLevel
-
-                    val rules = params.getStringOrNull(5)
-                        ?.split(",")
-                        ?.toSet()
-                        ?: emptySet()
-
-                    val modifiedBattleFormat = BattleFormat.setBattleRules(
-                        battleFormat = format,
-                        rules = rules
-                    )
-
-                    val cloneParties = (setLevel != -1) || (params.getBooleanOrNull(3) ?: false)
-                    val healFirst = params.getBooleanOrNull(4) ?: false
-
-                    val battleStartResult = BattleBuilder.pvp1v1(
-                        player1 = player,
-                        player2 = opponent,
-                        battleFormat = modifiedBattleFormat,
-                        cloneParties = cloneParties,
-                        healFirst = healFirst
-                    )
-                    var returnValue: MoValue = DoubleValue.ZERO
-                    battleStartResult.ifSuccessful { returnValue = it.struct }
-                    return@put returnValue
-                }
            }
            map
        }
@@ -694,34 +581,6 @@ object MoLangFunctions {
                return@put owner?.asMostSpecificMoLangValue() ?: DoubleValue.ZERO
            }

-            if (entity is MoLangScriptingEntity) {
-                map.put("add_callback") { params ->
-                    val type = params.getString(0).asIdentifierDefaultingNamespace()
-                    val callback = params.getString(1).asIdentifierDefaultingNamespace()
-                    val allowDuplicates = params.getBooleanOrNull(2) ?: false
-                    entity.callbacks.addCallback(type, callback, allowDuplicates)
-                }
-                map.put("remove_callback") { params ->
-                    val type = params.getString(0).asIdentifierDefaultingNamespace()
-                    val callback = params.getString(1).asIdentifierDefaultingNamespace()
-                    entity.callbacks.removeCallback(type, callback)
-                }
-                map.put("has_callback") { params ->
-                    val type = params.getString(0).asIdentifierDefaultingNamespace()
-                    val callback = params.getString(1).asIdentifierDefaultingNamespace()
-                    return@put DoubleValue(callback in (entity.callbacks[type] ?: emptySet()))
-                }
-                map.put("clear_callbacks") { params ->
-                    val type = params.getStringOrNull(0)?.asIdentifierDefaultingNamespace()
-                    if (type != null) {
-                        entity.callbacks[type]?.clear()
-                    } else {
-                        entity.callbacks.clear()
-                    }
-                    return@put DoubleValue.ONE
-                }
-            }
-
            if (entity is PathfinderMob) {
                map.put("walk_to") { params ->
                    val x = params.getDouble(0)
@@ -911,80 +770,6 @@ object MoLangFunctions {
            map.put("is_sleeping") { _ -> DoubleValue(entity.isSleeping) }
            map.put("health") { _ -> DoubleValue(entity.health) }
            map.put("max_health") { _ -> DoubleValue(entity.maxHealth) }
-            map.put("look_at_position") { params ->
-                val x = params.getDouble(0)
-                val y = params.getDouble(1)
-                val z = params.getDouble(2)
-                val duration = params.getIntOrNull(3) ?: 20
-                val flags = params.params.subList(4, params.params.size).map { it.asString() }
-                val brain = entity.brain
-                brain.setMemoryWithExpiry(MemoryModuleType.LOOK_TARGET, CobblemonBlockPosTracker(Vec3(x, y, z), flags.toSet()), duration.toLong())
-            }
-            map.put("get_wander_control_memory") {
-                val value = entity.brain.getMemorySafely(CobblemonMemories.WANDER_CONTROL).orElse(null)
-                    ?: CobblemonWanderControl()
-                if (
-                    !entity.brain.checkMemory(CobblemonMemories.WANDER_CONTROL, MemoryStatus.VALUE_PRESENT)
-                    && entity.brain.checkMemory(CobblemonMemories.WANDER_CONTROL, MemoryStatus.REGISTERED)
-                ) {
-                    entity.brain.setMemory(CobblemonMemories.WANDER_CONTROL, value)
-                }
-                return@put value.struct
-            }
-            map.put("get_position_memory") { params ->
-                val id = params.getString(0).asIdentifierDefaultingNamespace()
-                val memoryType = BuiltInRegistries.MEMORY_MODULE_TYPE.get(id)
-                if (entity.brain.checkMemory(memoryType, MemoryStatus.VALUE_PRESENT)) {
-                    val memory = entity.brain.getMemory(memoryType).get()
-                    return@put when (memory) {
-                        is Vec3i -> VariableStruct(
-                            mapOf(
-                                "x" to DoubleValue(memory.x),
-                                "y" to DoubleValue(memory.y),
-                                "z" to DoubleValue(memory.z)
-                            )
-                        )
-                        is net.minecraft.core.Position -> VariableStruct(
-                            mapOf(
-                                "x" to DoubleValue(memory.x()),
-                                "y" to DoubleValue(memory.y()),
-                                "z" to DoubleValue(memory.z())
-                            )
-                        )
-                        else -> DoubleValue.ZERO
-                    }
-                } else {
-                    return@put DoubleValue.ZERO
-                }
-            }
-            map.put("set_uuid_memory") { params ->
-                val memory = params.getString(0).asIdentifierDefaultingNamespace().let(BuiltInRegistries.MEMORY_MODULE_TYPE::get) as MemoryModuleType<UUID>
-                val uuid = params.getString(1).asUUID ?: return@put DoubleValue.ZERO
-                val expiry = params.getIntOrNull(2) ?: -1
-                if (expiry != -1) {
-                    entity.brain.setMemoryWithExpiry(memory, uuid, expiry.toLong())
-                } else {
-                    entity.brain.setMemory(memory, uuid)
-                }
-                return@put DoubleValue.ONE
-            }
-            map.put("erase_memory") { params ->
-                val memories = params.params.map { it.asString().asIdentifierDefaultingNamespace() }.map(BuiltInRegistries.MEMORY_MODULE_TYPE::get)
-                memories.forEach { entity.brain.eraseMemory(it) }
-                return@put DoubleValue.ONE
-            }
-            map.put("has_memory_value") { params ->
-                val memoryTypes = params.params.map {
-                    it.asString().asIdentifierDefaultingNamespace()
-                }.map(BuiltInRegistries.MEMORY_MODULE_TYPE::get)
-                return@put DoubleValue(memoryTypes.all { entity.brain.checkMemory(it, MemoryStatus.VALUE_PRESENT) })
-            }
-            map.put("lacks_memory_value") { params ->
-                val memoryTypes = params.params.map {
-                    it.asString().asIdentifierDefaultingNamespace()
-                }.map(BuiltInRegistries.MEMORY_MODULE_TYPE::get)
-                return@put DoubleValue(memoryTypes.none { entity.brain.checkMemory(it, MemoryStatus.VALUE_PRESENT) })
-            }
            map.put("can_see") { params ->
                val target = params.get<MoValue>(0)
                val range = params.getDoubleOrNull(1) ?: 32.0
@@ -1291,23 +1076,6 @@ object MoLangFunctions {
        }
    )

-    val battleMessageFunctions = mutableListOf<(BattleMessage) -> HashMap<String, java.util.function.Function<MoParams, Any>>>(
-        { message ->
-            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
-            map.put("has_argument_at") { params ->
-                val index = params.getInt(0)
-                val value = params.getStringOrNull(1) ?: ""
-                return@put DoubleValue(value == message.argumentAt(index))
-            }
-            map.put("has_argument") { params ->
-                val argumentName = params.getString(0)
-                val value = params.getStringOrNull(1) ?: ""
-                return@put DoubleValue(value == message.optionalArgument(argumentName))
-            }
-            return@mutableListOf map
-        }
-    )
-
    val pokemonFunctions = mutableListOf<(Pokemon) -> HashMap<String, java.util.function.Function<MoParams, Any>>>(
        { pokemon ->
            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
@@ -1317,37 +1085,9 @@ 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("max_fullness") { DoubleValue(pokemon.getMaxFullness().toDouble()) }
-            map.put("fullness") { DoubleValue(pokemon.currentFullness.toDouble()) }
-            map.put("lose_fullness") { params ->
-                val amount = params.getDouble(0)
-                pokemon.loseFullness(amount.toInt())
-            }
-            map.put("feed_pokemon") { params ->
-                val amount = params.getDouble(0)
-                val playSound = params.getBooleanOrNull(1) ?: true
-                pokemon.feedPokemon(amount.toInt(), playSound)
-            }
            map.put("behaviour") { pokemon.form.behaviour.struct }
            map.put("behavior") { pokemon.form.behaviour.struct } // Inferior
            map.put("pokeball") { StringValue(pokemon.caughtBall.toString()) }
-            map.put("ability") { StringValue(pokemon.ability.name) }
-            map.put("has_learned") { params ->
-                val moveName = params.getString(0)
-                val move = pokemon.allAccessibleMoves.find { it.name == moveName }
-                if(move != null) {
-                    return@put DoubleValue.ONE
-                } else {
-                    return@put DoubleValue.ZERO
-                }
-            }
-            map.put("moveset") {
-                val struct = QueryStruct(hashMapOf())
-                for ((index, move) in pokemon.moveSet.withIndex()) {
-                    struct.addFunction(index.toString()) { move.struct }
-                }
-                struct
-            }
            map.put("evs") {
                val struct = QueryStruct(hashMapOf())
                for (stat in Stats.PERMANENT) {
@@ -1362,13 +1102,6 @@ object MoLangFunctions {
                }
                struct
            }
-            map.put("hyper_trained_ivs") {
-                val struct = QueryStruct(hashMapOf())
-                for (stat in Stats.PERMANENT) {
-                    struct.addFunction(stat.showdownId) { DoubleValue(pokemon.ivs.hyperTrainedIVs[stat] ?: -1.0) }
-                }
-                struct
-            }
            map.put("natdex_number") {
                DoubleValue(pokemon.species.nationalPokedexNumber.toDouble())
            }
@@ -1457,17 +1190,6 @@ object MoLangFunctions {
                }
                struct
            }
-            map.put("aspects") {
-                val aspects = pokemon.aspects
-                return@put aspects.asArrayValue { StringValue(it) }
-            }
-            map.put("form_aspects") {
-                val aspects = pokemon.form.aspects
-                return@put aspects.asArrayValue { StringValue(it) }
-            }
-            map.put("form_name") {
-                StringValue(pokemon.form.name.toString())
-            }
            // Yes, this is the lazy call for a single hardcoded pre-evolution.
            // Lol. Lmao, even.
            // TO-DO: Subscribe to [PokemonSpecies.observable].
@@ -1492,18 +1214,6 @@ object MoLangFunctions {
            map.put("remove_held_item") { _ ->
                pokemon.removeHeldItem()
            }
-            map.put("add_aspects") { params ->
-                for (aspect in params.params) pokemon.forcedAspects += aspect.asString()
-                pokemon.updateAspects()
-            }
-            map.put("remove_aspects") { params ->
-                for (aspect in params.params) pokemon.forcedAspects -= aspect.asString()
-                pokemon.updateAspects()
-            }
-            map.put("cosmetic_item") { pokemon.cosmeticItem().asMoLangValue(server()!!.registryAccess()) ?: DoubleValue.ZERO }
-            map.put("remove_cosmetic_item") { _ ->
-                pokemon.removeCosmeticItem()
-            }
            map.put("add_marks") { params ->
                for (param in params.params) {
                    val identifier = param.asString().asIdentifierDefaultingNamespace()
@@ -1545,92 +1255,6 @@ object MoLangFunctions {
                    return@put DoubleValue.ZERO
                }
            }
-            map.put("add_exp") { params ->
-                val exp = params.getDouble(0).toInt()
-                pokemon.addExperience(SidemodExperienceSource("molang"), exp)
-                return@put DoubleValue.ONE
-            }
-            map.put("set_iv") { params ->
-                val statId = params.getString(0)
-                val stat = Stats.getStat(statId)
-                val value = params.getIntOrNull(1)?.coerceIn(0, IVs.MAX_VALUE) ?: IVs.MAX_VALUE
-
-                if (Stats.PERMANENT.contains(stat)) {
-                    pokemon.setIV(stat, value)
-                    return@put DoubleValue.ONE
-                } else {
-                    return@put DoubleValue.ZERO
-                }
-            }
-            map.put("set_ev") { params ->
-                val statId = params.getString(0)
-                val stat = Stats.getStat(statId)
-                val value = (params.getIntOrNull(1) ?: 0).coerceIn(0, 255)
-
-                if (Stats.PERMANENT.contains(stat)) {
-                    pokemon.setEV(stat, value)
-                    return@put DoubleValue.ONE
-                } else {
-                    return@put DoubleValue.ZERO
-                }
-            }
-            map.put("initialize_moveset") { params ->
-                val preferLatest = params.getBooleanOrNull(0) ?: true
-                pokemon.initializeMoveset(preferLatest)
-                return@put DoubleValue.ONE
-            }
-            map.put("validate_moveset") { params ->
-                val includeLegacy = params.getBooleanOrNull(0) ?: true
-                pokemon.validateMoveset(includeLegacy)
-                return@put DoubleValue.ONE
-            }
-            map.put("teach_learnable_moves") { params ->
-                val includeLegacy = params.getBooleanOrNull(0) ?: true
-                pokemon.teachLearnableMoves(includeLegacy)
-                return@put DoubleValue.ONE
-            }
-            map.put("teach_move") { params ->
-                val moveName = params.getString(0)
-                val moveTemplate = Moves.getByName(moveName) ?: return@put DoubleValue.ZERO
-                val bypass = params.getBooleanOrNull(1) ?: false
-
-                val canLearn = bypass || LearnsetQuery.ANY.canLearn(moveTemplate, pokemon.form.moves)
-                if (!canLearn) {
-                    return@put DoubleValue.ZERO
-                }
-
-                val alreadyKnows = pokemon.moveSet.getMoves().any { it.template == moveTemplate } ||
-                        pokemon.benchedMoves.any { it.moveTemplate == moveTemplate }
-                if (alreadyKnows) {
-                    return@put DoubleValue.ZERO
-                }
-
-                if (pokemon.moveSet.hasSpace()) {
-                    pokemon.moveSet.add(moveTemplate.create())
-                } else {
-                    pokemon.benchedMoves.add(BenchedMove(moveTemplate, 0))
-                }
-
-                DoubleValue.ONE
-            }
-            map.put("can_learn_move") { params ->
-                val moveName = params.getString(0)
-                val moveTemplate = Moves.getByName(moveName) ?: return@put DoubleValue.ZERO
-                val includeLegacy = params.getBooleanOrNull(1) ?: true
-
-                val canLearn = LearnsetQuery.ANY.canLearn(moveTemplate, pokemon.form.moves)
-                return@put DoubleValue(if (canLearn) 1.0 else 0.0)
-            }
-            map.put("unlearn_move") { params ->
-                val moveName = params.getString(0)
-                val moveTemplate = Moves.getByName(moveName)
-                if (moveTemplate != null) {
-                    pokemon.unlearnMove(moveTemplate)
-                    return@put DoubleValue.ONE
-                } else {
-                    return@put DoubleValue.ZERO
-                }
-            }
            map
        }
    )
@@ -1645,8 +1269,6 @@ object MoLangFunctions {
            map.put("get_alt_pose") { StringValue(pokemonEntity.getAltPose()) }
            map.put("is_gliding") { DoubleValue(pokemonEntity.isUsingAltPose(cobblemonResource("gliding"))) }
            map.put("is_sprinting") { DoubleValue(pokemonEntity.isUsingAltPose(cobblemonResource("sprinting"))) }
-            map.put("is_drifting") { DoubleValue(pokemonEntity.isUsingAltPose(cobblemonResource("drifting"))) }
-            map.put("is_powered_drifting") { DoubleValue(pokemonEntity.isUsingAltPose(cobblemonResource("powered_drifting"))) }
            map.put("in_air") { DoubleValue(pokemonEntity.isUsingAltPose(cobblemonResource("in_air"))) }
            map.put("is_wild") { DoubleValue(pokemonEntity.ownerUUID == null) }
            map.put("is_in_party") { DoubleValue(pokemonEntity.pokemon.storeCoordinates.get()?.store is PartyStore) }
@@ -1756,12 +1378,6 @@ object MoLangFunctions {
                val pokemon = party.get(index) ?: return@put DoubleValue.ZERO
                return@put pokemon.struct
            }
-            map.put("set_pokemon") { params ->
-                val index = params.getInt(0)
-                val pokemon = params.get<ObjectValue<Pokemon>>(1).obj
-                party.set(index, pokemon)
-                return@put DoubleValue.ONE
-            }
            return@mutableListOf map
        })

@@ -1774,13 +1390,6 @@ object MoLangFunctions {
                val pokemon = pc[PCPosition(box, slot)] ?: return@put DoubleValue.ZERO
                return@put pokemon.struct
            }
-            map.put("set_pokemon") { params ->
-                val box = params.getInt(0)
-                val slot = params.getInt(1)
-                val pokemon = params.get<ObjectValue<Pokemon>>(2).obj
-                pc.set(PCPosition(box, slot), pokemon)
-                return@put DoubleValue.ONE
-            }
            map.put("resize") { params ->
                val newSize = params.getInt(0)
                val lockNewSize = params.getBooleanOrNull(1) == true
@@ -1959,21 +1568,6 @@ object MoLangFunctions {
        }
    )

-    val dropEntryFunctions: MutableList<(DropEntry) -> HashMap<String, java.util.function.Function<MoParams, Any>>> = mutableListOf(
-        { dropEntry ->
-            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
-
-            map.put("percentage") { DoubleValue(dropEntry.percentage.toDouble()) }
-            map.put("quantity") { DoubleValue(dropEntry.quantity.toDouble()) }
-            map.put("max_selectable_times") { DoubleValue(dropEntry.maxSelectableTimes.toDouble()) }
-            map.put("can_drop") { params ->
-                val pokemon = params.getOrNull<ObjectValue<Pokemon>>(0)?.obj
-                DoubleValue(if (dropEntry.canDrop(pokemon)) 1.0 else 0.0)
-            }
-            map
-        }
-    )
-
    val pokemonPropertiesFunctions: MutableList<(PokemonProperties) -> HashMap<String, java.util.function.Function<MoParams, Any>>> = mutableListOf(
        { props ->
            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
@@ -2102,15 +1696,6 @@ object MoLangFunctions {
        return value
    }

-    fun DropEntry.asMoLangValue(): ObjectValue<DropEntry> {
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.toString() }
-        )
-        value.addFunctions(dropEntryFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
-        return value
-    }
-
    fun PokemonProperties.asMoLangValue(): ObjectValue<PokemonProperties> {
        val value = ObjectValue(
            obj = this,
@@ -2268,14 +1853,6 @@ object MoLangFunctions {
        return this
    }

-    fun QueryStruct.addBattleMessageFunctions(battleMessage: BattleMessage): QueryStruct {
-        val addedFunctions = battleMessageFunctions
-            .flatMap { it.invoke(battleMessage).entries }
-            .associate { it.key to it.value }
-        functions.putAll(addedFunctions)
-        return this
-    }
-
    fun QueryStruct.addPokemonEntityFunctions(pokemonEntity: PokemonEntity): QueryStruct {
        val addedFunctions = pokemonEntityFunctions
            .flatMap { it.invoke(pokemonEntity).entries }
@@ -17,7 +17,6 @@ import net.minecraft.resources.ResourceLocation
 * As opposed to the [GlobalPokedexValueCalculator] this interface is always called on a specific dex definition (e.g. galar, kanto)
 */
 interface PokedexValueCalculator<T> {
-    val outputIsPercentage: Boolean
    fun calculate(dexManager: AbstractPokedexManager, dex: Map<ResourceLocation, PokedexEntry>): T
 }

@@ -26,7 +25,6 @@ interface PokedexValueCalculator<T> {
 * The calculation of this interface is aimed to consider all available Pokédex entries and is not limited or filtered to a particular dex
 */
 interface GlobalPokedexValueCalculator<T> {
-    val outputIsPercentage: Boolean
    fun calculate(dexManager: AbstractPokedexManager): T
 }

@@ -34,7 +32,6 @@ interface GlobalPokedexValueCalculator<T> {
 * Calculates the amount of caught Pokémon (globally or per dex)
 */
 object CaughtCount : PokedexValueCalculator<Int>, GlobalPokedexValueCalculator<Int> {
-    override val outputIsPercentage = false
    override fun calculate(dexManager: AbstractPokedexManager): Int {
        return dexManager.speciesRecords.values.count { it.getKnowledge() == PokedexEntryProgress.CAUGHT }
    }
@@ -48,7 +45,6 @@ object CaughtCount : PokedexValueCalculator<Int>, GlobalPokedexValueCalculator<I
 * Calculates the amount of seen Pokémon (globally or per dex)
 */
 object SeenCount : PokedexValueCalculator<Int>, GlobalPokedexValueCalculator<Int> {
-    override val outputIsPercentage = false
    override fun calculate(dexManager: AbstractPokedexManager): Int {
        return dexManager.speciesRecords.values.count { it.getKnowledge() != PokedexEntryProgress.NONE }
    }
@@ -62,14 +58,12 @@ object SeenCount : PokedexValueCalculator<Int>, GlobalPokedexValueCalculator<Int
 * Calculates the seen percentage globally or relative to a particular dex
 */
 object SeenPercent : PokedexValueCalculator<Float>, GlobalPokedexValueCalculator<Float> {
-    override val outputIsPercentage = true
-
    override fun calculate(dexManager: AbstractPokedexManager): Float {
-        return dexManager.speciesRecords.values.count { it.getKnowledge() != PokedexEntryProgress.NONE }.toFloat() / DexEntries.entries.values.map { it.speciesId }.toSet().size * 100F
+        return dexManager.speciesRecords.values.count { it.getKnowledge() != PokedexEntryProgress.NONE }.toFloat() / DexEntries.entries.count().toFloat() * 100F
    }

    override fun calculate(dexManager: AbstractPokedexManager, dex: Map<ResourceLocation, PokedexEntry>): Float {
-        return dex.entries.map { it.value }.count { dexManager.getKnowledgeForSpecies(it.speciesId) != PokedexEntryProgress.NONE }.toFloat() / dex.entries.size * 100F
+        return dex.entries.map { it.value }.count { dexManager.getKnowledgeForSpecies(it.speciesId) != PokedexEntryProgress.NONE }.toFloat() / DexEntries.entries.count().toFloat() * 100F
    }
 }

@@ -77,13 +71,11 @@ object SeenPercent : PokedexValueCalculator<Float>, GlobalPokedexValueCalculator
 * Calculates the caught percentage globally or relative to a particular dex
 */
 object CaughtPercent : PokedexValueCalculator<Float>, GlobalPokedexValueCalculator<Float> {
-    override val outputIsPercentage = true
-
    override fun calculate(dexManager: AbstractPokedexManager): Float {
-        return dexManager.speciesRecords.values.count { it.getKnowledge() == PokedexEntryProgress.CAUGHT }.toFloat() / DexEntries.entries.values.map { it.speciesId }.toSet().size * 100F
+        return dexManager.speciesRecords.values.count { it.getKnowledge() == PokedexEntryProgress.CAUGHT }.toFloat() / DexEntries.entries.count().toFloat().toFloat() * 100F
    }

    override fun calculate(dexManager: AbstractPokedexManager, dex: Map<ResourceLocation, PokedexEntry>): Float {
-        return dex.entries.map { it.value }.count { dexManager.getKnowledgeForSpecies(it.speciesId) == PokedexEntryProgress.CAUGHT }.toFloat() / dex.entries.size * 100F
+        return dex.entries.map { it.value }.count { dexManager.getKnowledgeForSpecies(it.speciesId) == PokedexEntryProgress.CAUGHT }.toFloat() / DexEntries.entries.count().toFloat().toFloat() * 100F
    }
 }
@@ -340,7 +340,6 @@ open class PokemonProperties {
    var originalTrainer: String? = null // Original Trainer by Username or UUID
    var moves: List<String>? = null
    var heldItem: String? = null
-    var cosmeticItem: String? = null

    var ivs: IVs? = null
    var evs: EVs? = null
@@ -37,7 +37,6 @@ import com.cobblemon.mod.common.api.pokemon.stats.Stat
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStatDefinition
 import com.cobblemon.mod.common.api.spawning.TimeRange
 import com.cobblemon.mod.common.api.types.ElementalType
@@ -128,7 +127,6 @@ object PokemonSpecies : JsonDataRegistry<Species> {
        .registerTypeAdapter(ItemPredicate::class.java, LegacyItemConditionWrapperAdapter)
        .registerTypeAdapter(RidingBehaviourSettings::class.java, RidingBehaviourSettingsAdapter)
        .registerTypeAdapter(RidingStatDefinition::class.java, RidingStatDefinitionAdapter)
-        .registerTypeAdapter(RideSoundSettingsList::class.java, RideSoundSettingsListAdapter)
        .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
        .disableHtmlEscaping()
        .enableComplexMapKeySerialization()
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.pokemon.aspect
-
-import com.cobblemon.mod.common.api.spawning.influence.SaccharineLogSlatheredInfluence
-import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
-import net.minecraft.core.particles.ParticleOptions
-import net.minecraft.core.particles.ParticleTypes
-import net.minecraft.resources.ResourceLocation
-
-/**
- * Used by [PokemonClientDelegate.spawnAspectParticle] to spawn associated particles for aspects
- */
-val aspectParticleMap: Map<String, ParticleData> = mapOf(
-    SaccharineLogSlatheredInfluence.HONEY_DRENCHED_ASPECT to ParticleData.MinecraftParticle(ParticleTypes.FALLING_HONEY, 0.075, 1)
-)
-
-sealed class ParticleData {
-    data class SnowstormParticle(val particle: ResourceLocation, val chance: Double, val amount: Int, val locators: List<String>): ParticleData()
-    data class MinecraftParticle(val particle: ParticleOptions, val chance: Double, val amount: Int): ParticleData()
-}
@@ -43,8 +43,6 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
        val tmInterpreter = Interpreter.parseFromPrefixIntoList("tm") { it.tmMoves }
        val eggInterpreter = Interpreter.parseFromPrefixIntoList("egg") { it.eggMoves }
        val tutorInterpreter = Interpreter.parseFromPrefixIntoList("tutor") { it.tutorMoves }
-        val legacyInterpreter = Interpreter.parseFromPrefixIntoList("legacy") { it.legacyMoves }
-        val specialInterpreter = Interpreter.parseFromPrefixIntoList("special") { it.specialMoves }
        val formChangeInterpreter = Interpreter.parseFromPrefixIntoList("form_change") { it.formChangeMoves }
        val levelUpInterpreter = Interpreter { element, learnset ->
            val str = element.takeIf { it.isJsonPrimitive }?.asString ?: return@Interpreter false
@@ -72,8 +70,6 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
            tmInterpreter,
            eggInterpreter,
            tutorInterpreter,
-            legacyInterpreter,
-            specialInterpreter,
            levelUpInterpreter,
            formChangeInterpreter
        )
@@ -82,8 +78,6 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
    val levelUpMoves = mutableMapOf<Int, MutableList<MoveTemplate>>()
    val eggMoves = mutableListOf<MoveTemplate>()
    val tutorMoves = mutableListOf<MoveTemplate>()
-    val legacyMoves = mutableListOf<MoveTemplate>()
-    val specialMoves = mutableListOf<MoveTemplate>()
    val tmMoves = mutableListOf<MoveTemplate>()
    /**
     * Moves the species/form will have learnt when evolving into itself.
@@ -99,15 +93,6 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
        .flatMap { it.value }
        .toSet()

-    fun getAllLegalMoves(): Set<MoveTemplate> {
-        return levelUpMoves.values.flatten().toSet() +
-                eggMoves +
-                tutorMoves +
-                tmMoves +
-                formChangeMoves +
-                evolutionMoves
-    }
-
    // We only sync level up moves atm
    override fun shouldSynchronize(other: Learnset) = other.levelUpMoves != this.levelUpMoves

@@ -24,17 +24,6 @@ fun interface LearnsetQuery {
    companion object {

        val ANY = LearnsetQuery { move, learnset ->
-            learnset.levelUpMoves.values.any { it.contains(move) }
-                    || learnset.eggMoves.contains(move)
-                    || learnset.tutorMoves.contains(move)
-                    || learnset.tmMoves.contains(move)
-                    || learnset.formChangeMoves.contains(move)
-                    || learnset.evolutionMoves.contains(move)
-                    || learnset.legacyMoves.contains(move)
-                    || learnset.specialMoves.contains(move)
-        }
-
-        val LEGAL = LearnsetQuery { move, learnset ->
            learnset.levelUpMoves.values.any { it.contains(move) }
                    || learnset.eggMoves.contains(move)
                    || learnset.tutorMoves.contains(move)
@@ -57,9 +46,6 @@ fun interface LearnsetQuery {

        val EVOLUTION = LearnsetQuery { move, learnset -> learnset.evolutionMoves.contains(move) }

-        val LEGACY_MOVES = LearnsetQuery { move, learnset -> learnset.legacyMoves.contains(move) }
-
-        val SPECIAL_MOVES = LearnsetQuery { move, learnset -> learnset.specialMoves.contains(move) }
    }

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

 import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.resources.ResourceLocation
@@ -89,8 +88,6 @@ interface RidingBehaviour<Settings : RidingBehaviourSettings, State : RidingBeha

    fun shouldRotatePlayerHead(settings: Settings, state: State, vehicle: PokemonEntity): Boolean

-    fun getRideSounds(settings: Settings, state: State, vehicle: PokemonEntity): RideSoundSettingsList
-
    fun maxUpStep(settings: Settings, state: State, vehicle: PokemonEntity): Float? = null

    fun canStopRiding(settings: Settings, state: State, vehicle: PokemonEntity, passenger: Player): Boolean = true
@@ -12,7 +12,6 @@ import com.cobblemon.mod.common.api.riding.behaviour.types.air.*
 import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.types.land.HorseBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.types.land.VehicleBehaviour
-import com.cobblemon.mod.common.api.riding.behaviour.types.land.MinekartBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.BoatBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.BurstBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.DolphinBehaviour
@@ -23,19 +22,15 @@ object RidingBehaviours {

    init {
        register(BirdBehaviour.KEY, BirdBehaviour())
-        register(BirdNoRollBehaviour.KEY, BirdNoRollBehaviour())
        register(DolphinBehaviour.KEY, DolphinBehaviour())
        register(HorseBehaviour.KEY, HorseBehaviour())
        register(BoatBehaviour.KEY, BoatBehaviour())
        register(GliderBehaviour.KEY, GliderBehaviour())
        register(HelicopterBehaviour.KEY, HelicopterBehaviour())
        register(JetBehaviour.KEY, JetBehaviour())
-        register(JetNoRollBehaviour.KEY, JetNoRollBehaviour())
        register(BurstBehaviour.KEY, BurstBehaviour())
        register(VehicleBehaviour.KEY, VehicleBehaviour())
-        register(MinekartBehaviour.KEY, MinekartBehaviour())
        register(HoverBehaviour.KEY, HoverBehaviour())
-        register(RocketBehaviour.KEY, RocketBehaviour())
        register(CompositeBehaviour.KEY, CompositeBehaviour())
    }

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.riding.behaviour

 import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.resources.ResourceLocation
@@ -191,11 +190,6 @@ class RidingController<Settings : RidingBehaviourSettings, State : RidingBehavio
        return behaviour.maxUpStep(settings, state, vehicle)
    }

-    override fun getRideSounds(settings: Settings, state: State, vehicle: PokemonEntity): RideSoundSettingsList {
-        if (!isActive(settings, state, vehicle)) return RideSoundSettingsList()
-        return behaviour.getRideSounds(settings, state, vehicle)
-    }
-
    override fun createDefaultState(settings: Settings): State {
        return behaviour.createDefaultState(settings)
    }
@@ -16,8 +16,6 @@ import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.api.riding.sound.RideLoopSound
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.*
@@ -25,7 +23,6 @@ import com.cobblemon.mod.common.util.math.geometry.toRadians
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.sounds.SoundEvent
 import net.minecraft.util.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
@@ -107,6 +104,14 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
            upForce -= 0.3
        }

+        val altitudeLimit = vehicle.runtime.resolveDouble(settings.jumpExpr)
+
+        //Only limit altitude if altitude is not infinite
+        if (!vehicle.runtime.resolveBoolean(settings.infiniteAltitude)) {
+            //Provide a hard limit on altitude
+            upForce = if (vehicle.y >= altitudeLimit && upForce > 0) 0.0 else upForce
+        }
+

        val velocity = Vec3(state.rideVelocity.get().x , upForce, forwardForce)
        return velocity
@@ -121,7 +126,12 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
        val glideTopSpeed = vehicle.runtime.resolveDouble(settings.glidespeedExpr)
        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr)
        val staminaStat = vehicle.runtime.resolveDouble(settings.staminaExpr)
+
        var glideSpeedChange = 0.0
+
+        val currSpeed = state.rideVelocity.get().length()
+
+        //Flag for determining if player is actively inputting
        var activeInput = false

        var newVelocity = Vec3(state.rideVelocity.get().x, state.rideVelocity.get().y, state.rideVelocity.get().z)
@@ -456,15 +466,7 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
        state: BirdState,
        vehicle: PokemonEntity
    ): Boolean {
-        return false
-    }
-
-    override fun getRideSounds(
-        settings: BirdSettings,
-        state: BirdState,
-        vehicle: PokemonEntity
-    ): RideSoundSettingsList {
-        return settings.rideSounds
+        return true
    }

    override fun createDefaultState(settings: BirdSettings) = BirdState()
@@ -489,11 +491,8 @@ class BirdSettings : RidingBehaviourSettings {
    var glidespeedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 2.0, 1.0)".asExpression()
        private set

-    var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
-
    override fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeResourceLocation(key)
-        rideSounds.encode(buffer)
        buffer.writeExpression(infiniteAltitude)
        buffer.writeExpression(infiniteStamina)
        buffer.writeExpression(glidespeedExpr)
@@ -505,7 +504,6 @@ class BirdSettings : RidingBehaviourSettings {
    }

    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        rideSounds = RideSoundSettingsList.decode(buffer)
        infiniteAltitude = buffer.readExpression()
        infiniteStamina = buffer.readExpression()
        glidespeedExpr = buffer.readExpression()
@@ -1,518 +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.riding.behaviour.types.air
-
-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.MoLangMath.lerp
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.OrientationControllable
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.*
-import com.cobblemon.mod.common.api.riding.posing.PoseOption
-import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.*
-import com.cobblemon.mod.common.util.math.geometry.toRadians
-import net.minecraft.network.FriendlyByteBuf
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.util.SmoothDouble
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.phys.Vec2
-import net.minecraft.world.phys.Vec3
-import org.joml.Vector3f
-import kotlin.math.*
-
-class BirdNoRollBehaviour : RidingBehaviour<BirdNoRollSettings, BirdNoRollState> {
-    companion object {
-        val KEY = cobblemonResource("air/birdnoroll")
-    }
-
-    override val key: ResourceLocation = KEY
-
-    override fun getRidingStyle(settings: BirdNoRollSettings, state: BirdNoRollState): RidingStyle {
-        return RidingStyle.AIR
-    }
-
-    val poseProvider = PoseProvider<BirdNoRollSettings, BirdNoRollState>(PoseType.HOVER)
-        .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVelocity.get().z > 0.2 })
-
-    override fun isActive(settings: BirdNoRollSettings, state: BirdNoRollState, vehicle: PokemonEntity): Boolean {
-        return true
-    }
-
-    override fun pose(settings: BirdNoRollSettings, state: BirdNoRollState, vehicle: PokemonEntity): PoseType {
-        return poseProvider.select(settings, state, vehicle)
-    }
-
-    override fun speed(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        return state.rideVelocity.get().length().toFloat()
-    }
-
-    override fun rotation(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ): Vec2 {
-        return Vec2(driver.xRot * 0.5f, driver.yRot)
-    }
-
-    override fun velocity(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ): Vec3 {
-        var yVel = 0.0
-        var leftForce = 0.0
-        var upForce = 0.0
-        var forwardForce = 0.0
-
-        //Perform ride velocity update
-        calculateRideSpaceVel(settings, state, vehicle, driver)
-
-        //Translate ride space velocity to world space velocity.
-        val controller = (driver as? OrientationControllable)?.orientationController
-        if (controller != null) {
-            upForce += -1.0 * sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z
-            forwardForce += cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z
-
-            upForce += cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().y
-            forwardForce += sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().y
-        }
-
-        //Bring the ride out of the sky when stamina is depleted.
-        if (state.stamina.get() <= 0.0) {
-            upForce -= 0.3
-        }
-
-        val velocity = Vec3(state.rideVelocity.get().x , upForce, forwardForce)
-        return velocity
-    }
-
-    /*
-    *  Calculates the change in the ride space vector due to player input and ride state
-    */
-    fun calculateRideSpaceVel(settings: BirdNoRollSettings, state: BirdNoRollState, vehicle: PokemonEntity, driver: Player) {
-        //retrieve stats
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val glideTopSpeed = vehicle.runtime.resolveDouble(settings.glidespeedExpr)
-        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr)
-        val staminaStat = vehicle.runtime.resolveDouble(settings.staminaExpr)
-
-        var glideSpeedChange = 0.0
-
-        val currSpeed = state.rideVelocity.get().length()
-
-        //Flag for determining if player is actively inputting
-        var activeInput = false
-
-        var newVelocity = Vec3(state.rideVelocity.get().x, state.rideVelocity.get().y, state.rideVelocity.get().z)
-
-        //speed up and slow down based on input
-        if (driver.zza != 0.0f && state.stamina.get() > 0.0) {
-            //make sure it can't exceed top speed
-            val forwardInput = when {
-                driver.zza > 0 && newVelocity.z > topSpeed -> 0.0
-                driver.zza < 0 && newVelocity.z < (-topSpeed / 3.0) -> 0.0
-                else -> driver.zza.sign
-            }
-
-            newVelocity = Vec3(
-                newVelocity.x,
-                newVelocity.y,
-                (newVelocity.z + (accel * forwardInput.toDouble())))
-
-            activeInput = true
-        }
-
-        val controller = (driver as? OrientationControllable)?.orientationController
-        if (controller != null) {
-            //Base glide speed change on current pitch of the ride.
-            glideSpeedChange = sin(Math.toRadians(controller.pitch.toDouble()))
-            glideSpeedChange = glideSpeedChange * 0.25
-
-            //TODO: Possibly create a deadzone around parallel where glide doesn't affect speed?
-            if (glideSpeedChange <= 0.0) {
-                //Ensures that a propelling force is still able to be applied when
-                //climbing in height
-                if (driver.zza <= 0) {
-                    //speed decrease should be 2x speed increase?
-                    //state.currSpeed = max(state.currSpeed + (0.0166) * glideSpeedChange, 0.0 )
-                    newVelocity = Vec3(
-                        newVelocity.x,
-                        newVelocity.y,
-                        lerp( newVelocity.z, 0.0,glideSpeedChange * -0.0166 * 2 )
-                    )
-                }
-            } else {
-                // only add to the speed if it hasn't exceeded the current
-                //glide angles maximum amount of speed that it can give.
-                //state.currSpeed = min(state.currSpeed + ((0.0166 * 2) * glideSpeedChange), maxGlideSpeed)
-                newVelocity = Vec3(
-                    newVelocity.x,
-                    newVelocity.y,
-                    min(newVelocity.z + ((0.0166 * 2) * glideSpeedChange), glideTopSpeed)
-                )
-            }
-        }
-
-        //Vertical movement based on driver input.
-        val vertTopSpeed = topSpeed / 2.0
-        val vertInput = when {
-            driver.jumping && state.rideVelocity.get().length() < 0.3 -> 1.0
-            driver.isShiftKeyDown && state.rideVelocity.get().length() < 0.3  -> -1.0
-            else -> 0.0
-        }
-
-        if (vertInput != 0.0 && state.stamina.get() > 0.0) {
-            newVelocity = Vec3(
-                newVelocity.x,
-                (newVelocity.y + (accel * vertInput)).coerceIn(-vertTopSpeed, vertTopSpeed),
-                newVelocity.z)
-            activeInput = true
-        }
-        else {
-            newVelocity = Vec3(
-                newVelocity.x,
-                lerp(newVelocity.y, 0.0, vertTopSpeed / 20.0),
-                newVelocity.z)
-        }
-
-        //Check if the ride should be gliding
-        if (driver.isLocalPlayer) {
-            if (activeInput && state.stamina.get() > 0.0) {
-                state.gliding.set(false)
-            } else {
-                state.gliding.set(true)
-            }
-        }
-
-        //air resistance
-        if( abs(newVelocity.z) > 0) {
-            newVelocity = newVelocity.subtract(0.0, 0.0, min(0.0015 * newVelocity.z.sign, newVelocity.z))
-        }
-        state.rideVelocity.set(newVelocity)
-    }
-
-    override fun angRollVel(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        deltaTime: Double
-    ): Vec3 {
-        if (driver !is OrientationControllable) return Vec3.ZERO
-        val controller = (driver as OrientationControllable).orientationController
-
-        //limit rolling based on handling and current speed.
-        //modulated by speed so that when flapping idle in air you are ont wobbling around to look around
-        //TODO: Tie handling into yaw rate
-        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr)
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        //This rotation limit will be used to know if the ride has exceeded it and its needs correcting.
-        val rotMin = 15.0
-        val rotLimit = max(handling * sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)), rotMin)
-
-        var yawDeltaDeg =  deltaTime * handling * sin(Math.toRadians(controller.roll.toDouble())) //sin(Math.toRadians(controller.roll.toDouble())) * abs(cos(Math.toRadians(controller.pitch.toDouble())))
-        val trueYawDelt = yawDeltaDeg * abs(cos(Math.toRadians(controller.pitch.toDouble())))
-        //val pitchedYawDelt = yawDeltaDeg - trueYawDelt
-
-        controller.applyGlobalYaw(trueYawDelt.toFloat())
-
-        //Calculate correcting roll force.
-        val correctionRate = 5.0
-        if(abs(controller.roll) > rotLimit && state.rideVelocity.get().length() < 0.2) {
-            state.currRollCorrectionForce.set(
-                state.currRollCorrectionForce.get() + ((abs(controller.roll) - rotLimit) / 180 - rotLimit) * controller.roll.sign * correctionRate * deltaTime * 0.01
-            )
-        } else {
-            state.currRollCorrectionForce.set(
-                //reduce rollCorrection gradually
-                lerp(state.currRollCorrectionForce.get(), 0.0, deltaTime * 0.98)
-            )
-        }
-
-        //yaw, pitch, roll
-        return Vec3(0.0, 0.0, state.currRollCorrectionForce.get())
-    }
-
-    override fun rotationOnMouseXY(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        mouseY: Double,
-        mouseX: Double,
-        mouseYSmoother: SmoothDouble,
-        mouseXSmoother: SmoothDouble,
-        sensitivity: Double,
-        deltaTime: Double
-    ): Vec3 {
-        if (driver !is OrientationControllable) return Vec3.ZERO
-        val controller = (driver as OrientationControllable).orientationController
-
-        //TODO: hook up handling in parity with normal bird
-        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr)
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-
-        //Smooth out mouse input.
-        val smoothingSpeed = 4.0
-        val invertRoll = if (Cobblemon.config.invertRoll) -1 else 1
-        val invertPitch = if (Cobblemon.config.invertPitch) -1 else 1
-        val mouseXc = (mouseX).coerceIn(-60.0, 60.0)
-        val mouseYc = (mouseY).coerceIn(-60.0, 60.0)
-        val xInput = mouseXSmoother.getNewDeltaValue(mouseXc * 0.1 * invertRoll, deltaTime * smoothingSpeed);
-        val yInput = mouseYSmoother.getNewDeltaValue(mouseYc * 0.1 * invertPitch, deltaTime * smoothingSpeed);
-
-        //Give the ability to yaw with x mouse input when at low speeds.
-        val yawForce =  xInput * ( 1.0 - min(sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)), 0.5))
-
-        //Apply yaw globally as we don't want roll or pitch changes due to local yaw when looking up or down.
-
-        controller.applyGlobalYaw(yawForce.toFloat())
-
-        var pitchRot = yInput
-
-        // Pitch up globally
-        if (abs(controller.pitch + pitchRot) >= 89.5 ) {
-            pitchRot = 0.0
-            mouseYSmoother.reset()
-        } else {
-            controller.applyGlobalPitch(pitchRot.toFloat()  * -1.0f)
-        }
-
-        //yaw, pitch, roll
-        return Vec3.ZERO
-    }
-
-    /*
-    *  Normalizes the given value between a min and a max.
-    *  The result is clamped between 0.0 and 1.0, where 0.0 represents x is at or below min
-    *  and 1.0 represents x is at or above it.
-    */
-    private fun normalizeVal(x: Double, min: Double, max: Double): Double {
-        require(max > min) { "max must be greater than min" }
-        return ((x - min) / (max - min)).coerceIn(0.0, 1.0)
-    }
-
-    override fun canJump(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        return false
-    }
-
-    override fun setRideBar(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        return (state.stamina.get() / 1.0f)
-    }
-
-    override fun jumpForce(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        jumpStrength: Int
-    ): Vec3 {
-        return Vec3.ZERO
-    }
-
-    override fun gravity(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity,
-        regularGravity: Double
-    ): Double {
-        return 0.0
-    }
-
-    override fun rideFovMultiplier(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val glideTopSpeed = vehicle.runtime.resolveDouble(settings.glidespeedExpr)
-
-        //Must I ensure that topspeed is greater than minimum?
-        val normalizedGlideSpeed = normalizeVal(state.rideVelocity.get().length(), topSpeed, glideTopSpeed)
-
-        //Only ever want the fov change to be a max of 0.2 and for it to have non linear scaling.
-        return 1.0f + normalizedGlideSpeed.pow(2).toFloat() * 0.2f
-    }
-
-    override fun useAngVelSmoothing(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun useRidingAltPose(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): ResourceLocation {
-        if (state.gliding.get()) {
-            return cobblemonResource("gliding")
-        }
-        return cobblemonResource("no_pose")
-    }
-
-    override fun inertia(settings: BirdNoRollSettings, state: BirdNoRollState, vehicle: PokemonEntity): Double {
-        return 0.5
-    }
-
-    override fun shouldRoll(settings: BirdNoRollSettings, state: BirdNoRollState, vehicle: PokemonEntity): Boolean {
-        return true
-    }
-
-    override fun turnOffOnGround(settings: BirdNoRollSettings, state: BirdNoRollState, vehicle: PokemonEntity): Boolean {
-        return false
-    }
-
-    override fun dismountOnShift(settings: BirdNoRollSettings, state: BirdNoRollState, vehicle: PokemonEntity): Boolean {
-        return false
-    }
-
-    override fun shouldRotatePokemonHead(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun shouldRotatePlayerHead(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun getRideSounds(
-        settings: BirdNoRollSettings,
-        state: BirdNoRollState,
-        vehicle: PokemonEntity
-    ): RideSoundSettingsList {
-        return settings.rideSounds
-    }
-
-    override fun createDefaultState(settings: BirdNoRollSettings) = BirdNoRollState()
-}
-
-class BirdNoRollSettings : RidingBehaviourSettings {
-    override val key = BirdNoRollBehaviour.KEY
-
-    var infiniteAltitude: Expression = "false".asExpression()
-        private set
-
-    var infiniteStamina: Expression = "false".asExpression()
-        private set
-
-    //max y level for the ride
-    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 200.0, 128.0)".asExpression()
-    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 135.0, 45.0)".asExpression()
-    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 1.0, 0.35)".asExpression()
-    var accelerationExpr: Expression = "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 3.0)), (1.0 / (20.0 * 8.0)))".asExpression()
-    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 120.0, 20.0)".asExpression()
-
-    var glidespeedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 2.0, 1.0)".asExpression()
-        private set
-
-    var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
-
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
-        rideSounds.encode(buffer)
-        buffer.writeExpression(infiniteAltitude)
-        buffer.writeExpression(infiniteStamina)
-        buffer.writeExpression(glidespeedExpr)
-        buffer.writeExpression(jumpExpr)
-        buffer.writeExpression(handlingExpr)
-        buffer.writeExpression(speedExpr)
-        buffer.writeExpression(accelerationExpr)
-        buffer.writeExpression(staminaExpr)
-    }
-
-    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        rideSounds = RideSoundSettingsList.decode(buffer)
-        infiniteAltitude = buffer.readExpression()
-        infiniteStamina = buffer.readExpression()
-        glidespeedExpr = buffer.readExpression()
-        jumpExpr = buffer.readExpression()
-        handlingExpr = buffer.readExpression()
-        speedExpr = buffer.readExpression()
-        accelerationExpr = buffer.readExpression()
-        staminaExpr = buffer.readExpression()
-    }
-}
-
-class BirdNoRollState : RidingBehaviourState() {
-    var gliding = ridingState(false, Side.CLIENT)
-    var lastGlide = ridingState(-100L, Side.CLIENT)
-    var currRollCorrectionForce = ridingState(0.0, Side.CLIENT)
-
-    override fun encode(buffer: FriendlyByteBuf) {
-        super.encode(buffer)
-        buffer.writeFloat(stamina.get())
-        buffer.writeBoolean(gliding.get())
-    }
-
-    override fun decode(buffer: FriendlyByteBuf) {
-        super.decode(buffer)
-        gliding.set(buffer.readBoolean(), forced = true)
-    }
-
-    override fun reset() {
-        super.reset()
-        gliding.set(false, forced = true)
-        lastGlide.set(-100L, forced = true)
-        currRollCorrectionForce.set(0.0, forced = true)
-    }
-
-    override fun toString(): String {
-        return "BirdNoRollState(rideVelocity=${rideVelocity.get()}, stamina=${stamina.get()}, gliding=${gliding.get()})"
-    }
-
-    override fun copy() = BirdNoRollState().also {
-        it.rideVelocity.set(this.rideVelocity.get(), forced = true)
-        it.stamina.set(this.stamina.get(), forced = true)
-        it.gliding.set(this.gliding.get(), forced = true)
-        it.lastGlide.set(this.lastGlide.get(), forced = true)
-        it.currRollCorrectionForce.set(this.currRollCorrectionForce.get(), forced = true)
-    }
-
-    override fun shouldSync(previous: RidingBehaviourState): Boolean {
-        if (previous !is BirdNoRollState) return false
-        if (previous.gliding.get() != gliding.get()) return true
-        return super.shouldSync(previous)
-    }
-}
@@ -17,7 +17,6 @@ import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -188,10 +187,6 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
        return false
    }

-    override fun getRideSounds(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity): RideSoundSettingsList {
-        return settings.rideSounds
-    }
-
    override fun createDefaultState(settings: GliderSettings) = RidingBehaviourState()
 }

@@ -207,18 +202,14 @@ class GliderSettings : RidingBehaviourSettings {
    var canStrafe: Expression = "false".asExpression()
        private set

-    var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
-
    override fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeResourceLocation(key)
-        rideSounds.encode(buffer)
        buffer.writeExpression(glideSpeed)
        buffer.writeExpression(speed)
        buffer.writeExpression(canStrafe)
    }

    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        rideSounds = RideSoundSettingsList.decode(buffer)
        glideSpeed = buffer.readExpression()
        speed = buffer.readExpression()
        canStrafe = buffer.readExpression()
@@ -17,7 +17,6 @@ import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.*
@@ -273,10 +272,6 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS
        return false
    }

-    override fun getRideSounds(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): RideSoundSettingsList {
-        return settings.rideSounds
-    }
-
    override fun createDefaultState(settings: HelicopterSettings) = RidingBehaviourState()
 }

@@ -296,11 +291,8 @@ class HelicopterSettings : RidingBehaviourSettings {
    var speed: Expression = "1.0".asExpression()
        private set

-    var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
-
    override fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeResourceLocation(key)
-        rideSounds.encode(buffer)
        buffer.writeExpression(gravity)
        buffer.writeExpression(horizontalAcceleration)
        buffer.writeExpression(verticalVelocity)
@@ -308,7 +300,6 @@ class HelicopterSettings : RidingBehaviourSettings {
    }

    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        rideSounds = RideSoundSettingsList.decode(buffer)
        gravity = buffer.readExpression()
        horizontalAcceleration = buffer.readExpression()
        verticalVelocity = buffer.readExpression()
@@ -13,8 +13,6 @@ import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.api.riding.sound.RideLoopSound
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.*
@@ -460,24 +458,12 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
        return false
    }

-    override fun getRideSounds(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): RideSoundSettingsList {
-        return settings.rideSounds
-    }
-
    override fun createDefaultState(settings: HoverSettings) = HoverState()
 }

 class HoverSettings : RidingBehaviourSettings {
    override val key = HoverBehaviour.KEY

-    var rideSound: ResourceLocation = "ride.loop.saucer".asIdentifierDefaultingNamespace()
-    var volumeExpr: Expression = "math.pow(math.min(q.ride_velocity() / 0.8, 1.0),2)".asExpression()
-    var pitchExpr: Expression =  "math.pow(math.min(1.0 + 0.2*(q.ride_velocity() / 0.8), 1.2),2)".asExpression()
-
    var canJump = "true".asExpression()
        private set

@@ -500,11 +486,8 @@ class HoverSettings : RidingBehaviourSettings {
    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 140.0, 20.0)".asExpression()
        private set

-    var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
-
    override fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeResourceLocation(key)
-        rideSounds.encode(buffer)
        buffer.writeExpression(speedExpr)
        buffer.writeExpression(accelerationExpr)
        buffer.writeExpression(staminaExpr)
@@ -513,7 +496,6 @@ class HoverSettings : RidingBehaviourSettings {
    }

    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        rideSounds = RideSoundSettingsList.decode(buffer)
        speedExpr = buffer.readExpression()
        accelerationExpr = buffer.readExpression()
        staminaExpr = buffer.readExpression()
@@ -21,8 +21,6 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.*
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
-import com.bedrockk.molang.runtime.MoLangMath.lerp
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
@@ -138,6 +136,14 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
        //If stamina has run out then initiate forced glide down.
        upForce = if (state.stamina.get() > 0.0) upForce else -0.7

+        val altitudeLimit = vehicle.runtime.resolveDouble(settings.jumpExpr)
+
+        //Only limit altitude if altitude is not infinite
+        if (!vehicle.runtime.resolveBoolean(settings.infiniteAltitude)) {
+            //Provide a hard limit on altitude
+            upForce = if (vehicle.y >= altitudeLimit && upForce > 0) 0.0 else upForce
+        }
+
        val velocity = Vec3(0.0, upForce, forwardForce)

        return velocity
@@ -154,11 +160,17 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
    ) {
        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr)
+        val altitudeLimit = vehicle.runtime.resolveDouble(settings.jumpExpr)
        val minSpeed = vehicle.runtime.resolveDouble(settings.minSpeed)
        val speed = state.rideVelocity.get().length()

+        //Give no altitude limit if at max jump stat.
+        val pushingHeightLimit = if (vehicle.runtime.resolveBoolean(settings.infiniteStamina)) false
+        else (vehicle.y >= altitudeLimit && vehicle.xRot <= 0)
+
+
        //speed up and slow down based on input
-        if (driver.zza > 0.0 && speed < topSpeed && state.stamina.get() > 0.0f) {
+        if (driver.zza > 0.0 && speed < topSpeed && state.stamina.get() > 0.0f && !pushingHeightLimit) {
            //modify acceleration to be slower when at closer speeds to top speed
            val accelMod = max(-(normalizeSpeed(speed, minSpeed, topSpeed)) + 1, 0.0)
            state.rideVelocity.set(
@@ -168,7 +180,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
                    min(state.rideVelocity.get().z + (accel * accelMod), topSpeed)
                )
            )
-        } else if (driver.zza >= 0.0 && (state.stamina.get() == 0.0f)) {
+        } else if (driver.zza >= 0.0 && (state.stamina.get() == 0.0f || pushingHeightLimit)) {
            state.rideVelocity.set(
                Vec3(
                    state.rideVelocity.get().x,
@@ -368,22 +380,10 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
        return false
    }

-    override fun shouldRotatePlayerHead(
-        settings: JetSettings,
-        state: JetState,
-        vehicle: PokemonEntity
-    ): Boolean {
+    override fun shouldRotatePlayerHead(settings: JetSettings, state: JetState, vehicle: PokemonEntity): Boolean {
        return false
    }

-    override fun getRideSounds(
-        settings: JetSettings,
-        state: JetState,
-        vehicle: PokemonEntity
-    ): RideSoundSettingsList {
-        return settings.rideSounds
-    }
-
    override fun createDefaultState(settings: JetSettings) = JetState()

    override fun damageOnCollision(
@@ -413,6 +413,9 @@ class JetSettings : RidingBehaviourSettings {
    var infiniteStamina: Expression = "false".asExpression()
        private set

+    var infiniteAltitude: Expression = "false".asExpression()
+        private set
+
    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 300.0, 128.0)".asExpression()
        private set
    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 140.0, 20.0)".asExpression()
@@ -425,15 +428,13 @@ class JetSettings : RidingBehaviourSettings {
    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 60.0, 10.0)".asExpression()
        private set

-    var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
-
    override fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeResourceLocation(key)
-        rideSounds.encode(buffer)
        buffer.writeExpression(gravity)
        buffer.writeExpression(minSpeed)
        buffer.writeExpression(handlingYawExpr)
        buffer.writeExpression(infiniteStamina)
+        buffer.writeExpression(infiniteAltitude)
        buffer.writeExpression(jumpExpr)
        buffer.writeExpression(handlingExpr)
        buffer.writeExpression(speedExpr)
@@ -442,11 +443,11 @@ class JetSettings : RidingBehaviourSettings {
    }

    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        rideSounds = RideSoundSettingsList.decode(buffer)
        gravity = buffer.readExpression()
        minSpeed = buffer.readExpression()
        handlingYawExpr = buffer.readExpression()
        infiniteStamina = buffer.readExpression()
+        infiniteAltitude = buffer.readExpression()
        jumpExpr = buffer.readExpression()
        handlingExpr = buffer.readExpression()
        speedExpr = buffer.readExpression()
@@ -482,6 +483,8 @@ class JetState : RidingBehaviourState() {
        it.currSpeed.set(currSpeed.get(), forced = true)
        it.stamina.set(stamina.get(), forced = true)
        it.rideVelocity.set(rideVelocity.get(), forced = true)
+//        it.currMouseXForce.set(currMouseXForce.get(), forced = true)
+//        it.currMouseYForce.set(currMouseYForce.get(), forced = true)
    }

    override fun shouldSync(previous: RidingBehaviourState): Boolean {
@@ -1,477 +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.riding.behaviour.types.air
-
-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.MoLangMath.lerp
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.OrientationControllable
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.*
-import com.cobblemon.mod.common.api.riding.posing.PoseOption
-import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.*
-import net.minecraft.network.FriendlyByteBuf
-import net.minecraft.network.RegistryFriendlyByteBuf
-import com.bedrockk.molang.runtime.MoLangMath.lerp
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.util.SmoothDouble
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.phys.Vec2
-import net.minecraft.world.phys.Vec3
-import net.minecraft.world.phys.shapes.Shapes
-import kotlin.math.*
-
-class JetNoRollBehaviour : RidingBehaviour<JetNoRollSettings, JetNoRollState> {
-    companion object {
-        val KEY = cobblemonResource("air/jetnoroll")
-    }
-
-    override val key = KEY
-
-    override fun getRidingStyle(settings: JetNoRollSettings, state: JetNoRollState): RidingStyle {
-        return RidingStyle.AIR
-    }
-
-    val poseProvider = PoseProvider<JetNoRollSettings, JetNoRollState>(PoseType.HOVER)
-        .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVelocity.get().z > 0.1 })
-
-    override fun isActive(settings: JetNoRollSettings, state: JetNoRollState, vehicle: PokemonEntity): Boolean {
-        return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
-            //Need to check other fluids
-            if (vehicle.isInWater || vehicle.isUnderWater) {
-                return@any false
-            }
-            //This might not actually work, depending on what the yPos actually is. yPos of the middle of the entity? the feet?
-            if (it.y.toDouble() == (vehicle.position().y)) {
-                val blockState = vehicle.level().getBlockState(it.below())
-                return@any !(!blockState.isAir && blockState.fluidState.isEmpty)
-            }
-            true
-        }
-    }
-
-    override fun pose(settings: JetNoRollSettings, state: JetNoRollState, vehicle: PokemonEntity): PoseType {
-        return poseProvider.select(settings, state, vehicle)
-    }
-
-    override fun speed(settings: JetNoRollSettings, state: JetNoRollState, vehicle: PokemonEntity, driver: Player): Float {
-        //retrieve stats
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val staminaStat = vehicle.runtime.resolveDouble(settings.staminaExpr)
-
-        //retrieve minSpeed
-        val minSpeed = vehicle.runtime.resolveDouble(settings.minSpeed)
-
-        //TODO: Reintroduce stamina drain once stats start to be polished and tweaked
-        state.stamina.set(1.0f)
-
-        return state.rideVelocity.get().length().toFloat()
-    }
-
-    //TODO: Move these functions to a riding util class.
-    /*
-    *  Normalizes the current speed between minSpeed and maxSpeed.
-    *  The result is clamped between 0.0 and 1.0, where 0.0 represents minSpeed and 1.0 represents maxSpeed.
-    */
-    private fun normalizeSpeed(currSpeed: Double, minSpeed: Double, maxSpeed: Double): Double {
-        require(maxSpeed > minSpeed) { "maxSpeed must be greater than minSpeed" }
-        return ((currSpeed - minSpeed) / (maxSpeed - minSpeed)).coerceIn(0.0, 1.0)
-    }
-
-    override fun rotation(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ): Vec2 {
-        return Vec2(driver.xRot * 0.5f, driver.yRot)
-    }
-
-    override fun velocity(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ): Vec3 {
-        var upForce = 0.0
-        var forwardForce = 0.0
-
-        val controller = (driver as? OrientationControllable)?.orientationController
-
-        //Calculate ride space velocity
-        calculateRideSpaceVel(settings, state, vehicle, driver)
-
-        //Translate ride space velocity to world space velocity.
-        if (controller != null) {
-            upForce = -1.0 * sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z
-            forwardForce = cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z
-        }
-
-        //If stamina has run out then initiate forced glide down.
-        upForce = if (state.stamina.get() > 0.0) upForce else -0.7
-
-        val velocity = Vec3(0.0, upForce, forwardForce)
-
-        return velocity
-    }
-
-    /*
-    *  Calculates the change in the ride space vector due to player input and ride state
-    */
-    private fun calculateRideSpaceVel(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ) {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr)
-        val minSpeed = vehicle.runtime.resolveDouble(settings.minSpeed)
-        val speed = state.rideVelocity.get().length()
-
-
-        //speed up and slow down based on input
-        if (driver.zza > 0.0 && speed < topSpeed && state.stamina.get() > 0.0f) {
-            //modify acceleration to be slower when at closer speeds to top speed
-            val accelMod = max(-(normalizeSpeed(speed, minSpeed, topSpeed)) + 1, 0.0)
-            state.rideVelocity.set(
-                Vec3(
-                    state.rideVelocity.get().x,
-                    state.rideVelocity.get().y,
-                    min(state.rideVelocity.get().z + (accel * accelMod), topSpeed)
-                )
-            )
-        } else if (driver.zza >= 0.0 && (state.stamina.get() == 0.0f)) {
-            state.rideVelocity.set(
-                Vec3(
-                    state.rideVelocity.get().x,
-                    state.rideVelocity.get().y,
-                    max(state.rideVelocity.get().z - ((accel) / 4), minSpeed)
-                )
-            )
-        } else if (driver.zza < 0.0 && speed > minSpeed) {
-            //modify deccel to be slower when at closer speeds to minimum speed
-            val deccelMod = max((normalizeSpeed(speed, minSpeed, topSpeed) - 1).pow(2) * 4, 0.1)
-
-            //Decelerate currently always a constant half of max acceleration.
-            state.rideVelocity.set(
-                Vec3(
-                    state.rideVelocity.get().x,
-                    state.rideVelocity.get().y,
-                    max(state.rideVelocity.get().z - ((accel * deccelMod) / 2), minSpeed)
-                )
-            )
-        }
-    }
-
-    override fun angRollVel(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        deltaTime: Double
-    ): Vec3 {
-//        //Cap at a rate of 5fps so frame skips dont lead to huge jumps
-//        val cappedDeltaTime = min(deltaTime, 0.2)
-//
-//        //Get handling in degrees per second
-//        val yawRotRate = vehicle.runtime.resolveDouble(settings.handlingYawExpr)
-//
-//        //Base the change off of deltatime.
-//        var handlingYaw = yawRotRate * (cappedDeltaTime)
-//
-//        //apply stamina debuff if applicable
-//        handlingYaw *= if (state.stamina.get() > 0.0) 1.0 else 0.5
-//
-//        //A+D to yaw
-//        val yawForce = driver.xxa * handlingYaw * -1
-
-        return Vec3.ZERO
-    }
-
-    override fun rotationOnMouseXY(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        mouseY: Double,
-        mouseX: Double,
-        mouseYSmoother: SmoothDouble,
-        mouseXSmoother: SmoothDouble,
-        sensitivity: Double,
-        deltaTime: Double
-    ): Vec3 {
-        if (driver !is OrientationControllable) return Vec3.ZERO
-        //TODO: figure out a cleaner solution to this issue of large jumps when skipping frames or lagging
-        //Cap at a rate of 5fps so frame skips dont lead to huge jumps
-        val cappedDeltaTime = min(deltaTime, 0.2)
-        val invertRoll = if (Cobblemon.config.invertRoll) -1 else 1
-        val invertPitch = if (Cobblemon.config.invertPitch) -1 else 1
-        // Accumulate the mouse input
-        state.currMouseXForce.set((state.currMouseXForce.get() + (0.0015 * mouseX * invertRoll)).coerceIn(-1.0, 1.0))
-        state.currMouseYForce.set((state.currMouseYForce.get() + (0.0015 * mouseY * invertPitch)).coerceIn(-1.0, 1.0))
-        //Get handling in degrees per second
-        var handling = vehicle.runtime.resolveDouble(settings.handlingExpr)
-        //convert it to delta time
-        handling *= (cappedDeltaTime)
-
-        //apply stamina debuff if applicable
-        handling *= if (state.stamina.get() > 0.0) 1.0 else 0.5
-
-        var pitchRot = handling * state.currMouseYForce.get()
-
-        // Yaw
-        val yawRot = handling * 0.5 * state.currMouseXForce.get()
-        val controller = (driver as OrientationControllable).orientationController
-        controller.applyGlobalYaw(yawRot.toFloat())
-
-        if (abs(controller.pitch + pitchRot) >= 89.5 ) {
-            pitchRot = 0.0
-            state.currMouseYForce.set(0.0)
-            mouseYSmoother.reset()
-        } else {
-            controller.applyGlobalPitch(pitchRot.toFloat()  * -1.0f)
-        }
-
-        val mouseRotation = Vec3(0.0, pitchRot, 0.0)
-
-        // Have accumulated input begin decay when no input detected
-        if (abs(mouseX) == 0.0) {
-            // Have decay on roll be much stronger.
-            state.currMouseXForce.set(lerp(state.currMouseXForce.get(), 0.0, 0.02))
-        }
-        if (mouseY == 0.0) {
-            state.currMouseYForce.set(lerp(state.currMouseYForce.get(), 0.0, 0.005))
-        }
-
-        //yaw, pitch, roll
-        return Vec3.ZERO
-    }
-
-    override fun canJump(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        return false
-    }
-
-    override fun setRideBar(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        return (state.stamina.get() / 1.0f)
-    }
-
-    override fun jumpForce(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        jumpStrength: Int
-    ): Vec3 {
-        return Vec3.ZERO
-    }
-
-    override fun gravity(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity,
-        regularGravity: Double
-    ): Double {
-        return 0.0
-    }
-
-    override fun rideFovMultiplier(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val minSpeed = vehicle.runtime.resolveDouble(settings.minSpeed)
-
-        //Must I ensure that topspeed is greater than minimum?
-        val normalizedSpeed = normalizeSpeed(state.rideVelocity.get().length(), minSpeed, topSpeed)
-
-        //TODO: Determine if this should be based on max possible speed instead of top speed.
-        //Only ever want the fov change to be a max of 0.2 and for it to have non linear scaling.
-        return 1.0f + normalizedSpeed.pow(2).toFloat() * 0.2f
-    }
-
-    override fun useAngVelSmoothing(settings: JetNoRollSettings, state: JetNoRollState, vehicle: PokemonEntity): Boolean {
-        return true
-    }
-
-    override fun useRidingAltPose(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): ResourceLocation {
-        return cobblemonResource("no_pose")
-    }
-
-    override fun inertia(settings: JetNoRollSettings, state: JetNoRollState, vehicle: PokemonEntity): Double {
-        return 1.0
-    }
-
-    override fun shouldRoll(settings: JetNoRollSettings, state: JetNoRollState, vehicle: PokemonEntity): Boolean {
-        return true
-    }
-
-    override fun turnOffOnGround(settings: JetNoRollSettings, state: JetNoRollState, vehicle: PokemonEntity): Boolean {
-        return false
-    }
-
-    override fun dismountOnShift(settings: JetNoRollSettings, state: JetNoRollState, vehicle: PokemonEntity): Boolean {
-        return false
-    }
-
-    override fun shouldRotatePokemonHead(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun shouldRotatePlayerHead(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun getRideSounds(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity
-    ): RideSoundSettingsList {
-        return settings.rideSounds
-    }
-
-    override fun createDefaultState(settings: JetNoRollSettings) = JetNoRollState()
-
-    override fun damageOnCollision(
-        settings: JetNoRollSettings,
-        state: JetNoRollState,
-        vehicle: PokemonEntity,
-        impactVec: Vec3
-    ): Boolean {
-        val impactSpeed = impactVec.horizontalDistance().toFloat() * 10f
-        return vehicle.causeFallDamage(impactSpeed, 1f, vehicle.damageSources().flyIntoWall())
-    }
-}
-
-class JetNoRollSettings : RidingBehaviourSettings {
-    override val key = JetNoRollBehaviour.KEY
-
-    var gravity: Expression = "0".asExpression()
-        private set
-
-    var minSpeed: Expression = "1.2".asExpression()
-        private set
-
-    var handlingYawExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 50.0, 25.0)".asExpression()
-        private set
-
-    // Make configurable by json
-    var infiniteStamina: Expression = "false".asExpression()
-        private set
-
-    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 300.0, 128.0)".asExpression()
-        private set
-    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 140.0, 20.0)".asExpression()
-        private set
-    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 1.8, 1.0)".asExpression()
-        private set
-    var accelerationExpr: Expression =
-        "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 1.0)), (1.0 / (20.0 * 5.0)))".asExpression()
-        private set
-    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 60.0, 10.0)".asExpression()
-        private set
-
-    var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
-
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
-        rideSounds.encode(buffer)
-        buffer.writeExpression(gravity)
-        buffer.writeExpression(minSpeed)
-        buffer.writeExpression(handlingYawExpr)
-        buffer.writeExpression(infiniteStamina)
-        buffer.writeExpression(jumpExpr)
-        buffer.writeExpression(handlingExpr)
-        buffer.writeExpression(speedExpr)
-        buffer.writeExpression(accelerationExpr)
-        buffer.writeExpression(staminaExpr)
-    }
-
-    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        rideSounds = RideSoundSettingsList.decode(buffer)
-        gravity = buffer.readExpression()
-        minSpeed = buffer.readExpression()
-        handlingYawExpr = buffer.readExpression()
-        infiniteStamina = buffer.readExpression()
-        jumpExpr = buffer.readExpression()
-        handlingExpr = buffer.readExpression()
-        speedExpr = buffer.readExpression()
-        accelerationExpr = buffer.readExpression()
-        staminaExpr = buffer.readExpression()
-    }
-}
-
-class JetNoRollState : RidingBehaviourState() {
-    var currSpeed = ridingState(0.0, Side.CLIENT)
-    var currMouseXForce = ridingState(0.0, Side.CLIENT)
-    var currMouseYForce = ridingState(0.0, Side.CLIENT)
-
-    override fun encode(buffer: FriendlyByteBuf) {
-        super.encode(buffer)
-        buffer.writeDouble(currSpeed.get())
-        buffer.writeFloat(stamina.get())
-    }
-
-    override fun decode(buffer: FriendlyByteBuf) {
-        super.decode(buffer)
-        currSpeed.set(buffer.readDouble(), forced = true)
-    }
-
-    override fun reset() {
-        super.reset()
-        currSpeed.set(0.0, forced = true)
-        currMouseXForce.set(0.0, forced = true)
-        currMouseYForce.set(0.0, forced = true)
-    }
-
-    override fun copy() = JetNoRollState().also {
-        it.currSpeed.set(currSpeed.get(), forced = true)
-        it.stamina.set(stamina.get(), forced = true)
-        it.rideVelocity.set(rideVelocity.get(), forced = true)
-//        it.currMouseXForce.set(currMouseXForce.get(), forced = true)
-//        it.currMouseYForce.set(currMouseYForce.get(), forced = true)
-    }
-
-    override fun shouldSync(previous: RidingBehaviourState): Boolean {
-        if (previous !is JetNoRollState) return false
-        if (previous.currSpeed != currSpeed) return true
-        return super.shouldSync(previous)
-    }
-}
@@ -1,566 +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.riding.behaviour.types.air
-
-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.MoLangMath.lerp
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.*
-import com.cobblemon.mod.common.api.riding.posing.PoseOption
-import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.*
-import com.cobblemon.mod.common.util.math.geometry.toRadians
-import net.minecraft.client.Minecraft
-import net.minecraft.network.FriendlyByteBuf
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.util.Mth
-import net.minecraft.util.SmoothDouble
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.phys.Vec2
-import net.minecraft.world.phys.Vec3
-import net.minecraft.world.phys.shapes.Shapes
-import org.joml.Matrix3f
-import kotlin.math.*
-
-class RocketBehaviour : RidingBehaviour<RocketSettings, RocketState> {
-    companion object {
-        val KEY = cobblemonResource("air/rocket")
-    }
-
-    override val key = KEY
-
-    override fun getRidingStyle(settings: RocketSettings, state: RocketState): RidingStyle {
-        return RidingStyle.AIR
-    }
-
-    val poseProvider = PoseProvider<RocketSettings, RocketState>(PoseType.HOVER)
-        .with(PoseOption(PoseType.FLY) { _, state, _ ->
-            return@PoseOption state.boosting.get()
-        })
-
-    override fun isActive(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
-            //Need to check other fluids
-            if (vehicle.isInWater || vehicle.isUnderWater) {
-                return@any false
-            }
-            //This might not actually work, depending on what the yPos actually is. yPos of the middle of the entity? the feet?
-            if (it.y.toDouble() == (vehicle.position().y)) {
-                val blockState = vehicle.level().getBlockState(it.below())
-                return@any !blockState.isAir && blockState.fluidState.isEmpty
-            }
-            true
-        }
-    }
-
-    override fun pose(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity
-    ): PoseType {
-        return this.poseProvider.select(settings, state, vehicle)
-    }
-
-    override fun speed(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        // Use this as a "tick" function and check to see if the driver is "boosting"
-        if(vehicle.level().isClientSide) {
-
-            //If the forward key is not held then it cannot be boosting
-            if(Minecraft.getInstance().options.keyUp.isDown()) {
-                val boostKeyPressed = Minecraft.getInstance().options.keySprint.isDown()
-
-                //If on the previous tick the boost key was held then don't change if the ride is boosting
-                if(state.boostIsToggleable.get() && boostKeyPressed) {
-                    //flip the boosting state if boost key is pressed
-                    state.boosting.set(!state.boosting.get())
-                }
-
-                //If the boost key is not held then next tick boosting is toggleable
-                state.boostIsToggleable.set(!boostKeyPressed)
-            } else {
-                //Turn off boost and reset boost params
-                state.boostIsToggleable.set(true)
-                state.boosting.set(false)
-                state.canSpeedBurst.set(true)
-            }
-
-        }
-
-        return state.rideVelocity.get().length().toFloat()
-    }
-
-    override fun updatePassengerRotation(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ) {
-        return
-    }
-
-    override fun clampPassengerRotation(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ) {
-        val f = Mth.wrapDegrees(driver.yRot - vehicle.yRot)
-        val lookYawLimit = 90.0f
-        val g = Mth.clamp(f, -lookYawLimit, lookYawLimit)
-
-        val ticksBeforeCorrection = 40
-
-        if(state.prevCamYRot.get() == driver.yRot){
-            state.ticksNoInput.set(state.ticksNoInput.get() + 1)
-        } else {
-            state.ticksNoInput.set(0)
-        }
-        val correctionForce = if(state.ticksNoInput.get() >= ticksBeforeCorrection && f != 0.0f && state.boosting.get()) 1f * min(sqrt(lookYawLimit / (abs(f))), 10.0f) else 0.0f
-        driver.yRotO += g - f
-        driver.yRot = driver.yRot + g - f //- ( clamp(f.sign * correctionForce, -abs(f), abs(f)) )
-        //driver.yRot = driver.yRot + g - f - ( min )
-        state.prevCamYRot.set(driver.yRot)
-        driver.setYHeadRot(driver.yRot)
-    }
-
-
-    override fun rotation(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ): Vec2 {
-
-        var newMomentum = state.turnMomentum.get().toDouble()
-
-        // Grab turningAcceleration and divide 20 twice to get
-        val turningAcceleration = (vehicle.runtime.resolveDouble(settings.handlingExpr) / 20.0f) / 20.0f * 2
-        val turnInput =  (driver.xxa *-1.0f) * turningAcceleration
-
-        val maxTurnMomentum = 80.0f / 20.0f
-
-        // Base boost stats off of normal turning stats
-        val boostMaxTurnMomentum = maxTurnMomentum * 0.1f
-        val boostTurnInput = turnInput * 0.15f
-
-        if(state.boosting.get()) {
-            if(driver.xxa != 0.0f && abs(newMomentum + turnInput) < (boostMaxTurnMomentum)) { //If max momentum will not be exceeded then modulate
-                newMomentum += boostTurnInput
-            } else {
-                newMomentum = lerp(newMomentum, 0.0, 0.05)
-            }
-        } else {
-            if(driver.xxa == 0.0f) { //If no turning input then lerp to 0
-                newMomentum = lerp(newMomentum, 0.0, 0.05)
-            } else if(abs(newMomentum + turnInput) < maxTurnMomentum) { //If max momentum will not be exceeded then modulate
-                newMomentum += turnInput
-            }
-        }
-
-
-        state.turnMomentum.set(newMomentum.toFloat())
-        driver.yRot += newMomentum.toFloat()
-        return Vec2(driver.xRot, vehicle.yRot + newMomentum.toFloat())
-
-    }
-
-
-    override fun velocity(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ): Vec3 {
-        val retVel = calculateRideSpaceVel(settings, state, vehicle, driver)
-        state.rideVelocity.set(retVel)
-        return retVel
-    }
-
-    private fun calculateRideSpaceVel(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Vec3 {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) * 2
-        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr) * 0.5 * 2
-
-        var newVelocity = vehicle.deltaMovement
-
-        // Align the direction of movement with the world coordinate space so as not to modify it through turning
-        val yawAligned = Matrix3f().rotateY(vehicle.yRot.toRadians())
-        newVelocity = (newVelocity.toVector3f().mul(yawAligned)).toVec3d()
-
-        //speed up and slow down based on input
-        if (driver.zza != 0.0f && state.stamina.get() > 0.0 && !state.boosting.get()) {
-            //make sure it can't exceed top speed
-            val forwardInput = when {
-                vehicle.deltaMovement.horizontalDistance() > topSpeed && (driver.zza.sign == newVelocity.z.sign.toFloat()) -> 0.0
-                else -> driver.zza.sign
-            }
-
-            newVelocity = Vec3(
-                newVelocity.x,
-                newVelocity.y,
-                (newVelocity.z + (accel * forwardInput.toDouble())))
-
-        } else if ((state.stamina.get() > 0.0 && state.boosting.get())) {
-            val boostSpeed = topSpeed * 5
-            val boostAccel = if(newVelocity.length() < boostSpeed) accel * 3 else 0.0
-            val forwardInput = 1.0f
-            var burst = 0.0f
-
-            if(state.canSpeedBurst.get()) {
-                burst = 0.25f
-                state.canSpeedBurst.set(false)
-            }
-
-            newVelocity = Vec3(
-                newVelocity.x,
-                newVelocity.y,
-                newVelocity.z + (boostAccel * forwardInput.toDouble()) + burst)
-        }
-
-        //Vertical movement based on driver input.
-        val maxVertSpeed = 0.5f
-        var vertInput = 0.0
-
-        //If boosting then don't lose altitude
-        //otherwise propel up or fall
-        if (state.boosting.get() && !driver.jumping && vehicle.deltaMovement.y > (-maxVertSpeed * 0.25)) {
-            vertInput = -0.7
-            newVelocity = Vec3(
-                newVelocity.x,
-                newVelocity.y + accel * vertInput,
-                newVelocity.z)
-        } else if(state.boosting.get() && vehicle.deltaMovement.y < maxVertSpeed) {
-            vertInput = when {
-                driver.jumping -> 2.0
-                else -> 0.0
-            }
-            newVelocity = Vec3(
-                newVelocity.x,
-                (newVelocity.y + (accel * 0.5 * vertInput)),
-                newVelocity.z)
-        } else {
-            if (driver.jumping && !(vehicle.deltaMovement.y > maxVertSpeed && (newVelocity.y.sign.toFloat() > 0.0))) {
-                vertInput = 1.0
-
-                // Reset falldistance if upward motion is detected
-                vehicle.resetFallDistance()
-            } else {
-                vertInput = -2.5
-            }
-
-            if (state.stamina.get() > 0.0) {
-                newVelocity = Vec3(
-                    newVelocity.x,
-                    (newVelocity.y + (accel * vertInput)),
-                    newVelocity.z)
-            }
-        }
-
-        return newVelocity
-    }
-
-    /*
-    *  Normalizes the current speed between minSpeed and maxSpeed.
-    *  The result is clamped between 0.0 and 1.0, where 0.0 represents minSpeed and 1.0 represents maxSpeed.
-    */
-    private fun normalizeVal(currSpeed: Double, minSpeed: Double, maxSpeed: Double): Double {
-        require(maxSpeed > minSpeed) { "maxSpeed must be greater than minSpeed" }
-        return ((currSpeed - minSpeed) / (maxSpeed - minSpeed)).coerceIn(0.0, 1.0)
-    }
-
-    override fun angRollVel(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        deltaTime: Double
-    ): Vec3 {
-        return Vec3.ZERO
-    }
-
-    override fun rotationOnMouseXY(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        mouseY: Double,
-        mouseX: Double,
-        mouseYSmoother: SmoothDouble,
-        mouseXSmoother: SmoothDouble,
-        sensitivity: Double,
-        deltaTime: Double
-    ): Vec3 {
-        //Smooth out mouse input.
-        val smoothingSpeed = 4
-        val xInput = mouseXSmoother.getNewDeltaValue(mouseX * 0.1, deltaTime * smoothingSpeed);
-        val yInput = mouseYSmoother.getNewDeltaValue(mouseY * 0.1, deltaTime * smoothingSpeed);
-
-        //yaw, pitch, roll
-        return Vec3(0.0, yInput, xInput)
-    }
-
-    override fun canJump(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        return false
-    }
-
-    override fun setRideBar(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        //Retrieve stamina from state and use it to set the "stamina bar"
-        return (state.stamina.get() / 1.0f)
-    }
-
-    override fun jumpForce(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        jumpStrength: Int
-    ): Vec3 {
-        return Vec3.ZERO
-    }
-
-    override fun gravity(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        regularGravity: Double
-    ): Double {
-        return 0.0
-    }
-
-    override fun rideFovMultiplier(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        if (state.boosting.get()) {
-            val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-            //val exceededSpeed = max(vehicle.deltaMovement.length() - topSpeed, 0.0)
-
-            //TODO: Remove this magic number and get a better comparison for boost top speed
-            val normalizedBoostSpeed = normalizeVal(state.rideVelocity.get().length(), topSpeed, topSpeed * 3)
-            return 1.0f + normalizedBoostSpeed.pow(2).toFloat() * 0.2f
-        } else {
-            return 1.0f
-        }
-    }
-
-    override fun useAngVelSmoothing(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun useRidingAltPose(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): ResourceLocation {
-        return cobblemonResource("no_pose")
-    }
-
-    override fun inertia(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity
-    ): Double {
-        return 1.0
-    }
-
-    override fun shouldRoll(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun turnOffOnGround(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun dismountOnShift(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun shouldRotatePokemonHead(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun shouldRotatePlayerHead(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun getRideSounds(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity
-    ): RideSoundSettingsList {
-        return settings.rideSounds
-    }
-
-    override fun createDefaultState(settings: RocketSettings) = RocketState()
-}
-
-class RocketSettings : RidingBehaviourSettings {
-    override val key = RocketBehaviour.KEY
-
-    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 0.65, 0.3) * 0.25".asExpression()
-        private set
-
-    // Max accel is a whole 1.0 in 1 second. The conversion in the function below is to convert seconds to ticks
-    var accelerationExpr: Expression =
-        "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 1.5)), (1.0 / (20.0 * 3.0))) * 0.5".asExpression()
-        private set
-
-    // Between 30 seconds and 10 seconds at the lowest when at full speed.
-    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 30.0, 10.0)".asExpression()
-        private set
-
-    //Between a one block jump and a ten block jump
-    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 10.0, 1.0)".asExpression()
-        private set
-
-    // Controls the acceleration of the turning speed since the max turning speed is locked at 60 degrees/second
-    // So this is a range of 60 degrees/second per second to 20. Meaning at max stats when holding a direction it
-    // takes a full second to be turning at max speed.
-    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 60.0, 20.0)".asExpression()
-        private set
-
-    var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
-
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
-        rideSounds.encode(buffer)
-        buffer.writeExpression(speedExpr)
-        buffer.writeExpression(accelerationExpr)
-        buffer.writeExpression(staminaExpr)
-        buffer.writeExpression(jumpExpr)
-        buffer.writeExpression(handlingExpr)
-    }
-
-    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        rideSounds = RideSoundSettingsList.decode(buffer)
-        speedExpr = buffer.readExpression()
-        accelerationExpr = buffer.readExpression()
-        staminaExpr = buffer.readExpression()
-        jumpExpr = buffer.readExpression()
-        handlingExpr = buffer.readExpression()
-    }
-
-}
-
-class RocketState : RidingBehaviourState() {
-    var boosting = ridingState(false, Side.BOTH)
-    var boostIsToggleable = ridingState(false, Side.BOTH)
-    var canSpeedBurst = ridingState(false, Side.BOTH)
-    var prevCamYRot: SidedRidingState<Float> = ridingState(0.0f, Side.CLIENT)
-    var ticksNoInput: SidedRidingState<Int> = ridingState(0, Side.CLIENT)
-    val turnMomentum: SidedRidingState<Float> = ridingState(0.0f, Side.CLIENT)
-
-    override fun reset() {
-        super.reset()
-        boosting.set(false, forced = true)
-        boostIsToggleable.set(false, forced = true)
-        canSpeedBurst.set(true, forced = true)
-        prevCamYRot.set(0.0f, forced = true)
-        ticksNoInput.set(0, forced = true)
-        turnMomentum.set(0.0f, forced = true)
-    }
-
-    override fun copy() = RocketState().also {
-        it.rideVelocity.set(this.rideVelocity.get(), forced = true)
-        it.stamina.set(this.stamina.get(), forced = true)
-        it.boosting.set(this.boosting.get(), forced = true)
-        it.boostIsToggleable.set(this.boosting.get(), forced = true)
-        it.canSpeedBurst.set(this.canSpeedBurst.get(), forced = true)
-        it.prevCamYRot.set(this.prevCamYRot.get(), forced = true)
-        it.ticksNoInput.set(this.ticksNoInput.get(), forced = true)
-        it.turnMomentum.set(this.turnMomentum.get(), forced = true)
-    }
-
-    override fun encode(buffer: FriendlyByteBuf) {
-        super.encode(buffer)
-        buffer.writeBoolean(boosting.get())
-        buffer.writeBoolean(boostIsToggleable.get())
-        buffer.writeBoolean(canSpeedBurst.get())
-        buffer.writeFloat(prevCamYRot.get())
-        buffer.writeInt(ticksNoInput.get())
-        buffer.writeFloat(turnMomentum.get())
-    }
-
-    override fun decode(buffer: FriendlyByteBuf) {
-        super.decode(buffer)
-        boosting.set(buffer.readBoolean(), forced = true)
-        boostIsToggleable.set(buffer.readBoolean(), forced = true)
-        canSpeedBurst.set(buffer.readBoolean(), forced = true)
-        prevCamYRot.set(buffer.readFloat(), forced = true)
-        ticksNoInput.set(buffer.readInt(), forced = true)
-        turnMomentum.set(buffer.readFloat(), forced = true)
-    }
-
-    override fun shouldSync(previous: RidingBehaviourState): Boolean {
-        if (previous !is RocketState) return false
-        if (previous.boosting.get() != boosting.get()) return true
-        if (previous.boostIsToggleable.get() != boostIsToggleable.get()) return true
-        if (previous.canSpeedBurst.get() != canSpeedBurst.get()) return true
-        if (previous.prevCamYRot.get() != prevCamYRot.get()) return true
-        if (previous.ticksNoInput.get() != ticksNoInput.get()) return true
-        if (previous.turnMomentum.get() != turnMomentum.get()) return true
-        return super.shouldSync(previous)
-    }
-}
@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.riding.behaviour.types.composite
 import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies.CompositeRidingStrategies
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.adapters.RidingBehaviourSettingsAdapter
@@ -328,16 +327,6 @@ class CompositeBehaviour : RidingBehaviour<CompositeSettings, CompositeState> {
        }
    }

-    override fun getRideSounds(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): RideSoundSettingsList {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.getRideSounds(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
    override fun isActive(
        settings: CompositeSettings,
        state: CompositeState,
@@ -45,7 +45,7 @@ object JumpStrategy : CompositeRidingStrategy<CompositeSettings> {
    ): Boolean {
        if (state.activeBehaviour.get() == defaultSettings.key) return false
        if (!vehicle.onGround()) return false
-        if (state.lastTransition.get() + 5 >= vehicle.level().gameTime) return false
+        if (state.lastTransition.get() + 20 >= vehicle.level().gameTime) return false
        val defaultBehaviour = RidingBehaviours.get(defaultSettings.key)
        return defaultBehaviour.isActive(defaultSettings, state.defaultBehaviourState, vehicle)
    }
@@ -58,7 +58,7 @@ object JumpStrategy : CompositeRidingStrategy<CompositeSettings> {
    ): Boolean {
        if (state.activeBehaviour.get() == alternativeSettings.key) return false
        if (!driver.jumping) return false
-        if (state.lastTransition.get() + 5 >= vehicle.level().gameTime) return false
+        if (state.lastTransition.get() + 20 >= vehicle.level().gameTime) return false
        val alternativeBehaviour = RidingBehaviours.get(alternativeSettings.key)
        return alternativeBehaviour.isActive(alternativeSettings, state.alternateBehaviourState, vehicle)
    }
@@ -13,7 +13,6 @@ import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.*
@@ -83,15 +82,7 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {

        // Use this as a "tick" function and calculate sprinting and inAir state here
        state.sprinting.set(driver.isSprinting)
-        inAirCheck(state, vehicle)

-        return state.rideVelocity.get().length().toFloat()
-    }
-
-    fun inAirCheck(
-        state: HorseState,
-        vehicle: PokemonEntity,
-    ) {
        // Check both vertical movement and if there are blocks below.
        val posBelow = vehicle.blockPosition().below()
        val blockStateBelow = vehicle.level().getBlockState(posBelow)
@@ -100,10 +91,14 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
        val canSupportEntity = blockStateBelow.isFaceSturdy(vehicle.level(), posBelow, Direction.UP)
        val standingOnSolid = canSupportEntity && !isAirOrLiquid

+//        val level = vehicle.level()
+//        val toesBox = vehicle.boundingBox.move(0.0, -0.1, 0.0)

        // inAir if not on the ground
        val inAir = !(vehicle.deltaMovement.y == 0.0 || standingOnSolid)
        state.inAir.set(inAir)
+
+        return state.rideVelocity.get().length().toFloat()
    }

    override fun updatePassengerRotation(
@@ -111,7 +106,26 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
        state: HorseState,
        vehicle: PokemonEntity,
        driver: LivingEntity
-    ) { return }
+    ) {
+
+        //Take the inverse so that it cancels out how
+        //much the entity rotates.
+        val turnAmount = calcRotAmount(settings, state, vehicle, driver)
+
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
+        val maxYawDiff = 90.0f
+
+        //Normalize the current rotation diff
+        val rotMod = Mth.wrapDegrees(driver.yRot - vehicle.yRot) / maxYawDiff
+
+        val rotAmount = 10.0f
+
+        //Take the inverse so that you turn more at higher speeds
+        val normSpeed = 1.0f - 0.5f*normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed).toFloat()
+
+        //driver.yRot += (entity.riding.deltaRotation.y - turnAmount)
+        //driver.setYHeadRot(driver.yHeadRot + (entity.riding.deltaRotation.y) - turnAmount)
+    }

    override fun clampPassengerRotation(
        settings: HorseSettings,
@@ -134,9 +148,9 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
        vehicle: PokemonEntity,
        driver: LivingEntity
    ): Vec2 {
-        var turnAmount =  calcRotAmount(settings, state, vehicle, driver)
+        val turnAmount =  calcRotAmount(settings, state, vehicle, driver)

-        return Vec2(vehicle.xRot, vehicle.yRot + turnAmount * 0.5f )
+        return Vec2(vehicle.xRot, vehicle.yRot + turnAmount )

    }

@@ -154,9 +168,9 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
    ): Float {
        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)

-        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr) * 3
-        val walkHandlingBoost = 5
-        val walkHandling = handling * walkHandlingBoost
+        //In degrees per second
+        val walkHandling = 140.0 * 2
+        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr) * 2

        val maxYawDiff = 90.0f

@@ -170,14 +184,13 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
        val rotDiffMod = (sqrt(abs(rotDiffNorm)) * rotDiffNorm.sign)

        //Take the inverse so that you turn less at higher speeds
-        val normSpeed = 1.0f
+        val normSpeed = 1.0f // = 1.0f - 0.5f*normalizeVal(state.rideVelocityocity.length(), 0.0, topSpeed).toFloat()

        // TurnRate should always be quick if not sprinting
-        val invRelSpeed = (inverseLerp(vehicle.deltaMovement.horizontalDistance(), 0.0, topSpeed ).pow(0.5) - 1.0f) * -1.0f
-        val turnRate = ((handling.toFloat() / 20.0f) * max(walkHandlingBoost * invRelSpeed, 1.0)).toFloat()
+        val turnRate = if(state.sprinting.get()) (handling.toFloat() / 20.0f) else (walkHandling.toFloat() / 20.0f)

        //Ensure you only ever rotate as much difference as there is between the angles.
-        val turnSpeed = turnRate * rotDiffMod * normSpeed
+        val turnSpeed = turnRate  * rotDiffMod * normSpeed
        val rotAmount = turnSpeed.coerceIn(-abs(rotDiff), abs(rotDiff))

        return rotAmount
@@ -204,19 +217,16 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {

        // Check to see if the ride should be walking or sprinting
        val walkSpeed = getWalkSpeed(vehicle)
-        val rideTopSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) * 1.3
+        val rideTopSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
        val topSpeed = if(state.sprinting.get()) rideTopSpeed else walkSpeed

-        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr) * 2
+        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr)

        //Flag for determining if player is actively inputting
        var activeInput = false

-        // Gather the previous velocity and set the horizontal fields of the velocity vector to the magnitude of the
-        // ones from deltaMovement. This is important as when a collision happens the Deltamovement will reflect it
-        // but rideVelocity won't.
-        var newVelocity = Vec3(state.rideVelocity.get().x, 0.0, state.rideVelocity.get().z).normalize().scale(vehicle.deltaMovement.horizontalDistance())
-        newVelocity = newVelocity.add(0.0, state.rideVelocity.get().y, 0.0)
+        var newVelocity = Vec3(state.rideVelocity.get().x, state.rideVelocity.get().y, state.rideVelocity.get().z)
+

        //speed up and slow down based on input
        if (driver.zza != 0.0f && state.stamina.get() > 0.0) {
@@ -235,14 +245,11 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
            activeInput = true
        }

-        // Gravity logic
+        //Gravity logic
        if (vehicle.onGround()) {
            newVelocity = Vec3(newVelocity.x, 0.0, newVelocity.z)
        } else {
-            //TODO: Should we just go back to standard minecraft gravity or do the lerp modifications prevent that?
-            //I think minecrafts gravity logic is also too harsh and isn't gamefied enough for mounts maybe? Need
-            //to do some testing and get other's opinions
-            val gravity = (9.8 / ( 20.0)) * 0.2 * 0.8
+            val gravity = (9.8 / ( 20.0)) * 0.2
            val terminalVel = 2.0

            val fallingForce = gravity -  ( newVelocity.z.sign *gravity *(abs(newVelocity.z) / 2.0))
@@ -254,34 +261,27 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
            newVelocity = newVelocity.subtract(0.0, 0.0, min(0.03 * newVelocity.z.sign, newVelocity.z))
        }

-        //TODO: Change this so its tied to a jumping stat and representative of the amount of jumps
-        val canJump = vehicle.runtime.resolveBoolean(settings.canJump)
        //Jump the thang!
-        if (driver.jumping && vehicle.onGround() && canJump) {
+        if (driver.jumping && vehicle.onGround()) {
            val jumpForce = 1.0
-            val velMag = newVelocity.length()
-
+            val horz = state.rideVelocity.get().horizontalDistance()
            newVelocity = newVelocity.add(0.0, jumpForce, 0.0)

-            val test = 0.0
            //Ensure this doesn't add unwanted forward velocity
            //val mag = if(newVelocity.length() < rideTopSpeed) newVelocity.length() else rideTopSpeed
            //newVelocity = newVelocity.normalize().scale(mag)
        }

-        //Zero out lateral velocity possibly picked up from a controller transition
-        newVelocity = Vec3(0.0, newVelocity.y, newVelocity.z)
-
        return newVelocity
    }

    /*
-    *  lerps the current val between minVal and maxVal.
-    *  The result is clamped between 0.0 and 1.0, where 0.0 represents minVal and 1.0 represents maxVal.
+    *  Normalizes the current speed between minSpeed and maxSpeed.
+    *  The result is clamped between 0.0 and 1.0, where 0.0 represents minSpeed and 1.0 represents maxSpeed.
    */
-    private fun inverseLerp(currVal: Double, minVal: Double, maxVal: Double): Double {
-        require(maxVal > minVal) { "minVal must be greater than maxVal" }
-        return ((currVal - minVal) / (maxVal - minVal)).coerceIn(0.0, 1.0)
+    private fun normalizeVal(currSpeed: Double, minSpeed: Double, maxSpeed: Double): Double {
+        require(maxSpeed > minSpeed) { "maxSpeed must be greater than minSpeed" }
+        return ((currSpeed - minSpeed) / (maxSpeed - minSpeed)).coerceIn(0.0, 1.0)
    }

    private fun getWalkSpeed( vehicle: PokemonEntity ): Double {
@@ -439,14 +439,6 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
        return true
    }

-    override fun getRideSounds(
-        settings: HorseSettings,
-        state: HorseState,
-        vehicle: PokemonEntity
-    ): RideSoundSettingsList {
-        return settings.rideSounds
-    }
-
    override fun createDefaultState(settings: HorseSettings) = HorseState()
 }

@@ -475,11 +467,8 @@ class HorseSettings : RidingBehaviourSettings {
    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'LAND', 140.0, 20.0)".asExpression()
        private set

-    var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
-
    override fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeResourceLocation(key)
-        rideSounds.encode(buffer)
        buffer.writeExpression(speedExpr)
        buffer.writeExpression(accelerationExpr)
        buffer.writeExpression(staminaExpr)
@@ -488,13 +477,13 @@ class HorseSettings : RidingBehaviourSettings {
    }

    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        rideSounds = RideSoundSettingsList.decode(buffer)
        speedExpr = buffer.readExpression()
        accelerationExpr = buffer.readExpression()
        staminaExpr = buffer.readExpression()
        jumpExpr = buffer.readExpression()
        handlingExpr = buffer.readExpression()
    }
+
 }

 class HorseState : RidingBehaviourState() {
@@ -1,563 +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.riding.behaviour.types.land
-
-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.MoLangMath.lerp
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.OrientationControllable
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.*
-import com.cobblemon.mod.common.api.riding.posing.PoseOption
-import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.*
-import com.cobblemon.mod.common.util.math.geometry.toRadians
-import net.minecraft.core.Direction
-import net.minecraft.network.FriendlyByteBuf
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.util.SmoothDouble
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.phys.Vec2
-import net.minecraft.world.phys.Vec3
-import net.minecraft.world.phys.shapes.Shapes
-import org.joml.Matrix3f
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.pow
-import kotlin.math.sign
-
-class MinekartBehaviour : RidingBehaviour<MinekartSettings, MinekartState> {
-    companion object {
-        val KEY = cobblemonResource("land/minekart")
-    }
-
-    override val key = KEY
-
-    override fun getRidingStyle(settings: MinekartSettings, state: MinekartState): RidingStyle {
-        return RidingStyle.LAND
-    }
-
-    val poseProvider = PoseProvider<MinekartSettings, MinekartState>(PoseType.STAND)
-        .with(PoseOption(PoseType.WALK) { _, state, _ ->
-            return@PoseOption abs(state.rideVelocity.get().horizontalDistance()) > 0.0
-        })
-
-//    val poseProvider = PoseProvider<MinekartSettings, MinekartState>(PoseType.STAND)
-//        .with(PoseOption(PoseType.WALK) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })
-
-    override fun isActive(settings: MinekartSettings, state: MinekartState, vehicle: PokemonEntity): Boolean {
-        return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
-            //Need to check other fluids
-            if (vehicle.isInWater || vehicle.isUnderWater) {
-                return@any false
-            }
-            //This might not actually work, depending on what the yPos actually is. yPos of the middle of the entity? the feet?
-            if (it.y.toDouble() == (vehicle.position().y)) {
-                val blockState = vehicle.level().getBlockState(it.below())
-                return@any !(!blockState.isAir && blockState.fluidState.isEmpty)
-            }
-            true
-        }
-    }
-
-    override fun pose(settings: MinekartSettings, state: MinekartState, vehicle: PokemonEntity): PoseType {
-        return poseProvider.select(settings, state, vehicle)
-    }
-
-    override fun speed(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-
-        val boostMax = vehicle.runtime.resolveFloat(settings.boostLimit)
-        //TODO: should this be by how much turn has accumulated or simply time turning... or both?
-        val boostPerSecond = 20.0f
-        val boostLoss = 40.0f
-
-        if (driver.jumping && driver.zza > 0.0f) {
-            if (!state.drifting.get()) {
-                if (driver.xxa != 0.0f) {
-                    state.clockwiseDrift.set(driver.xxa.sign > 0.0)
-                    state.turnMomentum.set(0.0f)
-                    state.drifting.set(true)
-                    state.boost.set(0.0f)
-                } else {
-                    //TODO: Add jumping logic
-                }
-            } else {
-                state.boost.set((state.boost.get() + boostPerSecond / 20.0f).coerceIn(0.0f, boostMax))
-            }
-        } else {
-            if(driver.zza <= 0.0 && state.boost.get() != 0.0f){
-                state.boost.set(0.0f)
-            } else if( state.boost.get() > 0.0f ) {
-                state.boost.set(max(state.boost.get() - boostLoss, 0.0f))
-            }
-            state.drifting.set(false)
-        }
-
-        inAirCheck(state, vehicle)
-        return driver.deltaMovement.length().toFloat()
-    }
-
-    fun inAirCheck(
-        state: MinekartState,
-        vehicle: PokemonEntity,
-    ) {
-        // Check both vertical movement and if there are blocks below.
-        val posBelow = vehicle.blockPosition().below()
-        val blockStateBelow = vehicle.level().getBlockState(posBelow)
-        val isAirOrLiquid = blockStateBelow.isAir || !blockStateBelow.fluidState.isEmpty
-
-        val canSupportEntity = blockStateBelow.isFaceSturdy(vehicle.level(), posBelow, Direction.UP)
-        val standingOnSolid = canSupportEntity && !isAirOrLiquid
-
-        // inAir if not on the ground
-        val inAir = !(vehicle.deltaMovement.y == 0.0 || standingOnSolid)
-        state.inAir.set(inAir)
-    }
-
-    override fun rotation(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ): Vec2 {
-
-        var newMomentum = state.turnMomentum.get().toDouble()
-
-        //TODO: maybe tie this to max turnspeeds rather than the turn acceleration
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val turningAcceleration = (vehicle.runtime.resolveDouble(settings.handlingExpr) * 1.5 / 20.0f) / 20.0f * 4.0
-        val turnInput =  (driver.xxa *-1.0f) * turningAcceleration
-        val driftInput = turnInput * 0.25f
-
-        val lowSpeedTurnBoost = (inverseLerp(vehicle.deltaMovement.horizontalDistance(), 0.0, topSpeed ).pow(0.5) - 2.0f) * -1.0f
-        val forcedDriftTurnMomentum = (80.0f / 20.0f) * lowSpeedTurnBoost
-        val maxTurnMomentum = (60.0f / 20.0f) * lowSpeedTurnBoost
-        val maxDriftMomentum = forcedDriftTurnMomentum * 0.6f
-
-        if (!state.drifting.get()){
-            // perform non drift turning
-            if(abs(newMomentum) <= maxTurnMomentum && turnInput != 0.0 ) {
-                newMomentum += turnInput
-                newMomentum = min(max(newMomentum, maxTurnMomentum * -1.0), maxTurnMomentum.toDouble())
-            } else {
-                newMomentum = lerp(newMomentum, 0.0, 0.15)
-            }
-
-            state.turnMomentum.set(newMomentum.toFloat())
-            driver.yRot += newMomentum.toFloat()
-            return Vec2(driver.xRot, vehicle.yRot + newMomentum.toFloat())
-        } else {
-            // perform drift turning
-            if(abs(newMomentum) <= maxDriftMomentum && driftInput != 0.0 ) {
-                newMomentum += driftInput
-                newMomentum = min(max(newMomentum, maxDriftMomentum * -1.0), maxDriftMomentum.toDouble())
-            } else {
-                      newMomentum = lerp(newMomentum, 0.0, 0.15)
-            }
-
-            val signedDriftTurn = if(state.clockwiseDrift.get()) forcedDriftTurnMomentum * -1.0f else forcedDriftTurnMomentum
-            state.turnMomentum.set(newMomentum.toFloat())
-            driver.yRot += newMomentum.toFloat() + signedDriftTurn.toFloat()
-            return Vec2(driver.xRot, vehicle.yRot + newMomentum.toFloat() + signedDriftTurn.toFloat())
-        }
-
-
-    }
-
-    override fun velocity(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ): Vec3 {
-        state.rideVelocity.set(calculateRideSpaceVel(settings, state, vehicle, driver))
-        return state.rideVelocity.get()
-    }
-
-
-    private fun calculateRideSpaceVel(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Vec3 {
-
-        // Check to see if the ride should be walking or sprinting
-        val rideTopSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) * 0.6 * 2.0
-        val topSpeed = if (state.drifting.get()) rideTopSpeed * 0.7 else rideTopSpeed
-        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr) * 0.3 * 3 * 2.0
-        val driftAngle = 20.0f
-
-        //Align the direction of this vector with the vehicles current heading.
-        var newVelocity = vehicle.deltaMovement
-        newVelocity = newVelocity.yRot(vehicle.yRot.toRadians())
-
-        // rotate the angle of force if drifting
-        if (state.drifting.get()) {
-            val signedDriftAngle = if(state.clockwiseDrift.get()) driftAngle else driftAngle * -1.0f
-            newVelocity = newVelocity.yRot(signedDriftAngle.toRadians())
-        }
-
-        //speed up and slow down based on input
-        if (driver.zza != 0.0f && state.stamina.get() > 0.0 && !state.inAir.get()) {
-            //make sure it can't exceed top speed
-            var forwardInput = when {
-                driver.zza > 0 && newVelocity.z > topSpeed -> 0.0
-                driver.zza < 0 && newVelocity.z <= 0.0 -> 0.0
-                else -> driver.zza.sign
-            }
-
-            if (!state.drifting.get() && state.boost.get() != 0.0f) {
-                forwardInput = 2.0;
-            }
-
-            // If drifting we need more acceleration due to the constant turn
-            val driftAccelBoost = if (state.drifting.get()) 1.5 else 1.0
-
-            newVelocity = Vec3(
-                newVelocity.x,
-                newVelocity.y,
-                (newVelocity.z + (accel * forwardInput.toDouble() * driftAccelBoost)))
-        }
-
-        // Gravity logic
-        if (vehicle.onGround()) {
-            newVelocity = Vec3(newVelocity.x, 0.0, newVelocity.z)
-        } else {
-            //TODO: Should we just go back to standard minecraft gravity or do the lerp modifications prevent that?
-            //I think minecrafts gravity logic is also too harsh and isn't gamefied enough for mounts maybe? Need
-            //to do some testing and get other's opinions
-            val gravity = (9.8 / ( 20.0)) * 0.2 * 0.25 * 3.0
-            val terminalVel = 2.0
-
-            val fallingForce = gravity -  ( newVelocity.z.sign *gravity *(abs(newVelocity.z) / 2.0))
-            newVelocity = Vec3(newVelocity.x, max(newVelocity.y - fallingForce, -terminalVel), newVelocity.z)
-        }
-
-        //ground Friction
-        var friction = 0.003 * 2.0
-        if (state.drifting.get()) {friction *= 0.5}
-        if (!state.inAir.get()) {
-            newVelocity = newVelocity.subtract(
-                min(friction , abs(newVelocity.x)) * newVelocity.x.sign,
-                0.0,
-                min(friction , abs(newVelocity.z)) * newVelocity.z.sign
-                )
-
-            // TEST FOR LATERAL SLIP OR WHATEVER
-            //TODO: calc lateral slip and friction better!
-            if (!state.drifting.get()) {
-                newVelocity = newVelocity.subtract(
-                    min(friction * 10, abs(newVelocity.x)) * newVelocity.x.sign,
-                    0.0,
-                    0.0,
-                )
-            }
-        }
-
-        //TODO: Change this so its tied to a jumping stat and representative of the amount of jumps
-//        val canJump = vehicle.runtime.resolveBoolean(settings.canJump)
-//        //Jump the thang!
-//        if (driver.jumping && vehicle.onGround() && canJump) {
-//            val jumpForce = 0.5
-//
-//            newVelocity = newVelocity.add(0.0, jumpForce, 0.0)
-//
-//        }
-
-        // unrotate the angle of force if drifting
-        if (state.drifting.get()) {
-            val inverseSignedDriftAngle = if(state.clockwiseDrift.get()) driftAngle * -1.0f else driftAngle
-            newVelocity = newVelocity.yRot(inverseSignedDriftAngle.toRadians())
-        }
-
-        return newVelocity
-    }
-
-    /*
-    *  lerps the current val between minVal and maxVal.
-    *  The result is clamped between 0.0 and 1.0, where 0.0 represents minVal and 1.0 represents maxVal.
-    */
-    private fun inverseLerp(currVal: Double, minVal: Double, maxVal: Double): Double {
-        require(maxVal > minVal) { "minVal must be greater than maxVal" }
-        return ((currVal - minVal) / (maxVal - minVal)).coerceIn(0.0, 1.0)
-    }
-
-    override fun angRollVel(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        deltaTime: Double
-    ): Vec3 {
-        return Vec3.ZERO
-    }
-
-    override fun rotationOnMouseXY(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        mouseY: Double,
-        mouseX: Double,
-        mouseYSmoother: SmoothDouble,
-        mouseXSmoother: SmoothDouble,
-        sensitivity: Double,
-        deltaTime: Double
-    ): Vec3 {
-        if (driver !is OrientationControllable) return Vec3.ZERO
-
-        //Might need to add the smoothing here for default.
-        val invertRoll = if (Cobblemon.config.invertRoll) -1 else 1
-        val invertPitch = if (Cobblemon.config.invertPitch) -1 else 1
-        return Vec3(0.0, mouseY * invertPitch, mouseX * invertRoll)
-    }
-
-    override fun canJump(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        return vehicle.runtime.resolveBoolean(settings.canJump)
-    }
-
-    override fun setRideBar(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        return 0.0f
-    }
-
-    override fun jumpForce(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        jumpStrength: Int
-    ): Vec3 {
-        return Vec3.ZERO
-    }
-
-    override fun gravity(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity,
-        regularGravity: Double
-    ): Double {
-        return 0.0
-    }
-
-    override fun rideFovMultiplier(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        var fov = 1.0f
-        if(!state.drifting.get() && state.boost.get() != 0.0f) {
-            //TODO: is this too abrupt? Possibly caluclate differently?
-            fov = 1.2f
-        }
-        return fov
-    }
-
-    override fun useAngVelSmoothing(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun useRidingAltPose(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): ResourceLocation {
-        when {
-            state.drifting.get() -> return cobblemonResource("drifting")
-        }
-        return cobblemonResource("no_pose")
-    }
-
-    override fun inertia(settings: MinekartSettings, state: MinekartState, vehicle: PokemonEntity): Double {
-        return 1.0
-    }
-
-    override fun shouldRoll(settings: MinekartSettings, state: MinekartState, vehicle: PokemonEntity): Boolean {
-        return false
-    }
-
-    override fun turnOffOnGround(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun dismountOnShift(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun shouldRotatePokemonHead(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun shouldRotatePlayerHead(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return true
-    }
-
-    override fun getRideSounds(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity
-    ): RideSoundSettingsList {
-        return settings.rideSounds
-    }
-
-    override fun createDefaultState(settings: MinekartSettings) = MinekartState()
-}
-
-class MinekartSettings : RidingBehaviourSettings {
-    override val key = MinekartBehaviour.KEY
-
-    var canJump = "true".asExpression()
-        private set
-
-    var boostLimit = "100.0f".asExpression()
-        private set
-
-    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'LAND', 1.0, 0.3)".asExpression()
-        private set
-
-    // Max accel is a whole 1.0 in 1 second. The conversion in the function below is to convert seconds to ticks
-    var accelerationExpr: Expression =
-        "q.get_ride_stats('ACCELERATION', 'LAND', (1.0 / (20.0 * 1.5)), (1.0 / (20.0 * 5.0)))".asExpression()
-        private set
-
-    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'LAND', 30.0, 10.0)".asExpression()
-        private set
-
-    //Between a one block jump and a ten block jump
-    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'LAND', 10.0, 1.0)".asExpression()
-        private set
-
-    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'LAND', 140.0, 20.0)".asExpression()
-        private set
-
-    var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
-
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
-        rideSounds.encode(buffer)
-        buffer.writeExpression(canJump)
-        buffer.writeExpression(boostLimit)
-    }
-
-    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        rideSounds = RideSoundSettingsList.decode(buffer)
-        canJump = buffer.readExpression()
-        boostLimit = buffer.readExpression()
-    }
-}
-
-class MinekartState : RidingBehaviourState() {
-    var currSpeed = ridingState(0.0, Side.BOTH)
-    var deltaRotation = ridingState(Vec2.ZERO, Side.BOTH)
-    var drifting = ridingState(false, Side.CLIENT)
-    var clockwiseDrift = ridingState(false, Side.CLIENT)
-    val boost: SidedRidingState<Float> = ridingState(0.0f, Side.CLIENT)
-    val turnMomentum: SidedRidingState<Float> = ridingState(0.0f, Side.CLIENT)
-    var inAir = ridingState(false, Side.CLIENT)
-
-
-    override fun reset() {
-        super.reset()
-        currSpeed.set(0.0, forced = true)
-        deltaRotation.set(Vec2.ZERO, forced = true)
-        drifting.set(false, forced = true)
-        clockwiseDrift.set(false, forced = true)
-        boost.set(0.0f, forced = true)
-        turnMomentum.set(0.0f, forced = true)
-        inAir.set(false, forced = true)
-    }
-
-    override fun encode(buffer: FriendlyByteBuf) {
-        super.encode(buffer)
-        buffer.writeBoolean(drifting.get())
-        buffer.writeBoolean(clockwiseDrift.get())
-        buffer.writeFloat(boost.get())
-        buffer.writeFloat(turnMomentum.get())
-        buffer.writeBoolean(inAir.get())
-    }
-
-    override fun decode(buffer: FriendlyByteBuf) {
-        super.decode(buffer)
-        drifting.set(buffer.readBoolean(), forced = true)
-        clockwiseDrift.set(buffer.readBoolean(), forced = true)
-        boost.set(buffer.readFloat(), forced = true)
-        turnMomentum.set(buffer.readFloat(), forced = true)
-        inAir.set(buffer.readBoolean(), forced = true)
-    }
-
-    override fun toString(): String {
-        return "MinekartState(currSpeed=${currSpeed.get()}, deltaRotation=${deltaRotation.get()})"
-    }
-
-    override fun copy() = MinekartState().also {
-        it.rideVelocity.set(rideVelocity.get(), forced = true)
-        it.stamina.set(stamina.get(), forced = true)
-        it.currSpeed.set(currSpeed.get(), forced = true)
-        it.deltaRotation.set(deltaRotation.get(), forced = true)
-        it.drifting.set(drifting.get(), forced = true)
-        it.clockwiseDrift.set(clockwiseDrift.get(), forced = true)
-        it.boost.set(boost.get(), forced = true)
-        it.turnMomentum.set(turnMomentum.get(), forced = true)
-        it.inAir.set(inAir.get(), forced = true)
-    }
-
-    override fun shouldSync(previous: RidingBehaviourState): Boolean {
-        if (previous !is MinekartState) return false
-        if (previous.drifting.get() != drifting.get()) return true
-        if (previous.clockwiseDrift.get() != clockwiseDrift.get()) return true
-        if (previous.boost.get() != boost.get()) return true
-        if (previous.turnMomentum.get() != turnMomentum.get()) return true
-        if (previous.inAir.get() != inAir.get()) return true
-        return super.shouldSync(previous)
-    }
-}
@@ -8,21 +8,17 @@

 package com.cobblemon.mod.common.api.riding.behaviour.types.land

-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.MoLangMath.lerp
+import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
+import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.*
-import com.cobblemon.mod.common.util.math.geometry.toRadians
-import net.minecraft.core.Direction
-import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.SmoothDouble
@@ -31,15 +27,29 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
 import net.minecraft.world.phys.shapes.Shapes
-import org.joml.Matrix3f
-import kotlin.math.abs
+import kotlin.math.absoluteValue
 import kotlin.math.max
 import kotlin.math.min
-import kotlin.math.sign

 class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
    companion object {
        val KEY = cobblemonResource("land/vehicle")
+
+        val MAX_TOP_SPEED = 1.0 // 20 bl/s
+        val MIN_TOP_SPEED = 0.35 // 7 bl/s
+        //val MIN_SPEED = 0.25 // 5 bl/s
+
+        //Accel will lie between 1.0 second and 5.0 seconds
+        val MAX_ACCEL = (MAX_TOP_SPEED) / (20*3) //3.0 second to max speed
+        val MIN_ACCEL = (MAX_TOP_SPEED) / (20*8) // 8 seconds to max speed
+
+        //Can rotate 90 degrees
+        val MAX_HANDLING = 90.0
+        val MIN_HANDLING = 30.0
+
+
+        val MAX_YAW_HANDLING = 16.0
+        val MIN_YAW_HANDLING = 8.0
    }

    override val key = KEY
@@ -49,12 +59,7 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
    }

    val poseProvider = PoseProvider<VehicleSettings, VehicleState>(PoseType.STAND)
-        .with(PoseOption(PoseType.WALK) { _, state, _ ->
-            return@PoseOption abs(state.rideVelocity.get().horizontalDistance()) > 0.0
-        })
-
-//    val poseProvider = PoseProvider<VehicleSettings, VehicleState>(PoseType.STAND)
-//        .with(PoseOption(PoseType.WALK) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })
+        .with(PoseOption(PoseType.WALK) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })

    override fun isActive(settings: VehicleSettings, state: VehicleState, vehicle: PokemonEntity): Boolean {
        return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
@@ -81,38 +86,18 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
+        val topSpeed = vehicle.getRideStat(RidingStat.SPEED, RidingStyle.AIR, MIN_TOP_SPEED, MAX_TOP_SPEED)
+        val accel = vehicle.getRideStat(RidingStat.ACCELERATION, RidingStyle.AIR, MIN_ACCEL, MAX_ACCEL)

-        if (driver.isShiftKeyDown) {
-            state.drifting.set(true)
-            if(driver.zza != 0.0f) {
-                state.poweredDrifting.set(true)
-            } else {
-                state.poweredDrifting.set(false)
-            }
-        } else {
-            state.drifting.set(false)
-            state.poweredDrifting.set(false)
+        //speed up and slow down based on input
+        if (driver.zza > 0.0 && state.currSpeed.get() < topSpeed) {
+            state.currSpeed.set(min(state.currSpeed.get() + accel , topSpeed))
+        } else if (driver.zza < 0.0 && state.currSpeed.get() > 0.0) {
+            //Decelerate is now always a constant half of max acceleration.
+            state.currSpeed.set(max(state.currSpeed.get() - (MAX_ACCEL / 2), 0.0))
        }

-        inAirCheck(state, vehicle)
-        return driver.deltaMovement.length().toFloat()
-    }
-
-    fun inAirCheck(
-        state: VehicleState,
-        vehicle: PokemonEntity,
-    ) {
-        // Check both vertical movement and if there are blocks below.
-        val posBelow = vehicle.blockPosition().below()
-        val blockStateBelow = vehicle.level().getBlockState(posBelow)
-        val isAirOrLiquid = blockStateBelow.isAir || !blockStateBelow.fluidState.isEmpty
-
-        val canSupportEntity = blockStateBelow.isFaceSturdy(vehicle.level(), posBelow, Direction.UP)
-        val standingOnSolid = canSupportEntity && !isAirOrLiquid
-
-        // inAir if not on the ground
-        val inAir = !(vehicle.deltaMovement.y == 0.0 || standingOnSolid)
-        state.inAir.set(inAir)
+        return state.currSpeed.get().toFloat()
    }

    override fun rotation(
@@ -121,38 +106,10 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
        vehicle: PokemonEntity,
        driver: LivingEntity
    ): Vec2 {
-
-        var newMomentum = state.turnMomentum.get().toDouble()
-
-        // Grab turningAcceleration and divide 20 twice to get
-        val turningAcceleration = (vehicle.runtime.resolveDouble(settings.handlingExpr) * 1.5 / 20.0f) / 20.0f * 4.0
-        val turnInput =  (driver.xxa *-1.0f) * turningAcceleration
-
-        val maxTurnMomentum = 80.0f / 20.0f
-
-        // Base boost stats off of normal turning stats
-        val driftMaxTurnMomentum = maxTurnMomentum * 3.0f
-        var driftTurnInput = turnInput * 0.4f
-
-        if(state.drifting.get() || state.inAir.get()) {
-            if( newMomentum < driftMaxTurnMomentum) {
-                driftTurnInput = driftTurnInput * (vehicle.deltaMovement.horizontalDistance() / vehicle.runtime.resolveDouble(settings.speedExpr))
-                newMomentum += driftTurnInput
-            }
-            newMomentum = lerp(newMomentum, 0.0, 0.03)
-            if( abs(newMomentum) < 0.05 ) {newMomentum = 0.0}
-        } else {
-            if(abs(newMomentum) <= maxTurnMomentum && turnInput != 0.0 ) {
-                newMomentum += turnInput
-                newMomentum.coerceIn(-maxTurnMomentum.toDouble(), maxTurnMomentum.toDouble())
-            } else {
-                newMomentum = lerp(newMomentum, 0.0, 0.15)
-            }
-        }
-
-        state.turnMomentum.set(newMomentum.toFloat())
-        driver.yRot += newMomentum.toFloat()
-        return Vec2(driver.xRot, vehicle.yRot + newMomentum.toFloat())
+        val rotationDegrees = driver.xxa * vehicle.runtime.resolveFloat(settings.rotationSpeed)
+        val rotation = Vec2(driver.xRot, vehicle.yRot - rotationDegrees)
+        state.deltaRotation.set(Vec2(rotation.x - driver.rotationVector.x, rotation.y - vehicle.rotationVector.y))
+        return rotation
    }

    override fun velocity(
@@ -162,106 +119,18 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
        driver: Player,
        input: Vec3
    ): Vec3 {
-        state.rideVelocity.set(calculateRideSpaceVel(settings, state, vehicle, driver))
-        return state.rideVelocity.get()
-    }
-
-
-    private fun calculateRideSpaceVel(
-        settings: VehicleSettings,
-        state: VehicleState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Vec3 {
-
-        // Check to see if the ride should be walking or sprinting
-        //val walkSpeed = getWalkSpeed(vehicle)
-        val rideTopSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) * 0.6 * 2.0
-        val topSpeed = if (state.drifting.get()) rideTopSpeed * 0.5 else rideTopSpeed
-
-        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr) * 0.3 * 3 * 2.0
-
-        //Flag for determining if player is actively inputting
-        var activeInput = false
-
-        var newVelocity = Vec3.ZERO
-        if (!state.drifting.get()) {
-            newVelocity = vehicle.deltaMovement
-
-            newVelocity = newVelocity.yRot(vehicle.yRot.toRadians())
-
-        } else {
-            state
-            newVelocity = vehicle.deltaMovement
-
-            // Align the direction of movement with the world coordinate space so as not to modify it through turning
-            val yawAligned = Matrix3f().rotateY(vehicle.yRot.toRadians())
-            newVelocity = (newVelocity.toVector3f().mul(yawAligned)).toVec3d()
+        val runtime = vehicle.runtime
+        val driveFactor = runtime.resolveFloat(settings.driveFactor)
+        var g = driver.zza * driveFactor
+        if (g <= 0.0f) {
+            g *= runtime.resolveFloat(settings.reverseDriveFactor)
        }
-
-        //speed up and slow down based on input
-        if (driver.zza != 0.0f && state.stamina.get() > 0.0 && !state.inAir.get()) {
-            //make sure it can't exceed top speed
-            val forwardInput = when {
-                driver.zza > 0 && newVelocity.z > topSpeed -> 0.0
-                driver.zza < 0 && newVelocity.z <= 0.0 -> 0.0
-                else -> driver.zza.sign
-            }
-
-            newVelocity = Vec3(
-                newVelocity.x,
-                newVelocity.y,
-                (newVelocity.z + (accel * forwardInput.toDouble())))
-
-            activeInput = true
+        if (driver.xxa != 0F && g.absoluteValue < runtime.resolveFloat(settings.minimumSpeedToTurn)) {
+            driver.xxa = 0F
        }
+        val velocity = Vec3(0.0 /* Maybe do drifting here later */, 0.0, g.toDouble() * state.currSpeed.get())

-        // Gravity logic
-        if (vehicle.onGround()) {
-            newVelocity = Vec3(newVelocity.x, 0.0, newVelocity.z)
-        } else {
-            //TODO: Should we just go back to standard minecraft gravity or do the lerp modifications prevent that?
-            //I think minecrafts gravity logic is also too harsh and isn't gamefied enough for mounts maybe? Need
-            //to do some testing and get other's opinions
-            val gravity = (9.8 / ( 20.0)) * 0.2 * 0.25 * 3.0
-            val terminalVel = 2.0
-
-            val fallingForce = gravity -  ( newVelocity.z.sign *gravity *(abs(newVelocity.z) / 2.0))
-            newVelocity = Vec3(newVelocity.x, max(newVelocity.y - fallingForce, -terminalVel), newVelocity.z)
-        }
-
-        //ground Friction
-        var friction = 0.003 * 2.0
-        if (state.drifting.get()) {friction *= 0.1}
-        if (!state.inAir.get()) {
-            newVelocity = newVelocity.subtract(
-                min(friction , abs(newVelocity.x)) * newVelocity.x.sign,
-                0.0,
-                min(friction , abs(newVelocity.z)) * newVelocity.z.sign
-                )
-
-            // TEST FOR LATERAL SLIP OR WHATEVER
-            //TODO: calc lateral slip and friction better!
-            if (!state.drifting.get()) {
-                newVelocity = newVelocity.subtract(
-                    min(friction * 10, abs(newVelocity.x)) * newVelocity.x.sign,
-                    0.0,
-                    0.0,
-                )
-            }
-        }
-
-        //TODO: Change this so its tied to a jumping stat and representative of the amount of jumps
-        val canJump = vehicle.runtime.resolveBoolean(settings.canJump)
-        //Jump the thang!
-        if (driver.jumping && vehicle.onGround() && canJump) {
-            val jumpForce = 0.5
-
-            newVelocity = newVelocity.add(0.0, jumpForce, 0.0)
-
-        }
-
-        return newVelocity
+        return velocity
    }

    override fun angRollVel(
@@ -319,7 +188,10 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
        driver: Player,
        jumpStrength: Int
    ): Vec3 {
-        return Vec3.ZERO
+        val runtime = vehicle.runtime
+        runtime.environment.query.addFunction("jump_strength") { DoubleValue(jumpStrength.toDouble()) }
+        val jumpVector = settings.jumpVector.map { runtime.resolveFloat(it) }
+        return Vec3(jumpVector[0].toDouble(), jumpVector[1].toDouble(), jumpVector[2].toDouble())
    }

    override fun gravity(
@@ -328,7 +200,7 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
        vehicle: PokemonEntity,
        regularGravity: Double
    ): Double {
-        return 0.0
+        return regularGravity
    }

    override fun rideFovMultiplier(
@@ -354,15 +226,11 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
        vehicle: PokemonEntity,
        driver: Player
    ): ResourceLocation {
-        when {
-            state.poweredDrifting.get() -> return cobblemonResource("powered_drifting")
-            state.drifting.get() -> return cobblemonResource("drifting")
-        }
        return cobblemonResource("no_pose")
    }

    override fun inertia(settings: VehicleSettings, state: VehicleState, vehicle: PokemonEntity): Double {
-        return 1.0
+        return 0.5
    }

    override fun shouldRoll(settings: VehicleSettings, state: VehicleState, vehicle: PokemonEntity): Boolean {
@@ -398,15 +266,7 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
        state: VehicleState,
        vehicle: PokemonEntity
    ): Boolean {
-        return true
-    }
-
-    override fun getRideSounds(
-        settings: VehicleSettings,
-        state: VehicleState,
-        vehicle: PokemonEntity
-    ): RideSoundSettingsList {
-        return settings.rideSounds
+        return false
    }

    override fun createDefaultState(settings: VehicleSettings) = VehicleState()
@@ -418,6 +278,9 @@ class VehicleSettings : RidingBehaviourSettings {
    var canJump = "true".asExpression()
        private set

+    var jumpVector = listOf("0".asExpression(), "0.3".asExpression(), "0".asExpression())
+        private set
+
    var speed = "0.3".asExpression()
        private set

@@ -427,50 +290,40 @@ class VehicleSettings : RidingBehaviourSettings {
    var reverseDriveFactor = "0.25".asExpression()
        private set

+    var minimumSpeedToTurn = "0.1".asExpression()
+        private set
+
    var rotationSpeed = "45/20".asExpression()
        private set

    var lookYawLimit = "101".asExpression()
        private set

-    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'LAND', 1.0, 0.3)".asExpression()
-        private set
-
-    // Max accel is a whole 1.0 in 1 second. The conversion in the function below is to convert seconds to ticks
-    var accelerationExpr: Expression =
-        "q.get_ride_stats('ACCELERATION', 'LAND', (1.0 / (20.0 * 1.5)), (1.0 / (20.0 * 5.0)))".asExpression()
-        private set
-
-    // Between 30 seconds and 10 seconds at the lowest when at full speed.
-    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'LAND', 30.0, 10.0)".asExpression()
-        private set
-
-    //Between a one block jump and a ten block jump
-    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'LAND', 10.0, 1.0)".asExpression()
-        private set
-
-    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'LAND', 140.0, 20.0)".asExpression()
-        private set
-
-    var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
-
    override fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeResourceLocation(key)
-        rideSounds.encode(buffer)
        buffer.writeExpression(canJump)
+        buffer.writeExpression(jumpVector[0])
+        buffer.writeExpression(jumpVector[1])
+        buffer.writeExpression(jumpVector[2])
        buffer.writeExpression(speed)
        buffer.writeExpression(driveFactor)
        buffer.writeExpression(reverseDriveFactor)
+        buffer.writeExpression(minimumSpeedToTurn)
        buffer.writeExpression(rotationSpeed)
        buffer.writeExpression(lookYawLimit)
    }

    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        rideSounds = RideSoundSettingsList.decode(buffer)
        canJump = buffer.readExpression()
+        jumpVector = listOf(
+            buffer.readExpression(),
+            buffer.readExpression(),
+            buffer.readExpression()
+        )
        speed = buffer.readExpression()
        driveFactor = buffer.readExpression()
        reverseDriveFactor = buffer.readExpression()
+        minimumSpeedToTurn = buffer.readExpression()
        rotationSpeed = buffer.readExpression()
        lookYawLimit = buffer.readExpression()
    }
@@ -479,36 +332,11 @@ class VehicleSettings : RidingBehaviourSettings {
 class VehicleState : RidingBehaviourState() {
    var currSpeed = ridingState(0.0, Side.BOTH)
    var deltaRotation = ridingState(Vec2.ZERO, Side.BOTH)
-    var drifting = ridingState(false, Side.CLIENT)
-    var poweredDrifting = ridingState(false, Side.CLIENT)
-    val turnMomentum: SidedRidingState<Float> = ridingState(0.0f, Side.CLIENT)
-    var inAir = ridingState(false, Side.CLIENT)
-

    override fun reset() {
        super.reset()
        currSpeed.set(0.0, forced = true)
        deltaRotation.set(Vec2.ZERO, forced = true)
-        drifting.set(false, forced = true)
-        poweredDrifting.set(false, forced = true)
-        turnMomentum.set(0.0f, forced = true)
-        inAir.set(false, forced = true)
-    }
-
-    override fun encode(buffer: FriendlyByteBuf) {
-        super.encode(buffer)
-        buffer.writeBoolean(drifting.get())
-        buffer.writeBoolean(poweredDrifting.get())
-        buffer.writeFloat(turnMomentum.get())
-        buffer.writeBoolean(inAir.get())
-    }
-
-    override fun decode(buffer: FriendlyByteBuf) {
-        super.decode(buffer)
-        drifting.set(buffer.readBoolean(), forced = true)
-        poweredDrifting.set(buffer.readBoolean(), forced = true)
-        turnMomentum.set(buffer.readFloat(), forced = true)
-        inAir.set(buffer.readBoolean(), forced = true)
    }

    override fun toString(): String {
@@ -520,18 +348,5 @@ class VehicleState : RidingBehaviourState() {
        it.stamina.set(stamina.get(), forced = true)
        it.currSpeed.set(currSpeed.get(), forced = true)
        it.deltaRotation.set(deltaRotation.get(), forced = true)
-        it.drifting.set(drifting.get(), forced = true)
-        it.poweredDrifting.set(poweredDrifting.get(), forced = true)
-        it.turnMomentum.set(turnMomentum.get(), forced = true)
-        it.inAir.set(inAir.get(), forced = true)
-    }
-
-    override fun shouldSync(previous: RidingBehaviourState): Boolean {
-        if (previous !is VehicleState) return false
-        if (previous.drifting.get() != drifting.get()) return true
-        if (previous.poweredDrifting.get() != poweredDrifting.get()) return true
-        if (previous.turnMomentum.get() != turnMomentum.get()) return true
-        if (previous.inAir.get() != inAir.get()) return true
-        return super.shouldSync(previous)
    }
 }
@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -338,14 +337,6 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
        return true
    }

-    override fun getRideSounds(
-        settings: BoatSettings,
-        state: BoatState,
-        vehicle: PokemonEntity
-    ): RideSoundSettingsList {
-        return settings.rideSounds
-    }
-
    override fun maxUpStep(settings: BoatSettings, state: BoatState, vehicle: PokemonEntity) = 0f

    override fun createDefaultState(settings: BoatSettings) = BoatState()
@@ -354,7 +345,6 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {

 class BoatSettings : RidingBehaviourSettings {
    override val key = BoatBehaviour.KEY
-    var rideSounds: RideSoundSettingsList = RideSoundSettingsList()

    var terminalVelocity = "-2.0".asExpression()
        private set
@@ -364,12 +354,10 @@ class BoatSettings : RidingBehaviourSettings {

    override fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeResourceLocation(key)
-        rideSounds.encode(buffer)
        buffer.writeExpression(terminalVelocity)
    }

    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        rideSounds = RideSoundSettingsList.decode(buffer)
        terminalVelocity = buffer.readExpression()
    }
 }
@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.blockPositionsAsListRounded
@@ -223,14 +222,6 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
        return false
    }

-    override fun getRideSounds(
-        settings: BurstSettings,
-        state: BurstState,
-        vehicle: PokemonEntity
-    ): RideSoundSettingsList {
-        return settings.rideSounds
-    }
-
    override fun createDefaultState(settings: BurstSettings) = BurstState()
 }

@@ -240,16 +231,12 @@ class BurstSettings : RidingBehaviourSettings {
    var dashSpeed = 1F
        private set

-    var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
-
    override fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeResourceLocation(key)
-        rideSounds.encode(buffer)
        buffer.writeFloat(dashSpeed)
    }

    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        rideSounds = RideSoundSettingsList.decode(buffer)
        dashSpeed = buffer.readFloat()
    }
 }
@@ -8,7 +8,6 @@

 package com.cobblemon.mod.common.api.riding.behaviour.types.liquid

-import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.OrientationControllable
@@ -16,11 +15,9 @@ import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.*
-import com.cobblemon.mod.common.util.math.geometry.toRadians
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.SmoothDouble
@@ -31,9 +28,7 @@ import net.minecraft.world.phys.Vec3
 import net.minecraft.world.phys.shapes.Shapes
 import kotlin.math.abs
 import kotlin.math.cos
-import kotlin.math.min
 import kotlin.math.sin
-import kotlin.math.sqrt

 class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
    companion object {
@@ -47,7 +42,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
    }

    val poseProvider = PoseProvider<DolphinSettings, DolphinState>(PoseType.FLOAT)
-        .with(PoseOption(PoseType.SWIM) { _, _, entity -> entity.deltaMovement.length() > 0.1 })
+        .with(PoseOption(PoseType.SWIM) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })

    override fun isActive(settings: DolphinSettings, state: DolphinState, vehicle: PokemonEntity): Boolean {
        return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
@@ -165,59 +160,11 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
        deltaTime: Double
    ): Vec3 {
        if (driver !is OrientationControllable) return Vec3.ZERO
-        val controller = (driver as OrientationControllable).orientationController

-        //TODO:hook up handling
-        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr)
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-
-        //Interpret mouse input
-        val smoothingSpeed = 4.0
+        //Might need to add the smoothing here for default.
        val invertRoll = if (Cobblemon.config.invertRoll) -1 else 1
        val invertPitch = if (Cobblemon.config.invertPitch) -1 else 1
-        val mouseXc = (mouseX).coerceIn(-60.0, 60.0)
-        val mouseYc = (mouseY).coerceIn(-60.0, 60.0)
-        val xInput = mouseXSmoother.getNewDeltaValue(mouseXc * 0.1 * invertRoll, deltaTime * smoothingSpeed);
-        val yInput = mouseYSmoother.getNewDeltaValue(mouseYc * 0.1 * invertPitch, deltaTime * smoothingSpeed);
-        val rollRot = xInput
-        val pitchRot = yInput
-
-        // Roll
-//        if (abs(controller.pitch + rollRot) >= 89.5 ) {
-//            mouseXSmoother.reset()
-//        } else {
-//
-//        }
-
-        controller.rotateRoll(rollRot.toFloat())
-
-        // Yaw
-        // TODO:move all magic numbers to handling expression
-        val yawSpeed = handling * deltaTime * 0.25
-        val yawForce =  sin(controller.roll.toRadians()) * yawSpeed * ( 1.0 - min(sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)), 0.5))
-        //Apply yaw globally as we don't want roll or pitch changes due to local yaw when looking up or down.
-        controller.applyGlobalYaw(yawForce.toFloat())
-
-        // Pitch
-        if (abs(controller.pitch + pitchRot) >= 89.5 ) {
-            mouseYSmoother.reset()
-        } else {
-            //controller.applyGlobalPitch(pitchRot.toFloat()  * -1.0f)
-            controller.rotatePitch(pitchRot.toFloat())
-        }
-
-        //yaw, pitch, roll
-        return Vec3.ZERO
-    }
-
-    /*
-    *  Normalizes the given value between a min and a max.
-    *  The result is clamped between 0.0 and 1.0, where 0.0 represents x is at or below min
-    *  and 1.0 represents x is at or above it.
-    */
-    private fun normalizeVal(x: Double, min: Double, max: Double): Double {
-        require(max > min) { "max must be greater than min" }
-        return ((x - min) / (max - min)).coerceIn(0.0, 1.0)
+        return Vec3(0.0, mouseY * invertPitch, mouseX * invertRoll)
    }

    override fun canJump(
@@ -314,14 +261,6 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
        return false
    }

-    override fun getRideSounds(
-        settings: DolphinSettings,
-        state: DolphinState,
-        vehicle: PokemonEntity
-    ): RideSoundSettingsList {
-        return settings.rideSounds
-    }
-
    override fun createDefaultState(settings: DolphinSettings) = DolphinState()

 }
@@ -347,17 +286,8 @@ class DolphinSettings : RidingBehaviourSettings {
    var strafeFactor = "0.2".asExpression()
        private set

-    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 200.0, 128.0)".asExpression()
-    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 135.0, 45.0)".asExpression()
-    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 1.0, 0.35)".asExpression()
-    var accelerationExpr: Expression = "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 3.0)), (1.0 / (20.0 * 8.0)))".asExpression()
-    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 120.0, 20.0)".asExpression()
-
-    var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
-
    override fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeResourceLocation(key)
-        rideSounds.encode(buffer)
        buffer.writeExpression(canJump)
        buffer.writeExpression(jumpVector[0])
        buffer.writeExpression(jumpVector[1])
@@ -369,7 +299,6 @@ class DolphinSettings : RidingBehaviourSettings {
    }

    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        rideSounds = RideSoundSettingsList.decode(buffer)
        canJump = buffer.readExpression()
        jumpVector = listOf(
            buffer.readExpression(),
@@ -1,24 +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.riding.sound;
-
-
-/**
- * Enum of attenuations models for ride sounds
- *
- * @author Jackowes
- * @since May 11th, 2025
- */
-
-enum class RideAttenuationModel {
-    NONE,
-    LINEAR,
-    EXPONENTIAL
-}
-
@@ -1,190 +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.riding.sound
-
-
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeBehaviour
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeState
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.resolveDouble
-import net.minecraft.client.Minecraft
-import net.minecraft.client.resources.sounds.AbstractTickableSoundInstance
-import net.minecraft.client.resources.sounds.SoundInstance
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.sounds.SoundEvent
-import net.minecraft.sounds.SoundSource
-import net.minecraft.util.Mth
-import net.minecraft.util.Mth.lerp
-import net.minecraft.world.level.ClipContext
-import net.minecraft.world.phys.HitResult
-import net.minecraft.world.phys.Vec3
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.pow
-import kotlin.math.sin
-
-/**
- * Class to handle looping ride sounds for clients.
- *
- * @author Jackowes
- * @since April 21st, 2025
- */
-class RideLoopSound(val ride: PokemonEntity, val soundSettings: RideSoundSettings) :
-        AbstractTickableSoundInstance(SoundEvent.createVariableRangeEvent(soundSettings.soundLocation), SoundSource.NEUTRAL, SoundInstance.createUnseededRandom()) {
-
-    var shouldStop: Boolean = false
-    var fade: Float = 0.0f
-    var shouldMuffle: Boolean = soundSettings.muffleEnabled
-    var rideAttenuation: RideAttenuationModel = soundSettings.attenuationModel
-    var muffleAmount: Float = 1.0f // Currently slightly misleading. 1.0 is on muffle and 0.0 is full hFgain muting
-    // TODO: revisit below flag once multi passenger support is enabled
-    var isPassenger: Boolean = Minecraft.getInstance().player?.id == ride.controllingPassenger?.id
-
-    init {
-        this.looping = true
-        this.delay = 0
-        this.volume = 0.1f
-        this.attenuation = SoundInstance.Attenuation.LINEAR // This class performs its own attenuation
-        if (this.isPassenger) this.relative = true
-    }
-
-    override fun tick() {
-        // Check if the sound should fade in/out or stop
-        this.runFade()
-
-        // If the ride is out of attenuation distance then don't play
-        if (this.outOfRange()) {
-            this.volume = 0.0f
-            return
-        }
-
-        // Perform data driven pitch and volume calculation
-        this.volume = ((soundSettings.volumeExpr.let { ride.runtime.resolveDouble(it) })).toFloat()
-        this.volume *= this.fade
-        this.pitch = ((soundSettings.pitchExpr.let { ride.runtime.resolveDouble(it) })).toFloat()
-
-        if (!this.isPassenger && this.soundSettings.playForNonPassengers) {
-            this.setPos()
-
-            // This should now be done fully through openal. Add to RideAttneuationModel and the
-            // ChannelMixin to expand on the attenuation models.
-            // Attenuate due to distance
-            // this.volume *= attenuation()
-
-            // Calculate influence due to the doppler effect
-            this.pitch *= calcDopplerInfluence().toFloat()
-
-            // Calculate muffling due to occlusion
-            val soundOc = soundOcclusion()
-            if (soundOc != 0.0f) {
-                val newMuffle = lerp(soundOc,1.0f, 0.2f).coerceIn(0.2f,1.0f)
-                // lerp muffle smoothly
-                this.muffleAmount = lerp(0.1f, this.muffleAmount, newMuffle)
-                this.shouldMuffle = true
-                this.volume *= muffleAmount
-            } else {
-                this.shouldMuffle = true
-                this.muffleAmount = lerp(0.1f, this.muffleAmount, 1.0f)
-                this.volume *= muffleAmount
-            }
-        }
-    }
-
-    fun runFade() {
-        if (this.shouldStop && this.fade == 0.0f) {
-            this.stop()
-        } else if(this.shouldStop) {
-            this.fade = max(0.0f, this.fade - 0.05f)
-        } else if(!this.shouldStop && this.fade != 1.0f){
-            this.fade = min(1.0f, this.fade + 0.05f)
-        }
-    }
-
-    fun outOfRange(): Boolean {
-        val attenDist = this.sound.attenuationDistance
-        val listenerPosition = Minecraft.getInstance().player?.eyePosition ?: return false
-        return listenerPosition.distanceTo(ride.position()) > attenDist
-    }
-
-    fun calcDopplerInfluence(): Double {
-        val rideVel = ride.getRideVelocity()
-
-        // TODO: Expand this to multiple players
-        val listener = Minecraft.getInstance().player ?: return 1.0
-        val listenerVel = listener.deltaMovement//listener.position().subtract(Vec3(listener.xOld, listener.yOld, listener.zOld))
-
-        // Tweaked constant based off speed of sound in room temp air. Exaggerated for a better effect in minecraft
-        val waveSpeed = 343.0f / 50.0f
-
-        // listener->ride los velocity
-        val lineOfSightToRide = ride.position().subtract(listener.position()).normalize()
-        //val lineOfSightToPlayer = listener.position().subtract(ride.position()).normalize()
-
-        // Speed of the observer towards the sound source
-        val velObserver = listenerVel.dot(lineOfSightToRide)
-        // Speed of the sound source towards the observer
-        val velSrc = rideVel.dot(lineOfSightToRide.scale(-1.0))
-
-        // Use the doppler effect equation to determine the pitch change
-        val pitchFactor = (waveSpeed + velObserver) / (waveSpeed - velSrc)
-
-        return pitchFactor
-    }
-
-    fun soundOcclusion(): Float {
-        val listener = Minecraft.getInstance().player ?: return 0.0f
-        val level = listener.level()
-        val maxAttenDist = this.sound.attenuationDistance
-
-        var totalMuffle = 0.0
-
-        val center = ride.boundingBox.center
-
-        val hit = level.clip(
-            ClipContext(
-                listener.eyePosition,
-                center,
-                ClipContext.Block.COLLIDER,
-                ClipContext.Fluid.NONE,
-                listener
-            )
-        )
-
-        if(hit.type != HitResult.Type.MISS) {
-            //Calculate the distance the hit was away from the listener
-            val hitDist = hit.location.distanceTo(listener.eyePosition)
-
-            //Calculate the influence based on distance of this particular ray hit
-            val hitMuffle = lerp((1 - (hitDist / maxAttenDist)), 0.3, 1.0)
-            totalMuffle += hitMuffle
-        }
-
-
-        return totalMuffle.toFloat()
-    }
-
-//    fun attenuation(): Float {
-//        val listener = Minecraft.getInstance().player ?: return 1.0f
-//        val soundDistance = (ride.position().subtract(listener.eyePosition)).length()
-//        val maxAttenDistance = this.sound.attenuationDistance
-//
-//        return (1 - (soundDistance / maxAttenDistance).pow(2)).toFloat()
-//    }
-
-    fun setPos() {
-        this.x = ride.x
-        this.y = ride.y
-        this.z = ride.z
-    }
-
-    fun stopSound() {
-        this.shouldStop = true
-        //Minecraft.getInstance().soundManager.stop(this)
-    }
-}
@@ -1,77 +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.riding.sound
-
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeBehaviour
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeState
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.client.Minecraft
-import net.minecraft.resources.ResourceLocation
-
-/**
- * Class to control playing all ride sounds
- *
- * @author Jackowes
- * @since April 26th, 2025
- */
-class RideSoundManager(
-    private val ride: PokemonEntity
-) {
-    private val activeSounds = mutableListOf<RideLoopSound>()
-    private var rideActive: Boolean = false
-    private var currKey: ResourceLocation = cobblemonResource("no_key")
-
-    fun tick() {
-        val currActive = ride.hasControllingPassenger()
-
-        if( !currActive && !this.rideActive) return
-
-        // Remove stopped sounds
-        activeSounds.removeIf { it.isStopped}
-
-        if (!currActive && this.rideActive) {
-            this.rideActive = false
-            this.currKey = cobblemonResource("no_key")
-            this.stop()
-        } else if (currActive && !this.rideActive) {
-            this.rideActive = true
-            this.currKey = getActiveRideKey()
-            this.getBehaviourSounds()
-        } else if (currActive && this.rideActive && this.currKey != getActiveRideKey()) {
-            this.currKey = getActiveRideKey()
-            this.stop()
-            this.getBehaviourSounds()
-        }
-    }
-
-    fun getBehaviourSounds() {
-        val rideSounds = ride.ifRidingAvailableSupply(null) { behaviour, settings, state ->
-            behaviour.getRideSounds(settings, state, ride)
-        }
-        rideSounds?.sounds?.forEach {
-            val loopingRideSound = RideLoopSound(ride,it)
-            activeSounds.add(loopingRideSound)
-            Minecraft.getInstance().soundManager.play(loopingRideSound)
-        }
-    }
-
-    fun getActiveRideKey(): ResourceLocation {
-        val key = ride.ridingBehaviourSettings?.key ?: cobblemonResource("no_key")
-        if (key == CompositeBehaviour.KEY) {
-            return (ride.ridingState as? CompositeState)?.activeBehaviour?.get() ?: cobblemonResource("no_key")
-        } else {
-            return key
-        }
-    }
-
-    fun stop() {
-        activeSounds.forEach { it.stopSound() }
-    }
-}
@@ -1,79 +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.riding.sound;
-
-import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.api.net.Encodable
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.readExpression
-import com.cobblemon.mod.common.util.writeExpression
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * Class to store data for looping sounds played during riding.
- *
- * @author Jackowes
- * @since April 26th, 2025
- */
-data class RideSoundSettings(
-    val soundLocation: ResourceLocation,
-    val volumeExpr: Expression = "1.0".asExpression(),
-    val pitchExpr: Expression = "1.0".asExpression(),
-    val playForNonPassengers: Boolean = false,
-    val muffleEnabled: Boolean = false,
-    val attenuationModel: RideAttenuationModel = RideAttenuationModel.NONE
-): Encodable {
-
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(soundLocation)
-        buffer.writeExpression(volumeExpr)
-        buffer.writeExpression(pitchExpr)
-        buffer.writeBoolean(playForNonPassengers)
-        buffer.writeBoolean(muffleEnabled)
-    }
-
-    companion object {
-        fun decode(buffer: RegistryFriendlyByteBuf): RideSoundSettings {
-
-            // Try to read if available, fallback to default otherwise
-            val soundLocation = buffer.readResourceLocation()
-            val volumeExpr = buffer.readExpression()
-            val pitchExpr = buffer.readExpression()
-            val playForNonPassengers = buffer.readBoolean()
-            val muffleEnabled = buffer.readBoolean()
-            val attenuationModel = RideAttenuationModel.EXPONENTIAL
-
-            return RideSoundSettings(
-                soundLocation,
-                volumeExpr,
-                pitchExpr,
-                playForNonPassengers,
-                muffleEnabled,
-                attenuationModel
-            )
-        }
-    }
-}
-
-class RideSoundSettingsList(var sounds: List<RideSoundSettings> = mutableListOf()) {
-
-    fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeCollection(sounds) { _, sound -> sound.encode(buffer) }
-    }
-
-    companion object {
-        fun decode(buffer: RegistryFriendlyByteBuf): RideSoundSettingsList {
-            val list = RideSoundSettingsList()
-            list.sounds = buffer.readList { RideSoundSettings.decode(buffer) }.toMutableList()
-            return list
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
JazzMcNade	9ff62821cd	Add the ability for piglins to fear pokemon tagged with avoidedByPiglin	2025-07-18 23:44:46 -05:00
JazzMcNade	1fb300cd86	Code cleanup of old mixin	2025-07-18 00:01:13 -05:00
JazzMcNade	dae01c545d	Piglins are now infatuated by Gholdengo	2025-07-17 23:49:29 -05:00