Update tinkaton animation, support changes in fov

Merge branch 'refs/heads/main' into camera-test
Add ceruledge test animation
2025-04-17 23:27:54 -04:00 · 2025-04-17 06:39:25 -04:00 · 2025-04-17 06:38:56 -04:00 · 2025-04-17 05:20:26 -04:00 · 2025-04-17 01:50:48 -04:00 · 2025-04-17 01:03:42 -04:00
760 changed files with 97419 additions and 24697 deletions
@@ -13,14 +13,120 @@
 - 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.
+- Added lang keys for all moves and abilities up to Generation 9.
+- Fixed Moon Ball moon phase logic to actually work correctly
+
+### 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
+- Cinderace
+- Kangaskhan
+
+### 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
+- Kangaskhan
+- Cinderace
+- Magnezone
+- Metagross
+- Added Syrupy Apples.

 ### Changes
 - Renamed `chargeGainedPerTick` config to `secondsToChargeHealingMachine`.
 - Made Blocks of Gold count as Big Nuggets when held by a Pokémon (for Fling functionality)
+- Players can now eat Sweet and Tart Apples, Whipped Dreams, and the Alcremie Sweets.
+- Updated Sweet and Tart Apple sprites
+- Updated the following recipes: Air Balloon, Assault Vest, Binding Band, Black Belt, Blunder Policy, Choice Band, Choice Scarf, Cleanse Tag, Covert Cloak, Destiny Knot, Eject Button, Expert Belt, Focus Band, Focus Sash, Magnet, Metronome, Muscle Band, Power Anklet, Power Band, Power Belt, Power Bracer, Power Lens, Power Weight, Protective Pads, Protein, Punching Glove, Reaper Cloth, Rocky Helmet, Room Service, Sachet, Safety Goggles, Silk Scarf, Spell Tag, Utility Umbrella, Weakness Policy, Zinc
+- Added alternate ingredient options to the following recipes: Cell Battery, Charcoal Stick, Dragon Fang, Miracle Seed, Mystic Water, Never Melt Ice, Twisted Spoon, Damp Rock, Heat Rock, Icy Rock, Smooth Rock
+- Grouped together some recipes within the Recipe Book. Groups include: the seven basic Poké Balls, the seven basic Ancient Poké Balls, Gilded Chests, Pokedexes, and the Weather Rocks.
+- Updated some item tags to better integrate behaviours between Cobblemon, Vanilla Minecraft, and other mods
+  - Removed Cooked Meat, Raw Meat, Protein Ingredients, and Zinc Ingredients, the first two are now using `c` namespace tags, the latter have better integrated use of tags within their recipes which removes need for custom tags.
+  - Added our seeds tag into `#c:seeds`, which is now made use of for the Miracle Seed recipe. 
+- Tweaked the Natural Materials Vanilla file to fit with the changes to tags
 - Substantially optimised spawning checks mainly by front-loading biome filtering.
 - 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.
+- Updated `doPokemonSpawning` gamerule to support per-dimension configurations.
+- The Pokedex now displays a form name of a "normal" Pokémon for when the base form is still a named form.

 ### Fixes
 - Fixed Particles sometimes facing the wrong direction (looking at you, Swords Dance)
@@ -43,11 +149,13 @@
 - 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.
 - Fixed an issue with newer versions of Fabric API where underground Pokémon were spawning in The End.
 - Fixed spawning not working well when you're at high points surrounded by lower altitude spawning areas, such as flying.
+- Fixed certain Pokémon with forms not having appropriate stock Pokédex entries.

 ### Developer
 - A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
@@ -65,6 +173,7 @@
 - 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)
@@ -75,9 +184,15 @@
 - 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
+- The Pokédex form lang key definition now follows `cobblemon.ui.pokedex.info.form.{species}-{formname}` instead of `cobblemon.ui.pokedex.info.form.{formname}`.

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

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

 ### Cry updates for the following Pokémon
 - Sceptile
@@ -15,10 +15,12 @@ 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.Rideable;
+import com.cobblemon.mod.common.api.riding.Seat;
 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;
@@ -38,16 +40,18 @@ 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.EntityDimensions;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Pose;
+import net.minecraft.world.entity.*;
 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;
@@ -82,7 +86,8 @@ 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 OrientationController cobblemon$orientationController = new OrientationController(this);
+    @Unique
+    private final OrientationController cobblemon$orientationController = new OrientationController(this);

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

    @Inject(
@@ -279,4 +284,41 @@ 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);
+    }
 }
@@ -8,19 +8,28 @@

 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;
@@ -32,12 +41,11 @@ import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Map;

@Mixin(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;
@@ -46,12 +54,15 @@ 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();
@@ -59,7 +70,7 @@ public abstract class CameraMixin {
    @Unique boolean disableRollableCameraDebug = false;

    @Inject(method = "setRotation", at = @At("HEAD"), cancellable = true)
-    public void open_camera$setRotation(float f, float g, CallbackInfo ci) {
+    public void cobblemon$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) {
@@ -77,7 +88,7 @@ public abstract class CameraMixin {
                    return;
                }
                controller.getOrientation().rotateZ((float) Math.toRadians(-rollAngleStart*(1-returnTimer)));
-                applyRotation();
+                cobblemon$applyRotation();
                this.returnTimer += .05F;
                ci.cancel();
            } else {
@@ -87,7 +98,7 @@ public abstract class CameraMixin {
            return;
        }
        if (controller.getOrientation() == null) return;
-        applyRotation();
+        cobblemon$applyRotation();

        this.returnTimer = 0;
        this.rollAngleStart = controller.getRoll();
@@ -96,9 +107,10 @@ 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 positionCamera(Camera instance, double x, double y, double z, Operation<Void> original){
+    public void cobblemon$positionCamera(Camera instance, double x, double y, double z, Operation<Void> original, @Local(ordinal = 1, argsOnly = true) boolean thirdPersonReverse) {
        Entity entity = instance.getEntity();
        Entity vehicle = entity.getVehicle();
+        MountedPokemonAnimationRenderController.INSTANCE.reset();

        if(vehicle instanceof Rideable){
            //RidingCameraDelagate.INSTANCE.positionCamera(instance, x, y, z, original);
@@ -107,38 +119,73 @@ 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;
-            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)));
+            OrientationController controller = rollable.getOrientationController();

-            var position = locatorOffset.add(entityPos).add(rotatedEyeHeight);
-            setPosition(position);
+            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)));
+            }
        } else {
            original.call(instance, x, y, z);
        }
    }

    @Unique
-    private void applyRotation(){
+    private void cobblemon$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());
@@ -152,4 +199,36 @@ 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;
+    }
 }
@@ -8,11 +8,24 @@

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

+import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.scheduling.ClientTaskTracker;
+import com.cobblemon.mod.common.stadium.StadiumClientManager;
+import com.cobblemon.mod.common.util.CameraExtensionsKt;
+import net.minecraft.client.Camera;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.LightTexture;
+import net.minecraft.util.Mth;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.Vec3;
+import org.joml.Matrix4f;
+import org.joml.Quaternionf;
+import org.joml.Vector3f;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -20,6 +33,17 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(GameRenderer.class)
 public class GameRendererMixin {
+    @Shadow @Final Minecraft minecraft;
+    @Shadow float renderDistance;
+    @Shadow @Final private LightTexture lightTexture;
+    @Shadow private boolean renderHand;
+
+    @Shadow private double getFov(Camera activeRenderInfo, float partialTicks, boolean useFOVSetting) { return 0.0; }
+    @Shadow public void resetProjectionMatrix(Matrix4f matrix) {}
+    @Shadow public Matrix4f getProjectionMatrix(double fov) { return new Matrix4f(); }
+    @Shadow private void renderItemInHand(Camera camera, float partialTick, Matrix4f projectionMatrix) {}
+    @Shadow public void pick(float partialTicks) {}
+
    @Unique
    long lastTime = -1;

@@ -42,4 +66,54 @@ public class GameRendererMixin {
        lastTime = newTime;
    }

+    @Inject(method = "renderLevel", at = @At(value = "HEAD"), cancellable = true)
+    public void renderLevel(DeltaTracker deltaTracker, CallbackInfo ci) {
+        if (StadiumClientManager.INSTANCE.shouldUseStadiumCamera()) {
+            float f = deltaTracker.getGameTimeDeltaPartialTick(true);
+            this.lightTexture.updateLightTexture(f);
+            if (this.minecraft.getCameraEntity() == null) {
+                this.minecraft.setCameraEntity(this.minecraft.player);
+            }
+
+            this.minecraft.getProfiler().push("camera");
+            Camera stadiumCamera = new Camera();
+            Entity entity = (Entity) this.minecraft.player;
+            stadiumCamera.setup(this.minecraft.level, entity, false, false, 1.0F);
+
+            //adjust camera
+            StadiumClientManager.INSTANCE.updateCameraData(f);
+            var position = StadiumClientManager.INSTANCE.getCameraPosition();
+            stadiumCamera.setPosition(position);
+
+            Quaternionf rotation = StadiumClientManager.INSTANCE.getCameraRotation();
+            var forwardVector = rotation.transform(Camera.FORWARDS, new Vector3f());
+            var upVector = rotation.transform(Camera.UP, new Vector3f());
+            var leftVector = rotation.transform(Camera.LEFT, new Vector3f());
+            stadiumCamera.rotation.set(rotation);
+            stadiumCamera.xRot = (float)Mth.wrapDegrees(-Math.toDegrees(Math.asin(forwardVector.y)));
+            stadiumCamera.yRot = Mth.wrapDegrees((float)-Math.toDegrees(Camera.FORWARDS.angleSigned(forwardVector, Camera.UP)) + 180);
+            stadiumCamera.forwards.set(forwardVector);
+            stadiumCamera.up.set(upVector);
+            stadiumCamera.left.set(leftVector);
+
+            this.renderDistance = (float)(this.minecraft.options.getEffectiveRenderDistance() * 16);
+            double d = this.getFov(stadiumCamera, f, true);
+            Matrix4f matrix4f = this.getProjectionMatrix(d);
+
+            this.resetProjectionMatrix(matrix4f);
+            Quaternionf quaternionf = stadiumCamera.rotation().conjugate(new Quaternionf());
+            Matrix4f matrix4f2 = (new Matrix4f()).rotation(quaternionf);
+            this.minecraft.levelRenderer.prepareCullFrustum(stadiumCamera.getPosition(), matrix4f2, this.getProjectionMatrix(Math.max(d, (double)(Integer)this.minecraft.options.fov().get())));
+            this.minecraft.levelRenderer.renderLevel(deltaTracker, false, stadiumCamera, (GameRenderer) (Object) this, this.lightTexture, matrix4f2, matrix4f);
+
+            this.minecraft.getProfiler().pop();
+
+            ci.cancel();
+        }
+    }
+
+    @Inject(method = "tick", at = @At(value = "TAIL"))
+    public void tick(CallbackInfo ci) {
+//        StadiumClientManager.INSTANCE.tickCameraManager();
+    }
 }
@@ -59,8 +59,21 @@ public class HumanoidModelMixin {
        }

        Entity vehicle = entity.getVehicle();
-        if (vehicle instanceof PokemonEntity && entity instanceof AbstractClientPlayer) {
-            MountedPlayerRenderer.INSTANCE.animate((PokemonEntity) vehicle, (AbstractClientPlayer) entity, relevantPartsByName, netHeadYaw, headPitch, ageInTicks, limbSwing, limbSwingAmount);
+        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);
        }
    }
 }
@@ -12,6 +12,7 @@ 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;
@@ -54,17 +55,18 @@ 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);
            }
        }
    }
@@ -78,6 +80,7 @@ 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,6 +15,7 @@ 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;
@@ -29,9 +30,10 @@ 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 class MouseHandlerMixin {
+public abstract class MouseHandlerMixin {
    @Shadow private double accumulatedScrollY;
    @Shadow @Final private Minecraft minecraft;

@@ -49,6 +51,14 @@ public 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(
@@ -161,16 +171,21 @@ public class MouseHandlerMixin {
        return false;
    }

-    @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) {
+    @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) {
        if (minecraft.player == null) return;
        if (!(minecraft.player instanceof OrientationControllable controllable)) return;
        if (!controllable.getOrientationController().isActive()) return;
        if (minecraft.isPaused()) return;
+        if (isMouseGrabbed()) return;

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

    @Unique
@@ -1,38 +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.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,6 +563,8 @@ 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))
    }

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

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

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

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

@@ -23,7 +23,7 @@ object CobblemonCommands {
        ChangeEyeHeight.register(dispatcher)
        ChangeScaleAndSize.register(dispatcher)
        ChangeWalkSpeed.register(dispatcher)
-        ChangeJointScaleCommand.register(dispatcher)
+        TransformModelPartCommand.register(dispatcher)
        TestCommand.register(dispatcher)
        ReloadShowdownCommand.register(dispatcher)
        ClickTextCommand.register(dispatcher)
@@ -272,6 +272,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val PC = blockItem("pc", CobblemonBlocks.PC)
    @JvmField
+    val STADIUM = blockItem("stadium_terminal", CobblemonBlocks.STADIUM)
+    @JvmField
    val PASTURE = blockItem("pasture", CobblemonBlocks.PASTURE)
    @JvmField
    val DISPLAY_CASE = blockItem("display_case", CobblemonBlocks.DISPLAY_CASE)
@@ -281,7 +283,6 @@ 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")
@@ -294,20 +295,21 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField val REAPER_CLOTH = noSettingsItem("reaper_cloth")
    @JvmField val PRISM_SCALE = noSettingsItem("prism_scale")
    @JvmField val SACHET = noSettingsItem("sachet")
-    @JvmField val WHIPPED_DREAM = noSettingsItem("whipped_dream")
-    @JvmField val STRAWBERRY_SWEET = noSettingsItem("strawberry_sweet")
-    @JvmField val LOVE_SWEET = noSettingsItem("love_sweet")
-    @JvmField val BERRY_SWEET = noSettingsItem("berry_sweet")
-    @JvmField val CLOVER_SWEET = noSettingsItem("clover_sweet")
-    @JvmField val FLOWER_SWEET = noSettingsItem("flower_sweet")
-    @JvmField val STAR_SWEET = noSettingsItem("star_sweet")
-    @JvmField val RIBBON_SWEET = noSettingsItem("ribbon_sweet")
+    @JvmField val WHIPPED_DREAM = create("whipped_dream", foodItem(8, 0.3f))
+    @JvmField val STRAWBERRY_SWEET = create("strawberry_sweet", foodItem(6, 0.125f))
+    @JvmField val LOVE_SWEET = create("love_sweet", foodItem(6, 0.125f))
+    @JvmField val BERRY_SWEET = create("berry_sweet", foodItem(6, 0.125f))
+    @JvmField val CLOVER_SWEET = create("clover_sweet", foodItem(6, 0.125f))
+    @JvmField val FLOWER_SWEET = create("flower_sweet", foodItem(6, 0.125f))
+    @JvmField val STAR_SWEET = create("star_sweet", foodItem(6, 0.125f))
+    @JvmField val RIBBON_SWEET = create("ribbon_sweet", foodItem(6, 0.125f))
    @JvmField val CHIPPED_POT = noSettingsItem("chipped_pot")
    @JvmField val CRACKED_POT = noSettingsItem("cracked_pot")
    @JvmField val MASTERPIECE_TEACUP = noSettingsItem("masterpiece_teacup")
    @JvmField val UNREMARKABLE_TEACUP = noSettingsItem("unremarkable_teacup")
-    @JvmField val SWEET_APPLE = noSettingsItem("sweet_apple")
-    @JvmField val TART_APPLE = noSettingsItem("tart_apple")
+    @JvmField val SWEET_APPLE = create("sweet_apple", foodItem(4, 0.3f))
+    @JvmField val TART_APPLE = create("tart_apple", foodItem(4, 0.3f))
+    @JvmField val SYRUPY_APPLE = create("syrupy_apple", foodItem(4, 0.3f))
    @JvmField val GALARICA_CUFF = noSettingsItem("galarica_cuff")
    @JvmField val GALARICA_WREATH = noSettingsItem("galarica_wreath")
    @JvmField val BLACK_AUGURITE = noSettingsItem("black_augurite")
@@ -660,6 +662,19 @@ 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")
@@ -676,8 +691,6 @@ 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")
@@ -686,12 +699,8 @@ 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")
@@ -712,8 +721,6 @@ 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")
@@ -722,8 +729,6 @@ 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")
@@ -758,8 +763,6 @@ 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,12 +793,8 @@ 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")
@@ -832,8 +831,6 @@ 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)
@@ -1263,6 +1260,16 @@ 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 {
@@ -1354,4 +1361,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
        return createdItem
    }

+    private fun foodItem(nutrition: Int, saturationModifier: Float): Item {
+        return Item(Item.Properties().food(FoodProperties.Builder().nutrition(nutrition).saturationModifier(saturationModifier).build()))
+    }
 }
@@ -218,6 +218,10 @@ import com.cobblemon.mod.common.net.serverhandling.trade.ChangeTradeAcceptanceHa
 import com.cobblemon.mod.common.net.serverhandling.trade.OfferTradeHandler
 import com.cobblemon.mod.common.net.serverhandling.trade.PerformTradeHandler
 import com.cobblemon.mod.common.net.serverhandling.trade.UpdateTradeOfferHandler
+import com.cobblemon.mod.common.stadium.StadiumCamerasSyncPacket
+import com.cobblemon.mod.common.stadium.StadiumJoinHandler
+import com.cobblemon.mod.common.stadium.StadiumJoinPacket
+import com.cobblemon.mod.common.stadium.StadiumCameraManagersSyncPacket
 import com.cobblemon.mod.common.util.server
 import net.minecraft.server.level.ServerPlayer

@@ -374,6 +378,8 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(FlowRegistrySyncPacket.ID, FlowRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(CosmeticItemAssignmentSyncPacket.ID, CosmeticItemAssignmentSyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(MarkRegistrySyncPacket.ID, MarkRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
+        list.add(PacketRegisterInfo(StadiumCamerasSyncPacket.ID, StadiumCamerasSyncPacket::decode, DataRegistrySyncPacketHandler()))
+        list.add(PacketRegisterInfo(StadiumCameraManagersSyncPacket.ID, StadiumCameraManagersSyncPacket::decode, DataRegistrySyncPacketHandler()))

        // Effects
        list.add(PacketRegisterInfo(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler))
@@ -436,6 +442,9 @@ object CobblemonNetwork {
        // Riding
        list.add(PacketRegisterInfo(ClientboundUpdateRidingStatePacket.ID, ClientboundUpdateRidingStatePacket::decode, ClientboundUpdateRidingStateHandler))

+        // Stadium packets
+        list.add(PacketRegisterInfo(StadiumJoinPacket.ID, StadiumJoinPacket::decode, StadiumJoinHandler))
+
        return list
    }

@@ -20,4 +20,4 @@ interface EntitySideDelegate<T : Entity> {
    fun tick(entity: T) {}
    fun onSyncedDataUpdated(data: EntityDataAccessor<*>) {}
    fun addToStruct(struct: QueryStruct) {}
-}
+}
@@ -21,4 +21,6 @@ interface PokemonSideDelegate : EntitySideDelegate<PokemonEntity> {
    fun updatePostDeath() {}
    fun handleStatus(status: Byte) {}
    fun spawnShinyParticle(player: Player) {}
-}
+    fun positionRider(passenger: Entity, positionUpdater: MoveFunction)
+    fun updateAge(age: Int) {}
+}
@@ -38,12 +38,11 @@ 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
@@ -63,7 +62,6 @@ import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
 import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
 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
@@ -289,16 +287,32 @@ object MoLangFunctions {
                } as? ServerPlayer
                val pos = Vec3(x, y, z)

-                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())
-                    }
+                val packet = SpawnSnowstormParticlePacket(particle, pos)
+                if (player != null) {
+                    packet.sendToPlayer(player)
                } else {
-                    val effect = BedrockParticleOptionsRepository.getEffect(particle) ?: return@put DoubleValue.ZERO
-                    ParticleStorm.createAtPosition(world, effect, pos).spawn()
+                    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
                }
            }
            map.put("get_entities_around") { params ->
@@ -818,9 +832,14 @@ 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).isEmpty) }
+            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
        }
    )
@@ -19,4 +19,4 @@ interface Decodable {
     */
    fun decode(buffer: RegistryFriendlyByteBuf)

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

-}
+}
@@ -107,4 +107,22 @@ 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 CHANGE_JOINT_SCALE = this.create("${COMMAND_PREFIX}changejointscale", PermissionLevel.ALL_COMMANDS)
+    val TRANSFORM_MODEL_PART = this.create("${COMMAND_PREFIX}transformmodelpart", PermissionLevel.ALL_COMMANDS)
    @JvmStatic
    val CHECKSPAWNS = this.create("${COMMAND_PREFIX}checkspawns", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
    @JvmStatic
@@ -77,18 +77,18 @@ object CatchRateModifiers {

    /**
     * Used by [PokeBalls.MOON_BALL].
-     * Boosts the catch rate 1.5× during Moon Phases 3 and 7 between the times of 12000 – 24000.
-     * 2.5× during Moon Phases 2 and 8 between the times of 12000 – 24000.
-     * 4× during Moon Phase 1 between the times of 12000 – 24000.
+     * Boosts the catch rate 1.5× during Moon Phases 2 and 6 between the times of 12000 – 24000.
+     * 2.5× during Moon Phases 1 and 7 between the times of 12000 – 24000.
+     * 4× during Moon Phase 0 between the times of 12000 – 24000.
     * 1× otherwise.
     */
    val MOON_PHASES: CatchRateModifier = WorldStateModifier { _, entity ->
        if (entity.level().gameTime in 12000..24000)
            return@WorldStateModifier 1F
        when (entity.level().moonPhase) {
-            3, 7 -> 1.5F
-            2, 8 -> 2.5F
-            1 -> 4F
+            2, 6 -> 1.5F
+            1, 7 -> 2.5F
+            0 -> 4F
            else -> 1F
        }
    }
@@ -41,9 +41,6 @@ class RidingProperties(
        }
    }

-    val canRide: Boolean
-        get() = seats.isNotEmpty() && behaviour != null
-
    fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeMap(
            stats,
@@ -53,7 +50,6 @@ 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,5 +18,6 @@ package com.cobblemon.mod.common.api.riding
 enum class RidingStyle {
    LAND,
    LIQUID,
-    AIR
-}
+    AIR,
+    COMPOSITE
+}
@@ -8,6 +8,7 @@

 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
@@ -27,6 +28,7 @@ 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

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

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

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

 }
@@ -11,6 +11,7 @@ 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,15 +8,10 @@

 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.network.RegistryFriendlyByteBuf
-import kotlin.reflect.KProperty
+import net.minecraft.world.phys.Vec3

 /**
 * Represents the state of a Pokemon when being ridden.
@@ -27,18 +22,38 @@ import kotlin.reflect.KProperty
 *
 * @author landonjw
 */
-interface RidingBehaviourState : Encodable, Decodable {
-    fun reset()
-    fun copy(): RidingBehaviourState
-    fun shouldSync(previous: RidingBehaviourState): Boolean
-}
+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)
+    }

-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<*, *>>()
+    val behaviours = mutableMapOf<ResourceLocation, RidingBehaviour<RidingBehaviourSettings, RidingBehaviourState>>()

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

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

 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
@@ -24,6 +25,7 @@ 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)
@@ -39,8 +41,13 @@ 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 vehicle.rotationVector
+        if (!isActive(settings, state, vehicle)) return driver.rotationVector
        return behaviour.rotation(settings, state, vehicle, driver)
    }

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

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

 }
@@ -12,12 +12,14 @@ 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
@@ -25,6 +27,9 @@ 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> {
@@ -33,9 +38,10 @@ 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.rideVel.get().z > 0.1 })
+        .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVelocity.get().z > 0.2 })

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

    override fun rotation(
@@ -83,11 +89,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.rideVel.get().z
-            forwardForce += cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVel.get().z
+            upForce += -1.0 * sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z
+            forwardForce += cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z

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


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

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

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

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

@@ -113,19 +119,19 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
    */
    fun calculateRideSpaceVel(settings: BirdAirSettings, state: BirdAirState, vehicle: PokemonEntity, driver: Player) {
        //retrieve stats
-        val topSpeed = vehicle.runtime.resolveDouble(settings.topSpeedExpr)
-        val glideTopSpeed = vehicle.runtime.resolveDouble(settings.glideTopSpeedExpr)
-        val accel = vehicle.runtime.resolveDouble(settings.accelExpr)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
+        val glideTopSpeed = vehicle.runtime.resolveDouble(settings.glidespeedExpr)
+        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr)
        val staminaStat = vehicle.runtime.resolveDouble(settings.staminaExpr)

        var glideSpeedChange = 0.0

-        val currSpeed = state.rideVel.get().length()
+        val currSpeed = state.rideVelocity.get().length()

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

-        var newVelocity = Vec3(state.rideVel.get().x, state.rideVel.get().y, state.rideVel.get().z)
+        var newVelocity = Vec3(state.rideVelocity.get().x, state.rideVelocity.get().y, state.rideVelocity.get().z)

        //speed up and slow down based on input
        if (driver.zza != 0.0f && state.stamina.get() > 0.0) {
@@ -176,26 +182,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 -> 1.0
-            driver.isShiftKeyDown -> -1.0
+            driver.jumping && state.rideVelocity.get().length() < 0.3 -> 1.0
+            driver.isShiftKeyDown && state.rideVelocity.get().length() < 0.3  -> -1.0
            else -> 0.0
        }

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

-        //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)
-        }
+        //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)
+//        }

        //air resistance
-        newVelocity = Vec3(
-            newVelocity.x,
-            newVelocity.y,
-            lerp( newVelocity.z,0.0, topSpeed / ( 20.0 * 30.0))
-        )
-        state.rideVel.set(newVelocity)
+        if( abs(newVelocity.z) > 0) {
+            newVelocity = newVelocity.subtract(0.0, 0.0, min(0.0015 * newVelocity.z.sign, newVelocity.z))
+        }
+        state.rideVelocity.set(newVelocity)
    }

    override fun angRollVel(
@@ -255,10 +260,17 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        if (driver !is OrientationControllable) return Vec3.ZERO
        val controller = (driver as OrientationControllable).orientationController

-        //TODO: Tie into handling
+        //limit rolling based on handling and current speed.
+        //modulated by speed so that when flapping idle in air you are ont wobbling around to look around
+        //TODO: Tie handling into yaw rate
        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr)
-        val topSpeed = vehicle.runtime.resolveDouble(settings.topSpeedExpr)
-         val rotationChangeRate = 10.0
+        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

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

-        return Vec3(yawForce, pitchForce, 0.0)
+        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())
    }

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

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

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

        //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 * normalizeVal(state.rideVel.get().length(), 0.0, topSpeed).pow(3), rotMin)
+        val rotLimit = max(handling * sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)), 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))
            }
@@ -315,10 +351,18 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        }

        //Give the ability to yaw with x mouse input when at low speeds.
-        val yawForce = xInput * ( 1.0 - normalizeVal(state.rideVel.get().length(), 0.0, topSpeed).pow(3))
+        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())

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

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

        //Must I ensure that topspeed is greater than minimum?
-        val normalizedGlideSpeed = normalizeVal(state.rideVel.get().length(), topSpeed, glideTopSpeed)
+        val normalizedGlideSpeed = normalizeVal(state.rideVelocity.get().length(), topSpeed, glideTopSpeed)

        //Only ever want the fov change to be a max of 0.2 and for it to have non linear scaling.
        return 1.0f + normalizedGlideSpeed.pow(2).toFloat() * 0.2f
@@ -433,104 +477,91 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        return false
    }

-    override fun createDefaultState() = BirdAirState()
+    override fun createDefaultState(settings: BirdAirSettings) = 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()
-        private set
-
-    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 speedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 1.0, 0.35)".asExpression()
+    var accelerationExpr: Expression = "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 3.0)), (1.0 / (20.0 * 8.0)))".asExpression()
    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 120.0, 20.0)".asExpression()
+
+    var glidespeedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 2.0, 1.0)".asExpression()
        private set

    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeExpression(altitudeExpr)
+        buffer.writeResourceLocation(key)
        buffer.writeExpression(infiniteAltitude)
        buffer.writeExpression(infiniteStamina)
+        buffer.writeExpression(glidespeedExpr)
+        buffer.writeExpression(jumpExpr)
        buffer.writeExpression(handlingExpr)
-        buffer.writeExpression(topSpeedExpr)
-        buffer.writeExpression(glideTopSpeedExpr)
-        buffer.writeExpression(accelExpr)
+        buffer.writeExpression(speedExpr)
+        buffer.writeExpression(accelerationExpr)
        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()
-        topSpeedExpr = buffer.readExpression()
-        glideTopSpeedExpr = buffer.readExpression()
-        accelExpr = buffer.readExpression()
+        speedExpr = buffer.readExpression()
+        accelerationExpr = buffer.readExpression()
        staminaExpr = buffer.readExpression()
    }
 }

-class BirdAirState : RidingBehaviourState {
-    var rideVel = ridingState(Vec3.ZERO, Side.CLIENT)
-    var stamina = ridingState(1.0f, Side.CLIENT)
+class BirdAirState : RidingBehaviourState() {
    var gliding = ridingState(false, Side.CLIENT)
    var lastGlide = ridingState(-100L, Side.CLIENT)
+    var currRollCorrectionForce = ridingState(0.0, Side.CLIENT)

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

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

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

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

    override fun copy() = BirdAirState().also {
-        it.rideVel.set(this.rideVel.get(), forced = true)
+        it.rideVelocity.set(this.rideVelocity.get(), forced = true)
        it.stamina.set(this.stamina.get(), forced = true)
        it.gliding.set(this.gliding.get(), forced = true)
        it.lastGlide.set(this.lastGlide.get(), forced = true)
+        it.currRollCorrectionForce.set(this.currRollCorrectionForce.get(), forced = true)
    }

    override fun shouldSync(previous: RidingBehaviourState): Boolean {
        if (previous !is BirdAirState) return false
-        if (previous.rideVel != rideVel) return true
-        if (previous.stamina != stamina) return true
-        if (previous.gliding != gliding) return true
-        return false
+        if (previous.gliding.get() != gliding.get()) return true
+        return super.shouldSync(previous)
    }
 }
@@ -11,6 +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.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
@@ -18,7 +19,6 @@ 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,6 +35,7 @@ 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) })
@@ -256,7 +257,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
        return false
    }

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

 }

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

    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
        buffer.writeExpression(canJump)
        buffer.writeExpression(jumpVector[0])
        buffer.writeExpression(jumpVector[1])
@@ -306,13 +308,11 @@ 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
 }
@@ -1,434 +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.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,7 +9,8 @@
 package com.cobblemon.mod.common.api.riding.behaviour.types

 import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.value.DoubleValue
+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
@@ -17,15 +18,14 @@ 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.max
-import kotlin.math.min
-import kotlin.math.pow
+import kotlin.math.*

 class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandState> {
    companion object {
@@ -33,10 +33,11 @@ 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 state.rideVel.get().z > 0.1
+            return@PoseOption abs(state.rideVelocity.get().z) > 0.2
        })

    override fun isActive(
@@ -72,18 +73,102 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
-        return state.rideVel.get().length().toFloat()
+        return state.rideVelocity.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 {
-        return Vec2(driver.xRot * 0.5f, driver.yRot)
+        val turnAmount =  calcRotAmount(settings, state, vehicle, driver)
+
+        return Vec2(vehicle.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: 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,
@@ -91,24 +176,16 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        driver: Player,
        input: Vec3
    ): Vec3 {
-        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
+        //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 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)
-        }
+        state.rideVelocity.set(calculateRideSpaceVel(settings, state, vehicle, driver))

        //This is cheap.
        //Also make it stop quicker the slower it is.
@@ -118,7 +195,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.rideVel.get()
+        return state.rideVelocity.get()
    }

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

-        val minSpeed = 0.0
+        //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.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)
+        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
+            }

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

+        //Gravity logic
        if (vehicle.onGround()) {
            newVelocity = Vec3(newVelocity.x, 0.0, newVelocity.z)
        } else {
-            newVelocity = Vec3(newVelocity.x, max(newVelocity.y - 0.2, -1.0), newVelocity.z)
+            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)
        }
+
+        //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
    }

@@ -163,7 +264,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 normalizeSpeed(currSpeed: Double, minSpeed: Double, maxSpeed: Double): Double {
+    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)
    }
@@ -215,8 +316,6 @@ 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)
    }

@@ -227,10 +326,7 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        driver: Player,
        jumpStrength: Int
    ): Vec3 {
-        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())
+        return Vec3.ZERO
    }

    override fun gravity(
@@ -316,30 +412,21 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        return false
    }

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

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

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

-    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()
+    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'LAND', 1.0, 0.3)".asExpression()
        private set

    // Max accel is a whole 1.0 in 1 second. The conversion in the function below is to convert seconds to ticks
-    var 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())
+    var accelerationExpr: Expression =
+        "q.get_ride_stats('ACCELERATION', 'LAND', (1.0 / (20.0 * 1.5)), (1.0 / (20.0 * 5.0)))".asExpression()
        private set

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

    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        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.writeResourceLocation(key)
+        buffer.writeExpression(speedExpr)
+        buffer.writeExpression(accelerationExpr)
        buffer.writeExpression(staminaExpr)
        buffer.writeExpression(jumpExpr)
        buffer.writeExpression(handlingExpr)
    }

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

 }

-class GenericLandState : RidingBehaviourState {
-    var rideVel = ridingState(Vec3.ZERO, Side.CLIENT)
-    var stamina = ridingState(1.0f, Side.CLIENT)
+class GenericLandState : RidingBehaviourState() {
    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.rideVel.set(this.rideVel.get(), forced = true)
+        it.rideVelocity.set(this.rideVelocity.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
-        if (rideVel != previous.rideVel) return true
-        if (stamina != previous.stamina) return true
-        return false
+        return super.shouldSync(previous)
    }
 }
@@ -11,7 +11,8 @@ 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.behaviour.NoState
+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.RidingBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
@@ -28,17 +29,18 @@ import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
 import net.minecraft.world.phys.shapes.Shapes

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 }

@@ -236,6 +238,7 @@ 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.NoState
+import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
 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,31 +29,32 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, NoState> {
+class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourState> {
    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, NoState>(PoseType.HOVER)
+    val poseProvider = PoseProvider<HelicopterSettings, RidingBehaviourState>(PoseType.HOVER)
        .with(PoseOption(PoseType.FLY) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })

-    override fun isActive(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity): Boolean {
+    override fun isActive(settings: HelicopterSettings, state: RidingBehaviourState, 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
@@ -56,11 +58,11 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, NoState> {
        }
    }

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

-    override fun speed(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity, driver: Player): Float {
+    override fun speed(settings: HelicopterSettings, state: RidingBehaviourState, 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
@@ -69,7 +71,7 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, NoState> {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
        buffer.writeExpression(gravity)
        buffer.writeExpression(horizontalAcceleration)
        buffer.writeExpression(verticalVelocity)
@@ -0,0 +1,479 @@
+/*
+ * 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,12 +11,14 @@ 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
@@ -24,6 +26,7 @@ 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> {
@@ -32,12 +35,24 @@ 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.rideVel.get().z > 0.1 })
+        .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVelocity.get().z > 0.1 })

    override fun isActive(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity): Boolean {
-        return true
+        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: JetAirSettings, state: JetAirState, vehicle: PokemonEntity): PoseType {
@@ -46,30 +61,32 @@ 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.topSpeedExpr)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
        val staminaStat = vehicle.runtime.resolveDouble(settings.staminaExpr)

        //retrieve minSpeed
        val minSpeed = vehicle.runtime.resolveDouble(settings.minSpeed)

-        //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))
+        //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)
+//        }

-            //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()
+        return state.rideVelocity.get().length().toFloat()
    }

    //TODO: Move these functions to a riding util class.
@@ -108,8 +125,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.rideVel.get().z
-            forwardForce = cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVel.get().z
+            upForce = -1.0 * sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z
+            forwardForce = cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z
        }

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

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

            //Decelerate currently always a constant half of max acceleration.
-            state.rideVel.set(Vec3(state.rideVel.get().x, state.rideVel.get().y, max(state.rideVel.get().z - ((accel * deccelMod) / 2), minSpeed)))
+            state.rideVelocity.set(Vec3(state.rideVelocity.get().x, state.rideVelocity.get().y, max(state.rideVelocity.get().z - ((accel * deccelMod) / 2), minSpeed)))
        }
    }

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

-        // Accumulate the mouse input
-        state.currMouseXForce.set((state.currMouseXForce.get() + (0.0015 * mouseX * invertRoll)).coerceIn(-1.0, 1.0))
+        // 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))
        state.currMouseYForce.set((state.currMouseYForce.get() + (0.0015 * mouseY * invertPitch)).coerceIn(-1.0, 1.0))

        //Get handling in degrees per second
@@ -232,8 +254,9 @@ 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)
    }
@@ -281,11 +304,11 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.topSpeedExpr)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
        val minSpeed = vehicle.runtime.resolveDouble(settings.minSpeed)

        //Must I ensure that topspeed is greater than minimum?
-        val normalizedSpeed = normalizeSpeed(state.rideVel.get().length(), minSpeed, topSpeed)
+        val normalizedSpeed = normalizeSpeed(state.rideVelocity.get().length(), minSpeed, topSpeed)

        //TODO: Determine if this should be based on max possible speed instead of top speed.
        //Only ever want the fov change to be a max of 0.2 and for it to have non linear scaling.
@@ -333,7 +356,7 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
        return false
    }

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

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

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

-    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()
+    var handlingYawExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 50.0, 25.0)".asExpression()
        private set

    // Make configurable by json
@@ -373,77 +378,79 @@ 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 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)
+    var currMouseXForce = ridingState(0.0, Side.CLIENT)
+    var currMouseYForce = ridingState(0.0, Side.CLIENT)

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

-    override fun decode(buffer: RegistryFriendlyByteBuf) {
+    override fun decode(buffer: FriendlyByteBuf) {
+        super.decode(buffer)
        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.rideVel.set(rideVel.get(), forced = true)
-        it.currMouseXForce.set(currMouseXForce.get(), forced = true)
-        it.currMouseYForce.set(currMouseYForce.get(), forced = true)
+        it.rideVelocity.set(rideVelocity.get(), forced = true)
+//        it.currMouseXForce.set(currMouseXForce.get(), forced = true)
+//        it.currMouseYForce.set(currMouseYForce.get(), forced = true)
    }

    override fun shouldSync(previous: RidingBehaviourState): Boolean {
        if (previous !is JetAirState) return false
        if (previous.currSpeed != currSpeed) return true
-        if (previous.stamina != stamina) return true
-        if (previous.rideVel != rideVel) return true
-        return false
+        return super.shouldSync(previous)
    }
 }
@@ -1,469 +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.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
-    }
-}
@@ -1,450 +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.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,6 +10,7 @@ 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
@@ -33,6 +34,7 @@ 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) })
@@ -217,7 +219,7 @@ class SwimDashBehaviour : RidingBehaviour<SwimDashSettings, SwimDashState> {
        return false
    }

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

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

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

@@ -235,14 +238,12 @@ 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)
    }
@@ -252,9 +253,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,6 +53,7 @@ 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) })
@@ -265,7 +266,7 @@ class VehicleLandBehaviour : RidingBehaviour<VehicleLandSettings, VehicleLandSta
        return false
    }

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

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

    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
        buffer.writeExpression(canJump)
        buffer.writeExpression(jumpVector[0])
        buffer.writeExpression(jumpVector[1])
@@ -324,14 +326,12 @@ 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
 }
@@ -0,0 +1,426 @@
+/*
+ * 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)
+    }
+
+}
@@ -0,0 +1,32 @@
+/*
+ * 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>
+    }
+}
@@ -0,0 +1,53 @@
+/*
+ * 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)
+    }
+
+}
@@ -0,0 +1,99 @@
+/*
+ * 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()
+    }
+}
@@ -0,0 +1,68 @@
+/*
+ * 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)
+    }
+
+}
@@ -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.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)
+    }
+
+}
@@ -0,0 +1,143 @@
+/*
+ * 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
+    }
+}
@@ -0,0 +1,68 @@
+/*
+ * 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))
+    }
+}
@@ -14,6 +14,7 @@ import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory
 import com.cobblemon.mod.common.platform.events.PlatformEvents
 import com.cobblemon.mod.common.util.server
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
+import net.minecraft.server.level.ServerLevel
 import java.util.UUID
 import net.minecraft.server.level.ServerPlayer

@@ -32,24 +33,45 @@ object CobblemonWorldSpawnerManager : SpawnerManager() {
    init {
        PlatformEvents.SERVER_PLAYER_LOGIN.subscribe { this.onPlayerLogin(it.player) }
        PlatformEvents.SERVER_PLAYER_LOGOUT.subscribe { this.onPlayerLogout(it.player) }
+        PlatformEvents.CHANGE_DIMENSION.subscribe { this.onDimensionChange(it.player, it.origin, it.destination) }
    }

    fun onPlayerLogin(player: ServerPlayer) {
        // Disables spawning
-        if (!Cobblemon.config.enableSpawning || server()?.gameRules?.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING) == false) {
+        if (!Cobblemon.config.enableSpawning || player.level().gameRules.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING) == false) {
            return;
        }

-        val spawner = PlayerSpawnerFactory.create(this, player)
-        spawnersForPlayers[player.uuid] = spawner
-        registerSpawner(spawner)
+        registerPlayerSpawner(player)
    }

    fun onPlayerLogout(player: ServerPlayer) {
-        val spawner = spawnersForPlayers[player.uuid]
-        if (spawner != null) {
-            spawnersForPlayers.remove(player.uuid)
-            unregisterSpawner(spawner)
+        unregisterPlayerSpawner(player)
+    }
+
+    fun onDimensionChange(player: ServerPlayer, origin: ServerLevel?, destination: ServerLevel?) {
+        fun getSpawnRule(level: ServerLevel?) = level?.gameRules?.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING)
+
+        if (!Cobblemon.config.enableSpawning || getSpawnRule(origin) == getSpawnRule(destination)) {
+            return
+        }
+
+        val spawnerAction = if (destination?.gameRules?.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING) == false) {
+            ::unregisterPlayerSpawner
+        } else {
+            ::registerPlayerSpawner
+        }
+        spawnerAction(player)
+    }
+
+    private fun unregisterPlayerSpawner(player: ServerPlayer) {
+        spawnersForPlayers.remove(player.uuid)?.let { unregisterSpawner(it) }
+    }
+
+    private fun registerPlayerSpawner(player: ServerPlayer) {
+        PlayerSpawnerFactory.create(this, player).also {
+            spawnersForPlayers[player.uuid] = it
+            registerSpawner(it)
        }
    }
 }
@@ -71,10 +71,15 @@ open class SpawnerManager {

    open fun onServerTick() {
        // Disables spawning
-        if (!Cobblemon.config.enableSpawning || server()?.gameRules?.getBoolean(DO_POKEMON_SPAWNING) == false) {
+        if (!Cobblemon.config.enableSpawning) {
            return
        }
        influences.removeIf { it.isExpired() }
-        getSpawnersOfType<TickingSpawner>().forEach(TickingSpawner::tick)
+        getSpawnersOfType<TickingSpawner>().forEach {
+            if (it.getCauseEntity()?.level()?.gameRules?.getBoolean(DO_POKEMON_SPAWNING) == false) {
+                return@forEach
+            }
+            it.tick()
+        }
    }
 }
@@ -8,9 +8,13 @@

 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
@@ -28,4 +32,115 @@ 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,6 +22,8 @@ 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
@@ -34,6 +36,7 @@ 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 {
@@ -138,85 +141,6 @@ 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,7 +13,6 @@ 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
@@ -42,12 +41,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 = ShowdownInterpreter.getSendoutPosition(battle, activePokemonA, battlePokemonA.actor) ?: activePokemonA.position?.second
+                val posA = activePokemonA.getSendOutPosition() ?: activePokemonA.position?.second
                if (posA != null && battlePokemonA.entity != null) {
                    battlePokemonA.entity?.setPositionSafely(battlePokemonA.entity!!.getAjustedSendoutPosition(posA))
                }

-                val posB = ShowdownInterpreter.getSendoutPosition(battle, activePokemonB, battlePokemonA.actor) ?: activePokemonB.position?.second
+                val posB = activePokemonB.getSendOutPosition() ?: 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 = ShowdownInterpreter.getSendoutPosition(battle, activePokemon, battleActor)
+                    val targetPos = activePokemon.getSendOutPosition()
                    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) ShowdownInterpreter.getSendoutPosition(battle, activePokemon, actor)
+                    val pos = (if (battle.format.battleType.pokemonPerSide == 1) activePokemon.getSendOutPosition()
                        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
@@ -0,0 +1,133 @@
+/*
+ * 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.block
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.text.red
+import com.cobblemon.mod.common.api.text.text
+import com.cobblemon.mod.common.block.entity.StadiumBlockEntity
+import net.minecraft.core.BlockPos
+import net.minecraft.core.Direction
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.world.InteractionResult
+import net.minecraft.world.entity.player.Player
+import net.minecraft.world.item.context.BlockPlaceContext
+import net.minecraft.world.level.Level
+import net.minecraft.world.level.block.BaseEntityBlock
+import net.minecraft.world.level.block.Block
+import net.minecraft.world.level.block.HorizontalDirectionalBlock
+import net.minecraft.world.level.block.Mirror
+import net.minecraft.world.level.block.RenderShape
+import net.minecraft.world.level.block.Rotation
+import net.minecraft.world.level.block.entity.BlockEntity
+import net.minecraft.world.level.block.state.BlockState
+import net.minecraft.world.level.block.state.StateDefinition
+import net.minecraft.world.phys.BlockHitResult
+
+class StadiumBlock(properties: Properties): BaseEntityBlock(properties) {
+    companion object {
+        val CODEC = simpleCodec(::StadiumBlock)
+    }
+
+    init {
+        registerDefaultState(stateDefinition.any().setValue(HorizontalDirectionalBlock.FACING, Direction.NORTH))
+    }
+
+    override fun codec() = CODEC
+
+    override fun newBlockEntity(pos: BlockPos, state: BlockState): BlockEntity {
+        return StadiumBlockEntity(pos, state)
+    }
+
+    override fun getStateForPlacement(blockPlaceContext: BlockPlaceContext): BlockState {
+        return this.defaultBlockState().setValue(HorizontalDirectionalBlock.FACING, blockPlaceContext.horizontalDirection)
+    }
+
+    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
+        builder.add(HorizontalDirectionalBlock.FACING)
+    }
+
+    override fun rotate(blockState: BlockState, rotation: Rotation): BlockState {
+        return blockState.setValue(
+            HorizontalDirectionalBlock.FACING, rotation.rotate(blockState.getValue(
+                HorizontalDirectionalBlock.FACING)))
+    }
+
+    override fun mirror(blockState: BlockState, mirror: Mirror): BlockState {
+        return blockState.rotate(mirror.getRotation(blockState.getValue(HorizontalDirectionalBlock.FACING)))
+    }
+
+    override fun onRemove(state: BlockState, world: Level, pos: BlockPos, newState: BlockState, moved: Boolean) {
+        if (!state.`is`(newState.block)) super.onRemove(state, world, pos, newState, moved)
+    }
+
+    //TODO: override getTicker
+
+    override fun getRenderShape(state: BlockState) = RenderShape.MODEL
+
+    override fun useWithoutItem(
+        state: BlockState,
+        world: Level,
+        pos: BlockPos,
+        player: Player,
+        hitResult: BlockHitResult
+    ): InteractionResult {
+        if (player !is ServerPlayer) return InteractionResult.SUCCESS
+
+        val blockEntity = world.getBlockEntity(pos)
+        if (blockEntity !is StadiumBlockEntity) return InteractionResult.SUCCESS
+
+        player.sendSystemMessage(text("Adding you to Battle").red())
+        blockEntity.addPlayer(player)
+        return InteractionResult.SUCCESS
+    }
+
+    /*
+    override fun useWithoutItem(
+        blockState: BlockState,
+        world: Level,
+        blockPos: BlockPos,
+        player: Player,
+        blockHitResult: BlockHitResult
+    ): InteractionResult {
+        if (player !is ServerPlayer) return InteractionResult.SUCCESS
+
+        val blockEntity = world.getBlockEntity(blockPos)
+        if (blockEntity !is StadiumBlockEntity) return InteractionResult.SUCCESS
+
+        // Toggle isInUse state
+        blockEntity.isInUse = !blockEntity.isInUse
+
+        // debug
+        val activateMessage = if (blockEntity.isInUse) "Stadium Activated!" else "Stadium Deactivated!"
+        player.sendSystemMessage(text(activateMessage).red())
+
+        if (blockEntity.isInUse) {
+            // Generate flight path when activated
+            blockEntity.generateFlightPath(world, radiusX = 5.0, radiusZ = 3.0, height = 10.0, steps = 20)
+
+        } else {
+            // Clear path when deactivated
+            blockEntity.pathPoints.clear()
+        }
+
+        val message = "Stadium Pos: " + blockEntity.blockPos +
+                "\nPlayer 1 Pos: " + blockEntity.getPlayer1Pos() +
+                "\nPoke 1 Pos: " + blockEntity.getPoke1Pos() +
+                "\nPlayer 2 Pos: " + blockEntity.getPlayer2Pos() +
+                "\nPoke 2 Pos: " + blockEntity.getPoke2Pos()
+        player.sendSystemMessage(text(message).red())
+
+        blockEntity.setChanged()
+        world.sendBlockUpdated(blockPos, blockState, blockState, Block.UPDATE_CLIENTS)
+
+        return InteractionResult.SUCCESS
+    }
+    */
+}
@@ -0,0 +1,143 @@
+package com.cobblemon.mod.common.block.entity
+
+import com.cobblemon.mod.common.CobblemonBlockEntities
+import com.cobblemon.mod.common.client.render.models.blockbench.drone.DroneState
+import com.cobblemon.mod.common.stadium.StadiumSingleBattle
+import net.minecraft.core.BlockPos
+import net.minecraft.core.HolderLookup
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.ListTag
+import net.minecraft.network.protocol.Packet
+import net.minecraft.network.protocol.game.ClientGamePacketListener
+import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket
+import net.minecraft.network.protocol.game.ClientboundPlayerLookAtPacket
+import net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.world.level.Level
+import net.minecraft.world.level.block.entity.BlockEntity
+import net.minecraft.world.level.block.state.BlockState
+import net.minecraft.world.phys.Vec3
+
+class StadiumBlockEntity(
+    pos: BlockPos,
+    blockState: BlockState
+): BlockEntity(
+    CobblemonBlockEntities.STADIUM,
+    pos,
+    blockState
+) {
+    var storedPlayers = mutableListOf<ServerPlayer>()
+
+    var battleDefenition = StadiumSingleBattle()
+
+    fun addPlayer(player: ServerPlayer) {
+        battleDefenition.addPlayer(player)
+        if (battleDefenition.readyForBattle()) battleDefenition.initializeBattle()
+    }
+
+    /*
+    var isInUse = false
+
+    val droneState = DroneState()
+
+    val pathPoints: MutableList<Vec3> = mutableListOf()
+
+    fun generateFlightPath(world: Level, radiusX: Double, radiusZ: Double, height: Double, steps: Int) {
+        pathPoints.clear()
+
+        for (i in 0 until steps) {
+            val angle = (i.toDouble() / steps) * Math.PI * 2
+            val xOffset = radiusX * Math.cos(angle)
+            val zOffset = radiusZ * Math.sin(angle)
+
+            val basePos = Vec3(blockPos.x + xOffset, blockPos.y + height, blockPos.z + zOffset)
+            val adjustedPos = getValidPoint(world, basePos)
+
+            pathPoints.add(adjustedPos)
+        }
+    }
+
+    private fun getValidPoint(world: Level, start: Vec3): Vec3 {
+        val maxHeight = 40 // Max height for drone path
+        val stepHeight = 1.0 // Step size for raycast
+
+        var adjustedHeight = start.y
+        for (h in 0..maxHeight step stepHeight.toInt()) {
+            val checkPos = BlockPos(start.x.toInt(), start.y.toInt() - h, start.z.toInt()) // Convert to BlockPos
+            if (!world.getBlockState(checkPos).isAir) { // Check if block is solid
+                return Vec3(start.x, start.y - h - 1, start.z) // Adjust position
+            }
+        }
+        return start // No obstruction found
+    }
+
+
+    fun getPlayer1Pos(): BlockPos {
+        return blockPos.north(10)
+    }
+    fun getPlayer2Pos(): BlockPos {
+        return blockPos.south(10)
+    }
+    fun getPoke1Pos(): BlockPos {
+        return blockPos.north(5)
+    }
+    fun getPoke2Pos(): BlockPos {
+        return blockPos.south(5)
+    }
+
+
+
+
+    /**
+     * Saves data to NBT.
+     */
+    override fun saveAdditional(tag: CompoundTag, registries: HolderLookup.Provider) {
+        super.saveAdditional(tag, registries)
+
+        // Save the isInUse state
+        tag.putBoolean("IsInUse", isInUse)
+
+        // Save path points
+        val pathTag = ListTag()
+        for (point in pathPoints) {
+            val pointTag = CompoundTag()
+            pointTag.putDouble("x", point.x)
+            pointTag.putDouble("y", point.y)
+            pointTag.putDouble("z", point.z)
+            pathTag.add(pointTag)
+        }
+        tag.put("PathPoints", pathTag)
+    }
+
+    /**
+     * Loads data from NBT.
+     */
+    override fun loadAdditional(tag: CompoundTag, registries: HolderLookup.Provider) {
+        super.loadAdditional(tag, registries)
+
+        // Load the isInUse state
+        isInUse = tag.getBoolean("IsInUse")
+
+        // Load path points
+        pathPoints.clear()
+        val pathTag = tag.getList("PathPoints", 10) // 10 is the ID for CompoundTag
+        for (i in 0 until pathTag.size) {
+            val pointTag = pathTag.getCompound(i)
+            val point = Vec3(pointTag.getDouble("x"), pointTag.getDouble("y"), pointTag.getDouble("z"))
+            pathPoints.add(point)
+        }
+    }
+
+    override fun getUpdatePacket(): Packet<ClientGamePacketListener>? {
+        //println("getUpdatePacket called for NestBlockEntity at $blockPos with egg: $eggComponent")
+        return ClientboundBlockEntityDataPacket.create(this)
+    }
+
+    override fun getUpdateTag(registryLookup: HolderLookup.Provider): CompoundTag {
+        val tag = saveWithoutMetadata(registryLookup)
+        //println("getUpdateTag called for NestBlockEntity at $blockPos with tag: $tag")
+        return tag
+    }
+
+    */
+}
@@ -26,13 +26,7 @@ import com.cobblemon.mod.common.client.gui.battle.BattleOverlay
 import com.cobblemon.mod.common.client.particle.BedrockParticleOptionsRepository
 import com.cobblemon.mod.common.client.render.ClientPlayerIcon
 import com.cobblemon.mod.common.client.render.DeferredRenderer
-import com.cobblemon.mod.common.client.render.block.BerryBlockRenderer
-import com.cobblemon.mod.common.client.render.block.DisplayCaseRenderer
-import com.cobblemon.mod.common.client.render.block.FossilAnalyzerRenderer
-import com.cobblemon.mod.common.client.render.block.GildedChestBlockRenderer
-import com.cobblemon.mod.common.client.render.block.HealingMachineRenderer
-import com.cobblemon.mod.common.client.render.block.LecternBlockEntityRenderer
-import com.cobblemon.mod.common.client.render.block.RestorationTankRenderer
+import com.cobblemon.mod.common.client.render.block.*
 import com.cobblemon.mod.common.client.render.boat.CobblemonBoatRenderer
 import com.cobblemon.mod.common.client.render.entity.PokeBobberEntityRenderer
 import com.cobblemon.mod.common.client.render.generic.GenericBedrockRenderer
@@ -60,6 +54,7 @@ import com.cobblemon.mod.common.entity.boat.CobblemonBoatType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.platform.events.PlatformEvents
 import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext
+import com.cobblemon.mod.common.stadium.StadiumClientManager
 import com.cobblemon.mod.common.util.isLookingAt
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
@@ -116,6 +111,7 @@ object CobblemonClient {
        CobblemonDataProvider.canReload = true
        DeferredRenderer.clearAll()
        ClientPlayerIcon.clear()
+        StadiumClientManager.onLogout()
    }

    fun initialize(implementation: CobblemonClientImplementation) {
@@ -260,7 +256,8 @@ object CobblemonClient {
            CobblemonBlocks.SKY_TUMBLESTONE_CLUSTER,
            CobblemonBlocks.GIMMIGHOUL_CHEST,
            CobblemonBlocks.DISPLAY_CASE,
-            CobblemonBlocks.LECTERN
+            CobblemonBlocks.LECTERN,
+            CobblemonBlocks.STADIUM
        )

        this.createBoatModelLayers()
@@ -294,6 +291,7 @@ object CobblemonClient {
        this.implementation.registerBlockEntityRenderer(CobblemonBlockEntities.GILDED_CHEST, ::GildedChestBlockRenderer)
        this.implementation.registerBlockEntityRenderer(CobblemonBlockEntities.DISPLAY_CASE, ::DisplayCaseRenderer)
        this.implementation.registerBlockEntityRenderer(CobblemonBlockEntities.LECTERN, ::LecternBlockEntityRenderer)
+        this.implementation.registerBlockEntityRenderer(CobblemonBlockEntities.STADIUM, ::StadiumBlockRenderer)
    }

    private fun registerEntityRenderers() {
@@ -0,0 +1,77 @@
+/*
+ * 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()
+    }
+}
@@ -43,8 +43,10 @@ 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 {
@@ -343,9 +345,12 @@ 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 {
@@ -451,4 +456,30 @@ 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() }
+        editBox.setFilter { value -> value.toIntOrNull() != null || value.isBlank() || value == "-" }
        editBox.setResponder { value ->
            if (value.isBlank()) {
                return@setResponder
            }

-            val intValue = value.toInt()
+            val intValue = value.toIntOrNull() ?: return@setResponder
            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() }
+        editBox.setFilter { value -> value.toFloatOrNull() != null || value.isBlank() || value == "." || value == "-" }
        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() }
+        editBox.setFilter { value -> value.toDoubleOrNull() != null || value.isBlank() || value == "." || value == "-" }
        editBox.setResponder { value ->
            if (value.toDoubleOrNull() != null) {
                setConfigValue(value.toDouble(), false)
@@ -458,10 +458,11 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
                formRightButton.render(context,mouseX, mouseY, delta)

                val form = showableForms[selectedFormIndex]
+                val formName = if (form.displayForm.lowercase() == "normal") "" else "-${form.displayForm.lowercase().replace("-", "")}"
                drawScaledTextJustifiedRight(
                    context = context,
                    font = CobblemonResources.DEFAULT_LARGE,
-                    text = lang("ui.pokedex.info.form.${form.displayForm.lowercase()}").bold(),
+                    text = lang("ui.pokedex.info.form.${species}${formName}").bold(),
                    x = pX + 136,
                    y = pY + 15,
                    shadow = true
@@ -125,6 +125,7 @@ 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)
@@ -181,7 +182,7 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
        )

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

        // Held/Cosmetic Item Button
        addRenderableWidget(
@@ -331,6 +332,7 @@ 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,7 +18,6 @@ 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

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

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

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

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

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

    override fun renderScrollbar(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
        // Do not render scrollbar if all rows are already visible
@@ -57,8 +59,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, 47, 47, 47)) // background
-            context.fill(xLeft,yTop, xRight, yTop + yBottom, FastColor.ARGB32.color(255, 198, 198, 198)) // base
+            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
        }
    }

@@ -72,7 +74,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 = this.rowLeft
+        val rowX = rowLeft

        var anyHovered = false
        for (index in 0 until this.itemCount) {
@@ -96,6 +98,7 @@ 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
@@ -109,10 +112,11 @@ 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 + ((SLOT_SPACING + SLOT_SIZE) * index)
+                val startPosX = x + ((horizontalSpacing + SLOT_SIZE) * index)
                val startPosY = y + SLOT_SPACING

                val slotHovered = mark != null && getHoveredSlotIndex(mouseX, mouseY) == index
@@ -156,9 +160,12 @@ 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 + ((SLOT_SPACING + SLOT_SIZE) * index)
+                val startPosX = x + ((horizontalSpacing + 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 + 10,
+        pX = pX + 9,
        pY = pY + 45,
        setSelectedMark = {
            if (hoveredMark != null) {
@@ -0,0 +1,209 @@
+/*
+ * 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.block
+
+import com.cobblemon.mod.common.CobblemonBlocks
+import com.cobblemon.mod.common.block.entity.StadiumBlockEntity
+import com.cobblemon.mod.common.client.render.models.blockbench.drone.DroneModel
+import com.cobblemon.mod.common.client.render.models.blockbench.drone.DroneState
+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.util.cobblemonResource
+import com.mojang.blaze3d.vertex.PoseStack
+import com.mojang.math.Axis
+import net.minecraft.client.renderer.MultiBufferSource
+import net.minecraft.client.renderer.RenderType
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderer
+import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider
+import net.minecraft.client.renderer.texture.OverlayTexture
+import net.minecraft.core.Direction
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.level.block.HorizontalDirectionalBlock
+import net.minecraft.world.level.block.state.BlockState
+
+class StadiumBlockRenderer(ctx: BlockEntityRendererProvider.Context) : BlockEntityRenderer<StadiumBlockEntity> {
+    val context = RenderContext().also {
+        it.put(RenderContext.DO_QUIRKS, false)
+        it.put(RenderContext.RENDER_STATE, RenderContext.RenderState.BLOCK)
+    }
+
+    private var pathIndex = 0
+    private var animationTime = 0.0
+    private val droneSpeed = 0.10
+
+    override fun render(
+        blockEntity: StadiumBlockEntity,
+        partialTick: Float,
+        poseStack: PoseStack,
+        bufferSource: MultiBufferSource,
+        packedLight: Int,
+        packedOverlay: Int
+    ) {
+
+    }
+
+    /*
+    override fun render(
+            blockEntity: StadiumBlockEntity,
+            tickDelta: Float,
+            poseStack: PoseStack,
+            multiBufferSource: MultiBufferSource,
+            light: Int,
+            overlay: Int
+    ) {
+        val blockState = blockEntity.blockState
+        val yRot = blockState.getValue(HorizontalDirectionalBlock.FACING).toYRot()
+
+        val isClientSide = blockEntity.level?.isClientSide == true
+        if (!isClientSide) return
+
+        val stadiumBlockState = blockEntity.level?.getBlockState(blockEntity.blockPos) ?: return
+        if (stadiumBlockState.block != CobblemonBlocks.STADIUM) {
+            return
+        }
+
+        val droneState = blockEntity.droneState
+
+
+        poseStack.pushPose()
+        if (blockEntity.isInUse) {
+            if (blockEntity.pathPoints.isEmpty()) {
+
+                poseStack.popPose()
+                return
+            }
+
+            spawnDebugParticles(blockEntity) // debug particles
+
+            // Center the drone at the block's center
+            poseStack.translate(0.5, -3.0, 0.5)
+            //poseStack.mulPose(Axis.XP.rotationDegrees(180F))
+            //poseStack.mulPose(Axis.YP.rotationDegrees(180F))
+
+            val points = blockEntity.pathPoints
+            val nextIndex = (pathIndex + 1) % points.size
+
+            val currentPoint = points[pathIndex]
+            val nextPoint = points[nextIndex]
+
+            animationTime += tickDelta * droneSpeed
+            if (animationTime >= 1.0) {
+                animationTime = 0.0
+                pathIndex = nextIndex
+            }
+
+            val interpolatedPos = currentPoint.lerp(nextPoint, animationTime.toDouble())
+
+            println("DEBUG: Drone moving between points:")
+            println("  - Current Point: ${currentPoint}")
+            println("  - Next Point: ${nextPoint}")
+            println("  - Interpolated Position: $interpolatedPos")
+
+            poseStack.translate(interpolatedPos.x - blockEntity.blockPos.x,
+                    interpolatedPos.y - blockEntity.blockPos.y,
+                    interpolatedPos.z - blockEntity.blockPos.z)
+
+            println("DEBUG: Drone position interpolated to: $interpolatedPos")
+
+            poseStack.mulPose(Axis.YP.rotationDegrees(-yRot))
+            poseStack.mulPose(Axis.ZP.rotationDegrees(180F)) // flip the drone right side up
+
+            renderDrone(droneState, "sleep", tickDelta, poseStack, 1.0F, multiBufferSource, light)
+        } else {
+            val yRot = blockState.getValue(HorizontalDirectionalBlock.FACING).toYRot()
+
+            val poseEntry = poseStack.last()
+            val matrix = poseEntry.pose()
+
+            poseStack.translate(0.5, 0.0, 0.5)
+            poseStack.mulPose(Axis.YP.rotationDegrees(yRot))
+
+            val posX = matrix.m03()
+            val posY = matrix.m13()
+            val posZ = matrix.m23()
+
+            println("DEBUG: Drone is NOT in use. Rendering default position at: x=$posX, y=$posY, z=$posZ")
+
+            poseStack.mulPose(Axis.ZP.rotationDegrees(180F))
+            renderDrone(droneState, "sleep", tickDelta, poseStack, 1.0F, multiBufferSource, light)
+        }
+
+        poseStack.popPose()
+    }
+
+    fun renderDrone(
+        state: DroneState,
+        pose: String,
+        tickDelta: Float,
+        poseStack: PoseStack,
+        scale: Float = 1F,
+        multiBufferSource: MultiBufferSource,
+        light: Int,
+    ) {
+        state.updatePartialTicks(tickDelta)
+
+        val droneResource: ResourceLocation = cobblemonResource("rotom_drone")
+
+        val model = VaryingModelRepository.getPoser(droneResource, state) as DroneModel
+        val texture = VaryingModelRepository.getTexture(droneResource, state)
+
+        val buffer = multiBufferSource.getBuffer(RenderType.entityCutout(texture))
+        model.bufferProvider = multiBufferSource
+
+        state.currentModel = model
+        state.setPose(pose)
+
+        model.context = context
+        context.put(RenderContext.TEXTURE, texture)
+        context.put(RenderContext.RENDER_STATE, RenderContext.RenderState.BLOCK)
+        context.put(RenderContext.POSABLE_STATE, state)
+
+        model.applyAnimations(
+            entity = null,
+            state = state,
+            headYaw = 0F,
+            headPitch = 0F,
+            limbSwing = 0F,
+            limbSwingAmount = 0F,
+            ageInTicks = state.animationSeconds * 20
+        )
+
+        poseStack.scale(scale, scale, scale)
+
+        // TODO: Make drone lighting dynamic (simply using the light arg makes the drone always appear dark)
+        model.withLayerContext(multiBufferSource, state, VaryingModelRepository.getLayers(droneResource, state)) {
+            model.render(context, poseStack, buffer, 200, OverlayTexture.NO_OVERLAY, -0x1)
+        }
+        model.setDefault()
+    }
+
+    private fun spawnDebugParticles(blockEntity: StadiumBlockEntity) {
+        val world = blockEntity.level ?: return
+        if (!world.isClientSide) return // Only run on the client-side
+
+        for (point in blockEntity.pathPoints) {
+            world.addParticle(
+                    net.minecraft.core.particles.ParticleTypes.FLAME, // Test particle (changeable)
+                    point.x, point.y, point.z, // Position of the particle
+                    0.0, 0.02, 0.0 // Slight upward motion
+            )
+        }
+
+        // Spawn a special particle at the next interpolation point
+        if (blockEntity.pathPoints.isNotEmpty()) {
+            val nextPoint = blockEntity.pathPoints[(pathIndex + 1) % blockEntity.pathPoints.size]
+            world.addParticle(
+                    net.minecraft.core.particles.ParticleTypes.END_ROD, // Different effect for next point
+                    nextPoint.x, nextPoint.y, nextPoint.z,
+                    0.0, 0.05, 0.0
+            )
+        }
+    }
+    */
+}
@@ -11,9 +11,12 @@ 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.render.MatrixWrapper
+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.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
@@ -24,7 +27,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 net.minecraft.world.phys.Vec3
+import org.joml.Vector3f

 class HeldItemRenderer {
    private val itemRenderer: ItemRenderer = Minecraft.getInstance().itemRenderer
@@ -34,133 +37,91 @@ class HeldItemRenderer {
        const val ITEM_FACE = "item_face"
        const val ITEM_HAT = "item_hat"
        const val ITEM = "item"
-    }

-    fun render(
-        entity: LivingEntity?,
-        model: PosableModel,
-        item: ItemStack,
-        locators: Map<String, MatrixWrapper>,
-        poseStack: PoseStack,
-        buffer: MultiBufferSource,
-        light: Int,
-        seed: Int,
-        rotation: Vec3
-    ) {
-        if (item.isEmpty) return
-        displayContext = ItemDisplayContext.FIXED
-
-        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()
-            if (locators.containsKey(locatorName)) {
-                displayContext = model.getLocatorDisplayContext(locatorName)?: ItemDisplayContext.FIXED
-                poseStack.mulPose(locators[locatorName]!!.matrix)
-                applyContextTransformation(poseStack, rotation)
-            }
-            itemRenderer.renderStatic(entity, item, displayContext, (displayContext==ItemDisplayContext.THIRD_PERSON_LEFT_HAND), poseStack, buffer, null, light, OverlayTexture.NO_OVERLAY, 0)
-            poseStack.popPose()
+        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(
-        model: PosableModel,
        item: ItemStack,
+        model: PosableModel,
        state: PosableState,
        poseStack: PoseStack,
        buffer: MultiBufferSource,
-        rotation: Vec3 = Vec3(0.0,0.0,0.0),
        light: Int = LightTexture.pack(11, 7),
+        frontLight: Boolean = false,
+        entity: LivingEntity? = null
    ) {
-        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)
-        }
+        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) }
    }

-    fun renderOnEntity(
-        entity: LivingEntity,
+    private fun renderAtLocator(
        item: ItemStack,
        model: PosableModel,
        state: PosableState,
+        entity: LivingEntity?,
        poseStack: PoseStack,
        buffer: MultiBufferSource,
        light: Int,
-        rotation: Vec3 = Vec3(0.0,0.0,0.0)
+        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
    ) {
-        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)
-        }
-    }
+        if (item.isEmpty) return

-    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)
+        if (state.locatorStates.containsKey(targetLocator)) {
+            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 -> {}
            }
-            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)
+
+            //Render front lighting for UI Models
+            if (frontLight) {
+                RenderSystem.setShaderLights(Vector3f(0F,0F,1F), Vector3f(0F,0F,1F))
            }
-            ItemDisplayContext.HEAD -> {
-                poseStack.mulPose(Axis.XP.rotationDegrees(90.0f))
-                poseStack.scale(.6f, .6f, .6f)
-                poseStack.translate(0f, -0.6f, 0f)
-            }
-            else -> {}
+
+            itemRenderer.renderStatic(entity, item, displayContext, (displayContext==ItemDisplayContext.THIRD_PERSON_LEFT_HAND), poseStack, buffer, null, light, OverlayTexture.NO_OVERLAY, seed)
+
+            poseStack.popPose()
        }
    }
 }
@@ -37,7 +37,6 @@ 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) {

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

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

            model.setDefault()
@@ -78,8 +78,15 @@ 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).also { if (isVisible != null) it.withVisibility(isVisible) }
+        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) }
    }?.toTypedArray() ?: arrayOf()

    val idleAnimations = (json.get("animations")?.asJsonArray ?: JsonArray()).asJsonArray.mapNotNull {
@@ -8,10 +8,8 @@

 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
@@ -36,7 +34,6 @@ 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(
@@ -79,11 +76,25 @@ abstract class PosableEntityModel<T : Entity>(
    ) {
        setupEntityTypeContext(entity)
        if (entity is PosableEntity) {
-            val state = entity.delegate as PosableState
-            posableModel.applyAnimations(entity, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch)
+            val ticks = getTicksForAnimation(entity, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch)
+            posableModel.applyAnimations(entity, entity.delegate as PosableState, limbSwing, limbSwingAmount, ticks, 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)
@@ -92,4 +103,4 @@ abstract class PosableEntityModel<T : Entity>(
            }
        }
    }
-}
+}
@@ -40,7 +40,6 @@ 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
@@ -51,7 +50,6 @@ 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
@@ -59,7 +57,6 @@ 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
@@ -96,6 +93,9 @@ 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.set() }
+        transformedParts.forEach { it.apply() }
    }

    /**
@@ -827,4 +827,6 @@ open class PosableModel(@Transient override val rootPart: Bone) : ModelFrame {
        condition = condition,
        animations = { animations(it) }
    )
+
+    fun isReadyForAnimation() = ::context.isInitialized
 }
@@ -35,8 +35,10 @@ 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
@@ -46,7 +48,6 @@ 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

@@ -101,7 +102,8 @@ abstract class PosableState : Schedulable {
    val allActiveAnimations: List<ActiveAnimation> get() = activeAnimations + quirks.flatMap { it.value.animations }

    /** The tick-driven age of the state. Combines with [currentPartialTicks] to produce the animation seconds. */
-    protected var age = 0
+    var age = 0
+        protected set
    /**
     * The partial tick value of the state. Combines with [age] to produce the animation seconds. For entity-based state
     * this will be consistently reset to a new value, whereas non-entity-based state will increment this value.
@@ -128,12 +130,140 @@ abstract class PosableState : Schedulable {
    /** This gets called 500 million times so use a mutable value for runtime */
    private val reusableAnimTime = DoubleValue(0.0)

-    val itemRenderingLocations = mutableMapOf<String, ItemStack>()
-//    var itemRenderingLocation = ""
-//    var animationItem : ItemStack? = null
+    /** 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))
+        }
+

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

            if (!item.isEmpty && locatorStates.containsKey(renderLocation)) {
-                itemRenderingLocations.put(renderLocation, item)
+                animationItems.put(renderLocation, item)
            } else {
-                if (itemRenderingLocations.containsKey(renderLocation)) itemRenderingLocations.remove(renderLocation)
+                if (animationItems.containsKey(renderLocation)) animationItems.remove(renderLocation)
                return@addFunction Unit
            }
        }
-        .addFunction("clear_items") { itemRenderingLocations.clear() }
+        .addFunction("clear_items") { animationItems.clear() }
        .addFunction("play_animation") { params ->
            val animationParameter = params.get<MoValue>(0)
            val animation = if (animationParameter is ObjectValue<*>) {
@@ -427,4 +563,4 @@ abstract class PosableState : Schedulable {
            1F
        }
    }
-}
+}
@@ -198,9 +198,11 @@ data class BedrockAnimation(

        boneTimelines.forEach { (boneName, timeline) ->
            val part = relevantPartsByName[boneName] ?: if (boneName == "root_part") (rootPart as? ModelPart) else null
+            val isCamera = boneName == "locator_camera"
+            val scalar = if (isCamera) 1.0 else intensity.toDouble()
            if (part !== null) {
                if (!timeline.position.isEmpty()) {
-                    val position = timeline.position.resolve(animationSeconds.toDouble(), runtime).scale(intensity.toDouble())
+                    val position = timeline.position.resolve(animationSeconds.toDouble(), runtime).scale(scalar)
                    part.apply {
                        x += position.x.toFloat()
                        y += position.y.toFloat()
@@ -210,7 +212,7 @@ data class BedrockAnimation(

                if (!timeline.rotation.isEmpty()) {
                    try {
-                        val rotation = timeline.rotation.resolve(animationSeconds.toDouble(), runtime).scale(intensity.toDouble())
+                        val rotation = timeline.rotation.resolve(animationSeconds.toDouble(), runtime).scale(scalar)
                        part.apply {
                            xRot += rotation.x.toFloat().toRadians()
                            yRot += rotation.y.toFloat().toRadians()
@@ -230,14 +232,14 @@ data class BedrockAnimation(
                if (!timeline.scale.isEmpty()) {
                    var scale = timeline.scale.resolve(animationSeconds.toDouble(), runtime)
                    // If the goal is to make the invisible then kick that into gear after 0.5. Maybe could work better somehow else.
-                    if (scale == Vec3.ZERO && intensity > 0.5) {
+                    if (scale == Vec3.ZERO && scalar > 0.5) {
                        part.xScale *= scale.x.toFloat()
                        part.yScale *= scale.y.toFloat()
                        part.zScale *= scale.z.toFloat()
                    } else {
                        // The deviation from 1 is what we want to multiply by the intensity of the animation.
                        val deviation = scale.scale(-1.0).add(1.0, 1.0, 1.0)
-                        val weakenedDeviation = deviation.scale(intensity.toDouble())
+                        val weakenedDeviation = deviation.scale(scalar)
                        scale = weakenedDeviation.subtract(1.0, 1.0, 1.0).scale(-1.0)
                        part.xScale *= scale.x.toFloat()
                        part.yScale *= scale.y.toFloat()
@@ -394,4 +396,4 @@ enum class InterpolationType {

 enum class Transformation {
    POSITION, ROTATION, SCALE
-}
+}
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2025 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.drone
+
+import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.PoseAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone
+import com.cobblemon.mod.common.client.render.models.blockbench.quirk.ModelQuirk
+import com.cobblemon.mod.common.entity.PoseType
+import com.google.gson.annotations.SerializedName
+import net.minecraft.client.model.geom.ModelPart
+
+/**
+ * A model for rendering the Rotom drone used by the stadium block.
+ *
+ * @author Flarkinater
+ * @since February 14th, 2025
+ */
+class DroneModel(root: Bone) : PosableModel(root) {
+    @Transient
+    @SerializedName("So this name can be literally anything, huh?")
+    override val rootPart = (root as ModelPart).registerChildWithAllChildren(root.children.entries.first().key)
+    var droneAnimations: Array<PoseAnimation> = emptyArray()
+    var droneQuirks: Array<ModelQuirk<*>> = emptyArray()
+
+    override fun registerPoses() {
+        registerPose(
+            poseType = PoseType.SLEEP,
+            animations = droneAnimations,
+            quirks = droneQuirks
+        )
+    }
+}
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2025 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.drone
+
+import com.cobblemon.mod.common.api.scheduling.SchedulingTracker
+import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
+
+/**
+ * State for a drone Rotom attached to a stadium block.
+ *
+ * @author Flarkinater
+ * @since February 12th, 2025
+ */
+class DroneState() : PosableState() {
+    init {
+        setPose("sleep")
+        age = 0
+        currentPartialTicks = 0F
+    }
+
+    override fun getEntity() = null
+
+    override fun updatePartialTicks(partialTicks: Float) {
+        currentPartialTicks += partialTicks / 2
+    }
+
+    override val schedulingTracker = SchedulingTracker()
+}
@@ -8,12 +8,16 @@

 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?) {
@@ -26,4 +30,28 @@ 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
+    }
 }
@@ -1,98 +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.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)
-            )
-        )
-
-    }
-}
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.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
-}
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.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
-}
@@ -1,64 +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.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.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 KangaskhanModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("kangaskhan")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.7F
-    override var portraitTranslation = Vec3(-0.15, 1.1, 0.0)
-
-    override var profileScale = 0.7F
-    override var profileTranslation = Vec3(0.0, 0.65, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("kangaskhan", "blink")}
-        val blink2 = quirk { bedrockStateful("kangaskhan", "blink2")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink, blink2),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("kangaskhan", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink, blink2),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("kangaskhan", "ground_idle")
-                //bedrock("kangaskhan", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("kangaskhan", "faint") else null
-}
@@ -1,129 +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.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")
-            )
-        )
-    }
-}
@@ -1,84 +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.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
-}
@@ -1,65 +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.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
-}
@@ -1,65 +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.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
-}
@@ -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.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
-}
@@ -1,95 +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.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
-}
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.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
-}
@@ -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.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
-
-}
@@ -1,66 +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.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
-}
@@ -1,66 +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.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)
-            )
-        )
-    }
-}
@@ -1,65 +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.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
-}
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.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
-                )
-            )
-        )
-    }
-}
@@ -1,65 +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.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
-}
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.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
-}
@@ -1,65 +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.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
-}
@@ -1,76 +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.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
-}
@@ -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.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, intensity: Float) {
+    fun apply(state: PosableState? = null, intensity: Float = 1f) {
        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) }
+        visibility?.let { modelPart.visible = state?.runtime?.resolveBoolean(it)?: defaultRuntime.resolveBoolean(it) }
    }

    fun set() {
--- a/Show More
+++ b/Show More