Add lapras assets

2025-04-05 01:19:26 -04:00
589 changed files with 16674 additions and 66515 deletions
@@ -13,92 +13,6 @@
 - Added `visibility/hidden`, `visibility/hat` and `visibility/face` tags to control where and how certain items are rendered.
 - Added Pokémon markings, toggleable within the summary.
 - Added `/boxcount` command to change PC boxes amount
- Added cosmetics for Gurdurr, Conkeldurr, Squirtle Line, Sneasler, Sandile line, Treecko line, Braixen, Delphox, and Dragonite.
- 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.
-
-### Pokémon Added
-
-#### Gen 2
- Dunsparce
-
-#### Gen 3
- Spoink
- Grumpig
- Snorunt
- Glalie
-
-#### Gen 4
- Bronzor
- Bronzong
- Croagunk
- Froslass
-
-#### Gen 5
- Pansage
- Simisage
- Pansear
- Simisear
- Panpour
- Simipour
- Munna
- Musharna
- Blitzle
- Zebstrika
- Trubbish
- Garbodor
-
-#### Gen 6
- Noibat
- Noivern
-
-#### Gen 7
- Drampa
-
-#### Gen 8
- Silicobra
- Sandaconda
-
-#### Gen 9
- Smoliv
- Dolliv
- Arboliva
- Orthworm
- Dudunsparce
-
-### Animation updates for the following Pokémon
- Garchomp
- Tropius
- Torpius
- Nosepass
- Probopass
- Sneasler
- Braixen
- Delphox
-
-### Model updates for the following Pokémon
- Gyarados
- Dragonite
- Eevee
- Vaporeon
- Jolteon
- Flareon
- Espeon
- Umbreon
- Leafeon
- Glaceon
- Sylveon
- Treecko
- Grovyle
- Sceptile
- Honchkrow
- Garchomp
- Pidgeot
- Nosepass
- Probopass
- Magnezone
- Metagross

 ### Changes
 - Renamed `chargeGainedPerTick` config to `secondsToChargeHealingMachine`.
@@ -107,8 +21,6 @@
 - When using the `cobblemon` or `generation_9` capture calculators a critical capture with a single shake will always play for successful captures when you've already registered the Pokémon as caught in your Pokédex.
 - Improved the performance of saving Pokédex and player data.
 - Pokémon hitbox now scales with entity attribute `generic.scale`.
- Removed Shulker aspect and replaced it with cosmetic_item-shulker_shell.
- Shulker shell Forretress is now a cosmetic rather than a special evo and thus all shulker Forretress will revert back to normal until a shulker shell is put in their cosmetic slot.

 ### Fixes
 - Fixed Particles sometimes facing the wrong direction (looking at you, Swords Dance)
@@ -131,7 +43,6 @@
 - Fixed field name in evolution requirements for Spewpa Pokeball.
 - Fixed LevelUpCriterion logic to correctly check that the Pokémon is a preEvo.
 - Fixed `hide_additional_tooltip` vanilla flag not properly hiding tooltips on pokerod and bait items
- Removed a number of scenarios in which a Pokémon battle may send out a Pokémon into collision geometry.
 - Fixed NPCs using Pokémon outside of their pool when a Pokémon name had a typo.
 - Fixed an issue with datapacked species features not being applied properly when relogging.
 - Fixed Pokémon marked as silent still playing shiny sounds and effects.
@@ -154,7 +65,6 @@
 - Updated NPCEntity beam positioning to properly account for the baseScale property.
 - 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`.

 ### 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)
@@ -165,14 +75,9 @@
 - Added `interpolate` boolean property to animated textures to allow gradual colour changes between frames.
 - Fixed species additions not being capable of changing implemented status.
 - Added support for action effects that are triggered by `|-activate|` Showdown instructions. `activate_{effect_id}` is the syntax.
- Added MoLang functions for rendering items `render_item(item_id, locator_name)` and `clear_items()`.
+- Added Molang functions for rendering items `render_item(item_id, locator_name)` and `clear_items()`.
 - Fixed location spawn filter components causing crashes
- Added `pokemon` as an available MoLang function for the `battleActor` functions.
- Added `spawn_pokemon` as an available MoLang function for the `worldHolder` functions.
- Added `attempt_wild_battle` as an available MoLang function.
 - 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

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

@@ -278,7 +183,6 @@
 - Geodude
 - Graveler
 - Golem
- Magnezone

 ### Cry updates for the following Pokémon
 - Sceptile
@@ -0,0 +1,30 @@
+/*
+ * 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.ServerInterface;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+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(ServerLevel.class)
+public abstract class MinecraftDedicatedServerMixin implements ServerInterface {
+
+    @Inject(method = "shouldDiscardEntity", at = @At(value = "HEAD"), cancellable = true)
+    public void cobblemon$allowPokemonSpawns(Entity entity, CallbackInfoReturnable<Boolean> callback) {
+        if (entity instanceof PokemonEntity) {
+            callback.setReturnValue(false);
+        }
+    }
+
+}
@@ -15,12 +15,10 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents;
 import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies;
-import com.cobblemon.mod.common.api.riding.Seat;
+import com.cobblemon.mod.common.api.riding.Rideable;
 import com.cobblemon.mod.common.api.storage.party.PartyStore;
 import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore;
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags;
-import com.cobblemon.mod.common.client.entity.PokemonClientDelegate;
-import com.cobblemon.mod.common.client.render.MatrixWrapper;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData;
 import com.cobblemon.mod.common.pokedex.scanner.ScannableEntity;
@@ -40,18 +38,16 @@ import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.*;
+import net.minecraft.world.entity.EntityDimensions;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
-import org.joml.Matrix3f;
-import org.joml.Vector3f;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -86,8 +82,7 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit

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

    protected PlayerMixin(EntityType<? extends LivingEntity> p_20966_, Level p_20967_) {
        super(p_20966_, p_20967_);
@@ -125,7 +120,7 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
        if (this.getVehicle() instanceof PokemonEntity) {
            return STANDING_DIMENSIONS;
        }
-        return POSES.getOrDefault(pose, STANDING_DIMENSIONS);
+        return (EntityDimensions)POSES.getOrDefault(pose, STANDING_DIMENSIONS);
    }

    @Inject(
@@ -284,41 +279,4 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
    public OrientationController getOrientationController() {
        return cobblemon$orientationController;
    }
-
-    @Override
-    public HitResult pick(double hitDistance, float partialTicks, boolean hitFluids) {
-        Entity vehicle = this.getVehicle();
-        if (vehicle instanceof PokemonEntity pokemonEntity) {
-            int seatIndex = pokemonEntity.getPassengers().indexOf(this);
-            Seat seat = pokemonEntity.getSeats().get(seatIndex);
-
-            PokemonClientDelegate delegate = (PokemonClientDelegate) pokemonEntity.getDelegate();
-            MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
-
-            if (locator == null) {
-                super.pick(hitDistance, partialTicks, hitFluids);
-            }
-
-            Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
-
-            OrientationController controller = this.getOrientationController();
-
-            float currEyeHeight = this.getEyeHeight();
-            Matrix3f orientation = controller.isActive() && controller.getOrientation() != null ? controller.getOrientation() : new Matrix3f();
-            Vec3 rotatedEyeHeight = new Vec3(orientation.transform(new Vector3f(0f, currEyeHeight - (this.getBbHeight() / 2), 0f)));
-
-            Vec3 eyePosition = locatorOffset.add(pokemonEntity.position()).add(rotatedEyeHeight);
-
-            Vec3 viewVector = this.getViewVector(partialTicks);
-            Vec3 viewDistanceVector = eyePosition.add(viewVector.x * hitDistance, viewVector.y * hitDistance, viewVector.z * hitDistance);
-            return this.level()
-                    .clip(
-                            new ClipContext(
-                                    eyePosition, viewDistanceVector, ClipContext.Block.OUTLINE, hitFluids ? net.minecraft.world.level.ClipContext.Fluid.ANY : net.minecraft.world.level.ClipContext.Fluid.NONE, this
-                            )
-                    );
-        }
-
-        return super.pick(hitDistance, partialTicks, hitFluids);
-    }
 }
@@ -1,53 +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.Cobblemon;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.entity.pokemon.PokemonServerDelegate;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.block.LevelEvent;
-import net.minecraft.world.phys.AABB;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(ServerLevel.class)
-public abstract class ServerLevelMixin {
-
-    @Inject(method = "shouldDiscardEntity", at = @At(value = "HEAD"), cancellable = true)
-    public void cobblemon$allowPokemonSpawns(Entity entity, CallbackInfoReturnable<Boolean> callback) {
-        if (entity instanceof PokemonEntity) {
-            callback.setReturnValue(false);
-        }
-    }
-
-    @Inject(method = "levelEvent(Lnet/minecraft/world/entity/player/Player;ILnet/minecraft/core/BlockPos;I)V", at = @At(value = "HEAD"))
-    public void cobblemon$setPokemonDancing(Player player, int type, BlockPos pos, int data, CallbackInfo ci) {
-        if (type == LevelEvent.SOUND_PLAY_JUKEBOX_SONG || type == LevelEvent.SOUND_STOP_JUKEBOX_SONG) {
-            cobblemon$notifyNearbyEntities((ServerLevel) ((Object) this), pos, type == LevelEvent.SOUND_PLAY_JUKEBOX_SONG);
-        }
-    }
-
-    @Unique
-    private void cobblemon$notifyNearbyEntities(ServerLevel level, BlockPos pos, boolean playing) {
-        for (PokemonEntity pokemonEntity : level.getEntitiesOfClass(PokemonEntity.class, new AABB(pos).inflate(Cobblemon.config.getPokemonDanceDistance()))) {
-            PokemonServerDelegate delegate = (PokemonServerDelegate) pokemonEntity.getDelegate();
-            delegate.setDancing(playing);
-            delegate.setJukeboxPos(pos);
-            pokemonEntity.setRecordPlayingNearby(pos, playing);
-        }
-    }
-}
@@ -8,28 +8,19 @@

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

-import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.riding.Rideable;
 import com.cobblemon.mod.common.api.riding.Seat;
-import com.cobblemon.mod.common.client.MountedPokemonAnimationRenderController;
 import com.cobblemon.mod.common.client.entity.PokemonClientDelegate;
 import com.cobblemon.mod.common.client.render.MatrixWrapper;
-import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState;
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel;
-import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
 import org.joml.Matrix3f;
 import org.joml.Quaternionf;
@@ -41,11 +32,12 @@ import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Map;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

@Mixin(Camera.class)
 public abstract class CameraMixin {
+    @Shadow @Final private static float DEFAULT_CAMERA_DISTANCE;
+
    @Shadow private Entity entity;
    @Shadow @Final private Quaternionf rotation;
    @Shadow @Final private Vector3f forwards;
@@ -54,15 +46,12 @@ public abstract class CameraMixin {
    @Shadow private float xRot;
    @Shadow private float yRot;

+    @Shadow private Vec3 position;
    @Shadow private float eyeHeight;
    @Shadow private float eyeHeightOld;

    @Shadow protected abstract void setPosition(Vec3 pos);

-    @Shadow
-    private BlockGetter level;
-
-    @Shadow private float partialTickTime;
    @Unique private float returnTimer = 0;
    @Unique private float rollAngleStart = 0;
    @Unique Minecraft minecraft = Minecraft.getInstance();
@@ -70,7 +59,7 @@ public abstract class CameraMixin {
    @Unique boolean disableRollableCameraDebug = false;

    @Inject(method = "setRotation", at = @At("HEAD"), cancellable = true)
-    public void cobblemon$setRotation(float f, float g, CallbackInfo ci) {
+    public void open_camera$setRotation(float f, float g, CallbackInfo ci) {
        if (!(this.entity instanceof OrientationControllable controllable) || disableRollableCameraDebug) return;
        var controller = controllable.getOrientationController();
        if (!controller.isActive() && controller.getOrientation() != null) {
@@ -88,7 +77,7 @@ public abstract class CameraMixin {
                    return;
                }
                controller.getOrientation().rotateZ((float) Math.toRadians(-rollAngleStart*(1-returnTimer)));
-                cobblemon$applyRotation();
+                applyRotation();
                this.returnTimer += .05F;
                ci.cancel();
            } else {
@@ -98,7 +87,7 @@ public abstract class CameraMixin {
            return;
        }
        if (controller.getOrientation() == null) return;
-        cobblemon$applyRotation();
+        applyRotation();

        this.returnTimer = 0;
        this.rollAngleStart = controller.getRoll();
@@ -107,10 +96,9 @@ public abstract class CameraMixin {

    //If you want to move this to a delagate you need an AW for position
    @WrapOperation(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;setPosition(DDD)V"))
-    public void cobblemon$positionCamera(Camera instance, double x, double y, double z, Operation<Void> original, @Local(ordinal = 1, argsOnly = true) boolean thirdPersonReverse) {
+    public void positionCamera(Camera instance, double x, double y, double z, Operation<Void> original){
        Entity entity = instance.getEntity();
        Entity vehicle = entity.getVehicle();
-        MountedPokemonAnimationRenderController.INSTANCE.reset();

        if(vehicle instanceof Rideable){
            //RidingCameraDelagate.INSTANCE.positionCamera(instance, x, y, z, original);
@@ -119,73 +107,38 @@ public abstract class CameraMixin {
                return;
            }

+            int seatIndex = pokemon.getPassengers().indexOf(entity);
+            Seat seat = pokemon.getSeats().get(seatIndex);
            PokemonClientDelegate delegate = (PokemonClientDelegate) pokemon.getDelegate();
+            MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
+            if(locator == null){
+                original.call(instance, x, y, z);
+                return;
+            }
+
+            Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
+
            Vec3 entityPos = new Vec3(
                    Mth.lerp(instance.getPartialTickTime(), pokemon.xOld, pokemon.getX()),
                    Mth.lerp(instance.getPartialTickTime(), pokemon.yOld, pokemon.getY()),
                    Mth.lerp(instance.getPartialTickTime(), pokemon.zOld, pokemon.getZ())
            );
-            MountedPokemonAnimationRenderController.INSTANCE.setup(pokemon, partialTickTime);
-            int seatIndex = pokemon.getPassengers().indexOf(entity);
-            Seat seat = pokemon.getSeats().get(seatIndex);

            OrientationControllable rollable = (OrientationControllable) entity;
-            OrientationController controller = rollable.getOrientationController();
+            float currEyeHeight = Mth.lerp(instance.getPartialTickTime(), eyeHeightOld, eyeHeight);
+            var controller = rollable.getOrientationController();
+            Matrix3f orientation = controller.isActive() && controller.getOrientation() != null ? controller.getOrientation() : new Matrix3f();
+            Vec3 rotatedEyeHeight = new Vec3(orientation.transform(new Vector3f(0f, currEyeHeight, 0f)));

-            if (!instance.isDetached() || Cobblemon.config.getThirdPartyViewBobbing()) {
-                MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
-
-                if (locator == null) {
-                    original.call(instance, x, y, z);
-                    return;
-                }
-
-                Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
-
-                float currEyeHeight = Mth.lerp(instance.getPartialTickTime(), eyeHeightOld, eyeHeight);
-                var rotatedEyeHeight = new Vector3f(0f, currEyeHeight - (entity.getBbHeight() / 2), 0f);
-                if (controller.isActive()) {
-                    rotatedEyeHeight = controller.getRenderOrientation(partialTickTime).transform(rotatedEyeHeight);
-                }
-
-                Vec3 position = locatorOffset.add(entityPos).add(new Vec3(rotatedEyeHeight));
-                setPosition(position);
-            } else {
-                Vector3f pos = entityPos.add(new Vec3(0, pokemon.getBbHeight() / 2, 0)).toVector3f();
-
-                PosableModel model = VaryingModelRepository.INSTANCE.getPoser(pokemon.getPokemon().getSpecies().getResourceIdentifier(), new FloatingState());
-                Map<String, Vec3> cameraOffsets = model.getSeatToCameraOffset();
-
-                Vec3 cameraOffset;
-                if (thirdPersonReverse && cameraOffsets.containsKey(seat.getLocator() + "_reverse")) {
-                    cameraOffset = cameraOffsets.get(seat.getLocator() + "_reverse");
-                } else if (cameraOffsets.containsKey(seat.getLocator())) {
-                    cameraOffset = cameraOffsets.get(seat.getLocator());
-                } else {
-                    cameraOffset = new Vec3(0f, 2f, 4f);
-                }
-
-                Vector3f offset = cameraOffset.toVector3f();
-
-                if (thirdPersonReverse) offset.z *= -1;
-                float xRot = (float) (-1 * Math.toRadians(instance.getXRot()));
-
-                Matrix3f orientation = controller.isActive() && controller.getOrientation() != null ? controller.getOrientation() : new Matrix3f().rotateY((float) Math.toRadians(180f - instance.getYRot())).rotateX(xRot);
-                Vector3f rotatedOffset = orientation.transform(offset);
-                float offsetDistance = rotatedOffset.length();
-                Vector3f offsetDirection = rotatedOffset.mul(1 / offsetDistance);
-
-                float maxZoom = cobblemon$getMaxZoom(offsetDistance, offsetDirection, pos);
-
-                setPosition(new Vec3(offsetDirection.mul(maxZoom).add(pos)));
-            }
+            var position = locatorOffset.add(entityPos).add(rotatedEyeHeight);
+            setPosition(position);
        } else {
            original.call(instance, x, y, z);
        }
    }

    @Unique
-    private void cobblemon$applyRotation(){
+    private void applyRotation(){
        if (!(this.entity instanceof OrientationControllable controllable) || controllable.getOrientationController().getOrientation() == null) return;
        var controller = controllable.getOrientationController();
        var newRotation = controller.getOrientation().normal(new Matrix3f()).getNormalizedRotation(new Quaternionf());
@@ -199,36 +152,4 @@ public abstract class CameraMixin {
        this.up.set(controller.getUpVector());
        this.left.set(controller.getLeftVector());
    }
-
-    @WrapOperation(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;move(FFF)V", ordinal = 0))
-    public void stopMoveIfRolling(Camera instance, float zoom, float dy, float dx, Operation<Void> original) {
-        Entity entity = instance.getEntity();
-        Entity vehicle = entity.getVehicle();
-
-        if (!(vehicle instanceof PokemonEntity) || Cobblemon.config.getThirdPartyViewBobbing()) {
-            original.call(instance, zoom, dy, dx);
-        }
-    }
-
-    //Modified vanilla code
-    @Unique
-    private float cobblemon$getMaxZoom(float maxZoom, Vector3f directionVector, Vector3f positionVector) {
-        Vec3 pos = new Vec3(positionVector);
-        for (int i = 0; i < 8; i++) {
-            float g = (float) ((i & 1) * 2 - 1);
-            float h = (float) ((i >> 1 & 1) * 2 - 1);
-            float j = (float) ((i >> 2 & 1) * 2 - 1);
-            Vec3 vec3 = pos.add(g * 0.1F, h * 0.1F, j * 0.1F);
-            Vec3 vec32 = vec3.add(new Vec3(directionVector).scale(maxZoom));
-            HitResult hitResult = this.level.clip(new ClipContext(vec3, vec32, ClipContext.Block.VISUAL, ClipContext.Fluid.NONE, this.entity));
-            if (hitResult.getType() != HitResult.Type.MISS) {
-                float k = (float) hitResult.getLocation().distanceToSqr(pos);
-                if (k < Mth.square(maxZoom)) {
-                    maxZoom = Mth.sqrt(k);
-                }
-            }
-        }
-
-        return maxZoom;
-    }
 }
@@ -59,21 +59,8 @@ public class HumanoidModelMixin {
        }

        Entity vehicle = entity.getVehicle();
-        if (vehicle instanceof PokemonEntity pokemonEntity && entity instanceof AbstractClientPlayer) {
-            var shouldRotatePlayerHead = pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) -> {
-                return behaviour.shouldRotatePlayerHead(settings, state, pokemonEntity);
-            });
-
-            if (!shouldRotatePlayerHead) {
-                netHeadYaw = 0f;
-                headPitch = 0f;
-                if (this.head != null) {
-                    this.head.yRot = 0f;
-                    this.head.xRot = 0f;
-                }
-            }
-
-            MountedPlayerRenderer.INSTANCE.animate(pokemonEntity, (AbstractClientPlayer) entity, relevantPartsByName, netHeadYaw, headPitch, ageInTicks, limbSwing, limbSwingAmount);
+        if (vehicle instanceof PokemonEntity && entity instanceof AbstractClientPlayer) {
+            MountedPlayerRenderer.INSTANCE.animate((PokemonEntity) vehicle, (AbstractClientPlayer) entity, relevantPartsByName, netHeadYaw, headPitch, ageInTicks, limbSwing, limbSwingAmount);
        }
    }
 }
@@ -12,7 +12,6 @@ import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.ModAPI;
 import com.cobblemon.mod.common.item.PokeBallItem;
 import com.cobblemon.mod.common.item.PokedexItem;
-import com.cobblemon.mod.common.item.WearableItem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.ItemModelShaper;
@@ -55,18 +54,17 @@ public abstract class ItemRendererMixin {
    )
    private void cobblemon$overrideItemModel(ItemStack stack, ItemDisplayContext renderMode, boolean leftHanded, PoseStack matrices, MultiBufferSource multiBufferSource, int light, int overlay, BakedModel model, CallbackInfo ci) {
        boolean shouldBe2d = renderMode == ItemDisplayContext.GUI || renderMode == ItemDisplayContext.FIXED;
-        ResourceLocation resourceLocation = null;
        if (shouldBe2d) {
+            ResourceLocation resourceLocation = null;
            if (stack.getItem() instanceof PokeBallItem pokeBallItem) resourceLocation = pokeBallItem.getPokeBall().getModel2d();
            else if (stack.getItem() instanceof PokedexItem pokedexItem) resourceLocation = pokedexItem.getType().getItemSpritePath();
-        }
-        if (renderMode != ItemDisplayContext.HEAD && stack.getItem() instanceof WearableItem wearableItem) resourceLocation = wearableItem.getModel2d();

-        if (resourceLocation != null) {
-            BakedModel replacementModel = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, "inventory"));
-            if (!cobblemon$isSameModel(model, replacementModel)) {
-                ci.cancel();
-                render(stack, renderMode, leftHanded, matrices, multiBufferSource, light, overlay, replacementModel);
+            if (resourceLocation != null) {
+                BakedModel replacementModel = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, "inventory"));
+                if (!cobblemon$isSameModel(model, replacementModel)) {
+                    ci.cancel();
+                    render(stack, renderMode, leftHanded, matrices, multiBufferSource, light, overlay, replacementModel);
+                }
            }
        }
    }
@@ -80,7 +78,6 @@ public abstract class ItemRendererMixin {
            boolean canOpenScreen = entity != null && ((entity.getOffhandItem() == stack && !(entity.getMainHandItem().getItem() instanceof PokedexItem)) || entity.getMainHandItem() == stack);
            resourceLocation = pokedexItem.getType().getItemModelPath(isScanModel ? "scanning" : (canOpenScreen ? null : "off"));
        }
-        else if (stack.getItem() instanceof WearableItem wearableItem) resourceLocation = wearableItem.getModel3d();

        if (resourceLocation != null) {
            BakedModel model = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, MODEL_PATH));
@@ -15,7 +15,6 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.sugar.Local;
-import com.mojang.blaze3d.Blaze3D;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.MouseHandler;
 import net.minecraft.client.player.LocalPlayer;
@@ -30,10 +29,9 @@ import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

@Mixin(MouseHandler.class)
-public abstract class MouseHandlerMixin {
+public class MouseHandlerMixin {
    @Shadow private double accumulatedScrollY;
    @Shadow @Final private Minecraft minecraft;

@@ -51,14 +49,6 @@ public abstract class MouseHandlerMixin {

    @Shadow private double accumulatedDY;

-    @Shadow private double lastHandleMovementTime;
-
-    @Shadow public abstract boolean isMouseGrabbed();
-
-    @Shadow protected abstract void turnPlayer(double movementTime);
-
-    @Unique private double cobblemon$timeDelta;
-
    @Inject(
            method = "onScroll",
            at = @At(
@@ -171,21 +161,16 @@ public abstract class MouseHandlerMixin {
        return false;
    }

-    @Inject(method = "handleAccumulatedMovement", at = @At("HEAD"))
-    private void cobblemon$maintainMovementWhenInScreens2(CallbackInfo ci) {
-        double time = Blaze3D.getTime();
-        cobblemon$timeDelta = time - this.lastHandleMovementTime;
-    }
-
-    @Inject(method = "handleAccumulatedMovement", at = @At("TAIL"))
-    private void cobblemon$maintainMovementWhenInScreens(CallbackInfo ci) {
+    @Inject(method = "handleAccumulatedMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MouseHandler;isMouseGrabbed()Z", ordinal = 0))
+    private void cobblemon$maintainMovementWhenInScreens(CallbackInfo ci, @Local(ordinal = 1) double e) {
        if (minecraft.player == null) return;
        if (!(minecraft.player instanceof OrientationControllable controllable)) return;
        if (!controllable.getOrientationController().isActive()) return;
        if (minecraft.isPaused()) return;
-        if (isMouseGrabbed()) return;

-        this.turnPlayer(cobblemon$timeDelta);
+        var pitch = pitchSmoother.getNewDeltaValue(0, e);
+        var roll = rollSmoother.getNewDeltaValue(0, e);
+        controllable.getOrientationController().rotate(0.0F, (float)pitch, (float)roll);
    }

    @Unique
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.client;
+
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import net.minecraft.client.model.PlayerModel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(PlayerModel.class)
+public class PlayerModelMixin {
+    @Inject(method = "setupAnim(Lnet/minecraft/world/entity/LivingEntity;FFFFF)V", at = @At(value = "HEAD"))
+    private void cobblemon$setHeadRotation(LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, CallbackInfo ci) {
+        if (!(entity instanceof Player)) return;
+        Entity vehicle = entity.getVehicle();
+
+        if (!(vehicle instanceof PokemonEntity pokemonEntity)) return;
+
+        var shouldRotatePlayerHead = pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) -> {
+            return behaviour.shouldRotatePlayerHead(settings, state, pokemonEntity);
+        });
+        if (shouldRotatePlayerHead) return;
+
+        netHeadYaw = 0f;
+        headPitch = 0f;
+    }
+}
@@ -563,8 +563,6 @@ object Cobblemon {
        this.implementation.registerCommandArgument(cobblemonResource("npc_class"), NPCClassArgumentType::class, SingletonArgumentInfo.contextFree(NPCClassArgumentType::npcClass))
        this.implementation.registerCommandArgument(cobblemonResource("wallpaper"), UnlockablePCBoxWallpaperArgumentType::class, SingletonArgumentInfo.contextFree(UnlockablePCBoxWallpaperArgumentType::wallpaper))
        this.implementation.registerCommandArgument(cobblemonResource("mark"), MarkArgumentType::class, SingletonArgumentInfo.contextFree(MarkArgumentType::mark))
-        this.implementation.registerCommandArgument(cobblemonResource("transform_type"), TransformTypeArgumentType::class, SingletonArgumentInfo.contextFree(TransformTypeArgumentType::transformType))
-        this.implementation.registerCommandArgument(cobblemonResource("model_part"), ModelPartArgumentType::class, SingletonArgumentInfo.contextFree(ModelPartArgumentType::modelPart))
    }

 }
@@ -23,7 +23,7 @@ object CobblemonCommands {
        ChangeEyeHeight.register(dispatcher)
        ChangeScaleAndSize.register(dispatcher)
        ChangeWalkSpeed.register(dispatcher)
-        TransformModelPartCommand.register(dispatcher)
+        ChangeJointScaleCommand.register(dispatcher)
        TestCommand.register(dispatcher)
        ReloadShowdownCommand.register(dispatcher)
        ClickTextCommand.register(dispatcher)
@@ -281,6 +281,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    // Evolution items
    @JvmField val LINK_CABLE = create("link_cable", LinkCableItem())
    @JvmField val DRAGON_SCALE = noSettingsItem("dragon_scale")
+    @JvmField val KINGS_ROCK = noSettingsItem("kings_rock")
    @JvmField val METAL_COAT = noSettingsItem("metal_coat")
    @JvmField val UPGRADE = noSettingsItem("upgrade")
    @JvmField val DUBIOUS_DISC = noSettingsItem("dubious_disc")
@@ -659,19 +660,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val WATER_STONE = noSettingsItem("water_stone")

-    val wearables = mutableListOf<WearableItem>()
-    //Wearable items (these items should have a corresponding 3D model)
-    @JvmField val BLACK_GLASSES = wearableItem("black_glasses")
-    @JvmField val CHOICE_BAND = wearableItem("choice_band")
-    @JvmField val CHOICE_SPECS = wearableItem("choice_specs")
-    @JvmField val EXP_SHARE = wearableItem("exp_share")
-    @JvmField val FOCUS_BAND = wearableItem("focus_band")
-    @JvmField val KINGS_ROCK = wearableItem("kings_rock")
-    @JvmField val MUSCLE_BAND = wearableItem("muscle_band")
-    @JvmField val ROCKY_HELMET = wearableItem("rocky_helmet")
-    @JvmField val SAFETY_GOGGLES = wearableItem("safety_goggles")
-    @JvmField val WISE_GLASSES = wearableItem("wise_glasses")
-
    // Held Items
    @JvmField
    val ABILITY_SHIELD = heldItem("ability_shield")
@@ -688,6 +676,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val BLACK_BELT = heldItem("black_belt")
    @JvmField
+    val BLACK_GLASSES = heldItem("black_glasses")
+    @JvmField
    val BLACK_SLUDGE = heldItem("black_sludge")
    @JvmField
    val BLUNDER_POLICY = heldItem("blunder_policy")
@@ -696,8 +686,12 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val CHARCOAL = heldItem("charcoal_stick", remappedName = "charcoal")
    @JvmField
+    val CHOICE_BAND = heldItem("choice_band")
+    @JvmField
    val CHOICE_SCARF = heldItem("choice_scarf")
    @JvmField
+    val CHOICE_SPECS = heldItem("choice_specs")
+    @JvmField
    val CLEANSE_TAG = heldItem("cleanse_tag")
   // @JvmField
   // val CLEAR_AMULET = heldItem("clear_amulet")
@@ -718,6 +712,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val EVIOLITE = heldItem("eviolite")
    @JvmField
+    val EXP_SHARE = heldItem("exp_share")
+    @JvmField
    val EXPERT_BELT = heldItem("expert_belt")
    @JvmField
    val FAIRY_FEATHER = heldItem("fairy_feather")
@@ -726,6 +722,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val FLOAT_STONE = heldItem("float_stone")
    @JvmField
+    val FOCUS_BAND = heldItem("focus_band")
+    @JvmField
    val FOCUS_SASH = heldItem("focus_sash")
    @JvmField
    val GRASSY_SEED = heldItem("grassy_seed")
@@ -760,6 +758,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val MIRACLE_SEED = heldItem("miracle_seed")
    @JvmField
+    val MUSCLE_BAND = heldItem("muscle_band")
+    @JvmField
    val MYSTIC_WATER = heldItem("mystic_water")
    @JvmField
    val NEVER_MELT_ICE = heldItem("never_melt_ice")
@@ -790,8 +790,12 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val RING_TARGET = heldItem("ring_target")
    @JvmField
+    val ROCKY_HELMET = heldItem("rocky_helmet")
+    @JvmField
    val ROOM_SERVICE = heldItem("room_service")
    @JvmField
+    val SAFETY_GOGGLES = heldItem("safety_goggles")
+    @JvmField
    val SCOPE_LENS = heldItem("scope_lens")
    @JvmField
    val SHARP_BEAK = heldItem("sharp_beak")
@@ -828,6 +832,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val WIDE_LENS = heldItem("wide_lens")
    @JvmField
+    val WISE_GLASSES = heldItem("wise_glasses")
+    @JvmField
    val ZOOM_LENS = heldItem("zoom_lens")
    @JvmField
    val MENTAL_HERB = compostableHeldItem("mental_herb", null, 1F)
@@ -1257,16 +1263,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
        return item
    }

-    private fun wearableItem(name: String, heldItemRemappedName: String? = null): CobblemonItem = create(
-        name,
-        WearableItem(name).also {
-            wearables.add(it)
-            if (heldItemRemappedName != null) {
-                CobblemonHeldItemManager.registerRemap(it, heldItemRemappedName)
-            }
-        }
-    )
-
    private fun heldItem(name: String, remappedName: String? = null): CobblemonItem = create(
        name,
        CobblemonItem(Item.Properties()).also {
@@ -20,4 +20,4 @@ interface EntitySideDelegate<T : Entity> {
    fun tick(entity: T) {}
    fun onSyncedDataUpdated(data: EntityDataAccessor<*>) {}
    fun addToStruct(struct: QueryStruct) {}
-}
+}
@@ -21,6 +21,4 @@ interface PokemonSideDelegate : EntitySideDelegate<PokemonEntity> {
    fun updatePostDeath() {}
    fun handleStatus(status: Byte) {}
    fun spawnShinyParticle(player: Player) {}
-    fun positionRider(passenger: Entity, positionUpdater: MoveFunction)
-    fun updateAge(age: Int) {}
-}
+}
@@ -17,11 +17,7 @@ import com.bedrockk.molang.runtime.struct.VariableStruct
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.CobblemonActivities
-import com.cobblemon.mod.common.CobblemonBlockEntities
-import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.CobblemonUnlockableWallpapers
+import com.cobblemon.mod.common.*
 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
@@ -31,13 +27,7 @@ import com.cobblemon.mod.common.api.mark.Marks
 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
-import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
-import com.cobblemon.mod.common.api.pokedex.CaughtCount
-import com.cobblemon.mod.common.api.pokedex.CaughtPercent
-import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
-import com.cobblemon.mod.common.api.pokedex.PokedexManager
-import com.cobblemon.mod.common.api.pokedex.SeenCount
-import com.cobblemon.mod.common.api.pokedex.SeenPercent
+import com.cobblemon.mod.common.api.pokedex.*
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
@@ -48,11 +38,12 @@ import com.cobblemon.mod.common.api.storage.party.PartyStore
 import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore
 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.BattleRegistry
 import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
+import com.cobblemon.mod.common.client.particle.BedrockParticleOptionsRepository
+import com.cobblemon.mod.common.client.particle.ParticleStorm
 import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunctions
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.entity.npc.NPCBattleActor
@@ -70,36 +61,9 @@ import com.cobblemon.mod.common.pokemon.Species
 import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolution
 import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
 import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
-import com.cobblemon.mod.common.util.asArrayValue
-import com.cobblemon.mod.common.util.asBlockPos
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import com.cobblemon.mod.common.util.asResource
-import com.cobblemon.mod.common.util.asUUID
-import com.cobblemon.mod.common.util.blockRegistry
-import com.cobblemon.mod.common.util.cloneFrom
-import com.cobblemon.mod.common.util.effectiveName
-import com.cobblemon.mod.common.util.getBattleState
-import com.cobblemon.mod.common.util.getBlockStatesWithPos
-import com.cobblemon.mod.common.util.getBooleanOrNull
-import com.cobblemon.mod.common.util.getDoubleOrNull
-import com.cobblemon.mod.common.util.getIntOrNull
-import com.cobblemon.mod.common.util.getIsSubmerged
-import com.cobblemon.mod.common.util.getOrNull
-import com.cobblemon.mod.common.util.getPlayer
-import com.cobblemon.mod.common.util.getStringOrNull
-import com.cobblemon.mod.common.util.isInBattle
-import com.cobblemon.mod.common.util.isInt
-import com.cobblemon.mod.common.util.isStandingOn
-import com.cobblemon.mod.common.util.party
-import com.cobblemon.mod.common.util.pc
-import com.cobblemon.mod.common.util.pokedex
-import com.cobblemon.mod.common.util.resolve
-import com.cobblemon.mod.common.util.server
-import com.cobblemon.mod.common.util.toProperties
-import com.cobblemon.mod.common.util.withNPCValue
-import com.cobblemon.mod.common.util.worldRegistry
+import com.cobblemon.mod.common.util.*
 import com.mojang.datafixers.util.Either
+import net.minecraft.client.multiplayer.ClientLevel
 import net.minecraft.commands.arguments.EntityAnchorArgument
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Holder
@@ -107,11 +71,7 @@ import net.minecraft.core.Registry
 import net.minecraft.core.RegistryAccess
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
-import net.minecraft.nbt.CompoundTag
-import net.minecraft.nbt.DoubleTag
-import net.minecraft.nbt.ListTag
-import net.minecraft.nbt.StringTag
-import net.minecraft.nbt.Tag
+import net.minecraft.nbt.*
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.MinecraftServer
@@ -120,11 +80,7 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.tags.TagKey
 import net.minecraft.world.damagesource.DamageSource
 import net.minecraft.world.damagesource.DamageTypes
-import net.minecraft.world.entity.Entity
-import net.minecraft.world.entity.EntityType
-import net.minecraft.world.entity.LightningBolt
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.*
 import net.minecraft.world.entity.ai.behavior.BlockPosTracker
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.entity.ai.memory.MemoryStatus
@@ -139,45 +95,7 @@ import net.minecraft.world.level.dimension.DimensionType
 import net.minecraft.world.level.levelgen.Heightmap
 import net.minecraft.world.phys.AABB
 import net.minecraft.world.phys.Vec3
-import java.util.UUID
-import kotlin.collections.HashMap
-import kotlin.collections.Map
-import kotlin.collections.MutableList
-import kotlin.collections.MutableSet
-import kotlin.collections.any
-import kotlin.collections.associate
-import kotlin.collections.component1
-import kotlin.collections.component2
-import kotlin.collections.contains
-import kotlin.collections.count
-import kotlin.collections.emptyList
-import kotlin.collections.filter
-import kotlin.collections.filterIsInstance
-import kotlin.collections.find
-import kotlin.collections.flatMap
-import kotlin.collections.forEach
-import kotlin.collections.forEachIndexed
-import kotlin.collections.getOrPut
-import kotlin.collections.hashMapOf
-import kotlin.collections.isNotEmpty
-import kotlin.collections.iterator
-import kotlin.collections.listOf
-import kotlin.collections.map
-import kotlin.collections.mapIndexed
-import kotlin.collections.mapNotNull
-import kotlin.collections.mapOf
-import kotlin.collections.maxOfOrNull
-import kotlin.collections.minByOrNull
-import kotlin.collections.minOfOrNull
-import kotlin.collections.mutableListOf
-import kotlin.collections.mutableSetOf
-import kotlin.collections.none
-import kotlin.collections.random
-import kotlin.collections.set
-import kotlin.collections.setOf
-import kotlin.collections.toList
-import kotlin.collections.toMap
-import kotlin.collections.toTypedArray
+import java.util.*
 import kotlin.math.sqrt
 import kotlin.random.Random

@@ -371,32 +289,16 @@ object MoLangFunctions {
                } as? ServerPlayer
                val pos = Vec3(x, y, z)

-                val packet = SpawnSnowstormParticlePacket(particle, pos)
-                if (player != null) {
-                    packet.sendToPlayer(player)
+                if (world !is ClientLevel) {
+                    val packet = SpawnSnowstormParticlePacket(particle, pos)
+                    if (player != null) {
+                        packet.sendToPlayer(player)
+                    } else {
+                        packet.sendToPlayersAround(x, y, z, 64.0, world.dimension())
+                    }
                } else {
-                    packet.sendToPlayersAround(x, y, z, 64.0, world.dimension())
-                }
-            }
-            map.put("spawn_pokemon") { params ->
-                val x = params.getInt(0)
-                val y = params.getInt(1)
-                val z = params.getInt(2)
-                val props = params.getString(3).toProperties()
-
-                val pos = BlockPos(x, y, z)
-
-                if (!Level.isInSpawnableBounds(pos)) {
-                    return@put DoubleValue.ZERO
-                }
-
-                val pokemon = props.createEntity(world)
-                pokemon.moveTo(pos, pokemon.yRot, pokemon.xRot)
-
-                if (world.addFreshEntity(pokemon)) {
-                    return@put pokemon.struct
-                } else {
-                    return@put DoubleValue.ZERO
+                    val effect = BedrockParticleOptionsRepository.getEffect(particle) ?: return@put DoubleValue.ZERO
+                    ParticleStorm.createAtPosition(world, effect, pos).spawn()
                }
            }
            map.put("get_entities_around") { params ->
@@ -916,14 +818,9 @@ object MoLangFunctions {
            map.put("is_moving") { DoubleValue((pokemonEntity.moveControl as? PokemonMoveControl)?.hasWanted() == true) }
            map.put("is_flying") { DoubleValue(pokemonEntity.getBehaviourFlag(PokemonBehaviourFlag.FLYING)) }
            map.put("is_gliding") { DoubleValue(pokemonEntity.useRidingAltPose()) }
-            map.put("is_ridden") { DoubleValue(pokemonEntity.hasControllingPassenger()) }
            map.put("has_aspect") { DoubleValue(it.getString(0) in pokemonEntity.aspects) }
            map.put("is_pokemon") { DoubleValue.ONE }
-            map.put("is_holding_item") { DoubleValue(!pokemonEntity.entityData.get(PokemonEntity.SHOWN_HELD_ITEM).let {
-                it.isEmpty || it.`is`(CobblemonItemTags.WEARABLE_HAT_ITEMS) || it.`is`(CobblemonItemTags.WEARABLE_FACE_ITEMS)
-            }) }
-            map.put("is_wearing_hat") { DoubleValue(pokemonEntity.entityData.get(PokemonEntity.SHOWN_HELD_ITEM).`is`(CobblemonItemTags.WEARABLE_HAT_ITEMS)) }
-            map.put("is_wearing_face") { DoubleValue(pokemonEntity.entityData.get(PokemonEntity.SHOWN_HELD_ITEM).`is`(CobblemonItemTags.WEARABLE_FACE_ITEMS)) }
+            map.put("is_holding_item") { DoubleValue(!pokemonEntity.entityData.get(PokemonEntity.SHOWN_HELD_ITEM).isEmpty) }
            map
        }
    )
@@ -19,4 +19,4 @@ interface Decodable {
     */
    fun decode(buffer: RegistryFriendlyByteBuf)

-}
+}
@@ -25,4 +25,4 @@ interface Encodable {
     */
    fun encode(buffer: RegistryFriendlyByteBuf)

-}
+}
@@ -107,22 +107,4 @@ open class OrientationController(val entity: LivingEntity) {
    val roll: Float
        get() = Mth.wrapDegrees(-upVector.angleSigned(UP, forwardVector).toDegrees())

-    fun applyGlobalYaw(deltaYawDegrees: Float) = updateOrientation { original ->
-        val euler = Vector3f()
-        original.getEulerAnglesXYZ(euler)
-        val pitch0 = euler.x
-        val roll0 = euler.z
-
-        val unroll = Matrix3f().rotateZ(-roll0)
-        val unpitch = Matrix3f().rotateX(-pitch0)
-        val flattened = Matrix3f(original).mul(unroll).mul(unpitch)
-
-        //Flip to reflect current acceptance of what direction is pos for yaw
-        val globalYaw = Matrix3f().rotationY(-1.0f * deltaYawDegrees.toRadians())
-        val rePitch = Matrix3f().rotateX(pitch0)
-        val reRoll = Matrix3f().rotateZ(roll0)
-
-        return@updateOrientation Matrix3f(globalYaw).mul(flattened).mul(rePitch).mul(reRoll)
-    }
-
 }
@@ -20,7 +20,7 @@ object CobblemonPermissions {
    @JvmStatic
    val CHANGE_WALK_SPEED = this.create("${COMMAND_PREFIX}changewalkspeed", PermissionLevel.ALL_COMMANDS)
    @JvmStatic
-    val TRANSFORM_MODEL_PART = this.create("${COMMAND_PREFIX}transformmodelpart", PermissionLevel.ALL_COMMANDS)
+    val CHANGE_JOINT_SCALE = this.create("${COMMAND_PREFIX}changejointscale", PermissionLevel.ALL_COMMANDS)
    @JvmStatic
    val CHECKSPAWNS = this.create("${COMMAND_PREFIX}checkspawns", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
    @JvmStatic
@@ -41,6 +41,9 @@ class RidingProperties(
        }
    }

+    val canRide: Boolean
+        get() = seats.isNotEmpty() && behaviour != null
+
    fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeMap(
            stats,
@@ -50,6 +53,7 @@ class RidingProperties(
        buffer.writeCollection(seats) { _, seat -> seat.encode(buffer) }
        buffer.writeCollection(conditions) { _, condition -> buffer.writeString(condition.getString()) }
        buffer.writeNullable(behaviour) { _, behaviour ->
+            buffer.writeResourceLocation(behaviour.key)
            behaviour.encode(buffer)
        }
    }
@@ -18,6 +18,5 @@ package com.cobblemon.mod.common.api.riding
 enum class RidingStyle {
    LAND,
    LIQUID,
-    AIR,
-    COMPOSITE
-}
+    AIR
+}
@@ -8,7 +8,6 @@

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

-import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.resources.ResourceLocation
@@ -28,7 +27,6 @@ import net.minecraft.world.phys.Vec3
 */
 interface RidingBehaviour<Settings : RidingBehaviourSettings, State : RidingBehaviourState> {
    val key: ResourceLocation
-    val style: RidingStyle

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

@@ -87,6 +85,6 @@ interface RidingBehaviour<Settings : RidingBehaviourSettings, State : RidingBeha

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

-    fun createDefaultState(settings: Settings): State
+    fun createDefaultState(): State

 }
@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.riding.behaviour
 import com.cobblemon.mod.common.api.net.Decodable
 import com.cobblemon.mod.common.api.net.Encodable
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.phys.Vec3

 /**
 * Represents static settings of a riding behaviour.
@@ -8,10 +8,15 @@

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

+import com.cobblemon.mod.common.api.net.Decodable
+import com.cobblemon.mod.common.api.net.Encodable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.ifClient
 import com.cobblemon.mod.common.util.ifServer
+import net.minecraft.client.player.RemotePlayer
 import net.minecraft.network.FriendlyByteBuf
-import net.minecraft.world.phys.Vec3
+import net.minecraft.network.RegistryFriendlyByteBuf
+import kotlin.reflect.KProperty

 /**
 * Represents the state of a Pokemon when being ridden.
@@ -22,38 +27,18 @@ import net.minecraft.world.phys.Vec3
 *
 * @author landonjw
 */
-open class RidingBehaviourState {
-    open val rideVelocity: SidedRidingState<Vec3> = ridingState(Vec3.ZERO, Side.BOTH)
-    open val stamina: SidedRidingState<Float> = ridingState(1.0F, Side.BOTH)
-
-    open fun reset() {
-        rideVelocity.set(Vec3.ZERO, true)
-        stamina.set(1.0F, true)
-    }
-
-    open fun copy(): RidingBehaviourState {
-        val copy = RidingBehaviourState()
-        copy.rideVelocity.set(rideVelocity.get(), true)
-        copy.stamina.set(stamina.get(), true)
-        return copy
-    }
-
-    open fun shouldSync(previous: RidingBehaviourState): Boolean {
-        if (previous.rideVelocity.get() != rideVelocity.get()) return true
-        if (previous.stamina.get() != stamina.get()) return true
-        return false
-    }
-
-    open fun encode(buffer: FriendlyByteBuf) {
-        buffer.writeVec3(rideVelocity.get())
-        buffer.writeFloat(stamina.get())
-    }
-
-    open fun decode(buffer: FriendlyByteBuf) {
-        rideVelocity.set(buffer.readVec3(), true)
-        stamina.set(buffer.readFloat(), true)
-    }
+interface RidingBehaviourState : Encodable, Decodable {
+    fun reset()
+    fun copy(): RidingBehaviourState
+    fun shouldSync(previous: RidingBehaviourState): Boolean
+}

+object NoState : RidingBehaviourState {
+    override fun encode(buffer: RegistryFriendlyByteBuf) = Unit
+    override fun decode(buffer: RegistryFriendlyByteBuf) = Unit
+    override fun copy() = NoState
+    override fun reset() = Unit
+    override fun shouldSync(previous: RidingBehaviourState) = false
 }

 fun <T> ridingState(value: T, side: Side) = SidedRidingState(value, side)
@@ -9,32 +9,32 @@
 package com.cobblemon.mod.common.api.riding.behaviour

 import com.cobblemon.mod.common.api.riding.behaviour.types.*
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeBehaviour
 import net.minecraft.resources.ResourceLocation

 object RidingBehaviours {
-    val behaviours = mutableMapOf<ResourceLocation, RidingBehaviour<RidingBehaviourSettings, RidingBehaviourState>>()
+    val behaviours = mutableMapOf<ResourceLocation, RidingBehaviour<*, *>>()

    init {
        register(BirdAirBehaviour.KEY, BirdAirBehaviour())
        register(DolphinBehaviour.KEY, DolphinBehaviour())
+        register(FallToGlideCompositeBehaviour.KEY, FallToGlideCompositeBehaviour())
        register(GenericLandBehaviour.KEY, GenericLandBehaviour())
        register(GenericSwimBehaviour.KEY, GenericSwimBehaviour())
        register(GliderAirBehaviour.KEY, GliderAirBehaviour())
        register(HelicopterBehaviour.KEY, HelicopterBehaviour())
        register(JetAirBehaviour.KEY, JetAirBehaviour())
+        register(JumpToFlightCompositeBehaviour.KEY, JumpToFlightCompositeBehaviour())
+        register(RunToJetCompositeBehaviour.KEY, RunToJetCompositeBehaviour())
        register(SwimDashBehaviour.KEY, SwimDashBehaviour())
        register(VehicleLandBehaviour.KEY, VehicleLandBehaviour())
-        register(HoverBehaviour.KEY, HoverBehaviour())
-        register(CompositeBehaviour.KEY, CompositeBehaviour())
    }

-    fun register(key: ResourceLocation, behaviour: RidingBehaviour<out RidingBehaviourSettings, out RidingBehaviourState>) {
+    fun register(key: ResourceLocation, behaviour: RidingBehaviour<*, *>) {
        if (behaviours.contains(key)) error("Behaviour already registered to key $key")
-        behaviours[key] = RidingController(behaviour) as RidingBehaviour<RidingBehaviourSettings, RidingBehaviourState>
+        behaviours[key] = RidingController(behaviour)
    }

-    fun get(key: ResourceLocation): RidingBehaviour<RidingBehaviourSettings, RidingBehaviourState> {
+    fun get(key: ResourceLocation): RidingBehaviour<*, *> {
        if (!behaviours.contains(key)) error("Behaviour not registered to key $key")
        return behaviours[key]!!
    }
@@ -8,7 +8,6 @@

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

-import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.SmoothDouble
@@ -25,7 +24,6 @@ import net.minecraft.world.phys.Vec3
 class RidingController<Settings : RidingBehaviourSettings, State : RidingBehaviourState>(val behaviour: RidingBehaviour<Settings, State>) : RidingBehaviour<Settings, State> {

    override val key = behaviour.key
-    override val style = behaviour.style

    override fun isActive(settings: Settings, state: State, vehicle: PokemonEntity) =
        behaviour.isActive(settings, state, vehicle)
@@ -41,13 +39,8 @@ class RidingController<Settings : RidingBehaviourSettings, State : RidingBehavio
        return behaviour.speed(settings, state, vehicle, driver)
    }

-    override fun clampPassengerRotation(settings: Settings, state: State, vehicle: PokemonEntity, driver: LivingEntity) {
-        if (!isActive(settings, state, vehicle)) return
-        return behaviour.clampPassengerRotation(settings, state, vehicle, driver)
-    }
-
    override fun rotation(settings: Settings, state: State, vehicle: PokemonEntity, driver: LivingEntity): Vec2 {
-        if (!isActive(settings, state, vehicle)) return driver.rotationVector
+        if (!isActive(settings, state, vehicle)) return vehicle.rotationVector
        return behaviour.rotation(settings, state, vehicle, driver)
    }

@@ -171,8 +164,8 @@ class RidingController<Settings : RidingBehaviourSettings, State : RidingBehavio
        return behaviour.setRideBar(settings, state, vehicle, driver)
    }

-    override fun createDefaultState(settings: Settings): State {
-        return behaviour.createDefaultState(settings)
+    override fun createDefaultState(): State {
+        return behaviour.createDefaultState()
    }

 }
@@ -12,14 +12,12 @@ 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 net.minecraft.resources.ResourceLocation
 import net.minecraft.util.SmoothDouble
@@ -27,9 +25,6 @@ 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.Matrix3f
-import org.joml.Quaternionf
-import org.joml.Vector3f
 import kotlin.math.*

 class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
@@ -38,10 +33,9 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
    }

    override val key: ResourceLocation = KEY
-    override val style = RidingStyle.AIR

    val poseProvider = PoseProvider<BirdAirSettings, BirdAirState>(PoseType.HOVER)
-        .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVelocity.get().z > 0.2 })
+        .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVel.get().z > 0.1 })

    override fun isActive(settings: BirdAirSettings, state: BirdAirState, vehicle: PokemonEntity): Boolean {
        return true
@@ -57,7 +51,7 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
-        return state.rideVelocity.get().length().toFloat()
+        return state.rideVel.get().length().toFloat()
    }

    override fun rotation(
@@ -89,11 +83,11 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        if (controller != null) {
            //Need to deadzone this when straight up or down

-            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 += -1.0 * sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVel.get().z
+            forwardForce += cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVel.get().z

-            upForce += cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().y
-            forwardForce += sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().y
+            upForce += cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVel.get().y
+            forwardForce += sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVel.get().y
        }


@@ -102,7 +96,7 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
            upForce -= 0.3
        }

-        val altitudeLimit = vehicle.runtime.resolveDouble(settings.jumpExpr)
+        val altitudeLimit = vehicle.runtime.resolveDouble(settings.altitudeExpr)

        //Only limit altitude if altitude is not infinite
        if (!vehicle.runtime.resolveBoolean(settings.infiniteAltitude)) {
@@ -110,7 +104,7 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
            upForce = if (vehicle.y >= altitudeLimit && upForce > 0) 0.0 else upForce
        }

-        val velocity = Vec3(state.rideVelocity.get().x , upForce, forwardForce)
+        val velocity = Vec3(state.rideVel.get().x , upForce, forwardForce)
        return velocity
    }

@@ -119,19 +113,19 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
    */
    fun calculateRideSpaceVel(settings: BirdAirSettings, state: BirdAirState, 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 topSpeed = vehicle.runtime.resolveDouble(settings.topSpeedExpr)
+        val glideTopSpeed = vehicle.runtime.resolveDouble(settings.glideTopSpeedExpr)
+        val accel = vehicle.runtime.resolveDouble(settings.accelExpr)
        val staminaStat = vehicle.runtime.resolveDouble(settings.staminaExpr)

        var glideSpeedChange = 0.0

-        val currSpeed = state.rideVelocity.get().length()
+        val currSpeed = state.rideVel.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)
+        var newVelocity = Vec3(state.rideVel.get().x, state.rideVel.get().y, state.rideVel.get().z)

        //speed up and slow down based on input
        if (driver.zza != 0.0f && state.stamina.get() > 0.0) {
@@ -182,26 +176,26 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        }

        //Lateral movement based on driver input.
-//        val latTopSpeed = topSpeed / 2.0
-//        if (driver.xxa != 0.0f && state.stamina.get() > 0.0) {
-//            newVelocity = Vec3(
-//                (newVelocity.x + (accel * driver.xxa)).coerceIn(-latTopSpeed, latTopSpeed),
-//                newVelocity.y,
-//                newVelocity.z)
-//            activeInput = true
-//        }
-//        else {
-//            newVelocity = Vec3(
-//                lerp(newVelocity.x, 0.0, latTopSpeed / 20.0),
-//                newVelocity.y,
-//                newVelocity.z)
-//        }
+        val latTopSpeed = topSpeed / 2.0
+        if (driver.xxa != 0.0f && state.stamina.get() > 0.0) {
+            newVelocity = Vec3(
+                (newVelocity.x + (accel * driver.xxa)).coerceIn(-latTopSpeed, latTopSpeed),
+                newVelocity.y,
+                newVelocity.z)
+            activeInput = true
+        }
+        else {
+            newVelocity = Vec3(
+                lerp(newVelocity.x, 0.0, latTopSpeed / 20.0),
+                newVelocity.y,
+                newVelocity.z)
+        }

        //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
+            driver.jumping -> 1.0
+            driver.isShiftKeyDown -> -1.0
            else -> 0.0
        }

@@ -228,26 +222,27 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
            }
        }

-        //TODO: Reintroduce stamina drain once stats start to be polished and tweaked
-//        //Only perform stamina logic if the ride does not have infinite stamina
-//        if (!vehicle.runtime.resolveBoolean(settings.infiniteStamina)) {
-//            if (activeInput) {
-//                state.stamina.set(state.stamina.get() - (0.05 / staminaStat).toFloat())
-//            }
-//
-//            //Lose a base amount of stamina just for being airborne
-//            state.stamina.set(state.stamina.get() - (0.01 / staminaStat).toFloat())
-//        }
-//        else
-//        {
-//            state.stamina.set(1.0f)
-//        }
+        //Only perform stamina logic if the ride does not have infinite stamina
+        if (!vehicle.runtime.resolveBoolean(settings.infiniteStamina)) {
+            if (activeInput) {
+                state.stamina.set(state.stamina.get() - (0.05 / staminaStat).toFloat())
+            }
+
+            //Lose a base amount of stamina just for being airborne
+            state.stamina.set(state.stamina.get() - (0.01 / staminaStat).toFloat())
+        }
+        else
+        {
+            state.stamina.set(1.0f)
+        }

        //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)
+        newVelocity = Vec3(
+            newVelocity.x,
+            newVelocity.y,
+            lerp( newVelocity.z,0.0, topSpeed / ( 20.0 * 30.0))
+        )
+        state.rideVel.set(newVelocity)
    }

    override fun angRollVel(
@@ -260,17 +255,10 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        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
+        //TODO: Tie into handling
        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)
-
-
-        val rotationChangeRate = 100.0
+        val topSpeed = vehicle.runtime.resolveDouble(settings.topSpeedExpr)
+         val rotationChangeRate = 10.0

        var yawForce =  rotationChangeRate * sin(Math.toRadians(controller.roll.toDouble()))
        //for a bit of correction on the rolls limit it to a quarter the amount
@@ -280,28 +268,7 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        yawForce *= abs(cos(Math.toRadians(controller.pitch.toDouble())))
        pitchForce *= abs(cos(Math.toRadians(controller.pitch.toDouble()))) * 1.5

-        var yawDeltaDeg =  deltaTime * rotationChangeRate * 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())
-
-        val correctionRate = 5.0
-        //Calculate correcting roll force.
-        if(abs(controller.roll) > rotLimit) {
-            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 and make sure to
-                //state.currRollCorrectionForce.get() - max(correctionRate * deltaTime * 0.04, abs(state.currRollCorrectionForce.get())) * state.currRollCorrectionForce.get().sign
-                lerp(state.currRollCorrectionForce.get(), 0.0, deltaTime * 0.98)
-            )
-        }
-
-        //yaw, pitch, roll
-        return Vec3(0.0, 0.0, state.currRollCorrectionForce.get())
+        return Vec3(yawForce, pitchForce, 0.0)
    }

    override fun rotationOnMouseXY(
@@ -320,29 +287,26 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        val controller = (driver as OrientationControllable).orientationController

        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr)
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.topSpeedExpr)

        //Smooth out mouse input.
-        val smoothingSpeed = 4.0
+        val smoothingSpeed = 4
        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 xInput = mouseXSmoother.getNewDeltaValue(mouseX * 0.1 * invertRoll, deltaTime * smoothingSpeed);
+        val yInput = mouseYSmoother.getNewDeltaValue(mouseY * 0.1 * invertPitch, deltaTime * smoothingSpeed);

        //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
        val rotMin = 15.0
        var rollForce = xInput
-        val rotLimit = max(handling * sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)), rotMin)
+        val rotLimit = max(handling * normalizeVal(state.rideVel.get().length(), 0.0, topSpeed).pow(3), rotMin)

        //Limit roll by non linearly decreasing inputs towards
        // a rotation limit based on the current distance from
        // that rotation limit
        if (abs(controller.roll + rollForce) < rotLimit) {
            if (sign(rollForce) == sign(controller.roll).toDouble()) {
-                //Grab how far the current roll is away from the roll limit
                val d = abs(abs(controller.roll) - rotLimit)
                rollForce *= (d.pow(2)) / (rotLimit.pow(2))
            }
@@ -351,18 +315,10 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        }

        //Give the ability to yaw with x mouse input when at low speeds.
-        val yawForce = xInput * ( 1.0 - sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)))
-
-        //Yaw locally a bit when up or down so that its more intuitive to make it out of a dive or a straight vertical
-        //climb
-        val yawForcePitched = xInput * sin(Math.toRadians(abs(controller.pitch.toDouble()))) * 0.25
-
-
-        //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())
+        val yawForce = xInput * ( 1.0 - normalizeVal(state.rideVel.get().length(), 0.0, topSpeed).pow(3))

        //yaw, pitch, roll
-        return Vec3(yawForcePitched, yInput, rollForce)
+        return Vec3(yawForce, yInput, rollForce)
    }

    /*
@@ -418,11 +374,11 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val glideTopSpeed = vehicle.runtime.resolveDouble(settings.glidespeedExpr)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.topSpeedExpr)
+        val glideTopSpeed = vehicle.runtime.resolveDouble(settings.glideTopSpeedExpr)

        //Must I ensure that topspeed is greater than minimum?
-        val normalizedGlideSpeed = normalizeVal(state.rideVelocity.get().length(), topSpeed, glideTopSpeed)
+        val normalizedGlideSpeed = normalizeVal(state.rideVel.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
@@ -477,91 +433,104 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        return false
    }

-    override fun createDefaultState(settings: BirdAirSettings) = BirdAirState()
+    override fun createDefaultState() = BirdAirState()

 }

 class BirdAirSettings : RidingBehaviourSettings {
    override val key = BirdAirBehaviour.KEY

+    //max y level for the ride
+    var altitudeExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 200.0, 128.0)".asExpression()
+        private set
+
    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()
+        private set

-    var glidespeedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 2.0, 1.0)".asExpression()
+    var topSpeedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 1.0, 0.35)".asExpression()
+        private set
+
+    var glideTopSpeedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 2.0, 1.0)".asExpression()
+        private set
+
+    // Max accel is a whole 1.0 in 3 seconds. The conversion in the function below is to convert seconds to ticks
+    var accelExpr: Expression = "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 3.0)), (1.0 / (20.0 * 8.0)))".asExpression()
+        private set
+
+    //Seconds self propelled flight (glide is not self propelled in this case)
+    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 120.0, 20.0)".asExpression()
        private set

    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
+        buffer.writeExpression(altitudeExpr)
        buffer.writeExpression(infiniteAltitude)
        buffer.writeExpression(infiniteStamina)
-        buffer.writeExpression(glidespeedExpr)
-        buffer.writeExpression(jumpExpr)
        buffer.writeExpression(handlingExpr)
-        buffer.writeExpression(speedExpr)
-        buffer.writeExpression(accelerationExpr)
+        buffer.writeExpression(topSpeedExpr)
+        buffer.writeExpression(glideTopSpeedExpr)
+        buffer.writeExpression(accelExpr)
        buffer.writeExpression(staminaExpr)
    }

    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        altitudeExpr = buffer.readExpression()
        infiniteAltitude = buffer.readExpression()
        infiniteStamina = buffer.readExpression()
-        glidespeedExpr = buffer.readExpression()
-        jumpExpr = buffer.readExpression()
        handlingExpr = buffer.readExpression()
-        speedExpr = buffer.readExpression()
-        accelerationExpr = buffer.readExpression()
+        topSpeedExpr = buffer.readExpression()
+        glideTopSpeedExpr = buffer.readExpression()
+        accelExpr = buffer.readExpression()
        staminaExpr = buffer.readExpression()
    }
 }

-class BirdAirState : RidingBehaviourState() {
+class BirdAirState : RidingBehaviourState {
+    var rideVel = ridingState(Vec3.ZERO, Side.CLIENT)
+    var stamina = ridingState(1.0f, Side.CLIENT)
    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)
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeVec3(rideVel.get())
        buffer.writeFloat(stamina.get())
        buffer.writeBoolean(gliding.get())
    }

-    override fun decode(buffer: FriendlyByteBuf) {
-        super.decode(buffer)
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        rideVel.set(buffer.readVec3(), forced = true)
+        stamina.set(buffer.readFloat(), forced = true)
        gliding.set(buffer.readBoolean(), forced = true)
    }

    override fun reset() {
-        super.reset()
+        rideVel.set(Vec3.ZERO, forced = true)
+        stamina.set(1.0f, forced = true)
        gliding.set(false, forced = true)
        lastGlide.set(-100L, forced = true)
-        currRollCorrectionForce.set(0.0, forced = true)
    }

    override fun toString(): String {
-        return "BirdAirState(rideVelocity=${rideVelocity.get()}, stamina=${stamina.get()}, gliding=${gliding.get()})"
+        return "BirdAirState(rideVel=${rideVel.get()}, stamina=${stamina.get()}, gliding=${gliding.get()})"
    }

    override fun copy() = BirdAirState().also {
-        it.rideVelocity.set(this.rideVelocity.get(), forced = true)
+        it.rideVel.set(this.rideVel.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 BirdAirState) return false
-        if (previous.gliding.get() != gliding.get()) return true
-        return super.shouldSync(previous)
+        if (previous.rideVel != rideVel) return true
+        if (previous.stamina != stamina) return true
+        if (previous.gliding != gliding) return true
+        return false
    }
 }
@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.riding.behaviour.types
 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
@@ -19,6 +18,7 @@ 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.RegistryFriendlyByteBuf
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
@@ -35,7 +35,6 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
    }

    override val key = KEY
-    override val style = RidingStyle.LIQUID

    val poseProvider = PoseProvider<DolphinSettings, DolphinState>(PoseType.FLOAT)
        .with(PoseOption(PoseType.SWIM) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })
@@ -257,7 +256,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
        return false
    }

-    override fun createDefaultState(settings: DolphinSettings) = DolphinState()
+    override fun createDefaultState() = DolphinState()

 }

@@ -283,7 +282,6 @@ class DolphinSettings : RidingBehaviourSettings {
        private set

    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
        buffer.writeExpression(canJump)
        buffer.writeExpression(jumpVector[0])
        buffer.writeExpression(jumpVector[1])
@@ -308,11 +306,13 @@ class DolphinSettings : RidingBehaviourSettings {
    }
 }

-class DolphinState : RidingBehaviourState() {
+class DolphinState : RidingBehaviourState {
    var lastVelocity = ridingState(Vec3.ZERO, Side.BOTH)

+    override fun encode(buffer: RegistryFriendlyByteBuf) = Unit
+    override fun decode(buffer: RegistryFriendlyByteBuf) = Unit
+
    override fun reset() {
-        super.reset()
        lastVelocity.set(Vec3.ZERO, forced = true)
    }

@@ -321,8 +321,8 @@ class DolphinState : RidingBehaviourState() {
    }

    override fun copy() = DolphinState().also {
-        it.stamina.set(stamina.get(), forced = true)
-        it.rideVelocity.set(rideVelocity.get(), forced = true)
        it.lastVelocity.set(lastVelocity.get(), forced = true)
    }
+
+    override fun shouldSync(previous: RidingBehaviourState) = false
 }
@@ -0,0 +1,434 @@
+/*
+ * 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
+
+import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.api.riding.behaviour.*
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.util.*
+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
+
+class FallToGlideCompositeBehaviour : RidingBehaviour<FallToGlideCompositeSettings, FallToGlideCompositeState> {
+    companion object {
+        val KEY = cobblemonResource("composite/fall_to_glide")
+    }
+
+    override val key = KEY
+
+    val landBehaviour: GenericLandBehaviour = GenericLandBehaviour()
+    val glideBehaviour: GliderAirBehaviour = GliderAirBehaviour()
+
+    override fun tick(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        input: Vec3
+    ) {
+        val shouldBeFlying = checkShouldBeFlying(settings, vehicle, state.activeController.get() == GliderAirBehaviour.KEY)
+        if (state.activeController.get() == GliderAirBehaviour.KEY && !shouldBeFlying) { // && entity.onGround() && state.timeTransitioned + 20 < entity.level().gameTime) {
+            state.activeController.set(GenericLandBehaviour.KEY)
+            vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, false)
+        } else if (state.activeController.get() == GenericLandBehaviour.KEY && shouldBeFlying) {
+            state.activeController.set(GliderAirBehaviour.KEY)
+            vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, true)
+        }
+    }
+
+    private fun checkShouldBeFlying(
+        settings: FallToGlideCompositeSettings,
+        vehicle: PokemonEntity,
+        isFlyingAlready: Boolean
+    ): Boolean {
+        val runtime = vehicle.runtime
+        val minFallingSpeed = runtime.resolveFloat(settings.minimumFallSpeed)
+        val minForwardSpeed = runtime.resolveFloat(settings.minimumForwardSpeed)
+        val grounded = vehicle.onGround()
+        return if (isFlyingAlready) {
+            !grounded
+        } else {
+            vehicle.deltaMovement.y <= -minFallingSpeed && vehicle.deltaMovement.horizontalDistance() >= minForwardSpeed
+        }
+    }
+
+    override fun isActive(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return true
+    }
+
+    override fun pose(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): PoseType {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.pose(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.pose(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun speed(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.speed(settings.land, state.landState, vehicle, driver)
+            GliderAirBehaviour.KEY -> glideBehaviour.speed(settings.glide, NoState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rotation(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: LivingEntity
+    ): Vec2 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rotation(settings.land, state.landState, vehicle, driver)
+            GliderAirBehaviour.KEY -> glideBehaviour.rotation(settings.glide, NoState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun velocity(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        input: Vec3
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.velocity(settings.land, state.landState, vehicle, driver, input)
+            GliderAirBehaviour.KEY -> glideBehaviour.velocity(settings.glide, NoState, vehicle, driver, input)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun angRollVel(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        deltaTime: Double
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.angRollVel(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                deltaTime
+            )
+
+            GliderAirBehaviour.KEY -> glideBehaviour.angRollVel(settings.glide, NoState, vehicle, driver, deltaTime)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rotationOnMouseXY(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        mouseY: Double,
+        mouseX: Double,
+        mouseYSmoother: SmoothDouble,
+        mouseXSmoother: SmoothDouble,
+        sensitivity: Double,
+        deltaTime: Double
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rotationOnMouseXY(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                mouseY,
+                mouseX,
+                mouseYSmoother,
+                mouseXSmoother,
+                sensitivity,
+                deltaTime
+            )
+
+            GliderAirBehaviour.KEY -> glideBehaviour.rotationOnMouseXY(
+                settings.glide,
+                NoState,
+                vehicle,
+                driver,
+                mouseY,
+                mouseX,
+                mouseYSmoother,
+                mouseXSmoother,
+                sensitivity,
+                deltaTime
+            )
+
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun canJump(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.canJump(settings.land, state.landState, vehicle, driver)
+            GliderAirBehaviour.KEY -> glideBehaviour.canJump(settings.glide, NoState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun setRideBar(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.setRideBar(settings.land, state.landState, vehicle, driver)
+            GliderAirBehaviour.KEY -> glideBehaviour.setRideBar(settings.glide, NoState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun jumpForce(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        jumpStrength: Int
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.jumpForce(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                jumpStrength
+            )
+
+            GliderAirBehaviour.KEY -> glideBehaviour.jumpForce(settings.glide, NoState, vehicle, driver, jumpStrength)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun gravity(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        regularGravity: Double
+    ): Double {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.gravity(settings.land, state.landState, vehicle, regularGravity)
+            GliderAirBehaviour.KEY -> glideBehaviour.gravity(settings.glide, NoState, vehicle, regularGravity)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rideFovMultiplier(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rideFovMultiplier(settings.land, state.landState, vehicle, driver)
+            GliderAirBehaviour.KEY -> glideBehaviour.rideFovMultiplier(settings.glide, NoState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun useAngVelSmoothing(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.useAngVelSmoothing(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.useAngVelSmoothing(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun useRidingAltPose(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.useRidingAltPose(settings.land, state.landState, vehicle, driver)
+            GliderAirBehaviour.KEY -> glideBehaviour.useRidingAltPose(settings.glide, NoState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun inertia(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Double {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.inertia(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.inertia(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRoll(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRoll(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.shouldRoll(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun turnOffOnGround(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.turnOffOnGround(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.turnOffOnGround(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun dismountOnShift(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.dismountOnShift(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.dismountOnShift(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRotatePokemonHead(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRotatePokemonHead(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.shouldRotatePokemonHead(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRotatePlayerHead(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRotatePlayerHead(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.shouldRotatePlayerHead(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun createDefaultState() = FallToGlideCompositeState()
+
+
+}
+
+class FallToGlideCompositeSettings : RidingBehaviourSettings {
+    override val key = FallToGlideCompositeBehaviour.KEY
+
+    var glide: GliderAirSettings = GliderAirSettings()
+        private set
+
+    var land: GenericLandSettings = GenericLandSettings()
+        private set
+
+    var minimumForwardSpeed: Expression = "0.0".asExpression()
+        private set
+
+    var minimumFallSpeed: Expression = "0.5".asExpression()
+        private set
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        glide.encode(buffer)
+        land.encode(buffer)
+        buffer.writeExpression(minimumForwardSpeed)
+        buffer.writeExpression(minimumFallSpeed)
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        glide.decode(buffer)
+        land.decode(buffer)
+        minimumForwardSpeed = buffer.readExpression()
+        minimumFallSpeed = buffer.readExpression()
+    }
+}
+
+class FallToGlideCompositeState : RidingBehaviourState {
+    var activeController = ridingState(GenericLandBehaviour.KEY, Side.CLIENT)
+    var landState: GenericLandState = GenericLandState()
+    var timeTransitioned = ridingState(-100L, Side.BOTH)
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(activeController.get())
+        landState.encode(buffer)
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        activeController.set(buffer.readResourceLocation(), forced = true)
+        landState.decode(buffer)
+    }
+
+    override fun reset() {
+        activeController.set(GenericLandBehaviour.KEY, forced = true)
+        landState.reset()
+        timeTransitioned.set(-100L, forced = true)
+    }
+
+    override fun toString(): String {
+        return "FallToGlideCompositeState(activeController=$activeController, landState=$landState, timeTransitioned=$timeTransitioned)"
+    }
+
+    override fun copy() = FallToGlideCompositeState().also {
+        it.activeController.set(activeController.get(), forced = true)
+        it.landState = landState.copy()
+        it.timeTransitioned.set(timeTransitioned.get(), forced = true)
+    }
+
+    override fun shouldSync(previous: RidingBehaviourState): Boolean {
+        if (previous !is FallToGlideCompositeState) return false
+        if (activeController != previous.activeController) return true
+        if (landState.shouldSync(previous.landState)) return true
+        return false
+    }
+}
@@ -9,8 +9,7 @@
 package com.cobblemon.mod.common.api.riding.behaviour.types

 import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.MoLangMath.lerp
-import com.cobblemon.mod.common.api.riding.RidingStyle
+import com.bedrockk.molang.runtime.value.DoubleValue
 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
@@ -18,14 +17,15 @@ 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.RegistryFriendlyByteBuf
-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 kotlin.math.*
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.pow

 class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandState> {
    companion object {
@@ -33,11 +33,10 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
    }

    override val key = KEY
-    override val style = RidingStyle.LAND

    val poseProvider = PoseProvider<GenericLandSettings, GenericLandState>(PoseType.STAND)
        .with(PoseOption(PoseType.WALK) { _, state, _ ->
-            return@PoseOption abs(state.rideVelocity.get().z) > 0.2
+            return@PoseOption state.rideVel.get().z > 0.1
        })

    override fun isActive(
@@ -73,102 +72,18 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
-        return state.rideVelocity.get().length().toFloat()
+        return state.rideVel.get().length().toFloat()
    }

-    override fun updatePassengerRotation(
-        settings: GenericLandSettings,
-        state: GenericLandState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ) {
-
-        //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: GenericLandSettings,
-        state: GenericLandState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ) {
-        val f = Mth.wrapDegrees(driver.yRot - vehicle.yRot)
-        val lookYawLimit = 90.0f
-        val g = Mth.clamp(f, -lookYawLimit, lookYawLimit)
-        driver.yRotO += g - f
-        driver.yRot = driver.yRot + g - f
-        driver.setYHeadRot(driver.yRot)
-    }
-
-
    override fun rotation(
        settings: GenericLandSettings,
        state: GenericLandState,
        vehicle: PokemonEntity,
        driver: LivingEntity
    ): Vec2 {
-        val turnAmount =  calcRotAmount(settings, state, vehicle, driver)
-
-        return Vec2(vehicle.xRot, vehicle.yRot + turnAmount )
-
+        return Vec2(driver.xRot * 0.5f, driver.yRot)
    }

-    /*
-   *  Calculates the rotation amount given the difference between
-   *  the current player y rot and entity y rot. This gives the
-   *  affect of influencing a rides rotation through the mouse
-   *  without it being instant.
-   */
-    fun calcRotAmount(
-        settings: GenericLandSettings,
-        state: GenericLandState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ): Float {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        //In degrees per second
-        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr)
-        val maxYawDiff = 90.0f
-
-        //Normalize the current rotation diff
-        val rotDiff = Mth.wrapDegrees(driver.yRot - vehicle.yRot)
-        val rotDiffNorm = rotDiff / maxYawDiff
-
-        //Take the square root so that the ride levels out quicker when at lower differences between entity
-        //y and driver y
-        //This influences the speed of the turn based on how far in one direction you're looking
-        val rotDiffMod = (sqrt(abs(rotDiffNorm)) * rotDiffNorm.sign)
-
-        //Take the inverse so that you turn less at higher speeds
-        val normSpeed = 1.0f // = 1.0f - 0.5f*normalizeVal(state.rideVelocityocity.length(), 0.0, topSpeed).toFloat()
-
-        // TODO: This needs to be tweaked with in game results and testing
-        val turnRate = (handling.toFloat() / 20.0f) * 2
-
-        //Ensure you only ever rotate as much difference as there is between the angles.
-        val turnSpeed = turnRate  * rotDiffMod * normSpeed
-        val rotAmount = turnSpeed.coerceIn(-abs(rotDiff), abs(rotDiff))
-
-        return rotAmount
-    }
-
-
    override fun velocity(
        settings: GenericLandSettings,
        state: GenericLandState,
@@ -176,16 +91,24 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        driver: Player,
        input: Vec3
    ): Vec3 {
-        //Limit horizontal velocity that may have accumulated through alternate behaviour
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val currVel = state.rideVelocity.get()
-//        state.rideVelocity.set(Vec3(
-//            max(currVel.x, topSpeed),
-//            currVel.y,
-//            max(currVel.z, topSpeed)
-//        ))
+        val runtime = vehicle.runtime
+        val driveFactor = runtime.resolveFloat(settings.driveFactor)
+        val strafeFactor = runtime.resolveFloat(settings.strafeFactor)
+        val f = driver.xxa * strafeFactor
+        var g = driver.zza * driveFactor
+        if (g <= 0.0f) {
+            g *= runtime.resolveFloat(settings.reverseDriveFactor)
+        }
+        val gravity = -1.0

-        state.rideVelocity.set(calculateRideSpaceVel(settings, state, vehicle, driver))
+        val newVelocity = calculateRideSpaceVel(settings, state, vehicle, driver)
+
+        //Jump the thang!
+        if (driver.jumping && vehicle.onGround()) {
+            state.rideVel.set(Vec3(newVelocity.x, 2.0, newVelocity.z))
+        } else {
+            state.rideVel.set(newVelocity)
+        }

        //This is cheap.
        //Also make it stop quicker the slower it is.
@@ -195,7 +118,7 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta

        //entity.deltaMovement = entity.deltaMovement.lerp(velocity, 1.0)
        //state.currVel = state.currVel.add( f.toDouble() / 20.0, gravity / 20.0 , g.toDouble() / 20.0)
-        return state.rideVelocity.get()
+        return state.rideVel.get()
    }

    private fun calculateRideSpaceVel(
@@ -204,59 +127,35 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        vehicle: PokemonEntity,
        driver: Player
    ): Vec3 {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr)
-        val speed = state.rideVelocity.get().length()
+        val topSpeed = vehicle.runtime.resolveDouble(settings.topSpeedExpr)
+        val accel = vehicle.runtime.resolveDouble(settings.accelExpr)
+        val speed = state.rideVel.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)
+        val minSpeed = 0.0

+        var newVelocity = Vec3(state.rideVel.get().x, state.rideVel.get().y, state.rideVel.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
-            }
+        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).pow(2), 0.1)
+            newVelocity = Vec3(newVelocity.x, newVelocity.y, min(newVelocity.z + (accel * accelMod), topSpeed))
+        } else if (driver.zza >= 0.0 && state.stamina.get() == 0.0f || speed > topSpeed) {
+            newVelocity = Vec3(newVelocity.x, newVelocity.y, max(newVelocity.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, 0.0)

-            newVelocity = Vec3(
-                newVelocity.x,
-                newVelocity.y,
-                (newVelocity.z + (accel * forwardInput.toDouble())))
-
-            activeInput = true
+            //Decelerate currently always a constant half of max acceleration.
+            newVelocity =
+                Vec3(newVelocity.x, newVelocity.y, max(newVelocity.z - ((accel * deccelMod) / 2), minSpeed))
        }

-        //Gravity logic
        if (vehicle.onGround()) {
            newVelocity = Vec3(newVelocity.x, 0.0, newVelocity.z)
        } else {
-            val gravity = (9.8 / ( 20.0)) * 0.2
-            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)
+            newVelocity = Vec3(newVelocity.x, max(newVelocity.y - 0.2, -1.0), newVelocity.z)
        }
-
-        //ground Friction
-        if( abs(newVelocity.z) > 0 && vehicle.onGround() && !activeInput) {
-            newVelocity = newVelocity.subtract(0.0, 0.0, min(0.03 * newVelocity.z.sign, newVelocity.z))
-        }
-
-        //Jump the thang!
-        if (driver.jumping && vehicle.onGround()) {
-            val jumpVel = 1.0
-            newVelocity = newVelocity.add(0.0, 1.0, 0.0)
-
-            //Ensure this doesn't add unwanted forward velocity
-            val mag = if(newVelocity.length() < topSpeed) newVelocity.length() else topSpeed
-            newVelocity = newVelocity.normalize().scale(mag)
-        }
-
        return newVelocity
    }

@@ -264,7 +163,7 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
    *  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 {
+    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)
    }
@@ -316,6 +215,8 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        driver: Player
    ): Float {
        //Retrieve stamina from state and tick up at a rate of 0.1 a second
+        val staminaGain = (1.0 / 20.0) * 0.1
+        state.stamina.set(min(state.stamina.get() + staminaGain, 1.0).toFloat())
        return (state.stamina.get() / 1.0f)
    }

@@ -326,7 +227,10 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        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(
@@ -412,21 +316,30 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        return false
    }

-    override fun createDefaultState(settings: GenericLandSettings) = GenericLandState()
+    override fun createDefaultState() = GenericLandState()
 }

 class GenericLandSettings : RidingBehaviourSettings {
    override val key = GenericLandBehaviour.KEY

-    var canJump = "true".asExpression()
+    var driveFactor = "1.0".asExpression()
        private set

-    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'LAND', 1.0, 0.3)".asExpression()
+    var strafeFactor = "0.2".asExpression()
+        private set
+
+    var reverseDriveFactor = "0.25".asExpression()
+        private set
+
+    var topSpeedExpr: 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()
+    var accelExpr: Expression =
+        "q.get_ride_stats('ACCELERATION', 'LAND', (1.0 / (20.0 * 0.5)), (1.0 / (20.0 * 5.0)))".asExpression()
+        private set
+
+    var jumpVector = listOf("0".asExpression(), "0.3".asExpression(), "0".asExpression())
        private set

    // Between 30 seconds and 10 seconds at the lowest when at full speed.
@@ -441,17 +354,30 @@ class GenericLandSettings : RidingBehaviourSettings {
        private set

    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
-        buffer.writeExpression(speedExpr)
-        buffer.writeExpression(accelerationExpr)
+        buffer.writeExpression(driveFactor)
+        buffer.writeExpression(strafeFactor)
+        buffer.writeExpression(reverseDriveFactor)
+        buffer.writeExpression(topSpeedExpr)
+        buffer.writeExpression(accelExpr)
+        buffer.writeExpression(jumpVector[0])
+        buffer.writeExpression(jumpVector[1])
+        buffer.writeExpression(jumpVector[2])
        buffer.writeExpression(staminaExpr)
        buffer.writeExpression(jumpExpr)
        buffer.writeExpression(handlingExpr)
    }

    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        speedExpr = buffer.readExpression()
-        accelerationExpr = buffer.readExpression()
+        driveFactor = buffer.readExpression()
+        strafeFactor = buffer.readExpression()
+        reverseDriveFactor = buffer.readExpression()
+        topSpeedExpr = buffer.readExpression()
+        accelExpr = buffer.readExpression()
+        jumpVector = listOf(
+            buffer.readExpression(),
+            buffer.readExpression(),
+            buffer.readExpression()
+        )
        staminaExpr = buffer.readExpression()
        jumpExpr = buffer.readExpression()
        handlingExpr = buffer.readExpression()
@@ -459,16 +385,41 @@ class GenericLandSettings : RidingBehaviourSettings {

 }

-class GenericLandState : RidingBehaviourState() {
+class GenericLandState : RidingBehaviourState {
+    var rideVel = ridingState(Vec3.ZERO, Side.CLIENT)
+    var stamina = ridingState(1.0f, Side.CLIENT)
    var currSpeed = ridingState(0.0, Side.BOTH)

+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeVec3(rideVel.get())
+        buffer.writeFloat(stamina.get())
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        rideVel.set(buffer.readVec3(), forced = true)
+        stamina.set(buffer.readFloat(), forced = true)
+    }
+
+    override fun reset() {
+        rideVel.set(Vec3.ZERO, forced = true)
+        stamina.set(1.0f, forced = true)
+        currSpeed.set(0.0, forced = true)
+    }
+
+    override fun toString(): String {
+        return "GenericLandState(rideVel=${rideVel.get()}, stamina=${stamina.get()}, currSpeed=${currSpeed.get()})"
+    }
+
    override fun copy() = GenericLandState().also {
-        it.rideVelocity.set(this.rideVelocity.get(), forced = true)
+        it.rideVel.set(this.rideVel.get(), forced = true)
        it.stamina.set(this.stamina.get(), forced = true)
+        it.currSpeed.set(this.currSpeed.get(), forced = true)
    }

    override fun shouldSync(previous: RidingBehaviourState): Boolean {
        if (previous !is GenericLandState) return false
-        return super.shouldSync(previous)
+        if (rideVel != previous.rideVel) return true
+        if (stamina != previous.stamina) return true
+        return false
    }
 }
@@ -11,8 +11,7 @@ package com.cobblemon.mod.common.api.riding.behaviour.types
 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.RidingBehaviourState
+import com.cobblemon.mod.common.api.riding.behaviour.NoState
 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
@@ -29,18 +28,17 @@ import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
 import net.minecraft.world.phys.shapes.Shapes

-class GenericSwimBehaviour : RidingBehaviour<GenericSwimSettings, RidingBehaviourState> {
+class GenericSwimBehaviour : RidingBehaviour<GenericSwimSettings, NoState> {
    companion object {
        val KEY = cobblemonResource("swim/generic")
    }

    override val key = KEY
-    override val style = RidingStyle.LIQUID

-    val poseProvider = PoseProvider<GenericSwimSettings, RidingBehaviourState>(PoseType.FLOAT)
+    val poseProvider = PoseProvider<GenericSwimSettings, NoState>(PoseType.FLOAT)
        .with(PoseOption(PoseType.SWIM) { _, _, entity -> entity.isSwimming && entity.entityData.get(PokemonEntity.MOVING) })

-    override fun isActive(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun isActive(settings: GenericSwimSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
            if (vehicle.isInWater || vehicle.isUnderWater) {
                return@any true
@@ -50,17 +48,17 @@ class GenericSwimBehaviour : RidingBehaviour<GenericSwimSettings, RidingBehaviou
        }
    }

-    override fun pose(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity): PoseType {
+    override fun pose(settings: GenericSwimSettings, state: NoState, vehicle: PokemonEntity): PoseType {
        return poseProvider.select(settings, state, vehicle)
    }

-    override fun speed(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity, driver: Player): Float {
+    override fun speed(settings: GenericSwimSettings, state: NoState, vehicle: PokemonEntity, driver: Player): Float {
        return vehicle.runtime.resolveFloat(settings.speed)
    }

    override fun rotation(
        settings: GenericSwimSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: LivingEntity
    ): Vec2 {
@@ -69,7 +67,7 @@ class GenericSwimBehaviour : RidingBehaviour<GenericSwimSettings, RidingBehaviou

    override fun velocity(
        settings: GenericSwimSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player,
        input: Vec3
@@ -90,7 +88,7 @@ class GenericSwimBehaviour : RidingBehaviour<GenericSwimSettings, RidingBehaviou

    override fun angRollVel(
        settings: GenericSwimSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player,
        deltaTime: Double
@@ -100,7 +98,7 @@ class GenericSwimBehaviour : RidingBehaviour<GenericSwimSettings, RidingBehaviou

    override fun rotationOnMouseXY(
        settings: GenericSwimSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player,
        mouseY: Double,
@@ -120,7 +118,7 @@ class GenericSwimBehaviour : RidingBehaviour<GenericSwimSettings, RidingBehaviou

    override fun canJump(
        settings: GenericSwimSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player
    ): Boolean {
@@ -129,7 +127,7 @@ class GenericSwimBehaviour : RidingBehaviour<GenericSwimSettings, RidingBehaviou

    override fun setRideBar(
        settings: GenericSwimSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
@@ -138,7 +136,7 @@ class GenericSwimBehaviour : RidingBehaviour<GenericSwimSettings, RidingBehaviou

    override fun jumpForce(
        settings: GenericSwimSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player,
        jumpStrength: Int
@@ -151,7 +149,7 @@ class GenericSwimBehaviour : RidingBehaviour<GenericSwimSettings, RidingBehaviou

    override fun gravity(
        settings: GenericSwimSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        regularGravity: Double
    ): Double {
@@ -160,45 +158,45 @@ class GenericSwimBehaviour : RidingBehaviour<GenericSwimSettings, RidingBehaviou

    override fun rideFovMultiplier(
        settings: GenericSwimSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
        return 1.0f
    }

-    override fun useAngVelSmoothing(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun useAngVelSmoothing(settings: GenericSwimSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return false
    }

    override fun useRidingAltPose(
        settings: GenericSwimSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player
    ): Boolean {
        return false
    }

-    override fun inertia(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Double {
+    override fun inertia(settings: GenericSwimSettings, state: NoState, vehicle: PokemonEntity): Double {
        return 0.5
    }

-    override fun shouldRoll(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun shouldRoll(settings: GenericSwimSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return false
    }

-    override fun turnOffOnGround(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun turnOffOnGround(settings: GenericSwimSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return false
    }

-    override fun dismountOnShift(settings: GenericSwimSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun dismountOnShift(settings: GenericSwimSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return false
    }

    override fun shouldRotatePokemonHead(
        settings: GenericSwimSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity
    ): Boolean {
        return false
@@ -206,13 +204,13 @@ class GenericSwimBehaviour : RidingBehaviour<GenericSwimSettings, RidingBehaviou

    override fun shouldRotatePlayerHead(
        settings: GenericSwimSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity
    ): Boolean {
        return false
    }

-    override fun createDefaultState(settings: GenericSwimSettings) = RidingBehaviourState()
+    override fun createDefaultState() = NoState

 }

@@ -238,7 +236,6 @@ class GenericSwimSettings : RidingBehaviourSettings {
        private set

    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
        buffer.writeExpression(canJump)
        buffer.writeExpression(jumpVector[0])
        buffer.writeExpression(jumpVector[1])
@@ -12,7 +12,7 @@ import com.bedrockk.molang.Expression
 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.RidingBehaviourState
+import com.cobblemon.mod.common.api.riding.behaviour.NoState
 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
@@ -29,32 +29,31 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3

-class GliderAirBehaviour : RidingBehaviour<GliderAirSettings, RidingBehaviourState> {
+class GliderAirBehaviour : RidingBehaviour<GliderAirSettings, NoState> {
    companion object {
        val KEY = cobblemonResource("air/glider")
    }

    override val key = KEY
-    override val style = RidingStyle.AIR

-    val poseProvider = PoseProvider<GliderAirSettings, RidingBehaviourState>(PoseType.HOVER)
+    val poseProvider = PoseProvider<GliderAirSettings, NoState>(PoseType.HOVER)
        .with(PoseOption(PoseType.FLY) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })

-    override fun isActive(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun isActive(settings: GliderAirSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return true
    }

-    override fun pose(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): PoseType {
+    override fun pose(settings: GliderAirSettings, state: NoState, vehicle: PokemonEntity): PoseType {
        return poseProvider.select(settings, state, vehicle)
    }

-    override fun speed(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity, driver: Player): Float {
+    override fun speed(settings: GliderAirSettings, state: NoState, vehicle: PokemonEntity, driver: Player): Float {
        return vehicle.runtime.resolveFloat(settings.speed)
    }

    override fun rotation(
        settings: GliderAirSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: LivingEntity
    ): Vec2 {
@@ -63,7 +62,7 @@ class GliderAirBehaviour : RidingBehaviour<GliderAirSettings, RidingBehaviourSta

    override fun velocity(
        settings: GliderAirSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player,
        input: Vec3
@@ -78,7 +77,7 @@ class GliderAirBehaviour : RidingBehaviour<GliderAirSettings, RidingBehaviourSta

    override fun angRollVel(
        settings: GliderAirSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player,
        deltaTime: Double
@@ -88,7 +87,7 @@ class GliderAirBehaviour : RidingBehaviour<GliderAirSettings, RidingBehaviourSta

    override fun rotationOnMouseXY(
        settings: GliderAirSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player,
        mouseY: Double,
@@ -106,13 +105,13 @@ class GliderAirBehaviour : RidingBehaviour<GliderAirSettings, RidingBehaviourSta
        return Vec3(0.0, mouseY * invertPitch, mouseX * invertRoll)
    }

-    override fun canJump(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity, driver: Player): Boolean {
+    override fun canJump(settings: GliderAirSettings, state: NoState, vehicle: PokemonEntity, driver: Player): Boolean {
        return false
    }

    override fun setRideBar(
        settings: GliderAirSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
@@ -121,7 +120,7 @@ class GliderAirBehaviour : RidingBehaviour<GliderAirSettings, RidingBehaviourSta

    override fun jumpForce(
        settings: GliderAirSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player,
        jumpStrength: Int
@@ -131,7 +130,7 @@ class GliderAirBehaviour : RidingBehaviour<GliderAirSettings, RidingBehaviourSta

    override fun gravity(
        settings: GliderAirSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        regularGravity: Double
    ): Double {
@@ -140,51 +139,51 @@ class GliderAirBehaviour : RidingBehaviour<GliderAirSettings, RidingBehaviourSta

    override fun rideFovMultiplier(
        settings: GliderAirSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
        return 1.0f
    }

-    override fun useAngVelSmoothing(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun useAngVelSmoothing(settings: GliderAirSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return false
    }

    override fun useRidingAltPose(
        settings: GliderAirSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player
    ): Boolean {
        return false
    }

-    override fun inertia(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Double {
+    override fun inertia(settings: GliderAirSettings, state: NoState, vehicle: PokemonEntity): Double {
        return 0.5
    }

-    override fun shouldRoll(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun shouldRoll(settings: GliderAirSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return false
    }

-    override fun turnOffOnGround(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun turnOffOnGround(settings: GliderAirSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return false
    }

-    override fun dismountOnShift(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun dismountOnShift(settings: GliderAirSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return false
    }

-    override fun shouldRotatePokemonHead(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun shouldRotatePokemonHead(settings: GliderAirSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return false
    }

-    override fun shouldRotatePlayerHead(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun shouldRotatePlayerHead(settings: GliderAirSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return false
    }

-    override fun createDefaultState(settings: GliderAirSettings) = RidingBehaviourState()
+    override fun createDefaultState() = NoState
 }

 class GliderAirSettings : RidingBehaviourSettings {
@@ -200,7 +199,6 @@ class GliderAirSettings : RidingBehaviourSettings {
        private set

    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
        buffer.writeExpression(glideSpeed)
        buffer.writeExpression(speed)
        buffer.writeExpression(canStrafe)
@@ -11,8 +11,7 @@ package com.cobblemon.mod.common.api.riding.behaviour.types
 import com.bedrockk.molang.Expression
 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.RidingBehaviourState
+import com.cobblemon.mod.common.api.riding.behaviour.NoState
 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
@@ -32,19 +31,18 @@ import kotlin.math.abs
 import kotlin.math.pow
 import kotlin.math.sin

-class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourState> {
+class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, NoState> {
    companion object {
        val KEY = cobblemonResource("air/helicopter")
        val ROTATION_LIMIT = 30.0f
    }

    override val key = KEY
-    override val style = RidingStyle.AIR

-    val poseProvider = PoseProvider<HelicopterSettings, RidingBehaviourState>(PoseType.HOVER)
+    val poseProvider = PoseProvider<HelicopterSettings, NoState>(PoseType.HOVER)
        .with(PoseOption(PoseType.FLY) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })

-    override fun isActive(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun isActive(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        //If there are only fluid blocks or air block below the ride
        //then activate the controller. If it is in water the ride will
        //dismount accordingly
@@ -58,11 +56,11 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS
        }
    }

-    override fun pose(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): PoseType {
+    override fun pose(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity): PoseType {
        return poseProvider.select(settings, state, vehicle)
    }

-    override fun speed(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity, driver: Player): Float {
+    override fun speed(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity, driver: Player): Float {
        //Increased max speed to exaggerate movement.
        //This likely just needs to be a static number if it really is just
        //the scalar for the velocity vector
@@ -71,7 +69,7 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS

    override fun rotation(
        settings: HelicopterSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: LivingEntity
    ): Vec2 {
@@ -80,7 +78,7 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS

    override fun velocity(
        settings: HelicopterSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player,
        input: Vec3
@@ -109,7 +107,7 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS

    override fun angRollVel(
        settings: HelicopterSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player,
        deltaTime: Double
@@ -164,7 +162,7 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS

    override fun rotationOnMouseXY(
        settings: HelicopterSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player,
        mouseY: Double,
@@ -184,7 +182,7 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS

    override fun canJump(
        settings: HelicopterSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player
    ): Boolean {
@@ -193,7 +191,7 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS

    override fun setRideBar(
        settings: HelicopterSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
@@ -202,7 +200,7 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS

    override fun jumpForce(
        settings: HelicopterSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player,
        jumpStrength: Int
@@ -212,7 +210,7 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS

    override fun gravity(
        settings: HelicopterSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        regularGravity: Double
    ): Double {
@@ -221,55 +219,55 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS

    override fun rideFovMultiplier(
        settings: HelicopterSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
        return 1.0f
    }

-    override fun useAngVelSmoothing(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun useAngVelSmoothing(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return true
    }

    override fun useRidingAltPose(
        settings: HelicopterSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player
    ): Boolean {
        return false
    }

-    override fun inertia(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Double {
+    override fun inertia(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity): Double {
        return 0.1
    }

-    override fun shouldRoll(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun shouldRoll(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return true
    }

-    override fun turnOffOnGround(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun turnOffOnGround(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return false
    }

-    override fun dismountOnShift(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun dismountOnShift(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return false
    }

    override fun shouldRotatePokemonHead(
        settings: HelicopterSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity
    ): Boolean {
        return false
    }

-    override fun shouldRotatePlayerHead(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun shouldRotatePlayerHead(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return false
    }

-    override fun createDefaultState(settings: HelicopterSettings) = RidingBehaviourState()
+    override fun createDefaultState() = NoState
 }


@@ -289,7 +287,6 @@ class HelicopterSettings : RidingBehaviourSettings {
        private set

    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
        buffer.writeExpression(gravity)
        buffer.writeExpression(horizontalAcceleration)
        buffer.writeExpression(verticalVelocity)
@@ -1,479 +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
-
-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.entity.PoseType
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.*
-import net.minecraft.network.RegistryFriendlyByteBuf
-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 kotlin.math.*
-
-class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
-    companion object {
-        val KEY = cobblemonResource("air/hover")
-    }
-
-    override val key = KEY
-    override val style = RidingStyle.AIR
-
-    val poseProvider = PoseProvider<HoverSettings, HoverState>(PoseType.STAND)
-        .with(PoseOption(PoseType.WALK) { _, state, _ ->
-            return@PoseOption abs(state.rideVelocity.get().z) > 0.2
-        })
-
-    override fun isActive(
-        settings: HoverSettings,
-        state: HoverState,
-        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: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): PoseType {
-        return this.poseProvider.select(settings, state, vehicle)
-    }
-
-    override fun speed(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        return state.rideVelocity.get().length().toFloat()
-    }
-
-    override fun updatePassengerRotation(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ) {
-
-        //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: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ) {
-        val f = Mth.wrapDegrees(driver.yRot - vehicle.yRot)
-        val lookYawLimit = 90.0f
-        val g = Mth.clamp(f, -lookYawLimit, lookYawLimit)
-        driver.yRotO += g - f
-        driver.yRot = driver.yRot + g - f
-        driver.setYHeadRot(driver.yRot)
-    }
-
-
-    override fun rotation(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ): Vec2 {
-        val turnAmount =  calcRotAmount(settings, state, vehicle, driver)
-
-        return Vec2(driver.xRot, vehicle.yRot + turnAmount )
-
-    }
-
-    /*
-   *  Calculates the rotation amount given the difference between
-   *  the current player y rot and entity y rot. This gives the
-   *  affect of influencing a rides rotation through the mouse
-   *  without it being instant.
-   */
-    fun calcRotAmount(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ): Float {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        //In degrees per second
-        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr)
-        val maxYawDiff = 90.0f
-
-        //Normalize the current rotation diff
-        val rotDiff = Mth.wrapDegrees(driver.yRot - vehicle.yRot)
-        val rotDiffNorm = rotDiff / maxYawDiff
-
-        //Take the square root so that the ride levels out quicker when at lower differences between entity
-        //y and driver y
-        //This influences the speed of the turn based on how far in one direction you're looking
-        val rotDiffMod = (sqrt(abs(rotDiffNorm)) * rotDiffNorm.sign)
-
-        //Take the inverse so that you turn less at higher speeds
-        val normSpeed = 1.0f // = 1.0f - 0.5f*normalizeVal(state.rideVelocityocity.length(), 0.0, topSpeed).toFloat()
-
-        // TODO: This needs to be tweaked with in game results and testing
-        val turnRate = (handling.toFloat() / 20.0f) * 2
-
-        //Ensure you only ever rotate as much difference as there is between the angles.
-        val turnSpeed = turnRate  * rotDiffMod * normSpeed
-        val rotAmount = turnSpeed.coerceIn(-abs(rotDiff), abs(rotDiff))
-
-        return rotAmount
-    }
-
-
-    override fun velocity(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ): Vec3 {
-
-        val strafeFactor = 0.2
-        val f = driver.xxa * strafeFactor
-        var g = driver.zza
-        if (g <= 0.0f) {
-            g *= -1.0f
-        }
-
-        return calculateRideSpaceVel(settings, state, vehicle, driver).scale(10.0)
-    }
-
-    private fun calculateRideSpaceVel(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Vec3 {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr)
-        val speed = state.rideVelocity.get().length()
-
-        //Flag for determining if player is actively inputting
-        var activeInput = false
-
-        val minSpeed = 0.0
-
-        var newVelocity = Vec3(state.rideVelocity.get().x, state.rideVelocity.get().y, state.rideVelocity.get().z)
-
-        var jumpVec = Vec3.ZERO
-
-
-        //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
-            jumpVec = jumpVec.add(0.0, 0.0, forwardInput.toDouble())
-        }
-
-        //speed up and slow down based on input
-        if (driver.xxa != 0.0f && state.stamina.get() > 0.0) {
-            //make sure it can't exceed top speed
-            val forwardInput = when {
-                driver.xxa > 0 && newVelocity.x > topSpeed -> 0.0
-                driver.xxa < 0 && newVelocity.x < (-topSpeed / 3.0) -> 0.0
-                else -> driver.xxa.sign
-            }
-
-            newVelocity = Vec3(
-                newVelocity.x + (accel * forwardInput.toDouble()),
-                newVelocity.y,
-                (newVelocity.z ))
-
-            activeInput = true
-        }
-
-        //Vertical movement based on driver input.
-        val vertTopSpeed = topSpeed / 2.0
-        val vertInput = when {
-            driver.jumping -> 1.0
-            driver.isShiftKeyDown -> -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
-        }
-
-
-        //air Friction
-
-
-
-        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: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        deltaTime: Double
-    ): Vec3 {
-        return Vec3.ZERO
-    }
-
-    override fun rotationOnMouseXY(
-        settings: HoverSettings,
-        state: HoverState,
-        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: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        return false
-    }
-
-    override fun setRideBar(
-        settings: HoverSettings,
-        state: HoverState,
-        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: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        jumpStrength: Int
-    ): Vec3 {
-        return Vec3.ZERO
-    }
-
-    override fun gravity(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        regularGravity: Double
-    ): Double {
-        return 0.0
-    }
-
-    override fun rideFovMultiplier(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        return 1.0f
-    }
-
-    override fun useAngVelSmoothing(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun useRidingAltPose(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        return false
-    }
-
-    override fun inertia(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Double {
-        return 0.05
-    }
-
-    override fun shouldRoll(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun turnOffOnGround(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun dismountOnShift(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun shouldRotatePokemonHead(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun shouldRotatePlayerHead(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun createDefaultState(settings: HoverSettings) = HoverState()
-}
-
-class HoverSettings : RidingBehaviourSettings {
-    override val key = HoverBehaviour.KEY
-
-    var canJump = "true".asExpression()
-        private set
-
-    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 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', 'AIR', (1.0 / (20.0 * 0.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', '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
-
-    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 140.0, 20.0)".asExpression()
-        private set
-
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
-        buffer.writeExpression(speedExpr)
-        buffer.writeExpression(accelerationExpr)
-        buffer.writeExpression(staminaExpr)
-        buffer.writeExpression(jumpExpr)
-        buffer.writeExpression(handlingExpr)
-    }
-
-    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        speedExpr = buffer.readExpression()
-        accelerationExpr = buffer.readExpression()
-        staminaExpr = buffer.readExpression()
-        jumpExpr = buffer.readExpression()
-        handlingExpr = buffer.readExpression()
-    }
-
-}
-
-class HoverState : RidingBehaviourState() {
-
-    override fun copy() = HoverState().also {
-        it.rideVelocity.set(this.rideVelocity.get(), forced = true)
-        it.stamina.set(this.stamina.get(), forced = true)
-    }
-
-    override fun shouldSync(previous: RidingBehaviourState): Boolean {
-        if (previous !is HoverState) return false
-        return super.shouldSync(previous)
-    }
-}
@@ -11,14 +11,12 @@ package com.cobblemon.mod.common.api.riding.behaviour.types
 import com.bedrockk.molang.Expression
 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 net.minecraft.resources.ResourceLocation
 import net.minecraft.util.SmoothDouble
@@ -26,7 +24,6 @@ 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 JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
@@ -35,24 +32,12 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
    }

    override val key = KEY
-    override val style = RidingStyle.AIR

    val poseProvider = PoseProvider<JetAirSettings, JetAirState>(PoseType.HOVER)
-        .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVelocity.get().z > 0.1 })
+        .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVel.get().z > 0.1 })

    override fun isActive(settings: JetAirSettings, state: JetAirState, 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
-        }
+        return true
    }

    override fun pose(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity): PoseType {
@@ -61,32 +46,30 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {

    override fun speed(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity, driver: Player): Float {
        //retrieve stats
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.topSpeedExpr)
        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)
-//        //Reduce stamina unless stamina is infinite
-//        if (!vehicle.runtime.resolveBoolean(settings.infiniteStamina)) {
-//            //Calculate stamina loss due to speed
-//            //At max speed it will tick down 0.1 a second so the stamina will last ten seconds
-//            //There has got to be a better way to express this equation. It interpolates between 0.5 and 1.0
-//            var staminaRate = (normalizeSpeed(state.rideVelocity.get().length(), minSpeed, topSpeed))
-//
-//            //interpolate between 0.25 and 1.0 so that you always have at least a min of 0.25 stam loss
-//            staminaRate = 0.25 + (0.75 * staminaRate.pow(3))
-//
-//            //Calculate stamina loss in seconds achievable at top speed
-//            val staminaLoss = staminaRate * (1.0 / (20.0 * staminaStat))
-//            state.stamina.set(max(state.stamina.get() - staminaLoss, 0.0).toFloat())
-//        } else {
-//            state.stamina.set(1.0f)
-//        }
+        //Reduce stamina unless stamina is infinite
+        if (!vehicle.runtime.resolveBoolean(settings.infiniteStamina)) {
+            //Calculate stamina loss due to speed
+            //At max speed it will tick down 0.1 a second so the stamina will last ten seconds
+            //There has got to be a better way to express this equation. It interpolates between 0.5 and 1.0
+            var staminaRate = (normalizeSpeed(state.rideVel.get().length(), minSpeed, topSpeed))

-        return state.rideVelocity.get().length().toFloat()
+            //interpolate between 0.25 and 1.0 so that you always have at least a min of 0.25 stam loss
+            staminaRate = 0.25 + (0.75 * staminaRate.pow(3))
+
+            //Calculate stamina loss in seconds achievable at top speed
+            val staminaLoss = staminaRate * (1.0 / (20.0 * staminaStat))
+            state.stamina.set(max(state.stamina.get() - staminaLoss, 0.0).toFloat())
+        } else {
+            state.stamina.set(1.0f)
+        }
+
+        return state.rideVel.get().length().toFloat()
    }

    //TODO: Move these functions to a riding util class.
@@ -125,8 +108,8 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {

        //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
+            upForce = -1.0 * sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVel.get().z
+            forwardForce = cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVel.get().z
        }

        //If stamina has run out then initiate forced glide down.
@@ -154,11 +137,11 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
        vehicle: PokemonEntity,
        driver: Player
    ) {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.topSpeedExpr)
+        val accel = vehicle.runtime.resolveDouble(settings.accelExpr)
        val altitudeLimit = vehicle.runtime.resolveDouble(settings.jumpExpr)
        val minSpeed = vehicle.runtime.resolveDouble(settings.minSpeed)
-        val speed = state.rideVelocity.get().length()
+        val speed = state.rideVel.get().length()

        //Give no altitude limit if at max jump stat.
        val pushingHeightLimit = if (vehicle.runtime.resolveBoolean(settings.infiniteStamina)) false
@@ -169,15 +152,15 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
        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(Vec3(state.rideVelocity.get().x, state.rideVelocity.get().y, min(state.rideVelocity.get().z + (accel * accelMod), topSpeed)))
+            state.rideVel.set(Vec3(state.rideVel.get().x, state.rideVel.get().y, min(state.rideVel.get().z + (accel * accelMod), topSpeed)))
        } else if (driver.zza >= 0.0 && (state.stamina.get() == 0.0f || pushingHeightLimit)) {
-            state.rideVelocity.set(Vec3(state.rideVelocity.get().x, state.rideVelocity.get().y, max(state.rideVelocity.get().z - ((accel) / 4), minSpeed)))
+            state.rideVel.set(Vec3(state.rideVel.get().x, state.rideVel.get().y, max(state.rideVel.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) * 8, 0.1)
+            val deccelMod = max((normalizeSpeed(speed, minSpeed, topSpeed) - 1).pow(2), 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)))
+            state.rideVel.set(Vec3(state.rideVel.get().x, state.rideVel.get().y, max(state.rideVel.get().z - ((accel * deccelMod) / 2), minSpeed)))
        }
    }

@@ -226,13 +209,8 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
        val invertRoll = if (Cobblemon.config.invertRoll) -1 else 1
        val invertPitch = if (Cobblemon.config.invertPitch) -1 else 1

-        // Smooth out and accumulate roll input
-        val smoothingSpeed = 4.0
-        val mouseXc = (mouseX).coerceIn(-60.0, 60.0)
-        val xInput = mouseXSmoother.getNewDeltaValue(mouseXc * 0.1 * invertRoll, deltaTime * smoothingSpeed);
-
-        // Accumulate the y mouse input for pitch
-        //state.currMouseXForce.set((state.currMouseXForce.get() + (0.0015 * mouseX * invertRoll)).coerceIn(-1.0, 1.0))
+        // 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
@@ -254,9 +232,8 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
        val pitchRot = handling * state.currMouseYForce.get()

        //Roll is 1.5 times as fast as pitch
+        val rollRot = handling * 1.5 * state.currMouseXForce.get()

-        //val rollRot = handling * 1.5 * state.currMouseXForce.get()
-        val rollRot = handling * 1.5 * xInput.coerceIn(-1.0,1.0)
        //yaw, pitch, roll
        return Vec3(0.0, pitchRot, rollRot)
    }
@@ -304,11 +281,11 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.topSpeedExpr)
        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)
+        val normalizedSpeed = normalizeSpeed(state.rideVel.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.
@@ -356,7 +333,7 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
        return false
    }

-    override fun createDefaultState(settings: JetAirSettings) = JetAirState()
+    override fun createDefaultState() = JetAirState()
 }

 class JetAirSettings : RidingBehaviourSettings {
@@ -365,10 +342,28 @@ class JetAirSettings : RidingBehaviourSettings {
    var gravity: Expression = "0".asExpression()
        private set

-    var minSpeed: Expression = "0.8".asExpression()
+    var minSpeed: Expression = "1.2".asExpression()
        private set

-    var handlingYawExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 50.0, 25.0)".asExpression()
+    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 140.0, 20.0)".asExpression()
+        private set
+
+    var handlingYawExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 25.0, 8.0)".asExpression()
+        private set
+
+    var topSpeedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 2.5, 1.0)".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 accelExpr: Expression =
+        "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 1.0)), (1.0 / (20.0 * 5.0)))".asExpression()
+        private set
+
+    // Between 60 seconds and 10 seconds at the lowest when at full speed.
+    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 60.0, 10.0)".asExpression()
+        private set
+
+    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 300.0, 128.0)".asExpression()
        private set

    // Make configurable by json
@@ -378,79 +373,77 @@ class JetAirSettings : RidingBehaviourSettings {
    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()
-        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
-
    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
        buffer.writeExpression(gravity)
        buffer.writeExpression(minSpeed)
+        buffer.writeExpression(handlingExpr)
        buffer.writeExpression(handlingYawExpr)
+        buffer.writeExpression(topSpeedExpr)
+        buffer.writeExpression(accelExpr)
+        buffer.writeExpression(staminaExpr)
+        buffer.writeExpression(jumpExpr)
        buffer.writeExpression(infiniteStamina)
        buffer.writeExpression(infiniteAltitude)
-        buffer.writeExpression(jumpExpr)
-        buffer.writeExpression(handlingExpr)
-        buffer.writeExpression(speedExpr)
-        buffer.writeExpression(accelerationExpr)
-        buffer.writeExpression(staminaExpr)
    }

    override fun decode(buffer: RegistryFriendlyByteBuf) {
        gravity = buffer.readExpression()
        minSpeed = buffer.readExpression()
+        handlingExpr = buffer.readExpression()
        handlingYawExpr = buffer.readExpression()
+        topSpeedExpr = buffer.readExpression()
+        accelExpr = buffer.readExpression()
+        staminaExpr = buffer.readExpression()
+        jumpExpr = buffer.readExpression()
        infiniteStamina = buffer.readExpression()
        infiniteAltitude = buffer.readExpression()
-        jumpExpr = buffer.readExpression()
-        handlingExpr = buffer.readExpression()
-        speedExpr = buffer.readExpression()
-        accelerationExpr = buffer.readExpression()
-        staminaExpr = buffer.readExpression()
    }
 }

-class JetAirState : RidingBehaviourState() {
+class JetAirState : RidingBehaviourState {
    var currSpeed = ridingState(0.0, Side.CLIENT)
-    var currMouseXForce = ridingState(0.0, Side.CLIENT)
-    var currMouseYForce = ridingState(0.0, Side.CLIENT)
+    var stamina = ridingState(1.0f, Side.CLIENT)
+    var rideVel = ridingState(Vec3.ZERO, Side.CLIENT)
+    var currMouseXForce = ridingState(0.0, Side.BOTH)
+    var currMouseYForce = ridingState(0.0, Side.BOTH)

-    override fun encode(buffer: FriendlyByteBuf) {
-        super.encode(buffer)
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeDouble(currSpeed.get())
        buffer.writeFloat(stamina.get())
+        buffer.writeVec3(rideVel.get())
    }

-    override fun decode(buffer: FriendlyByteBuf) {
-        super.decode(buffer)
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
        currSpeed.set(buffer.readDouble(), forced = true)
+        stamina.set(buffer.readFloat(), forced = true)
+        rideVel.set(buffer.readVec3(), forced = true)
    }

    override fun reset() {
-        super.reset()
        currSpeed.set(0.0, forced = true)
+        stamina.set(1.0f, forced = true)
+        rideVel.set(Vec3.ZERO, forced = true)
        currMouseXForce.set(0.0, forced = true)
        currMouseYForce.set(0.0, forced = true)
    }

+    override fun toString(): String {
+        return "JetAirState(currSpeed=${currSpeed.get()}, stamina=${stamina.get()}, rideVel=${rideVel.get()}, currMouseXForce=${currMouseXForce.get()}, currMouseYForce=${currMouseYForce.get()})"
+    }
+
    override fun copy() = JetAirState().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)
+        it.rideVel.set(rideVel.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 JetAirState) return false
        if (previous.currSpeed != currSpeed) return true
-        return super.shouldSync(previous)
+        if (previous.stamina != stamina) return true
+        if (previous.rideVel != rideVel) return true
+        return false
    }
 }
@@ -0,0 +1,469 @@
+/*
+ * 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
+
+import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.api.riding.behaviour.*
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+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
+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
+
+class JumpToFlightCompositeBehaviour : RidingBehaviour<JumpToFlightCompositeSettings, JumpToFlightCompositeState> {
+    companion object {
+        val KEY = cobblemonResource("composite/jump_to_flight")
+    }
+
+    override val key = KEY
+
+    val landBehaviour: GenericLandBehaviour = GenericLandBehaviour()
+    val birdBehaviour: BirdAirBehaviour = BirdAirBehaviour()
+
+    override fun tick(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        input: Vec3
+    ) {
+        val flightState = state.flightState
+        val groundState = state.landState
+        if (shouldTransitionToGround(state, vehicle)) {
+            //Pass the speed to the next state
+//            groundState.currSpeed = flightState.currSpeed
+            groundState.rideVel.set(flightState.rideVel.get())
+            groundState.stamina.set(flightState.stamina.get())
+
+            state.activeController.set(GenericLandBehaviour.KEY)
+            vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, false)
+            state.timeTransitioned.set(vehicle.level().gameTime)
+        } else if (shouldTransitionToAir(state, vehicle, driver)) {
+            //Pass the speed to the next state
+//            flightState.currSpeed = groundState.currSpeed
+            flightState.rideVel.set(groundState.rideVel.get())
+            flightState.stamina.set(groundState.stamina.get())
+
+            state.activeController.set(BirdAirBehaviour.KEY)
+            vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, true)
+            state.timeTransitioned.set(vehicle.level().gameTime)
+        }
+    }
+
+    override fun isActive(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return true
+    }
+
+    private fun shouldTransitionToGround(state: JumpToFlightCompositeState, entity: PokemonEntity): Boolean {
+        return state.activeController.get() == BirdAirBehaviour.KEY
+                && entity.onGround()
+                && state.timeTransitioned.get() + 20 < entity.level().gameTime
+    }
+
+    private fun shouldTransitionToAir(
+        state: JumpToFlightCompositeState,
+        entity: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        return state.activeController.get() == GenericLandBehaviour.KEY
+                && driver.jumping
+                && state.timeTransitioned.get() + 20 < entity.level().gameTime
+    }
+
+    override fun pose(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): PoseType {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.pose(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.pose(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun speed(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.speed(settings.land, state.landState, vehicle, driver)
+            BirdAirBehaviour.KEY -> birdBehaviour.speed(settings.bird, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rotation(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: LivingEntity
+    ): Vec2 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rotation(settings.land, state.landState, vehicle, driver)
+            BirdAirBehaviour.KEY -> birdBehaviour.rotation(settings.bird, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun velocity(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        input: Vec3
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.velocity(settings.land, state.landState, vehicle, driver, input)
+            BirdAirBehaviour.KEY -> birdBehaviour.velocity(settings.bird, state.flightState, vehicle, driver, input)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun angRollVel(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        deltaTime: Double
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.angRollVel(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                deltaTime
+            )
+
+            BirdAirBehaviour.KEY -> birdBehaviour.angRollVel(
+                settings.bird,
+                state.flightState,
+                vehicle,
+                driver,
+                deltaTime
+            )
+
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rotationOnMouseXY(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        mouseY: Double,
+        mouseX: Double,
+        mouseYSmoother: SmoothDouble,
+        mouseXSmoother: SmoothDouble,
+        sensitivity: Double,
+        deltaTime: Double
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rotationOnMouseXY(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                mouseY,
+                mouseX,
+                mouseYSmoother,
+                mouseXSmoother,
+                sensitivity,
+                deltaTime
+            )
+
+            BirdAirBehaviour.KEY -> birdBehaviour.rotationOnMouseXY(
+                settings.bird,
+                state.flightState,
+                vehicle,
+                driver,
+                mouseY,
+                mouseX,
+                mouseYSmoother,
+                mouseXSmoother,
+                sensitivity,
+                deltaTime
+            )
+
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun canJump(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.canJump(settings.land, state.landState, vehicle, driver)
+            BirdAirBehaviour.KEY -> birdBehaviour.canJump(settings.bird, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun setRideBar(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.setRideBar(settings.land, state.landState, vehicle, driver)
+            BirdAirBehaviour.KEY -> birdBehaviour.setRideBar(settings.bird, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun jumpForce(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        jumpStrength: Int
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.jumpForce(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                jumpStrength
+            )
+
+            BirdAirBehaviour.KEY -> birdBehaviour.jumpForce(
+                settings.bird,
+                state.flightState,
+                vehicle,
+                driver,
+                jumpStrength
+            )
+
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun gravity(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        regularGravity: Double
+    ): Double {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.gravity(settings.land, state.landState, vehicle, regularGravity)
+            BirdAirBehaviour.KEY -> birdBehaviour.gravity(settings.bird, state.flightState, vehicle, regularGravity)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rideFovMultiplier(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rideFovMultiplier(settings.land, state.landState, vehicle, driver)
+            BirdAirBehaviour.KEY -> birdBehaviour.rideFovMultiplier(settings.bird, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun useAngVelSmoothing(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.useAngVelSmoothing(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.useAngVelSmoothing(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun useRidingAltPose(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.useRidingAltPose(settings.land, state.landState, vehicle, driver)
+            BirdAirBehaviour.KEY -> birdBehaviour.useRidingAltPose(settings.bird, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun inertia(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Double {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.inertia(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.inertia(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRoll(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRoll(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.shouldRoll(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun turnOffOnGround(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.turnOffOnGround(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.turnOffOnGround(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun dismountOnShift(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.dismountOnShift(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.dismountOnShift(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRotatePokemonHead(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRotatePokemonHead(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.shouldRotatePokemonHead(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRotatePlayerHead(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRotatePlayerHead(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.shouldRotatePlayerHead(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun createDefaultState() = JumpToFlightCompositeState()
+}
+
+class JumpToFlightCompositeSettings : RidingBehaviourSettings {
+    override val key = JumpToFlightCompositeBehaviour.KEY
+
+    var bird: BirdAirSettings = BirdAirSettings()
+        private set
+
+    var land: GenericLandSettings = GenericLandSettings()
+        private set
+
+    var minimumSpeed: Expression = "0.5".asExpression()
+        private set
+
+    var minimumJump: Expression = "0.5".asExpression()
+        private set
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        bird.encode(buffer)
+        land.encode(buffer)
+        buffer.writeExpression(minimumSpeed)
+        buffer.writeExpression(minimumJump)
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        bird.decode(buffer)
+        land.decode(buffer)
+        minimumSpeed = buffer.readExpression()
+        minimumJump = buffer.readExpression()
+    }
+}
+
+class JumpToFlightCompositeState : RidingBehaviourState {
+    var activeController = ridingState(GenericLandBehaviour.KEY, Side.CLIENT)
+    var currSpeed = ridingState(0.0, Side.BOTH)
+    var timeTransitioned = ridingState(-100L, Side.BOTH)
+    var landState = GenericLandState()
+    var flightState = BirdAirState()
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(activeController.get())
+        landState.encode(buffer)
+        flightState.encode(buffer)
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        activeController.set(buffer.readResourceLocation(), forced = true)
+        landState.decode(buffer)
+        flightState.decode(buffer)
+    }
+
+    override fun reset() {
+        activeController.set(GenericLandBehaviour.KEY, forced = true)
+        timeTransitioned.set(-100L, forced = true)
+        currSpeed.set(0.0, forced = true)
+    }
+
+    override fun toString(): String {
+        return "JumpToFlightCompositeState(activeController=${activeController.get()}, landState=$landState, flightState=$flightState, currSpeed=${currSpeed.get()}, timeTransitioned=${timeTransitioned.get()})"
+    }
+
+    override fun copy() = JumpToFlightCompositeState().also {
+        it.activeController.set(activeController.get(), forced = true)
+        it.landState = landState.copy()
+        it.flightState = flightState.copy()
+        it.currSpeed.set(currSpeed.get(), forced = true)
+        it.timeTransitioned.set(timeTransitioned.get(), forced = true)
+    }
+
+    override fun shouldSync(previous: RidingBehaviourState): Boolean {
+        if (previous !is JumpToFlightCompositeState) return false
+        if (activeController != previous.activeController) return true
+        if (landState.shouldSync(previous.landState)) return true
+        if (flightState.shouldSync(previous.flightState)) return true
+        return false
+    }
+}
@@ -0,0 +1,450 @@
+/*
+ * 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
+
+import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.api.riding.behaviour.*
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+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
+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
+
+class RunToJetCompositeBehaviour : RidingBehaviour<RunToJetCompositeSettings, RunToJetCompositeState> {
+    companion object {
+        val KEY = cobblemonResource("composite/run_to_jet")
+    }
+
+    override val key = KEY
+
+    val landBehaviour: GenericLandBehaviour = GenericLandBehaviour()
+    val jetBehaviour: JetAirBehaviour = JetAirBehaviour()
+
+    override fun tick(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        input: Vec3
+    ) {
+        val flightState = state.flightState
+        val groundState = state.landState
+        if (shouldTransitionToGround(state, vehicle, driver)) {
+            groundState.currSpeed = flightState.currSpeed
+            groundState.stamina = flightState.stamina
+            groundState.rideVel = flightState.rideVel
+
+            state.activeController.set(GenericLandBehaviour.KEY)
+            vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, false)
+            state.timeTransitioned.set(vehicle.level().gameTime)
+        } else if (shouldTransitionToAir(state, vehicle, driver, input)) {
+            flightState.currSpeed = groundState.currSpeed
+            flightState.stamina = groundState.stamina
+            flightState.rideVel = groundState.rideVel
+
+            state.activeController.set(JetAirBehaviour.KEY)
+            vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, true)
+            state.timeTransitioned.set(vehicle.level().gameTime)
+        }
+    }
+
+    private fun shouldTransitionToGround(
+        state: RunToJetCompositeState,
+        entity: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        if (state.activeController.get() != JetAirBehaviour.KEY) return false
+        if (state.timeTransitioned.get() + 20 >= entity.level().gameTime) return false
+        return driver.isSprinting || entity.onGround()
+    }
+
+    private fun shouldTransitionToAir(
+        state: RunToJetCompositeState,
+        entity: PokemonEntity,
+        driver: Player,
+        input: Vec3
+    ): Boolean {
+        if (state.activeController.get() != GenericLandBehaviour.KEY) return false
+        if (state.timeTransitioned.get() + 20 >= entity.level().gameTime) return false
+        return driver.isSprinting && input.z > 0.5
+    }
+
+    override fun isActive(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return true
+    }
+
+    override fun pose(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): PoseType {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.pose(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.pose(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun speed(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.speed(settings.land, state.landState, vehicle, driver)
+            JetAirBehaviour.KEY -> jetBehaviour.speed(settings.jet, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rotation(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: LivingEntity
+    ): Vec2 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rotation(settings.land, state.landState, vehicle, driver)
+            JetAirBehaviour.KEY -> jetBehaviour.rotation(settings.jet, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun velocity(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        input: Vec3
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.velocity(settings.land, state.landState, vehicle, driver, input)
+            JetAirBehaviour.KEY -> jetBehaviour.velocity(settings.jet, state.flightState, vehicle, driver, input)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun angRollVel(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        deltaTime: Double
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.angRollVel(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                deltaTime
+            )
+
+            JetAirBehaviour.KEY -> jetBehaviour.angRollVel(settings.jet, state.flightState, vehicle, driver, deltaTime)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rotationOnMouseXY(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        mouseY: Double,
+        mouseX: Double,
+        mouseYSmoother: SmoothDouble,
+        mouseXSmoother: SmoothDouble,
+        sensitivity: Double,
+        deltaTime: Double
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rotationOnMouseXY(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                mouseY,
+                mouseX,
+                mouseYSmoother,
+                mouseXSmoother,
+                sensitivity,
+                deltaTime
+            )
+            JetAirBehaviour.KEY -> jetBehaviour.rotationOnMouseXY(
+                settings.jet,
+                state.flightState,
+                vehicle,
+                driver,
+                mouseY,
+                mouseX,
+                mouseYSmoother,
+                mouseXSmoother,
+                sensitivity,
+                deltaTime
+            )
+
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun canJump(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.canJump(settings.land, state.landState, vehicle, driver)
+            JetAirBehaviour.KEY -> jetBehaviour.canJump(settings.jet, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun setRideBar(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.setRideBar(settings.land, state.landState, vehicle, driver)
+            JetAirBehaviour.KEY -> jetBehaviour.setRideBar(settings.jet, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun jumpForce(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        jumpStrength: Int
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.jumpForce(settings.land, state.landState, vehicle, driver, jumpStrength)
+            JetAirBehaviour.KEY -> jetBehaviour.jumpForce(settings.jet, state.flightState, vehicle, driver, jumpStrength)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun gravity(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        regularGravity: Double
+    ): Double {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.gravity(settings.land, state.landState, vehicle, regularGravity)
+            JetAirBehaviour.KEY -> jetBehaviour.gravity(settings.jet, state.flightState, vehicle, regularGravity)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rideFovMultiplier(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rideFovMultiplier(settings.land, state.landState, vehicle, driver)
+            JetAirBehaviour.KEY -> jetBehaviour.rideFovMultiplier(settings.jet, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun useAngVelSmoothing(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.useAngVelSmoothing(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.useAngVelSmoothing(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun useRidingAltPose(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.useRidingAltPose(settings.land, state.landState, vehicle, driver)
+            JetAirBehaviour.KEY -> jetBehaviour.useRidingAltPose(settings.jet, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun inertia(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Double {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.inertia(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.inertia(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRoll(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRoll(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.shouldRoll(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun turnOffOnGround(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.turnOffOnGround(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.turnOffOnGround(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun dismountOnShift(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.dismountOnShift(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.dismountOnShift(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRotatePokemonHead(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRotatePokemonHead(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.shouldRotatePokemonHead(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRotatePlayerHead(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRotatePlayerHead(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.shouldRotatePlayerHead(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun createDefaultState() = RunToJetCompositeState()
+}
+
+class RunToJetCompositeSettings : RidingBehaviourSettings {
+    override val key = RunToJetCompositeBehaviour.KEY
+
+    var jet: JetAirSettings = JetAirSettings()
+        private set
+
+    var land: GenericLandSettings = GenericLandSettings()
+        private set
+
+    var minimumSpeed: Expression = "0.5".asExpression()
+        private set
+
+    var minimumJump: Expression = "0.5".asExpression()
+        private set
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        jet.encode(buffer)
+        land.encode(buffer)
+        buffer.writeExpression(minimumSpeed)
+        buffer.writeExpression(minimumJump)
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        jet.decode(buffer)
+        land.decode(buffer)
+        minimumSpeed = buffer.readExpression()
+        minimumJump = buffer.readExpression()
+    }
+}
+
+class RunToJetCompositeState : RidingBehaviourState {
+    var activeController = ridingState(GenericLandBehaviour.KEY, Side.CLIENT)
+    var landState: GenericLandState = GenericLandState()
+    var flightState: JetAirState = JetAirState()
+    var currSpeed = ridingState(0.0, Side.BOTH)
+    var timeTransitioned = ridingState(-100L, Side.BOTH)
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(activeController.get())
+        landState.encode(buffer)
+        flightState.encode(buffer)
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        activeController.set(buffer.readResourceLocation(), forced = true)
+        landState.decode(buffer)
+        flightState.decode(buffer)
+    }
+
+    override fun reset() {
+        activeController.set(GenericLandBehaviour.KEY, forced = true)
+        timeTransitioned.set(-100L, forced = true)
+        currSpeed.set(0.0, forced = true)
+    }
+
+    override fun toString(): String {
+        return "RunToJetCompositeState(activeController=${activeController.get()}, landState=$landState, flightState=$flightState, currSpeed=${currSpeed.get()}, timeTransitioned=${timeTransitioned.get()})"
+    }
+
+    override fun copy() = RunToJetCompositeState().also {
+        it.activeController.set(activeController.get(), forced = true)
+        it.landState = landState.copy()
+        it.flightState = flightState.copy()
+        it.currSpeed.set(currSpeed.get(), forced = true)
+        it.timeTransitioned.set(timeTransitioned.get(), forced = true)
+    }
+
+    override fun shouldSync(previous: RidingBehaviourState): Boolean {
+        if (previous !is RunToJetCompositeState) return false
+        if (activeController != previous.activeController) return true
+        if (landState.shouldSync(previous.landState)) return true
+        if (flightState.shouldSync(previous.flightState)) return true
+        return false
+    }
+}
@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.riding.behaviour.types

 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
@@ -34,7 +33,6 @@ class SwimDashBehaviour : RidingBehaviour<SwimDashSettings, SwimDashState> {
    }

    override val key = KEY
-    override val style = RidingStyle.LIQUID

    val poseProvider = PoseProvider<SwimDashSettings, SwimDashState>(PoseType.FLOAT)
        .with(PoseOption(PoseType.SWIM) { _, _, entity -> entity.isSwimming && entity.entityData.get(PokemonEntity.MOVING) })
@@ -219,7 +217,7 @@ class SwimDashBehaviour : RidingBehaviour<SwimDashSettings, SwimDashState> {
        return false
    }

-    override fun createDefaultState(settings: SwimDashSettings) = SwimDashState()
+    override fun createDefaultState() = SwimDashState()
 }

 class SwimDashSettings : RidingBehaviourSettings {
@@ -229,7 +227,6 @@ class SwimDashSettings : RidingBehaviourSettings {
        private set

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

@@ -238,12 +235,14 @@ class SwimDashSettings : RidingBehaviourSettings {
    }
 }

-class SwimDashState : RidingBehaviourState() {
+class SwimDashState : RidingBehaviourState {
    var dashing = ridingState(false, Side.BOTH)
    var ticks = ridingState(0, Side.BOTH)

+    override fun encode(buffer: RegistryFriendlyByteBuf) = Unit
+    override fun decode(buffer: RegistryFriendlyByteBuf) = Unit
+
    override fun reset() {
-        super.reset()
        dashing.set(false, forced = true)
        ticks.set(0, forced = true)
    }
@@ -253,9 +252,9 @@ class SwimDashState : RidingBehaviourState() {
    }

    override fun copy() = SwimDashState().also {
-        it.rideVelocity.set(rideVelocity.get(), forced = true)
-        it.stamina.set(stamina.get(), forced = true)
        it.dashing.set(dashing.get(), forced = true)
        it.ticks.set(ticks. get(), forced = true)
    }
+
+    override fun shouldSync(previous: RidingBehaviourState) = false
 }
@@ -53,7 +53,6 @@ class VehicleLandBehaviour : RidingBehaviour<VehicleLandSettings, VehicleLandSta
    }

    override val key = KEY
-    override val style = RidingStyle.LAND

    val poseProvider = PoseProvider<VehicleLandSettings, VehicleLandState>(PoseType.STAND)
        .with(PoseOption(PoseType.WALK) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })
@@ -266,7 +265,7 @@ class VehicleLandBehaviour : RidingBehaviour<VehicleLandSettings, VehicleLandSta
        return false
    }

-    override fun createDefaultState(settings: VehicleLandSettings) = VehicleLandState()
+    override fun createDefaultState() = VehicleLandState()
 }

 class VehicleLandSettings : RidingBehaviourSettings {
@@ -297,7 +296,6 @@ class VehicleLandSettings : RidingBehaviourSettings {
        private set

    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
        buffer.writeExpression(canJump)
        buffer.writeExpression(jumpVector[0])
        buffer.writeExpression(jumpVector[1])
@@ -326,12 +324,14 @@ class VehicleLandSettings : RidingBehaviourSettings {
    }
 }

-class VehicleLandState : RidingBehaviourState() {
+class VehicleLandState : RidingBehaviourState {
    var currSpeed = ridingState(0.0, Side.BOTH)
    var deltaRotation = ridingState(Vec2.ZERO, Side.BOTH)

+    override fun encode(buffer: RegistryFriendlyByteBuf) = Unit
+    override fun decode(buffer: RegistryFriendlyByteBuf) = Unit
+
    override fun reset() {
-        super.reset()
        currSpeed.set(0.0, forced = true)
        deltaRotation.set(Vec2.ZERO, forced = true)
    }
@@ -341,9 +341,9 @@ class VehicleLandState : RidingBehaviourState() {
    }

    override fun copy() = VehicleLandState().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)
    }
+
+    override fun shouldSync(previous: RidingBehaviourState) = false
 }
@@ -1,426 +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.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.entity.PoseType
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.adapters.RidingBehaviourSettingsAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-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
-
-class CompositeBehaviour : RidingBehaviour<CompositeSettings, CompositeState> {
-    companion object {
-        val KEY = cobblemonResource("composite")
-    }
-
-    override val key = KEY
-    override val style = RidingStyle.COMPOSITE
-
-    override fun createDefaultState(settings: CompositeSettings): CompositeState {
-        val defaultBehaviour = RidingBehaviours.get(settings.defaultBehaviour.key)
-        val defaultState = defaultBehaviour.createDefaultState(settings.defaultBehaviour)
-        val alternateBehaviour = RidingBehaviours.get(settings.alternateBehaviour.key)
-        val alternativeState = alternateBehaviour.createDefaultState(settings.alternateBehaviour)
-        return CompositeState(
-            defaultBehaviour = settings.defaultBehaviour.key,
-            defaultBehaviourState = defaultState,
-            alternateBehaviourState = alternativeState
-        )
-    }
-
-    fun <T> chooseBehaviour(
-        settings: CompositeSettings,
-        state: CompositeState,
-        action: (behaviour: RidingBehaviour<RidingBehaviourSettings, RidingBehaviourState>, settings: RidingBehaviourSettings, state: RidingBehaviourState) -> T
-    ): T {
-        val defaultBehaviour = RidingBehaviours.get(settings.defaultBehaviour.key)
-        val alternativeBehaviour = RidingBehaviours.get(settings.alternateBehaviour.key)
-        return when (state.activeController.get()) {
-            settings.defaultBehaviour.key -> action(
-                defaultBehaviour,
-                settings.defaultBehaviour,
-                state.defaultBehaviourState
-            )
-            settings.alternateBehaviour.key -> action(
-                alternativeBehaviour,
-                settings.alternateBehaviour,
-                state.alternateBehaviourState
-            )
-
-            else -> error("Invalid controller: ${state.activeController.get()}")
-        }
-    }
-
-    override fun tick(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ) {
-        val strategy = CompositeRidingStrategies.get(settings.transitionStrategy)
-        strategy.tick(settings, state, state.defaultBehaviourState, state.alternateBehaviourState, vehicle, driver, input)
-    }
-
-    override fun clampPassengerRotation(
-        settings: CompositeSettings,
-        state: CompositeState,
-        entity: PokemonEntity,
-        driver: LivingEntity
-    ) {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.clampPassengerRotation(behaviourSettings, behaviourState, entity, driver)
-        }
-    }
-
-    override fun updatePassengerRotation(
-        settings: CompositeSettings,
-        state: CompositeState,
-        entity: PokemonEntity,
-        driver: LivingEntity
-    ) {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.updatePassengerRotation(behaviourSettings, behaviourState, entity, driver)
-        }
-    }
-
-    override fun shouldRotatePlayerHead(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.shouldRotatePlayerHead(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun shouldRotatePokemonHead(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.shouldRotatePokemonHead(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun dismountOnShift(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.dismountOnShift(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun turnOffOnGround(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.turnOffOnGround(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun shouldRoll(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.shouldRoll(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun inertia(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Double {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.inertia(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun useRidingAltPose(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.useRidingAltPose(behaviourSettings, behaviourState, vehicle, driver)
-        }
-    }
-
-    override fun useAngVelSmoothing(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.useAngVelSmoothing(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun rideFovMultiplier(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.rideFovMultiplier(behaviourSettings, behaviourState, vehicle, driver)
-        }
-    }
-
-    override fun gravity(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        regularGravity: Double
-    ): Double {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.gravity(behaviourSettings, behaviourState, vehicle, regularGravity)
-        }
-    }
-
-    override fun jumpForce(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        jumpStrength: Int
-    ): Vec3 {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.jumpForce(behaviourSettings, behaviourState, vehicle, driver, jumpStrength)
-        }
-    }
-
-    override fun setRideBar(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.setRideBar(behaviourSettings, behaviourState, vehicle, driver)
-        }
-    }
-
-    override fun canJump(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.canJump(behaviourSettings, behaviourState, vehicle, driver)
-        }
-    }
-
-    override fun rotationOnMouseXY(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        mouseY: Double,
-        mouseX: Double,
-        mouseYSmoother: SmoothDouble,
-        mouseXSmoother: SmoothDouble,
-        sensitivity: Double,
-        deltaTime: Double
-    ): Vec3 {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.rotationOnMouseXY(
-                behaviourSettings,
-                behaviourState,
-                vehicle,
-                driver,
-                mouseY,
-                mouseX,
-                mouseYSmoother,
-                mouseXSmoother,
-                sensitivity,
-                deltaTime
-            )
-        }
-    }
-
-    override fun angRollVel(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        deltaTime: Double
-    ): Vec3 {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.angRollVel(behaviourSettings, behaviourState, vehicle, driver, deltaTime)
-        }
-    }
-
-    override fun velocity(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ): Vec3 {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.velocity(behaviourSettings, behaviourState, vehicle, driver, input)
-        }
-    }
-
-    override fun rotation(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ): Vec2 {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.rotation(behaviourSettings, behaviourState, vehicle, driver)
-        }
-    }
-
-    override fun speed(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.speed(behaviourSettings, behaviourState, vehicle, driver)
-        }
-    }
-
-    override fun pose(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): PoseType {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.pose(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun isActive(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.isActive(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-}
-
-open class CompositeSettings : RidingBehaviourSettings {
-    lateinit var transitionStrategy: ResourceLocation
-        private set
-    lateinit var defaultBehaviour: RidingBehaviourSettings
-        private set
-    lateinit var alternateBehaviour: RidingBehaviourSettings
-        private set
-
-    override val key: ResourceLocation = CompositeBehaviour.KEY
-
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
-        buffer.writeResourceLocation(transitionStrategy)
-        defaultBehaviour.encode(buffer)
-        alternateBehaviour.encode(buffer)
-    }
-
-    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        transitionStrategy = buffer.readResourceLocation()
-        val defaultBehaviourKey = buffer.readResourceLocation()
-        defaultBehaviour = RidingBehaviourSettingsAdapter.types[defaultBehaviourKey]?.getConstructor()?.newInstance()
-            ?: error("Unknown controller key: $key")
-        defaultBehaviour.decode(buffer)
-        val alternativeBehaviourKey = buffer.readResourceLocation()
-        alternateBehaviour =
-            RidingBehaviourSettingsAdapter.types[alternativeBehaviourKey]?.getConstructor()?.newInstance()
-                ?: error("Unknown controller key: $key")
-        alternateBehaviour.decode(buffer)
-    }
-}
-
-class CompositeState(
-    private val defaultBehaviour: ResourceLocation,
-    val defaultBehaviourState: RidingBehaviourState,
-    val alternateBehaviourState: RidingBehaviourState
-) : RidingBehaviourState() {
-    var activeController = ridingState(defaultBehaviour, Side.CLIENT)
-    var lastTransition = ridingState(-100L, Side.BOTH)
-
-    override val rideVelocity: SidedRidingState<Vec3>
-        get() = when (activeController.get()) {
-            defaultBehaviour -> defaultBehaviourState.rideVelocity
-            else -> alternateBehaviourState.rideVelocity
-        }
-
-    override val stamina: SidedRidingState<Float>
-        get() = when (activeController.get()) {
-            defaultBehaviour -> defaultBehaviourState.stamina
-            else -> alternateBehaviourState.stamina
-        }
-
-    override fun reset() {
-        super.reset()
-        activeController.set(defaultBehaviour, forced = true)
-        lastTransition.set(-100L, forced = true)
-        defaultBehaviourState.reset()
-        alternateBehaviourState.reset()
-    }
-
-    override fun copy(): CompositeState {
-        val state =
-            CompositeState(defaultBehaviour, defaultBehaviourState.copy(), alternateBehaviourState.copy())
-        state.activeController.set(activeController.get(), forced = true)
-        state.lastTransition.set(lastTransition.get(), forced = true)
-        state.rideVelocity.set(rideVelocity.get(), forced = true)
-        state.stamina.set(stamina.get(), forced = true)
-        return state
-    }
-
-    override fun shouldSync(previous: RidingBehaviourState): Boolean {
-        if (previous !is CompositeState) return false
-        if (previous.activeController.get() != activeController.get()) return true
-        if (defaultBehaviourState.shouldSync(previous.defaultBehaviourState)) return true
-        if (alternateBehaviourState.shouldSync(previous.alternateBehaviourState)) return true
-        return super.shouldSync(previous)
-    }
-
-    override fun encode(buffer: FriendlyByteBuf) {
-        super.encode(buffer)
-        buffer.writeResourceLocation(activeController.get())
-        defaultBehaviourState.encode(buffer)
-        alternateBehaviourState.encode(buffer)
-    }
-
-    override fun decode(buffer: FriendlyByteBuf) {
-        super.decode(buffer)
-        activeController.set(buffer.readResourceLocation(), forced = true)
-        defaultBehaviourState.decode(buffer)
-        alternateBehaviourState.decode(buffer)
-    }
-
-}
@@ -1,32 +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.composite.strategies
-
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeSettings
-import net.minecraft.resources.ResourceLocation
-
-object CompositeRidingStrategies {
-    val strategies = mutableMapOf<ResourceLocation, CompositeRidingStrategy<out CompositeSettings>>()
-
-    init {
-        register(RunStrategy.key, RunStrategy)
-        register(JumpStrategy.key, JumpStrategy)
-        register(FallStrategy.key, FallStrategy)
-    }
-
-    fun register(key: ResourceLocation, strategy: CompositeRidingStrategy<out CompositeSettings>) {
-        if (strategies.contains(key)) error("Strategy already registered to key $key")
-        strategies[key] = strategy
-    }
-
-    fun get(key: ResourceLocation): CompositeRidingStrategy<CompositeSettings> {
-        if (!strategies.contains(key)) error("Strategy not registered to key $key")
-        return strategies[key]!! as CompositeRidingStrategy<CompositeSettings>
-    }
-}
@@ -1,53 +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.composite.strategies
-
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviours
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeState
-import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.phys.Vec3
-
-interface CompositeRidingStrategy<T : CompositeSettings> {
-    val key: ResourceLocation
-
-    fun tick(
-        settings: T,
-        state: CompositeState,
-        defaultState: RidingBehaviourState,
-        alternateState: RidingBehaviourState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    )
-
-    fun transition(
-        vehicle: PokemonEntity,
-        settings: CompositeSettings,
-        state: CompositeState,
-        fromState: RidingBehaviourState,
-        toState: RidingBehaviourState,
-        toSettings: RidingBehaviourSettings
-    ) {
-        toState.stamina.set(fromState.stamina.get())
-        toState.rideVelocity.set(fromState.rideVelocity.get())
-        fromState.reset()
-        state.activeController.set(toSettings.key)
-        state.lastTransition.set(vehicle.level().gameTime)
-        val behaviour = RidingBehaviours.get(toSettings.key)
-        vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, behaviour.style == RidingStyle.AIR)
-    }
-
-}
@@ -1,99 +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.composite.strategies
-
-import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviours
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeState
-import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.*
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.phys.Vec3
-
-object FallStrategy : CompositeRidingStrategy<FallCompositeSettings> {
-
-    override val key = cobblemonResource("strategy/fall")
-
-    override fun tick(
-        settings: FallCompositeSettings,
-        state: CompositeState,
-        defaultState: RidingBehaviourState,
-        alternateState: RidingBehaviourState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ) {
-        if (shouldTransitionToDefault(state, settings.defaultBehaviour, vehicle)) {
-            transition(vehicle, settings, state, alternateState, defaultState, settings.defaultBehaviour)
-        } else if (shouldTransitionToAlternate(settings, state, settings.alternateBehaviour, vehicle, driver)) {
-            transition(vehicle, settings, state, defaultState, alternateState, settings.alternateBehaviour)
-        }
-    }
-
-    private fun shouldTransitionToDefault(
-        state: CompositeState,
-        defaultSettings: RidingBehaviourSettings,
-        vehicle: PokemonEntity
-    ): Boolean {
-        if (state.activeController.get() == defaultSettings.key) return false
-        if (state.lastTransition.get() + 20 >= vehicle.level().gameTime) return false
-        if (!vehicle.onGround()) return false
-        val defaultBehaviour = RidingBehaviours.get(defaultSettings.key)
-        return defaultBehaviour.isActive(defaultSettings, state.defaultBehaviourState, vehicle)
-    }
-
-    private fun shouldTransitionToAlternate(
-        settings: FallCompositeSettings,
-        state: CompositeState,
-        alternateSettings: RidingBehaviourSettings,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        if (state.activeController.get() == alternateSettings.key) return false
-        if (!driver.jumping) return false
-        if (state.lastTransition.get() + 20 >= vehicle.level().gameTime) return false
-
-        val runtime = vehicle.runtime
-        val minFallingSpeed = runtime.resolveFloat(settings.minimumFallSpeed)
-        val minForwardSpeed = runtime.resolveFloat(settings.minimumForwardSpeed)
-        if (vehicle.deltaMovement.y < -minFallingSpeed) return false
-        if (vehicle.deltaMovement.horizontalDistance() < minForwardSpeed) return false
-        val alternativeBehaviour = RidingBehaviours.get(alternateSettings.key)
-        return alternativeBehaviour.isActive(alternateSettings, state.alternateBehaviourState, vehicle)
-    }
-
-}
-
-class FallCompositeSettings : CompositeSettings() {
-    override val key = FallStrategy.key
-
-    var minimumForwardSpeed: Expression = "0.0".asExpression()
-        private set
-
-    var minimumFallSpeed: Expression = "0.5".asExpression()
-        private set
-
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        super.encode(buffer)
-        buffer.writeExpression(minimumForwardSpeed)
-        buffer.writeExpression(minimumFallSpeed)
-    }
-
-    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        super.decode(buffer)
-        minimumForwardSpeed = buffer.readExpression()
-        minimumFallSpeed = buffer.readExpression()
-    }
-}
@@ -1,68 +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.composite.strategies
-
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviours
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeState
-import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.phys.Vec3
-
-object JumpStrategy : CompositeRidingStrategy<CompositeSettings> {
-
-    override val key = cobblemonResource("strategy/jump")
-
-    override fun tick(
-        settings: CompositeSettings,
-        state: CompositeState,
-        defaultState: RidingBehaviourState,
-        alternateState: RidingBehaviourState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ) {
-        if (shouldTransitionToDefault(state, settings.defaultBehaviour, vehicle)) {
-            transition(vehicle, settings, state, alternateState, defaultState, settings.defaultBehaviour)
-        } else if (shouldTransitionToAlternative(state, settings.alternateBehaviour, vehicle, driver)) {
-            transition(vehicle, settings, state, defaultState, alternateState, settings.alternateBehaviour)
-        }
-    }
-
-    private fun shouldTransitionToDefault(
-        state: CompositeState,
-        defaultSettings: RidingBehaviourSettings,
-        vehicle: PokemonEntity
-    ): Boolean {
-        if (state.activeController.get() == defaultSettings.key) return false
-        if (!vehicle.onGround()) 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)
-    }
-
-    private fun shouldTransitionToAlternative(
-        state: CompositeState,
-        alternativeSettings: RidingBehaviourSettings,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        if (state.activeController.get() == alternativeSettings.key) return false
-        if (!driver.jumping) 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)
-    }
-
-}
@@ -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.api.riding.behaviour.types.composite.strategies
-
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviours
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeSettings
-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.world.entity.player.Player
-import net.minecraft.world.phys.Vec3
-
-object RunStrategy : CompositeRidingStrategy<CompositeSettings> {
-
-    override val key = cobblemonResource("strategy/run")
-
-    override fun tick(
-        settings: CompositeSettings,
-        state: CompositeState,
-        defaultState: RidingBehaviourState,
-        alternateState: RidingBehaviourState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ) {
-        if (shouldTransitionToDefault(state, settings.defaultBehaviour, vehicle, driver)) {
-            transition(vehicle, settings, state, alternateState, defaultState, settings.defaultBehaviour)
-        }
-        else if (shouldTransitionToAlternate(state, settings.alternateBehaviour, vehicle, driver, input)) {
-            transition(vehicle, settings, state, defaultState, alternateState, settings.alternateBehaviour)
-        }
-    }
-
-    private fun shouldTransitionToDefault(
-        state: CompositeState,
-        defaultSettings: RidingBehaviourSettings,
-        entity: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        if (state.activeController.get() == defaultSettings.key) return false
-        if (!entity.onGround()) return false
-        if (state.lastTransition.get() + 20 >= entity.level().gameTime) return false
-        val defaultBehaviour = RidingBehaviours.get(defaultSettings.key)
-        val ret = defaultBehaviour.isActive(defaultSettings, state.defaultBehaviourState, entity)
-        return ret
-    }
-
-    private fun shouldTransitionToAlternate(
-        state: CompositeState,
-        alternativeSettings: RidingBehaviourSettings,
-        entity: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ): Boolean {
-        if (state.activeController.get() == alternativeSettings.key) return false
-        if (state.lastTransition.get() + 20 >= entity.level().gameTime) return false
-        val alternativeBehaviour = RidingBehaviours.get(alternativeSettings.key)
-        return driver.isSprinting && input.z > 0.5 && alternativeBehaviour.isActive(alternativeSettings, state.alternateBehaviourState, entity)
-    }
-
-}
@@ -1,143 +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.util
-
-import com.cobblemon.mod.common.OrientationControllable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.math.geometry.toRadians
-import net.minecraft.util.Mth
-import net.minecraft.world.phys.Vec3
-import org.joml.Matrix3f
-import org.joml.Quaternionf
-import org.joml.Vector3f
-
-/**
- * Class to handle the updating and containment of ride data used in animation.
- *
- * @author Jackowes
- * @since April 7th, 2025
- */
-
-
-class RidingAnimationData
-{
-    var prevOrientation: Matrix3f = Matrix3f()
-    var prevRot: Vec3 = Vec3.ZERO
-    var velocitySpring: Vec3Spring = Vec3Spring()
-    var rotSpring: Vec3Spring = Vec3Spring()
-    var rotDeltaSpring: Vec3Spring = Vec3Spring()
-    var localVelocitySpring: Vec3Spring = Vec3Spring()
-
-    fun update(entity: PokemonEntity) {
-
-        var currRot = Vec3.ZERO
-        var angDelta = Vec3.ZERO
-
-//        val stiffness = 90.0
-//        val damping = 18.0
-        val stiffness = 16.0
-        val damping = 8.0
-
-        // Update velocity first
-        val currentVelocity = Vec3(
-            entity.x - entity.xOld,
-            entity.y - entity.yOld,
-            entity.z - entity.zOld
-        )
-
-        val r = entity.ifRidingAvailableSupply(false) { behaviour, settings, state ->
-            behaviour.shouldRoll(settings, state, entity);
-        }
-        if( r ) {
-            //TODO: should this return?
-            val controller = (entity.firstPassenger as? OrientationControllable)?.orientationController ?: return
-            val orientation = controller.orientation ?: Matrix3f()
-
-            val currPitch = controller.pitch
-            val currYaw = controller.yaw
-            val currRoll = controller.roll
-            currRot = Vec3(currPitch.toDouble(), currYaw.toDouble(), currRoll.toDouble())
-
-            val currOrientation = orientation
-
-            /******************************************************
-             * Calculate current 3d euler rotation deltas in the
-             * entities local space
-             *****************************************************/
-
-            // Get current and previous orientation as quaternions
-            val currQuat = Quaternionf().setFromUnnormalized(currOrientation)
-            val prevQuat = Quaternionf().setFromUnnormalized(prevOrientation)
-
-            // Compute deltaQuat = current * inverse(previous)
-            val deltaQuat = Quaternionf(currQuat).mul(Quaternionf(prevQuat).invert())
-
-            // Transform delta into the local space of the current orientation
-            val localDeltaQuat = Quaternionf(currQuat).invert().mul(deltaQuat).mul(currQuat)
-
-            // Convert delta rotation to Euler angles
-            val euler = Vector3f()
-            localDeltaQuat.getEulerAnglesXYZ(euler) // Angles are in radians
-
-            // Convert to degrees
-            val pitchDegrees = Math.toDegrees(euler.x.toDouble()) // Rotation around X axis = pitch
-            val yawDegrees = Math.toDegrees(euler.y.toDouble())   // Rotation around Y axis = yaw
-            val rollDegrees = Math.toDegrees(euler.z.toDouble())  // Rotation around Z axis = roll
-            //Scale rotation delta by 20 to represent degree per second instead of tick
-            angDelta = Vec3(pitchDegrees, yawDegrees, rollDegrees).scale(20.0)
-
-            /******************************************************
-             * Calculate ride local velocity
-             *****************************************************/
-            val velocityWorldF = Vector3f(currentVelocity.x.toFloat(), currentVelocity.y.toFloat(), currentVelocity.z.toFloat())
-
-            val localVelocityF = Matrix3f(orientation).transpose().transform(velocityWorldF)
-            val localVelocity = Vec3(localVelocityF.x.toDouble(), localVelocityF.y.toDouble(), localVelocityF.z.toDouble())
-
-            localVelocitySpring.update(localVelocity, stiffness, damping)
-
-            // Update previous values
-            prevOrientation.set(currOrientation)
-        } else {
-            val currPitch = entity.xRot
-            val currYaw = entity.yRot
-            val currRoll = 0.0f
-            currRot = Vec3(currPitch.toDouble(), currYaw.toDouble(), currRoll.toDouble())
-
-            //Scale rotation delta by 20 to represent degree per second instead of tick
-            angDelta = Vec3(
-                (currRot.x - prevRot.x),
-                Mth.degreesDifference(currRot.y.toFloat(), prevRot.y.toFloat()).toDouble(),
-                Mth.degreesDifference(currRot.z.toFloat(), prevRot.z.toFloat()).toDouble()
-            ).scale(20.0)
-
-            /******************************************************
-             * Calculate ride local velocity
-             *****************************************************/
-            val yaw360 = -1.0 * (entity.yRot + 360.0f) % 360.0f
-            val orientationNonRollable = Matrix3f().rotateY(yaw360.toRadians())
-
-            //Convert to Vector3f
-            var velocityWorldF = Vector3f(currentVelocity.x.toFloat(), currentVelocity.y.toFloat(), currentVelocity.z.toFloat())
-
-            val localVelocityF = Matrix3f(orientationNonRollable).transpose().transform(velocityWorldF)
-            val localVelocity = Vec3(localVelocityF.x.toDouble(), localVelocityF.y.toDouble(), localVelocityF.z.toDouble())
-
-            localVelocitySpring.update(localVelocity, stiffness, damping)
-        }
-
-        /******************************************************
-         * Update springs
-         *****************************************************/
-        rotDeltaSpring.update(angDelta, stiffness, damping)
-        velocitySpring.update(currentVelocity, stiffness, damping)
-        rotSpring.update(currRot, stiffness, damping)
-        prevRot = currRot
-    }
-}
@@ -1,68 +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.util
-
-import net.minecraft.world.phys.Vec3
-import kotlin.math.min
-
-/**
- * A spring-based smoother for Vec3 values, designed for applying damped spring motion to riding data.
- * Stores the previous and current values, along with a history buffer for lookback-based interpolation.
- *
- * @author Jackowes
- * @since March 27th, 2025
- */
-
-
-class Vec3Spring(
-    var value: Vec3 = Vec3.ZERO,
-    var velocity: Vec3 = Vec3.ZERO
-) {
-    val history = ArrayDeque<Vec3>()
-    //Hold up to a seconds worth of values
-    val lookBackSize = 20
-
-    fun update(target: Vec3, stiffness: Double, damping: Double) {
-
-        //Hooke's Law f = kx where:
-        //f is force
-        //k is the spring constant or stiffness of this spring
-        //x is the distance from rest and in this case the difference between the most recent
-        //rotation delta ( the target ) and the springs current value for delta rot
-        val force = target.subtract(value).scale(stiffness)
-
-        //Now calculate acceleration and apply damping
-        val accel = force.subtract(velocity.scale(damping))
-
-        velocity = velocity.add(accel.scale(1.0/20.0))
-        value = value.add(velocity.scale(1.0/20.0))
-
-        history.addFirst(value)
-        //Adding one since if we want to check max look back point it needs something to interp with.
-        if( history.size > lookBackSize + 1) {
-            history.removeLast()
-        }
-    }
-
-    fun getInterpolated(partialTick: Double, lookBackTick: Int): Vec3 {
-        if (history.size < 2) {
-            return value // or Vec3.ZERO if you prefer
-        }
-
-        val tick = min(lookBackTick, history.size - 2)
-        var ret = Vec3.ZERO
-        for( i in 0..tick) {
-            val older = history.get(i + 1).scale(1.0)
-            val newer = history.get(i).scale(1.0)
-            ret = ret.add(older.add(newer.subtract(older).scale(partialTick)))
-        }
-
-        return ret.scale(1.0/(tick+1))
-    }
-}
@@ -8,13 +8,9 @@

 package com.cobblemon.mod.common.battles

-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
-import com.cobblemon.mod.common.api.battles.model.actor.EntityBackedBattleActor
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import net.minecraft.server.level.ServerLevel
-import net.minecraft.world.level.ClipContext
-import net.minecraft.world.phys.HitResult
 import net.minecraft.world.phys.Vec3
 class ActiveBattlePokemon(val actor: BattleActor, var battlePokemon: BattlePokemon? = null): Targetable {
    val battle = actor.battle
@@ -32,115 +28,4 @@ class ActiveBattlePokemon(val actor: BattleActor, var battlePokemon: BattlePokem
    override fun hasPokemon() = battlePokemon != null
    fun isGone() = battlePokemon?.gone ?: true
    fun isAlive() = (battlePokemon?.health ?: 0) > 0
-
-    fun getSendOutPosition(): Vec3? {
-        val pnx = getPNX()
-        val actorEntityPosList = actor.getSide().actors.mapNotNull { if (it is EntityBackedBattleActor<*>) it.initialPos else null }
-        val actorEntityPos = if (actorEntityPosList.size == 1)
-            actorEntityPosList[0]
-        else if (actorEntityPosList.size > 1)
-            actorEntityPosList.fold(Vec3(0.0, 0.0, 0.0)) { acc, vec3 -> acc.add(vec3.scale(1.0 / actorEntityPosList.size)) }
-        else
-            null
-        val opposingActorEntityList = actor.getSide().getOppositeSide().actors.mapNotNull { if (it is EntityBackedBattleActor<*>) it.initialPos else null }
-        val opposingEntityPos = if (opposingActorEntityList.size == 1)
-            opposingActorEntityList[0]
-        else if (opposingActorEntityList.size > 1) {
-            // If multiple actors per side, avg their position
-            opposingActorEntityList.fold(Vec3(0.0, 0.0, 0.0)) { acc, vec3 -> acc.add(vec3.scale(1.0 / opposingActorEntityList.size)) }
-        }
-        else null
-
-        var actorOffset = actorEntityPos?.let { opposingEntityPos?.subtract(it) }
-        var result = actorEntityPos
-        if (actorOffset != null) {
-            var widthSum = 4.0 // Leave a constant to allow double/triples alignment to be consistent
-            var pokemonWidth = battlePokemon?.originalPokemon?.form?.hitbox?.width ?: 0F
-            val pokemonBaseScale = battlePokemon?.originalPokemon?.form?.baseScale ?: 0F
-            pokemonWidth *= pokemonBaseScale
-            if (battle.format.battleType.pokemonPerSide == 1) {
-                battlePokemon?.let { battlePokemon ->
-                    // sum of the hitbox widths of both pokemon
-                    val opposingActivePokemon = (getOppositeOpponent() as ActiveBattlePokemon)
-                    val opposingPokemonWidth = opposingActivePokemon.battlePokemon?.let {
-                        it.originalPokemon.form.hitbox.width * it.originalPokemon.form.baseScale
-                    } ?: pokemonWidth
-                    widthSum = (pokemonWidth + opposingPokemonWidth) / 2.0 // Only care about the front half of each hitbox
-                }
-            }
-
-            val minDistance = 4.0 + widthSum
-            val actorDistance = actorOffset.length()
-
-            if (actorDistance < minDistance) {
-                val temp = actorOffset.scale(minDistance / actorDistance) ?: actorOffset
-                result = actorEntityPos?.subtract(temp.subtract(actorOffset))
-                actorOffset = temp
-            }
-            // orthogonalVector is the sideways displacement from the battle actors
-            var orthogonalVector = Vec3(actorOffset.x, 0.0, actorOffset.z).normalize()
-            orthogonalVector = orthogonalVector.cross(Vec3(0.0, 1.0, 0.0))
-
-            if (battle.format.battleType.pokemonPerSide == 1) { // Singles
-                result = result?.add(actorOffset.scale(if (battle.isPvW) 0.4 else 0.3))
-                battlePokemon?.let { battlePokemon ->
-                    val hitbox = battlePokemon.originalPokemon.form.hitbox
-                    val scale = battlePokemon.originalPokemon.form.baseScale
-                    orthogonalVector = orthogonalVector.scale(-0.3 - hitbox.width * scale )
-                }
-            } else if (battle.format.battleType.pokemonPerSide == 2) { // Doubles/Multi
-                if (battle.actors.first() != battle.actors.last()) {
-                    val offsetB = if (pnx[2] == 'a') orthogonalVector.scale(-1.0) else orthogonalVector
-                    result = result?.add(actorOffset.scale(0.33))
-                    orthogonalVector = offsetB.scale(2.5)
-                }
-            } else if (battle.format.battleType.pokemonPerSide == 3) { // Triples
-                if (battle.actors.first() != battle.actors.last()) {
-                    result = when (pnx[2]) {
-                        'a' -> {
-                            orthogonalVector = orthogonalVector.scale(-3.5)
-                            result?.add(actorOffset.scale(0.15))
-                        }
-                        'b' -> {
-                            orthogonalVector = Vec3.ZERO
-                            result?.add(actorOffset.scale(0.3))
-                        }
-                        'c' -> {
-                            orthogonalVector = orthogonalVector.scale(3.5)
-                            result?.add(actorOffset.scale(0.15))
-                        }
-                        else -> result
-                    }
-                }
-            }
-            val fallbackPos = result
-            result = result?.add(orthogonalVector)
-            if (actor is EntityBackedBattleActor<*> && result != null) {
-                val entity = actor.entity ?: return result
-                // Do a single raycast to estimate if we're trying to throw a pokemon into a wall.
-                // If the collision is too close to the actor, try to find a more reasonable position.
-                // The motivation here is to give setPositionSafely something more reasonable to work with.
-                val collisionResult = entity.level().clip(
-                        ClipContext(
-                                actorEntityPos!!.add(Vec3(0.0,entity.eyeHeight.toDouble(),0.0)), // start position
-                                Vec3(result.x, entity.y + entity.eyeHeight.toDouble(), result.z), // end position
-                                ClipContext.Block.OUTLINE,
-                                ClipContext.Fluid.NONE,
-                                entity
-                        )
-                )
-                if (collisionResult.type == HitResult.Type.BLOCK) {
-                    // Collided with terrain
-                    result = if (collisionResult.location.distanceToSqr(actorEntityPos) < pokemonWidth) {
-                        // Fallback to in between the two actors, dropping the orthogonal vector
-                        // Ideally this keeps a pokemon in between the actors in a narrow tunnel
-                        fallbackPos
-                    } else {
-                        Vec3(collisionResult.location.x, result.y, collisionResult.location.z)
-                    }
-                }
-            }
-        }
-        return result
-    }
 }
@@ -22,8 +22,6 @@ import com.cobblemon.mod.common.battles.interpreter.instructions.*
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.util.battleLang
 import com.cobblemon.mod.common.util.runOnServer
-import net.minecraft.world.level.ClipContext
-import net.minecraft.world.phys.HitResult
 import net.minecraft.world.phys.Vec3
 import java.util.UUID
 import kotlin.collections.Iterator
@@ -36,7 +34,6 @@ import kotlin.collections.mutableMapOf
 import kotlin.collections.set
 import kotlin.collections.toMutableList
 import kotlin.collections.toTypedArray
-import kotlin.time.measureTime

@Suppress("KotlinPlaceholderCountMatchesArgumentCount", "UNUSED_PARAMETER")
 object ShowdownInterpreter {
@@ -141,6 +138,85 @@ object ShowdownInterpreter {
        // Note '-cureteam' is a legacy thing that is only used in generation 2 and 4 mods for heal bell and aromatherapy respectively as such we can just ignore that
    }

+    /**
+     *
+     * Figures out the sendout position for a pokemon in a battle
+     * 
+     *
+     */
+     fun getSendoutPosition(battle: PokemonBattle, activePokemon: ActiveBattlePokemon, battleActor: BattleActor): Vec3? {
+        val pnx = activePokemon.getPNX()
+        val actorEntityPosList = battleActor.getSide().actors.mapNotNull { if (it is EntityBackedBattleActor<*>) it.initialPos else null }
+        val actorEntityPos = if (actorEntityPosList.size == 1)
+            actorEntityPosList[0]
+        else if (actorEntityPosList.size > 1)
+            actorEntityPosList.fold(Vec3(0.0, 0.0, 0.0)) { acc, vec3 -> acc.add(vec3.scale(1.0 / actorEntityPosList.size)) }
+        else
+            null
+        val opposingActorEntityList = battleActor.getSide().getOppositeSide().actors.mapNotNull { if (it is EntityBackedBattleActor<*>) it.initialPos else null }
+        val opposingEntityPos = if (opposingActorEntityList.size == 1)
+            opposingActorEntityList[0]
+        else if (opposingActorEntityList.size > 1) {
+            // If multiple actors per side, avg their position
+            opposingActorEntityList.fold(Vec3(0.0, 0.0, 0.0)) { acc, vec3 -> acc.add(vec3.scale(1.0 / opposingActorEntityList.size)) }
+        }
+        else null
+        
+        var actorOffset = actorEntityPos?.let { opposingEntityPos?.subtract(it) }
+        var result = actorEntityPos
+        if (actorOffset != null) {
+            var widthSum = 4.0 // Leave a constant to allow double/triples alignment to be consistent
+            if (battle.format.battleType.pokemonPerSide == 1) {
+                activePokemon.battlePokemon?.let { battlePokemon ->
+                    // sum of the hitbox widths of both pokemon
+                    val opposingActivePokemon = (activePokemon.getOppositeOpponent() as ActiveBattlePokemon)
+                    val pokemonWidth = battlePokemon.originalPokemon.form.hitbox.width * battlePokemon.originalPokemon.form.baseScale
+                    val opposingPokemonWidth = opposingActivePokemon.battlePokemon?.let {
+                        it.originalPokemon.form.hitbox.width * it.originalPokemon.form.baseScale
+                    } ?: pokemonWidth
+                    widthSum = (pokemonWidth + opposingPokemonWidth) / 2.0 // Only care about the front half of each hitbox
+                }
+            }
+
+            val minDistance = 4.0 + widthSum
+            val actorDistance = actorOffset.length()
+
+            if (actorDistance < minDistance) {
+                val temp = actorOffset.scale(minDistance / actorDistance) ?: actorOffset
+                result = actorEntityPos?.subtract(temp.subtract(actorOffset))
+                actorOffset = temp
+            }
+            var vector = Vec3(actorOffset.x, 0.0, actorOffset.z).normalize()
+            vector = vector.cross(Vec3(0.0, 1.0, 0.0))
+
+            if (battle.format.battleType.pokemonPerSide == 1) { // Singles
+                result = result?.add(actorOffset.scale(if (battle.isPvW) 0.4 else 0.3))
+                activePokemon.battlePokemon?.let { battlePokemon ->
+                    val hitbox = battlePokemon.originalPokemon.form.hitbox
+                    val scale = battlePokemon.originalPokemon.form.baseScale
+                    activePokemon.getAdjacentOpponents()
+                    result = result?.add(vector.scale(-0.3 - hitbox.width * scale ))
+                }
+            } else if (battle.format.battleType.pokemonPerSide == 2) { // Doubles/Multi
+                if (battle.actors.first() !== battle.actors.last()) {
+                    val offsetB = if (pnx[2] == 'a') vector.scale(-1.0) else vector
+                    result = result?.add(actorOffset.scale(0.33))?.add(offsetB.scale(2.5))
+                }
+            } else if (battle.format.battleType.pokemonPerSide == 3) { // Triples
+                if (battle.actors.first() !== battle.actors.last()) {
+                    result = when (pnx[2]) {
+                        'a' -> result?.add(actorOffset.scale(0.15))?.add(vector.scale(-3.5))
+                        'b' -> result?.add(actorOffset.scale(0.3))
+                        'c' -> result?.add(actorOffset.scale(0.15))?.add(vector.scale(3.5))
+                        else -> result
+                    }
+                }
+            }
+        }
+        return result
+    }
+
+

    fun interpretMessage(battleId: UUID, message: String) {
        // Check key map and use function if matching
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.battles.ShowdownInterpreter
 import com.cobblemon.mod.common.battles.dispatch.InstructionSet
 import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
+import com.cobblemon.mod.common.entity.pokemon.effects.IllusionEffect
 import com.cobblemon.mod.common.net.messages.client.battle.BattleSwapPokemonPacket
 import com.cobblemon.mod.common.util.battleLang
 import com.cobblemon.mod.common.util.setPositionSafely
@@ -41,12 +42,12 @@ class SwapInstruction(val message: BattleMessage, val instructionSet: Instructio
                // Swap references of the 2 pokemon
                actor.activePokemon.swap((pnxA[2] - 'a'), (pnxB[2] - 'a'))

-                val posA = activePokemonA.getSendOutPosition() ?: activePokemonA.position?.second
+                val posA = ShowdownInterpreter.getSendoutPosition(battle, activePokemonA, battlePokemonA.actor) ?: activePokemonA.position?.second
                if (posA != null && battlePokemonA.entity != null) {
                    battlePokemonA.entity?.setPositionSafely(battlePokemonA.entity!!.getAjustedSendoutPosition(posA))
                }

-                val posB = activePokemonB.getSendOutPosition() ?: activePokemonB.position?.second
+                val posB = ShowdownInterpreter.getSendoutPosition(battle, activePokemonB, battlePokemonA.actor) ?: activePokemonB.position?.second
                val battlePokemonB = activePokemonB.battlePokemon
                if (posB != null && battlePokemonB?.entity != null) {
                    activePokemonB.battlePokemon?.entity?.setPositionSafely(battlePokemonB.entity!!.getAjustedSendoutPosition(posB))
@@ -70,7 +70,7 @@ class SwitchInstruction(val instructionSet: InstructionSet, val battleActor: Bat
                else if (pokemonEntity == null && entity != null) {
                    activePokemon.battlePokemon = pokemon
                    activePokemon.illusion = illusion
-                    val targetPos = activePokemon.getSendOutPosition()
+                    val targetPos = ShowdownInterpreter.getSendoutPosition(battle, activePokemon, battleActor)
                    if (targetPos != null) {
                        val battleSendoutCount = activePokemon.getActorShowdownId()[1].digitToInt() - 1 + actor.stillSendingOutCount
                        actor.stillSendingOutCount++
@@ -180,7 +180,7 @@ class SwitchInstruction(val instructionSet: InstructionSet, val battleActor: Bat
                    }
                } else {
                    // For Singles, we modify the sendout position based on the pokemon's hitbox size
-                    val pos = (if (battle.format.battleType.pokemonPerSide == 1) activePokemon.getSendOutPosition()
+                    val pos = (if (battle.format.battleType.pokemonPerSide == 1) ShowdownInterpreter.getSendoutPosition(battle, activePokemon, actor)
                        else  activePokemon.position?.second) ?: entity.position()
                    // Send out at previous Pokémon's location if it is known, otherwise actor location
                    val world = entity.level() as ServerLevel
@@ -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.client
-
-import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import net.minecraft.util.Mth
-import net.minecraft.world.phys.Vec3
-
-/**
- * This class is responsible for setting up the animation state of a Pokemon entity before it begins to render.
- *
- * Sometimes we depend on the animation state of the Pokemon to be set up before we begin rendering it, so this class
- * allows us to do that. It also caches which Pokemon have been pre-animated to avoid doing it multiple times.
- *
- * @author landonjw
- */
-object MountedPokemonAnimationRenderController {
-    private val forcedDeltas = mutableMapOf<Int, Float>()
-
-    fun setup(pokemon: PokemonEntity, partialTickTime: Float) {
-        if (forcedDeltas.contains(pokemon.id)) return
-
-        val delegate = pokemon.delegate as? PokemonClientDelegate ?: return
-        val model = delegate.currentModel ?: return
-        if (!model.isReadyForAnimation()) return
-
-        val entityPos = Vec3(
-            Mth.lerp(partialTickTime.toDouble(), pokemon.xOld, pokemon.x),
-            Mth.lerp(partialTickTime.toDouble(), pokemon.yOld, pokemon.y),
-            Mth.lerp(partialTickTime.toDouble(), pokemon.zOld, pokemon.z)
-        )
-
-        val f = Mth.rotLerp(partialTickTime, pokemon.yBodyRotO, pokemon.yBodyRot)
-        val g = Mth.rotLerp(partialTickTime, pokemon.yHeadRotO, pokemon.yHeadRot)
-        var h = g - f
-        val j = Mth.lerp(partialTickTime, pokemon.xRotO, pokemon.xRot)
-        h = Mth.wrapDegrees(h)
-
-        var l = 0.0f
-        var m = 0.0f
-        if (!pokemon.isPassenger && pokemon.isAlive) {
-            l = pokemon.walkAnimation.speed(partialTickTime)
-            m = pokemon.walkAnimation.position(partialTickTime)
-            if (pokemon.isBaby) {
-                m *= 3.0f
-            }
-
-            if (l > 1.0f) {
-                l = 1.0f
-            }
-        }
-
-        delegate.updatePartialTicks(partialTickTime)
-        delegate.updateLocatorPosition(entityPos)
-        delegate.currentModel?.applyAnimations(pokemon, delegate, l, m, partialTickTime, j, h)
-
-        forcedDeltas[pokemon.id] = partialTickTime
-    }
-
-    fun getPartialTick(pokemon: PokemonEntity) : Float? {
-        return forcedDeltas[pokemon.id]
-    }
-
-    /**
-     * Resets the prerendered list. This should be called in the render loop before we begin setting up any pokemon with `setup`.
-     */
-    fun reset() {
-        forcedDeltas.clear()
-    }
-}
@@ -34,11 +34,7 @@ import com.cobblemon.mod.common.client.render.pokemon.PokemonRenderer.Companion.
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.ServerboundUpdateRidingStatePacket
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.MovingSoundInstance
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.resolve
+import com.cobblemon.mod.common.util.*
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.Minecraft
 import net.minecraft.network.syncher.EntityDataAccessor
@@ -47,10 +43,8 @@ import net.minecraft.sounds.SoundEvent
 import net.minecraft.sounds.SoundSource
 import net.minecraft.world.InteractionHand
 import net.minecraft.world.entity.Entity
-import net.minecraft.world.entity.Entity.MoveFunction
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec3
-import org.joml.Vector3f

 class PokemonClientDelegate : PosableState(), PokemonSideDelegate {
    companion object {
@@ -349,12 +343,9 @@ class PokemonClientDelegate : PosableState(), PokemonSideDelegate {
        runtime.environment.query = struct
    }

-    override fun updateAge(age: Int) {
-        this.age = age
-    }
-
    override fun initialize(entity: PokemonEntity) {
        this.currentEntity = entity
+        this.age = entity.tickCount

        this.runtime.environment.query.addFunctions(mapOf(
            "in_battle" to java.util.function.Function {
@@ -460,30 +451,4 @@ class PokemonClientDelegate : PosableState(), PokemonSideDelegate {
        }
        cryAnimation = animation
    }
-
-    override fun positionRider(passenger: Entity, positionUpdater: MoveFunction) {
-        val index =
-            this.getEntity().passengers.indexOf(passenger).takeIf { it >= 0 && it < this.getEntity().seats.size }
-                ?: return
-        val seat = this.getEntity().seats[index]
-        val locator = this.locatorStates[seat.locator]
-
-        if (locator == null) return
-
-        val offset = locator.matrix.getTranslation(Vector3f())
-            .sub(
-                Vector3f(
-                    0f,
-                    passenger.eyeHeight - (passenger.bbHeight / 2),
-                    0f
-                )
-            ) // This is close but not exact
-
-        positionUpdater.accept(
-            passenger,
-            this.getEntity().x + offset.x,
-            this.getEntity().y + offset.y,
-            this.getEntity().z + offset.z
-        )
-    }
 }
@@ -98,13 +98,13 @@ class CobblemonConfigIntVariable(
    override fun getConfigValueAsString(): String = (config.getter.call(parent.parent.clonedConfig) as Int?).toString()

    init {
-        editBox.setFilter { value -> value.toIntOrNull() != null || value.isBlank() || value == "-" }
+        editBox.setFilter { value -> value.toIntOrNull() != null || value.isBlank() }
        editBox.setResponder { value ->
            if (value.isBlank()) {
                return@setResponder
            }

-            val intValue = value.toIntOrNull() ?: return@setResponder
+            val intValue = value.toInt()
            setConfigValue(intValue, false)

            if (intConstraintAnnotation != null) {
@@ -129,7 +129,7 @@ class CobblemonConfigFloatVariable(
    override fun getConfigValueAsString(): String = (config.getter.call(parent.parent.clonedConfig) as Float?).toString()

    init {
-        editBox.setFilter { value -> value.toFloatOrNull() != null || value.isBlank() || value == "." || value == "-" }
+        editBox.setFilter { value -> value.toFloatOrNull() != null || value.isBlank() }
        editBox.setResponder { value ->
            if (value.toFloatOrNull() != null) {
                setConfigValue(value.toFloat(), false)
@@ -145,7 +145,7 @@ class CobblemonConfigDoubleVariable(
    override fun getConfigValueAsString(): String = (config.getter.call(parent.parent.clonedConfig) as Double?).toString()

    init {
-        editBox.setFilter { value -> value.toDoubleOrNull() != null || value.isBlank() || value == "." || value == "-" }
+        editBox.setFilter { value -> value.toDoubleOrNull() != null || value.isBlank() }
        editBox.setResponder { value ->
            if (value.toDoubleOrNull() != null) {
                setConfigValue(value.toDouble(), false)
@@ -125,7 +125,6 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
    private lateinit var markingsWidget: MarkingsWidget
    private val summaryTabs = mutableListOf<SummaryTab>()
    private var showCosmeticItem = false
-    private lateinit var heldItemVisibilityButton: SummaryButton
    private var mainScreenIndex = INFO
    var sideScreenIndex = PARTY
    private val party = ArrayList(party)
@@ -182,7 +181,7 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
        )

        //Item Visibility Button
-        heldItemVisibilityButton = SummaryButton(
+        val HeldItemVisibilityButton = SummaryButton(
            buttonX = x + 3F,
            buttonY = y + 104F,
            buttonWidth = 32,
@@ -192,7 +191,7 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
            activeResource = itemHiddenResource,
            clickAction = {
                selectedPokemon.heldItemVisible = !selectedPokemon.heldItemVisible
-                heldItemVisibilityButton.buttonActive = !selectedPokemon.heldItemVisible
+                (it as SummaryButton).buttonActive = !selectedPokemon.heldItemVisible
                modelWidget.heldItem = if (selectedPokemon.heldItemVisible) selectedPokemon.heldItem else null
                // Send item visibility update to server
                sendToServer(SetItemHiddenPacket(selectedPokemon.uuid, selectedPokemon.heldItemVisible))
@@ -200,8 +199,8 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
            renderRequirement = { !selectedPokemon.heldItemNoCopy().isEmpty && !showCosmeticItem },
            clickRequirement = { !selectedPokemon.heldItemNoCopy().isEmpty && !showCosmeticItem }
        )
-        heldItemVisibilityButton.buttonActive = !selectedPokemon.heldItemVisible
-        addRenderableWidget(heldItemVisibilityButton)
+
+        addRenderableWidget(HeldItemVisibilityButton)

        // Held/Cosmetic Item Button
        addRenderableWidget(
@@ -332,7 +331,6 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
        if (::modelWidget.isInitialized) {
            modelWidget.pokemon = selectedPokemon.asRenderablePokemon()
            modelWidget.heldItem = if (selectedPokemon.heldItemVisible) selectedPokemon.heldItem else null
-            heldItemVisibilityButton.buttonActive = !selectedPokemon.heldItemVisible
        }

        if (::nicknameEntryWidget.isInitialized) nicknameEntryWidget.setSelectedPokemon(selectedPokemon)
@@ -18,6 +18,7 @@ import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.network.chat.Component
 import net.minecraft.world.item.ItemStack
+import net.minecraft.world.phys.Vec3
 import org.joml.Quaternionf
 import org.joml.Vector3f

@@ -113,13 +114,12 @@ class ModelWidget(
        )

        heldItemRenderer.renderOnModel(
-            heldItem?: ItemStack.EMPTY,
            state.currentModel!!,
+            heldItem?: ItemStack.EMPTY,
            state,
            matrices,
            context.bufferSource(),
-            light = 0xF000F0,
-            true
+            Vec3(0.0,-90.0,-90.0)
        )

        matrices.popPose()
@@ -36,13 +36,11 @@ class MarksScrollingWidget(val pX: Int, val pY: Int, val setSelectedMark: () ->

    fun createEntries(marks: List<Mark?>) {
        marks.chunked(6).forEachIndexed { index, listChunk ->
-            addEntry(ScrollSlotRow(this, listChunk, setSelectedMark, setHoveredMark))
+            addEntry(ScrollSlotRow(listChunk, setSelectedMark, setHoveredMark))
        }
    }

-    override fun getRowLeft(): Int = if (children().size > 5) (left + 1) else left
-
-    override fun getScrollbarPosition(): Int = rowLeft + width - 3
+    override fun getScrollbarPosition(): Int = pX + width - 3

    override fun renderScrollbar(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
        // Do not render scrollbar if all rows are already visible
@@ -59,8 +57,8 @@ class MarksScrollingWidget(val pX: Int, val pY: Int, val setSelectedMark: () ->
                yTop = this.y
            }

-            context.fill(xLeft, this.y, xRight, this.bottom, FastColor.ARGB32.color(255, 75, 75, 75)) // background
-            context.fill(xLeft,yTop, xRight, yTop + yBottom, FastColor.ARGB32.color(255, 141, 141, 141)) // base
+            context.fill(xLeft, this.y, xRight, this.bottom, FastColor.ARGB32.color(255, 47, 47, 47)) // background
+            context.fill(xLeft,yTop, xRight, yTop + yBottom, FastColor.ARGB32.color(255, 198, 198, 198)) // base
        }
    }

@@ -74,7 +72,7 @@ class MarksScrollingWidget(val pX: Int, val pY: Int, val setSelectedMark: () ->
    override fun getEntry(index: Int): ScrollSlotRow = children()[index] as ScrollSlotRow

    override fun renderListItems(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        val rowX = rowLeft
+        val rowX = this.rowLeft

        var anyHovered = false
        for (index in 0 until this.itemCount) {
@@ -98,7 +96,6 @@ class MarksScrollingWidget(val pX: Int, val pY: Int, val setSelectedMark: () ->
    }

    class ScrollSlotRow(
-        val parent: MarksScrollingWidget,
        val markList:  List<Mark?>,
        val setSelectedMark : () -> Unit,
        val setHoveredMark: (Mark?) -> Unit
@@ -112,11 +109,10 @@ class MarksScrollingWidget(val pX: Int, val pY: Int, val setSelectedMark: () ->

        fun renderRow(context: GuiGraphics, y: Int, x: Int, mouseX: Int, mouseY: Int): Boolean {
            var anyHovered = false
-            val horizontalSpacing = if (isScrollVisible()) SLOT_SPACING else (SLOT_SPACING + 1)
            markList.forEachIndexed { index, mark ->
                val matrices = context.pose()

-                val startPosX = x + ((horizontalSpacing + SLOT_SIZE) * index)
+                val startPosX = x + ((SLOT_SPACING + SLOT_SIZE) * index)
                val startPosY = y + SLOT_SPACING

                val slotHovered = mark != null && getHoveredSlotIndex(mouseX, mouseY) == index
@@ -160,12 +156,9 @@ class MarksScrollingWidget(val pX: Int, val pY: Int, val setSelectedMark: () ->
            return true
        }

-        private fun isScrollVisible(): Boolean = parent.children().size > 5
-
        private fun getHoveredSlotIndex(mouseX: Int, mouseY: Int): Int {
-            val horizontalSpacing = if (isScrollVisible()) SLOT_SPACING else (SLOT_SPACING + 1)
            markList.forEachIndexed { index, _ ->
-                val startPosX = x + ((horizontalSpacing + SLOT_SIZE) * index)
+                val startPosX = x + ((SLOT_SPACING + SLOT_SIZE) * index)
                val startPosY = y + SLOT_SPACING + 1

                if (mouseX in startPosX..(startPosX + SLOT_SIZE)
@@ -42,7 +42,7 @@ class MarksWidget(
    var hoveredMark: Mark? = null

    val marksScrollList = MarksScrollingWidget(
-        pX = pX + 9,
+        pX = pX + 10,
        pY = pY + 45,
        setSelectedMark = {
            if (hoveredMark != null) {
@@ -11,12 +11,9 @@ package com.cobblemon.mod.common.client.render.item
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags.WEARABLE_FACE_ITEMS
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags.WEARABLE_HAT_ITEMS
-import com.cobblemon.mod.common.client.entity.NPCClientDelegate
-import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
-import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
+import com.cobblemon.mod.common.client.render.MatrixWrapper
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.mojang.blaze3d.systems.RenderSystem
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.math.Axis
 import net.minecraft.client.Minecraft
@@ -27,7 +24,7 @@ import net.minecraft.client.renderer.texture.OverlayTexture
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.item.ItemDisplayContext
 import net.minecraft.world.item.ItemStack
-import org.joml.Vector3f
+import net.minecraft.world.phys.Vec3

 class HeldItemRenderer {
    private val itemRenderer: ItemRenderer = Minecraft.getInstance().itemRenderer
@@ -37,91 +34,133 @@ class HeldItemRenderer {
        const val ITEM_FACE = "item_face"
        const val ITEM_HAT = "item_hat"
        const val ITEM = "item"
-
-        private fun PoseStack.setOriginAndScale(x:Float,y:Float,z:Float,scale:Float=1f) {
-            this.translate(x*.0625*scale, y*.0625*scale, z*.0625*scale)
-            this.scale(scale, scale, scale)
-        }
    }

-    fun renderOnModel(
-        item: ItemStack,
-        model: PosableModel,
-        state: PosableState,
-        poseStack: PoseStack,
-        buffer: MultiBufferSource,
-        light: Int = LightTexture.pack(11, 7),
-        frontLight: Boolean = false,
-        entity: LivingEntity? = null
-    ) {
-        if (!item.`is`(CobblemonItemTags.HIDDEN_ITEMS)) renderAtLocator(item, model, state, entity, poseStack, buffer, light, 0, frontLight)
-        state.animationItems.forEach { (targetLocator, item) -> renderAtLocator(item, model, state, entity, poseStack, buffer, light, 0, frontLight, targetLocator) }
-    }
-
-    private fun renderAtLocator(
-        item: ItemStack,
-        model: PosableModel,
-        state: PosableState,
+    fun render(
        entity: LivingEntity?,
+        model: PosableModel,
+        item: ItemStack,
+        locators: Map<String, MatrixWrapper>,
        poseStack: PoseStack,
        buffer: MultiBufferSource,
        light: Int,
        seed: Int,
-        frontLight: Boolean = false,
-        targetLocator: String =
-            if (item.`is`(WEARABLE_FACE_ITEMS) && state.locatorStates.containsKey(ITEM_FACE)) ITEM_FACE
-            else if (item.`is`(WEARABLE_HAT_ITEMS) && state.locatorStates.containsKey(ITEM_HAT)) ITEM_HAT
-            else ITEM
+        rotation: Vec3
    ) {
        if (item.isEmpty) return
+        displayContext = ItemDisplayContext.FIXED

-        if (state.locatorStates.containsKey(targetLocator)) {
+        poseStack.pushPose()
+        when {
+            //item_face locator
+            (locators.containsKey(ITEM_FACE) && item.`is`(WEARABLE_FACE_ITEMS)) -> {
+                displayContext = model.getLocatorDisplayContext(ITEM_FACE) ?: ItemDisplayContext.HEAD
+                poseStack.mulPose(locators[ITEM_FACE]!!.matrix)
+                poseStack.translate(0f, 0f, .28f)
+                poseStack.scale(0.7f, 0.7f, 0.7f)
+            }
+            //item_hat locator
+            (locators.containsKey(ITEM_HAT) && item.`is`(WEARABLE_HAT_ITEMS)) -> {
+                displayContext = model.getLocatorDisplayContext(ITEM_HAT) ?: ItemDisplayContext.HEAD
+                poseStack.mulPose(locators[ITEM_HAT]!!.matrix)
+                poseStack.translate(0f, -0.26f, 0f)
+                poseStack.scale(.68f, .68f, .68f)
+            }
+            //item locator
+            (locators.containsKey(ITEM)) -> {
+                displayContext = model.getLocatorDisplayContext(ITEM) ?: ItemDisplayContext.FIXED
+                poseStack.mulPose(locators[ITEM]!!.matrix)
+                applyContextTransformation(poseStack, rotation)
+            }
+            // Don't render any item
+            else -> {
+                poseStack.popPose()
+                return
+            }
+        }
+
+        itemRenderer.renderStatic(entity, item, displayContext, (displayContext==ItemDisplayContext.THIRD_PERSON_LEFT_HAND), poseStack, buffer, null, light, OverlayTexture.NO_OVERLAY, seed)
+        poseStack.popPose()
+    }
+
+    private fun renderAnimationItem(
+        model: PosableModel,
+        state: PosableState,
+        locators: Map<String, MatrixWrapper>,
+        poseStack: PoseStack,
+        buffer: MultiBufferSource,
+        light: Int,
+        entity: LivingEntity?,
+        rotation: Vec3
+    ) {
+        state.itemRenderingLocations.forEach { (locatorName, item) ->
            poseStack.pushPose()
-            RenderSystem.applyModelViewMatrix()
-
-            displayContext = model.getLocatorDisplayContext(targetLocator)?:
-                if ((item.`is`(WEARABLE_FACE_ITEMS) && targetLocator==ITEM_FACE) || (item.`is`(WEARABLE_HAT_ITEMS) && targetLocator== ITEM_HAT)) ItemDisplayContext.HEAD
-                else ItemDisplayContext.FIXED
-
-            poseStack.mulPose(state.locatorStates[targetLocator]!!.matrix)
-            when (displayContext) {
-                ItemDisplayContext.FIXED -> {
-                    poseStack.setOriginAndScale(0f,.5f,0f, .5f)
-                    poseStack.mulPose(Axis.XP.rotationDegrees(90.0f))
-                }
-                ItemDisplayContext.THIRD_PERSON_RIGHT_HAND, ItemDisplayContext.THIRD_PERSON_LEFT_HAND -> {
-                    //For Minecraft player models
-                    if (state is NPCClientDelegate) {
-                        poseStack.mulPose(Axis.XP.rotationDegrees(-90.0F))
-                    }
-                    //for T-Posing Models
-                    else if (state is PokemonClientDelegate || state is FloatingState) {
-                        poseStack.mulPose(Axis.YP.rotationDegrees(-90.0F))
-                        poseStack.mulPose(Axis.ZP.rotationDegrees(90.0F))
-                    }
-                    poseStack.translate(0.025f * if (displayContext==ItemDisplayContext.THIRD_PERSON_LEFT_HAND) 1 else -1 , 0.0f, 0.0f)
-                }
-                ItemDisplayContext.HEAD -> {
-                    if (state is NPCClientDelegate) {
-                        if (item.`is`(WEARABLE_FACE_ITEMS)) poseStack.setOriginAndScale(0f,-2f,7.25f, 0.62f)
-                        else if (item.`is`(WEARABLE_HAT_ITEMS)) poseStack.setOriginAndScale(0f,-10.25f,0f, 0.62f)
-                    }
-                    else {
-                        if (item.`is`(WEARABLE_FACE_ITEMS)) poseStack.setOriginAndScale(0f,1f,(7.25f)-.5f, 0.62f)
-                        else if (item.`is`(WEARABLE_HAT_ITEMS)) poseStack.setOriginAndScale(0f,(-7.25f)+.5f,0f, 0.62f)
-                    }
-                }
-                else -> {}
+            if (locators.containsKey(locatorName)) {
+                displayContext = model.getLocatorDisplayContext(locatorName)?: ItemDisplayContext.FIXED
+                poseStack.mulPose(locators[locatorName]!!.matrix)
+                applyContextTransformation(poseStack, rotation)
            }
-
-            //Render front lighting for UI Models
-            if (frontLight) {
-                RenderSystem.setShaderLights(Vector3f(0F,0F,1F), Vector3f(0F,0F,1F))
-            }
-
-            itemRenderer.renderStatic(entity, item, displayContext, (displayContext==ItemDisplayContext.THIRD_PERSON_LEFT_HAND), poseStack, buffer, null, light, OverlayTexture.NO_OVERLAY, seed)
-
+            itemRenderer.renderStatic(entity, item, displayContext, (displayContext==ItemDisplayContext.THIRD_PERSON_LEFT_HAND), poseStack, buffer, null, light, OverlayTexture.NO_OVERLAY, 0)
            poseStack.popPose()
        }
    }
+
+    fun renderOnModel(
+        model: PosableModel,
+        item: ItemStack,
+        state: PosableState,
+        poseStack: PoseStack,
+        buffer: MultiBufferSource,
+        rotation: Vec3 = Vec3(0.0,0.0,0.0),
+        light: Int = LightTexture.pack(11, 7),
+    ) {
+        val locators: Map<String, MatrixWrapper> = state.locatorStates
+        if (state.itemRenderingLocations.isNotEmpty()) {
+            renderAnimationItem(model, state, locators, poseStack, buffer, light, null, rotation)
+        }
+        else if (!item.`is`(CobblemonItemTags.HIDDEN_ITEMS)) {
+            render(null, model, item, locators, poseStack, buffer, light, 0, rotation)
+        }
+    }
+
+    fun renderOnEntity(
+        entity: LivingEntity,
+        item: ItemStack,
+        model: PosableModel,
+        state: PosableState,
+        poseStack: PoseStack,
+        buffer: MultiBufferSource,
+        light: Int,
+        rotation: Vec3 = Vec3(0.0,0.0,0.0)
+    ) {
+        val locators: Map<String, MatrixWrapper> = state.locatorStates
+        if (state.itemRenderingLocations.isNotEmpty()) {
+            renderAnimationItem(model, state, locators, poseStack, buffer, light, entity, rotation)
+        }
+        else {
+            render(entity, model, item, locators, poseStack, buffer, light, 0, rotation)
+        }
+    }
+
+    private fun applyContextTransformation(poseStack: PoseStack, rotation: Vec3) {
+        when (displayContext) {
+            ItemDisplayContext.FIXED -> {
+                poseStack.mulPose(Axis.XP.rotationDegrees(90.0f))
+                poseStack.scale(.5f, .5f, .5f )
+                poseStack.translate(0f, 0.01666f, 0f)
+            }
+            ItemDisplayContext.THIRD_PERSON_RIGHT_HAND, ItemDisplayContext.THIRD_PERSON_LEFT_HAND -> {
+                poseStack.mulPose(Axis.XP.rotationDegrees((rotation.x).toFloat()))
+                poseStack.mulPose(Axis.YP.rotationDegrees((rotation.y).toFloat()))
+                poseStack.mulPose(Axis.ZP.rotationDegrees((rotation.z).toFloat()))
+                poseStack.translate(0.025f * if (displayContext==ItemDisplayContext.THIRD_PERSON_LEFT_HAND) 1 else -1 , 0.0f, 0.0f)
+            }
+            ItemDisplayContext.HEAD -> {
+                poseStack.mulPose(Axis.XP.rotationDegrees(90.0f))
+                poseStack.scale(.6f, .6f, .6f)
+                poseStack.translate(0f, -0.6f, 0f)
+            }
+            else -> {}
+        }
+    }
 }
@@ -37,6 +37,7 @@ import net.minecraft.nbt.Tag
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
+import net.minecraft.world.phys.Vec3

 class PokemonOnShoulderRenderer<T : Player>(renderLayerParent: RenderLayerParent<T, PlayerModel<T>>) : RenderLayer<T, PlayerModel<T>>(renderLayerParent) {

@@ -161,12 +162,12 @@ class PokemonOnShoulderRenderer<T : Player>(renderLayerParent: RenderLayerParent
            }

            heldItemRenderer.renderOnModel(
-                shoulderData.shownItem,
                model,
+                shoulderData.shownItem,
                state,
                matrixStack,
                buffer,
-                packedLight
+                Vec3(0.0,-90.0,-90.0)
            )

            model.setDefault()
@@ -78,15 +78,8 @@ class JsonPose(model: PosableModel, json: JsonObject) {
                it[2].asDouble
            )
        } ?: Vec3.ZERO
-        val scale = it.get("scale")?.asJsonArray?.let {
-            Vec3(
-                it[0].asDouble,
-                it[1].asDouble,
-                it[2].asDouble
-            )
-        } ?: Vec3(1.0,1.0,1.0)
        val isVisible = it.get("isVisible")?.asString?.asExpressionLike()
-        return@map part.withPosition(position.x, position.y, position.z).withRotationDegrees(rotation.x, rotation.y, rotation.z).withScale(scale.x, scale.y, scale.z).also { if (isVisible != null) it.withVisibility(isVisible) }
+        return@map part.withPosition(position.x, position.y, position.z).withRotationDegrees(rotation.x, rotation.y, rotation.z).also { if (isVisible != null) it.withVisibility(isVisible) }
    }?.toTypedArray() ?: arrayOf()

    val idleAnimations = (json.get("animations")?.asJsonArray ?: JsonArray()).asJsonArray.mapNotNull {
@@ -40,6 +40,7 @@ import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.plus
 import com.cobblemon.mod.common.util.toRGBA
 import com.mojang.blaze3d.systems.RenderSystem
@@ -50,6 +51,7 @@ import com.mojang.blaze3d.vertex.VertexFormat
 import com.mojang.math.Axis
 import net.minecraft.client.Minecraft
 import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.client.player.RemotePlayer
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.RenderStateShard
 import net.minecraft.client.renderer.RenderType
@@ -57,6 +59,7 @@ import net.minecraft.client.renderer.texture.DynamicTexture
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.Mth
 import net.minecraft.world.entity.Entity
+import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.item.ItemDisplayContext
 import net.minecraft.world.phys.Vec3
 import org.joml.Matrix4f
@@ -93,9 +96,6 @@ open class PosableModel(@Transient override val rootPart: Bone) : ModelFrame {

    open var profileScale = 1F

-    /** Used for third person riding camera */
-    open var seatToCameraOffset = mutableMapOf<String, Vec3>()
-
    /**
     * These are open-ended properties that can be used to store miscellaneous properties about the model.
     *
@@ -532,7 +532,7 @@ open class PosableModel(@Transient override val rootPart: Bone) : ModelFrame {
    /** Puts the model back to its original location and rotations. */
    fun setDefault() {
        defaultPositions.forEach { it.set() }
-        transformedParts.forEach { it.apply() }
+        transformedParts.forEach { it.set() }
    }

    /**
@@ -827,6 +827,4 @@ open class PosableModel(@Transient override val rootPart: Bone) : ModelFrame {
        condition = condition,
        animations = { animations(it) }
    )
-
-    fun isReadyForAnimation() = ::context.isInitialized
 }
@@ -35,10 +35,8 @@ import com.cobblemon.mod.common.client.render.models.blockbench.quirk.ModelQuirk
 import com.cobblemon.mod.common.client.render.models.blockbench.quirk.QuirkData
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.mojang.brigadier.StringReader
-import com.mojang.brigadier.exceptions.CommandSyntaxException
 import net.minecraft.client.Minecraft
 import net.minecraft.client.multiplayer.ClientLevel
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
@@ -48,6 +46,7 @@ import net.minecraft.sounds.SoundSource
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.phys.Vec3
+import org.joml.Matrix4f
 import java.util.*
 import java.util.concurrent.ConcurrentLinkedQueue

@@ -129,140 +128,12 @@ abstract class PosableState : Schedulable {
    /** This gets called 500 million times so use a mutable value for runtime */
    private val reusableAnimTime = DoubleValue(0.0)

-    /** A list of items to be rendered on a PosableModel during an animation */
-    val animationItems = mutableMapOf<String, ItemStack>()
-
-    /** All of the MoLang functions that can be expose current riding data. */
-    val ridingFunctions = QueryStruct(hashMapOf())
-        .addFunction("pitch") { params ->
-            val lookBackTick = params.getInt(0)
-
-            val pokemon = getEntity() as? PokemonEntity ?: return@addFunction DoubleValue(0.0)
-            val partialTickPitch = pokemon.ridingAnimationData.rotSpring.getInterpolated(currentPartialTicks.toDouble(), lookBackTick).x
-            val maxPitch = 90.0
-            return@addFunction DoubleValue((partialTickPitch / maxPitch).coerceIn(-1.0,1.0))
-        }
-        .addFunction("yaw") { params ->
-            val lookBackTick = params.getInt(0)
-
-            val pokemon = getEntity() as? PokemonEntity ?: return@addFunction DoubleValue(0.0)
-            val partialTickYaw = pokemon.ridingAnimationData.rotSpring.getInterpolated(currentPartialTicks.toDouble(), lookBackTick).y
-            val maxYaw = 180.0
-            return@addFunction DoubleValue((partialTickYaw / maxYaw).coerceIn(-1.0,1.0))
-        }
-        .addFunction("roll") { params ->
-            val lookBackTick = params.getInt(0)
-
-            val pokemon = getEntity() as? PokemonEntity ?: return@addFunction DoubleValue(0.0)
-            val partialTickRoll = pokemon.ridingAnimationData.rotSpring.getInterpolated(currentPartialTicks.toDouble(), lookBackTick).z
-            val maxRoll = 180.0
-            return@addFunction DoubleValue((partialTickRoll / maxRoll).coerceIn(-1.0,1.0))
-        }
-        .addFunction("pitch_change") { params ->
-            val lookBackTick = params.getInt(0)
-
-            val pokemon = getEntity() as? PokemonEntity ?: return@addFunction DoubleValue(0.0)
-            val partialTickPitchDelta = pokemon.ridingAnimationData.rotDeltaSpring.getInterpolated(currentPartialTicks.toDouble(), lookBackTick).x
-            //TODO: hook back up the retrieval of the current behaviors stat for this and the following functions
-            val maxRotRate = 140.0//pokemon.riding.getController(pokemon)?.getStat(pokemon, RidingStat.SKILL)
-            //?: return@addFunction DoubleValue(0.0)
-            return@addFunction DoubleValue((partialTickPitchDelta / maxRotRate).coerceIn(-1.0,1.0))
-        }
-        .addFunction("yaw_change") { params ->
-            val lookBackTick = params.getInt(0)
-            val pokemon = getEntity() as? PokemonEntity ?: return@addFunction DoubleValue(0.0)
-            val partialTickYawDelta = pokemon.ridingAnimationData.rotDeltaSpring.getInterpolated(currentPartialTicks.toDouble(), lookBackTick).y
-            //TODO: make this not hardcoded
-            val maxRotRate = 140.0 //pokemon.riding.getController(pokemon)?.getStat(pokemon, RidingStat.SKILL)
-            //?: return@addFunction DoubleValue(0.0)
-            return@addFunction DoubleValue((partialTickYawDelta / maxRotRate).coerceIn(-1.0,1.0))
-        }
-        .addFunction("roll_change") { params ->
-            val lookBackTick = params.getInt(0)
-
-            val pokemon = getEntity() as? PokemonEntity ?: return@addFunction DoubleValue(0.0)
-            val partialTickRollDelta = pokemon.ridingAnimationData.rotDeltaSpring.getInterpolated(currentPartialTicks.toDouble(), lookBackTick).z
-            val maxRotRate = 140.0 //pokemon.riding.getController(pokemon)?.getStat(pokemon, RidingStat.SKILL)
-            //?: return@addFunction DoubleValue(0.0)
-            return@addFunction DoubleValue((partialTickRollDelta / maxRotRate).coerceIn(-1.0,1.0))
-        }
-        .addFunction("speed") { params ->
-            val lookBackTick = params.getInt(0)
-            val pokemon = getEntity() as? PokemonEntity ?: return@addFunction DoubleValue(0.0)
-
-            val partialTickSpeed = pokemon.ridingAnimationData.velocitySpring.getInterpolated(currentPartialTicks.toDouble(), lookBackTick).length()
-            val topSpeed = 1.0//pokemon.riding.getController(pokemon)?.getStat(pokemon, RidingStat.SPEED)
-            //?: return@addFunction DoubleValue(0.0)
-
-            return@addFunction DoubleValue((partialTickSpeed / topSpeed).coerceIn(-1.0,1.0))
-        }
-        .addFunction("velocity_x") { params ->
-            val lookBackTick = params.getInt(0)
-            val pokemon = getEntity() as? PokemonEntity ?: return@addFunction DoubleValue(0.0)
-
-            val partialTickXVel = pokemon.ridingAnimationData.velocitySpring.getInterpolated(currentPartialTicks.toDouble(), lookBackTick).x
-
-            val topSpeed = 1.0//pokemon.riding.getController(pokemon)?.getStat(pokemon, RidingStat.SPEED)
-            //?: return@addFunction DoubleValue(0.0)
-            return@addFunction DoubleValue((partialTickXVel / topSpeed).coerceIn(-1.0,1.0))
-        }
-        .addFunction("velocity_y") { params ->
-            val lookBackTick = params.getInt(0)
-            val pokemon = getEntity() as? PokemonEntity ?: return@addFunction DoubleValue(0.0)
-
-            val partialTickYVel = pokemon.ridingAnimationData.velocitySpring.getInterpolated(currentPartialTicks.toDouble(), lookBackTick).y
-
-            val topSpeed = 1.0//pokemon.riding.getController(pokemon)?.getStat(pokemon, RidingStat.SPEED)
-            //?: return@addFunction DoubleValue(0.0)
-            return@addFunction DoubleValue((partialTickYVel / topSpeed).coerceIn(-1.0,1.0))
-        }
-        .addFunction("velocity_z") { params ->
-            val lookBackTick = params.getInt(0)
-            val pokemon = getEntity() as? PokemonEntity ?: return@addFunction DoubleValue(0.0)
-
-            val partialTickZVel = pokemon.ridingAnimationData.velocitySpring.getInterpolated(currentPartialTicks.toDouble(), lookBackTick).z
-
-            val topSpeed = 1.0//pokemon.riding.getController(pokemon)?.getStat(pokemon, RidingStat.SPEED)
-            //?: return@addFunction DoubleValue(0.0)
-            return@addFunction DoubleValue((partialTickZVel / topSpeed).coerceIn(-1.0,1.0))
-        }
-        .addFunction("velocity_right") { params ->
-            val lookBackTick = params.getInt(0)
-            val pokemon = getEntity() as? PokemonEntity ?: return@addFunction DoubleValue(0.0)
-
-            val partialTickZVel = pokemon.ridingAnimationData.localVelocitySpring.getInterpolated(currentPartialTicks.toDouble(), lookBackTick).x
-
-            val topSpeed = 1.0//pokemon.riding.getController(pokemon)?.getStat(pokemon, RidingStat.SPEED)
-            //?: return@addFunction DoubleValue(0.0)
-            return@addFunction DoubleValue((partialTickZVel / topSpeed).coerceIn(-1.0,1.0) * -1.0)
-        }
-        .addFunction("velocity_upward") { params ->
-            val lookBackTick = params.getInt(0)
-            val pokemon = getEntity() as? PokemonEntity ?: return@addFunction DoubleValue(0.0)
-
-            val partialTickZVel = pokemon.ridingAnimationData.localVelocitySpring.getInterpolated(currentPartialTicks.toDouble(), lookBackTick).y
-
-            val topSpeed = 1.0//pokemon.riding.getController(pokemon)?.getStat(pokemon, RidingStat.SPEED)
-            //?: return@addFunction DoubleValue(0.0)
-            return@addFunction DoubleValue((partialTickZVel / topSpeed).coerceIn(-1.0,1.0))
-        }
-        .addFunction("velocity_forward") { params ->
-            val lookBackTick = params.getInt(0)
-            val pokemon = getEntity() as? PokemonEntity ?: return@addFunction DoubleValue(0.0)
-
-            val partialTickZVel = pokemon.ridingAnimationData.localVelocitySpring.getInterpolated(currentPartialTicks.toDouble(), lookBackTick).z
-
-            val topSpeed = 1.0//pokemon.riding.getController(pokemon)?.getStat(pokemon, RidingStat.SPEED)
-            //?: return@addFunction DoubleValue(0.0)
-            return@addFunction DoubleValue((partialTickZVel / topSpeed).coerceIn(-1.0,1.0))
-        }
-
+    val itemRenderingLocations = mutableMapOf<String, ItemStack>()
+//    var itemRenderingLocation = ""
+//    var animationItem : ItemStack? = null

    /** All of the MoLang functions that can be applied to something with this state. */
-    val functions = QueryStruct(hashMapOf(
-        "riding" to java.util.function.Function { ridingFunctions },
-        "r" to java.util.function.Function { ridingFunctions }
-    ))
+    val functions = QueryStruct(hashMapOf())
        .addFunction("anim_time") {
            reusableAnimTime.value = animationSeconds.toDouble()
            reusableAnimTime
@@ -288,27 +159,21 @@ abstract class PosableState : Schedulable {
        .addFunction("render_item") { params ->
            if (params.get<MoValue>(0) !is StringValue) return@addFunction Unit

-            val item: ItemStack
-            try {
-                val client = Minecraft.getInstance().connection ?: return@addFunction Unit
-                val result = ItemParser(client.registryAccess()).parse(StringReader(params.getString(0)))
-                item = ItemStack(result.item)
-                item.applyComponents(result.components)
-            }
-            catch (_: CommandSyntaxException) {
-                return@addFunction Unit
-            }
+            val client = Minecraft.getInstance().connection ?: return@addFunction Unit
+            val result = ItemParser(client.registryAccess()).parse(StringReader(params.getString(0)))
+            val item = ItemStack(result.item)
+            item.applyComponents(result.components)

            val renderLocation = if (params.contains(1)) params.getString(1) else "item"

            if (!item.isEmpty && locatorStates.containsKey(renderLocation)) {
-                animationItems.put(renderLocation, item)
+                itemRenderingLocations.put(renderLocation, item)
            } else {
-                if (animationItems.containsKey(renderLocation)) animationItems.remove(renderLocation)
+                if (itemRenderingLocations.containsKey(renderLocation)) itemRenderingLocations.remove(renderLocation)
                return@addFunction Unit
            }
        }
-        .addFunction("clear_items") { animationItems.clear() }
+        .addFunction("clear_items") { itemRenderingLocations.clear() }
        .addFunction("play_animation") { params ->
            val animationParameter = params.get<MoValue>(0)
            val animation = if (animationParameter is ObjectValue<*>) {
@@ -8,8 +8,10 @@

 package com.cobblemon.mod.common.client.render.models.blockbench

+import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.client.renderer.texture.OverlayTexture
 import net.minecraft.client.renderer.RenderType
 import com.mojang.blaze3d.vertex.VertexConsumer
@@ -34,6 +36,7 @@ abstract class PosableEntityModel<T : Entity>(
    val context: RenderContext = RenderContext().also {
        it.put(RenderContext.RENDER_STATE, RenderContext.RenderState.WORLD)
    }
+
    lateinit var posableModel: PosableModel

    override fun renderToBuffer(
@@ -76,25 +79,11 @@ abstract class PosableEntityModel<T : Entity>(
    ) {
        setupEntityTypeContext(entity)
        if (entity is PosableEntity) {
-            val ticks = getTicksForAnimation(entity, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch)
-            posableModel.applyAnimations(entity, entity.delegate as PosableState, limbSwing, limbSwingAmount, ticks, headYaw, headPitch)
+            val state = entity.delegate as PosableState
+            posableModel.applyAnimations(entity, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch)
        }
    }

-    /**
-     * This is to support cases where the ageInTicks value that should go to the animator is not the same as the entity's
-     * normal value. This can happen in the case of riding where it has been rendered in a different part of the pipeline
-     * and we want to prevent stuttering / re-render it for a specific moment.
-     */
-    open fun getTicksForAnimation(
-        entity: T,
-        limbSwing: Float,
-        limbSwingAmount: Float,
-        ageInTicks: Float,
-        headYaw: Float,
-        headPitch: Float
-    ): Float = ageInTicks
-
    open fun setupEntityTypeContext(entity: Entity?) {
        entity?.let {
            context.put(RenderContext.ENTITY, entity)
@@ -103,4 +92,4 @@ abstract class PosableEntityModel<T : Entity>(
            }
        }
    }
-}
+}
@@ -8,16 +8,12 @@

 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon

-import com.cobblemon.mod.common.client.MountedPokemonAnimationRenderController
 import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableEntityModel
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import net.minecraft.util.Mth
 import net.minecraft.world.entity.Entity
-import net.minecraft.world.phys.Vec3

 class PosablePokemonEntityModel : PosableEntityModel<PokemonEntity>() {
    override fun setupEntityTypeContext(entity: Entity?) {
@@ -30,28 +26,4 @@ class PosablePokemonEntityModel : PosableEntityModel<PokemonEntity>() {
                .let { texture -> context.put(RenderContext.TEXTURE, texture) }
        }
    }
-
-    // TODO: This is a bit of a hack, but it works for now. We should find a better way to do this.
-    override fun getTicksForAnimation(
-        entity: PokemonEntity,
-        limbSwing: Float,
-        limbSwingAmount: Float,
-        ageInTicks: Float,
-        headYaw: Float,
-        headPitch: Float
-    ): Float {
-        val delegate = entity.delegate as? PosableState
-        val forcedTick = MountedPokemonAnimationRenderController.getPartialTick(entity)
-        if (entity.passengers.isEmpty() || delegate == null || forcedTick == null) {
-            return ageInTicks
-        }
-        delegate.updatePartialTicks(forcedTick)
-        val entityPos = Vec3(
-            Mth.lerp(forcedTick.toDouble(), entity.xOld, entity.x),
-            Mth.lerp(forcedTick.toDouble(), entity.yOld, entity.y),
-            Mth.lerp(forcedTick.toDouble(), entity.zOld, entity.z)
-        )
-        delegate.updateLocatorPosition(entityPos)
-        return forcedTick
-    }
 }
@@ -0,0 +1,98 @@
+/*
+ * 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.client.render.models.blockbench.pokemon.gen1
+
+import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation.Companion.X_AXIS
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class EeveeModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
+    override val rootPart = root.registerChildWithAllChildren("eevee")
+    val body = getPart("body")
+    override val head = getPart("head")
+    override val hindRightLeg = getPart("leg_back_right")
+    override val hindLeftLeg = getPart("leg_back_left")
+    override val foreRightLeg = getPart("leg_front_right")
+    override val foreLeftLeg= getPart("leg_front_left")
+
+    override var portraitScale = 2.2F
+    override var portraitTranslation = Vec3(-0.4, -0.54, 0.0)
+
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3(0.0, 0.55, 0.0)
+
+    lateinit var stand: Pose
+    lateinit var walk: Pose
+    lateinit var shoulderLeft: Pose
+    lateinit var shoulderRight: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("eevee", "cry") }
+
+    val shoulderOffset = 4
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("eevee", "blink") }
+        stand = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("eevee", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("eevee", "ground_walk")
+            )
+        )
+
+        shoulderLeft = registerPose(
+            poseType = PoseType.SHOULDER_LEFT,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("eevee", "ground_idle")
+            ),
+            transformedParts = arrayOf(
+                rootPart.createTransformation().addPosition(X_AXIS, shoulderOffset)
+            )
+        )
+
+        shoulderRight = registerPose(
+            poseType = PoseType.SHOULDER_RIGHT,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("eevee", "ground_idle")
+            ),
+            transformedParts = arrayOf(
+                rootPart.createTransformation().addPosition(X_AXIS, -shoulderOffset)
+            )
+        )
+
+    }
+}
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class FlareonModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("flareon")
+    override val head = getPart("head")
+
+    override var portraitScale = 2.2F
+    override var portraitTranslation = Vec3(-0.6, -0.45, 0.0)
+
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3(0.0, 0.36, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("flareon", "cry") }
+
+    override fun registerPoses() {
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("flareon", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("flareon", "ground_run")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("flareon", "faint") else null
+}
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class JolteonModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("jolteon")
+    override val head = getPart("head")
+
+    override var portraitScale = 2.3F
+    override var portraitTranslation = Vec3(-0.55, -0.6, 0.0)
+
+    override var profileScale = 1.0F
+    override var profileTranslation = Vec3(0.0, 0.2, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("jolteon", "cry") }
+
+    override fun registerPoses() {
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("jolteon", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("jolteon", "ground_run")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("jolteon", "faint") else null
+}
@@ -0,0 +1,129 @@
+/*
+ * 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.client.render.models.blockbench.pokemon.gen1
+
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class PidgeotModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
+    override val rootPart = root.registerChildWithAllChildren("pidgeot")
+    override val leftLeg = getPart("leg_left")
+    override val rightLeg = getPart("leg_right")
+    override val head = getPart("neck")
+
+    private val wingOpenRight = getPart("wing_open_right")
+    private val wingOpenLeft = getPart("wing_open_left")
+    private val wingClosedRight = getPart("wing_closed_right")
+    private val wingClosedLeft = getPart("wing_closed_left")
+
+    override var portraitScale = 2.2F
+    override var portraitTranslation = Vec3(-0.6, 0.15, 0.0)
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3(0.0, 0.4, 0.0)
+
+//    lateinit var sleep: CobblemonPose
+    lateinit var stand: CobblemonPose
+    lateinit var walk: CobblemonPose
+    lateinit var hover: CobblemonPose
+    lateinit var fly: CobblemonPose
+
+    override val cryAnimation = CryProvider { bedrockStateful("pidgeot", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("pidgeot", "blink")}
+        val flyQuirk1 = quirk { bedrockStateful("pidgeot", "air_fly_quirk") }
+        val flyQuirk2 = quirk { bedrockStateful("pidgeot", "air_fly_quirk2") }
+
+//        sleep = registerPose(
+//            poseName = "sleeping",
+//            transformedParts = arrayOf(
+//                wingClosedLeft.createTransformation().withVisibility(visibility = true),
+//                wingClosedRight.createTransformation().withVisibility(visibility = true),
+//                wingOpenLeft.createTransformation().withVisibility(visibility = false),
+//                wingOpenRight.createTransformation().withVisibility(visibility = false)
+//            ),
+//            poseType = PoseType.SLEEP,
+//            animations = arrayOf(bedrock("pidgeot", "sleep"))
+//        )
+
+        stand = registerPose(
+            poseName = "stand",
+            transformedParts = arrayOf(
+                wingClosedLeft.createTransformation().withVisibility(visibility = true),
+                wingClosedRight.createTransformation().withVisibility(visibility = true),
+                wingOpenLeft.createTransformation().withVisibility(visibility = false),
+                wingOpenRight.createTransformation().withVisibility(visibility = false)
+            ),
+            poseTypes = PoseType.STATIONARY_POSES - PoseType.HOVER - PoseType.FLOAT + UI_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("pidgeot", "ground_idle_PLACEHOLDER"),
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            transformedParts = arrayOf(
+                wingClosedLeft.createTransformation().withVisibility(visibility = true),
+                wingClosedRight.createTransformation().withVisibility(visibility = true),
+                wingOpenLeft.createTransformation().withVisibility(visibility = false),
+                wingOpenRight.createTransformation().withVisibility(visibility = false)
+            ),
+            poseTypes = PoseType.MOVING_POSES - PoseType.FLY - PoseType.SWIM,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("pidgeot", "ground_idle_PLACEHOLDER"),
+                BipedWalkAnimation(this)
+            )
+        )
+
+        hover = registerPose(
+            poseName = "floating",
+            transformedParts = arrayOf(
+                wingClosedLeft.createTransformation().withVisibility(visibility = false),
+                wingClosedRight.createTransformation().withVisibility(visibility = false),
+                wingOpenLeft.createTransformation().withVisibility(visibility = true),
+                wingOpenRight.createTransformation().withVisibility(visibility = true)
+            ),
+            poseTypes = setOf(PoseType.FLOAT, PoseType.HOVER),
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("pidgeot", "air_idle")
+            )
+        )
+
+        fly = registerPose(
+            poseName = "flying",
+            transformedParts = arrayOf(
+                wingClosedLeft.createTransformation().withVisibility(visibility = false),
+                wingClosedRight.createTransformation().withVisibility(visibility = false),
+                wingOpenLeft.createTransformation().withVisibility(visibility = true),
+                wingOpenRight.createTransformation().withVisibility(visibility = true)
+            ),
+            poseTypes = setOf(PoseType.FLY, PoseType.SWIM),
+            quirks = arrayOf(blink, flyQuirk1, flyQuirk2),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("pidgeot", "air_fly")
+            )
+        )
+    }
+}
@@ -0,0 +1,84 @@
+/*
+ * 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.client.render.models.blockbench.pokemon.gen1
+
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class VaporeonModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("vaporeon")
+    override val head = getPart("head")
+
+    override var portraitScale = 2.2F
+    override var portraitTranslation = Vec3(-0.6, -0.58, 0.0)
+
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3(0.0, 0.35, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var swimIdle: Pose
+    lateinit var swimMove: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("vaporeon", "cry") }
+
+    override fun registerPoses() {
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES - PoseType.FLOAT,
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("vaporeon", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = setOf(PoseType.WALK),
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("vaporeon", "ground_run")
+            )
+        )
+
+        swimIdle = registerPose(
+            poseName = "float",
+            poseTypes = setOf(PoseType.FLOAT),
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("vaporeon", "water_idle")
+            )
+        )
+
+        swimMove = registerPose(
+            poseName = "swim",
+            poseTypes = setOf(PoseType.SWIM),
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("vaporeon", "water_swim")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("vaporeon", "faint") else null
+}
@@ -0,0 +1,65 @@
+/*
+ * 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.client.render.models.blockbench.pokemon.gen2
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class EspeonModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("espeon")
+    override val head = getPart("head")
+
+    override var portraitScale = 2.15F
+    override var portraitTranslation = Vec3(-0.55, -0.43, 0.0)
+
+    override var profileScale = 0.81F
+    override var profileTranslation = Vec3(0.07, 0.59, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("espeon", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("espeon", "blink")}
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("espeon", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("espeon", "ground_run")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("espeon", "faint") else null
+}
@@ -0,0 +1,65 @@
+/*
+ * 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.client.render.models.blockbench.pokemon.gen2
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class UmbreonModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("umbreon")
+    override val head = getPart("head")
+
+    override var portraitScale = 2.2F
+    override var portraitTranslation = Vec3(-0.6, -0.45, 0.0)
+
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3(0.0, 0.35, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("umbreon", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("umbreon", "blink")}
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("umbreon", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("umbreon", "ground_run")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("umbreon", "faint") else null
+}
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3
+
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class GrovyleModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
+    override val rootPart = root.registerChildWithAllChildren("grovyle")
+    override val head = getPart("head")
+
+    override val leftLeg = getPart("left_upper_leg")
+    override val rightLeg = getPart("right_upper_leg")
+
+    override var portraitScale = 2.31F
+    override var portraitTranslation = Vec3(-0.24, 1.29, 0.0)
+
+    override var profileScale = 0.66F
+    override var profileTranslation = Vec3(0.01, 0.87, 0.0)
+
+    //lateinit var sleep: CobblemonPose
+    lateinit var standing: CobblemonPose
+    lateinit var walk: CobblemonPose
+
+    override val cryAnimation = CryProvider { bedrockStateful("grovyle", "cry") }
+
+    override fun registerPoses() {
+        //sleep = registerPose(
+        //    poseType = PoseType.SLEEP,
+        //    animations = arrayOf(bedrock("grovyle", "sleep"))
+        //)
+
+        val blink = quirk { bedrockStateful("grovyle", "blink") }
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("grovyle", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("grovyle", "ground_idle"),
+                    BipedWalkAnimation(this, periodMultiplier = 0.6F, amplitudeMultiplier = 0.9F)
+            )
+        )
+    }
+    //override fun getFaintAnimation(
+    //    pokemonEntity: PokemonEntity,
+    //    state: PosableState<PokemonEntity>
+    //) = if (state.isNotPosedIn(sleep)) bedrockStateful("grovyle", "faint") else null
+}
@@ -8,11 +8,11 @@

 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3

+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType
 import net.minecraft.client.model.geom.ModelPart
@@ -38,7 +38,6 @@ class LudicoloModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
    lateinit var floating: Pose
    lateinit var swim: Pose
    lateinit var sleep: Pose
-    lateinit var dance: Pose

    override fun registerPoses() {
        val blink = quirk { bedrockStateful("ludicolo", "blink") }
@@ -88,17 +87,6 @@ class LudicoloModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
            )
        )

-        dance = registerPose(
-            poseName = "dance",
-            poseType = PoseType.DANCE,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("ludicolo", "dance"),
-            )
-        )
-
    }
    override fun getFaintAnimation(state: PosableState) = if (state.isNotPosedIn(sleep)) bedrockStateful("ludicolo", "faint") else null
-}
+}
@@ -0,0 +1,95 @@
+/*
+ * 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.client.render.models.blockbench.pokemon.gen3
+
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.util.isBattling
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class MetagrossModel (root: ModelPart) : PokemonPosableModel(root) {
+    override val rootPart = root.registerChildWithAllChildren("metagross")
+
+    override var portraitScale = 1.1F
+    override var portraitTranslation = Vec3(-0.45, 0.5, 0.0)
+
+    override var profileScale = 0.4F
+    override var profileTranslation = Vec3(0.0, 1.0, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var hover: Pose
+    lateinit var fly: Pose
+    lateinit var sleep: Pose
+    lateinit var battleidle: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("metagross", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("metagross", "blink")}
+
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            animations = arrayOf(bedrock("metagross", "sleep"))
+        )
+        standing = registerPose(
+            poseName = "stand",
+            poseTypes = PoseType.STATIONARY_POSES - PoseType.HOVER - PoseType.FLOAT + PoseType.UI_POSES,
+            condition = { !it.isBattling },
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("metagross", "ground_idle")
+            )
+        )
+        hover = registerPose(
+            poseName = "hover",
+            poseTypes = setOf(PoseType.HOVER, PoseType.FLOAT),
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("metagross", "air_idle")
+            )
+        )
+        fly = registerPose(
+            poseName = "fly",
+            poseTypes = setOf(PoseType.FLY, PoseType.SWIM),
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("metagross", "air_fly")
+            )
+        )
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES - PoseType.FLY - PoseType.SWIM,
+            transformTicks = 5,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("metagross", "ground_walk")
+            )
+        )
+        battleidle = registerPose(
+            poseName = "battle_idle",
+            poseTypes = PoseType.STATIONARY_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            condition = { it.isBattling },
+            animations = arrayOf(
+                bedrock("metagross", "battle_idle")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("metagross", "faint") else null
+}
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3
+
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class NosepassModel(root: ModelPart) : PokemonPosableModel(root), BipedFrame {
+    override val rootPart = root.registerChildWithAllChildren("nosepass")
+
+    override val leftLeg = getPart("leg_left")
+    override val rightLeg = getPart("leg_right")
+
+    override var portraitScale = 1.5F
+    override var portraitTranslation = Vec3(-0.1, -0.1, 0.0)
+
+    override var profileScale = 0.75F
+    override var profileTranslation = Vec3(0.0, 0.65, 0.0)
+
+    lateinit var sleep: Pose
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override fun registerPoses() {
+
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            animations = arrayOf(bedrock("nosepass", "sleep"))
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            animations = arrayOf(
+                bedrock("nosepass", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            animations = arrayOf(
+                bedrock("nosepass", "ground_walk"),
+            )
+        )
+    }
+
+    override fun getFaintAnimation(state: PosableState) = if (state.isNotPosedIn(sleep)) bedrockStateful("nosepass", "faint") else null
+}
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3
+
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class SceptileModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
+    override val rootPart = root.registerChildWithAllChildren("sceptile")
+    override val head = getPart("head")
+
+    override val leftLeg = getPart("left_upper_leg")
+    override val rightLeg = getPart("right_upper_leg")
+
+    override var portraitScale = 2.34F
+    override var portraitTranslation = Vec3(-0.25, 2.22, 0.0)
+
+    override var profileScale = 0.63F
+    override var profileTranslation = Vec3(0.06, 0.91, 0.0)
+
+    lateinit var sleep: CobblemonPose
+    lateinit var standing: CobblemonPose
+    lateinit var walk: CobblemonPose
+
+    override val cryAnimation = CryProvider { bedrockStateful("sceptile", "cry") }
+
+    override fun registerPoses() {
+       // sleep = registerPose(
+       //     poseType = PoseType.SLEEP,
+       //     animations = arrayOf(bedrock("sceptile", "sleep"))
+        // )
+        val blink = quirk { bedrockStateful("sceptile", "blink") }
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("sceptile", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("sceptile", "ground_idle"),
+                    BipedWalkAnimation(this, periodMultiplier = 0.6F, amplitudeMultiplier = 0.9F)
+            )
+        )
+    }
+    //override fun getFaintAnimation(
+    //    pokemonEntity: PokemonEntity,
+    //    state: PosableState<PokemonEntity>
+    //) = if (state.isNotPosedIn(sleep)) bedrockStateful("sceptile", "faint") else null
+
+}
@@ -0,0 +1,66 @@
+/*
+ * 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.client.render.models.blockbench.pokemon.gen3
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class TreeckoModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("treecko")
+    override val head = getPart("head")
+
+    override var portraitScale = 2.25F
+    override var portraitTranslation = Vec3(0.02, 0.12, 0.0)
+
+    override var profileScale = 0.74F
+    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
+
+    lateinit var sleep: CobblemonPose
+    lateinit var standing: CobblemonPose
+    lateinit var walk: CobblemonPose
+
+    override val cryAnimation = CryProvider { bedrockStateful("treecko", "cry") }
+
+    override fun registerPoses() {
+        //sleep = registerPose(
+        //    poseType = PoseType.SLEEP,
+        //    animations = arrayOf(bedrock("treecko", "sleep"))
+        //)
+
+        val blink = quirk { bedrockStateful("treecko", "blink") }
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES + PoseType.SLEEP,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("treecko", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("treecko", "ground_walk"),
+            )
+        )
+    }
+    //override fun getFaintAnimation(
+    //    pokemonEntity: PokemonEntity,
+    //    state: PosableState<PokemonEntity>
+    //) = if (state.isNotPosedIn(sleep)) bedrockStateful("treecko", "faint") else null
+}
@@ -0,0 +1,66 @@
+/*
+ * 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.client.render.models.blockbench.pokemon.gen3
+
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class TropiusModel  (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
+    override val rootPart = root.registerChildWithAllChildren("tropius")
+    override val head = getPart("neck")
+
+    override val foreLeftLeg= getPart("leg_front_left")
+    override val foreRightLeg = getPart("leg_front_right")
+    override val hindLeftLeg = getPart("leg_back_left")
+    override val hindRightLeg = getPart("leg_back_right")
+
+    override var portraitScale = 1.31F
+    override var portraitTranslation = Vec3(-1.23, 5.01, 0.0)
+
+    override var profileScale = 0.28F
+    override var profileTranslation = Vec3(0.0, 1.26, 0.0)
+
+    lateinit var standing: CobblemonPose
+    lateinit var walk: CobblemonPose
+
+    override val cryAnimation = CryProvider { bedrockStateful("tropius", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("tropius", "blink") }
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("tropius", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("tropius", "ground_idle"),
+                QuadrupedWalkAnimation(this, periodMultiplier = 0.7F, amplitudeMultiplier = 0.7F)
+            )
+        )
+    }
+}
@@ -38,7 +38,6 @@ class AmbipomModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, B
    lateinit var walking: Pose
    lateinit var sleep: Pose
    lateinit var battleidle: Pose
-    lateinit var dancing: Pose

    override val cryAnimation = CryProvider { bedrockStateful("ambipom", "cry") }

@@ -51,7 +50,8 @@ class AmbipomModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, B

        standing = registerPose(
            poseName = "standing",
-            poseTypes = PoseType.UI_POSES + PoseType.STAND,
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            condition = { !it.isBattling },
            quirks = arrayOf(blink),
            animations = arrayOf(
                singleBoneLook(),
@@ -80,20 +80,10 @@ class AmbipomModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, B
                bedrock("ambipom", "ground_idle")
            )
        )
-
-        dancing = registerPose(
-            poseName = "dancing",
-            poseType = PoseType.DANCE,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("ambipom", "dance")
-            )
-        )
    }

 //    override fun getFaintAnimation(
 //        pokemonEntity: PokemonEntity,
 //        state: PosableState<PokemonEntity>
 //    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("ambipom", "faint") else null
-}
+}
@@ -0,0 +1,65 @@
+/*
+ * 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.client.render.models.blockbench.pokemon.gen4
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class GlaceonModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("glaceon")
+    override val head = getPart("head")
+
+    override var portraitScale = 2.4F
+    override var portraitTranslation = Vec3(-0.7, -0.75, 0.0)
+
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3(0.0, 0.35, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("glaceon", "cry") }
+
+    override fun registerPoses() {
+//        val blink = quirk { bedrockStateful("glaceon", "blink")}
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            transformTicks = 10,
+//            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("glaceon", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            transformTicks = 10,
+//            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("glaceon", "ground_run")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("glaceon", "faint") else null
+}
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen4
+
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.WingFlapIdleAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.sineFunction
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.util.math.geometry.toRadians
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class HonchkrowModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BiWingedFrame {
+    override val rootPart = root.registerChildWithAllChildren("honchkrow")
+    override val head = getPart("head")
+    override val leftLeg = getPart("leg_left")
+    override val rightLeg = getPart("leg_right")
+    override val leftWing = getPart("wing_left")
+    override val rightWing = getPart("wing_right")
+
+    override var portraitScale = 3.4F
+    override var portraitTranslation = Vec3(-0.35, -1.2, 0.0)
+
+    override var profileScale = 1.2F
+    override var profileTranslation = Vec3(0.0, -0.05, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var sleep: Pose
+    lateinit var hover: Pose
+    lateinit var fly: Pose
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("honchkrow", "blink") }
+
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            animations = arrayOf(
+                bedrock("honchkrow", "sleep")
+            )
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            quirks = arrayOf(blink), animations = arrayOf(
+                singleBoneLook(),
+                bedrock("honchkrow", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            quirks = arrayOf(blink), animations = arrayOf(
+                singleBoneLook(),
+                bedrock("honchkrow", "ground_idle"),
+                BipedWalkAnimation(this, amplitudeMultiplier = 0.8F, periodMultiplier = 0.7F)
+//                bedrock("honchkrow", "ground_walk")
+            )
+        )
+        hover = registerPose(
+            poseName = "hover",
+            poseType = PoseType.HOVER,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("honchkrow", "air_idle"),
+                WingFlapIdleAnimation(this,
+                    flapFunction = sineFunction(verticalShift = -10F.toRadians(), period = 0.9F, amplitude = 0.6F),
+                    timeVariable = { state, _, _ -> state.animationSeconds },
+                    axis = ModelPartTransformation.Z_AXIS
+                )
+            )
+        )
+
+        fly = registerPose(
+            poseName = "fly",
+            poseType = PoseType.FLY,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("honchkrow", "air_fly"),
+                WingFlapIdleAnimation(this,
+                    flapFunction = sineFunction(verticalShift = -14F.toRadians(), period = 0.9F, amplitude = 0.9F),
+                    timeVariable = { state, _, _ -> state.animationSeconds },
+                    axis = ModelPartTransformation.Z_AXIS
+                )
+            )
+        )
+    }
+}
@@ -0,0 +1,65 @@
+/*
+ * 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.client.render.models.blockbench.pokemon.gen4
+
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class LeafeonModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("leafeon")
+    override val head = getPart("head")
+
+    override var portraitScale = 2.3F
+    override var portraitTranslation = Vec3(-0.7, -0.7, 0.0)
+
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3(0.0, 0.35, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("leafeon", "cry") }
+
+    override fun registerPoses() {
+//        val blink = quirk { bedrockStateful("leafeon", "blink")}
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            transformTicks = 10,
+//            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("leafeon", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            transformTicks = 10,
+//            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("leafeon", "ground_run")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("leafeon", "faint") else null
+}
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen4
+
+import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class ProbopassModel(root: ModelPart) : PokemonPosableModel(root) {
+    override val rootPart = root.registerChildWithAllChildren("probopass")
+
+    override var portraitScale = 1F
+    override var portraitTranslation = Vec3(0.0, 0.425, 0.0)
+
+    override var profileScale = 0.75F
+    override var profileTranslation = Vec3(0.0, 0.7, 0.0)
+
+    lateinit var sleep: Pose
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("probopass", "blink") }
+
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            animations = arrayOf(bedrock("probopass", "sleep"))
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("probopass", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("probopass", "ground_walk"),
+            )
+        )
+    }
+
+    override fun getFaintAnimation(state: PosableState) = if (state.isNotPosedIn(sleep)) bedrockStateful("probopass", "faint") else null
+}
@@ -0,0 +1,65 @@
+/*
+ * 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.client.render.models.blockbench.pokemon.gen6
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class SylveonModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("sylveon")
+    override val head = getPart("head")
+
+    override var portraitScale = 2.4F
+    override var portraitTranslation = Vec3(-0.55, -0.45, 0.0)
+
+    override var profileScale = 0.85F
+    override var profileTranslation = Vec3(0.0, 0.43, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("sylveon", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("sylveon", "blink") }
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                 bedrock("sylveon", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                 bedrock("sylveon", "ground_run")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("sylveon", "faint") else null
+}
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen7
+
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class MudsdaleModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
+    override val rootPart = root.registerChildWithAllChildren("mudsdale")
+    override val head = getPart("neck")
+
+    override val foreLeftLeg = getPart("leg_front_left")
+    override val foreRightLeg = getPart("leg_front_right")
+    override val hindLeftLeg = getPart("leg_back_left")
+    override val hindRightLeg = getPart("leg_back_right")
+
+    override var portraitScale = 1.5F
+    override var portraitTranslation = Vec3(-1.0, 1.76, 0.0)
+
+    override var profileScale = 0.5F
+    override var profileTranslation = Vec3(0.0, 1.0, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var sleep: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("mudsdale", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("mudsdale", "blink") }
+
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            animations = arrayOf(bedrock("mudsdale", "sleep"))
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(disableY = true),
+                bedrock("mudsdale", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(disableY = true),
+                bedrock("mudsdale", "ground_walk")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("mudsdale", "faint") else null
+}
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen8
+
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.BimanualSwingAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class SneaslerModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
+    override val rootPart = root.registerChildWithAllChildren("sneasler")
+    override val head = getPart("head")
+
+    override val leftArm = getPart("arm_left")
+    override val rightArm = getPart("arm_right")
+    override val leftLeg = getPart("leg_left")
+    override val rightLeg = getPart("leg_right")
+
+    override var portraitScale = 2.03F
+    override var portraitTranslation = Vec3(-0.44, 2.41, 0.0)
+
+    override var profileScale = 0.52F
+    override var profileTranslation = Vec3(0.0, 0.94, 0.0)
+
+    lateinit var standing: CobblemonPose
+    lateinit var walk: CobblemonPose
+
+    override val cryAnimation = CryProvider { bedrockStateful("sneasler", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("sneasler", "blink") }
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("sneasler", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("sneasler", "ground_idle"),
+                BipedWalkAnimation(this, periodMultiplier = 0.6F, amplitudeMultiplier = 0.9F),
+                BimanualSwingAnimation(this, swingPeriodMultiplier = 0.6F, amplitudeMultiplier = 0.9F)
+                //bedrock("sneasler", "ground_walk")
+            )
+        )
+    }
+}
@@ -46,7 +46,7 @@ class ModelPartTransformation(val modelPart: ModelPart) {
    var visibility: ExpressionLike? = null

    /** Applies the transformation to the model part. */
-    fun apply(state: PosableState? = null, intensity: Float = 1f) {
+    fun apply(state: PosableState, intensity: Float) {
        modelPart.x += position[0] * intensity
        modelPart.y += position[1] * intensity
        modelPart.z += position[2] * intensity
@@ -56,7 +56,7 @@ class ModelPartTransformation(val modelPart: ModelPart) {
        modelPart.xScale *= ((1 - scale[0]).absoluteValue * intensity) * (scale[0] - 1).sign + 1
        modelPart.yScale *= ((1 - scale[1]).absoluteValue * intensity) * (scale[1] - 1).sign + 1
        modelPart.zScale *= ((1 - scale[2]).absoluteValue * intensity) * (scale[2] - 1).sign + 1
-        visibility?.let { modelPart.visible = state?.runtime?.resolveBoolean(it)?: defaultRuntime.resolveBoolean(it) }
+        visibility?.let { modelPart.visible = state.runtime.resolveBoolean(it) }
    }

    fun set() {
@@ -229,8 +229,10 @@ object VaryingModelRepository {
        inbuilt("raticate", ::RaticateModel)
        inbuilt("rattata_alolan", ::RattataAlolanModel)
        inbuilt("raticate_alolan", ::RaticateAlolanModel)
+        inbuilt("eevee", ::EeveeModel)
        inbuilt("pidgey", ::PidgeyModel)
        inbuilt("pidgeotto", ::PidgeottoModel)
+        inbuilt("pidgeot", ::PidgeotModel)
        inbuilt("diglett", ::DiglettModel)
        inbuilt("dugtrio", ::DugtrioModel)
        inbuilt("zubat", ::ZubatModel)
@@ -272,6 +274,7 @@ object VaryingModelRepository {
        inbuilt("farfetchd", ::FarfetchdModel)
        inbuilt("farfetchd_galarian", ::FarfetchdGalarianModel)
        inbuilt("fearow", ::FearowModel)
+        inbuilt("flareon", ::FlareonModel)
        inbuilt("gengar", ::GengarModel)
        inbuilt("geodude", ::GeodudeModel)
        inbuilt("golbat", ::GolbatModel)
@@ -283,6 +286,7 @@ object VaryingModelRepository {
        inbuilt("hitmonchan", ::HitmonchanModel)
        inbuilt("hitmonlee", ::HitmonleeModel)
        inbuilt("hypno", ::HypnoModel)
+        inbuilt("jolteon", ::JolteonModel)
        inbuilt("jynx", ::JynxModel)
        inbuilt("kabuto", ::KabutoModel)
        inbuilt("kabutops", ::KabutopsModel)
@@ -329,6 +333,7 @@ object VaryingModelRepository {
        inbuilt("tangela", ::TangelaModel)
        inbuilt("tentacool", ::TentacoolModel)
        inbuilt("tentacruel", ::TentacruelModel)
+        inbuilt("vaporeon", ::VaporeonModel)
        inbuilt("venomoth", ::VenomothModel)
        inbuilt("venonat", ::VenonatModel)
        inbuilt("vulpix", ::VulpixModel)
@@ -339,10 +344,15 @@ object VaryingModelRepository {
        inbuilt("smoochum", ::SmoochumModel)
        inbuilt("hitmontop", ::HitmontopModel)
        inbuilt("electivire", ::ElectivireModel)
+        inbuilt("glaceon", ::GlaceonModel)
+        inbuilt("leafeon", ::LeafeonModel)
        inbuilt("lickilicky", ::LickilickyModel)
        inbuilt("mimejr", ::MimejrModel)
        inbuilt("scizor", ::ScizorModel)
        inbuilt("tangrowth", ::TangrowthModel)
+        inbuilt("sylveon", ::SylveonModel)
+        inbuilt("umbreon", ::UmbreonModel)
+        inbuilt("espeon", ::EspeonModel)
        inbuilt("blissey", ::BlisseyModel)
        inbuilt("piloswine", ::PiloswineModel)
        inbuilt("quagsire", ::QuagsireModel)
@@ -388,6 +398,7 @@ object VaryingModelRepository {
        inbuilt("wailmer", ::WailmerModel)
        inbuilt("wailord", ::WailordModel)
        inbuilt("murkrow", ::MurkrowModel)
+        inbuilt("honchkrow", ::HonchkrowModel)
        inbuilt("nacli", :: NacliModel)
        inbuilt("naclstack", :: NaclstackModel)
        inbuilt("garganacl", ::GarganaclModel)
@@ -404,6 +415,9 @@ object VaryingModelRepository {
        inbuilt("klinklang", :: KlinklangModel)
        inbuilt("morelull", :: MorelullModel)
        inbuilt("shiinotic", :: ShiinoticModel)
+        inbuilt("treecko", :: TreeckoModel)
+        inbuilt("grovyle", :: GrovyleModel)
+        inbuilt("sceptile", :: SceptileModel)
        inbuilt("honedge", :: HonedgeModel)
        inbuilt("spiritomb", :: SpiritombModel)
        inbuilt("chespin", :: ChespinModel)
@@ -471,6 +485,8 @@ object VaryingModelRepository {
        inbuilt("magcargo", ::MagcargoModel)
        inbuilt("slugma_shiny", ::SlugmaShinyModel)
        inbuilt("magcargo_shiny", ::MagcargoShinyModel)
+        inbuilt("nosepass", ::NosepassModel)
+        inbuilt("probopass", ::ProbopassModel)
        inbuilt("chinchou", ::ChinchouModel)
        inbuilt("clamperl", ::ClamperlModel)
        inbuilt("huntail", ::HuntailModel)
@@ -481,6 +497,7 @@ object VaryingModelRepository {
        inbuilt("taillow", ::TaillowModel)
        inbuilt("swellow", ::SwellowModel)
        inbuilt("mudbray", ::MudbrayModel)
+        inbuilt("mudsdale", ::MudsdaleModel)
        inbuilt("comfey", ::ComfeyModel)
        inbuilt("tandemaus", ::TandemausModel)
        inbuilt("maushold", ::MausholdModel)
@@ -638,6 +655,7 @@ object VaryingModelRepository {
        inbuilt("gallade", ::GalladeModel)
        inbuilt("beldum", ::BeldumModel)
        inbuilt("metang", ::MetangModel)
+        inbuilt("metagross", ::MetagrossModel)
        inbuilt("ursaluna", ::UrsalunaModel)
        inbuilt("lechonk", ::LechonkModel)
        inbuilt("oinkologne_male", ::OinkologneMaleModel)
@@ -697,6 +715,8 @@ object VaryingModelRepository {
        inbuilt("qwilfish_hisuian", ::QwilfishHisuianModel)
        inbuilt("overqwil", ::OverqwilModel)
        inbuilt("sneasel_hisuian", ::SneaselHisuianModel)
+        inbuilt("sneasler", ::SneaslerModel)
+        inbuilt("tropius", ::TropiusModel)
        inbuilt("petilil", ::PetililModel)
        inbuilt("lilligant", ::LilligantModel)
        inbuilt("petilil_hisui_bias", ::PetililHisuiBiasModel)
@@ -20,6 +20,7 @@ import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.entity.EntityRendererProvider.Context
 import net.minecraft.client.renderer.entity.LivingEntityRenderer
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.phys.Vec3
 import kotlin.math.min

 class NPCRenderer(context: Context) : LivingEntityRenderer<NPCEntity, PosableEntityModel<NPCEntity>>(context, PosableNPCModel(), 0.5f) {
@@ -59,17 +60,17 @@ class NPCRenderer(context: Context) : LivingEntityRenderer<NPCEntity, PosableEnt
        model.blue = 1F
        model.resetLayerContext()

-        if (entity.deathTime < 1) {
+        if (entity.deathTime < 1){
            //Render Held Item
-            heldItemRenderer.renderOnModel(
+            heldItemRenderer.renderOnEntity(
+                entity,
                entity.mainHandItem,
                model,
                clientDelegate,
                poseMatrix,
                buffer,
                packedLight,
-                false,
-                entity
+                Vec3(-90.0,0.0,0.0)
            )
        }

@@ -11,17 +11,18 @@ package com.cobblemon.mod.common.client.render.player
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.riding.Rideable
-import com.cobblemon.mod.common.client.MountedPokemonAnimationRenderController
 import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
 import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockAnimationRepository
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.util.cobblemonResource
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.math.Axis
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.client.player.AbstractClientPlayer
+import net.minecraft.client.player.RemotePlayer
 import net.minecraft.util.Mth
 import net.minecraft.world.phys.Vec3
-import org.joml.AxisAngle4f
+import org.joml.Matrix3f
 import org.joml.Matrix4f
 import org.joml.Vector3f

@@ -42,7 +43,19 @@ object MountedPlayerRenderer {

        //Positions player
        if (locator != null) {
-            MountedPokemonAnimationRenderController.setup(entity, partialTicks)
+            val locatorOffset = locator.matrix.getTranslation(Vector3f())
+
+            val center = Vector3f(0f, entity.bbHeight/2, 0f)
+            val locatorOffsetToCenter = locatorOffset.sub(center, Vector3f())
+
+            val transformationMatrix = Matrix4f()
+            //if (player is Rollable && player.shouldRoll()){
+                //transformationMatrix.rotate(Axis.YP.rotationDegrees(-yBodyRot))
+                //transformationMatrix.mulLocal(player.orientation)
+            //}
+
+            val rotatedOffset = transformationMatrix.transformPosition(locatorOffsetToCenter, Vector3f()).add(center).sub(Vector3f(0f, player.bbHeight/2, 0f))
+            matrix.translate(rotatedOffset)

            //Undo seat position
            val playerPos = Vec3(
@@ -58,16 +71,20 @@ object MountedPlayerRenderer {
            )

            matrix.translate(playerPos.subtract(entityPos).toVector3f().negate())
-            matrix.translate(locator.matrix.getTranslation(Vector3f()))
-
-            val offset = Vector3f(0f, player.bbHeight / 2, 0f).mul(-1f)
-
-            matrix.rotate(locator.matrix.getRotation(AxisAngle4f()))
-            matrix.rotate(Axis.YP.rotationDegrees(180 + yBodyRot))
-            matrix.translate(offset)
-
-            matrix.translate(Vector3f(0f, 0.35f, 0f))
        }
+
+        //Rotates player
+        if (player is OrientationControllable && player.orientationController.active && !disableRollableRenderDebug) {
+            val center = Vector3f(0f, player.bbHeight / 2, 0f)
+            val transformationMatrix = Matrix4f()
+            transformationMatrix.translate(center)
+            transformationMatrix.rotate(player.orientationController.getRenderOrientation(partialTicks))
+            transformationMatrix.translate(center.negate(Vector3f()))
+            //Pre-Undo Yaw
+            transformationMatrix.rotate(Axis.YP.rotationDegrees(yBodyRot+180f))
+            matrix.mul(transformationMatrix)
+        }
+        matrix.translate(0f, 0.25f, 0f)
    }

    fun animate(
@@ -159,15 +159,15 @@ class PokemonRenderer(
 //        Minecraft.getInstance().bufferBuilders.entityVertexConsumers.draw()

        //Render Held Item
-        heldItemRenderer.renderOnModel(
+        heldItemRenderer.renderOnEntity(
+            entity,
            entity.shownItem,
-            modelNow,
+            model.posableModel,
            clientDelegate,
            poseMatrix,
            buffer,
            packedLight,
-            false,
-            entity
+            Vec3(0.0,-90.0,90.0)
        )
    }

@@ -0,0 +1,79 @@
+/*
+ * 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.command
+
+import com.cobblemon.mod.common.api.permission.CobblemonPermissions
+import com.cobblemon.mod.common.api.text.red
+import com.cobblemon.mod.common.api.text.text
+import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
+import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.util.permission
+import com.cobblemon.mod.common.util.traceFirstEntityCollision
+import com.mojang.brigadier.Command
+import com.mojang.brigadier.CommandDispatcher
+import com.mojang.brigadier.arguments.FloatArgumentType
+import com.mojang.brigadier.arguments.StringArgumentType
+import com.mojang.brigadier.context.CommandContext
+import net.minecraft.commands.CommandSourceStack
+import net.minecraft.commands.Commands
+
+object ChangeJointScaleCommand {
+    fun register(dispatcher : CommandDispatcher<CommandSourceStack>) {
+        val command = Commands.literal("changejointscale")
+            .permission(CobblemonPermissions.CHANGE_JOINT_SCALE)
+            .then(
+                Commands.argument("joint", StringArgumentType.string())
+                    .then(
+                        Commands.argument("x", FloatArgumentType.floatArg())
+                            .then(Commands.argument("y", FloatArgumentType.floatArg())
+                                .then(
+                                    Commands.argument("z", FloatArgumentType.floatArg())
+                                        .executes(::execute)
+                                )
+                            )
+                    )
+                    .executes(::execute))
+        dispatcher.register(command)
+    }
+
+    private fun execute(context: CommandContext<CommandSourceStack>) : Int {
+        val jointName = StringArgumentType.getString(context, "joint")
+        val x = FloatArgumentType.getFloat(context, "x")
+        val y = FloatArgumentType.getFloat(context, "y")
+        val z = FloatArgumentType.getFloat(context, "z")
+
+        val player = context.source.playerOrException
+        val targetEntity = player.traceFirstEntityCollision(entityClass = PokemonEntity::class.java)
+        if (targetEntity == null) {
+            player.sendSystemMessage("No pokemon".red())
+            return 0
+        }
+
+        val state = FloatingState()
+        state.currentAspects = targetEntity.aspects
+        val model = VaryingModelRepository.getPoser(name = targetEntity.exposedSpecies.resourceIdentifier, state = state)
+
+        val part = model.relevantPartsByName[jointName]
+            ?: run {
+                player.sendSystemMessage("No joint named $jointName".red())
+                return 0
+            }
+        val existing = model.transformedParts.find { it.modelPart == part }
+        if (existing == null) {
+            model.transformedParts = model.transformedParts + part.createTransformation().withScale(x, y, z)
+        } else {
+            existing.withScale(x, y, z)
+        }
+
+        player.sendSystemMessage("Changed scale of $jointName to $x, $y, $z".text())
+        return Command.SINGLE_SUCCESS
+    }
+}
@@ -1,72 +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.command
-
-import com.cobblemon.mod.common.api.permission.CobblemonPermissions
-import com.cobblemon.mod.common.api.text.text
-import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
-import com.cobblemon.mod.common.command.argument.ModelPartArgumentType
-import com.cobblemon.mod.common.command.argument.TransformTypeArgumentType
-import com.cobblemon.mod.common.command.argument.TransformTypeArgumentType.Companion.TransformType
-import com.cobblemon.mod.common.util.permission
-import com.mojang.brigadier.Command
-import com.mojang.brigadier.CommandDispatcher
-import com.mojang.brigadier.arguments.FloatArgumentType
-import com.mojang.brigadier.context.CommandContext
-import net.minecraft.commands.CommandSourceStack
-import net.minecraft.commands.Commands
-
-object TransformModelPartCommand {
-
-    fun register(dispatcher : CommandDispatcher<CommandSourceStack>) {
-        val command = Commands.literal("transformmodelpart")
-            .permission(CobblemonPermissions.TRANSFORM_MODEL_PART)
-            .then(Commands.argument("transform", TransformTypeArgumentType.transformType())
-                .then(Commands.argument("part", ModelPartArgumentType.modelPart())
-                    .then(Commands.argument("x", FloatArgumentType.floatArg())
-                        .then(Commands.argument("y", FloatArgumentType.floatArg())
-                            .then(Commands.argument("z", FloatArgumentType.floatArg())
-                                .executes(::execute)
-                            )
-                        )
-                    )
-                    .executes(::execute))
-                .executes(::execute))
-        dispatcher.register(command)
-    }
-
-    private fun execute(context: CommandContext<CommandSourceStack>) : Int {
-        val transformType = TransformTypeArgumentType.getTransform(context, "transform")
-        val targetModelPart = ModelPartArgumentType.getModelPart(context, "part")?: return 0
-        val x = FloatArgumentType.getFloat(context, "x")
-        val y = FloatArgumentType.getFloat(context, "y")
-        val z = FloatArgumentType.getFloat(context, "z")
-
-        val model = ModelPartArgumentType.getModel(context)?: return 0
-
-        val existing = model.transformedParts.find { it.modelPart == targetModelPart }
-        when (transformType) {
-            TransformType.POSITION -> {
-                if (existing != null) existing.withPosition(x, y, z)
-                else model.transformedParts += targetModelPart.createTransformation().withPosition(x, y, z)
-            }
-            TransformType.ROTATION -> {
-                if (existing != null) existing.withRotation(x, y, z)
-                else model.transformedParts += targetModelPart.createTransformation().withRotation(x, y, z)
-            }
-            TransformType.SCALE -> {
-                if (existing != null) existing.withScale(x, y, z)
-                else model.transformedParts += targetModelPart.createTransformation().withScale(x, y, z)
-            }
-        }
-
-        context.source.playerOrException.sendSystemMessage("Changed ${transformType.name.lowercase()} of ${context.getArgument("part", String::class.java )} to $x, $y, $z".text())
-        return Command.SINGLE_SUCCESS
-    }
-}
@@ -1,75 +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.command.argument
-
-import com.cobblemon.mod.common.api.text.red
-import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.mojang.brigadier.StringReader
-import com.mojang.brigadier.arguments.ArgumentType
-import com.mojang.brigadier.context.CommandContext
-import com.mojang.brigadier.suggestion.Suggestions
-import com.mojang.brigadier.suggestion.SuggestionsBuilder
-import net.minecraft.client.Minecraft
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.commands.CommandSourceStack
-import net.minecraft.commands.SharedSuggestionProvider
-import net.minecraft.world.phys.EntityHitResult
-import net.minecraft.world.phys.HitResult.Type
-import java.util.concurrent.CompletableFuture
-
-class ModelPartArgumentType(): ArgumentType<String> {
-    override fun parse(reader: StringReader): String {
-        return reader.readString()
-    }
-
-    override fun <S : Any> listSuggestions(
-        context: CommandContext<S>,
-        builder: SuggestionsBuilder
-    ): CompletableFuture<Suggestions> {
-        return SharedSuggestionProvider.suggest(getModelParts(context).keys.toList(),builder)
-    }
-
-    companion object {
-        fun modelPart() = ModelPartArgumentType()
-
-        fun <S: Any> getModel(context: CommandContext<S> ): PosableModel? {
-            if (context.source is SharedSuggestionProvider) {
-                val targetEntity = (Minecraft.getInstance().hitResult as? EntityHitResult)
-                    ?.takeIf { it.type == Type.ENTITY }
-                    ?.entity
-                //Could probably work for NPCs too with some changes
-                if (targetEntity is PokemonEntity) {
-                    val state = FloatingState()
-                    state.currentAspects = targetEntity.aspects
-                    return VaryingModelRepository.getPoser(name = targetEntity.exposedSpecies.resourceIdentifier, state = state)
-                }
-            }
-            return null
-        }
-
-        private fun <S: Any> getModelParts(context: CommandContext<S>): MutableMap<String, ModelPart> {
-            val modelParts = getModel(context)?.relevantPartsByName?:mutableMapOf()
-            return modelParts
-        }
-
-        fun getModelPart(context: CommandContext<CommandSourceStack>, name: String): ModelPart? {
-            val partName = context.getArgument(name, String::class.java )
-            val part = getModelParts(context)[partName]
-                ?: run {
-                    context.source.playerOrException.sendSystemMessage("No joint named $partName".red())
-                    return null
-                }
-            return part
-        }
-
-    }
-}
@@ -1,49 +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.command.argument
-
-import com.mojang.brigadier.StringReader
-import com.mojang.brigadier.arguments.ArgumentType
-import com.mojang.brigadier.context.CommandContext
-import com.mojang.brigadier.exceptions.CommandSyntaxException
-import com.mojang.brigadier.suggestion.SuggestionsBuilder
-import net.minecraft.commands.CommandSourceStack
-import net.minecraft.commands.SharedSuggestionProvider
-
-class TransformTypeArgumentType: ArgumentType<TransformTypeArgumentType.Companion.TransformType>
-{
-    override fun parse(reader: StringReader): TransformType {
-        try {
-            reader.readString()?.let { return TransformType.valueOf(it.uppercase()) }
-        }
-        catch (_: Exception) { }
-        throw  CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherParseException().create(reader)
-    }
-
-    override fun getExamples() = EXAMPLES
-
-    override fun <S : Any> listSuggestions(context: CommandContext<S>, builder: SuggestionsBuilder) = SharedSuggestionProvider.suggest(EXAMPLES, builder)
-
-    companion object {
-        enum class TransformType {
-            POSITION,
-            ROTATION,
-            SCALE
-        }
-
-        fun transformType() = TransformTypeArgumentType()
-
-        fun getTransform(context: CommandContext<CommandSourceStack>, name: String): TransformType {
-            return context.getArgument(name, TransformType::class.java )
-        }
-
-        private val EXAMPLES = TransformType.entries.map { it.name.lowercase() }
-    }
-
-}
@@ -17,9 +17,9 @@ import com.cobblemon.mod.common.pokeball.catching.calculators.CobblemonCaptureCa
 import com.cobblemon.mod.common.util.adapters.CaptureCalculatorAdapter
 import com.cobblemon.mod.common.util.adapters.IntRangeAdapter
 import com.google.gson.GsonBuilder
-import com.google.gson.annotations.SerializedName
 import kotlin.reflect.full.memberProperties
 import kotlin.reflect.jvm.isAccessible
+import com.google.gson.annotations.SerializedName

 class CobblemonConfig {
    companion object {
@@ -259,9 +259,6 @@ class CobblemonConfig {
    @CobblemonConfigField(Category.Interface, lang = "party_portrait_animations")
    var partyPortraitAnimations = PortraitStyle.NEVER_ANIMATE

-    @CobblemonConfigField(Category.Riding, lang = "third_person_view_bobbing")
-    var thirdPartyViewBobbing = false
-
    @CobblemonConfigField(Category.Riding, lang = "invert_roll")
    var invertRoll = false

@@ -280,9 +277,6 @@ class CobblemonConfig {
    @CobblemonConfigField(Category.Debug, lang = "enable_debug_keys")
    var enableDebugKeys = false

-    @CobblemonConfigField(Category.Pokemon, lang="pokemon_dance_distance")
-    var pokemonDanceDistance = 3.0
-
    fun clone(): CobblemonConfig {
        val newConfig = CobblemonConfig()
        CobblemonConfig::class.memberProperties.forEach { property ->
@@ -9,9 +9,8 @@
 package com.cobblemon.mod.common.entity

 import com.cobblemon.mod.common.util.cobblemonResource
+import java.util.*
 import net.minecraft.resources.ResourceLocation
-import java.util.EnumSet
-import java.util.Locale

 /**
 * The type of a pose. Used for normalizing pose swapping for all models.
@@ -28,7 +27,6 @@ enum class PoseType {
    FLOAT,
    SWIM,
    GLIDE,
-    DANCE,
    /** A pose for rendering on the left shoulder. Pose animations are given the player head yaw, pitch, and ageInTicks. */
    SHOULDER_LEFT,
    /** A pose for rendering on the right shoulder. Pose animations are given the player head yaw, pitch, and ageInTicks. */
@@ -12,6 +12,7 @@ import com.bedrockk.molang.runtime.MoLangRuntime
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.*
 import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
+import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.drop.DropTable
 import com.cobblemon.mod.common.api.entity.Despawner
 import com.cobblemon.mod.common.api.entity.PokemonSender
@@ -39,17 +40,11 @@ import com.cobblemon.mod.common.api.pokemon.feature.StringSpeciesFeature
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
 import com.cobblemon.mod.common.api.reactive.ObservableSubscription
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.api.riding.Rideable
-import com.cobblemon.mod.common.api.riding.RidingProperties
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.Seat
-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.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviours
+import com.cobblemon.mod.common.api.riding.*
+import com.cobblemon.mod.common.api.riding.behaviour.*
+import com.cobblemon.mod.common.api.riding.behaviour.types.*
 import com.cobblemon.mod.common.api.riding.events.SelectDriverEvent
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.api.riding.util.RidingAnimationData
 import com.cobblemon.mod.common.api.scheduling.Schedulable
 import com.cobblemon.mod.common.api.scheduling.SchedulingTracker
 import com.cobblemon.mod.common.api.scheduling.afterOnServer
@@ -93,8 +88,14 @@ import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolut
 import com.cobblemon.mod.common.pokemon.feature.StashHandler
 import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
 import com.cobblemon.mod.common.util.*
+import com.cobblemon.mod.common.util.math.geometry.toRadians
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
 import com.mojang.serialization.Codec
+import java.util.EnumSet
+import java.util.Optional
+import java.util.UUID
+import java.util.concurrent.CompletableFuture
+import kotlin.math.PI
 import net.minecraft.core.BlockPos
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
@@ -145,9 +146,8 @@ import net.minecraft.world.level.material.FluidState
 import net.minecraft.world.level.pathfinder.PathType
 import net.minecraft.world.phys.AABB
 import net.minecraft.world.phys.Vec3
-import java.util.*
-import java.util.concurrent.CompletableFuture
-import kotlin.math.PI
+import org.joml.Matrix3f
+import org.joml.Vector3f

@Suppress("unused")
 open class PokemonEntity(
@@ -252,7 +252,7 @@ open class PokemonEntity(

    var enablePoseTypeRecalculation = true

-    val ridingAnimationData: RidingAnimationData = RidingAnimationData()
+//    override var ridingController: RideController? = null

    var previousRidingState: RidingBehaviourState? = null
    var ridingState: RidingBehaviourState? = null
@@ -285,9 +285,9 @@ open class PokemonEntity(
        ridingBehaviourSettings = null
        if (pokemon.riding.behaviour == null) return

-        riding = RidingBehaviours.get(pokemon.riding.behaviour!!.key)
+        riding = RidingBehaviours.get(pokemon.riding.behaviour!!.key) as RidingBehaviour<RidingBehaviourSettings, RidingBehaviourState>?
+        ridingState = riding!!.createDefaultState()
        ridingBehaviourSettings = pokemon.riding.behaviour!!
-        ridingState = riding!!.createDefaultState(ridingBehaviourSettings!!)
    }

    /**
@@ -356,11 +356,10 @@ open class PokemonEntity(
    }

    var flyDistO = 0F
+
    var isPokemonWalking = false
    var isPokemonFlying = false

-    var tickSpawned = 0
-
    init {
        delegate.initialize(this)
        delegate.changePokemon(pokemon)
@@ -409,7 +408,11 @@ open class PokemonEntity(
            SPECIES -> refreshDimensions()
            POSE_TYPE -> {
                val value = entityData.get(data) as PoseType
-                isNoGravity = (value == PoseType.FLY || value == PoseType.HOVER) && passengers.isEmpty()
+                if ((value == PoseType.FLY || value == PoseType.HOVER) && passengers.isEmpty()) {
+                    setNoGravity(true)
+                } else {
+                    setNoGravity(false)
+                }
            }

            BATTLE_ID -> {
@@ -482,14 +485,9 @@ open class PokemonEntity(
        isPokemonFlying = flyDist - flyDistO > 0.005F
        isPokemonWalking = walkDist - walkDistO > 0.005F

-        entityData.get(MOVING)
+        val isMoving = entityData.get(MOVING)

        super.tick()
-
-        if (passengers.isNotEmpty()) {
-            ridingAnimationData.update(this)
-        }
-
        flyDistO = flyDist

        if (isBattling) {
@@ -1019,15 +1017,12 @@ open class PokemonEntity(
                itemStack
            )
            if (player.isShiftKeyDown) {
-                val canRide = ifRidingAvailableSupply(false) { behaviour, settings, state ->
-                    this.canRide(player) && seats.isNotEmpty() && behaviour.isActive(settings, state, this)
-                }
                InteractPokemonUIPacket(
                    this.getUUID(),
                    canSitOnShoulder() && pokemon in player.party(),
                    !(pokemon.heldItemNoCopy().isEmpty && itemStack.isEmpty),
                    (!pokemon.cosmeticItem.isEmpty && itemStack.isEmpty) || cosmeticItemDefinition != null,
-                    canRide
+                    this.canRide(player) && pokemon.riding.canRide
                ).sendToPlayer(player)
            } else {
                // TODO #105
@@ -1222,7 +1217,7 @@ open class PokemonEntity(
        val possibleReturn = if (isCosmetic) this.pokemon.cosmeticItem.copy() else this.pokemon.heldItemNoCopy()
        val giving = stack.copy().apply { count = 1 }

-        if (ItemStack.isSameItemSameComponents(giving, possibleReturn)) {
+        if (ItemStack.isSameItem(giving, possibleReturn)) {
            val message = if (isCosmetic) {
                lang("cosmetic_item.already_wearing", this.pokemon.getDisplayName(), stack.hoverName)
            } else {
@@ -1239,15 +1234,30 @@ open class PokemonEntity(
        }

        val text = when {
-            isCosmetic && giving.isEmpty -> lang("cosmetic_item.take", returned.displayName, this.pokemon.getDisplayName())
-            isCosmetic && returned.isEmpty -> lang("cosmetic_item.give", this.pokemon.getDisplayName(), giving.displayName)
-            !isCosmetic && giving.isEmpty -> lang("held_item.take", returned.displayName, this.pokemon.getDisplayName())
-            !isCosmetic && returned.isEmpty -> lang("held_item.give", this.pokemon.getDisplayName(), giving.displayName)
-            isCosmetic -> lang("cosmetic_item.replace", returned.displayName, this.pokemon.getDisplayName(), giving.displayName)
-            else -> lang("held_item.replace", returned.displayName, this.pokemon.getDisplayName(), giving.displayName)
+            isCosmetic && giving.isEmpty -> lang(
+                "cosmetic_item.take",
+                returned.hoverName,
+                this.pokemon.getDisplayName()
+            )
+
+            isCosmetic && returned.isEmpty -> lang(
+                "cosmetic_item.give",
+                this.pokemon.getDisplayName(),
+                giving.hoverName
+            )
+
+            !isCosmetic && giving.isEmpty -> lang("held_item.take", returned.hoverName, this.pokemon.getDisplayName())
+            !isCosmetic && returned.isEmpty -> lang("held_item.give", this.pokemon.getDisplayName(), giving.hoverName)
+            isCosmetic -> lang(
+                "cosmetic_item.replace",
+                returned.hoverName,
+                this.pokemon.getDisplayName(),
+                returned.hoverName
+            )
+
+            else -> lang("held_item.replace", returned.hoverName, this.pokemon.getDisplayName(), returned.hoverName)
        }

-        player.giveOrDropItemStack(returned, false)
        player.sendSystemMessage(text)
        this.level().playSoundServer(
            position = this.position(),
@@ -1456,7 +1466,7 @@ open class PokemonEntity(
    // Copy and paste of how vanilla checks it, unfortunately no util method you can only add then wait for the result
    fun hasRoomToMount(player: Player): Boolean {
        return (player.shoulderEntityLeft.isEmpty || player.shoulderEntityRight.isEmpty)
-                && !player.isPassenger
+                && !player.isPassenger()
                && player.onGround()
                && !player.isInWater
                && !player.isInPowderSnow
@@ -1519,14 +1529,13 @@ open class PokemonEntity(
                behaviour.velocity(settings, state, this, this.controllingPassenger as Player, deltaMovement)
            }
            //Handle ridden pokemon differently to allow vector lerp instead of simple addition.
-            val v = getInputVector(velocity, 1.0f, this.yRot)
+            val v = Entity.getInputVector(velocity, 1.0f, this.getYRot());
            //changing this will give the ride more or less inertia/handling/drift
            val inertia = ifRidingAvailableSupply(fallback = 0.5) { behaviour, settings, state ->
                behaviour.inertia(settings, state,this)
            }

            // TODO: jackowes look over this so I don't accidentally break anything
-            // TODO: Talk to landon about why this was needed
            this.deltaMovement = this.deltaMovement.lerp(v, inertia)
            var pos = this.deltaMovement.scale(this.speed.toDouble())
            if (super.onGround() && this.deltaMovement.y == 0.0) {
@@ -1554,37 +1563,14 @@ open class PokemonEntity(
        if (beamMode != 3) { // Don't let Pokémon move during recall

            //Prevent current travel logic when riding a pokemon.
+            /*
            val riders = this.passengers.filterIsInstance<LivingEntity>()
-            if ( riders.isEmpty() || this.controllingPassenger == null) {
+            if ( riders.isEmpty() ) {
                super.travel(movementInput)
            }
-            else {
-                val inp = ifRidingAvailableSupply(fallback = Vec3.ZERO) { behaviour, settings, state ->
-                    behaviour.velocity(settings, state, this, this.controllingPassenger as Player, deltaMovement)
-                }
-
-                // Rotate velocity vector to face the current y rotation
-                val f = Mth.sin(this.yRot * 0.017453292f)
-                val g = Mth.cos(this.yRot * 0.017453292f)
-                val v = Vec3(
-                    inp.x * g.toDouble() - inp.z * f.toDouble(),
-                    inp.y,
-                    inp.z * g.toDouble() + inp.x * f.toDouble()
-                )
-
-
-
-                val diff = v.subtract(this.deltaMovement)
-
-                val inertia = ifRidingAvailableSupply(fallback = 0.5) { behaviour, settings, state ->
-                    behaviour.inertia(settings, state,this)
-                }
-
-                this.deltaMovement = this.deltaMovement.add( diff.scale(inertia) )
-
-                this.move(MoverType.SELF, this.deltaMovement)
-            }
+             */

+            super.travel(movementInput)

            this.updateBlocksTraveled(prevBlockPos)
        }
@@ -1596,7 +1582,7 @@ open class PokemonEntity(

    private fun updateBlocksTraveled(fromBp: BlockPos) {
        // Riding or falling shouldn't count, other movement sources are fine
-        if (this.isPassenger || this.isFalling()) {
+        if (this.isPassenger() || this.isFalling()) {
            return
        }
        val blocksTaken = this.blockPosition().distSqr(fromBp)
@@ -1869,11 +1855,11 @@ open class PokemonEntity(
            }

            val rotation = behaviour.rotation(settings, state, this, driver)
-            this.yRotO = this.yRot
            setRot(rotation.y, rotation.x)
            this.yHeadRot = this.yRot
            this.yBodyRot = this.yRot
-            this.passengers.filterIsInstance<LivingEntity>()
+            this.yRotO = this.yRot
+            val riders = this.passengers.filterIsInstance<LivingEntity>()

            if (behaviour.isActive(settings, state, this) && behaviour.canJump(settings, state, this, driver)) {
                if (this.jumpInputStrength > 0) {
@@ -1914,7 +1900,7 @@ open class PokemonEntity(

    fun Entity.isNearGround(): Boolean {
        val blockBelow: BlockPos = this.blockPosition().below()
-        return this.level().getBlockState(blockBelow).isSolid
+        return this.level().getBlockState(blockBelow).isSolid()
    }

 //    override fun jump() {
@@ -1933,7 +1919,7 @@ open class PokemonEntity(
 //    }

    override fun onPassengerTurned(entityToUpdate: Entity) {
-         if (entityToUpdate !is LivingEntity) return
+        if (entityToUpdate !is LivingEntity) return
        ifRidingAvailable { behaviour, settings, state ->
            behaviour.clampPassengerRotation(settings, state, this, entityToUpdate)
        }
@@ -1941,8 +1927,23 @@ open class PokemonEntity(

    override fun positionRider(passenger: Entity, positionUpdater: MoveFunction) {
        if (this.hasPassenger(passenger)) {
-            this.delegate.positionRider(passenger, positionUpdater)
+            val index = this.passengers.indexOf(passenger).takeIf { it >= 0 && it < this.seats.size } ?: return
+            val seat = this.seats[index]
+            val seatOffset = seat.getOffset(this.getCurrentPoseType()).toVector3f()
+            val center = Vector3f(0f, this.bbHeight / 2, 0f)

+            val seatToCenter = center.sub(seatOffset, Vector3f())
+            val matrix = (this.passengers.first() as? OrientationControllable)?.orientationController?.orientation
+                ?: Matrix3f().rotate((180f - passenger.yRot).toRadians(), Vector3f(0f, 1f, 0f))
+            val rotatedOffset =
+                matrix.transform(seatToCenter, Vector3f()).add(center).sub(Vector3f(0f, passenger.bbHeight / 2, 0f))
+
+            positionUpdater.accept(
+                passenger,
+                this.x + rotatedOffset.x,
+                this.y + rotatedOffset.y,
+                this.z + rotatedOffset.z
+            )
            if (passenger is LivingEntity) {
                ifRidingAvailable { behaviour, settings, state ->
                    behaviour.updatePassengerRotation(settings, state,this, passenger)
@@ -1951,22 +1952,6 @@ open class PokemonEntity(
        }
    }

-    // When riding mimic RemotePlayers logic for rendering players at farther
-    // distances than usual. Otherwise the player may render when the pokemon
-    // entity is not, causing a floating player.
-    override fun shouldRenderAtSqrDistance(distance: Double): Boolean {
-        if (!passengers.isEmpty()) {
-            var d = (boundingBox.getSize() * 10.0)
-            if (d.isNaN()) {
-                d = 1.0
-            }
-            val scale = 64.0 * getViewScale()
-            return distance < d * scale * scale
-        }
-
-        return super.shouldRenderAtSqrDistance(distance)
-    }
-
    override fun getControllingPassenger(): LivingEntity? {
        val riders = this.passengers.filterIsInstance<LivingEntity>()
        if (riders.isEmpty()) {
@@ -8,32 +8,26 @@

 package com.cobblemon.mod.common.entity.pokemon

-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.MoValue
-import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.CobblemonNetwork
 import com.cobblemon.mod.common.CobblemonSounds
-import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.entity.PokemonSender
 import com.cobblemon.mod.common.api.entity.PokemonSideDelegate
-import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.battles.BattleRegistry
+import com.cobblemon.mod.common.entity.PlatformType
 import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.net.messages.server.pokemon.update.ServerboundUpdateRidingStatePacket
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.pokemon.activestate.ActivePokemonState
 import com.cobblemon.mod.common.pokemon.activestate.SentOutState
-import com.cobblemon.mod.common.util.asUUID
 import com.cobblemon.mod.common.util.getIsSubmerged
-import com.cobblemon.mod.common.util.math.geometry.toRadians
 import com.cobblemon.mod.common.util.playSoundServer
-import com.cobblemon.mod.common.util.toVec3d
 import com.cobblemon.mod.common.util.update
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
-import net.minecraft.core.BlockPos
+import net.minecraft.client.Minecraft
 import net.minecraft.network.chat.Component
 import net.minecraft.network.syncher.EntityDataAccessor
 import net.minecraft.server.level.ServerLevel
@@ -42,20 +36,14 @@ import net.minecraft.world.damagesource.DamageSource
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.ai.attributes.Attributes
 import net.minecraft.world.item.ItemStack
-import net.minecraft.world.level.block.entity.JukeboxBlockEntity
 import net.minecraft.world.level.pathfinder.PathType
-import org.joml.Matrix3f
-import org.joml.Vector3f
-import java.util.Optional
+import java.util.*

 /** Handles purely server logic for a Pokémon */
 class PokemonServerDelegate : PokemonSideDelegate {
    lateinit var entity: PokemonEntity
    var acknowledgedHPStat = -1

-    var dancing: Boolean = false
-    var jukeboxPos: BlockPos? = null
-
    /** Mocked properties exposed to the client [PokemonEntity]. */
    private val mock: PokemonProperties?
        get() = entity.effects.mockEffect?.mock
@@ -114,32 +102,6 @@ class PokemonServerDelegate : PokemonSideDelegate {
        updateTrackedValues()
    }

-    override fun addToStruct(struct: QueryStruct) {
-        super.addToStruct(struct)
-        if (entity.pokemon.isWild()) {
-            struct
-                    .addFunction("attempt_wild_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) {
-                                entity.server!!.playerList.getPlayer(playerUUID) ?: return@addFunction DoubleValue.ZERO
-                            } else {
-                                entity.server!!.playerList.getPlayerByName(paramString) ?: return@addFunction DoubleValue.ZERO
-                            }
-                        }
-
-                        // Need to wait to ensure any entity info gets grabbed properly before battle attempt.
-                        return@addFunction entity.after(0.01F) {
-                            DoubleValue(entity.forceBattle(opponent))
-                        }
-                    }
-        }
-    }
-
    fun getBattle() = entity.battleId?.let(BattleRegistry::getBattle)

    fun updateTrackedValues() {
@@ -269,18 +231,9 @@ class PokemonServerDelegate : PokemonSideDelegate {

        val isSleeping = entity.pokemon.status?.status == Statuses.SLEEP && entity.behaviour.resting.canSleep
        val isMoving = entity.entityData.get(PokemonEntity.MOVING)
-        val isPassenger = entity.isPassenger
+        val isPassenger = entity.isPassenger()
        val isUnderwater = entity.getIsSubmerged()
        val isFlying = entity.getBehaviourFlag(PokemonBehaviourFlag.FLYING)
-        var isDancing = false
-
-        if (jukeboxPos != null) {
-            val level = entity.level()
-            val jukeboxBlockEntity =  if (level.isLoaded(jukeboxPos!!)) level.getBlockEntity(jukeboxPos) as? JukeboxBlockEntity
-                                      else null
-            val distanceToJukebox = jukeboxPos?.toVec3d()?.distanceTo(entity.position())
-            isDancing = jukeboxBlockEntity?.songPlayer?.isPlaying == true && (distanceToJukebox ?: 100.0) < Cobblemon.config.pokemonDanceDistance
-        }

        val poseType = when {
            isPassenger -> PoseType.STAND
@@ -290,7 +243,6 @@ class PokemonServerDelegate : PokemonSideDelegate {
            isMoving && isFlying -> PoseType.FLY
            isFlying -> PoseType.HOVER
            isMoving -> PoseType.WALK
-            isDancing -> PoseType.DANCE
            else -> PoseType.STAND
        }

@@ -345,28 +297,4 @@ class PokemonServerDelegate : PokemonSideDelegate {
            entity.remove(Entity.RemovalReason.KILLED)
        }
    }
-
-    override fun positionRider(
-        passenger: Entity,
-        positionUpdater: Entity.MoveFunction
-    ) {
-        val index =
-            this.entity.passengers.indexOf(passenger).takeIf { it >= 0 && it < this.entity.seats.size } ?: return
-        val seat = this.entity.seats[index]
-        val seatOffset = seat.getOffset(this.entity.getCurrentPoseType()).toVector3f()
-        val center = Vector3f(0f, this.entity.bbHeight / 2, 0f)
-
-        val seatToCenter = center.sub(seatOffset, Vector3f())
-        val matrix = (this.entity.passengers.first() as? OrientationControllable)?.orientationController?.orientation
-            ?: Matrix3f().rotate((180f - passenger.yRot).toRadians(), Vector3f(0f, 1f, 0f))
-        val offset =
-            matrix.transform(seatToCenter, Vector3f()).add(center).sub(Vector3f(0f, passenger.bbHeight / 2, 0f))
-
-        positionUpdater.accept(
-            passenger,
-            this.entity.x + offset.x,
-            this.entity.y + offset.y,
-            this.entity.z + offset.z
-        )
-    }
 }
--- a/Show More
+++ b/Show More