Add lapras assets

2025-04-05 01:19:26 -04:00
1681 changed files with 36482 additions and 129640 deletions
@@ -1,11 +0,0 @@
-### Additions
- Added the Campfire Pot, made from apricorns and placed onto campfires.
-  - This pot can be used to make bait for fishing, Poké Cakes, Lure Cakes, local specialties, and potions (less efficiently than a brewing stand).
-  - There is a different pot for each apricorn colour because at this point I think we may have an addiction.
- Added Aprijuice, made from the Campfire Pot using apricorns with seasoning to give flavours.
-  - Aprijuice can be fed to ride-able Pokémon to improve their riding characteristics, depending on the flavour and the Pokémon's nature.
-
-### Datapack and Addon Changes
- Renamed the fishing_baits datapack folder to spawn_bait_effects.
- Added `seasonings` datapack folder for controlling usable items in the campfire pot and what colour and flavour they apply.
- Added campfire pot recipe type, which you could use to make anything work as fishing bait.
@@ -6,7 +6,6 @@
 - Added filter functionality in PC UI, which supports `PokemonProperties` (e.g. `shiny=yes` shows all shiny Pokémon).
 - Added `/changewallpaper <player> <boxNumber> <wallpaper>` command to change a box wallpaper through commands.
 - Added `/renamebox <player> <boxNumber> <name>` command to rename a PC box through commands.
- Added IVs and EVs stat displays in PC.

 ### Developer
 - Added `RenamePCBoxEvent.Pre` and `RenamePCBoxEvent.Post` events to prevent players from renaming a box or changing their input.
@@ -13,127 +13,14 @@
 - Added `visibility/hidden`, `visibility/hat` and `visibility/face` tags to control where and how certain items are rendered.
 - Added Pokémon markings, toggleable within the summary.
 - Added `/boxcount` command to change PC boxes amount
- Added cosmetics for Gurdurr, Conkeldurr, Squirtle Line, Sneasler, Sandile line, Treecko line, Braixen, Delphox, and Dragonite.
- Added cosmetics for Gurdurr, Conkeldurr, Squirtle Line, Sneasler, Sandle line, Treecko line, Braixen, Delphox, and Dragonite.
- Added `/transformmodelpart (position|rotation|scale) <modelPart> <transform: x y z>` command that can add transformations to a pokemon's model part.
-  - The player executing the command must be facing the target pokemon entity. Transformations are not persistent and will revert when resources are reloaded.
- Added lang keys for all moves and abilities up to Generation 9.
- Fixed Moon Ball moon phase logic to actually work correctly
- Added `translucent_cull` boolean option into resolver's layer to allow for translucent textures with culling
- Added [LambDynamicLights](https://modrinth.com/mod/lambdynamiclights) support for items held by Pokémon.
-
-### Pokémon Added
-
-#### Gen 2
- Dunsparce
-
-#### Gen 3
- Spoink
- Grumpig
- Snorunt
- Glalie
-
-#### Gen 4
- Bronzor
- Bronzong
- Croagunk
- Froslass
-
-#### Gen 5
- Pansage
- Simisage
- Pansear
- Simisear
- Panpour
- Simipour
- Munna
- Musharna
- Blitzle
- Zebstrika
- Trubbish
- Garbodor
-
-#### Gen 6
- Noibat
- Noivern
-
-#### Gen 7
- Drampa
-
-#### Gen 8
- Silicobra
- Sandaconda
-
-#### Gen 9
- Smoliv
- Dolliv
- Arboliva
- Orthworm
- Dudunsparce
-
-### Animation updates for the following Pokémon
- Garchomp
- Tropius
- Torpius
- Nosepass
- Probopass
- Sneasler
- Braixen
- Delphox
- Cinderace
- Kangaskhan
-
-### Model updates for the following Pokémon
- Gyarados
- Dragonite
- Eevee
- Vaporeon
- Jolteon
- Flareon
- Espeon
- Umbreon
- Leafeon
- Glaceon
- Sylveon
- Treecko
- Grovyle
- Sceptile
- Honchkrow
- Garchomp
- Pidgeot
- Nosepass
- Probopass
- Kangaskhan
- Cinderace
- Magnezone
- Metagross
- Added Syrupy Apples.

 ### Changes
 - Renamed `chargeGainedPerTick` config to `secondsToChargeHealingMachine`.
 - Made Blocks of Gold count as Big Nuggets when held by a Pokémon (for Fling functionality)
- Players can now eat Sweet and Tart Apples, Whipped Dreams, and the Alcremie Sweets.
- Updated Sweet and Tart Apple sprites
- Updated the following recipes: Air Balloon, Assault Vest, Binding Band, Black Belt, Blunder Policy, Choice Band, Choice Scarf, Cleanse Tag, Covert Cloak, Destiny Knot, Eject Button, Expert Belt, Focus Band, Focus Sash, Magnet, Metronome, Muscle Band, Power Anklet, Power Band, Power Belt, Power Bracer, Power Lens, Power Weight, Protective Pads, Protein, Punching Glove, Reaper Cloth, Rocky Helmet, Room Service, Sachet, Safety Goggles, Silk Scarf, Spell Tag, Utility Umbrella, Weakness Policy, Zinc
- Added alternate ingredient options to the following recipes: Cell Battery, Charcoal Stick, Dragon Fang, Miracle Seed, Mystic Water, Never Melt Ice, Twisted Spoon, Damp Rock, Heat Rock, Icy Rock, Smooth Rock
- Grouped together some recipes within the Recipe Book. Groups include: the seven basic Poké Balls, the seven basic Ancient Poké Balls, Gilded Chests, Pokedexes, and the Weather Rocks.
- Updated some item tags to better integrate behaviours between Cobblemon, Vanilla Minecraft, and other mods
-  - Removed Cooked Meat, Raw Meat, Protein Ingredients, and Zinc Ingredients, the first two are now using `c` namespace tags, the latter have better integrated use of tags within their recipes which removes need for custom tags.
-  - Added our seeds tag into `#c:seeds`, which is now made use of for the Miracle Seed recipe. 
- Tweaked the Natural Materials Vanilla file to fit with the changes to tags
 - Substantially optimised spawning checks mainly by front-loading biome filtering.
 - When using the `cobblemon` or `generation_9` capture calculators a critical capture with a single shake will always play for successful captures when you've already registered the Pokémon as caught in your Pokédex.
 - Improved the performance of saving Pokédex and player data.
 - Pokémon hitbox now scales with entity attribute `generic.scale`.
- Removed Shulker aspect and replaced it with cosmetic_item-shulker_shell.
- Shulker shell Forretress is now a cosmetic rather than a special evo and thus all shulker Forretress will revert back to normal until a shulker shell is put in their cosmetic slot.
- Updated `doPokemonSpawning` gamerule to support per-dimension configurations.
- The Pokedex now displays a form name of a "normal" Pokémon for when the base form is still a named form.
- Improved the zoom functionality of the Pokédex Scanner by giving the levels logarithmic scaling.
- Added a subtle rotation effect to the Pokédex Scanner's wheel when zooming.
- Improved parity with vanilla mobs' drop behavior; loot and XP drop on death instead of after the entire death sequence finishes.
- Quirk animations no longer play in the battle GUI since they were pretty distracting.
- A number of Pokemon that float above the ground visually (Gastly, Klingklang, etc.)  are no longer considered to be touching the ground

 ### Fixes
 - Fixed Particles sometimes facing the wrong direction (looking at you, Swords Dance)
@@ -156,15 +43,11 @@
 - Fixed field name in evolution requirements for Spewpa Pokeball.
 - Fixed LevelUpCriterion logic to correctly check that the Pokémon is a preEvo.
 - Fixed `hide_additional_tooltip` vanilla flag not properly hiding tooltips on pokerod and bait items
- Removed a number of scenarios in which a Pokémon battle may send out a Pokémon into collision geometry.
 - Fixed NPCs using Pokémon outside of their pool when a Pokémon name had a typo.
 - Fixed an issue with datapacked species features not being applied properly when relogging.
 - Fixed Pokémon marked as silent still playing shiny sounds and effects.
 - Fixed an issue with newer versions of Fabric API where underground Pokémon were spawning in The End.
 - Fixed spawning not working well when you're at high points surrounded by lower altitude spawning areas, such as flying.
- Fixed certain Pokémon with forms not having appropriate stock Pokédex entries.
- Fixed issue with Pokédex Scanner that caused the open/close overlay to have the wrong opacity values
- Fixed dragon's breath not being usable on the restoration tank when it should be

 ### Developer
 - A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
@@ -182,16 +65,7 @@
 - Updated NPCEntity beam positioning to properly account for the baseScale property.
 - Updated NPCEntity pokeball throw positioning to properly account for the baseScale property.
 - Fixed `[Pokemon].copyFrom` error causing forms, IVs, and EVs to not be applied properly when using `[Pokemon].loadFromJSON` or `[Pokemon].loadFromNBT`
- Added new item class, `WearableItem`. Instances of this class should have a corresponding 3D model. These models render when the items display context is `HEAD`.
- Pokemon now have a fireImmune attribute in their behaviour that can be set to true to ignore all fire damage (lava, magma blocks, etc.)
-  `JSON
-  {
-    "behaviour": {
-      "fireImmune": true
-    }
-  }
-  `
-  
+
 ### MoLang & Datapacks
 - The following usages for item predicates can now use item conditions like advancements do, you can learn about them in the [Minecraft wiki](https://minecraft.wiki/w/Advancement_definition#minecraft:filled_bucket)
  - The `requiredContext` for an item interaction evolution
@@ -201,15 +75,9 @@
 - Added `interpolate` boolean property to animated textures to allow gradual colour changes between frames.
 - Fixed species additions not being capable of changing implemented status.
 - Added support for action effects that are triggered by `|-activate|` Showdown instructions. `activate_{effect_id}` is the syntax.
- Added MoLang functions for rendering items `render_item(item_id, locator_name)` and `clear_items()`.
+- Added Molang functions for rendering items `render_item(item_id, locator_name)` and `clear_items()`.
 - Fixed location spawn filter components causing crashes
- Added `pokemon` as an available MoLang function for the `battleActor` functions.
- Added `spawn_pokemon` as an available MoLang function for the `worldHolder` functions.
- Added `attempt_wild_battle` as an available MoLang function.
 - Added `pokemon` as an available Molang function for the `battleActor` functions.
- Fixed `heldItem` property inside spawn files not working and causing crashes
- Fixed `spawn_bedrock_particles` MoLang causing crashes when used in a server environment
- The Pokédex form lang key definition now follows `cobblemon.ui.pokedex.info.form.{species}-{formname}` instead of `cobblemon.ui.pokedex.info.form.{formname}`.

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

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

 ### Cry updates for the following Pokémon
 - Sceptile
@@ -1,9 +1,8 @@
-
-import utilities.isSnapshot
-import utilities.version
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
+import utilities.isSnapshot
+import utilities.version

 /*
 *
@@ -13,12 +13,10 @@ import com.cobblemon.mod.common.client.render.layer.PokemonOnShoulderRenderer;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.pokemon.FormData;
 import com.cobblemon.mod.common.pokemon.lighthing.LightingData;
-import dev.lambdaurora.lambdynlights.LambDynLights;
 import dev.lambdaurora.lambdynlights.api.DynamicLightHandler;
 import dev.lambdaurora.lambdynlights.api.DynamicLightHandlers;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -55,19 +53,15 @@ public class LambDynamicLightsCompat {

    private static int resolvedPokemonLightLevel(PokemonEntity pokemon) {
        var underwater = !pokemon.level().getFluidState(BlockPos.containing(pokemon.getX(), pokemon.getEyeY(), pokemon.getZ())).isEmpty();
-
-        ItemStack item = pokemon.getShownItem();
-        int itemLightLevel = item.isEmpty()?0:LambDynLights.getLuminanceFromItemStack(item, underwater);
-        int formLightLevel = extractFormLightLevel(pokemon.getForm(), underwater).orElse(0);
-
-        return Math.max(itemLightLevel, formLightLevel);
+        return extractFormLightLevel(pokemon.getForm(), underwater).orElse(0);
    }

    private static int resolvedShoulderLightLevel(Player player) {
+        final var shoulderDataPair = PokemonOnShoulderRenderer.shoulderDataOf(player);
        var underwater = !player.level().getFluidState(BlockPos.containing(player.getX(), player.getEyeY(), player.getZ())).isEmpty();
-        final int leftLightLevel = extractShoulderLightLevel(PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityLeft()), underwater);
-        final int rightLightLevel = extractShoulderLightLevel(PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityRight()), underwater);
-        return Math.max(leftLightLevel, rightLightLevel);
+        final Optional<Integer> leftLightLevel = extractShoulderLightLevel(shoulderDataPair.getFirst(), underwater);
+        final Optional<Integer> rightLightLevel = extractShoulderLightLevel(shoulderDataPair.getSecond(), underwater);
+        return Math.max(leftLightLevel.orElse(0), rightLightLevel.orElse(0));
    }

    private static Optional<Integer> extractFormLightLevel(@NotNull FormData form, boolean underwater) {
@@ -77,16 +71,11 @@ public class LambDynamicLightsCompat {
        return Optional.of(form.getLightingData().getLightLevel());
    }

-    private static int extractShoulderLightLevel(@Nullable PokemonOnShoulderRenderer.ShoulderData shoulderData, boolean underwater) {
+    private static Optional<Integer> extractShoulderLightLevel(@Nullable PokemonOnShoulderRenderer.ShoulderData shoulderData, boolean underwater) {
        if (shoulderData == null) {
-            return 0;
+            return Optional.empty();
        }
-
-        ItemStack item = shoulderData.getShownItem();
-        int itemLightLevel = item.isEmpty()?0:LambDynLights.getLuminanceFromItemStack(item, underwater);
-        int formLightLevel = extractFormLightLevel(shoulderData.getForm(), underwater).orElse(0);
-
-        return Math.max(itemLightLevel, formLightLevel);
+        return extractFormLightLevel(shoulderData.getForm(), underwater);
    }

    private static boolean liquidGlowModeSupport(@NotNull LightingData.LiquidGlowMode liquidGlowMode, boolean underwater) {
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.block.SaccharineLeafBlock;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import org.objectweb.asm.Opcodes;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Desc;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.Slice;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
-
-
-@Mixin(targets = "net.minecraft.world.entity.animal.Bee$BeeGrowCropGoal")
-public abstract class BeeEntityMixin {
-
-    @Unique
-    private BlockState cobblemon$result = null;
-
-    @Inject(method = "tick()V", at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/world/level/block/BonemealableBlock;performBonemeal(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/util/RandomSource;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V",
-            shift = At.Shift.BY,
-            by = 2
-        ),
-        locals = LocalCapture.CAPTURE_FAILHARD
-    )
-    private void injectCustomGrowth(CallbackInfo ci, int i, BlockPos blockPos, BlockState blockState, Block block) {
-        if (block instanceof SaccharineLeafBlock) {
-
-            int age = blockState.getValue(SaccharineLeafBlock.Companion.getAGE());
-
-            if (age < 2) {
-                this.cobblemon$result = blockState.setValue(SaccharineLeafBlock.Companion.getAGE(), age + 1);
-            }
-        }
-    }
-
-    @ModifyVariable(method = "tick", at = @At(value = "LOAD", ordinal = 0), index = 5)
-    private BlockState applyCustomBlockState(BlockState before) {
-        if(this.cobblemon$result != null && before == null) {
-            BlockState result = this.cobblemon$result;
-            this.cobblemon$result = null;
-            return result;
-        }
-
-        return before;
-    }
-}
@@ -8,46 +8,19 @@

 package com.cobblemon.mod.common.mixin;

-import com.cobblemon.mod.common.OrientationControllable;
-import com.cobblemon.mod.common.api.orientation.OrientationController;
-import com.cobblemon.mod.common.api.riding.Seat;
-import com.cobblemon.mod.common.client.entity.PokemonClientDelegate;
-import com.cobblemon.mod.common.client.render.MatrixWrapper;
-import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState;
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel;
-import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.mojang.authlib.GameProfile;
-import net.minecraft.client.CameraType;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
-import org.jetbrains.annotations.NotNull;
-import org.joml.Matrix3f;
-import org.joml.Vector3f;
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

-import java.util.Map;
-
@Mixin(LocalPlayer.class)
-public abstract class LocalPlayerMixin extends AbstractClientPlayer implements OrientationControllable {
+public abstract class LocalPlayerMixin {
    @Shadow
    private float jumpRidingScale;

-    public LocalPlayerMixin(ClientLevel clientLevel, GameProfile gameProfile) {
-        super(clientLevel, gameProfile);
-    }
-
    @Inject(method = "getJumpRidingScale", at = @At("HEAD"), cancellable = true)
    public void modifyJumpRidingScale(CallbackInfoReturnable<Float> cir) {
        LocalPlayer player = (LocalPlayer) (Object) this;
@@ -61,59 +34,4 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
            }
        }
    }
-
-    @Override
-    public HitResult pick(double hitDistance, float partialTicks, boolean hitFluids) {
-        Entity vehicle = this.getVehicle();
-        if (vehicle instanceof PokemonEntity pokemonEntity) {
-            int seatIndex = pokemonEntity.getPassengers().indexOf(this);
-            Seat seat = pokemonEntity.getSeats().get(seatIndex);
-
-            PokemonClientDelegate delegate = (PokemonClientDelegate) pokemonEntity.getDelegate();
-            MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
-
-            if (locator == null) {
-                super.pick(hitDistance, partialTicks, hitFluids);
-            }
-
-            Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
-
-            OrientationController controller = this.getOrientationController();
-
-            float currEyeHeight = this.getEyeHeight();
-            Vector3f offset = new Vector3f(new Vector3f(0f, currEyeHeight - (this.getBbHeight() / 2), 0f));
-
-            if (Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON) {
-                PosableModel model = VaryingModelRepository.INSTANCE.getPoser(pokemonEntity.getPokemon().getSpecies().getResourceIdentifier(), new FloatingState());
-                offset.add(cobblemon$getFirstPersonOffset(model, seat));
-            }
-
-            Matrix3f orientation = controller.isActive() && controller.getOrientation() != null ? controller.getOrientation() : new Matrix3f();
-            Vec3 rotatedEyeHeight = new Vec3(orientation.transform(offset));
-
-            Vec3 eyePosition = locatorOffset.add(pokemonEntity.position()).add(rotatedEyeHeight);
-
-            Vec3 viewVector = this.getViewVector(partialTicks);
-            Vec3 viewDistanceVector = eyePosition.add(viewVector.x * hitDistance, viewVector.y * hitDistance, viewVector.z * hitDistance);
-            return this.level()
-                    .clip(
-                            new ClipContext(
-                                    eyePosition, viewDistanceVector, ClipContext.Block.OUTLINE, hitFluids ? net.minecraft.world.level.ClipContext.Fluid.ANY : net.minecraft.world.level.ClipContext.Fluid.NONE, this
-                            )
-                    );
-        }
-
-        return super.pick(hitDistance, partialTicks, hitFluids);
-    }
-
-    @Unique
-    private static @NotNull Vector3f cobblemon$getFirstPersonOffset(PosableModel model, Seat seat) {
-        Map<String, Vec3> cameraOffsets = model.getFirstPersonCameraOffset();
-
-        if (cameraOffsets.containsKey(seat.getLocator())) {
-            return cameraOffsets.get(seat.getLocator()).toVector3f();
-        } else {
-            return new Vector3f(0f, 0f, 0f);
-        }
-    }
 }
@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents;
 import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies;
+import com.cobblemon.mod.common.api.riding.Rideable;
 import com.cobblemon.mod.common.api.storage.party.PartyStore;
 import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore;
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags;
@@ -81,8 +82,7 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit

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

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

    @Inject(
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import net.minecraft.stats.RecipeBookSettings;
-import net.minecraft.world.inventory.RecipeBookType;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Map;
-
-@Mixin(RecipeBookSettings.class)
-public class RecipeBookSettingsMixin {
-
-
-    @Shadow @Final public Map<RecipeBookType, RecipeBookSettings.TypeSettings> states;
-
-    @Inject(method = "<init>", at = @At("TAIL"))
-    private void cobblemon$init(CallbackInfo ci) {
-        states.put(RecipeBookType.valueOf("COOKING_POT"), new RecipeBookSettings.TypeSettings(true, true));
-    }
-
-}
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import net.minecraft.world.inventory.RecipeBookType;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.gen.Invoker;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Mixin(value = RecipeBookType.class)
-public class RecipeBookTypeMixin {
-
-    @Final
-    @Mutable
-    @Shadow
-    private static RecipeBookType[] $VALUES; // moj
-
-    @Invoker("<init>")
-    private static RecipeBookType cobblemon$createBookType(String name, int ordinal) {
-        throw new AssertionError();
-    }
-
-    @Inject(
-            method = "<clinit>",
-            at = @At("TAIL")
-    )
-    private static void cobblemon$addRecipeBookType(CallbackInfo ci) {
-        ArrayList<RecipeBookType> types = new ArrayList<>(List.of($VALUES));
-        types.add(cobblemon$createBookType("COOKING_POT", $VALUES.length));
-        $VALUES = types.toArray(RecipeBookType[]::new);
-    }
-}
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.accessor;
-
-import net.minecraft.client.Camera;
-import net.minecraft.world.level.BlockGetter;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(Camera.class)
-public interface CameraAccessor {
-    @Accessor("level")
-    BlockGetter getLevel();
-}
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.accessor;
-
-import net.minecraft.client.gui.components.StateSwitchingButton;
-import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
-import net.minecraft.network.chat.Component;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(RecipeBookComponent.class)
-public interface RecipeBookComponentAccessor {
-    @Accessor("filterButton")
-    StateSwitchingButton getFilterButton();
-}
@@ -8,19 +8,19 @@

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

-import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.OrientationControllable;
+import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.riding.Rideable;
-import com.cobblemon.mod.common.client.MountedPokemonAnimationRenderController;
-import com.cobblemon.mod.common.client.render.camera.MountedCameraRenderer;
+import com.cobblemon.mod.common.api.riding.Seat;
+import com.cobblemon.mod.common.client.entity.PokemonClientDelegate;
+import com.cobblemon.mod.common.client.render.MatrixWrapper;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
+import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.phys.Vec3;
 import org.joml.Matrix3f;
 import org.joml.Quaternionf;
@@ -32,52 +32,38 @@ import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

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

-    @Shadow
-    private float eyeHeight;
-    @Shadow
-    private float eyeHeightOld;
+    @Shadow private Entity entity;
+    @Shadow @Final private Quaternionf rotation;
+    @Shadow @Final private Vector3f forwards;
+    @Shadow @Final private Vector3f up;
+    @Shadow @Final private Vector3f left;
+    @Shadow private float xRot;
+    @Shadow private float yRot;

-    @Shadow
-    protected abstract void setPosition(Vec3 pos);
+    @Shadow private Vec3 position;
+    @Shadow private float eyeHeight;
+    @Shadow private float eyeHeightOld;

-    @Unique
-    private float returnTimer = 0;
-    @Unique
-    private float rollAngleStart = 0;
-    @Unique
-    Minecraft minecraft = Minecraft.getInstance();
+    @Shadow protected abstract void setPosition(Vec3 pos);

-    @Unique
-    boolean disableRollableCameraDebug = false;
+    @Unique private float returnTimer = 0;
+    @Unique private float rollAngleStart = 0;
+    @Unique Minecraft minecraft = Minecraft.getInstance();
+
+    @Unique boolean disableRollableCameraDebug = false;

    @Inject(method = "setRotation", at = @At("HEAD"), cancellable = true)
-    public void cobblemon$setRotation(float f, float g, CallbackInfo ci) {
+    public void open_camera$setRotation(float f, float g, CallbackInfo ci) {
        if (!(this.entity instanceof OrientationControllable controllable) || disableRollableCameraDebug) return;
        var controller = controllable.getOrientationController();
        if (!controller.isActive() && controller.getOrientation() != null) {
-            if (this.returnTimer < 1) {
+            if(this.returnTimer < 1) {
                //Rotation is taken from entity since we no longer handle mouse ourselves
                //Stops a period of time when you can't input anything.
                controller.getOrientation().set(
@@ -85,61 +71,79 @@ public abstract class CameraMixin {
                                .rotateY((float) Math.toRadians(180 - this.entity.getYRot()))
                                .rotateX((float) Math.toRadians(-this.entity.getXRot()))
                );
-                if (rollAngleStart == 0) {
+                if(rollAngleStart == 0){
                    this.returnTimer = 1;
                    controller.reset();
                    return;
                }
-                controller.getOrientation().rotateZ((float) Math.toRadians(-rollAngleStart * (1 - returnTimer)));
-                cobblemon$applyRotation();
+                controller.getOrientation().rotateZ((float) Math.toRadians(-rollAngleStart*(1-returnTimer)));
+                applyRotation();
                this.returnTimer += .05F;
                ci.cancel();
-            }
-            else {
+            } else {
                this.returnTimer = 1;
                controller.reset();
            }
            return;
        }
        if (controller.getOrientation() == null) return;
-        cobblemon$applyRotation();
+        applyRotation();

        this.returnTimer = 0;
        this.rollAngleStart = controller.getRoll();
        ci.cancel();
    }

-    @Inject(method = "setup", at = @At("HEAD"))
-    private void cobblemon$tickAnimationPreRenders(BlockGetter level, Entity entity, boolean detached, boolean thirdPersonReverse, float partialTick, CallbackInfo ci) {
-        MountedPokemonAnimationRenderController.INSTANCE.reset();
-    }
-
+    //If you want to move this to a delagate you need an AW for position
    @WrapOperation(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;setPosition(DDD)V"))
-    public void cobblemon$positionCamera(Camera instance, double x, double y, double z, Operation<Void> original, @Local(ordinal = 1, argsOnly = true) boolean thirdPersonReverse) {
-        if (cobblemon$isRidingPokemon(entity)) {
-            Vec3 position = MountedCameraRenderer.INSTANCE.getCameraPosition(instance, entity, entity.getVehicle(), thirdPersonReverse, eyeHeightOld, eyeHeight);
-            if (position != null) {
-                setPosition(position);
+    public void positionCamera(Camera instance, double x, double y, double z, Operation<Void> original){
+        Entity entity = instance.getEntity();
+        Entity vehicle = entity.getVehicle();
+
+        if(vehicle instanceof Rideable){
+            //RidingCameraDelagate.INSTANCE.positionCamera(instance, x, y, z, original);
+            if (!(vehicle instanceof PokemonEntity pokemon)) {
+                original.call(instance, x, y, z);
                return;
            }
+
+            int seatIndex = pokemon.getPassengers().indexOf(entity);
+            Seat seat = pokemon.getSeats().get(seatIndex);
+            PokemonClientDelegate delegate = (PokemonClientDelegate) pokemon.getDelegate();
+            MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
+            if(locator == null){
+                original.call(instance, x, y, z);
+                return;
+            }
+
+            Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
+
+            Vec3 entityPos = new Vec3(
+                    Mth.lerp(instance.getPartialTickTime(), pokemon.xOld, pokemon.getX()),
+                    Mth.lerp(instance.getPartialTickTime(), pokemon.yOld, pokemon.getY()),
+                    Mth.lerp(instance.getPartialTickTime(), pokemon.zOld, pokemon.getZ())
+            );
+
+            OrientationControllable rollable = (OrientationControllable) entity;
+            float currEyeHeight = Mth.lerp(instance.getPartialTickTime(), eyeHeightOld, eyeHeight);
+            var controller = rollable.getOrientationController();
+            Matrix3f orientation = controller.isActive() && controller.getOrientation() != null ? controller.getOrientation() : new Matrix3f();
+            Vec3 rotatedEyeHeight = new Vec3(orientation.transform(new Vector3f(0f, currEyeHeight, 0f)));
+
+            var position = locatorOffset.add(entityPos).add(rotatedEyeHeight);
+            setPosition(position);
+        } else {
+            original.call(instance, x, y, z);
        }
-
-        original.call(instance, x, y, z);
    }

    @Unique
-    private boolean cobblemon$isRidingPokemon(Entity entity) {
-        return entity.getVehicle() instanceof PokemonEntity;
-    }
-
-    @Unique
-    private void cobblemon$applyRotation() {
-        if (!(this.entity instanceof OrientationControllable controllable) || controllable.getOrientationController().getOrientation() == null)
-            return;
+    private void applyRotation(){
+        if (!(this.entity instanceof OrientationControllable controllable) || controllable.getOrientationController().getOrientation() == null) return;
        var controller = controllable.getOrientationController();
        var newRotation = controller.getOrientation().normal(new Matrix3f()).getNormalizedRotation(new Quaternionf());
        if (this.minecraft.options.getCameraType().isMirrored()) {
-            newRotation.rotateY((float) Math.toRadians(180));
+            newRotation.rotateY((float)Math.toRadians(180));
        }
        this.rotation.set(newRotation);
        this.xRot = controller.getPitch();
@@ -148,14 +152,4 @@ public abstract class CameraMixin {
        this.up.set(controller.getUpVector());
        this.left.set(controller.getLeftVector());
    }
-
-    @WrapOperation(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;move(FFF)V", ordinal = 0))
-    public void stopMoveIfRolling(Camera instance, float zoom, float dy, float dx, Operation<Void> original) {
-        Entity entity = instance.getEntity();
-        Entity vehicle = entity.getVehicle();
-
-        if (!(vehicle instanceof PokemonEntity) || Cobblemon.config.getViewBobTranslation()) {
-            original.call(instance, zoom, dy, dx);
-        }
-    }
 }
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.client;
-
-import com.cobblemon.mod.common.CobblemonRecipeCategories;
-import com.cobblemon.mod.common.item.crafting.CookingPotBookCategory;
-import com.cobblemon.mod.common.item.crafting.CookingPotRecipe;
-import com.cobblemon.mod.common.item.crafting.CookingPotShapelessRecipe;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-import net.minecraft.client.ClientRecipeBook;
-import net.minecraft.client.RecipeBookCategories;
-import net.minecraft.client.gui.screens.recipebook.RecipeCollection;
-import net.minecraft.core.RegistryAccess;
-
-import net.minecraft.world.item.crafting.Recipe;
-import net.minecraft.world.item.crafting.RecipeHolder;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.List;
-import java.util.Map;
-
-@Mixin(ClientRecipeBook.class)
-public abstract class ClientRecipeBookMixin {
-
-    @Shadow
-    protected static Map<RecipeBookCategories, List<List<RecipeHolder<?>>>> categorizeAndGroupRecipes(Iterable<RecipeHolder<?>> recipes) {
-        return null;
-    }
-
-    @Shadow private Map<RecipeBookCategories, List<RecipeCollection>> collectionsByTab;
-
-    @Shadow private List<RecipeCollection> allCollections;
-
-    @Inject(method = "getCategory", at = @At(value = "HEAD"), cancellable = true)
-    private static void addCustomCategory(RecipeHolder<?> recipe, CallbackInfoReturnable<RecipeBookCategories> cir) {
-        Recipe<?> recipe2 = recipe.value();
-        if (recipe2 instanceof CookingPotRecipe || recipe2 instanceof CookingPotShapelessRecipe) {
-            CookingPotBookCategory category = recipe2 instanceof CookingPotRecipe
-                    ? ((CookingPotRecipe) recipe2).getCategory()
-                    : ((CookingPotShapelessRecipe) recipe2).category();
-            RecipeBookCategories var7;
-            switch (category) {
-                case MISC -> var7 = CobblemonRecipeCategories.COOKING_POT_MISC.toVanillaCategory();
-                case FOODS -> var7 = CobblemonRecipeCategories.COOKING_POT_FOODS.toVanillaCategory();
-                case MEDICINES -> var7 = CobblemonRecipeCategories.COOKING_POT_MEDICINES.toVanillaCategory();
-                case BAITS -> var7 = CobblemonRecipeCategories.COOKING_POT_BAITS.toVanillaCategory();
-                default -> throw new MatchException(null, null);
-            }
-            cir.setReturnValue(var7);
-        }
-    }
-
-    @Inject(method = "setupCollections", at = @At("RETURN"))
-    private void addCustomAggregateCategories(Iterable<RecipeHolder<?>> recipes, RegistryAccess registryAccess, CallbackInfo ci) {
-        Map<RecipeBookCategories, List<List<RecipeHolder<?>>>> map = categorizeAndGroupRecipes(recipes);
-        Map<RecipeBookCategories, List<RecipeCollection>> map2 = Maps.newHashMap();
-        ImmutableList.Builder<RecipeCollection> builder = ImmutableList.builder();
-
-        map.forEach((recipeBookCategories, list) -> {
-            List<RecipeCollection> collections = list.stream()
-                    .map(listx -> new RecipeCollection(registryAccess, listx))
-                    .peek(builder::add)
-                    .collect(ImmutableList.toImmutableList());
-            map2.put(recipeBookCategories, collections);
-        });
-        RecipeBookCategories.AGGREGATE_CATEGORIES.forEach((recipeBookCategories, list) -> map2.put(recipeBookCategories, (List)list.stream().flatMap((recipeBookCategoriesx) -> ((List)map2.getOrDefault(recipeBookCategoriesx, ImmutableList.of())).stream()).collect(ImmutableList.toImmutableList())));
-        CobblemonRecipeCategories.Companion.getCustomAggregateCategories().forEach((recipeBookCategories, list) -> map2.put(recipeBookCategories, (List)list.stream().flatMap((recipeBookCategoriesx) -> ((List)map2.getOrDefault(recipeBookCategoriesx, ImmutableList.of())).stream()).collect(ImmutableList.toImmutableList())));
-
-        this.collectionsByTab = ImmutableMap.copyOf(map2);
-        this.allCollections = builder.build();
-    }
-}
@@ -59,21 +59,8 @@ public class HumanoidModelMixin {
        }

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

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

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

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

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

    @Shadow private double accumulatedDY;

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

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

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

    @Unique
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.client;
+
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import net.minecraft.client.model.PlayerModel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(PlayerModel.class)
+public class PlayerModelMixin {
+    @Inject(method = "setupAnim(Lnet/minecraft/world/entity/LivingEntity;FFFFF)V", at = @At(value = "HEAD"))
+    private void cobblemon$setHeadRotation(LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, CallbackInfo ci) {
+        if (!(entity instanceof Player)) return;
+        Entity vehicle = entity.getVehicle();
+
+        if (!(vehicle instanceof PokemonEntity pokemonEntity)) return;
+
+        var shouldRotatePlayerHead = pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) -> {
+            return behaviour.shouldRotatePlayerHead(settings, state, pokemonEntity);
+        });
+        if (shouldRotatePlayerHead) return;
+
+        netHeadYaw = 0f;
+        headPitch = 0f;
+    }
+}
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.client;
-
-
-import com.cobblemon.mod.common.CobblemonItems;
-import com.cobblemon.mod.common.CobblemonRecipeCategories;
-import com.google.common.collect.ImmutableList;
-import net.minecraft.client.RecipeBookCategories;
-import net.minecraft.world.inventory.RecipeBookType;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.gen.Invoker;
-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.ArrayList;
-import java.util.List;
-
-
-@Mixin(RecipeBookCategories.class)
-public class RecipeBookCategoriesMixin {
-
-    @Final
-    @Mutable
-    @Shadow
-    private static RecipeBookCategories[] $VALUES;
-
-    @Invoker("<init>")
-    private static RecipeBookCategories cobblemon$createCategory(String name, int ordinal, ItemStack... icons) {
-        throw new AssertionError();
-    }
-
-    @Inject(
-            method = "<clinit>",
-            at = @At("TAIL")
-    )
-    private static void cobblemon$addRecipeBookType(CallbackInfo ci) {
-        ArrayList<RecipeBookCategories> types = new ArrayList<>(List.of($VALUES));
-        types.add(cobblemon$createCategory("COOKING_POT_SEARCH", $VALUES.length, new ItemStack(Items.COMPASS)));
-        types.add(cobblemon$createCategory("COOKING_POT_FOODS", $VALUES.length + 1, new ItemStack(CobblemonItems.ROASTED_LEEK)));
-        types.add(cobblemon$createCategory("COOKING_POT_MEDICINES", $VALUES.length + 2, new ItemStack(CobblemonItems.HP_UP)));
-        types.add(cobblemon$createCategory("COOKING_POT_BAITS", $VALUES.length + 3, new ItemStack(CobblemonItems.PERSIM_BERRY)));
-        types.add(cobblemon$createCategory("COOKING_POT_MISC", $VALUES.length + 4, new ItemStack(CobblemonItems.MIRROR_HERB)));
-        $VALUES = types.toArray(RecipeBookCategories[]::new);
-    }
-
-    @Inject(method = "getCategories", at = @At("HEAD"), cancellable = true)
-    private static void modifyCategories(RecipeBookType recipeBookType, CallbackInfoReturnable<List<RecipeBookCategories>> cir) {
-        if (recipeBookType == RecipeBookType.valueOf("COOKING_POT")) {
-            List var10000 = ImmutableList.of(
-                    CobblemonRecipeCategories.COOKING_POT_SEARCH.toVanillaCategory(),
-                    CobblemonRecipeCategories.COOKING_POT_FOODS.toVanillaCategory(),
-                    CobblemonRecipeCategories.COOKING_POT_MEDICINES.toVanillaCategory(),
-                    CobblemonRecipeCategories.COOKING_POT_BAITS.toVanillaCategory(),
-                    CobblemonRecipeCategories.COOKING_POT_MISC.toVanillaCategory());
-            cir.setReturnValue(var10000);
-            return;
-        }
-    }
-}
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.client;
-
-import com.cobblemon.mod.common.CobblemonRecipeCategories;
-import net.minecraft.client.ClientRecipeBook;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.RecipeBookCategories;
-import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
-import net.minecraft.client.gui.screens.recipebook.RecipeBookPage;
-import net.minecraft.client.gui.screens.recipebook.RecipeBookTabButton;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(RecipeBookComponent.class)
-public class RecipeBookComponentMixin {
-
-    @Shadow private ClientRecipeBook book;
-
-    @Shadow protected Minecraft minecraft;
-
-    @Shadow private int width;
-
-    @Shadow private int xOffset;
-
-    @Shadow private int height;
-
-    @Shadow @Final private RecipeBookPage recipeBookPage;
-
-    @Inject(method = "updateTabs", at = @At("HEAD"), cancellable = true)
-    private void customUpdateTabs(CallbackInfo ci) {
-        RecipeBookComponent instance = (RecipeBookComponent) (Object) this;
-        int i = (width - 147) / 2 - xOffset - 30;
-        int j = (height - 166) / 2 + 3;
-        int k = 27;
-        int l = 0;
-
-        for (RecipeBookTabButton recipeBookTabButton : instance.tabButtons) {
-            RecipeBookCategories recipeBookCategories = recipeBookTabButton.getCategory();
-            if (recipeBookCategories != RecipeBookCategories.CRAFTING_SEARCH && recipeBookCategories != RecipeBookCategories.FURNACE_SEARCH && recipeBookCategories != CobblemonRecipeCategories.COOKING_POT_SEARCH.toVanillaCategory()) {
-                if (recipeBookTabButton.updateVisibility(book)) {
-                    recipeBookTabButton.setPosition(i, j + 27 * l++);
-                    recipeBookTabButton.startAnimation(minecraft);
-                }
-            } else {
-                recipeBookTabButton.visible = true;
-                recipeBookTabButton.setPosition(i, j + k * l++);
-            }
-        }
-
-        ci.cancel();
-    }
-}
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.client;
-
-import net.minecraft.client.ClientRecipeBook;
-import net.minecraft.client.gui.screens.recipebook.RecipeBookTabButton;
-import net.minecraft.client.gui.screens.recipebook.RecipeCollection;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.List;
-
-@Mixin(RecipeBookTabButton.class)
-public class RecipeBookTabButtonMixin {
-
-    @Inject(method = "updateVisibility", at = @At("HEAD"), cancellable = true)
-    private void customUpdateVisibility(ClientRecipeBook recipeBook, CallbackInfoReturnable<Boolean> cir) {
-        RecipeBookTabButton instance = (RecipeBookTabButton) (Object) this;
-        List<RecipeCollection> list = recipeBook.getCollection(instance.getCategory());
-        boolean visible = false;
-        if (list != null) {
-            for (RecipeCollection recipeCollection : list) {
-                if (recipeCollection.hasKnownRecipes() && recipeCollection.hasFitting()) {
-                    visible = true;
-                    break;
-                }
-            }
-        }
-        instance.visible = visible;
-        cir.setReturnValue(visible);
-    }
-}
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.client;
-
-import net.minecraft.client.gui.screens.recipebook.RecipeCollection;
-import net.minecraft.stats.RecipeBook;
-import net.minecraft.world.entity.player.StackedContents;
-import net.minecraft.world.item.crafting.RecipeHolder;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.List;
-import java.util.Set;
-
-@Mixin(RecipeCollection.class)
-public class RecipeCollectionMixin {
-
-    @Shadow @Final private Set<RecipeHolder<?>> fitsDimensions;
-
-    @Shadow @Final private Set<RecipeHolder<?>> craftable;
-
-    @Shadow @Final private List<RecipeHolder<?>> recipes;
-
-    @Inject(method = "canCraft", at = @At("HEAD"), cancellable = true)
-    private void customCanCraft(StackedContents handler, int width, int height, RecipeBook book, CallbackInfo ci) {
-        for (RecipeHolder<?> recipeHolder : recipes) {
-            boolean bl = recipeHolder.value().canCraftInDimensions(width, height) && book.contains(recipeHolder);
-            if (bl) {
-                fitsDimensions.add(recipeHolder);
-            } else {
-                fitsDimensions.remove(recipeHolder);
-            }
-
-            if (bl && handler.canCraft(recipeHolder.value(), null)) {
-                craftable.add(recipeHolder);
-            } else {
-                craftable.remove(recipeHolder);
-            }
-        }
-
-        ci.cancel();
-    }
-}
@@ -128,7 +128,6 @@ import kotlin.reflect.jvm.isAccessible
 import kotlin.reflect.jvm.javaField
 import net.minecraft.client.Minecraft
 import net.minecraft.commands.synchronization.SingletonArgumentInfo
-import net.minecraft.core.registries.Registries
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
@@ -195,8 +194,6 @@ object Cobblemon {
            this.LOGGER.info("  - Branch: ${CobblemonBuildDetails.BRANCH}")
        }

-        implementation.registerRecipeSerializers()
-        implementation.registerRecipeTypes()
        implementation.registerPermissionValidator()
        implementation.registerSoundEvents()
        implementation.registerDataComponents()
@@ -205,11 +202,9 @@ object Cobblemon {
        implementation.registerEntityTypes()
        implementation.registerEntityAttributes()
        implementation.registerBlockEntityTypes()
-        implementation.registerPoiTypes()
        implementation.registerVillagers()
        implementation.registerWorldGenFeatures()
        implementation.registerParticles()
-        implementation.registerMenu()
        implementation.registerEntityDataSerializers()
        implementation.registerCriteria()
        implementation.registerEntitySubPredicates()
@@ -568,8 +563,6 @@ object Cobblemon {
        this.implementation.registerCommandArgument(cobblemonResource("npc_class"), NPCClassArgumentType::class, SingletonArgumentInfo.contextFree(NPCClassArgumentType::npcClass))
        this.implementation.registerCommandArgument(cobblemonResource("wallpaper"), UnlockablePCBoxWallpaperArgumentType::class, SingletonArgumentInfo.contextFree(UnlockablePCBoxWallpaperArgumentType::wallpaper))
        this.implementation.registerCommandArgument(cobblemonResource("mark"), MarkArgumentType::class, SingletonArgumentInfo.contextFree(MarkArgumentType::mark))
-        this.implementation.registerCommandArgument(cobblemonResource("transform_type"), TransformTypeArgumentType::class, SingletonArgumentInfo.contextFree(TransformTypeArgumentType::transformType))
-        this.implementation.registerCommandArgument(cobblemonResource("model_part"), ModelPartArgumentType::class, SingletonArgumentInfo.contextFree(ModelPartArgumentType::modelPart))
    }

 }
@@ -8,7 +8,6 @@

 package com.cobblemon.mod.common

-import com.cobblemon.mod.common.block.entity.PokeCakeBlockEntity
 import com.cobblemon.mod.common.block.entity.BerryBlockEntity
 import com.cobblemon.mod.common.block.entity.HealingMachineBlockEntity
 import com.cobblemon.mod.common.block.entity.PCBlockEntity
@@ -46,9 +45,9 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
    @JvmField
    val PASTURE: BlockEntityType<PokemonPastureBlockEntity> = this.create("pasture", BlockEntityType.Builder.of(::PokemonPastureBlockEntity, CobblemonBlocks.PASTURE).build(null))
    @JvmField
-    val SIGN: BlockEntityType<CobblemonSignBlockEntity> = this.create("sign", BlockEntityType.Builder.of(::CobblemonSignBlockEntity, CobblemonBlocks.APRICORN_SIGN, CobblemonBlocks.APRICORN_WALL_SIGN, CobblemonBlocks.SACCHARINE_SIGN, CobblemonBlocks.SACCHARINE_WALL_SIGN).build(null))
+    val SIGN: BlockEntityType<CobblemonSignBlockEntity> = this.create("sign", BlockEntityType.Builder.of(::CobblemonSignBlockEntity, CobblemonBlocks.APRICORN_SIGN, CobblemonBlocks.APRICORN_WALL_SIGN).build(null))
    @JvmField
-    val HANGING_SIGN: BlockEntityType<CobblemonHangingSignBlockEntity> = this.create("hanging_sign", BlockEntityType.Builder.of(::CobblemonHangingSignBlockEntity, CobblemonBlocks.APRICORN_HANGING_SIGN, CobblemonBlocks.APRICORN_WALL_HANGING_SIGN, CobblemonBlocks.SACCHARINE_HANGING_SIGN, CobblemonBlocks.SACCHARINE_WALL_HANGING_SIGN).build(null))
+    val HANGING_SIGN: BlockEntityType<CobblemonHangingSignBlockEntity> = this.create("hanging_sign", BlockEntityType.Builder.of(::CobblemonHangingSignBlockEntity, CobblemonBlocks.APRICORN_HANGING_SIGN, CobblemonBlocks.APRICORN_WALL_HANGING_SIGN).build(null))

    @JvmField
    val GILDED_CHEST: BlockEntityType<GildedChestBlockEntity> = this.create("chest", BlockEntityType.Builder.of(::GildedChestBlockEntity,
@@ -87,36 +86,4 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
    val DISPLAY_CASE: BlockEntityType<DisplayCaseBlockEntity> = this.create("display_case",
        BlockEntityType.Builder.of(::DisplayCaseBlockEntity, CobblemonBlocks.DISPLAY_CASE).build(null)
    )
-
-    @JvmField
-    val INCENSE_SWEET: BlockEntityType<SweetIncenseBlockEntity> = this.create("incense_sweet",
-            BlockEntityType.Builder.of(::SweetIncenseBlockEntity, CobblemonBlocks.INCENSE_SWEET).build(null)
-    )
-
-    @JvmField
-    val CAMPFIRE: BlockEntityType<CampfireBlockEntity> = this.create("campfire_pot",
-            BlockEntityType.Builder.of(::CampfireBlockEntity, CobblemonBlocks.CAMPFIRE).build(null)
-    )
-
-    /*@JvmField
-    val LURE_CAKE: BlockEntityType<LureCakeBlockEntity> =
-        BlockEntityType.Builder.of({ pos, state -> LureCakeBlockEntity(pos, state) },
-            CobblemonBlocks.LURE_CAKE
-        ).build(null)*/
-
-    @JvmField
-    val LURE_CAKE: BlockEntityType<LureCakeBlockEntity> = this.create(
-        "lure_cake",
-        BlockEntityType.Builder.of(::LureCakeBlockEntity, CobblemonBlocks.LURE_CAKE).build(null)
-    )
-    @JvmField
-    val POKE_CAKE: BlockEntityType<PokeCakeBlockEntity> = this.create(
-        "poke_cake",
-        BlockEntityType.Builder.of(::PokeCakeBlockEntity, CobblemonBlocks.POKE_CAKE).build(null)
-    )
-    @JvmField
-    val CANDLE_POKE_CAKE: BlockEntityType<CandlePokeCakeBlockEntity> = this.create(
-        "candle_poke_cake",
-        BlockEntityType.Builder.of(::CandlePokeCakeBlockEntity, CobblemonBlocks.CANDLE_POKE_CAKE).build(null)
-    )
 }
@@ -10,10 +10,8 @@ package com.cobblemon.mod.common

 import com.cobblemon.mod.common.api.apricorn.Apricorn
 import com.cobblemon.mod.common.block.*
-import com.cobblemon.mod.common.block.campfirepot.CampfireBlock
 import com.cobblemon.mod.common.block.LecternBlock
 import com.cobblemon.mod.common.block.MintBlock.MintType
-import com.cobblemon.mod.common.block.campfirepot.CampfirePotBlock
 import com.cobblemon.mod.common.block.chest.GildedChestBlock
 import com.cobblemon.mod.common.block.sign.CobblemonHangingSignBlock
 import com.cobblemon.mod.common.block.sign.CobblemonSignBlock
@@ -22,7 +20,6 @@ import com.cobblemon.mod.common.block.sign.CobblemonWallSignBlock
 import com.cobblemon.mod.common.mixin.invoker.*
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.core.BlockPos
 import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
@@ -30,13 +27,9 @@ import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.valueproviders.UniformInt
 import net.minecraft.world.effect.MobEffects
-import net.minecraft.world.entity.EntityType
-import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.block.*
 import net.minecraft.world.level.block.state.BlockBehaviour
-import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.properties.BlockSetType
-import net.minecraft.world.level.block.state.properties.BlockStateProperties.LIT
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument
 import net.minecraft.world.level.block.state.properties.WoodType
 import net.minecraft.world.level.material.MapColor
@@ -50,8 +43,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<

    val APRICORN_BLOCK_SET_TYPE = BlockSetType("apricorn")
    val APRICORN_WOOD_TYPE = WoodType.register(WoodType("apricorn", APRICORN_BLOCK_SET_TYPE))
-    val SACCHARINE_BLOCK_SET_TYPE = BlockSetType("saccharine")
-    val SACCHARINE_WOOD_TYPE = WoodType.register(WoodType("saccharine", SACCHARINE_BLOCK_SET_TYPE))

    // Evolution Ores
    @JvmField
@@ -168,80 +159,15 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    @JvmField
    val YELLOW_APRICORN_SAPLING = this.create("yellow_apricorn_sapling", ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.YELLOW))

-    // Saccharines
-    @JvmField
-    val SACCHARINE_LOG = this.create("saccharine_log", SaccharineLogBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD).ignitedByLava()))
-    @JvmField
-    val SACCHARINE_HONEY_LOG = this.create("saccharine_honey_log", SaccharineHoneyLogBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD).ignitedByLava()))
-
-    @JvmField
-    val STRIPPED_SACCHARINE_LOG = this.create("stripped_saccharine_log", SaccharineStrippedLogBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD).ignitedByLava())) //log("stripped_saccharine_log")
-    @JvmField
-    val SACCHARINE_WOOD = log("saccharine_wood")
-    @JvmField
-    val STRIPPED_SACCHARINE_WOOD = this.create("stripped_saccharine_wood", SaccharineStrippedLogBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD).ignitedByLava())) //log("stripped_saccharine_log")
-    @JvmField
-    val SACCHARINE_PLANKS = this.create("saccharine_planks", Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
-    @JvmField
-    val SACCHARINE_LEAVES = this.create("saccharine_leaves", SaccharineLeafBlock(
-        BlockBehaviour.Properties.of().mapColor(
-            MapColor.PLANT
-        ).strength(0.2f).randomTicks().sound(SoundType.GRASS).noOcclusion()
-            .isValidSpawn { _: BlockState?, _: BlockGetter?, _: BlockPos?, entity: EntityType<*>? ->
-                entity === EntityType.OCELOT || entity === EntityType.PARROT
-            }.isSuffocating { _: BlockState?, _: BlockGetter?, _: BlockPos? ->
-                false
-            }.isViewBlocking { _: BlockState?, _: BlockGetter?, _: BlockPos? ->
-                false
-            }.ignitedByLava().pushReaction(PushReaction.DESTROY)
-            .isRedstoneConductor { _: BlockState?, _: BlockGetter?, _: BlockPos? ->
-                false
-            }))
-    @JvmField
-    val SACCHARINE_FENCE = this.create("saccharine_fence", FenceBlock(BlockBehaviour.Properties.of().mapColor(SACCHARINE_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
-    @JvmField
-    val SACCHARINE_FENCE_GATE = this.create("saccharine_fence_gate", FenceGateBlock(SACCHARINE_WOOD_TYPE, BlockBehaviour.Properties.of().mapColor(SACCHARINE_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
-
-    val SACCHARINE_BUTTON = this.create("saccharine_button", BlocksInvoker.createWoodenButtonBlock(BlockSetType.OAK))
-    @JvmField
-    val SACCHARINE_PRESSURE_PLATE = this.create("saccharine_pressure_plate", PressurePlateBlockInvoker.`cobblemon$create`(SACCHARINE_BLOCK_SET_TYPE, BlockBehaviour.Properties.of().mapColor(SACCHARINE_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).noCollission().strength(0.5f).sound(SoundType.WOOD)))
-    @JvmField
-    val SACCHARINE_SIGN = this.create("saccharine_sign", CobblemonSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SIGN), SACCHARINE_WOOD_TYPE))
-    @JvmField
-    val SACCHARINE_WALL_SIGN = this.create("saccharine_wall_sign", CobblemonWallSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_WALL_SIGN), SACCHARINE_WOOD_TYPE))
-    @JvmField
-    val SACCHARINE_HANGING_SIGN = this.create("saccharine_hanging_sign", CobblemonHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN), SACCHARINE_WOOD_TYPE))
-    @JvmField
-    val SACCHARINE_WALL_HANGING_SIGN = this.create("saccharine_wall_hanging_sign", CobblemonWallHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_HANGING_SIGN), SACCHARINE_WOOD_TYPE))
-    @JvmField
-    val SACCHARINE_SLAB = this.create("saccharine_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
-    @JvmField
-    val SACCHARINE_STAIRS = this.create("saccharine_stairs", StairsBlockInvoker.`cobblemon$create`(SACCHARINE_PLANKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SACCHARINE_PLANKS)))
-    @JvmField
-    val SACCHARINE_DOOR = this.create("saccharine_door", DoorBlockInvoker.`cobblemon$create`(SACCHARINE_BLOCK_SET_TYPE, BlockBehaviour.Properties.of().mapColor(SACCHARINE_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).strength(3.0F).sound(SoundType.WOOD).noOcclusion()))
-    @JvmField
-    val SACCHARINE_TRAPDOOR = this.create("saccharine_trapdoor", TrapdoorBlockInvoker.`cobblemon$create`(SACCHARINE_BLOCK_SET_TYPE, BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(3.0F).sound(SoundType.WOOD).noOcclusion()))
-    @JvmField
-    val SACCHARINE_SAPLING = this.create("saccharine_sapling", SaccharineSaplingBlock(PLANT_PROPERTIES))
-
    @JvmField
    val MEDICINAL_LEEK = this.create("medicinal_leek", MedicinalLeekBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.CRIMSON_NYLIUM).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MEDICINAL_LEEK_SOUNDS)))
    @JvmField
-    val BUGWORT = this.create("bugwort", BugwortBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.COLOR_PURPLE).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MEDICINAL_LEEK_SOUNDS)))
-    @JvmField
    val ENERGY_ROOT = this.create("energy_root", EnergyRootBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.DIRT).noCollission().randomTicks().instabreak().sound(CobblemonSounds.ENERGY_ROOT_SOUNDS)))
    @JvmField
    val BIG_ROOT = this.create("big_root", BigRootBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.PLANT).noCollission().randomTicks().instabreak().sound(CobblemonSounds.BIG_ROOT_SOUNDS)))
    @JvmField
    val REVIVAL_HERB = this.create("revival_herb", RevivalHerbBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.PLANT).ignitedByLava().noCollission().instabreak().sound(CobblemonSounds.REVIVAL_HERB_SOUNDS)))

-    @JvmField
-    val LURE_CAKE = this.create("lure_cake", LureCakeBlock(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY)))
-    @JvmField
-    val POKE_CAKE = this.create("poke_cake", PokeCakeBlock(BlockBehaviour.Properties.ofFullCopy(LURE_CAKE)))
-    @JvmField
-    val CANDLE_POKE_CAKE = this.create("candle_poke_cake", CandlePokeCakeBlock(BlockBehaviour.Properties.ofFullCopy(LURE_CAKE).lightLevel { blockState -> if (blockState.getValue(LIT) == true) 3 else 0 }))
-
    @JvmField
    val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
    @JvmField
@@ -393,60 +319,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    @JvmField
    val YELLOW_APRICORN = apricornBlock("yellow_apricorn", Apricorn.YELLOW)

-    @JvmField
-    val BLACK_CAMPFIRE_POT = create("campfire_pot_black",
-        CampfirePotBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLACK).sound(CobblemonSounds.CAMPFIRE_POT_SOUNDS)
-                .strength(0.5F).pushReaction(PushReaction.BLOCK).noOcclusion()
-        )
-    )
-    @JvmField
-    val BLUE_CAMPFIRE_POT = create("campfire_pot_blue",
-        CampfirePotBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).sound(CobblemonSounds.CAMPFIRE_POT_SOUNDS)
-                .strength(0.5F).pushReaction(PushReaction.BLOCK).noOcclusion()
-        )
-    )
-    @JvmField
-    val GREEN_CAMPFIRE_POT = create("campfire_pot_green",
-        CampfirePotBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).sound(CobblemonSounds.CAMPFIRE_POT_SOUNDS)
-                .strength(0.5F).pushReaction(PushReaction.BLOCK).noOcclusion()
-        )
-    )
-    @JvmField
-    val PINK_CAMPFIRE_POT = create("campfire_pot_pink",
-        CampfirePotBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_PINK).sound(CobblemonSounds.CAMPFIRE_POT_SOUNDS)
-                .strength(0.5F).pushReaction(PushReaction.BLOCK).noOcclusion()
-        )
-    )
-    @JvmField
-    val RED_CAMPFIRE_POT = create("campfire_pot_red",
-        CampfirePotBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).sound(CobblemonSounds.CAMPFIRE_POT_SOUNDS)
-                .strength(0.5F).pushReaction(PushReaction.BLOCK).noOcclusion()
-        )
-    )
-    @JvmField
-    val WHITE_CAMPFIRE_POT = create("campfire_pot_white",
-        CampfirePotBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GRAY)
-                .sound(CobblemonSounds.CAMPFIRE_POT_SOUNDS).strength(0.5F).pushReaction(PushReaction.BLOCK)
-                .noOcclusion()
-        )
-    )
-    @JvmField
-    val YELLOW_CAMPFIRE_POT = create("campfire_pot_yellow",
-        CampfirePotBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_YELLOW).sound(CobblemonSounds.CAMPFIRE_POT_SOUNDS)
-                .strength(0.5F).pushReaction(PushReaction.BLOCK).noOcclusion()
-        )
-    )
-
-    @JvmField
-    val CAMPFIRE = create("campfire", CampfireBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOD).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.PODZOL).strength(2.0F).lightLevel { if ((it.getValue(CampfireBlock.SOUL) as Boolean)) 9 else 14 }))
-
    @JvmField
    val RELIC_COIN_POUCH = create("relic_coin_pouch", CoinPouchBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.RELIC_COIN_POUCH_SOUNDS).pushReaction(PushReaction.DESTROY).noOcclusion(), true))
    @JvmField
@@ -488,9 +360,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    @JvmField
    val DISPLAY_CASE = create("display_case", DisplayCaseBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.DISPLAY_CASE_SOUNDS).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.STONE).strength(0.3F)))

-    @JvmField
-    val INCENSE_SWEET = create("incense_sweet", SweetIncenseBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.DISPLAY_CASE_SOUNDS).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.STONE).strength(0.3f)))
-
    @JvmField
    val PASTURE = create("pasture", PastureBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).sound(SoundType.WOOD).strength(2F).noOcclusion().pushReaction(PushReaction.BLOCK).lightLevel { if ((it.getValue(PastureBlock.ON) as Boolean) && (it.getValue(PastureBlock.PART) == PastureBlock.PasturePart.TOP)) 10 else 0 }))

@@ -512,8 +381,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
    val PEP_UP_FLOWER = this.create("pep_up_flower", FlowerBlock(MobEffects.LEVITATION, 10F, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY)))
    @JvmField
    val POTTED_PEP_UP_FLOWER = this.create("potted_pep_up_flower", BlocksInvoker.createFlowerPotBlock(PEP_UP_FLOWER))
-    @JvmField
-    val HEARTY_GRAINS = this.create("hearty_grains", HeartyGrainsBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.PLANT).noCollission().randomTicks().instabreak().sound(CobblemonSounds.VIVICHOKE_SOUNDS)))

    /**
     * Returns a map of all the blocks that can be stripped with an axe in the format of input - output.
@@ -522,10 +389,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     */
    fun strippedBlocks(): Map<Block, Block> = mapOf(
        APRICORN_WOOD to STRIPPED_APRICORN_WOOD,
-        APRICORN_LOG to STRIPPED_APRICORN_LOG,
-        SACCHARINE_WOOD to STRIPPED_SACCHARINE_WOOD,
-        SACCHARINE_LOG to STRIPPED_SACCHARINE_LOG,
-        SACCHARINE_HONEY_LOG to STRIPPED_SACCHARINE_LOG
+        APRICORN_LOG to STRIPPED_APRICORN_LOG
    )


@@ -23,7 +23,7 @@ object CobblemonCommands {
        ChangeEyeHeight.register(dispatcher)
        ChangeScaleAndSize.register(dispatcher)
        ChangeWalkSpeed.register(dispatcher)
-        TransformModelPartCommand.register(dispatcher)
+        ChangeJointScaleCommand.register(dispatcher)
        TestCommand.register(dispatcher)
        ReloadShowdownCommand.register(dispatcher)
        ClickTextCommand.register(dispatcher)
@@ -94,17 +94,12 @@ interface CobblemonImplementation {
     */
    fun registerBlockEntityTypes()

-    fun registerPoiTypes()
    /**
     * TODO
     *
     */
    fun registerVillagers()

-    fun registerRecipeSerializers()
-    fun registerRecipeTypes()
-
-
    /**
     * TODO
     *
@@ -113,8 +108,6 @@ interface CobblemonImplementation {

    fun registerParticles()

-    fun registerMenu()
-
    fun registerEntitySubPredicates()


@@ -8,13 +8,9 @@

 package com.cobblemon.mod.common

-import com.cobblemon.mod.common.block.PotComponent
-import com.cobblemon.mod.common.item.components.BaitEffectsComponent
-import com.cobblemon.mod.common.item.components.FlavourComponent
-import com.cobblemon.mod.common.item.components.FoodColourComponent
 import com.cobblemon.mod.common.item.components.HeldItemCapableComponent
 import com.cobblemon.mod.common.item.components.PokemonItemComponent
-import com.cobblemon.mod.common.item.components.RodBaitComponent
+import com.cobblemon.mod.common.item.RodBaitComponent
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import net.minecraft.core.Registry
 import net.minecraft.core.component.DataComponentType
@@ -40,34 +36,11 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
        .networkSynchronized(RodBaitComponent.PACKET_CODEC)
        .build())

-    val POT_DATA: DataComponentType<PotComponent> = create("cooking_pot_item", DataComponentType.builder<PotComponent>()
-        .persistent(PotComponent.CODEC)
-        .networkSynchronized(PotComponent.PACKET_CODEC)
-        .build())
-
-    val BAIT_EFFECTS: DataComponentType<BaitEffectsComponent> = create("bait_effects", DataComponentType.builder<BaitEffectsComponent>()
-        .persistent(BaitEffectsComponent.CODEC)
-        .networkSynchronized(BaitEffectsComponent.PACKET_CODEC)
-        .build())
-
-    val FLAVOUR: DataComponentType<FlavourComponent> = create("flavour", DataComponentType.builder<FlavourComponent>()
-        .persistent(FlavourComponent.CODEC)
-        .networkSynchronized(FlavourComponent.PACKET_CODEC)
-        .build())
-
-    val FOOD_COLOUR: DataComponentType<FoodColourComponent> = create("food_colour", DataComponentType.builder<FoodColourComponent>()
-        .persistent(FoodColourComponent.CODEC)
-        .networkSynchronized(FoodColourComponent.PACKET_CODEC)
-        .build())


    fun register() {
        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:pokemon_item"), POKEMON_ITEM)
        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:bait"), BAIT)
-        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:cooking_pot_item"), POT_DATA)
-        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:bait_effects"), BAIT_EFFECTS)
-        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:flavour"), FLAVOUR)
-        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:food_colour"), FOOD_COLOUR)
    }

    override val registry = BuiltInRegistries.DATA_COMPONENT_TYPE
@@ -8,7 +8,6 @@

 package com.cobblemon.mod.common

-import com.cobblemon.mod.common.api.apricorn.Apricorn
 import com.cobblemon.mod.common.api.item.ability.AbilityChanger
 import com.cobblemon.mod.common.api.mulch.MulchVariant
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
@@ -27,14 +26,9 @@ import com.cobblemon.mod.common.item.armor.CobblemonArmorTrims
 import com.cobblemon.mod.common.item.battle.DireHitItem
 import com.cobblemon.mod.common.item.battle.GuardSpecItem
 import com.cobblemon.mod.common.item.battle.XStatItem
-import com.cobblemon.mod.common.item.berry.BerryItem
-import com.cobblemon.mod.common.item.berry.FriendshipRaisingBerryItem
-import com.cobblemon.mod.common.item.berry.HealingBerryItem
-import com.cobblemon.mod.common.item.berry.PPRestoringBerryItem
-import com.cobblemon.mod.common.item.berry.PortionHealingBerryItem
-import com.cobblemon.mod.common.item.berry.StatusCuringBerryItem
-import com.cobblemon.mod.common.item.berry.VolatileCuringBerryItem
+import com.cobblemon.mod.common.item.berry.*
 import com.cobblemon.mod.common.item.interactive.*
+import com.cobblemon.mod.common.item.interactive.PotionItem
 import com.cobblemon.mod.common.item.interactive.ability.AbilityChangeItem
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import com.cobblemon.mod.common.pokeball.PokeBall
@@ -50,14 +44,7 @@ import net.minecraft.world.effect.MobEffectInstance
 import net.minecraft.world.effect.MobEffects
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.food.FoodProperties
-import net.minecraft.world.item.BlockItem
-import net.minecraft.world.item.HangingSignItem
-import net.minecraft.world.item.Item
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.Items
-import net.minecraft.world.item.Rarity
-import net.minecraft.world.item.SignItem
-import net.minecraft.world.item.SmithingTemplateItem
+import net.minecraft.world.item.*
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.Block

@@ -184,25 +171,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val POKEDEX_WHITE = pokedexItem(PokedexType.WHITE)

-    val campfire_pots = mutableListOf<CampfirePotItem>()
-    @JvmField
-    val CAMPFIRE_POT_BLACK = campfirePotItem(CobblemonBlocks.BLACK_CAMPFIRE_POT, "black")
-    @JvmField
-    val CAMPFIRE_POT_BLUE = campfirePotItem(CobblemonBlocks.BLUE_CAMPFIRE_POT, "blue")
-    @JvmField
-    val CAMPFIRE_POT_GREEN = campfirePotItem(CobblemonBlocks.GREEN_CAMPFIRE_POT, "green")
-    @JvmField
-    val CAMPFIRE_POT_PINK = campfirePotItem(CobblemonBlocks.PINK_CAMPFIRE_POT, "pink")
-    @JvmField
-    val CAMPFIRE_POT_RED = campfirePotItem(CobblemonBlocks.RED_CAMPFIRE_POT, "red")
-    @JvmField
-    val CAMPFIRE_POT_WHITE = campfirePotItem(CobblemonBlocks.WHITE_CAMPFIRE_POT, "white")
-    @JvmField
-    val CAMPFIRE_POT_YELLOW = campfirePotItem(CobblemonBlocks.YELLOW_CAMPFIRE_POT, "yellow")
-
-    @JvmField
-    val Hearty_Grains = compostableItem("hearty_grains", HeartyGrainsItem(CobblemonBlocks.HEARTY_GRAINS))
-
    @JvmField
    val VIVICHOKE = compostableItem("vivichoke")

@@ -293,321 +261,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val GIMMIGHOUL_CHEST = this.create("gimmighoul_chest", BlockItem(CobblemonBlocks.GIMMIGHOUL_CHEST, Item.Properties()))

-    // Saccharines
-    @JvmField
-    val SACCHARINE_LOG = blockItem("saccharine_log", CobblemonBlocks.SACCHARINE_LOG)
-    @JvmField
-    val SACCHARINE_HONEY_LOG = blockItem("saccharine_honey_log", CobblemonBlocks.SACCHARINE_HONEY_LOG)
-    @JvmField
-    val STRIPPED_SACCHARINE_LOG = blockItem("stripped_saccharine_log", CobblemonBlocks.STRIPPED_SACCHARINE_LOG)
-    @JvmField
-    val SACCHARINE_WOOD = blockItem("saccharine_wood", CobblemonBlocks.SACCHARINE_WOOD)
-    @JvmField
-    val STRIPPED_SACCHARINE_WOOD = blockItem("stripped_saccharine_wood", CobblemonBlocks.STRIPPED_SACCHARINE_WOOD)
-    @JvmField
-    val SACCHARINE_PLANKS = blockItem("saccharine_planks", CobblemonBlocks.SACCHARINE_PLANKS)
-    @JvmField
-    val SACCHARINE_LEAVES = compostableBlockItem("saccharine_leaves", CobblemonBlocks.SACCHARINE_LEAVES)
-    @JvmField
-    val SACCHARINE_BOAT = create("saccharine_boat", CobblemonBoatItem(CobblemonBoatType.SACCHARINE, false, Item.Properties().stacksTo(1)))
-    @JvmField
-    val SACCHARINE_CHEST_BOAT = create("saccharine_chest_boat", CobblemonBoatItem(CobblemonBoatType.SACCHARINE, true, Item.Properties().stacksTo(1)))
-
-    @JvmField
-    val SACCHARINE_DOOR = blockItem("saccharine_door", CobblemonBlocks.SACCHARINE_DOOR)
-    @JvmField
-    val SACCHARINE_TRAPDOOR = blockItem("saccharine_trapdoor", CobblemonBlocks.SACCHARINE_TRAPDOOR)
-    @JvmField
-    val SACCHARINE_FENCE = blockItem("saccharine_fence", CobblemonBlocks.SACCHARINE_FENCE)
-    @JvmField
-    val SACCHARINE_FENCE_GATE = blockItem("saccharine_fence_gate", CobblemonBlocks.SACCHARINE_FENCE_GATE)
-    @JvmField
-    val SACCHARINE_BUTTON = blockItem("saccharine_button", CobblemonBlocks.SACCHARINE_BUTTON)
-    @JvmField
-    val SACCHARINE_PRESSURE_PLATE = blockItem("saccharine_pressure_plate", CobblemonBlocks.SACCHARINE_PRESSURE_PLATE)
-    @JvmField
-    val SACCHARINE_SLAB = blockItem("saccharine_slab", CobblemonBlocks.SACCHARINE_SLAB)
-    @JvmField
-    val SACCHARINE_STAIRS = blockItem("saccharine_stairs", CobblemonBlocks.SACCHARINE_STAIRS)
-    @JvmField
-    val SACCHARINE_SIGN = this.create("saccharine_sign", SignItem(Item.Properties().stacksTo(16), CobblemonBlocks.SACCHARINE_SIGN, CobblemonBlocks.SACCHARINE_WALL_SIGN))
-    @JvmField
-    val SACCHARINE_HANGING_SIGN = this.create("saccharine_hanging_sign", HangingSignItem(CobblemonBlocks.SACCHARINE_HANGING_SIGN, CobblemonBlocks.SACCHARINE_WALL_HANGING_SIGN, Item.Properties().stacksTo(16)))
-    @JvmField
-    val SACCHARINE_SAPLING = saccharineSaplingItem("saccharine_sapling", SaccharineSaplingItem(CobblemonBlocks.SACCHARINE_SAPLING))
-
-    @JvmField
-    val BUGWORT = bugwortItem("bugwort", BugwortItem(CobblemonBlocks.BUGWORT))
-    @JvmField
-    val POKE_BAIT = noSettingsItem("poke_bait")
-
-    @JvmField
-    val LURE_CAKE = blockItem("lure_cake", CobblemonBlocks.LURE_CAKE)
-    @JvmField
-    val POKE_CAKE = blockItem("poke_cake", CobblemonBlocks.POKE_CAKE)
-
-    val aprijuices = mutableListOf<AprijuiceItem>()
-    @JvmField
-    val APRIJUICE_BLACK = aprijuiceItem(Apricorn.BLACK)
-    @JvmField
-    val APRIJUICE_RED = aprijuiceItem(Apricorn.RED)
-    @JvmField
-    val APRIJUICE_BLUE = aprijuiceItem(Apricorn.BLUE)
-    @JvmField
-    val APRIJUICE_GREEN = aprijuiceItem(Apricorn.GREEN)
-    @JvmField
-    val APRIJUICE_YELLOW = aprijuiceItem(Apricorn.YELLOW)
-    @JvmField
-    val APRIJUICE_WHITE = aprijuiceItem(Apricorn.WHITE)
-    @JvmField
-    val APRIJUICE_PINK = aprijuiceItem(Apricorn.PINK)
-
-    @JvmField
-    val POKE_PUFF = noSettingsItem("poke_puff") // todo make a PokePuffItem class for friendship boosting purposes
-
-    // FOODS
-    @JvmField
-    val SWEET_HEART = noSettingsItem("sweet_heart") // todo make a SweetHeartItem class for breeding purposes
-
-    @JvmField
-    val PEWTER_CRUNCHIES = create("pewter_crunchies", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    @JvmField
-    val RAGE_CANDY_BAR = create("rage_candy_bar", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    @JvmField
-    val LAVA_COOKIE = create("lava_cookie", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    @JvmField
-    val OLD_GATEAU = create("old_gateau", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    @JvmField
-    val CASTELIACONE = create("casteliacone", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    @JvmField
-    val SHALOR_SABLE = create("shalor_sable", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    @JvmField
-    val LUMIOSE_GALETTE = create("lumiose_galette", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    @JvmField
-    val BIG_MALASADA = create("big_malasada", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    /*@JvmField // todo see what we are doing for these (are there different kinds?)
-    val CURRY = create("curry", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .usingConvertsTo(Items.BOWL)
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })*/
-
-    @JvmField
-    val JUBILIFE_MUFFIN = create("jubilife_muffin", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    /*@JvmField // todo see what we are doing for these (are there different kinds?)
-    val SANDWICH = create("sandwich", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .usingConvertsTo(Items.BOWL)
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })*/
-
-    // todo we might need to wait on these for later?
-    /*@JvmField
-    val CHOICE_DUMPLING = noSettingsItem("choice_dumpling") // todo make a ChoiceDumpingItem class for breeding purposes
-    @JvmField
-    val SWAP_SNACK = noSettingsItem("swap_snack") // todo make a SwapSnackItem class for breeding purposes
-    @JvmField
-    val TWICE_SPICED_BEETROOT = noSettingsItem("twice_spiced_beetroot") // todo make a TwiceSpiceBeetrootItem class for breeding purposes
-*/
-    @JvmField
-    val POTATO_MOCHI = create("potato_mochi", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-            .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-    @JvmField
-    val FRIED_RICE = create("fried_rice", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-            .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-    @JvmField
-    val CANDIED_APPLE = create("candied_apple", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-            .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-    @JvmField
-    val CANDIED_BERRY = create("candied_berry", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-            .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-    @JvmField
-    val JELLY_DOUGHNUT = create("jelly_doughnut", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-            .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-
-
-    // todo etc?
-
-    //@JvmField
-    //val SCATTER_BANG = this.create("scatter_bang", ScatterBangItem(Item.Settings()))
-    //@JvmField
-    //val STICKY_GLOB = this.create("sticky_glob", StickyGlobItem(Item.Settings()))
-
    @JvmField
    val RESTORATION_TANK = blockItem("restoration_tank", CobblemonBlocks.RESTORATION_TANK)
    @JvmField
@@ -623,12 +276,12 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val DISPLAY_CASE = blockItem("display_case", CobblemonBlocks.DISPLAY_CASE)
    @JvmField
-    val INCENSE_SWEET = blockItem("incense_sweet", CobblemonBlocks.INCENSE_SWEET)
-
+    val LECTERN = blockItem("lectern", CobblemonBlocks.LECTERN)

    // Evolution items
    @JvmField val LINK_CABLE = create("link_cable", LinkCableItem())
    @JvmField val DRAGON_SCALE = noSettingsItem("dragon_scale")
+    @JvmField val KINGS_ROCK = noSettingsItem("kings_rock")
    @JvmField val METAL_COAT = noSettingsItem("metal_coat")
    @JvmField val UPGRADE = noSettingsItem("upgrade")
    @JvmField val DUBIOUS_DISC = noSettingsItem("dubious_disc")
@@ -641,21 +294,20 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField val REAPER_CLOTH = noSettingsItem("reaper_cloth")
    @JvmField val PRISM_SCALE = noSettingsItem("prism_scale")
    @JvmField val SACHET = noSettingsItem("sachet")
-    @JvmField val WHIPPED_DREAM = create("whipped_dream", foodItem(8, 0.3f))
-    @JvmField val STRAWBERRY_SWEET = create("strawberry_sweet", foodItem(6, 0.125f))
-    @JvmField val LOVE_SWEET = create("love_sweet", foodItem(6, 0.125f))
-    @JvmField val BERRY_SWEET = create("berry_sweet", foodItem(6, 0.125f))
-    @JvmField val CLOVER_SWEET = create("clover_sweet", foodItem(6, 0.125f))
-    @JvmField val FLOWER_SWEET = create("flower_sweet", foodItem(6, 0.125f))
-    @JvmField val STAR_SWEET = create("star_sweet", foodItem(6, 0.125f))
-    @JvmField val RIBBON_SWEET = create("ribbon_sweet", foodItem(6, 0.125f))
+    @JvmField val WHIPPED_DREAM = noSettingsItem("whipped_dream")
+    @JvmField val STRAWBERRY_SWEET = noSettingsItem("strawberry_sweet")
+    @JvmField val LOVE_SWEET = noSettingsItem("love_sweet")
+    @JvmField val BERRY_SWEET = noSettingsItem("berry_sweet")
+    @JvmField val CLOVER_SWEET = noSettingsItem("clover_sweet")
+    @JvmField val FLOWER_SWEET = noSettingsItem("flower_sweet")
+    @JvmField val STAR_SWEET = noSettingsItem("star_sweet")
+    @JvmField val RIBBON_SWEET = noSettingsItem("ribbon_sweet")
    @JvmField val CHIPPED_POT = noSettingsItem("chipped_pot")
    @JvmField val CRACKED_POT = noSettingsItem("cracked_pot")
    @JvmField val MASTERPIECE_TEACUP = noSettingsItem("masterpiece_teacup")
    @JvmField val UNREMARKABLE_TEACUP = noSettingsItem("unremarkable_teacup")
-    @JvmField val SWEET_APPLE = create("sweet_apple", foodItem(4, 0.3f))
-    @JvmField val TART_APPLE = create("tart_apple", foodItem(4, 0.3f))
-    @JvmField val SYRUPY_APPLE = create("syrupy_apple", foodItem(4, 0.3f))
+    @JvmField val SWEET_APPLE = noSettingsItem("sweet_apple")
+    @JvmField val TART_APPLE = noSettingsItem("tart_apple")
    @JvmField val GALARICA_CUFF = noSettingsItem("galarica_cuff")
    @JvmField val GALARICA_WREATH = noSettingsItem("galarica_wreath")
    @JvmField val BLACK_AUGURITE = noSettingsItem("black_augurite")
@@ -769,20 +421,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val ZINC = create("zinc", VitaminItem(Stats.SPECIAL_DEFENCE))
    @JvmField
-    val HEALTH_MOCHI = create("health_mochi", MochiItem(Stats.HP))
-    @JvmField
-    val MUSCLE_MOCHI = create("muscle_mochi", MochiItem(Stats.ATTACK))
-    @JvmField
-    val RESIST_MOCHI = create("resist_mochi", MochiItem(Stats.DEFENCE))
-    @JvmField
-    val GENIUS_MOCHI = create("genius_mochi", MochiItem(Stats.SPECIAL_ATTACK))
-    @JvmField
-    val CLEVER_MOCHI = create("clever_mochi", MochiItem(Stats.SPECIAL_DEFENCE))
-    @JvmField
-    val SWIFT_MOCHI = create("swift_mochi", MochiItem(Stats.SPEED))
-    @JvmField
-    val FRESH_START_MOCHI = create("fresh_start_mochi", FreshStartMochiItem())
-    @JvmField
    val GENIUS_FEATHER = create("genius_feather", FeatherItem(Stats.SPECIAL_ATTACK))
    @JvmField
    val SWIFT_FEATHER = create("swift_feather", FeatherItem(Stats.SPEED))
@@ -1022,19 +660,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val WATER_STONE = noSettingsItem("water_stone")

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

-    private fun wearableItem(name: String, heldItemRemappedName: String? = null): CobblemonItem = create(
-        name,
-        WearableItem(name).also {
-            wearables.add(it)
-            if (heldItemRemappedName != null) {
-                CobblemonHeldItemManager.registerRemap(it, heldItemRemappedName)
-            }
-        }
-    )
-
-    private fun campfirePotItem(block: Block, type: String): CampfirePotItem {
-        val item = create("campfire_pot_${type}", CampfirePotItem(block))
-        campfire_pots.add(item)
-        return item
-    }
-
-    private fun aprijuiceItem(type: Apricorn): AprijuiceItem {
-        val item = create("aprijuice_${type.name.lowercase()}", AprijuiceItem(type))
-        aprijuices.add(item)
-        return item
-    }
-
    private fun heldItem(name: String, remappedName: String? = null): CobblemonItem = create(
        name,
        CobblemonItem(Item.Properties()).also {
@@ -1701,21 +1322,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
        return item
    }

-    private fun saccharineSaplingItem(name: String, saccharineSaplingItem: SaccharineSaplingItem): SaccharineSaplingItem {
-        val finalName = "saccharine_sapling"
-        val item = this.create(finalName, saccharineSaplingItem)
-        compostable(item, .65f)
-        return item
-    }
-
-    private fun bugwortItem(name: String, bugwortItem: BugwortItem): BugwortItem {
-        val finalName = "bugwort"
-        val item = this.create(finalName, bugwortItem)
-        compostable(item, .65f)
-        return item
-    }
-
-
    private fun mintSeed(name: String, mintBlock: MintBlock): Item {
        val finalName = "${name}_mint_seeds"
        val item = this.blockItem(finalName, mintBlock)
@@ -1748,7 +1354,4 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
        return createdItem
    }

-    private fun foodItem(nutrition: Int, saturationModifier: Float): Item {
-        return Item(Item.Properties().food(FoodProperties.Builder().nutrition(nutrition).saturationModifier(saturationModifier).build()))
-    }
 }
@@ -1,30 +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
-
-
-import com.cobblemon.mod.common.block.campfirepot.CookingPotMenu
-import com.cobblemon.mod.common.client.gui.cookingpot.CookingPotScreen
-import com.cobblemon.mod.common.platform.PlatformRegistry
-import net.minecraft.client.gui.screens.MenuScreens
-import net.minecraft.core.Registry
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
-import net.minecraft.world.inventory.MenuType
-
-object CobblemonMenuType : PlatformRegistry<Registry<MenuType<*>>, ResourceKey<Registry<MenuType<*>>>, MenuType<*>>() {
-
-    val COOKING_POT = MenuType.register("cooking_pot", ::CookingPotMenu)
-
-    override val registry: Registry<MenuType<*>>
-        get() = BuiltInRegistries.MENU
-    override val resourceKey: ResourceKey<Registry<MenuType<*>>>
-        get() = Registries.MENU
-}
@@ -17,7 +17,6 @@ import com.cobblemon.mod.common.client.net.battle.*
 import com.cobblemon.mod.common.client.net.callback.move.OpenMoveCallbackHandler
 import com.cobblemon.mod.common.client.net.callback.party.OpenPartyCallbackHandler
 import com.cobblemon.mod.common.client.net.callback.partymove.OpenPartyMoveCallbackHandler
-import com.cobblemon.mod.common.client.net.cooking.ToggleCookingPotLidHandler
 import com.cobblemon.mod.common.client.net.data.DataRegistrySyncPacketHandler
 import com.cobblemon.mod.common.client.net.data.UnlockReloadPacketHandler
 import com.cobblemon.mod.common.client.net.dialogue.DialogueClosedHandler
@@ -68,8 +67,6 @@ import com.cobblemon.mod.common.net.messages.client.battle.*
 import com.cobblemon.mod.common.net.messages.client.callback.OpenMoveCallbackPacket
 import com.cobblemon.mod.common.net.messages.client.callback.OpenPartyCallbackPacket
 import com.cobblemon.mod.common.net.messages.client.callback.OpenPartyMoveCallbackPacket
-import com.cobblemon.mod.common.net.messages.client.cooking.SeasoningRegistrySyncPacket
-import com.cobblemon.mod.common.net.messages.client.cooking.ToggleCookingPotLidPacket
 import com.cobblemon.mod.common.net.messages.client.data.*
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueClosedPacket
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueOpenedPacket
@@ -145,8 +142,6 @@ import com.cobblemon.mod.common.net.messages.server.callback.party.PartyPokemonS
 import com.cobblemon.mod.common.net.messages.server.callback.party.PartySelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.partymove.PartyMoveSelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.partymove.PartyPokemonMoveSelectedPacket
-import com.cobblemon.mod.common.net.messages.server.debug.ServerboundUpdateRidingStatRangePacket
-import com.cobblemon.mod.common.net.messages.server.debug.ServerboundUpdateRidingStatsPacket
 import com.cobblemon.mod.common.net.messages.server.dialogue.EscapeDialoguePacket
 import com.cobblemon.mod.common.net.messages.server.dialogue.InputToDialoguePacket
 import com.cobblemon.mod.common.net.messages.server.npc.SaveNPCPacket
@@ -191,8 +186,6 @@ import com.cobblemon.mod.common.net.serverhandling.callback.party.PartyPokemonSe
 import com.cobblemon.mod.common.net.serverhandling.callback.party.PartySelectCancelledHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.partymove.PartyMoveSelectCancelledHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.partymove.PartyPokemonMoveSelectedHandler
-import com.cobblemon.mod.common.net.serverhandling.debug.ServerboundUpdateRidingStatRangeHandler
-import com.cobblemon.mod.common.net.serverhandling.debug.ServerboundUpdateRidingStatsHandler
 import com.cobblemon.mod.common.net.serverhandling.dialogue.EscapeDialogueHandler
 import com.cobblemon.mod.common.net.serverhandling.dialogue.InputToDialogueHandler
 import com.cobblemon.mod.common.net.serverhandling.evolution.AcceptEvolutionHandler
@@ -288,7 +281,6 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(MarksUpdatePacket.ID, MarksUpdatePacket::decode, PokemonUpdatePacketHandler()))
        list.add(PacketRegisterInfo(MarksPotentialUpdatePacket.ID, MarksPotentialUpdatePacket::decode, PokemonUpdatePacketHandler()))
        list.add(PacketRegisterInfo(MarkingsUpdatePacket.ID, MarkingsUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(RideBoostsUpdatePacket.ID, RideBoostsUpdatePacket::decode, PokemonUpdatePacketHandler()))

        // Evolution start
        list.add(PacketRegisterInfo(AddEvolutionPacket.ID, AddEvolutionPacket::decode, PokemonUpdatePacketHandler()))
@@ -378,8 +370,7 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(ScriptRegistrySyncPacket.ID, ScriptRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(PokedexDexSyncPacket.ID, PokedexDexSyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(DexEntrySyncPacket.ID, DexEntrySyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(SpawnBaitRegistrySyncPacket.ID, SpawnBaitRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(SeasoningRegistrySyncPacket.ID, SeasoningRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
+        list.add(PacketRegisterInfo(FishingBaitRegistrySyncPacket.ID, FishingBaitRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(FlowRegistrySyncPacket.ID, FlowRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(CosmeticItemAssignmentSyncPacket.ID, CosmeticItemAssignmentSyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(MarkRegistrySyncPacket.ID, MarkRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
@@ -545,11 +536,6 @@ object CobblemonNetwork {
        // Riding packet(s)
        list.add(PacketRegisterInfo(ServerboundUpdateOrientationPacket.ID, ServerboundUpdateOrientationPacket::decode, OrientationPacketHandler))
        list.add(PacketRegisterInfo(ServerboundUpdateRidingStatePacket.ID, ServerboundUpdateRidingStatePacket::decode, ServerboundUpdateRidingStateHandler))
-        list.add(PacketRegisterInfo(ServerboundUpdateRidingStatsPacket.ID, ServerboundUpdateRidingStatsPacket::decode, ServerboundUpdateRidingStatsHandler))
-        list.add(PacketRegisterInfo(ServerboundUpdateRidingStatRangePacket.ID, ServerboundUpdateRidingStatRangePacket::decode, ServerboundUpdateRidingStatRangeHandler))
-
-        // Cooking
-        list.add(PacketRegisterInfo(ToggleCookingPotLidPacket.ID, ToggleCookingPotLidPacket::decode, ToggleCookingPotLidHandler))

        return list
    }
@@ -1,40 +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
-
-import net.minecraft.client.RecipeBookCategories
-
-enum class CobblemonRecipeCategories {
-
-    COOKING_POT_SEARCH("COOKING_POT_SEARCH"),
-    COOKING_POT_FOODS("COOKING_POT_FOODS"),
-    COOKING_POT_MEDICINES("COOKING_POT_MEDICINES"),
-    COOKING_POT_BAITS("COOKING_POT_BAITS"),
-    COOKING_POT_MISC("COOKING_POT_MISC");
-
-    companion object {
-        val customAggregateCategories: Map<RecipeBookCategories, List<RecipeBookCategories>> = mapOf(
-            COOKING_POT_SEARCH.toVanillaCategory() to listOf(
-                COOKING_POT_FOODS.toVanillaCategory(), COOKING_POT_MISC.toVanillaCategory(), COOKING_POT_MEDICINES.toVanillaCategory(), COOKING_POT_BAITS.toVanillaCategory()
-            )
-        )
-    }
-
-    var id: String
-
-    constructor(id: String) {
-        this.id = id
-    }
-
-    fun toVanillaCategory(): RecipeBookCategories {
-        return RecipeBookCategories.valueOf(this.id)
-    }
-
-
-}
@@ -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
-
-
-import com.cobblemon.mod.common.item.crafting.CookingPotRecipe
-import com.cobblemon.mod.common.item.crafting.CookingPotShapelessRecipe
-import com.cobblemon.mod.common.platform.PlatformRegistry
-import net.minecraft.core.Registry
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
-import net.minecraft.world.item.crafting.Recipe
-import net.minecraft.world.item.crafting.RecipeSerializer
-
-object CobblemonRecipeSerializers : PlatformRegistry<Registry<RecipeSerializer<*>>, ResourceKey<Registry<RecipeSerializer<*>>>, RecipeSerializer<*>>() {
-
-    val COOKING_POT_COOKING: RecipeSerializer<*> = register("cobblemon:cooking_pot", CookingPotRecipe.Serializer())
-    val COOKING_POT_SHAPELESS: RecipeSerializer<*> = register("cobblemon:cooking_pot_shapeless", CookingPotShapelessRecipe.Serializer())
-
-    override val registry: Registry<RecipeSerializer<*>>
-        get() = BuiltInRegistries.RECIPE_SERIALIZER
-    override val resourceKey: ResourceKey<Registry<RecipeSerializer<*>>>
-        get() = Registries.RECIPE_SERIALIZER
-
-    fun <S : RecipeSerializer<T>, T : Recipe<*>> register(key: String, recipeSerializer: S): S {
-        return Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, key, recipeSerializer) as S
-    }
-}
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common
-
-
-import com.cobblemon.mod.common.item.crafting.CookingPotRecipe
-import com.cobblemon.mod.common.item.crafting.CookingPotShapelessRecipe
-import com.cobblemon.mod.common.platform.PlatformRegistry
-import net.minecraft.core.Registry
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
-import net.minecraft.world.item.crafting.Recipe
-import net.minecraft.world.item.crafting.RecipeType
-
-object CobblemonRecipeTypes : PlatformRegistry<Registry<RecipeType<*>>, ResourceKey<Registry<RecipeType<*>>>, RecipeType<*>>() {
-
-    val COOKING_POT_COOKING: RecipeType<CookingPotRecipe> = register("cobblemon:cooking_pot")
-    val COOKING_POT_SHAPELESS: RecipeType<CookingPotShapelessRecipe> = register("cobblemon:cooking_pot_shapeless")
-
-    override val registry: Registry<RecipeType<*>>
-        get() = BuiltInRegistries.RECIPE_TYPE
-    override val resourceKey: ResourceKey<Registry<RecipeType<*>>>
-        get() = Registries.RECIPE_TYPE
-
-    fun <T : Recipe<*>> register(identifier: String): RecipeType<T> {
-        return Registry.register(
-                BuiltInRegistries.RECIPE_TYPE,
-                identifier,
-                object : RecipeType<T> {
-                    override fun toString(): String {
-                        return identifier
-                    }
-                }
-        )
-    }
-
-}
@@ -112,8 +112,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
    val MEDICINE_SPRAY_USE = this.create("item.medicine.spray.use")
    @JvmField
    val MEDICINE_FEATHER_USE = this.create("item.medicine.feather.use")
-    @JvmField
-    val MOCHI_USE = this.create("item.medicine.feather.use")

    @JvmField
    val MULCH_PLACE = this.create("block.mulch.place")
@@ -427,37 +425,5 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
        DISPLAY_CASE_STEP
    )

-    @JvmField
-    val CAMPFIRE_POT_PLACE_CAMPFIRE = this.create("block.campfire_pot.place_campfire")
-    @JvmField
-    val CAMPFIRE_POT_RETRIEVE = this.create("block.campfire_pot.retrieve")
-    @JvmField
-    val CAMPFIRE_POT_OPEN = this.create("block.campfire_pot.open")
-    @JvmField
-    val CAMPFIRE_POT_CLOSE = this.create("block.campfire_pot.close")
-    @JvmField
-    val CAMPFIRE_POT_USE = this.create("block.campfire_pot.use")
-    @JvmField
-    val CAMPFIRE_POT_COOK = this.create("block.campfire_pot.cook")
-    @JvmField
-    val CAMPFIRE_POT_CRAFT = this.create("block.campfire_pot.craft")
-    @JvmField
-    val CAMPFIRE_POT_PLACE = this.create("block.campfire_pot.place")
-    @JvmField
-    val CAMPFIRE_POT_BREAK = this.create("block.campfire_pot.break")
-    @JvmField
-    val CAMPFIRE_POT_HIT = this.create("block.campfire_pot.hit")
-    @JvmField
-    val CAMPFIRE_POT_STEP = this.create("block.campfire_pot.step")
-
-    @JvmField
-    val CAMPFIRE_POT_SOUNDS = SoundType(1f, 1.1f,
-        CAMPFIRE_POT_BREAK,
-        CAMPFIRE_POT_STEP,
-        CAMPFIRE_POT_PLACE,
-        CAMPFIRE_POT_HIT,
-        CAMPFIRE_POT_STEP
-    )
-
    private fun create(name: String): SoundEvent = this.create(name, SoundEvent.createVariableRangeEvent(cobblemonResource(name)))
 }
@@ -19,7 +19,7 @@ import net.minecraft.world.entity.ai.village.poi.PoiType
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.BlockState

-object CobblemonPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Registry<PoiType>>, PoiType>() {
+object CobblemonVillagerPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Registry<PoiType>>, PoiType>() {
    override val registry: Registry<PoiType> = BuiltInRegistries.POINT_OF_INTEREST_TYPE
    override val resourceKey: ResourceKey<Registry<PoiType>> = Registries.POINT_OF_INTEREST_TYPE

@@ -27,20 +27,8 @@ object CobblemonPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Regist
    val NURSE_KEY: ResourceKey<PoiType> = createKey("nurse")
    @JvmField
    val NURSE = create(NURSE_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.HEALING_MACHINE), 1, 1))
-    @JvmField
-    val LURE_CAKE_KEY: ResourceKey<PoiType> = createKey("lure_cake")
-    @JvmField
-    val LURE_CAKE = create(LURE_CAKE_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.LURE_CAKE), 0, 1))
-    @JvmField
-    val SACCHARINE_HONEY_LOG_KEY: ResourceKey<PoiType> = createKey("saccharine_honey_log")
-    @JvmField
-    val SACCHARINE_HONEY_LOG = create(SACCHARINE_HONEY_LOG_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.SACCHARINE_HONEY_LOG), 0, 1))
-    @JvmField
-    val INCENSE_SWEET_KEY: ResourceKey<PoiType> = createKey("saccharine_honey_log")
-    @JvmField
-    val INCENSE_SWEET = create(INCENSE_SWEET_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.INCENSE_SWEET), 0, 1))

    private fun createKey(string: String): ResourceKey<PoiType> = ResourceKey.create(Registries.POINT_OF_INTEREST_TYPE, cobblemonResource(string))

    private fun getBlockStates(block: Block): Set<BlockState> = ImmutableSet.copyOf(block.stateDefinition.possibleStates)
-}
+}
@@ -24,7 +24,7 @@ object CobblemonVillagerProfessions: PlatformRegistry<Registry<VillagerProfessio
    override val resourceKey: ResourceKey<Registry<VillagerProfession>> = Registries.VILLAGER_PROFESSION

    @JvmField
-    val NURSE = profession(CobblemonPoiTypes.NURSE_KEY, CobblemonSounds.VILLAGER_WORK_NURSE)
+    val NURSE = profession(CobblemonVillagerPoiTypes.NURSE_KEY, CobblemonSounds.VILLAGER_WORK_NURSE)

    /**
     * Register a villager profession texture override for Cobblemon villagers of the given [VillagerProfession] for specified names.
@@ -20,8 +20,8 @@ import net.minecraft.resources.ResourceLocation
 class CastPokeRodContext(val baitId: ResourceLocation)

 class CastPokeRodCriterionCondition(
-    playerCtx: Optional<ContextAwarePredicate>,
-    val baitId: String
+        playerCtx: Optional<ContextAwarePredicate>,
+        val baitId: String
 ): SimpleCriterionCondition<CastPokeRodContext>(playerCtx) {

    companion object {
@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.apricorn

 import com.cobblemon.mod.common.CobblemonBlocks
 import com.cobblemon.mod.common.CobblemonItems
-import com.cobblemon.mod.common.api.cooking.Flavour
 import com.cobblemon.mod.common.block.ApricornBlock
 import com.cobblemon.mod.common.block.ApricornSaplingBlock
 import com.cobblemon.mod.common.item.ApricornItem
@@ -28,43 +27,15 @@ import net.minecraft.world.level.material.MapColor
 * @author Licious
 * @since October 29th, 2022
 */
-enum class Apricorn(
-    /** A value of true means it buffs that flavour, a value of false means it weakens that flavour. */
-    val flavourStrength: Map<Flavour, Boolean> = emptyMap()
-) : StringRepresentable {
+enum class Apricorn : StringRepresentable {

    BLACK,
-    BLUE(
-        mapOf(
-            Flavour.DRY to true,
-            Flavour.BITTER to false
-        )
-    ),
-    GREEN(
-        mapOf(
-            Flavour.BITTER to true,
-            Flavour.SWEET to false
-        )
-    ),
-    PINK(
-        mapOf(
-            Flavour.SWEET to true,
-            Flavour.SPICY to false
-        )
-    ),
-    RED(
-        mapOf(
-            Flavour.SPICY to true,
-            Flavour.SOUR to false
-        )
-    ),
+    BLUE,
+    GREEN,
+    PINK,
+    RED,
    WHITE,
-    YELLOW(
-        mapOf(
-            Flavour.SOUR to true,
-            Flavour.DRY to false
-        )
-    );
+    YELLOW;

    fun item(): ApricornItem = when(this) {
        BLACK -> CobblemonItems.BLACK_APRICORN
@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.berry
 import com.cobblemon.mod.common.CobblemonBlocks
 import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.api.berry.spawncondition.BerrySpawnCondition
-import com.cobblemon.mod.common.api.cooking.Flavour
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.berry.BerryYieldCalculationEvent
 import com.cobblemon.mod.common.api.mulch.MulchVariant
@@ -21,10 +20,16 @@ import com.cobblemon.mod.common.item.berry.BerryItem
 import com.cobblemon.mod.common.pokemon.Nature
 import com.cobblemon.mod.common.util.readBox
 import com.cobblemon.mod.common.util.readEnumConstant
+import com.cobblemon.mod.common.util.readEnumSet
 import com.cobblemon.mod.common.util.readIdentifier
+import com.cobblemon.mod.common.util.readList
+import com.cobblemon.mod.common.util.readMap
 import com.cobblemon.mod.common.util.writeBox
+import com.cobblemon.mod.common.util.writeCollection
 import com.cobblemon.mod.common.util.writeEnumConstant
+import com.cobblemon.mod.common.util.writeEnumSet
 import com.cobblemon.mod.common.util.writeIdentifier
+import com.cobblemon.mod.common.util.writeMap
 import com.google.gson.annotations.SerializedName
 import net.minecraft.core.BlockPos
 import net.minecraft.network.RegistryFriendlyByteBuf
@@ -33,7 +38,6 @@ import java.util.EnumSet
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.tags.TagKey
 import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.item.DyeColor
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.biome.Biome
 import net.minecraft.world.level.block.Block
@@ -57,7 +61,7 @@ import net.minecraft.world.phys.shapes.VoxelShape
 * @property growthPoints A collection of [GrowthPoint]s for the berry flowers and fruit.
 * @property sproutShapeBoxes A collection of [Box]es that make up the tree [VoxelShape] during the sprouting stages.
 * @property matureShapeBoxes A collection of [Box]es that make up the tree [VoxelShape] during the mature stages.
- * @property flavours The [com.cobblemon.mod.common.api.cooking.Flavour] values.
+ * @property flavors The [Flavor] values.
 * @property tintIndexes Determines tints at specific indexes if any.
 * @property flowerModelIdentifier The [ResourceLocation] for the model of the berry in flower form.
 * @property flowerTexture The [ResourceLocation] for the texture of the berry in flower form. This is resolved into a [ModelPart] on the client.
@@ -83,10 +87,7 @@ class Berry(
    private val sproutShapeBoxes: Collection<AABB>,
    @SerializedName("matureShape")
    private val matureShapeBoxes: Collection<AABB>,
-    @SerializedName("flavours", alternate = ["flavor"])
-    val flavours: Map<Flavour, Int>,
-    @SerializedName("colour", alternate = ["color"])
-    val colour: DyeColor,
+    private val flavors: Map<Flavor, Int>,
    val tintIndexes: Map<Int, Color>,
    @SerializedName("flowerModel")
    val flowerModelIdentifier: ResourceLocation,
@@ -143,13 +144,13 @@ class Berry(
    /**
     * Query the value of a certain flavor.
     *
-     * @param flavour The [Flavour] being queried.
+     * @param flavor The [Flavor] being queried.
     * @return The value if any or 0.
     */
-    fun flavor(flavour: Flavour): Int = this.flavours[flavour] ?: 0
+    fun flavor(flavor: Flavor): Int = this.flavors[flavor] ?: 0

    fun dislikedBy(nature: Nature): Boolean {
-        val dislikedFlavor = nature.dislikedFlavour ?: return false
+        val dislikedFlavor = nature.dislikedFlavor ?: return false
        return flavor(dislikedFlavor) > 0
    }

@@ -280,8 +281,7 @@ class Berry(
        buffer.writeCollection(this.matureShapeBoxes) { writer, value ->
            writer.writeBox(value)
        }
-        buffer.writeMap(this.flavours, { writer, key -> writer.writeEnumConstant(key) }, { writer, value -> writer.writeInt(value) })
-        buffer.writeEnumConstant(colour)
+        buffer.writeMap(this.flavors, { writer, key -> writer.writeEnumConstant(key) }, { writer, value -> writer.writeInt(value) })
        buffer.writeMap(this.tintIndexes, { writer, key -> writer.writeInt(key) }, { writer, value -> writer.writeInt(value.rgb) })
        buffer.writeIdentifier(this.flowerModelIdentifier)
        buffer.writeIdentifier(this.flowerTexture)
@@ -353,8 +353,7 @@ class Berry(
            val mutations = buffer.readMap({ reader -> reader.readIdentifier() }, { reader -> reader.readIdentifier() })
            val sproutShapeBoxes = buffer.readList { it.readBox() }
            val matureShapeBoxes = buffer.readList { it.readBox() }
-            val flavors = buffer.readMap({ reader -> reader.readEnumConstant(Flavour::class.java) }, { reader -> reader.readInt() })
-            val colour = buffer.readEnumConstant(DyeColor::class.java)
+            val flavors = buffer.readMap({ reader -> reader.readEnumConstant(Flavor::class.java) }, { reader -> reader.readInt() })
            val tintIndexes = buffer.readMap({ reader -> reader.readInt() }, { reader -> Color(reader.readInt()) })
            val flowerModelIdentifier = buffer.readIdentifier()
            val flowerTexture = buffer.readIdentifier()
@@ -362,7 +361,7 @@ class Berry(
            val fruitTexture = buffer.readIdentifier()
            val stageOneYPos = GrowthPoint(Vec3(buffer.readDouble(), buffer.readDouble(), buffer.readDouble()), Vec3(buffer.readDouble(), buffer.readDouble(), buffer.readDouble()))
            val boneMealChance = buffer.readFloat()
-            return Berry(identifier, baseYield, emptyList(), growthTime, refreshRate, favMulchs, emptySet(), emptyList(), growthPoints, randomizedGrowthPoints, mutations, sproutShapeBoxes, matureShapeBoxes, flavors, colour, tintIndexes, flowerModelIdentifier, flowerTexture, fruitModelIdentifier, fruitTexture, stageOneYPos, 0F, boneMealChance)
+            return Berry(identifier, baseYield, emptyList(), growthTime, refreshRate, favMulchs, emptySet(), emptyList(), growthPoints, randomizedGrowthPoints, mutations, sproutShapeBoxes, matureShapeBoxes, flavors, tintIndexes, flowerModelIdentifier, flowerTexture, fruitModelIdentifier, fruitTexture, stageOneYPos, 0F, boneMealChance)
        }

    }
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.berry
+
+/**
+ * Represents the different flavors associated with berries and other Pokémon consumables.
+ * See the [Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Flavor) article for more information.
+ *
+ * @author Licious
+ * @since November 28th, 2022
+ */
+enum class Flavor(val colour: Int) {
+    SPICY(0x00FF00),
+    DRY(0xFF0000),
+    SWEET(0x0000FF),
+    BITTER(0xFFFF00),
+    SOUR(0xFF00FF);
+}
@@ -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.cooking
-
-import net.minecraft.ChatFormatting
-import net.minecraft.util.StringRepresentable
-
-/**
- * Represents the different flavors associated with berries and other Pokémon consumables.
- * See the [Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Flavor) article for more information.
- *
- * @author Licious
- * @since November 28th, 2022
- */
-enum class Flavour(val colour: Int, val chatFormatting: ChatFormatting): StringRepresentable {
-    SPICY(0x00FF00, ChatFormatting.RED),
-    DRY(0xFF0000, ChatFormatting.DARK_AQUA),
-    SWEET(0x0000FF, ChatFormatting.LIGHT_PURPLE),
-    BITTER(0xFFFF00, ChatFormatting.GREEN),
-    SOUR(0xFF00FF, ChatFormatting.YELLOW);
-
-    override fun getSerializedName() = name
-    companion object {
-        val CODEC = StringRepresentable.fromEnum<Flavour> { Flavour.entries.toTypedArray() }
-    }
-}
@@ -1,63 +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.cooking
-
-import net.minecraft.util.FastColor
-import net.minecraft.world.item.ItemStack
-
-private val colourMap = mapOf(
-    Flavour.SPICY to 0xFEB37D,
-    Flavour.DRY to 0x8AE9FC,
-    Flavour.SWEET to 0xFFBEED,
-    Flavour.BITTER to 0x9EED8F,
-    Flavour.SOUR to 0xFCF38A
-)
-
-private val bubbleColourMap = mapOf(
-    Flavour.SPICY to 0xFFD9AD,
-    Flavour.DRY to 0xBCF8FE,
-    Flavour.SWEET to 0xFEE3F9,
-    Flavour.BITTER to 0xC8F7BC,
-    Flavour.SOUR to 0xFDFAB8
-)
-
-fun getColourMixFromSeasonings(seasonings: List<ItemStack>, forBubbles: Boolean = false): Int? {
-    val flavors = seasonings
-        .flatMap { Seasonings.getFlavoursFromItemStack(it).entries }
-        .groupingBy { it.key }
-        .fold(0) { acc, entry -> acc + entry.value }
-
-    val maxFlavorValue = flavors.values.maxOrNull()
-    val dominantFlavors = flavors.filter { it.value == maxFlavorValue }.map { it.key }
-
-    return getColourMixFromFlavours(dominantFlavors, forBubbles)
-}
-
-fun getColourMixFromFlavours(dominantFlavours: List<Flavour>, forBubbles: Boolean = false): Int? {
-    val colors =
-        dominantFlavours.mapNotNull { if (forBubbles) bubbleColourMap[it] else colourMap[it] }
-            .map { FastColor.ARGB32.opaque(it) }
-
-    if (colors.isEmpty()) return null
-
-    val (alphaSum, redSum, greenSum, blueSum) = colors.fold(IntArray(4)) { acc, color ->
-        acc[0] += FastColor.ARGB32.alpha(color)
-        acc[1] += FastColor.ARGB32.red(color)
-        acc[2] += FastColor.ARGB32.green(color)
-        acc[3] += FastColor.ARGB32.blue(color)
-        acc
-    }
-
-    return FastColor.ARGB32.color(
-        alphaSum / colors.size,
-        redSum / colors.size,
-        greenSum / colors.size,
-        blueSum / colors.size
-    )
-}
@@ -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.cooking
-
-import com.cobblemon.mod.common.api.conditional.ITEM_REGISTRY_LIKE_CODEC
-import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
-import com.cobblemon.mod.common.api.conditional.RegistryLikeIdentifierCondition
-import com.cobblemon.mod.common.api.fishing.SpawnBait
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.annotations.SerializedName
-import com.mojang.serialization.Codec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import io.netty.buffer.ByteBuf
-import net.minecraft.network.codec.ByteBufCodecs
-import net.minecraft.network.codec.StreamCodec
-import net.minecraft.world.item.DyeColor
-import net.minecraft.world.item.Item
-
-data class Seasoning(
-    val ingredient: RegistryLikeCondition<Item>,
-    @SerializedName("flavours", alternate = ["flavors"])
-    val flavours: Map<Flavour, Int>,
-    @SerializedName("colour", alternate = ["color"])
-    val colour: DyeColor,
-    @SerializedName("baitEffects")
-    val baitEffects: List<SpawnBait.Effect> = emptyList()
-) {
-    companion object {
-        val CODEC: Codec<Seasoning> = RecordCodecBuilder.create { builder ->
-            builder.group(
-                ITEM_REGISTRY_LIKE_CODEC.fieldOf("ingredient").forGetter { it.ingredient },
-                Codec.unboundedMap(Flavour.CODEC, Codec.INT).fieldOf("flavours").forGetter { it.flavours }, // Use map codec
-                DyeColor.CODEC.fieldOf("colour").forGetter { it.colour },
-                SpawnBait.Effect.CODEC.listOf().optionalFieldOf("baitEffects", emptyList()).forGetter { it.baitEffects }
-            ).apply(builder, ::Seasoning)
-        }
-
-        val STREAM_CODEC: StreamCodec<ByteBuf, Seasoning> = ByteBufCodecs.fromCodec(CODEC)
-
-        val BLANK_SEASONING = Seasoning(
-            ingredient = RegistryLikeIdentifierCondition<Item>(cobblemonResource("blank")),
-            flavours = Flavour.entries.associate { it to 0 },
-            colour = DyeColor.WHITE,
-            baitEffects = emptyList()
-        )
-    }
-}
@@ -1,92 +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.cooking
-
-import com.cobblemon.mod.common.CobblemonItemComponents
-import com.cobblemon.mod.common.api.berry.Berries
-import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
-import com.cobblemon.mod.common.api.conditional.RegistryLikeIdentifierCondition
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.fishing.SpawnBait
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.cooking.SeasoningRegistrySyncPacket
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.cobblemon.mod.common.util.adapters.ItemLikeConditionAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-import net.minecraft.world.item.DyeColor
-import net.minecraft.world.item.Item
-import net.minecraft.world.item.ItemStack
-
-object Seasonings : JsonDataRegistry<Seasoning> {
-    override val id = cobblemonResource("seasonings")
-    override val type = PackType.SERVER_DATA
-    override val observable = SimpleObservable<Seasonings>()
-    override val typeToken: TypeToken<Seasoning> = TypeToken.get(Seasoning::class.java)
-    override val resourcePath = "seasonings"
-    override val gson: Gson = GsonBuilder()
-        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
-        .setPrettyPrinting()
-        .create()
-
-    val seasonings = mutableListOf<Seasoning>()
-
-    val BLANK_SEASONING = Seasoning(
-        ingredient = RegistryLikeIdentifierCondition<Item>(cobblemonResource("blank")),
-        flavours = emptyMap(),
-        colour = DyeColor.WHITE
-    )
-
-    override fun sync(player: ServerPlayer) {
-        SeasoningRegistrySyncPacket(seasonings.toList()).sendToPlayer(player)
-    }
-
-    override fun reload(data: Map<ResourceLocation, Seasoning>) {
-        // this needs to sideload the berry data so we don't get duplicate JSONs.
-        val finalData = Berries.all().associate {
-            it.identifier to Seasoning(
-                ingredient = RegistryLikeIdentifierCondition(it.identifier),
-                flavours = it.flavours.toMap(),
-                colour = it.colour
-            )
-        }.toMutableMap()
-        finalData.putAll(data)
-        seasonings.addAll(finalData.values)
-    }
-
-    fun reloadEntries(seasonings: Collection<Seasoning>) {
-        this.seasonings.clear()
-        this.seasonings.addAll(seasonings)
-    }
-
-    fun getFlavoursFromItemStack(stack: ItemStack): Map<Flavour, Int> {
-        val holder = stack.itemHolder
-        val seasoning = seasonings.find { it.ingredient.fits(holder) } ?: BLANK_SEASONING
-        val inherentFlavours = stack.get(CobblemonItemComponents.FLAVOUR)?.flavours ?: emptyMap()
-
-        return seasoning.flavours.mapValues { (flavour, value) -> inherentFlavours.getOrDefault(flavour, 0) + value }
-    }
-
-    fun getBaitEffectsFromItemStack(stack: ItemStack): List<SpawnBait.Effect> {
-        return getFromItemStack(stack)?.baitEffects ?: emptyList()
-    }
-
-    fun getFromItemStack(stack: ItemStack): Seasoning? {
-        val holder = stack.itemHolder
-        return seasonings.find { it.ingredient.fits(holder) }
-    }
-
-    fun isSeasoning(stack: ItemStack) = getFromItemStack(stack) != null
-}
@@ -20,4 +20,4 @@ interface EntitySideDelegate<T : Entity> {
    fun tick(entity: T) {}
    fun onSyncedDataUpdated(data: EntityDataAccessor<*>) {}
    fun addToStruct(struct: QueryStruct) {}
-}
+}
@@ -21,6 +21,4 @@ interface PokemonSideDelegate : EntitySideDelegate<PokemonEntity> {
    fun updatePostDeath() {}
    fun handleStatus(status: Byte) {}
    fun spawnShinyParticle(player: Player) {}
-    fun positionRider(passenger: Entity, positionUpdater: MoveFunction)
-    fun updateAge(age: Int) {}
-}
+}
@@ -255,11 +255,6 @@ object CobblemonEvents {
    @JvmField
    val BAIT_EFFECT_REGISTRATION = EventObservable<BaitEffectFunctionRegistryEvent>()

-    // Baits and Lures
-    @JvmField
-    val BAIT_SPAWN_POKEMON_MODIFY = EventObservable<BaitSpawnPokemonEvent.Modify>()
-
-
    @JvmField
    val COLLECT_EGG = CancelableObservable<CollectEggEvent>()
    @JvmField
@@ -8,19 +8,19 @@

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

-import com.cobblemon.mod.common.api.fishing.SpawnBait
+import com.cobblemon.mod.common.api.fishing.FishingBait
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.resources.ResourceLocation

 /**
 * Event to register code-based functions for bait effects.
- * @see SpawnBait.Effect
- * @see SpawnBait.Effects
+ * @see FishingBait.Effect
+ * @see FishingBait.Effects
 */
 class BaitEffectFunctionRegistryEvent {
-    val functions = mutableMapOf<ResourceLocation, (PokemonEntity, SpawnBait.Effect) -> Unit>()
+    val functions = mutableMapOf<ResourceLocation, (PokemonEntity, FishingBait.Effect) -> Unit>()

-    fun registerFunction(id: ResourceLocation, function: (PokemonEntity, SpawnBait.Effect) -> Unit) {
+    fun registerFunction(id: ResourceLocation, function: (PokemonEntity, FishingBait.Effect) -> Unit) {
        functions[id] = function
    }
 }
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.fishing
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
-import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import net.minecraft.world.item.ItemStack
-
-/**
- * Event that is fired when a Pokemon is spawned by a bobber.
- */
-interface BaitSpawnPokemonEvent {
-
-    /**
-     * Event that is fired before a Pokemon is spawned by a bobber.
-     * @param bobber The PokeRodFishingBobberEntity that is spawning the Pokemon.
-     * @param chosenBucket The bucket that is chosen.
-     * @param rod The ItemStack of the rod that the bobber is attached to.
-     */
-    data class Pre(
-        val bobber: PokeRodFishingBobberEntity, // todo replace this with the bait entity
-        val chosenBucket: SpawnBucket,
-        val rod: ItemStack
-    ) : Cancelable(), BobberSpawnPokemonEvent
-
-    /**
-     * Event that is fired when a Pokemon is modified before it is spawned by a bobber.
-     * @param chosenBucket The bucket that is chosen.
-     * @param rod The ItemStack of the rod that the bobber is attached to.
-     * @param pokemon The Pokemon that is modified.
-     */
-    data class Modify(
-        val chosenBucket: SpawnBucket,
-        val rod: ItemStack,
-        val pokemon: PokemonEntity
-    ) : BobberSpawnPokemonEvent
-
-    /**
-     * Event that is fired after a Pokemon is spawned by a bobber.
-     * @param bobber The PokeRodFishingBobberEntity that is spawning the Pokemon.
-     * @param chosenBucket The bucket that is chosen.
-     * @param bait The ItemStack of the bait that is set on the rod.
-     * @param pokemon The Pokemon that is spawned.
-     */
-    data class Post(
-        val bobber: PokeRodFishingBobberEntity,
-        val chosenBucket: SpawnBucket,
-        val bait: ItemStack,
-        val pokemon: PokemonEntity
-    ) : BobberSpawnPokemonEvent
-}
@@ -8,8 +8,6 @@

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

-import com.cobblemon.mod.common.api.conditional.ITEM_REGISTRY_LIKE_CODEC
-import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.fishing.BaitEffectFunctionRegistryEvent
 import com.cobblemon.mod.common.api.spawning.fishing.FishingSpawnCause
@@ -18,14 +16,18 @@ import com.cobblemon.mod.common.util.cobblemonResource
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.RecordCodecBuilder
 import java.util.Optional
+import net.minecraft.core.Registry
 import net.minecraft.network.codec.ByteBufCodecs
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.item.Item
+import net.minecraft.world.item.ItemStack

-class SpawnBait(
-    val item: RegistryLikeCondition<Item>,
+data class FishingBait(
+    val item: ResourceLocation,
    val effects: List<Effect>,
 ) {
+    fun toItemStack(itemRegistry: Registry<Item>) = item.let(itemRegistry::get)?.let { ItemStack(it) } ?: ItemStack.EMPTY
+
    data class Effect(
        val type: ResourceLocation,
        val subcategory: ResourceLocation?,
@@ -47,14 +49,19 @@ class SpawnBait(
    }

    companion object {
-        val CODEC = RecordCodecBuilder.create<SpawnBait> { instance ->
+        val CODEC = RecordCodecBuilder.create<FishingBait> { instance ->
            instance.group(
-                ITEM_REGISTRY_LIKE_CODEC.fieldOf("item").forGetter { it.item },
+                ResourceLocation.CODEC.fieldOf("item").forGetter { it.item },
                Effect.CODEC.listOf().fieldOf("effects").forGetter {it.effects}
-            ).apply(instance, ::SpawnBait)
+            ).apply(instance, ::FishingBait)
        }

        val STREAM_CODEC = ByteBufCodecs.fromCodec(CODEC)
+
+        val BLANK_BAIT = FishingBait(
+            cobblemonResource("blank"),
+            emptyList()
+        )
    }

    object Effects {
@@ -71,7 +78,7 @@ class SpawnBait(
        val HIDDEN_ABILITY_CHANCE = cobblemonResource("ha_chance")
        val POKEMON_CHANCE = cobblemonResource("pokemon_chance")
        val FRIENDSHIP = cobblemonResource("friendship")
-        val RARITY_BUCKET = cobblemonResource("rarity_bucket")
+        val INERT = cobblemonResource("inert")

        fun registerEffect(type: ResourceLocation, effect: (PokemonEntity, Effect) -> Unit) {
            EFFECT_FUNCTIONS[type] = effect
@@ -82,15 +89,15 @@ class SpawnBait(
        }

        fun setupEffects() {
-            registerEffect(NATURE) { entity, effect -> FishingSpawnCause.alterNatureAttempt(entity, effect) }
-            registerEffect(IV) { entity, effect -> FishingSpawnCause.alterIVAttempt(entity, effect) }
-            registerEffect(SHINY_REROLL) { entity, effect -> FishingSpawnCause.shinyReroll(entity, effect) }
-            registerEffect(GENDER_CHANCE) { entity, effect -> FishingSpawnCause.alterGenderAttempt(entity, effect) }
-            registerEffect(LEVEL_RAISE) { entity, effect -> FishingSpawnCause.alterLevelAttempt(entity, effect) }
-            registerEffect(HIDDEN_ABILITY_CHANCE) { entity, _ -> FishingSpawnCause.alterHAAttempt(entity) }
-            registerEffect(FRIENDSHIP) { entity, effect -> FishingSpawnCause.alterFriendshipAttempt(entity, effect) }
+            EFFECT_FUNCTIONS[NATURE] = { entity, effect -> FishingSpawnCause.alterNatureAttempt(entity, effect) }
+            EFFECT_FUNCTIONS[IV] = { entity, effect -> FishingSpawnCause.alterIVAttempt(entity, effect) }
+            EFFECT_FUNCTIONS[SHINY_REROLL] = { entity, effect -> FishingSpawnCause.shinyReroll(entity, effect) }
+            EFFECT_FUNCTIONS[GENDER_CHANCE] = { entity, effect -> FishingSpawnCause.alterGenderAttempt(entity, effect) }
+            EFFECT_FUNCTIONS[LEVEL_RAISE] = { entity, effect -> FishingSpawnCause.alterLevelAttempt(entity, effect) }
+            EFFECT_FUNCTIONS[HIDDEN_ABILITY_CHANCE] = { entity, _ -> FishingSpawnCause.alterHAAttempt(entity) }
+            EFFECT_FUNCTIONS[FRIENDSHIP] = { entity, effect -> FishingSpawnCause.alterFriendshipAttempt(entity, effect) }
            CobblemonEvents.BAIT_EFFECT_REGISTRATION.post(BaitEffectFunctionRegistryEvent()) { event ->
-                event.functions.forEach { (type, function) -> registerEffect(type, function) }
+                EFFECT_FUNCTIONS.putAll(event.functions)
            }
        }
    }
@@ -0,0 +1,114 @@
+/*
+ * 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.fishing
+
+import com.cobblemon.mod.common.CobblemonItemComponents
+import com.cobblemon.mod.common.api.data.JsonDataRegistry
+import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.net.messages.client.data.FishingBaitRegistrySyncPacket
+import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.server.packs.PackType
+import net.minecraft.world.item.ItemStack
+
+object FishingBaits : JsonDataRegistry<FishingBait>{
+    override val id = cobblemonResource("fishing_baits")
+    override val type = PackType.SERVER_DATA
+    override val observable = SimpleObservable<FishingBaits>()
+    override val typeToken: TypeToken<FishingBait> = TypeToken.get(FishingBait::class.java)
+    override val resourcePath = "fishing_baits"
+    override val gson: Gson = GsonBuilder()
+        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+        .setPrettyPrinting()
+        .create()
+
+    private val itemMap = mutableMapOf<ResourceLocation, FishingBait>()
+
+    override fun sync(player: ServerPlayer) {
+        FishingBaitRegistrySyncPacket(this.itemMap.values.toList()).sendToPlayer(player)
+    }
+
+    override fun reload(data: Map<ResourceLocation, FishingBait>) {
+        itemMap.clear()
+        data.forEach { id, bait ->
+            itemMap[bait.item] = bait
+        }
+    }
+
+    fun getFromRodItemStack(stack: ItemStack): FishingBait? {
+        return stack.components.get(CobblemonItemComponents.BAIT)?.bait
+    }
+
+    fun getFromBaitItemStack(stack: ItemStack): FishingBait? {
+        return getFromIdentifier(BuiltInRegistries.ITEM.getKey(stack.item))
+    }
+
+    fun getFromIdentifier(identifier: ResourceLocation): FishingBait? {
+        return itemMap[identifier]
+    }
+
+    fun isFishingBait(stack: ItemStack) = itemMap.containsKey(BuiltInRegistries.ITEM.getKey(stack.item))
+
+//
+//
+//    fun getBaitSubcategory(item: ItemStack): String? {
+//        val itemId = Registries.ITEM.getId(item.item)
+//        if (itemId in itemMap.keys) {
+//            return itemMap[itemId]?.subcategory
+//        }
+//        val tag = tagMap.keys.firstOrNull { it.fits(item.item, Registries.ITEM) }
+//        if (tag != null) {
+//            return tagMap[tag]?.subcategory
+//        }
+//        return null
+//    }
+//
+//    fun getBaitSuccessChance(item: ItemStack): Double? {
+//        val itemId = Registries.ITEM.getId(item.item)
+//        if (itemId in itemMap.keys) {
+//            return itemMap[itemId]?.chance
+//        }
+//        val tag = tagMap.keys.firstOrNull { it.fits(item.item, Registries.ITEM) }
+//        if (tag != null) {
+//            return tagMap[tag]?.chance
+//        }
+//        return null
+//    }
+//
+//    fun getBaitEffectValue(item: ItemStack): Double? {
+//        val itemId = Registries.ITEM.getId(item.item)
+//        if (itemId in itemMap.keys) {
+//            return itemMap[itemId]?.value
+//        }
+//        val tag = tagMap.keys.firstOrNull { it.fits(item.item, Registries.ITEM) }
+//        if (tag != null) {
+//            return tagMap[tag]?.value
+//        }
+//        return null
+//    }
+//
+//
+//    fun getBaitNote(item: ItemStack): String? {
+//        val itemId = Registries.ITEM.getId(item.item)
+//        if (itemId in itemMap.keys) {
+//            return itemMap[itemId]?.note
+//        }
+//        val tag = tagMap.keys.firstOrNull { it.fits(item.item, Registries.ITEM) }
+//        if (tag != null) {
+//            return tagMap[tag]?.note
+//        }
+//        return null
+//    }
+}
@@ -1,103 +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.fishing
-
-import com.cobblemon.mod.common.CobblemonItemComponents
-import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
-import com.cobblemon.mod.common.api.conditional.RegistryLikeIdentifierCondition
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.data.SpawnBaitRegistrySyncPacket
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.cobblemon.mod.common.util.adapters.ItemLikeConditionAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import net.minecraft.core.Holder
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-import net.minecraft.world.item.Item
-import net.minecraft.world.item.ItemStack
-
-object SpawnBaitEffects : JsonDataRegistry<SpawnBait> {
-    override val id = cobblemonResource("spawn_bait_effects")
-    override val type = PackType.SERVER_DATA
-    override val observable = SimpleObservable<SpawnBaitEffects>()
-    override val typeToken: TypeToken<SpawnBait> = TypeToken.get(SpawnBait::class.java)
-    override val resourcePath = "spawn_bait_effects"
-    override val gson: Gson = GsonBuilder()
-        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
-        .setPrettyPrinting()
-        .create()
-
-    private val effectsMap = mutableMapOf<ResourceLocation, SpawnBait>()
-
-    override fun sync(player: ServerPlayer) {
-        SpawnBaitRegistrySyncPacket(this.effectsMap.toMap()).sendToPlayer(player)
-    }
-
-    override fun reload(data: Map<ResourceLocation, SpawnBait>) {
-        effectsMap.clear()
-        data.forEach { id, bait ->
-            effectsMap[id] = bait
-        }
-    }
-
-    fun getEffectsFromRodItemStack(stack: ItemStack): List<SpawnBait.Effect> {
-        return getEffectsFromItemStack(stack.components.get(CobblemonItemComponents.BAIT)?.stack ?: ItemStack.EMPTY)
-    }
-
-    fun getEffectsFromItemStack(stack: ItemStack): List<SpawnBait.Effect> {
-        val componentEffects = stack.get(CobblemonItemComponents.BAIT_EFFECTS)?.effects ?: emptyList()
-        return componentEffects.mapNotNull(::getFromIdentifier).flatMap { it.effects } +
-                getEffectsFromItem(stack.itemHolder)
-    }
-
-    fun getBaitIdentifiersFromItem(holder: Holder<Item>): List<ResourceLocation> {
-        return effectsMap.entries.filter { it.value.item.fits(holder) }.map { it.key }
-    }
-
-    fun getBaitFromItemStack(holder: Holder<Item>): List<SpawnBait> {
-        return effectsMap.values.filter { it.item.fits(holder) }
-    }
-
-    private fun getEffectsFromItem(holder: Holder<Item>): List<SpawnBait.Effect> {
-        return getBaitFromItemStack(holder).flatMap { it.effects }
-    }
-
-    fun getFromIdentifier(identifier: ResourceLocation): SpawnBait? {
-        // Check normal spawn bait registry
-        effectsMap[identifier]?.let { return it }
-
-        // check seasoning spawn bait registry
-        if (identifier.namespace == "seasonings") {
-            val seasoning = com.cobblemon.mod.common.api.cooking.Seasonings.seasonings.find {
-                it.ingredient is RegistryLikeIdentifierCondition &&
-                        (it.ingredient as RegistryLikeIdentifierCondition<Item>).identifier.path == identifier.path
-            }
-
-            if (seasoning != null && seasoning.baitEffects.isNotEmpty()) {
-                return SpawnBait(
-                    item = seasoning.ingredient,
-                    effects = seasoning.baitEffects
-                )
-            }
-        }
-
-        return null
-    }
-
-    fun isFishingBait(stack: ItemStack): Boolean {
-        val holder = stack.itemHolder
-        return stack.has(CobblemonItemComponents.BAIT_EFFECTS) || effectsMap.values.any { it.item.fits(holder) }
-    }
-}
@@ -1,39 +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.fishing
-
-object SpawnBaitUtils {
-    fun mergeEffects(effects: List<SpawnBait.Effect>): List<SpawnBait.Effect> {
-        val grouped = effects.groupBy { Pair(it.type, it.subcategory) }
-
-        return grouped.map { (key, groupEffects) ->
-            val (type, subcategory) = key
-
-            if (type == SpawnBait.Effects.RARITY_BUCKET) {
-                // we want to keep the highest rarity bucket effect instead of merging them
-                groupEffects.maxByOrNull { it.value }!!
-            } else {
-                val count = groupEffects.size
-                val totalChance = groupEffects.sumOf { it.chance }
-                val totalValue = groupEffects.sumOf { it.value }
-
-                val multiplier = when (count) {
-                    2 -> 0.8
-                    3 -> 0.9
-                    else -> 1.0
-                }
-
-                val adjustedChance = (totalChance * multiplier).coerceAtMost(1.0)
-                val adjustedValue = totalValue * multiplier
-
-                SpawnBait.Effect(type, subcategory, adjustedChance, adjustedValue)
-            }
-        }
-    }
-}
@@ -215,7 +215,6 @@ fun drawPosablePortrait(
    ageInTicks: Float = 0F,
    headYaw: Float = 0F,
    headPitch: Float = 0F,
-    doQuirks: Boolean = true,
    r: Float = 1F,
    g: Float = 1F,
    b: Float = 1F,
@@ -241,7 +240,6 @@ fun drawPosablePortrait(
        context.put(RenderContext.SPECIES, identifier)
        context.put(RenderContext.ASPECTS, state.currentAspects)
        context.put(RenderContext.POSABLE_STATE, state)
-        context.put(RenderContext.DO_QUIRKS, doQuirks)

        val renderType = RenderType.entityCutout(texture)

@@ -82,7 +82,7 @@ interface PokemonAndMoveSelectingItem {
        val bagItem = bagItem
        if (!battlePokemon.actor.canFitForcedAction()) {
            player.sendSystemMessage(battleLang("bagitem.cannot").red())
-        } else if (!bagItem!!.canUse(stack, battle, battlePokemon)) {
+        } else if (!bagItem!!.canUse(battle, battlePokemon)) {
            player.sendSystemMessage(battleLang("bagitem.invalid").red())
        } else {
            battlePokemon.actor.forceChoose(BagItemActionResponse(bagItem, battlePokemon, move.template.name))
@@ -92,10 +92,10 @@ interface PokemonAndMoveSelectingItem {
        }
    }

-    fun canUseOnPokemon(stack: ItemStack, pokemon: Pokemon): Boolean
-    fun canUseOnBattlePokemon(stack: ItemStack, battlePokemon: BattlePokemon): Boolean = bagItem!!.canUse(stack, battlePokemon.actor.battle, battlePokemon)
-    fun canUseOnMove(stack: ItemStack, pokemon: Pokemon, move: Move): Boolean = canUseOnMove(stack, move)
-    fun canUseOnMove(stack: ItemStack, move: Move): Boolean
+    fun canUseOnPokemon(pokemon: Pokemon): Boolean
+    fun canUseOnBattlePokemon(battlePokemon: BattlePokemon): Boolean = bagItem!!.canUse(battlePokemon.actor.battle, battlePokemon)
+    fun canUseOnMove(pokemon: Pokemon, move: Move): Boolean = canUseOnMove(move)
+    fun canUseOnMove(move: Move): Boolean

    fun interactWithSpecific(player: ServerPlayer, stack: ItemStack, pokemon: Pokemon): InteractionResultHolder<ItemStack>? {

@@ -106,18 +106,18 @@ interface PokemonAndMoveSelectingItem {
        MoveSelectCallbacks.create(
            player = player,
            moves = pokemon.moveSet.toList(),
-            canSelect = { canUseOnMove(stack, it)},
+            canSelect = ::canUseOnMove,
            handler = { move -> if (stack.isHeld(player)) applyToPokemon(player, stack, pokemon, move) }
        )
        return InteractionResultHolder.success(stack)
    }

    fun interactWithSpecificBattle(player: ServerPlayer, stack: ItemStack, battlePokemon: BattlePokemon): InteractionResultHolder<ItemStack>? {
-        return if (canUseOnBattlePokemon(stack, battlePokemon)) {
+        return if (canUseOnBattlePokemon(battlePokemon)) {
            MoveSelectCallbacks.create(
                player = player,
                moves = battlePokemon.moveSet.getMoves(),
-                canSelect = { canUseOnMove(stack, it) },
+                canSelect = ::canUseOnMove,
                handler = { applyToBattlePokemon(player, stack, battlePokemon, it) }
            )
            InteractionResultHolder.success(stack)
@@ -131,8 +131,8 @@ interface PokemonAndMoveSelectingItem {
        PartyMoveSelectCallbacks.createFromPokemon(
            player = player,
            pokemon = player.party().toList(),
-            canSelectPokemon = { canUseOnPokemon(stack, it) },
-            canSelectMove = { pokemon, move -> canUseOnMove(stack, pokemon, move) },
+            canSelectPokemon = ::canUseOnPokemon,
+            canSelectMove = ::canUseOnMove,
            handler = { pk, mv -> if (stack.isHeld(player)) applyToPokemon(player, stack, pk, mv) }
        )

@@ -144,8 +144,8 @@ interface PokemonAndMoveSelectingItem {
            player = player,
            pokemon = actor.pokemonList.map { it.effectedPokemon },
            moves = { pk -> actor.pokemonList.find { it.effectedPokemon == pk }!!.moveSet.getMoves() },
-            canSelectPokemon = { pk -> canUseOnBattlePokemon(stack, actor.pokemonList.find { it.effectedPokemon == pk }!!) },
-            canSelectMove = { pokemon, move -> canUseOnMove(stack, pokemon, move) },
+            canSelectPokemon = { pk -> canUseOnBattlePokemon(actor.pokemonList.find { it.effectedPokemon == pk }!!) },
+            canSelectMove = ::canUseOnMove,
            handler = { pk, mv -> applyToBattlePokemon(player, stack, actor.pokemonList.find { it.effectedPokemon == pk }!!, mv) }
        )

@@ -92,7 +92,7 @@ interface PokemonSelectingItem {
        val bagItem = bagItem
        if (!battlePokemon.actor.canFitForcedAction()) {
            player.sendSystemMessage(battleLang("bagitem.cannot").red())
-        } else if (!bagItem!!.canUse(stack, battle, battlePokemon)) {
+        } else if (!bagItem!!.canUse(battle, battlePokemon)) {
            player.sendSystemMessage(battleLang("bagitem.invalid").red())
        } else {
            battlePokemon.actor.forceChoose(BagItemActionResponse(bagItem, battlePokemon))
@@ -105,11 +105,11 @@ interface PokemonSelectingItem {
        }
    }

-    fun canUseOnPokemon(stack: ItemStack, pokemon: Pokemon): Boolean
-    fun canUseOnBattlePokemon(stack: ItemStack, battlePokemon: BattlePokemon): Boolean = bagItem!!.canUse(stack, battlePokemon.actor.battle, battlePokemon)
+    fun canUseOnPokemon(pokemon: Pokemon): Boolean
+    fun canUseOnBattlePokemon(battlePokemon: BattlePokemon): Boolean = bagItem!!.canUse(battlePokemon.actor.battle, battlePokemon)

    fun interactWithSpecificBattle(player: ServerPlayer, stack: ItemStack, battlePokemon: BattlePokemon): InteractionResultHolder<ItemStack> {
-        return if (canUseOnBattlePokemon(stack, battlePokemon)) {
+        return if (canUseOnBattlePokemon(battlePokemon)) {
            applyToBattlePokemon(player, stack, battlePokemon)
            InteractionResultHolder.success(stack)
        } else {
@@ -127,7 +127,7 @@ interface PokemonSelectingItem {
        PartySelectCallbacks.createFromPokemon(
            player = player,
            pokemon = party,
-            canSelect = { pk -> canUseOnPokemon(stack, pk) },
+            canSelect = ::canUseOnPokemon,
            handler = { pk ->
                if (stack.isHeld(player)) {
                    applyToPokemon(player, stack, pk)
@@ -143,7 +143,7 @@ interface PokemonSelectingItem {
        PartySelectCallbacks.createBattleSelect(
            player = player,
            pokemon = actor.pokemonList,
-            canSelect = { pk -> canUseOnBattlePokemon(stack, actor.pokemonList.find { it.effectedPokemon == pk.effectedPokemon }!!) },
+            canSelect = { pk -> canUseOnBattlePokemon(actor.pokemonList.find { it.effectedPokemon == pk.effectedPokemon }!!) },
            handler = { pk -> applyToBattlePokemon(player, stack, actor.pokemonList.find { it.effectedPokemon == pk.effectedPokemon }!!) }
        )

@@ -38,11 +38,12 @@ import com.cobblemon.mod.common.api.storage.party.PartyStore
 import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore
 import com.cobblemon.mod.common.api.storage.pc.PCPosition
 import com.cobblemon.mod.common.api.storage.pc.PCStore
-import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.battles.BattleRegistry
 import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
+import com.cobblemon.mod.common.client.particle.BedrockParticleOptionsRepository
+import com.cobblemon.mod.common.client.particle.ParticleStorm
 import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunctions
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.entity.npc.NPCBattleActor
@@ -62,6 +63,7 @@ import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
 import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
 import com.cobblemon.mod.common.util.*
 import com.mojang.datafixers.util.Either
+import net.minecraft.client.multiplayer.ClientLevel
 import net.minecraft.commands.arguments.EntityAnchorArgument
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Holder
@@ -287,32 +289,16 @@ object MoLangFunctions {
                } as? ServerPlayer
                val pos = Vec3(x, y, z)

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

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

-}
+}
@@ -1,37 +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.net.serializers
-
-import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.readString
-import com.cobblemon.mod.common.util.writeString
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.network.codec.StreamCodec
-import net.minecraft.network.syncher.EntityDataSerializer
-
-object RideBoostsDataSerializer : EntityDataSerializer<Map<RidingStat, Float>> {
-    val ID = cobblemonResource("ride_boosts")
-    fun read(buf: RegistryFriendlyByteBuf): Map<RidingStat, Float> {
-        return buf.readMap(
-            { RidingStat.valueOf(it.readString()) },
-            { it.readFloat() }
-        )
-    }
-    override fun copy(value: Map<RidingStat, Float>) = value.toMap()
-    fun write(buf: RegistryFriendlyByteBuf, value: Map<RidingStat, Float>) {
-        buf.writeMap(
-            value,
-            { _, it -> buf.writeString(it.name) },
-            { _, it -> buf.writeFloat(it) }
-        )
-    }
-
-    override fun codec() = StreamCodec.of(::write, ::read)
-}
@@ -17,7 +17,6 @@ import org.joml.Matrix3f
 import org.joml.Quaternionf
 import org.joml.Vector3f
 import kotlin.math.asin
-import kotlin.math.sign

 open class OrientationController(val entity: LivingEntity) {

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

-    fun applyGlobalYaw(deltaYawDegrees: Float) = updateOrientation { original ->
-        return@updateOrientation original.rotateLocalY(-deltaYawDegrees.toRadians())
-    }
-
-    fun applyGlobalPitch(deltaPitchDegrees: Float) = updateOrientation { original ->
-        val currQuat = Quaternionf().setFromUnnormalized(original)
-        val horzLeftVector = Vector3f(this.leftVector.x, 0.0f, this.leftVector.z)
-        val globalPitch = Quaternionf().fromAxisAngleRad(horzLeftVector.normalize(), -deltaPitchDegrees.toRadians())
-        val resultQuat = globalPitch.mul(currQuat)
-        return@updateOrientation Matrix3f().set(resultQuat)
-    }
-
 }
@@ -20,7 +20,7 @@ object CobblemonPermissions {
    @JvmStatic
    val CHANGE_WALK_SPEED = this.create("${COMMAND_PREFIX}changewalkspeed", PermissionLevel.ALL_COMMANDS)
    @JvmStatic
-    val TRANSFORM_MODEL_PART = this.create("${COMMAND_PREFIX}transformmodelpart", PermissionLevel.ALL_COMMANDS)
+    val CHANGE_JOINT_SCALE = this.create("${COMMAND_PREFIX}changejointscale", PermissionLevel.ALL_COMMANDS)
    @JvmStatic
    val CHECKSPAWNS = this.create("${COMMAND_PREFIX}checkspawns", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
    @JvmStatic
@@ -77,18 +77,18 @@ object CatchRateModifiers {

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

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

-import com.cobblemon.mod.common.api.cooking.Flavour
+import com.cobblemon.mod.common.api.berry.Flavor
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.pokemon.Nature
 import com.cobblemon.mod.common.util.cobblemonResource
@@ -31,27 +31,27 @@ object Natures {

    val LONELY = registerNature(
        Nature(cobblemonResource("lonely"), "cobblemon.nature.lonely",
-        Stats.ATTACK, Stats.DEFENCE, Flavour.SPICY, Flavour.SOUR)
+        Stats.ATTACK, Stats.DEFENCE, Flavor.SPICY, Flavor.SOUR)
    )

    val BRAVE = registerNature(
        Nature(cobblemonResource("brave"), "cobblemon.nature.brave",
-            Stats.ATTACK, Stats.SPEED, Flavour.SPICY, Flavour.SWEET)
+            Stats.ATTACK, Stats.SPEED, Flavor.SPICY, Flavor.SWEET)
    )

    val ADAMANT = registerNature(
        Nature(cobblemonResource("adamant"), "cobblemon.nature.adamant",
-        Stats.ATTACK, Stats.SPECIAL_ATTACK, Flavour.SPICY, Flavour.DRY)
+        Stats.ATTACK, Stats.SPECIAL_ATTACK, Flavor.SPICY, Flavor.DRY)
    )

    val NAUGHTY = registerNature(
        Nature(cobblemonResource("naughty"), "cobblemon.nature.naughty",
-        Stats.ATTACK, Stats.SPECIAL_DEFENCE, Flavour.SPICY, Flavour.BITTER)
+        Stats.ATTACK, Stats.SPECIAL_DEFENCE, Flavor.SPICY, Flavor.BITTER)
    )

    val BOLD = registerNature(
        Nature(cobblemonResource("bold"), "cobblemon.nature.bold",
-        Stats.DEFENCE, Stats.ATTACK, Flavour.SOUR, Flavour.SPICY)
+        Stats.DEFENCE, Stats.ATTACK, Flavor.SOUR, Flavor.SPICY)
    )

    val DOCILE = registerNature(
@@ -61,27 +61,27 @@ object Natures {

    val RELAXED = registerNature(
        Nature(cobblemonResource("relaxed"), "cobblemon.nature.relaxed",
-        Stats.DEFENCE, Stats.SPEED, Flavour.SOUR, Flavour.SWEET)
+        Stats.DEFENCE, Stats.SPEED, Flavor.SOUR, Flavor.SWEET)
    )

    val IMPISH = registerNature(
        Nature(cobblemonResource("impish"), "cobblemon.nature.impish",
-        Stats.DEFENCE, Stats.SPECIAL_ATTACK, Flavour.SOUR, Flavour.DRY)
+        Stats.DEFENCE, Stats.SPECIAL_ATTACK, Flavor.SOUR, Flavor.DRY)
    )

    val LAX = registerNature(
        Nature(cobblemonResource("lax"), "cobblemon.nature.lax",
-        Stats.DEFENCE, Stats.SPECIAL_DEFENCE, Flavour.SOUR, Flavour.BITTER)
+        Stats.DEFENCE, Stats.SPECIAL_DEFENCE, Flavor.SOUR, Flavor.BITTER)
    )

    val TIMID = registerNature(
        Nature(cobblemonResource("timid"), "cobblemon.nature.timid",
-        Stats.SPEED, Stats.ATTACK, Flavour.SWEET, Flavour.SPICY)
+        Stats.SPEED, Stats.ATTACK, Flavor.SWEET, Flavor.SPICY)
    )

    val HASTY = registerNature(
        Nature(cobblemonResource("hasty"), "cobblemon.nature.hasty",
-        Stats.SPEED, Stats.DEFENCE, Flavour.SWEET, Flavour.SOUR)
+        Stats.SPEED, Stats.DEFENCE, Flavor.SWEET, Flavor.SOUR)
    )

    val SERIOUS = registerNature(
@@ -91,12 +91,12 @@ object Natures {

    val JOLLY = registerNature(
        Nature(cobblemonResource("jolly"), "cobblemon.nature.jolly",
-        Stats.SPEED, Stats.SPECIAL_ATTACK, Flavour.SWEET, Flavour.DRY)
+        Stats.SPEED, Stats.SPECIAL_ATTACK, Flavor.SWEET, Flavor.DRY)
    )

    val NAIVE = registerNature(
        Nature(cobblemonResource("naive"), "cobblemon.nature.naive",
-        Stats.SPEED, Stats.SPECIAL_DEFENCE, Flavour.SWEET, Flavour.BITTER)
+        Stats.SPEED, Stats.SPECIAL_DEFENCE, Flavor.SWEET, Flavor.BITTER)
    )

    val MODEST = registerNature(
@@ -106,12 +106,12 @@ object Natures {

    val MILD = registerNature(
        Nature(cobblemonResource("mild"), "cobblemon.nature.mild",
-        Stats.SPECIAL_ATTACK, Stats.DEFENCE, Flavour.DRY, Flavour.SOUR)
+        Stats.SPECIAL_ATTACK, Stats.DEFENCE, Flavor.DRY, Flavor.SOUR)
    )

    val QUIET = registerNature(
        Nature(cobblemonResource("quiet"), "cobblemon.nature.quiet",
-        Stats.SPECIAL_ATTACK, Stats.SPEED, Flavour.DRY, Flavour.SWEET)
+        Stats.SPECIAL_ATTACK, Stats.SPEED, Flavor.DRY, Flavor.SWEET)
    )

    val BASHFUL = registerNature(
@@ -121,27 +121,27 @@ object Natures {

    val RASH = registerNature(
        Nature(cobblemonResource("rash"), "cobblemon.nature.rash",
-        Stats.SPECIAL_ATTACK, Stats.SPECIAL_DEFENCE, Flavour.DRY, Flavour.BITTER)
+        Stats.SPECIAL_ATTACK, Stats.SPECIAL_DEFENCE, Flavor.DRY, Flavor.BITTER)
    )

    val CALM = registerNature(
        Nature(cobblemonResource("calm"), "cobblemon.nature.calm",
-        Stats.SPECIAL_DEFENCE, Stats.ATTACK, Flavour.BITTER, Flavour.SPICY)
+        Stats.SPECIAL_DEFENCE, Stats.ATTACK, Flavor.BITTER, Flavor.SPICY)
    )

    val GENTLE = registerNature(
        Nature(cobblemonResource("gentle"), "cobblemon.nature.gentle",
-        Stats.SPECIAL_DEFENCE, Stats.DEFENCE, Flavour.BITTER, Flavour.SOUR)
+        Stats.SPECIAL_DEFENCE, Stats.DEFENCE, Flavor.BITTER, Flavor.SOUR)
    )

    val SASSY = registerNature(
        Nature(cobblemonResource("sassy"), "cobblemon.nature.sassy",
-        Stats.SPECIAL_DEFENCE, Stats.SPEED, Flavour.BITTER, Flavour.SWEET)
+        Stats.SPECIAL_DEFENCE, Stats.SPEED, Flavor.BITTER, Flavor.SWEET)
    )

    val CAREFUL = registerNature(
        Nature(cobblemonResource("careful"), "cobblemon.nature.careful",
-        Stats.SPECIAL_DEFENCE, Stats.SPECIAL_ATTACK, Flavour.BITTER, Flavour.DRY)
+        Stats.SPECIAL_DEFENCE, Stats.SPECIAL_ATTACK, Flavor.BITTER, Flavor.DRY)
    )

    val QUIRKY = registerNature(
@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.riding

 import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.api.riding.stats.RidingStatDefinition
@@ -18,18 +17,17 @@ import com.cobblemon.mod.common.util.adapters.RidingBehaviourSettingsAdapter
 import net.minecraft.network.RegistryFriendlyByteBuf

 class RidingProperties(
-        val stats: MutableMap<RidingStat, RidingStatDefinition> = mutableMapOf(),
-        val seats: List<Seat> = listOf(),
-        val conditions: List<Expression> = listOf(),
-        val behaviour: RidingBehaviourSettings? = null
+    val stats: Map<RidingStat, RidingStatDefinition> = mapOf(),
+    val seats: List<Seat> = listOf(),
+    val conditions: List<Expression> = listOf(),
+    val behaviour: RidingBehaviourSettings? = null
 ) {
-
    companion object {
        fun decode(buffer: RegistryFriendlyByteBuf): RidingProperties {
-            val stats: MutableMap<RidingStat, RidingStatDefinition> = buffer.readMap(
-                    { buffer.readEnum(RidingStat::class.java) },
-                    { RidingStatDefinition.decode(buffer) }
-            ).toMutableMap()
+            val stats: Map<RidingStat, RidingStatDefinition> = buffer.readMap(
+                { buffer.readEnum(RidingStat::class.java) },
+                { RidingStatDefinition.decode(buffer) }
+            )
            val seats: List<Seat> = buffer.readList { _ -> Seat.decode(buffer) }
            val conditions = buffer.readList { buffer.readString().asExpression() }
            val behaviour = buffer.readNullable { _ ->
@@ -43,23 +41,19 @@ class RidingProperties(
        }
    }

-    internal fun updateStatRange(stat: RidingStat, style: RidingStyle, min: Int, max: Int) {
-        if (!Cobblemon.config.enableDebugKeys) return
-        if (stats[stat] == null) {
-            stats[stat] = RidingStatDefinition()
-        }
-        stats[stat]!!.ranges[style] = min..max
-    }
+    val canRide: Boolean
+        get() = seats.isNotEmpty() && behaviour != null

    fun encode(buffer: RegistryFriendlyByteBuf) {
        buffer.writeMap(
-                stats,
-                { _, stat -> buffer.writeEnum(stat) },
-                { _, stat -> stat.encode(buffer) }
+            stats,
+            { _, stat -> buffer.writeEnum(stat) },
+            { _, stat -> stat.encode(buffer) }
        )
        buffer.writeCollection(seats) { _, seat -> seat.encode(buffer) }
        buffer.writeCollection(conditions) { _, condition -> buffer.writeString(condition.getString()) }
        buffer.writeNullable(behaviour) { _, behaviour ->
+            buffer.writeResourceLocation(behaviour.key)
            behaviour.encode(buffer)
        }
    }
@@ -72,4 +66,4 @@ class RidingProperties(
    fun hasStat(stat: RidingStat, style: RidingStyle): Boolean {
        return stats[stat]?.ranges?.containsKey(style) == true
    }
-}
+}
@@ -19,4 +19,4 @@ enum class RidingStyle {
    LAND,
    LIQUID,
    AIR
-}
+}
@@ -8,7 +8,6 @@

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

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

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

    fun tick(settings: Settings, state: State, vehicle: PokemonEntity, driver: Player, input: Vec3) {}
@@ -74,7 +71,7 @@ interface RidingBehaviour<Settings : RidingBehaviourSettings, State : RidingBeha

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

-    fun useRidingAltPose(settings: Settings, state: State, vehicle: PokemonEntity, driver: Player): ResourceLocation
+    fun useRidingAltPose(settings: Settings, state: State, vehicle: PokemonEntity, driver: Player): Boolean

    fun inertia(settings: Settings, state: State, vehicle: PokemonEntity): Double

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    override val key = behaviour.key
-    
-    override fun getRidingStyle(settings: Settings, state: State): RidingStyle {
-        return behaviour.getRidingStyle(settings, state)
-    }

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

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

@@ -139,8 +128,8 @@ class RidingController<Settings : RidingBehaviourSettings, State : RidingBehavio
        return behaviour.inertia(settings, state, vehicle)
    }

-    override fun useRidingAltPose(settings: Settings, state: State, vehicle: PokemonEntity, driver: Player): ResourceLocation {
-        if (!isActive(settings, state, vehicle)) return cobblemonResource("no_pose")
+    override fun useRidingAltPose(settings: Settings, state: State, vehicle: PokemonEntity, driver: Player): Boolean {
+        if (!isActive(settings, state, vehicle)) return false
        return behaviour.useRidingAltPose(settings, state, vehicle, driver)
    }

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

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

-
 }
@@ -12,17 +12,12 @@ import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.MoLangMath.lerp
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.OrientationControllable
-import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.*
-import com.cobblemon.mod.common.util.math.geometry.toRadians
-import net.minecraft.client.Minecraft
-import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.SmoothDouble
@@ -30,7 +25,6 @@ import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
-import org.joml.Vector3f
 import kotlin.math.*

 class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
@@ -40,12 +34,8 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {

    override val key: ResourceLocation = KEY

-    override fun getRidingStyle(settings: BirdAirSettings, state: BirdAirState): RidingStyle {
-        return RidingStyle.AIR
-    }
-
    val poseProvider = PoseProvider<BirdAirSettings, BirdAirState>(PoseType.HOVER)
-        .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVelocity.get().z > 0.2 })
+        .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVel.get().z > 0.1 })

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

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

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

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


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

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

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

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

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

        var glideSpeedChange = 0.0

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

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

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

        //speed up and slow down based on input
        if (driver.zza != 0.0f && state.stamina.get() > 0.0) {
@@ -159,7 +148,7 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        if (controller != null) {
            //Base glide speed change on current pitch of the ride.
            glideSpeedChange = sin(Math.toRadians(controller.pitch.toDouble()))
-            glideSpeedChange = glideSpeedChange * 0.25
+            glideSpeedChange = glideSpeedChange.pow(3) * 0.5

            //TODO: Possibly create a deadzone around parallel where glide doesn't affect speed?
            if (glideSpeedChange <= 0.0) {
@@ -186,11 +175,27 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
            }
        }

+        //Lateral movement based on driver input.
+        val latTopSpeed = topSpeed / 2.0
+        if (driver.xxa != 0.0f && state.stamina.get() > 0.0) {
+            newVelocity = Vec3(
+                (newVelocity.x + (accel * driver.xxa)).coerceIn(-latTopSpeed, latTopSpeed),
+                newVelocity.y,
+                newVelocity.z)
+            activeInput = true
+        }
+        else {
+            newVelocity = Vec3(
+                lerp(newVelocity.x, 0.0, latTopSpeed / 20.0),
+                newVelocity.y,
+                newVelocity.z)
+        }
+
        //Vertical movement based on driver input.
        val vertTopSpeed = topSpeed / 2.0
        val vertInput = when {
-            driver.jumping && state.rideVelocity.get().length() < 0.3 -> 1.0
-            driver.isShiftKeyDown && state.rideVelocity.get().length() < 0.3  -> -1.0
+            driver.jumping -> 1.0
+            driver.isShiftKeyDown -> -1.0
            else -> 0.0
        }

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

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

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

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

-        //limit rolling based on handling and current speed.
-        //modulated by speed so that when flapping idle in air you are ont wobbling around to look around
-        //TODO: Tie handling into yaw rate
+        //TODO: Tie into handling
        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr)
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        //This rotation limit will be used to know if the ride has exceeded it and its needs correcting.
-        val rotMin = 15.0
-        val rotLimit = max(handling * sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)), rotMin)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.topSpeedExpr)
+         val rotationChangeRate = 10.0

-        var yawDeltaDeg =  deltaTime * handling * sin(Math.toRadians(controller.roll.toDouble())) //sin(Math.toRadians(controller.roll.toDouble())) * abs(cos(Math.toRadians(controller.pitch.toDouble())))
-        val trueYawDelt = yawDeltaDeg * abs(cos(Math.toRadians(controller.pitch.toDouble())))
-        //val pitchedYawDelt = yawDeltaDeg - trueYawDelt
+        var yawForce =  rotationChangeRate * sin(Math.toRadians(controller.roll.toDouble()))
+        //for a bit of correction on the rolls limit it to a quarter the amount
+        var pitchForce = -0.35 * rotationChangeRate * abs(sin(Math.toRadians(controller.roll.toDouble())))

-        controller.applyGlobalYaw(trueYawDelt.toFloat())
+        //limit rotation modulation when pitched up heavily or pitched down heavily
+        yawForce *= abs(cos(Math.toRadians(controller.pitch.toDouble())))
+        pitchForce *= abs(cos(Math.toRadians(controller.pitch.toDouble()))) * 1.5

-        //Calculate correcting roll force.
-        val correctionRate = 5.0
-        if(abs(controller.roll) > rotLimit && state.rideVelocity.get().length() < 0.2) {
-            state.currRollCorrectionForce.set(
-                state.currRollCorrectionForce.get() + ((abs(controller.roll) - rotLimit) / 180 - rotLimit) * controller.roll.sign * correctionRate * deltaTime * 0.01
-            )
-        } else {
-            state.currRollCorrectionForce.set(
-                //reduce rollCorrection gradually
-                lerp(state.currRollCorrectionForce.get(), 0.0, deltaTime * 0.98)
-            )
-        }
-
-        //yaw, pitch, roll
-        return Vec3(0.0, 0.0, state.currRollCorrectionForce.get())
+        return Vec3(yawForce, pitchForce, 0.0)
    }

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

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

        //Smooth out mouse input.
-        val smoothingSpeed = 4.0
+        val smoothingSpeed = 4
        val invertRoll = if (Cobblemon.config.invertRoll) -1 else 1
        val invertPitch = if (Cobblemon.config.invertPitch) -1 else 1
-        val mouseXc = (mouseX).coerceIn(-60.0, 60.0)
-        val mouseYc = (mouseY).coerceIn(-60.0, 60.0)
-        val xInput = mouseXSmoother.getNewDeltaValue(mouseXc * 0.1 * invertRoll, deltaTime * smoothingSpeed);
-        val yInput = mouseYSmoother.getNewDeltaValue(mouseYc * 0.1 * invertPitch, deltaTime * smoothingSpeed);
+        val xInput = mouseXSmoother.getNewDeltaValue(mouseX * 0.1 * invertRoll, deltaTime * smoothingSpeed);
+        val yInput = mouseYSmoother.getNewDeltaValue(mouseY * 0.1 * invertPitch, deltaTime * smoothingSpeed);

        //limit rolling based on handling and current speed.
        //modulated by speed so that when flapping idle in air you are ont wobbling around to look around
        val rotMin = 15.0
        var rollForce = xInput
-        val rotLimit = max(90 * sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)), rotMin)
+        val rotLimit = max(handling * normalizeVal(state.rideVel.get().length(), 0.0, topSpeed).pow(3), rotMin)

        //Limit roll by non linearly decreasing inputs towards
        // a rotation limit based on the current distance from
        // that rotation limit
        if (abs(controller.roll + rollForce) < rotLimit) {
            if (sign(rollForce) == sign(controller.roll).toDouble()) {
-                //Grab how far the current roll is away from the roll limit
                val d = abs(abs(controller.roll) - rotLimit)
                rollForce *= (d.pow(2)) / (rotLimit.pow(2))
            }
-        } else { //if (sign(rollForce) == sign(controller.roll).toDouble()) {
-            rollForce *= max(abs(sin(controller.pitch.toRadians())),0.1f)
+        } else if (sign(rollForce) == sign(controller.roll).toDouble()) {
+            rollForce = 0.0
        }

        //Give the ability to yaw with x mouse input when at low speeds.
-        val yawForce =  xInput * ( 1.0 - sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)))
-
-        //Yaw locally a bit when up or down so that its more intuitive to make it out of a dive or a straight vertical
-        //climb
-        val yawForcePitched = xInput * sin(Math.toRadians(abs(controller.pitch.toDouble()))) * 0.25
-
-
-        //Apply yaw globally as we don't want roll or pitch changes due to local yaw when looking up or down.
-        if (controller.upVector.dot(Vector3f(0f,1f,0f)) > 0) {
-            controller.applyGlobalYaw(yawForce.toFloat())
-        }
-
-
-        // Pitch up globally
-        controller.applyGlobalPitch(-1 * yInput.toFloat())
-        // roll to 0 if pitching and not upside down. This is to prevent odd back and forth wobbling when
-        // pitching globally and experiencing axis changes
-        if (controller.upVector.dot(Vector3f(0f,1f,0f)) > 0) {
-            // correct roll equal to the amount the ride is pitching (yInput)
-            // correct roll only when near to horizontal (cos(pitch))
-            // correct roll proportional to how rolled the ride currently is
-            rollForce += controller.roll * -0.01 * abs(yInput) * abs(cos(controller.pitch.toRadians())) * abs(sin(controller.roll.toRadians()))
-        }
+        val yawForce = xInput * ( 1.0 - normalizeVal(state.rideVel.get().length(), 0.0, topSpeed).pow(3))

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

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

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

        //Only ever want the fov change to be a max of 0.2 and for it to have non linear scaling.
        return 1.0f + normalizedGlideSpeed.pow(2).toFloat() * 0.2f
@@ -432,11 +397,8 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        state: BirdAirState,
        vehicle: PokemonEntity,
        driver: Player
-    ): ResourceLocation {
-        if (state.gliding.get()) {
-            return cobblemonResource("gliding")
-        }
-        return cobblemonResource("no_pose")
+    ): Boolean {
+        return state.gliding.get()
    }

    override fun inertia(settings: BirdAirSettings, state: BirdAirState, vehicle: PokemonEntity): Double {
@@ -468,94 +430,107 @@ class BirdAirBehaviour : RidingBehaviour<BirdAirSettings, BirdAirState> {
        state: BirdAirState,
        vehicle: PokemonEntity
    ): Boolean {
-        return true
+        return false
    }

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

 }

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

+    //max y level for the ride
+    var altitudeExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 200.0, 128.0)".asExpression()
+        private set
+
    var infiniteAltitude: Expression = "false".asExpression()
        private set

    var infiniteStamina: Expression = "false".asExpression()
        private set

-    //max y level for the ride
-    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 200.0, 128.0)".asExpression()
    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 135.0, 45.0)".asExpression()
-    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 1.0, 0.35)".asExpression()
-    var accelerationExpr: Expression = "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 3.0)), (1.0 / (20.0 * 8.0)))".asExpression()
-    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 120.0, 20.0)".asExpression()
+        private set

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

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

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

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

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

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

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

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

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

    override fun shouldSync(previous: RidingBehaviourState): Boolean {
        if (previous !is BirdAirState) return false
-        if (previous.gliding.get() != gliding.get()) return true
-        return super.shouldSync(previous)
+        if (previous.rideVel != rideVel) return true
+        if (previous.stamina != stamina) return true
+        if (previous.gliding != gliding) return true
+        return false
    }
 }
@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.riding.behaviour.types
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.OrientationControllable
-import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
@@ -37,10 +36,6 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {

    override val key = KEY

-    override fun getRidingStyle(settings: DolphinSettings, state: DolphinState): RidingStyle {
-        return RidingStyle.LIQUID
-    }
-
    val poseProvider = PoseProvider<DolphinSettings, DolphinState>(PoseType.FLOAT)
        .with(PoseOption(PoseType.SWIM) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })

@@ -225,8 +220,8 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
        state: DolphinState,
        vehicle: PokemonEntity,
        driver: Player
-    ): ResourceLocation {
-        return cobblemonResource("no_pose")
+    ): Boolean {
+        return false
    }

    override fun inertia(settings: DolphinSettings, state: DolphinState, vehicle: PokemonEntity): Double {
@@ -261,7 +256,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
        return false
    }

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

 }

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

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

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

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

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

    override fun copy() = DolphinState().also {
-        it.stamina.set(stamina.get(), forced = true)
-        it.rideVelocity.set(rideVelocity.get(), forced = true)
        it.lastVelocity.set(lastVelocity.get(), forced = true)
    }
+
+    override fun shouldSync(previous: RidingBehaviourState) = false
 }
@@ -0,0 +1,434 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.riding.behaviour.types
+
+import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.api.riding.behaviour.*
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.util.*
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.util.SmoothDouble
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.player.Player
+import net.minecraft.world.phys.Vec2
+import net.minecraft.world.phys.Vec3
+
+class FallToGlideCompositeBehaviour : RidingBehaviour<FallToGlideCompositeSettings, FallToGlideCompositeState> {
+    companion object {
+        val KEY = cobblemonResource("composite/fall_to_glide")
+    }
+
+    override val key = KEY
+
+    val landBehaviour: GenericLandBehaviour = GenericLandBehaviour()
+    val glideBehaviour: GliderAirBehaviour = GliderAirBehaviour()
+
+    override fun tick(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        input: Vec3
+    ) {
+        val shouldBeFlying = checkShouldBeFlying(settings, vehicle, state.activeController.get() == GliderAirBehaviour.KEY)
+        if (state.activeController.get() == GliderAirBehaviour.KEY && !shouldBeFlying) { // && entity.onGround() && state.timeTransitioned + 20 < entity.level().gameTime) {
+            state.activeController.set(GenericLandBehaviour.KEY)
+            vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, false)
+        } else if (state.activeController.get() == GenericLandBehaviour.KEY && shouldBeFlying) {
+            state.activeController.set(GliderAirBehaviour.KEY)
+            vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, true)
+        }
+    }
+
+    private fun checkShouldBeFlying(
+        settings: FallToGlideCompositeSettings,
+        vehicle: PokemonEntity,
+        isFlyingAlready: Boolean
+    ): Boolean {
+        val runtime = vehicle.runtime
+        val minFallingSpeed = runtime.resolveFloat(settings.minimumFallSpeed)
+        val minForwardSpeed = runtime.resolveFloat(settings.minimumForwardSpeed)
+        val grounded = vehicle.onGround()
+        return if (isFlyingAlready) {
+            !grounded
+        } else {
+            vehicle.deltaMovement.y <= -minFallingSpeed && vehicle.deltaMovement.horizontalDistance() >= minForwardSpeed
+        }
+    }
+
+    override fun isActive(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return true
+    }
+
+    override fun pose(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): PoseType {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.pose(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.pose(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun speed(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.speed(settings.land, state.landState, vehicle, driver)
+            GliderAirBehaviour.KEY -> glideBehaviour.speed(settings.glide, NoState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rotation(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: LivingEntity
+    ): Vec2 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rotation(settings.land, state.landState, vehicle, driver)
+            GliderAirBehaviour.KEY -> glideBehaviour.rotation(settings.glide, NoState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun velocity(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        input: Vec3
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.velocity(settings.land, state.landState, vehicle, driver, input)
+            GliderAirBehaviour.KEY -> glideBehaviour.velocity(settings.glide, NoState, vehicle, driver, input)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun angRollVel(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        deltaTime: Double
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.angRollVel(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                deltaTime
+            )
+
+            GliderAirBehaviour.KEY -> glideBehaviour.angRollVel(settings.glide, NoState, vehicle, driver, deltaTime)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rotationOnMouseXY(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        mouseY: Double,
+        mouseX: Double,
+        mouseYSmoother: SmoothDouble,
+        mouseXSmoother: SmoothDouble,
+        sensitivity: Double,
+        deltaTime: Double
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rotationOnMouseXY(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                mouseY,
+                mouseX,
+                mouseYSmoother,
+                mouseXSmoother,
+                sensitivity,
+                deltaTime
+            )
+
+            GliderAirBehaviour.KEY -> glideBehaviour.rotationOnMouseXY(
+                settings.glide,
+                NoState,
+                vehicle,
+                driver,
+                mouseY,
+                mouseX,
+                mouseYSmoother,
+                mouseXSmoother,
+                sensitivity,
+                deltaTime
+            )
+
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun canJump(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.canJump(settings.land, state.landState, vehicle, driver)
+            GliderAirBehaviour.KEY -> glideBehaviour.canJump(settings.glide, NoState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun setRideBar(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.setRideBar(settings.land, state.landState, vehicle, driver)
+            GliderAirBehaviour.KEY -> glideBehaviour.setRideBar(settings.glide, NoState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun jumpForce(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        jumpStrength: Int
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.jumpForce(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                jumpStrength
+            )
+
+            GliderAirBehaviour.KEY -> glideBehaviour.jumpForce(settings.glide, NoState, vehicle, driver, jumpStrength)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun gravity(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        regularGravity: Double
+    ): Double {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.gravity(settings.land, state.landState, vehicle, regularGravity)
+            GliderAirBehaviour.KEY -> glideBehaviour.gravity(settings.glide, NoState, vehicle, regularGravity)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rideFovMultiplier(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rideFovMultiplier(settings.land, state.landState, vehicle, driver)
+            GliderAirBehaviour.KEY -> glideBehaviour.rideFovMultiplier(settings.glide, NoState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun useAngVelSmoothing(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.useAngVelSmoothing(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.useAngVelSmoothing(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun useRidingAltPose(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.useRidingAltPose(settings.land, state.landState, vehicle, driver)
+            GliderAirBehaviour.KEY -> glideBehaviour.useRidingAltPose(settings.glide, NoState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun inertia(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Double {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.inertia(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.inertia(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRoll(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRoll(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.shouldRoll(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun turnOffOnGround(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.turnOffOnGround(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.turnOffOnGround(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun dismountOnShift(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.dismountOnShift(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.dismountOnShift(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRotatePokemonHead(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRotatePokemonHead(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.shouldRotatePokemonHead(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRotatePlayerHead(
+        settings: FallToGlideCompositeSettings,
+        state: FallToGlideCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRotatePlayerHead(settings.land, state.landState, vehicle)
+            GliderAirBehaviour.KEY -> glideBehaviour.shouldRotatePlayerHead(settings.glide, NoState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun createDefaultState() = FallToGlideCompositeState()
+
+
+}
+
+class FallToGlideCompositeSettings : RidingBehaviourSettings {
+    override val key = FallToGlideCompositeBehaviour.KEY
+
+    var glide: GliderAirSettings = GliderAirSettings()
+        private set
+
+    var land: GenericLandSettings = GenericLandSettings()
+        private set
+
+    var minimumForwardSpeed: Expression = "0.0".asExpression()
+        private set
+
+    var minimumFallSpeed: Expression = "0.5".asExpression()
+        private set
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        glide.encode(buffer)
+        land.encode(buffer)
+        buffer.writeExpression(minimumForwardSpeed)
+        buffer.writeExpression(minimumFallSpeed)
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        glide.decode(buffer)
+        land.decode(buffer)
+        minimumForwardSpeed = buffer.readExpression()
+        minimumFallSpeed = buffer.readExpression()
+    }
+}
+
+class FallToGlideCompositeState : RidingBehaviourState {
+    var activeController = ridingState(GenericLandBehaviour.KEY, Side.CLIENT)
+    var landState: GenericLandState = GenericLandState()
+    var timeTransitioned = ridingState(-100L, Side.BOTH)
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(activeController.get())
+        landState.encode(buffer)
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        activeController.set(buffer.readResourceLocation(), forced = true)
+        landState.decode(buffer)
+    }
+
+    override fun reset() {
+        activeController.set(GenericLandBehaviour.KEY, forced = true)
+        landState.reset()
+        timeTransitioned.set(-100L, forced = true)
+    }
+
+    override fun toString(): String {
+        return "FallToGlideCompositeState(activeController=$activeController, landState=$landState, timeTransitioned=$timeTransitioned)"
+    }
+
+    override fun copy() = FallToGlideCompositeState().also {
+        it.activeController.set(activeController.get(), forced = true)
+        it.landState = landState.copy()
+        it.timeTransitioned.set(timeTransitioned.get(), forced = true)
+    }
+
+    override fun shouldSync(previous: RidingBehaviourState): Boolean {
+        if (previous !is FallToGlideCompositeState) return false
+        if (activeController != previous.activeController) return true
+        if (landState.shouldSync(previous.landState)) return true
+        return false
+    }
+}
@@ -9,26 +9,23 @@
 package com.cobblemon.mod.common.api.riding.behaviour.types

 import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.api.riding.RidingStyle
+import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.*
-import net.minecraft.core.Direction
-import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.util.Mth
 import net.minecraft.util.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.attributes.Attributes
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
 import net.minecraft.world.phys.shapes.Shapes
-import kotlin.math.*
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.pow

 class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandState> {
    companion object {
@@ -37,13 +34,9 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta

    override val key = KEY

-    override fun getRidingStyle(settings: GenericLandSettings, state: GenericLandState): RidingStyle {
-        return RidingStyle.LAND
-    }
-
    val poseProvider = PoseProvider<GenericLandSettings, GenericLandState>(PoseType.STAND)
        .with(PoseOption(PoseType.WALK) { _, state, _ ->
-            return@PoseOption abs(state.rideVelocity.get().z) > 0.0
+            return@PoseOption state.rideVel.get().z > 0.1
        })

    override fun isActive(
@@ -79,124 +72,18 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
-
-        // Use this as a "tick" function and calculate sprinting and inAir state here
-        state.sprinting.set(driver.isSprinting)
-
-        // Check both vertical movement and if there are blocks below.
-        val posBelow = vehicle.blockPosition().below()
-        val blockStateBelow = vehicle.level().getBlockState(posBelow)
-        val isAirOrLiquid = blockStateBelow.isAir || !blockStateBelow.fluidState.isEmpty
-
-        val canSupportEntity = blockStateBelow.isFaceSturdy(vehicle.level(), posBelow, Direction.UP)
-        val standingOnSolid = canSupportEntity && !isAirOrLiquid
-
-//        val level = vehicle.level()
-//        val toesBox = vehicle.boundingBox.move(0.0, -0.1, 0.0)
-
-        // inAir if not on the ground
-        val inAir = !(vehicle.deltaMovement.y == 0.0 || standingOnSolid)
-        state.inAir.set(inAir)
-
-        return state.rideVelocity.get().length().toFloat()
+        return state.rideVel.get().length().toFloat()
    }

-    override fun updatePassengerRotation(
-        settings: GenericLandSettings,
-        state: GenericLandState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ) {
-
-        //Take the inverse so that it cancels out how
-        //much the entity rotates.
-        val turnAmount = calcRotAmount(settings, state, vehicle, driver)
-
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val maxYawDiff = 90.0f
-
-        //Normalize the current rotation diff
-        val rotMod = Mth.wrapDegrees(driver.yRot - vehicle.yRot) / maxYawDiff
-
-        val rotAmount = 10.0f
-
-        //Take the inverse so that you turn more at higher speeds
-        val normSpeed = 1.0f - 0.5f*normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed).toFloat()
-
-        //driver.yRot += (entity.riding.deltaRotation.y - turnAmount)
-        //driver.setYHeadRot(driver.yHeadRot + (entity.riding.deltaRotation.y) - turnAmount)
-    }
-
-    override fun clampPassengerRotation(
-        settings: GenericLandSettings,
-        state: GenericLandState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ) {
-        val f = Mth.wrapDegrees(driver.yRot - vehicle.yRot)
-        val lookYawLimit = 90.0f
-        val g = Mth.clamp(f, -lookYawLimit, lookYawLimit)
-        driver.yRotO += g - f
-        driver.yRot = driver.yRot + g - f
-        driver.setYHeadRot(driver.yRot)
-    }
-
-
    override fun rotation(
        settings: GenericLandSettings,
        state: GenericLandState,
        vehicle: PokemonEntity,
        driver: LivingEntity
    ): Vec2 {
-        val turnAmount =  calcRotAmount(settings, state, vehicle, driver)
-
-        return Vec2(vehicle.xRot, vehicle.yRot + turnAmount )
-
+        return Vec2(driver.xRot * 0.5f, driver.yRot)
    }

-    /*
-   *  Calculates the rotation amount given the difference between
-   *  the current player y rot and entity y rot. This gives the
-   *  affect of influencing a rides rotation through the mouse
-   *  without it being instant.
-   */
-    fun calcRotAmount(
-        settings: GenericLandSettings,
-        state: GenericLandState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ): Float {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-
-        //In degrees per second
-        val walkHandling = 140.0 * 2
-        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr) * 2
-
-        val maxYawDiff = 90.0f
-
-        //Normalize the current rotation diff
-        val rotDiff = Mth.wrapDegrees(driver.yRot - vehicle.yRot)
-        val rotDiffNorm = rotDiff / maxYawDiff
-
-        //Take the square root so that the ride levels out quicker when at lower differences between entity
-        //y and driver y
-        //This influences the speed of the turn based on how far in one direction you're looking
-        val rotDiffMod = (sqrt(abs(rotDiffNorm)) * rotDiffNorm.sign)
-
-        //Take the inverse so that you turn less at higher speeds
-        val normSpeed = 1.0f // = 1.0f - 0.5f*normalizeVal(state.rideVelocityocity.length(), 0.0, topSpeed).toFloat()
-
-        // TurnRate should always be quick if not sprinting
-        val turnRate = if(state.sprinting.get()) (handling.toFloat() / 20.0f) else (walkHandling.toFloat() / 20.0f)
-
-        //Ensure you only ever rotate as much difference as there is between the angles.
-        val turnSpeed = turnRate  * rotDiffMod * normSpeed
-        val rotAmount = turnSpeed.coerceIn(-abs(rotDiff), abs(rotDiff))
-
-        return rotAmount
-    }
-
-
    override fun velocity(
        settings: GenericLandSettings,
        state: GenericLandState,
@@ -204,8 +91,34 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        driver: Player,
        input: Vec3
    ): Vec3 {
-            state.rideVelocity.set(calculateRideSpaceVel(settings, state, vehicle, driver))
-            return state.rideVelocity.get()
+        val runtime = vehicle.runtime
+        val driveFactor = runtime.resolveFloat(settings.driveFactor)
+        val strafeFactor = runtime.resolveFloat(settings.strafeFactor)
+        val f = driver.xxa * strafeFactor
+        var g = driver.zza * driveFactor
+        if (g <= 0.0f) {
+            g *= runtime.resolveFloat(settings.reverseDriveFactor)
+        }
+        val gravity = -1.0
+
+        val newVelocity = calculateRideSpaceVel(settings, state, vehicle, driver)
+
+        //Jump the thang!
+        if (driver.jumping && vehicle.onGround()) {
+            state.rideVel.set(Vec3(newVelocity.x, 2.0, newVelocity.z))
+        } else {
+            state.rideVel.set(newVelocity)
+        }
+
+        //This is cheap.
+        //Also make it stop quicker the slower it is.
+        val maxSpeed = 1.0
+        //state.currVel = state.currVel.lerp( Vec3(0.0, state.currVel.y, 0.0), 1.0/20.0 )
+
+
+        //entity.deltaMovement = entity.deltaMovement.lerp(velocity, 1.0)
+        //state.currVel = state.currVel.add( f.toDouble() / 20.0, gravity / 20.0 , g.toDouble() / 20.0)
+        return state.rideVel.get()
    }

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

-        // Check to see if the ride should be walking or sprinting
-        val walkSpeed = getWalkSpeed(vehicle)
-        val rideTopSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val topSpeed = if(state.sprinting.get()) rideTopSpeed else walkSpeed
-
-        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr)
-
-        //Flag for determining if player is actively inputting
-        var activeInput = false
-
-        var newVelocity = Vec3(state.rideVelocity.get().x, state.rideVelocity.get().y, state.rideVelocity.get().z)
+        val minSpeed = 0.0

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

        //speed up and slow down based on input
-        if (driver.zza != 0.0f && state.stamina.get() > 0.0) {
-            //make sure it can't exceed top speed
-            val forwardInput = when {
-                driver.zza > 0 && newVelocity.z > topSpeed -> 0.0
-                driver.zza < 0 && newVelocity.z < (-topSpeed / 3.0) -> 0.0
-                else -> driver.zza.sign
-            }
+        if (driver.zza > 0.0 && speed <= topSpeed && state.stamina.get() > 0.0f) {
+            //modify acceleration to be slower when at closer speeds to top speed
+            val accelMod = max((normalizeSpeed(speed, minSpeed, topSpeed) - 1).pow(2), 0.1)
+            newVelocity = Vec3(newVelocity.x, newVelocity.y, min(newVelocity.z + (accel * accelMod), topSpeed))
+        } else if (driver.zza >= 0.0 && state.stamina.get() == 0.0f || speed > topSpeed) {
+            newVelocity = Vec3(newVelocity.x, newVelocity.y, max(newVelocity.z - ((accel) / 4), minSpeed))
+        } else if (driver.zza < 0.0 && speed > minSpeed) {
+            //modify deccel to be slower when at closer speeds to minimum speed
+            val deccelMod = max(-(normalizeSpeed(speed, minSpeed, topSpeed)) + 1, 0.0)

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

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

@@ -279,19 +163,11 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
    *  Normalizes the current speed between minSpeed and maxSpeed.
    *  The result is clamped between 0.0 and 1.0, where 0.0 represents minSpeed and 1.0 represents maxSpeed.
    */
-    private fun normalizeVal(currSpeed: Double, minSpeed: Double, maxSpeed: Double): Double {
+    private fun normalizeSpeed(currSpeed: Double, minSpeed: Double, maxSpeed: Double): Double {
        require(maxSpeed > minSpeed) { "maxSpeed must be greater than minSpeed" }
        return ((currSpeed - minSpeed) / (maxSpeed - minSpeed)).coerceIn(0.0, 1.0)
    }

-    private fun getWalkSpeed( vehicle: PokemonEntity ): Double {
-        val walkspeed = vehicle.runtime.resolveDouble(vehicle.behaviour.moving.walk.walkSpeed)
-        val movementSpeed = vehicle.attributes.getValue(Attributes.MOVEMENT_SPEED)
-        val speedModifier = 1.2 * 0.35
-        return walkspeed * movementSpeed * speedModifier
-
-    }
-
    override fun angRollVel(
        settings: GenericLandSettings,
        state: GenericLandState,
@@ -339,6 +215,8 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        driver: Player
    ): Float {
        //Retrieve stamina from state and tick up at a rate of 0.1 a second
+        val staminaGain = (1.0 / 20.0) * 0.1
+        state.stamina.set(min(state.stamina.get() + staminaGain, 1.0).toFloat())
        return (state.stamina.get() / 1.0f)
    }

@@ -349,7 +227,10 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        driver: Player,
        jumpStrength: Int
    ): Vec3 {
-        return Vec3.ZERO
+        val runtime = vehicle.runtime
+        runtime.environment.query.addFunction("jump_strength") { DoubleValue(jumpStrength.toDouble()) }
+        val jumpVector = settings.jumpVector.map { runtime.resolveFloat(it) }
+        return Vec3(jumpVector[0].toDouble(), jumpVector[1].toDouble(), jumpVector[2].toDouble())
    }

    override fun gravity(
@@ -383,12 +264,8 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        state: GenericLandState,
        vehicle: PokemonEntity,
        driver: Player
-    ): ResourceLocation {
-        when {
-            state.inAir.get() -> cobblemonResource("in_air")
-            state.sprinting.get() -> return cobblemonResource("sprinting")
-        }
-        return cobblemonResource("no_pose")
+    ): Boolean {
+        return false
    }

    override fun inertia(
@@ -396,7 +273,7 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        state: GenericLandState,
        vehicle: PokemonEntity
    ): Double {
-            return 1.0
+        return 0.5
    }

    override fun shouldRoll(
@@ -436,24 +313,33 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
        state: GenericLandState,
        vehicle: PokemonEntity
    ): Boolean {
-        return true
+        return false
    }

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

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

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

-    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'LAND', 1.0, 0.3)".asExpression()
+    var strafeFactor = "0.2".asExpression()
+        private set
+
+    var reverseDriveFactor = "0.25".asExpression()
+        private set
+
+    var topSpeedExpr: Expression = "q.get_ride_stats('SPEED', 'LAND', 1.0, 0.3)".asExpression()
        private set

    // Max accel is a whole 1.0 in 1 second. The conversion in the function below is to convert seconds to ticks
-    var accelerationExpr: Expression =
-        "q.get_ride_stats('ACCELERATION', 'LAND', (1.0 / (20.0 * 1.5)), (1.0 / (20.0 * 5.0)))".asExpression()
+    var accelExpr: Expression =
+        "q.get_ride_stats('ACCELERATION', 'LAND', (1.0 / (20.0 * 0.5)), (1.0 / (20.0 * 5.0)))".asExpression()
+        private set
+
+    var jumpVector = listOf("0".asExpression(), "0.3".asExpression(), "0".asExpression())
        private set

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

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

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

 }

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

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

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

    override fun reset() {
-        super.reset()
-        sprinting.set(false, forced = true)
-        inAir.set(false, forced = true)
+        rideVel.set(Vec3.ZERO, forced = true)
+        stamina.set(1.0f, forced = true)
+        currSpeed.set(0.0, forced = true)
+    }
+
+    override fun toString(): String {
+        return "GenericLandState(rideVel=${rideVel.get()}, stamina=${stamina.get()}, currSpeed=${currSpeed.get()})"
    }

    override fun copy() = GenericLandState().also {
-        it.rideVelocity.set(this.rideVelocity.get(), forced = true)
+        it.rideVel.set(this.rideVel.get(), forced = true)
        it.stamina.set(this.stamina.get(), forced = true)
-        it.sprinting.set(this.sprinting.get(), forced = true)
-        it.inAir.set(this.inAir.get(), forced = true)
+        it.currSpeed.set(this.currSpeed.get(), forced = true)
    }

    override fun shouldSync(previous: RidingBehaviourState): Boolean {
        if (previous !is GenericLandState) return false
-        if (previous.sprinting.get() != sprinting.get()) return true
-        if (previous.inAir.get() != inAir.get()) return true
-        return super.shouldSync(previous)
+        if (rideVel != previous.rideVel) return true
+        if (stamina != previous.stamina) return true
+        return false
    }
 }
@@ -11,8 +11,7 @@ package com.cobblemon.mod.common.api.riding.behaviour.types
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.OrientationControllable
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
+import com.cobblemon.mod.common.api.riding.behaviour.NoState
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
@@ -29,21 +28,17 @@ import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
 import net.minecraft.world.phys.shapes.Shapes

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

    override val key = KEY

-    override fun getRidingStyle(settings: GenericSwimSettings, state: RidingBehaviourState): RidingStyle {
-        return RidingStyle.LIQUID
-    }
-
-    val poseProvider = PoseProvider<GenericSwimSettings, RidingBehaviourState>(PoseType.FLOAT)
+    val poseProvider = PoseProvider<GenericSwimSettings, NoState>(PoseType.FLOAT)
        .with(PoseOption(PoseType.SWIM) { _, _, entity -> entity.isSwimming && entity.entityData.get(PokemonEntity.MOVING) })

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 }

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

    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
        buffer.writeExpression(canJump)
        buffer.writeExpression(jumpVector[0])
        buffer.writeExpression(jumpVector[1])
@@ -12,7 +12,7 @@ import com.bedrockk.molang.Expression
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
+import com.cobblemon.mod.common.api.riding.behaviour.NoState
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
@@ -29,47 +29,43 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3

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

    override val key = KEY

-    override fun getRidingStyle(settings: GliderAirSettings, state: RidingBehaviourState): RidingStyle {
-        return RidingStyle.AIR
-    }
+    val poseProvider = PoseProvider<GliderAirSettings, NoState>(PoseType.HOVER)
+        .with(PoseOption(PoseType.FLY) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })

-    val poseProvider = PoseProvider<GliderAirSettings, RidingBehaviourState>(PoseType.HOVER)
-            .with(PoseOption(PoseType.FLY) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })
-
-    override fun isActive(settings: GliderAirSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun isActive(settings: GliderAirSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return true
    }

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

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

    override fun rotation(
-            settings: GliderAirSettings,
-            state: RidingBehaviourState,
-            vehicle: PokemonEntity,
-            driver: LivingEntity
+        settings: GliderAirSettings,
+        state: NoState,
+        vehicle: PokemonEntity,
+        driver: LivingEntity
    ): Vec2 {
        return Vec2(driver.xRot, driver.yRot)
    }

    override fun velocity(
-            settings: GliderAirSettings,
-            state: RidingBehaviourState,
-            vehicle: PokemonEntity,
-            driver: Player,
-            input: Vec3
+        settings: GliderAirSettings,
+        state: NoState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        input: Vec3
    ): Vec3 {
        val xVector = if (vehicle.runtime.resolveBoolean(settings.canStrafe)) driver.xxa.toDouble() else 0.0
        val yVector = -vehicle.runtime.resolveDouble(settings.glideSpeed)
@@ -80,26 +76,26 @@ class GliderAirBehaviour : RidingBehaviour<GliderAirSettings, RidingBehaviourSta
    }

    override fun angRollVel(
-            settings: GliderAirSettings,
-            state: RidingBehaviourState,
-            vehicle: PokemonEntity,
-            driver: Player,
-            deltaTime: Double
+        settings: GliderAirSettings,
+        state: NoState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        deltaTime: Double
    ): Vec3 {
        return Vec3.ZERO
    }

    override fun rotationOnMouseXY(
-            settings: GliderAirSettings,
-            state: RidingBehaviourState,
-            vehicle: PokemonEntity,
-            driver: Player,
-            mouseY: Double,
-            mouseX: Double,
-            mouseYSmoother: SmoothDouble,
-            mouseXSmoother: SmoothDouble,
-            sensitivity: Double,
-            deltaTime: Double
+        settings: GliderAirSettings,
+        state: NoState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        mouseY: Double,
+        mouseX: Double,
+        mouseYSmoother: SmoothDouble,
+        mouseXSmoother: SmoothDouble,
+        sensitivity: Double,
+        deltaTime: Double
    ): Vec3 {
        if (driver !is OrientationControllable) return Vec3.ZERO

@@ -109,85 +105,85 @@ class GliderAirBehaviour : RidingBehaviour<GliderAirSettings, RidingBehaviourSta
        return Vec3(0.0, mouseY * invertPitch, mouseX * invertRoll)
    }

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

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

    override fun jumpForce(
-            settings: GliderAirSettings,
-            state: RidingBehaviourState,
-            vehicle: PokemonEntity,
-            driver: Player,
-            jumpStrength: Int
+        settings: GliderAirSettings,
+        state: NoState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        jumpStrength: Int
    ): Vec3 {
        return Vec3.ZERO
    }

    override fun gravity(
-            settings: GliderAirSettings,
-            state: RidingBehaviourState,
-            vehicle: PokemonEntity,
-            regularGravity: Double
+        settings: GliderAirSettings,
+        state: NoState,
+        vehicle: PokemonEntity,
+        regularGravity: Double
    ): Double {
        return 0.0
    }

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

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

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

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

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

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

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

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

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

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

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

    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
        buffer.writeExpression(glideSpeed)
        buffer.writeExpression(speed)
        buffer.writeExpression(canStrafe)
@@ -11,8 +11,7 @@ package com.cobblemon.mod.common.api.riding.behaviour.types
 import com.bedrockk.molang.Expression
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.OrientationControllable
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
+import com.cobblemon.mod.common.api.riding.behaviour.NoState
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
@@ -32,7 +31,7 @@ import kotlin.math.abs
 import kotlin.math.pow
 import kotlin.math.sin

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

    override val key = KEY

-    override fun getRidingStyle(settings: HelicopterSettings, state: RidingBehaviourState): RidingStyle {
-        return RidingStyle.AIR
-    }
-
-    val poseProvider = PoseProvider<HelicopterSettings, RidingBehaviourState>(PoseType.HOVER)
+    val poseProvider = PoseProvider<HelicopterSettings, NoState>(PoseType.HOVER)
        .with(PoseOption(PoseType.FLY) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })

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

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

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

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

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

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

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

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

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

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

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

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

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

    override fun useRidingAltPose(
        settings: HelicopterSettings,
-        state: RidingBehaviourState,
+        state: NoState,
        vehicle: PokemonEntity,
        driver: Player
-    ): ResourceLocation {
-        return cobblemonResource("no_pose")
-    }
-
-    override fun inertia(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Double {
-        return 0.1
-    }
-
-    override fun shouldRoll(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
-        return true
-    }
-
-    override fun turnOffOnGround(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    ): Boolean {
        return false
    }

-    override fun dismountOnShift(settings: HelicopterSettings, state: RidingBehaviourState, vehicle: PokemonEntity): Boolean {
+    override fun inertia(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity): Double {
+        return 0.1
+    }
+
+    override fun shouldRoll(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity): Boolean {
+        return true
+    }
+
+    override fun turnOffOnGround(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity): Boolean {
+        return false
+    }
+
+    override fun dismountOnShift(settings: HelicopterSettings, state: NoState, vehicle: PokemonEntity): Boolean {
        return false
    }

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

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

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


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

    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
        buffer.writeExpression(gravity)
        buffer.writeExpression(horizontalAcceleration)
        buffer.writeExpression(verticalVelocity)
@@ -1,521 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding.behaviour.types
-
-import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.*
-import com.cobblemon.mod.common.api.riding.posing.PoseOption
-import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.*
-import com.cobblemon.mod.common.util.math.geometry.toRadians
-import net.fabricmc.loader.impl.lib.sat4j.core.Vec
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.util.Mth
-import net.minecraft.util.SmoothDouble
-import net.minecraft.world.entity.Entity
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.phys.Vec2
-import net.minecraft.world.phys.Vec3
-import net.minecraft.world.phys.shapes.Shapes
-import org.joml.Matrix3f
-import org.joml.Vector3f
-import kotlin.math.*
-
-class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
-    companion object {
-        val KEY = cobblemonResource("air/hover")
-    }
-
-    override val key = KEY
-
-    override fun getRidingStyle(settings: HoverSettings, state: HoverState): RidingStyle {
-        return RidingStyle.AIR
-    }
-
-    val poseProvider = PoseProvider<HoverSettings, HoverState>(PoseType.STAND)
-        .with(PoseOption(PoseType.WALK) { _, state, _ ->
-            return@PoseOption abs(state.rideVelocity.get().z) > 0.2
-        })
-
-    override fun isActive(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
-            //Need to check other fluids
-            if (vehicle.isInWater || vehicle.isUnderWater) {
-                return@any false
-            }
-            //This might not actually work, depending on what the yPos actually is. yPos of the middle of the entity? the feet?
-            if (it.y.toDouble() == (vehicle.position().y)) {
-                val blockState = vehicle.level().getBlockState(it.below())
-                return@any !blockState.isAir && blockState.fluidState.isEmpty
-            }
-            true
-        }
-    }
-
-    override fun pose(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): PoseType {
-        return this.poseProvider.select(settings, state, vehicle)
-    }
-
-    override fun speed(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        return state.rideVelocity.get().length().toFloat()
-    }
-
-    override fun updatePassengerRotation(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ) {
-
-        //Take the inverse so that it cancels out how
-        //much the entity rotates.
-        val turnAmount = calcRotAmount(settings, state, vehicle, driver)
-
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val maxYawDiff = 90.0f
-
-        //Normalize the current rotation diff
-        val rotMod = Mth.wrapDegrees(driver.yRot - vehicle.yRot) / maxYawDiff
-
-        val rotAmount = 10.0f
-
-        //Take the inverse so that you turn more at higher speeds
-        val normSpeed = 1.0f - 0.5f*normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed).toFloat()
-
-        //driver.yRot += (entity.riding.deltaRotation.y - turnAmount)
-        //driver.setYHeadRot(driver.yHeadRot + (entity.riding.deltaRotation.y) - turnAmount)
-    }
-
-    override fun clampPassengerRotation(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ) {
-        val f = Mth.wrapDegrees(driver.yRot - vehicle.yRot)
-        val lookYawLimit = 90.0f
-        val g = Mth.clamp(f, -lookYawLimit, lookYawLimit)
-        driver.yRotO += g - f
-        driver.yRot = driver.yRot + g - f
-        driver.setYHeadRot(driver.yRot)
-    }
-
-
-    override fun rotation(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ): Vec2 {
-        val turnAmount =  calcRotAmount(settings, state, vehicle, driver)
-
-        return Vec2(driver.xRot, vehicle.yRot + turnAmount )
-
-    }
-
-    /*
-   *  Calculates the rotation amount given the difference between
-   *  the current player y rot and entity y rot. This gives the
-   *  affect of influencing a rides rotation through the mouse
-   *  without it being instant.
-   */
-    fun calcRotAmount(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ): Float {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        //In degrees per second
-        val handling = 220.0
-        val maxYawDiff = 90.0f
-
-        //Normalize the current rotation diff
-        val rotDiff = Mth.wrapDegrees(driver.yRot - vehicle.yRot)
-        val rotDiffNorm = rotDiff / maxYawDiff
-
-        //Take the square root so that the ride levels out quicker when at lower differences between entity
-        //y and driver y
-        //This influences the speed of the turn based on how far in one direction you're looking
-        val rotDiffMod = (sqrt(abs(rotDiffNorm)) * rotDiffNorm.sign)
-
-        //Take the inverse so that you turn less at higher speeds
-        val normSpeed = 1.0f // = 1.0f - 0.5f*normalizeVal(state.rideVelocityocity.length(), 0.0, topSpeed).toFloat()
-
-        val turnRate = (handling.toFloat() / 20.0f)
-
-        //Ensure you only ever rotate as much difference as there is between the angles.
-        val turnSpeed = turnRate  * rotDiffMod * normSpeed
-        val rotAmount = turnSpeed.coerceIn(-abs(rotDiff), abs(rotDiff))
-
-        return rotAmount
-    }
-
-    override fun velocity(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ): Vec3 {
-
-//        if (Minecraft.getInstance().options.keySprint.isDown) {
-//            val belowBox = vehicle.boundingBox.expandTowards(0.0,-1.5, 0.0).inflate(5.0, 10.0,5.0)
-//
-//            val level = vehicle.level()
-//            val toBeSucked = level.getEntities(vehicle, belowBox)
-//            for (suckee in toBeSucked) {
-//                if (suckee != null) {
-//                    abductify(suckee, vehicle.position().add(0.0,-2.0,0.0))
-//                    suckee.deltaMovement = suckee.deltaMovement.add(0.0, 0.5,0.0)
-//
-//                }
-//            }
-//        }
-
-//
-//        if (firstEntity != null) {
-//            // Example action: print the entity name
-//            println("Found nearby entity: ${firstEntity.name.string}")
-//
-//            firstEntity.deltaMovement = firstEntity.deltaMovement.add(0.0, 0.1,0.0)
-//        }
-        val retVel = calculateRideSpaceVel(settings, state, vehicle, driver)
-        //state.rideVelocity.set(retVel)
-        return retVel
-    }
-
-    private fun abductify(abductee: Entity, pos: Vec3) {
-        val diff = pos.subtract(abductee.position()).scale(1.0)
-        abductee.deltaMovement = abductee.deltaMovement.add(diff)
-    }
-
-    private fun calculateRideSpaceVel(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Vec3 {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
-        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr)
-        val speed = vehicle.deltaMovement.length()
-
-        //Flag for determining if player is actively inputting
-        var activeInput = false
-
-        val minSpeed = 0.0
-
-        var newVelocity = vehicle.deltaMovement
-
-        val yawAligned = Matrix3f().rotateY(vehicle.yRot.toRadians())
-        newVelocity = (newVelocity.toVector3f().mul(yawAligned)).toVec3d()
-
-        //air Resistance
-        //newVelocity = newVelocity.lerp(Vec3.ZERO,(((topSpeed - speed) / topSpeed))*0.001)
-
-
-        //speed up and slow down based on input
-        if (driver.zza != 0.0f && state.stamina.get() > 0.0) {
-            //make sure it can't exceed top speed
-            val forwardInput = when {
-                speed > topSpeed && (driver.zza.sign == newVelocity.z.sign.toFloat()) -> 0.0
-                else -> driver.zza.sign
-            }
-
-            newVelocity = Vec3(
-                newVelocity.x,
-                newVelocity.y,
-                (newVelocity.z + (accel * forwardInput.toDouble())))
-
-        } else {
-//            newVelocity = Vec3(
-//                newVelocity.x,
-//                newVelocity.y,
-//                newVelocity.z - (((topSpeed - speed) / topSpeed)*0.001)
-//            )
-        }
-
-        //speed up and slow down based on input
-        if (driver.xxa != 0.0f && state.stamina.get() > 0.0) {
-            //make sure it can't exceed top speed
-            val lateralInput = when {
-                speed > topSpeed && (driver.xxa.sign == newVelocity.x.sign.toFloat()) -> 0.0
-                else -> driver.xxa.sign
-            }
-
-            newVelocity = Vec3(
-                newVelocity.x + (accel * lateralInput.toDouble()),
-                newVelocity.y,
-                (newVelocity.z ))
-
-            //air resistance
-//            if (lateralInput == 0.0) {
-//                newVelocity = Vec3(
-//                    newVelocity.x  - (((topSpeed - speed) / topSpeed)*0.001),
-//                    newVelocity.y,
-//                    newVelocity.z
-//                )
-//            }
-        }
-
-        //Vertical movement based on driver input.
-        val vertInput = when {
-            driver.jumping && !(speed > topSpeed && (newVelocity.y.sign.toFloat() > 0.0))-> 1.0
-            driver.isShiftKeyDown  && !(speed > topSpeed && (newVelocity.y.sign.toFloat() < 0.0))-> -1.0
-            else -> 0.0
-        }
-
-        //air resistance
-//        if (vertInput == 0.0) {
-//            newVelocity = Vec3(
-//                newVelocity.x,
-//                newVelocity.y  - (((topSpeed - speed) / topSpeed)*0.001),
-//                newVelocity.z
-//            )
-//        }
-
-        if (state.stamina.get() > 0.0) {
-            newVelocity = Vec3(
-                newVelocity.x,
-                (newVelocity.y + (accel * vertInput)), //.coerceIn(-vertTopSpeed, vertTopSpeed),
-                newVelocity.z)
-        }
-
-        return newVelocity
-    }
-
-    /*
-    *  Normalizes the current speed between minSpeed and maxSpeed.
-    *  The result is clamped between 0.0 and 1.0, where 0.0 represents minSpeed and 1.0 represents maxSpeed.
-    */
-    private fun normalizeVal(currSpeed: Double, minSpeed: Double, maxSpeed: Double): Double {
-        require(maxSpeed > minSpeed) { "maxSpeed must be greater than minSpeed" }
-        return ((currSpeed - minSpeed) / (maxSpeed - minSpeed)).coerceIn(0.0, 1.0)
-    }
-
-    override fun angRollVel(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        deltaTime: Double
-    ): Vec3 {
-        return Vec3.ZERO
-    }
-
-    override fun rotationOnMouseXY(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        mouseY: Double,
-        mouseX: Double,
-        mouseYSmoother: SmoothDouble,
-        mouseXSmoother: SmoothDouble,
-        sensitivity: Double,
-        deltaTime: Double
-    ): Vec3 {
-        //Smooth out mouse input.
-        val smoothingSpeed = 4
-        val xInput = mouseXSmoother.getNewDeltaValue(mouseX * 0.1, deltaTime * smoothingSpeed);
-        val yInput = mouseYSmoother.getNewDeltaValue(mouseY * 0.1, deltaTime * smoothingSpeed);
-
-        //yaw, pitch, roll
-        return Vec3(0.0, yInput, xInput)
-    }
-
-    override fun canJump(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        return false
-    }
-
-    override fun setRideBar(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        //Retrieve stamina from state and use it to set the "stamina bar"
-        return (state.stamina.get() / 1.0f)
-    }
-
-    override fun jumpForce(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        jumpStrength: Int
-    ): Vec3 {
-        return Vec3.ZERO
-    }
-
-    override fun gravity(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        regularGravity: Double
-    ): Double {
-        return 0.0
-    }
-
-    override fun rideFovMultiplier(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        return 1.0f
-    }
-
-    override fun useAngVelSmoothing(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun useRidingAltPose(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): ResourceLocation {
-        return cobblemonResource("no_pose")
-    }
-
-    override fun inertia(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Double {
-        return 1.0
-    }
-
-    override fun shouldRoll(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun turnOffOnGround(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun dismountOnShift(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun shouldRotatePokemonHead(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun shouldRotatePlayerHead(
-        settings: HoverSettings,
-        state: HoverState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return false
-    }
-
-    override fun createDefaultState(settings: HoverSettings) = HoverState()
-}
-
-class HoverSettings : RidingBehaviourSettings {
-    override val key = HoverBehaviour.KEY
-
-    var canJump = "true".asExpression()
-        private set
-
-    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 0.65, 0.3)".asExpression()
-        private set
-
-    // Max accel is a whole 1.0 in 1 second. The conversion in the function below is to convert seconds to ticks
-    var accelerationExpr: Expression =
-        "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 1.5)), (1.0 / (20.0 * 3.0)))".asExpression()
-        private set
-
-    // Between 30 seconds and 10 seconds at the lowest when at full speed.
-    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 30.0, 10.0)".asExpression()
-        private set
-
-    //Between a one block jump and a ten block jump
-    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 10.0, 1.0)".asExpression()
-        private set
-
-    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 140.0, 20.0)".asExpression()
-        private set
-
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
-        buffer.writeExpression(speedExpr)
-        buffer.writeExpression(accelerationExpr)
-        buffer.writeExpression(staminaExpr)
-        buffer.writeExpression(jumpExpr)
-        buffer.writeExpression(handlingExpr)
-    }
-
-    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        speedExpr = buffer.readExpression()
-        accelerationExpr = buffer.readExpression()
-        staminaExpr = buffer.readExpression()
-        jumpExpr = buffer.readExpression()
-        handlingExpr = buffer.readExpression()
-    }
-
-}
-
-class HoverState : RidingBehaviourState() {
-
-    override fun copy() = HoverState().also {
-        it.rideVelocity.set(this.rideVelocity.get(), forced = true)
-        it.stamina.set(this.stamina.get(), forced = true)
-    }
-
-    override fun shouldSync(previous: RidingBehaviourState): Boolean {
-        if (previous !is HoverState) return false
-        return super.shouldSync(previous)
-    }
-}
@@ -11,23 +11,19 @@ package com.cobblemon.mod.common.api.riding.behaviour.types
 import com.bedrockk.molang.Expression
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.OrientationControllable
-import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.*
-import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
-import com.bedrockk.molang.runtime.MoLangMath.lerp
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
-import net.minecraft.world.phys.shapes.Shapes
 import kotlin.math.*

 class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
@@ -37,26 +33,11 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {

    override val key = KEY

-    override fun getRidingStyle(settings: JetAirSettings, state: JetAirState): RidingStyle {
-        return RidingStyle.AIR
-    }
-
    val poseProvider = PoseProvider<JetAirSettings, JetAirState>(PoseType.HOVER)
-        .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVelocity.get().z > 0.1 })
+        .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVel.get().z > 0.1 })

    override fun isActive(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity): Boolean {
-        return Shapes.create(vehicle.boundingBox).blockPositionsAsListRounded().any {
-            //Need to check other fluids
-            if (vehicle.isInWater || vehicle.isUnderWater) {
-                return@any false
-            }
-            //This might not actually work, depending on what the yPos actually is. yPos of the middle of the entity? the feet?
-            if (it.y.toDouble() == (vehicle.position().y)) {
-                val blockState = vehicle.level().getBlockState(it.below())
-                return@any !(!blockState.isAir && blockState.fluidState.isEmpty)
-            }
-            true
-        }
+        return true
    }

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

    override fun speed(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity, driver: Player): Float {
        //retrieve stats
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.topSpeedExpr)
        val staminaStat = vehicle.runtime.resolveDouble(settings.staminaExpr)

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

-        //TODO: Reintroduce stamina drain once stats start to be polished and tweaked
-        state.stamina.set(1.0f)
-//        //Reduce stamina unless stamina is infinite
-//        if (!vehicle.runtime.resolveBoolean(settings.infiniteStamina)) {
-//            //Calculate stamina loss due to speed
-//            //At max speed it will tick down 0.1 a second so the stamina will last ten seconds
-//            //There has got to be a better way to express this equation. It interpolates between 0.5 and 1.0
-//            var staminaRate = (normalizeSpeed(state.rideVelocity.get().length(), minSpeed, topSpeed))
-//
-//            //interpolate between 0.25 and 1.0 so that you always have at least a min of 0.25 stam loss
-//            staminaRate = 0.25 + (0.75 * staminaRate.pow(3))
-//
-//            //Calculate stamina loss in seconds achievable at top speed
-//            val staminaLoss = staminaRate * (1.0 / (20.0 * staminaStat))
-//            state.stamina.set(max(state.stamina.get() - staminaLoss, 0.0).toFloat())
-//        } else {
-//            state.stamina.set(1.0f)
-//        }
+        //Reduce stamina unless stamina is infinite
+        if (!vehicle.runtime.resolveBoolean(settings.infiniteStamina)) {
+            //Calculate stamina loss due to speed
+            //At max speed it will tick down 0.1 a second so the stamina will last ten seconds
+            //There has got to be a better way to express this equation. It interpolates between 0.5 and 1.0
+            var staminaRate = (normalizeSpeed(state.rideVel.get().length(), minSpeed, topSpeed))

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

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

        //Translate ride space velocity to world space velocity.
        if (controller != null) {
-            upForce = -1.0 * sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z
-            forwardForce = cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z
+            upForce = -1.0 * sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVel.get().z
+            forwardForce = cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVel.get().z
        }

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

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

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

@@ -252,24 +231,11 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {

        val pitchRot = handling * state.currMouseYForce.get()

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

-        val mouseRotation = Vec3(0.0, pitchRot, rollRot)
-
-        // Have accumulated input begin decay when no input detected
-        if(abs(mouseX) == 0.0) {
-            // Have decay on roll be much stronger.
-            state.currMouseXForce.set(lerp( state.currMouseXForce.get(), 0.0, 0.02 ))
-        }
-        if(mouseY == 0.0) {
-            state.currMouseYForce.set(lerp(state.currMouseYForce.get(), 0.0, 0.005 ))
-        }
-
-
-
        //yaw, pitch, roll
-        return mouseRotation
+        return Vec3(0.0, pitchRot, rollRot)
    }

    override fun canJump(
@@ -315,11 +281,11 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
        vehicle: PokemonEntity,
        driver: Player
    ): Float {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.topSpeedExpr)
        val minSpeed = vehicle.runtime.resolveDouble(settings.minSpeed)

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

        //TODO: Determine if this should be based on max possible speed instead of top speed.
        //Only ever want the fov change to be a max of 0.2 and for it to have non linear scaling.
@@ -335,12 +301,12 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
        state: JetAirState,
        vehicle: PokemonEntity,
        driver: Player
-    ): ResourceLocation {
-        return cobblemonResource("no_pose")
+    ): Boolean {
+        return false
    }

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

    override fun shouldRoll(settings: JetAirSettings, state: JetAirState, vehicle: PokemonEntity): Boolean {
@@ -367,7 +333,7 @@ class JetAirBehaviour : RidingBehaviour<JetAirSettings, JetAirState> {
        return false
    }

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

 class JetAirSettings : RidingBehaviourSettings {
@@ -379,7 +345,25 @@ class JetAirSettings : RidingBehaviourSettings {
    var minSpeed: Expression = "1.2".asExpression()
        private set

-    var handlingYawExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 50.0, 25.0)".asExpression()
+    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 140.0, 20.0)".asExpression()
+        private set
+
+    var handlingYawExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 25.0, 8.0)".asExpression()
+        private set
+
+    var topSpeedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 2.5, 1.0)".asExpression()
+        private set
+
+    // Max accel is a whole 1.0 in 1 second. The conversion in the function below is to convert seconds to ticks
+    var accelExpr: Expression =
+        "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 1.0)), (1.0 / (20.0 * 5.0)))".asExpression()
+        private set
+
+    // Between 60 seconds and 10 seconds at the lowest when at full speed.
+    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 60.0, 10.0)".asExpression()
+        private set
+
+    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 300.0, 128.0)".asExpression()
        private set

    // Make configurable by json
@@ -389,79 +373,77 @@ class JetAirSettings : RidingBehaviourSettings {
    var infiniteAltitude: Expression = "false".asExpression()
        private set

-    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 300.0, 128.0)".asExpression()
-        private set
-    var handlingExpr: Expression =  "q.get_ride_stats('SKILL', 'AIR', 140.0, 20.0)".asExpression()
-        private set
-    var speedExpr: Expression =  "q.get_ride_stats('SPEED', 'AIR', 1.8, 1.0)".asExpression()
-        private set
-    var accelerationExpr: Expression = "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 1.0)), (1.0 / (20.0 * 5.0)))".asExpression()
-        private set
-    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 60.0, 10.0)".asExpression()
-        private set
-
    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
        buffer.writeExpression(gravity)
        buffer.writeExpression(minSpeed)
+        buffer.writeExpression(handlingExpr)
        buffer.writeExpression(handlingYawExpr)
+        buffer.writeExpression(topSpeedExpr)
+        buffer.writeExpression(accelExpr)
+        buffer.writeExpression(staminaExpr)
+        buffer.writeExpression(jumpExpr)
        buffer.writeExpression(infiniteStamina)
        buffer.writeExpression(infiniteAltitude)
-        buffer.writeExpression(jumpExpr)
-        buffer.writeExpression(handlingExpr)
-        buffer.writeExpression(speedExpr)
-        buffer.writeExpression(accelerationExpr)
-        buffer.writeExpression(staminaExpr)
    }

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

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

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

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

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

+    override fun toString(): String {
+        return "JetAirState(currSpeed=${currSpeed.get()}, stamina=${stamina.get()}, rideVel=${rideVel.get()}, currMouseXForce=${currMouseXForce.get()}, currMouseYForce=${currMouseYForce.get()})"
+    }
+
    override fun copy() = JetAirState().also {
        it.currSpeed.set(currSpeed.get(), forced = true)
        it.stamina.set(stamina.get(), forced = true)
-        it.rideVelocity.set(rideVelocity.get(), forced = true)
-//        it.currMouseXForce.set(currMouseXForce.get(), forced = true)
-//        it.currMouseYForce.set(currMouseYForce.get(), forced = true)
+        it.rideVel.set(rideVel.get(), forced = true)
+        it.currMouseXForce.set(currMouseXForce.get(), forced = true)
+        it.currMouseYForce.set(currMouseYForce.get(), forced = true)
    }

    override fun shouldSync(previous: RidingBehaviourState): Boolean {
        if (previous !is JetAirState) return false
        if (previous.currSpeed != currSpeed) return true
-        return super.shouldSync(previous)
+        if (previous.stamina != stamina) return true
+        if (previous.rideVel != rideVel) return true
+        return false
    }
 }
@@ -0,0 +1,469 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.riding.behaviour.types
+
+import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.api.riding.behaviour.*
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.readExpression
+import com.cobblemon.mod.common.util.writeExpression
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.util.SmoothDouble
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.player.Player
+import net.minecraft.world.phys.Vec2
+import net.minecraft.world.phys.Vec3
+
+class JumpToFlightCompositeBehaviour : RidingBehaviour<JumpToFlightCompositeSettings, JumpToFlightCompositeState> {
+    companion object {
+        val KEY = cobblemonResource("composite/jump_to_flight")
+    }
+
+    override val key = KEY
+
+    val landBehaviour: GenericLandBehaviour = GenericLandBehaviour()
+    val birdBehaviour: BirdAirBehaviour = BirdAirBehaviour()
+
+    override fun tick(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        input: Vec3
+    ) {
+        val flightState = state.flightState
+        val groundState = state.landState
+        if (shouldTransitionToGround(state, vehicle)) {
+            //Pass the speed to the next state
+//            groundState.currSpeed = flightState.currSpeed
+            groundState.rideVel.set(flightState.rideVel.get())
+            groundState.stamina.set(flightState.stamina.get())
+
+            state.activeController.set(GenericLandBehaviour.KEY)
+            vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, false)
+            state.timeTransitioned.set(vehicle.level().gameTime)
+        } else if (shouldTransitionToAir(state, vehicle, driver)) {
+            //Pass the speed to the next state
+//            flightState.currSpeed = groundState.currSpeed
+            flightState.rideVel.set(groundState.rideVel.get())
+            flightState.stamina.set(groundState.stamina.get())
+
+            state.activeController.set(BirdAirBehaviour.KEY)
+            vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, true)
+            state.timeTransitioned.set(vehicle.level().gameTime)
+        }
+    }
+
+    override fun isActive(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return true
+    }
+
+    private fun shouldTransitionToGround(state: JumpToFlightCompositeState, entity: PokemonEntity): Boolean {
+        return state.activeController.get() == BirdAirBehaviour.KEY
+                && entity.onGround()
+                && state.timeTransitioned.get() + 20 < entity.level().gameTime
+    }
+
+    private fun shouldTransitionToAir(
+        state: JumpToFlightCompositeState,
+        entity: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        return state.activeController.get() == GenericLandBehaviour.KEY
+                && driver.jumping
+                && state.timeTransitioned.get() + 20 < entity.level().gameTime
+    }
+
+    override fun pose(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): PoseType {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.pose(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.pose(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun speed(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.speed(settings.land, state.landState, vehicle, driver)
+            BirdAirBehaviour.KEY -> birdBehaviour.speed(settings.bird, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rotation(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: LivingEntity
+    ): Vec2 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rotation(settings.land, state.landState, vehicle, driver)
+            BirdAirBehaviour.KEY -> birdBehaviour.rotation(settings.bird, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun velocity(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        input: Vec3
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.velocity(settings.land, state.landState, vehicle, driver, input)
+            BirdAirBehaviour.KEY -> birdBehaviour.velocity(settings.bird, state.flightState, vehicle, driver, input)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun angRollVel(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        deltaTime: Double
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.angRollVel(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                deltaTime
+            )
+
+            BirdAirBehaviour.KEY -> birdBehaviour.angRollVel(
+                settings.bird,
+                state.flightState,
+                vehicle,
+                driver,
+                deltaTime
+            )
+
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rotationOnMouseXY(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        mouseY: Double,
+        mouseX: Double,
+        mouseYSmoother: SmoothDouble,
+        mouseXSmoother: SmoothDouble,
+        sensitivity: Double,
+        deltaTime: Double
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rotationOnMouseXY(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                mouseY,
+                mouseX,
+                mouseYSmoother,
+                mouseXSmoother,
+                sensitivity,
+                deltaTime
+            )
+
+            BirdAirBehaviour.KEY -> birdBehaviour.rotationOnMouseXY(
+                settings.bird,
+                state.flightState,
+                vehicle,
+                driver,
+                mouseY,
+                mouseX,
+                mouseYSmoother,
+                mouseXSmoother,
+                sensitivity,
+                deltaTime
+            )
+
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun canJump(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.canJump(settings.land, state.landState, vehicle, driver)
+            BirdAirBehaviour.KEY -> birdBehaviour.canJump(settings.bird, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun setRideBar(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.setRideBar(settings.land, state.landState, vehicle, driver)
+            BirdAirBehaviour.KEY -> birdBehaviour.setRideBar(settings.bird, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun jumpForce(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        jumpStrength: Int
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.jumpForce(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                jumpStrength
+            )
+
+            BirdAirBehaviour.KEY -> birdBehaviour.jumpForce(
+                settings.bird,
+                state.flightState,
+                vehicle,
+                driver,
+                jumpStrength
+            )
+
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun gravity(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        regularGravity: Double
+    ): Double {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.gravity(settings.land, state.landState, vehicle, regularGravity)
+            BirdAirBehaviour.KEY -> birdBehaviour.gravity(settings.bird, state.flightState, vehicle, regularGravity)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rideFovMultiplier(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rideFovMultiplier(settings.land, state.landState, vehicle, driver)
+            BirdAirBehaviour.KEY -> birdBehaviour.rideFovMultiplier(settings.bird, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun useAngVelSmoothing(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.useAngVelSmoothing(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.useAngVelSmoothing(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun useRidingAltPose(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.useRidingAltPose(settings.land, state.landState, vehicle, driver)
+            BirdAirBehaviour.KEY -> birdBehaviour.useRidingAltPose(settings.bird, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun inertia(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Double {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.inertia(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.inertia(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRoll(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRoll(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.shouldRoll(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun turnOffOnGround(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.turnOffOnGround(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.turnOffOnGround(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun dismountOnShift(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.dismountOnShift(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.dismountOnShift(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRotatePokemonHead(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRotatePokemonHead(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.shouldRotatePokemonHead(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRotatePlayerHead(
+        settings: JumpToFlightCompositeSettings,
+        state: JumpToFlightCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRotatePlayerHead(settings.land, state.landState, vehicle)
+            BirdAirBehaviour.KEY -> birdBehaviour.shouldRotatePlayerHead(settings.bird, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun createDefaultState() = JumpToFlightCompositeState()
+}
+
+class JumpToFlightCompositeSettings : RidingBehaviourSettings {
+    override val key = JumpToFlightCompositeBehaviour.KEY
+
+    var bird: BirdAirSettings = BirdAirSettings()
+        private set
+
+    var land: GenericLandSettings = GenericLandSettings()
+        private set
+
+    var minimumSpeed: Expression = "0.5".asExpression()
+        private set
+
+    var minimumJump: Expression = "0.5".asExpression()
+        private set
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        bird.encode(buffer)
+        land.encode(buffer)
+        buffer.writeExpression(minimumSpeed)
+        buffer.writeExpression(minimumJump)
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        bird.decode(buffer)
+        land.decode(buffer)
+        minimumSpeed = buffer.readExpression()
+        minimumJump = buffer.readExpression()
+    }
+}
+
+class JumpToFlightCompositeState : RidingBehaviourState {
+    var activeController = ridingState(GenericLandBehaviour.KEY, Side.CLIENT)
+    var currSpeed = ridingState(0.0, Side.BOTH)
+    var timeTransitioned = ridingState(-100L, Side.BOTH)
+    var landState = GenericLandState()
+    var flightState = BirdAirState()
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(activeController.get())
+        landState.encode(buffer)
+        flightState.encode(buffer)
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        activeController.set(buffer.readResourceLocation(), forced = true)
+        landState.decode(buffer)
+        flightState.decode(buffer)
+    }
+
+    override fun reset() {
+        activeController.set(GenericLandBehaviour.KEY, forced = true)
+        timeTransitioned.set(-100L, forced = true)
+        currSpeed.set(0.0, forced = true)
+    }
+
+    override fun toString(): String {
+        return "JumpToFlightCompositeState(activeController=${activeController.get()}, landState=$landState, flightState=$flightState, currSpeed=${currSpeed.get()}, timeTransitioned=${timeTransitioned.get()})"
+    }
+
+    override fun copy() = JumpToFlightCompositeState().also {
+        it.activeController.set(activeController.get(), forced = true)
+        it.landState = landState.copy()
+        it.flightState = flightState.copy()
+        it.currSpeed.set(currSpeed.get(), forced = true)
+        it.timeTransitioned.set(timeTransitioned.get(), forced = true)
+    }
+
+    override fun shouldSync(previous: RidingBehaviourState): Boolean {
+        if (previous !is JumpToFlightCompositeState) return false
+        if (activeController != previous.activeController) return true
+        if (landState.shouldSync(previous.landState)) return true
+        if (flightState.shouldSync(previous.flightState)) return true
+        return false
+    }
+}
@@ -0,0 +1,450 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.riding.behaviour.types
+
+import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.api.riding.behaviour.*
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.readExpression
+import com.cobblemon.mod.common.util.writeExpression
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.util.SmoothDouble
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.player.Player
+import net.minecraft.world.phys.Vec2
+import net.minecraft.world.phys.Vec3
+
+class RunToJetCompositeBehaviour : RidingBehaviour<RunToJetCompositeSettings, RunToJetCompositeState> {
+    companion object {
+        val KEY = cobblemonResource("composite/run_to_jet")
+    }
+
+    override val key = KEY
+
+    val landBehaviour: GenericLandBehaviour = GenericLandBehaviour()
+    val jetBehaviour: JetAirBehaviour = JetAirBehaviour()
+
+    override fun tick(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        input: Vec3
+    ) {
+        val flightState = state.flightState
+        val groundState = state.landState
+        if (shouldTransitionToGround(state, vehicle, driver)) {
+            groundState.currSpeed = flightState.currSpeed
+            groundState.stamina = flightState.stamina
+            groundState.rideVel = flightState.rideVel
+
+            state.activeController.set(GenericLandBehaviour.KEY)
+            vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, false)
+            state.timeTransitioned.set(vehicle.level().gameTime)
+        } else if (shouldTransitionToAir(state, vehicle, driver, input)) {
+            flightState.currSpeed = groundState.currSpeed
+            flightState.stamina = groundState.stamina
+            flightState.rideVel = groundState.rideVel
+
+            state.activeController.set(JetAirBehaviour.KEY)
+            vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, true)
+            state.timeTransitioned.set(vehicle.level().gameTime)
+        }
+    }
+
+    private fun shouldTransitionToGround(
+        state: RunToJetCompositeState,
+        entity: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        if (state.activeController.get() != JetAirBehaviour.KEY) return false
+        if (state.timeTransitioned.get() + 20 >= entity.level().gameTime) return false
+        return driver.isSprinting || entity.onGround()
+    }
+
+    private fun shouldTransitionToAir(
+        state: RunToJetCompositeState,
+        entity: PokemonEntity,
+        driver: Player,
+        input: Vec3
+    ): Boolean {
+        if (state.activeController.get() != GenericLandBehaviour.KEY) return false
+        if (state.timeTransitioned.get() + 20 >= entity.level().gameTime) return false
+        return driver.isSprinting && input.z > 0.5
+    }
+
+    override fun isActive(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return true
+    }
+
+    override fun pose(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): PoseType {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.pose(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.pose(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun speed(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.speed(settings.land, state.landState, vehicle, driver)
+            JetAirBehaviour.KEY -> jetBehaviour.speed(settings.jet, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rotation(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: LivingEntity
+    ): Vec2 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rotation(settings.land, state.landState, vehicle, driver)
+            JetAirBehaviour.KEY -> jetBehaviour.rotation(settings.jet, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun velocity(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        input: Vec3
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.velocity(settings.land, state.landState, vehicle, driver, input)
+            JetAirBehaviour.KEY -> jetBehaviour.velocity(settings.jet, state.flightState, vehicle, driver, input)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun angRollVel(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        deltaTime: Double
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.angRollVel(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                deltaTime
+            )
+
+            JetAirBehaviour.KEY -> jetBehaviour.angRollVel(settings.jet, state.flightState, vehicle, driver, deltaTime)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rotationOnMouseXY(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        mouseY: Double,
+        mouseX: Double,
+        mouseYSmoother: SmoothDouble,
+        mouseXSmoother: SmoothDouble,
+        sensitivity: Double,
+        deltaTime: Double
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rotationOnMouseXY(
+                settings.land,
+                state.landState,
+                vehicle,
+                driver,
+                mouseY,
+                mouseX,
+                mouseYSmoother,
+                mouseXSmoother,
+                sensitivity,
+                deltaTime
+            )
+            JetAirBehaviour.KEY -> jetBehaviour.rotationOnMouseXY(
+                settings.jet,
+                state.flightState,
+                vehicle,
+                driver,
+                mouseY,
+                mouseX,
+                mouseYSmoother,
+                mouseXSmoother,
+                sensitivity,
+                deltaTime
+            )
+
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun canJump(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.canJump(settings.land, state.landState, vehicle, driver)
+            JetAirBehaviour.KEY -> jetBehaviour.canJump(settings.jet, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun setRideBar(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.setRideBar(settings.land, state.landState, vehicle, driver)
+            JetAirBehaviour.KEY -> jetBehaviour.setRideBar(settings.jet, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun jumpForce(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player,
+        jumpStrength: Int
+    ): Vec3 {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.jumpForce(settings.land, state.landState, vehicle, driver, jumpStrength)
+            JetAirBehaviour.KEY -> jetBehaviour.jumpForce(settings.jet, state.flightState, vehicle, driver, jumpStrength)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun gravity(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        regularGravity: Double
+    ): Double {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.gravity(settings.land, state.landState, vehicle, regularGravity)
+            JetAirBehaviour.KEY -> jetBehaviour.gravity(settings.jet, state.flightState, vehicle, regularGravity)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun rideFovMultiplier(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Float {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.rideFovMultiplier(settings.land, state.landState, vehicle, driver)
+            JetAirBehaviour.KEY -> jetBehaviour.rideFovMultiplier(settings.jet, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun useAngVelSmoothing(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.useAngVelSmoothing(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.useAngVelSmoothing(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun useRidingAltPose(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity,
+        driver: Player
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.useRidingAltPose(settings.land, state.landState, vehicle, driver)
+            JetAirBehaviour.KEY -> jetBehaviour.useRidingAltPose(settings.jet, state.flightState, vehicle, driver)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun inertia(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Double {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.inertia(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.inertia(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRoll(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRoll(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.shouldRoll(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun turnOffOnGround(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.turnOffOnGround(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.turnOffOnGround(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun dismountOnShift(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.dismountOnShift(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.dismountOnShift(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRotatePokemonHead(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRotatePokemonHead(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.shouldRotatePokemonHead(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun shouldRotatePlayerHead(
+        settings: RunToJetCompositeSettings,
+        state: RunToJetCompositeState,
+        vehicle: PokemonEntity
+    ): Boolean {
+        return when (state.activeController.get()) {
+            GenericLandBehaviour.KEY -> landBehaviour.shouldRotatePlayerHead(settings.land, state.landState, vehicle)
+            JetAirBehaviour.KEY -> jetBehaviour.shouldRotatePlayerHead(settings.jet, state.flightState, vehicle)
+            else -> error("Invalid controller: ${state.activeController.get()}")
+        }
+    }
+
+    override fun createDefaultState() = RunToJetCompositeState()
+}
+
+class RunToJetCompositeSettings : RidingBehaviourSettings {
+    override val key = RunToJetCompositeBehaviour.KEY
+
+    var jet: JetAirSettings = JetAirSettings()
+        private set
+
+    var land: GenericLandSettings = GenericLandSettings()
+        private set
+
+    var minimumSpeed: Expression = "0.5".asExpression()
+        private set
+
+    var minimumJump: Expression = "0.5".asExpression()
+        private set
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        jet.encode(buffer)
+        land.encode(buffer)
+        buffer.writeExpression(minimumSpeed)
+        buffer.writeExpression(minimumJump)
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        jet.decode(buffer)
+        land.decode(buffer)
+        minimumSpeed = buffer.readExpression()
+        minimumJump = buffer.readExpression()
+    }
+}
+
+class RunToJetCompositeState : RidingBehaviourState {
+    var activeController = ridingState(GenericLandBehaviour.KEY, Side.CLIENT)
+    var landState: GenericLandState = GenericLandState()
+    var flightState: JetAirState = JetAirState()
+    var currSpeed = ridingState(0.0, Side.BOTH)
+    var timeTransitioned = ridingState(-100L, Side.BOTH)
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(activeController.get())
+        landState.encode(buffer)
+        flightState.encode(buffer)
+    }
+
+    override fun decode(buffer: RegistryFriendlyByteBuf) {
+        activeController.set(buffer.readResourceLocation(), forced = true)
+        landState.decode(buffer)
+        flightState.decode(buffer)
+    }
+
+    override fun reset() {
+        activeController.set(GenericLandBehaviour.KEY, forced = true)
+        timeTransitioned.set(-100L, forced = true)
+        currSpeed.set(0.0, forced = true)
+    }
+
+    override fun toString(): String {
+        return "RunToJetCompositeState(activeController=${activeController.get()}, landState=$landState, flightState=$flightState, currSpeed=${currSpeed.get()}, timeTransitioned=${timeTransitioned.get()})"
+    }
+
+    override fun copy() = RunToJetCompositeState().also {
+        it.activeController.set(activeController.get(), forced = true)
+        it.landState = landState.copy()
+        it.flightState = flightState.copy()
+        it.currSpeed.set(currSpeed.get(), forced = true)
+        it.timeTransitioned.set(timeTransitioned.get(), forced = true)
+    }
+
+    override fun shouldSync(previous: RidingBehaviourState): Boolean {
+        if (previous !is RunToJetCompositeState) return false
+        if (activeController != previous.activeController) return true
+        if (landState.shouldSync(previous.landState)) return true
+        if (flightState.shouldSync(previous.flightState)) return true
+        return false
+    }
+}
@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.riding.behaviour.types

 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.OrientationControllable
-import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
@@ -35,10 +34,6 @@ class SwimDashBehaviour : RidingBehaviour<SwimDashSettings, SwimDashState> {

    override val key = KEY

-    override fun getRidingStyle(settings: SwimDashSettings, state: SwimDashState): RidingStyle {
-        return RidingStyle.LIQUID
-    }
-
    val poseProvider = PoseProvider<SwimDashSettings, SwimDashState>(PoseType.FLOAT)
        .with(PoseOption(PoseType.SWIM) { _, _, entity -> entity.isSwimming && entity.entityData.get(PokemonEntity.MOVING) })

@@ -186,8 +181,8 @@ class SwimDashBehaviour : RidingBehaviour<SwimDashSettings, SwimDashState> {
        state: SwimDashState,
        vehicle: PokemonEntity,
        driver: Player
-    ): ResourceLocation {
-        return cobblemonResource("no_pose")
+    ): Boolean {
+        return false
    }

    override fun inertia(settings: SwimDashSettings, state: SwimDashState, vehicle: PokemonEntity): Double {
@@ -222,7 +217,7 @@ class SwimDashBehaviour : RidingBehaviour<SwimDashSettings, SwimDashState> {
        return false
    }

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

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

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

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

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

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

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

    override val key = KEY

-    override fun getRidingStyle(settings: VehicleLandSettings, state: VehicleLandState): RidingStyle {
-        return RidingStyle.LAND
-    }
-
    val poseProvider = PoseProvider<VehicleLandSettings, VehicleLandState>(PoseType.STAND)
        .with(PoseOption(PoseType.WALK) { _, _, entity -> entity.entityData.get(PokemonEntity.MOVING) })

@@ -225,8 +221,8 @@ class VehicleLandBehaviour : RidingBehaviour<VehicleLandSettings, VehicleLandSta
        state: VehicleLandState,
        vehicle: PokemonEntity,
        driver: Player
-    ): ResourceLocation {
-        return cobblemonResource("no_pose")
+    ): Boolean {
+        return false
    }

    override fun inertia(settings: VehicleLandSettings, state: VehicleLandState, vehicle: PokemonEntity): Double {
@@ -269,7 +265,7 @@ class VehicleLandBehaviour : RidingBehaviour<VehicleLandSettings, VehicleLandSta
        return false
    }

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

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

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

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

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

    override fun copy() = VehicleLandState().also {
-        it.rideVelocity.set(rideVelocity.get(), forced = true)
-        it.stamina.set(stamina.get(), forced = true)
        it.currSpeed.set(currSpeed.get(), forced = true)
        it.deltaRotation.set(deltaRotation.get(), forced = true)
    }
+
+    override fun shouldSync(previous: RidingBehaviourState) = false
 }
@@ -1,432 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding.behaviour.types.composite
-
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.*
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies.CompositeRidingStrategies
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.adapters.RidingBehaviourSettingsAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.network.FriendlyByteBuf
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.util.SmoothDouble
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.phys.Vec2
-import net.minecraft.world.phys.Vec3
-
-class CompositeBehaviour : RidingBehaviour<CompositeSettings, CompositeState> {
-    companion object {
-        val KEY = cobblemonResource("composite")
-    }
-
-    override val key = KEY
-
-    override fun getRidingStyle(settings: CompositeSettings, state: CompositeState): RidingStyle {
-        return chooseBehaviour(settings, state) {
-            behaviour, behaviourSettings, behaviourState ->
-            behaviour.getRidingStyle(behaviourSettings, behaviourState)
-        }
-    }
-    
-    override fun createDefaultState(settings: CompositeSettings): CompositeState {
-        val defaultBehaviour = RidingBehaviours.get(settings.defaultBehaviour.key)
-        val defaultState = defaultBehaviour.createDefaultState(settings.defaultBehaviour)
-        val alternateBehaviour = RidingBehaviours.get(settings.alternateBehaviour.key)
-        val alternativeState = alternateBehaviour.createDefaultState(settings.alternateBehaviour)
-        return CompositeState(
-            defaultBehaviour = settings.defaultBehaviour.key,
-            defaultBehaviourState = defaultState,
-            alternateBehaviourState = alternativeState
-        )
-    }
-
-    fun <T> chooseBehaviour(
-        settings: CompositeSettings,
-        state: CompositeState,
-        action: (behaviour: RidingBehaviour<RidingBehaviourSettings, RidingBehaviourState>, settings: RidingBehaviourSettings, state: RidingBehaviourState) -> T
-    ): T {
-        val defaultBehaviour = RidingBehaviours.get(settings.defaultBehaviour.key)
-        val alternativeBehaviour = RidingBehaviours.get(settings.alternateBehaviour.key)
-        return when (state.activeBehaviour.get()) {
-            settings.defaultBehaviour.key -> action(
-                defaultBehaviour,
-                settings.defaultBehaviour,
-                state.defaultBehaviourState
-            )
-            settings.alternateBehaviour.key -> action(
-                alternativeBehaviour,
-                settings.alternateBehaviour,
-                state.alternateBehaviourState
-            )
-
-            else -> error("Invalid controller: ${state.activeBehaviour.get()}")
-        }
-    }
-
-    override fun tick(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ) {
-        val strategy = CompositeRidingStrategies.get(settings.transitionStrategy)
-        strategy.tick(settings, state, state.defaultBehaviourState, state.alternateBehaviourState, vehicle, driver, input)
-    }
-
-    override fun clampPassengerRotation(
-        settings: CompositeSettings,
-        state: CompositeState,
-        entity: PokemonEntity,
-        driver: LivingEntity
-    ) {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.clampPassengerRotation(behaviourSettings, behaviourState, entity, driver)
-        }
-    }
-
-    override fun updatePassengerRotation(
-        settings: CompositeSettings,
-        state: CompositeState,
-        entity: PokemonEntity,
-        driver: LivingEntity
-    ) {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.updatePassengerRotation(behaviourSettings, behaviourState, entity, driver)
-        }
-    }
-
-    override fun shouldRotatePlayerHead(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.shouldRotatePlayerHead(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun shouldRotatePokemonHead(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.shouldRotatePokemonHead(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun dismountOnShift(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.dismountOnShift(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun turnOffOnGround(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.turnOffOnGround(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun shouldRoll(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.shouldRoll(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun inertia(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Double {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.inertia(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun useRidingAltPose(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): ResourceLocation {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.useRidingAltPose(behaviourSettings, behaviourState, vehicle, driver)
-        }
-    }
-
-    override fun useAngVelSmoothing(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.useAngVelSmoothing(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun rideFovMultiplier(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.rideFovMultiplier(behaviourSettings, behaviourState, vehicle, driver)
-        }
-    }
-
-    override fun gravity(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        regularGravity: Double
-    ): Double {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.gravity(behaviourSettings, behaviourState, vehicle, regularGravity)
-        }
-    }
-
-    override fun jumpForce(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        jumpStrength: Int
-    ): Vec3 {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.jumpForce(behaviourSettings, behaviourState, vehicle, driver, jumpStrength)
-        }
-    }
-
-    override fun setRideBar(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.setRideBar(behaviourSettings, behaviourState, vehicle, driver)
-        }
-    }
-
-    override fun canJump(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.canJump(behaviourSettings, behaviourState, vehicle, driver)
-        }
-    }
-
-    override fun rotationOnMouseXY(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        mouseY: Double,
-        mouseX: Double,
-        mouseYSmoother: SmoothDouble,
-        mouseXSmoother: SmoothDouble,
-        sensitivity: Double,
-        deltaTime: Double
-    ): Vec3 {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.rotationOnMouseXY(
-                behaviourSettings,
-                behaviourState,
-                vehicle,
-                driver,
-                mouseY,
-                mouseX,
-                mouseYSmoother,
-                mouseXSmoother,
-                sensitivity,
-                deltaTime
-            )
-        }
-    }
-
-    override fun angRollVel(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        deltaTime: Double
-    ): Vec3 {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.angRollVel(behaviourSettings, behaviourState, vehicle, driver, deltaTime)
-        }
-    }
-
-    override fun velocity(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ): Vec3 {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.velocity(behaviourSettings, behaviourState, vehicle, driver, input)
-        }
-    }
-
-    override fun rotation(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: LivingEntity
-    ): Vec2 {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.rotation(behaviourSettings, behaviourState, vehicle, driver)
-        }
-    }
-
-    override fun speed(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Float {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.speed(behaviourSettings, behaviourState, vehicle, driver)
-        }
-    }
-
-    override fun pose(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): PoseType {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.pose(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-
-    override fun isActive(
-        settings: CompositeSettings,
-        state: CompositeState,
-        vehicle: PokemonEntity
-    ): Boolean {
-        return chooseBehaviour(settings, state) { behaviour, behaviourSettings, behaviourState ->
-            behaviour.isActive(behaviourSettings, behaviourState, vehicle)
-        }
-    }
-}
-
-open class CompositeSettings : RidingBehaviourSettings {
-    lateinit var transitionStrategy: ResourceLocation
-        private set
-    lateinit var defaultBehaviour: RidingBehaviourSettings
-        private set
-    lateinit var alternateBehaviour: RidingBehaviourSettings
-        private set
-
-    override val key: ResourceLocation = CompositeBehaviour.KEY
-
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(key)
-        buffer.writeResourceLocation(transitionStrategy)
-        defaultBehaviour.encode(buffer)
-        alternateBehaviour.encode(buffer)
-    }
-
-    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        transitionStrategy = buffer.readResourceLocation()
-        val defaultBehaviourKey = buffer.readResourceLocation()
-        defaultBehaviour = RidingBehaviourSettingsAdapter.types[defaultBehaviourKey]?.getConstructor()?.newInstance()
-            ?: error("Unknown controller key: $key")
-        defaultBehaviour.decode(buffer)
-        val alternativeBehaviourKey = buffer.readResourceLocation()
-        alternateBehaviour =
-            RidingBehaviourSettingsAdapter.types[alternativeBehaviourKey]?.getConstructor()?.newInstance()
-                ?: error("Unknown controller key: $key")
-        alternateBehaviour.decode(buffer)
-    }
-}
-
-class CompositeState(
-    val defaultBehaviour: ResourceLocation,
-    val defaultBehaviourState: RidingBehaviourState,
-    val alternateBehaviourState: RidingBehaviourState
-) : RidingBehaviourState() {
-    var activeBehaviour = ridingState(defaultBehaviour, Side.CLIENT)
-    var lastTransition = ridingState(-100L, Side.BOTH)
-
-    override val rideVelocity: SidedRidingState<Vec3>
-        get() = when (activeBehaviour.get()) {
-            defaultBehaviour -> defaultBehaviourState.rideVelocity
-            else -> alternateBehaviourState.rideVelocity
-        }
-
-    override val stamina: SidedRidingState<Float>
-        get() = when (activeBehaviour.get()) {
-            defaultBehaviour -> defaultBehaviourState.stamina
-            else -> alternateBehaviourState.stamina
-        }
-
-    override fun reset() {
-        super.reset()
-        activeBehaviour.set(defaultBehaviour, forced = true)
-        lastTransition.set(-100L, forced = true)
-        defaultBehaviourState.reset()
-        alternateBehaviourState.reset()
-    }
-
-    override fun copy(): CompositeState {
-        val state =
-            CompositeState(defaultBehaviour, defaultBehaviourState.copy(), alternateBehaviourState.copy())
-        state.activeBehaviour.set(activeBehaviour.get(), forced = true)
-        state.lastTransition.set(lastTransition.get(), forced = true)
-        state.rideVelocity.set(rideVelocity.get(), forced = true)
-        state.stamina.set(stamina.get(), forced = true)
-        return state
-    }
-
-    override fun shouldSync(previous: RidingBehaviourState): Boolean {
-        if (previous !is CompositeState) return false
-        if (previous.activeBehaviour.get() != activeBehaviour.get()) return true
-        if (defaultBehaviourState.shouldSync(previous.defaultBehaviourState)) return true
-        if (alternateBehaviourState.shouldSync(previous.alternateBehaviourState)) return true
-        return super.shouldSync(previous)
-    }
-
-    override fun encode(buffer: FriendlyByteBuf) {
-        super.encode(buffer)
-        buffer.writeResourceLocation(activeBehaviour.get())
-        defaultBehaviourState.encode(buffer)
-        alternateBehaviourState.encode(buffer)
-    }
-
-    override fun decode(buffer: FriendlyByteBuf) {
-        super.decode(buffer)
-        activeBehaviour.set(buffer.readResourceLocation(), forced = true)
-        defaultBehaviourState.decode(buffer)
-        alternateBehaviourState.decode(buffer)
-    }
-
-}
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies
-
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeSettings
-import net.minecraft.resources.ResourceLocation
-
-object CompositeRidingStrategies {
-    val strategies = mutableMapOf<ResourceLocation, CompositeRidingStrategy<out CompositeSettings>>()
-
-    init {
-        register(RunStrategy.key, RunStrategy)
-        register(JumpStrategy.key, JumpStrategy)
-        register(FallStrategy.key, FallStrategy)
-    }
-
-    fun register(key: ResourceLocation, strategy: CompositeRidingStrategy<out CompositeSettings>) {
-        if (strategies.contains(key)) error("Strategy already registered to key $key")
-        strategies[key] = strategy
-    }
-
-    fun get(key: ResourceLocation): CompositeRidingStrategy<CompositeSettings> {
-        if (!strategies.contains(key)) error("Strategy not registered to key $key")
-        return strategies[key]!! as CompositeRidingStrategy<CompositeSettings>
-    }
-}
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies
-
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviours
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeState
-import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.phys.Vec3
-
-interface CompositeRidingStrategy<T : CompositeSettings> {
-    val key: ResourceLocation
-
-    fun tick(
-        settings: T,
-        state: CompositeState,
-        defaultState: RidingBehaviourState,
-        alternateState: RidingBehaviourState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    )
-
-    fun transition(
-        vehicle: PokemonEntity,
-        settings: CompositeSettings,
-        state: CompositeState,
-        fromState: RidingBehaviourState,
-        toState: RidingBehaviourState,
-        toSettings: RidingBehaviourSettings
-    ) {
-        toState.stamina.set(fromState.stamina.get())
-        toState.rideVelocity.set(fromState.rideVelocity.get())
-        fromState.reset()
-        state.activeBehaviour.set(toSettings.key)
-        state.lastTransition.set(vehicle.level().gameTime)
-        val behaviour = RidingBehaviours.get(toSettings.key)
-        vehicle.setBehaviourFlag(PokemonBehaviourFlag.FLYING, behaviour.getRidingStyle(toSettings, toState) == RidingStyle.AIR)
-    }
-
-}
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies
-
-import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviours
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeState
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.*
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.phys.Vec3
-
-object FallStrategy : CompositeRidingStrategy<FallCompositeSettings> {
-
-    override val key = cobblemonResource("strategy/fall")
-
-    override fun tick(
-        settings: FallCompositeSettings,
-        state: CompositeState,
-        defaultState: RidingBehaviourState,
-        alternateState: RidingBehaviourState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ) {
-        if (shouldTransitionToDefault(state, settings.defaultBehaviour, vehicle)) {
-            transition(vehicle, settings, state, alternateState, defaultState, settings.defaultBehaviour)
-        } else if (shouldTransitionToAlternate(settings, state, settings.alternateBehaviour, vehicle, driver)) {
-            transition(vehicle, settings, state, defaultState, alternateState, settings.alternateBehaviour)
-        }
-    }
-
-    private fun shouldTransitionToDefault(
-        state: CompositeState,
-        defaultSettings: RidingBehaviourSettings,
-        vehicle: PokemonEntity
-    ): Boolean {
-        if (state.activeBehaviour.get() == defaultSettings.key) return false
-        if (state.lastTransition.get() + 20 >= vehicle.level().gameTime) return false
-        if (!vehicle.onGround()) return false
-        val defaultBehaviour = RidingBehaviours.get(defaultSettings.key)
-        return defaultBehaviour.isActive(defaultSettings, state.defaultBehaviourState, vehicle)
-    }
-
-    private fun shouldTransitionToAlternate(
-        settings: FallCompositeSettings,
-        state: CompositeState,
-        alternateSettings: RidingBehaviourSettings,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        if (state.activeBehaviour.get() == alternateSettings.key) return false
-        if (!driver.jumping) return false
-        if (state.lastTransition.get() + 20 >= vehicle.level().gameTime) return false
-
-        val runtime = vehicle.runtime
-        val minFallingSpeed = runtime.resolveFloat(settings.minimumFallSpeed)
-        val minForwardSpeed = runtime.resolveFloat(settings.minimumForwardSpeed)
-        if (vehicle.deltaMovement.y < -minFallingSpeed) return false
-        if (vehicle.deltaMovement.horizontalDistance() < minForwardSpeed) return false
-        val alternativeBehaviour = RidingBehaviours.get(alternateSettings.key)
-        return alternativeBehaviour.isActive(alternateSettings, state.alternateBehaviourState, vehicle)
-    }
-
-}
-
-class FallCompositeSettings : CompositeSettings() {
-    override val key = FallStrategy.key
-
-    var minimumForwardSpeed: Expression = "0.0".asExpression()
-        private set
-
-    var minimumFallSpeed: Expression = "0.5".asExpression()
-        private set
-
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        super.encode(buffer)
-        buffer.writeExpression(minimumForwardSpeed)
-        buffer.writeExpression(minimumFallSpeed)
-    }
-
-    override fun decode(buffer: RegistryFriendlyByteBuf) {
-        super.decode(buffer)
-        minimumForwardSpeed = buffer.readExpression()
-        minimumFallSpeed = buffer.readExpression()
-    }
-}
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies
-
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviours
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeState
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.phys.Vec3
-
-object JumpStrategy : CompositeRidingStrategy<CompositeSettings> {
-
-    override val key = cobblemonResource("strategy/jump")
-
-    override fun tick(
-        settings: CompositeSettings,
-        state: CompositeState,
-        defaultState: RidingBehaviourState,
-        alternateState: RidingBehaviourState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ) {
-        if (shouldTransitionToDefault(state, settings.defaultBehaviour, vehicle)) {
-            transition(vehicle, settings, state, alternateState, defaultState, settings.defaultBehaviour)
-        } else if (shouldTransitionToAlternative(state, settings.alternateBehaviour, vehicle, driver)) {
-            transition(vehicle, settings, state, defaultState, alternateState, settings.alternateBehaviour)
-        }
-    }
-
-    private fun shouldTransitionToDefault(
-        state: CompositeState,
-        defaultSettings: RidingBehaviourSettings,
-        vehicle: PokemonEntity
-    ): Boolean {
-        if (state.activeBehaviour.get() == defaultSettings.key) return false
-        if (!vehicle.onGround()) return false
-        if (state.lastTransition.get() + 20 >= vehicle.level().gameTime) return false
-        val defaultBehaviour = RidingBehaviours.get(defaultSettings.key)
-        return defaultBehaviour.isActive(defaultSettings, state.defaultBehaviourState, vehicle)
-    }
-
-    private fun shouldTransitionToAlternative(
-        state: CompositeState,
-        alternativeSettings: RidingBehaviourSettings,
-        vehicle: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        if (state.activeBehaviour.get() == alternativeSettings.key) return false
-        if (!driver.jumping) return false
-        if (state.lastTransition.get() + 20 >= vehicle.level().gameTime) return false
-        val alternativeBehaviour = RidingBehaviours.get(alternativeSettings.key)
-        return alternativeBehaviour.isActive(alternativeSettings, state.alternateBehaviourState, vehicle)
-    }
-
-}
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding.behaviour.types.composite.strategies
-
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviours
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeState
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.phys.Vec3
-
-object RunStrategy : CompositeRidingStrategy<CompositeSettings> {
-
-    override val key = cobblemonResource("strategy/run")
-
-    override fun tick(
-        settings: CompositeSettings,
-        state: CompositeState,
-        defaultState: RidingBehaviourState,
-        alternateState: RidingBehaviourState,
-        vehicle: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ) {
-        if (shouldTransitionToDefault(state, settings.defaultBehaviour, vehicle, driver)) {
-            transition(vehicle, settings, state, alternateState, defaultState, settings.defaultBehaviour)
-        }
-        else if (shouldTransitionToAlternate(state, settings.alternateBehaviour, vehicle, driver, input)) {
-            transition(vehicle, settings, state, defaultState, alternateState, settings.alternateBehaviour)
-        }
-    }
-
-    private fun shouldTransitionToDefault(
-        state: CompositeState,
-        defaultSettings: RidingBehaviourSettings,
-        entity: PokemonEntity,
-        driver: Player
-    ): Boolean {
-        if (state.activeBehaviour.get() == defaultSettings.key) return false
-        if (!entity.onGround()) return false
-        if (state.lastTransition.get() + 20 >= entity.level().gameTime) return false
-        val defaultBehaviour = RidingBehaviours.get(defaultSettings.key)
-        val ret = defaultBehaviour.isActive(defaultSettings, state.defaultBehaviourState, entity)
-        return ret
-    }
-
-    private fun shouldTransitionToAlternate(
-        state: CompositeState,
-        alternativeSettings: RidingBehaviourSettings,
-        entity: PokemonEntity,
-        driver: Player,
-        input: Vec3
-    ): Boolean {
-        if (state.activeBehaviour.get() == alternativeSettings.key) return false
-        if (state.lastTransition.get() + 20 >= entity.level().gameTime) return false
-        val alternativeBehaviour = RidingBehaviours.get(alternativeSettings.key)
-        return driver.isSprinting && input.z > 0.5 && alternativeBehaviour.isActive(alternativeSettings, state.alternateBehaviourState, entity)
-    }
-
-}
@@ -8,7 +8,7 @@

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

-import com.cobblemon.mod.common.api.cooking.Flavour
+import com.cobblemon.mod.common.api.berry.Flavor
 import com.cobblemon.mod.common.util.lang
 import net.minecraft.network.chat.Component

@@ -19,13 +19,13 @@ import net.minecraft.network.chat.Component
 * @since February 17th, 2025
 */
 enum class RidingStat(
-    val flavour: Flavour
+    val flavour: Flavor
 ) {
-    SPEED(Flavour.SWEET),
-    ACCELERATION(Flavour.SPICY),
-    SKILL(Flavour.DRY),
-    JUMP(Flavour.BITTER),
-    STAMINA(Flavour.SOUR);
+    SPEED(Flavor.SWEET),
+    ACCELERATION(Flavor.SPICY),
+    SKILL(Flavor.DRY),
+    JUMP(Flavor.BITTER),
+    STAMINA(Flavor.SOUR);

    companion object {
        fun getByName(name: String) = RidingStat.entries.firstOrNull { it.name.equals(name, ignoreCase = true) }
@@ -43,12 +43,12 @@ class RidingStatDefinition {
        buffer.writeNullable(displayName) { _, it -> buffer.writeText(it) }
        buffer.writeNullable(description) { _, it -> buffer.writeText(it) }
        buffer.writeMap(
-                ranges,
-                { _, it -> buffer.writeEnum(it) },
-                { _, it ->
-                    buffer.writeSizedInt(IntSize.U_BYTE, it.first)
-                    buffer.writeSizedInt(IntSize.U_BYTE, it.last)
-                }
+            ranges,
+            { _, it -> buffer.writeEnum(it) },
+            { _, it ->
+                buffer.writeSizedInt(IntSize.U_BYTE, it.first)
+                buffer.writeSizedInt(IntSize.U_BYTE, it.last)
+            }
        )
    }

@@ -57,8 +57,8 @@ class RidingStatDefinition {
            val displayName = buffer.readNullable { buffer.readText() }
            val description = buffer.readNullable { buffer.readText() }
            val ranges = buffer.readMap<RidingStyle, IntRange>(
-                    { buffer.readEnum<RidingStyle>(RidingStyle::class.java) },
-                    { IntRange(buffer.readSizedInt(IntSize.U_BYTE), buffer.readSizedInt(IntSize.U_BYTE)) }
+                { buffer.readEnum<RidingStyle>(RidingStyle::class.java) },
+                { IntRange(buffer.readSizedInt(IntSize.U_BYTE), buffer.readSizedInt(IntSize.U_BYTE)) }
            )
            return RidingStatDefinition().apply {
                this.displayName = displayName
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding.util
-
-import com.cobblemon.mod.common.OrientationControllable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.math.geometry.toRadians
-import net.minecraft.util.Mth
-import net.minecraft.world.phys.Vec3
-import org.joml.Matrix3f
-import org.joml.Quaternionf
-import org.joml.Vector3f
-
-/**
- * Class to handle the updating and containment of ride data used in animation.
- *
- * @author Jackowes
- * @since April 7th, 2025
- */
-
-
-class RidingAnimationData
-{
-    var prevOrientation: Matrix3f = Matrix3f()
-    var prevRot: Vec3 = Vec3.ZERO
-    var velocitySpring: Vec3Spring = Vec3Spring()
-    var rotSpring: Vec3Spring = Vec3Spring()
-    var rotDeltaSpring: Vec3Spring = Vec3Spring()
-    var localVelocitySpring: Vec3Spring = Vec3Spring()
-
-    fun update(entity: PokemonEntity) {
-
-        var currRot = Vec3.ZERO
-        var angDelta = Vec3.ZERO
-
-        val stiffness = 90.0
-        val damping = 18.0
-//        val stiffness = 16.0
-//        val damping = 8.0
-
-        // Update velocity first
-        val currentVelocity = Vec3(
-            entity.x - entity.xOld,
-            entity.y - entity.yOld,
-            entity.z - entity.zOld
-        )
-
-        val r = entity.ifRidingAvailableSupply(false) { behaviour, settings, state ->
-            behaviour.shouldRoll(settings, state, entity);
-        }
-        if( r ) {
-            //TODO: should this return?
-            val controller = (entity.firstPassenger as? OrientationControllable)?.orientationController ?: return
-            val orientation = controller.orientation ?: Matrix3f()
-
-            val currPitch = controller.pitch
-            val currYaw = controller.yaw
-            val currRoll = controller.roll
-            currRot = Vec3(currPitch.toDouble(), currYaw.toDouble(), currRoll.toDouble())
-
-            val currOrientation = orientation
-
-            /******************************************************
-             * Calculate current 3d euler rotation deltas in the
-             * entities local space
-             *****************************************************/
-
-            // Get current and previous orientation as quaternions
-            val currQuat = Quaternionf().setFromUnnormalized(currOrientation)
-            val prevQuat = Quaternionf().setFromUnnormalized(prevOrientation)
-
-            // Compute deltaQuat = current * inverse(previous)
-            val deltaQuat = Quaternionf(currQuat).mul(Quaternionf(prevQuat).invert())
-
-            // Transform delta into the local space of the current orientation
-            val localDeltaQuat = Quaternionf(currQuat).invert().mul(deltaQuat).mul(currQuat)
-
-            // Convert delta rotation to Euler angles
-            val euler = Vector3f()
-            localDeltaQuat.getEulerAnglesXYZ(euler) // Angles are in radians
-
-            // Convert to degrees
-            val pitchDegrees = Math.toDegrees(euler.x.toDouble()) // Rotation around X axis = pitch
-            val yawDegrees = Math.toDegrees(euler.y.toDouble())   // Rotation around Y axis = yaw
-            val rollDegrees = Math.toDegrees(euler.z.toDouble())  // Rotation around Z axis = roll
-            //Scale rotation delta by 20 to represent degree per second instead of tick
-            angDelta = Vec3(pitchDegrees, yawDegrees, rollDegrees).scale(20.0)
-
-            /******************************************************
-             * Calculate ride local velocity
-             *****************************************************/
-            val velocityWorldF = Vector3f(currentVelocity.x.toFloat(), currentVelocity.y.toFloat(), currentVelocity.z.toFloat())
-
-            val localVelocityF = Matrix3f(orientation).transpose().transform(velocityWorldF)
-            val localVelocity = Vec3(localVelocityF.x.toDouble(), localVelocityF.y.toDouble(), localVelocityF.z.toDouble())
-
-            localVelocitySpring.update(localVelocity, stiffness, damping)
-
-            // Update previous values
-            prevOrientation.set(currOrientation)
-        } else {
-            val currPitch = entity.xRot
-            val currYaw = entity.yRot
-            val currRoll = 0.0f
-            currRot = Vec3(currPitch.toDouble(), currYaw.toDouble(), currRoll.toDouble())
-
-            //Scale rotation delta by 20 to represent degree per second instead of tick
-            angDelta = Vec3(
-                (currRot.x - prevRot.x),
-                Mth.degreesDifference(currRot.y.toFloat(), prevRot.y.toFloat()).toDouble(),
-                Mth.degreesDifference(currRot.z.toFloat(), prevRot.z.toFloat()).toDouble()
-            ).scale(20.0)
-
-            /******************************************************
-             * Calculate ride local velocity
-             *****************************************************/
-            val yaw360 = -1.0 * (entity.yRot + 360.0f) % 360.0f
-            val orientationNonRollable = Matrix3f().rotateY(yaw360.toRadians())
-
-            //Convert to Vector3f
-            var velocityWorldF = Vector3f(currentVelocity.x.toFloat(), currentVelocity.y.toFloat(), currentVelocity.z.toFloat())
-
-            val localVelocityF = Matrix3f(orientationNonRollable).transpose().transform(velocityWorldF)
-            val localVelocity = Vec3(localVelocityF.x.toDouble(), localVelocityF.y.toDouble(), localVelocityF.z.toDouble())
-
-            localVelocitySpring.update(localVelocity, stiffness, damping)
-        }
-
-        /******************************************************
-         * Update springs
-         *****************************************************/
-        rotDeltaSpring.update(angDelta, stiffness, damping)
-        velocitySpring.update(currentVelocity, stiffness, damping)
-        rotSpring.update(currRot, stiffness, damping)
-        prevRot = currRot
-    }
-}
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding.util
-
-import net.minecraft.world.phys.Vec3
-import kotlin.math.min
-
-/**
- * A spring-based smoother for Vec3 values, designed for applying damped spring motion to riding data.
- * Stores the previous and current values, along with a history buffer for lookback-based interpolation.
- *
- * @author Jackowes
- * @since March 27th, 2025
- */
-
-
-class Vec3Spring(
-    var value: Vec3 = Vec3.ZERO,
-    var velocity: Vec3 = Vec3.ZERO
-) {
-    val history = ArrayDeque<Vec3>()
-    //Hold up to a seconds worth of values
-    val lookBackSize = 20
-
-    fun update(target: Vec3, stiffness: Double, damping: Double) {
-
-        //Hooke's Law f = kx where:
-        //f is force
-        //k is the spring constant or stiffness of this spring
-        //x is the distance from rest and in this case the difference between the most recent
-        //rotation delta ( the target ) and the springs current value for delta rot
-        val force = target.subtract(value).scale(stiffness)
-
-        //Now calculate acceleration and apply damping
-        val accel = force.subtract(velocity.scale(damping))
-
-        velocity = velocity.add(accel.scale(1.0/20.0))
-        value = value.add(velocity.scale(1.0/20.0))
-
-        history.addFirst(value)
-        //Adding one since if we want to check max look back point it needs something to interp with.
-        if( history.size > lookBackSize + 1) {
-            history.removeLast()
-        }
-    }
-
-    fun getInterpolated(partialTick: Double, lookBackTick: Int): Vec3 {
-        if (history.size < 2) {
-            return value // or Vec3.ZERO if you prefer
-        }
-
-        val tick = min(lookBackTick, history.size - 2)
-        var ret = Vec3.ZERO
-        for( i in 0..tick) {
-            val older = history.get(i + 1).scale(1.0)
-            val newer = history.get(i).scale(1.0)
-            ret = ret.add(older.add(newer.subtract(older).scale(partialTick)))
-        }
-
-        return ret.scale(1.0/(tick+1))
-    }
-}
@@ -127,7 +127,6 @@ class ParticleEvent(
                sourceAlive = storm.sourceAlive,
                sourceVisible = storm.sourceVisible,
                onDespawn = {},
-                getParticleColor = storm.getParticleColor,
                targetPos = storm.targetPos,
                runtime = MoLangRuntime().setup(),
                entity = storm.entity
@@ -37,6 +37,7 @@ import com.cobblemon.mod.common.api.spawning.detail.PokemonSpawnDetail
 import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
 import com.cobblemon.mod.common.api.spawning.fishing.FishingSpawner
+import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
 import com.cobblemon.mod.common.api.spawning.preset.BasicSpawnDetailPreset
 import com.cobblemon.mod.common.api.spawning.preset.BestSpawnerConfig
 import com.cobblemon.mod.common.api.spawning.preset.PokemonSpawnDetailPreset
@@ -10,8 +10,6 @@ package com.cobblemon.mod.common.api.spawning

 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.config
-import com.cobblemon.mod.common.api.spawning.influence.WorldSlicedSpawningInfluence
-import com.cobblemon.mod.common.api.spawning.prospecting.SpawningInfluenceProspector
 import com.cobblemon.mod.common.api.spawning.prospecting.SpawningProspector
 import com.cobblemon.mod.common.api.spawning.spawner.Spawner
 import com.cobblemon.mod.common.api.spawning.spawner.SpawningArea
@@ -81,7 +79,6 @@ object CobblemonSpawningProspector : SpawningProspector {
        val blocks = Array(area.length) { Array(height) { Array(area.width) { defaultBlockData } } }
        val skyLevel = Array(area.length) { Array(area.width) { world.maxBuildHeight } }
        val pos = BlockPos.MutableBlockPos()
-        val worldSlicedSpawningInfluences = mutableListOf<WorldSlicedSpawningInfluence>()

        val chunks = mutableMapOf<Pair<Int, Int>, ChunkAccess?>()
        val yRange = (baseY until baseY + height).reversed()
@@ -101,7 +98,6 @@ object CobblemonSpawningProspector : SpawningProspector {
                        light = world.getMaxLocalRawBrightness(pos),
                        skyLight = skyLight
                    )
-                    worldSlicedSpawningInfluences.addAll(SpawningInfluenceProspector.prospectors.mapNotNull { it.prospectBlock(world, pos, state) })
                    if (canSeeSky) {
                        skyLevel[x - area.baseX][z - area.baseZ] = y
                    }
@@ -112,10 +108,6 @@ object CobblemonSpawningProspector : SpawningProspector {
            }
        }

-        for (prospector in SpawningInfluenceProspector.prospectors) {
-            worldSlicedSpawningInfluences.addAll(prospector.prospect(spawner, area))
-        }
-
        return WorldSlice(
            cause = area.cause,
            world = world,
@@ -124,8 +116,7 @@ object CobblemonSpawningProspector : SpawningProspector {
            baseZ = area.baseZ,
            blocks = blocks,
            skyLevel = skyLevel,
-            nearbyEntityPositions = nearbyEntityPositions,
-            influences = worldSlicedSpawningInfluences
+            nearbyEntityPositions = nearbyEntityPositions
        )
    }
 }
@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory
 import com.cobblemon.mod.common.platform.events.PlatformEvents
 import com.cobblemon.mod.common.util.server
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
-import net.minecraft.server.level.ServerLevel
 import java.util.UUID
 import net.minecraft.server.level.ServerPlayer

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

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

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

    fun onPlayerLogout(player: ServerPlayer) {
-        unregisterPlayerSpawner(player)
-    }
-
-    fun onDimensionChange(player: ServerPlayer, origin: ServerLevel?, destination: ServerLevel?) {
-        fun getSpawnRule(level: ServerLevel?) = level?.gameRules?.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING)
-
-        if (!Cobblemon.config.enableSpawning || getSpawnRule(origin) == getSpawnRule(destination)) {
-            return
-        }
-
-        val spawnerAction = if (destination?.gameRules?.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING) == false) {
-            ::unregisterPlayerSpawner
-        } else {
-            ::registerPlayerSpawner
-        }
-        spawnerAction(player)
-    }
-
-    private fun unregisterPlayerSpawner(player: ServerPlayer) {
-        spawnersForPlayers.remove(player.uuid)?.let { unregisterSpawner(it) }
-    }
-
-    private fun registerPlayerSpawner(player: ServerPlayer) {
-        PlayerSpawnerFactory.create(this, player).also {
-            spawnersForPlayers[player.uuid] = it
-            registerSpawner(it)
+        val spawner = spawnersForPlayers[player.uuid]
+        if (spawner != null) {
+            spawnersForPlayers.remove(player.uuid)
+            unregisterSpawner(spawner)
        }
    }
 }
@@ -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.spawning
-
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
-import com.cobblemon.mod.common.util.weightedSelection
-
-object SpawnBucketUtils {
-    fun chooseAdjustedSpawnBucket(buckets: List<SpawnBucket>, bucketLureStrength: Int): SpawnBucket {
-        val baseValues = listOf(88.5F, 8.5F, 2.4F, 0.6F)
-        val adjustments = listOf(-6.9F, 3.6F, 2.3F, 1F)
-
-        val adjustedWeights = buckets.mapIndexed { index, bucket ->
-            if (index >= baseValues.size) {
-                bucket to bucket.weight
-            } else {
-                val base = baseValues[index]
-                val adjustment = adjustments[index]
-                val adjusted = base + adjustment * bucketLureStrength
-                bucket to adjusted.coerceAtLeast(0f) // we do not want the weights to be negative
-            }
-        }.toMap()
-
-        return buckets.weightedSelection { adjustedWeights[it]!! }!!
-    }
-}
--- a/Show More
+++ b/Show More