Merge branch 'main' into fickle-behaviour

* main: (359 commits)
  Stop using Architectury Runtime Transfomers implicitly
  Re-enabled aprijuice and made creative menu aprijuice 10 in all flavours because w/e
  Release the held pokemon before sorting, closes #1663
  Fixed persistence issues for pokemon item pickup behaviours
  Fixed pokemon having the NPC dialogues memory
  Fixed pokemon in the party following and looking around while asleep, closes #1668
  Fixed crash when adding stationary Behaviour without a movement providing behaviour. Closes #1678
  Fixed terralith:shrubland not counting as plains for pokemon spawning, closes #1685
  tweak default stat ranges for some flying behaviours
  Added math.sign and math.copy_sigh molang dep update
  Grain Improvements
  update fabric-permissions-api to 0.3.1
  Behaviour tweaks
  Update mochis.json
  IV Drip
  Ride settings editor
  Fix in air dismount
  Fix riding waterwalk
  swap out textures
  Remove unnecessary check on resource
  ...

# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/FormPokemonBehaviour.kt
#	common/src/main/resources/assets/cobblemon/lang/en_us.json
#	common/src/main/resources/data/cobblemon/behaviours/looks_around.json
#	common/src/main/resources/data/cobblemon/behaviours/pokemon/auto/pokemon_core.json
#	common/src/main/resources/data/cobblemon/behaviours/pokemon/auto/pokemon_non_party.json

CHANGELOG-AI.md

@@ -15,9 +15,6 @@
 - baseScale in NPCs has been removed from classes and presets, and in the entity it is replaced with hitboxScale and renderScale.
 - Added `EntityCallbacks` to `NPCEntity` and `PokemonEntity`. You can trigger custom callback types by using `[Entity].callbacks.process(...)`
 
-### Fixes
-- Fixed Pokémon with a moving walk target frequently spinning in place as they re-calculate their path.
-
 ### MoLang & Datapacks
 - Added a `behaviours` datapack folder which motivates the Behaviour Editor screen on NPCs and Pokémon.
 - Added "callback" support on PokemonEntity and NPCEntity that allows MoLang scripts to be executed in response to certain scenarios.

CHANGELOG.md

@@ -2,7 +2,6 @@
 ## [1.7.0 (Month xth, 2025)](#1-7-0)
 
 ### Additions
-- Added `/npcdelete` uuid parameter support and usuable to console
 - Added `/spectateBattle <player>` command to spectate battles without having to manually walk up to the target.
 - Added an in-game configuration screen, allowing all settings from `main.json` to be edited directly in-game.
 - Added `/cobblemonconfig reload` command to reload `main.json` configuration. **Note:** Some settings require a server restart to take effect; use this command cautiously.
@@ -284,15 +283,6 @@
 - Revavroom
 - Bouffalant
 - Lickilicky
-- Blaziken
-- Rhyhorn
-- Rhydon
-- Rhyperior
-- Tauros
-- Tauros - Paldea Aqua
-- Tauros - Paldea Blaze
-- Tauros - Paldea Combat
-- Dewgong
 
 ### Model updates for the following Pokémon
 - Cleffa
@@ -466,7 +456,6 @@
 - Updated `EvolutionCompleteEvent` parameters to include the Source Pokemon that evolved.
 - Updated `HatchEggEvent.Post` to include the Pokemon that hatched.
 - Roseli Berry Trees now naturally generate in their preferred biomes.
-- Refactored dynamic lights compat to be more future proof. The dynamic light support is only tested with LambDynamicLights, on NeoForged use that mod in combination with Sinytra Connector
 
 ### Fixes
 - Fixed game crashing when removing national pokedex using datapacks
@@ -550,7 +539,6 @@
 - Fixed busted abilities and moves in Pokémon data due to removed datapacks etc. causing storage corruption. It now just rerolls their ability / uses Tackle.
 - Fixed singular Pokémon corruption causing entire storage corruption. Storages will now skip corrupted Pokémon and print an error to console.
 - Fixed species additions not being able to properly mark a species as implemented.
-- Fixed Pokémon item models not showing a glint when enchanted.
 
 ### Developer
 - A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
@@ -681,20 +669,6 @@
 - Added `q.pokemon.is_busy` Returns whether the Pokémon is busy.
 - Added `q.pokemon.is_rideable` Returns whether the Pokémon is rideable.
 - Fixed `background` field and added `textColor` field for dialogues.
-- Added support to reload some data registries:
-    - MoLang scripts
-    - Callbacks
-    - Spawn Detail Presets
-    - Spawn Pools
-    - Spawn Rules
-    - Cosmetic Items
-    - Dialogues
-    - Fossils
-    - Natural Materials
-    - Action Effects
-    - Mechanics
-    - Unlockable Wallpapers
-    - Starter Data
 
 ### Particles
 Added new/updated particles for the following moves:

common/build.gradle.kts

@@ -31,7 +31,6 @@ repositories {
     maven(url = "${rootProject.projectDir}/deps")
     maven(url = "https://api.modrinth.com/maven")
     maven(url = "https://maven.neoforged.net/releases")
-    maven(url = "https://maven.gegy.dev")
     mavenLocal()
 }
 
@@ -45,12 +44,6 @@ dependencies {
     modCompileOnly(libs.bundles.common.integrations.compileOnly) {
         isTransitive = false
     }
-    // LambDynamicLights is handled differently because we need the Mojang-mappings version of it.
-    modCompileOnly(libs.lambDynamicLights) {
-        capabilities {
-            requireCapability("dev.lambdaurora.lambdynamiclights:api-mojmap")
-        }
-    }
     // Flywheel has no common dep so just pick one and don't use any platform specific code in common
     // modCompileOnly(libs.flywheelFabric)
 

common/src/main/java/com/cobblemon/mod/common/compat/LambDynamicLightsCompat.java

@@ -0,0 +1,102 @@
+/*
+ * 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.compat;
+
+import com.cobblemon.mod.common.CobblemonEntities;
+import com.cobblemon.mod.common.client.render.layer.PokemonOnShoulderRenderer;
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.cobblemon.mod.common.item.PokedexItem;
+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;
+
+import java.util.Optional;
+
+import net.minecraft.world.entity.player.Player;
+
+// Java class due to relying on entrypoint on Fabric side
+public class LambDynamicLightsCompat {
+
+    // This is all called on client side
+    // These things are checked every tick so try to keep it as free as possible
+    // That being said it's unlikely school Toshiba person is running dynamic lighting and shaders to enjoy this
+    // Make sure not to call anything Fabric specific :)
+    public static void hookCompat() {
+        // Pokémon entities
+        DynamicLightHandlers.registerDynamicLightHandler(
+            CobblemonEntities.POKEMON,
+            DynamicLightHandler.makeHandler(
+                LambDynamicLightsCompat::resolvedPokemonLightLevel,
+                pokemon -> false
+            )
+        );
+
+        // Shouldered Pokémon
+        DynamicLightHandlers.registerDynamicLightHandler(
+            EntityType.PLAYER,
+            DynamicLightHandler.makeHandler(
+                LambDynamicLightsCompat::resolvedPlayerLightLevel,
+                player -> false
+            )
+        );
+    }
+
+    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);
+    }
+
+    private static int resolvedPlayerLightLevel(Player player) {
+        var underwater = !player.level().getFluidState(BlockPos.containing(player.getX(), player.getEyeY(), player.getZ())).isEmpty();
+        final int leftShoulderLightLevel = extractShoulderLightLevel(PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityLeft()), underwater);
+        final int rightShoulderLightLevel = extractShoulderLightLevel(PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityRight()), underwater);
+        final int itemLightLevel = customHeldItemLightLevel(player.getMainHandItem(), player.getOffhandItem());
+
+        return Math.max(itemLightLevel, Math.max(leftShoulderLightLevel, rightShoulderLightLevel));
+    }
+
+    private static Optional<Integer> extractFormLightLevel(@NotNull FormData form, boolean underwater) {
+        if (form.getLightingData() == null || !liquidGlowModeSupport(form.getLightingData().getLiquidGlowMode(), underwater)) {
+            return Optional.empty();
+        }
+        return Optional.of(form.getLightingData().getLightLevel());
+    }
+
+    private static int extractShoulderLightLevel(@Nullable PokemonOnShoulderRenderer.ShoulderData shoulderData, boolean underwater) {
+        if (shoulderData == null) {
+            return 0;
+        }
+
+        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);
+    }
+
+    private static int customHeldItemLightLevel(ItemStack mainhand, ItemStack offhand) {
+        return (mainhand.getItem() instanceof PokedexItem || offhand.getItem() instanceof PokedexItem) ? 13 : 0;
+    }
+
+    private static boolean liquidGlowModeSupport(@NotNull LightingData.LiquidGlowMode liquidGlowMode, boolean underwater) {
+        return underwater ? liquidGlowMode.getGlowsUnderwater() : liquidGlowMode.getGlowsInLand();
+    }
+}

common/src/main/java/com/cobblemon/mod/common/compat/lambdynamiclights/CustomLuminance.java

@@ -1,28 +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.compat.lambdynamiclights;
-
-import com.cobblemon.mod.common.pokemon.FormData;
-import com.cobblemon.mod.common.pokemon.lighthing.LightingData;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Optional;
-
-public abstract class CustomLuminance {
-    protected static Optional<Integer> extractFormLightLevel(@NotNull FormData form, boolean underwater) {
-        if (form.getLightingData() == null || !liquidGlowModeSupport(form.getLightingData().getLiquidGlowMode(), underwater)) {
-            return Optional.empty();
-        }
-        return Optional.of(form.getLightingData().getLightLevel());
-    }
-
-    protected static boolean liquidGlowModeSupport(@NotNull LightingData.LiquidGlowMode liquidGlowMode, boolean underwater) {
-        return underwater ? liquidGlowMode.getGlowsUnderwater() : liquidGlowMode.getGlowsInLand();
-    }
-}

common/src/main/java/com/cobblemon/mod/common/compat/lambdynamiclights/LambDynamicLightsInitializer.java

@@ -1,42 +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.compat.lambdynamiclights;
-
-import com.cobblemon.mod.common.Cobblemon;
-import dev.lambdaurora.lambdynlights.api.DynamicLightsContext;
-import dev.lambdaurora.lambdynlights.api.DynamicLightsInitializer;
-import dev.lambdaurora.lambdynlights.api.entity.luminance.EntityLuminance;
-import dev.lambdaurora.lambdynlights.api.item.ItemLightSourceManager;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.EntityType;
-
-public class LambDynamicLightsInitializer implements DynamicLightsInitializer {
-    public static final EntityLuminance.Type POKEMON_LUMINANCE = EntityLuminance.Type.registerSimple(
-            ResourceLocation.fromNamespaceAndPath(Cobblemon.MODID, "pokemon"),
-            PokemonLuminance.INSTANCE
-    );
-    public static final EntityLuminance.Type PLAYER_LUMINANCE = EntityLuminance.Type.registerSimple(
-            ResourceLocation.fromNamespaceAndPath(Cobblemon.MODID, "shoulder"),
-            PlayerLuminance.INSTANCE
-    );
-
-    @Override
-    public void onInitializeDynamicLights(DynamicLightsContext context) {
-        Cobblemon.LOGGER.info("Lamb Dynamic Lights compatibility enabled");
-
-        context.entityLightSourceManager().onRegisterEvent().register(ctx -> {
-            ctx.register(EntityType.PLAYER, PlayerLuminance.INSTANCE);
-        });
-    }
-
-    @SuppressWarnings({"removal", "UnstableApiUsage"})
-    @Override
-    public void onInitializeDynamicLights(ItemLightSourceManager itemLightSourceManager) {}
-}
-

common/src/main/java/com/cobblemon/mod/common/compat/lambdynamiclights/PlayerLuminance.java

@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.compat.lambdynamiclights;
-
-import com.cobblemon.mod.common.Cobblemon;
-import com.cobblemon.mod.common.client.render.layer.PokemonOnShoulderRenderer;
-import dev.lambdaurora.lambdynlights.api.entity.luminance.EntityLuminance;
-import dev.lambdaurora.lambdynlights.api.item.ItemLightSourceManager;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.Range;
-
-public final class PlayerLuminance extends CustomLuminance implements EntityLuminance {
-    public static final PlayerLuminance INSTANCE = new PlayerLuminance();
-    private static final TagKey<Item> POKEDEX = TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(Cobblemon.MODID, "pokedex"));
-
-    @Override
-    public @NotNull Type type() {
-        return LambDynamicLightsInitializer.PLAYER_LUMINANCE;
-    }
-
-    @Override
-    public @Range(from = 0L, to = 15L) int getLuminance(@NotNull ItemLightSourceManager itemLightSourceManager, @NotNull Entity entity) {
-        if (entity instanceof Player player) {
-            final int shoulderLightLevel = shoulderLuminance(itemLightSourceManager, player);
-
-            final int itemLightLevel = player.isHolding(stack -> stack.is(POKEDEX)) ? 13 : 0;
-
-            return Math.max(shoulderLightLevel, itemLightLevel);
-        } else {
-            return 0;
-        }
-    }
-
-    private @Range(from = 0L, to = 15L) static int shoulderLuminance(@NotNull ItemLightSourceManager itemLightSourceManager, @NotNull Player player) {
-        final var leftShoulder = PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityLeft());
-        final var rightShoulder = PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityRight());
-
-        if (leftShoulder == null && rightShoulder == null) {
-            return 0;
-        }
-
-        final int leftShoulderLightLevel = extractShoulderLightLevel(leftShoulder, itemLightSourceManager, player.isUnderWater());
-        final int rightShoulderLightLevel = extractShoulderLightLevel(rightShoulder, itemLightSourceManager, player.isUnderWater());
-        return Math.max(leftShoulderLightLevel, rightShoulderLightLevel);
-    }
-
-    private static int extractShoulderLightLevel(@Nullable PokemonOnShoulderRenderer.ShoulderData shoulderData, @NotNull ItemLightSourceManager itemLightSourceManager, boolean underwater) {
-        if (shoulderData == null) {
-            return 0;
-        }
-
-        ItemStack item = shoulderData.getShownItem();
-        int itemLightLevel = item.isEmpty() ? 0 : itemLightSourceManager.getLuminance(item, underwater);
-        int formLightLevel = extractFormLightLevel(shoulderData.getForm(), underwater).orElse(0);
-
-        return Math.max(itemLightLevel, formLightLevel);
-    }
-}

common/src/main/java/com/cobblemon/mod/common/compat/lambdynamiclights/PokemonLuminance.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.compat.lambdynamiclights;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import dev.lambdaurora.lambdynlights.api.entity.luminance.EntityLuminance;
-import dev.lambdaurora.lambdynlights.api.item.ItemLightSourceManager;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.item.ItemStack;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Range;
-
-public final class PokemonLuminance extends CustomLuminance implements EntityLuminance {
-    public static final PokemonLuminance INSTANCE = new PokemonLuminance();
-
-    private PokemonLuminance() {}
-
-    @Override
-    public @NotNull Type type() {
-        return LambDynamicLightsInitializer.POKEMON_LUMINANCE;
-    }
-
-    @Override
-    public @Range(from = 0L, to = 15L) int getLuminance(
-            @NotNull ItemLightSourceManager itemLightSourceManager,
-            @NotNull Entity entity
-    ) {
-        if (entity instanceof PokemonEntity pokemon) {
-            boolean underwater = pokemon.isUnderWater();
-            ItemStack item = pokemon.getShownItem();
-            int itemLightLevel = item.isEmpty() ? 0 : itemLightSourceManager.getLuminance(item, underwater);
-            int formLightLevel = extractFormLightLevel(pokemon.getForm(), underwater).orElse(0);
-
-            return Math.max(itemLightLevel, formLightLevel);
-        } else {
-            return 0;
-        }
-    }
-}

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

@@ -31,15 +31,14 @@ public class AbstractClientPlayerMixin {
         PokedexUsageContext usageContext = CobblemonClient.INSTANCE.getPokedexUsageContext();
         if (usageContext.getScanningGuiOpen()) {
             cir.setReturnValue(usageContext.getFovMultiplier());
-        } else {
-            // Only modify fov through riding if the pokedex is not open
-            LocalPlayer player = (LocalPlayer) (Object) this;
-            if (player != null && player.isPassenger() && player.getVehicle() instanceof PokemonEntity) {
-                PokemonEntity ride = (PokemonEntity) player.getVehicle();
+        }
 
-                // Return custom fov mult for riding
-                cir.setReturnValue(ride.rideFovMult());
-            }
+        LocalPlayer player = (LocalPlayer) (Object) this;
+        if (player != null && player.isPassenger() && player.getVehicle() instanceof PokemonEntity) {
+            PokemonEntity ride = (PokemonEntity) player.getVehicle();
+
+            //Return custom fov mult
+            cir.setReturnValue(ride.rideFovMult());
         }
     }
 }

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

@@ -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.client;
-
-import com.cobblemon.mod.common.client.render.player.MountedPlayerRenderer;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import net.minecraft.client.model.AgeableListModel;
-import net.minecraft.client.model.HumanoidModel;
-import net.minecraft.client.model.Model;
-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;
-
-/**
- * This mixin adds to the head of the renderToBuffer function and allows us to detect if it is a HumanoidModel and
- * is being rendered as part of a player in the world who is riding a PokemonEntity. If so we need to obey any
- * root animations that have been applied earlier.
- *
- * @author Hiroku
- * @since May 16, 2025
- */
-@Mixin(AgeableListModel.class)
-public class AgeableListModelMixin {
-    @Inject(method = "renderToBuffer", at = @At("HEAD"))
-    private void cobblemon$renderToBuffer(
-        PoseStack poseStack,
-        VertexConsumer vertexConsumer,
-        int packedLight,
-        int packedOverlay,
-        int colour,
-        CallbackInfo ci
-    ) {
-        Model model = (Model) (Object) this;
-        if (model instanceof HumanoidModel<?> && MountedPlayerRenderer.shouldApplyRootAnimation) {
-            MountedPlayerRenderer.INSTANCE.animateRoot(poseStack);
-        }
-    }
-}

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

@@ -19,17 +19,20 @@ import net.minecraft.world.entity.LivingEntity;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.util.HashMap;
+
 @Mixin(HumanoidModel.class)
 public class HumanoidModelMixin {
+    @Unique HashMap<String, ModelPart> relevantPartsByName = new HashMap<>();
+
     @Shadow @Final
     public ModelPart head;
     @Shadow @Final
-    public ModelPart hat;
-    @Shadow @Final
     public ModelPart rightArm;
     @Shadow @Final
     public ModelPart leftArm;
@@ -37,8 +40,6 @@ public class HumanoidModelMixin {
     public ModelPart rightLeg;
     @Shadow @Final
     public ModelPart leftLeg;
-    @Shadow @Final
-    public ModelPart body;
 
     @Inject(method = "setupAnim*", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/model/geom/ModelPart;copyFrom(Lnet/minecraft/client/model/geom/ModelPart;)V", shift = At.Shift.BEFORE))
     public void cobblemon$animateRiders(
@@ -50,23 +51,19 @@ public class HumanoidModelMixin {
         float headPitch,
         CallbackInfo ci
     ) {
-        MountedPlayerRenderer.shouldApplyRootAnimation = false;
-
-        if (MountedPlayerRenderer.relevantPartsByName.size() <= 1) {
-            MountedPlayerRenderer.relevantPartsByName.put("arm_left", leftArm);
-            MountedPlayerRenderer.relevantPartsByName.put("arm_right", rightArm);
-            MountedPlayerRenderer.relevantPartsByName.put("leg_left", leftLeg);
-            MountedPlayerRenderer.relevantPartsByName.put("leg_right", rightLeg);
-            MountedPlayerRenderer.relevantPartsByName.put("head", head);
-            MountedPlayerRenderer.relevantPartsByName.put("hat", hat);
-            MountedPlayerRenderer.relevantPartsByName.put("torso", body);
+        if (relevantPartsByName.isEmpty()) {
+            relevantPartsByName.put("arm_left", leftArm);
+            relevantPartsByName.put("arm_right", rightArm);
+            relevantPartsByName.put("leg_left", leftLeg);
+            relevantPartsByName.put("leg_right", rightLeg);
+            relevantPartsByName.put("head", head);
         }
 
         Entity vehicle = entity.getVehicle();
         if (vehicle instanceof PokemonEntity pokemonEntity && entity instanceof OrientationControllable) {
-            var shouldRotatePlayerHead = pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) ->
-                    behaviour.shouldRotateRiderHead(settings, state, pokemonEntity)
-            );
+            var shouldRotatePlayerHead = pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) -> {
+                return behaviour.shouldRotateRiderHead(settings, state, pokemonEntity);
+            });
 
             if (!shouldRotatePlayerHead) {
                 netHeadYaw = 0f;
@@ -79,8 +76,7 @@ public class HumanoidModelMixin {
 
             if (!(entity instanceof AbstractClientPlayer player)) return;
 
-            MountedPlayerRenderer.shouldApplyRootAnimation = true;
-            MountedPlayerRenderer.INSTANCE.animate((HumanoidModel<AbstractClientPlayer>)(Object)this, pokemonEntity, player, netHeadYaw, headPitch, ageInTicks, limbSwing, limbSwingAmount);
+            MountedPlayerRenderer.INSTANCE.animate(pokemonEntity, player, relevantPartsByName, netHeadYaw, headPitch, ageInTicks, limbSwing, limbSwingAmount);
         }
     }
 }

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

@@ -174,16 +174,6 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
         return this.cobblemon$isDoubleJumping;
     }
 
-    @Inject(method = "isHandsBusy", at = @At("HEAD"), cancellable = true)
-    private void cobblemon$isHandsBusy(CallbackInfoReturnable<Boolean> cir) {
-        Entity vehicle = this.getVehicle();
-        if (vehicle instanceof PokemonEntity pokemonEntity) {
-            int seatIndex = pokemonEntity.getPassengers().indexOf(this);
-            Seat seat = pokemonEntity.getSeats().get(seatIndex);
-            cir.setReturnValue(seat.getHandsBusy());
-        }
-    }
-
     @Override
     public HitResult pick(double hitDistance, float partialTicks, boolean hitFluids) {
         Entity vehicle = this.getVehicle();

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

@@ -117,8 +117,6 @@ public abstract class MouseHandlerMixin {
         @Local(argsOnly = true) double d,
         @Local(argsOnly = true) double movementTime
         ) {
-        boolean returnValue = true;
-
         PokedexUsageContext usageContext = CobblemonClient.INSTANCE.getPokedexUsageContext();
         if (usageContext.getScanningGuiOpen()) {
             this.smoothTurnY.reset();
@@ -129,7 +127,7 @@ public abstract class MouseHandlerMixin {
             var sensitivity = Mth.lerp(usageContext.getFovMultiplier(), spyglassSensitivity, lookSensitivity);
             var yRotationFlip = this.minecraft.options.invertYMouse().get() ? -1 : 1;
             player.turn(this.accumulatedDX * sensitivity, (this.accumulatedDY * sensitivity * yRotationFlip));
-            returnValue = false;
+            return false;
         }
 
         // Clamp player rotation if riding and the vehicle demands it
@@ -145,33 +143,35 @@ public abstract class MouseHandlerMixin {
             pitchSmoother.reset();
             rollSmoother.reset();
             yawSmoother.reset();
-            return returnValue;
+            return true;
         }
 
-        // Send mouse input to be interpreted into rotation
-        // deltas by the ride controller
+        //Send mouse input to be interpreted into rotation
+        //deltas by the ride controller
         Vec3 angVecMouse = cobblemon$getRideMouseRotation(cursorDeltaX, cursorDeltaY, movementTime);
 
-        // Perform Rotation using mouse influenced rotation deltas.
+        //Perform Rotation using mouse influenced rotation deltas.
         controllable.getOrientationController().rotate(
             (float) angVecMouse.x,
             (float) angVecMouse.y,
             (float) angVecMouse.z
         );
 
-        // Gather and apply the current rotation deltas
+        //Gather and apply the current rotation deltas
         var angRot = cobblemon$getAngularVelocity(movementTime);
 
-        // Apply smoothing if requested by the controller.
-        // This Might be best if done by the controller itself?
-        if(cobblemon$shouldUseAngVelSmoothing()) {
+        //Apply smoothing if requested by the controller.
+        //This Might be best if done by the controller itself?
+        if(cobblemon$shouldUseAngVelSmoothing())
+        {
             var yaw = yawSmoother.getNewDeltaValue(angRot.x * 0.5f, d);
             var pitch = pitchSmoother.getNewDeltaValue(angRot.y * 0.5f, d);
             var roll = rollSmoother.getNewDeltaValue(angRot.z * 0.5f, d);
             controllable.getOrientationController().rotate((float) yaw, (float) pitch, (float) roll);
         }
-        // Otherwise simply apply the smoothing
-        else {
+        //Otherwise simply apply the smoothing
+        else
+        {
             controllable.getOrientationController().rotate((float) (angRot.x * 10 * d), (float) (angRot.y * 10 * d), (float) (angRot.z * 10 * d));
         }
         return false;

common/src/main/java/com/cobblemon/mod/common/mixin/client/snapshots/SnapshotWarningMixin.java

@@ -10,7 +10,8 @@ package com.cobblemon.mod.common.mixin.client.snapshots;
 
 import com.cobblemon.mod.common.CobblemonBuildDetails;
 import com.cobblemon.mod.common.client.gui.snapshots.SnapshotWarningScreen;
-import com.cobblemon.mod.common.client.persisted.ClientPersistedData;
+import com.cobblemon.mod.common.client.snapshots.SnapshotAcknowledgementData;
+import com.cobblemon.mod.common.client.snapshots.SnapshotAcknowledgementReader;
 import kotlin.Unit;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.Minecraft;
@@ -41,7 +42,7 @@ public final class SnapshotWarningMixin {
                     return Unit.INSTANCE;
                 }
 
-                ClientPersistedData.INSTANCE.writeSnapshotsData(new ClientPersistedData.SnapshotAcknowledgementData(CobblemonBuildDetails.VERSION, dsa));
+                SnapshotAcknowledgementReader.INSTANCE.write(new SnapshotAcknowledgementData(CobblemonBuildDetails.VERSION, dsa));
 
                 runnable.run();
                 return Unit.INSTANCE;
@@ -53,7 +54,7 @@ public final class SnapshotWarningMixin {
     @Unique
     @SuppressWarnings("ResultOfMethodCallIgnored")
     private boolean cobblemon$isAcknowledged() {
-        ClientPersistedData.SnapshotAcknowledgementData data = ClientPersistedData.INSTANCE.readSnapshotsData();
+        SnapshotAcknowledgementData data = SnapshotAcknowledgementReader.INSTANCE.read();
         if (data == null) {
             return false;
         }

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

@@ -213,7 +213,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @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_SIGN), SACCHARINE_WOOD_TYPE))
+    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

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

@@ -26,10 +26,10 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
         .networkSynchronized(PokemonItemComponent.PACKET_CODEC)
         .build())
 
-    val HELD_ITEM_EFFECT: DataComponentType<HeldItemEffectComponent> = create("held_item_effect", DataComponentType.builder<HeldItemEffectComponent>()
-        .persistent(HeldItemEffectComponent.CODEC)
-        .networkSynchronized(HeldItemEffectComponent.PACKET_CODEC)
-        .build())
+    val HELD_ITEM_REP: DataComponentType<HeldItemCapableComponent> = DataComponentType.builder<HeldItemCapableComponent>()
+        .persistent(HeldItemCapableComponent.CODEC)
+        .networkSynchronized(HeldItemCapableComponent.PACKET_CODEC)
+        .build()
 
     val BAIT: DataComponentType<RodBaitComponent> = create("bait", DataComponentType.builder<RodBaitComponent>()
         .persistent(RodBaitComponent.CODEC)
@@ -86,7 +86,6 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:ingredient"), INGREDIENT)
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:food"), FOOD)
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:mob_effects"), MOB_EFFECTS)
-        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:held_item_effect"), HELD_ITEM_EFFECT)
     }
 
     override val registry = BuiltInRegistries.DATA_COMPONENT_TYPE

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

@@ -39,7 +39,6 @@ object CobblemonMechanics : DataRegistry {
     var potions = PotionsMechanic()
 
     override fun sync(player: ServerPlayer) {}
-
     override fun reload(manager: ResourceManager) {
         remedies = loadMechanic(manager, "remedies", RemediesMechanic::class.java)
         berries = loadMechanic(manager, "berries", BerriesMechanic::class.java)

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

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.api.ai.CobblemonAttackTargetData
+import com.cobblemon.mod.common.api.ai.CobblemonAvoidTargetData
 import com.cobblemon.mod.common.api.ai.CobblemonWanderControl
 import com.cobblemon.mod.common.api.dialogue.ActiveDialogue
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
@@ -57,6 +58,7 @@ object CobblemonMemories {
     /** how many are following me rn? */
     val HERD_SIZE = register<Int>("herd_size") // Don't bother saving it, we'll try to keep count roughly.
     val ATTACK_TARGET_DATA = register<CobblemonAttackTargetData>("attack_target_data") // This is used to store additional information about the attack target, such as when to give up pursuit.
+    val AVOID_TARGET_DATA = register<CobblemonAvoidTargetData>("avoid_target_data") // This is used to store additional information about the avoid target, such as how fast to move.
     val WANDER_CONTROL = register<CobblemonWanderControl>("wander_control")
     val DISABLE_WALK_TO_WANTED_ITEM = register<Boolean>("disable_walk_to_wanted_item")
     val TIME_TRYING_TO_REACH_WANTED_ITEM = register<Int>("time_trying_to_wanted_item")

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

@@ -9,8 +9,8 @@
 package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.api.net.NetworkPacket
-import com.cobblemon.mod.common.client.net.CalculateSeatPositionsHandler
 import com.cobblemon.mod.common.client.net.OpenBehaviourEditorHandler
+import com.cobblemon.mod.common.client.net.CalculateSeatPositionsHandler
 import com.cobblemon.mod.common.client.net.PlayerInteractOptionsHandler
 import com.cobblemon.mod.common.client.net.SetClientPlayerDataHandler
 import com.cobblemon.mod.common.client.net.animation.PlayPosableAnimationHandler
@@ -20,7 +20,7 @@ import com.cobblemon.mod.common.client.net.callback.party.OpenPartyCallbackHandl
 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.RideSettingsSyncHandler
+import com.cobblemon.mod.common.client.net.data.UnlockReloadPacketHandler
 import com.cobblemon.mod.common.client.net.dialogue.DialogueClosedHandler
 import com.cobblemon.mod.common.client.net.dialogue.DialogueOpenedHandler
 import com.cobblemon.mod.common.client.net.effect.PokeSnackBlockParticlesHandler
@@ -65,8 +65,8 @@ import com.cobblemon.mod.common.client.net.trade.TradeProcessStartedHandler
 import com.cobblemon.mod.common.client.net.trade.TradeStartedHandler
 import com.cobblemon.mod.common.client.net.trade.TradeUpdatedHandler
 import com.cobblemon.mod.common.net.PacketRegisterInfo
-import com.cobblemon.mod.common.net.messages.client.CalculateSeatPositionsPacket
 import com.cobblemon.mod.common.net.messages.client.OpenBehaviourEditorPacket
+import com.cobblemon.mod.common.net.messages.client.CalculateSeatPositionsPacket
 import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket
 import com.cobblemon.mod.common.net.messages.client.SetClientPlayerDataPacket
 import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
@@ -171,11 +171,11 @@ import com.cobblemon.mod.common.net.messages.server.pasture.UnpasturePokemonPack
 import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.FinishScanningPacket
 import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.StartScanningPacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.interact.InteractPokemonPacket
-import com.cobblemon.mod.common.net.messages.server.pokemon.update.ServerboundUpdateRidingStatePacket
-import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetActiveMarkPacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetItemHiddenPacket
-import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetMarkingsPacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetNicknamePacket
+import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetActiveMarkPacket
+import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetMarkingsPacket
+import com.cobblemon.mod.common.net.messages.server.pokemon.update.ServerboundUpdateRidingStatePacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
 import com.cobblemon.mod.common.net.messages.server.riding.DismountPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateDriverInputPacket
@@ -224,11 +224,11 @@ import com.cobblemon.mod.common.net.serverhandling.pasture.UnpasturePokemonHandl
 import com.cobblemon.mod.common.net.serverhandling.pokedex.scanner.FinishScanningHandler
 import com.cobblemon.mod.common.net.serverhandling.pokedex.scanner.StartScanningHandler
 import com.cobblemon.mod.common.net.serverhandling.pokemon.interact.InteractPokemonHandler
-import com.cobblemon.mod.common.net.serverhandling.pokemon.update.ServerboundUpdateRidingStateHandler
-import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetActiveMarkHandler
 import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetItemHiddenHandler
-import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetMarkingsHandler
 import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetNicknameHandler
+import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetActiveMarkHandler
+import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetMarkingsHandler
+import com.cobblemon.mod.common.net.serverhandling.pokemon.update.ServerboundUpdateRidingStateHandler
 import com.cobblemon.mod.common.net.serverhandling.riding.DismountPokemonPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.riding.DriverInputPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.starter.RequestStarterScreenHandler
@@ -312,7 +312,6 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(MarksPotentialUpdatePacket.ID, MarksPotentialUpdatePacket::decode, PokemonUpdatePacketHandler()))
         list.add(PacketRegisterInfo(MarkingsUpdatePacket.ID, MarkingsUpdatePacket::decode, PokemonUpdatePacketHandler()))
         list.add(PacketRegisterInfo(RideBoostsUpdatePacket.ID, RideBoostsUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(RideStaminaUpdatePacket.ID, RideStaminaUpdatePacket::decode, PokemonUpdatePacketHandler()))
 
         // Evolution start
         list.add(PacketRegisterInfo(AddEvolutionPacket.ID, AddEvolutionPacket::decode, PokemonUpdatePacketHandler()))
@@ -391,6 +390,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(BerryRegistrySyncPacket.ID, BerryRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(SpeciesRegistrySyncPacket.ID, SpeciesRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(PropertiesCompletionRegistrySyncPacket.ID, PropertiesCompletionRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
+        list.add(PacketRegisterInfo(UnlockReloadPacket.ID, UnlockReloadPacket::decode, UnlockReloadPacketHandler))
         list.add(PacketRegisterInfo(StandardSpeciesFeatureSyncPacket.ID, StandardSpeciesFeatureSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(GlobalSpeciesFeatureSyncPacket.ID, GlobalSpeciesFeatureSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(SpeciesFeatureAssignmentSyncPacket.ID, SpeciesFeatureAssignmentSyncPacket::decode, DataRegistrySyncPacketHandler()))
@@ -407,7 +407,6 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(CosmeticItemAssignmentSyncPacket.ID, CosmeticItemAssignmentSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(BehaviourSyncPacket.ID, BehaviourSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(MarkRegistrySyncPacket.ID, MarkRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(RideSettingsSyncPacket.ID, RideSettingsSyncPacket::decode, RideSettingsSyncHandler))
 
         // Effects
         list.add(PacketRegisterInfo(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler))

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

@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common
-
-import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
-import com.cobblemon.mod.common.api.data.DataRegistry
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.air.BirdSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.air.GliderSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.air.HelicopterSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.air.HoverSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.air.JetSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.air.RocketSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.land.HorseSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.land.MinekartSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.land.VehicleSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.BoatSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.BurstSettings
-import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.DolphinSettings
-import com.cobblemon.mod.common.net.messages.client.data.RideSettingsSyncPacket
-import com.cobblemon.mod.common.util.adapters.ExpressionAdapter
-import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
-import com.cobblemon.mod.common.util.adapters.FloatNumberRangeAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.GsonBuilder
-import net.minecraft.advancements.critereon.MinMaxBounds
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-import net.minecraft.server.packs.resources.ResourceManager
-
-object CobblemonRideSettings : DataRegistry {
-    override val id: ResourceLocation = cobblemonResource("ride_settings")
-    override val type = PackType.SERVER_DATA
-    override val observable = SimpleObservable<CobblemonRideSettings>()
-    val gson = GsonBuilder()
-        .setPrettyPrinting()
-        .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
-        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
-        .registerTypeAdapter(MinMaxBounds.Doubles::class.java, FloatNumberRangeAdapter)
-        .create()
-
-    var bird = BirdSettings()
-    var glider = GliderSettings()
-    var helicopter = HelicopterSettings()
-    var hover = HoverSettings()
-    var jet = JetSettings()
-    var rocket = RocketSettings()
-
-    var horse = HorseSettings()
-    var minekart = MinekartSettings()
-    var vehicle = VehicleSettings()
-
-    var boat = BoatSettings()
-    var burst = BurstSettings()
-    var dolphin = DolphinSettings()
-
-    override fun sync(player: ServerPlayer) {
-        player.sendPacket(
-            RideSettingsSyncPacket(
-                bird = bird,
-                glider = glider,
-                helicopter = helicopter,
-                hover = hover,
-                jet = jet,
-                rocket = rocket,
-                horse = horse,
-                minekart = minekart,
-                vehicle = vehicle,
-                boat = boat,
-                burst = burst,
-                dolphin = dolphin
-            )
-        )
-    }
-
-    override fun reload(manager: ResourceManager) {
-        bird = loadStyle(manager, "bird", BirdSettings::class.java)
-        glider = loadStyle(manager, "glider", GliderSettings::class.java)
-        helicopter = loadStyle(manager, "helicopter", HelicopterSettings::class.java)
-        hover = loadStyle(manager, "hover", HoverSettings::class.java)
-        jet = loadStyle(manager, "jet", JetSettings::class.java)
-        rocket = loadStyle(manager, "rocket", RocketSettings::class.java)
-        horse = loadStyle(manager, "horse", HorseSettings::class.java)
-        minekart = loadStyle(manager, "minekart", MinekartSettings::class.java)
-        vehicle = loadStyle(manager, "vehicle", VehicleSettings::class.java)
-        boat = loadStyle(manager, "boat", BoatSettings::class.java)
-        burst = loadStyle(manager, "burst", BurstSettings::class.java)
-        dolphin = loadStyle(manager, "dolphin", DolphinSettings::class.java)
-    }
-
-    private fun <T : RidingBehaviourSettings> loadStyle(manager: ResourceManager, name: String, clazz: Class<T>): T {
-        manager.getResourceOrThrow(cobblemonResource("ride_settings/$name.json")).open().use {
-            return gson.fromJson(it.reader(), clazz)
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/CobblemonAttackTargetData.kt

@@ -20,6 +20,8 @@ import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.resolve
 import net.minecraft.world.entity.Entity
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
 
 /**
  * This is used in the AI system to store optional additional information about the attack target,
@@ -41,15 +43,21 @@ import net.minecraft.world.entity.Entity
 class CobblemonAttackTargetData(
     /** An expression that returns false when the target is no longer worth attacking. */
     var shouldContinue: Expression = "true".asExpression(),
-    var hitsUntilDisengage: Int = -1, // -1 means no limit
-    var disengageAction: (entity: Entity) -> Unit = {}
+    var dealtHitsUntilDisengage: Int = -1, // -1 means no limit
+    var disengageAction: (entity: LivingEntity) -> Unit = ::defaultDisengage
 ) {
+    companion object {
+        fun defaultDisengage(entity: LivingEntity) {
+            entity.brain.eraseMemory(MemoryModuleType.ATTACK_TARGET)
+            entity.brain.updateActivityFromSchedule(entity.level().dayTime, entity.level().gameTime)
+        }
+    }
     val struct = ObjectValue<CobblemonAttackTargetData>(this).also {
-        it.addFunction("hits_until_disengage") { DoubleValue(hitsUntilDisengage.toDouble()) }
-        it.addFunction("set_hits_until_disengage") { params ->
+        it.addFunction("dealt_hits_until_disengage") { DoubleValue(dealtHitsUntilDisengage.toDouble()) }
+        it.addFunction("set_dealt_hits_until_disengage") { params ->
             val value = params.getDouble(0)
-            hitsUntilDisengage = value.toInt()
-            DoubleValue(hitsUntilDisengage.toDouble())
+            dealtHitsUntilDisengage = value.toInt()
+            DoubleValue(dealtHitsUntilDisengage.toDouble())
         }
         it.addFunction("set_disengage_action") { params ->
             val script = params.getString(0).asIdentifierDefaultingNamespace()
@@ -64,8 +72,15 @@ class CobblemonAttackTargetData(
             }
             DoubleValue.ONE
         }
+        it.addFunction("reset") {
+            shouldContinue = "true".asExpression()
+            dealtHitsUntilDisengage = -1
+            disengageAction = ::defaultDisengage
+            DoubleValue.ONE
+        }
         it.addFunction("unset_disengage_action") { params ->
-            disengageAction = {}
+            disengageAction = ::defaultDisengage
         }
     }
+
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/CobblemonAvoidTargetData.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai
+
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.util.getDoubleOrNull
+
+class CobblemonAvoidTargetData {
+    var walkSpeed: Float? = null
+
+    @Transient
+    val struct = ObjectValue<CobblemonAvoidTargetData>(this).also {
+        it.addFunction("walk_speed") { DoubleValue(walkSpeed) }
+        it.addFunction("set_walk_speed") { walkSpeed = it.getDoubleOrNull(0)?.toFloat() }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/CobblemonWanderControl.kt

@@ -13,7 +13,6 @@ import com.cobblemon.mod.common.util.getBooleanOrNull
 import com.cobblemon.mod.common.util.getDoubleOrNull
 import kotlin.math.sqrt
 import net.minecraft.core.BlockPos
-import net.minecraft.world.entity.PathfinderMob
 
 /**
  * Used to maintain some settings around how the entity should wander this tick. The idea is you
@@ -30,7 +29,8 @@ class CobblemonWanderControl(
     var allowWater: Boolean = false,
     var allowAir: Boolean = false,
     var pathCooldownTicks: Int = 20 * 5, // Used to mitigate the cost of pathfinding.
-    var wanderSpeed: Float = 0.35F,
+    var speedMultiplier: Float = 1F,
+    var wanderChance: Float? = null
 ) {
     class WanderCenter(val x: Number, val y: Number, val z: Number, val minRange: Float, val maxRange: Float)
 
@@ -46,7 +46,7 @@ class CobblemonWanderControl(
         .addFunction("allow_water") { if (allowWater) 1.0 else 0.0 }
         .addFunction("allow_air") { if (allowAir) 1.0 else 0.0 }
         .addFunction("path_cooldown_ticks") { pathCooldownTicks.toDouble() }
-        .addFunction("wander_speed") { wanderSpeed }
+        .addFunction("speed_multiplier") { speedMultiplier }
         .addFunction("set_center") { params ->
             if (params.params.size < 3) {
                 throw IllegalArgumentException("set_center requires at least 3 parameters: x, y, z")
@@ -69,15 +69,19 @@ class CobblemonWanderControl(
         .addFunction("set_allow_water") { params -> allowWater = params.getBooleanOrNull(0) ?: false }
         .addFunction("set_allow_air") { params -> allowAir = params.getBooleanOrNull(0) ?: false }
         .addFunction("set_path_cooldown_ticks") { params -> pathCooldownTicks = params.getDoubleOrNull(0)?.toInt() ?: (20 * 5) }
-        .addFunction("set_wander_speed") { params -> wanderSpeed = params.getDoubleOrNull(0)?.toFloat() ?: 0.35F }
+        .addFunction("set_speed_multiplier") { params -> speedMultiplier = params.getDoubleOrNull(0)?.toFloat() ?: 0.35F }
+        .addFunction("set_wander_chance") { params ->
+            wanderChance = params.getDoubleOrNull(0)?.toFloat()
+        }
         .addFunction("reset") {
             center = null
             allowLand = false
             allowWater = false
             allowAir = false
             pathCooldownTicks = 20 * 5
-            wanderSpeed = 0.35F
+            speedMultiplier = 1F
             maxAttempts = 4
+            wanderChance = null
         }
 
     fun isSuitable(position: BlockPos): Boolean {

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/FindAirTaskConfig.kt

@@ -53,7 +53,7 @@ class FindAirTaskConfig : SingleTaskConfig {
                 it.absent(CobblemonMemories.PATH_COOLDOWN)
             ).apply(it) { walkTarget, pathCooldown ->
                 Trigger { world, entity, time ->
-                    if (!entity.getIsSubmerged() || entity.isInLava) {
+                    if (!entity.getIsSubmerged()) {
                         return@Trigger false
                     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/GoToLandTaskConfig.kt

@@ -57,7 +57,7 @@ class GoToLandTaskConfig : SingleTaskConfig {
                 it.absent(CobblemonMemories.PATH_COOLDOWN)
             ).apply(it) { walkTarget, pathCooldown ->
                 Trigger { world, entity, time ->
-                    if (!entity.isInWater) {
+                    if (!entity.isInLiquid) {
                         return@Trigger false
                     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/NotifyAboutEntityVisibilityTaskConfig.kt

@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.entity.EntityCallbacks
+import com.cobblemon.mod.common.entity.MoLangScriptingEntity
+import com.cobblemon.mod.common.util.asExpression
+import com.mojang.datafixers.util.Either
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.Behavior
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.MemoryStatus
+import net.minecraft.world.entity.ai.sensing.SensorType
+
+/**
+ * Frequently checks a diff on the visibility of entities around the given entity so EntityCallbacks can be triggered.
+ *
+ * @author Hiroku
+ * @since August 7th, 2025
+ */
+class NotifyAboutEntityVisibilityTaskConfig : SingleTaskConfig {
+    val ticksBetweenChecks: ExpressionOrEntityVariable = Either.left("20".asExpression())
+
+    override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) = listOf(ticksBetweenChecks).asVariables()
+    override fun createTask(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        if (entity !is MoLangScriptingEntity) {
+            return null
+        }
+
+        val ticksBetweenChecks = ticksBetweenChecks.resolveInt(behaviourConfigurationContext.runtime)
+
+        behaviourConfigurationContext.addMemories(MemoryModuleType.NEAREST_LIVING_ENTITIES)
+        behaviourConfigurationContext.addSensors(SensorType.NEAREST_LIVING_ENTITIES)
+
+        return object : Behavior<LivingEntity>(mapOf(MemoryModuleType.NEAREST_LIVING_ENTITIES to MemoryStatus.VALUE_PRESENT), Int.MAX_VALUE) {
+            override fun canStillUse(level: ServerLevel, entity: LivingEntity, gameTime: Long) = true
+            override fun checkExtraStartConditions(level: ServerLevel, owner: LivingEntity) = true
+
+            // Buffer of known entities
+            val knownEntities = mutableListOf<LivingEntity>()
+            override fun tick(level: ServerLevel, owner: LivingEntity, gameTime: Long) {
+                if (gameTime % ticksBetweenChecks != 0L) {
+                    return
+                }
+
+                val visibleEntities = owner.getBrain().getMemory(MemoryModuleType.NEAREST_LIVING_ENTITIES)
+                    .orElse(emptyList<LivingEntity>())
+                    .filter { it.isAlive }
+
+                val newEntities = visibleEntities.filterNot { it in knownEntities }
+                val removedEntities = knownEntities.filterNot { it in visibleEntities }
+
+                newEntities.forEach {
+                    entity.callbacks.process(
+                        type = EntityCallbacks.SAW_ENTITY,
+                        functions = mapOf("other_entity" to { _ -> it.asMostSpecificMoLangValue() })
+                    )
+                }
+
+                removedEntities.forEach {
+                    entity.callbacks.process(
+                        type = EntityCallbacks.LOST_ENTITY,
+                        functions = mapOf("other_entity" to { _ -> it.asMostSpecificMoLangValue() })
+                    )
+                }
+
+                knownEntities.clear()
+                knownEntities.addAll(visibleEntities)
+            }
+        }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/TaskConfig.kt

@@ -120,6 +120,7 @@ interface TaskConfig {
             cobblemonResource("target_entity") to TargetEntityTaskConfig::class.java,
             cobblemonResource("memory_aspect") to MemoryAspectTaskConfig::class.java,
             cobblemonResource("activity_change") to ActivityChangeTaskConfig::class.java,
+            cobblemonResource("notify_about_entity_visibility") to NotifyAboutEntityVisibilityTaskConfig::class.java,
         )
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/WanderTaskConfig.kt

@@ -14,8 +14,6 @@ import com.cobblemon.mod.common.api.ai.CobblemonWanderControl
 import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.entity.OmniPathingEntity
-import com.cobblemon.mod.common.entity.ai.CobblemonRandomSurfacePos
 import com.cobblemon.mod.common.entity.ai.CobblemonWalkTarget
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.mainThreadRuntime
@@ -28,7 +26,6 @@ import net.minecraft.server.level.ServerLevel
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.BehaviorUtils
 import net.minecraft.world.entity.ai.behavior.BlockPosTracker
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
@@ -44,27 +41,24 @@ class WanderTaskConfig : SingleTaskConfig {
     }
 
     val condition = booleanVariable(WANDER, "wanders", true).asExpressible()
-    val wanderChance = numberVariable(WANDER, "wander_chance", 1 / (20 * 6F)).asExpressible()
+    val wanderChance = numberVariable(WANDER, "wander_chance", 1/(20 * 6F)).asExpressible()
     val horizontalRange = numberVariable(WANDER, "horizontal_wander_range", 10).asExpressible()
     val verticalRange = numberVariable(WANDER, "vertical_wander_range", 5).asExpressible()
-    val speedMultiplier =
-        numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
-    val avoidTargetingAir: ExpressionOrEntityVariable =
-        Either.left("true".asExpression()) // Whether to avoid air blocks when wandering
+    val speedMultiplier = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible()
+    val avoidTargetingAir: ExpressionOrEntityVariable = Either.left("true".asExpression()) // Whether to avoid air blocks when wandering
     val minimumHeight: ExpressionOrEntityVariable = Either.left("0".asExpression()) // Height off the ground
     val maximumHeight: ExpressionOrEntityVariable = Either.left("-1".asExpression()) // Height off the ground
 
-    override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) =
-        listOf(
-            condition,
-            wanderChance,
-            horizontalRange,
-            verticalRange,
-            speedMultiplier,
-            avoidTargetingAir,
-            minimumHeight,
-            maximumHeight
-        ).asVariables()
+    override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) = listOf(
+        condition,
+        wanderChance,
+        horizontalRange,
+        verticalRange,
+        speedMultiplier,
+        avoidTargetingAir,
+        minimumHeight,
+        maximumHeight
+    ).asVariables()
 
     private fun applyHeightConstraints(
         pos: BlockPos,
@@ -83,7 +77,7 @@ class WanderTaskConfig : SingleTaskConfig {
             (1..MAX_LOOK_DOWN_DISTANCE).firstOrNull {
                 val newPos = pos.below(it)
                 if (!world.getBlockState(newPos).isAir) {
-                    return@firstOrNull true
+                    return@firstOrNull  true
                 } else if (newPos.y <= world.minBuildHeight) {
                     // Don't adjust downward into the void (Mostly if we're in the end)
                     // This doesn't stop fliers from wandering off end islands,
@@ -132,17 +126,18 @@ class WanderTaskConfig : SingleTaskConfig {
                 it.registered(CobblemonMemories.WANDER_CONTROL)
             ).apply(it) { walkTarget, lookTarget, pathCooldown, wanderControl ->
                 Trigger { world, entity, time ->
-                    if (entity !is PathfinderMob || (entity.isUnderWater && !(entity.canBreatheUnderwater() && !((entity as OmniPathingEntity).canSwimInWater())))) {
+                    if (entity !is PathfinderMob || entity.isUnderWater) {
                         return@Trigger false
                     }
 
                     val wanderControl = it.tryGet(wanderControl).orElse(null) ?: CobblemonWanderControl()
                     mainThreadRuntime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
                     val avoidsTargetingAir = avoidTargetingAir.resolveBoolean(mainThreadRuntime)
-                    val wanderChance = mainThreadRuntime.resolveFloat(wanderChanceExpression)
-                    if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) {
+                    val wanderChance = wanderControl.wanderChance ?: mainThreadRuntime.resolveFloat(wanderChanceExpression)
+                    if (wanderChance <= 0 || world.random.nextFloat() > wanderChance || !wanderControl.allowLand) {
                         return@Trigger false
                     }
+
                     pathCooldown.setWithExpiry(true, wanderControl.pathCooldownTicks.toLong())
                     val minimumHeight = minimumHeight.resolveInt(mainThreadRuntime)
                     val maximumHeight = maximumHeight.resolveInt(mainThreadRuntime)
@@ -162,28 +157,14 @@ class WanderTaskConfig : SingleTaskConfig {
                                 maximumHeight,
                                 minimumHeight
                             )
-                        } else if (entity.isUnderWater && entity.canBreatheUnderwater() && !((entity as OmniPathingEntity).canSwimInWater())) {
-                            BehaviorUtils.getRandomSwimmablePos(
-                                entity,
-                                horizontalRange.resolveInt(mainThreadRuntime),
-                                verticalRange.resolveInt(mainThreadRuntime)
-                            )
-                        } else if (entity is OmniPathingEntity && (entity.canWalkOnWater() || entity.canWalkOnLava())) {
-                            CobblemonRandomSurfacePos.getPos(
-                                entity,
-                                horizontalRange.resolveInt(mainThreadRuntime),
-                                verticalRange.resolveInt(mainThreadRuntime)
-                            )
                         } else {
-                            LandRandomPos.getPos(
-                                entity,
-                                horizontalRange.resolveInt(mainThreadRuntime),
-                                verticalRange.resolveInt(mainThreadRuntime)
-                            )
+                                LandRandomPos.getPos(
+                                    entity,
+                                    horizontalRange.resolveInt(mainThreadRuntime),
+                                    verticalRange.resolveInt(mainThreadRuntime)
+                                )
                         } ?: continue
 
-                        if (targetVec == null) continue
-
                         pos = applyHeightConstraints(
                             pos = BlockPos.containing(targetVec),
                             minimumHeight = minimumHeight,
@@ -199,19 +180,10 @@ class WanderTaskConfig : SingleTaskConfig {
                     walkTarget.set(
                         CobblemonWalkTarget(
                             pos = pos,
-                            speedModifier = speedMultiplier.resolveFloat(mainThreadRuntime),
+                            speedModifier = speedMultiplier.resolveFloat(mainThreadRuntime) * wanderControl.speedMultiplier,
                             completionRange = 0,
-                            nodeTypeFilter = { nodeType ->
-                                entity.canBreatheUnderwater() || nodeType !in listOf(
-                                    PathType.WATER,
-                                    PathType.WATER_BORDER
-                                )
-                            },
-                            destinationNodeTypeFilter = { nodeType ->
-                                !avoidsTargetingAir || nodeType !in listOf(
-                                    PathType.OPEN
-                                )
-                            }
+                            nodeTypeFilter = { nodeType -> nodeType !in listOf(PathType.WATER, PathType.WATER_BORDER) },
+                            destinationNodeTypeFilter = { nodeType -> !avoidsTargetingAir || nodeType !in listOf(PathType.OPEN) }
                         )
                     )
                     lookTarget.set(BlockPosTracker(pos.toVec3d().add(0.0, entity.eyeHeight.toDouble(), 0.0)))

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/WaterWanderTaskConfig.kt

@@ -31,10 +31,8 @@ import net.minecraft.world.entity.ai.behavior.BlockPosTracker
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
-import net.minecraft.world.level.material.Fluids
 import net.minecraft.world.level.pathfinder.PathType
 import net.minecraft.world.phys.Vec3
-import kotlin.math.ceil
 
 class WaterWanderTaskConfig : SingleTaskConfig {
     val condition = booleanVariable(WANDER, "water_wanders", true).asExpressible()
@@ -80,7 +78,7 @@ class WaterWanderTaskConfig : SingleTaskConfig {
                     }
 
                     mainThreadRuntime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-                    val wanderChance = mainThreadRuntime.resolveFloat(wanderChanceExpression)
+                    val wanderChance = wanderControl.wanderChance ?: mainThreadRuntime.resolveFloat(wanderChanceExpression)
                     if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) {
                         return@Trigger false
                     }
@@ -102,38 +100,11 @@ class WaterWanderTaskConfig : SingleTaskConfig {
                         return@Trigger false
                     }
 
-                    // Move target pos down so that we don't move out of water too much
-                    val requiredDepth = ceil(0.5 + entity.eyeHeight)
-                    // Get the current depth of the block
-                    var depth = 1
-                    var testPos = pos.above()
-                    var blockState = entity.level().getBlockState(testPos)
-                    while (blockState.fluidState.type == Fluids.WATER) {
-                        depth++
-                        testPos = testPos!!.above()
-                        blockState = entity.level().getBlockState(testPos)
-                    }
-
-                    if (depth < requiredDepth) {
-                        // Iterate down until we reach the desired min depth or we reach a non water block
-                        pos = pos.below()
-                        blockState = entity.level().getBlockState(pos)
-                        while (blockState.fluidState.type == Fluids.WATER && depth < requiredDepth) {
-                            depth ++
-                            pos = pos!!.below()
-                            blockState = entity.level().getBlockState(pos)
-                        }
-                    }
-
-                    if (depth < requiredDepth) {
-                        return@Trigger false
-                    }
-
                     walkTarget.set(
                         CobblemonWalkTarget(
                             pos = pos,
                             nodeTypeFilter = { it == PathType.WATER || it == PathType.WATER_BORDER },
-                            speedModifier = speedMultiplier.resolveFloat(mainThreadRuntime),
+                            speedModifier = speedMultiplier.resolveFloat(mainThreadRuntime) * wanderControl.speedMultiplier,
                             completionRange = 0
                         )
                     )

common/src/main/kotlin/com/cobblemon/mod/common/api/cooking/Flavour.kt

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.api.cooking
 
+import net.minecraft.ChatFormatting
 import net.minecraft.util.StringRepresentable
 
 /**
@@ -17,16 +18,16 @@ import net.minecraft.util.StringRepresentable
  * @author Licious
  * @since November 28th, 2022
  */
-enum class Flavour(val colour: Int): StringRepresentable {
-    SPICY(0xFA795E),
-    DRY(0x65AFF3),
-    SWEET(0xFF82CF),
-    BITTER(0x77C96A),
-    SOUR(0xF3D465),
-    MILD(0x9D99BF);
+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),
+    MILD(0xFF00FF, ChatFormatting.DARK_PURPLE);
 
     override fun getSerializedName() = name
     companion object {
         val CODEC = StringRepresentable.fromEnum<Flavour> { Flavour.entries.toTypedArray() }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/cooking/PokePuffUtils.kt

@@ -9,11 +9,13 @@
 package com.cobblemon.mod.common.api.cooking
 
 import com.cobblemon.mod.common.CobblemonItemComponents
+import com.cobblemon.mod.common.item.PokePuffItem
 import com.cobblemon.mod.common.item.PokePuffItem.Companion.DISLIKED_FLAVOR_MULTIPLIER
 import com.cobblemon.mod.common.item.PokePuffItem.Companion.LIKED_FLAVOR_MULTIPLIER
 import com.cobblemon.mod.common.pokemon.Nature
-import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.item.ItemStack
+import net.minecraft.core.registries.BuiltInRegistries
 
 object PokePuffUtils {
 
@@ -23,12 +25,11 @@ object PokePuffUtils {
 
         val (baseFriendship) = calculateBaseFriendship(stack)
 
-        val multiplier = if (
-            dominantFlavour == nature.favouriteFlavour ||
-            (dominantFlavour == Flavour.MILD && isNeutralNature)
-        ) LIKED_FLAVOR_MULTIPLIER else -DISLIKED_FLAVOR_MULTIPLIER
-
-        return (baseFriendship / multiplier).toInt()
+        return when {
+            dominantFlavour == nature.favouriteFlavour -> (baseFriendship / LIKED_FLAVOR_MULTIPLIER).toInt()
+            dominantFlavour == Flavour.MILD && isNeutralNature -> (baseFriendship / 2.0).coerceAtLeast(1.0).toInt()
+            else -> (-baseFriendship / DISLIKED_FLAVOR_MULTIPLIER).toInt()
+        }
     }
 
     fun calculateBaseFriendship(stack: ItemStack): Pair<Double, Double> {
@@ -76,8 +77,8 @@ object PokePuffUtils {
             Flavour.SPICY -> "attack"
             Flavour.DRY -> "special_attack"
             Flavour.SWEET -> "speed"
-            Flavour.BITTER -> "special_defence"
-            Flavour.SOUR -> "defence"
+            Flavour.BITTER -> "special_defense"
+            Flavour.SOUR -> "defense"
             Flavour.MILD -> "neutral"
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/data/DataProvider.kt

@@ -18,13 +18,14 @@ import net.minecraft.resources.ResourceLocation
  * @since August 5th, 2022
  */
 interface DataProvider {
+
     /**
      * Registers a [DataRegistry] to listen for updates.
      * The updates will automatically happen on the correct sides based on [DataRegistry.type].
      *
      * @param registry The [DataRegistry] being registered.
      */
-    fun <T : DataRegistry> register(registry: T, reloadable: Boolean): T
+    fun <T : DataRegistry> register(registry: T): T
 
     /**
      * Attempts to find a [DataRegistry] with the given [ResourceLocation].

common/src/main/kotlin/com/cobblemon/mod/common/api/events/CobblemonEvents.kt

@@ -152,9 +152,6 @@ object CobblemonEvents {
     @JvmField
     val RIDE_EVENT_PRE = CancelableObservable<RidePokemonEvent.Pre>()
 
-    @JvmField
-    val RIDE_EVENT_APPLY_STAMINA = EventObservable<RidePokemonEvent.ApplyStamina>()
-
     @JvmField
     val RIDE_EVENT_POST = EventObservable<RidePokemonEvent.Post>()
 

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/RidePokemonEvent.kt

@@ -8,7 +8,9 @@
 
 package com.cobblemon.mod.common.api.events.pokemon
 
+import com.cobblemon.mod.common.util.server
 import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
@@ -47,36 +49,4 @@ interface RidePokemonEvent {
             "pokemon" to pokemon.struct
         )
     }
-
-    /**
-     * Event published when stamina is being applied. At this point you can modify the stamina that will get used on the
-     * mount or you can make the stamina infinite. Handy hey.
-     */
-    class ApplyStamina(
-        override val player: ServerPlayer,
-        override val pokemon: PokemonEntity,
-        var rideStamina: Float
-    ) : RidePokemonEvent {
-        val context = mutableMapOf(
-            "player" to player.asMoLangValue(),
-            "pokemon" to pokemon.struct,
-            "ride_stamina" to DoubleValue(rideStamina)
-        )
-        val functions = moLangFunctionMap(
-            "set_ride_stamina" to { params ->
-                rideStamina = params.getDouble(0).toFloat().coerceIn(0F, 1F)
-                DoubleValue.ONE
-            },
-            "set_infinite_stamina" to { _ ->
-                rideStamina = -1F
-                DoubleValue.ONE
-            },
-        )
-
-        fun setInfiniteStamina() {
-            rideStamina = -1F
-        }
-
-        fun isInfiniteStamina() = rideStamina == -1F
-    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/item/HeldItems.kt

@@ -1,57 +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.item
-
-import com.cobblemon.mod.common.api.data.DataRegistry
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.battles.runner.ShowdownService
-import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-import net.minecraft.server.packs.resources.ResourceManager
-import java.io.File
-
-object HeldItems : DataRegistry {
-
-    override val id = cobblemonResource("held_items")
-    override val type = PackType.SERVER_DATA
-    override val observable = SimpleObservable<HeldItems>()
-    override fun sync(player: ServerPlayer) {}
-
-    // val heldItems = PrioritizedList<BagItemLike>()
-    internal val heldItemsScripts = mutableMapOf<String, String>() // showdown item ID to JavaScript
-    val showdownItems = hashSetOf<String>()
-
-    override fun reload(manager: ResourceManager) {
-        heldItemsScripts.clear()
-        ShowdownService.service.resetRegistryData("heldItem")
-        manager.listResources("held_items") { it.path.endsWith(".js") }.forEach { (identifier, resource) ->
-            resource.open().use { stream ->
-                stream.bufferedReader().use { reader ->
-                    val resolvedIdentifier = ResourceLocation.fromNamespaceAndPath(identifier.namespace, File(identifier.path).nameWithoutExtension)
-                    val js = reader.readText()
-                    heldItemsScripts[resolvedIdentifier.path] = js
-                }
-            }
-        }
-        ShowdownService.service.sendRegistryData(heldItemsScripts, "heldItem")
-
-        val itemsJson = ShowdownService.service.getRegistryData("heldItem")
-        for (i in 0 until itemsJson.size()) {
-            val jsItem = itemsJson[i].asJsonObject
-            showdownItems += jsItem.get("id").asString
-        }
-
-        CobblemonHeldItemManager.load()
-
-        this.observable.emit(this)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt

@@ -12,7 +12,6 @@ import com.bedrockk.molang.runtime.MoLangEnvironment
 import com.bedrockk.molang.runtime.MoLangRuntime
 import com.bedrockk.molang.runtime.MoParams
 import com.bedrockk.molang.runtime.struct.ArrayStruct
-import com.bedrockk.molang.runtime.struct.MoStruct
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.bedrockk.molang.runtime.struct.VariableStruct
 import com.bedrockk.molang.runtime.value.DoubleValue
@@ -25,6 +24,8 @@ import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.CobblemonUnlockableWallpapers
 import com.cobblemon.mod.common.Environment
 import com.cobblemon.mod.common.api.ai.CobblemonBlockPosTracker
+import com.cobblemon.mod.common.api.ai.CobblemonAttackTargetData
+import com.cobblemon.mod.common.api.ai.CobblemonAvoidTargetData
 import com.cobblemon.mod.common.api.ai.CobblemonWanderControl
 import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
@@ -348,10 +349,7 @@ object MoLangFunctions {
             val b = format.parse(dateB)
             DoubleValue(a.after(b))
         },
-        "create_simple_party_provider" to java.util.function.Function { params ->
-            val partyProvider = SimplePartyProvider()
-            return@Function partyProvider.struct
-        },
+        "create_simple_party_provider" to java.util.function.Function { SimplePartyProvider().struct },
         "create_pickup_item" to java.util.function.Function { params ->
             val item = params.getOrNull<MoValue>(0)?.asString()?.let(ObtainableItemCondition::parseFromString)
             val pickupPriority = params.getIntOrNull(1) ?: 0
@@ -364,6 +362,7 @@ object MoLangFunctions {
         { worldHolder ->
             val world = worldHolder.value()
             val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
+            map.put("id") { StringValue(world.dimension().location().toString()) }
             map.put("is_time_of_day") { params ->
                 val timeOfDay = TimeRange.timeRanges[params.getString(0).lowercase()]
                     ?: return@put DoubleValue.ZERO
@@ -807,6 +806,13 @@ object MoLangFunctions {
                 val source = DamageSource(entity.level().registryAccess().registryOrThrow(Registries.DAMAGE_TYPE).getHolder(DamageTypes.GENERIC).get())
                 entity.hurt(source, amount.toFloat())
             }
+            map.put("damage_source") { params ->
+                val registry = entity.level().registryAccess().registryOrThrow(Registries.DAMAGE_TYPE)
+                val type = params.getStringOrNull(0)?.asIdentifierDefaultingNamespace()?.let(registry::getHolder)
+                    ?: registry.getHolder(DamageTypes.GENERIC)
+                val damageSource = DamageSource(type.get(), entity)
+                return@put damageSource.asMoLangValue()
+            }
             map.put("distance_to_owner") {
                 if (entity !is TamableAnimal) {
                     return@put DoubleValue.ZERO
@@ -930,6 +936,10 @@ object MoLangFunctions {
             map.put("is_on_fire") { _ -> DoubleValue(entity.isOnFire) }
             map.put("is_invisible") { _ -> DoubleValue(entity.isInvisible) }
             map.put("is_riding") { _ -> DoubleValue(entity.isPassenger) }
+            map.put("distance_to_entity") { params ->
+                val otherEntity = params.get<MoValue>(0) as? ObjectValue<Entity> ?: return@put DoubleValue.ZERO
+                return@put DoubleValue(entity.distanceTo(otherEntity.obj))
+            }
             map.put("distance_to_pos") { params ->
                 val x = params.getDouble(0)
                 val y = params.getDouble(1)
@@ -1063,7 +1073,19 @@ object MoLangFunctions {
         }
     )
 
-    val livingEntityFunctions: MutableList<(LivingEntity) -> HashMap<String, java.util.function.Function<MoParams, Any>>> = mutableListOf<(LivingEntity) -> HashMap<String, java.util.function.Function<MoParams, Any>>>(
+    val damageSourceFunctions: MutableList<(DamageSource) -> java.util.HashMap<String, java.util.function.Function<MoParams, Any>>> = mutableListOf(
+        { source ->
+            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
+            map.put("direct_entity") { source.directEntity?.asMostSpecificMoLangValue() ?: DoubleValue.ZERO }
+            map.put("entity") { source.entity?.asMostSpecificMoLangValue() ?: DoubleValue.ZERO }
+            map.put("is_food_exhaustion") { DoubleValue(source.foodExhaustion) }
+            map.put("is_direct") { DoubleValue(source.isDirect) }
+            map.put("type") { StringValue(source.typeHolder().unwrapKey().get().location().toString()) }
+            return@mutableListOf map
+        }
+    )
+
+    val livingEntityFunctions: MutableList<(LivingEntity) -> HashMap<String, java.util.function.Function<MoParams, Any>>> = mutableListOf(
         { entity ->
             val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
             map.put("is_player") { _ -> DoubleValue(entity is Player) }
@@ -1105,6 +1127,23 @@ object MoLangFunctions {
                 val amount = params.getDouble(0)
                 entity.heal(amount.toFloat())
             }
+            map.put("reset_activity") { _ ->
+                entity.brain.updateActivityFromSchedule(entity.level().dayTime, entity.level().gameTime)
+                DoubleValue.ONE
+            }
+            map.put("activity") { _ ->
+                return@put entity.brain.activeNonCoreActivity.map { StringValue(it.name) }.orElse(null) ?: DoubleValue.ZERO
+            }
+            map.put("set_activity") { params ->
+                val activityId = params.getString(0).asIdentifierDefaultingNamespace()
+                val activity = BuiltInRegistries.ACTIVITY.get(activityId)
+                if (activity != null) {
+                    entity.brain.setActiveActivityIfPossible(activity)
+                    return@put DoubleValue.ONE
+                } else {
+                    return@put DoubleValue.ZERO
+                }
+            }
             map.put("is_looking_at") { params ->
                 val targetEntity = params.get<MoValue>(0)
                 val maxDistance = params.getDoubleOrNull(1)?.toFloat() ?: 2.0F
@@ -1131,6 +1170,26 @@ object MoLangFunctions {
                 val brain = entity.brain
                 brain.setMemoryWithExpiry(MemoryModuleType.LOOK_TARGET, CobblemonBlockPosTracker(Vec3(x, y, z), flags.toSet()), duration.toLong())
             }
+            map.put("is_doing_activity") { params ->
+                val identifiers = params.params.map { it.asString().asIdentifierDefaultingNamespace(namespace = "minecraft") }
+                val activities = identifiers.mapNotNull(BuiltInRegistries.ACTIVITY::get)
+                if (activities.isNotEmpty()) {
+                    return@put DoubleValue(activities.any(entity.brain::isActive))
+                } else {
+                    return@put DoubleValue.ZERO
+                }
+            }
+            map.put("get_attack_target_data_memory") {
+                val value = entity.brain.getMemorySafely(CobblemonMemories.ATTACK_TARGET_DATA).orElse(null)
+                    ?: CobblemonAttackTargetData()
+                if (
+                    !entity.brain.checkMemory(CobblemonMemories.ATTACK_TARGET_DATA, MemoryStatus.VALUE_PRESENT)
+                    && entity.brain.checkMemory(CobblemonMemories.ATTACK_TARGET_DATA, MemoryStatus.REGISTERED)
+                ) {
+                    entity.brain.setMemory(CobblemonMemories.ATTACK_TARGET_DATA, value)
+                }
+                return@put value.struct
+            }
             map.put("get_wander_control_memory") {
                 val value = entity.brain.getMemorySafely(CobblemonMemories.WANDER_CONTROL).orElse(null)
                     ?: CobblemonWanderControl()
@@ -1142,6 +1201,17 @@ object MoLangFunctions {
                 }
                 return@put value.struct
             }
+            map.put("get_avoid_target_data_memory") {
+                val value = entity.brain.getMemorySafely(CobblemonMemories.AVOID_TARGET_DATA).orElse(null)
+                    ?: CobblemonAvoidTargetData()
+                if (
+                    !entity.brain.checkMemory(CobblemonMemories.AVOID_TARGET_DATA, MemoryStatus.VALUE_PRESENT)
+                    && entity.brain.checkMemory(CobblemonMemories.AVOID_TARGET_DATA, MemoryStatus.REGISTERED)
+                ) {
+                    entity.brain.setMemory(CobblemonMemories.AVOID_TARGET_DATA, value)
+                }
+                return@put value.struct
+            }
             map.put("get_position_memory") { params ->
                 val id = params.getString(0).asIdentifierDefaultingNamespace()
                 val memoryType = BuiltInRegistries.MEMORY_MODULE_TYPE.get(id)
@@ -1168,6 +1238,30 @@ object MoLangFunctions {
                     return@put DoubleValue.ZERO
                 }
             }
+            map.put("get_entity_memory") { params ->
+                val id = params.getString(0).asIdentifierDefaultingNamespace()
+                val memoryType = BuiltInRegistries.MEMORY_MODULE_TYPE.get(id)
+                if (entity.brain.checkMemory(memoryType, MemoryStatus.VALUE_PRESENT)) {
+                    val memory = entity.brain.getMemory(memoryType).get()
+                    return@put when (memory) {
+                        is Entity -> memory.asMostSpecificMoLangValue()
+                        else -> DoubleValue.ZERO
+                    }
+                } else {
+                    return@put DoubleValue.ZERO
+                }
+            }
+            map.put("set_entity_memory") { params ->
+                val memory = params.getString(0).asIdentifierDefaultingNamespace().let(BuiltInRegistries.MEMORY_MODULE_TYPE::get) as MemoryModuleType<LivingEntity>
+                val entityValue = (params.get<MoValue>(1) as? ObjectValue<*>)?.obj as? LivingEntity ?: return@put DoubleValue.ZERO
+                val expiry = params.getIntOrNull(2) ?: -1
+                if (expiry != -1) {
+                    entity.brain.setMemoryWithExpiry(memory, entityValue, expiry.toLong())
+                } else {
+                    entity.brain.setMemory(memory, entityValue)
+                }
+                return@put DoubleValue.ONE
+            }
             map.put("set_uuid_memory") { params ->
                 val memory = params.getString(0).asIdentifierDefaultingNamespace().let(BuiltInRegistries.MEMORY_MODULE_TYPE::get) as MemoryModuleType<UUID>
                 val uuid = params.getString(1).asUUID ?: return@put DoubleValue.ZERO
@@ -1214,6 +1308,18 @@ object MoLangFunctions {
                     return@put DoubleValue.ZERO
                 }
             }
+            map.put("is_visible_entity") { params ->
+                val otherEntity = params.get<ObjectValue<*>>(0)?.obj as? LivingEntity ?: return@put DoubleValue.ZERO
+                val visibleMobs = entity.brain.getMemorySafely(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES).orElse(null)
+                    ?: return@put DoubleValue.ZERO
+                return@put DoubleValue(visibleMobs.contains(otherEntity))
+            }
+            map.put("is_nearby_entity") { params ->
+                val otherEntity = params.get<ObjectValue<*>>(0)?.obj as? LivingEntity ?: return@put DoubleValue.ZERO
+                val nearbyMobs = entity.brain.getMemorySafely(MemoryModuleType.NEAREST_LIVING_ENTITIES).orElse(null)
+                    ?: return@put DoubleValue.ZERO
+                return@put DoubleValue(nearbyMobs.contains(otherEntity))
+            }
             if (entity is PathfinderMob) {
                 map.put("walk_to") { params ->
                     val x = params.getDouble(0)
@@ -1252,15 +1358,6 @@ object MoLangFunctions {
             map.put("in_battle") { DoubleValue(npc.isInBattle()) }
             map.put("battles") { ArrayStruct(npc.battleIds.mapNotNull { BattleRegistry.getBattle(it)?.struct }.mapIndexed { index, value -> "$index" to value }.toMap()) }
             map.put("stop_battles") { _ -> npc.battleIds.forEach { BattleRegistry.getBattle(it)?.stop() } }
-            map.put("is_doing_activity") { params ->
-                val identifiers = params.params.map { it.asString().asIdentifierDefaultingNamespace(namespace = "minecraft") }
-                val activities = identifiers.mapNotNull { identifier -> BuiltInRegistries.ACTIVITY.get(identifier) }
-                if (activities.isNotEmpty()) {
-                    return@put DoubleValue(activities.any { activity -> npc.brain.isActive(activity) })
-                } else {
-                    return@put DoubleValue.ZERO
-                }
-            }
             map.put("run_script_on_client") { params ->
                 val world = npc.level()
                 if (world is ServerLevel) {
@@ -2471,6 +2568,15 @@ object MoLangFunctions {
         return value
     }
 
+    fun DamageSource.asMoLangValue(): ObjectValue<DamageSource> {
+        val value = ObjectValue(
+            obj = this,
+            stringify = { it.toString() }
+        )
+        value.addFunctions(damageSourceFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
+        return value
+    }
+
     /**
      * Different functions exist depending on the entity type, this tries to make the struct that's most specific to the type.
      */

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

@@ -15,7 +15,6 @@ import net.minecraft.world.entity.LivingEntity
 import org.joml.Matrix3f
 import org.joml.Quaternionf
 import org.joml.Vector3f
-import kotlin.math.abs
 import kotlin.math.asin
 import kotlin.math.sign
 
@@ -114,7 +113,7 @@ open class OrientationController(val entity: LivingEntity) {
 
     fun applyGlobalPitch(deltaPitchDegrees: Float) = updateOrientation { original ->
         val currQuat = Quaternionf().setFromUnnormalized(original)
-        val horzLeftVector = Vector3f(0.0f, -abs(this.upVector.y.sign), 0.0f).cross(this.forwardVector)
+        val horzLeftVector = Vector3f(0.0f, this.upVector.y.sign, 0.0f).cross(this.forwardVector)
         // Avoid NaN issue when normalizing and the forwardVector and upVector are equal
         val pitchAxis = if (horzLeftVector.lengthSquared() < 0.01) this.leftVector else horzLeftVector
 

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonProperties.kt

@@ -131,7 +131,6 @@ open class PokemonProperties {
             props.species = parseSpeciesIdentifier(keyPairs)
             props.form = parseForm(keyPairs)
             props.friendship = parseIntProperty(keyPairs, listOf("friendship"))?.coerceIn(0, Cobblemon.config.maxPokemonFriendship)
-            props.fullness = parseIntProperty(keyPairs, listOf("fullness"))
             props.pokeball = parseIdentifierOfRegistry(keyPairs, listOf("pokeball")) { identifier -> PokeBalls.getPokeBall(identifier)?.name?.toString() }
             props.nature = parseIdentifierOfRegistry(keyPairs, listOf("nature")) { identifier -> Natures.getNature(identifier)?.name?.toString() }
             props.ability = parseStringOfRegistry(keyPairs, listOf("ability")) { Abilities.get(it)?.name }
@@ -327,7 +326,6 @@ open class PokemonProperties {
     var gender: Gender? = null
     var level: Int? = null
     var friendship: Int? = null
-    var fullness: Int? = null
     var pokeball: String? = null
     var nature: String? = null
     var ability: String? = null
@@ -399,7 +397,6 @@ open class PokemonProperties {
                 pokemon.setFriendship(pokemon.form.baseFriendship)
             }
         }
-        fullness?.let { pokemon.currentFullness = it }
         pokeball?.let { PokeBalls.getPokeBall(it.asIdentifierDefaultingNamespace())?.let { pokeball -> pokemon.caughtBall = pokeball } }
         nature?.let  { Natures.getNature(it.asIdentifierDefaultingNamespace())?.let { nature -> pokemon.nature = nature } }
         customProperties.forEach { it.apply(pokemon) }
@@ -507,7 +504,6 @@ open class PokemonProperties {
         nickname?.takeIf { it.string != pokemon.nickname?.string }?.let { return false }
         form?.takeIf { !it.equals(pokemon.form.name, true) }?.let { return false }
         friendship?.takeIf { it != pokemon.friendship }?.let { return false }
-        fullness?.takeIf { it != pokemon.currentFullness }?.let { return false }
         pokeball?.takeIf { it != pokemon.caughtBall.name.toString() }?.let { return false }
         nature?.takeIf { it != pokemon.nature.name.toString() }?.let { return false }
         ability?.takeIf { it != pokemon.ability.name }?.let { return false }
@@ -592,7 +588,6 @@ open class PokemonProperties {
         originalTrainer?.takeIf { it != properties.originalTrainer }?.let{ return false }
         originalTrainerType?.takeIf { it != properties.originalTrainerType }?.let{ return false }
         moves?.takeIf { it.any { move -> properties.moves?.none { it == move } == true } }?.let { return false }
-        fullness?.takeIf { it != properties.fullness }?.let { return false }
         return true
     }
 
@@ -641,7 +636,6 @@ open class PokemonProperties {
         nickname?.let { nbt.putString(DataKeys.POKEMON_NICKNAME, Component.Serializer.toJson(it, registryLookup)) }
         form?.let { nbt.putString(DataKeys.POKEMON_FORM_ID, it) }
         friendship?.let { nbt.putInt(DataKeys.POKEMON_FRIENDSHIP, it) }
-        fullness?.let { nbt.putInt(DataKeys.POKEMON_FULLNESS, it) }
         pokeball?.let { nbt.putString(DataKeys.POKEMON_CAUGHT_BALL, it) }
         nature?.let { nbt.putString(DataKeys.POKEMON_NATURE, it) }
         ability?.let { nbt.putString(DataKeys.POKEMON_ABILITY, it) }
@@ -673,7 +667,6 @@ open class PokemonProperties {
         nickname = if (tag.contains(DataKeys.POKEMON_NICKNAME)) Component.Serializer.fromJson(tag.getString(DataKeys.POKEMON_NICKNAME), registryLookup) else null
         form = if (tag.contains(DataKeys.POKEMON_FORM_ID)) tag.getString(DataKeys.POKEMON_FORM_ID) else null
         friendship = if (tag.contains(DataKeys.POKEMON_FRIENDSHIP)) tag.getInt(DataKeys.POKEMON_FRIENDSHIP) else null
-        fullness = if (tag.contains(DataKeys.POKEMON_FULLNESS)) tag.getInt(DataKeys.POKEMON_FULLNESS) else null
         pokeball = if (tag.contains(DataKeys.POKEMON_CAUGHT_BALL)) tag.getString(DataKeys.POKEMON_CAUGHT_BALL) else null
         nature = if (tag.contains(DataKeys.POKEMON_NATURE)) tag.getString(DataKeys.POKEMON_NATURE) else null
         ability = if (tag.contains(DataKeys.POKEMON_ABILITY)) tag.getString(DataKeys.POKEMON_ABILITY) else null
@@ -707,7 +700,6 @@ open class PokemonProperties {
         //nickname?.let { json.addProperty(DataKeys.POKEMON_NICKNAME, Text.Serialization.toJsonString(it)) }
         form?.let { json.addProperty(DataKeys.POKEMON_FORM_ID, it) }
         friendship?.let { json.addProperty(DataKeys.POKEMON_FRIENDSHIP, it) }
-        fullness?.let {json.addProperty(DataKeys.POKEMON_FULLNESS, it)}
         pokeball?.let { json.addProperty(DataKeys.POKEMON_CAUGHT_BALL, it) }
         nature?.let { json.addProperty(DataKeys.POKEMON_NATURE, it) }
         ability?.let { json.addProperty(DataKeys.POKEMON_ABILITY, it) }
@@ -740,7 +732,6 @@ open class PokemonProperties {
         //nickname = json.get(DataKeys.POKEMON_NICKNAME)?.asString?.let { Text.Serialization.fromJson(it) }
         form = json.get(DataKeys.POKEMON_FORM_ID)?.asString
         friendship = json.get(DataKeys.POKEMON_FRIENDSHIP)?.asInt
-        fullness = json.get(DataKeys.POKEMON_FULLNESS)?.asInt
         pokeball = json.get(DataKeys.POKEMON_CAUGHT_BALL)?.asString
         nature = json.get(DataKeys.POKEMON_NATURE)?.asString
         ability = json.get(DataKeys.POKEMON_ABILITY)?.asString
@@ -772,7 +763,6 @@ open class PokemonProperties {
         shiny?.let { pieces.add("shiny=$it") }
         gender?.let { pieces.add("gender=$it")}
         friendship?.let { pieces.add("friendship=$it") }
-        fullness?.let {pieces.add("fullness=$it")}
         pokeball?.let { pieces.add("pokeball=$it") }
         nature?.let { pieces.add("nature=$it") }
         ability?.let { pieces.add("ability=$it") }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonSpecies.kt

@@ -53,6 +53,7 @@ import com.cobblemon.mod.common.pokemon.ai.ObtainableItemConditionAdapter
 import com.cobblemon.mod.common.pokemon.evolution.adapters.CobblemonEvolutionAdapter
 import com.cobblemon.mod.common.pokemon.evolution.adapters.CobblemonPreEvolutionAdapter
 import com.cobblemon.mod.common.pokemon.evolution.adapters.LegacyItemConditionWrapperAdapter
+import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.util.adapters.*
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.common.collect.HashBasedTable
@@ -157,6 +158,8 @@ object PokemonSpecies : JsonDataRegistry<Species> {
                 it.resetRegistryData("species")
                 it.sendRegistryData(allShowdownSpecies(), "species")
                 it.indicateSpeciesInitialized()
+                // Reload this with the mod
+                CobblemonHeldItemManager.load()
                 Cobblemon.LOGGER.info("Loaded {} Pokémon species", this.speciesByIdentifier.size)
                 this.observable.emit(this)
             }

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

@@ -8,6 +8,9 @@
 
 package com.cobblemon.mod.common.api.riding
 
+import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
+import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
+import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
 import net.minecraft.world.entity.PlayerRideableJumping
 
 /**

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

@@ -9,7 +9,10 @@
 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
 import com.cobblemon.mod.common.util.*
 import com.cobblemon.mod.common.util.adapters.RidingBehaviourSettingsAdapter
 import net.minecraft.network.RegistryFriendlyByteBuf
@@ -29,10 +32,10 @@ class RidingProperties(
                     { buffer.readEnumConstant(RidingStyle::class.java) },
                     {
                         val key = buffer.readResourceLocation()
-                        val behaviour = RidingBehaviourSettingsAdapter.types[key]?.getConstructor()?.newInstance()
+                        val settings = RidingBehaviourSettingsAdapter.types[key]?.getConstructor()?.newInstance()
                             ?: error("Unknown controller key: $key")
-                        behaviour.decode(buffer)
-                        behaviour
+                        settings.decode(buffer)
+                        settings
                     }
                 )
             }
@@ -48,10 +51,7 @@ class RidingProperties(
             buffer.writeMap(
                 v,
                 { _, style -> buffer.writeEnumConstant(style) },
-                { _, behaviour ->
-                    buffer.writeResourceLocation(behaviour.key)
-                    behaviour.encode(buffer)
-                }
+                { _, behaviour -> behaviour.encode(buffer) }
             )
         }
     }

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

@@ -25,8 +25,7 @@ data class Seat(
     val locator: String?,
     val offset: Vec3?,
     val poseOffsets: MutableList<SeatPoseOffset>?,
-    val poseAnimations: MutableList<SeatPoseAnimations>?,
-    val handsBusy: Boolean = false,
+    val poseAnimations: MutableList<SeatPoseAnimations>?
 ) : Encodable {
     fun getOffset(poseType: PoseType) : Vec3 {
         return poseOffsets?.firstOrNull { poseType in it.poseTypes }?.offset ?: Vec3.ZERO
@@ -41,7 +40,6 @@ data class Seat(
         buffer.writeNullable(poseAnimations) { _, v ->
             buffer.writeCollection(v) { _, animations -> animations.encode(buffer) }
         }
-        buffer.writeBoolean(handsBusy)
     }
 
     companion object {
@@ -50,8 +48,7 @@ data class Seat(
                 buffer.readNullable { buffer.readString() },
                 buffer.readNullable { buffer.readVec3() },
                 buffer.readNullable { buffer.readList { SeatPoseOffset.decode(buffer) } },
-                buffer.readNullable { buffer.readList { SeatPoseAnimations.decode(buffer) } },
-                buffer.readBoolean()
+                buffer.readNullable { buffer.readList { SeatPoseAnimations.decode(buffer) } }
             )
         }
     }

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

@@ -10,8 +10,10 @@ package com.cobblemon.mod.common.api.riding.behaviour
 
 import com.cobblemon.mod.common.api.net.Decodable
 import com.cobblemon.mod.common.api.net.Encodable
+import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.phys.Vec3
 
 /**
  * Represents static settings of a riding behaviour.
@@ -19,17 +21,17 @@ import net.minecraft.resources.ResourceLocation
  * Typically this will be initialized for each pokemon form during deserialization
  * to determine how they should ride.
  *
- * These also exist in a datapacked folder, ride_settings, which are used for the fallback
- * values if non-stat settings are omitted in the pokemon form JSON.
- *
  * @author landonjw
  */
 interface RidingBehaviourSettings: Encodable, Decodable {
     val key: ResourceLocation
     val stats: MutableMap<RidingStat, IntRange>
 
-    fun calculate(stat: RidingStat, boostAmount: Float): Float {
+    fun calculate(stat: RidingStat, boosts: Int): Float {
         val range = stats[stat] ?: return 0F
-        return range.first + boostAmount
+        val boostQuotient = boosts / 255F
+        return range.first + (range.last - range.first) * boostQuotient
     }
+
+    fun hasStat(stat: RidingStat) = stats.containsKey(stat)
 }

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

@@ -18,7 +18,7 @@ import net.minecraft.world.phys.Vec3
  * This is intended to contain mutable state that is passed between the client and server
  * or temporary state that is used during the riding process.
  *
- * This will be destroyed when the main rider dismounts the Pokemon.
+ * This will be destroyed when the a user dismounts the Pokemon.
  *
  * @author landonjw
  */

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

@@ -8,17 +8,13 @@
 
 package com.cobblemon.mod.common.api.riding.behaviour
 
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.DoubleJump
 import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.client.MountedCameraTypeHandler
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.tags.FluidTags
 import net.minecraft.world.entity.LivingEntity
 import kotlin.collections.get
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.entity.player.Player
 
 /**
  * Small wrapper around a RidingBehaviour to provide sane defaults in the event that the behaviour is not active.
@@ -53,15 +49,6 @@ class RidingController(
             if (newTransition != null && behaviourSettings != null) {
                 val newState = RidingBehaviours.get(behaviourSettings.key).createDefaultState(behaviourSettings)
                 context?.let { newState.stamina.set(it.state.stamina.get(), forced = true) }
-                context?.let { newState.rideVelocity.set(it.state.rideVelocity.get(), forced = true) }
-                val previousKey = context?.behaviour
-                val newKey = behaviourSettings.key
-                for (passenger in entity.passengers) {
-                    if (passenger is Player && passenger !is ServerPlayer) {
-                        MountedCameraTypeHandler.handleTransition(previousKey ?: continue, newKey)
-                    }
-                }
-
                 context = ActiveRidingContext(behaviourSettings.key, behaviourSettings, newState, newTransition)
                 lastTransitionAge = entity.ticksLived
             } else {

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

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.riding.behaviour.types.air
 import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.MoLangMath.lerp
 import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.CobblemonRideSettings
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.orientation.OrientationController
 import com.cobblemon.mod.common.api.riding.RidingStyle
@@ -22,18 +21,18 @@ import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.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.Mth
 import net.minecraft.util.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
-import net.minecraft.world.phys.shapes.Shapes
 import kotlin.math.*
 
 class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
@@ -50,22 +49,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
     val poseProvider = PoseProvider<BirdSettings, BirdState>(PoseType.HOVER)
         .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVelocity.get().z > 0.2 })
 
-    val globalBird: BirdSettings
-        get() = CobblemonRideSettings.bird
-
     override fun isActive(settings: BirdSettings, state: BirdState, 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: BirdSettings, state: BirdState, vehicle: PokemonEntity): PoseType {
@@ -103,10 +88,7 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         if (cos(controller.roll.toRadians()) < 0.0) {
             val upsideDownRate = 1.0 / (2.0 * 20.0) // 2 seconds to max out upsideDown force
             state.currUpsideDownForce.set( min(1.0, state.currUpsideDownForce.get() + upsideDownRate * abs(cos(controller.roll.toRadians()))))
-        } else if (state.stamina.get() == 0.0f) { // checks stamina depletion and forces dive if depleted
-            val upsideDownRate = 1.0 / (2.0 * 20.0) // 1 seconds to max out
-            state.currUpsideDownForce.set( min(1.0, state.currUpsideDownForce.get() + upsideDownRate))
-        } else { // Its right side up or has stamina so reset it
+        } else { // Its right side up so reset it
             state.currUpsideDownForce.set(0.0)
         }
     }
@@ -122,7 +104,7 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         // Grab the boost time in seconds and convert to ticks. Then calculate the drain rate as inversely
         // proportional to the number of ticks of boost thus making a full boost take x ticks
         // in short: "Stamina drains slower at higher values and also replenishes slower"
-        val totalStam = vehicle.runtime.resolveDouble(settings.staminaExpr ?: globalBird.staminaExpr!!) * 20.0f
+        val totalStam = vehicle.runtime.resolveDouble(settings.staminaExpr) * 20.0f
         val stamDrainRate = (1.0f / totalStam).toFloat()
 
         val newStam = if (driver.zza > 0.0) max(0.0f,stam - stamDrainRate)
@@ -167,7 +149,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         }
 
         // The downward force used to encourage players to stop flying upside down.
-        val extraDownwardForce = state.currUpsideDownForce.get().pow(2) * -0.3 // 6 blocks a second downward
+        val extraDownwardForce = if(state.stamina.get() == 0.0f) -0.3
+            else state.currUpsideDownForce.get().pow(2) * -0.3 // 6 blocks a second downward
 
         val velocity = Vec3(state.rideVelocity.get().x , upForce + extraDownwardForce, forwardForce)
         return velocity
@@ -178,9 +161,9 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
     */
     fun calculateRideSpaceVel(settings: BirdSettings, state: BirdState, vehicle: PokemonEntity, driver: Player) {
         // retrieve stats
-        val topSpeed = (vehicle.runtime.resolveDouble(settings.speedExpr ?: globalBird.speedExpr!!) / 20.0)
-        val accel = topSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalBird.accelerationExpr!!) * 20.0)
-        val glideTopSpeed = topSpeed * vehicle.runtime.resolveDouble(settings.glideSpeedExpr ?: globalBird.glideSpeedExpr!!)
+        val topSpeed = (vehicle.runtime.resolveDouble(settings.speedExpr) / 20.0)
+        val accel = topSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr) * 20.0)
+        val glideTopSpeed = topSpeed * vehicle.runtime.resolveDouble(settings.glidespeedExpr)
         var glideSpeedChange = 0.0
         var activeInput = false
 
@@ -289,23 +272,21 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         if (driver !is OrientationControllable) return Vec3.ZERO
         val controller = (driver as OrientationControllable).orientationController
 
-        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalBird.handlingExpr!!)
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalBird.speedExpr!!) / 20.0
+        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) / 20.0
 
-        val yawDeltaDeg =  deltaTime * handling * sin(Math.toRadians(controller.roll.toDouble())) //* sin(Math.toRadians(controller.roll.toDouble())).sign
-        val trueYawDelt = yawDeltaDeg * abs(cos(Math.toRadians(controller.pitch.toDouble())))// * sqrt(RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), 0.0, topSpeed))
+        val yawDeltaDeg =  deltaTime * handling * sin(Math.toRadians(controller.roll.toDouble())).pow(2) * sin(Math.toRadians(controller.roll.toDouble())).sign
+        val trueYawDelt = yawDeltaDeg * abs(cos(Math.toRadians(controller.pitch.toDouble()))) * sqrt(RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), 0.0, topSpeed))
 
         // Dampen yaw when upside down
-        val yawDampen = (1 - abs(min(cos(controller.roll.toRadians()),0.0f)).pow(2))
+        val yawDampen = (1 - abs(min(cos(controller.roll.toRadians()),0.0f)))
         controller.applyGlobalYaw(trueYawDelt.toFloat() * yawDampen)
 
         // Correct orientation when at low speeds
         correctOrientation(settings, state, vehicle, controller, deltaTime)
 
-        controller.applyGlobalPitch(state.currPitchCorrectionForce.get().toRadians())
-
         //yaw, pitch, roll
-        return Vec3(0.0, 0.0, state.currRollCorrectionForce.get())
+        return Vec3(0.0, state.currPitchCorrectionForce.get(), state.currRollCorrectionForce.get())
     }
 
     private fun correctOrientation(
@@ -317,11 +298,11 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
     ) {
         // Calculate correcting roll force.
         // Mult by cos(pitch) to ensure that it doesn't roll correct at when diving or climbing
-        val rollCorrectionTimer = vehicle.runtime.resolveDouble(settings.timeToRollCorrect ?: globalBird.timeToRollCorrect!!)
-        val maxRollCorrectionRate = if (state.rideVelocity.get().length() < 0.1) 15.0f else 8.0f * (cos(controller.pitch.toRadians())).pow(2) * ((state.noInputTimeRoll.get() - rollCorrectionTimer)).coerceIn(0.0, 1.0).toFloat()
+        val rollCorrectionTimer = vehicle.runtime.resolveDouble(settings.timeToRollCorrect)
+        val maxRollCorrectionRate = if (state.rideVelocity.get().length() < 0.1) 15.0f else 8.0f * (cos(controller.pitch.toRadians())).pow(2) * ((state.noInputTime.get() - rollCorrectionTimer) * 2).coerceIn(0.0, 1.0).toFloat()
         val maxRollForce = maxRollCorrectionRate / 40.0
         val rollArrivalDeg = 90.0
-        if(state.rideVelocity.get().length() < 0.1 || state.noInputTimeRoll.get() > rollCorrectionTimer) {
+        if(state.rideVelocity.get().length() < 0.1 || state.noInputTime.get() > rollCorrectionTimer) {
             val arrivalInfluence = (min(rollArrivalDeg,abs(controller.roll).toDouble()) / rollArrivalDeg)
             val desiredRollForce = (0 - controller.roll).sign * maxRollCorrectionRate * arrivalInfluence
             var steeredRollForce = desiredRollForce - state.currRollCorrectionForce.get()
@@ -343,18 +324,13 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         }
 
         //Calculate correcting pitch force.
-        val maxPitchCorrectionRate = if (state.currUpsideDownForce.get() != 0.0) 8f * state.currUpsideDownForce.get() else 15f
-        val maxPitchForce = maxPitchCorrectionRate.toFloat() / 40.0f
-        val pitchArrivalDeg = 45.0f
-        var desiredPitch = if (state.currUpsideDownForce.get() != 0.0) 90.0 else 0.0
-//        if (cos(controller.roll.toRadians()) < 0.0) {
-//            desiredPitch *= -1 // If not rolled over then flip the pitch force. There are better ways to do this :(
-//        }
-
-        if((state.rideVelocity.get().length() < 0.1 && controller.pitch < 0.0) || state.currUpsideDownForce.get() != 0.0) {
-            val arrivalInfluence = (min(pitchArrivalDeg,abs(Mth.wrapDegrees(desiredPitch.toFloat().angleDifference(controller.pitch)))) / pitchArrivalDeg)
-            val desiredPitchForce = maxPitchCorrectionRate.toFloat() * arrivalInfluence
-            var steeredPitchForce = (desiredPitchForce - state.currPitchCorrectionForce.get())
+        val maxPitchCorrectionRate = 15
+        val maxPitchForce = maxPitchCorrectionRate / 40.0
+        val pitchArrivalDeg = 90.0
+        if(state.rideVelocity.get().length() < 0.1) {
+            val arrivalInfluence = (min(pitchArrivalDeg,abs(controller.pitch).toDouble()) / pitchArrivalDeg)
+            val desiredPitchForce = (0 - controller.pitch).sign * maxPitchCorrectionRate * arrivalInfluence
+            var steeredPitchForce = desiredPitchForce - state.currPitchCorrectionForce.get()
 
             // Ensure the 'steering' correction force doesn't exceed our maxForce
             if (abs(steeredPitchForce) > maxPitchForce) {
@@ -385,23 +361,12 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         sensitivity: Double,
         deltaTime: Double
     ): Vec3 {
-        if (driver !is OrientationControllable) return Vec3.ZERO
-        val controller = (driver as OrientationControllable).orientationController
         // Begin the roll correction time counter if not enough mouse input
         // is detected
-        if (mouseX < 1 && abs(mouseY) < 1) {
-            state.noInputTimeRoll.set(state.noInputTimeRoll.get() + deltaTime)
-        } else if (cos(controller.roll.toRadians()) < 0.1) {
-            state.noInputTimeRoll.set(state.noInputTimeRoll.get() + deltaTime * 0.5)
-        }
-        else {
-            state.noInputTimeRoll.set(0.0)
-        }
-
-        if (abs(mouseY) < 1) {
-            state.noInputTimePitch.set(state.noInputTimePitch.get() + deltaTime)
+        if (abs(mouseX) < 1 && abs(mouseY) < 1) {
+            state.noInputTime.set(state.noInputTime.get() + deltaTime)
         } else {
-            state.noInputTimePitch.set(0.0)
+            state.noInputTime.set(0.0)
         }
 
         return when {
@@ -450,8 +415,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         // Set roll to zero if transitioning to noroll config
         controller.rotateRoll(controller.roll * -1.0f)
 
-        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalBird.handlingExpr!!)
-        val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult ?: globalBird.mouseInputMult!!)
+        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr)
+        val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult)
 
         //Smooth out mouse input.
         val smoothingSpeed = 4.0
@@ -495,11 +460,11 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         if (driver !is OrientationControllable) return Vec3.ZERO
         val controller = (driver as OrientationControllable).orientationController
 
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalBird.speedExpr!!) / 20.0
-        val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult ?: globalBird.mouseInputMult!!)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) / 20.0
+        val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult)
 
         //Smooth out mouse input.
-        val smoothingSpeed = 2.0
+        val smoothingSpeed = 4.0
         val mouseXc = (mouseX).coerceIn(-45.0, 45.0) * mouseInputMult
         // When upside down apply a pitching force to nudge the player towards a dive. This reduces the 'weirdness'
         // of being upside down
@@ -511,28 +476,25 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         val currHorzSpeed = state.rideVelocity.get().horizontalDistance()
         val hoverSpeed = 0.1
 
-        // Yaw locally when at or below hoverSpeed but not when pitched up or rolled over
+        // Yaw locally when at or below hoverSpeed
         val yawDampen = abs(cos(controller.pitch.toRadians())).pow(2) * abs(cos(controller.roll.toRadians())).pow(2)
         val localYaw = if (currHorzSpeed < hoverSpeed) xInput * (1 - sqrt(RidingBehaviour.scaleToRange(currHorzSpeed, hoverSpeed, topSpeed))).coerceIn(0.0, 1.0)
-            else 0.0 //xInput * 0.4 * cos(controller.roll.toRadians()).coerceIn(0.0f, 1.0f) * yawDampen
+            else xInput * 0.4 * cos(controller.roll.toRadians()).coerceIn(0.0f, 1.0f) * yawDampen
 
         // Pitch locally up or down depending upon a number of factors:
         // - Reduce pitch substantially when rolled and in a steep yaw. This prevents the player from ignoring a slow handling stat
         // - Do not pitch at all when at or below hover speed
         // - pitch faster at higher speeds
-        val p = 1.0 - vehicle.runtime.resolveDouble(settings.horizontalPitchExpr ?: globalBird.horizontalPitchExpr!!)
+        val p = 1.0 - vehicle.runtime.resolveDouble(settings.horizontalPitchExpr)
         var localPitch = yInput * (1 - abs(sin(controller.roll.toRadians())).pow(2) * p * hypot(controller.forwardVector.x.toDouble(), controller.forwardVector.z.toDouble()).toFloat())
-        localPitch *= if (currSpeed > hoverSpeed || yInput > 0.0) RidingBehaviour.scaleToRange(currSpeed, 0.0, topSpeed).coerceIn(0.2, 1.0)
+        localPitch *= if (currHorzSpeed > hoverSpeed) RidingBehaviour.scaleToRange(currHorzSpeed, hoverSpeed, topSpeed)
             else 0.0
 
         // Roll less when slow and not at all when at hoverSpeed or lower.
         // Apply a roll righting force when trying to pitch hard while rolled sideways. This nudges the player towards
         // pitching globally
         val pitchInfluencedRollCorrection = 0.0
-        val howRolledAmI =  (( cos(controller.roll.toRadians()) - 1).coerceIn(-1.0f, 0.0f) * -2).coerceIn(0.0f, 0.7f) //Coerce into how much roll you want to let in in the deadzone
-        val inputInRolledDir = if (xInput.sign.toFloat() == controller.roll.sign) 1.0 else -cos(controller.roll.toRadians()).coerceIn(-1.0f, 0.0f).toDouble()
-        val rollDampen = (1 - howRolledAmI * abs(cos(controller.pitch.toRadians())).pow(2) * inputInRolledDir)
-        val rollForce = if (currHorzSpeed > hoverSpeed) xInput * sqrt(abs(RidingBehaviour.scaleToRange(currHorzSpeed, hoverSpeed, topSpeed)).coerceIn(0.0,1.0)) * rollDampen + pitchInfluencedRollCorrection
+        val rollForce = if (currHorzSpeed > hoverSpeed) xInput * sqrt(abs(RidingBehaviour.scaleToRange(currHorzSpeed, hoverSpeed, topSpeed)).coerceIn(0.0,1.0)) + pitchInfluencedRollCorrection
             else 0.0
 
         //yaw, pitch, roll
@@ -583,8 +545,8 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         vehicle: PokemonEntity,
         driver: Player
     ): Float {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalBird.speedExpr!!) / 20.0
-        val glideTopSpeed = topSpeed * vehicle.runtime.resolveDouble(settings.glideSpeedExpr ?: globalBird.glideSpeedExpr!!)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) / 20.0
+        val glideTopSpeed = topSpeed * vehicle.runtime.resolveDouble(settings.glidespeedExpr)
         val currSpeed = state.rideVelocity.get().length()
 
         // Must I ensure that topspeed is greater than minimum?
@@ -672,56 +634,57 @@ class BirdSettings : RidingBehaviourSettings {
     override val key = BirdBehaviour.KEY
     override val stats = mutableMapOf<RidingStat, IntRange>()
 
-    var infiniteAltitude: Expression? = null
+    var infiniteAltitude: Expression = "false".asExpression()
         private set
 
-    var infiniteStamina: Expression? = null
+    var infiniteStamina: Expression = "false".asExpression()
         private set
 
-    var timeToRollCorrect: Expression? = null
+    var timeToRollCorrect: Expression = "0.5".asExpression()
         private set
 
-    var handlingExpr: Expression? = null
-    var horizontalPitchExpr: Expression? = null
-    var mouseInputMult: Expression? = null
-    var speedExpr: Expression? = null
+    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 45.0, 10.0)".asExpression()
+    var horizontalPitchExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 0.2, 0.1)".asExpression()
+    var mouseInputMult: Expression = "q.get_ride_stats('SKILL', 'AIR', 1.2, 0.8)".asExpression()
+    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 20.0, 4.0)".asExpression()
     // Seconds from stationary to top speed
-    var accelerationExpr: Expression? = null
-    var staminaExpr: Expression? = null
+    var accelerationExpr: Expression = "q.get_ride_stats('ACCELERATION', 'AIR', 2.0, 8.0)".asExpression()
+    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 15.0, 2.0)".asExpression()
 
-    var glideSpeedExpr: Expression? = null
+    var glidespeedExpr: Expression =  "q.get_ride_stats('JUMP', 'AIR', 2.0, 1.0)".asExpression()
         private set
 
     var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
         buffer.writeRidingStats(stats)
         rideSounds.encode(buffer)
-        buffer.writeNullableExpression(infiniteAltitude)
-        buffer.writeNullableExpression(infiniteStamina)
-        buffer.writeNullableExpression(glideSpeedExpr)
-        buffer.writeNullableExpression(handlingExpr)
-        buffer.writeNullableExpression(horizontalPitchExpr)
-        buffer.writeNullableExpression(mouseInputMult)
-        buffer.writeNullableExpression(speedExpr)
-        buffer.writeNullableExpression(accelerationExpr)
-        buffer.writeNullableExpression(staminaExpr)
-        buffer.writeNullableExpression(timeToRollCorrect)
+        buffer.writeExpression(infiniteAltitude)
+        buffer.writeExpression(infiniteStamina)
+        buffer.writeExpression(glidespeedExpr)
+        buffer.writeExpression(handlingExpr)
+        buffer.writeExpression(horizontalPitchExpr)
+        buffer.writeExpression(mouseInputMult)
+        buffer.writeExpression(speedExpr)
+        buffer.writeExpression(accelerationExpr)
+        buffer.writeExpression(staminaExpr)
+        buffer.writeExpression(timeToRollCorrect)
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
         stats.putAll(buffer.readRidingStats())
         rideSounds = RideSoundSettingsList.decode(buffer)
-        infiniteAltitude = buffer.readNullableExpression()
-        infiniteStamina = buffer.readNullableExpression()
-        glideSpeedExpr = buffer.readNullableExpression()
-        handlingExpr = buffer.readNullableExpression()
-        horizontalPitchExpr = buffer.readNullableExpression()
-        mouseInputMult = buffer.readNullableExpression()
-        speedExpr = buffer.readNullableExpression()
-        accelerationExpr = buffer.readNullableExpression()
-        staminaExpr = buffer.readNullableExpression()
-        timeToRollCorrect = buffer.readNullableExpression()
+        infiniteAltitude = buffer.readExpression()
+        infiniteStamina = buffer.readExpression()
+        glidespeedExpr = buffer.readExpression()
+        handlingExpr = buffer.readExpression()
+        horizontalPitchExpr = buffer.readExpression()
+        mouseInputMult = buffer.readExpression()
+        speedExpr = buffer.readExpression()
+        accelerationExpr = buffer.readExpression()
+        staminaExpr = buffer.readExpression()
+        timeToRollCorrect = buffer.readExpression()
     }
 }
 
@@ -730,8 +693,7 @@ class BirdState : RidingBehaviourState() {
     var lastGlide = ridingState(-100L, Side.CLIENT)
     var currRollCorrectionForce = ridingState(0.0, Side.CLIENT)
     var currPitchCorrectionForce = ridingState(0.0, Side.CLIENT)
-    var noInputTimeRoll = ridingState(0.0, Side.CLIENT)
-    var noInputTimePitch = ridingState(0.0, Side.CLIENT)
+    var noInputTime = ridingState(0.0, Side.CLIENT)
     var currUpsideDownForce = ridingState(0.0, Side.CLIENT)
 
     override fun encode(buffer: FriendlyByteBuf) {
@@ -750,8 +712,7 @@ class BirdState : RidingBehaviourState() {
         lastGlide.set(-100L, forced = true)
         currRollCorrectionForce.set(0.0, forced = true)
         currPitchCorrectionForce.set(0.0, forced = true)
-        noInputTimeRoll.set(0.0, forced = true)
-        noInputTimePitch.set(0.0, forced = true)
+        noInputTime.set(0.0, forced = true)
     }
 
     override fun toString(): String {
@@ -765,8 +726,7 @@ class BirdState : RidingBehaviourState() {
         it.lastGlide.set(this.lastGlide.get(), forced = true)
         it.currRollCorrectionForce.set(this.currRollCorrectionForce.get(), forced = true)
         it.currPitchCorrectionForce.set(this.currPitchCorrectionForce.get(), forced = true)
-        it.noInputTimeRoll.set(this.noInputTimeRoll.get(), forced = true)
-        it.noInputTimePitch.set(this.noInputTimePitch.get(), forced = true)
+        it.noInputTime.set(this.noInputTime.get(), forced = true)
     }
 
     override fun shouldSync(previous: RidingBehaviourState): Boolean {
@@ -775,16 +735,3 @@ class BirdState : RidingBehaviourState() {
         return super.shouldSync(previous)
     }
 }
-
-/**
- * Calculates the shortest difference between two angles.
- * The result will be in the range [-180, 180].
- * A positive result indicates a clockwise direction from this angle to the other,
- * a negative result indicates a counter-clockwise direction.
- */
-fun Float.angleDifference(other: Float): Float {
-    var diff = other - this
-    while (diff <= -180F) diff += 360F
-    while (diff > 180F) diff -= 360F
-    return diff
-}

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

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.riding.behaviour.types.air
 
 import com.bedrockk.molang.Expression
 import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.CobblemonRideSettings
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
@@ -38,9 +37,6 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
 
     override val key = KEY
 
-    val globalGlider: GliderSettings
-        get() = CobblemonRideSettings.glider
-
     override fun getRidingStyle(settings: GliderSettings, state: RidingBehaviourState): RidingStyle {
         return RidingStyle.AIR
     }
@@ -57,7 +53,7 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
     }
 
     override fun speed(settings: GliderSettings, state: RidingBehaviourState, vehicle: PokemonEntity, driver: Player): Float {
-        return vehicle.runtime.resolveFloat(settings.speed ?: globalGlider.speed!!)
+        return vehicle.runtime.resolveFloat(settings.speed)
     }
 
     override fun rotation(
@@ -76,9 +72,10 @@ class GliderBehaviour : RidingBehaviour<GliderSettings, RidingBehaviourState> {
             driver: Player,
             input: Vec3
     ): Vec3 {
-        val xVector = if (vehicle.runtime.resolveBoolean(settings.canStrafe ?: globalGlider.canStrafe!!)) driver.xxa.toDouble() else 0.0
-        val yVector = -vehicle.runtime.resolveDouble(settings.glideSpeed ?: globalGlider.glideSpeed!!)
+        val xVector = if (vehicle.runtime.resolveBoolean(settings.canStrafe)) driver.xxa.toDouble() else 0.0
+        val yVector = -vehicle.runtime.resolveDouble(settings.glideSpeed)
         val zVector = driver.zza.toDouble()
+        val speedStat = settings.calculate(RidingStat.SPEED, 0)
         return Vec3(xVector, yVector, zVector)
     }
 
@@ -199,30 +196,31 @@ class GliderSettings : RidingBehaviourSettings {
     override val key = GliderBehaviour.KEY
     override val stats = mutableMapOf<RidingStat, IntRange>()
 
-    var glideSpeed: Expression? = null
+    var glideSpeed: Expression = "0.1".asExpression()
         private set
 
-    var speed: Expression? = null
+    var speed: Expression = "1.0".asExpression()
         private set
 
-    var canStrafe: Expression? = null
+    var canStrafe: Expression = "false".asExpression()
         private set
 
     var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
         buffer.writeRidingStats(stats)
         rideSounds.encode(buffer)
-        buffer.writeNullableExpression(glideSpeed)
-        buffer.writeNullableExpression(speed)
-        buffer.writeNullableExpression(canStrafe)
+        buffer.writeExpression(glideSpeed)
+        buffer.writeExpression(speed)
+        buffer.writeExpression(canStrafe)
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
         stats.putAll(buffer.readRidingStats())
         rideSounds = RideSoundSettingsList.decode(buffer)
-        glideSpeed = buffer.readNullableExpression()
-        speed = buffer.readNullableExpression()
-        canStrafe = buffer.readNullableExpression()
+        glideSpeed = buffer.readExpression()
+        speed = buffer.readExpression()
+        canStrafe = buffer.readExpression()
     }
 }

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

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.riding.behaviour.types.air
 
 import com.bedrockk.molang.Expression
 import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.CobblemonRideSettings
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
@@ -22,16 +21,7 @@ import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.blockPositionsAsListRounded
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.readNullableExpression
-import com.cobblemon.mod.common.util.readRidingStats
-import com.cobblemon.mod.common.util.resolveDouble
-import com.cobblemon.mod.common.util.writeNullableExpression
-import com.cobblemon.mod.common.util.writeRidingStats
-import kotlin.math.abs
-import kotlin.math.pow
-import kotlin.math.sin
+import com.cobblemon.mod.common.util.*
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.SmoothDouble
@@ -40,6 +30,9 @@ 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.abs
+import kotlin.math.pow
+import kotlin.math.sin
 
 class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourState> {
     companion object {
@@ -48,8 +41,6 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS
     }
 
     override val key = KEY
-    val globalHelicopter: HelicopterSettings
-        get() = CobblemonRideSettings.helicopter
 
     override fun getRidingStyle(settings: HelicopterSettings, state: RidingBehaviourState): RidingStyle {
         return RidingStyle.AIR
@@ -102,8 +93,8 @@ class HelicopterBehaviour : RidingBehaviour<HelicopterSettings, RidingBehaviourS
         val runtime = vehicle.runtime
 
         //If the player is not modulating height then hover
-        var yVel = if (driver.jumping) runtime.resolveDouble(settings.verticalVelocity ?: globalHelicopter.verticalVelocity!!)
-        else if (driver.isShiftKeyDown) -runtime.resolveDouble(settings.verticalVelocity ?: globalHelicopter.verticalVelocity!!)
+        var yVel = if (driver.jumping) runtime.resolveDouble(settings.verticalVelocity)
+        else if (driver.isShiftKeyDown) -runtime.resolveDouble(settings.verticalVelocity)
         else (0.0)
 
         yVel *= 0.25
@@ -299,35 +290,36 @@ class HelicopterSettings : RidingBehaviourSettings {
     override val key = HelicopterBehaviour.KEY
     override val stats = mutableMapOf<RidingStat, IntRange>()
 
-    var gravity: Expression? = null
+    var gravity: Expression = "1.0".asExpression()
         private set
 
-    var horizontalAcceleration: Expression? = null
+    var horizontalAcceleration: Expression = "0.1".asExpression()
         private set
 
-    var verticalVelocity: Expression? = null
+    var verticalVelocity: Expression = "1.0".asExpression()
         private set
 
-    var speed: Expression? = null
+    var speed: Expression = "1.0".asExpression()
         private set
 
     var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
         buffer.writeRidingStats(stats)
         rideSounds.encode(buffer)
-        buffer.writeNullableExpression(gravity)
-        buffer.writeNullableExpression(horizontalAcceleration)
-        buffer.writeNullableExpression(verticalVelocity)
-        buffer.writeNullableExpression(speed)
+        buffer.writeExpression(gravity)
+        buffer.writeExpression(horizontalAcceleration)
+        buffer.writeExpression(verticalVelocity)
+        buffer.writeExpression(speed)
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
         stats.putAll(buffer.readRidingStats())
         rideSounds = RideSoundSettingsList.decode(buffer)
-        gravity = buffer.readNullableExpression()
-        horizontalAcceleration = buffer.readNullableExpression()
-        verticalVelocity = buffer.readNullableExpression()
-        speed = buffer.readNullableExpression()
+        gravity = buffer.readExpression()
+        horizontalAcceleration = buffer.readExpression()
+        verticalVelocity = buffer.readExpression()
+        speed = buffer.readExpression()
     }
 }

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

@@ -9,9 +9,10 @@
 package com.cobblemon.mod.common.api.riding.behaviour.types.air
 
 import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.CobblemonRideSettings
 import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.behaviour.*
+import com.cobblemon.mod.common.api.riding.behaviour.types.land.HorseSettings
+import com.cobblemon.mod.common.api.riding.behaviour.types.land.HorseState
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
@@ -26,6 +27,7 @@ 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.level.ClipContext
@@ -42,8 +44,6 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
     }
 
     override val key = KEY
-    val globalHover: HoverSettings
-        get() = CobblemonRideSettings.hover
 
     override fun getRidingStyle(settings: HoverSettings, state: HoverState): RidingStyle {
         return RidingStyle.AIR
@@ -108,7 +108,7 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
         state: HoverState,
         vehicle: PokemonEntity,
     ) {
-        val heightLimit = vehicle.runtime.resolveDouble(settings.jumpExpr ?: globalHover.jumpExpr!!)
+        val heightLimit = vehicle.runtime.resolveDouble(settings.jumpExpr)
         val pos = vehicle.position()
         val level = Minecraft.getInstance().player?.level() ?: return
         val hit = level.clip(
@@ -129,13 +129,10 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
         state: HoverState,
         vehicle: PokemonEntity
     ) {
-        if (vehicle.runtime.resolveBoolean(settings.infiniteStamina ?: globalHover.infiniteStamina!!)) {
-            return
-        }
         val stam = state.stamina.get()
-        val stamDrainRate = (1.0f / vehicle.runtime.resolveDouble(settings.staminaExpr ?: globalHover.staminaExpr!!)).toFloat() / 20.0f
-        val stamReplenishRate = (1.0f / vehicle.runtime.resolveDouble(settings.stamReplenishTimeSeconds ?: globalHover.stamReplenishTimeSeconds!!) ).toFloat() / 20.0f // 2 seconds to replenish a full bar of stamina
-        val newStam = if (state.tooHigh.get()) max(0.0f, stam - stamDrainRate) else min(1.0f,stam + stamReplenishRate)
+        val stamDrainRate = (1.0f / vehicle.runtime.resolveDouble(settings.staminaExpr)).toFloat() / 20.0f
+
+        val newStam = if (state.tooHigh.get()) max(0.0f, stam - stamDrainRate) else min(1.0f,stam + stamDrainRate)
 
         state.stamina.set(newStam)
     }
@@ -181,8 +178,8 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
         vehicle: PokemonEntity,
         driver: LivingEntity
     ): Float {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalHover.speedExpr!!) / 20.0
-        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalHover.handlingExpr!!) / 20.0
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) / 20.0
+        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr) / 20.0
         val maxYawDiff = 90.0f
 
         // Normalize the current rotation diff
@@ -217,8 +214,8 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
         driver: Player
     ): Vec3 {
         // Convert these to their tick values
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalHover.speedExpr!!) / 20.0
-        val accel = topSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalHover.accelerationExpr!!) * 20.0)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) / 20.0
+        val accel = topSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr) * 20.0)
 
         var newVelocity = state.rideVelocity.get()
 
@@ -433,61 +430,51 @@ class HoverSettings : RidingBehaviourSettings {
     override val key = HoverBehaviour.KEY
     override val stats = mutableMapOf<RidingStat, IntRange>()
 
-    var infiniteStamina: Expression? = null
-        private set
-
-    var canJump: Expression? = null
-        private set
-
-    var stamReplenishTimeSeconds: Expression? = null
+    var canJump = "true".asExpression()
         private set
 
     // Speed in block per second
-    var speedExpr: Expression? = null
+    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 7.0, 1.0)".asExpression()
         private set
 
     // Acceleration in number of seconds to top speed
-    var accelerationExpr: Expression? = null
+    var accelerationExpr: Expression =
+        "q.get_ride_stats('ACCELERATION', 'AIR', 2.0, 8.0)".asExpression()
         private set
 
     // Amount of seconds between boosts
-    var staminaExpr: Expression? = null
+    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 30.0, 2.0)".asExpression()
         private set
 
     // Blocks before stamina drain
-    var jumpExpr: Expression? = null
+    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 16.0, 2.0)".asExpression()
         private set
 
     // Turn rate in degrees per second when stationary
-    var handlingExpr: Expression? = null
+    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 270.0, 45.0)".asExpression()
         private set
 
     var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
         buffer.writeRidingStats(stats)
         rideSounds.encode(buffer)
-        buffer.writeNullableExpression(infiniteStamina)
-        buffer.writeNullableExpression(canJump)
-        buffer.writeNullableExpression(stamReplenishTimeSeconds)
-        buffer.writeNullableExpression(speedExpr)
-        buffer.writeNullableExpression(accelerationExpr)
-        buffer.writeNullableExpression(staminaExpr)
-        buffer.writeNullableExpression(jumpExpr)
-        buffer.writeNullableExpression(handlingExpr)
+        buffer.writeExpression(speedExpr)
+        buffer.writeExpression(accelerationExpr)
+        buffer.writeExpression(staminaExpr)
+        buffer.writeExpression(jumpExpr)
+        buffer.writeExpression(handlingExpr)
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
         stats.putAll(buffer.readRidingStats())
         rideSounds = RideSoundSettingsList.decode(buffer)
-        infiniteStamina = buffer.readNullableExpression()
-        canJump = buffer.readNullableExpression()
-        stamReplenishTimeSeconds = buffer.readNullableExpression()
-        speedExpr = buffer.readNullableExpression()
-        accelerationExpr = buffer.readNullableExpression()
-        staminaExpr = buffer.readNullableExpression()
-        jumpExpr = buffer.readNullableExpression()
-        handlingExpr = buffer.readNullableExpression()
+        speedExpr = buffer.readExpression()
+        accelerationExpr = buffer.readExpression()
+        staminaExpr = buffer.readExpression()
+        jumpExpr = buffer.readExpression()
+        handlingExpr = buffer.readExpression()
     }
 
 }

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

@@ -11,35 +11,22 @@ package com.cobblemon.mod.common.api.riding.behaviour.types.air
 import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.MoLangMath.lerp
 import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.CobblemonRideSettings
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.Side
-import com.cobblemon.mod.common.api.riding.behaviour.ridingState
+import com.cobblemon.mod.common.api.riding.behaviour.*
+import com.cobblemon.mod.common.api.riding.behaviour.types.land.HorseSettings
+import com.cobblemon.mod.common.api.riding.behaviour.types.land.HorseState
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
-import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
-import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.blockPositionsAsListRounded
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.math.geometry.toRadians
-import com.cobblemon.mod.common.util.readNullableExpression
-import com.cobblemon.mod.common.util.readRidingStats
-import com.cobblemon.mod.common.util.resolveDouble
-import com.cobblemon.mod.common.util.toVec3d
-import com.cobblemon.mod.common.util.writeNullableExpression
-import com.cobblemon.mod.common.util.writeRidingStats
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-import net.minecraft.client.Minecraft
+import com.cobblemon.mod.common.util.*
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
+import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
+import com.cobblemon.mod.common.api.riding.stats.RidingStat
+import com.cobblemon.mod.common.config.CobblemonConfig
+import net.minecraft.client.Minecraft
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
@@ -47,7 +34,7 @@ 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.Vector3f
+import kotlin.math.*
 
 class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
     companion object {
@@ -60,9 +47,6 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
         return RidingStyle.AIR
     }
 
-    val globalJet: JetSettings
-        get() = CobblemonRideSettings.jet
-
     val poseProvider = PoseProvider<JetSettings, JetState>(PoseType.HOVER)
         .with(PoseOption(PoseType.FLY) { _, state, _ -> state.rideVelocity.get().z > 0.1 })
 
@@ -103,7 +87,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
         val boostKeyPressed = Minecraft.getInstance().options.keySprint.isDown()
 
         if(state.stamina.get() != 0.0f && boostKeyPressed) {
-            if (state.stamina.get() >= 0.0f) {
+            if (state.stamina.get() >= 0.25f) {
                 //If on the previous tick the boost key was held then don't change if the ride is boosting
                 if(state.boostIsToggleable.get()) {
                     //flip the boosting state if boost key is pressed
@@ -127,21 +111,15 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
     ) {
         val stam = state.stamina.get()
         var newStam = stam
-        val stamDrainRate = (1.0f / vehicle.runtime.resolveDouble(settings.staminaExpr ?: globalJet.staminaExpr!!)).toFloat() / 20.0f
+        val stamDrainRate = (1.0f / vehicle.runtime.resolveDouble(settings.staminaExpr)).toFloat() / 20.0f
 
         if (state.boosting.get()) {
             newStam = max(0.0f,stam - stamDrainRate * 1.5f)
+
         } else {
             newStam = max(0.0f,stam - stamDrainRate)
         }
 
-        // If out of stamina then increase noStamTickCnt
-        if (newStam == 0.0f) {
-            state.noStamTickCnt.set(state.noStamTickCnt.get() + 1)
-        } else {
-            state.noStamTickCnt.get()
-        }
-
         state.stamina.set(newStam)
     }
 
@@ -161,26 +139,27 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
         driver: Player,
         input: Vec3
     ): Vec3 {
+        var upForce = 0.0
+        var forwardForce = 0.0
+
         val controller = (driver as? OrientationControllable)?.orientationController
-        if (controller == null || controller.orientation == null) return Vec3.ZERO
 
         //Calculate ride space velocity
         calculateRideSpaceVel(settings, state, vehicle, driver)
 
+        //Translate ride space velocity to world space velocity.
+        if (controller != null) {
+            upForce =  if(state.stamina.get() != 0.0f) -1.0 * sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z
+                else min(0.0, -1.0 * sin(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z)
+            forwardForce = cos(Math.toRadians(controller.pitch.toDouble())) * state.rideVelocity.get().z
+        }
+
         // The downward force used to encourage players to stop flying upside down.
-        val maxDownwardForceTickCnt = 20.0
-        val extraDownwardForce = if(state.stamina.get() == 0.0f) -0.3 * (state.noStamTickCnt.get() / maxDownwardForceTickCnt).coerceIn(0.0, 1.0) else 0.0 // 6 blocks a second downward
+        val extraDownwardForce = if(state.stamina.get() == 0.0f) -0.3 else 0.0 // 6 blocks a second downward
 
-        // Convert the local velocity vector into a world vector
-        val localVelVec = Vector3f(
-            state.rideVelocity.get().x.toFloat(),
-            (state.rideVelocity.get().y).toFloat(),
-            state.rideVelocity.get().z.toFloat() * -1.0f // Flip the z axis to make this left handed? orr.. right handed? idk, flip it though
-        )
-        var worldVelVec = localVelVec.mul(controller.orientation).toVec3d().yRot(vehicle.yRot.toRadians()) // Unrotate preemptively as this vector gets rotate later down the line in MC logic.
-        worldVelVec =  worldVelVec.add(0.0, extraDownwardForce, 0.0) // Add the stamina depletion force to bring the ride down.
+        val velocity = Vec3(0.0, upForce + extraDownwardForce, forwardForce)
 
-        return worldVelVec
+        return velocity
     }
 
     /*
@@ -192,12 +171,11 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
         vehicle: PokemonEntity,
         driver: Player
     ) {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalJet.speedExpr!!) / 20.0
-        val accel = topSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalJet.accelerationExpr!!) * 20.0)
-        val deccel = vehicle.runtime.resolveDouble(settings.deccelRate ?: globalJet.deccelRate!!)//0.005
-        val minSpeed = topSpeed * vehicle.runtime.resolveDouble(settings.minSpeedFactor ?: globalJet.minSpeedFactor!!)
-        val speed = state.rideVelocity.get().z
-        val boostMult = vehicle.runtime.resolveDouble(settings.jumpExpr ?: globalJet.jumpExpr!!)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) / 20.0
+        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr) / 400.0
+        val minSpeed = vehicle.runtime.resolveDouble(settings.minSpeed) / 20.0
+        val speed = state.rideVelocity.get().length()
+        val boostMult = vehicle.runtime.resolveDouble(settings.jumpExpr)
 
         val boostTopSpeed = topSpeed * boostMult
         val boostAccel = accel * boostMult
@@ -209,7 +187,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
                 Vec3(
                     state.rideVelocity.get().x,
                     state.rideVelocity.get().y,
-                    max(state.rideVelocity.get().z - (deccel * 1.3), 0.3 * 0.5)
+                    max(state.rideVelocity.get().z - ((accel) / 2), minSpeed * 0.5)
                 )
             )
         }
@@ -237,7 +215,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
                 Vec3(
                     state.rideVelocity.get().x,
                     state.rideVelocity.get().y,
-                    max(state.rideVelocity.get().z - (deccel), minSpeed)
+                    max(state.rideVelocity.get().z - ((accel) / 2), minSpeed)
                 )
             )
         } else if (speed > topSpeed) {
@@ -245,17 +223,6 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
                 state.rideVelocity.get().scale(0.98)
             )
         }
-
-        /****************************************************************************
-         * Kill strafing velocities carried over from controller transition. Don't
-         * kill immediately to give some momentum to transitions.
-         ***************************************************************************/
-        state.rideVelocity.set(Vec3(
-            lerp(state.rideVelocity.get().x, 0.0, 0.03),
-            lerp(state.rideVelocity.get().y, 0.0, 0.03),
-            state.rideVelocity.get().z
-        ))
-
     }
 
     override fun angRollVel(
@@ -272,7 +239,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
         val cappedDeltaTime = min(deltaTime, 0.2)
 
         //Get handling in degrees per second
-        val yawRotRate = vehicle.runtime.resolveDouble(settings.handlingYawExpr ?: globalJet.handlingYawExpr!!)
+        val yawRotRate = vehicle.runtime.resolveDouble(settings.handlingYawExpr)
 
         //Base the change off of deltatime.
         var handlingYaw = yawRotRate * (cappedDeltaTime)
@@ -353,7 +320,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
 
         //Get handling in degrees per second
         val handlingDebuff = if(state.stamina.get() == 0.0f) 0.5 else 1.0
-        var handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalJet.handlingExpr!!) * handlingDebuff
+        var handling = vehicle.runtime.resolveDouble(settings.handlingExpr) * handlingDebuff
         //convert it to delta time
         handling *= (cappedDeltaTime)
 
@@ -407,7 +374,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
 
         //Get handling in degrees per second
         val handlingDebuff = if(state.stamina.get() == 0.0f) 0.5 else 1.0
-        var handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalJet.handlingExpr!!) * handlingDebuff
+        var handling = vehicle.runtime.resolveDouble(settings.handlingExpr) * handlingDebuff
 
         //convert it to delta time
         handling *= (cappedDeltaTime)
@@ -483,12 +450,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
         vehicle: PokemonEntity,
         driver: Player
     ): Float {
-        val maxDownwardForceTickCnt = 20.0f
-        return when {
-            state.noStamTickCnt.get() != 0 -> 1f - 0.2f*(state.noStamTickCnt.get() / maxDownwardForceTickCnt).coerceIn(0.0f,1.0f)
-            state.boosting.get() -> 1.2f
-            else -> 1.0f
-        }
+        return if (state.boosting.get()) 1.2f else 1.0f
     }
 
     override fun useAngVelSmoothing(settings: JetSettings, state: JetState, vehicle: PokemonEntity): Boolean {
@@ -561,70 +523,66 @@ class JetSettings : RidingBehaviourSettings {
     override val key = JetBehaviour.KEY
     override val stats = mutableMapOf<RidingStat, IntRange>()
 
-    var gravity: Expression? = null
+    var gravity: Expression = "0".asExpression()
         private set
 
-    var deccelRate: Expression? = null
+    var minSpeed: Expression = "12.0".asExpression()
         private set
 
-    // Mult to top speed in order to derive minSpeed
-    var minSpeedFactor: Expression? = null
-        private set
-
-    var handlingYawExpr: Expression? = null
+    var handlingYawExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 50.0, 25.0)".asExpression()
         private set
 
     // Make configurable by json
-    var infiniteStamina: Expression? = null
+    var infiniteStamina: Expression = "false".asExpression()
         private set
 
     // Boost power. Mult for top speed and accel while boosting
-    var jumpExpr: Expression? = null
+    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 2.0, 1.0)".asExpression()
         private set
 
     // Turn rate in degrees per second
-    var handlingExpr: Expression? = null
+    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 60.0, 20.0)".asExpression()
         private set
     // Top Speed in blocks per second
-    var speedExpr: Expression? = null
+    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 24.0, 4.0)".asExpression()
         private set
-    // Seconds to get to top speed
-    var accelerationExpr: Expression? = null
+    // Acceleration in blocks per s^2
+    var accelerationExpr: Expression =
+        "q.get_ride_stats('ACCELERATION', 'AIR', 4.0, 1.0)".asExpression()
         private set
     // Time in seconds to drain full bar of stamina flying
-    var staminaExpr: Expression? = null
+    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 60.0, 4.0)".asExpression()
         private set
 
     var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
         buffer.writeRidingStats(stats)
         rideSounds.encode(buffer)
-        buffer.writeNullableExpression(gravity)
-        buffer.writeNullableExpression(deccelRate)
-        buffer.writeNullableExpression(minSpeedFactor)
-        buffer.writeNullableExpression(handlingYawExpr)
-        buffer.writeNullableExpression(infiniteStamina)
-        buffer.writeNullableExpression(jumpExpr)
-        buffer.writeNullableExpression(handlingExpr)
-        buffer.writeNullableExpression(speedExpr)
-        buffer.writeNullableExpression(accelerationExpr)
-        buffer.writeNullableExpression(staminaExpr)
+        buffer.writeExpression(gravity)
+        buffer.writeExpression(minSpeed)
+        buffer.writeExpression(handlingYawExpr)
+        buffer.writeExpression(infiniteStamina)
+        buffer.writeExpression(jumpExpr)
+        buffer.writeExpression(handlingExpr)
+        buffer.writeExpression(speedExpr)
+        buffer.writeExpression(accelerationExpr)
+        buffer.writeExpression(staminaExpr)
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
         stats.putAll(buffer.readRidingStats())
         rideSounds = RideSoundSettingsList.decode(buffer)
-        gravity = buffer.readNullableExpression()
-        deccelRate = buffer.readNullableExpression()
-        minSpeedFactor = buffer.readNullableExpression()
-        handlingYawExpr = buffer.readNullableExpression()
-        infiniteStamina = buffer.readNullableExpression()
-        jumpExpr = buffer.readNullableExpression()
-        handlingExpr = buffer.readNullableExpression()
-        speedExpr = buffer.readNullableExpression()
-        accelerationExpr = buffer.readNullableExpression()
-        staminaExpr = buffer.readNullableExpression()
+        gravity = buffer.readExpression()
+        minSpeed = buffer.readExpression()
+        handlingYawExpr = buffer.readExpression()
+        infiniteStamina = buffer.readExpression()
+        jumpExpr = buffer.readExpression()
+        handlingExpr = buffer.readExpression()
+        speedExpr = buffer.readExpression()
+        accelerationExpr = buffer.readExpression()
+        staminaExpr = buffer.readExpression()
     }
 }
 
@@ -635,7 +593,6 @@ class JetState : RidingBehaviourState() {
     var boosting = ridingState(false, Side.BOTH)
     var boostIsToggleable = ridingState(false, Side.BOTH)
     var canSpeedBurst = ridingState(false, Side.BOTH)
-    var noStamTickCnt = ridingState(0, Side.CLIENT) // Value that is increased for every tick you are out of stamina
 
     override fun encode(buffer: FriendlyByteBuf) {
         super.encode(buffer)
@@ -662,7 +619,6 @@ class JetState : RidingBehaviourState() {
         boosting.set(false, forced = true)
         boostIsToggleable.set(false, forced = true)
         canSpeedBurst.set(true, forced = true)
-        noStamTickCnt.set(0, forced = true)
     }
 
     override fun copy() = JetState().also {

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

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.riding.behaviour.types.air
 
 import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.MoLangMath.lerp
-import com.cobblemon.mod.common.CobblemonRideSettings
 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
@@ -41,8 +40,6 @@ class RocketBehaviour : RidingBehaviour<RocketSettings, RocketState> {
     }
 
     override val key = KEY
-    val globalRocket: RocketSettings
-        get() = CobblemonRideSettings.rocket
 
     override fun getRidingStyle(settings: RocketSettings, state: RocketState): RidingStyle {
         return RidingStyle.AIR
@@ -87,7 +84,7 @@ class RocketBehaviour : RidingBehaviour<RocketSettings, RocketState> {
         driver: Player
     ): Float {
         // Use this as a "tick" function and check to see if the driver is "boosting"
-        if (vehicle.level().isClientSide) {
+        if(vehicle.level().isClientSide) {
             handleBoosting(settings, state, vehicle, driver)
             tickStamina(settings, state, vehicle, driver)
         }
@@ -127,14 +124,10 @@ class RocketBehaviour : RidingBehaviour<RocketSettings, RocketState> {
     ) {
         val stam = state.stamina.get()
 
-        if (vehicle.runtime.resolveBoolean(settings.infiniteStamina ?: globalRocket.infiniteStamina!!)) {
-            return
-        }
-
         // Grab the boost time in seconds and convert to ticks. Then calculate the drain rate as inversely
         // proportional to the number of ticks of boost thus making a full boost take x ticks
         // in short: "Stamina drains slower at higher values and also replenishes slower"
-        val boostTime = vehicle.runtime.resolveDouble(settings.staminaExpr ?: globalRocket.staminaExpr!!) * 20.0f
+        val boostTime = vehicle.runtime.resolveDouble(settings.staminaExpr) * 20.0f
         val stamDrainRate = (1.0f / boostTime).toFloat()
 
         val newStam = if(state.boosting.get() || driver.jumping) max(0.0f,stam - stamDrainRate) else stam
@@ -186,13 +179,13 @@ class RocketBehaviour : RidingBehaviour<RocketSettings, RocketState> {
 
         var newMomentum = state.turnMomentum.get().toDouble()
         // Degrees per tick
-        val maxTurnMomentum = vehicle.runtime.resolveDouble(settings.maxTurnRate ?: globalRocket.maxTurnRate!!) / 20.0f
+        val maxTurnMomentum = vehicle.runtime.resolveDouble(settings.maxTurnRate) / 20.0f
         // Turn rate increase per tick. Based off number of seconds to get to max turn rate
-        val turningAcceleration = maxTurnMomentum / (vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalRocket.handlingExpr!!) * 20.0f)
+        val turningAcceleration = maxTurnMomentum / (vehicle.runtime.resolveDouble(settings.handlingExpr) * 20.0f)
         val turnInput =  (driver.xxa *-1.0f) * turningAcceleration
 
         // Base boost stats off of normal turning stats
-        val boostHandlingMod = vehicle.runtime.resolveDouble(settings.boostHandlingMod ?: globalRocket.boostHandlingMod!!)
+        val boostHandlingMod = vehicle.runtime.resolveDouble(settings.boostHandlingMod)
         val boostMaxTurnMomentum = maxTurnMomentum * boostHandlingMod
         val boostTurnInput = turnInput * boostHandlingMod
 
@@ -237,9 +230,9 @@ class RocketBehaviour : RidingBehaviour<RocketSettings, RocketState> {
         vehicle: PokemonEntity,
         driver: Player
     ): Vec3 {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalRocket.speedExpr!!)
-        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalRocket.accelerationExpr!!)
-        val jump = vehicle.runtime.resolveDouble(settings.jumpExpr ?: globalRocket.jumpExpr!!)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
+        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr)
+        val jump = vehicle.runtime.resolveDouble(settings.jumpExpr)
 
         var newVelocity = vehicle.deltaMovement
 
@@ -263,7 +256,7 @@ class RocketBehaviour : RidingBehaviour<RocketSettings, RocketState> {
                 (newVelocity.z + (accel * forwardInput.toDouble())))
 
         } else if ((state.boosting.get())) {
-            val boostMod = vehicle.runtime.resolveDouble(settings.boostSpeedMod ?: globalRocket.boostSpeedMod!!)
+            val boostMod = vehicle.runtime.resolveDouble(settings.boostSpeedMod)
             val boostSpeed = topSpeed * boostMod
             val boostAccel = if(newVelocity.length() < boostSpeed) accel * (boostMod/1.5) else 0.0
             val forwardInput = 1.0f
@@ -405,8 +398,8 @@ class RocketBehaviour : RidingBehaviour<RocketSettings, RocketState> {
         driver: Player
     ): Float {
         if (state.boosting.get()) {
-            val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalRocket.speedExpr!!)
-            val boostMod = vehicle.runtime.resolveDouble(settings.boostSpeedMod ?: globalRocket.boostSpeedMod!!)
+            val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
+            val boostMod = vehicle.runtime.resolveDouble(settings.boostSpeedMod)
             val normalizedBoostSpeed = RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), topSpeed, topSpeed * boostMod)
             return 1.0f + normalizedBoostSpeed.pow(2).toFloat() * 0.2f
         } else {
@@ -506,67 +499,60 @@ class RocketSettings : RidingBehaviourSettings {
     override val key = RocketBehaviour.KEY
     override val stats = mutableMapOf<RidingStat, IntRange>()
 
-    var infiniteStamina: Expression? = null
-        private set
     // Boost multiplier for speed
-    var boostSpeedMod: Expression? = null
+    var boostSpeedMod: Expression = "5.0".asExpression()
         private set
 
     // Boost multiplier for handling
-    var boostHandlingMod: Expression? = null
+    var boostHandlingMod: Expression = "0.3".asExpression()
         private set
 
     // Max turn rate in degrees per second
-    var maxTurnRate: Expression? = null
+    var maxTurnRate: Expression = "100.0".asExpression()
         private set
 
-    var speedExpr: Expression? = null
+    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 1.2, 0.6)".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? = null
+    var accelerationExpr: Expression =
+        "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 1.5)), (1.0 / (20.0 * 3.0))) * 0.5".asExpression()
         private set
 
     // air time in seconds
-    var staminaExpr: Expression? = null
+    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 20.0, 10.0)".asExpression()
         private set
 
-    var jumpExpr: Expression? = null
+    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 2.0, 1.0)".asExpression()
         private set
 
     // How long it takes to get to max turn rate from rest (in seconds)
-    var handlingExpr: Expression? = null
+    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 0.5, 3.0)".asExpression()
         private set
 
     var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
         buffer.writeRidingStats(stats)
         rideSounds.encode(buffer)
-        buffer.writeNullableExpression(infiniteStamina)
-        buffer.writeNullableExpression(boostSpeedMod)
-        buffer.writeNullableExpression(boostHandlingMod)
-        buffer.writeNullableExpression(maxTurnRate)
-        buffer.writeNullableExpression(speedExpr)
-        buffer.writeNullableExpression(accelerationExpr)
-        buffer.writeNullableExpression(staminaExpr)
-        buffer.writeNullableExpression(jumpExpr)
-        buffer.writeNullableExpression(handlingExpr)
+        buffer.writeExpression(speedExpr)
+        buffer.writeExpression(accelerationExpr)
+        buffer.writeExpression(staminaExpr)
+        buffer.writeExpression(jumpExpr)
+        buffer.writeExpression(handlingExpr)
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
         stats.putAll(buffer.readRidingStats())
         rideSounds = RideSoundSettingsList.decode(buffer)
-        infiniteStamina = buffer.readNullableExpression()
-        boostSpeedMod = buffer.readNullableExpression()
-        boostHandlingMod = buffer.readNullableExpression()
-        maxTurnRate = buffer.readNullableExpression()
-        speedExpr = buffer.readNullableExpression()
-        accelerationExpr = buffer.readNullableExpression()
-        staminaExpr = buffer.readNullableExpression()
-        jumpExpr = buffer.readNullableExpression()
-        handlingExpr = buffer.readNullableExpression()
+        speedExpr = buffer.readExpression()
+        accelerationExpr = buffer.readExpression()
+        staminaExpr = buffer.readExpression()
+        jumpExpr = buffer.readExpression()
+        handlingExpr = buffer.readExpression()
     }
+
 }
 
 class RocketState : RidingBehaviourState() {

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

@@ -387,10 +387,9 @@ open class CompositeSettings : RidingBehaviourSettings {
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeRidingStats(stats)
+        buffer.writeResourceLocation(key)
         buffer.writeResourceLocation(transitionStrategy)
-        buffer.writeResourceLocation(defaultBehaviour.key)
         defaultBehaviour.encode(buffer)
-        buffer.writeResourceLocation(alternateBehaviour.key)
         alternateBehaviour.encode(buffer)
     }
 

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

@@ -41,10 +41,6 @@ interface CompositeRidingStrategy<T : CompositeSettings> {
         toState: RidingBehaviourState,
         toSettings: RidingBehaviourSettings
     ) {
-        if (vehicle.level().isClientSide) {
-            val fromSettings = if (settings.defaultBehaviour == toSettings) settings.alternateBehaviour else settings.defaultBehaviour
-
-        }
         toState.stamina.set(fromState.stamina.get())
         toState.rideVelocity.set(fromState.rideVelocity.get())
         fromState.reset()

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

@@ -9,34 +9,15 @@
 package com.cobblemon.mod.common.api.riding.behaviour.types.land
 
 import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.CobblemonRideSettings
 import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.Side
-import com.cobblemon.mod.common.api.riding.behaviour.ridingState
+import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.blockPositionsAsListRounded
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.readNullableExpression
-import com.cobblemon.mod.common.util.readRidingStats
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveDouble
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.writeNullableExpression
-import com.cobblemon.mod.common.util.writeRidingStats
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.pow
-import kotlin.math.sign
-import kotlin.math.sqrt
+import com.cobblemon.mod.common.util.*
 import net.minecraft.core.Direction
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
@@ -49,6 +30,7 @@ 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 HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
     companion object {
@@ -56,8 +38,6 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
     }
 
     override val key = KEY
-    val globalHorse: HorseSettings
-        get() = CobblemonRideSettings.horse
 
     override fun getRidingStyle(settings: HorseSettings, state: HorseState): RidingStyle {
         return RidingStyle.LAND
@@ -152,13 +132,8 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
         vehicle: PokemonEntity,
     ) {
         val stam = state.stamina.get()
-
-        if (vehicle.runtime.resolveBoolean(settings.infiniteStamina ?: globalHorse.infiniteStamina!!)) {
-            return
-        }
-
         var newStam = stam
-        val stamDrainRate = (1.0f / vehicle.runtime.resolveDouble(settings.staminaExpr ?: globalHorse.staminaExpr!!)).toFloat() / 20.0f
+        val stamDrainRate = (1.0f / vehicle.runtime.resolveDouble(settings.staminaExpr)).toFloat() / 20.0f
 
         if (state.sprinting.get()) {
             newStam = max(0.0f,stam - stamDrainRate)
@@ -208,10 +183,10 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
         vehicle: PokemonEntity,
         driver: LivingEntity
     ): Float {
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalHorse.speedExpr!!)
-        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalHorse.handlingExpr!!)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
+        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr)
         val walkHandlingBoost = 5
-        val maxYawDiff = vehicle.runtime.resolveFloat(settings.lookYawLimit ?: globalHorse.lookYawLimit!!)
+        val maxYawDiff = vehicle.runtime.resolveFloat(settings.lookYawLimit)
 
         // Normalize the current rotation diff
         val rotDiff = Mth.wrapDegrees(driver.yRot - vehicle.yRot).coerceIn(-maxYawDiff,maxYawDiff)
@@ -255,34 +230,21 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
         vehicle: PokemonEntity,
         driver: Player
     ): Vec3 {
-        val canSprint = vehicle.runtime.resolveBoolean(settings.canSprint ?: globalHorse.canSprint!!)
-        val canJump = vehicle.runtime.resolveBoolean(settings.canJump ?: globalHorse.canJump!!)
-        val jumpForce = vehicle.runtime.resolveDouble(settings.jumpExpr ?: globalHorse.jumpExpr!!) * 0.75
-        val rideTopSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalHorse.speedExpr!!)
+        val canSprint = vehicle.runtime.resolveBoolean(settings.canSprint)
+        val canJump = vehicle.runtime.resolveBoolean(settings.canJump)
+        val jumpForce = vehicle.runtime.resolveDouble(settings.jumpExpr) * 0.75
+        val rideTopSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
         val walkSpeed = getWalkSpeed(vehicle)
         val topSpeed = if(canSprint && state.sprinting.get()) rideTopSpeed else walkSpeed
-        val accel = topSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalHorse.accelerationExpr!!) * 20.0)
+        val accel = topSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr) * 20.0)
         var activeInput = false
 
         /******************************************************
          * Gather the previous velocity and check for horizontal
          * collisions
          *****************************************************/
-        val dmSpeed = vehicle.deltaMovement.length()
-        val rvSpeed = state.rideVelocity.get().length()
         var newVelocity = state.rideVelocity.get() //.normalize().scale(vehicle.deltaMovement.horizontalDistance())
 
-        /******************************************************
-         * Gather the previous velocity and check for horizontal
-         * collisions
-         *****************************************************/
-//        if (dmSpeed > rvSpeed) {
-//            // align the velocity vector to be in local vehicle space
-//            newVelocity = vehicle.deltaMovement
-//            val yawAligned = Matrix3f().rotateY(-vehicle.yRot.toRadians())
-//            newVelocity = (newVelocity.toVector3f().mul(yawAligned)).toVec3d()
-//        }
-
         if (vehicle.horizontalCollision) {
             newVelocity = newVelocity.normalize().scale(vehicle.deltaMovement.length())
         }
@@ -294,7 +256,7 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
 
             // If on a tight turn then do not speed up past half of top speed in order to turn quicker
             // Also determine how fast to be slowing down based on how far turned you are
-            val lookYawLimit = vehicle.runtime.resolveFloat(settings.lookYawLimit ?: globalHorse.lookYawLimit!!)
+            val lookYawLimit = vehicle.runtime.resolveFloat(settings.lookYawLimit)
             val percOfMaxTurnSpeed = abs(Mth.wrapDegrees(driver.yRot - vehicle.yRot) / lookYawLimit) * 100.0f
             val turnPercThresh = 0.0f
             val s = min(((percOfMaxTurnSpeed - turnPercThresh) / (100.0f - turnPercThresh)).pow(1),1.0f)
@@ -536,67 +498,59 @@ class HorseSettings : RidingBehaviourSettings {
     override val key = HorseBehaviour.KEY
     override val stats = mutableMapOf<RidingStat, IntRange>()
 
-    var infiniteStamina: Expression? = null
-        private set
-    var canJump: Expression? = null
+    var canJump = "true".asExpression()
         private set
 
-    var canSprint: Expression? = null
+    var canSprint = "true".asExpression()
         private set
 
-    var lookYawLimit: Expression? = null
+    var lookYawLimit = "90.0f".asExpression()
         private set
 
-    var speedExpr: Expression? = null
+    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'LAND', 1.0, 0.4)".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? = null
+    var accelerationExpr: Expression =
+        "q.get_ride_stats('ACCELERATION', 'LAND', 0.5, 2.0)".asExpression()
         private set
 
     // Between 30 seconds and 10 seconds at the lowest when at full speed.
-    var staminaExpr: Expression? = null
+    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'LAND', 30.0, 10.0)".asExpression()
         private set
 
     //Between a one block jump and a six block jump
-    var jumpExpr: Expression? = null
+    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'LAND', 1.0, 0.38)".asExpression()
         private set
 
-    var handlingExpr: Expression? = null
+    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'LAND', 180.0, 40.0)".asExpression()
         private set
 
     var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
         buffer.writeRidingStats(stats)
         rideSounds.encode(buffer)
-        buffer.writeNullableExpression(infiniteStamina)
-        buffer.writeNullableExpression(canJump)
-        buffer.writeNullableExpression(canSprint)
-        buffer.writeNullableExpression(lookYawLimit)
-        buffer.writeNullableExpression(speedExpr)
-        buffer.writeNullableExpression(accelerationExpr)
-        buffer.writeNullableExpression(staminaExpr)
-        buffer.writeNullableExpression(jumpExpr)
-        buffer.writeNullableExpression(handlingExpr)
-        buffer.writeNullableExpression(canJump)
-        buffer.writeNullableExpression(canSprint)
+        buffer.writeExpression(speedExpr)
+        buffer.writeExpression(accelerationExpr)
+        buffer.writeExpression(staminaExpr)
+        buffer.writeExpression(jumpExpr)
+        buffer.writeExpression(handlingExpr)
+        buffer.writeExpression(canJump)
+        buffer.writeExpression(canSprint)
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
         stats.putAll(buffer.readRidingStats())
         rideSounds = RideSoundSettingsList.decode(buffer)
-        infiniteStamina = buffer.readNullableExpression()
-        canJump = buffer.readNullableExpression()
-        canSprint = buffer.readNullableExpression()
-        lookYawLimit = buffer.readNullableExpression()
-        speedExpr = buffer.readNullableExpression()
-        accelerationExpr = buffer.readNullableExpression()
-        staminaExpr = buffer.readNullableExpression()
-        jumpExpr = buffer.readNullableExpression()
-        handlingExpr = buffer.readNullableExpression()
-        canJump = buffer.readNullableExpression()
-        canSprint = buffer.readNullableExpression()
+        speedExpr = buffer.readExpression()
+        accelerationExpr = buffer.readExpression()
+        staminaExpr = buffer.readExpression()
+        jumpExpr = buffer.readExpression()
+        handlingExpr = buffer.readExpression()
+        canJump = buffer.readExpression()
+        canSprint = buffer.readExpression()
     }
 }
 

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

@@ -10,36 +10,18 @@ package com.cobblemon.mod.common.api.riding.behaviour.types.land
 
 import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.MoLangMath.lerp
-import com.cobblemon.mod.common.CobblemonRideSettings
+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.RidingBehaviour
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.Side
-import com.cobblemon.mod.common.api.riding.behaviour.SidedRidingState
-import com.cobblemon.mod.common.api.riding.behaviour.ridingState
+import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.blockPositionsAsListRounded
-import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.*
 import com.cobblemon.mod.common.util.math.geometry.toRadians
-import com.cobblemon.mod.common.util.readNullableExpression
-import com.cobblemon.mod.common.util.readRidingStats
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveDouble
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.writeNullableExpression
-import com.cobblemon.mod.common.util.writeRidingStats
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.pow
-import kotlin.math.sign
 import net.minecraft.core.Direction
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
@@ -50,6 +32,12 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
 import net.minecraft.world.phys.shapes.Shapes
+import org.joml.Matrix3f
+import kotlin.math.abs
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.pow
+import kotlin.math.sign
 
 class MinekartBehaviour : RidingBehaviour<MinekartSettings, MinekartState> {
     companion object {
@@ -57,8 +45,6 @@ class MinekartBehaviour : RidingBehaviour<MinekartSettings, MinekartState> {
     }
 
     override val key = KEY
-    val globalMinekart: MinekartSettings
-        get() = CobblemonRideSettings.minekart
 
     override fun getRidingStyle(settings: MinekartSettings, state: MinekartState): RidingStyle {
         return RidingStyle.LAND
@@ -98,7 +84,7 @@ class MinekartBehaviour : RidingBehaviour<MinekartSettings, MinekartState> {
         driver: Player
     ): Float {
 
-        val boostMax = vehicle.runtime.resolveFloat(settings.boostLimit ?: globalMinekart.boostLimit!!)
+        val boostMax = vehicle.runtime.resolveFloat(settings.boostLimit)
         //TODO: should this be by how much turn has accumulated or simply time turning... or both?
         val boostPerSecond = 20.0f
         val boostLoss = 40.0f
@@ -156,8 +142,8 @@ class MinekartBehaviour : RidingBehaviour<MinekartSettings, MinekartState> {
         var newMomentum = state.turnMomentum.get().toDouble()
 
         //TODO: maybe tie this to max turnspeeds rather than the turn acceleration
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalMinekart.speedExpr!!)
-        val turningAcceleration = (vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalMinekart.handlingExpr!!) * 1.5 / 20.0f) / 20.0f * 4.0
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
+        val turningAcceleration = (vehicle.runtime.resolveDouble(settings.handlingExpr) * 1.5 / 20.0f) / 20.0f * 4.0
         val turnInput =  (driver.xxa *-1.0f) * turningAcceleration
         val driftInput = turnInput * 0.25f
 
@@ -216,9 +202,9 @@ class MinekartBehaviour : RidingBehaviour<MinekartSettings, MinekartState> {
     ): Vec3 {
 
         // Check to see if the ride should be walking or sprinting
-        val rideTopSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalMinekart.speedExpr!!) * 0.6 * 2.0
+        val rideTopSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) * 0.6 * 2.0
         val topSpeed = if (state.drifting.get()) rideTopSpeed * 0.7 else rideTopSpeed
-        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalMinekart.accelerationExpr!!) * 0.3 * 3 * 2.0
+        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr) * 0.3 * 3 * 2.0
         val driftAngle = 20.0f
 
         //Align the direction of this vector with the vehicles current heading.
@@ -341,7 +327,7 @@ class MinekartBehaviour : RidingBehaviour<MinekartSettings, MinekartState> {
         vehicle: PokemonEntity,
         driver: Player
     ): Boolean {
-        return vehicle.runtime.resolveBoolean(settings.canJump ?: globalMinekart.canJump!!)
+        return vehicle.runtime.resolveBoolean(settings.canJump)
     }
 
     override fun setRideBar(
@@ -461,57 +447,45 @@ class MinekartSettings : RidingBehaviourSettings {
     override val key = MinekartBehaviour.KEY
     override val stats = mutableMapOf<RidingStat, IntRange>()
 
-    var infiniteStamina: Expression? = null
-        private set
-    var canJump: Expression? = null
+    var canJump = "true".asExpression()
         private set
 
-    var boostLimit: Expression? = null
+    var boostLimit = "100.0f".asExpression()
         private set
 
-    var speedExpr: Expression? = null
+    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'LAND', 1.0, 0.3)".asExpression()
         private set
 
     // Max accel is a whole 1.0 in 1 second. The conversion in the function below is to convert seconds to ticks
-    var accelerationExpr: Expression? = null
+    var accelerationExpr: Expression =
+        "q.get_ride_stats('ACCELERATION', 'LAND', (1.0 / (20.0 * 1.5)), (1.0 / (20.0 * 5.0)))".asExpression()
         private set
 
-    var staminaExpr: Expression? = null
+    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'LAND', 30.0, 10.0)".asExpression()
         private set
 
     //Between a one block jump and a ten block jump
-    var jumpExpr: Expression? = null
+    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'LAND', 10.0, 1.0)".asExpression()
         private set
 
-    var handlingExpr: Expression? = null
+    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'LAND', 140.0, 20.0)".asExpression()
         private set
 
     var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
         buffer.writeRidingStats(stats)
         rideSounds.encode(buffer)
-        buffer.writeNullableExpression(infiniteStamina)
-        buffer.writeNullableExpression(canJump)
-        buffer.writeNullableExpression(boostLimit)
-        buffer.writeNullableExpression(speedExpr)
-        buffer.writeNullableExpression(accelerationExpr)
-        buffer.writeNullableExpression(staminaExpr)
-        buffer.writeNullableExpression(jumpExpr)
-        buffer.writeNullableExpression(handlingExpr)
+        buffer.writeExpression(canJump)
+        buffer.writeExpression(boostLimit)
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
         stats.putAll(buffer.readRidingStats())
         rideSounds = RideSoundSettingsList.decode(buffer)
-        infiniteStamina = buffer.readNullableExpression()
-        canJump = buffer.readNullableExpression()
-        boostLimit = buffer.readNullableExpression()
-        speedExpr = buffer.readNullableExpression()
-        accelerationExpr = buffer.readNullableExpression()
-        staminaExpr = buffer.readNullableExpression()
-        jumpExpr = buffer.readNullableExpression()
-        handlingExpr = buffer.readNullableExpression()
+        canJump = buffer.readExpression()
+        boostLimit = buffer.readExpression()
     }
 }
 

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

@@ -10,35 +10,18 @@ package com.cobblemon.mod.common.api.riding.behaviour.types.land
 
 import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.MoLangMath.lerp
-import com.cobblemon.mod.common.CobblemonRideSettings
+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.RidingBehaviour
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.Side
-import com.cobblemon.mod.common.api.riding.behaviour.SidedRidingState
-import com.cobblemon.mod.common.api.riding.behaviour.ridingState
+import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.blockPositionsAsListRounded
-import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.*
 import com.cobblemon.mod.common.util.math.geometry.toRadians
-import com.cobblemon.mod.common.util.readNullableExpression
-import com.cobblemon.mod.common.util.readRidingStats
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveDouble
-import com.cobblemon.mod.common.util.toVec3d
-import com.cobblemon.mod.common.util.writeNullableExpression
-import com.cobblemon.mod.common.util.writeRidingStats
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.sign
 import net.minecraft.core.Direction
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
@@ -50,6 +33,10 @@ import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
 import net.minecraft.world.phys.shapes.Shapes
 import org.joml.Matrix3f
+import kotlin.math.abs
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.sign
 
 class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
     companion object {
@@ -57,8 +44,6 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
     }
 
     override val key = KEY
-    val globalVehicle: VehicleSettings
-        get() = CobblemonRideSettings.vehicle
 
     override fun getRidingStyle(settings: VehicleSettings, state: VehicleState): RidingStyle {
         return RidingStyle.LAND
@@ -141,7 +126,7 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
         var newMomentum = state.turnMomentum.get().toDouble()
 
         // Grab turningAcceleration and divide 20 twice to get
-        val turningAcceleration = (vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalVehicle.handlingExpr!!) * 1.5 / 20.0f) / 20.0f * 4.0
+        val turningAcceleration = (vehicle.runtime.resolveDouble(settings.handlingExpr) * 1.5 / 20.0f) / 20.0f * 4.0
         val turnInput =  (driver.xxa *-1.0f) * turningAcceleration
 
         val maxTurnMomentum = 80.0f / 20.0f
@@ -152,7 +137,7 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
 
         if(state.drifting.get() || state.inAir.get()) {
             if( newMomentum < driftMaxTurnMomentum) {
-                driftTurnInput = driftTurnInput * (vehicle.deltaMovement.horizontalDistance() / vehicle.runtime.resolveDouble(settings.speedExpr ?: globalVehicle.speedExpr!!))
+                driftTurnInput = driftTurnInput * (vehicle.deltaMovement.horizontalDistance() / vehicle.runtime.resolveDouble(settings.speedExpr))
                 newMomentum += driftTurnInput
             }
             newMomentum = lerp(newMomentum, 0.0, 0.03)
@@ -192,10 +177,10 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
 
         // Check to see if the ride should be walking or sprinting
         //val walkSpeed = getWalkSpeed(vehicle)
-        val rideTopSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalVehicle.speedExpr!!) * 0.6 * 2.0
+        val rideTopSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) * 0.6 * 2.0
         val topSpeed = if (state.drifting.get()) rideTopSpeed * 0.5 else rideTopSpeed
 
-        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalVehicle.accelerationExpr!!) * 0.3 * 3 * 2.0
+        val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr) * 0.3 * 3 * 2.0
 
         //Flag for determining if player is actively inputting
         var activeInput = false
@@ -265,7 +250,7 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
         }
 
         //TODO: Change this so its tied to a jumping stat and representative of the amount of jumps
-        val canJump = vehicle.runtime.resolveBoolean(settings.canJump ?: globalVehicle.canJump!!)
+        val canJump = vehicle.runtime.resolveBoolean(settings.canJump)
         //Jump the thang!
         if (driver.jumping && vehicle.onGround() && canJump) {
             val jumpForce = 0.5
@@ -311,7 +296,7 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
         vehicle: PokemonEntity,
         driver: Player
     ): Boolean {
-        return vehicle.runtime.resolveBoolean(settings.canJump ?: globalVehicle.canJump!!)
+        return vehicle.runtime.resolveBoolean(settings.canJump)
     }
 
     override fun setRideBar(
@@ -427,79 +412,66 @@ class VehicleSettings : RidingBehaviourSettings {
     override val key = VehicleBehaviour.KEY
     override val stats = mutableMapOf<RidingStat, IntRange>()
 
-    var infiniteStamina: Expression? = null
+    var canJump = "true".asExpression()
         private set
 
-    var canJump: Expression? = null
+    var speed = "0.3".asExpression()
         private set
 
-    var speed: Expression? = null
+    var driveFactor = "1.0".asExpression()
         private set
 
-    var driveFactor: Expression? = null
+    var reverseDriveFactor = "0.25".asExpression()
         private set
 
-    var reverseDriveFactor: Expression? = null
+    var rotationSpeed = "45/20".asExpression()
         private set
 
-    var rotationSpeed: Expression? = null
+    var lookYawLimit = "101".asExpression()
         private set
 
-    var lookYawLimit: Expression? = null
-        private set
-
-    var speedExpr: Expression? = null
+    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'LAND', 1.0, 0.3)".asExpression()
         private set
 
     // Max accel is a whole 1.0 in 1 second. The conversion in the function below is to convert seconds to ticks
-    var accelerationExpr: Expression? = null
+    var accelerationExpr: Expression =
+        "q.get_ride_stats('ACCELERATION', 'LAND', (1.0 / (20.0 * 1.5)), (1.0 / (20.0 * 5.0)))".asExpression()
         private set
 
     // Between 30 seconds and 10 seconds at the lowest when at full speed.
-    var staminaExpr: Expression? = null
+    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'LAND', 30.0, 10.0)".asExpression()
         private set
 
     //Between a one block jump and a ten block jump
-    var jumpExpr: Expression? = null
+    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'LAND', 10.0, 1.0)".asExpression()
         private set
 
-    var handlingExpr: Expression? = null
+    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'LAND', 140.0, 20.0)".asExpression()
         private set
 
     var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
         buffer.writeRidingStats(stats)
         rideSounds.encode(buffer)
-        buffer.writeNullableExpression(infiniteStamina)
-        buffer.writeNullableExpression(canJump)
-        buffer.writeNullableExpression(speed)
-        buffer.writeNullableExpression(driveFactor)
-        buffer.writeNullableExpression(reverseDriveFactor)
-        buffer.writeNullableExpression(rotationSpeed)
-        buffer.writeNullableExpression(lookYawLimit)
-        buffer.writeNullableExpression(speedExpr)
-        buffer.writeNullableExpression(accelerationExpr)
-        buffer.writeNullableExpression(staminaExpr)
-        buffer.writeNullableExpression(jumpExpr)
-        buffer.writeNullableExpression(handlingExpr)
+        buffer.writeExpression(canJump)
+        buffer.writeExpression(speed)
+        buffer.writeExpression(driveFactor)
+        buffer.writeExpression(reverseDriveFactor)
+        buffer.writeExpression(rotationSpeed)
+        buffer.writeExpression(lookYawLimit)
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
         stats.putAll(buffer.readRidingStats())
         rideSounds = RideSoundSettingsList.decode(buffer)
-        infiniteStamina = buffer.readNullableExpression()
-        canJump = buffer.readNullableExpression()
-        speed = buffer.readNullableExpression()
-        driveFactor = buffer.readNullableExpression()
-        reverseDriveFactor = buffer.readNullableExpression()
-        rotationSpeed = buffer.readNullableExpression()
-        lookYawLimit = buffer.readNullableExpression()
-        speedExpr = buffer.readNullableExpression()
-        accelerationExpr = buffer.readNullableExpression()
-        staminaExpr = buffer.readNullableExpression()
-        jumpExpr = buffer.readNullableExpression()
-        handlingExpr = buffer.readNullableExpression()
+        canJump = buffer.readExpression()
+        speed = buffer.readExpression()
+        driveFactor = buffer.readExpression()
+        reverseDriveFactor = buffer.readExpression()
+        rotationSpeed = buffer.readExpression()
+        lookYawLimit = buffer.readExpression()
     }
 }
 

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

@@ -8,34 +8,16 @@
 
 package com.cobblemon.mod.common.api.riding.behaviour.types.liquid
 
-import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.CobblemonRideSettings
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.Side
-import com.cobblemon.mod.common.api.riding.behaviour.ridingState
+import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.blockPositionsAsListRounded
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.readNullableExpression
-import com.cobblemon.mod.common.util.readRidingStats
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveDouble
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.writeNullableExpression
-import com.cobblemon.mod.common.util.writeRidingStats
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-import net.minecraft.core.BlockPos
+import com.cobblemon.mod.common.util.*
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.Mth
@@ -45,6 +27,9 @@ 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.abs
+import kotlin.math.max
+import kotlin.math.min
 
 class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
     companion object {
@@ -52,8 +37,6 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
     }
 
     override val key = KEY
-    val globalBoat: BoatSettings
-        get() = CobblemonRideSettings.boat
 
     override fun getRidingStyle(settings: BoatSettings, state: BoatState): RidingStyle {
         return RidingStyle.LIQUID
@@ -103,7 +86,7 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
 
         if (!state.isVehicleSprinting.get()) {
             if (state.staminaBuffer.get() >= 20) {
-                val staminaIncrease = vehicle.runtime.resolveDouble(settings.staminaIncreaseExpr ?: globalBoat.staminaIncreaseExpr!!)
+                val staminaIncrease = vehicle.runtime.resolveDouble(settings.staminaIncreaseExpr)
                 state.stamina.set(min(1.0f, state.stamina.get() + 0.01f * staminaIncrease.toFloat()))
             }
         }
@@ -150,14 +133,14 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
     }
 
     private fun applyVelocityFromInput(velocity: Vec3, vehicle: PokemonEntity, driver: Player, settings: BoatSettings, state: BoatState): Vec3 {
-        val speed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalBoat.speedExpr!!)
-        val acceleration = speed / (vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalBoat.accelerationExpr!!) * 20)
+        val speed = vehicle.runtime.resolveDouble(settings.speedExpr)
+        val acceleration = vehicle.runtime.resolveDouble(settings.accelerationExpr)
 
         if (state.jumpBuffer.get() != -1 || !(vehicle.isInWater || vehicle.isUnderWater)) {
             return velocity
         }
 
-        val sprintModifier = vehicle.runtime.resolveDouble(settings.sprintSpeedModifier ?: globalBoat.sprintSpeedModifier!!)
+        val sprintModifier = vehicle.runtime.resolveDouble(settings.sprintSpeedModifier)
         val activeSprintModifier = if (state.isVehicleSprinting.get() && hasStamina(state)) sprintModifier else 1.0
         val forwardInput = driver.zza.toDouble()
         val delta = when {
@@ -180,34 +163,23 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
         if (!driver.jumping) return velocity // Not jumping
         if (state.jumpBuffer.get() != -1) return velocity // Already jumped very recently
 
-        val jumpStrength = vehicle.runtime.resolveDouble(settings.jumpStrengthExpr ?: globalBoat.jumpStrengthExpr!!)
+        val jumpStrength = vehicle.runtime.resolveDouble(settings.jumpStrengthExpr)
         state.jumpBuffer.set(0)
         return Vec3(velocity.x, velocity.y + jumpStrength, velocity.z)
     }
 
     private fun applyGravity(velocity: Vec3, vehicle: PokemonEntity, settings: BoatSettings, state: BoatState): Vec3 {
         if (state.jumpBuffer.get() == -1 && (vehicle.isInWater || vehicle.isUnderWater)) {
-            if (shouldFloatHigher(vehicle, settings)) {
-                return Vec3(velocity.x, 0.5, velocity.z)
-            }
-            else {
-                return Vec3(velocity.x, 0.0, velocity.z)
-            }
+            val verticalVelocity = if (vehicle.isUnderWater) 0.5 else 0.0
+            return Vec3(velocity.x, verticalVelocity, velocity.z)
         }
-        val terminalVelocity = vehicle.runtime.resolveDouble(settings.terminalVelocity ?: globalBoat.terminalVelocity!!)
+        val terminalVelocity = vehicle.runtime.resolveDouble(settings.terminalVelocity)
         val gravity = (9.8 / ( 20.0)) * 0.2
         return Vec3(velocity.x, max(velocity.y - gravity, terminalVelocity), velocity.z)
     }
 
-    private fun shouldFloatHigher(vehicle: PokemonEntity, settings: BoatSettings): Boolean {
-        val surfaceOffset = vehicle.runtime.resolveFloat(settings.surfaceLevelOffset ?: globalBoat.surfaceLevelOffset!!)
-        val blockPos = BlockPos.containing(vehicle.x, vehicle.eyeY + surfaceOffset, vehicle.z)
-        val fluidState = vehicle.level().getFluidState(blockPos)
-        return !fluidState.isEmpty
-    }
-
     private fun applyStrafeRotation(vehicle: PokemonEntity, driver: Player, settings: BoatSettings, state: BoatState) {
-        val skillModifier = vehicle.runtime.resolveDouble(settings.rotationSpeedModifierExpr ?: globalBoat.rotationSpeedModifierExpr!!)
+        val skillModifier = vehicle.runtime.resolveDouble(settings.rotationspeedModifierExpr)
         val strafe = driver.xxa
         if (abs(strafe) > 0) {
             val increase = if (strafe > 0) -1 else 1
@@ -220,10 +192,7 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
     }
 
     private fun consumeStamina(vehicle: PokemonEntity, driver: Player, settings: BoatSettings, state: BoatState, drain: Float) {
-        val staminaModifier = vehicle.runtime.resolveFloat(settings.staminaDecreaseExpr ?: globalBoat.staminaDecreaseExpr!!)
-        if (staminaModifier == 0F) {
-            return
-        }
+        val staminaModifier = vehicle.runtime.resolveFloat(settings.staminaDecreaseExpr)
         state.stamina.set(max(0f, state.stamina.get() - drain / staminaModifier))
         if (state.stamina.get() == 0f) {
             state.isVehicleSprinting.set(false)
@@ -329,7 +298,7 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
         vehicle: PokemonEntity,
         driver: Player
     ): Float {
-        val sprintFov = vehicle.runtime.resolveFloat(settings.sprintFovModifier ?: globalBoat.sprintFovModifier!!)
+        val sprintFov = vehicle.runtime.resolveFloat(settings.sprintFovModifier)
         return if (state.isVehicleSprinting.get()) sprintFov else 1.0f
     }
 
@@ -374,7 +343,7 @@ class BoatBehaviour : RidingBehaviour<BoatSettings, BoatState> {
         state: BoatState,
         vehicle: PokemonEntity
     ): Boolean {
-        return vehicle.runtime.resolveBoolean(settings.rotatePokemonHead ?: globalBoat.rotatePokemonHead!!)
+        return vehicle.runtime.resolveBoolean(settings.rotatePokemonHead)
     }
 
     override fun shouldRotateRiderHead(
@@ -404,67 +373,46 @@ class BoatSettings : RidingBehaviourSettings {
     override val stats = mutableMapOf<RidingStat, IntRange>()
     var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
 
-    var terminalVelocity: Expression? = null
+    var terminalVelocity = "-2.0".asExpression()
         private set
 
-    var rotatePokemonHead: Expression? = null
+    var rotatePokemonHead = "true".asExpression()
         private set
 
-    var staminaIncreaseExpr: Expression? = null
+    var staminaIncreaseExpr = "q.get_ride_stats('STAMINA', 'LIQUID', 2.0, 1.0)".asExpression()
         private set
 
-    var staminaDecreaseExpr: Expression? = null
+    var staminaDecreaseExpr = "q.get_ride_stats('STAMINA', 'LIQUID', 5.0, 1.0)".asExpression()
         private set
 
-    var rotationSpeedModifierExpr: Expression? = null
+    var rotationspeedModifierExpr = "q.get_ride_stats('SKILL', 'LIQUID', 1.5, 0.5)".asExpression()
         private set
 
-    var jumpStrengthExpr: Expression? = null
+    var jumpStrengthExpr = "q.get_ride_stats('JUMP', 'LIQUID', 2.5, 1.0)".asExpression()
         private set
 
-    var speedExpr: Expression? = null
+    var speedExpr = "q.get_ride_stats('SPEED', 'LIQUID', 2.0, 0.5)".asExpression()
         private set
 
-    var accelerationExpr: Expression? = null
+    var accelerationExpr = "q.get_ride_stats('ACCELERATION', 'LIQUID', 0.5, 0.05)".asExpression()
         private set
 
-    var sprintSpeedModifier: Expression? = null
+    var sprintSpeedModifier = "1.5".asExpression()
         private set
 
-    var sprintFovModifier: Expression? = null
-
-    var surfaceLevelOffset: Expression? = null
+    var sprintFovModifier = "1.2".asExpression()
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
         buffer.writeRidingStats(stats)
         rideSounds.encode(buffer)
-        buffer.writeNullableExpression(terminalVelocity)
-        buffer.writeNullableExpression(rotatePokemonHead)
-        buffer.writeNullableExpression(staminaIncreaseExpr)
-        buffer.writeNullableExpression(staminaDecreaseExpr)
-        buffer.writeNullableExpression(rotationSpeedModifierExpr)
-        buffer.writeNullableExpression(jumpStrengthExpr)
-        buffer.writeNullableExpression(speedExpr)
-        buffer.writeNullableExpression(accelerationExpr)
-        buffer.writeNullableExpression(sprintSpeedModifier)
-        buffer.writeNullableExpression(sprintFovModifier)
-        buffer.writeNullableExpression(surfaceLevelOffset)
+        buffer.writeExpression(terminalVelocity)
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
         stats.putAll(buffer.readRidingStats())
         rideSounds = RideSoundSettingsList.decode(buffer)
-        terminalVelocity = buffer.readNullableExpression()
-        rotatePokemonHead = buffer.readNullableExpression()
-        staminaIncreaseExpr = buffer.readNullableExpression()
-        staminaDecreaseExpr = buffer.readNullableExpression()
-        rotationSpeedModifierExpr = buffer.readNullableExpression()
-        jumpStrengthExpr = buffer.readNullableExpression()
-        speedExpr = buffer.readNullableExpression()
-        accelerationExpr = buffer.readNullableExpression()
-        sprintSpeedModifier = buffer.readNullableExpression()
-        sprintFovModifier = buffer.readNullableExpression()
-        surfaceLevelOffset = buffer.readNullableExpression()
+        terminalVelocity = buffer.readExpression()
     }
 }
 

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

@@ -8,14 +8,10 @@
 
 package com.cobblemon.mod.common.api.riding.behaviour.types.liquid
 
-import com.cobblemon.mod.common.CobblemonRideSettings
+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.RidingBehaviour
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.Side
-import com.cobblemon.mod.common.api.riding.behaviour.ridingState
+import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
@@ -25,7 +21,6 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.blockPositionsAsListRounded
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.readRidingStats
-import com.cobblemon.mod.common.util.writeNullable
 import com.cobblemon.mod.common.util.writeRidingStats
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
@@ -43,8 +38,6 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
     }
 
     override val key = KEY
-    val globalBurst: BurstSettings
-        get() = CobblemonRideSettings.burst
 
     override fun getRidingStyle(settings: BurstSettings, state: BurstState): RidingStyle {
         return RidingStyle.LIQUID
@@ -74,7 +67,7 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
         vehicle: PokemonEntity,
         driver: Player
     ): Float {
-        if (state.dashing.get()) {
+        if(state.dashing.get()) {
             state.ticks.set(state.ticks.get() + 1)
             if(state.ticks.get() >= DASH_TICKS) {
                 state.dashing.set(false)
@@ -84,7 +77,7 @@ class BurstBehaviour : RidingBehaviour<BurstSettings, BurstState> {
         }
 
         state.dashing.set(true)
-        return settings.dashSpeed ?: globalBurst.dashSpeed!!
+        return settings.dashSpeed
     }
 
     override fun rotation(
@@ -246,21 +239,22 @@ class BurstSettings : RidingBehaviourSettings {
     override val key = BurstBehaviour.KEY
     override val stats = mutableMapOf<RidingStat, IntRange>()
 
-    var dashSpeed: Float? = null
+    var dashSpeed = 1F
         private set
 
     var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
         buffer.writeRidingStats(stats)
         rideSounds.encode(buffer)
-        buffer.writeNullable(dashSpeed) { buf, speed -> buf.writeFloat(speed) }
+        buffer.writeFloat(dashSpeed)
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
         stats.putAll(buffer.readRidingStats())
         rideSounds = RideSoundSettingsList.decode(buffer)
-        dashSpeed = buffer.readNullable { buf -> buf.readFloat() }
+        dashSpeed = buffer.readFloat()
     }
 }
 

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

@@ -10,33 +10,21 @@ package com.cobblemon.mod.common.api.riding.behaviour.types.liquid
 
 import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.MoLangMath.lerp
+import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.CobblemonRideSettings
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.orientation.OrientationController
 import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState
-import com.cobblemon.mod.common.api.riding.behaviour.Side
-import com.cobblemon.mod.common.api.riding.behaviour.ridingState
+import com.cobblemon.mod.common.api.riding.behaviour.*
 import com.cobblemon.mod.common.api.riding.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.posing.PoseProvider
 import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.*
 import com.cobblemon.mod.common.util.math.geometry.toDegrees
 import com.cobblemon.mod.common.util.math.geometry.toRadians
-import com.cobblemon.mod.common.util.readNullableExpression
-import com.cobblemon.mod.common.util.readRidingStats
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveDouble
-import com.cobblemon.mod.common.util.toVec3d
-import com.cobblemon.mod.common.util.writeNullableExpression
-import com.cobblemon.mod.common.util.writeRidingStats
-import kotlin.math.*
 import net.minecraft.client.Minecraft
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
@@ -47,6 +35,18 @@ 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.Vector3f
+import kotlin.math.abs
+import kotlin.math.asin
+import kotlin.math.cos
+import kotlin.math.hypot
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.pow
+import kotlin.math.sign
+import kotlin.math.sin
+import kotlin.math.sqrt
 
 class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
     companion object {
@@ -54,8 +54,6 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
     }
 
     override val key = KEY
-    val globalDolphin: DolphinSettings
-        get() = CobblemonRideSettings.dolphin
 
     override fun getRidingStyle(settings: DolphinSettings, state: DolphinState): RidingStyle {
         return RidingStyle.LIQUID
@@ -119,14 +117,10 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
     ) {
         val stam = state.stamina.get()
 
-        if (vehicle.runtime.resolveBoolean(settings.infiniteStamina ?: globalDolphin.infiniteStamina!!)) {
-            return
-        }
-
         // Grab the boost time in seconds and convert to ticks. Then calculate the drain rate as inversely
         // proportional to the number of ticks of boost thus making a full boost take x ticks
         // in short: "Stamina drains slower at higher values and also replenishes slower"
-        val boostTime = vehicle.runtime.resolveDouble(settings.staminaExpr ?: globalDolphin.staminaExpr!!) * 20.0f
+        val boostTime = vehicle.runtime.resolveDouble(settings.staminaExpr) * 20.0f
         val stamDrainRate = (1.0f / boostTime).toFloat()
 
         val newStam = if (state.boosting.get()) max(0.0f,stam - stamDrainRate)
@@ -155,9 +149,9 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         val controller = (driver as OrientationControllable).orientationController
 
         val runtime = vehicle.runtime
-        val boostMod = if (state.boosting.get()) runtime.resolveDouble(settings.jumpExpr ?: globalDolphin.jumpExpr!!) else 1.0
-        val topSpeed = (vehicle.runtime.resolveDouble(settings.speedExpr ?: globalDolphin.speedExpr!!) / 20.0) * boostMod
-        val accel = (topSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalDolphin.accelerationExpr!!) * 20.0)) * boostMod
+        val boostMod = if (state.boosting.get()) runtime.resolveDouble(settings.jumpExpr) else 1.0
+        val topSpeed = (vehicle.runtime.resolveDouble(settings.speedExpr) / 20.0) * boostMod
+        val accel = (topSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr) * 20.0)) * boostMod
 
         /*********************************************
          * Breaching logic
@@ -195,8 +189,8 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         }
 
         val currSpeed = state.speed.get()
-        val strafeFactor = runtime.resolveDouble(settings.strafeFactor ?: globalDolphin.strafeFactor!!)
-        val reverseDriveFactor = runtime.resolveDouble(settings.reverseDriveFactor ?: globalDolphin.reverseDriveFactor!!)
+        val strafeFactor = runtime.resolveDouble(settings.strafeFactor)
+        val reverseDriveFactor = runtime.resolveDouble(settings.reverseDriveFactor)
         val f = -driver.xxa * strafeFactor
         when {
             driver.zza > 0.0 -> state.speed.set(min(topSpeed, currSpeed + accel))
@@ -231,8 +225,8 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
 
         val currSpeed = vehicle.deltaMovement.length()
 
-        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalDolphin.handlingExpr!!)
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalDolphin.speedExpr!!) / 20.0
+        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr)
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) / 20.0
 
         val yawDeltaDeg =  deltaTime * handling * sin(Math.toRadians(controller.roll.toDouble())).pow(2) * sin(Math.toRadians(controller.roll.toDouble())).sign
         val trueYawDelt = yawDeltaDeg * abs(cos(Math.toRadians(controller.pitch.toDouble()))) * sqrt(RidingBehaviour.scaleToRange(currSpeed, 0.0, topSpeed))
@@ -259,7 +253,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         // Calculate correcting roll force.
         // Mult by cos(pitch) to ensure that it doesn't roll correct at when diving or climbing
         val currSpeed = vehicle.deltaMovement.length()
-        val rollCorrectionTimer = vehicle.runtime.resolveDouble(settings.timeToRollCorrect ?: globalDolphin.timeToRollCorrect!!)
+        val rollCorrectionTimer = vehicle.runtime.resolveDouble(settings.timeToRollCorrect)
         val maxRollCorrectionRate = if (!(vehicle.isInWater || vehicle.isUnderWater)) 15.0f
             else 10.0f * (cos(controller.pitch.toRadians())).pow(2) * ((state.noInputTime.get() - rollCorrectionTimer) * 2).coerceIn(0.0, 1.0).toFloat()
         val maxRollForce = maxRollCorrectionRate / 40.0
@@ -380,8 +374,8 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         controller.rotateRoll(controller.roll * -1.0f)
 
         val boostingHandleDebuff = if (state.boosting.get()) 0.2 else 1.0
-        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr ?: globalDolphin.handlingExpr!!) * boostingHandleDebuff
-        val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult ?: globalDolphin.mouseInputMult!!)
+        val handling = vehicle.runtime.resolveDouble(settings.handlingExpr) * boostingHandleDebuff
+        val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult)
 
         //Smooth out mouse input.
         val smoothingSpeed = 4.0
@@ -424,9 +418,9 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
     ): Vec3 {
         if (driver !is OrientationControllable) return Vec3.ZERO
         val controller = (driver as OrientationControllable).orientationController
-        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr ?: globalDolphin.speedExpr!!) / 20.0
+        val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) / 20.0
         val boostingHandleDebuff = if (state.boosting.get()) 0.2 else 1.0
-        val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult ?: globalDolphin.mouseInputMult!!) * boostingHandleDebuff
+        val mouseInputMult = vehicle.runtime.resolveDouble(settings.mouseInputMult) * boostingHandleDebuff
 
         //Smooth out mouse input.
         val smoothingSpeed = 4.0
@@ -445,7 +439,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         // - Reduce pitch substantially when rolled and in a steep yaw. This prevents the player from ignoring a slow handling stat
         // - Do not pitch at all when at or below hover speed
         // - pitch faster at higher speeds
-        val p = 1.0 - vehicle.runtime.resolveDouble(settings.horizontalPitchExpr ?: globalDolphin.horizontalPitchExpr!!)
+        val p = 1.0 - vehicle.runtime.resolveDouble(settings.horizontalPitchExpr)
         val localPitch = yInput * (1 - abs(sin(controller.roll.toRadians())) * p * hypot(controller.forwardVector.x.toDouble(), controller.forwardVector.z.toDouble()).toFloat())
 //        localPitch *= if (currSpeed > hoverSpeed) RidingBehaviour.scaleToRange(currSpeed, hoverSpeed, topSpeed)
 //        else 0.0
@@ -566,66 +560,62 @@ class DolphinSettings : RidingBehaviourSettings {
     override val key = DolphinBehaviour.KEY
     override val stats = mutableMapOf<RidingStat, IntRange>()
 
-    var infiniteStamina: Expression? = null
+    var canJump = "true".asExpression()
         private set
 
-    var canJump: Expression? = null
+    var reverseDriveFactor = "0.25".asExpression()
         private set
 
-    var reverseDriveFactor: Expression? = null
+    var strafeFactor = "0.2".asExpression()
         private set
 
-    var strafeFactor: Expression? = null
-        private set
-
-    var timeToRollCorrect: Expression? = null
+    var timeToRollCorrect: Expression = "0.5".asExpression()
         private set
 
     // Boost influence when boosting
-    var jumpExpr: Expression? = null
+    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'LIQUID', 2.2, 1.2)".asExpression()
     // Yaw rate in degrees per second
-    var handlingExpr: Expression? = null
-    var horizontalPitchExpr: Expression? = null
-    var mouseInputMult: Expression? = null
+    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'LIQUID', 100.0, 45.0)".asExpression()
+    var horizontalPitchExpr: Expression = "q.get_ride_stats('SKILL', 'LIQUID', 0.3, 0.2)".asExpression()
+    var mouseInputMult: Expression = "q.get_ride_stats('SKILL', 'LIQUID', 1.2, 0.8)".asExpression()
     // Top speed in Bl/s
-    var speedExpr: Expression? = null
+    var speedExpr: Expression = "q.get_ride_stats('SPEED', 'LIQUID', 15.0, 5.0)".asExpression()
     // Seconds to get to top speed
-    var accelerationExpr: Expression? = null
+    var accelerationExpr: Expression = "q.get_ride_stats('ACCELERATION', 'LIQUID', 2.0, 5.0)".asExpression()
     // Seconds of boost
-    var staminaExpr: Expression? = null
+    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'LIQUID', 7.0, 3.0)".asExpression()
 
     var rideSounds: RideSoundSettingsList = RideSoundSettingsList()
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(key)
         buffer.writeRidingStats(stats)
         rideSounds.encode(buffer)
-        buffer.writeNullableExpression(infiniteStamina)
-        buffer.writeNullableExpression(canJump)
-        buffer.writeNullableExpression(reverseDriveFactor)
-        buffer.writeNullableExpression(strafeFactor)
-        buffer.writeNullableExpression(jumpExpr)
-        buffer.writeNullableExpression(handlingExpr)
-        buffer.writeNullableExpression(horizontalPitchExpr)
-        buffer.writeNullableExpression(mouseInputMult)
-        buffer.writeNullableExpression(speedExpr)
-        buffer.writeNullableExpression(accelerationExpr)
-        buffer.writeNullableExpression(staminaExpr)
+        buffer.writeExpression(canJump)
+        buffer.writeExpression(reverseDriveFactor)
+        buffer.writeExpression(strafeFactor)
+        buffer.writeExpression(jumpExpr)
+        buffer.writeExpression(handlingExpr)
+        buffer.writeExpression(horizontalPitchExpr)
+        buffer.writeExpression(mouseInputMult)
+        buffer.writeExpression(speedExpr)
+        buffer.writeExpression(accelerationExpr)
+        buffer.writeExpression(staminaExpr)
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
         stats.putAll(buffer.readRidingStats())
         rideSounds = RideSoundSettingsList.decode(buffer)
-        infiniteStamina = buffer.readNullableExpression()
-        canJump = buffer.readNullableExpression()
-        reverseDriveFactor = buffer.readNullableExpression()
-        strafeFactor = buffer.readNullableExpression()
-        jumpExpr = buffer.readNullableExpression()
-        handlingExpr = buffer.readNullableExpression()
-        horizontalPitchExpr = buffer.readNullableExpression()
-        mouseInputMult = buffer.readNullableExpression()
-        speedExpr = buffer.readNullableExpression()
-        accelerationExpr = buffer.readNullableExpression()
-        staminaExpr = buffer.readNullableExpression()
+        canJump = buffer.readExpression()
+        reverseDriveFactor = buffer.readExpression()
+        strafeFactor = buffer.readExpression()
+        jumpExpr = buffer.readExpression()
+        handlingExpr = buffer.readExpression()
+        horizontalPitchExpr = buffer.readExpression()
+        mouseInputMult = buffer.readExpression()
+        speedExpr = buffer.readExpression()
+        accelerationExpr = buffer.readExpression()
+        staminaExpr = buffer.readExpression()
     }
 }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/sound/RideLoopSound.kt

@@ -42,10 +42,9 @@ class RideLoopSound(val ride: PokemonEntity, val soundSettings: RideSoundSetting
     var fade: Float = 0.0f
     var shouldMuffle: Boolean = soundSettings.muffleEnabled
     var rideAttenuation: RideAttenuationModel = soundSettings.attenuationModel
-    var muffleAmount: Float = 1.0f // Currently slightly misleading. 1.0 is no muffle and 0.0 is full hFgain muting
-    var isPassenger: Boolean = ride.passengers.any { passenger ->
-        Minecraft.getInstance().player?.id == passenger.id
-    }
+    var muffleAmount: Float = 1.0f // Currently slightly misleading. 1.0 is on muffle and 0.0 is full hFgain muting
+    // TODO: revisit below flag once multi passenger support is enabled
+    var isPassenger: Boolean = Minecraft.getInstance().player?.id == ride.controllingPassenger?.id
 
     init {
         this.looping = true

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

@@ -21,11 +21,11 @@ import net.minecraft.network.chat.Component
 enum class RidingStat(
     val flavour: Flavour
 ) {
+    SPEED(Flavour.SWEET),
     ACCELERATION(Flavour.SPICY),
     SKILL(Flavour.DRY),
-    SPEED(Flavour.SWEET),
-    STAMINA(Flavour.SOUR),
-    JUMP(Flavour.BITTER);
+    JUMP(Flavour.BITTER),
+    STAMINA(Flavour.SOUR);
 
     companion object {
         fun getByName(name: String) = RidingStat.entries.firstOrNull { it.name.equals(name, ignoreCase = true) }

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

@@ -34,7 +34,7 @@ object CobblemonSpawnPools {
                 SpawnablePositionTypePrecalculation,
                 BucketPrecalculation,
                 BiomePrecalculation
-            ), reloadable = true
+            )
         )
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/prospecting/LurePokeSnackDetector.kt

@@ -24,12 +24,14 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.client.effect.PokeSnackBlockParticlesPacket
 import com.cobblemon.mod.common.util.math.pow
 import com.cobblemon.mod.common.util.toBlockPos
+import com.cobblemon.mod.common.util.toVec3d
 import kotlin.math.ceil
 import kotlin.math.sqrt
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.core.Holder
 import net.minecraft.server.level.ServerLevel
+import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.ai.village.poi.PoiManager
 import net.minecraft.world.entity.ai.village.poi.PoiType
 import net.minecraft.world.level.block.Blocks
@@ -112,6 +114,73 @@ object LurePokeSnackDetector : SpawningInfluenceDetector {
         }
     }
 
+    fun attemptSafeMove2(level: ServerLevel, startPos: BlockPos, entity: PokemonEntity, ) {
+        val inWater = entity.isInWater
+
+        // Random offset in a cardinal direction (north, south, east, west)
+        val randomDirection = listOf(Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST).random()
+        val initialOffsetPos = startPos.relative(randomDirection)
+
+        // Variables to track the best (closest) safe position
+        var safePos: BlockPos? = null
+        var bestDistanceSq = Double.MAX_VALUE
+
+        val maxRadius = 10
+
+        // Search within a sphere around the initial offset position
+        for (dx in -maxRadius..maxRadius) {
+            for (dy in -maxRadius..maxRadius) {
+                for (dz in -maxRadius..maxRadius) {
+                    val candidatePos = initialOffsetPos.offset(dx, dy, dz)
+                    val distanceSq = startPos.distSqr(candidatePos)
+
+                    // Check if within sphere radius
+                    if (dx*dx + dy*dy + dz*dz <= maxRadius*maxRadius) {
+                        // Check collision at candidate position
+                        val currentBox = entity.boundingBox.move(
+                            candidatePos.x - entity.x,
+                            candidatePos.y - entity.y,
+                            candidatePos.z - entity.z
+                        )
+
+                        if (level.noCollision(entity, currentBox)) {
+                            val blockBelowPos = candidatePos.below()
+                            val blockState = level.getBlockState(blockBelowPos)
+
+                            val isWater = blockState.block == Blocks.WATER
+                            if (inWater) {
+                                if (isWater) {
+                                    if (distanceSq < bestDistanceSq) {
+                                        bestDistanceSq = distanceSq
+                                        safePos = candidatePos
+                                    }
+                                }
+                            } else {
+                                if (!blockState.isAir) {
+                                    if (distanceSq < bestDistanceSq) {
+                                        bestDistanceSq = distanceSq
+                                        safePos = candidatePos
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (safePos != null) {
+            entity.moveTo(safePos.toVec3d())
+            PokeSnackBlockParticlesPacket(startPos, safePos).sendToPlayersAround(
+                startPos.x.toDouble(),
+                startPos.y.toDouble(),
+                startPos.z.toDouble(),
+                64.0,
+                level.dimension()
+            )
+        }
+    }
+
     fun attemptSafeMove(level: ServerLevel, startPos: BlockPos, entity: PokemonEntity) {
         val inWater = entity.isInWater
         val maxDistance = 10  // maximum search radius
@@ -186,4 +255,4 @@ object LurePokeSnackDetector : SpawningInfluenceDetector {
     }
 
     override fun detectFromBlock(level: ServerLevel, pos: BlockPos, blockState: BlockState) = emptyList<SpawningZoneInfluence>()
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/party/PlayerPartyStore.kt

@@ -161,10 +161,6 @@ open class PlayerPartyStore(
                 if (pokemon.interactionCooldowns.any()) {
                     pokemon.tickInteractionCooldown()
                 }
-
-                if (pokemon.entity?.passengers?.isNotEmpty() != true) {
-                    pokemon.rideStamina += 0.1F // Recover all stamina in 10 seconds, as long as no one's on it
-                }
             }
             // Friendship
             // ToDo expand this down the line just a very basic implementation for the first releases

common/src/main/kotlin/com/cobblemon/mod/common/block/entity/CampfireBlockEntity.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.block.entity
 import com.cobblemon.mod.common.CobblemonBlockEntities
 import com.cobblemon.mod.common.CobblemonRecipeTypes
 import com.cobblemon.mod.common.CobblemonSounds
-import com.cobblemon.mod.common.api.cooking.Seasonings
 import com.cobblemon.mod.common.api.cooking.getColourMixFromSeasonings
 import com.cobblemon.mod.common.block.campfirepot.CampfireBlock
 import com.cobblemon.mod.common.item.components.PotComponent
@@ -478,10 +477,9 @@ class CampfireBlockEntity(pos: BlockPos, state: BlockState) : BaseContainerBlock
     }
 
     override fun canPlaceItemThroughFace(index: Int, itemStack: ItemStack, direction: Direction?): Boolean {
-        return if(direction == Direction.UP && Seasonings.isSeasoning(itemStack)){
-            SEASONING_SLOTS.contains(index)
-        } else {
-            CRAFTING_GRID_SLOTS.contains(index)
+        return when (direction) {
+            Direction.UP -> SEASONING_SLOTS.contains(index)
+            else -> CRAFTING_GRID_SLOTS.contains(index)
         }
     }
 

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

@@ -29,15 +29,7 @@ import com.cobblemon.mod.common.client.gui.cookingpot.CookingPotScreen
 import com.cobblemon.mod.common.client.particle.BedrockParticleOptionsRepository
 import com.cobblemon.mod.common.client.render.ClientPlayerIcon
 import com.cobblemon.mod.common.client.render.DeferredRenderer
-import com.cobblemon.mod.common.client.render.block.BerryBlockRenderer
-import com.cobblemon.mod.common.client.render.block.CampfireBlockEntityRenderer
-import com.cobblemon.mod.common.client.render.block.DisplayCaseRenderer
-import com.cobblemon.mod.common.client.render.block.FossilAnalyzerRenderer
-import com.cobblemon.mod.common.client.render.block.GildedChestBlockRenderer
-import com.cobblemon.mod.common.client.render.block.HealingMachineRenderer
-import com.cobblemon.mod.common.client.render.block.LecternBlockEntityRenderer
-import com.cobblemon.mod.common.client.render.block.PokeSnackBlockEntityRenderer
-import com.cobblemon.mod.common.client.render.block.RestorationTankRenderer
+import com.cobblemon.mod.common.client.render.block.*
 import com.cobblemon.mod.common.client.render.boat.CobblemonBoatRenderer
 import com.cobblemon.mod.common.client.render.color.AprijuiceItemColorProvider
 import com.cobblemon.mod.common.client.render.color.PokeBaitItemColorProvider
@@ -50,9 +42,7 @@ import com.cobblemon.mod.common.client.render.item.CobblemonBuiltinItemRendererR
 import com.cobblemon.mod.common.client.render.item.PokemonItemRenderer
 import com.cobblemon.mod.common.client.render.layer.PokemonOnShoulderRenderer
 import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockAnimationRepository
-import com.cobblemon.mod.common.client.render.models.blockbench.repository.BerryModelRepository
-import com.cobblemon.mod.common.client.render.models.blockbench.repository.MiscModelRepository
-import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.*
 import com.cobblemon.mod.common.client.render.npc.NPCRenderer
 import com.cobblemon.mod.common.client.render.pokeball.PokeBallRenderer
 import com.cobblemon.mod.common.client.render.pokemon.PokemonRenderer
@@ -60,25 +50,18 @@ import com.cobblemon.mod.common.client.requests.ClientPlayerActionRequests
 import com.cobblemon.mod.common.client.sound.BattleMusicController
 import com.cobblemon.mod.common.client.sound.EntitySoundTracker
 import com.cobblemon.mod.common.client.storage.ClientStorageManager
-import com.cobblemon.mod.common.client.tooltips.AprijuiceTooltipGenerator
-import com.cobblemon.mod.common.client.tooltips.CobblemonTooltipGenerator
-import com.cobblemon.mod.common.client.tooltips.FishingBaitTooltipGenerator
-import com.cobblemon.mod.common.client.tooltips.FishingRodTooltipGenerator
-import com.cobblemon.mod.common.client.tooltips.PokePuffTooltipGenerator
-import com.cobblemon.mod.common.client.tooltips.RecipeSeasoningAbsorbtionTooltipGenerator
-import com.cobblemon.mod.common.client.tooltips.SeasoningTooltipGenerator
-import com.cobblemon.mod.common.client.tooltips.TooltipManager
+import com.cobblemon.mod.common.client.tooltips.*
 import com.cobblemon.mod.common.client.trade.ClientTrade
-import com.cobblemon.mod.common.debug.RidingDebugRenderer
+import com.cobblemon.mod.common.data.CobblemonDataProvider
 import com.cobblemon.mod.common.entity.boat.CobblemonBoatType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.item.food.SinisterTeaItem
 import com.cobblemon.mod.common.platform.events.PlatformEvents
 import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext
-import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.isLookingAt
-import io.github.flemmli97.debugutils.api.RegisterDebugRenderers
 import net.minecraft.client.Minecraft
 import net.minecraft.client.color.block.BlockColor
+import net.minecraft.client.color.item.ItemColor
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.screens.MenuScreens
 import net.minecraft.client.gui.screens.Screen
@@ -121,7 +104,7 @@ object CobblemonClient {
         teamData = ClientPlayerTeamData()
         clientPokedexData = ClientPokedexManager(mutableMapOf())
         storage.onLogin()
-//        CobblemonDataProvider.canReload = false
+        CobblemonDataProvider.canReload = false
     }
 
     fun onLogout() {
@@ -130,7 +113,7 @@ object CobblemonClient {
         battleOverlay.onLogout()
         ClientTaskTracker.clear()
         checkedStarterScreen = false
-//        CobblemonDataProvider.canReload = true
+        CobblemonDataProvider.canReload = true
         DeferredRenderer.clearAll()
         ClientPlayerIcon.clear()
     }
@@ -196,11 +179,6 @@ object CobblemonClient {
             }
             ClientPlayerIcon.onTick()
         }
-
-        val debugId = cobblemonResource("riding")
-        RegisterDebugRenderers.registerCustomDebugRenderer(debugId, RidingDebugRenderer)
-        RegisterDebugRenderers.registerServerToggle(debugId)
-        RegisterDebugRenderers.registerClientHandler(debugId) { RidingDebugRenderer.clientHandler(it) }
     }
 
     private fun registerTooltipManagers() {
@@ -443,4 +421,5 @@ object CobblemonClient {
             )
         }
     }
+
 }

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

@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client
-
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.client.persisted.ClientPersistedData
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import net.minecraft.client.CameraType
-import net.minecraft.client.Minecraft
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.entity.Entity
-
-/**
- * The purpose here is to keep track of the last camera type that was used for each riding behaviour or just
- * the last overall, then change the camera type where necessary when mounting/dismounting or switching
- * between different riding behaviours. This is dependent on a config option, but the general idea is we
- * want the camera to be whatever the player feels most comfy with without them having to fiddle with it
- * more than once.
- */
-object MountedCameraTypeHandler {
-    var unmountedCameraType: CameraType = CameraType.FIRST_PERSON
-
-    fun handleMount(passenger: Entity, vehicle: PokemonEntity) {
-        val mc = Minecraft.getInstance()
-        val key = vehicle.ridingController?.context?.settings?.key
-        if (passenger != mc.player || key == null) {
-            return
-        }
-        unmountedCameraType = mc.options.cameraType
-        val data = ClientPersistedData.ridingPerspectives
-        if (Cobblemon.config.rememberRidingCamera) {
-            val lastCameraTypeForKey = data.perspectives[key]
-            if (lastCameraTypeForKey != null) {
-                mc.options.cameraType = lastCameraTypeForKey
-            }
-        }
-    }
-
-    fun handleDismount(passenger: Entity, vehicle: PokemonEntity) {
-        val mc = Minecraft.getInstance()
-        val key = vehicle.ridingController?.context?.settings?.key
-        if (passenger != mc.player || key == null) {
-            return
-        }
-        val currentCameraType = mc.options.cameraType
-        if (currentCameraType != unmountedCameraType) {
-            mc.options.cameraType = unmountedCameraType
-        }
-        val data = ClientPersistedData.ridingPerspectives
-        data.updatePerspective(key, currentCameraType)
-    }
-
-    fun handleTransition(fromKey: ResourceLocation, toKey: ResourceLocation) {
-        val mc = Minecraft.getInstance()
-        val currentCameraType = mc.options.cameraType
-        val data = ClientPersistedData.ridingPerspectives
-        data.updatePerspective(fromKey, currentCameraType)
-        if (Cobblemon.config.rememberRidingCamera) {
-            val lastCameraTypeForKey = data.perspectives[toKey]
-            if (lastCameraTypeForKey != null) {
-                mc.options.cameraType = lastCameraTypeForKey
-            }
-        }
-    }
-}

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

@@ -135,11 +135,7 @@ class RideControlsOverlay : Gui(Minecraft.getInstance()) {
                 // Configure what controls to show for each behaviour
                 when (currentBehaviourKey) {
                     BirdBehaviour.KEY -> {}
-                    BoatBehaviour.KEY -> {
-                        showVerticalMouse = false
-                        showHorizontalMouse = false
-                        showSneakKey = false
-                    }
+                    BoatBehaviour.KEY -> {}
                     BurstBehaviour.KEY -> {}
                     DolphinBehaviour.KEY -> {}
                     GliderBehaviour.KEY -> {}

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

@@ -12,9 +12,7 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.config.CobblemonConfig
 import com.cobblemon.mod.common.util.asTranslated
-import com.cobblemon.mod.common.util.ifServer
 import com.cobblemon.mod.common.util.lang
-import com.cobblemon.mod.common.util.runOnServer
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.components.Button
 import net.minecraft.client.gui.components.EditBox

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

@@ -82,6 +82,9 @@ class PokedexGUI private constructor(
         private val arrowUpIcon = cobblemonResource("textures/gui/pokedex/arrow_up.png")
         private val arrowDownIcon = cobblemonResource("textures/gui/pokedex/arrow_down.png")
 
+        private val tooltipEdge = cobblemonResource("textures/gui/pokedex/tooltip_edge.png")
+        private val tooltipBackground = cobblemonResource("textures/gui/pokedex/tooltip_background.png")
+
         private val tabSelectArrow = cobblemonResource("textures/gui/pokedex/select_arrow.png")
         private val tabIcons = arrayOf(
             cobblemonResource("textures/gui/pokedex/tab_info.png"),
@@ -322,15 +325,17 @@ class PokedexGUI private constructor(
 
         // Search type tooltip
         if (searchByTypeButton.isButtonHovered(mouseX, mouseY)) {
+            matrices.pushPose()
+            matrices.translate(0.0, 0.0, 1000.0)
             val searchTypeText = lang("ui.pokedex.search.search_by", lang("ui.pokedex.search.type.${selectedSearchByType.name.lowercase()}")).bold()
-            renderTooltip(
-                context,
-                searchTypeText,
-                mouseX,
-                mouseY,
-                delta,
-                -14
-            )
+            val searchTypeTextWidth = Minecraft.getInstance().font.width(searchTypeText.font(CobblemonResources.DEFAULT_LARGE))
+            val tooltipWidth = searchTypeTextWidth + 6
+
+            blitk(matrixStack = matrices, texture = tooltipEdge, x = mouseX - (tooltipWidth / 2) - 1, y = mouseY - 16, width = 1, height = 11)
+            blitk(matrixStack = matrices, texture = tooltipBackground, x = mouseX - (tooltipWidth / 2), y = mouseY - 16, width = tooltipWidth, height = 11)
+            blitk(matrixStack = matrices, texture = tooltipEdge, x = mouseX + (tooltipWidth / 2), y = mouseY - 16, width = 1, height = 11)
+            drawScaledText(context = context, font = CobblemonResources.DEFAULT_LARGE, text = searchTypeText, x = mouseX, y = mouseY - 15, shadow = true, centered = true)
+            matrices.popPose()
         }
     }
 
@@ -476,8 +481,6 @@ class PokedexGUI private constructor(
 
     fun displaytabInfoElement(tabIndex: Int, update: Boolean = true) {
         val showActiveTab = selectedEntry?.let { selectedForm in CobblemonClient.clientPokedexData.getCaughtForms(it) } == true
-        var statSubIndex = 0
-
         if (tabButtons.isNotEmpty() && tabButtons.size > tabIndex) {
             tabButtons.forEachIndexed { index, tab -> tab.isWidgetActive = showActiveTab && index == tabIndex
             }
@@ -488,14 +491,6 @@ class PokedexGUI private constructor(
             removeWidget((tabInfoElement as AbilitiesWidget).rightButton)
         }
 
-        if (tabInfoIndex == TAB_STATS && tabInfoElement is StatsWidget) {
-            statSubIndex = (tabInfoElement as StatsWidget).selectedStatTypeIndex
-            removeWidget((tabInfoElement as StatsWidget).leftButton)
-            removeWidget((tabInfoElement as StatsWidget).rightButton)
-            removeWidget((tabInfoElement as StatsWidget).leftSubButton)
-            removeWidget((tabInfoElement as StatsWidget).rightSubButton)
-        }
-
         tabInfoIndex = tabIndex
         if (::tabInfoElement.isInitialized) removeWidget(tabInfoElement)
 
@@ -513,9 +508,7 @@ class PokedexGUI private constructor(
                 tabInfoElement = SizeWidget(x + 180, y + 135)
             }
             TAB_STATS -> {
-                tabInfoElement = StatsWidget(x + 180, y + 135).also {
-                    it.selectedStatTypeIndex = statSubIndex
-                }
+                tabInfoElement = StatsWidget(x + 180, y + 135)
             }
             TAB_DROPS -> {
                 tabInfoElement = DropsScrollingWidget(x + 189, y + 135)
@@ -562,17 +555,6 @@ class PokedexGUI private constructor(
                 }
                 TAB_STATS -> {
                     (tabInfoElement as StatsWidget).baseStats = form.baseStats
-                    (tabInfoElement as StatsWidget).rideProperties = form.riding
-
-                    form.riding.behaviours?.let {
-                        addRenderableWidget((tabInfoElement as StatsWidget).leftButton)
-                        addRenderableWidget((tabInfoElement as StatsWidget).rightButton)
-
-                        if (it.size > 1) {
-                            addRenderableWidget((tabInfoElement as StatsWidget).leftSubButton)
-                            addRenderableWidget((tabInfoElement as StatsWidget).rightSubButton)
-                        }
-                    }
                 }
                 TAB_DROPS -> {
                     (tabInfoElement as DropsScrollingWidget).dropTable = form.drops

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

@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.gui.pokedex
-
-import com.cobblemon.mod.common.api.gui.blitk
-import com.cobblemon.mod.common.api.text.font
-import com.cobblemon.mod.common.client.CobblemonResources
-import com.cobblemon.mod.common.client.render.drawScaledText
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
-import net.minecraft.network.chat.MutableComponent
-
-private val tooltipEdge = cobblemonResource("textures/gui/pokedex/tooltip_edge.png")
-private val tooltipBackground = cobblemonResource("textures/gui/pokedex/tooltip_background.png")
-
-fun renderTooltip(context: GuiGraphics, text: MutableComponent, posX: Int, posY: Int, delta: Float, offsetY: Int = 0) {
-    val poseStack = context.pose()
-    val textWidth = Minecraft.getInstance().font.width(text.font(CobblemonResources.DEFAULT_LARGE))
-    val tooltipWidth = textWidth + 6
-    val tooltipHeight = 11
-    val tooltipTop = posY + offsetY
-
-    poseStack.pushPose()
-    poseStack.translate(0.0, 0.0, 1000.0)
-    Minecraft.getInstance().let {
-        it.mainRenderTarget.bindWrite(false)
-        context.enableScissor(
-            posX - (tooltipWidth / 2),
-            tooltipTop + 1,
-            (posX - (tooltipWidth / 2)) + tooltipWidth,
-            tooltipTop + 10
-        )
-        it.gameRenderer.processBlurEffect(delta)
-        context.disableScissor()
-        it.mainRenderTarget.bindWrite(true)
-    }
-
-    blitk(matrixStack = poseStack, texture = tooltipEdge, x = posX - (tooltipWidth / 2) - 1, y = tooltipTop, width = 1, height = tooltipHeight)
-    blitk(matrixStack = poseStack, texture = tooltipBackground, x = posX - (tooltipWidth / 2), y = tooltipTop, width = tooltipWidth, height = tooltipHeight)
-    blitk(matrixStack = poseStack, texture = tooltipEdge, x = posX + (tooltipWidth / 2), y = tooltipTop, width = 1, height = tooltipHeight)
-    drawScaledText(context = context, font = CobblemonResources.DEFAULT_LARGE, text = text, x = posX, y = tooltipTop + 1, shadow = true, centered = true)
-    poseStack.popPose()
-}

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

@@ -31,7 +31,6 @@ class ScaledButton(
 ): Button(buttonX.toInt(), buttonY.toInt(), buttonWidth.toInt(), buttonHeight.toInt(), "".text(), clickAction, DEFAULT_NARRATION), CobblemonRenderable {
 
     var isWidgetActive = false
-    var isVisible = true
 
     override fun mouseDragged(d: Double, e: Double, i: Int, f: Double, g: Double) = false
     override fun defaultButtonNarrationText(builder: NarrationElementOutput) {
@@ -39,7 +38,8 @@ class ScaledButton(
 
     override fun renderWidget(context: GuiGraphics, pMouseX: Int, pMouseY: Int, pPartialTicks: Float) {
         val matrices = context.pose()
-        if (isVisible && resource != null) {
+
+        if (resource != null) {
             blitk(
                 matrixStack = matrices,
                 texture = resource,
@@ -55,14 +55,14 @@ class ScaledButton(
     }
 
     override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
-        if (isVisible && active && isButtonHovered(mouseX, mouseY)) {
+        if (active && isButtonHovered(mouseX, mouseY)) {
             super.mouseClicked(mouseX, mouseY, button)
         }
         return false
     }
 
     override fun playDownSound(soundManager: SoundManager) {
-        if (isVisible && active && !this.silent) {
+        if (active && !this.silent) {
             soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.POKEDEX_CLICK_SHORT, 1.0F))
         }
     }
@@ -71,4 +71,4 @@ class ScaledButton(
         return mouseX.toFloat() in (buttonX..(buttonX + (buttonWidth.toFloat() * scale)))
                 && mouseY.toFloat() in (buttonY..(buttonY + (buttonHeight.toFloat() * scale)))
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/AbilitiesWidget.kt

@@ -48,11 +48,12 @@ class AbilitiesWidget(x: Int, y: Int): InfoTextScrollWidget(pX = x, pY = y) {
     init { setAbility() }
 
     private fun switchAbility(nextIndex: Boolean) {
-        val size = abilitiesList.size
-        selectedAbilitiesIndex = if (nextIndex) {
-            (selectedAbilitiesIndex + 1) % size
+        if (nextIndex) {
+            if (selectedAbilitiesIndex < abilitiesList.lastIndex) selectedAbilitiesIndex++
+            else selectedAbilitiesIndex = 0
         } else {
-            (selectedAbilitiesIndex - 1 + size) % size
+            if (selectedAbilitiesIndex > 0) selectedAbilitiesIndex--
+            else selectedAbilitiesIndex = abilitiesList.lastIndex
         }
         setAbility()
     }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/PokemonInfoWidget.kt

@@ -33,7 +33,6 @@ import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.PORTRAIT_
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.PORTRAIT_POKE_BALL_WIDTH
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCALE
 import com.cobblemon.mod.common.client.gui.pokedex.ScaledButton
-import com.cobblemon.mod.common.client.gui.pokedex.renderTooltip
 import com.cobblemon.mod.common.client.gui.summary.widgets.SoundlessWidget
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.client.render.drawScaledTextJustifiedRight
@@ -95,6 +94,9 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
         private val buttonGenderFemale = cobblemonResource("textures/gui/pokedex/button_female.png")
         private val buttonNone = cobblemonResource("textures/gui/pokedex/button_none.png")
         private val buttonShiny = cobblemonResource("textures/gui/pokedex/button_shiny.png")
+
+        private val tooltipEdge = cobblemonResource("textures/gui/pokedex/tooltip_edge.png")
+        private val tooltipBackground = cobblemonResource("textures/gui/pokedex/tooltip_background.png")
     }
 
     var currentEntry : PokedexEntry? = null
@@ -438,14 +440,13 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
                 // Tooltip
                 if (it.isVisible() && it.getWidget().isButtonHovered(mouseX, mouseY)) {
                     val variationText = it.variation.displayName.asTranslated().bold()
-                    renderTooltip(
-                        context,
-                        variationText,
-                        mouseX,
-                        mouseY,
-                        delta,
-                        10
-                    )
+                    val variationTextWidth = Minecraft.getInstance().font.width(variationText.font(CobblemonResources.DEFAULT_LARGE))
+                    val tooltipWidth = variationTextWidth + 6
+
+                    blitk(matrixStack = matrices, texture = tooltipEdge, x = mouseX - (tooltipWidth / 2) - 1, y = mouseY + 8, width = 1, height = 11)
+                    blitk(matrixStack = matrices, texture = tooltipBackground, x = mouseX - (tooltipWidth / 2), y = mouseY + 8, width = tooltipWidth, height = 11)
+                    blitk(matrixStack = matrices, texture = tooltipEdge, x = mouseX + (tooltipWidth / 2), y = mouseY + 8, width = 1, height = 11)
+                    drawScaledText(context = context, font = CobblemonResources.DEFAULT_LARGE, text = variationText, x = mouseX, y = mouseY + 9, shadow = true, centered = true)
                 }
             }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/StatsWidget.kt

@@ -11,24 +11,18 @@ package com.cobblemon.mod.common.client.gui.pokedex.widgets
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.pokemon.stats.Stat
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
-import com.cobblemon.mod.common.api.riding.RidingProperties
-import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_WIDTH
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.POKEMON_DESCRIPTION_HEIGHT
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCALE
-import com.cobblemon.mod.common.client.gui.pokedex.ScaledButton
-import com.cobblemon.mod.common.client.gui.pokedex.renderTooltip
 import com.cobblemon.mod.common.client.gui.summary.widgets.SoundlessWidget
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.client.render.drawScaledTextJustifiedRight
-import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.network.chat.Component
-import net.minecraft.util.FastColor
 
 class StatsWidget(val pX: Int, val pY: Int) : SoundlessWidget(
     pX,
@@ -39,18 +33,6 @@ class StatsWidget(val pX: Int, val pY: Int) : SoundlessWidget(
 ) {
 
     companion object {
-        const val STAT_TYPE_BASE = 0
-        const val STAT_TYPE_RIDE = 1
-        const val MAX_BAR_WIDTH = 75
-
-        private val statTypes = listOf(STAT_TYPE_BASE, STAT_TYPE_RIDE)
-
-        private val divider = cobblemonResource("textures/gui/pokedex/info_stat_divider.png")
-        private val arrowLeft = cobblemonResource("textures/gui/pokedex/info_arrow_left.png")
-        private val arrowRight = cobblemonResource("textures/gui/pokedex/info_arrow_right.png")
-        private val subArrowLeft = cobblemonResource("textures/gui/pokedex/info_sub_arrow_left.png")
-        private val subArrowRight = cobblemonResource("textures/gui/pokedex/info_sub_arrow_right.png")
-
         private val statLabels = arrayOf(
             lang("ui.stats.hp"),
             lang("ui.stats.atk"),
@@ -70,92 +52,13 @@ class StatsWidget(val pX: Int, val pY: Int) : SoundlessWidget(
         )
     }
 
-    val leftButton: ScaledButton = ScaledButton(
-        pX + 2.5F,
-        pY - 8F,
-        7,
-        10,
-        arrowLeft,
-        clickAction = { switchStatType(false) }
-    )
-
-    val rightButton: ScaledButton = ScaledButton(
-        pX + 133F,
-        pY - 8F,
-        7,
-        10,
-        arrowRight,
-        clickAction = { switchStatType(true) }
-    )
-
-    val leftSubButton: ScaledButton = ScaledButton(
-        pX + 2.5F,
-        pY + 18.5F,
-        7,
-        10,
-        subArrowLeft,
-        clickAction = { switchRideBehaviour(false) }
-    )
-
-    val rightSubButton: ScaledButton = ScaledButton(
-        pX + 133F,
-        pY + 18.5F,
-        7,
-        10,
-        subArrowRight,
-        clickAction = { switchRideBehaviour(true) }
-    )
-
-    var selectedRideBehavioursIndex: Int = 0
-
-    var selectedStatTypeIndex: Int = STAT_TYPE_BASE
-        set(value) {
-            field = value
-
-            val isRideStatVisible = value == STAT_TYPE_RIDE
-            leftSubButton.visible = isRideStatVisible
-            rightSubButton.visible = isRideStatVisible
-        }
-
     var baseStats: Map<Stat, Int>? = null
-    var rideProperties: RidingProperties? = null
-
-    private fun switchStatType(nextIndex: Boolean) {
-        val size = statTypes.size
-        selectedStatTypeIndex = if (nextIndex) {
-            (selectedStatTypeIndex + 1) % size
-        } else {
-            (selectedStatTypeIndex - 1 + size) % size
-        }
-
-        val showSubArrowButtons = selectedStatTypeIndex == STAT_TYPE_RIDE
-        leftSubButton.visible = showSubArrowButtons
-        rightSubButton.visible = showSubArrowButtons
-    }
-
-    private fun switchRideBehaviour(nextIndex: Boolean) {
-        val size = rideProperties?.behaviours?.size ?: 0
-        selectedRideBehavioursIndex = if (nextIndex) {
-            (selectedRideBehavioursIndex + 1) % size
-        } else {
-            (selectedRideBehavioursIndex - 1 + size) % size
-        }
-    }
 
     override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        when (selectedStatTypeIndex) {
-            STAT_TYPE_BASE -> {
-                renderBaseStats(context)
-            }
-            STAT_TYPE_RIDE -> {
-                renderRideStats(context, mouseX, mouseY, delta)
-            }
-        }
-    }
-
-    private fun renderBaseStats(context: GuiGraphics) {
         if (baseStats == null) return
 
+        val matrices = context.pose()
+
         drawScaledText(
             context = context,
             font = CobblemonResources.DEFAULT_LARGE,
@@ -165,9 +68,18 @@ class StatsWidget(val pX: Int, val pY: Int) : SoundlessWidget(
             shadow = true
         )
 
-        val matrices = context.pose()
-
-        blitk(matrixStack = matrices, texture = divider, x = pX + 51, y = pY + 4, height = 33.5, width = 1)
+        // Divider
+        blitk(
+            matrixStack = matrices,
+            texture = CobblemonResources.WHITE,
+            x = pX + 50.5,
+            y = pY + 4,
+            height = 33.5,
+            width = 1,
+            red = 0.71F,
+            green = 0.95F,
+            blue = 0.95F
+        )
 
         for (i in statLabels.indices) {
             drawScaledText(
@@ -195,10 +107,10 @@ class StatsWidget(val pX: Int, val pY: Int) : SoundlessWidget(
                 blitk(
                     matrixStack = matrices,
                     texture = CobblemonResources.WHITE,
-                    x = pX + 55,
+                    x = pX + 54.5,
                     y = pY + 4 + (6 * i),
                     height = 3.5F,
-                    width = (statValue / 255F) * MAX_BAR_WIDTH,
+                    width = (statValue / 255F) * 77,
                     red = red,
                     green = green,
                     blue = blue
@@ -207,119 +119,6 @@ class StatsWidget(val pX: Int, val pY: Int) : SoundlessWidget(
         }
     }
 
-    private fun renderRideStats(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        rideProperties?.behaviours?.let { behaviours ->
-            val selectedBehaviour = behaviours.entries.toList()[selectedRideBehavioursIndex]
-            val behaviourStats = selectedBehaviour.value.stats
-
-            val matrices = context.pose()
-
-            drawScaledText(
-                context = context,
-                font = CobblemonResources.DEFAULT_LARGE,
-                text = Component.translatable("cobblemon.ui.pokedex.info.stats_ride").bold(),
-                x = pX + 9,
-                y = pY - 10,
-                shadow = true
-            )
-
-            rideProperties?.seats?.size?.let { seats ->
-                drawScaledTextJustifiedRight(
-                    context = context,
-                    font = CobblemonResources.DEFAULT_LARGE,
-                    text = Component.translatable("cobblemon.ui.pokedex.info.stats_ride.seats", seats).bold(),
-                    x = pX + 130,
-                    y = pY - 10,
-                    shadow = true
-                )
-            }
-
-            blitk(matrixStack = matrices, texture = divider, x = pX + 51, y = pY + 10, height = 27.5, width = 1)
-            blitk(matrixStack = matrices, texture = divider, x = pX + 9, y = pY + 2, height = 6, width = 121)
-
-            drawScaledText(
-                context = context,
-                text = lang("ui.ride_style.${selectedBehaviour.key.name.lowercase()}").bold(),
-                x = pX + 69.5,
-                y = pY + 3,
-                colour = 0x3A96B6,
-                scale = SCALE,
-                centered = true
-            )
-
-            RidingStat.entries.forEachIndexed { index, stat ->
-                drawScaledText(
-                    context = context,
-                    text =  lang("ui.stats.ride.${stat.name.lowercase()}").bold(),
-                    x = pX + 9,
-                    y = pY + 10 + (6 * index),
-                    colour = 0x606B6E,
-                    scale = SCALE
-                )
-
-                behaviourStats[stat]?.let { range ->
-                    val startPosY = pY + 10 + (6F * index)
-
-                    val red = FastColor.ARGB32.red(stat.flavour.colour) / 255F
-                    val green = FastColor.ARGB32.green(stat.flavour.colour) / 255F
-                    val blue = FastColor.ARGB32.blue(stat.flavour.colour) / 255F
-
-                    val barStart = pX + 55F
-                    val baseStatWidth = (range.start / 100F) * MAX_BAR_WIDTH
-                    val boostedStatWidth = ((range.endInclusive / 100F) * MAX_BAR_WIDTH) - baseStatWidth
-                    blitk(
-                        matrixStack = matrices,
-                        texture = CobblemonResources.WHITE,
-                        x = barStart,
-                        y = startPosY,
-                        height = 3.5F,
-                        width = baseStatWidth,
-                        red = red,
-                        green = green,
-                        blue = blue
-                    )
-
-                    val isBoostedStatHovered = mouseX.toFloat() in ((barStart + baseStatWidth)..(barStart + baseStatWidth + boostedStatWidth)) && mouseY.toFloat() in (startPosY..(startPosY + 3.5F))
-
-                    drawScaledTextJustifiedRight(
-                        context = context,
-                        text = if (isBoostedStatHovered) range.endInclusive.toString().text().bold() else range.start.toString().text(),
-                        x = pX + 48,
-                        y = startPosY,
-                        colour = 0x3A96B6,
-                        scale = SCALE
-                    )
-
-                    // Boostable range
-                    blitk(
-                        matrixStack = matrices,
-                        texture = CobblemonResources.WHITE,
-                        x = barStart + baseStatWidth,
-                        y = startPosY,
-                        height = 3.5F,
-                        width = boostedStatWidth,
-                        red = red,
-                        green = green,
-                        blue = blue,
-                        alpha = if (isBoostedStatHovered) 1F else 0.5F
-                    )
-
-                    if (isBoostedStatHovered) renderTooltip(
-                        context,
-                        lang("ui.stats.ride.boost_maximum").bold(),
-                        mouseX,
-                        mouseY,
-                        delta,
-                        -16
-                    )
-                }
-            }
-        } ?: run {
-            // If ride properties null, reset index to base stats
-            selectedStatTypeIndex = STAT_TYPE_BASE
-        }
-    }
-
     private fun getStatValueRGB(value: Int): Triple<Float, Float, Float> {
         when {
             value >= 150 -> return Triple(0.647F, 0.929F, 0.647F)
@@ -329,4 +128,4 @@ class StatsWidget(val pX: Int, val pY: Int) : SoundlessWidget(
         }
         return Triple(0.964F, 0.64F, 0.502F)
     }
-}
+}

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

@@ -53,7 +53,7 @@ class SummaryButton(
     override fun defaultButtonNarrationText(builder: NarrationElementOutput) {
     }
 
-    public override fun renderWidget(context: GuiGraphics, pMouseX: Int, pMouseY: Int, pPartialTicks: Float) {
+    override fun renderWidget(context: GuiGraphics, pMouseX: Int, pMouseY: Int, pPartialTicks: Float) {
         if (!this.renderRequirement.invoke(this)) {
             return
         }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/featurerenderers/BarSummarySpeciesFeatureRenderer.kt

@@ -28,91 +28,83 @@ import net.minecraft.world.phys.Vec3
  * @author Hiroku
  * @since November 13th, 2023
  */
-open class BarSummarySpeciesFeatureRenderer(
+class BarSummarySpeciesFeatureRenderer(
     override val name: String,
     val displayName: MutableComponent,
-    val underlay: ResourceLocation,
-    val overlay: ResourceLocation,
-    val pokemon: Pokemon,
     val min: Int,
     val max: Int,
-    val value: Int = 0,
-    val colour: Vec3? = null
+    val colour: Vec3,
+    val underlay: ResourceLocation,
+    val overlay: ResourceLocation,
+    val pokemon: Pokemon
 ) : SummarySpeciesFeatureRenderer<IntSpeciesFeature> {
-    override fun render(guiGraphics: GuiGraphics, x: Float, y: Float, pokemon: Pokemon, feature: IntSpeciesFeature) {
-        renderElement(guiGraphics, x, y, pokemon, feature.value)
-    }
-
-    open fun renderElement(guiGraphics: GuiGraphics, x: Float, y: Float, pokemon: Pokemon, barValue: Int = value) {
-        val barRatio = (barValue - min) / (max - min).toFloat()
-        val barWidth = Mth.ceil(barRatio * 110)
+    override fun render(GuiGraphics: GuiGraphics, x: Float, y: Float, pokemon: Pokemon, feature: IntSpeciesFeature) {
+        val value = feature.value
+        val barRatio = (value - min) / (max - min).toFloat()
+        val barWidth = Mth.ceil(barRatio * 108)
 
         blitk(
-            matrixStack = guiGraphics.pose(),
+            matrixStack = GuiGraphics.pose(),
             texture = underlay,
             x = x,
             y = y,
-            height = 24,
-            width = 116
+            height = 28,
+            width = 124
         )
 
-        renderBar(guiGraphics, x, y, barValue, barRatio, barWidth)
+        val red = colour.x / 255F
+        val green = colour.y / 255F
+        val blue = colour.z / 255F
 
         blitk(
-            matrixStack = guiGraphics.pose(),
-            texture = overlay,
-            x = (x + 3) / StatWidget.SCALE,
-            y = (y + 13) / StatWidget.SCALE,
-            height = 20,
-            width = 220,
-            scale = StatWidget.SCALE
-        )
-
-        // Label
-        drawScaledText(
-            context = guiGraphics,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = displayName.bold(),
-            x = x + 58,
-            y = y + 2.5,
-            centered = true,
-            shadow = true
-        )
-
-        drawScaledText(
-            context = guiGraphics,
-            text = barValue.toString().text(),
-            x = x + 9,
-            y = y + 6,
-            scale = StatWidget.SCALE,
-            centered = true
-        )
-
-        drawScaledText(
-            context = guiGraphics,
-            text = "${Mth.floor(barRatio * 100)}%".text(),
-            x = x + 107,
-            y = y + 6,
-            scale = StatWidget.SCALE,
-            centered = true
-        )
-    }
-
-    open fun renderBar(guiGraphics: GuiGraphics, x: Float, y: Float, barValue: Int, barRatio: Float, barWidth: Int) {
-        val red = (colour?.x ?: 255.0) / 255.0
-        val green = (colour?.y ?: 255.0) / 255.0
-        val blue = (colour?.z ?: 255.0) / 255.0
-
-        blitk(
-            matrixStack = guiGraphics.pose(),
+            matrixStack = GuiGraphics.pose(),
             texture = CobblemonResources.WHITE,
-            x = x + 3,
-            y = y + 13,
+            x = x + 8,
+            y = y + 16,
             height = 10,
             width = barWidth,
             red = red,
             green = green,
             blue = blue
         )
+
+        blitk(
+            matrixStack = GuiGraphics.pose(),
+            texture = overlay,
+            x = x / StatWidget.SCALE,
+            y = (y + 16) / StatWidget.SCALE,
+            height = 20,
+            width = 248,
+            scale = StatWidget.SCALE
+        )
+
+        // Label
+        drawScaledText(
+            context = GuiGraphics,
+            font = CobblemonResources.DEFAULT_LARGE,
+            text = displayName.bold(),
+            x = x + 62,
+            y = y + 2.5,
+            centered = true,
+            shadow = true
+        )
+
+        drawScaledText(
+            context = GuiGraphics,
+            text = value.toString().text(),
+            x = x + 11,
+            y = y + 6,
+            scale = StatWidget.SCALE,
+            centered = true
+        )
+
+        drawScaledText(
+            context = GuiGraphics,
+            text = "${Mth.floor(barRatio * 100)}%".text(),
+            x = x + 113,
+            y = y + 6,
+            scale = StatWidget.SCALE,
+            centered = true
+        )
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/featurerenderers/SummarySpeciesFeatureRenderer.kt

@@ -23,10 +23,10 @@ interface SummarySpeciesFeatureRenderer<T : SynchronizedSpeciesFeature> {
     /** The name of the feature (so we know where to look to find it in the [Pokemon]) */
     val name: String
     /** Draws it at a particular position. */
-    fun render(guiGraphics: GuiGraphics, x: Float, y: Float, pokemon: Pokemon, feature: T)
-    fun render(guiGraphics: GuiGraphics, x: Float, y: Float, pokemon: Pokemon): Boolean {
+    fun render(GuiGraphics: GuiGraphics, x: Float, y: Float, pokemon: Pokemon, feature: T)
+    fun render(GuiGraphics: GuiGraphics, x: Float, y: Float, pokemon: Pokemon): Boolean {
         val feature = pokemon.getFeature<T>(name) ?: return false
-        render(guiGraphics, x, y, pokemon, feature)
+        render(GuiGraphics, x, y, pokemon, feature)
         return true
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/screens/stats/StatWidget.kt

@@ -14,16 +14,12 @@ import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeatures
 import com.cobblemon.mod.common.api.pokemon.feature.SynchronizedSpeciesFeatureProvider
 import com.cobblemon.mod.common.api.pokemon.stats.Stat
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.api.text.bold
+import com.cobblemon.mod.common.api.text.italicise
+import com.cobblemon.mod.common.api.text.onHover
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.client.CobblemonResources
-import com.cobblemon.mod.common.client.gui.summary.SummaryButton
-import com.cobblemon.mod.common.client.gui.summary.featurerenderers.BarSummarySpeciesFeatureRenderer
 import com.cobblemon.mod.common.client.gui.summary.widgets.SoundlessWidget
-import com.cobblemon.mod.common.client.gui.summary.widgets.screens.stats.features.FriendshipFeatureRenderer
-import com.cobblemon.mod.common.client.gui.summary.widgets.screens.stats.features.FullnessFeatureRenderer
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.cobblemonResource
@@ -43,6 +39,8 @@ import net.minecraft.util.Mth.ceil
 import net.minecraft.util.Mth.floor
 import net.minecraft.world.phys.Vec2
 import org.joml.Vector3f
+import kotlin.math.cos
+import kotlin.math.sin
 
 class StatWidget(
     pX: Int, pY: Int,
@@ -53,129 +51,63 @@ class StatWidget(
     companion object {
         // Stat tab options
         private const val STATS = "stats"
-        private const val IV = "ivs"
-        private const val EV = "evs"
-        private const val RIDE = "ride"
+        private const val IV = "iv"
+        private const val EV = "ev"
         private const val OTHER = "other"
 
-        private const val OTHER_STAT_BARS_PER_PAGE = 4
-        private const val STAT_TAB_WIDTH_6 = 22
-        private const val STAT_TAB_WIDTH_5 = 24
-        private const val MARKER_WIDTH = 8
+        private val statOptions = listOf(STATS, IV, EV, OTHER)
+
+        private const val statTabWidth = 24
         private const val WIDTH = 134
         private const val HEIGHT = 148
         const val SCALE = 0.5F
 
         private const val WHITE = 0x00FFFFFF
-        private const val GREY = 0x008F8F8F
+        private const val GREY = 0x00AAAAAA
         private const val BLUE = 0x00548BFB
         private const val RED = 0x00FB5454
 
         private val statsBaseResource = cobblemonResource("textures/gui/summary/summary_stats_chart_base.png")
         private val statsChartResource = cobblemonResource("textures/gui/summary/summary_stats_chart.png")
-        private val statsChartPentagonResource = cobblemonResource("textures/gui/summary/summary_stats_chart_pentagon.png")
         private val statsOtherBaseResource = cobblemonResource("textures/gui/summary/summary_stats_other_base.png")
-        private val statsOtherSidebarsResource = cobblemonResource("textures/gui/summary/summary_stats_other_sidebars.png")
-        private val statsOtherSidebarArrowLeft = cobblemonResource("textures/gui/summary/summary_stats_other_sidebar_arrow_left.png")
-        private val statsOtherSidebarArrowRight = cobblemonResource("textures/gui/summary/summary_stats_other_sidebar_arrow_right.png")
+        private val statsOtherBarTemplate = cobblemonResource("textures/gui/summary/summary_stats_other_bar.png")
+        private val friendshipOverlayResource = cobblemonResource("textures/gui/summary/summary_stats_friendship_overlay.png")
+        private val fullnessOverlayResource = cobblemonResource("textures/gui/summary/summary_stats_fullness_overlay.png")
         private val tabMarkerResource = cobblemonResource("textures/gui/summary/summary_stats_tab_marker.png")
         private val statIncreaseResource = cobblemonResource("textures/gui/summary/summary_stats_icon_increase.png")
         private val statDecreaseResource = cobblemonResource("textures/gui/summary/summary_stats_icon_decrease.png")
 
-        private val statLabels: Map<MutableComponent, Stats> = mapOf(
-            lang("ui.stats.hp").bold() to Stats.HP,
-            lang("ui.stats.atk").bold() to Stats.ATTACK,
-            lang("ui.stats.def").bold() to Stats.DEFENCE,
-            lang("ui.stats.speed").bold() to Stats.SPEED,
-            lang("ui.stats.sp_def").bold() to Stats.SPECIAL_DEFENCE,
-            lang("ui.stats.sp_atk").bold() to Stats.SPECIAL_ATTACK
-        )
+        private val statsLabel = lang("ui.stats")
+        private val ivLabel = lang("ui.stats.ivs")
+        private val evLabel = lang("ui.stats.evs")
+        private val otherLabel = lang("ui.stats.other")
 
-        private val hexagonVerticesOffset = listOf(
-            Pair(67.0, 10.5), // 12 o'clock
-            Pair(122.0, 42.5), // 2 o'clock
-            Pair(122.0, 93.5), // 4 o'clock
-            Pair(67.0, 124.5), // 6 o'clock
-            Pair(12.0, 93.5), // 8 o'clock
-            Pair(12.0, 42.5) // 10 o'clock
-        )
-
-        private val pentagonVerticesOffset = listOf(
-            Pair(67.0, 10.5), // 12 o'clock
-            Pair(123.0, 47.5), // 2 o'clock
-            Pair(103.0, 112.5), // 5 o'clock
-            Pair(31.0, 112.5), // 7 o'clock
-            Pair(11.0, 47.5), // 10 o'clock
-        )
+        private val hpLabel = lang("ui.stats.hp")
+        private val spAtkLabel = lang("ui.stats.sp_atk")
+        private val atkLabel = lang("ui.stats.atk")
+        private val spDefLabel = lang("ui.stats.sp_def")
+        private val defLabel = lang("ui.stats.def")
+        private val speedLabel = lang("ui.stats.speed")
     }
 
-    private val statOptions = if (pokemon.form.riding.behaviours != null) listOf(STATS, IV, EV, RIDE, OTHER) else listOf(STATS, IV, EV, OTHER)
-
-    private var _statTabIndex: Int = tabIndex
-    var statTabIndex: Int
-        get() = _statTabIndex.coerceIn(0, statOptions.size - 1)
-        set(value) {
-            _statTabIndex = value.coerceIn(0, statOptions.size - 1)
-        }
-
-    private var _rideBehaviourIndex: Int = 0
-    var rideBehaviourIndex: Int
-        get() = _rideBehaviourIndex.coerceIn(0, (pokemon.form.riding.behaviours?.size ?: 1) - 1)
-        set(value) {
-            _rideBehaviourIndex = value.coerceIn(0, (pokemon.form.riding.behaviours?.size ?: 1) - 1)
-        }
-
-    val universalFeatures = listOf(
-        FriendshipFeatureRenderer(pokemon),
-        FullnessFeatureRenderer(pokemon)
-    )
+    var effectiveBattleIVs: Map<Stat, Int> = Stats.PERMANENT.associateWith { stat ->
+        pokemon.ivs.getEffectiveBattleIV(stat)
+    }
 
+    var statTabIndex = tabIndex
     val renderableFeatures = SpeciesFeatures
         .getFeaturesFor(pokemon.species)
         .filterIsInstance<SynchronizedSpeciesFeatureProvider<*>>()
         .mapNotNull { it.getRenderer(pokemon) }
 
-    var otherStatsPageIndex: Int = 0
-
-    var otherStatLeftButton: SummaryButton? = null
-    var otherStatRightButton: SummaryButton? = null
-
-    init {
-        if (renderableFeatures.size + universalFeatures.size > OTHER_STAT_BARS_PER_PAGE) {
-            otherStatLeftButton = SummaryButton(
-                x - 1F,
-                y + 67F,
-                14,
-                14,
-                resource = statsOtherSidebarArrowLeft,
-                scale = SCALE,
-                clickAction = { switchOtherStatsPage(false) }
-            ).also { addWidget(it) }
-
-            otherStatRightButton = SummaryButton(
-                x + 128F,
-                y + 67F,
-                14,
-                14,
-                resource = statsOtherSidebarArrowRight,
-                scale = SCALE,
-                clickAction = { switchOtherStatsPage(true) }
-            ).also { addWidget(it) }
-        }
-    }
-
-    private fun switchOtherStatsPage(nextIndex: Boolean) {
-        val pages = ceil((renderableFeatures.size + universalFeatures.size).toDouble() / OTHER_STAT_BARS_PER_PAGE.toDouble())
-        otherStatsPageIndex = if (nextIndex) {
-            (otherStatsPageIndex + 1) % pages
-        } else {
-            (otherStatsPageIndex - 1 + pages) % pages
-        }
-    }
-
-    private fun drawTriangle(colour: Vector3f, v1: Vec2, v2: Vec2, v3: Vec2, opacity: Float = 0.6F) {
+    private fun drawTriangle(
+        colour: Vector3f,
+        v1: Vec2,
+        v2: Vec2,
+        v3: Vec2
+    ) {
         CobblemonResources.WHITE.let { RenderSystem.setShaderTexture(0, it) }
-        RenderSystem.setShaderColor(colour.x, colour.y, colour.z, opacity)
+        RenderSystem.setShaderColor(colour.x, colour.y, colour.z, 0.6F)
         val bufferBuilder = Tesselator.getInstance().begin(VertexFormat.Mode.TRIANGLES, DefaultVertexFormat.POSITION)
         bufferBuilder.addVertex(v1.x, v1.y, 10F)
         bufferBuilder.addVertex(v2.x, v2.y, 10F)
@@ -184,325 +116,396 @@ class StatWidget(
         RenderSystem.setShaderColor(1F, 1F, 1F, 1F)
     }
 
-    /**
-     * Render a 5 or 6 sided polygon
-     *
-     * @param ratios list of ratios for how far each vertex is from the center, starting from top vertex going clockwise
-     * @param colour the colour to render
-     */
-    private fun drawStatPolygon(ratios: List<Float>, colour: Vector3f) {
-        val sides = ratios.size
-        if (sides !in 5 .. 6) return
+    private fun drawStatHexagon(stats: Map<Stat, Int>, colour: Vector3f, maximum: Int) {
+        val hexLeftX = x + 25.5
+        val hexTopY = y + 22
+        val hexAttackY = hexTopY + 24.5
+        val hexDefenceY = hexAttackY + 47.0
+        val hexBottomY = hexDefenceY + 24.5
+        val hexRightX = x + 108.5
+        val hexCenterX = (hexLeftX + hexRightX) / 2
+        val hexCenterY = (hexTopY + hexBottomY) / 2
+        val minTriangleSize = 8F
+        val minXTriangleLen = sin(Math.toRadians(61.0)).toFloat() * minTriangleSize * 0.95F
+        val minYTriangleLen = cos(Math.toRadians(60.0)).toFloat() * minTriangleSize
 
-        val topVertexY = y + 22F
-        val centerX = x + 67F
-        val centerY = topVertexY + if (sides > 5) 48F else 49F
+        val triangleLongEdge = (hexCenterY - hexTopY - minTriangleSize).toFloat()
+        val triangleMediumEdge = (triangleLongEdge * sin(Math.toRadians(61.0))).toFloat()
+        val triangleShortEdge = (triangleLongEdge * cos(Math.toRadians(61.0))).toFloat()
 
-        val radius = centerY - topVertexY
+        val hpRatio = (stats.getOrDefault(Stats.HP, 0).toFloat() / maximum).coerceIn(0F, 1F)
+        val atkRatio = (stats.getOrDefault(Stats.ATTACK, 0).toFloat() / maximum).coerceIn(0F, 1F)
+        val defRatio = (stats.getOrDefault(Stats.DEFENCE, 0).toFloat() / maximum).coerceIn(0F, 1F)
+        val spAtkRatio = (stats.getOrDefault(Stats.SPECIAL_ATTACK, 0).toFloat() / maximum).coerceIn(0F, 1F)
+        val spDefRatio = (stats.getOrDefault(Stats.SPECIAL_DEFENCE, 0).toFloat() / maximum).coerceIn(0F, 1F)
+        val spdRatio = (stats.getOrDefault(Stats.SPEED, 0).toFloat() / maximum).coerceIn(0F, 1F)
 
-        val startAngleDeg = -90.0
-        val angleStepDeg = 360.0 / sides
+        val hpPoint = Vec2(
+            hexCenterX.toFloat(),
+            hexCenterY.toFloat() - minTriangleSize - hpRatio * triangleLongEdge
+        )
 
-        // Generate the angles for each vertex
-        val anglesDeg = List(sides) { i -> startAngleDeg + i * angleStepDeg }
-        val anglesRad = anglesDeg.map { Math.toRadians(it) }
+        val attackPoint = Vec2(
+            hexCenterX.toFloat() + minXTriangleLen + atkRatio * triangleMediumEdge,
+            hexCenterY.toFloat() - minYTriangleLen - atkRatio * triangleShortEdge
+        )
 
-        // Calculate maximum points on the circle
-        val maxPoints = anglesRad.map { angle ->
-            Vec2(
-                centerX + radius * Math.cos(angle).toFloat(),
-                centerY + radius * Math.sin(angle).toFloat()
-            )
+        val defencePoint = Vec2(
+            hexCenterX.toFloat() + minXTriangleLen + defRatio * triangleMediumEdge,
+            hexCenterY.toFloat() + minYTriangleLen + defRatio * triangleShortEdge
+        )
+
+        val specialAttackPoint = Vec2(
+            hexCenterX.toFloat() - minXTriangleLen - spAtkRatio * triangleMediumEdge,
+            hexCenterY.toFloat() - minYTriangleLen - spAtkRatio * triangleShortEdge
+        )
+
+        val specialDefencePoint = Vec2(
+            hexCenterX.toFloat() - minXTriangleLen - spDefRatio * triangleMediumEdge,
+            hexCenterY.toFloat() + minYTriangleLen + spDefRatio * triangleShortEdge
+        )
+
+        val speedPoint = Vec2(
+            hexCenterX.toFloat(),
+            hexCenterY.toFloat() + minTriangleSize + spdRatio * triangleLongEdge
+        )
+
+        val centerPoint = Vec2(
+            hexCenterX.toFloat(),
+            hexCenterY.toFloat()
+        )
+
+        // 1-o'clock
+        drawTriangle(colour, hpPoint, centerPoint, attackPoint)
+        // 3-o'clock
+        drawTriangle(colour, attackPoint, centerPoint, defencePoint)
+        // 5-o'clock
+        drawTriangle(colour, defencePoint, centerPoint, speedPoint)
+        // 7-o'clock
+        drawTriangle(colour, speedPoint, centerPoint, specialDefencePoint)
+        // 9-o'clock
+        drawTriangle(colour, specialDefencePoint, centerPoint, specialAttackPoint)
+        // 11-o'clock
+        drawTriangle(colour, specialAttackPoint, centerPoint, hpPoint)
+    }
+
+    private fun drawFriendship(moduleX: Int, moduleY: Int, matrices: PoseStack, context: GuiGraphics, friendship: Int) {
+        val barRatio = friendship / 255F
+        val barWidth = ceil(barRatio * 108)
+
+        blitk(
+            matrixStack = matrices,
+            texture = statsOtherBarTemplate,
+            x = moduleX,
+            y = moduleY,
+            height = 28,
+            width = 124
+        )
+
+        val red = 1
+        val green: Number = if (pokemon.friendship >= 160) 0.28 else 0.56
+        val blue: Number = if (pokemon.friendship >= 160) 0.4 else 0.64
+
+        blitk(
+            matrixStack = matrices,
+            texture = CobblemonResources.WHITE,
+            x = moduleX + 8,
+            y = moduleY + 18,
+            height = 8,
+            width = barWidth,
+            red = red,
+            green = green,
+            blue = blue
+        )
+
+        blitk(
+            matrixStack = matrices,
+            texture = friendshipOverlayResource,
+            x = moduleX / SCALE,
+            y = (moduleY + 16) / SCALE,
+            height = 20,
+            width = 248,
+            scale = SCALE
+        )
+
+        // Label
+        drawScaledText(
+            context = context,
+            font = CobblemonResources.DEFAULT_LARGE,
+            text = lang("ui.stats.friendship").bold(),
+            x = moduleX + 62,
+            y = moduleY + 2.5,
+            centered = true,
+            shadow = true
+        )
+
+        drawScaledText(
+            context = context,
+            text = friendship.toString().text(),
+            x = moduleX + 11,
+            y = moduleY + 6,
+            scale = SCALE,
+            centered = true
+        )
+
+        drawScaledText(
+            context = context,
+            text = "${floor(barRatio * 100)}%".text(),
+            x = moduleX + 113,
+            y = moduleY + 6,
+            scale = SCALE,
+            centered = true
+        )
+    }
+
+    private fun drawFullness(moduleX: Int, moduleY: Int, matrices: PoseStack, context: GuiGraphics, pokemon: Pokemon) {
+        val currentFullness = pokemon.currentFullness
+        val maxFullness = pokemon.getMaxFullness()
+        val barRatio = currentFullness.toFloat() / maxFullness.toFloat()
+        val barWidth = ceil(barRatio * 108)
+
+        blitk(
+                matrixStack = matrices,
+                texture = statsOtherBarTemplate,
+                x = moduleX,
+                y = moduleY,
+                height = 28,
+                width = 124
+        )
+
+        val (red, green, blue) = when {
+            barRatio <= 0.33 -> Triple(0f, 1f, 0f) // Green (full green)
+            barRatio <= 0.66 -> Triple(1f, 1f, 0f) // Yellow (red + green)
+            else -> Triple(1f, 0f, 0f)              // Red (full red)
         }
 
-        // Coerce values as 0.0 will prevent triangles from rendering
-        val coercedRatios = ratios.map { it.coerceIn(5 / radius, 1F) }
+        blitk(
+                matrixStack = matrices,
+                texture = CobblemonResources.WHITE,
+                x = moduleX + 8,
+                y = moduleY + 18,
+                height = 8,
+                width = barWidth,
+                red = red,
+                green = green,
+                blue = blue
+        )
 
-        // Interpolate vertices based on ratios
-        val vertices = maxPoints.mapIndexed { index, maxPoint ->
-            Vec2(
-                centerX + (maxPoint.x - centerX) * coercedRatios[index],
-                centerY + (maxPoint.y - centerY) * coercedRatios[index]
-            )
-        }
+        // Draw the overlay
+        blitk(
+                matrixStack = matrices,
+                texture = fullnessOverlayResource,
+                x = moduleX / SCALE,
+                y = (moduleY + 16) / SCALE,
+                height = 20,
+                width = 248,
+                scale = SCALE
+        )
 
-        val centerPoint = Vec2(centerX, centerY)
+        drawScaledText(
+                context = context,
+                font = CobblemonResources.DEFAULT_LARGE,
+                text = "Fullness".text().bold(),
+                x = moduleX + 62,
+                y = moduleY + 2.5,
+                centered = true,
+                shadow = true
+        )
 
-        // Draw triangles between each vertex and the next clockwise starting from top vertex
-        RenderSystem.disableDepthTest()
-        for (i in vertices.indices) {
-            val nextIndex = (i + 1) % vertices.size
-            drawTriangle(colour, vertices[i], centerPoint, vertices[nextIndex])
-        }
-        RenderSystem.enableDepthTest()
+        drawScaledText(
+                context = context,
+                text = currentFullness.toString().text(),
+                x = moduleX + 11,
+                y = moduleY + 6,
+                scale = SCALE,
+                centered = true
+        )
+
+        drawScaledText(
+                context = context,
+                text = "${floor(barRatio * 100)}%".text(),
+                x = moduleX + 113,
+                y = moduleY + 6,
+                scale = SCALE,
+                centered = true
+        )
     }
 
     override fun renderWidget(context: GuiGraphics, pMouseX: Int, pMouseY: Int, pPartialTicks: Float) {
-        val renderOtherStats = statOptions.get(statTabIndex) == OTHER
-        val renderPentagonStats = statOptions.get(statTabIndex) == RIDE
+        val renderChart = statOptions.get(statTabIndex) != OTHER
         val matrices = context.pose()
 
         // Background
         blitk(
             matrixStack = matrices,
-            texture = if (renderOtherStats)  statsOtherBaseResource else statsBaseResource,
+            texture = if (renderChart) statsBaseResource else statsOtherBaseResource,
             x= x,
             y = y,
             width = width,
             height = height
         )
 
-        if (renderOtherStats) {
-            val barOffsetY = 29
-            val barPosX = x + 9F
-            var drawY = y + 15F
-
-            val featuresList: MutableList<Any> = renderableFeatures.toMutableList()
-            featuresList.addAll(0, universalFeatures)
-
-            val pageFeatures = featuresList.subList(
-                otherStatsPageIndex * OTHER_STAT_BARS_PER_PAGE,
-                minOf((otherStatsPageIndex * OTHER_STAT_BARS_PER_PAGE) + OTHER_STAT_BARS_PER_PAGE, featuresList.size)
+        // Chart
+        if (renderChart) {
+            blitk(
+                matrixStack = matrices,
+                texture = statsChartResource,
+                x= (x + 25.5) / SCALE,
+                y = (y + 22) / SCALE,
+                width = 166,
+                height = 192,
+                scale = SCALE
             )
-
-            for (feature in pageFeatures) {
-                if (feature is BarSummarySpeciesFeatureRenderer) {
-                    val rendered = feature.render(
-                        guiGraphics = context,
-                        x = barPosX,
-                        y = drawY,
-                        pokemon = pokemon
-                    )
-                    if (rendered) drawY += barOffsetY
-                }
-            }
-            if (featuresList.size > 4) {
-                blitk(
-                    matrixStack = matrices,
-                    texture = statsOtherSidebarsResource,
-                    x= x,
-                    y = y + 13,
-                    width = 134,
-                    height = 115
-                )
-                otherStatLeftButton?.renderWidget(context, pMouseX, pMouseY, pPartialTicks)
-                otherStatRightButton?.renderWidget(context, pMouseX, pMouseY, pPartialTicks)
-            }
-        } else {
-            if (renderPentagonStats) {
-                blitk(
-                    matrixStack = matrices,
-                    texture = statsChartPentagonResource,
-                    x= (x + 20.5) / SCALE,
-                    y = (y + 22) / SCALE,
-                    width = 186,
-                    height = 176,
-                    scale = SCALE
-                )
-
-                pokemon.form.riding.behaviours?.let {
-                    val behaviours = it.entries.toList()
-                    val selectedBehaviour = behaviours[rideBehaviourIndex]
-
-                    val pentagonColour = when (selectedBehaviour.key) {
-                        RidingStyle.AIR -> {
-                            if (behaviours.size > 1 && centerHovered(pMouseX, pMouseY))
-                                Vector3f(70F/255F, 235F/225F, 195F/255F)
-                            else Vector3f(40F/255F, 205F/255F, 165F/255F)
-                        }
-                        RidingStyle.LIQUID -> {
-                            if (behaviours.size > 1 && centerHovered(pMouseX, pMouseY))
-                                Vector3f(95F/255F, 165F/255F, 1F)
-                            else Vector3f(65F/255F, 135F/255F, 1F)
-                        }
-                        else -> {
-                            if (behaviours.size > 1 && centerHovered(pMouseX, pMouseY))
-                                Vector3f(1F, 195F/255F, 30F/255F)
-                            else Vector3f(1F, 165F/255F, 0F)
-                        }
-                    }
-
-                    drawStatPolygon(
-                        ratios = RidingStat.entries.map { pokemon.getRideStat(selectedBehaviour.key, it) / 100F },
-                        colour = pentagonColour
-                    )
-
-                    drawScaledText(
-                        context = context,
-                        font = CobblemonResources.DEFAULT_LARGE,
-                        text = lang("ui.ride_style.${selectedBehaviour.key.name.lowercase()}").bold(),
-                        x = x + (WIDTH / 2),
-                        y = y + 66,
-                        shadow = true,
-                        centered = true
-                    )
-
-                    // Stat Labels
-                    renderPolygonLabels(
-                        context = context,
-                        labels = RidingStat.entries.toList().map { stat ->
-                            if (statLabelsHovered(pentagonVerticesOffset, pMouseX, pMouseY))
-                            "${floor(pokemon.getRideStat(selectedBehaviour.key, stat))}/${selectedBehaviour.value.stats[stat]?.endInclusive}".text()
-                            else lang("ui.stats.ride.${stat.name.lowercase()}").bold()
-                        },
-                        verticesOffset = pentagonVerticesOffset
-                    )
-
-                    // Stat Values
-                    renderPolygonLabels(
-                        context = context,
-                        labels = RidingStat.entries.toList().map { stat ->
-                            if (statLabelsHovered(pentagonVerticesOffset, pMouseX, pMouseY))
-                                "${floor((pokemon.getRideStat(selectedBehaviour.key, stat) / (selectedBehaviour.value.stats[stat]?.endInclusive ?: 1)) * 100)}%".text()
-                                else floor(pokemon.getRideStat(selectedBehaviour.key, stat)).toString().text()
-                        },
-                        verticesOffset = pentagonVerticesOffset,
-                        offsetY = 5.5
-                    )
-                }
-
-            } else {
-                blitk(
-                    matrixStack = matrices,
-                    texture = statsChartResource,
-                    x= (x + 25.5) / SCALE,
-                    y = (y + 22) / SCALE,
-                    width = 166,
-                    height = 192,
-                    scale = SCALE
-                )
-
-                when (statOptions.get(statTabIndex)) {
-                    STATS -> drawStatPolygon(
-                        listOf(
-                            pokemon.maxHealth,
-                            pokemon.attack,
-                            pokemon.defence,
-                            pokemon.speed,
-                            pokemon.specialDefence,
-                            pokemon.specialAttack
-                        ).map { it / 400F },
-                        colour = Vector3f(50F/255F, 215F/255F, 1F)
-                    )
-                    IV -> drawStatPolygon(
-                        statLabels.values.map { pokemon.ivs.getEffectiveBattleIV(it) / 31F },
-                        colour = Vector3f(216F/255, 100F/255, 1F)
-                    )
-                    EV -> drawStatPolygon(
-                        statLabels.values.map { (pokemon.evs[it]?.toFloat() ?: 0F) / 252F },
-                        colour = Vector3f(1F, 1F, 100F/255F)
-                    )
-                }
-
-                val labelsHovered = statLabelsHovered(hexagonVerticesOffset, pMouseX, pMouseY)
-
-                val labels = statLabels.map { stat ->
-                    if (labelsHovered) {
-                        when (statOptions.get(statTabIndex)) {
-                            IV -> {
-                                "${
-                                    if (pokemon.ivs.isHyperTrained(stat.value)) "${pokemon.ivs[stat.value]} (${pokemon.ivs.hyperTrainedIVs[stat.value]})"
-                                    else pokemon.ivs[stat.value].toString()
-                                }/31".text()
-                            }
-                            EV -> "${pokemon.evs.getOrDefault(stat.value)}/252".text()
-                            else -> stat.key
-                        }
-                    } else { stat.key }
-                }
-
-                // Stat Labels
-                renderPolygonLabels(
-                    context = context,
-                    labels = labels,
-                    verticesOffset = hexagonVerticesOffset,
-                    enableColour = true
-                )
-
-                // Stat Values
-                renderPolygonLabels(
-                    context = context,
-                    labels = statValuesAsText(
-                        statLabels.values.toList(),
-                        labelsHovered
-                    ),
-                    verticesOffset = hexagonVerticesOffset,
-                    offsetY = 5.5
-                )
-
-                // Nature-modified Stat Icons
-                if (statOptions.get(statTabIndex) == STATS) {
-                    val nature = pokemon.effectiveNature
-                    renderModifiedStatIcon(matrices, nature.increasedStat, true)
-                    renderModifiedStatIcon(matrices, nature.decreasedStat, false)
-                }
-            }
         }
-
-        // Stat type select bar
-        val hasRideBehaviour = pokemon.form.riding.behaviours != null
-        val startPosX = x + if (hasRideBehaviour) 23 else 31
-        val statTabWidth = if (hasRideBehaviour) STAT_TAB_WIDTH_6 else STAT_TAB_WIDTH_5
-
-        statOptions.forEachIndexed { index, stat ->
-            val statKey = if (stat == STATS) "" else ".$stat"
-            drawScaledText(
-                context = context,
-                text = lang("ui.stats$statKey").bold(),
-                x = startPosX + (statTabWidth * index),
-                y = y + 143,
-                scale = SCALE,
-                colour = if (statOptions.get(statTabIndex) == stat) WHITE else GREY,
-                centered = true
+        when (statOptions.get(statTabIndex)) {
+            STATS -> drawStatHexagon(
+                mapOf(
+                    Stats.HP to pokemon.maxHealth,
+                    Stats.ATTACK to pokemon.attack,
+                    Stats.DEFENCE to pokemon.defence,
+                    Stats.SPECIAL_ATTACK to pokemon.specialAttack,
+                    Stats.SPECIAL_DEFENCE to pokemon.specialDefence,
+                    Stats.SPEED to pokemon.speed
+                ),
+                colour = Vector3f(50F/255, 215F/255F, 1F),
+                maximum = 400
+            )
+            IV -> drawStatHexagon(
+                effectiveBattleIVs,
+                colour = Vector3f(216F/255, 100F/255, 1F),
+                maximum = 31
+            )
+            EV -> drawStatHexagon(
+                pokemon.evs.associate { it.key to it.value },
+                colour = Vector3f(1F, 1F, 100F/255),
+                maximum = 252
             )
         }
 
+        drawScaledText(
+            context = context,
+            text = statsLabel.bold(),
+            x = x + 31,
+            y = y + 143,
+            scale = SCALE,
+            colour = if (statOptions.get(statTabIndex) == STATS) WHITE else GREY,
+            centered = true
+        )
+
+        drawScaledText(
+            context = context,
+            text = ivLabel.bold(),
+            x = x + 55,
+            y = y + 143,
+            scale = SCALE,
+            colour = if (statOptions.get(statTabIndex) == IV) WHITE else GREY,
+            centered = true
+        )
+
+        drawScaledText(
+            context = context,
+            text = evLabel.bold(),
+            x = x + 79,
+            y = y + 143,
+            scale = SCALE,
+            colour = if (statOptions.get(statTabIndex) == EV) WHITE else GREY,
+            centered = true
+        )
+
+        drawScaledText(
+            context = context,
+            text = otherLabel.bold(),
+            x = x + 103,
+            y = y + 143,
+            scale = SCALE,
+            colour = if (statOptions.get(statTabIndex) == OTHER) WHITE else GREY,
+            centered = true
+        )
+
+        val paddingLeft = (WIDTH - ((statOptions.size + 1) * statTabWidth)) / 2
         blitk(
             matrixStack = context.pose(),
             texture = tabMarkerResource,
-            x= (startPosX + (statTabIndex * statTabWidth) - (MARKER_WIDTH / 4)) / SCALE,
+            x= ((x + paddingLeft + ((statTabIndex + 1) * statTabWidth)) / SCALE) - 2,
             y = (y + 140) / SCALE,
-            width = MARKER_WIDTH,
+            width = 8,
             height = 4,
-            scale = SCALE
+            scale = SCALE,
         )
+
+        if (renderChart) {
+            // Stat Labels
+            renderTextAtVertices(
+                context = context,
+                hp = hpLabel.bold(),
+                spAtk = spAtkLabel.bold(),
+                atk = atkLabel.bold(),
+                spDef = spDefLabel.bold(),
+                def = defLabel.bold(),
+                speed = speedLabel.bold()
+            )
+
+            // Stat Values
+            renderTextAtVertices(
+                context = context,
+                offsetY = 5.5,
+                enableColour = false,
+                hp = getStatValueAsText(Stats.HP),
+                spAtk = getStatValueAsText(Stats.SPECIAL_ATTACK),
+                atk = getStatValueAsText(Stats.ATTACK),
+                spDef = getStatValueAsText(Stats.SPECIAL_DEFENCE),
+                def = getStatValueAsText(Stats.DEFENCE),
+                speed = getStatValueAsText(Stats.SPEED)
+            )
+
+            // Nature-modified Stat Icons
+            if (statOptions.get(statTabIndex) == STATS) {
+                val nature = pokemon.effectiveNature
+                renderModifiedStatIcon(matrices, nature.increasedStat, true)
+                renderModifiedStatIcon(matrices, nature.decreasedStat, false)
+            }
+        } else {
+            var drawY = y + 11
+
+            drawFriendship(x + 5, drawY, matrices, context, pokemon.friendship)
+            drawY += 30
+
+            drawFullness(x + 5, drawY, matrices, context, pokemon)
+            drawY += 30
+
+            for (renderableFeature in renderableFeatures) {
+                val rendered = renderableFeature.render(
+                    GuiGraphics = context,
+                    x = x + 5F,
+                    y = drawY.toFloat(),
+                    pokemon = pokemon
+                )
+
+                if (rendered) {
+                    drawY += 30
+                }
+            }
+        }
     }
 
     override fun mouseClicked(pMouseX: Double, pMouseY: Double, pButton: Int): Boolean {
         val index = getTabIndexFromPos(pMouseX, pMouseY)
         // Only play sound here as the rest of the widget is meant to be silent
-        if (index in 0 until statOptions.size && statTabIndex != index) {
+        if (index in 0..4 && statTabIndex != index) {
             statTabIndex = index
             Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.GUI_CLICK, 1.0F))
         }
-
-        if (statOptions.get(statTabIndex) == RIDE && ((pokemon.riding.behaviours?.size ?: 0) > 1) && centerHovered(pMouseX, pMouseY)) {
-            rideBehaviourIndex = (rideBehaviourIndex + 1) % (pokemon.riding.behaviours?.size ?: 1)
-            Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.GUI_CLICK, 1.0F))
-        }
-
         return super.mouseClicked(pMouseX, pMouseY, pButton)
     }
 
-    private fun statValuesAsText(stats: List<Stat>, asPercent: Boolean): List<MutableComponent> {
-        return stats.map { stat ->
-            when (statOptions.get(statTabIndex)) {
-                STATS -> (if (stat == Stats.HP) "${pokemon.currentHealth} / ${pokemon.maxHealth}" else pokemon.getStat(stat).toString()).text()
-                IV -> {
-                    (if (asPercent) {
-                        "${floor((((if (pokemon.ivs.isHyperTrained(stat)) pokemon.ivs.hyperTrainedIVs[stat] else pokemon.ivs[stat]) ?: 0) / 31.0) * 100)}%"
-                    } else {
-                        if (pokemon.ivs.isHyperTrained(stat)) "${pokemon.ivs[stat]} (${pokemon.ivs.hyperTrainedIVs[stat]})"
-                        else pokemon.ivs[stat].toString()
-                    }).text()
-                }
-                EV -> {
-                    (if (asPercent) "${floor((pokemon.evs.getOrDefault(stat) / 252.0) * 100)}%"
-                    else pokemon.evs.getOrDefault(stat).toString()).text()
-                }
-                else -> "0".text()
-            }
+    private fun getStatValueAsText(stat: Stat): MutableComponent {
+        val value = when (statOptions.get(statTabIndex)) {
+            STATS -> if (stat == Stats.HP) "${pokemon.currentHealth} / ${pokemon.maxHealth}" else pokemon.getStat(stat).toString()
+            IV -> if (pokemon.ivs.isHyperTrained(stat)) "${pokemon.ivs[stat]} (${pokemon.ivs.hyperTrainedIVs[stat]})" else pokemon.ivs[stat].toString()
+            EV -> pokemon.evs.getOrDefault(stat).toString()
+            else -> "0"
         }
+        return value.text()
     }
 
     private fun renderModifiedStatIcon(pPoseStack: PoseStack, stat: Stat?, increasedStat: Boolean) {
@@ -531,7 +534,7 @@ class StatWidget(
         }
     }
 
-    private fun getModifiedStatColour(stat: Stat?, enableColour: Boolean): Int {
+    private fun getModifiedStatColour(stat: Stat, enableColour: Boolean): Int {
         if (statOptions.get(statTabIndex) == STATS && enableColour) {
             val nature = pokemon.effectiveNature
 
@@ -541,38 +544,81 @@ class StatWidget(
         return WHITE
     }
 
-    private fun renderPolygonLabels(context: GuiGraphics, labels: List<MutableComponent>, verticesOffset: List<Pair<Double, Double>>, offsetY: Double = 0.0, enableColour: Boolean = false) {
-        if (labels.size != verticesOffset.size) return
+    private fun renderTextAtVertices(
+        context: GuiGraphics,
+        offsetY: Double = 0.0,
+        enableColour: Boolean = true,
+        hp: MutableComponent,
+        spAtk: MutableComponent,
+        atk: MutableComponent,
+        spDef: MutableComponent,
+        def: MutableComponent,
+        speed: MutableComponent
+    ) {
+        drawScaledText(
+            context = context,
+            text = hp,
+            x = x + 67,
+            y = y + 10.5 + offsetY,
+            scale = SCALE,
+            colour = getModifiedStatColour(Stats.HP, enableColour),
+            centered = true
+        )
 
-        labels.forEachIndexed { index, label ->
-            drawScaledText(
-                context = context,
-                text = label,
-                x = x + verticesOffset[index].first,
-                y = y + verticesOffset[index].second + offsetY,
-                scale = SCALE,
-                colour = getModifiedStatColour(statLabels[label], enableColour),
-                centered = true
-            )
-        }
-    }
+        drawScaledText(
+            context = context,
+            text = spAtk,
+            x = x + 12,
+            y = y + 42.5 + offsetY,
+            scale = SCALE,
+            colour = getModifiedStatColour(Stats.SPECIAL_ATTACK, enableColour),
+            centered = true
+        )
 
-    private fun centerHovered(pMouseX: Number, pMouseY: Number): Boolean {
-        return (pMouseX.toInt() in (x + 44)..(x + 90)) && (pMouseY.toInt() in (y + 47)..(y + 93))
-    }
+        drawScaledText(
+            context = context,
+            text = atk,
+            x = x + 122,
+            y = y + 42.5 + offsetY,
+            scale = SCALE,
+            colour = getModifiedStatColour(Stats.ATTACK,enableColour),
+            centered = true
+        )
 
-    private fun statLabelsHovered(labelOffsets: List<Pair<Double, Double>>, mouseX: Int, mouseY: Int): Boolean {
-        return labelOffsets.any { pos ->
-            (mouseX.toDouble() in (x + pos.first - 12)..(x + pos.first + 12))
-                && (mouseY.toDouble() in (y + pos.second - 1)..(y + pos.second + 10))
-        }
+        drawScaledText(
+            context = context,
+            text = spDef,
+            x = x + 12,
+            y = y + 93.5 + offsetY,
+            scale = SCALE,
+            colour = getModifiedStatColour(Stats.SPECIAL_DEFENCE, enableColour),
+            centered = true
+        )
+
+        drawScaledText(
+            context = context,
+            text = def,
+            x = x + 122,
+            y = y + 93.5 + offsetY,
+            scale = SCALE,
+            colour = getModifiedStatColour(Stats.DEFENCE, enableColour),
+            centered = true
+        )
+
+        drawScaledText(
+            context = context,
+            text = speed,
+            x = x + 67,
+            y = y + 124.5 + offsetY,
+            scale = SCALE,
+            colour = getModifiedStatColour(Stats.SPEED, enableColour),
+            centered = true
+        )
     }
 
     private fun getTabIndexFromPos(mouseX: Double, mouseY: Double): Int {
-        val hasRideBehaviour = pokemon.form.riding.behaviours != null
-        val left = x + if (hasRideBehaviour) ((23 + 1) / 2).toFloat() else ((31 + 1) / 2).toFloat()
-        val statTabWidth = if (hasRideBehaviour) STAT_TAB_WIDTH_6 else STAT_TAB_WIDTH_5
-
+        val paddingLeft = ((WIDTH - ((statOptions.size + 1) * statTabWidth)) / 2.0) + (statTabWidth / 2)
+        val left = x + paddingLeft
         val top = y + 140.0
         if (mouseX in left..(left + (statTabWidth * (statOptions.size + 1))) && mouseY in top..(top + 9.0)) {
             var startX = left
@@ -585,4 +631,4 @@ class StatWidget(
         }
         return -1
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/screens/stats/features/FriendshipFeatureRenderer.kt

@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.gui.summary.widgets.screens.stats.features
-
-import com.cobblemon.mod.common.api.gui.blitk
-import com.cobblemon.mod.common.client.CobblemonResources
-import com.cobblemon.mod.common.client.gui.summary.featurerenderers.BarSummarySpeciesFeatureRenderer
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.lang
-import net.minecraft.client.gui.GuiGraphics
-
-class FriendshipFeatureRenderer(
-    val selectedPokemon: Pokemon
-) : BarSummarySpeciesFeatureRenderer(
-    "friendship",
-    lang("ui.stats.friendship"),
-    cobblemonResource("textures/gui/summary/summary_stats_other_bar.png"),
-    cobblemonResource("textures/gui/summary/summary_stats_friendship_overlay.png"),
-    selectedPokemon,
-    0,
-    255,
-    selectedPokemon.friendship
-) {
-    override fun render(guiGraphics: GuiGraphics, x: Float, y: Float, pokemon: Pokemon): Boolean {
-        renderElement(guiGraphics, x, y, pokemon)
-        return true
-    }
-
-    override fun renderBar(guiGraphics: GuiGraphics, x: Float, y: Float, barValue: Int, barRatio: Float, barWidth: Int) {
-        val red = 1
-        val green: Number = if (barValue >= 160) 0.28 else 0.56
-        val blue: Number = if (barValue >= 160) 0.4 else 0.64
-
-        blitk(
-            matrixStack = guiGraphics.pose(),
-            texture = CobblemonResources.WHITE,
-            x = x + 3,
-            y = y + 13,
-            height = 10,
-            width = barWidth,
-            red = red,
-            green = green,
-            blue = blue
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/screens/stats/features/FullnessFeatureRenderer.kt

@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.gui.summary.widgets.screens.stats.features
-
-import com.cobblemon.mod.common.api.gui.blitk
-import com.cobblemon.mod.common.client.CobblemonResources
-import com.cobblemon.mod.common.client.gui.summary.featurerenderers.BarSummarySpeciesFeatureRenderer
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.lang
-import net.minecraft.client.gui.GuiGraphics
-
-class FullnessFeatureRenderer(
-    val selectedPokemon: Pokemon
-) : BarSummarySpeciesFeatureRenderer(
-    "fullness",
-    lang("ui.stats.fullness"),
-    cobblemonResource("textures/gui/summary/summary_stats_other_bar.png"),
-    cobblemonResource("textures/gui/summary/summary_stats_fullness_overlay.png"),
-    selectedPokemon,
-    0,
-    selectedPokemon.getMaxFullness(),
-    selectedPokemon.currentFullness
-) {
-    override fun render(guiGraphics: GuiGraphics, x: Float, y: Float, pokemon: Pokemon): Boolean {
-        renderElement(guiGraphics, x, y, pokemon)
-        return true
-    }
-
-    override fun renderBar(guiGraphics: GuiGraphics, x: Float, y: Float, barValue: Int, barRatio: Float, barWidth: Int) {
-        val (red, green, blue) = when {
-            barRatio <= 0.33 -> Triple(120F/255F, 200F/255F, 80F/255F) // Green
-            barRatio <= 0.66 -> Triple(240F/255F, 200F/255F, 65F/255F) // Yellow
-            else -> Triple(230F/255F, 80F/255F, 65F/255F) // Red
-        }
-
-        blitk(
-            matrixStack = guiGraphics.pose(),
-            texture = CobblemonResources.WHITE,
-            x = x + 3,
-            y = y + 13,
-            height = 10,
-            width = barWidth,
-            red = red,
-            green = green,
-            blue = blue
-        )
-    }
-}

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

@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.net.data
-
-import com.cobblemon.mod.common.CobblemonRideSettings
-import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
-import com.cobblemon.mod.common.net.messages.client.data.RideSettingsSyncPacket
-import net.minecraft.server.MinecraftServer
-import net.minecraft.server.level.ServerPlayer
-
-object RideSettingsSyncHandler : ServerNetworkPacketHandler<RideSettingsSyncPacket> {
-    override fun handle(packet: RideSettingsSyncPacket, server: MinecraftServer, player: ServerPlayer) {
-        CobblemonRideSettings.bird = packet.bird
-        CobblemonRideSettings.glider = packet.glider
-        CobblemonRideSettings.helicopter = packet.helicopter
-        CobblemonRideSettings.hover = packet.hover
-        CobblemonRideSettings.jet = packet.jet
-        CobblemonRideSettings.rocket = packet.rocket
-
-        CobblemonRideSettings.horse = packet.horse
-        CobblemonRideSettings.minekart = packet.minekart
-        CobblemonRideSettings.vehicle = packet.vehicle
-
-        CobblemonRideSettings.boat = packet.boat
-        CobblemonRideSettings.burst = packet.burst
-        CobblemonRideSettings.dolphin = packet.dolphin
-    }
-}

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

@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.net.data
+
+import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler
+import com.cobblemon.mod.common.data.CobblemonDataProvider
+import com.cobblemon.mod.common.net.messages.client.data.UnlockReloadPacket
+import net.minecraft.client.Minecraft
+
+internal object UnlockReloadPacketHandler : ClientNetworkPacketHandler<UnlockReloadPacket> {
+    override fun handle(packet: UnlockReloadPacket, client: Minecraft) {
+        CobblemonDataProvider.canReload = true
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/persisted/ClientPersistedData.kt

@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.persisted
-
-import com.cobblemon.mod.common.config.CobblemonConfig
-import java.io.BufferedReader
-import java.io.BufferedWriter
-import java.io.FileInputStream
-import java.io.FileWriter
-import java.io.InputStreamReader
-import java.nio.file.Paths
-import kotlin.io.path.exists
-import net.minecraft.client.CameraType
-import net.minecraft.resources.ResourceLocation
-
-object ClientPersistedData {
-
-    val gson = CobblemonConfig.GSON
-
-    val snapshotsPath = Paths.get("cobblemon").resolve("snapshots.json")
-    val ridingPerspectivesPath = Paths.get("cobblemon").resolve("riding_perspectives.json")
-
-    var ridingPerspectives: RidingPerspectiveData = readRidingPerspectivesData() ?: RidingPerspectiveData()
-
-    fun readSnapshotsData() : SnapshotAcknowledgementData? {
-        if (snapshotsPath.exists()) {
-            BufferedReader(InputStreamReader(FileInputStream(snapshotsPath.toFile()))).use { reader ->
-                return gson.fromJson(reader, SnapshotAcknowledgementData::class.java)
-            }
-        }
-
-        return null
-    }
-
-    fun writeSnapshotsData(data: SnapshotAcknowledgementData) {
-        snapshotsPath.toFile().parentFile.mkdirs()
-        BufferedWriter(FileWriter(snapshotsPath.toFile())).use { writer -> gson.toJson(data, writer) }
-    }
-
-    fun readRidingPerspectivesData() : RidingPerspectiveData? {
-        if (ridingPerspectivesPath.exists()) {
-            BufferedReader(InputStreamReader(FileInputStream(ridingPerspectivesPath.toFile()))).use { reader ->
-                return gson.fromJson(reader, RidingPerspectiveData::class.java)
-            }
-        }
-
-        return null
-    }
-
-    fun saveRidingPerspectivesData() {
-        ridingPerspectivesPath.toFile().parentFile.mkdirs()
-        BufferedWriter(FileWriter(ridingPerspectivesPath.toFile())).use { writer -> gson.toJson(ridingPerspectives, writer) }
-    }
-
-    data class SnapshotAcknowledgementData(val version: String, val dontShowAgain: Boolean)
-    data class RidingPerspectiveData(
-        val perspectives: MutableMap<ResourceLocation, CameraType> = mutableMapOf()
-    ) {
-        fun updatePerspective(key: ResourceLocation, cameraType: CameraType) {
-            perspectives[key] = cameraType
-            saveRidingPerspectivesData()
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/item/PokemonItemRenderer.kt

@@ -17,12 +17,10 @@ import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
 import com.mojang.blaze3d.platform.Lighting
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.blaze3d.vertex.VertexConsumer
-import com.mojang.blaze3d.vertex.VertexMultiConsumer
 import net.minecraft.client.renderer.LightTexture
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.RenderType
 import net.minecraft.client.renderer.texture.OverlayTexture
-import net.minecraft.core.component.DataComponents
 import net.minecraft.world.item.ItemDisplayContext
 import net.minecraft.world.item.ItemStack
 import org.joml.Quaternionf
@@ -48,6 +46,8 @@ class PokemonItemRenderer : CobblemonBuiltinItemRenderer {
         context.put(RenderContext.POSABLE_STATE, state)
         state.currentModel = model
 
+        val renderLayer = RenderType.entityCutout(VaryingModelRepository.getTexture(species.resourceIdentifier, state))
+
         val transformations = positions[mode]!!
 
         if (mode == ItemDisplayContext.GUI) {
@@ -64,19 +64,7 @@ class PokemonItemRenderer : CobblemonBuiltinItemRenderer {
         val rotation = Quaternionf().fromEulerXYZDegrees(Vector3f(transformations.rotation.x, transformations.rotation.y, transformations.rotation.z))
         matrices.mulPose(rotation)
         rotation.conjugate()
-
-        val renderLayer = RenderType.entityCutout(VaryingModelRepository.getTexture(species.resourceIdentifier, state))
-        val isEnchanted = stack.get(DataComponents.ENCHANTMENTS)?.isEmpty == false
-        val vertexConsumer: VertexConsumer =
-            if (isEnchanted) {
-                VertexMultiConsumer.create(
-                    vertexConsumers.getBuffer(RenderType.entityGlintDirect()),
-                    vertexConsumers.getBuffer(renderLayer),
-                )
-            } else {
-                vertexConsumers.getBuffer(renderLayer)
-            }
-
+        val vertexConsumer: VertexConsumer = vertexConsumers.getBuffer(renderLayer)
         matrices.pushPose()
         val packedLight = if (mode == ItemDisplayContext.GUI) {
             LightTexture.pack(13, 13)

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

@@ -267,7 +267,7 @@ class TexturedModel {
                 var counter = 0
                 subParts.forEachIndexed { index, part ->
                     parts[bone.name]!!.addOrReplaceChild(
-                        "%" + bone.name + "%" + counter++.toString(),
+                        bone.name + counter++.toString(),
                         part,
                         modelTransforms[index]
                     )

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

@@ -9,63 +9,30 @@
 package com.cobblemon.mod.common.client.render.player
 
 import com.bedrockk.molang.runtime.value.DoubleValue
-import com.cobblemon.mod.common.api.riding.RidingAnimation
 import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
 import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockAnimationRepository
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.mojang.blaze3d.vertex.PoseStack
-import com.mojang.math.Axis
-import net.minecraft.client.model.AnimationUtils
-import net.minecraft.client.model.HumanoidModel
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.client.player.AbstractClientPlayer
-import net.minecraft.world.InteractionHand
-import net.minecraft.world.entity.HumanoidArm
-import net.minecraft.world.phys.Vec3
 
 /**
  * @author landonjw
  */
 object MountedPlayerRenderer {
-    @JvmField
-    var shouldApplyRootAnimation = false
-
-    @JvmField
-    val relevantPartsByName = mutableMapOf(
-        "body" to ModelPart(emptyList(), emptyMap()),
-    )
-
-    val defaultAnimations = listOf(
-        RidingAnimation(
-            fileName = "player",
-            animationName = "animation.player.default_ride_pose"
-        )
-    )
-
     fun animate(
-        model: HumanoidModel<AbstractClientPlayer>,
         pokemonEntity: PokemonEntity,
         player: AbstractClientPlayer,
+        relevantPartsByName: Map<String, ModelPart>,
         headYaw: Float,
         headPitch: Float,
         ageInTicks: Float,
         limbSwing: Float,
         limbSwingAmount: Float
     ) {
-        // We need to reset the root because it's a synthetic part, Minecraft won't do this for us.
-        val root = relevantPartsByName["body"] ?: return
-        root.x = 0F
-        root.y = 0F
-        root.z = 0F
-        root.xRot = 0F
-        root.yRot = 0F
-        root.zRot = 0F
-
         val seatIndex = pokemonEntity.passengers.indexOf(player).takeIf { it != -1 && it < pokemonEntity.seats.size } ?: return
         val seat = pokemonEntity.seats[seatIndex]
-        val animations = seat.poseAnimations
-            ?.firstOrNull { it.poseTypes.isEmpty() || it.poseTypes.contains(pokemonEntity.getCurrentPoseType()) }?.animations
-            ?: defaultAnimations
+        val animations = seat.poseAnimations?.firstOrNull { it.poseTypes.isEmpty() || it.poseTypes.contains(pokemonEntity.getCurrentPoseType()) }?.animations
+            ?: return
         val state = pokemonEntity.delegate as PokemonClientDelegate
 
         relevantPartsByName.values.forEach {
@@ -77,8 +44,6 @@ object MountedPlayerRenderer {
         state.runtime.environment.setSimpleVariable("age_in_ticks", DoubleValue(ageInTicks.toDouble()))
         state.runtime.environment.setSimpleVariable("limb_swing", DoubleValue(limbSwing.toDouble()))
         state.runtime.environment.setSimpleVariable("limb_swing_amount", DoubleValue(limbSwingAmount.toDouble()))
-        state.runtime.environment.setSimpleVariable("head_yaw", DoubleValue(headYaw.toDouble()))
-        state.runtime.environment.setSimpleVariable("head_pitch", DoubleValue(headPitch.toDouble()))
 
         // TODO add the q.player reference, requires a cached thing or something on the client idk
 
@@ -96,59 +61,5 @@ object MountedPlayerRenderer {
                 intensity = 1F
             )
         }
-
-        applyRegularAnimation(model, player, ageInTicks)
-    }
-
-    /**
-     * This does what Minecraft would typically do for various additional body part
-     * rendering thingies. It's largely copy paste.
-     */
-    fun applyRegularAnimation(
-        model: HumanoidModel<AbstractClientPlayer>,
-        player: AbstractClientPlayer,
-        ageInTicks: Float
-    ) {
-        val rightHanded = player.mainArm == HumanoidArm.RIGHT
-        if (player.isUsingItem) {
-            val usingMainHand = player.usedItemHand == InteractionHand.MAIN_HAND
-            if (usingMainHand == rightHanded) {
-                model.poseRightArm(player)
-            } else {
-                model.poseLeftArm(player)
-            }
-        } else {
-            val offHandIsTwoHanded: Boolean = if (rightHanded) model.leftArmPose.isTwoHanded else model.rightArmPose.isTwoHanded
-            if (rightHanded != offHandIsTwoHanded) {
-                model.poseLeftArm(player)
-                model.poseRightArm(player)
-            } else {
-                model.poseRightArm(player)
-                model.poseLeftArm(player)
-            }
-        }
-
-        model.setupAttackAnimation(player, ageInTicks)
-
-        if (model.rightArmPose != HumanoidModel.ArmPose.SPYGLASS) {
-            AnimationUtils.bobModelPart(model.rightArm, ageInTicks, 1.0F);
-        }
-
-        if (model.leftArmPose != HumanoidModel.ArmPose.SPYGLASS) {
-            AnimationUtils.bobModelPart(model.leftArm, ageInTicks, -1.0F);
-        }
-
-        model.hat.copyFrom(model.head)
-    }
-
-    const val RIDING_SITTING_OFFSET = -10.0
-    fun animateRoot(stack: PoseStack) {
-        val root = relevantPartsByName["body"] ?: return
-        val rootOffset = Vec3(root.x.toDouble(), root.y.toDouble() + RIDING_SITTING_OFFSET, root.z.toDouble()).scale(1/16.0)
-        val rotation = Vec3(root.xRot.toDouble(), root.yRot.toDouble(), root.zRot.toDouble())
-        stack.mulPose(Axis.ZP.rotation(rotation.z.toFloat()))
-        stack.mulPose(Axis.YP.rotation(rotation.y.toFloat()))
-        stack.mulPose(Axis.XP.rotation(rotation.x.toFloat()))
-        stack.translate(rootOffset.x.toFloat(), rootOffset.y.toFloat(), rootOffset.z.toFloat())
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/snapshots/SnapshotAcknowledgementData.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.snapshots
+
+import com.cobblemon.mod.common.config.CobblemonConfig
+import java.io.BufferedReader
+import java.io.BufferedWriter
+import java.io.FileInputStream
+import java.io.FileWriter
+import java.io.InputStreamReader
+import java.nio.file.Path
+import java.nio.file.Paths
+import kotlin.io.path.exists
+
+object SnapshotAcknowledgementReader {
+
+    val gson = CobblemonConfig.GSON
+    val target: Path = Paths.get("cobblemon").resolve("snapshots.json")
+
+    fun read() : SnapshotAcknowledgementData? {
+        if (target.exists()) {
+            BufferedReader(InputStreamReader(FileInputStream(target.toFile()))).use { reader ->
+                return gson.fromJson(reader, SnapshotAcknowledgementData::class.java)
+            }
+        }
+
+        return null
+    }
+
+    fun write(data: SnapshotAcknowledgementData) {
+        target.toFile().parentFile.mkdirs()
+        BufferedWriter(FileWriter(target.toFile())).use { writer -> gson.toJson(data, writer) }
+    }
+
+}
+
+data class SnapshotAcknowledgementData(val version: String, val dontShowAgain: Boolean)

common/src/main/kotlin/com/cobblemon/mod/common/client/tooltips/SeasoningTooltipHelper.kt

@@ -11,6 +11,8 @@ package com.cobblemon.mod.common.client.tooltips
 import com.cobblemon.mod.common.CobblemonItemComponents
 import com.cobblemon.mod.common.CobblemonRecipeTypes
 import com.cobblemon.mod.common.api.cooking.Flavour
+import com.cobblemon.mod.common.api.cooking.Food
+import com.cobblemon.mod.common.api.cooking.PokePuffUtils
 import com.cobblemon.mod.common.api.cooking.Seasonings
 import com.cobblemon.mod.common.api.fishing.SpawnBait
 import com.cobblemon.mod.common.api.fishing.SpawnBaitEffects
@@ -18,16 +20,20 @@ import com.cobblemon.mod.common.api.fishing.SpawnBaitUtils
 import com.cobblemon.mod.common.api.pokemon.egg.EggGroup
 import com.cobblemon.mod.common.api.text.*
 import com.cobblemon.mod.common.api.types.ElementalTypes
+import com.cobblemon.mod.common.item.components.FoodComponent
+import com.cobblemon.mod.common.item.crafting.CookingPotRecipe
+import com.cobblemon.mod.common.item.crafting.CookingPotRecipeBase
 import com.cobblemon.mod.common.item.interactive.PokerodItem
 import com.cobblemon.mod.common.pokemon.Gender
 import com.cobblemon.mod.common.util.lang
 import net.minecraft.ChatFormatting
 import net.minecraft.client.Minecraft
 import net.minecraft.network.chat.Component
-import net.minecraft.network.chat.Style
 import net.minecraft.world.effect.MobEffectInstance
 import net.minecraft.world.effect.MobEffectUtil
 import net.minecraft.world.item.ItemStack
+import net.minecraft.world.item.crafting.RecipeManager
+import net.minecraft.world.level.Level
 import java.text.DecimalFormat
 
 val cookingPotRecipeAbsorbHeader by lazy { lang("item_class.cooking_pot_recipe_absorbs").gray() }
@@ -115,7 +121,8 @@ fun generateAdditionalFlavorTooltip(flavours: Map<Flavour, Int>): MutableList<Co
 
     val combinedFlavorsLine = Component.literal("")
     flavours.filter { it.key != Flavour.MILD }.forEach { (flavour, value) ->
-        val flavourText = lang("seasoning_flavor.${flavour.name.lowercase()}").setStyle(Style.EMPTY.withColor(flavour.colour))
+        var flavourText = lang("seasoning_flavor.${flavour.name.lowercase()}").withStyle(flavour.chatFormatting)
+
         if (combinedFlavorsLine.string.isNotEmpty()) {
             combinedFlavorsLine.append(" ")
         }

common/src/main/kotlin/com/cobblemon/mod/common/command/NPCDeleteCommand.kt

@@ -9,60 +9,34 @@
 package com.cobblemon.mod.common.command
 
 import com.cobblemon.mod.common.api.permission.CobblemonPermissions
-import com.cobblemon.mod.common.api.text.green
 import com.cobblemon.mod.common.api.text.red
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.util.commandLang
-import com.cobblemon.mod.common.util.permission
+import com.cobblemon.mod.common.util.requiresWithPermission
 import com.cobblemon.mod.common.util.traceFirstEntityCollision
 import com.mojang.brigadier.Command
 import com.mojang.brigadier.CommandDispatcher
+import com.mojang.brigadier.context.CommandContext
 import net.minecraft.commands.CommandSourceStack
 import net.minecraft.commands.Commands
-import net.minecraft.commands.arguments.EntityArgument
-import net.minecraft.world.entity.Entity
+import net.minecraft.server.level.ServerPlayer
 
 object NPCDeleteCommand {
     fun register(dispatcher : CommandDispatcher<CommandSourceStack>) {
         dispatcher.register(
             Commands.literal("npcdelete")
-                .permission(CobblemonPermissions.NPC_DELETE)
-                .then(
-                    Commands.argument("target", EntityArgument.entity())
-                        .executes {context ->
-                            val source = context.source
-                            val entity = EntityArgument.getEntity(context, "target")
-                            execute(entity, source)
-                        }
-                )
-                .executes {context ->
-                    val source = context.source
-                    val player = source.player
-                    if (player == null) {
-                        source.sendSystemMessage(commandLang("npcdelete.not_player").red())
-                        return@executes 0
-                    }
-
-                    val targetEntity = player.traceFirstEntityCollision(entityClass = NPCEntity::class.java)
-
-                    if (targetEntity == null) {
-                        player.sendSystemMessage(commandLang("npcedit.non_npc").red())
-                        return@executes 0
-                    }
-                    execute(targetEntity, source)
-                }
-
-        )
+                .requiresWithPermission(CobblemonPermissions.NPC_DELETE) { it.player != null }
+                .executes { execute(it, it.source.playerOrException) })
     }
 
-    private fun execute(entity: Entity, source: CommandSourceStack) : Int {
-        if(entity !is NPCEntity){
-            source.sendSystemMessage(commandLang("npcedit.non_npc").red())
+    private fun execute(context: CommandContext<CommandSourceStack>, player: ServerPlayer) : Int {
+        val targetEntity = player.traceFirstEntityCollision(entityClass = NPCEntity::class.java)
+        if (targetEntity == null) {
+            player.sendSystemMessage(commandLang("npcedit.non_npc").red())
             return 0
         }
 
-        entity.discard()
-        source.sendSystemMessage(commandLang("npcdelete.deleted", entity.name.string).green())
+        targetEntity.discard()
         return Command.SINGLE_SUCCESS
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/command/ReloadShowdownCommand.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.command
 
 import com.cobblemon.mod.common.api.abilities.Abilities
-import com.cobblemon.mod.common.api.item.HeldItems
 import com.cobblemon.mod.common.api.moves.Moves
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.battles.BagItems
@@ -37,7 +36,7 @@ object ReloadShowdownCommand {
             ShowdownService.service.resetAllRegistries()
             ShowdownService.service.sendRegistryData(Abilities.abilityScripts, "ability")
             ShowdownService.service.sendRegistryData(BagItems.bagItemsScripts, "bagItem")
-            ShowdownService.service.sendRegistryData(HeldItems.heldItemsScripts, "heldItem")
+            // TODO: ShowdownService.service.sendRegistryData(notYetImplemented, "heldItem")
             ShowdownService.service.sendRegistryData(Moves.moveScripts, "move")
             ShowdownService.service.sendRegistryData(PokemonSpecies.allShowdownSpecies(), "species")
             context.source.sendSystemMessage(Component.literal("Reloaded showdown"))

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

@@ -15,13 +15,11 @@ import com.cobblemon.mod.common.client.gui.portrait.PortraitStyle
 import com.cobblemon.mod.common.config.constraint.IntConstraint
 import com.cobblemon.mod.common.pokeball.catching.calculators.CobblemonCaptureCalculator
 import com.cobblemon.mod.common.util.adapters.CaptureCalculatorAdapter
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.adapters.IntRangeAdapter
 import com.google.gson.GsonBuilder
 import com.google.gson.annotations.SerializedName
 import kotlin.reflect.full.memberProperties
 import kotlin.reflect.jvm.isAccessible
-import net.minecraft.resources.ResourceLocation
 
 class CobblemonConfig {
     companion object {
@@ -31,7 +29,6 @@ class CobblemonConfig {
             .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
             .registerTypeAdapter(ItemDropMethod::class.java, ItemDropMethod.adapter)
             .registerTypeAdapter(CaptureCalculator::class.java, CaptureCalculatorAdapter)
-            .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
             .create()
     }
 
@@ -303,12 +300,6 @@ class CobblemonConfig {
     @CobblemonConfigField(Category.Riding, lang = "display_controls_duration_seconds")
     var displayControlSeconds = 3
 
-    @CobblemonConfigField(Category.Riding, lang = "infinite_ride_stamina")
-    var infiniteRideStamina = false
-
-    @CobblemonConfigField(Category.Riding, lang = "remember_riding_camera")
-    var rememberRidingCamera = true
-
     @CobblemonConfigField(Category.Debug, lang = "enable_debug_keys")
     var enableDebugKeys = true
 

common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt

@@ -10,26 +10,25 @@ package com.cobblemon.mod.common.data
 
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.LOGGER
-import com.cobblemon.mod.common.CobblemonBehaviours
-import com.cobblemon.mod.common.CobblemonCallbacks
 import com.cobblemon.mod.common.CobblemonCosmeticItems
+import com.cobblemon.mod.common.CobblemonCallbacks
+import com.cobblemon.mod.common.CobblemonBehaviours
 import com.cobblemon.mod.common.CobblemonMechanics
-import com.cobblemon.mod.common.CobblemonRideSettings
 import com.cobblemon.mod.common.CobblemonUnlockableWallpapers
 import com.cobblemon.mod.common.api.abilities.Abilities
 import com.cobblemon.mod.common.api.berry.Berries
 import com.cobblemon.mod.common.api.cooking.Seasonings
 import com.cobblemon.mod.common.api.data.DataProvider
 import com.cobblemon.mod.common.api.data.DataRegistry
+import com.cobblemon.mod.common.api.pokedex.Dexes
 import com.cobblemon.mod.common.api.dialogue.Dialogues
 import com.cobblemon.mod.common.api.events.CobblemonEvents
-import com.cobblemon.mod.common.api.fishing.PokeRods
 import com.cobblemon.mod.common.api.fishing.SpawnBait
 import com.cobblemon.mod.common.api.fishing.SpawnBaitEffects
+import com.cobblemon.mod.common.api.fishing.PokeRods
 import com.cobblemon.mod.common.api.fossil.Fossils
 import com.cobblemon.mod.common.api.fossil.NaturalMaterials
 import com.cobblemon.mod.common.api.interaction.PokemonInteractions
-import com.cobblemon.mod.common.api.item.HeldItems
 import com.cobblemon.mod.common.api.mark.Marks
 import com.cobblemon.mod.common.api.moves.Moves
 import com.cobblemon.mod.common.api.moves.animations.ActionEffects
@@ -37,7 +36,6 @@ import com.cobblemon.mod.common.api.npc.NPCClasses
 import com.cobblemon.mod.common.api.npc.NPCPresets
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.api.pokedex.DexAdditions
-import com.cobblemon.mod.common.api.pokedex.Dexes
 import com.cobblemon.mod.common.api.pokedex.entry.DexEntries
 import com.cobblemon.mod.common.api.pokedex.entry.DexEntryAdditions
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
@@ -49,72 +47,72 @@ import com.cobblemon.mod.common.api.spawning.CobblemonSpawnPools
 import com.cobblemon.mod.common.api.spawning.CobblemonSpawnRules
 import com.cobblemon.mod.common.api.spawning.SpawnDetailPresets
 import com.cobblemon.mod.common.battles.BagItems
+import com.cobblemon.mod.common.net.messages.client.data.UnlockReloadPacket
 import com.cobblemon.mod.common.platform.events.PlatformEvents
 import com.cobblemon.mod.common.pokemon.SpeciesAdditions
 import com.cobblemon.mod.common.pokemon.properties.PropertiesCompletionProvider
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.ifClient
 import com.cobblemon.mod.common.util.server
-import java.util.UUID
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.server.packs.resources.ResourceManager
 import net.minecraft.server.packs.resources.ResourceManagerReloadListener
+import java.util.*
 
 object CobblemonDataProvider : DataProvider {
 
+    internal var canReload = true
     // Both Forge n Fabric keep insertion order so if a registry depends on another simply register it after
     private val registries = linkedSetOf<DataRegistry>()
-    private val reloadableRegistries = linkedSetOf<DataRegistry>()
     private val synchronizedPlayerIds = mutableListOf<UUID>()
 
     private val scheduledActions = mutableMapOf<UUID, MutableList<() -> Unit>>()
 
     fun registerDefaults() {
-        this.register(CobblemonScripts, reloadable = true)
-        this.register(SpeciesFeatures, reloadable = false)
-        this.register(GlobalSpeciesFeatures, reloadable = false)
-        this.register(SpeciesFeatureAssignments, reloadable = false)
-        this.register(ActionEffects, reloadable = true)
-        this.register(Moves, reloadable = false)
-        this.register(Abilities, reloadable = false)
-        this.register(CobblemonBehaviours, reloadable = false)
-        this.register(PokemonSpecies, reloadable = false)
-        this.register(SpeciesAdditions, reloadable = false)
-        this.register(PokeBalls, reloadable = false)
-        this.register(PropertiesCompletionProvider, reloadable = false)
-        this.register(SpawnDetailPresets, reloadable = true)
-        this.register(CobblemonSpawnRules, reloadable = true)
-        this.register(CobblemonMechanics, reloadable = true)
-        this.register(BagItems, reloadable = false)
-        this.register(HeldItems, reloadable = false)
-        this.register(Dialogues, reloadable = true)
-        this.register(NaturalMaterials, reloadable = true)
-        this.register(Fossils, reloadable = true)
-        this.register(NPCPresets, reloadable = false)
-        this.register(NPCClasses, reloadable = false)
-        this.register(DexEntries, reloadable = false)
-        this.register(DexEntryAdditions, reloadable = false)
-        this.register(Dexes, reloadable = false)
-        this.register(DexAdditions, reloadable = false)
-        this.register(CobblemonCosmeticItems, reloadable = true)
-        this.register(CobblemonCallbacks, reloadable = true)
-        this.register(CobblemonUnlockableWallpapers, reloadable = true)
-        this.register(Marks, reloadable = false)
-        this.register(StarterDataLoader, reloadable = true)
+        this.register(CobblemonScripts)
+        this.register(SpeciesFeatures)
+        this.register(GlobalSpeciesFeatures)
+        this.register(SpeciesFeatureAssignments)
+        this.register(ActionEffects)
+        this.register(Moves)
+        this.register(Abilities)
+        this.register(CobblemonBehaviours)
+        this.register(PokemonSpecies)
+        this.register(SpeciesAdditions)
+        this.register(PokeBalls)
+        this.register(PropertiesCompletionProvider)
+        this.register(SpawnDetailPresets)
+        this.register(CobblemonSpawnRules)
+        this.register(CobblemonMechanics)
+        this.register(BagItems)
+        this.register(Dialogues)
+        this.register(NaturalMaterials)
+        this.register(Fossils)
+        this.register(NPCPresets)
+        this.register(NPCClasses)
+        this.register(DexEntries)
+        this.register(DexEntryAdditions)
+        this.register(Dexes)
+        this.register(DexAdditions)
+        this.register(CobblemonCosmeticItems)
+        this.register(CobblemonCallbacks)
+        this.register(CobblemonUnlockableWallpapers)
+        this.register(Marks)
+        this.register(StarterDataLoader)
 
         CobblemonSpawnPools.load()
-        this.register(PokeRods, reloadable = false)
-        this.register(Berries, reloadable = false)
-        this.register(Seasonings, reloadable = false)
-        this.register(PokemonInteractions, reloadable = false)
-        this.register(SpawnBaitEffects, reloadable = false)
-        this.register(CobblemonRideSettings, reloadable = true)
+        this.register(PokeRods)
+        this.register(Berries)
+        this.register(Seasonings)
+        this.register(PokemonInteractions)
+        this.register(SpawnBaitEffects)
         SpawnBait.Effects.setupEffects()
 
         PlatformEvents.SERVER_PLAYER_LOGOUT.subscribe {
             synchronizedPlayerIds.remove(it.player.uuid)
+            UnlockReloadPacket().sendToPlayer(it.player)
         }
 
         ifClient {
@@ -123,15 +121,12 @@ object CobblemonDataProvider : DataProvider {
         Cobblemon.implementation.registerResourceReloader(cobblemonResource("data_resources"), SimpleResourceReloader(PackType.SERVER_DATA), PackType.SERVER_DATA, emptyList())
     }
 
-    override fun <T : DataRegistry> register(registry: T, reloadable: Boolean): T {
+    override fun <T : DataRegistry> register(registry: T): T {
         // Only send message once
         if (this.registries.isEmpty()) {
             LOGGER.info("Note: Cobblemon data registries are only loaded once per server instance as Pokémon species are not safe to reload.")
         }
         this.registries.add(registry)
-        if (reloadable) {
-            this.reloadableRegistries.add(registry)
-        }
         LOGGER.info("Registered the {} registry", registry.id.toString())
         LOGGER.debug("Registered the {} registry of class {}", registry.id.toString(), registry::class.qualifiedName)
         return registry
@@ -162,9 +157,15 @@ object CobblemonDataProvider : DataProvider {
     private class SimpleResourceReloader(private val type: PackType) : ResourceManagerReloadListener {
         override fun onResourceManagerReload(manager: ResourceManager) {
             // Check for a server running, this is due to the create a world screen triggering datapack reloads, these are fine to happen as many times as needed as players may be in the process of adding their datapacks.
-            val reloadAllowed = server()?.isReady != true
-            registries.filter { it.type == this.type && (reloadAllowed || it in reloadableRegistries) }
+            val isInGame = server() != null
+            if (isInGame && this.type == PackType.SERVER_DATA && !canReload) {
+                return
+            }
+            registries.filter { it.type == this.type }
                 .forEach { it.reload(manager) }
+            if (isInGame && this.type == PackType.SERVER_DATA) {
+                canReload = false
+            }
         }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/debug/RidingDebugRenderer.kt

@@ -1,58 +0,0 @@
-package com.cobblemon.mod.common.debug
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.mojang.blaze3d.vertex.PoseStack
-import net.minecraft.client.Minecraft
-import net.minecraft.client.renderer.MultiBufferSource
-import net.minecraft.client.renderer.debug.DebugRenderer
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Position
-import java.util.function.Consumer
-
-object RidingDebugRenderer : DebugRenderer.SimpleDebugRenderer {
-    var enabled = false
-
-    override fun render(
-        poseStack: PoseStack,
-        buffer: MultiBufferSource,
-        camX: Double,
-        camY: Double,
-        camZ: Double
-    ) {
-        val minecraft = Minecraft.getInstance() ?: return
-        val vehicle = minecraft.player?.vehicle
-        if (vehicle != null && vehicle is PokemonEntity) {
-            DebugRenderer.renderFloatingText(poseStack, buffer, "riding", camX, camY, camZ, -1, 1f, false, 0.5f, true)
-            renderRidingInfo(vehicle, poseStack, buffer)
-        }
-    }
-
-    private fun renderRidingInfo(vehicle: PokemonEntity, poseStack: PoseStack, buffer: MultiBufferSource) {
-        val ridingController = vehicle.ridingController
-        if (ridingController != null) {
-            var i = 0
-            ridingController.context?.let { context ->
-                val debugString = "Currently active: ${context.behaviour}"
-                renderTextOverVehicle(poseStack, buffer, vehicle.position(), i, debugString, -1, 0.03f)
-                i++
-            }
-            ridingController.behaviours.forEach { (style, settings) ->
-                val debugString = "Available: $style"
-                renderTextOverVehicle(poseStack, buffer, vehicle.position(), i, debugString, -1, 0.03f)
-                i++
-            }
-        }
-    }
-
-    private fun renderTextOverVehicle(poseStack: PoseStack, buffer: MultiBufferSource, pos: Position, layer: Int, text: String, color: Int, scale: Float) {
-        val blockPos = BlockPos.containing(pos)
-        val x = blockPos.x.toDouble() + 0.5
-        val y = blockPos.y.toDouble() + 2.4 + layer * 0.25
-        val z = blockPos.z.toDouble() + 0.5
-        DebugRenderer.renderFloatingText(poseStack, buffer, text, x, y, z, color, scale, false, 0.5f, true)
-    }
-
-    fun clientHandler(enabled: Boolean) {
-        this.enabled = enabled
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/entity/EntityCallbacks.kt

@@ -38,6 +38,7 @@ class EntityCallbacks(val entity: Entity) : HashMap<ResourceLocation, MutableLis
     companion object {
         val HIT_BY_POKEBALL = cobblemonResource("hit_by_pokeball")
         val SAW_ENTITY = cobblemonResource("saw_entity")
+        val LOST_ENTITY = cobblemonResource("lost_sight_of_entity")
         val HURT = cobblemonResource("hurt")
         val DIED = cobblemonResource("died")
     }

common/src/main/kotlin/com/cobblemon/mod/common/entity/OmniPathingEntity.kt

@@ -21,9 +21,7 @@ import net.minecraft.world.level.material.FluidState
 interface OmniPathingEntity {
     fun canWalk(): Boolean
     fun canSwimInWater(): Boolean
-    fun canWalkOnWater(): Boolean
     fun canSwimInLava(): Boolean
-    fun canWalkOnLava(): Boolean
     fun canSwimUnderFluid(fluidState: FluidState): Boolean
     fun canFly(): Boolean
     fun isFlying(): Boolean

common/src/main/kotlin/com/cobblemon/mod/common/entity/PoseType.kt

@@ -49,7 +49,7 @@ enum class PoseType {
         val UI_POSES = EnumSet.of(PROFILE, PORTRAIT)
         val MOVING_POSES = EnumSet.of(WALK, SWIM, FLY)
         val STATIONARY_POSES = EnumSet.of(STAND, FLOAT, HOVER)
-        val NO_GRAV_POSES = EnumSet.of(FLY, HOVER, SWIM)
+        val NO_GRAV_POSES = EnumSet.of(FLY, HOVER, FLOAT, SWIM)
 
         fun identified() : List<ResourceLocation> {
             return ALL_POSES.stream()

common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/CobblemonRandomSurfacePos.kt

@@ -1,125 +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.entity.ai
-
-import com.cobblemon.mod.common.entity.OmniPathingEntity
-import net.minecraft.core.BlockPos
-import net.minecraft.tags.FluidTags
-import net.minecraft.world.entity.PathfinderMob
-import net.minecraft.world.entity.ai.util.GoalUtils
-import net.minecraft.world.entity.ai.util.RandomPos
-import net.minecraft.world.phys.Vec3
-import java.util.*
-import java.util.function.Supplier
-import java.util.function.ToDoubleFunction
-
-/*
-*
-*  This is a rewrite of Minecraft's LandRandomPos tuned for
-*  water and lava walkers.
-*  The only real difference is movePosUpOutOfSolid() which
-*  moves the target pos out of liquids
-*
-* */
-class CobblemonRandomSurfacePos {
-    companion object {
-        fun getPos(mob: PathfinderMob, radius: Int, verticalRange: Int): Vec3? {
-            Objects.requireNonNull(mob)
-            return getPos(
-                mob,
-                radius,
-                verticalRange,
-                 { pos: BlockPos? ->
-                     if (pos != null) {
-                         mob.getWalkTargetValue(pos).toDouble()
-                     }
-                     0.0
-                 })
-        }
-
-        fun getPos(mob: PathfinderMob, radius: Int, yRange: Int, toDoubleFunction: ToDoubleFunction<BlockPos?>): Vec3? {
-            val bl = GoalUtils.mobRestricted(mob, radius)
-            return RandomPos.generateRandomPos(Supplier {
-                val blockPos = RandomPos.generateRandomDirection(mob.getRandom(), radius, yRange)
-                val blockPos2 = generateRandomPosTowardDirection(mob, radius, bl, blockPos)
-                if (blockPos2 == null) null else movePosUpOutOfSolid(mob, blockPos2)
-            }, toDoubleFunction)
-        }
-
-        fun getPosTowards(mob: PathfinderMob, radius: Int, yRange: Int, vectorPosition: Vec3): Vec3? {
-            val vec3 = vectorPosition.subtract(mob.getX(), mob.getY(), mob.getZ())
-            val bl = GoalUtils.mobRestricted(mob, radius)
-            return getPosInDirection(mob, radius, yRange, vec3, bl)
-        }
-        private fun getPosInDirection(
-            mob: PathfinderMob,
-            radius: Int,
-            yRange: Int,
-            vectorPosition: Vec3,
-            shortCircuit: Boolean
-        ): Vec3? {
-            return RandomPos.generateRandomPos(mob, Supplier {
-                val blockPos: BlockPos? =
-                    RandomPos.generateRandomDirectionWithinRadians(
-                        mob.getRandom(),
-                        radius,
-                        yRange,
-                        0,
-                        vectorPosition.x,
-                        vectorPosition.z,
-                        (Math.PI.toFloat() / 2f).toDouble()
-                    )
-                if (blockPos == null) {
-                    return@Supplier null
-                } else {
-                    val blockPos2: BlockPos? =
-                        generateRandomPosTowardDirection(
-                            mob,
-                            radius,
-                            shortCircuit,
-                            blockPos
-                        )
-                    return@Supplier if (blockPos2 == null) null else movePosUpOutOfSolid(
-                        mob,
-                        blockPos2
-                    )
-                }
-
-            })
-        }
-
-        fun generateRandomPosTowardDirection(
-            mob: PathfinderMob,
-            radius: Int,
-            shortCircuit: Boolean,
-            pos: BlockPos
-        ): BlockPos? {
-            val blockPos = RandomPos.generateRandomPosTowardDirection(mob, radius, mob.getRandom(), pos)
-            return if (!GoalUtils.isOutsideLimits(blockPos, mob) && !GoalUtils.isRestricted(
-                    shortCircuit,
-                    mob,
-                    blockPos
-                ) && !GoalUtils.isNotStable(mob.getNavigation(), blockPos)
-            ) blockPos else null
-        }
-
-        fun movePosUpOutOfSolid(mob: PathfinderMob, pos: BlockPos): BlockPos? {
-            var pos = pos
-            pos = RandomPos.moveUpOutOfSolid(
-                pos,
-                mob.level().maxBuildHeight
-            ) { blockPos: BlockPos ->
-                if (GoalUtils.isSolid(mob, blockPos)) true
-                val fluidState = mob.level().getFluidState(blockPos)
-                !fluidState.isEmpty && (mob !is OmniPathingEntity || ((mob.canWalkOnWater() && fluidState.type == FluidTags.WATER) || (mob.canWalkOnLava() && fluidState.type == FluidTags.LAVA)))
-            }
-            return if (!GoalUtils.hasMalus(mob, pos)) pos else null
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/FollowHerdLeaderTask.kt

@@ -15,11 +15,9 @@ import com.google.common.collect.ImmutableMap
 import java.util.UUID
 import kotlin.math.pow
 import net.minecraft.server.level.ServerLevel
-import net.minecraft.world.entity.MoverType
 import net.minecraft.world.entity.ai.behavior.Behavior
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.entity.ai.memory.MemoryStatus
-import net.minecraft.world.entity.ai.memory.WalkTarget
 import net.minecraft.world.phys.Vec3
 
 class FollowHerdLeaderTask : Behavior<PokemonEntity>(
@@ -69,14 +67,8 @@ class FollowHerdLeaderTask : Behavior<PokemonEntity>(
                 entity.brain.eraseMemory(CobblemonMemories.HERD_LEADER) // We can't go where this guy's going
                 return
             }
-            entity.brain.setMemory(
-                MemoryModuleType.WALK_TARGET,
-                CobblemonWalkTarget(
-                    pos = leader.blockPosition(),
-                    speedModifier = 0.3F,
-                    completionRange = closeEnough.toInt()
-                )
-            )
+            entity.setFlying(true)
+            entity.addDeltaMovement(Vec3(0.0, 2.0, 0.0))
         } else if (leaderMoveControl.banking) {
             if (leader.isInLiquid && !entity.isInLiquid) {
                 // We should get into water asap so we can mimic the banking

common/src/main/kotlin/com/cobblemon/mod/common/entity/ai/OmniPathNavigation.kt

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.entity.ai
 
 import com.cobblemon.mod.common.entity.OmniPathingEntity
 import com.cobblemon.mod.common.pokemon.ai.OmniPathNodeMaker
-import com.cobblemon.mod.common.util.deleteNode
 import com.cobblemon.mod.common.util.getWaterAndLavaIn
 import com.cobblemon.mod.common.util.toVec3d
 import com.google.common.collect.ImmutableSet
@@ -28,6 +27,7 @@ import net.minecraft.world.level.pathfinder.Path
 import net.minecraft.world.level.pathfinder.PathComputationType
 import net.minecraft.world.level.pathfinder.PathFinder
 import net.minecraft.world.level.pathfinder.PathType
+import net.minecraft.world.level.pathfinder.WalkNodeEvaluator
 import net.minecraft.world.phys.Vec3
 import kotlin.math.PI
 import kotlin.math.abs
@@ -132,7 +132,7 @@ class OmniPathNavigation(val world: Level, val entity: Mob) : GroundPathNavigati
         val f = abs(mob.z - targetVec3d.z)
         val closeEnough = d < maxDistanceToWaypoint.toDouble()
                 && f < this.maxDistanceToWaypoint.toDouble()
-                && e < (if (currentNode.type in verticallyPreciseNodeTypes && (mob.isUnderWater || pather.isFlying())) maxDistanceToWaypoint else 1.0).toDouble()
+                && e < (if (currentNode.type in verticallyPreciseNodeTypes) maxDistanceToWaypoint else 1.0).toDouble()
 
         // Corner cutting is commented out because it makes pokemon and NPCs 'cut' the corner and fall into water or lava
         if (closeEnough) {// || mob.navigation.canCutCorner(path!!.nextNode.type) && shouldTargetNextNodeInDirection(vec3d)) {
@@ -228,25 +228,6 @@ class OmniPathNavigation(val world: Level, val entity: Mob) : GroundPathNavigati
                 return true
             }
         }
-        if (mob.canBreatheUnderwater()) {
-            val blockGetter: BlockGetter = level
-            if (blockGetter.getFluidState(pos).`is`(FluidTags.WATER)) {
-                val blockPos = pos.below()
-                return level.getBlockState(blockPos).isSolidRender(this.level, blockPos)
-            }
-        }
-        if (pather.canWalkOnWater()) {
-            val blockGetter: BlockGetter = level
-            if (blockGetter.getFluidState(pos.below()).`is`(FluidTags.WATER)) {
-                return !level.getBlockState(pos).isSolidRender(this.level, pos)
-            }
-        }
-        if (pather.canWalkOnLava()) {
-            val blockGetter: BlockGetter = level
-            if (blockGetter.getFluidState(pos.below()).`is`(FluidTags.LAVA)) {
-                return !level.getBlockState(pos).isSolidRender(this.level, pos)
-            }
-        }
         if (pather.canFly()) {
             return this.level.getBlockState(pos).isAir || super.isStableDestination(pos)
             // Note the below is what is used by default for minecraft fliers
@@ -264,7 +245,7 @@ class OmniPathNavigation(val world: Level, val entity: Mob) : GroundPathNavigati
             // If we can fly and we're airborne, return the current Y position
             return vec.y
         }
-        return if ((canFloat()) && blockGetter.getFluidState(blockPos).`is`(FluidTags.WATER)) vec.y + 0.5 else super.getGroundY(vec)
+        return if ((canFloat()) && blockGetter.getFluidState(blockPos).`is`(FluidTags.WATER)) vec.y + 0.5 else WalkNodeEvaluator.getFloorLevel(blockGetter, blockPos)
     }
 
     override fun createPath(entity: Entity, distance: Int): Path? {
@@ -288,28 +269,6 @@ class OmniPathNavigation(val world: Level, val entity: Mob) : GroundPathNavigati
     override fun trimPath() {
         super.trimPath()
         val path = getPath() ?: return
-
-        // What's there to trim
-        if (path.nodeCount < 2) {
-            return
-        }
-
-        /*
-         * Sometimes entities spin in place at the start of their path
-         * because of rounding stuff (I think) so try to detect those
-         * cases and nix the first node so they just move forward.
-         */
-        val introNode = path.getNode(0)
-        val subsequentNode = path.getNode(1)
-        val mobMiddle = entity.position()
-        val toIntroNode = introNode.asVec3().add(0.5, 0.0, 0.5).subtract(mobMiddle)
-        val toSubsequentNode = subsequentNode.asVec3().add(0.5, 0.0, 0.5).subtract(mobMiddle)
-        // if the first two nodes are pointing in opposite directions (>90 degrees) from the entity or the second node is closer, trim the first node
-        if (toIntroNode.dot(toSubsequentNode) < 0 || toIntroNode.lengthSqr() > toSubsequentNode.lengthSqr()) {
-            path.deleteNode(0)
-        }
-
-
         var i = 2
 
         // Tries to skip some nodes that are all lined up