Merge branch 'soon-to-be-implemented-steps' into 'main'

Implementing some steps

See merge request cable-mc/cobblemon!2519

CHANGELOG.md

@@ -1,31 +1,27 @@
 # Changelog
-## [1.8.x (MONTH xth, 2026)](#1-8-x)
+## [1.8.5 (MONTH xth, 2026)](#1-8-5)
 
 ### Additions
-
-### New rideable Pokémon
-
-### Pokémon Added
-
-### Model updates for the following Pokémon
-
-### Animation updates for the following Pokémon
+- Added the `healersSetSpawn` gamerule. When enabled, using a healing machine will set your spawnpoint.
+- A Pokémon holding a Power item now gains 1 point in the corresponding riding stat every two minutes while being ridden. The interval is configurable, and can be disabled with `-1`.
+- Added sounds to Gigaton Hammer and Pyro Ball
+- Added stepsounds to Venusaur, Blastoise, Dewgong, Rhydon, Rhyhorn, Parasect and Mr. Mime.
 
 ### Changes
-- Reworked spawn presets and added structure tags for spawns
+- Amethyst now grows from Typegem core blocks like typegems do
 
 ### Fixes
-- Fixed blank Cooking Pot recipe book entries and missing tabs on Fabric.
-- Fixed Minior's "Shields Down" ability not working as intended
+- Fixed Ponigiri food values for AppleSkin integration
+- Fixed errors emitted by typos in Parched Peat bog structure files
 
 ### Developer
 
 ### Molang & Datapacks
-- Added `q.target_fainted` function to move action effects that checks if any opponents fainted from the move.
+- `q.is_standing_on_blocks` now properly checks for non-full blocks like slabs, Mud or Soul Sand
+- Added Molang functions to play footstep sounds based on the corresponding surface. These are intended to be used by Pokémon animations.
+- Pokémon can now have their Minecraft footstep sounds silenced in their poser. This doesn't affect emitting game events.
 
 ### Particles
 
-#### New Move Animations
-
 ### Localization
-- Updated translations for:
+- Updated translations for:

changelogs/CHANGELOG-1.8.4.md

@@ -0,0 +1,25 @@
+# Changelog
+## [1.8.4 (October 27th, 2026)](#1-8-4)
+
+### Changes
+- The Froakie line now blinks. The world will never be the same.
+
+### Fixes
+- Fixed heaps of spawns not working. This was caused by us missing something before release. RIP.
+- Fixed a crash caused by Fearow blinking while you're riding one. Makes sense to me.
+- Fixed Minior's "Shields Down" ability being very broken.
+- Fixed Dusclops using Squirtle's cry sound (lol).
+- Fixed blank Cooking Pot recipe book entries and missing tabs on Fabric.
+- Fixed a hitbox issue with placeable Orb held items attached to a ceiling.
+- Fixed something sneaky. I'll tell you about it later.
+
+### Molang & Datapacks
+- Added `q.target_fainted` function to move action effects that checks if any opponents fainted from the move.
+
+### Particles
+- Updated Water Shuriken effect to be timed better when the opponent faints.
+
+### Localization
+- Updated translations for:
+  - Korean
+  - Simplified Chinese

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

@@ -75,10 +75,9 @@ public abstract class LivingEntityMixin extends Entity implements OrientationCon
     public @NotNull HitResult pick(double hitDistance, float partialTicks, boolean hitFluids) {
         Entity vehicle = this.getVehicle();
         if (vehicle instanceof PokemonEntity pokemonEntity && pokemonEntity.getDelegate() instanceof PokemonClientDelegate delegate) {
-            // Passenger order isn't seat order, so look the seat up directly
-            Seat seat = pokemonEntity.getSeatForPassenger(this);
-            MatrixWrapper locator = seat != null ? delegate.getLocatorStates().get(seat.getLocator()) : null;
-            if (locator == null) return super.pick(hitDistance, partialTicks, hitFluids);
+            int seatIndex = pokemonEntity.getPassengers().indexOf(this);
+            Seat seat = pokemonEntity.getSeats().get(seatIndex);
+            MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
 
             Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
 
@@ -100,8 +99,7 @@ public abstract class LivingEntityMixin extends Entity implements OrientationCon
 
     @Unique
     private Vec3 cobblemon$getEyePosition(float partialTicks, PokemonEntity pokemonEntity, Vec3 locatorOffset) {
-        // The ride owns the orientation, the passenger's own controller is never active
-        OrientationController controller = ((OrientationControllable) pokemonEntity).getOrientationController();
+        OrientationController controller = this.getOrientationController();
 
         float currEyeHeight = this.getEyeHeight();
         Vec3 offset = locatorOffset.add(pokemonEntity.position());
@@ -109,7 +107,7 @@ public abstract class LivingEntityMixin extends Entity implements OrientationCon
             Quaternionf orientation = controller.getRenderOrientation(partialTicks);
             Vec3 rotatedEyeHeight = new Vec3(orientation.transform(new Vector3f(0f, currEyeHeight - (this.getBbHeight() / 2), 0f)));
 
-            offset = offset.add(rotatedEyeHeight);
+            offset.add(rotatedEyeHeight);
         }
 
         return offset;

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

@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.api.riding.RidingStyle;
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner;
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory;
 import com.cobblemon.mod.common.api.stats.CobblemonStats;
+import com.cobblemon.mod.common.block.HealingMachineBlock;
 import com.cobblemon.mod.common.duck.ServerLevelDuck;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
@@ -22,10 +23,14 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.core.BlockPos;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -33,6 +38,9 @@ import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Optional;
 
 @Mixin(ServerPlayer.class)
 public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
@@ -142,4 +150,17 @@ public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
                         ((ServerLevelDuck) this.serverLevel()).cobblemon$getLevelResourceLocation()
                 );
     }
+
+    @Inject(
+            method = "findRespawnAndUseSpawnBlock(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;FZZ)Ljava/util/Optional;",
+            at = @At(value = "HEAD"),
+            cancellable = true
+    )
+    private static void cobblemon$useHealthStationAsRespawn(ServerLevel level, BlockPos pos, float angle, boolean forced, boolean keepInventory, CallbackInfoReturnable<Optional<ServerPlayer.RespawnPosAngle>> cir) {
+        BlockState state = level.getBlockState(pos);
+        Block block = state.getBlock();
+        if (block instanceof HealingMachineBlock && HealingMachineBlock.Companion.canSetSpawn(level)) {
+            cir.setReturnValue(HealingMachineBlock.Companion.findStandUpPosition(EntityType.PLAYER, level, pos).map((vec3) -> ServerPlayer.RespawnPosAngle.of(vec3, pos)));
+        }
+    }
 }

common/src/main/java/com/cobblemon/mod/common/mixin/client/CameraMixin.java

@@ -83,7 +83,7 @@ public abstract class CameraMixin implements CameraDuck {
         }
 
         // reset the rotation values if it is now not being ridden.
-        MountedCameraRenderer.INSTANCE.reset();
+        MountedCameraRenderer.INSTANCE.setSmoothRotation(null);
         original.call(instance, x, y, z);
     }
 }

common/src/main/java/com/cobblemon/mod/common/mixin/client/HumanoidModelMixin.java

@@ -19,7 +19,6 @@ import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.phys.Vec2;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -72,18 +71,17 @@ public class HumanoidModelMixin {
                     behaviour.shouldRotateRiderHead(settings, state, pokemonEntity)
             );
 
-            // Vanilla's head angles are world yaw but the body sits on a seat that can be on its side, so measure the real look against the seat
-            if (shouldRotatePlayerHead) {
-                Vec2 riderHead = MountedPlayerRenderer.riderHeadAngles(pokemonEntity, entity, Mth.clamp(ageInTicks - entity.tickCount, 0f, 1f));
-                if (riderHead != null) {
-                    netHeadYaw = riderHead.x;
-                    headPitch = riderHead.y;
-                    if (this.head != null) {
-                        this.head.yRot = netHeadYaw * Mth.DEG_TO_RAD;
-                        this.head.xRot = headPitch * Mth.DEG_TO_RAD;
-                    }
-                }
-            }
+            // If the player is on a rollable ride then use the ride local rotations to rotate the head
+            // This is to allow the player head to face the correct direction when "freelooking"
+            // TODO: find a way for this to work on built jars without borking head rotations.
+//            if (entity instanceof RidePassenger playerRotater &&
+//                vehicle instanceof OrientationControllable controller &&
+//                controller.getOrientationController().isActive()) {
+//                this.head.xRot = playerRotater.cobblemon$getRideXRot();
+//                headPitch = playerRotater.cobblemon$getRideXRot();
+//                this.head.yRot = playerRotater.cobblemon$getRideYRot();
+//                netHeadYaw = playerRotater.cobblemon$getRideYRot();
+//            }
 
             if (!shouldRotatePlayerHead) {
                 netHeadYaw = 0f;

common/src/main/java/com/cobblemon/mod/common/mixin/client/ItemInHandRendererMixin.java

@@ -9,14 +9,11 @@
 package com.cobblemon.mod.common.mixin.client;
 
 import com.cobblemon.mod.common.OrientationControllable;
-import com.cobblemon.mod.common.client.render.camera.MountedCameraRenderer;
 import com.cobblemon.mod.common.client.render.player.FirstPersonRecallBallRenderer;
 import com.cobblemon.mod.common.item.PokedexItem;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Axis;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.ItemInHandRenderer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.world.InteractionHand;
@@ -43,14 +40,6 @@ public class ItemInHandRendererMixin {
         }
     }
 
-    @Inject(method = "renderHandsWithItems", at = @At("HEAD"))
-    private void cobblemon$rollHandsWithRide(float partialTicks, PoseStack poseStack, MultiBufferSource.BufferSource buffer, LocalPlayer player, int light, CallbackInfo ci) {
-        float roll = MountedCameraRenderer.INSTANCE.getHandRoll();
-        if (roll != 0f) {
-            poseStack.mulPose(Axis.ZN.rotationDegrees(roll));
-        }
-    }
-
     @Redirect(method = "renderHandsWithItems", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/PoseStack;mulPose(Lorg/joml/Quaternionf;)V"))
     private void cobblemon$renderHandswithItems(PoseStack instance, Quaternionf quaternion) {
         if (!(Minecraft.getInstance().player != null && Minecraft.getInstance().player.getVehicle() instanceof OrientationControllable controllable && controllable.getOrientationController().isActive())) {

common/src/main/java/com/cobblemon/mod/common/mixin/client/LocalPlayerMixin.java

@@ -32,6 +32,7 @@ import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.player.Input;
 import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.ClipContext;
@@ -49,13 +50,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Map;
-import java.util.Objects;
 
 @Mixin(LocalPlayer.class)
 public abstract class LocalPlayerMixin extends AbstractClientPlayer implements OrientationControllable, DoubleJump {
 
     @Unique Matrix3f cobblemon$lastOrientation;
-    @Unique int cobblemon$lastOrientationVehicleId = -1;
 
     @Unique float cobblemon$lastRideXRot;
     @Unique float cobblemon$lastRideYRot;
@@ -82,28 +81,30 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
     private void cobblemon$updateRotationMatrixPassenger(CallbackInfo ci) {
         if (!(this.getVehicle() instanceof OrientationControllable controllableVehicle)) return;
         var vehicleController = controllableVehicle.getOrientationController();
-        if (!vehicleController.isActive()) {
-            // Forget the last sent value so the next ride always gets its first orientation sent
-            cobblemon$lastOrientation = null;
-            return;
-        }
-        var orientation = vehicleController.getOrientation();
-        var vehicleId = this.getVehicle().getId();
-        // Compare by value, the stored one is a copy so a reference check never matches
-        if (vehicleId == cobblemon$lastOrientationVehicleId && Objects.equals(orientation, cobblemon$lastOrientation)) return;
-        cobblemon$lastOrientation = orientation != null ? new Matrix3f(orientation) : null;
-        cobblemon$lastOrientationVehicleId = vehicleId;
-        CobblemonNetwork.INSTANCE.sendToServer(new ServerboundUpdateOrientationPacket(vehicleId, orientation));
+        if (!vehicleController.isActive() || vehicleController.getOrientation() == cobblemon$lastOrientation) return;
+        cobblemon$lastOrientation = vehicleController.getOrientation() != null ? new Matrix3f(vehicleController.getOrientation()) : null;
+        CobblemonNetwork.INSTANCE.sendToServer(new ServerboundUpdateOrientationPacket(this.getVehicle().getId(), vehicleController.getOrientation()));
     }
 
     @Inject(method = "rideTick", at = @At("HEAD"))
     private void cobblemon$updateOrientationControllerRideTick(CallbackInfo ci) {
         if (Minecraft.getInstance().player != (Object)this) return;
+        var driver = (LocalPlayer)(Object)this;
+        var vehicle = driver.getVehicle();
         if (!(this.getVehicle() instanceof OrientationControllable controllableVehicle)) return;
         var shouldUseCustomOrientation = cobblemon$shouldUseCustomOrientation((LocalPlayer)(Object)this);
         var vehicleController = controllableVehicle.getOrientationController();
 
-        // Look angles get seeded by the camera on its first rolling frame
+        // If the player has just switched to riding a custom orientation ride then set their
+        // x and y rots local to the vehicle rots(if the controller wasn't active and will now be active)
+        // This ensures that on transition your camera stays in the same spot
+        if (!vehicleController.isActive() && shouldUseCustomOrientation) {
+            // Set local to the vehicle x and yrot so
+            var playerRotater = (RidePassenger)driver;
+            playerRotater.cobblemon$setRideXRot(Mth.wrapDegrees(driver.getXRot() - vehicle.getXRot()));
+            playerRotater.cobblemon$setRideYRot(Mth.wrapDegrees(driver.getYRot() - vehicle.getYRot()));
+        }
+
         vehicleController.setActive(shouldUseCustomOrientation);
     }
 

common/src/main/java/com/cobblemon/mod/common/mixin/client/MouseHandlerMixin.java

@@ -11,10 +11,6 @@ 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.behaviour.RideSteerInput;
-import com.cobblemon.mod.common.api.riding.camera.RideLookInput;
-import com.cobblemon.mod.common.api.riding.camera.RideLookSettings;
-import com.cobblemon.mod.common.api.riding.camera.RideLookTake;
 import com.cobblemon.mod.common.client.CobblemonClient;
 import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding;
 import com.cobblemon.mod.common.client.keybind.keybinds.RidingFreelookBinding;
@@ -24,12 +20,13 @@ 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 kotlin.Unit;
+import kotlin.Pair;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.MouseHandler;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.util.Mth;
 import net.minecraft.util.SmoothDouble;
+import net.minecraft.world.phys.Vec3;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -45,11 +42,6 @@ import static net.minecraft.util.Mth.lerp;
 
 @Mixin(MouseHandler.class)
 public abstract class MouseHandlerMixin {
-    // Entity.turn scales mouse movement to degrees by this
-    @Unique private static final float COBBLEMON$VANILLA_DEGREES_PER_MOUSE_UNIT = 0.15F;
-    // Share of the look offset closed per second as it drifts back to centre. Raise to recentre faster
-    @Unique private static final float COBBLEMON$LOOK_RECENTER_RATE = 5.0F;
-
     @Shadow private double accumulatedScrollY;
     @Shadow @Final private Minecraft minecraft;
 
@@ -168,48 +160,74 @@ public abstract class MouseHandlerMixin {
         }
 
         var vehicleController = controllableVehicle.getOrientationController();
-        var pokemonVehicle = (PokemonEntity) vehicle;
+        var freeLooking = RidingFreelookBinding.INSTANCE.isDown();
+        Pair<Boolean, Boolean> mouseShouldModifyDriver = ((PokemonEntity) vehicle).ifRidingAvailableSupply(new Pair(false, false), (behaviour, settings, state) -> {
+            return behaviour.mouseModifiesDriverRotation(
+                    settings,
+                    state,
+                    (PokemonEntity) vehicle
+            );
+        });
+
+        //-------------------------------------------------------------------------
+        // If looking around then modify the players orientation instead and zero the mouse deltas so the mouse doesn't
+        // affect the vehicle orientation when looking around.
+        // If the client is a passenger it will modify these rotations and return
+        //-------------------------------------------------------------------------
+        if (freeLooking || player.getControlledVehicle() == null) {
+            // Modify driver rotations
+            cobblemon$setDriverRotations(player, cursorDeltaX, cursorDeltaY);
+
+            // If the player/passenger is not the driver then return and ignore all vehicle rotation logic
+            if (player.getControlledVehicle() == null) return false;
+
+            // Set to zero so that vehicle rotations don't also get affected by movement.
+            cursorDeltaX = 0.0;
+            cursorDeltaY = 0.0;
+        } else if (mouseShouldModifyDriver.getFirst()) { // If not freelooking then check modification per mouse input dimension
+            cobblemon$setDriverRotations(player, cursorDeltaX, 0.0);
+            cursorDeltaX = 0.0;
+        } else if (mouseShouldModifyDriver.getSecond()) {
+            cobblemon$setDriverRotations(player, 0.0, cursorDeltaY);
+            cursorDeltaY = 0.0;
+        }
+
+        //-------------------------------------------------------------------------
+        // Smoothly return driver rotations to zero when needed
+        //-------------------------------------------------------------------------
         var playerRotater = (RidePassenger)player;
-        float yawDelta = (float)cursorDeltaX * COBBLEMON$VANILLA_DEGREES_PER_MOUSE_UNIT;
-        float pitchDelta = (float)cursorDeltaY * COBBLEMON$VANILLA_DEGREES_PER_MOUSE_UNIT;
-
-        // Passengers only ever look around
-        if (player.getControlledVehicle() == null) {
-            cobblemon$addLook(player, yawDelta, pitchDelta);
-            return false;
+        if( !freeLooking && !mouseShouldModifyDriver.getFirst()){
+            playerRotater.cobblemon$setRideYRot(lerp(min(5.0f * (float)movementTime, 1.0f), Mth.wrapDegrees(playerRotater.cobblemon$getRideYRot()), 0.0f));
+        }
+        if( !freeLooking && !mouseShouldModifyDriver.getSecond()) {
+            playerRotater.cobblemon$setRideXRot(lerp(min(5.0f * (float)movementTime, 1.0f), Mth.wrapDegrees(playerRotater.cobblemon$getRideXRot()), 0.0f));
         }
 
-        // The ride takes what it wants of the mouse to steer with and the rest moves the look. Freelook keeps it all for the look
-        var lookInput = new RideLookInput(yawDelta, pitchDelta, playerRotater.cobblemon$getRideYRot(), playerRotater.cobblemon$getRideXRot());
-        RideLookTake take = RidingFreelookBinding.INSTANCE.isDown() ? RideLookTake.NONE : pokemonVehicle.ifRidingAvailableSupply(RideLookTake.all(lookInput), (behaviour, settings, state) -> {
-            return behaviour.consumeLook(settings, state, pokemonVehicle, lookInput);
-        });
-        float lookYaw = yawDelta - take.getYaw();
-        float lookPitch = pitchDelta - take.getPitch();
-        if (lookYaw != 0.0f || lookPitch != 0.0f) {
-            cobblemon$addLook(player, lookYaw, lookPitch);
+        // Send mouse input to be interpreted into rotation deltas by the ride controller
+        Vec3 angVecMouse = cobblemon$getRideMouseRotation(cursorDeltaX, cursorDeltaY, movementTime);
+
+        // Perform Rotation using mouse influenced rotation deltas.
+        vehicleController.rotate(
+            (float) angVecMouse.x,
+            (float) angVecMouse.y,
+            (float) angVecMouse.z
+        );
+
+        // Gather and apply the current rotation deltas
+        var angRot = cobblemon$getAngularVelocity(movementTime);
+
+        // Apply smoothing if requested by the controller.
+        if(cobblemon$shouldUseAngVelSmoothing()) {
+            var yaw = yawSmoother.getNewDeltaValue(angRot.x * 0.5f, d);
+            var pitch = pitchSmoother.getNewDeltaValue(angRot.y * 0.5f, d);
+            var roll = rollSmoother.getNewDeltaValue(angRot.z * 0.5f, d);
+            vehicleController.rotate((float) yaw, (float) pitch, (float) roll);
+        }
+        else {
+            vehicleController.rotate((float) (angRot.x * 10 * d), (float) (angRot.y * 10 * d), (float) (angRot.z * 10 * d));
         }
 
-        // Drift the look back to centre on the axes the ride steers with
-        float recenter = min(COBBLEMON$LOOK_RECENTER_RATE * (float)movementTime, 1.0f);
-        if (take.getRecenterYaw()) {
-            playerRotater.cobblemon$setRideYRot(lerp(recenter, Mth.wrapDegrees(playerRotater.cobblemon$getRideYRot()), 0.0f));
-        }
-        if (take.getRecenterPitch()) {
-            playerRotater.cobblemon$setRideXRot(lerp(recenter, Mth.wrapDegrees(playerRotater.cobblemon$getRideXRot()), 0.0f));
-        }
-
-        // Hand the ride its share back in mouse units since that's what every ride's steering is tuned for
-        double rideDeltaX = yawDelta == 0.0f ? 0.0 : cursorDeltaX * (take.getYaw() / yawDelta);
-        double rideDeltaY = pitchDelta == 0.0f ? 0.0 : cursorDeltaY * (take.getPitch() / pitchDelta);
-        var steerInput = cobblemon$getSteerInput(vehicleController, rideDeltaX, rideDeltaY, movementTime);
-        pokemonVehicle.ifRidingAvailable((behaviour, settings, state) -> {
-            behaviour.steer(settings, state, pokemonVehicle, player, steerInput);
-            return Unit.INSTANCE;
-        });
-
-        // The camera sets the player's rotation from the look every frame so vanilla turn would only get overwritten
-        return false;
+        return returnValue;
     }
 
     @Inject(method = "handleAccumulatedMovement", at = @At("HEAD"))
@@ -230,9 +248,28 @@ public abstract class MouseHandlerMixin {
         this.turnPlayer(cobblemon$timeDelta);
     }
 
-    /** The ride's share of the mouse put through the riding sensitivity, invert and swap options. */
     @Unique
-    private RideSteerInput cobblemon$getSteerInput(OrientationController controller, double mouseX, double mouseY, double deltaTime) {
+    private Vec3 cobblemon$getAngularVelocity(double deltaTime) {
+        var player = minecraft.player;
+        if (player == null) return Vec3.ZERO;
+        if (!(player instanceof OrientationControllable)) return Vec3.ZERO;
+
+        var playerVehicle = player.getVehicle();
+        if (playerVehicle == null) return Vec3.ZERO;
+        if (!(playerVehicle instanceof PokemonEntity pokemonEntity)) return Vec3.ZERO;
+        return pokemonEntity.ifRidingAvailableSupply(Vec3.ZERO, (behaviour, settings, state) -> {
+            return behaviour.angRollVel(settings, state, pokemonEntity, player, deltaTime);
+        });
+    }
+
+    @Unique
+    private Vec3 cobblemon$getRideMouseRotation(double mouseX, double mouseY, double deltaTime) {
+        var player = minecraft.player;
+        if (player == null) return Vec3.ZERO;
+        var vehicle = player.getVehicle();
+        if (vehicle == null) return Vec3.ZERO;
+        if (!(vehicle instanceof PokemonEntity pokemonEntity)) return Vec3.ZERO;
+
         var invertYaw = Cobblemon.config.getInvertYaw();
         var invertPitch = Cobblemon.config.getInvertPitch();
 
@@ -245,18 +282,21 @@ public abstract class MouseHandlerMixin {
 
         var pitch = (swapXAndY ? xValue : yValue) * (invertPitch? -1.0f : 1.0f);
 
-        return new RideSteerInput(
-                controller,
-                yaw,
-                pitch,
-                xMouseSmoother,
-                yMouseSmoother,
-                cobblemon$getRidingSensitivity(),
-                deltaTime,
-                yawSmoother,
-                pitchSmoother,
-                rollSmoother
-        );
+        var sensitivity = cobblemon$getRidingSensitivity();
+        return pokemonEntity.ifRidingAvailableSupply(Vec3.ZERO, (behaviour, settings, state) -> {
+            return behaviour.rotationOnMouseXY(
+                    settings,
+                    state,
+                    pokemonEntity,
+                    player,
+                    pitch,
+                    yaw,
+                    yMouseSmoother,
+                    xMouseSmoother,
+                    sensitivity,
+                    deltaTime
+            );
+        });
     }
 
     @Unique
@@ -265,33 +305,31 @@ public abstract class MouseHandlerMixin {
         return Math.pow(sensitivity, 3);
     }
 
-    /** Moves the ride look by degrees within the ride's look limits. Same job as vanilla turn but on the look instead of the player. */
     @Unique
-    private void cobblemon$addLook(LocalPlayer player, float yawDelta, float pitchDelta) {
+    private void cobblemon$setDriverRotations(LocalPlayer player, double cursorDeltaX, double cursorDeltaY) {
+        // the vanilla turn() method redone so that it uses rideRotations.
+        float f = (float)cursorDeltaY * 0.15F; // Note: turn() uses xRot for pitch (up/down)
+        float g = (float)cursorDeltaX * 0.15F; // Note: turn() uses yRot for yaw (left/right)
         var playerRotater = (RidePassenger)player;
-        var lookSettings = cobblemon$getLookSettings(player);
-        playerRotater.cobblemon$setRideXRot(cobblemon$softClamp(playerRotater.cobblemon$getRideXRot(), pitchDelta, lookSettings.getMaxPitch()));
-        playerRotater.cobblemon$setRideYRot(cobblemon$softClamp(playerRotater.cobblemon$getRideYRot(), yawDelta, lookSettings.getMaxYaw()));
+        playerRotater.cobblemon$setRideXRot(playerRotater.cobblemon$getRideXRot() + f);
+        playerRotater.cobblemon$setRideYRot(playerRotater.cobblemon$getRideYRot() + g);
+        playerRotater.cobblemon$setRideXRot(Mth.clamp(playerRotater.cobblemon$getRideXRot(), -89.0F, 89.0F));
+        playerRotater.cobblemon$setRideYRot(Mth.clamp(playerRotater.cobblemon$getRideYRot(), -105.0F, 105.0F));
         if (player.getVehicle() != null) {
             player.getVehicle().onPassengerTurned(player);
         }
     }
 
-    /**
-     * Moves an angle by delta while keeping it inside the limit. An angle already past the limit
-     * (the base turning under a low carry look can put it there) isn't snapped back, it just can't go further out.
-     */
     @Unique
-    private static float cobblemon$softClamp(float angle, float delta, float limit) {
-        float bound = Math.max(limit, Math.abs(angle));
-        return Mth.clamp(angle + delta, -bound, bound);
-    }
+    private boolean cobblemon$shouldUseAngVelSmoothing() {
+        var player = minecraft.player;
+        if (player == null) return true;
 
-    @Unique
-    private RideLookSettings cobblemon$getLookSettings(LocalPlayer player) {
-        if (!(player.getVehicle() instanceof PokemonEntity pokemonEntity)) return RideLookSettings.DEFAULT;
-        return pokemonEntity.ifRidingAvailableSupply(RideLookSettings.DEFAULT, (behaviour, settings, state) -> {
-            return behaviour.lookSettings(settings, state, pokemonEntity);
+        var playerVehicle = player.getVehicle();
+        if (playerVehicle == null) return true;
+        if (!(playerVehicle instanceof PokemonEntity pokemonEntity)) return true;
+        return pokemonEntity.ifRidingAvailableSupply(true, (behaviour, settings, state) -> {
+            return behaviour.useAngVelSmoothing(settings, state, pokemonEntity);
         });
     }
 

common/src/main/java/com/cobblemon/mod/common/mixin/entity/EntityMixin.java

@@ -38,9 +38,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(Entity.class)
 public abstract class EntityMixin {
 
-    // How far the clientsent ride eye can sit from the players
-    @Unique private static final double COBBLEMON$MAX_RIDE_EYE_OFFSET = 3.0;
-
     @Shadow @Nullable public abstract Entity getVehicle();
 
     @Inject(method = "updateInWaterStateAndDoWaterCurrentPushing", at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/Entity;wasTouchingWater:Z", ordinal = 1), cancellable = true)
@@ -94,9 +91,6 @@ public abstract class EntityMixin {
         if (vehicleController == null) return;
 
         Vec3 customEyePos = ridePassenger.cobblemon$getRideEyePos();
-        Vec3 vanillaEyePos = new Vec3(player.getX(), player.getEyeY(), player.getZ());
-        double maxSqr = COBBLEMON$MAX_RIDE_EYE_OFFSET * COBBLEMON$MAX_RIDE_EYE_OFFSET;
-        if (customEyePos == null || !(customEyePos.distanceToSqr(vanillaEyePos) <= maxSqr)) return;
         cir.setReturnValue(customEyePos);
     }
 

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

@@ -20,7 +20,6 @@ import com.cobblemon.mod.common.api.riding.behaviour.types.air.HelicopterSetting
 import com.cobblemon.mod.common.api.riding.behaviour.types.air.HoverSettings
 import com.cobblemon.mod.common.api.riding.behaviour.types.air.JetSettings
 import com.cobblemon.mod.common.api.riding.behaviour.types.air.RocketSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.air.BoardSettings
 import com.cobblemon.mod.common.api.riding.behaviour.types.land.HorseSettings
 import com.cobblemon.mod.common.api.riding.behaviour.types.land.MinekartSettings
 import com.cobblemon.mod.common.api.riding.behaviour.types.land.VehicleSettings
@@ -57,7 +56,6 @@ object CobblemonRideSettings : DataRegistry {
     var hover = HoverSettings()
     var jet = JetSettings()
     var rocket = RocketSettings()
-    var board = BoardSettings()
 
     var horse = HorseSettings()
     var minekart = MinekartSettings()
@@ -77,7 +75,6 @@ object CobblemonRideSettings : DataRegistry {
                 hover = hover,
                 jet = jet,
                 rocket = rocket,
-                board = board,
                 horse = horse,
                 minekart = minekart,
                 vehicle = vehicle,
@@ -96,7 +93,6 @@ object CobblemonRideSettings : DataRegistry {
         hover = loadStyle(manager, "hover", HoverSettings::class.java)
         jet = loadStyle(manager, "jet", JetSettings::class.java)
         rocket = loadStyle(manager, "rocket", RocketSettings::class.java)
-        board = loadStyle(manager, "board", BoardSettings::class.java)
         horse = loadStyle(manager, "horse", HorseSettings::class.java)
         minekart = loadStyle(manager, "minekart", MinekartSettings::class.java)
         vehicle = loadStyle(manager, "vehicle", VehicleSettings::class.java)

common/src/main/kotlin/com/cobblemon/mod/common/api/orientation/OrientationController.kt

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common.api.orientation
 
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.math.QuatSpring
 import com.cobblemon.mod.common.util.math.geometry.toDegrees
 import com.cobblemon.mod.common.util.math.geometry.toRadians
@@ -30,8 +29,7 @@ open class OrientationController(val entity: LivingEntity) {
         val UP: Vector3f = Vector3f(0.0f, 1.0f, 0.0f)
         val LEFT: Vector3f = Vector3f(-1.0f, 0.0f, 0.0f)
         private const val TICK_DT = 1f / 20f // Minecraft server tick rate
-        // Seconds for the render orientation to close half the gap to the real one. Raise for smoother but laggier visuals
-        private const val RENDER_SMOOTH_HALFLIFE = 0.15f
+        private const val RENDER_SMOOTH_HALFLIFE = 0.1f // seconds to close ~half the gap
     }
 
     open var active: Boolean = false
@@ -103,11 +101,7 @@ open class OrientationController(val entity: LivingEntity) {
         // Use a "quat spring" to smoothly move the render orientation towards the goal orientation.
         // It takes into account the orientations angular velocities and should be much more resilient
         // to sharp changes in goal orientation or late/missed packets.
-        val pokemon = entity as? PokemonEntity
-        val halflife = pokemon?.ifRidingAvailableSupply(fallback = null as Float?) { behaviour, settings, state ->
-            behaviour.renderHalflife(settings, state, pokemon)
-        } ?: RENDER_SMOOTH_HALFLIFE
-        simpleSpringDamperQuat(renderSpring, targetQuat, halflife, TICK_DT)
+        simpleSpringDamperQuat(renderSpring, targetQuat, 0.15f, TICK_DT)
 
         val newRenderOrientation = Matrix3f()
         renderSpring.quat.get(newRenderOrientation)

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/RideSteerInput.kt

@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding.behaviour
-
-import com.cobblemon.mod.common.api.orientation.OrientationController
-import net.minecraft.util.SmoothDouble
-import net.minecraft.world.phys.Vec3
-
-/**
- * One frame of steering for a rolling ride on the client that's driving it.
- * The mouse values are the share the ride took in consumeLook, already through the riding
- * sensitivity, invert and swap options and still in mouse units.
- */
-class RideSteerInput(
-    /** The ride's own orientation controller */
-    val controller: OrientationController,
-    val mouseYaw: Double,
-    val mousePitch: Double,
-    val mouseXSmoother: SmoothDouble,
-    val mouseYSmoother: SmoothDouble,
-    /** Vanilla's mouse sensitivity curve, cubed */
-    val sensitivity: Double,
-    /** Seconds since the last frame */
-    val deltaTime: Double,
-    private val yawSmoother: SmoothDouble,
-    private val pitchSmoother: SmoothDouble,
-    private val rollSmoother: SmoothDouble
-) {
-    companion object {
-        // Share of each push the smoothers get. Lower makes smoothed turning softer
-        const val SMOOTHED_SHARE = 0.5
-    }
-
-    /** Turns the ride by local yaw, pitch and roll degrees right away. */
-    fun rotate(rotation: Vec3) {
-        controller.rotate(rotation.x.toFloat(), rotation.y.toFloat(), rotation.z.toFloat())
-    }
-
-    /** Turns the ride by local yaw, pitch and roll degrees eased through vanilla's mouse smoother so it spreads over a few frames. */
-    fun rotateSmoothed(rotation: Vec3) {
-        controller.rotate(
-            yawSmoother.getNewDeltaValue(rotation.x * SMOOTHED_SHARE, deltaTime).toFloat(),
-            pitchSmoother.getNewDeltaValue(rotation.y * SMOOTHED_SHARE, deltaTime).toFloat(),
-            rollSmoother.getNewDeltaValue(rotation.z * SMOOTHED_SHARE, deltaTime).toFloat()
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/RidingBehaviour.kt

@@ -12,21 +12,15 @@ import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.camera.RideCameraContext
-import com.cobblemon.mod.common.api.riding.camera.RideLookInput
-import com.cobblemon.mod.common.api.riding.camera.RideLookTake
-import com.cobblemon.mod.common.api.riding.camera.RideLookSettings
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
-import com.cobblemon.mod.common.api.riding.util.RideFrame
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.util.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
-import org.joml.Quaternionf
-import org.joml.Vector3f
 
 /**
  * Represents the behaviour of a Pokemon when being ridden.
@@ -47,42 +41,30 @@ interface RidingBehaviour<Settings : RidingBehaviourSettings, State : RidingBeha
 
     fun pose(settings: Settings, state: State, vehicle: PokemonEntity): PoseType
 
-    /** Ride speed for vanilla's setSpeed. Only reads state, anything that changes state goes in [driverTick]. */
     fun speed(settings: Settings, state: State, vehicle: PokemonEntity, driver: Player): Float
 
-    /**
-     * Runs once a tick only on the client that's steering, after [tick] and the ride's rotation.
-     * Whatever it works out reaches the server and other players through the riding state sync.
-     */
-    fun driverTick(settings: Settings, state: State, vehicle: PokemonEntity, driver: Player) {}
-
     fun clampPassengerRotation(settings: Settings, state: State, vehicle: PokemonEntity, driver: LivingEntity) {}
 
     fun updatePassengerRotation(settings: Settings, state: State, vehicle: PokemonEntity, driver: LivingEntity) {}
 
     fun rotation(settings: Settings, state: State, vehicle: PokemonEntity, driver: LivingEntity): Vec2
 
-    /**
-     * Ride velocity for this tick in world space blocks per tick.
-     * [RideFrame.yawToWorld] turns a velocity worked out along the ride's yaw into world space.
-     */
     fun velocity(settings: Settings, state: State, vehicle: PokemonEntity, driver: Player, input: Vec3): Vec3
 
-    /**
-     * True to have the driver's client call [velocity] a second time each tick inside travel.
-     * Vanilla already asks for it once in getRiddenInput and travel always asked again, so every ride's
-     * numbers are tuned around running twice a tick. Return false once a ride is retuned for a single run.
-     */
-    fun velocityRunsTwicePerTick(settings: Settings, state: State, vehicle: PokemonEntity): Boolean = true
+    fun angRollVel(settings: Settings, state: State, vehicle: PokemonEntity, driver: Player, deltaTime: Double): Vec3
 
-    /** Moves the ride itself this tick instead of the shared velocity and inertia. True if it did */
-    fun travel(settings: Settings, state: State, vehicle: PokemonEntity, driver: Player): Boolean = false
-
-    /**
-     * Turns the ride for one frame while it rolls. Runs every frame on the client that's driving with the mouse
-     * share the ride took in [consumeLook]. Rotate through [RideSteerInput.controller] or its helpers.
-     */
-    fun steer(settings: Settings, state: State, vehicle: PokemonEntity, driver: Player, input: RideSteerInput) {}
+    fun rotationOnMouseXY(
+        settings: Settings,
+        state: State,
+        vehicle: PokemonEntity,
+        driver: Player,
+        mouseY: Double,
+        mouseX: Double,
+        mouseYSmoother: SmoothDouble,
+        mouseXSmoother: SmoothDouble,
+        sensitivity: Double,
+        deltaTime: Double
+    ): Vec3
 
     fun canJump(settings: Settings, state: State, vehicle: PokemonEntity, driver: Player): Boolean
 
@@ -94,6 +76,8 @@ interface RidingBehaviour<Settings : RidingBehaviourSettings, State : RidingBeha
 
     fun rideFovMultiplier(settings: Settings, state: State, vehicle: PokemonEntity, driver: Player): Float
 
+    fun useAngVelSmoothing(settings: Settings, state: State, vehicle: PokemonEntity): Boolean
+
     fun inertia(settings: Settings, state: State, vehicle: PokemonEntity): Double
 
     fun shouldRoll(settings: Settings, state: State, vehicle: PokemonEntity): Boolean
@@ -127,28 +111,10 @@ interface RidingBehaviour<Settings : RidingBehaviourSettings, State : RidingBeha
     fun applyRenderRotation(settings: Settings, state: State, vehicle: PokemonEntity, partialTicks: Float) {}
 
     /**
-     * How much of this frame's mouse look the ride takes to steer with. What it takes goes through
-     * [steer] and the rest moves the rider's look. Only asked for the driver and never while freelooking.
+     * Determines if the pair of mouse inputs Pair(mouseX, mouseY) get used to modify the driverRotations or the vehicle rotations themselves.
+     * Driver rotations are the rotations used by passengers or a driver that is freelooking. This does not override the freelook button.
      */
-    fun consumeLook(settings: Settings, state: State, vehicle: PokemonEntity, input: RideLookInput): RideLookTake = RideLookTake.all(input)
-
-    /**
-     * Rotation the rider's camera hangs off while the ride rolls. Called every frame on the client
-     * and the rider's look sits on top of it. The player's disableRoll setting still applies after this.
-     */
-    fun cameraBase(settings: Settings, state: State, vehicle: PokemonEntity, context: RideCameraContext): Quaternionf = context.defaultBase()
-
-    /** Degrees to roll the first person hands and held items */
-    fun firstPersonHandRoll(settings: Settings, state: State, vehicle: PokemonEntity, context: RideCameraContext): Float = 0f
-
-    /** Blocks to shift the model and its locators by once [orientation] has turned it, so a ride can keep its model on what it's standing on */
-    fun renderOffset(settings: Settings, state: State, vehicle: PokemonEntity, orientation: Quaternionf): Vector3f = Vector3f()
-
-    /** Seconds the drawn orientation takes to close half the gap to the real one. Null keeps the controller's default */
-    fun renderHalflife(settings: Settings, state: State, vehicle: PokemonEntity): Float? = null
-
-    /** Look limits and carry for riders while the ride rolls. */
-    fun lookSettings(settings: Settings, state: State, vehicle: PokemonEntity): RideLookSettings = RideLookSettings.DEFAULT
+    fun mouseModifiesDriverRotation(settings: Settings, state: State, vehicle: PokemonEntity): Pair<Boolean, Boolean> = Pair(false, false)
 
     /**
      * Used in MoLang functions for querying states for animations or other magical MoLang effects.

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/RidingBehaviours.kt

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.riding.behaviour
 
 import com.cobblemon.mod.common.api.riding.behaviour.types.air.*
 import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeBehaviour
-import com.cobblemon.mod.common.api.riding.behaviour.types.land.ClimbBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.types.land.HorseBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.types.land.VehicleBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.types.land.MinekartBehaviour
@@ -36,9 +35,7 @@ object RidingBehaviours {
         register(MinekartBehaviour.KEY, MinekartBehaviour())
         register(HoverBehaviour.KEY, HoverBehaviour())
         register(RocketBehaviour.KEY, RocketBehaviour())
-        register(BoardBehaviour.KEY, BoardBehaviour())
         register(SubmarineBehaviour.KEY, SubmarineBehaviour())
-        register(ClimbBehaviour.KEY, ClimbBehaviour())
         register(CompositeBehaviour.KEY, CompositeBehaviour())
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/air/BirdBehaviour.kt

@@ -15,13 +15,8 @@ import com.cobblemon.mod.common.CobblemonRideSettings
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.orientation.OrientationController
-import com.cobblemon.mod.common.api.orientation.OrientationController.Companion.FORWARDS
-import com.cobblemon.mod.common.api.orientation.OrientationController.Companion.UP
 import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
-import com.cobblemon.mod.common.api.riding.camera.RideCameraContext
-import com.cobblemon.mod.common.api.riding.camera.RideLookInput
-import com.cobblemon.mod.common.api.riding.camera.RideLookTake
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
@@ -29,9 +24,7 @@ import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.*
-import com.cobblemon.mod.common.util.math.FloatSpring
 import com.cobblemon.mod.common.util.math.geometry.toRadians
-import com.cobblemon.mod.common.util.math.simpleSpringDamper
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
@@ -41,8 +34,6 @@ import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
-import org.joml.Matrix3f
-import org.joml.Quaternionf
 import org.joml.Vector3f
 import kotlin.math.*
 
@@ -51,28 +42,6 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         val KEY = cobblemonResource("air/bird")
 
         private const val FLY_POSE_SPEED = 0.1
-        // At or below this the bird hovers instead of flying
-        private const val HOVER_SPEED = 0.1
-        // Within this many degrees of straight up or down wings level means nothing so the camera holds its roll
-        private const val VERTICAL_DEADZONE_DEGREES = 15f
-        private val MIN_LEVEL_UP_LENGTH_SQ = sin(VERTICAL_DEADZONE_DEGREES.toRadians()).pow(2)
-        // Below this speed the bird is too slow to bank so its wings always level out
-        private const val NO_BANK_SPEED = 0.2
-        // Degrees before the max roll where rolling further starts easing off. Raise for a softer stop
-        private const val ROLL_CAP_BAND_DEGREES = 20f
-        // Degrees past the turn roll limit over which mouse pitch hands over from world up and down to the bird's own pitch
-        private const val PITCH_BLEND_BAND_DEGREES = 15f
-        // Pitch where mouse pitch starts handing back to the bird's own pitch. By straight up or down it's all the bird's
-        // own so a loop carries on over the top instead of world up pulling it back
-        private const val WORLD_PITCH_FADE_START = 60f
-        // Fastest the wings level out by themselves in degrees per second
-        private const val MAX_ROLL_SETTLE_RATE = 45f
-        // Within this many degrees of level the settle rate eases off so it lands on level instead of overshooting
-        private const val ROLL_SETTLE_ARRIVAL_DEGREES = 35f
-        // How fast the settle rate can change in degrees per second squared. Same as the old per frame cap at 60 fps
-        private const val ROLL_SETTLE_ACCEL = 67.5f
-        // Keeps the turn roll limit from dividing by zero
-        private const val MIN_TURN_ROLL_LIMIT = 1f
         private const val GLIDE_ENTRY_SPEED = 0.19
         private const val GLIDE_EXIT_SPEED = 0.13
     }
@@ -115,17 +84,25 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
     ) {
         if(vehicle.level().isClientSide) {
             tickStamina(settings, state, vehicle, driver)
-            checkStaminaDive(state)
+            checkUpsideDown(state, vehicle, driver)
         }
     }
 
-    // Out of stamina the bird can't hold itself up so it builds up a dive
-    private fun checkStaminaDive(state: BirdState) {
-        if (state.stamina.get() == 0.0f) {
-            val diveRate = 1.0 / (2.0 * 20.0) // 2 seconds to max out
-            state.staminaDiveForce.set(min(1.0, state.staminaDiveForce.get() + diveRate))
-        } else {
-            state.staminaDiveForce.set(0.0)
+    private fun checkUpsideDown(
+        state: BirdState,
+        vehicle: PokemonEntity,
+        driver: Player,
+    ) {
+        // Also checks stamina
+        val controller = (vehicle as OrientationControllable).orientationController
+        if (cos(controller.roll.toRadians()) < 0.0) {
+            val upsideDownRate = 1.0 / (2.0 * 20.0) // 2 seconds to max out upsideDown force
+            state.currUpsideDownForce.set( min(1.0, state.currUpsideDownForce.get() + upsideDownRate * abs(cos(controller.roll.toRadians()))))
+        } else if (state.stamina.get() == 0.0f) { // checks stamina depletion and forces dive if depleted
+            val upsideDownRate = 1.0 / (2.0 * 20.0) // 1 seconds to max out
+            state.currUpsideDownForce.set( min(1.0, state.currUpsideDownForce.get() + upsideDownRate))
+        } else { // Its right side up or has stamina so reset it
+            state.currUpsideDownForce.set(0.0)
         }
     }
 
@@ -184,8 +161,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         //Perform ride velocity update
         calculateRideSpaceVel(settings, state, vehicle, driver)
 
-        // Pulls the bird down once it's out of stamina
-        val extraDownwardForce = state.staminaDiveForce.get().pow(2) * -0.3 // 6 blocks a second downward
+        // The downward force used to encourage players to stop flying upside down.
+        val extraDownwardForce = state.currUpsideDownForce.get().pow(2) * -0.3 // 6 blocks a second downward
 
         // Convert the local velocity vector into a world vector
         val localVelVec = Vector3f(
@@ -193,7 +170,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
             (state.rideVelocity.get().y).toFloat(),
             state.rideVelocity.get().z.toFloat() * -1.0f // Flip the z axis to make this left handed
         )
-        var worldVelVec = localVelVec.mul(controller.orientation).toVec3d()
+        // Unrotate preemptively as this vector gets rotatee later down the line in MC logic.
+        var worldVelVec = localVelVec.mul(controller.orientation).toVec3d().yRot(vehicle.yRot.toRadians())
         worldVelVec =  worldVelVec.add(0.0, extraDownwardForce, 0.0) // Add the stamina depletion force to bring the ride down.
 
         return worldVelVec
@@ -304,23 +282,19 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         state.rideVelocity.set(newVelocity)
     }
 
-    private fun rotateOverTime(
+    override fun angRollVel(
         settings: BirdSettings,
         state: BirdState,
         vehicle: PokemonEntity,
         driver: Player,
         deltaTime: Double
-    ) {
-        if (vehicle !is OrientationControllable) return
+    ): Vec3 {
+        if (vehicle !is OrientationControllable) return Vec3.ZERO
         val controller = (vehicle as OrientationControllable).orientationController
 
         val handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalBird.handlingExpr!!)
 
-        // Turn rate tops out at the turn roll limit. Banking further is for show and doesn't turn any harder
-        val turnRollLimit = frameTuning(settings, state, vehicle).turnRollLimit.coerceIn(MIN_TURN_ROLL_LIMIT, 90f)
-        val bankFromLevel = if (abs(controller.roll) > 90f) 180f - abs(controller.roll) else abs(controller.roll)
-        val turnShare = sin(min(bankFromLevel, turnRollLimit).toRadians()) / sin(turnRollLimit.toRadians()) * controller.roll.sign
-        val yawDeltaDeg =  deltaTime * handling * turnShare
+        val yawDeltaDeg =  deltaTime * handling * sin(Math.toRadians(controller.roll.toDouble()))
         val trueYawDelt = yawDeltaDeg * abs(cos(Math.toRadians(controller.pitch.toDouble()))).coerceIn(-1.0, 1.0)
 
         // Dampen yaw when upside down
@@ -335,6 +309,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         controller.applyGlobalPitch(pCorr)
         controller.rotateRoll(rCorr)
 
+        //yaw, pitch, roll
+        return Vec3(0.0, 0.0, 0.0)
     }
 
     private fun correctOrientation(
@@ -344,28 +320,45 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         controller: OrientationController,
         deltaTime: Double
     ) {
-        // Wings only level out by themselves when the rider has let go and they're nearly level already,
-        // or when the bird's too slow to bank at all. A bank the rider holds stays where they put it
-        val tuning = frameTuning(settings, state, vehicle)
-        val idle = state.noInputTimeRoll.get() >= tuning.rollSettleDelay
-        val settling = state.rideVelocity.get().length() < NO_BANK_SPEED || (idle && abs(controller.roll) < tuning.rollSettleAngle)
-        val rollError = Mth.wrapDegrees(0.0f.angleDifference(controller.roll))
-        val desiredRollRate = if (settling) {
-            MAX_ROLL_SETTLE_RATE * (min(ROLL_SETTLE_ARRIVAL_DEGREES, abs(rollError)) / ROLL_SETTLE_ARRIVAL_DEGREES) * -rollError.sign
-        } else {
-            0f
+        // Calculate correcting roll force.
+        val rollCorrectionTimer = vehicle.runtime.resolveDouble(settings.timeToRollCorrect ?: globalBird.timeToRollCorrect!!)
+        // If the ride is moving then have the correction rate be an equal proportion of:
+        // - how rolled are you
+        // - how long has it been since last mouse input (higher is stronger correction)
+        // Also the correction is proportional as a whole to how NOT pitched are you so you don't spin endlessly when looking up or down
+        val howRolledAmI =  sqrt(abs((cos(controller.roll.toRadians()) - 1.0f) * 0.5f)) // sqrt so it trends towards one pretty quickly
+        val maxRollCorrectionRate =
+            if (state.rideVelocity.get().length() < 0.2) 45.0f
+            else 45.0f * cos(controller.pitch.toRadians()).pow(2) * (
+                         howRolledAmI*1.0f +
+                         (state.noInputTimeRoll.get() - rollCorrectionTimer).coerceIn(0.0, 1.0).pow(2).toFloat()*0.5f
+                    )
+        val maxRollForce = maxRollCorrectionRate / 40.0f
+        val rollArrivalDeg = 35.0f
+        val desiredRoll = 0.0f
+
+        // Calculate the signed error (how far and in what direction)
+        val rollError = Mth.wrapDegrees(desiredRoll.angleDifference(controller.roll))
+        // Use the absolute error to     calculate the magnitude of the influence
+        val influenceMagnitude = (min(rollArrivalDeg, abs(rollError)) / rollArrivalDeg)
+        val desiredRollForce = maxRollCorrectionRate * influenceMagnitude * -rollError.sign
+        var steeredRollForce = desiredRollForce - state.currRollCorrectionForce.get()
+        // Ensure the 'steering' correction force doesn't exceed our maxForce
+        if (abs(steeredRollForce) > maxRollForce) {
+            steeredRollForce = steeredRollForce.sign * maxRollForce
         }
-        val maxRateChange = ROLL_SETTLE_ACCEL * deltaTime
-        val currentRollRate = state.currRollCorrectionForce.get()
-        state.currRollCorrectionForce.set(currentRollRate + (desiredRollRate - currentRollRate).coerceIn(-maxRateChange, maxRateChange))
+        // Apply the 'steered' force (its really not a steering force I need a better name)
+        state.currRollCorrectionForce.set(
+            state.currRollCorrectionForce.get() + steeredRollForce
+        )
 
         //Calculate correcting pitch force.
-        val maxPitchCorrectionRate = if (state.staminaDiveForce.get() != 0.0) 15.0f * state.staminaDiveForce.get().toFloat() else 30.0f
+        val maxPitchCorrectionRate = if (state.currUpsideDownForce.get() != 0.0) 15.0f * state.currUpsideDownForce.get().toFloat() else 30.0f
         val maxPitchForce = maxPitchCorrectionRate / 40.0f
         val pitchArrivalDeg = 35.0f
-        val desiredPitch = if (state.staminaDiveForce.get() != 0.0) 90.0f else 0.0f
+        val desiredPitch = if (state.currUpsideDownForce.get() != 0.0) 90.0f else 0.0f
 
-        if((state.rideVelocity.get().length() < 0.1) || state.staminaDiveForce.get() != 0.0) {
+        if((state.rideVelocity.get().length() < 0.1) || state.currUpsideDownForce.get() != 0.0) {
             val pitchErrror = Mth.wrapDegrees(desiredPitch.angleDifference(controller.pitch))
             val arrivalInfluence = (min(pitchArrivalDeg,abs(pitchErrror)) / pitchArrivalDeg)
             val desiredPitchForce = maxPitchCorrectionRate * arrivalInfluence * -pitchErrror.sign
@@ -388,18 +381,7 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         }
     }
 
-    override fun steer(
-        settings: BirdSettings,
-        state: BirdState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: RideSteerInput
-    ) {
-        input.rotate(mouseRotation(settings, state, vehicle, driver, input.mousePitch, input.mouseYaw, input.mouseYSmoother, input.mouseXSmoother, input.sensitivity, input.deltaTime))
-        rotateOverTime(settings, state, vehicle, driver, input.deltaTime)
-    }
-
-    private fun mouseRotation(
+    override fun rotationOnMouseXY(
         settings: BirdSettings,
         state: BirdState,
         vehicle: PokemonEntity,
@@ -412,10 +394,15 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         deltaTime: Double
     ): Vec3 {
         if (driver !is OrientationControllable) return Vec3.ZERO
-        // Time since the rider last moved the mouse, wings only settle once it passes the settle delay
-        if (abs(mouseX) < 1 && abs(mouseY) < 1) {
+        val controller = (driver as OrientationControllable).orientationController
+        // Begin the roll correction time counter if not enough mouse input
+        // is detected
+        if (mouseX < 1 && abs(mouseY) < 1) {
             state.noInputTimeRoll.set(state.noInputTimeRoll.get() + deltaTime)
-        } else {
+        } else if (cos(controller.roll.toRadians()) < 0.1) {
+            state.noInputTimeRoll.set(state.noInputTimeRoll.get() + deltaTime * 0.5)
+        }
+        else {
             state.noInputTimeRoll.set(0.0)
         }
 
@@ -456,42 +443,46 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
 
         val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalBird.speedExpr!!) / 20.0
         val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult ?: globalBird.mouseInputMult!!)
-        val tuning = frameTuning(settings, state, vehicle)
+        // Applied to mouseX to prevent turning upside down when trying to roll hard.
+        val rollDegreeDebuff = if(mouseX.sign.toFloat() == controller.roll.sign) 1 - 0.9f*sqrt(abs(sin(controller.roll.toRadians())))*sqrt(abs(cos(controller.pitch))) else 1.0f
 
         //Smooth out mouse input.
         val smoothingSpeed = 2.0
-        val mouseXc = (mouseX).coerceIn(-45.0, 45.0) * mouseInputMult
-        val mouseYc = (mouseY).coerceIn(-45.0, 45.0) * mouseInputMult
+        val mouseXc = (mouseX).coerceIn(-45.0, 45.0) * mouseInputMult * rollDegreeDebuff
+        // When upside down apply a pitching force to nudge the player towards a dive. This reduces the 'weirdness'
+        // of being upside down
+        val rolledOverPitchCorrection = -8*sqrt(abs(min(cos(controller.roll.toRadians()),0.0f))) * (cos(controller.pitch.toRadians())).pow(2)
+        val mouseYc = ((mouseY).coerceIn(-45.0, 45.0) * mouseInputMult) + rolledOverPitchCorrection
         val xInput = mouseXSmoother.getNewDeltaValue(mouseXc * 0.1, deltaTime * smoothingSpeed)
         val yInput = mouseYSmoother.getNewDeltaValue(mouseYc * 0.1, deltaTime * smoothingSpeed)
         val currSpeed = state.rideVelocity.get().length()
         val currHorzSpeed = state.rideVelocity.get().horizontalDistance()
-        val hoverSpeed = HOVER_SPEED
+        val hoverSpeed = 0.1
         val pitchDamping = abs(cos(controller.pitch.toRadians())).pow(2) // Helper value used when wanting to discard the influence of another value at steep pitches
 
         // Yaw locally when at or below hoverSpeed but not when pitched up or rolled over
         val globalYaw = xInput * (1 - sqrt(RidingBehaviour.scaleToRange(currHorzSpeed, hoverSpeed, topSpeed))).coerceIn(0.0, 1.0)
         controller.applyGlobalYaw(globalYaw.toFloat())
 
-        // No pitching at hover speed and faster pitching the faster the bird goes
-        val pitchInput = yInput * if (currSpeed > hoverSpeed || yInput > 0.0) RidingBehaviour.scaleToRange(currSpeed, 0.0, topSpeed).coerceIn(0.2, 1.0)
+        // Pitch locally up or down depending upon a number of factors:
+        // - Reduce pitch substantially when rolled and in a steep yaw. This prevents the player from ignoring a slow handling stat
+        // - Do not pitch at all when at or below hover speed
+        // - pitch faster at higher speeds
+        val p = 1.0 - vehicle.runtime.resolveDouble(settings.horizontalPitchExpr ?: globalBird.horizontalPitchExpr!!)
+        var localPitch = yInput * (1 - abs(sin(controller.roll.toRadians())).pow(2) * p * hypot(controller.forwardVector.x.toDouble(), controller.forwardVector.z.toDouble()).toFloat())
+        localPitch *= if (currSpeed > hoverSpeed || yInput > 0.0) RidingBehaviour.scaleToRange(currSpeed, 0.0, topSpeed).coerceIn(0.2, 1.0)
             else 0.0
 
-        // Inside a normal bank mouse pitch is world up and down so pulling up climbs instead of tightening the turn.
-        // Past the turn roll limit, or pointing near straight up or down, it hands over to the bird's own pitch
-        val pastTurnRoll = smoothstep01((abs(controller.roll) - tuning.turnRollLimit) / PITCH_BLEND_BAND_DEGREES)
-        val nearVertical = smoothstep01((abs(controller.pitch) - WORLD_PITCH_FADE_START) / (90f - WORLD_PITCH_FADE_START))
-        val localShare = 1f - (1f - pastTurnRoll) * (1f - nearVertical)
-        controller.applyGlobalPitch((pitchInput * (1f - localShare)).toFloat())
-
-        // Pulling with the bird's own pitch while rolled turns hard so it's held back by handling there
-        val p = 1.0 - vehicle.runtime.resolveDouble(settings.horizontalPitchExpr ?: globalBird.horizontalPitchExpr!!)
-        val localPitch = pitchInput * localShare * (1 - abs(sin(controller.roll.toRadians())).pow(2) * p * hypot(controller.forwardVector.x.toDouble(), controller.forwardVector.z.toDouble()).toFloat())
-
-        // Roll less when slow and not at all when at hoverSpeed or lower
+        // Roll less when slow and not at all when at hoverSpeed or lower.
+        // Apply a roll righting force when trying to pitch hard while rolled sideways. This nudges the player towards
+        // pitching globally
+        val pitchInfluencedRollCorrection = 0.0
+        val howRolledAmI =  (( cos(controller.roll.toRadians()) - 1).coerceIn(-1.0f, 0.0f) * -2) //Coerce into how much roll you want to let in in the deadzone
         val isInputtingTowardsRoll = if ( xInput.sign == controller.roll.sign.toDouble()) 1.0 else 0.0
-        val rollInput = xInput * sqrt(abs(RidingBehaviour.scaleToRange(currHorzSpeed, hoverSpeed, topSpeed)).coerceIn(0.0,1.0))
-        val rollForce = if (currHorzSpeed > hoverSpeed) capRoll(rollInput, controller.roll, tuning.maxRoll) else 0.0
+        val inputInRolledDir = if (isInputtingTowardsRoll == 1.0) 1.0 else -cos(controller.roll.toRadians()).coerceIn(-1.0f, 0.0f).toDouble()
+        val rollDampen = (1 - howRolledAmI.coerceIn(0.0f, 0.7f) * pitchDamping * inputInRolledDir)
+        val rollForce = if (currHorzSpeed > hoverSpeed) xInput * sqrt(abs(RidingBehaviour.scaleToRange(currHorzSpeed, hoverSpeed, topSpeed)).coerceIn(0.0,1.0)) * rollDampen + pitchInfluencedRollCorrection
+            else 0.0
 
         // When already rolled significantly part of the roll force should turn to local yaw force
         val localYawForce = rollForce * abs(sin(controller.roll.toRadians())).pow(2) * pitchDamping * isInputtingTowardsRoll
@@ -555,6 +546,14 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         return 1.0f + normalizedGlideSpeed.pow(2).toFloat() * 0.2f
     }
 
+    override fun useAngVelSmoothing(
+        settings: BirdSettings,
+        state: BirdState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return false
+    }
+
     override fun inertia(settings: BirdSettings, state: BirdState, vehicle: PokemonEntity): Double {
         return 0.5
     }
@@ -608,139 +607,6 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
 
     override fun createDefaultState(settings: BirdSettings) = BirdState()
 
-    /**
-     * Keeps the camera level until the bird rolls past the engage angle, then eases it into the bird's roll.
-     * It levels out again once the bird comes back under the release angle. Yaw and pitch always follow the bird.
-     */
-    override fun cameraBase(
-        settings: BirdSettings,
-        state: BirdState,
-        vehicle: PokemonEntity,
-        context: RideCameraContext
-    ): Quaternionf {
-        val ride = context.defaultBase()
-        val tuning = frameTuning(settings, state, vehicle)
-        val roll = context.data as? BirdCameraRoll ?: BirdCameraRoll().also { context.data = it }
-
-        val forward = FORWARDS.rotate(ride, Vector3f())
-        val up = UP.rotate(ride, Vector3f())
-
-        // Up with wings level. Pointing near straight up or down it flips sides so it's only used away from vertical
-        val levelUp = Vector3f(0f, 1f, 0f).sub(Vector3f(forward).mul(forward.y))
-        val hasLevel = levelUp.lengthSquared() > MIN_LEVEL_UP_LENGTH_SQ
-        if (hasLevel) {
-            levelUp.normalize()
-            val rideRoll = signedAngle(levelUp, up, forward)
-            if (roll.engaged && abs(rideRoll) < tuning.rollRelease) {
-                roll.engaged = false
-            } else if (!roll.engaged && abs(rideRoll) > tuning.rollEngage) {
-                roll.engaged = true
-            }
-        }
-
-        // Camera up lives in world space so the level up flipping over the top of a loop can't drag the camera round
-        val cameraUp = roll.cameraUp?.let { flatten(it, forward) } ?: Vector3f(up)
-        val target = when {
-            roll.engaged -> up
-            hasLevel -> levelUp
-            else -> Vector3f(cameraUp)
-        }
-
-        if (roll.cameraUp == null) {
-            cameraUp.set(target)
-        } else if (context.frameSeconds > 0f) {
-            // Spring the leftover angle so it builds up speed and settles instead of lunging at the start
-            roll.spring.value = signedAngle(target, cameraUp, forward)
-            simpleSpringDamper(roll.spring, 0f, tuning.rollHalflife, context.frameSeconds)
-            cameraUp.set(target).rotateAxis(roll.spring.value * Mth.DEG_TO_RAD, forward.x, forward.y, forward.z)
-        }
-        roll.cameraUp = cameraUp
-
-        return levelFrame(forward, cameraUp)
-    }
-
-    override fun firstPersonHandRoll(
-        settings: BirdSettings,
-        state: BirdState,
-        vehicle: PokemonEntity,
-        context: RideCameraContext
-    ): Float {
-        return context.rideRollAroundView() * frameTuning(settings, state, vehicle).handRollShare
-    }
-
-    // Hovering the rider can look up and down freely and around up to the hover limit. Only pushing past it turns the bird
-    override fun consumeLook(
-        settings: BirdSettings,
-        state: BirdState,
-        vehicle: PokemonEntity,
-        input: RideLookInput
-    ): RideLookTake {
-        // Only forward speed counts so rising or sinking on the spot is still hovering
-        if (state.rideVelocity.get().horizontalDistance() > HOVER_SPEED) return RideLookTake.all(input)
-        val limit = frameTuning(settings, state, vehicle).hoverLookYawLimit
-        // Never snap a look that's already past the limit, it just can't be pushed further out
-        val bound = max(limit, abs(input.yaw))
-        val target = input.yaw + input.yawDelta
-        val pushed = target - target.coerceIn(-bound, bound)
-        return RideLookTake(pushed, 0f, recenterYaw = false, recenterPitch = false)
-    }
-
-    /** Knobs the bird reads every frame, resolved at most once a tick so MoLang doesn't run per frame. */
-    private fun frameTuning(settings: BirdSettings, state: BirdState, vehicle: PokemonEntity): BirdTuning {
-        val cached = state.frameTuning.get()
-        if (cached != null && cached.tick == vehicle.tickCount) return cached
-        val runtime = vehicle.runtime
-        return BirdTuning(
-            tick = vehicle.tickCount,
-            rollEngage = runtime.resolveFloat(settings.cameraRollEngage ?: globalBird.cameraRollEngage!!),
-            rollRelease = runtime.resolveFloat(settings.cameraRollRelease ?: globalBird.cameraRollRelease!!),
-            rollHalflife = runtime.resolveFloat(settings.cameraRollHalflife ?: globalBird.cameraRollHalflife!!),
-            hoverLookYawLimit = runtime.resolveFloat(settings.hoverLookYawLimit ?: globalBird.hoverLookYawLimit!!),
-            turnRollLimit = runtime.resolveFloat(settings.turnRollLimit ?: globalBird.turnRollLimit!!),
-            maxRoll = runtime.resolveFloat(settings.maxRoll ?: globalBird.maxRoll!!),
-            rollSettleAngle = runtime.resolveFloat(settings.rollSettleAngle ?: globalBird.rollSettleAngle!!),
-            rollSettleDelay = runtime.resolveFloat(settings.timeToRollCorrect ?: globalBird.timeToRollCorrect!!),
-            handRollShare = runtime.resolveFloat(settings.handRollShare ?: globalBird.handRollShare!!)
-        ).also { state.frameTuning.set(it) }
-    }
-
-    /** Smoothstep of [t] clamped to 0 to 1. */
-    private fun smoothstep01(t: Float): Float {
-        val x = t.coerceIn(0f, 1f)
-        return x * x * (3f - 2f * x)
-    }
-
-    /**
-     * Eases roll that would take the bird further from level to a stop at [maxRoll] degrees.
-     * Rolling back toward level is never held back.
-     */
-    private fun capRoll(rollDelta: Double, roll: Float, maxRoll: Float): Double {
-        if (rollDelta.sign != roll.sign.toDouble()) return rollDelta
-        val room = (maxRoll - abs(roll)).coerceAtLeast(0f)
-        val ease = (room / ROLL_CAP_BAND_DEGREES).coerceIn(0f, 1f)
-        val eased = rollDelta * ease * ease * (3f - 2f * ease)
-        // Never step past the cap in one frame
-        return eased.coerceIn(-room.toDouble(), room.toDouble())
-    }
-
-    /** Signed degrees from [from] to [to] turning around [axis]. Both have to be perpendicular to it. */
-    private fun signedAngle(from: Vector3f, to: Vector3f, axis: Vector3f): Float {
-        return atan2(Vector3f(from).cross(to).dot(axis), from.dot(to)) * Mth.RAD_TO_DEG
-    }
-
-    /** [vector] with the part along [axis] removed, or null if nothing is left. */
-    private fun flatten(vector: Vector3f, axis: Vector3f): Vector3f? {
-        val flat = Vector3f(vector).sub(Vector3f(axis).mul(vector.dot(axis)))
-        return if (flat.lengthSquared() > 0f) flat.normalize() else null
-    }
-
-    /** Rotation whose forward is [forward] and up is [up]. They have to be unit length and perpendicular. */
-    private fun levelFrame(forward: Vector3f, up: Vector3f): Quaternionf {
-        val right = Vector3f(forward).cross(up)
-        val back = Vector3f(forward).negate()
-        return Quaternionf().setFromNormalized(Matrix3f(right, up, back))
-    }
-
     override fun asMoLangValue(
         settings: BirdSettings,
         state: BirdState,
@@ -793,39 +659,6 @@ class BirdSettings : RidingBehaviourSettings {
     // This is coerced between 1 and 0 or things would get weird.
     var stamDrainPerRateDive: Expression? = null
         private set
-    // Degrees of roll before the camera starts rolling with the bird
-    var cameraRollEngage: Expression? = null
-        private set
-
-    // Degrees the bird has to roll back under before the camera levels out. Keep it below engage so it doesn't flicker
-    var cameraRollRelease: Expression? = null
-        private set
-
-    // Seconds the camera roll spring takes to settle. Raise for a lazier camera
-    var cameraRollHalflife: Expression? = null
-        private set
-
-    // Degrees either side the rider can look while hovering before pushing further turns the bird
-    var hoverLookYawLimit: Expression? = null
-        private set
-
-    // Roll in degrees where turning tops out and mouse pitch stops being world up and down
-    var turnRollLimit: Expression? = null
-        private set
-
-    // Furthest the bird can roll from level in degrees. Keep cameraRollEngage just above it so the camera
-    // stays level through normal flying and only rolls in loops and flips. 180 lets it roll all the way over
-    var maxRoll: Expression? = null
-        private set
-
-    // Within this many degrees of level the wings settle back to level once the rider lets go of the mouse
-    var rollSettleAngle: Expression? = null
-        private set
-
-    // Share of the bird's roll the first person hands lean with, 0 to 1
-    var handRollShare: Expression? = null
-        private set
-
     var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
@@ -844,14 +677,6 @@ class BirdSettings : RidingBehaviourSettings {
         buffer.writeNullableExpression(stamDrainPercRateGlide)
         buffer.writeNullableExpression(stamDrainPerRateDive)
         buffer.writeNullableExpression(timeToRollCorrect)
-        buffer.writeNullableExpression(cameraRollEngage)
-        buffer.writeNullableExpression(cameraRollRelease)
-        buffer.writeNullableExpression(cameraRollHalflife)
-        buffer.writeNullableExpression(hoverLookYawLimit)
-        buffer.writeNullableExpression(turnRollLimit)
-        buffer.writeNullableExpression(maxRoll)
-        buffer.writeNullableExpression(rollSettleAngle)
-        buffer.writeNullableExpression(handRollShare)
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
@@ -870,14 +695,6 @@ class BirdSettings : RidingBehaviourSettings {
         stamDrainPercRateGlide = buffer.readNullableExpression()
         stamDrainPerRateDive = buffer.readNullableExpression()
         timeToRollCorrect = buffer.readNullableExpression()
-        cameraRollEngage = buffer.readNullableExpression()
-        cameraRollRelease = buffer.readNullableExpression()
-        cameraRollHalflife = buffer.readNullableExpression()
-        hoverLookYawLimit = buffer.readNullableExpression()
-        turnRollLimit = buffer.readNullableExpression()
-        maxRoll = buffer.readNullableExpression()
-        rollSettleAngle = buffer.readNullableExpression()
-        handRollShare = buffer.readNullableExpression()
     }
 }
 
@@ -888,9 +705,7 @@ class BirdState : RidingBehaviourState() {
     var currPitchCorrectionForce = ridingState(0.0, Side.CLIENT)
     var noInputTimeRoll = ridingState(0.0, Side.CLIENT)
     var noInputTimePitch = ridingState(0.0, Side.CLIENT)
-    var staminaDiveForce = ridingState(0.0, Side.CLIENT)
-    // Client only cache of the knobs read every frame, never synced
-    var frameTuning = ridingState<BirdTuning?>(null, Side.CLIENT)
+    var currUpsideDownForce = ridingState(0.0, Side.CLIENT)
 
     override fun encode(buffer: FriendlyByteBuf) {
         super.encode(buffer)
@@ -910,7 +725,6 @@ class BirdState : RidingBehaviourState() {
         currPitchCorrectionForce.set(0.0, forced = true)
         noInputTimeRoll.set(0.0, forced = true)
         noInputTimePitch.set(0.0, forced = true)
-        frameTuning.set(null, forced = true)
     }
 
     override fun toString(): String {
@@ -947,26 +761,3 @@ fun Float.angleDifference(other: Float): Float {
     while (diff > 180F) diff -= 360F
     return diff
 }
-
-/** Bird knobs resolved for one tick. */
-data class BirdTuning(
-    val tick: Int,
-    val rollEngage: Float,
-    val rollRelease: Float,
-    val rollHalflife: Float,
-    val hoverLookYawLimit: Float,
-    val turnRollLimit: Float,
-    val maxRoll: Float,
-    val rollSettleAngle: Float,
-    val rollSettleDelay: Float,
-    val handRollShare: Float
-)
-
-/** Bird's camera roll smoothing, kept in the camera context between frames. */
-class BirdCameraRoll {
-    var engaged = false
-    // World space up the camera had last frame, null until the first frame
-    var cameraUp: Vector3f? = null
-    // Degrees left between the camera and where it's heading, plus how fast that's closing
-    val spring = FloatSpring()
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/air/GliderBehaviour.kt

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.api.riding.behaviour.types.air
 
 import com.bedrockk.molang.Expression
 import com.cobblemon.mod.common.CobblemonRideSettings
+import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
@@ -18,11 +19,11 @@ import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.api.riding.util.RideFrame
 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.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
@@ -66,18 +67,7 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
         return Vec2(driver.xRot, driver.yRot)
     }
 
-    // This ride works along its yaw so its velocity gets turned into world space here
     override fun velocity(
-        settings: GliderSettings,
-        state: RidingBehaviourState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ): Vec3 {
-        return RideFrame.yawToWorld(localVelocity(settings, state, vehicle, driver, input), vehicle.yRot)
-    }
-
-    private fun localVelocity(
             settings: GliderSettings,
             state: RidingBehaviourState,
             vehicle: PokemonEntity,
@@ -90,6 +80,34 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
         return Vec3(xVector, yVector, zVector)
     }
 
+    override fun angRollVel(
+            settings: GliderSettings,
+            state: RidingBehaviourState,
+            vehicle: PokemonEntity,
+            driver: Player,
+            deltaTime: Double
+    ): Vec3 {
+        return Vec3.ZERO
+    }
+
+    override fun rotationOnMouseXY(
+            settings: GliderSettings,
+            state: RidingBehaviourState,
+            vehicle: PokemonEntity,
+            driver: Player,
+            mouseY: Double,
+            mouseX: Double,
+            mouseYSmoother: SmoothDouble,
+            mouseXSmoother: SmoothDouble,
+            sensitivity: Double,
+            deltaTime: Double
+    ): Vec3 {
+        if (driver !is OrientationControllable) return Vec3.ZERO
+
+        //Might need to add the smoothing here for default.
+        return Vec3(0.0, mouseY, mouseX)
+    }
+
     override fun canJump(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity, driver: Player): Boolean {
         return false
     }
@@ -131,6 +149,10 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
         return 1.0f
     }
 
+    override fun useAngVelSmoothing(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+        return false
+    }
+
     override fun inertia(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Double {
         return 0.5
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/air/HelicopterBehaviour.kt

@@ -13,7 +13,6 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonRideSettings
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.RideSteerInput
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
@@ -21,7 +20,6 @@ import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.api.riding.util.RideFrame
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.blockPositionsAsListRounded
@@ -93,23 +91,12 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS
         return Vec2(driver.xRot * 0.5f, driver.yRot)
     }
 
-    // This ride works along its yaw so its velocity gets turned into world space here
     override fun velocity(
         settings: HelicopterSettings,
         state: RidingBehaviourState,
         vehicle: PokemonEntity,
         driver: Player,
         input: Vec3
-    ): Vec3 {
-        return RideFrame.yawToWorld(localVelocity(settings, state, vehicle, driver, input), vehicle.yRot)
-    }
-
-    private fun localVelocity(
-        settings: HelicopterSettings,
-        state: RidingBehaviourState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
     ): Vec3 {
         val runtime = vehicle.runtime
 
@@ -133,7 +120,7 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS
         return Vec3(xVel, yVel, zVel)
     }
 
-    private fun rotationOverTime(
+    override fun angRollVel(
         settings: HelicopterSettings,
         state: RidingBehaviourState,
         vehicle: PokemonEntity,
@@ -188,18 +175,7 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS
         return Vec3(0.0, 0.0, 0.0)
     }
 
-    override fun steer(
-        settings: HelicopterSettings,
-        state: RidingBehaviourState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: RideSteerInput
-    ) {
-        input.rotate(mouseRotation(settings, state, vehicle, driver, input.mousePitch, input.mouseYaw, input.mouseYSmoother, input.mouseXSmoother, input.sensitivity, input.deltaTime))
-        input.rotateSmoothed(rotationOverTime(settings, state, vehicle, driver, input.deltaTime))
-    }
-
-    private fun mouseRotation(
+    override fun rotationOnMouseXY(
         settings: HelicopterSettings,
         state: RidingBehaviourState,
         vehicle: PokemonEntity,
@@ -265,6 +241,10 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS
         return 1.0f
     }
 
+    override fun useAngVelSmoothing(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+        return true
+    }
+
     override fun inertia(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Double {
         return 0.1
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/air/HoverBehaviour.kt

@@ -18,7 +18,6 @@ import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.api.riding.util.RideFrame
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.*
@@ -27,6 +26,7 @@ import net.minecraft.client.Minecraft
 import net.minecraft.network.FriendlyByteBuf
 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.level.ClipContext
@@ -190,23 +190,12 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
         return rotAmount
     }
 
-    // This ride works along its yaw so its velocity gets turned into world space here
     override fun velocity(
         settings: HoverSettings,
         state: HoverState,
         vehicle: PokemonEntity,
         driver: Player,
         input: Vec3
-    ): Vec3 {
-        return RideFrame.yawToWorld(localVelocity(settings, state, vehicle, driver, input), vehicle.yRot)
-    }
-
-    private fun localVelocity(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
     ): Vec3 {
         val retVel = calculateRideSpaceVel(settings, state, vehicle, driver)
         state.rideVelocity.set(retVel)
@@ -294,6 +283,31 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
         return newVelocity
     }
 
+    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 {
+        return Vec3.ZERO
+    }
+
     override fun canJump(
         settings: HoverSettings,
         state: HoverState,
@@ -341,6 +355,14 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
         return if (state.isBoosting.get()) 1.1f else 1.0f
     }
 
+    override fun useAngVelSmoothing(
+        settings: HoverSettings,
+        state: HoverState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return false
+    }
+
     override fun inertia(
         settings: HoverSettings,
         state: HoverState,

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/air/JetBehaviour.kt

@@ -15,7 +15,6 @@ import com.cobblemon.mod.common.CobblemonRideSettings
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.RideSteerInput
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
@@ -29,6 +28,7 @@ import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.blockPositionsAsListRounded
 import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.math.geometry.toRadians
 import com.cobblemon.mod.common.util.readNullableExpression
 import com.cobblemon.mod.common.util.readRidingStats
 import com.cobblemon.mod.common.util.resolveDouble
@@ -176,7 +176,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
             (state.rideVelocity.get().y).toFloat(),
             state.rideVelocity.get().z.toFloat() * -1.0f // Flip the z axis to make this left handed? orr.. right handed? idk, flip it though
         )
-        var worldVelVec = localVelVec.mul(controller.orientation).toVec3d()
+        var worldVelVec = localVelVec.mul(controller.orientation).toVec3d().yRot(vehicle.yRot.toRadians()) // Unrotate preemptively as this vector gets rotate later down the line in MC logic.
         worldVelVec =  Vec3(
             worldVelVec.x,
             worldVelVec.y * (1 - (state.noStamTickCnt.get() / penaltyDeccel).coerceIn(0.0f, 1.0f)), // Dampen the upwards movement depending on stamina depletion time
@@ -266,7 +266,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
 
     }
 
-    private fun rotationOverTime(
+    override fun angRollVel(
         settings: JetSettings,
         state: JetState,
         vehicle: PokemonEntity,
@@ -292,18 +292,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
         return Vec3(yawForce, 0.0, 0.0)
     }
 
-    override fun steer(
-        settings: JetSettings,
-        state: JetState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: RideSteerInput
-    ) {
-        input.rotate(mouseRotation(settings, state, vehicle, driver, input.mousePitch, input.mouseYaw, input.mouseYSmoother, input.mouseXSmoother, input.sensitivity, input.deltaTime))
-        input.rotateSmoothed(rotationOverTime(settings, state, vehicle, driver, input.deltaTime))
-    }
-
-    private fun mouseRotation(
+    override fun rotationOnMouseXY(
         settings: JetSettings,
         state: JetState,
         vehicle: PokemonEntity,
@@ -401,6 +390,10 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
         }
     }
 
+    override fun useAngVelSmoothing(settings: JetSettings, state: JetState, vehicle: PokemonEntity): Boolean {
+        return true
+    }
+
     override fun inertia(settings: JetSettings, state: JetState, vehicle: PokemonEntity): Double {
         return 1.0
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/air/RocketBehaviour.kt

@@ -19,7 +19,6 @@ import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.api.riding.util.RideFrame
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.*
@@ -28,6 +27,7 @@ import net.minecraft.client.Minecraft
 import net.minecraft.network.FriendlyByteBuf
 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
@@ -75,17 +75,13 @@ class RocketBehaviour : RidingBehaviour<RocketSettings, RocketState> {
         vehicle: PokemonEntity,
         driver: Player
     ): Float {
-        return state.rideVelocity.get().length().toFloat()
-    }
+        // Use this as a "tick" function and check to see if the driver is "boosting"
+        if (vehicle.level().isClientSide) {
+            handleBoosting(settings, state, vehicle, driver)
+            tickStamina(settings, state, vehicle, driver)
+        }
 
-    override fun driverTick(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ) {
-        handleBoosting(settings, state, vehicle, driver)
-        tickStamina(settings, state, vehicle, driver)
+        return state.rideVelocity.get().length().toFloat()
     }
 
     fun handleBoosting(
@@ -212,23 +208,12 @@ class RocketBehaviour : RidingBehaviour<RocketSettings, RocketState> {
     }
 
 
-    // This ride works along its yaw so its velocity gets turned into world space here
     override fun velocity(
         settings: RocketSettings,
         state: RocketState,
         vehicle: PokemonEntity,
         driver: Player,
         input: Vec3
-    ): Vec3 {
-        return RideFrame.yawToWorld(localVelocity(settings, state, vehicle, driver, input), vehicle.yRot)
-    }
-
-    private fun localVelocity(
-        settings: RocketSettings,
-        state: RocketState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
     ): Vec3 {
         val retVel = calculateRideSpaceVel(settings, state, vehicle, driver)
         state.rideVelocity.set(retVel)
@@ -333,6 +318,37 @@ class RocketBehaviour : RidingBehaviour<RocketSettings, RocketState> {
         return newVelocity
     }
 
+    override fun angRollVel(
+        settings: RocketSettings,
+        state: RocketState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        deltaTime: Double
+    ): Vec3 {
+        return Vec3.ZERO
+    }
+
+    override fun rotationOnMouseXY(
+        settings: RocketSettings,
+        state: RocketState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        mouseY: Double,
+        mouseX: Double,
+        mouseYSmoother: SmoothDouble,
+        mouseXSmoother: SmoothDouble,
+        sensitivity: Double,
+        deltaTime: Double
+    ): Vec3 {
+        //Smooth out mouse input.
+        val smoothingSpeed = 4
+        val xInput = mouseXSmoother.getNewDeltaValue(mouseX * 0.1, deltaTime * smoothingSpeed);
+        val yInput = mouseYSmoother.getNewDeltaValue(mouseY * 0.1, deltaTime * smoothingSpeed);
+
+        //yaw, pitch, roll
+        return Vec3(0.0, yInput, xInput)
+    }
+
     override fun canJump(
         settings: RocketSettings,
         state: RocketState,
@@ -387,6 +403,14 @@ class RocketBehaviour : RidingBehaviour<RocketSettings, RocketState> {
         }
     }
 
+    override fun useAngVelSmoothing(
+        settings: RocketSettings,
+        state: RocketState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return false
+    }
+
     override fun inertia(
         settings: RocketSettings,
         state: RocketState,

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/composite/CompositeBehaviour.kt

@@ -11,10 +11,6 @@ package com.cobblemon.mod.common.api.riding.behaviour.types.composite
 import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies.CompositeRidingStrategies
-import com.cobblemon.mod.common.api.riding.camera.RideCameraContext
-import com.cobblemon.mod.common.api.riding.camera.RideLookInput
-import com.cobblemon.mod.common.api.riding.camera.RideLookTake
-import com.cobblemon.mod.common.api.riding.camera.RideLookSettings
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.entity.PoseType
@@ -26,12 +22,11 @@ import com.cobblemon.mod.common.util.writeRidingStats
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.util.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
-import org.joml.Quaternionf
-import org.joml.Vector3f
 
 class CompositeBehaviour : RidingBehaviour<CompositeSettings, CompositeState> {
     companion object {
@@ -175,6 +170,16 @@ class CompositeBehaviour : RidingBehaviour<CompositeSettings, CompositeState> {
         }
     }
 
+    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,
@@ -231,6 +236,46 @@ class CompositeBehaviour : RidingBehaviour<CompositeSettings, CompositeState> {
         }
     }
 
+    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,
@@ -243,39 +288,6 @@ class CompositeBehaviour : RidingBehaviour<CompositeSettings, CompositeState> {
         }
     }
 
-    override fun steer(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: RideSteerInput
-    ) {
-        chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.steer(behaviourSettings, behaviourState, vehicle, driver, input)
-        }
-    }
-
-    override fun travel(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.travel(behaviourSettings, behaviourState, vehicle, driver)
-        }
-    }
-
-    override fun velocityRunsTwicePerTick(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.velocityRunsTwicePerTick(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
     override fun rotation(
         settings: CompositeSettings,
         state: CompositeState,
@@ -298,17 +310,6 @@ class CompositeBehaviour : RidingBehaviour<CompositeSettings, CompositeState> {
         }
     }
 
-    override fun driverTick(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ) {
-        chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.driverTick(behaviourSettings, behaviourState, vehicle, driver)
-        }
-    }
-
     override fun pose(
         settings: CompositeSettings,
         state: CompositeState,
@@ -360,70 +361,6 @@ class CompositeBehaviour : RidingBehaviour<CompositeSettings, CompositeState> {
             behaviour.damageOnCollision(behaviourSettings, behaviourState, vehicle, impactVec)
         }
     }
-
-    override fun cameraBase(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        context: RideCameraContext
-    ): Quaternionf {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.cameraBase(behaviourSettings, behaviourState, vehicle, context)
-        }
-    }
-
-    override fun firstPersonHandRoll(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        context: RideCameraContext
-    ): Float {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.firstPersonHandRoll(behaviourSettings, behaviourState, vehicle, context)
-        }
-    }
-
-    override fun renderOffset(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        orientation: Quaternionf
-    ): Vector3f {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.renderOffset(behaviourSettings, behaviourState, vehicle, orientation)
-        }
-    }
-
-    override fun renderHalflife(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Float? {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.renderHalflife(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun lookSettings(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): RideLookSettings {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.lookSettings(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun consumeLook(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        input: RideLookInput
-    ): RideLookTake {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.consumeLook(behaviourSettings, behaviourState, vehicle, input)
-        }
-    }
 }
 
 open class CompositeSettings : RidingBehaviourSettings {

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/composite/strategies/RunStrategy.kt

@@ -13,7 +13,6 @@ 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.api.riding.util.RideFrame
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.world.entity.player.Player
@@ -64,8 +63,7 @@ object RunStrategy : CompositeRidingStrategy<CompositeSettings> {
         if (state.activeBehaviour.get() == alternativeSettings.key) return false
         if (state.lastTransition.get() + 20 >= entity.level().gameTime) return false
         val alternativeBehaviour = RidingBehaviours.get(alternativeSettings.key)
-        // Ride velocity is world space so check how much of it is forward
-        return driver.isSprinting && RideFrame.worldToYaw(input, entity.yRot).z > 0.5 && alternativeBehaviour.isActive(alternativeSettings, state.alternateBehaviourState, entity)
+        return driver.isSprinting && input.z > 0.5 && alternativeBehaviour.isActive(alternativeSettings, state.alternateBehaviourState, entity)
     }
 
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/land/HorseBehaviour.kt

@@ -22,7 +22,6 @@ import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.api.riding.util.RideFrame
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.blockPositionsAsListRounded
@@ -45,6 +44,7 @@ import net.minecraft.core.Direction
 import net.minecraft.network.FriendlyByteBuf
 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.ai.attributes.Attributes
 import net.minecraft.world.entity.player.Player
@@ -267,23 +267,12 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
     }
 
 
-    // This ride works along its yaw so its velocity gets turned into world space here
     override fun velocity(
         settings: HorseSettings,
         state: HorseState,
         vehicle: PokemonEntity,
         driver: Player,
         input: Vec3
-    ): Vec3 {
-        return RideFrame.yawToWorld(localVelocity(settings, state, vehicle, driver, input), vehicle.yRot)
-    }
-
-    private fun localVelocity(
-        settings: HorseSettings,
-        state: HorseState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
     ): Vec3 {
             state.rideVelocity.set(calculateRideSpaceVel(settings, state, vehicle, driver))
             return state.rideVelocity.get()
@@ -409,6 +398,37 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
 
     }
 
+    override fun angRollVel(
+        settings: HorseSettings,
+        state: HorseState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        deltaTime: Double
+    ): Vec3 {
+        return Vec3.ZERO
+    }
+
+    override fun rotationOnMouseXY(
+        settings: HorseSettings,
+        state: HorseState,
+        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: HorseSettings,
         state: HorseState,
@@ -455,6 +475,14 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
         return if (state.sprinting.get()) 1.15f else 1.0f
     }
 
+    override fun useAngVelSmoothing(
+        settings: HorseSettings,
+        state: HorseState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return false
+    }
+
     override fun inertia(
         settings: HorseSettings,
         state: HorseState,

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/land/MinekartBehaviour.kt

@@ -12,6 +12,7 @@ import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.MoLangMath.lerp
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.CobblemonRideSettings
+import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
@@ -24,7 +25,6 @@ import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.api.riding.util.RideFrame
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.blockPositionsAsListRounded
@@ -45,6 +45,7 @@ import kotlin.math.sign
 import net.minecraft.core.Direction
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.util.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
@@ -97,15 +98,7 @@ class MinekartBehaviour : RidingBehaviour<MinekartSettings, MinekartState> {
         vehicle: PokemonEntity,
         driver: Player
     ): Float {
-        return driver.deltaMovement.length().toFloat()
-    }
 
-    override fun driverTick(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ) {
         val boostMax = vehicle.runtime.resolveFloat(settings.boostLimit ?: globalMinekart.boostLimit!!)
         //TODO: should this be by how much turn has accumulated or simply time turning... or both?
         val boostPerSecond = 20.0f
@@ -134,6 +127,7 @@ class MinekartBehaviour : RidingBehaviour<MinekartSettings, MinekartState> {
         }
 
         inAirCheck(state, vehicle)
+        return driver.deltaMovement.length().toFloat()
     }
 
     fun inAirCheck(
@@ -203,23 +197,12 @@ class MinekartBehaviour : RidingBehaviour<MinekartSettings, MinekartState> {
 
     }
 
-    // This ride works along its yaw so its velocity gets turned into world space here
     override fun velocity(
         settings: MinekartSettings,
         state: MinekartState,
         vehicle: PokemonEntity,
         driver: Player,
         input: Vec3
-    ): Vec3 {
-        return RideFrame.yawToWorld(localVelocity(settings, state, vehicle, driver, input), vehicle.yRot)
-    }
-
-    private fun localVelocity(
-        settings: MinekartSettings,
-        state: MinekartState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
     ): Vec3 {
         state.rideVelocity.set(calculateRideSpaceVel(settings, state, vehicle, driver))
         return state.rideVelocity.get()
@@ -325,6 +308,34 @@ class MinekartBehaviour : RidingBehaviour<MinekartSettings, MinekartState> {
         return newVelocity
     }
 
+    override fun angRollVel(
+        settings: MinekartSettings,
+        state: MinekartState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        deltaTime: Double
+    ): Vec3 {
+        return Vec3.ZERO
+    }
+
+    override fun rotationOnMouseXY(
+        settings: MinekartSettings,
+        state: MinekartState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        mouseY: Double,
+        mouseX: Double,
+        mouseYSmoother: SmoothDouble,
+        mouseXSmoother: SmoothDouble,
+        sensitivity: Double,
+        deltaTime: Double
+    ): Vec3 {
+        if (driver !is OrientationControllable) return Vec3.ZERO
+
+        //Might need to add the smoothing here for default.
+        return Vec3(0.0, mouseY, mouseX)
+    }
+
     override fun canJump(
         settings: MinekartSettings,
         state: MinekartState,
@@ -376,6 +387,14 @@ class MinekartBehaviour : RidingBehaviour<MinekartSettings, MinekartState> {
         return fov
     }
 
+    override fun useAngVelSmoothing(
+        settings: MinekartSettings,
+        state: MinekartState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return false
+    }
+
     override fun inertia(settings: MinekartSettings, state: MinekartState, vehicle: PokemonEntity): Double {
         return 1.0
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/land/VehicleBehaviour.kt

@@ -12,6 +12,7 @@ import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.MoLangMath.lerp
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.CobblemonRideSettings
+import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
@@ -24,7 +25,6 @@ import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.api.riding.util.RideFrame
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.blockPositionsAsListRounded
@@ -44,6 +44,7 @@ import kotlin.math.sign
 import net.minecraft.core.Direction
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.util.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
@@ -97,15 +98,7 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
         vehicle: PokemonEntity,
         driver: Player
     ): Float {
-        return driver.deltaMovement.length().toFloat()
-    }
 
-    override fun driverTick(
-        settings: VehicleSettings,
-        state: VehicleState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ) {
         if (driver.isShiftKeyDown) {
             state.drifting.set(true)
             if(driver.zza != 0.0f) {
@@ -119,6 +112,7 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
         }
 
         inAirCheck(state, vehicle)
+        return driver.deltaMovement.length().toFloat()
     }
 
     fun inAirCheck(
@@ -178,23 +172,12 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
         return Vec2(driver.xRot, vehicle.yRot + newMomentum.toFloat())
     }
 
-    // This ride works along its yaw so its velocity gets turned into world space here
     override fun velocity(
         settings: VehicleSettings,
         state: VehicleState,
         vehicle: PokemonEntity,
         driver: Player,
         input: Vec3
-    ): Vec3 {
-        return RideFrame.yawToWorld(localVelocity(settings, state, vehicle, driver, input), vehicle.yRot)
-    }
-
-    private fun localVelocity(
-        settings: VehicleSettings,
-        state: VehicleState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
     ): Vec3 {
         state.rideVelocity.set(calculateRideSpaceVel(settings, state, vehicle, driver))
         return state.rideVelocity.get()
@@ -295,6 +278,34 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
         return newVelocity
     }
 
+    override fun angRollVel(
+        settings: VehicleSettings,
+        state: VehicleState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        deltaTime: Double
+    ): Vec3 {
+        return Vec3.ZERO
+    }
+
+    override fun rotationOnMouseXY(
+        settings: VehicleSettings,
+        state: VehicleState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        mouseY: Double,
+        mouseX: Double,
+        mouseYSmoother: SmoothDouble,
+        mouseXSmoother: SmoothDouble,
+        sensitivity: Double,
+        deltaTime: Double
+    ): Vec3 {
+        if (driver !is OrientationControllable) return Vec3.ZERO
+
+        //Might need to add the smoothing here for default.
+        return Vec3(0.0, mouseY, mouseX)
+    }
+
     override fun canJump(
         settings: VehicleSettings,
         state: VehicleState,
@@ -341,6 +352,14 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
         return 1.0f
     }
 
+    override fun useAngVelSmoothing(
+        settings: VehicleSettings,
+        state: VehicleState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return false
+    }
+
     override fun inertia(settings: VehicleSettings, state: VehicleState, vehicle: PokemonEntity): Double {
         return 1.0
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/liquid/BoatBehaviour.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.api.riding.behaviour.types.liquid
 import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.CobblemonRideSettings
+import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
@@ -22,7 +23,6 @@ import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.api.riding.util.RideFrame
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.blockPositionsAsListRounded
@@ -40,6 +40,7 @@ import kotlin.math.min
 import net.minecraft.core.BlockPos
 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
@@ -132,23 +133,12 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
         return Vec2(vehicle.xRot, vehicle.yRot + state.deltaRotation.get().toFloat())
     }
 
-    // This ride works along its yaw so its velocity gets turned into world space here
     override fun velocity(
         settings: BoatSettings,
         state: BoatState,
         vehicle: PokemonEntity,
         driver: Player,
         input: Vec3
-    ): Vec3 {
-        return RideFrame.yawToWorld(localVelocity(settings, state, vehicle, driver, input), vehicle.yRot)
-    }
-
-    private fun localVelocity(
-        settings: BoatSettings,
-        state: BoatState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
     ): Vec3 {
         applyStrafeRotation(vehicle, driver, settings, state)
 
@@ -269,6 +259,34 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
         vehicle.setYHeadRot(driver.yRot)
     }
 
+    override fun angRollVel(
+        settings: BoatSettings,
+        state: BoatState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        deltaTime: Double
+    ): Vec3 {
+        return Vec3.ZERO
+    }
+
+    override fun rotationOnMouseXY(
+        settings: BoatSettings,
+        state: BoatState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        mouseY: Double,
+        mouseX: Double,
+        mouseYSmoother: SmoothDouble,
+        mouseXSmoother: SmoothDouble,
+        sensitivity: Double,
+        deltaTime: Double
+    ): Vec3 {
+        if (driver !is OrientationControllable) return Vec3.ZERO
+
+        //Might need to add the smoothing here for default.
+        return Vec3(0.0, mouseY, mouseX)
+    }
+
     override fun canJump(
         settings: BoatSettings,
         state: BoatState,
@@ -316,6 +334,10 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
         return if (state.isVehicleSprinting.get()) sprintFov else 1.0f
     }
 
+    override fun useAngVelSmoothing(settings: BoatSettings, state: BoatState, vehicle: PokemonEntity): Boolean {
+        return false
+    }
+
     override fun inertia(settings: BoatSettings, state: BoatState, vehicle: PokemonEntity): Double {
         return 0.5
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/liquid/BurstBehaviour.kt

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.api.riding.behaviour.types.liquid
 
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.CobblemonRideSettings
+import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
@@ -21,7 +22,6 @@ import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.api.riding.util.RideFrame
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.blockPositionsAsListRounded
@@ -29,6 +29,7 @@ import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.readRidingStats
 import com.cobblemon.mod.common.util.writeRidingStats
 import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.util.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
@@ -95,23 +96,12 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
         return Vec2(driver.xRot * 0.5f, driver.yRot)
     }
 
-    // This ride works along its yaw so its velocity gets turned into world space here
     override fun velocity(
         settings: BurstSettings,
         state: BurstState,
         vehicle: PokemonEntity,
         driver: Player,
         input: Vec3
-    ): Vec3 {
-        return RideFrame.yawToWorld(localVelocity(settings, state, vehicle, driver, input), vehicle.yRot)
-    }
-
-    private fun localVelocity(
-        settings: BurstSettings,
-        state: BurstState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
     ): Vec3 {
         val f = driver.xxa * 0.05f
         var g = driver.zza * 0.6f
@@ -122,6 +112,34 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
         return Vec3(f.toDouble(), 0.0, g.toDouble())
     }
 
+    override fun angRollVel(
+        settings: BurstSettings,
+        state: BurstState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        deltaTime: Double
+    ): Vec3 {
+        return Vec3.ZERO
+    }
+
+    override fun rotationOnMouseXY(
+        settings: BurstSettings,
+        state: BurstState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        mouseY: Double,
+        mouseX: Double,
+        mouseYSmoother: SmoothDouble,
+        mouseXSmoother: SmoothDouble,
+        sensitivity: Double,
+        deltaTime: Double
+    ): Vec3 {
+        if (driver !is OrientationControllable) return Vec3.ZERO
+
+        //Might need to add the smoothing here for default.
+        return Vec3(0.0, mouseX, mouseY)
+    }
+
     override fun canJump(
         settings: BurstSettings,
         state: BurstState,
@@ -168,6 +186,10 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
         return 1.0f
     }
 
+    override fun useAngVelSmoothing(settings: BurstSettings, state: BurstState, vehicle: PokemonEntity): Boolean {
+        return false
+    }
+
     override fun inertia(settings: BurstSettings, state: BurstState, vehicle: PokemonEntity): Double {
         return 0.5
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/liquid/DolphinBehaviour.kt

@@ -16,7 +16,6 @@ import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.orientation.OrientationController
 import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.RideSteerInput
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
@@ -55,8 +54,6 @@ import org.joml.Vector3f
 
 class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
     companion object {
-        // The correction forces were tuned as degrees per tenth of a second
-        private const val CORRECTION_FORCE_TO_DEGREES_PER_SECOND = 10.0
         val KEY = cobblemonResource("liquid/dolphin")
     }
 
@@ -204,7 +201,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
             }
 
             state.lastVelocity.set(prevVel)
-            return state.lastVelocity.get()
+            return state.lastVelocity.get().yRot(vehicle.yRot.toRadians())
         } else {
             if(state.hasBreached.get()) {
                 state.clearMouseSmoothers.set(true)
@@ -241,17 +238,18 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         val worldVelVec = localVelVec.mul(orientation).toVec3d()
         state.lastVelocity.set(worldVelVec) // Set last velocity to be used during breaching
 
-        return worldVelVec
+        // Unrotate preemptively as this vector gets rotated later down the line in MC logic.
+        return worldVelVec.yRot(vehicle.yRot.toRadians())
     }
 
-    private fun rotateOverTime(
+    override fun angRollVel(
         settings: DolphinSettings,
         state: DolphinState,
         vehicle: PokemonEntity,
         driver: Player,
         deltaTime: Double
-    ) {
-        if (vehicle !is OrientationControllable) return
+    ): Vec3 {
+        if (vehicle !is OrientationControllable) return Vec3.ZERO
         val controller = (vehicle as OrientationControllable).orientationController
 
         val currSpeed = vehicle.deltaMovement.length()
@@ -269,8 +267,8 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         // Correct orientation when at low speeds
         correctOrientation(settings, state, vehicle, controller, driver, deltaTime)
 
-        val correction = deltaTime * CORRECTION_FORCE_TO_DEGREES_PER_SECOND
-        controller.rotate(0f, (state.currPitchCorrectionForce.get() * correction).toFloat(), (state.currRollCorrectionForce.get() * correction).toFloat())
+        //yaw, pitch, roll
+        return Vec3(0.0, state.currPitchCorrectionForce.get(), state.currRollCorrectionForce.get())
     }
 
     private fun correctOrientation(
@@ -356,18 +354,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         }
     }
 
-    override fun steer(
-        settings: DolphinSettings,
-        state: DolphinState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: RideSteerInput
-    ) {
-        input.rotate(mouseRotation(settings, state, vehicle, driver, input.mousePitch, input.mouseYaw, input.mouseYSmoother, input.mouseXSmoother, input.sensitivity, input.deltaTime))
-        rotateOverTime(settings, state, vehicle, driver, input.deltaTime)
-    }
-
-    private fun mouseRotation(
+    override fun rotationOnMouseXY(
         settings: DolphinSettings,
         state: DolphinState,
         vehicle: PokemonEntity,
@@ -500,6 +487,10 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         return if (state.boosting.get()) 1.2f else 1.0f
     }
 
+    override fun useAngVelSmoothing(settings: DolphinSettings, state: DolphinState, vehicle: PokemonEntity): Boolean {
+        return false
+    }
+
     override fun inertia(settings: DolphinSettings, state: DolphinState, vehicle: PokemonEntity): Double {
         return if (!vehicle.isInWater && !vehicle.isUnderWater) 1.0 else 0.1
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/liquid/SubmarineBehaviour.kt

@@ -17,16 +17,14 @@ import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.orientation.OrientationController
 import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
-import com.cobblemon.mod.common.api.riding.camera.RideLookInput
-import com.cobblemon.mod.common.api.riding.camera.RideLookTake
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.api.riding.util.RideFrame
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.math.geometry.toRadians
 import com.cobblemon.mod.common.util.readNullableExpression
 import com.cobblemon.mod.common.util.readRidingStats
 import com.cobblemon.mod.common.util.resolveBoolean
@@ -256,17 +254,29 @@ class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
          *********************************************/
         // If the driver and vehicles eyes are out of the water but the vehicle is still in it then move only horizontally or downwards as you have surfaced
         if (state.onSurface.get()) {
-            return RideFrame.yawToWorld(Vec3(currVel.x, min(0.0, currVel.y), currVel.z), vehicle.yRot)
+            val worldVelVec = Vec3(currVel.x, min(0.0, currVel.y), currVel.z)
+            return worldVelVec
         } else {
             val vertVec = Vec3(0.0, currVel.y, 0.0)
-            val horzVec = RideFrame.yawToWorld(Vec3(currVel.x, 0.0, 0.0), vehicle.yRot)
+            val horzVec = Vec3(currVel.x, 0.0, 0.0)
             val localZVelVec = Vector3f(0.0f, 0.0f, currVel.z.toFloat() * -1.0f) // Flip the z axis to make this left handed
-            val worldVelVec = localZVelVec.mul(orientation).toVec3d()
+            // Unrotate preemptively as this vector gets rotated later down the line in MC logic.
+            val worldVelVec = localZVelVec.mul(orientation).toVec3d().yRot(vehicle.yRot.toRadians())
             // Add back the horizontal and vertical components.
             return worldVelVec.add(vertVec).add(horzVec)
         }
     }
 
+    override fun angRollVel(
+        settings: SubmarineSettings,
+        state: SubmarineState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        deltaTime: Double
+    ): Vec3 {
+        return Vec3.ZERO
+    }
+
     override fun applyRenderRotation(
         settings: SubmarineSettings,
         state: SubmarineState,
@@ -313,17 +323,7 @@ class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
 
     }
 
-    override fun steer(
-        settings: SubmarineSettings,
-        state: SubmarineState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: RideSteerInput
-    ) {
-        input.rotate(mouseRotation(settings, state, vehicle, driver, input.mousePitch, input.mouseYaw, input.mouseYSmoother, input.mouseXSmoother, input.sensitivity, input.deltaTime))
-    }
-
-    private fun mouseRotation(
+    override fun rotationOnMouseXY(
         settings: SubmarineSettings,
         state: SubmarineState,
         vehicle: PokemonEntity,
@@ -432,6 +432,10 @@ class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
         return 1.0f
     }
 
+    override fun useAngVelSmoothing(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Boolean {
+        return false
+    }
+
     override fun inertia(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Double {
         return if (!vehicle.isUnderWater) 1.0 else 0.1
     }
@@ -448,10 +452,8 @@ class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
         return false
     }
 
-    // Surfaced the mouse pitch only moves the look so you can look around without nosing the sub under
-    override fun consumeLook(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity, input: RideLookInput): RideLookTake {
-        if (!state.onSurface.get()) return RideLookTake.all(input)
-        return RideLookTake(input.yawDelta, 0f, recenterYaw = true, recenterPitch = false)
+    override fun mouseModifiesDriverRotation(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Pair<Boolean, Boolean> {
+        return Pair(false, state.onSurface.get())
     }
 
     override fun shouldRotatePokemonHead(

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/camera/RideCameraContext.kt

@@ -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.api.riding.camera
-
-import com.cobblemon.mod.common.api.orientation.OrientationController.Companion.FORWARDS
-import com.cobblemon.mod.common.api.orientation.OrientationController.Companion.UP
-import net.minecraft.util.Mth
-import org.joml.Matrix3f
-import org.joml.Quaternionf
-import org.joml.Vector3f
-import kotlin.math.atan2
-
-/**
- * What a ride gets to build its camera base from each frame.
- * One lives per ride on the client so [data] can keep a ride's own camera state between frames.
- */
-class RideCameraContext {
-    companion object {
-        // Ride up this close to the view direction has no readable roll
-        private const val MIN_FLAT_LENGTH_SQ = 1.0E-6f
-
-        /** Rotation whose forward is [forward] and up is [up]. Both unit length and perpendicular */
-        @JvmStatic
-        fun frameOf(forward: Vector3f, up: Vector3f): Quaternionf {
-            val right = Vector3f(forward).cross(up)
-            return Quaternionf().setFromNormalized(Matrix3f(right, up, Vector3f(forward).negate()))
-        }
-    }
-
-    /** Ride orientation exactly as the driver sets it */
-    val rawOrientation = Quaternionf()
-    /** Spring smoothed ride orientation the model and seats are drawn with */
-    val renderOrientation = Quaternionf()
-    /** True when the local player is the one steering */
-    var isDriving = false
-        private set
-    /** Base the camera used last frame, null on the first frame of a ride */
-    var previousBase: Quaternionf? = null
-        private set
-    /** Seconds since the last frame, 0 while paused */
-    var frameSeconds = 0f
-        private set
-    var partialTicks = 0f
-        private set
-    /** Free slot for a ride to keep its own camera state in. Cleared when the ride changes */
-    var data: Any? = null
-    /** Final camera view this frame, base with the look on top */
-    val view = Quaternionf()
-
-    /** Drivers hang straight off the ride. Passengers get the smoothed one since raw packets make it jerky */
-    fun defaultBase(): Quaternionf = Quaternionf(if (isDriving) rawOrientation else renderOrientation)
-
-    internal fun update(raw: Quaternionf, render: Quaternionf, isDriving: Boolean, frameSeconds: Float, partialTicks: Float) {
-        rawOrientation.set(raw)
-        renderOrientation.set(render)
-        this.isDriving = isDriving
-        this.frameSeconds = frameSeconds
-        this.partialTicks = partialTicks
-    }
-
-    /** Degrees the ride's model is rolled from the camera around the view direction */
-    fun rideRollAroundView(): Float {
-        val forward = FORWARDS.rotate(view, Vector3f())
-        val cameraUp = UP.rotate(view, Vector3f())
-        val rideUp = UP.rotate(renderOrientation, Vector3f())
-        rideUp.sub(Vector3f(forward).mul(rideUp.dot(forward)))
-        if (rideUp.lengthSquared() < MIN_FLAT_LENGTH_SQ) return 0f
-        return atan2(Vector3f(cameraUp).cross(rideUp).dot(forward), cameraUp.dot(rideUp)) * Mth.RAD_TO_DEG
-    }
-
-    internal fun updateView(view: Quaternionf) {
-        this.view.set(view)
-    }
-
-    internal fun finishFrame(base: Quaternionf) {
-        previousBase = (previousBase ?: Quaternionf()).set(base)
-    }
-
-    internal fun reset() {
-        view.identity()
-        rawOrientation.identity()
-        renderOrientation.identity()
-        isDriving = false
-        previousBase = null
-        frameSeconds = 0f
-        partialTicks = 0f
-        data = null
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/camera/RideLookInput.kt

@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding.camera
-
-/**
- * One frame of mouse look in degrees, before the ride takes its share.
- * Angles are relative to the camera base.
- */
-data class RideLookInput(
-    /** Degrees the mouse moved the look sideways this frame */
-    val yawDelta: Float,
-    /** Degrees the mouse moved the look up or down this frame */
-    val pitchDelta: Float,
-    /** Look yaw before this frame's movement */
-    val yaw: Float,
-    /** Look pitch before this frame's movement */
-    val pitch: Float
-)

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/camera/RideLookSettings.kt

@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding.camera
-
-/**
- * How far a rider can look around the camera base and how much of the base's turning the look follows.
- */
-data class RideLookSettings(
-    /** Degrees the look can pitch either side of the camera base */
-    val maxPitch: Float = DEFAULT_MAX_PITCH,
-    /** Degrees the look can yaw either side of the camera base */
-    val maxYaw: Float = DEFAULT_MAX_YAW,
-    /** 0 to 1 share of the base's turning the look follows. 1 turns with the base and 0 holds its direction in the world */
-    val carry: Float = FULL_CARRY
-) {
-    companion object {
-        // Just short of straight up or down so yaw never goes degenerate
-        const val DEFAULT_MAX_PITCH = 89f
-        // A bit past side on so you can look over your shoulder. Raise to let riders look further back
-        const val DEFAULT_MAX_YAW = 105f
-        const val FULL_CARRY = 1f
-
-        @JvmField
-        val DEFAULT = RideLookSettings()
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/camera/RideLookTake.kt

@@ -1,31 +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.camera
-
-/**
- * The part of a frame's mouse look a ride takes to steer with, in degrees.
- * Whatever isn't taken moves the rider's look instead.
- */
-data class RideLookTake(
-    val yaw: Float,
-    val pitch: Float,
-    /** Ease the look back to centre on this axis */
-    val recenterYaw: Boolean,
-    val recenterPitch: Boolean
-) {
-    companion object {
-        /** Ride takes nothing and the look stays where it's put */
-        @JvmField
-        val NONE = RideLookTake(0f, 0f, recenterYaw = false, recenterPitch = false)
-
-        /** Ride steers with all of it and the look drifts back to centre. How rolling rides have always worked */
-        @JvmStatic
-        fun all(input: RideLookInput) = RideLookTake(input.yawDelta, input.pitchDelta, recenterYaw = true, recenterPitch = true)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/stats/RidingStat.kt

@@ -9,9 +9,12 @@
 package com.cobblemon.mod.common.api.riding.stats
 
 import com.cobblemon.mod.common.api.cooking.Flavour
+import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.util.lang
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
+import net.minecraft.tags.TagKey
+import net.minecraft.world.item.Item
 
 /**
  * A stat that is used for riding Pokémon. The exact implementation of each of these depends on the [com.cobblemon.mod.common.api.riding.controller.RideController].
@@ -20,13 +23,14 @@ import net.minecraft.network.chat.MutableComponent
  * @since February 17th, 2025
  */
 enum class RidingStat(
-    val flavour: Flavour
+    val flavour: Flavour,
+    val powerItem: TagKey<Item>
 ) {
-    ACCELERATION(Flavour.SPICY),
-    SKILL(Flavour.DRY),
-    SPEED(Flavour.SWEET),
-    STAMINA(Flavour.SOUR),
-    JUMP(Flavour.BITTER);
+    ACCELERATION(Flavour.SPICY, CobblemonItemTags.POWER_BRACER),
+    SKILL(Flavour.DRY, CobblemonItemTags.POWER_BELT),
+    SPEED(Flavour.SWEET, CobblemonItemTags.POWER_ANKLET),
+    STAMINA(Flavour.SOUR, CobblemonItemTags.POWER_WEIGHT),
+    JUMP(Flavour.BITTER, CobblemonItemTags.POWER_BAND);
 
     companion object {
         fun getByName(name: String) = RidingStat.entries.firstOrNull { it.name.equals(name, ignoreCase = true) }

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/util/BlockPrimitiveCollector.kt

@@ -9,12 +9,8 @@
 package com.cobblemon.mod.common.api.riding.util
 
 import net.minecraft.core.BlockPos
-import net.minecraft.world.entity.Entity
 import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.phys.AABB
-import net.minecraft.world.phys.shapes.BooleanOp
-import net.minecraft.world.phys.shapes.Shapes
-import net.minecraft.world.phys.shapes.VoxelShape
 import kotlin.math.floor
 
 /**
@@ -64,22 +60,3 @@ fun collectPrimitivesFromBlocks(
 
     return primitives
 }
-
-/**
- * Real collision boxes in [searchBox] as [PrimitiveShape.BOX] primitives, so slabs, stairs and fences
- * keep their actual shape. Merged first so a flat wall comes out as one box with no seams to dip the field
- */
-fun collectCollisionPrimitives(entity: Entity, searchBox: AABB): List<FieldPrimitive> {
-    var merged: VoxelShape = Shapes.empty()
-    for (shape in entity.level().getBlockCollisions(entity, searchBox)) {
-        merged = Shapes.joinUnoptimized(merged, shape, BooleanOp.OR)
-    }
-    return merged.optimize().toAabbs().map {
-        val center = it.center
-        FieldPrimitive(
-            shape = PrimitiveShape.BOX,
-            centerX = center.x.toFloat(), centerY = center.y.toFloat(), centerZ = center.z.toFloat(),
-            halfWidth = (it.xsize * 0.5).toFloat(), halfHeight = (it.ysize * 0.5).toFloat(), halfDepth = (it.zsize * 0.5).toFloat()
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/util/RideFrame.kt

@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding.util
-
-import com.cobblemon.mod.common.util.math.geometry.toRadians
-import net.minecraft.util.Mth
-import net.minecraft.world.phys.Vec3
-
-/**
- * Turns ride velocities between world space and a ride's yaw local space,
- * where x is strafe, y is up and z is forward along the ride's yaw.
- */
-object RideFrame {
-    /** Yaw local to world. Same maths PokemonEntity.travel always used so rides come out identical. */
-    @JvmStatic
-    fun yawToWorld(local: Vec3, yawDegrees: Float): Vec3 {
-        val sin = Mth.sin(yawDegrees.toRadians()).toDouble()
-        val cos = Mth.cos(yawDegrees.toRadians()).toDouble()
-        return Vec3(local.x * cos - local.z * sin, local.y, local.z * cos + local.x * sin)
-    }
-
-    /** World to yaw local. Exact inverse of [yawToWorld]. */
-    @JvmStatic
-    fun worldToYaw(world: Vec3, yawDegrees: Float): Vec3 {
-        val sin = Mth.sin(yawDegrees.toRadians()).toDouble()
-        val cos = Mth.cos(yawDegrees.toRadians()).toDouble()
-        return Vec3(world.x * cos + world.z * sin, world.y, world.z * cos - world.x * sin)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/spawner/Spawner.kt

@@ -198,7 +198,17 @@ interface Spawner {
         val mid = chunk.getBlockState(startPos)
         val above = chunk.getBlockState(abovePos)
 
-        return above.isPathfindable(PathComputationType.AIR) && mid.isAir
+        // Above must be non-solid
+        if (!above.isPathfindable(PathComputationType.AIR)) {
+            return false
+        }
+
+        // Position must be non-air
+        if (mid.isAir) {
+            return false
+        }
+
+        return true
     }
 
     fun constrainArea(area: SpawningZoneInput): SpawningZoneInput? {

common/src/main/kotlin/com/cobblemon/mod/common/block/HealingMachineBlock.kt

@@ -24,6 +24,7 @@ import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.util.RandomSource
 import net.minecraft.world.InteractionResult
+import net.minecraft.world.entity.EntityType
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.Item
@@ -31,13 +32,9 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.TooltipFlag
 import net.minecraft.world.item.context.BlockPlaceContext
 import net.minecraft.world.level.BlockGetter
+import net.minecraft.world.level.CollisionGetter
 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.*
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityTicker
 import net.minecraft.world.level.block.entity.BlockEntityType
@@ -48,9 +45,11 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty
 import net.minecraft.world.level.block.state.properties.Property
 import net.minecraft.world.level.pathfinder.PathComputationType
 import net.minecraft.world.phys.BlockHitResult
+import net.minecraft.world.phys.Vec3
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.Shapes
 import net.minecraft.world.phys.shapes.VoxelShape
+import java.util.Optional
 
 @Suppress("DEPRECATED", "OVERRIDE_DEPRECATION")
 class HealingMachineBlock(settings: Properties) : BaseEntityBlock(settings) {
@@ -79,6 +78,14 @@ class HealingMachineBlock(settings: Properties) : BaseEntityBlock(settings) {
         const val MAX_CHARGE_LEVEL = 5
         val CHARGE_LEVEL: IntegerProperty = IntegerProperty.create("charge", 0, MAX_CHARGE_LEVEL + 1)
         val NATURAL: BooleanProperty = BooleanProperty.create("natural")
+
+        fun canSetSpawn(level: Level): Boolean {
+            return level.gameRules.getBoolean(CobblemonGameRules.HEALER_SET_SPAWN)
+        }
+
+        fun findStandUpPosition(entityType: EntityType<*>, level: CollisionGetter, pos: BlockPos): Optional<Vec3> {
+            return RespawnAnchorBlock.findStandUpPosition(entityType, level, pos) // Exists if we ever want to make something more custom, but anchor block logic should suffice
+        }
     }
 
     init {
@@ -158,7 +165,12 @@ class HealingMachineBlock(settings: Properties) : BaseEntityBlock(settings) {
         }
         val party = serverPlayerEntity.party()
         val pc = serverPlayerEntity.pc()
-        val healPC = player.level().gameRules.getBoolean(CobblemonGameRules.HEALERS_HEAL_PC);
+        val healPC = player.level().gameRules.getBoolean(CobblemonGameRules.HEALERS_HEAL_PC)
+
+        // Do spawnpoint stuff
+        if (canSetSpawn(world)) {
+            player.setRespawnPosition(world.dimension(), blockPos, player.yRot, false, true)
+        }
 
         if (party.none() && (!healPC || pc.none())) {
             player.sendSystemMessage(lang("healingmachine.nopokemon").red(), true)
@@ -183,6 +195,7 @@ class HealingMachineBlock(settings: Properties) : BaseEntityBlock(settings) {
             player.sendSystemMessage(lang("healingmachine.notenoughcharge", "${((neededCharge/party.count())*100f).toInt()}%").red(), true)
         }
         party.forEach { it.tryRecallWithAnimation() }
+
         return InteractionResult.CONSUME
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/block/OrbBlock.kt

@@ -30,7 +30,7 @@ class OrbBlock(properties: Properties) : SixFaceRotationalBlock(properties) {
 
         val FLOOR_NORTH = Shapes.box(0.3125, 0.0, 0.3125, 0.6875, 0.375, 0.6875)
         val WALL_NORTH = Shapes.box(0.3125, 0.3125, 0.625, 0.6875, 0.6875, 1.0)
-        val CEILING_NORTH = Shapes.box(0.3125, 0.625, 0.375, 0.6875, 1.0, 0.6875)
+        val CEILING_NORTH = Shapes.box(0.3125, 0.625, 0.3125, 0.6875, 1.0, 0.6875)
     }
 
     init {

common/src/main/kotlin/com/cobblemon/mod/common/block/TypeGemClusterBlock.kt

@@ -160,8 +160,8 @@ class TypeGemClusterBlock(
             && state.getValue(STAGE) == 3) return false
 
         val supportPos = pos.relative(state.getValue(FACING).opposite)
-        val supportBlock = level.getBlockState(supportPos).block
-        return CobblemonBlocks.typeGemBlocks().containsValue(supportBlock) || (supportBlock == CobblemonBlocks.TYPE_GEM_CORE) // Cannot grow if not on any gem blocks
+        val supportState = level.getBlockState(supportPos)
+        return supportState.`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS) || supportState.block == CobblemonBlocks.TYPE_GEM_CORE // Cannot grow if not on any gem blocks
     }
 
 

common/src/main/kotlin/com/cobblemon/mod/common/block/TypeGemCoreBlock.kt

@@ -51,10 +51,20 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
                 ResourceLocation.parse("cobblemon:dragon_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_DRAGON,
                 ResourceLocation.parse("cobblemon:dark_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_DARK,
                 ResourceLocation.parse("cobblemon:steel_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_STEEL,
-                ResourceLocation.parse("cobblemon:fairy_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY
+                ResourceLocation.parse("cobblemon:fairy_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY,
+                ResourceLocation.parse("minecraft:amethyst_block") to Blocks.SMALL_AMETHYST_BUD
             )
         }
 
+        val AMETHYST_STAGES = listOf(
+            Blocks.SMALL_AMETHYST_BUD,
+            Blocks.MEDIUM_AMETHYST_BUD,
+            Blocks.LARGE_AMETHYST_BUD,
+            Blocks.AMETHYST_CLUSTER
+        )
+
+        private fun isAmethystStage(block: Block) = block in AMETHYST_STAGES
+
         fun getConnectedGemBlocks(level: BlockGetter, pos: BlockPos): List<Pair<BlockState, BlockPos>> {
             val connectedGems = mutableListOf<Pair<BlockState, BlockPos>>()
             val visited = mutableSetOf<BlockPos>()
@@ -85,12 +95,16 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
             Direction.entries.forEach {
                 if (random.nextFloat() < Cobblemon.config.typeGemGrowthChance) {
                     val faceState = level.getBlockState(pos.relative(it))
-                    val randomGrowthType = decideClusterGrowthType(level, pos)
-                    val newState = BLOCK_TO_CLUSTER[BuiltInRegistries.BLOCK.getKey(state.block)]?.defaultBlockState()
+                    var newState = BLOCK_TO_CLUSTER[BuiltInRegistries.BLOCK.getKey(state.block)]?.defaultBlockState()
                         ?.setValue(DirectionalBlock.FACING, it)
-                        ?.setValue(GROWTH_TYPE, randomGrowthType)
                         ?: return
 
+                    if (newState.hasProperty(GROWTH_TYPE)) {
+                        newState = newState.setValue(GROWTH_TYPE, decideClusterGrowthType(level, pos))
+                    } else if (getConnectedGemBlocks(level, pos).size > Cobblemon.config.typeGemMaxConnected) {
+                        return@forEach
+                    }
+
                     if (faceState.`is`(Blocks.AIR)) {
                         level.setBlock(pos.relative(it), newState, 3)
                     }
@@ -132,7 +146,7 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
                 if (!visited.add(clusterPos)) continue
 
                 val clusterState = level.getBlockState(clusterPos)
-                if (clusterState.block == expectedCluster) {
+                if (clusterState.block == expectedCluster && clusterState.hasProperty(GROWTH_TYPE)) {
                     clusters += clusterState to clusterPos
                 }
             }
@@ -178,13 +192,41 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
         Direction.entries.forEach { direction ->
             val relativePos = pos.relative(direction)
             val relativeState = level.getBlockState(relativePos)
-            val clusterBlock = relativeState.block as? TypeGemClusterBlock ?: return@forEach
-
-            if ((relativeState.getValue(DirectionalBlock.FACING) == direction &&
-                random.nextFloat() < Cobblemon.config.typeGemGrowthChance) || forceGrow
-                ) {
-                clusterBlock.advanceGrowth(relativeState, level, relativePos, random)
+            val matchesFace = relativeState.hasProperty(DirectionalBlock.FACING)
+                    && relativeState.getValue(DirectionalBlock.FACING) == direction
+            if (!(forceGrow || (matchesFace && random.nextFloat() < Cobblemon.config.typeGemGrowthChance))) {
+                return@forEach
             }
+
+            val block = relativeState.block
+            if (block is TypeGemClusterBlock) {
+                block.advanceGrowth(relativeState, level, relativePos, random)
+            } else if (isAmethystStage(block)) {
+                advanceAmethyst(relativeState, level, relativePos)
+            }
+        }
+    }
+
+    private fun advanceAmethyst(state: BlockState, level: LevelAccessor, pos: BlockPos) {
+        val facing = state.getValue(DirectionalBlock.FACING)
+        val supportState = level.getBlockState(pos.relative(facing.opposite))
+        if (!supportState.`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS) && supportState.block != CobblemonBlocks.TYPE_GEM_CORE) {
+            return
+        }
+
+        if (state.block != Blocks.AMETHYST_CLUSTER) {
+            val nextStage = AMETHYST_STAGES[AMETHYST_STAGES.indexOf(state.block) + 1]
+            level.setBlock(pos, nextStage.defaultBlockState().setValue(DirectionalBlock.FACING, facing), 3)
+            return
+        }
+
+        // Fully grown clusters mature into amethyst blocks unless boxed in, mirroring stunted type gems
+        val boxedIn = Direction.entries.any { direction ->
+            direction != facing.opposite
+                    && level.getBlockState(pos.relative(direction)).`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS)
+        }
+        if (!boxedIn) {
+            level.setBlock(pos, Blocks.AMETHYST_BLOCK.defaultBlockState(), 3)
         }
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/RidingCameraInterface.kt

@@ -0,0 +1,50 @@
+/*
+ * 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 org.joml.Quaternionf
+import org.spongepowered.asm.mixin.Unique
+
+interface RidingCameraInterface {
+    // Used to help in camera rotation rendering when transitioning
+    // from rolled to unrolled.
+    @Unique
+    fun `getCobblemon$returnTimer`(): Float
+
+    @Unique
+    fun `setCobblemon$returnTimer`(time: Float)
+
+    @Unique
+    fun `getCobblemon$lastHandledRotationTime`(): Double
+
+    @Unique
+    fun `setCobblemon$lastHandledRotationTime`(time: Double)
+
+    @Unique
+    fun `getCobblemon$frameTime`(): Double
+
+    @Unique
+    fun `setCobblemon$frameTime`(time: Double)
+
+    @Unique
+    fun `getCobblemon$partialTickTime`(): Float
+
+    @Unique
+    fun `setCobblemon$partialTickTime`(time: Float)
+
+    @Unique
+    fun `getCobblemon$rollAngleStart`(): Float
+
+    @Unique
+    fun `setCobblemon$rollAngleStart`(angle: Float)
+
+    fun `getCobblemon$smoothRotation`(): Quaternionf?
+
+    fun `setCobblemon$smoothRotation`(smoothRotation: Quaternionf)
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/RideControlsOverlay.kt

@@ -182,7 +182,6 @@ class RideControlsOverlay : Gui(Minecraft.getInstance()) {
                     showHorizontalMouse = false
                 }
                 VehicleBehaviour.KEY -> {}
-                BoardBehaviour.KEY -> {}
             }
 
             val centerX = minecraft.window.guiScaledWidth / 2

common/src/main/kotlin/com/cobblemon/mod/common/client/net/orientation/ClientboundUpdateOrientationHandler.kt

@@ -10,8 +10,10 @@ package com.cobblemon.mod.common.client.net.orientation
 
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler
+import com.cobblemon.mod.common.duck.RidePassenger
 import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateOrientationPacket
 import net.minecraft.client.Minecraft
+import net.minecraft.util.Mth
 
 object ClientboundUpdateOrientationHandler : ClientNetworkPacketHandler<ClientboundUpdateOrientationPacket> {
     override fun handle(packet: ClientboundUpdateOrientationPacket, client: Minecraft) {
@@ -24,7 +26,21 @@ object ClientboundUpdateOrientationHandler : ClientNetworkPacketHandler<Clientbo
         // of truth on vehicle orientation updates.
         if (vehicle.controllingPassenger != player) {
             packet.active?.let { shouldUseCustomOrientation ->
-                // Passenger look angles get seeded by the camera on its first rolling frame
+
+                val playerIsPassenger = vehicle.passengers.contains(player)
+
+                // If the player has just switched to riding a custom orientation ride then set their
+                // ride x and y rots local to the vehicle rots(if the controller wasn't active and will now be active)
+                // This ensures that on transition your camera stays in the same spot
+                if (!vehicleController.isActive() && shouldUseCustomOrientation && playerIsPassenger) {
+                    // Set local to the vehicle x and yrot
+                    val playerRotater = player as RidePassenger?
+                    if (playerRotater != null) {
+                        playerRotater.`cobblemon$setRideXRot`(Mth.wrapDegrees(player.getXRot() - vehicle.getXRot()))
+                        playerRotater.`cobblemon$setRideYRot`(Mth.wrapDegrees(player.getYRot() - vehicle.getYRot()))
+                    }
+                }
+
                 vehicle.orientationController.active = shouldUseCustomOrientation
             }
             vehicle.orientationController.updateOrientation { _ -> packet.orientation }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/camera/MountedCameraRenderer.kt

@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.api.orientation.OrientationController
 import com.cobblemon.mod.common.api.orientation.OrientationController.Companion.FORWARDS
 import com.cobblemon.mod.common.api.orientation.OrientationController.Companion.LEFT
 import com.cobblemon.mod.common.api.orientation.OrientationController.Companion.UP
-import com.cobblemon.mod.common.api.riding.camera.RideLookSettings
 import com.cobblemon.mod.common.client.MountedPokemonAnimationRenderController
 import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
 import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
@@ -31,45 +30,23 @@ import net.minecraft.client.Minecraft
 import net.minecraft.util.Mth
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.level.ClipContext
-import net.minecraft.world.phys.AABB
 import net.minecraft.world.phys.HitResult
 import net.minecraft.world.phys.Vec3
 import org.joml.Matrix3f
 import org.joml.Quaternionf
 import org.joml.Vector3d
 import org.joml.Vector3f
-import kotlin.math.asin
-import kotlin.math.atan2
-import kotlin.math.ceil
-import kotlin.math.abs
-import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.sign
 import kotlin.math.sqrt
 
 object MountedCameraRenderer {
-    private const val MIN_OFFSET_LENGTH = 1.0E-6
-    // Below this the forward vector is pointing almost straight up or down so it has no usable yaw
-    private const val MIN_HORIZONTAL_LENGTH_SQ = 1.0E-6f
-    // Entity.turn clamps pitch to this
-    private const val VANILLA_MAX_PITCH = 90f
-    // Camera.getMaxZoom checks this far either side on each axis, so it reads a wall as hit if it starts closer than this
-    private const val VANILLA_CAMERA_PROBE = 0.1
-    // Extra gap past vanilla's probe the camera keeps from walls. Raise if the view still starts inside blocks
-    private const val CAMERA_WALL_CLEARANCE = 0.02
-    // Longest step of the camera sweep. Lower follows the straight line more closely round corners but costs more
-    private const val CAMERA_SWEEP_STEP = 0.25
-
+    private var returnTimer: Float = 0f
     private var lastHandledRotationTime: Double = Double.MIN_VALUE
     private var frameTime: Double = 0.0
+    private var rollAngleStart: Float = 0f
 
-    private val state = RideCameraState()
-
-    /** Drops all per ride camera state. Called whenever the camera isn't on a ride. */
-    fun reset() = state.reset()
-
-    /** Degrees to roll the first person hands this frame */
-    fun getHandRoll(): Float = state.handRoll
+    var smoothRotation: Quaternionf? = null
 
     fun getCameraPosition(
         instance: Camera,
@@ -102,7 +79,7 @@ object MountedCameraRenderer {
         val locator = delegate.locatorStates[locatorName] ?: return null
 
         // Get additional offset from poser and add to the eyeHeight offset
-        val currEyeHeight: Double = Mth.lerp(instance.partialTickTime.toDouble(), eyeHeightOld, eyeHeight)
+        val currEyeHeight: Double = Mth.lerp(instance.partialTickTime.toDouble(), eyeHeight, eyeHeightOld)
         var offset = Vec3(0.0, currEyeHeight - (driver.bbHeight / 2), 0.0)
         var eyeOffset = Vec3(0.0, currEyeHeight - (driver.bbHeight / 2), 0.0)
 
@@ -148,44 +125,24 @@ object MountedCameraRenderer {
             pivot.add(entityPos.toVector3f())
         } */
 
+        val offsetDistance = offset.length()
+        val offsetDirection = offset.scale(1 / offsetDistance)
+
         val eyeOffsetDistance = eyeOffset.length()
-        val eyeOffsetDirection = safeDirection(eyeOffset, eyeOffsetDistance)
+        val eyeOffsetDirection = eyeOffset.scale(1 / eyeOffsetDistance)
 
         // Use getMaxZoom to calculate clipping
+        val maxZoom: Double = getMaxZoom(offsetDistance, offsetDirection, pos, instance)
         val eyeMaxZoom: Double = getMaxZoom(eyeOffsetDistance, eyeOffsetDirection, eyePos, instance)
 
         val playerRotater = driver as RidePassenger
         playerRotater.`cobblemon$setRideEyePos`(eyeOffsetDirection.scale(eyeMaxZoom).add(eyePos))
-        // The seat can swing into a wall round corners so clipping from it isn't safe. Come out from the hitbox instead
-        return sweepFromBody(vehicle, entityPos, offset.add(pos))
-    }
-
-    /**
-     * Slides a small box from the middle of the ride's hitbox out to [target] and returns where it ends up.
-     * The hitbox never sits in blocks so this never starts inside a wall, and the box keeps vanilla's
-     * zoom clipping from starting inside one either
-     */
-    private fun sweepFromBody(vehicle: Entity, lerpedPos: Vec3, target: Vec3): Vec3 {
-        val level = vehicle.level()
-        val halfSize = VANILLA_CAMERA_PROBE + CAMERA_WALL_CLEARANCE
-        var start = lerpedPos.add(0.0, vehicle.bbHeight * 0.5, 0.0)
-        // Lerping between ticks can cut across a corner the ride went round, so fall back to where it really is
-        if (level.getBlockCollisions(null, AABB(start, start).inflate(halfSize)).any()) start = vehicle.boundingBox.center
-        var box = AABB(start, start).inflate(halfSize)
-        val path = target.subtract(start)
-        // Small steps so it slides along the straight line instead of going one axis at a time
-        val steps = max(1, ceil(path.length() / CAMERA_SWEEP_STEP).toInt())
-        val step = path.scale(1.0 / steps)
-        repeat(steps) {
-            box = box.move(Entity.collideBoundingBox(null, step, box, level, emptyList()))
-        }
-        return box.center
+        return offsetDirection.scale(maxZoom).add(pos)
     }
 
     // Return value is false if the vanilla camera rotations should be applied.
     fun setRotation(instance: Camera): Boolean {
         val cameraDuck = instance as CameraDuck
-        state.handRoll = 0f
 
         // Calculate the current frametime
         val d = Blaze3D.getTime()
@@ -195,7 +152,6 @@ object MountedCameraRenderer {
         // Don't assume the camera to be attached to an entity. Ponder Scenes from create et.al. for example aren't.
         val vehicle: Entity? = cameraDuck.`cobblemon$getEntity`()?.vehicle ?: return false
         if (vehicle !is OrientationControllable) return false
-        state.bindTo(vehicle.id)
 
         // If the current vehicle has no orientation then return and perform
         // vanilla camera rotations
@@ -205,12 +161,11 @@ object MountedCameraRenderer {
         // If the controller has been deactivated but the orientation isn't null yet
         // then perform transition from rolled ride/camera to vanilla
         if (!vehicleController.isActive() && vehicleController.orientation != null) {
-            state.lookSeeded = false
             return applyTransitionRotation(vehicleController, instance)
         } else { // Otherwise perform cobblemon specific camera rotation and set transition helper variables
             applyCameraRotation(instance)
-            state.returnTimer = 0f
-            state.rollAngleStart = instance.rotation().getEulerAnglesYXZ(Vector3f()).z()
+            returnTimer = 0f
+            rollAngleStart = instance.rotation().getEulerAnglesYXZ(Vector3f()).z()
             return true
         }
     }
@@ -227,31 +182,25 @@ object MountedCameraRenderer {
         val vehicleController: OrientationController = controllableVehicle.getOrientationController()
 
         val isDriving = driver.controlledVehicle != null
-        val ride = vehicle as? PokemonEntity
 
-        val context = state.context
-        context.update(
-            vehicleController.orientation!!.normal(Matrix3f()).getNormalizedRotation(Quaternionf()),
-            vehicleController.getRenderOrientation(instance.partialTickTime),
-            isDriving,
-            if (Minecraft.getInstance().isPaused) 0f else frameTime.toFloat(),
-            instance.partialTickTime
-        )
-        // The ride picks what the camera hangs off. disableRoll still gets the last word below since it's the player's setting
-        var newRotation = ride?.let { pokemon ->
-            pokemon.ifRidingAvailableSupply<Quaternionf?>(null) { behaviour, settings, rideState ->
-                behaviour.cameraBase(settings, rideState, pokemon, context)
-            }
-        } ?: context.defaultBase()
+
+        // Grab the ride orientation
+        // If the player is driving then use the current orientation since the driver sets it.
+        // If not then use the smoothed render orientation for passengers otherwise the vehicle rotation will be jerky
+        var newRotation = if (isDriving) {
+             vehicleController.orientation!!.normal(Matrix3f()).getNormalizedRotation(Quaternionf())
+        } else {
+            vehicleController.getRenderOrientation(instance.partialTickTime)
+        }
 
         // Unroll the current rotation if no roll is requested and not currently freelooking
         if (Cobblemon.config.disableRoll) {
             // Init the smooth rotation if it has not been set yet.
-            if (state.smoothRotation == null) {
-                state.smoothRotation = Quaternionf().set(instance.rotation())
+            if (smoothRotation == null) {
+                smoothRotation = Quaternionf().set(instance.rotation())
             }
             val rideAngs = newRotation.getEulerAnglesYXZ(Vector3f())
-            val cameraAngs = state.smoothRotation!!.getEulerAnglesYXZ(Vector3f())
+            val cameraAngs = smoothRotation!!.getEulerAnglesYXZ(Vector3f())
 
             val degDiff = Mth.degreesDifference(
                 Math.toDegrees(cameraAngs.y().toDouble()).toFloat(),
@@ -288,114 +237,37 @@ object MountedCameraRenderer {
 
             // Set rotations
             val smoothedRot = Quaternionf().rotateYXZ(newYaw.toFloat(), newPitch.toFloat(), newRoll)
-            state.smoothRotation?.set(smoothedRot)
+            smoothRotation?.set(smoothedRot)
             newRotation.set(smoothedRot)
 
         }
 
-        // newRotation is the camera base from here on
-        val playerRotater = driver as RidePassenger
-        // First frame on a roll ride so carry over wherever the player was already looking
-        if (!state.lookSeeded) {
-            seedLook(driver, playerRotater, newRotation)
-            state.lookSeeded = true
-        } else {
-            val lookSettings = ride?.let { pokemon ->
-                pokemon.ifRidingAvailableSupply(RideLookSettings.DEFAULT) { behaviour, settings, rideState ->
-                    behaviour.lookSettings(settings, rideState, pokemon)
-                }
-            } ?: RideLookSettings.DEFAULT
-            val previousBase = context.previousBase
-            // Full carry is exactly what the look angles already do so skip the work
-            if (lookSettings.carry < RideLookSettings.FULL_CARRY && previousBase != null) {
-                val oldYaw = playerRotater.`cobblemon$getRideYRot`()
-                val oldPitch = playerRotater.`cobblemon$getRideXRot`()
-                carryLook(playerRotater, previousBase, newRotation, lookSettings.carry)
-                // The base turning drags the look along at its limits but never pushes it further out than it was
-                playerRotater.`cobblemon$setRideYRot`(clampOutward(playerRotater.`cobblemon$getRideYRot`(), oldYaw, lookSettings.maxYaw))
-                playerRotater.`cobblemon$setRideXRot`(clampOutward(playerRotater.`cobblemon$getRideXRot`(), oldPitch, lookSettings.maxPitch))
-            }
+        var rotationOffset = 0
+        if (Minecraft.getInstance().options.cameraType.isMirrored) {
+            newRotation.rotateY(Math.toRadians(180.0).toFloat())
+            rotationOffset = 180
         }
-        context.finishFrame(newRotation)
 
-        // Look sits on top of the base. Built straight as a quaternion so nothing round trips through euler angles
-        val view = Quaternionf(newRotation).mul(lookRotation(playerRotater)).normalize()
 
-        // Mirroring only flips the camera so the player still aims where they look
-        val cameraRotation = if (Minecraft.getInstance().options.cameraType.isMirrored) Quaternionf(view).rotateY(Mth.PI) else view
-        setCameraRotations(cameraRotation, instance, cameraDuck)
-        lookAlong(driver, view)
-
-        // Third person shows the player model which already leans with the ride
-        context.updateView(view)
-        if (Minecraft.getInstance().options.cameraType.isFirstPerson) {
-            state.handRoll = ride?.let { pokemon ->
-                pokemon.ifRidingAvailableSupply(0f) { behaviour, settings, rideState ->
-                    behaviour.firstPersonHandRoll(settings, rideState, pokemon, context)
-                }
-            } ?: 0f
+        // Get the drivers local look angle in relation to the ride and apply it.
+        if (vehicleController.active) {
+            val vehicleMatrix = Matrix3f().set(newRotation)
+            val driverMatrix = Matrix3f() // Base the driver
+            val playerRotater = driver as RidePassenger
+            newRotation = vehicleMatrix.mul(
+                driverMatrix.rotateYXZ(
+                    -Mth.DEG_TO_RAD * (playerRotater.`cobblemon$getRideYRot`()),
+                    -Mth.DEG_TO_RAD * playerRotater.`cobblemon$getRideXRot`(),
+                    0.0f
+                )
+            ).normal(Matrix3f()).getNormalizedRotation(Quaternionf())
         }
-    }
+        val eulerAngs = newRotation.getEulerAnglesYXZ(Vector3f())
+        setCameraRotations(newRotation, instance, cameraDuck)
 
-    /** Sets ride look angles so the view keeps pointing where [player] already looks once [base] takes over. */
-    private fun seedLook(player: Entity, rotater: RidePassenger, base: Quaternionf) {
-        val local = Quaternionf(base).invert().transform(player.calculateViewVector(player.xRot, player.yRot).toVector3f())
-        setLookFromLocal(rotater, local)
-    }
-
-    /**
-     * Turns the look by only [carry] of how far the base turned since last frame.
-     * Whatever the look doesn't follow ends up as a change in the look angles instead.
-     */
-    private fun carryLook(rotater: RidePassenger, previousBase: Quaternionf, base: Quaternionf, carry: Float) {
-        val worldLook = Quaternionf(previousBase).mul(lookRotation(rotater))
-        val baseDelta = Quaternionf(base).mul(Quaternionf(previousBase).invert())
-        Quaternionf().slerp(baseDelta, carry).mul(worldLook, worldLook)
-        val local = Quaternionf(base).invert().transform(FORWARDS.rotate(worldLook, Vector3f()))
-        setLookFromLocal(rotater, local)
-    }
-
-    /** Keeps [angle] within [limit] either side, or within [previous] if that was already further out */
-    private fun clampOutward(angle: Float, previous: Float, limit: Float): Float {
-        val bound = max(limit, abs(previous))
-        return angle.coerceIn(-bound, bound)
-    }
-
-    /** Look as a rotation relative to the base. */
-    private fun lookRotation(rotater: RidePassenger): Quaternionf = Quaternionf().rotationYXZ(
-        -Mth.DEG_TO_RAD * rotater.`cobblemon$getRideYRot`(),
-        -Mth.DEG_TO_RAD * rotater.`cobblemon$getRideXRot`(),
-        0.0f
-    )
-
-    /** Look angles that point along [local], a direction in the base's frame. Inverse of [lookRotation]. */
-    private fun setLookFromLocal(rotater: RidePassenger, local: Vector3f) {
-        rotater.`cobblemon$setRideXRot`(-asin(local.y.coerceIn(-1f, 1f)) * Mth.RAD_TO_DEG)
-        rotater.`cobblemon$setRideYRot`(atan2(local.x, -local.z) * Mth.RAD_TO_DEG)
-    }
-
-    /**
-     * Points [player] along [view] so picking, bows and other clients follow the camera.
-     * Yaw stays continuous so partial tick lerps never sweep through a 360 wrap.
-     */
-    private fun lookAlong(player: Entity, view: Quaternionf) {
-        val forward = FORWARDS.rotate(view, Vector3f())
-        val pitch = pitchOf(forward)
-        val yaw = player.yRot + Mth.wrapDegrees(yawOf(forward, player.yRot) - player.yRot)
-        // Shift the old values by the same amount like vanilla turn does so the lerped view vector doesn't trail a tick behind
-        player.xRotO = Mth.clamp(player.xRotO + pitch - player.xRot, -VANILLA_MAX_PITCH, VANILLA_MAX_PITCH)
-        player.yRotO += yaw - player.yRot
-        player.xRot = pitch
-        player.yRot = yaw
-    }
-
-    /** Vanilla style pitch in degrees for a forward vector. */
-    private fun pitchOf(forward: Vector3f): Float = -asin(forward.y.coerceIn(-1f, 1f)) * Mth.RAD_TO_DEG
-
-    /** Vanilla style yaw in degrees for a forward vector, or [fallback] when looking straight up or down. */
-    private fun yawOf(forward: Vector3f, fallback: Float): Float {
-        if (forward.x * forward.x + forward.z * forward.z < MIN_HORIZONTAL_LENGTH_SQ) return fallback
-        return atan2(-forward.x, forward.z) * Mth.RAD_TO_DEG
+        // Set the drivers rotations to match
+        driver.xRot = -eulerAngs.x() * Mth.RAD_TO_DEG + rotationOffset
+        driver.yRot = 180.0f - (eulerAngs.y() * Mth.RAD_TO_DEG)
     }
 
     private fun applyTransitionRotation(
@@ -405,14 +277,14 @@ object MountedCameraRenderer {
         val cameraDuck = instance as CameraDuck
         val entity = cameraDuck.`cobblemon$getEntity`()!!
         // If the transition has just started then
-        if (state.returnTimer == 0f) {
+        if (returnTimer == 0f) {
             resetDriverRotations(instance, entity)
         }
 
-        if (state.returnTimer < 1f) {
+        if (returnTimer < 1f) {
             // Rotation is taken from entity since we no longer handle mouse ourselves
             // Stops a period of time when you can't input anything.
-            val interpolatedRoll = Mth.lerp(state.returnTimer, state.rollAngleStart, 0.0f)
+            val interpolatedRoll = Mth.lerp(returnTimer, rollAngleStart, 0.0f)
             val pitch = Math.toRadians(-entity.xRot.toDouble()).toFloat()
             val yaw = Math.toRadians((180 - entity.yRot).toDouble()).toFloat()
 
@@ -421,16 +293,16 @@ object MountedCameraRenderer {
 
             setCameraRotations(interRot, instance, cameraDuck)
 
-            if (state.rollAngleStart == 0f) {
-                state.rollAngleStart = 1f
+            if (rollAngleStart == 0f) {
+                rollAngleStart = 1f
                 vehicleController.reset()
                 resetDriverRotations(instance, entity)
                 return false
             }
-            state.returnTimer += instance.partialTickTime * (1.0f / 20.0f)
+            returnTimer += instance.partialTickTime * (1.0f / 20.0f)
             return true
         } else {
-            state.returnTimer = 1f
+            returnTimer = 1f
             vehicleController.reset()
             resetDriverRotations(instance, entity)
             return false
@@ -457,7 +329,7 @@ object MountedCameraRenderer {
         val offset = if (thirdPersonReverse && cameraOffsets.containsKey(locatorName + "_reverse")) {
             cameraOffsets[locatorName + "_reverse"]!!
         } else if (thirdPersonReverse && cameraOffsets.containsKey("seat_default_reverse")) {
-            cameraOffsets["seat_default_reverse"]!!
+            cameraOffsets[locatorName + "seat_default_reverse"]!!
         } else if (cameraOffsets.containsKey(locatorName)) {
             cameraOffsets[locatorName]!!
         } else if (cameraOffsets.containsKey("seat_default")) {
@@ -482,10 +354,6 @@ object MountedCameraRenderer {
     }
 
 
-    /** Unit direction of [offset], or zero when it's too short to have one (avoids NaN from 0 / 0). */
-    private fun safeDirection(offset: Vec3, length: Double): Vec3 =
-        if (length > MIN_OFFSET_LENGTH) offset.scale(1 / length) else Vec3.ZERO
-
     private fun getMaxZoom(maxZoom: Double, directionVector: Vec3, positionVector: Vec3, instance: Camera): Double {
         var maxZoom = maxZoom
         for (i in 0 .. 7) {
@@ -516,14 +384,14 @@ object MountedCameraRenderer {
     }
 
     private fun setCameraRotations(rotation: Quaternionf, instance: Camera, duck: CameraDuck) {
-        val cameraRotation = instance.rotation().set(rotation).normalize()
-        FORWARDS.rotate(cameraRotation, duck.`cobblemon$getForwards`())
-        UP.rotate(cameraRotation, duck.`cobblemon$getUp`())
-        LEFT.rotate(cameraRotation, duck.`cobblemon$getLeft`())
+        val eulerAngs = rotation.getEulerAnglesYXZ(Vector3f())
+        val cameraRotation = instance.rotation()
+        cameraRotation.rotationYXZ(eulerAngs.y, eulerAngs.x, eulerAngs.z)
+        duck.`cobblemon$setXRot`(eulerAngs.x() * Mth.RAD_TO_DEG)
+        duck.`cobblemon$setYRot`(eulerAngs.y() * Mth.RAD_TO_DEG)
 
-        // Same yaw and pitch convention vanilla setRotation stores since vanilla reads these back
-        val forward = duck.`cobblemon$getForwards`()
-        duck.`cobblemon$setXRot`(pitchOf(forward))
-        duck.`cobblemon$setYRot`(yawOf(forward, duck.`cobblemon$getYRot`()))
+        FORWARDS.rotate(rotation, duck.`cobblemon$getForwards`())
+        UP.rotate(rotation, duck.`cobblemon$getUp`())
+        LEFT.rotate(cameraRotation, duck.`cobblemon$getLeft`())
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/camera/RideCameraState.kt

@@ -1,55 +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.camera
-
-import com.cobblemon.mod.common.api.riding.camera.RideCameraContext
-import org.joml.Quaternionf
-
-/**
- * Camera state for the ride the local player is on.
- * Tied to one vehicle so nothing leaks from one ride into the next.
- */
-class RideCameraState {
-    companion object {
-        private const val NO_VEHICLE = -1
-    }
-
-    var vehicleId: Int = NO_VEHICLE
-        private set
-
-    // 0 to 1 progress of the roll going back to level once a roll ride turns off
-    var returnTimer: Float = 0f
-    // Camera roll at the start of that transition
-    var rollAngleStart: Float = 0f
-    // Smoothed rotation the disableRoll camera eases with
-    var smoothRotation: Quaternionf? = null
-    // False until the look has been rebuilt from the player's real look for this stretch of rolling
-    var lookSeeded: Boolean = false
-    // Degrees the first person hands are rolled this frame
-    var handRoll: Float = 0f
-    // Handed to the ride's camera hooks every frame
-    val context = RideCameraContext()
-
-    /** Starts fresh if [vehicleId] isn't the vehicle this state was built for. */
-    fun bindTo(vehicleId: Int) {
-        if (this.vehicleId == vehicleId) return
-        reset()
-        this.vehicleId = vehicleId
-    }
-
-    fun reset() {
-        vehicleId = NO_VEHICLE
-        returnTimer = 0f
-        rollAngleStart = 0f
-        smoothRotation = null
-        lookSeeded = false
-        handRoll = 0f
-        context.reset()
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PosableModel.kt

@@ -770,13 +770,8 @@ open class PosableModel(@Transient override val rootPart: Bone) : ModelFrame {
                 val controller = entity.orientationController
                 val transformationMatrix = Matrix4f()
                 val center = Vector3f(0f, entity.bbHeight/2, 0f)
-                val orientation = controller.getRenderOrientation(state.getPartialTicks())
-                // Same shift the renderer gives the model so seats stay on it
-                transformationMatrix.translate(entity.ifRidingAvailableSupply(fallback = Vector3f()) { behaviour, settings, rideState ->
-                    behaviour.renderOffset(settings, rideState, entity, orientation)
-                })
                 transformationMatrix.translate(center)
-                transformationMatrix.rotate(orientation)
+                transformationMatrix.rotate(controller.getRenderOrientation(state.getPartialTicks()))
                 transformationMatrix.translate(center.negate())
                 matrixStack.mulPose(transformationMatrix)
             } else {

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/DusclopsModel.kt

@@ -34,7 +34,7 @@ class DusclopsModel (root: ModelPart) : PokemonPosableModel(root) {
     lateinit var battleidle: Pose
 
     override fun registerPoses() {
-        animations["cry"] = "q.bedrock_stateful('squirtle', 'cry')".asExpressionLike()
+        animations["cry"] = "q.bedrock_stateful('dusclops', 'cry')".asExpressionLike()
 
         val blink = quirk { bedrockStateful("dusclops", "blink") }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/render/player/MountedPlayerRenderer.kt

@@ -19,16 +19,9 @@ import net.minecraft.client.model.AnimationUtils
 import net.minecraft.client.model.HumanoidModel
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.client.player.AbstractClientPlayer
-import net.minecraft.util.Mth
 import net.minecraft.world.InteractionHand
 import net.minecraft.world.entity.HumanoidArm
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
-import org.joml.Quaternionf
-import org.joml.Vector3f
-import kotlin.math.atan2
-import kotlin.math.hypot
 
 /**
  * @author landonjw
@@ -37,9 +30,6 @@ object MountedPlayerRenderer {
     @JvmField
     var shouldApplyRootAnimation = false
 
-    // Furthest a passenger's head turns from its body either way. From LivingEntityRenderer.render
-    private const val VANILLA_PASSENGER_HEAD_YAW_LIMIT = 85f
-
     @JvmField
     val relevantPartsByName = mutableMapOf(
         "body" to ModelPart(emptyList(), emptyMap()),
@@ -150,28 +140,6 @@ object MountedPlayerRenderer {
         model.hat.copyFrom(model.head)
     }
 
-    /**
-     * Rider head yaw and pitch in degrees like vanilla hands them to setupAnim, but measured against the seat
-     * the body is drawn on instead of world yaw. Null if the rider has no seat locator
-     */
-    @JvmStatic
-    fun riderHeadAngles(pokemon: PokemonEntity, rider: LivingEntity, partialTicks: Float): Vec2? {
-        val delegate = pokemon.delegate as? PokemonClientDelegate ?: return null
-        val locator = delegate.getSeatLocator(rider)?.let { delegate.locatorStates[it] } ?: return null
-        // MountedLivingEntityRenderer cancels the body yaw so the seat's rotation is the whole body frame
-        val seat = locator.matrix.getNormalizedRotation(Quaternionf())
-        val forward = seat.transform(Vector3f(0f, 0f, -1f))
-        val up = seat.transform(Vector3f(0f, 1f, 0f))
-        // Way a positive head yaw turns
-        val side = Vector3f(forward).cross(up)
-        val view = rider.getViewVector(partialTicks).toVector3f()
-        val ahead = view.dot(forward)
-        val across = view.dot(side)
-        val yaw = atan2(across, ahead) * Mth.RAD_TO_DEG
-        val pitch = atan2(-view.dot(up), hypot(across, ahead)) * Mth.RAD_TO_DEG
-        return Vec2(yaw.coerceIn(-VANILLA_PASSENGER_HEAD_YAW_LIMIT, VANILLA_PASSENGER_HEAD_YAW_LIMIT), pitch)
-    }
-
     const val RIDING_SITTING_OFFSET = -10.0
     fun animateRoot(stack: PoseStack) {
         val root = relevantPartsByName["body"] ?: return

common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt

@@ -199,16 +199,11 @@ class PokemonRenderer(
             val matrix = poseMatrix.last().pose()
             val yaw = Mth.rotLerp(partialTicks, entity.yBodyRotO, entity.yBodyRot)
             val center = Vector3f(0f, entity.bbHeight/2, 0f)
-            val orientation = controller.getRenderOrientation(partialTicks)
             val transformationMatrix = Matrix4f()
-            // Lets the ride slide the model onto what it's standing on
-            transformationMatrix.translate(entity.ifRidingAvailableSupply(fallback = Vector3f()) { behaviour, settings, state ->
-                behaviour.renderOffset(settings, state, entity, orientation)
-            })
             //Move origin to center of Pokemon
             transformationMatrix.translate(center)
 
-            transformationMatrix.rotate(orientation)
+            transformationMatrix.rotate(controller.getRenderOrientation(partialTicks))
             //Move origin to base of the entity
             transformationMatrix.translate(center.negate(Vector3f()))
 

common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt

@@ -47,6 +47,10 @@ class CobblemonConfig {
     @IntConstraint(min = 0, max = 1000)
     var maxPokemonFriendship = 255
 
+    @CobblemonConfigField(Category.Pokemon, lang = "power_item_ride_stat_gain_interval_seconds", SERVER)
+    @IntConstraint(min = -1, max = Int.MAX_VALUE)
+    var powerItemRideStatGainIntervalSeconds = 120
+
     @CobblemonConfigField(Category.Pokemon, lang = "announce_drop_items", SERVER)
     var announceDropItems = true
     @CobblemonConfigField(Category.Pokemon, lang = "default_drop_item_method", SERVER)

common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt

@@ -107,6 +107,7 @@ import com.cobblemon.mod.common.pokemon.feature.SlowpokeTailRegrowthSpeciesFeatu
 import com.cobblemon.mod.common.pokemon.feature.StashHandler
 import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
 import com.cobblemon.mod.common.util.*
+import com.cobblemon.mod.common.util.math.geometry.toRadians
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
 import com.google.common.collect.UnmodifiableIterator
 import com.mojang.serialization.Codec
@@ -1865,9 +1866,28 @@ open class PokemonEntity(
         }
     }
 
-    // Ridden movement is all in travel which never gets here while someone's steering
     override fun handleRelativeFrictionAndCalculateMovement(deltaMovement: Vec3, friction: Float): Vec3 {
-        super.handleRelativeFrictionAndCalculateMovement(deltaMovement, friction)
+        if (!this.hasRider() || this.controllingPassenger == null) {
+            super.handleRelativeFrictionAndCalculateMovement(deltaMovement, friction)
+        } else {
+            val velocity = ifRidingAvailableSupply(fallback = Vec3.ZERO) { behaviour, settings, state ->
+                behaviour.velocity(settings, state, this, this.controllingPassenger as Player, deltaMovement)
+            }
+            // Handle ridden pokemon differently to allow vector lerp instead of simple addition.
+            val v = getInputVector(velocity, 1.0f, this.yRot)
+            // Changing this will give the ride more or less inertia/handling/drift
+            val inertia = ifRidingAvailableSupply(fallback = 0.5) { behaviour, settings, state ->
+                behaviour.inertia(settings, state,this)
+            }
+
+            this.deltaMovement = this.deltaMovement.lerp(v, inertia)
+            var pos = this.deltaMovement.scale(this.speed.toDouble())
+            if (super.onGround() && this.deltaMovement.y == 0.0) {
+                pos = pos.subtract(0.0, 0.0001, 0.0)
+            }
+            this.move(MoverType.SELF, pos)
+        }
+
         return this.deltaMovement
     }
 
@@ -1900,46 +1920,44 @@ open class PokemonEntity(
             if (!this.hasRider() || this.controllingPassenger == null) {
                 super.travel(movementInput)
             } else {
-                // Some rides move themselves, like climbers going over every surface
-                val travelled = ifRidingAvailableSupply(fallback = false) { behaviour, settings, state ->
-                    behaviour.travel(settings, state, this, this.controllingPassenger as Player)
+                val inp = ifRidingAvailableSupply(fallback = Vec3.ZERO) { behaviour, settings, state ->
+                    behaviour.velocity(settings, state, this, this.controllingPassenger as Player, deltaMovement)
                 }
-                if (!travelled) {
-                    // movementInput is the world space velocity getRiddenInput already got from the ride this tick
-                    val v = ifRidingAvailableSupply(fallback = Vec3.ZERO) { behaviour, settings, state ->
-                        if (behaviour.velocityRunsTwicePerTick(settings, state, this)) {
-                            behaviour.velocity(settings, state, this, this.controllingPassenger as Player, deltaMovement)
-                        } else {
-                            movementInput
-                        }
-                    }
 
-                    val diff = v.subtract(this.deltaMovement)
+                // Rotate velocity vector to face the current y rotation
+                val f = Mth.sin(this.yRot.toRadians())
+                val g = Mth.cos(this.yRot.toRadians())
+                val v = Vec3(
+                    inp.x * g.toDouble() - inp.z * f.toDouble(),
+                    inp.y,
+                    inp.z * g.toDouble() + inp.x * f.toDouble()
+                )
 
-                    val inertia = ifRidingAvailableSupply(fallback = 0.5) { behaviour, settings, state ->
-                        behaviour.inertia(settings, state,this)
-                    }
+                val diff = v.subtract(this.deltaMovement)
 
-                    this.deltaMovement = this.deltaMovement.add( diff.scale(inertia) )
-                    val triedMovement = this.deltaMovement
+                val inertia = ifRidingAvailableSupply(fallback = 0.5) { behaviour, settings, state ->
+                    behaviour.inertia(settings, state,this)
+                }
 
-                    this.move(MoverType.SELF, this.deltaMovement)
+                this.deltaMovement = this.deltaMovement.add( diff.scale(inertia) )
+                val triedMovement = this.deltaMovement
 
-                    if (this.horizontalCollision && this.isControlledByLocalInstance) {
-                        ifRidingAvailable { behaviour, settings, state ->
-                            // Tried minus performed = vector pointing at where we *couldn't* go
-                            val delta = triedMovement.subtract(this.deltaMovement)
-                            if (behaviour.damageOnCollision(settings, state, this, delta)) {
-                                DamageOnCollisionPacket(delta).sendToServer()
+                this.move(MoverType.SELF, this.deltaMovement)
 
-                                for (passenger in this.passengers) {
-                                    passenger.deltaMovement = this.deltaMovement
-                                }
-                                DismountPokemonPacket().sendToServer()
+                if (this.horizontalCollision && this.isControlledByLocalInstance) {
+                    ifRidingAvailable { behaviour, settings, state ->
+                        // Tried minus performed = vector pointing at where we *couldn't* go
+                        val delta = triedMovement.subtract(this.deltaMovement)
+                        if (behaviour.damageOnCollision(settings, state, this, delta)) {
+                            DamageOnCollisionPacket(delta).sendToServer()
 
-                                // Reset ride velocity
-                                state.rideVelocity.set(state.rideVelocity.get().multiply(0.0, 1.0, 0.0))
+                            for (passenger in this.passengers) {
+                                passenger.deltaMovement = this.deltaMovement
                             }
+                            DismountPokemonPacket().sendToServer()
+
+                            // Reset ride velocity
+                            state.rideVelocity.set(state.rideVelocity.get().multiply(0.0, 1.0, 0.0))
                         }
                     }
                 }
@@ -2372,11 +2390,6 @@ open class PokemonEntity(
 
                 this.jumpInputStrength = 0
             }
-
-            // Same spot speed used to get called from so nothing shifts order
-            if (this.isControlledByLocalInstance) {
-                behaviour.driverTick(settings, state, this, driver)
-            }
         }
     }
 
@@ -2731,4 +2744,9 @@ open class PokemonEntity(
     }
 
     fun hasRider() = this.passengers.any { it is LivingEntity }
-}
+
+    override fun playStepSound(pos: BlockPos, state: BlockState) {
+        if (this.pokemon.species.silenceStepSounds) return
+        super.playStepSound(pos, state)
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt

@@ -22,6 +22,7 @@ import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.feature.TickingSpeciesFeature
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
+import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.api.spawning.fishing.FishingSpawnCause.Companion.DROPS_REROLL_ASPECT
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.battles.BattleRegistry
@@ -46,10 +47,15 @@ import kotlin.math.*
 
 /** Handles purely server logic for a Pokémon */
 class PokemonServerDelegate : PokemonSideDelegate {
+    companion object {
+        private const val RIDE_STAT_GAIN_AMOUNT = 1F
+    }
+
     lateinit var entity: PokemonEntity
     var acknowledgedHPValue = -1
     var acknowledgedLevel = -1
     val passengerOffsets = mutableMapOf<Int, Vec3>()
+    private var rideStatGainAnchor: Vec3? = null
 
     /** Mocked properties exposed to the client [PokemonEntity]. */
     private val mock: PokemonProperties?
@@ -355,9 +361,30 @@ class PokemonServerDelegate : PokemonSideDelegate {
             }
         }
 
+        val rideStatGainIntervalSeconds = Cobblemon.config.powerItemRideStatGainIntervalSeconds
+        if (rideStatGainIntervalSeconds > 0) {
+            val rideStatGainIntervalTicks = rideStatGainIntervalSeconds * 20L
+            if (entity.level().gameTime % rideStatGainIntervalTicks == 0L) {
+                trainRideStats()
+            }
+        }
+
         updateTrackedValues()
     }
 
+    private fun trainRideStats() {
+        val position = entity.position()
+        val anchor = rideStatGainAnchor
+        rideStatGainAnchor = position
+        if (anchor == null || anchor == position || entity.passengers.isEmpty()) return
+
+        val heldItem = entity.pokemon.heldItemNoCopy()
+        if (heldItem.isEmpty) return
+
+        val stat = RidingStat.entries.firstOrNull { heldItem.`is`(it.powerItem) } ?: return
+        entity.pokemon.addRideBoost(stat, RIDE_STAT_GAIN_AMOUNT)
+    }
+
     fun updateShownItem() {
         val trackedShownItem = when {
             // Show Hand Item if Held item is hidden

common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/PonigiriItem.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.item.interactive
 
 import com.cobblemon.mod.common.CobblemonItemComponents
+import com.cobblemon.mod.common.item.components.FoodComponent
 import net.minecraft.network.chat.Component
 import net.minecraft.sounds.SoundEvent
 import net.minecraft.sounds.SoundEvents
@@ -23,10 +24,15 @@ import net.minecraft.world.level.Level
 class PonigiriItem : Item(
         Properties().stacksTo(64)
                 .food(FoodProperties.Builder()
-                        .nutrition(2)
-                        .saturationModifier(0.55f)
+                        .nutrition(NUTRITION)
+                        .saturationModifier(SATURATION_MODIFIER)
                         .build())
 ) {
+    companion object {
+        const val NUTRITION = 2
+        const val SATURATION_MODIFIER = 0.55f
+    }
+
     override fun getName(stack: ItemStack): Component {
 
         val ingredients = stack.get(CobblemonItemComponents.INGREDIENT)
@@ -59,4 +65,9 @@ class PonigiriItem : Item(
     override fun getEatingSound(): SoundEvent {
         return SoundEvents.GENERIC_EAT
     }
-}
+
+    fun getFoodValues(stack: ItemStack): Pair<Int, Float> {
+        val (hunger, saturation) = stack.getOrDefault(CobblemonItemComponents.FOOD, FoodComponent(NUTRITION, SATURATION_MODIFIER))
+        return hunger to saturation
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/data/RideSettingsSyncPacket.kt

@@ -15,7 +15,6 @@ import com.cobblemon.mod.common.api.riding.behaviour.types.air.HelicopterSetting
 import com.cobblemon.mod.common.api.riding.behaviour.types.air.HoverSettings
 import com.cobblemon.mod.common.api.riding.behaviour.types.air.JetSettings
 import com.cobblemon.mod.common.api.riding.behaviour.types.air.RocketSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.air.BoardSettings
 import com.cobblemon.mod.common.api.riding.behaviour.types.land.HorseSettings
 import com.cobblemon.mod.common.api.riding.behaviour.types.land.MinekartSettings
 import com.cobblemon.mod.common.api.riding.behaviour.types.land.VehicleSettings
@@ -36,7 +35,6 @@ class RideSettingsSyncPacket(
     val hover: HoverSettings,
     val jet: JetSettings,
     val rocket: RocketSettings,
-    val board: BoardSettings,
     val horse: HorseSettings,
     val minekart: MinekartSettings,
     val vehicle: VehicleSettings,
@@ -54,7 +52,6 @@ class RideSettingsSyncPacket(
         hover.encode(buffer)
         jet.encode(buffer)
         rocket.encode(buffer)
-        board.encode(buffer)
         horse.encode(buffer)
         minekart.encode(buffer)
         vehicle.encode(buffer)
@@ -74,7 +71,6 @@ class RideSettingsSyncPacket(
                 hover = HoverSettings(),
                 jet = JetSettings(),
                 rocket = RocketSettings(),
-                board = BoardSettings(),
                 horse = HorseSettings(),
                 minekart = MinekartSettings(),
                 vehicle = VehicleSettings(),
@@ -89,7 +85,6 @@ class RideSettingsSyncPacket(
                 hover.decode(buffer)
                 jet.decode(buffer)
                 rocket.decode(buffer)
-                board.decode(buffer)
                 horse.decode(buffer)
                 minekart.decode(buffer)
                 vehicle.decode(buffer)

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Species.kt

@@ -173,6 +173,7 @@ class Species : ShowdownIdentifiable {
         .addStandardFunctions()
         .addSpeciesFunctions(this)
 
+    var silenceStepSounds = false
 
     fun initialize() {
         Cobblemon.statProvider.provide(this)
@@ -256,6 +257,7 @@ class Species : ShowdownIdentifiable {
         }
 
         this.riding.encode(buffer)
+        buffer.writeBoolean(this.silenceStepSounds)
     }
 
     fun decode(buffer: RegistryFriendlyByteBuf) {
@@ -299,6 +301,7 @@ class Species : ShowdownIdentifiable {
             }
         }
         this.riding = RidingProperties.decode(buffer)
+        this.silenceStepSounds = buffer.readBoolean()
         this.initialize()
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/util/EntityExtensions.kt

@@ -234,11 +234,11 @@ fun Entity.isDusk(): Boolean {
 }
 
 fun Entity.isStandingOn(blocks: Set<String>, depth: Int = 2): Boolean {
-    for (currentDepth in 1..depth) {
-        val bellowBlockPos = blockPosition().below(currentDepth)
+    for (currentDepth in 0..depth) {
+        val bellowBlockPos = blockPosBelowThatAffectsMyMovement.below(currentDepth)
         val blockState = level().getBlockState(bellowBlockPos)
 
-        if (blockState.isAir || !blockState.isCollisionShapeFullBlock(level(), bellowBlockPos)) continue
+        if (blockState.isAir) continue
 
         val elementOrTags = ExtraCodecs.TAG_OR_ELEMENT_ID.listOf().decode(JavaOps.INSTANCE, blocks.toList()).result().get().first
         elementOrTags.forEach {

common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/RidingBehaviourSettingsAdapter.kt

@@ -17,7 +17,12 @@ import com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies.
 import com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies.FallStrategy
 import com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies.JumpStrategy
 import com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies.RunStrategy
-import com.cobblemon.mod.common.api.riding.behaviour.types.land.*
+import com.cobblemon.mod.common.api.riding.behaviour.types.land.HorseBehaviour
+import com.cobblemon.mod.common.api.riding.behaviour.types.land.HorseSettings
+import com.cobblemon.mod.common.api.riding.behaviour.types.land.MinekartBehaviour
+import com.cobblemon.mod.common.api.riding.behaviour.types.land.MinekartSettings
+import com.cobblemon.mod.common.api.riding.behaviour.types.land.VehicleBehaviour
+import com.cobblemon.mod.common.api.riding.behaviour.types.land.VehicleSettings
 import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.*
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.google.gson.JsonDeserializationContext
@@ -45,9 +50,7 @@ object RidingBehaviourSettingsAdapter : JsonDeserializer<RidingBehaviourSettings
         MinekartBehaviour.KEY to MinekartSettings::class.java,
         HoverBehaviour.KEY to HoverSettings::class.java,
         RocketBehaviour.KEY to RocketSettings::class.java,
-        BoardBehaviour.KEY to BoardSettings::class.java,
         SubmarineBehaviour.KEY to SubmarineSettings::class.java,
-        ClimbBehaviour.KEY to ClimbSettings::class.java,
         CompositeBehaviour.KEY to CompositeSettings::class.java,
 
         /*

common/src/main/kotlin/com/cobblemon/mod/common/world/gamerules/CobblemonGameRules.kt

@@ -27,5 +27,7 @@ object CobblemonGameRules {
     @JvmField
     val HEALERS_HEAL_PC: GameRules.Key<GameRules.BooleanValue> = Cobblemon.implementation.registerGameRule("healersHealPC", GameRules.Category.MISC, BooleanRuleInvoker.`cobblemon$create`(false))
     @JvmField
+    val HEALER_SET_SPAWN: GameRules.Key<GameRules.BooleanValue> = Cobblemon.implementation.registerGameRule("healersSetSpawn", GameRules.Category.MISC, BooleanRuleInvoker.`cobblemon$create`(false))
+    @JvmField
     val DO_POKEMON_PREDATION: GameRules.Key<GameRules.BooleanValue> = Cobblemon.implementation.registerGameRule("doPokemonPredation", GameRules.Category.MOBS, BooleanRuleInvoker.`cobblemon$create`(true))
 }

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_actoralt.particle.json

@@ -64,7 +64,7 @@
 				"rotation": "math.random_integer(0,3)*90"
 			},
 			"minecraft:particle_motion_parametric": {
-				"relative_position": ["-(v.target_deltax+((v.particle_random_1-0.5)*2))*(v.particle_age / v.particle_lifetime)", "(v.target_deltay+((v.particle_random_2-0.5)*2))*(v.particle_age / v.particle_lifetime)", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
+				"relative_position": ["-(v.target_deltax+((v.particle_random_1-0.5)*1.33))*(v.particle_age / v.particle_lifetime)", "(v.target_deltay+((v.particle_random_2-0.5)*1.33))*(v.particle_age / v.particle_lifetime)", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
 			},
 			"minecraft:particle_appearance_billboard": {
 				"size": ["0.4*v.rsize", "0.4*v.rsize"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0009_blastoise/blastoise.animation.json

@@ -456,6 +456,12 @@
 				"cannon_left": {
 					"position": [0, 0, 3]
 				}
+			},
+			"timeline": {
+				"0.25": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.25": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"2.25": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"3.25": "q.run_molang('cobblemon:stepsound_standard_large');"
 			}
 		},
 		"animation.blastoise.ground_run": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0018_pidgeot/pidgeot.animation.json

@@ -1815,6 +1815,12 @@
 				"wings_open": {
 					"scale": 0
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_claw_medium');",
+				"0.5": "q.run_molang('cobblemon:stepsound_claw_medium');",
+				"1.0": "q.run_molang('cobblemon:stepsound_claw_medium');",
+				"1.5": "q.run_molang('cobblemon:stepsound_claw_medium');"
 			}
 		},
 		"animation.pidgeot.mount_ground_idle": {
@@ -3631,6 +3637,12 @@
 				"wings_open": {
 					"scale": 0
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_claw_medium');",
+				"0.5": "q.run_molang('cobblemon:stepsound_claw_medium');",
+				"1.0": "q.run_molang('cobblemon:stepsound_claw_medium');",
+				"1.5": "q.run_molang('cobblemon:stepsound_claw_medium');"
 			}
 		},
 		"animation.pidgeot.ride_ground_walk": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0047_parasect/parasect.animation.json

@@ -83,6 +83,7 @@
 		},
 		"animation.parasect.ground_walk": {
 			"loop": true,
+			"animation_length": 1,
 			"bones": {
 				"body": {
 					"rotation": [0, 0, 0],
@@ -134,6 +135,12 @@
 				"locator_seat_1": {
 					"rotation": [7.5, 0, 0]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.25": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.5": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.75": "q.run_molang('cobblemon:stepsound_minecraft');"
 			}
 		},
 		"animation.parasect.ground_run": {
@@ -258,6 +265,10 @@
 					"rotation": ["5+Math.cos((query.anim_time) * 90 * 16 - 90) * 2", 0, 0],
 					"position": [0, "0+Math.cos((query.anim_time) * 90 * 32) * -0.2", -0.25]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.125": "q.run_molang('cobblemon:stepsound_minecraft');"
 			}
 		},
 		"animation.parasect.ride_ground_run": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0059_arcanine/arcanine.animation.json

@@ -1682,6 +1682,12 @@
 						"1.3333": [10, 9, 0]
 					}
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"0.4583": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"0.6667": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"1.125": "q.run_molang('cobblemon:stepsound_standard_medium');"
 			}
 		},
 		"animation.arcanine.ride_ground_walk": {
@@ -2639,6 +2645,12 @@
 				"chest_fluff_right": {
 					"rotation": [5, "-22.5+math.cos(q.anim_time*90*8-120)*15", "-math.sin(q.anim_time*90*8-120)*3"]
 				}
+			},
+			"timeline": {
+				"0.125": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"0.2083": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"0.2917": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"0.375": "q.run_molang('cobblemon:stepsound_standard_medium');"
 			}
 		},
 		"animation.arcanine.ride_ground_run": {
@@ -4161,41 +4173,101 @@
 				"eye_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [-0.1, 0, 0.1]},
-						"0.5": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [-0.1, 0, 0.1]},
-						"1.6667": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0.1]
+						},
+						"0.5": {
+							"pre": [-0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0.1]
+						},
+						"1.6667": {
+							"pre": [-0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [0.1, 0, 0.1]},
-						"0.5": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [0.1, 0, 0.1]},
-						"1.6667": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0.1]
+						},
+						"0.5": {
+							"pre": [0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0.1]
+						},
+						"1.6667": {
+							"pre": [0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"0.5": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"1.6667": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, -0.1]
+						},
+						"0.5": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, -0.1]
+						},
+						"1.6667": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"0.5": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"1.6667": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, -0.1]
+						},
+						"0.5": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, -0.1]
+						},
+						"1.6667": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"jaw": {
@@ -4823,41 +4895,101 @@
 				"eye_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [-0.1, 0, 0.1]},
-						"0.5": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [-0.1, 0, 0.1]},
-						"1.6667": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0.1]
+						},
+						"0.5": {
+							"pre": [-0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0.1]
+						},
+						"1.6667": {
+							"pre": [-0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [0.1, 0, 0.1]},
-						"0.5": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [0.1, 0, 0.1]},
-						"1.6667": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0.1]
+						},
+						"0.5": {
+							"pre": [0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0.1]
+						},
+						"1.6667": {
+							"pre": [0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"0.5": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"1.6667": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, -0.1]
+						},
+						"0.5": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, -0.1]
+						},
+						"1.6667": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"0.5": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"1.6667": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, -0.1]
+						},
+						"0.5": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, -0.1]
+						},
+						"1.6667": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"jaw": {
@@ -5287,14 +5419,20 @@
 					"position": {
 						"0.0": [-0.1, 0, 0.1],
 						"0.125": [-0.1, 0, 0.1],
-						"0.1667": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [-0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0.1, 0, 0.1],
 						"0.125": [0.1, 0, 0.1],
-						"0.1667": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				}
 			}
@@ -5491,47 +5629,95 @@
 				"eye_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [-0.2, 0, 0.1]},
-						"0.3333": {"pre": [-0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [-0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [-0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0.2, 0, 0.1]},
-						"0.3333": {"pre": [0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [-0.2, 0, 0.1]},
-						"0.3333": {"pre": [-0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [-0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [-0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0.2, 0, 0.1]},
-						"0.3333": {"pre": [0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left_hurt": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"0.3333": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, -0.1]
+						},
+						"0.3333": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right_hurt": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"0.3333": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, -0.1]
+						},
+						"0.3333": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"jaw": {
@@ -6238,47 +6424,95 @@
 				"eye_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [-0.2, 0, 0.1]},
-						"0.3333": {"pre": [-0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [-0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [-0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0.2, 0, 0.1]},
-						"0.3333": {"pre": [0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [-0.2, 0, 0.1]},
-						"0.3333": {"pre": [-0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [-0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [-0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0.2, 0, 0.1]},
-						"0.3333": {"pre": [0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left_hurt": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"0.3333": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, -0.1]
+						},
+						"0.3333": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right_hurt": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"0.3333": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, -0.1]
+						},
+						"0.3333": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"jaw": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0087_dewgong/dewgong.animation.json

@@ -391,6 +391,10 @@
 						"0.7083": [0, 0, 0]
 					}
 				}
+			},
+			"timeline": {
+				"0.0833": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"0.2917": "q.run_molang('cobblemon:stepsound_standard_medium');"
 			}
 		},
 		"animation.dewgong.water_idle": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0111_rhyhorn/rhyhorn.animation.json

@@ -1071,6 +1071,16 @@
 				"head": {
 					"rotation": ["-0.8*math.cos(q.anim_time*90*8-120)", 0, "3*math.sin(q.anim_time*90*4+70)"]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"0.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"2.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"2.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"3.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"3.5": "q.run_molang('cobblemon:stepsound_standard_large');"
 			}
 		},
 		"animation.rhyhorn.ride_ground_walk": {
@@ -1917,6 +1927,16 @@
 					],
 					"position": [0, "0.4+0.6*math.cos(q.anim_time*90*8-120)", 0]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"0.375": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"0.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"0.875": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"1.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.375": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"1.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.875": "q.run_molang('cobblemon:stepsound_standard_medium');"
 			}
 		},
 		"animation.rhyhorn.ride_ground_run": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0112_rhydon/rhydon.animation.json

@@ -329,6 +329,12 @@
 				"locator_seat_1": {
 					"rotation": [-15, 0, 0]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"2.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"3.0": "q.run_molang('cobblemon:stepsound_standard_large');"
 			}
 		},
 		"animation.rhydon.ride_ground_walk": {
@@ -807,6 +813,12 @@
 				"locator_seat_1": {
 					"rotation": [-15, 0, 0]
 				}
+			},
+			"timeline": {
+				"0.3333": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"0.8333": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.3333": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.8333": "q.run_molang('cobblemon:stepsound_standard_large');"
 			}
 		},
 		"animation.rhydon.ride_ground_run": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0122_mrmime/mr_mime.animation.json

@@ -391,6 +391,10 @@
 						"1.0": [0, 0, 0]
 					}
 				}
+			},
+			"timeline": {
+				"0.0833": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.5833": "q.run_molang('cobblemon:stepsound_minecraft');"
 			}
 		},
 		"animation.mr_mime.ground_run": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0823_corviknight/corviknight.animation.json

@@ -3150,6 +3150,10 @@
 				"locator_seat_2": {
 					"rotation": [45, 0, 0]
 				}
+			},
+			"timeline": {
+				"0.5": "q.run_molang('cobblemon:stepsound_claw_large');",
+				"1.5": "q.run_molang('cobblemon:stepsound_claw_large');"
 			}
 		},
 		"animation.corviknight.ground_run": {
@@ -4473,6 +4477,10 @@
 				"locator_seat_2": {
 					"rotation": [25, 0, 0]
 				}
+			},
+			"timeline": {
+				"0.3333": "q.run_molang('cobblemon:stepsound_claw_large');",
+				"0.8333": "q.run_molang('cobblemon:stepsound_claw_large');"
 			}
 		},
 		"animation.corviknight.air_idle": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0899_wyrdeer/wyrdeer.animation.json

@@ -566,6 +566,12 @@
 						"1.5": [0, 0.2, 0]
 					}
 				}
+			},
+			"timeline": {
+				"0.5417": "q.run_molang('cobblemon:stepsound_hoof_medium');",
+				"0.7083": "q.run_molang('cobblemon:stepsound_hoof_medium');",
+				"1.2917": "q.run_molang('cobblemon:stepsound_hoof_medium');",
+				"1.4583": "q.run_molang('cobblemon:stepsound_hoof_medium');"
 			}
 		},
 		"animation.wyrdeer.sleep": {
@@ -780,15 +786,27 @@
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.25": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"0.5": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
+						"0.25": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, -0.1]
+						},
+						"0.5": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.25": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"0.5": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
+						"0.25": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, -0.1]
+						},
+						"0.5": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"ear_right": {
@@ -1186,18 +1204,36 @@
 					"position": {
 						"0.0": [0, 0, 0],
 						"1.5833": [-0.1, 0, -0.1],
-						"1.6667": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]},
-						"3.0": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"3.125": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
+						"1.6667": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"3.0": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, -0.1]
+						},
+						"3.125": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
 						"1.5833": [0.1, 0, -0.1],
-						"1.6667": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]},
-						"3.0": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"3.125": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
+						"1.6667": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"3.0": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, -0.1]
+						},
+						"3.125": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"tail": {
@@ -2204,6 +2240,16 @@
 						"1.1667": [0, 0, 0]
 					}
 				}
+			},
+			"timeline": {
+				"0.2083": "q.run_molang('cobblemon:stepsound_hoof_medium');",
+				"0.2917": "q.run_molang('cobblemon:stepsound_hoof_medium');",
+				"0.375": "q.run_molang('cobblemon:stepsound_hoof_medium');",
+				"0.4583": "q.run_molang('cobblemon:stepsound_hoof_large');",
+				"0.7917": "q.run_molang('cobblemon:stepsound_hoof_medium');",
+				"0.875": "q.run_molang('cobblemon:stepsound_hoof_medium');",
+				"0.9583": "q.run_molang('cobblemon:stepsound_hoof_medium');",
+				"1.0417": "q.run_molang('cobblemon:stepsound_hoof_large');"
 			}
 		},
 		"animation.wyrdeer.ride_jump": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0656_froakie/froakie.geo.json

@@ -227,6 +227,14 @@
 						{"origin": [3.1, 20.8, -0.84], "size": [2, 1, 1], "inflate": 0.1, "uv": [60, 42]}
 					]
 				},
+				{
+					"name": "eyelid_closed_left",
+					"parent": "head_left",
+					"pivot": [3.6, 19.7, -0.91],
+					"cubes": [
+						{"origin": [2.1, 17.2, -0.66], "size": [3, 5, 1], "inflate": 0.25, "uv": [98, 2]}
+					]
+				},
 				{
 					"name": "face_ditto_left",
 					"parent": "head_left",
@@ -332,6 +340,14 @@
 						{"origin": [-5.1, 20.8, -0.84], "size": [2, 1, 1], "inflate": 0.1, "uv": [51, 42], "mirror": true}
 					]
 				},
+				{
+					"name": "eyelid_closed_right",
+					"parent": "head_right",
+					"pivot": [-3.6, 19.7, -0.91],
+					"cubes": [
+						{"origin": [-5.1, 17.2, -0.66], "size": [3, 5, 1], "inflate": 0.25, "uv": [89, 2], "mirror": true}
+					]
+				},
 				{
 					"name": "face_ditto_right",
 					"parent": "head_right",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0657_frogadier/frogadier.geo.json

@@ -134,229 +134,114 @@
 						"jaw2": [0, 27, -7.35]
 					}
 				},
-				{
-					"name": "head_right",
-					"parent": "head_angle",
-					"pivot": [-3.525, 31, 0.25],
-					"rotation": [5, 0, 0],
-					"cubes": [
-						{"origin": [-4.525, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 11]},
-						{"origin": [-3.625, 31.5, 0.25], "size": [0, 3, 5], "uv": [52, 55]}
-					]
-				},
-				{
-					"name": "locator_eye_right",
-					"parent": "head_right",
-					"pivot": [-4.5, 31, -2.5],
-					"rotation": [0, 90, 0],
-					"locators": {
-						"eye1": [-4.5, 31, -2.5]
-					}
-				},
-				{
-					"name": "eye_right",
-					"parent": "head_right",
-					"pivot": [-4.525, 31.35, -2.25],
-					"cubes": [
-						{"origin": [-4.525, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [66, 2], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_neutral_right",
-					"parent": "eye_right",
-					"pivot": [-4.525, 32.85095, -2.27179],
-					"cubes": [
-						{"origin": [-4.505, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 12], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_angry_right",
-					"parent": "eye_right",
-					"pivot": [-4.435, 32.1, -2.5],
-					"cubes": [
-						{"origin": [-4.405, 30.85, -4.25], "size": [1, 3, 4], "inflate": 0.05, "uv": [66, 26], "mirror": true},
-						{"origin": [-4.44, 31.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [73, 27], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_sad_right",
-					"parent": "eye_right",
-					"pivot": [-4.435, 32.85, -2.5],
-					"cubes": [
-						{"origin": [-4.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 19], "mirror": true},
-						{"origin": [-4.44, 32.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [73, 20], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_right",
-					"parent": "eye_right",
-					"pivot": [-4.525, 30.85095, -3.02179],
-					"cubes": [
-						{"origin": [-4.525, 29.35, -4.04], "size": [1, 3, 2], "inflate": 0.02, "uv": [73, 0], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_right2",
-					"parent": "pupil_right",
-					"pivot": [-4.55, 31.35095, -3.02179],
-					"cubes": [
-						{"origin": [-4.55, 30.35, -3.55], "size": [1, 2, 1], "uv": [84, 2], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_right",
-					"parent": "head_right",
-					"pivot": [-3.925, 31.35095, -2.27179],
-					"cubes": [
-						{"origin": [-4.425, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [77, 2], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_eyelid_right",
-					"parent": "eyelid_right",
-					"pivot": [-4.425, 30.80095, -2.27179],
-					"cubes": [
-						{"origin": [-4.435, 30.3, -3.75], "size": [1, 1, 3], "inflate": 0.01, "uv": [77, 14], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_right2",
-					"parent": "eyelid_right",
-					"pivot": [-3.925, 32.85095, -2.27179],
-					"cubes": [
-						{"origin": [-4.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 12], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_happy_right",
-					"parent": "eyelid_right",
-					"pivot": [-4.325, 30.80095, -2.27179],
-					"cubes": [
-						{"origin": [-4.325, 30.30095, -3.77179], "size": [1, 2, 3], "inflate": 0.05, "uv": [77, 20], "mirror": true}
-					]
-				},
-				{
-					"name": "face_ditto_right",
-					"parent": "head_right",
-					"pivot": [-4.435, 32, -2.25]
-				},
-				{
-					"name": "eye_ditto_right",
-					"parent": "face_ditto_right",
-					"pivot": [-4.435, 32, -2.25],
-					"cubes": [
-						{"origin": [-4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [113, 1]}
-					]
-				},
-				{
-					"name": "eye_closed_ditto_right",
-					"parent": "face_ditto_right",
-					"pivot": [-4.335, 32, -2.25],
-					"cubes": [
-						{"origin": [-4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [112, 2]},
-						{"origin": [-4.345, 32, -2.75], "size": [0, 1, 1], "uv": [113, 5]}
-					]
-				},
 				{
 					"name": "head_left",
 					"parent": "head_angle",
-					"pivot": [3.525, 31, 0.25],
+					"pivot": [3.53, 31, 0.25],
 					"rotation": [5, 0, 0],
 					"cubes": [
-						{"origin": [2.525, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 21], "mirror": true},
-						{"origin": [3.625, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55], "mirror": true}
+						{"origin": [2.53, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 21], "mirror": true},
+						{"origin": [3.63, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55], "mirror": true}
 					]
 				},
-				{
-					"name": "locator_eye_left",
-					"parent": "head_left",
-					"pivot": [4.5, 31, -2.5],
-					"rotation": [0, -90, 0],
-					"locators": {
-						"eye2": [4.5, 31, -2.5]
-					}
-				},
 				{
 					"name": "eye_left",
 					"parent": "head_left",
-					"pivot": [4.525, 31.35, -2.25],
+					"pivot": [4.53, 31.5, -2.25],
 					"cubes": [
-						{"origin": [3.525, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [88, 2]}
+						{"origin": [3.54, 29, -4.25], "size": [1, 5, 4], "uv": [88, 2]}
 					]
 				},
 				{
 					"name": "eye_neutral_left",
 					"parent": "eye_left",
-					"pivot": [4.525, 32.85095, -2.27179],
+					"pivot": [4.54, 33, -2.25],
 					"cubes": [
-						{"origin": [3.505, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 12]}
+						{"origin": [3.54, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 12]}
 					]
 				},
 				{
 					"name": "eye_angry_left",
 					"parent": "eye_left",
-					"pivot": [4.435, 32.1, -2.5],
+					"pivot": [4.44, 32.5, -2.25],
 					"cubes": [
-						{"origin": [3.405, 30.85, -4.25], "size": [1, 3, 4], "inflate": 0.05, "uv": [88, 26]},
-						{"origin": [3.44, 31.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [95, 27]}
+						{"origin": [3.44, 31, -4.25], "size": [1, 3, 4], "inflate": 0.021, "uv": [88, 26]},
+						{"origin": [3.44, 31.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [95, 27]}
 					]
 				},
 				{
 					"name": "eye_sad_left",
 					"parent": "eye_left",
-					"pivot": [4.435, 32.85, -2.5],
+					"pivot": [4.43, 33, -2.25],
 					"cubes": [
-						{"origin": [3.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 19]},
-						{"origin": [3.44, 32.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [95, 20]}
+						{"origin": [3.44, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 19]},
+						{"origin": [3.44, 32.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [95, 20]}
 					]
 				},
 				{
 					"name": "pupil_left",
 					"parent": "eye_left",
-					"pivot": [4.525, 30.85095, -3.02179],
+					"pivot": [4.55, 31, -3.05],
 					"cubes": [
-						{"origin": [3.525, 29.35, -4.04], "size": [1, 3, 2], "inflate": 0.02, "uv": [95, 0]}
+						{"origin": [3.55, 29.5, -4.05], "size": [1, 3, 2], "uv": [95, 0]}
 					]
 				},
 				{
-					"name": "pupil_left2",
+					"name": "eye_shine_left",
 					"parent": "pupil_left",
-					"pivot": [4.55, 31.35095, -3.02179],
+					"pivot": [4.55, 31.5, -3.05],
 					"cubes": [
-						{"origin": [3.55, 30.35, -3.55], "size": [1, 2, 1], "uv": [106, 2]}
+						{"origin": [3.56, 30.5, -3.55], "size": [1, 2, 1], "uv": [106, 2]}
+					]
+				},
+				{
+					"name": "open_eye_left",
+					"parent": "head_left",
+					"pivot": [4.44, 31.5, -2.25],
+					"cubes": [
+						{"origin": [3.44, 29, -4.25], "size": [1, 5, 4], "uv": [99, 2]}
+					]
+				},
+				{
+					"name": "open_pupil_left",
+					"parent": "open_eye_left",
+					"pivot": [4.45, 31.5, -2.25],
+					"cubes": [
+						{"origin": [3.45, 31, -3.75], "size": [1, 1, 3], "uv": [99, 14]}
+					]
+				},
+				{
+					"name": "open_neutral_left",
+					"parent": "open_eye_left",
+					"pivot": [4.34, 33, -2.25],
+					"cubes": [
+						{"origin": [3.34, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 12]}
+					]
+				},
+				{
+					"name": "open_happy_left",
+					"parent": "open_eye_left",
+					"pivot": [4.35, 32, -2.25],
+					"cubes": [
+						{"origin": [3.35, 31, -3.75], "size": [1, 2, 3], "uv": [99, 20]}
 					]
 				},
 				{
 					"name": "eyelid_left",
 					"parent": "head_left",
-					"pivot": [3.925, 31.35095, -2.27179],
+					"pivot": [4.44, 31.5, -2.25],
 					"cubes": [
-						{"origin": [3.425, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [99, 2]}
+						{"origin": [3.44, 29, -4.25], "size": [1, 5, 4], "inflate": 0.022, "uv": [99, 26]}
 					]
 				},
 				{
-					"name": "pupil_eyelid_left",
-					"parent": "eyelid_left",
-					"pivot": [4.425, 30.80095, -2.27179],
-					"cubes": [
-						{"origin": [3.435, 30.3, -3.75], "size": [1, 1, 3], "inflate": 0.01, "uv": [99, 14]}
-					]
-				},
-				{
-					"name": "eyelid_left2",
-					"parent": "eyelid_left",
-					"pivot": [3.925, 32.85095, -2.27179],
-					"cubes": [
-						{"origin": [3.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 12]}
-					]
-				},
-				{
-					"name": "pupil_happy_left",
-					"parent": "eyelid_left",
-					"pivot": [4.325, 30.80095, -2.27179],
-					"cubes": [
-						{"origin": [3.325, 30.30095, -3.77179], "size": [1, 2, 3], "inflate": 0.05, "uv": [99, 20]}
-					]
+					"name": "locator_eye_left",
+					"parent": "head_left",
+					"pivot": [4.54, 31, -2.46],
+					"rotation": [0, -90, 0],
+					"locators": {
+						"eye2": [4.54, 31, -2.46]
+					}
 				},
 				{
 					"name": "face_ditto_left",
@@ -368,7 +253,7 @@
 					"parent": "face_ditto_left",
 					"pivot": [4.435, 32, -2.25],
 					"cubes": [
-						{"origin": [4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [118, 1], "mirror": true}
+						{"origin": [4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [113, 1]}
 					]
 				},
 				{
@@ -376,8 +261,139 @@
 					"parent": "face_ditto_left",
 					"pivot": [4.335, 32, -2.25],
 					"cubes": [
-						{"origin": [4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [117, 2], "mirror": true},
-						{"origin": [4.345, 32, -2.75], "size": [0, 1, 1], "uv": [118, 5], "mirror": true}
+						{"origin": [4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [112, 2]},
+						{"origin": [4.345, 32, -2.75], "size": [0, 1, 1], "uv": [113, 5]}
+					]
+				},
+				{
+					"name": "head_right",
+					"parent": "head_angle",
+					"pivot": [-3.53, 31, 0.25],
+					"rotation": [5, 0, 0],
+					"cubes": [
+						{"origin": [-4.53, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 11]},
+						{"origin": [-3.63, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55]}
+					]
+				},
+				{
+					"name": "eye_right",
+					"parent": "head_right",
+					"pivot": [-4.53, 31.5, -2.25],
+					"cubes": [
+						{"origin": [-4.54, 29, -4.25], "size": [1, 5, 4], "uv": [66, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_neutral_right",
+					"parent": "eye_right",
+					"pivot": [-4.54, 33, -2.25],
+					"cubes": [
+						{"origin": [-4.54, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 12], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_angry_right",
+					"parent": "eye_right",
+					"pivot": [-4.44, 32.5, -2.25],
+					"cubes": [
+						{"origin": [-4.44, 31, -4.25], "size": [1, 3, 4], "inflate": 0.021, "uv": [66, 26], "mirror": true},
+						{"origin": [-4.44, 31.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [73, 27], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_sad_right",
+					"parent": "eye_right",
+					"pivot": [-4.43, 33, -2.25],
+					"cubes": [
+						{"origin": [-4.44, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 19], "mirror": true},
+						{"origin": [-4.44, 32.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [73, 20], "mirror": true}
+					]
+				},
+				{
+					"name": "pupil_right",
+					"parent": "eye_right",
+					"pivot": [-4.55, 31, -3.05],
+					"cubes": [
+						{"origin": [-4.55, 29.5, -4.05], "size": [1, 3, 2], "uv": [73, 0], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_shine_right",
+					"parent": "pupil_right",
+					"pivot": [-4.55, 31.5, -3.05],
+					"cubes": [
+						{"origin": [-4.56, 30.5, -3.55], "size": [1, 2, 1], "uv": [84, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "open_eye_right",
+					"parent": "head_right",
+					"pivot": [-4.44, 31.5, -2.25],
+					"cubes": [
+						{"origin": [-4.44, 29, -4.25], "size": [1, 5, 4], "uv": [77, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "open_pupil_right",
+					"parent": "open_eye_right",
+					"pivot": [-4.45, 31.5, -2.25],
+					"cubes": [
+						{"origin": [-4.45, 31, -3.75], "size": [1, 1, 3], "uv": [77, 14], "mirror": true}
+					]
+				},
+				{
+					"name": "open_neutral_right",
+					"parent": "open_eye_right",
+					"pivot": [-4.34, 33, -2.25],
+					"cubes": [
+						{"origin": [-4.34, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 12], "mirror": true}
+					]
+				},
+				{
+					"name": "open_happy_right",
+					"parent": "open_eye_right",
+					"pivot": [-4.35, 32, -2.25],
+					"cubes": [
+						{"origin": [-4.35, 31, -3.75], "size": [1, 2, 3], "uv": [77, 20], "mirror": true}
+					]
+				},
+				{
+					"name": "eyelid_right",
+					"parent": "head_right",
+					"pivot": [-4.44, 31.5, -2.25],
+					"cubes": [
+						{"origin": [-4.44, 29, -4.25], "size": [1, 5, 4], "inflate": 0.022, "uv": [77, 26], "mirror": true}
+					]
+				},
+				{
+					"name": "locator_eye_right",
+					"parent": "head_right",
+					"pivot": [-4.54, 31, -2.46],
+					"rotation": [0, 90, 0],
+					"locators": {
+						"eye1": [-4.54, 31, -2.46]
+					}
+				},
+				{
+					"name": "face_ditto_right",
+					"parent": "head_right",
+					"pivot": [-4.435, 32, -2.25]
+				},
+				{
+					"name": "eye_ditto_right",
+					"parent": "face_ditto_right",
+					"pivot": [-4.435, 32, -2.25],
+					"cubes": [
+						{"origin": [-4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [118, 1], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_closed_ditto_right",
+					"parent": "face_ditto_right",
+					"pivot": [-4.335, 32, -2.25],
+					"cubes": [
+						{"origin": [-4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [117, 2], "mirror": true},
+						{"origin": [-4.345, 32, -2.75], "size": [0, 1, 1], "uv": [118, 5], "mirror": true}
 					]
 				},
 				{

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0658_greninja/greninja.geo.json

@@ -830,11 +830,6 @@
 						{"origin": [-3.5, 38.3, 33.75], "size": [7, 5, 9], "uv": [106, 33]}
 					]
 				},
-				{
-					"name": "tongue6",
-					"parent": "tongue5",
-					"pivot": [0, 40.8, 40.5]
-				},
 				{
 					"name": "muzzle",
 					"parent": "head_angle",
@@ -913,6 +908,15 @@
 						{"origin": [-0.1, 44.3, -8.11], "size": [4, 2, 1], "uv": [87, 72]}
 					]
 				},
+				{
+					"name": "eyelid_base_left",
+					"parent": "eye_left_base",
+					"pivot": [1.9, 43.9, -8.11],
+					"cubes": [
+						{"origin": [-0.1, 45.3, -8.11], "size": [4, 1, 1], "uv": [87, 76]},
+						{"origin": [-0.1, 41.9, -8.11], "size": [4, 4, 1], "uv": [87, 79]}
+					]
+				},
 				{
 					"name": "eye_left",
 					"parent": "eye_left_base",
@@ -950,7 +954,7 @@
 					"parent": "eye_left",
 					"pivot": [1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [0.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [87, 76]}
+						{"origin": [0.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [87, 85]}
 					]
 				},
 				{
@@ -958,7 +962,7 @@
 					"parent": "eye_left",
 					"pivot": [1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [0.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [87, 79]}
+						{"origin": [0.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [87, 88]}
 					]
 				},
 				{
@@ -995,6 +999,15 @@
 						{"origin": [-3.9, 44.3, -8.11], "size": [4, 2, 1], "uv": [76, 72], "mirror": true}
 					]
 				},
+				{
+					"name": "eyelid_base_right",
+					"parent": "eye_right_base",
+					"pivot": [-1.9, 43.9, -8.11],
+					"cubes": [
+						{"origin": [-3.9, 45.3, -8.11], "size": [4, 1, 1], "uv": [76, 76], "mirror": true},
+						{"origin": [-3.9, 41.9, -8.11], "size": [4, 4, 1], "uv": [76, 79], "mirror": true}
+					]
+				},
 				{
 					"name": "eye_right",
 					"parent": "eye_right_base",
@@ -1032,7 +1045,7 @@
 					"parent": "eye_right",
 					"pivot": [-1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [-3.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [76, 76], "mirror": true}
+						{"origin": [-3.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [76, 85], "mirror": true}
 					]
 				},
 				{
@@ -1040,7 +1053,7 @@
 					"parent": "eye_right",
 					"pivot": [-1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [-3.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [76, 79], "mirror": true}
+						{"origin": [-3.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [76, 88], "mirror": true}
 					]
 				},
 				{

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/1000_gholdengo/gholdengo.geo.json

@@ -846,14 +846,6 @@
 					"cubes": [
 						{"origin": [-2, -1, 27], "size": [4, 1, 4], "inflate": -0.01, "uv": [104, 47]}
 					]
-				},
-				{
-					"name": "locator_seat_1",
-					"parent": "surfboard",
-					"pivot": [0, 14.5, 3],
-					"locators": {
-						"seat_1": [19, 1.5, 0]
-					}
 				}
 			]
 		}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0022_fearow/fearow.json

@@ -8,7 +8,6 @@
   "poses": {
     "standing": {
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
-      "isBattle": false,
       "animations": [
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
         "q.look('head_ai')",
@@ -35,6 +34,9 @@
           "part": "wing_closed_left",
           "isVisible": true
         }
+      ],
+      "quirks": [
+        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "walking": {
@@ -65,6 +67,9 @@
           "part": "wing_closed_left",
           "isVisible": true
         }
+      ],
+      "quirks": [
+        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "hover": {
@@ -96,6 +101,9 @@
           "part": "wing_closed_left",
           "isVisible": false
         }
+      ],
+      "quirks": [
+        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "fly": {
@@ -128,6 +136,9 @@
           "part": "wing_closed_left",
           "isVisible": false
         }
+      ],
+      "quirks": [
+        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "sleep": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0656_froakie/froakie.json

@@ -27,7 +27,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'ground_idle')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
       },
       "walking": {
          "poseTypes": ["WALK"],
@@ -36,7 +36,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'ground_walk')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
       },
       "swimming": {
          "poseTypes": ["WALK","SWIM"],
@@ -46,7 +46,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'water_swim')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
       },
       "float": {
          "poseTypes": ["STAND","FLOAT"],
@@ -55,7 +55,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'water_idle')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
       },
       "sleep": {
          "poseTypes": ["SLEEP"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0657_frogadier/frogadier.json

@@ -27,7 +27,7 @@
             "q.look('head_ai', 1, 1, 5, -45, 45, -45)",
             "q.bedrock('frogadier', 'ground_idle')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
       },
       "walking": {
          "poseTypes": ["WALK"],
@@ -36,7 +36,7 @@
             "q.look('head_ai', 1, 1, 0, -45, 45, -45)",
             "q.bedrock('frogadier', 'ground_walk')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
       },
       "swimming": {
          "poseTypes": ["WALK","SWIM"],
@@ -46,7 +46,7 @@
             "q.look('head_ai')",
             "q.bedrock('frogadier', 'water_swim')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
       },
       "float": {
          "poseTypes": ["STAND","FLOAT"],
@@ -55,7 +55,7 @@
             "q.look('head_ai')",
             "q.bedrock('frogadier', 'water_idle')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
       },
       "sleep": {
          "poseTypes": ["SLEEP"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0658_greninja/greninja.json

@@ -66,7 +66,7 @@
             "q.bedrock('greninja', math.random(0, 1) < 0.4 ? 'ground_idle_alt' : 'ground_idle')"
          ],
          "quirks": [
-            "q.bedrock_quirk('greninja', q.array('quirk_look_left', 'quirk_look_right'), 8, 30, 1)"
+            "q.bedrock_quirk('greninja', 'blink')","q.bedrock_quirk('greninja', q.array('quirk_look_left', 'quirk_look_right'), 8, 30, 1)"
          ]
       },
       "walking": {
@@ -78,7 +78,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'ground_walk')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"]
       },
       "running": {
          "poseTypes": ["WALK"],
@@ -89,7 +89,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'ground_run')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"]
       },
       "surface-swimming": {
          "poseTypes": ["WALK","SWIM"],
@@ -101,7 +101,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_swim')"
          ],
-         "quirks": [],
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
          "transformedParts": [
             {
                "part": "body",
@@ -118,7 +118,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_idle')"
          ],
-         "quirks": [],
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
          "transformedParts": [
             {
                "part": "body",
@@ -136,7 +136,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_swim')"
          ],
-         "quirks": [],
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
          "transformedParts": [
             {
                "part": "body",
@@ -153,7 +153,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_idle')"
          ],
-         "quirks": [],
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
          "transformedParts": [
             {
                "part": "body",

common/src/main/resources/assets/cobblemon/lang/en_us.json

@@ -383,7 +383,7 @@
   "item.cobblemon.eject_pack.tooltip_1": "Switches out the holder if any stats are lowered",
   "item.cobblemon.eject_pack.tooltip_2": "Consumed after use",
   "item.cobblemon.electric_seed": "Electric Seed",
-  "item.cobblemon.electric_seed.tooltip": "Boosts the holder's Defense in Electric terrain",
+  "item.cobblemon.electric_seed.tooltip": "Boosts the holder's Defense in Electric Terrain",
   "item.cobblemon.everstone": "Everstone",
   "item.cobblemon.everstone.tooltip": "Prevents the holder from evolving",
   "item.cobblemon.eviolite": "Eviolite",
@@ -402,7 +402,7 @@
   "item.cobblemon.focus_sash.tooltip_1": "Prevents the holder from fainting in a single hit",
   "item.cobblemon.focus_sash.tooltip_2": "Consumed after use",
   "item.cobblemon.grassy_seed": "Grassy Seed",
-  "item.cobblemon.grassy_seed.tooltip": "Boosts the holder's Defense in Grassy terrain",
+  "item.cobblemon.grassy_seed.tooltip": "Boosts the holder's Defense in Grassy Terrain",
   "item.cobblemon.grip_claw": "Grip Claw",
   "item.cobblemon.hard_stone": "Hard Stone",
   "item.cobblemon.hard_stone.tooltip": "Boosts the power of the holder's Rock-type moves",
@@ -507,7 +507,7 @@
   "item.cobblemon.mirror_herb.tooltip_1": "Allows the holder to mirror an opponent's stat increases to boost its own stats",
   "item.cobblemon.mirror_herb.tooltip_2": "Consumed after use",
   "item.cobblemon.misty_seed": "Misty Seed",
-  "item.cobblemon.misty_seed.tooltip": "Boosts the holder's Sp. Def in Misty terrain",
+  "item.cobblemon.misty_seed.tooltip": "Boosts the holder's Sp. Def in Misty Terrain",
   "item.cobblemon.power_herb": "Power Herb",
   "item.cobblemon.power_herb.tooltip_1": "Allows the holder to immediately use a move that normally requires a change of turn to charge",
   "item.cobblemon.power_herb.tooltip_2": "Consumed after use",
@@ -535,7 +535,7 @@
   "item.cobblemon.power_weight": "Power Weight",
   "item.cobblemon.power_weight.tooltip": "Grants 8 HP EVs when gaining experience in battle",
   "item.cobblemon.psychic_seed": "Psychic Seed",
-  "item.cobblemon.psychic_seed.tooltip": "Boosts the holder's Sp. Def in Psychic terrain",
+  "item.cobblemon.psychic_seed.tooltip": "Boosts the holder's Sp. Def in Psychic Terrain",
   "item.cobblemon.flame_orb": "Flame Orb",
   "item.cobblemon.flame_orb.tooltip": "Burns the holder",
   "item.cobblemon.smoke_ball": "Smoke Ball",
@@ -2434,6 +2434,8 @@
   "cobblemon.config.ui.max_pokemon_level.tooltip": "The maximum level Pokémon can get to.",
   "cobblemon.config.ui.max_pokemon_friendship": "Max Pokémon Friendship",
   "cobblemon.config.ui.max_pokemon_friendship.tooltip": "The maximum friendship value.",
+  "cobblemon.config.ui.power_item_ride_stat_gain_interval_seconds": "Power Item Riding Stat Training Interval (Seconds)",
+  "cobblemon.config.ui.power_item_ride_stat_gain_interval_seconds.tooltip": "Seconds between riding stat gains while riding a Pokémon holding a Power item. Defaults to 120 seconds. Set to -1 or 0 to disable; values below -1 are clamped to -1.",
   "cobblemon.config.ui.announce_drop_items": "Announce Drop Items",
   "cobblemon.config.ui.announce_drop_items.tooltip": "Whether to notify the Player of dropped items from defeating wild Pokémon.",
   "cobblemon.config.ui.default_drop_item_method": "Default Drop Item Method",

common/src/main/resources/assets/cobblemon/lang/ko_kr.json

@@ -6526,7 +6526,7 @@
     "cobblemon.move.10000000voltthunderbolt": "1000만볼트",
     "cobblemon.species.unown-x.desc": "고대 문자를 닮은 모습의 포켓몬이다. 먼저 생겨난 것은 문자인가 안농인가. 연구 중이지만 아직도 수수께끼다.",
     "cobblemon.ui.pokedex.info.form.qwilfish-hisui": "히스이의 모습",
-    "cobblemon.ui.pokedex.info.form.groudon-primal": "원시그란돈",
+    "cobblemon.ui.pokedex.info.form.groudon-primal": "원시회귀",
     "cobblemon.ui.pokedex.info.form.burmy-sandy": "모래땅도롱",
     "cobblemon.ui.pokedex.info.form.abomasnow-mega": "메가눈설왕",
     "cobblemon.species.rotom-frost.desc": "특수한 모터로 움직이는 냉장고에 들어갔다. 냉기를 뿜으며 싸운다.",
@@ -6758,7 +6758,7 @@
     "cobblemon.species.salamence-mega.desc": "앞다리를 껍질 틈에 얹어서 비행 태세를 갖춘다. 복잡한 지형도 고속으로 날아다닌다.",
     "cobblemon.species.metagross-mega.desc": "이길 수 없다고 판단하면 발톱으로 상대를 붙잡고 대폭발의 카운트를 시작한다.",
     "cobblemon.species.latios-mega.desc": "본 것이나 생각한 이미지를 상대방에게 영상으로 보여주는 능력을 지녔다. 인간의 말을 이해할 수 있다.",
-    "cobblemon.ui.pokedex.info.form.kyogre-primal": "원시가이오가",
+    "cobblemon.ui.pokedex.info.form.kyogre-primal": "원시회귀",
     "cobblemon.species.deoxys-attack.desc": "공격적인 형상으로 변화한 테오키스. 다른 모습을 보여 적을 혼란시키는 힘을 가졌다.",
     "cobblemon.ui.pokedex.info.form.deoxys-speed": "스피드폼",
     "cobblemon.ui.pokedex.info.form.burmy-trash": "슈레도롱",
@@ -9549,5 +9549,125 @@
     "cobblemon.config.ui.world_spawning_blocklist": "월드별 스폰 차단 목록",
     "cobblemon.config.ui.world_spawning_blocklist.tooltip": "포켓몬 생성 로직을 비활성화하는 월드입니다.",
     "advancements.cobblemon.obtain_tm": "기술을 보여줘!",
-    "advancements.cobblemon.obtain_tm.description": "TM을 찾거나 제작하세요"
+    "advancements.cobblemon.obtain_tm.description": "TM을 찾거나 제작하세요",
+    "itemGroup.cobblemon.tm_item": "코블몬: 기술머신",
+    "block.cobblemon.pomohana": "이글이글꽃",
+    "block.cobblemon.pauvillea": "파칙파칙꽃",
+    "block.cobblemon.lobaila": "훌라훌라꽃",
+    "block.cobblemon.wistensu": "하늘하늘꽃",
+    "block.cobblemon.voltaconia": "찌릿꽃",
+    "block.cobblemon.verdroot": "풀빛뿌리",
+    "block.cobblemon.lucibell": "빛방울꽃",
+    "block.cobblemon.mistleaf": "안개잎",
+    "cobblemon.ui.pokedex.info.evolution_tree": "진화 계통",
+    "cobblemon.ui.pokedex.evolution.item_interact.tooltip": "진화하려면 %1$s 필요",
+    "cobblemon.ui.pokedex.evolution.trade.tooltip.with_species": "%1$s와(과) 교환 시 진화",
+    "cobblemon.ui.pokedex.evolution.trade.tooltip.with_any_species": "교환 시 진화",
+    "cobblemon.ui.pokedex.evolution.shedder.tooltip": "남는 몬스터볼과 파티 빈칸도 필요",
+    "cobblemon.ui.pokedex.evolution.or": "또는",
+    "cobblemon.ui.pokedex.evolution.one_of": "다음 중 하나:",
+    "cobblemon.ui.pokedex.requirement.advancement.tooltip": "발전 과제 %1$s 달성 필요",
+    "cobblemon.ui.pokedex.requirement.battle_critical_hits.tooltip": "배틀에서 급소 %1$s회 맞히기",
+    "cobblemon.ui.pokedex.requirement.biome.anticondition.tooltip": "%1$s 바이옴 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.biome.both.tooltip": "%1$s 바이옴 안, %2$s 바이옴 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.biome.tooltip": "%1$s 바이옴에 있기",
+    "cobblemon.ui.pokedex.requirement.blocks_traveled.tooltip": "%1$s블록 이동하기",
+    "cobblemon.ui.pokedex.requirement.damage_taken.tooltip": "배틀에서 기절하지 않고 데미지 %1$s 받기",
+    "cobblemon.ui.pokedex.requirement.defeat.tooltip": "배틀에서 %1$s을(를) 쓰러뜨리기",
+    "cobblemon.ui.pokedex.requirement.friendship.tooltip": "친밀도 %1$s 이상 필요",
+    "cobblemon.ui.pokedex.requirement.has_move.tooltip": "기술 %1$s 배우고 있기",
+    "cobblemon.ui.pokedex.requirement.has_move_type.tooltip": "%1$s 타입 기술 배우고 있기",
+    "cobblemon.ui.pokedex.requirement.held_item.tooltip": "%1$s 지니고 있기",
+    "cobblemon.ui.pokedex.requirement.level.tooltip.min": "레벨 %1$s부터 진화",
+    "cobblemon.ui.pokedex.requirement.level.tooltip.between": "레벨 %1$s~%2$s 사이에 진화",
+    "cobblemon.ui.pokedex.requirement.moon_phase.tooltip": "달 모양이 %1$s일 때 진화",
+    "cobblemon.ui.pokedex.requirement.nature.toxtricity_amped": "§a노력§r, §a용감§r, §a고집§r, §a개구쟁이§r, §a온순§r, §a장난꾸러기§r, §a촐랑§r, §a성급§r, §a명랑§r, §a천진난만§r, §a덜렁§r, §a건방§r, §a변덕§r 성격 중 하나",
+    "cobblemon.ui.pokedex.requirement.nature.toxtricity_low_key": "§a외로움§r, §a대담§r, §a무사태평§r, §a겁쟁이§r, §a성실§r, §a조심§r, §a의젓§r, §a냉정§r, §a수줍음§r, §a차분§r, §a얌전§r, §a신중§r 성격 중 하나",
+    "cobblemon.ui.pokedex.requirement.negate.tooltip": "아님: %1$s",
+    "cobblemon.ui.pokedex.requirement.nickname.malamar": "이름이 §aDinnerbone§r 또는 §aGrumm§r이어야 함",
+    "cobblemon.ui.pokedex.requirement.party_member.anticondition.tooltip": "파티에 %1$s 포켓몬이 없기",
+    "cobblemon.ui.pokedex.requirement.party_member.tooltip": "파티에 %1$s 포켓몬이 있기",
+    "cobblemon.ui.pokedex.requirement.pokemon_properties.tooltip": "조건: %1$s",
+    "cobblemon.ui.pokedex.requirement.properties.and": "%1$s, %2$s",
+    "cobblemon.ui.pokedex.requirement.properties.custom.cocoon_species": "%1$s 고치",
+    "cobblemon.ui.pokedex.requirement.properties.held_item": "%1$s 지닌",
+    "cobblemon.ui.pokedex.requirement.properties.int_feature": "%1$s %2$s",
+    "cobblemon.ui.pokedex.requirement.properties.nature": "%1$s 성격",
+    "cobblemon.ui.pokedex.requirement.properties.nickname": "이름이 %1$s인",
+    "cobblemon.ui.pokedex.requirement.properties.type": "%1$s 타입",
+    "cobblemon.ui.pokedex.requirement.property_range.tooltip": "%1$s이(가) %2$s~%3$s 사이여야 함",
+    "cobblemon.ui.pokedex.requirement.recoil.tooltip": "배틀에서 반동 데미지 %1$s 받기",
+    "cobblemon.ui.pokedex.requirement.stat_compare.tooltip": "%1$s이(가) %2$s보다 높아야 함",
+    "cobblemon.ui.pokedex.requirement.stat_equal.tooltip": "%1$s와(과) %2$s이(가) 같아야 함",
+    "cobblemon.ui.pokedex.requirement.structure.anticondition.tooltip": "%1$s 구조물 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.structure.both.tooltip": "%1$s 구조물 안, %2$s 구조물 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.structure.tooltip": "%1$s 구조물에 있기",
+    "cobblemon.ui.pokedex.requirement.time_range.tooltip": "%1$s에 진화",
+    "cobblemon.ui.pokedex.requirement.use_move.tooltip": "배틀에서 기술 %1$s 사용하기",
+    "cobblemon.ui.pokedex.requirement.weather.tooltip.raining": "비가 올 때 진화",
+    "cobblemon.ui.pokedex.requirement.weather.tooltip.thundering": "뇌우가 칠 때 진화",
+    "cobblemon.ui.moon_phase.full_moon": "보름달",
+    "cobblemon.ui.moon_phase.waning_gibbous": "기우는 볼록달",
+    "cobblemon.ui.moon_phase.third_quarter": "하현달",
+    "cobblemon.ui.moon_phase.waning_crescent": "그믐달",
+    "cobblemon.ui.moon_phase.new_moon": "삭",
+    "cobblemon.ui.moon_phase.waxing_crescent": "초승달",
+    "cobblemon.ui.moon_phase.first_quarter": "상현달",
+    "cobblemon.ui.moon_phase.waxing_gibbous": "차오르는 볼록달",
+    "cobblemon.ui.time_range.any": "언제든",
+    "cobblemon.ui.time_range.day": "낮",
+    "cobblemon.ui.time_range.night": "밤",
+    "cobblemon.ui.time_range.noon": "정오",
+    "cobblemon.ui.time_range.midnight": "자정",
+    "cobblemon.ui.time_range.dawn": "새벽",
+    "cobblemon.ui.time_range.dusk": "해 질 녘",
+    "cobblemon.ui.time_range.twilight": "황혼",
+    "cobblemon.ui.time_range.morning": "아침",
+    "cobblemon.ui.time_range.afternoon": "오후",
+    "cobblemon.ui.time_range.predawn": "동트기 전",
+    "cobblemon.ui.time_range.evening": "저녁",
+    "cobblemon.subtitle.item.bright_powder.use": "반짝가루가 빛남",
+    "cobblemon.config.ui.type_gem_max_connected": "연결된 타입주얼 블록 최대 수",
+    "cobblemon.config.ui.type_gem_min_growth": "타입주얼 최소 성장",
+    "cobblemon.config.ui.type_gem_growth_chance": "타입주얼 성장 확률",
+    "cobblemon.config.ui.type_gem_initial_expansion_cycles": "타입주얼 초기 확장 횟수",
+    "cobblemon.battle.activate.ficklebeam": "%1$s은(는) 전력을 다해 공격한다!",
+    "tag.item.cobblemon.oricorio_flowers": "꽃꿀 꽃",
+    "tag.item.cobblemon.terrain_plants": "필드 식물",
+    "tag.item.cobblemon.tall_flowers": "큰 꽃",
+    "tag.worldgen.biome.cobblemon.evolution.regional.bergmite_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.bergmite_kalosbiome": "칼로스",
+    "tag.worldgen.biome.cobblemon.evolution.regional.cubone_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.cubone_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dartrix_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dartrix_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dewott_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dewott_unovabiome": "하나",
+    "tag.worldgen.biome.cobblemon.evolution.regional.exeggcute_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.exeggcute_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.goomy_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.goomy_kalosbiome": "칼로스",
+    "tag.worldgen.biome.cobblemon.evolution.regional.koffing_galarbiome": "가라르",
+    "tag.worldgen.biome.cobblemon.evolution.regional.koffing_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.mimejr_galarbiome": "가라르",
+    "tag.worldgen.biome.cobblemon.evolution.regional.mimejr_sinnohbiome": "신오",
+    "tag.worldgen.biome.cobblemon.evolution.regional.petilil_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.petilil_unovabiome": "하나",
+    "tag.worldgen.biome.cobblemon.evolution.regional.pikachu_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.pikachu_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.quilava_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.quilava_johtobiome": "성도",
+    "tag.worldgen.biome.cobblemon.evolution.regional.rufflet_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.rufflet_unovabiome": "하나",
+    "cobblemon.ui.pokedex.info.form.vivillon-icy snow": "빙설의 모양",
+    "cobblemon.species.vivillon-icy-snow.desc": "태어난 땅의 기후나 풍토에 영향을 받아 모양이 달라진다. 얼어붙은 땅에서의 모습이다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-high plains": "황야의 모양",
+    "cobblemon.species.vivillon-high-plains.desc": "태어난 땅의 기후나 풍토에 영향을 받아 모양이 달라진다. 비가 적게 내리는 땅에서의 모습이다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-inferno": "지옥의 모양",
+    "cobblemon.species.vivillon-inferno.desc": "살고 있는 장소의 기후나 풍토에 따라 날개의 모양이 다른 포켓몬이다. 화려한 색의 날개 가루를 뿌린다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-void": "공허의 모양",
+    "cobblemon.species.vivillon-void.desc": "살고 있는 장소의 기후나 풍토에 따라 날개의 모양이 다른 포켓몬이다. 화려한 색의 날개 가루를 뿌린다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-forsaken": "망각의 모양",
+    "cobblemon.species.vivillon-forsaken.desc": "살고 있는 장소의 기후나 풍토에 따라 날개의 모양이 다른 포켓몬이다. 화려한 색의 날개 가루를 뿌린다.",
+    "cobblemon.species.minior-red.desc": "겉껍질이 벗겨진 모습. 코어의 색이 다른 이유는 먹은 먹이의 성분이 다르기 때문이다."
 }

common/src/main/resources/assets/cobblemon/lang/zh_cn.json

@@ -9677,5 +9677,6 @@
     "cobblemon.config.ui.world_spawning_blocklist": "维度生成黑名单",
     "cobblemon.config.ui.world_spawning_blocklist.tooltip": "禁用宝可梦生成逻辑的维度。",
     "advancements.cobblemon.obtain_tm": "让我看看你的招式",
-    "advancements.cobblemon.obtain_tm.description": "发现或刻写一个招式学习器"
+    "advancements.cobblemon.obtain_tm.description": "发现或刻写一个招式学习器",
+    "itemGroup.cobblemon.tm_item": "招式学习器"
 }

common/src/main/resources/assets/cobblemon/sounds.json

@@ -1653,6 +1653,18 @@
   "move.horndrill.target_2": {
     "sounds": [ { "name": "cobblemon:move/horndrill/horndrill_target_2", "volume": 1.0 } ]
   },
+  "move.gigatonhammer.actor": {
+    "sounds": [ { "name": "cobblemon:move/gigatonhammer/gigatonhammer_actor", "volume": 1.0 } ]
+  },
+  "move.gigatonhammer.target": {
+    "sounds": [ { "name": "cobblemon:move/gigatonhammer/gigatonhammer_target", "volume": 1.0 } ]
+  },
+  "move.pyroball.actor": {
+    "sounds": [ { "name": "cobblemon:move/pyroball/pyroball_actor", "volume": 1.0 } ]
+  },
+  "move.pyroball.target": {
+    "sounds": [ { "name": "cobblemon:move/pyroball/pyroball_target", "volume": 1.0 } ]
+  },
   "impact.normal": {
     "sounds": [
       { "name": "cobblemon:move/impact_generic/impact_generic_fighting_1", "volume": 0.8 },
@@ -2031,6 +2043,850 @@
       { "name": "cobblemon:animation/wings/steel_wing_flap_medium_8", "volume": 0.25 }
     ]
   },
+  "stepsound.dirt.standard.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_1", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_2", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_3", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_4", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_5", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_6", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_7", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_8", "volume": 0.2 }
+    ]
+  },
+  "stepsound.dirt.standard.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_1", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_2", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_3", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_4", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_5", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_6", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_7", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_8", "volume": 0.1 }
+    ]
+  },
+  "stepsound.grass.standard.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_1", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_2", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_3", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_4", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_5", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_6", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_7", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_8", "volume": 0.2 }
+    ]
+  },
+  "stepsound.grass.standard.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_1", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_2", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_3", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_4", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_5", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_6", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_7", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_8", "volume": 0.1 }
+    ]
+  },
+  "stepsound.stone.standard.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_1", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_2", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_3", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_4", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_5", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_6", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_7", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_8", "volume": 0.2 }
+    ]
+  },
+  "stepsound.stone.standard.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_1", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_2", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_3", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_4", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_5", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_6", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_7", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_8", "volume": 0.1 }
+    ]
+  },
+  "stepsound.sand.standard.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_1", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_2", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_3", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_4", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_5", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_6", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_7", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_8", "volume": 0.2 }
+    ]
+  },
+  "stepsound.sand.standard.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_1", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_2", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_3", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_4", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_5", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_6", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_7", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_8", "volume": 0.1 }
+    ]
+  },
+  "stepsound.snow.standard.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_1", "volume": 0.18 },
+      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_2", "volume": 0.18 },
+      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_3", "volume": 0.18 },
+      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_4", "volume": 0.18 },
+      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_5", "volume": 0.18 },
+      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_6", "volume": 0.18 },
+      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_7", "volume": 0.18 },
+      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_8", "volume": 0.18 }
+    ]
+  },
+  "stepsound.snow.standard.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_1", "volume": 0.08 },
+      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_2", "volume": 0.08 },
+      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_3", "volume": 0.08 },
+      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_4", "volume": 0.08 },
+      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_5", "volume": 0.08 },
+      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_6", "volume": 0.08 },
+      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_7", "volume": 0.08 },
+      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_8", "volume": 0.08 }
+    ]
+  },
+  "stepsound.wood.standard.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_1", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_2", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_3", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_4", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_5", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_6", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_7", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_8", "volume": 0.25 }
+    ]
+  },
+  "stepsound.wood.standard.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_1", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_2", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_3", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_4", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_5", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_6", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_7", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_8", "volume": 0.15 }
+    ]
+  },
+  "stepsound.mud.standard.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_1", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_2", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_3", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_4", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_5", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_6", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_7", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_8", "volume": 0.22 }
+    ]
+  },
+  "stepsound.mud.standard.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_1", "volume": 0.14 },
+      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_2", "volume": 0.14 },
+      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_3", "volume": 0.14 },
+      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_4", "volume": 0.14 },
+      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_5", "volume": 0.14 },
+      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_6", "volume": 0.14 },
+      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_7", "volume": 0.14 },
+      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_8", "volume": 0.14 }
+    ]
+  },
+  "stepsound.glass.standard.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_1", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_2", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_3", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_4", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_5", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_6", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_7", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_8", "volume": 0.2 }
+    ]
+  },
+  "stepsound.glass.standard.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_1", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_2", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_3", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_4", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_5", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_6", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_7", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_8", "volume": 0.1 }
+    ]
+  },
+  "stepsound.metal.standard.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_1", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_2", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_3", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_4", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_5", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_6", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_7", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_8", "volume": 0.2 }
+    ]
+  },
+  "stepsound.metal.standard.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_1", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_2", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_3", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_4", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_5", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_6", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_7", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_8", "volume": 0.1 }
+    ]
+  },
+  "stepsound.dirt.hoof.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_1", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_2", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_3", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_4", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_5", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_6", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_7", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_8", "volume": 0.25 }
+    ]
+  },
+  "stepsound.dirt.hoof.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_1", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_2", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_3", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_4", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_5", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_6", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_7", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_8", "volume": 0.15 }
+    ]
+  },
+  "stepsound.grass.hoof.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_1", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_2", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_3", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_4", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_5", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_6", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_7", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_8", "volume": 0.25 }
+    ]
+  },
+  "stepsound.grass.hoof.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_1", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_2", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_3", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_4", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_5", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_6", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_7", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_8", "volume": 0.15 }
+    ]
+  },
+
+  "stepsound.stone.hoof.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_1", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_2", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_3", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_4", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_5", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_6", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_7", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_8", "volume": 0.25 }
+    ]
+  },
+  "stepsound.stone.hoof.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_1", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_2", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_3", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_4", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_5", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_6", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_7", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_8", "volume": 0.15 }
+    ]
+  },
+  "stepsound.sand.hoof.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_1", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_2", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_3", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_4", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_5", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_6", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_7", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_8", "volume": 0.2 }
+    ]
+  },
+  "stepsound.sand.hoof.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_1", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_2", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_3", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_4", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_5", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_6", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_7", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_8", "volume": 0.1 }
+    ]
+  },
+  "stepsound.snow.hoof.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_1", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_2", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_3", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_4", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_5", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_6", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_7", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_8", "volume": 0.22 }
+    ]
+  },
+  "stepsound.snow.hoof.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_1", "volume": 0.12 },
+      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_2", "volume": 0.12 },
+      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_3", "volume": 0.12 },
+      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_4", "volume": 0.12 },
+      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_5", "volume": 0.12 },
+      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_6", "volume": 0.12 },
+      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_7", "volume": 0.12 },
+      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_8", "volume": 0.12 }
+    ]
+  },
+  "stepsound.wood.hoof.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_1", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_2", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_3", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_4", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_5", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_6", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_7", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_8", "volume": 0.25 }
+    ]
+  },
+  "stepsound.wood.hoof.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_1", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_2", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_3", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_4", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_5", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_6", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_7", "volume": 0.15 },
+      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_8", "volume": 0.15 }
+    ]
+  },
+  "stepsound.mud.hoof.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_1", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_2", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_3", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_4", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_5", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_6", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_7", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_8", "volume": 0.2 }
+    ]
+  },
+  "stepsound.mud.hoof.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_1", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_2", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_3", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_4", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_5", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_6", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_7", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_8", "volume": 0.1 }
+    ]
+  },
+  "stepsound.glass.hoof.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_1", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_2", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_3", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_4", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_5", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_6", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_7", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_8", "volume": 0.2 }
+    ]
+  },
+  "stepsound.glass.hoof.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_1", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_2", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_3", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_4", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_5", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_6", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_7", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_8", "volume": 0.1 }
+    ]
+  },
+
+  "stepsound.metal.hoof.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_1", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_2", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_3", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_4", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_5", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_6", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_7", "volume": 0.2 },
+      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_8", "volume": 0.2 }
+    ]
+  },
+  "stepsound.metal.hoof.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_1", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_2", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_3", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_4", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_5", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_6", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_7", "volume": 0.1 },
+      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_8", "volume": 0.1 }
+    ]
+  },
+  "stepsound.grass.minecraft": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "step/grass1", "volume": 0.05 },
+      { "name": "step/grass2", "volume": 0.05 },
+      { "name": "step/grass3", "volume": 0.05 },
+      { "name": "step/grass4", "volume": 0.05 },
+      { "name": "step/grass5", "volume": 0.05 },
+      { "name": "step/grass6", "volume": 0.05 }
+    ]
+  },
+  "stepsound.glass.minecraft": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "step/stone1", "volume": 0.05 },
+      { "name": "step/stone2", "volume": 0.05 },
+      { "name": "step/stone3", "volume": 0.05 },
+      { "name": "step/stone4", "volume": 0.05 },
+      { "name": "step/stone5", "volume": 0.05 },
+      { "name": "step/stone6", "volume": 0.05 }
+    ]
+  },
+  "stepsound.dirt.minecraft": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "step/gravel1", "volume": 0.05 },
+      { "name": "step/gravel2", "volume": 0.05 },
+      { "name": "step/gravel3", "volume": 0.05 },
+      { "name": "step/gravel4", "volume": 0.05 }
+    ]
+  },
+  "stepsound.mud.minecraft": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "block/mud/step1", "volume": 0.2 },
+      { "name": "block/mud/step2", "volume": 0.2 },
+      { "name": "block/mud/step3", "volume": 0.2 },
+      { "name": "block/mud/step4", "volume": 0.2 },
+      { "name": "block/mud/step5", "volume": 0.2 },
+      { "name": "block/mud/step6", "volume": 0.2 }
+    ]
+  },
+  "stepsound.stone.minecraft": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "step/stone1", "volume": 0.08 },
+      { "name": "step/stone2", "volume": 0.08 },
+      { "name": "step/stone3", "volume": 0.08 },
+      { "name": "step/stone4", "volume": 0.08 },
+      { "name": "step/stone5", "volume": 0.08 },
+      { "name": "step/stone6", "volume": 0.08 }
+    ]
+  },
+  "stepsound.wood.minecraft": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "block/cherry_wood/step1", "volume": 0.2 },
+      { "name": "block/cherry_wood/step2", "volume": 0.2 },
+      { "name": "block/cherry_wood/step3", "volume": 0.2 },
+      { "name": "block/cherry_wood/step4", "volume": 0.2 },
+      { "name": "block/cherry_wood/step5", "volume": 0.2 },
+      { "name": "block/cherry_wood/step6", "volume": 0.2 }
+    ]
+  },
+  "stepsound.metal.minecraft": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "block/copper/step1", "volume": 0.2 },
+      { "name": "block/copper/step2", "volume": 0.2 },
+      { "name": "block/copper/step3", "volume": 0.2 },
+      { "name": "block/copper/step4", "volume": 0.2 },
+      { "name": "block/copper/step5", "volume": 0.2 },
+      { "name": "block/copper/step6", "volume": 0.2 }
+    ]
+  },
+  "stepsound.sand.minecraft": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "step/sand1", "volume": 0.08 },
+      { "name": "step/sand2", "volume": 0.08 },
+      { "name": "step/sand3", "volume": 0.08 },
+      { "name": "step/sand4", "volume": 0.08 },
+      { "name": "step/sand5", "volume": 0.08 }
+    ]
+  },
+  "stepsound.snow.minecraft": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "step/snow1", "volume": 0.08 },
+      { "name": "step/snow2", "volume": 0.08 },
+      { "name": "step/snow3", "volume": 0.08 },
+      { "name": "step/snow4", "volume": 0.08 }
+    ]
+  },
+  "stepsound.amethyst.minecraft": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "block/amethyst/step1", "volume":  0.11 },
+      { "name": "block/amethyst/step2", "volume":  0.11 },
+      { "name": "block/amethyst/step3", "volume":  0.11 },
+      { "name": "block/amethyst/step4", "volume":  0.11 },
+      { "name": "block/amethyst/step5", "volume":  0.11 },
+      { "name": "block/amethyst/step6", "volume":  0.11 },
+      { "name": "block/amethyst/step7", "volume":  0.11 },
+      { "name": "block/amethyst/step8", "volume":  0.11 },
+      { "name": "block/amethyst/step9", "volume":  0.11 },
+      { "name": "block/amethyst/step10", "volume":  0.11 },
+      { "name": "block/amethyst/step11", "volume":  0.11 },
+      { "name": "block/amethyst/step12", "volume":  0.11 },
+      { "name": "block/amethyst/step13", "volume":  0.11 },
+      { "name": "block/amethyst/step14", "volume":  0.11 }
+    ]
+  },
+  "stepsound.grass.claw.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_1", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_2", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_3", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_4", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_5", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_6", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_7", "volume": 0.25 },
+      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_8", "volume": 0.25 }
+    ]
+  },
+  "stepsound.grass.claw.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_1", "volume": 0.14 },
+      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_2", "volume": 0.14 },
+      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_3", "volume": 0.14 },
+      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_4", "volume": 0.14 },
+      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_5", "volume": 0.14 },
+      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_6", "volume": 0.14 },
+      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_7", "volume": 0.14 },
+      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_8", "volume": 0.14 }
+    ]
+  },
+  "stepsound.dirt.claw.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_1", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_2", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_3", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_4", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_5", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_6", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_7", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_8", "volume": 0.22 }
+    ]
+  },
+  "stepsound.dirt.claw.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_1", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_2", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_3", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_4", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_5", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_6", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_7", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_8", "volume": 0.11 }
+    ]
+  },
+  "stepsound.stone.claw.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_1", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_2", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_3", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_4", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_5", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_6", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_7", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_8", "volume": 0.22 }
+    ]
+  },
+  "stepsound.stone.claw.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_1", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_2", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_3", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_4", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_5", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_6", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_7", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_8", "volume": 0.11 }
+    ]
+  },
+  "stepsound.sand.claw.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_1", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_2", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_3", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_4", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_5", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_6", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_7", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_8", "volume": 0.22 }
+    ]
+  },
+  "stepsound.sand.claw.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_1", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_2", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_3", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_4", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_5", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_6", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_7", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_8", "volume": 0.11 }
+    ]
+  },
+  "stepsound.snow.claw.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_1", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_2", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_3", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_4", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_5", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_6", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_7", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_8", "volume": 0.22 }
+    ]
+  },
+  "stepsound.snow.claw.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_1", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_2", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_3", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_4", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_5", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_6", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_7", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_8", "volume": 0.11 }
+    ]
+  },
+  "stepsound.wood.claw.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_1", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_2", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_3", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_4", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_5", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_6", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_7", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_8", "volume": 0.22 }
+    ]
+  },
+  "stepsound.wood.claw.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_1", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_2", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_3", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_4", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_5", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_6", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_7", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_8", "volume": 0.11 }
+    ]
+  },
+  "stepsound.mud.claw.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_1", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_2", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_3", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_4", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_5", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_6", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_7", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_8", "volume": 0.22 }
+    ]
+  },
+  "stepsound.mud.claw.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_1", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_2", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_3", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_4", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_5", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_6", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_7", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_8", "volume": 0.11 }
+    ]
+  },
+  "stepsound.glass.claw.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_1", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_2", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_3", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_4", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_5", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_6", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_7", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_8", "volume": 0.22 }
+    ]
+  },
+  "stepsound.glass.claw.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_1", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_2", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_3", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_4", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_5", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_6", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_7", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_8", "volume": 0.11 }
+    ]
+  },
+
+  "stepsound.metal.claw.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_1", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_2", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_3", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_4", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_5", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_6", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_7", "volume": 0.22 },
+      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_8", "volume": 0.22 }
+    ]
+  },
+  "stepsound.metal.claw.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_1", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_2", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_3", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_4", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_5", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_6", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_7", "volume": 0.11 },
+      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_8", "volume": 0.11 }
+    ]
+  },
+  "stepsound.leaves.universal.large": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_1", "volume": 0.12 },
+      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_2", "volume": 0.12 },
+      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_3", "volume": 0.12 },
+      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_4", "volume": 0.12 },
+      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_5", "volume": 0.12 },
+      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_6", "volume": 0.12 },
+      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_7", "volume": 0.12 },
+      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_8", "volume": 0.12 }
+    ]
+  },
+  "stepsound.leaves.universal.medium": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_1", "volume": 0.06 },
+      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_2", "volume": 0.06 },
+      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_3", "volume": 0.06 },
+      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_4", "volume": 0.06 },
+      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_5", "volume": 0.06 },
+      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_6", "volume": 0.06 },
+      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_7", "volume": 0.06 },
+      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_8", "volume": 0.06 }
+    ]
+  },
   "ride.loop.wind.mono": {
     "sounds": [
       {
@@ -7828,6 +8684,9 @@
   "pokemon.cinderace.cry": {
     "sounds": [ { "name": "cobblemon:pokemon/cinderace/cinderace_cry", "volume": 0.8 } ]
   },
+  "pokemon.cinderace.pyroball": {
+    "sounds": [ { "name": "cobblemon:pokemon/cinderace/cinderace_pyroball", "volume": 0.5 } ]
+  },
   "pokemon.sobble.cry": {
     "sounds": [ {  "name": "cobblemon:pokemon/sobble/sobble_cry", "volume": 0.8 } ]
   },