loisence

Couple of misc API additions and bug fixes.

See merge request cable-mc/cobblemon!2125

CHANGELOG.md

@@ -1,58 +1,85 @@
 # Changelog
-## [1.7.4 (MONTH Xth, 2026)](#1-7-4)
+## [1.7.2 (MONTH Xth, YEAR)](#1-7-2)
 
 ### Additions
-- Added config options to award experience to fainted Pokémon for opponents they helped defeat (`awardExperienceToFaintedPokemon`) and to still award experience for defeated enemies even after battle loss/forfeit (`awardExperienceOnBattleLoss`)
-- Party Overlay Exp Gained Animation will now display the amount of EXP the Pokémon gained
-- Added a toast to notify players of how they can scroll through their party. Did you know you can hold R and scroll instead of using arrow keys??!
-- Added new layer property that makes a layer scroll in a direction. "scrolling": {"speedU": 0.1, "speedV": 0.1}
-- Added missing crops to Botany Pots integration
-
-### New rideable Pokémon
-
-### Pokémon Added
-
-### Model updates for the following Pokémon
-
-### Animation updates for the following Pokémon
+- Added riding statistics: `Distance by Pokémon on Land`, `Distance by Pokémon in Air` and `Distance by Pokémon in Liquid`.
+- Added the Partner Mark, which party Pokémon have a very small chance to earn as the player walks, provided they have enough friendship.
+- Added new effects
+  - Mental Restoration: Reduces "Time Since Last Rest" statistic, which controls Insomnia, by half a minute per second per effect level
+  - Negative Effect Cleanse: Removes all negative effects
+  - Effect Cleanse: Removes all effects
+- Added more seasonings for sinister tea
+  - Mental Herb - Mental Restoration I for 10 seconds
+  - White Herb - Negative Effect Cleanse
+  - Milk - Effect Cleanse
+  - Moomoo Milk - Effect Cleanse
+- Added `label` as an alternate key to the `tag` property.
+- Added Saccharine wood furniture for Adorn.
+- Added block models for existing items: Potion, Super Potion, Hyper Potion, Max Potion, Full Restore, Antidote, Awakening, Burn Heal, Ice Heal, Paralyze Heal, Full Heal, Ether, Elixir, Max Ether, Max Elixir, X Accuracy, X Attack, X Defence, X Special Attack, X Special Defence, X Speed, Dire Hit, Guard Spec, Weakness Policy, Blunder Policy, Cleanse Tag, and Spell Tag.
+- Added decorative sign blocks, Plaques.
 
 ### Changes
-- Restructured Botany Pots integration folder structure
-- Decrease default pastured mon wander radius to 32.
-- Factor in the weight of pokemon when calculating pushing forces between hitboxes.
-- Remade the Starter Selection Screen with new assets
-- Refactored berry trees to be less impactful on TPS (more performant)
+- Ride sounds have been separated into stereo for passengers and mono for other players. Riding will now sound more spacious.
+- Added a new config option, `Enable In-Flight Dismounting` (default: off), which lets you dismount while riding a Pokémon in the air.
+- Battle AI now uses a smarter threshold for switching, reducing unnecessary switches.
+- AI will always use the most damaging move when at low HP and when it is not switching, improving endgame decision-making.
+- Added support for optional message variants in battle activate instructions for more context-specific battle text.
+  - Example: `this.add('-activate', pokemon, 'ability: example', '[msg]message1');` will parse to lang key `cobblemon.battle.activate.example.message1`
 
 ### Fixes
-- Fixes https://gitlab.com/cable-mc/cobblemon/-/issues/1943
-- Fix occasional crash on retrieving revived fossils
-- Fixed a compatibility issue with World Game Rules which caused some log spam in specific cases.
-- Fixed improper validation of Pokémon when performing a trade.
-- Fixed issue where particle like beam can disappear when you don't see the beginning of the beam or you look away
- - Fixes https://gitlab.com/cable-mc/cobblemon/-/issues/1943
- - Fix occasional crash on retrieving revived fossils
- - Fix brushing not working on Neoforge
- - [Various Submarine Ride Fixes](https://gitlab.com/cable-mc/cobblemon/-/merge_requests/2157)
- - Fix Pastured mons despawning and running away.
- - Fix Apricorn trees crashing when other mods bonemeal it
- - [Various UFO Ride Improvements](https://gitlab.com/cable-mc/cobblemon/-/merge_requests/2156)
-- Fixed NeoForge brewing stand unexpectedly crashing users when shift clicking items within it's menu
-- Fixed NPCs switching pokemon very often during battles
-- Fixed Campfire pot causing crashes under certain circumstances
-- Fixed Type Gems not being consumed upon use
-- Fixed Ancient Pokeball's to their respective modifiers
-- Fixed a Server warning when recalling Pokemon
+- Fixed an issue in the OmniPathNodeMaker/Navigation that prevented Combee from pathing into and out of Saccharine Leaves.
+- Fixed orientation not getting reset after crashing while flying and getting back on the Pokémon.
+- Fixed Furfrou not being trimmable on NeoForge.
+- Fixed shiny Pokémon not respecting the silent flag on spawn.
+- Fixed honey from Saccharine Leaves being harvestable at less than the max age.
+- Items given from interacting with Saccharine Leaves are placed in the active hotbar slot if possible.
+- Fix all Pokémon being saved to chunks and never despawning.
+- Fixed possible error on world generation when Combee are placed in naturally generated bee nests.
+- Fixed Poké Snacks crashing if there was no available spawn.
+- Fixed Pokémon spawn influences not being specific to regional forms.
+- Fixed crashing when viewing another player in spectator mode.
+- Fixed missing apricorn textures for Adorn blocks.
+- Fixed crashing when riding due to malformed json file instead of resetting it.
+- Fixed mochi items consuming two items at a time.
+- Fix item interaction sometimes not working properly when playing on servers.
+- Fixed Soothe Bell not being properly tagged as a held item.
+- Fixed Mint Leaves not being usable for filling the Resurrection Machine.
+- Added Saccharine Boats and Saccharine Boat with Chests to relevant boat tags.
+- Fixed the `run_script` Molang function to not fail if the environment's context is null.
+- Fixed battle item duplication issue.
+- Fixed the movesets of certain Pokémon being incorrectly sanitized upon reload.
+- Fixed the ordering of Aprijuice's riding stat boosts to always have the same order.
+- Fixed the Molang functions `date_local_time`, `date_of`, `date_is_after` to use the correct date format.
+- Fixed the bottom half of pasture blocks having an incorrect hit-box when facing north or south.
+- Fixed Galarian Mr. Mime incorrectly being rideable.
+- Fixed gimmicks not being usable in double / triple battles.
+- Fixed gimmick buttons showing when already used in the same turn in double / triple battles.
+- Fixed Apricorn block model rotation for counters/sinks/cupboards/drawers to match that of most recent version of Adorn.
+- Fixed Fresh Start Mochi EV reset not syncing health changes properly.
+- Fixed requirements such as `biomeCondition` crashing the game when used to define Pokémon interactions.
+- Fixed Pokémon interactions not playing sound effects when the volume was not specified.
+- Fixed Pokémon interaction cooldowns taking longer than intended when the Pokémon was in the player’s party.
+- Fixed Pokémon interactions occasionally crashing the game when spamming an interaction with a 0 cooldown.
+- Fixed Pokémon fullness decreasing more than intended when the Pokémon was pastured.
+- Fixed crashing when sending a Pokémon out after editing its form.
+- Fixed Super Potion recipes incorrectly using Hondew Berry instead of Aguav Berry.
+- Fixed `/calculateseatpositions` expecting a locator format that even we don't use. It needs an underscore after "seat".
+- Fixed invulnerability-bypassed damage being resisted by invulnerable NPC entities.
+- Fixed selected leading Pokémon in battle not being used when levels are raised.
+- Fixed killer not being set early enough on a wild wild Pokémon entity from WinInstruction.
 
 ### Developer
-- Added `PokeSnackSpawnerFactory` which allows influence registration on PokeSnack encounters
-- Added `FishingSpawnerFactory` which allows influence registration on fishing encounters
-- Added `BattleFleeAttemptEvent` fired from `PokemonBattle.checkFleeAttempt`, allowing developers to intercept and control flee attempts
+- Changed the `owner` parameter in the `OwnerQueryRequirement` interface from `ServerPlayer` to `Player`. This method is now also called on the client to verify whether a Pokémon interaction succeeded, so make sure to update your implementations to handle both server and client contexts.
+- Added `pnx` to the `BattleFaintedEvent` and `FormeChangeEvent`.
+- Added register methods for custom instructions to `ShowdownInterpreter`.
+- Changed callback operations in `BattlePokemon` to allow multiple callbacks and is now mutable.
 
 ### Molang & Datapacks
-- q.item.is_enchanted()
-- q.item.has_enchantment(minecraft:sharpness, 3)
-- Added `has_chosen_starter` & `get_starter_uuid` as available Molang functions
-- Added `marks`, `has_mark`, & `remove_marks` as available Molang functions for pokemon
+- Ride sounds can now be set as exclusive to passengers.
+- Ride sounds no longer play when submerged unless specified with a new setting.
+- Exception handling has been added to `run_molang`, resolving some crashes caused by malformed MoLang expressions.
+
+### Particles
 
 ### Localization
 - Updated translations for:

changelogs/CHANGELOG-1.7.2.md

@@ -1,137 +0,0 @@
-# Changelog
-## [1.7.2 (January 25th, 2026)](#1-7-2)
-
-### Additions
-- Added Saccharine wood furniture for Adorn.
-- Added the Partner Mark, which party Pokémon have a very small chance to earn as the player walks, provided they have enough friendship.
-- Added decorative block models for existing items: Potion, Super Potion, Hyper Potion, Max Potion, Full Restore, Antidote, Awakening, Burn Heal, Ice Heal, Paralyze Heal, Full Heal, Ether, Elixir, Max Ether, Max Elixir, X Accuracy, X Attack, X Defence, X Special Attack, X Special Defence, X Speed, Dire Hit, Guard Spec, Weakness Policy, Blunder Policy, Cleanse Tag, and Spell Tag.
-- Added decorative sign blocks called Plaques.
-- Added ride style labels to ride stats in Pokédex, as well as ride style icons in the summary GUI.
-- Added more seasonings for sinister tea:
-  - Mental Herb - Mental Restoration I for 10 seconds, which staves off Insomnia.
-  - White Herb - Removes negative effects.
-  - Milk, Moomoo Milk - Removes effects.
-- Added dispenser support for:
-  - Applying a Honey Bottle to Saccharine Logs.
-  - Washing honey off of Saccharine Slathered Logs.
-  - Applying and removing honey on Saccharine Leaves.
-- Added riding statistics: `Distance by Pokémon on Land`, `Distance by Pokémon in Air` and `Distance by Pokémon in Liquid`.
-
-### New rideable Pokémon
-- Honchkrow 
-- Mantine
-
-### Pokémon Added
-
-#### Gen 5
-- Throh
-- Sawk
-
-#### Gen 6
-- Litleo
-- Pyroar
-- Spritzee
-- Aromatisse
-- Swirlix
-- Slurpuff
-
-### Model updates for the following Pokémon
-- Falinks
-- Cottonee
-- Whimsicott
-- Ferroseed
-- Ferrothorn
-- Chingling
-- Chimecho
-
-### Animation updates for the following Pokémon
-- Mantine (ride animations)
-- Flygon (ride jump animation)
-- Honchkrow (ride animations)
-- Croagunk
-- Toxicroak
-
-### Changes
-- Added a new config option, `Enable In-Flight Dismounting` (default: off), which lets you dismount while riding a Pokémon in the air. This is the textbook definition of caveat emptor.
-- Ride sounds have been separated into stereo for passengers and mono for other players. Riding will now sound more spacious.
-- Battle AI now uses a smarter threshold for switching, reducing unnecessary switches.
-- AI will always use the most damaging move when at low HP and when it is not switching, improving endgame decision-making.
-- Items given from interacting with Saccharine Leaves are placed in the active hotbar slot if possible.
-- Added `label` as an alternate key to the `tag` property.
-
-### Fixes
-- Fixed crashing when viewing another player in spectator mode. Some said this was reason to release this update a month ago. They were probably right.
-- Fixed crashing when sending a Pokémon out after editing its form.
-- Fixed all Pokémon being saved to chunks and never despawning even when they should be.
-- Fixed Poké Snacks crashing if there was no available spawn.
-- Fixed Poké Snack / Bait effects so that EV Yield, Type, and Egg Group filters now all apply together when weighting spawns. And you thought you were going crazy.
-- Fixed Furfrou not being trimmable on NeoForge specifically.
-- Fixed honey from Saccharine Leaves being harvestable at less than the max age.
-- Fixed possible error on world generation when Combee are placed in naturally generated bee nests.
-- Fixed Galarian Weezing crashing the world if it decides to blink the wrong way. The same could happen to you!
-- Fixed Galarian Mr. Mime incorrectly being rideable. Some would argue that regular Mr. Mime shouldn't be rideable, but that would make them wrong.
-- Fixed missing apricorn textures for Adorn blocks.
-- Fixed Apricorn block model rotation for counters/sinks/cupboards/drawers to match that of most recent version of Adorn.
-- Fixed item interaction sometimes not working properly when playing on servers.
-- Fixed Mint Leaves not being usable for filling the Resurrection Machine.
-- Fixed Super Potion recipes incorrectly using Hondew Berry instead of Aguav Berry. They look similar, to be fair.
-- Fixed Wishiwashi not schooling properly.
-- Fixed battle item duplication issue. How did it work? Wouldn't you like to know, weather boy.
-- Fixed the ordering of Aprijuice's riding stat boosts so they always have the same order.
-- Fixed the movesets of certain Pokémon being incorrectly sanitized upon reload, causing some forms to keep losing moves.
-- Fixed selected leading Pokémon in battle not being used when levels are set.
-- Fixed the bottom half of pasture blocks having an incorrect hit-box when facing north or south.
-- Fixed gimmicks not being usable in double and triple battles.
-- Fixed gimmick buttons showing when already used in the same turn in double and triple battles.
-- Fixed mochi items consuming two items at a time.
-- Fixed Fresh Start Mochi's EV reset not syncing health changes properly.
-- Fixed Pokémon spawn influences not being specific to regional forms.
-- Fixed memory leak from battles not being cleaned up after ending.
-- Fixed orientation not getting reset after crashing while flying and getting back on the Pokémon.
-- Fixed shiny Pokémon not respecting the `silent` flag on spawn.
-- Fixed 'Plain' prefix not being applied to all low-quality Aprijuice.
-- Fixed Pokémon interactions not playing sound effects when the volume was not specified.
-- Fixed Pokémon interaction cooldowns taking longer than intended when the Pokémon was in the player’s party.
-- Fixed Pokémon interactions occasionally crashing the game when spamming an interaction with a 0 cooldown.
-- Fixed Pokémon fullness decreasing more than intended when the Pokémon was pastured.
-- Fixed Scraggy line, Milcery line, and Morpeko spawning on unnatural blocks. 
-- Fixed invulnerability-bypassed damage being resisted by invulnerable NPC entities.
-- Fixed Fabric network packets not being handled immediately, fixing incompatibilities with Supplementaries, Prometheus, Sleep Tight, and others.
-- Fixed killer not being set early enough on a wild Pokémon entity from `WinInstruction`.
-- Fixed requirements such as `biomeCondition` crashing the game when used to define Pokémon interactions.
-- Fixed an issue that prevented registering custom dispenser behaviours (no longer overrides vanilla behaviour).
-- Fixed an issue navigation that prevented Combee from pathing into and out of Saccharine Leaves.
-- Added Saccharine Boats and Saccharine Boat with Chests to relevant boat tags.
-- Fixed Soothe Bell not being properly tagged as a held item.
-- Fixed `/calculateseatpositions` expecting a locator format that even we don't use. It needs an underscore after "seat".
-- Fixed the `run_script` Molang function to not fail if the environment's context is null.
-- Fixed the Molang functions `date_local_time`, `date_of`, `date_is_after` to use the correct date format.
-
-### Developer
-- Changed the `owner` parameter in the `OwnerQueryRequirement` interface from `ServerPlayer` to `Player`. This method is now also called on the client to verify whether a Pokémon interaction succeeded, so make sure to update your implementations to handle both server and client contexts.
-- Added the `pnx` to the `BattleFaintedEvent` and `FormeChangeEvent`.
-- Added register methods for custom instructions to `ShowdownInterpreter`.
-- Changed callback operations in `BattlePokemon` to allow multiple callbacks and be mutable.
-- Added `display_name`, `description`, and `max_pp` functions to the `MoveTemplate` struct.
-- Changed the implementations of `AIBattleActor` to be open classes to allow extension.
-- Changed the resource location of Poké Ball icons in the GUI to use the balls namespace instead of Cobblemon's, allowing mods to properly use their own namespace for these textures.
-
-### Molang & Datapacks
-- Ride sounds can now be set as exclusive to passengers.
-- Ride sounds no longer play when submerged unless specified with a new setting.
-- Exception handling has been added to `run_molang`, resolving some crashes caused by malformed MoLang expressions.
-- Added the `create_itemstack`, `has_inventory_space`, `set_inventory_slot`, and `give_item` MoLang functions for item and inventory utility.
-- Added the `get_move_from_id` MoLang function for general move info queries without requiring a Moveset object to access.
-- Added support for optional message variants in battle activate instructions for more context-specific battle text.
-  - Example: `this.add('-activate', pokemon, 'ability: example', '[msg]message1');` will parse to lang key `cobblemon.battle.activate.example.message1`.
-
-### Localization
-- Updated translations for:
-  - French
-  - Canadian French
-  - Simplified Chinese
-  - Ukrainian
-  - Brazilian Portuguese
-  - Spanish
-  - Korean
-  - Japanese

changelogs/CHANGELOG-1.7.3.md

@@ -1,22 +0,0 @@
-# Changelog
-## [1.7.3 (January 31st, 2026)](#1-7-3)
-
-### Fixes
-- Fixed mounted Pokémon not playing sounds.
-- Fixed players failing to join servers randomly.
-- Fixed some Pokémon having no stamina for flying.
-- Fixed `/pctake` not respecting the actual size of the PC.
-### Developer
-- Poké Ball GUI textures now respect the ball's namespace, enabling proper texture loading for custom balls from other mods.
-
-### Molang & Datapacks
-- Added a `chance` requirement type for Pokémon interactions.
-
-### Localization
-- Updated translations for:
-  - French
-  - Canadian French
-  - Korean
-  - Portuguese
-  - Simplified Chinese
-  - Spanish

common/build.gradle.kts

@@ -55,7 +55,7 @@ dependencies {
     // modCompileOnly(libs.flywheelFabric)
 
     // Showdown
-    modCompileOnly(libs.graal.core)
+    modCompileOnly(libs.graal)
 
     // Data Storage
     modCompileOnly(libs.bundles.mongo)

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

@@ -15,8 +15,6 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents;
 import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies;
-import com.cobblemon.mod.common.api.riding.RidingStyle;
-import com.cobblemon.mod.common.api.riding.behaviour.types.air.HoverBehaviour;
 import com.cobblemon.mod.common.api.storage.party.PartyStore;
 import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore;
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags;
@@ -61,7 +59,6 @@ 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
@@ -172,32 +169,6 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
         }
     }
 
-    @Redirect(
-            method = "getDestroySpeed",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/world/entity/player/Player;onGround()Z"
-            )
-    )
-    private boolean cobblemon$considerHoverOnGround(Player player) {
-        // If riding a Hover Mount, return true to bypass the 5x slowdown
-        if (player.getVehicle() instanceof PokemonEntity vehicle) {
-
-            var ridingController = vehicle.getRidingController();
-            if (ridingController == null) player.onGround();
-
-            var activeContext = ridingController.getContext();
-            if (activeContext == null) player.onGround();
-
-            if (activeContext.getStyle() == RidingStyle.AIR &&
-                activeContext.getBehaviour().equals(HoverBehaviour.Companion.getKEY())) {
-                return true;
-            }
-        }
-        // Otherwise, return the actual value
-        return player.onGround();
-    }
-
     @Inject(
         method = "eat",
         at = @At(

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

@@ -101,7 +101,7 @@ public abstract class ServerEntityMixin {
         cobblemon$broadcast(new ClientboundUpdateDriverInputPacket(driverInput, entity.getId()));
     }
 
-    public void cobblemon$broadcast(NetworkPacket<?> packet) {
+    private void cobblemon$broadcast(NetworkPacket<?> packet) {
         if (!(entity.level() instanceof ServerLevel level)) return;
         ChunkMap chunkMap = level.getChunkSource().chunkMap;
         Int2ObjectMap<?> entityMap = ((ChunkMapAccessor) chunkMap).getEntityMap();

common/src/main/java/com/cobblemon/mod/common/mixin/accessor/DispenserBlockAccessor.java

@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.accessor;
-
-import net.minecraft.world.item.Item;
-import net.minecraft.core.dispenser.DispenseItemBehavior;
-import net.minecraft.world.level.block.DispenserBlock;
-
-import java.util.Map;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(DispenserBlock.class)
-public interface DispenserBlockAccessor {
-	@Accessor("DISPENSER_REGISTRY")
-	static Map<Item, DispenseItemBehavior> getItemBehaviors() {
-		throw new AssertionError();
-	}
-}

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

@@ -35,7 +35,6 @@ 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 com.cobblemon.mod.common.client.gui.party.PartyTutorialToasts;
 
 import static com.google.common.primitives.Floats.min;
 import static net.minecraft.util.Mth.lerp;
@@ -86,13 +85,11 @@ public abstract class MouseHandlerMixin {
                 CobblemonClient.INSTANCE.getStorage().shiftSelected(false);
                 ci.cancel();
                 PartySendBinding.INSTANCE.actioned();
-                PartyTutorialToasts.INSTANCE.onHoldKeyScrollSwitchedSlot();
             } else if (i < 0) {
                 accumulatedScrollY -= i;
                 CobblemonClient.INSTANCE.getStorage().shiftSelected(true);
                 ci.cancel();
                 PartySendBinding.INSTANCE.actioned();
-                PartyTutorialToasts.INSTANCE.onHoldKeyScrollSwitchedSlot();
             }
         }
     }
@@ -313,7 +310,7 @@ public abstract class MouseHandlerMixin {
         var playerRotater = (RidePassenger)player;
         playerRotater.cobblemon$setRideXRot(playerRotater.cobblemon$getRideXRot() + f);
         playerRotater.cobblemon$setRideYRot(playerRotater.cobblemon$getRideYRot() + g);
-        playerRotater.cobblemon$setRideXRot(Mth.clamp(playerRotater.cobblemon$getRideXRot(), -89.0F, 89.0F));
+        playerRotater.cobblemon$setRideXRot(Mth.clamp(playerRotater.cobblemon$getRideXRot(), -90.0F, 90.0F));
         playerRotater.cobblemon$setRideYRot(Mth.clamp(playerRotater.cobblemon$getRideYRot(), -105.0F, 105.0F));
         if (player.getVehicle() != null) {
             player.getVehicle().onPassengerTurned(player);

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

@@ -14,14 +14,9 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.pokemon.Pokemon;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
-import com.llamalad7.mixinextras.sugar.Share;
-import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
-import com.llamalad7.mixinextras.sugar.ref.LocalFloatRef;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
@@ -94,61 +89,4 @@ public abstract class EntityMixin {
         cir.setReturnValue(customEyePos);
     }
 
-
-    @WrapOperation(
-            method = "push(Lnet/minecraft/world/entity/Entity;)V",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;push(DDD)V", ordinal = 0)
-    )
-    public void cobblemon$customPusherLogic(Entity pusher, double x, double y, double z,
-                                            Operation<Void> original,
-                                            @Local(argsOnly = true) Entity pushee,
-                                            @Local(name = "e") double e, @Local(name = "d") double d,
-                                            @Share("pusherIsPlayerOrPokemon") LocalBooleanRef pusherIsPlayerOrPokemon,
-                                            @Share("pusheeIsPlayerOrPokemon") LocalBooleanRef pusheeIsPlayerOrPokemon,
-                                            @Share("pusheeReceivedForce")LocalFloatRef pusheeReceivedForce) {
-        pusherIsPlayerOrPokemon.set(pusher instanceof PokemonEntity || pusher instanceof Player);
-        pusheeIsPlayerOrPokemon.set(pushee instanceof PokemonEntity || pushee instanceof Player);
-
-        if (!pusheeIsPlayerOrPokemon.get() || !pusherIsPlayerOrPokemon.get()) {
-            original.call(pusher, x, y, z);
-            return;
-        }
-
-        /**********************************************
-         * Custom portion of the code:
-         * Handle collisions with weight in mind. Use
-         * the weight value of pokemon to determine
-         * which side gets what portion of the total
-         * force.
-         *********************************************/
-        // Weights in hectograms
-        // Check to see if the pusher or pushee is a player. 200ish pounds. Steve's like a 6'6 miner
-        var pusherWeight = pusher instanceof PokemonEntity pusherPokemon ? pusherPokemon.getPokemon().getSpecies().getWeight() : 900F;
-        var pusheeWeight = pushee instanceof PokemonEntity pusheePokemon ? pusheePokemon.getPokemon().getSpecies().getWeight() : 900F;
-
-        // Calculate the portion of force received for both entities. Bigger receives less from the
-        // collision than the smaller one.
-        var totalWeight = pusherWeight + pusheeWeight;
-        var pusherReceivedForce = pusheeWeight / totalWeight * 2F;
-        pusheeReceivedForce.set((pusherWeight / totalWeight) * 2F);
-
-        original.call(pusher, -d * pusherReceivedForce, 0.0, -e * pusherReceivedForce);
-    }
-
-    @WrapOperation(
-            method = "push(Lnet/minecraft/world/entity/Entity;)V",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;push(DDD)V", ordinal = 1)
-    )
-    public void cobblemon$customPusheeLogic(Entity pusher, double x, double y, double z, Operation<Void> original,
-                                            @Local(name = "e") double e, @Local(name = "d") double d,
-                                            @Share("pusherIsPlayerOrPokemon") LocalBooleanRef pusherIsPlayerOrPokemon,
-                                            @Share("pusheeIsPlayerOrPokemon") LocalBooleanRef pusheeIsPlayerOrPokemon,
-                                            @Share("pusheeReceivedForce")LocalFloatRef pusheeReceivedForce) {
-        if (!pusheeIsPlayerOrPokemon.get() || !pusherIsPlayerOrPokemon.get()) {
-            original.call(pusher, x, y, z);
-            return;
-        }
-
-        original.call(pusher, d * pusheeReceivedForce.get(), 0.0, e * pusheeReceivedForce.get());
-    }
 }

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

@@ -65,14 +65,10 @@ import com.cobblemon.mod.common.api.storage.player.adapter.PlayerDataMongoBacken
 import com.cobblemon.mod.common.api.storage.player.factory.CachedPlayerDataStoreFactory
 import com.cobblemon.mod.common.api.tags.CobblemonEntityTypeTags
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
-import com.cobblemon.mod.common.battles.BagItems
-import com.cobblemon.mod.common.battles.BattleFormat
-import com.cobblemon.mod.common.battles.BattleRegistry
-import com.cobblemon.mod.common.battles.BattleSide
-import com.cobblemon.mod.common.battles.ShowdownThread
+import com.cobblemon.mod.common.battles.*
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
-import com.cobblemon.mod.common.block.dispenser.DispenserBehaviorRegistry
+import com.cobblemon.mod.common.block.DispenserBehaviorRegistry
 import com.cobblemon.mod.common.client.CobblemonPack
 import com.cobblemon.mod.common.command.argument.*
 import com.cobblemon.mod.common.config.CobblemonConfig
@@ -80,12 +76,7 @@ import com.cobblemon.mod.common.config.LastChangedVersion
 import com.cobblemon.mod.common.config.constraint.IntConstraint
 import com.cobblemon.mod.common.config.starter.StarterConfig
 import com.cobblemon.mod.common.data.CobblemonDataProvider
-import com.cobblemon.mod.common.events.AdvancementHandler
-import com.cobblemon.mod.common.events.CallbackHandler
-import com.cobblemon.mod.common.events.EntityCallbackHandler
-import com.cobblemon.mod.common.events.PokedexHandler
-import com.cobblemon.mod.common.events.ServerTickHandler
-import com.cobblemon.mod.common.events.StatHandler
+import com.cobblemon.mod.common.events.*
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
 import com.cobblemon.mod.common.permission.LaxPermissionValidator
 import com.cobblemon.mod.common.platform.events.PlatformEvents
@@ -99,23 +90,11 @@ import com.cobblemon.mod.common.pokemon.feature.SlowpokeTailRegrowthSpeciesFeatu
 import com.cobblemon.mod.common.pokemon.feature.SlowpokeTailRegrowthSpeciesFeatureProvider
 import com.cobblemon.mod.common.pokemon.feature.TagSeasonResolver
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
-import com.cobblemon.mod.common.pokemon.properties.AspectPropertyType
-import com.cobblemon.mod.common.pokemon.properties.BattleCloneProperty
-import com.cobblemon.mod.common.pokemon.properties.FreezeFrameProperty
-import com.cobblemon.mod.common.pokemon.properties.HiddenAbilityPropertyType
+import com.cobblemon.mod.common.pokemon.properties.*
 import com.cobblemon.mod.common.pokemon.properties.LabelProperty
-import com.cobblemon.mod.common.pokemon.properties.NoAIProperty
-import com.cobblemon.mod.common.pokemon.properties.UnaspectPropertyType
-import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
-import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.ifDedicatedServer
-import com.cobblemon.mod.common.util.isLaterVersion
-import com.cobblemon.mod.common.util.party
-import com.cobblemon.mod.common.util.requestWallpapers
-import com.cobblemon.mod.common.util.server
+import com.cobblemon.mod.common.util.*
 import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
 import com.cobblemon.mod.common.world.feature.ore.CobblemonOrePlacedFeatures
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
@@ -123,17 +102,6 @@ import com.mongodb.ConnectionString
 import com.mongodb.MongoClientSettings
 import com.mongodb.client.MongoClient
 import com.mongodb.client.MongoClients
-import java.io.File
-import java.io.FileReader
-import java.io.FileWriter
-import java.io.PrintWriter
-import java.util.UUID
-import java.util.concurrent.TimeUnit
-import kotlin.math.roundToInt
-import kotlin.properties.Delegates
-import kotlin.reflect.full.memberProperties
-import kotlin.reflect.jvm.isAccessible
-import kotlin.reflect.jvm.javaField
 import net.minecraft.client.Minecraft
 import net.minecraft.commands.synchronization.SingletonArgumentInfo
 import net.minecraft.resources.ResourceKey
@@ -146,6 +114,17 @@ import net.minecraft.world.level.Level
 import net.minecraft.world.level.storage.LevelResource
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
+import java.io.File
+import java.io.FileReader
+import java.io.FileWriter
+import java.io.PrintWriter
+import java.util.*
+import java.util.concurrent.TimeUnit
+import kotlin.math.roundToInt
+import kotlin.properties.Delegates
+import kotlin.reflect.full.memberProperties
+import kotlin.reflect.jvm.isAccessible
+import kotlin.reflect.jvm.javaField
 
 object Cobblemon {
     const val MODID = CobblemonBuildDetails.MOD_ID
@@ -186,7 +165,7 @@ object Cobblemon {
     val statistics: CobblemonStats = CobblemonStats
 
     @JvmStatic
-    val builtinPacks = listOf(
+    val builtinPacks = listOf<CobblemonPack>(
         CobblemonPack(id = "adorncompatibility", name = "Adorn Compatibility", packType = PackType.CLIENT_RESOURCES, activationBehaviour = ResourcePackActivationBehaviour.ALWAYS_ENABLED, neededMods = setOf("adorn")),
         CobblemonPack(id = "gyaradosjump", name = "Gyarados Jump Patterns", packType = PackType.CLIENT_RESOURCES, activationBehaviour = ResourcePackActivationBehaviour.DEFAULT_ENABLED),
         CobblemonPack(id = "regionbiasforms", name = "Region Bias Forms", packType = PackType.CLIENT_RESOURCES, activationBehaviour = ResourcePackActivationBehaviour.DEFAULT_ENABLED),
@@ -472,7 +451,7 @@ object Cobblemon {
             server()?.getLevel(dimension)
         } else {
             val mc = Minecraft.getInstance()
-            mc.singleplayerServer?.getLevel(dimension) ?: mc.level
+            return mc.singleplayerServer?.getLevel(dimension) ?: mc.level
         }
     }
 

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

@@ -28,8 +28,6 @@ object CobblemonActivities {
     @JvmField
     val POKEMON_HERD = register(Activity("pokemon_herd"))
     @JvmField
-    val POKEMON_BOIDS = register(Activity("pokemon_boid"))
-    @JvmField
     val POKEMON_POLLINATION = register(Activity("pokemon_pollination"))
 
     @JvmStatic

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

@@ -21,7 +21,6 @@ import net.minecraft.core.UUIDUtil
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import java.util.*
-import net.minecraft.world.entity.player.Player
 
 object CobblemonMemories {
     val memories = mutableMapOf<String, MemoryModuleType<*>>()
@@ -93,9 +92,6 @@ object CobblemonMemories {
     val DISABLE_WALK_TO_WANTED_ITEM = register<Boolean>("disable_walk_to_wanted_item")
     @JvmField
     val TIME_TRYING_TO_REACH_WANTED_ITEM = register<Int>("time_trying_to_wanted_item")
-    /** Is the nearest player holding a diamond for debugging purposes? */
-    @JvmField
-    val DIAMOND_DEBUGGER = register<Player>("diamond_debugger")
 
     @JvmStatic
     fun <U> register(id: String, codec: Codec<U>): MemoryModuleType<U> {

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

@@ -21,16 +21,12 @@ import com.cobblemon.mod.common.client.net.callback.partymove.OpenPartyMoveCallb
 import com.cobblemon.mod.common.client.net.cooking.ToggleCookingPotLidHandler
 import com.cobblemon.mod.common.client.net.data.CobblemonMechanicsSyncHandler
 import com.cobblemon.mod.common.client.net.data.DataRegistrySyncPacketHandler
+import com.cobblemon.mod.common.client.net.data.PokemonInteractionsSyncHandler
 import com.cobblemon.mod.common.client.net.data.RideSettingsSyncHandler
 import com.cobblemon.mod.common.client.net.debug.OpenRidingStatsDebugGUIHandler
-import com.cobblemon.mod.common.client.net.debug.S2CUpdateObsAvoidHandler
 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
-import com.cobblemon.mod.common.client.net.effect.RunPosableMoLangHandler
-import com.cobblemon.mod.common.client.net.effect.SaccharineLogBlockParticlesHandler
-import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormEntityParticleHandler
-import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormParticleHandler
+import com.cobblemon.mod.common.client.net.effect.*
 import com.cobblemon.mod.common.client.net.gui.ExpGainedDataPacketHandler
 import com.cobblemon.mod.common.client.net.gui.InteractPokemonUIPacketHandler
 import com.cobblemon.mod.common.client.net.gui.PokedexUIPacketHandler
@@ -38,11 +34,7 @@ import com.cobblemon.mod.common.client.net.gui.SummaryUIPacketHandler
 import com.cobblemon.mod.common.client.net.npc.CloseNPCEditorHandler
 import com.cobblemon.mod.common.client.net.npc.OpenNPCEditorHandler
 import com.cobblemon.mod.common.client.net.orientation.ClientboundUpdateOrientationHandler
-import com.cobblemon.mod.common.client.net.pasture.ClosePastureHandler
-import com.cobblemon.mod.common.client.net.pasture.OpenPastureHandler
-import com.cobblemon.mod.common.client.net.pasture.PokemonPasturedHandler
-import com.cobblemon.mod.common.client.net.pasture.PokemonUnpasturedHandler
-import com.cobblemon.mod.common.client.net.pasture.UpdatePastureConflictFlagHandler
+import com.cobblemon.mod.common.client.net.pasture.*
 import com.cobblemon.mod.common.client.net.pokedex.ServerConfirmedRegisterHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.ClientboundUpdateRidingStateHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.PokemonUpdatePacketHandler
@@ -60,14 +52,7 @@ import com.cobblemon.mod.common.client.net.storage.party.SetPartyPokemonHandler
 import com.cobblemon.mod.common.client.net.storage.party.SetPartyReferenceHandler
 import com.cobblemon.mod.common.client.net.storage.pc.*
 import com.cobblemon.mod.common.client.net.toast.ToastPacketHandler
-import com.cobblemon.mod.common.client.net.trade.TradeAcceptanceChangedHandler
-import com.cobblemon.mod.common.client.net.trade.TradeCancelledHandler
-import com.cobblemon.mod.common.client.net.trade.TradeCompletedHandler
-import com.cobblemon.mod.common.client.net.trade.TradeOfferExpiredHandler
-import com.cobblemon.mod.common.client.net.trade.TradeOfferNotificationHandler
-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.client.net.trade.*
 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
@@ -81,24 +66,15 @@ import com.cobblemon.mod.common.net.messages.client.callback.OpenPartyMoveCallba
 import com.cobblemon.mod.common.net.messages.client.cooking.SeasoningRegistrySyncPacket
 import com.cobblemon.mod.common.net.messages.client.cooking.ToggleCookingPotLidPacket
 import com.cobblemon.mod.common.net.messages.client.data.*
-import com.cobblemon.mod.common.net.messages.client.debug.ClientboundUpdateObsAvoidPacket
 import com.cobblemon.mod.common.net.messages.client.debug.RequestOpenRidingStatsDebugGUIPacket
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueClosedPacket
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueOpenedPacket
-import com.cobblemon.mod.common.net.messages.client.effect.PokeSnackBlockParticlesPacket
-import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
-import com.cobblemon.mod.common.net.messages.client.effect.SaccharineLogBlockParticlesPacket
-import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
-import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormParticlePacket
+import com.cobblemon.mod.common.net.messages.client.effect.*
 import com.cobblemon.mod.common.net.messages.client.npc.CloseNPCEditorPacket
 import com.cobblemon.mod.common.net.messages.client.npc.OpenNPCEditorPacket
 import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateDriverInputPacket
 import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateOrientationPacket
-import com.cobblemon.mod.common.net.messages.client.pasture.ClosePasturePacket
-import com.cobblemon.mod.common.net.messages.client.pasture.OpenPasturePacket
-import com.cobblemon.mod.common.net.messages.client.pasture.PokemonPasturedPacket
-import com.cobblemon.mod.common.net.messages.client.pasture.PokemonUnpasturedPacket
-import com.cobblemon.mod.common.net.messages.client.pasture.UpdatePastureConflictFlagPacket
+import com.cobblemon.mod.common.net.messages.client.pasture.*
 import com.cobblemon.mod.common.net.messages.client.pokedex.ServerConfirmedRegisterPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.*
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.AddEvolutionPacket
@@ -118,37 +94,19 @@ import com.cobblemon.mod.common.net.messages.client.storage.party.InitializePart
 import com.cobblemon.mod.common.net.messages.client.storage.party.MoveClientPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyReferencePacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.ClosePCPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.InitializePCPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.MoveClientPCPokemonPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.OpenPCPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.RenamePCBoxPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCBoxPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.*
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.ChangePCBoxWallpaperPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.RequestPCBoxWallpapersPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.SetPCBoxWallpapersPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.UnlockPCBoxWallpaperPacket
 import com.cobblemon.mod.common.net.messages.client.toast.ToastPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeAcceptanceChangedPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeCancelledPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeCompletedPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferExpiredPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferNotificationPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeProcessStartedPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeStartedPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeUpdatedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.*
 import com.cobblemon.mod.common.net.messages.client.ui.ExpGainedDataPacket
 import com.cobblemon.mod.common.net.messages.client.ui.InteractPokemonUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.PokedexUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
 import com.cobblemon.mod.common.net.messages.server.*
-import com.cobblemon.mod.common.net.messages.server.battle.BattleSelectActionsPacket
-import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamLeavePacket
-import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamRequestPacket
-import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamResponsePacket
-import com.cobblemon.mod.common.net.messages.server.battle.RemoveSpectatorPacket
-import com.cobblemon.mod.common.net.messages.server.battle.SpectateBattlePacket
+import com.cobblemon.mod.common.net.messages.server.battle.*
 import com.cobblemon.mod.common.net.messages.server.behaviour.DamageOnCollisionPacket
 import com.cobblemon.mod.common.net.messages.server.behaviour.SetEntityBehaviourPacket
 import com.cobblemon.mod.common.net.messages.server.block.AdjustBlockEntityViewerCountPacket
@@ -173,11 +131,7 @@ 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.*
 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
@@ -185,25 +139,14 @@ import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateRide
 import com.cobblemon.mod.common.net.messages.server.starter.RequestStarterScreenPacket
 import com.cobblemon.mod.common.net.messages.server.storage.SwapPCPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.MovePartyPokemonPacket
-import com.cobblemon.mod.common.net.messages.server.storage.party.PartyTutorialPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.ReleasePartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.SwapPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.pc.*
-import com.cobblemon.mod.common.net.messages.server.trade.AcceptTradeRequestPacket
-import com.cobblemon.mod.common.net.messages.server.trade.CancelTradePacket
-import com.cobblemon.mod.common.net.messages.server.trade.ChangeTradeAcceptancePacket
-import com.cobblemon.mod.common.net.messages.server.trade.OfferTradePacket
-import com.cobblemon.mod.common.net.messages.server.trade.PerformTradePacket
-import com.cobblemon.mod.common.net.messages.server.trade.UpdateTradeOfferPacket
+import com.cobblemon.mod.common.net.messages.server.trade.*
 import com.cobblemon.mod.common.net.serverhandling.ChallengeHandler
 import com.cobblemon.mod.common.net.serverhandling.ChallengeResponseHandler
 import com.cobblemon.mod.common.net.serverhandling.RequestInteractionsHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.BattleSelectActionsHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.RemoveSpectatorHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.SpectateBattleHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.TeamLeaveHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestResponseHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.*
 import com.cobblemon.mod.common.net.serverhandling.behaviour.DamageOnCollisionPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.behaviour.SetEntityBehaviourHandler
 import com.cobblemon.mod.common.net.serverhandling.block.AdjustBlockEntityViewerCountHandler
@@ -222,7 +165,6 @@ import com.cobblemon.mod.common.net.serverhandling.dialogue.InputToDialogueHandl
 import com.cobblemon.mod.common.net.serverhandling.evolution.AcceptEvolutionHandler
 import com.cobblemon.mod.common.net.serverhandling.npc.SaveNPCHandler
 import com.cobblemon.mod.common.net.serverhandling.orientation.ServerboundUpdateOrientationHandler
-import com.cobblemon.mod.common.net.serverhandling.storage.party.PartyTutorialPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.pasture.PasturePokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.pasture.SetPastureConflictHandler
 import com.cobblemon.mod.common.net.serverhandling.pasture.UnpastureAllPokemonHandler
@@ -230,11 +172,7 @@ 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.*
 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.riding.ServerboundUpdateRiderRotationHandler
@@ -248,18 +186,9 @@ import com.cobblemon.mod.common.net.serverhandling.storage.party.MovePartyPokemo
 import com.cobblemon.mod.common.net.serverhandling.storage.party.ReleasePCPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.party.SwapPartyPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.pc.*
-import com.cobblemon.mod.common.net.serverhandling.trade.AcceptTradeRequestHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.CancelTradeHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.ChangeTradeAcceptanceHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.OfferTradeHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.PerformTradeHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.UpdateTradeOfferHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.*
 import com.cobblemon.mod.common.util.server
-import net.minecraft.server.level.ServerLevel
 import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.entity.Entity
-import com.cobblemon.mod.common.mixin.accessor.ChunkMapAccessor
-import com.cobblemon.mod.common.mixin.accessor.TrackedEntityAccessor
 
 /**
  * Registers Cobblemon network packets.
@@ -282,19 +211,6 @@ object CobblemonNetwork {
     fun sendToAllPlayers(packet: NetworkPacket<*>) = sendPacketToPlayers(server()!!.playerList.players, packet)
     @JvmStatic
     fun sendPacketToPlayers(players: Iterable<ServerPlayer>, packet: NetworkPacket<*>) = players.forEach { sendPacketToPlayer(it, packet) }
-    fun sendPacketToTrackingPlayers(entity: Entity, packet: NetworkPacket<*>) {
-        val level = entity.level() as? ServerLevel ?: return
-
-        val chunkMap = level.chunkSource.chunkMap
-        val entityTracker = (chunkMap as ChunkMapAccessor).entityMap[entity.id]
-
-        if (entityTracker is TrackedEntityAccessor) {
-            entityTracker.seenBy.forEach { connection ->
-                sendPacketToPlayer(connection.player, packet)
-            }
-        }
-    }
-
 
     val s2cPayloads = generateS2CPacketInfoList()
     val c2sPayloads = generateC2SPacketInfoList()
@@ -416,7 +332,7 @@ object CobblemonNetwork {
         // Data registries
         list.add(PacketRegisterInfo(AbilityRegistrySyncPacket.ID, AbilityRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(CobblemonMechanicsSyncPacket.ID, CobblemonMechanicsSyncPacket::decode, CobblemonMechanicsSyncHandler))
-        list.add(PacketRegisterInfo(PokemonInteractionsSyncPacket.ID, PokemonInteractionsSyncPacket::decode, DataRegistrySyncPacketHandler()))
+        list.add(PacketRegisterInfo(PokemonInteractionsSyncPacket.ID, PokemonInteractionsSyncPacket::decode, PokemonInteractionsSyncHandler))
         list.add(PacketRegisterInfo(MovesRegistrySyncPacket.ID, MovesRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(BerryRegistrySyncPacket.ID, BerryRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(SpeciesRegistrySyncPacket.ID, SpeciesRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
@@ -502,7 +418,6 @@ object CobblemonNetwork {
 
         // Debug / cheats
         list.add(PacketRegisterInfo(CalculateSeatPositionsPacket.ID, CalculateSeatPositionsPacket::decode, CalculateSeatPositionsHandler))
-        list.add(PacketRegisterInfo(ClientboundUpdateObsAvoidPacket.ID, ClientboundUpdateObsAvoidPacket::decode, S2CUpdateObsAvoidHandler))
 
         // Riding
         list.add(PacketRegisterInfo(ClientboundUpdateRidingStatePacket.ID, ClientboundUpdateRidingStatePacket::decode, ClientboundUpdateRidingStateHandler))
@@ -545,7 +460,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(ReleasePCPokemonPacket.ID, ReleasePCPokemonPacket::decode, ReleasePCPokemonHandler))
         list.add(PacketRegisterInfo(UnlinkPlayerFromPCPacket.ID, UnlinkPlayerFromPCPacket::decode, UnlinkPlayerFromPCHandler))
 
-        list.add(PacketRegisterInfo(RequestRenamePCBoxPacket.ID, RequestRenamePCBoxPacket::decode, RequestRenamePCBoxHandler))
+        list.add(PacketRegisterInfo(RequestRenamePCBoxPacket.Companion.ID, RequestRenamePCBoxPacket.Companion::decode, RequestRenamePCBoxHandler))
         list.add(PacketRegisterInfo(PCBoxWallpapersPacket.ID, PCBoxWallpapersPacket::decode, PCBoxWallpapersHandler))
         list.add(PacketRegisterInfo(RequestChangePCBoxWallpaperPacket.ID, RequestChangePCBoxWallpaperPacket::decode, RequestChangePCBoxWallpaperHandler))
         list.add(PacketRegisterInfo(MarkPCBoxWallpapersSeenPacket.ID, MarkPCBoxWallpapersSeenPacket::decode, MarkPCBoxWallpapersSeenHandler))
@@ -603,9 +518,6 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(PartyPokemonMoveSelectedPacket.ID, PartyPokemonMoveSelectedPacket::decode, PartyPokemonMoveSelectedHandler))
         list.add(PacketRegisterInfo(PartyMoveSelectCancelledPacket.ID, PartyMoveSelectCancelledPacket::decode, PartyMoveSelectCancelledHandler))
 
-        //Party move tutorial toasts packets
-        list.add(PacketRegisterInfo(PartyTutorialPacket.ID, PartyTutorialPacket::decode, PartyTutorialPacketHandler))
-
         // Dialogue packets
         list.add(PacketRegisterInfo(EscapeDialoguePacket.ID, EscapeDialoguePacket::decode, EscapeDialogueHandler))
         list.add(PacketRegisterInfo(InputToDialoguePacket.ID, InputToDialoguePacket::decode, InputToDialogueHandler))

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

@@ -49,9 +49,6 @@ object CobblemonSensors {
     @JvmField
     val NEARBY_SWEET_BERRY_BUSH = register("nearby_sweet_berry_bush", ::SweetBerryBushSensor)
 
-    @JvmField
-    val PLAYER_DEBUGGING = register("player_debugging", ::PlayerDebuggingSensor)
-
     @JvmField
     val POKEMON_NEARBY_WANTED_ITEM = register("pokemon_nearby_wanted_item", ::PokemonItemSensor)
 

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/BoidsTaskConfig.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.api.ai.config.task
-
-import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.CobblemonSensors
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.tasks.WakeUpTask
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-
-class BoidsTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) = emptyList<MoLangConfigVariable>()
-    override fun createTask(
-        entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        if (entity !is PokemonEntity) {
-            return null
-        }
-        behaviourConfigurationContext.addMemories(CobblemonMemories.POKEMON_DROWSY, CobblemonMemories.POKEMON_SLEEPING)
-        behaviourConfigurationContext.addSensors(CobblemonSensors.POKEMON_DROWSY)
-        return WrapperLivingEntityTask(WakeUpTask.create(), PokemonEntity::class.java)
-    }
-}

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

@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.BoidsMoveControl
-import com.cobblemon.mod.common.entity.pokemon.ai.PokemonMoveControl
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
-import net.minecraft.world.entity.ai.behavior.declarative.Trigger
-
-class SwitchFromBoidTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) = emptyList<MoLangConfigVariable>()
-    override fun createTask(
-        entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        behaviourConfigurationContext.addMemories(CobblemonMemories.DIAMOND_DEBUGGER)
-        return BehaviorBuilder.create {
-            it.group(
-                it.absent(CobblemonMemories.DIAMOND_DEBUGGER)
-            ).apply(it) { _ ->
-                Trigger { world, entity, time ->
-                    if(entity !is PokemonEntity) return@Trigger false
-                    if (entity.moveControl !is PokemonMoveControl) {
-                        entity.moveControl = PokemonMoveControl(entity)
-                    }
-                    entity.brain.updateActivityFromSchedule(world.dayTime, world.gameTime)
-                    return@Trigger true
-                }
-            }
-        }
-    }
-}

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

@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.ai.config.task
-
-import com.cobblemon.mod.common.CobblemonActivities
-import com.cobblemon.mod.common.CobblemonMemories
-import com.cobblemon.mod.common.CobblemonSensors
-import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
-import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.BoidsMoveControl
-import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
-import net.minecraft.world.entity.ai.behavior.declarative.Trigger
-import net.minecraft.world.entity.player.Player
-
-class SwitchToBoidTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) = emptyList<MoLangConfigVariable>()
-    override fun createTask(
-        entity: LivingEntity,
-        behaviourConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        behaviourConfigurationContext.addMemories(CobblemonMemories.DIAMOND_DEBUGGER)
-        behaviourConfigurationContext.addSensors(CobblemonSensors.PLAYER_DEBUGGING)
-        return BehaviorBuilder.create {
-            it.group(
-                it.present(CobblemonMemories.DIAMOND_DEBUGGER)
-            ).apply(it) { _ ->
-                Trigger { world, entity, time ->
-                    if(entity !is PokemonEntity) return@Trigger false
-                    val player = entity.brain.getMemory(CobblemonMemories.DIAMOND_DEBUGGER).orElse(null)
-                    if (entity.moveControl !is BoidsMoveControl && player is LivingEntity) {
-                        entity.moveControl = BoidsMoveControl(entity, player)
-                    } else {
-                        return@Trigger false
-                    }
-                    entity.brain.setActiveActivityIfPossible(CobblemonActivities.POKEMON_BOIDS)
-//                    SpawnSnowstormEntityParticlePacket(
-//                        cobblemonResource("evo_particles"),
-//                        entity.id,
-//                        listOf("shiny_particles", "middle")).sendToPlayersAround(
-//                        entity.x,
-//                        entity.y,
-//                        entity.z,
-//                        64.0,
-//                        entity.level().dimension()
-//                        )
-                    return@Trigger true
-                }
-            }
-        }
-    }
-}

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

@@ -124,8 +124,6 @@ interface TaskConfig {
             cobblemonResource("target_entity") to TargetEntityTaskConfig::class.java,
             cobblemonResource("memory_aspect") to MemoryAspectTaskConfig::class.java,
             cobblemonResource("activity_change") to ActivityChangeTaskConfig::class.java,
-            cobblemonResource("switch_from_boid") to SwitchFromBoidTaskConfig::class.java,
-            cobblemonResource("switch_to_boid") to SwitchToBoidTaskConfig::class.java,
         )
     }
 

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

@@ -17,7 +17,6 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangV
 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.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.mainThreadRuntime
 import com.cobblemon.mod.common.util.resolveFloat
@@ -185,12 +184,6 @@ class WanderTaskConfig : SingleTaskConfig {
 
                         if (targetVec == null) continue
 
-                        // Ignore pathing targets outside of the pasture zone if the pokemon is pastured.
-                        val tethering = (entity as? PokemonEntity)?.tethering
-                        if (tethering?.canRoamTo(BlockPos.containing(targetVec)) == false) {
-                            continue
-                        }
-
                         pos = applyHeightConstraints(
                             pos = BlockPos.containing(targetVec),
                             minimumHeight = minimumHeight,

common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/PokemonBattle.kt

@@ -22,21 +22,18 @@ import com.cobblemon.mod.common.api.battles.model.actor.EntityBackedBattleActor
 import com.cobblemon.mod.common.api.battles.model.actor.FleeableBattleActor
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.battles.BattleFledEvent
-import com.cobblemon.mod.common.api.events.battles.BattleFleeAttemptEvent
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.api.pokemon.stats.BattleEvSource
 import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.api.text.red
-import com.cobblemon.mod.common.api.text.white
 import com.cobblemon.mod.common.api.text.yellow
 import com.cobblemon.mod.common.battles.ActiveBattlePokemon
 import com.cobblemon.mod.common.battles.BattleCaptureAction
 import com.cobblemon.mod.common.battles.BattleFormat
 import com.cobblemon.mod.common.battles.BattleRegistry
 import com.cobblemon.mod.common.battles.BattleSide
-import com.cobblemon.mod.common.battles.FleeAttemptActionResponse
 import com.cobblemon.mod.common.battles.ForfeitActionResponse
 import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
 import com.cobblemon.mod.common.battles.dispatch.BattleDispatch
@@ -51,9 +48,7 @@ import com.cobblemon.mod.common.entity.npc.NPCBattleActor
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.client.battle.BattleEndPacket
-import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMessagePacket
-import com.cobblemon.mod.common.net.messages.client.battle.BattleQueueRequestPacket
 import com.cobblemon.mod.common.pokemon.evolution.progress.DefeatEvolutionProgress
 import com.cobblemon.mod.common.pokemon.evolution.progress.LastBattleCriticalHitsEvolutionProgress
 import com.cobblemon.mod.common.pokemon.requirements.DefeatRequirement
@@ -142,9 +137,6 @@ open class PokemonBattle(
     val captureActions = mutableListOf<BattleCaptureAction>()
 
     val majorBattleActions = hashMapOf<UUID, BattleMessage>()
-
-    /** Monotonically increasing counter to track faint ordering within this battle. */
-    var faintCounter = 0
     val minorBattleActions = hashMapOf<UUID, BattleMessage>()
     val contextManager = ContextManager()
 
@@ -252,23 +244,12 @@ open class PokemonBattle(
 
     fun end() {
         ended = true
-        val awardToFainted = Cobblemon.config.awardExperienceToFaintedPokemon
-        val awardOnLoss = Cobblemon.config.awardExperienceOnBattleLoss
         this.actors.forEach { actor ->
             val faintedPokemons = actor.pokemonList.filter { it.health <= 0 }
             actor.getSide().getOppositeSide().actors.forEach { opponent ->
-                val opponentPokemons = if (awardToFainted) opponent.pokemonList else opponent.pokemonList.filter { it.health > 0 }
+                val opponentNonFaintedPokemons = opponent.pokemonList.filter { it.health > 0 }
                 faintedPokemons.forEach { faintedPokemon ->
-                    for (opponentPokemon in opponentPokemons) {
-                        // Faint-order check: if awarding XP to fainted pokemon, only award for enemies that fainted before this pokemon did
-                        if (awardToFainted) {
-                            val enemyFaintedAt = faintedPokemon.faintedAt ?: continue
-                            val opponentFaintedAt = opponentPokemon.faintedAt
-                            if (opponentFaintedAt != null && opponentFaintedAt <= enemyFaintedAt) {
-                                continue
-                            }
-                        }
-
+                    for (opponentPokemon in opponentNonFaintedPokemons) {
                         val facedFainted = opponentPokemon.facedOpponents.contains(faintedPokemon)
                         val pokemon = opponentPokemon.effectedPokemon
                         if (facedFainted) {
@@ -289,8 +270,7 @@ open class PokemonBattle(
                             else -> continue
                         }
                         val experience = Cobblemon.experienceCalculator.calculate(opponentPokemon, faintedPokemon, multiplier)
-                        val enemyTeamWiped = actor.pokemonList.all { it.health <= 0 }
-                        if (experience > 0 && (enemyTeamWiped || awardOnLoss)) {
+                        if (experience > 0 && actor.pokemonList.all { it.health <= 0 }) {
                             opponent.awardExperience(opponentPokemon, experience)
                         }
                         Cobblemon.evYieldCalculator.calculate(opponentPokemon, faintedPokemon).forEach { (stat, amount) ->
@@ -519,13 +499,12 @@ open class PokemonBattle(
     }
 
     fun stop() {
-        writeShowdownAction(">forcetie") // This will terminate the Showdown connection
         end()
+        writeShowdownAction(">forcetie") // This will terminate the Showdown connection
     }
 
     fun checkForInputDispatch() {
         if (checkForfeit()) return  // ignore actors that are still choosing, their choices don't matter anymore
-        if (checkFleeAttempt()) return
         val readyToInput = (actors.any { !it.mustChoose && it.responses.isNotEmpty() } && actors.none { it.mustChoose })
         if (readyToInput && captureActions.isEmpty()) {
             actors.filter { it.responses.isNotEmpty() }.forEach { it.writeShowdownResponse() }
@@ -533,20 +512,6 @@ open class PokemonBattle(
         }
     }
 
-    private fun checkFleeAttempt(): Boolean {
-        val runner = actors.find { it.responses.any { it is FleeAttemptActionResponse }  } as? PlayerBattleActor ?: return false
-        CobblemonEvents.BATTLE_FLEE_ATTEMPT.post(BattleFleeAttemptEvent(this, runner))
-        runner.responses.clear()
-
-        runner.mustChoose = true
-        runner.request?.let { runner.sendUpdate(BattleQueueRequestPacket(it)) }
-        runner.sendUpdate(BattleMakeChoicePacket())
-
-        runner.entity?.sendSystemMessage(battleLang("run_prompt").white())
-
-        return true
-    }
-
     /** Forces Showdown to end the battle when a [BattleActor] chooses to forfeit. */
     private fun checkForfeit(): Boolean {
         val forfeit = actors.find { it.responses.any { it is ForfeitActionResponse } }

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

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.events
 
 import com.cobblemon.mod.common.api.events.battles.BattleFaintedEvent
 import com.cobblemon.mod.common.api.events.battles.BattleFledEvent
-import com.cobblemon.mod.common.api.events.battles.BattleFleeAttemptEvent
 import com.cobblemon.mod.common.api.events.battles.BattleStartedEvent
 import com.cobblemon.mod.common.api.events.battles.BattleVictoryEvent
 import com.cobblemon.mod.common.api.events.battles.instruction.FormeChangeEvent
@@ -111,9 +110,6 @@ object CobblemonEvents {
     @JvmField
     val BATTLE_STARTED_POST = EventObservable<BattleStartedEvent.Post>()
 
-    @JvmField
-    val BATTLE_FLEE_ATTEMPT = EventObservable<BattleFleeAttemptEvent>()
-
     @JvmField
     val BATTLE_FLED = EventObservable<BattleFledEvent>()
 

common/src/main/kotlin/com/cobblemon/mod/common/api/events/battles/BattleFleeAttemptEvent.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.api.events.battles
-
-import com.bedrockk.molang.runtime.value.MoValue
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.battles.model.actor.ActorType
-import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
-import com.cobblemon.mod.common.util.asArrayValue
-
-/**
- * Event fired when a [PokemonBattle] is fled by a [PlayerBattleActor].
- *
- * @author saultsc
- * @since March 31th 2026
- */
-
-data class BattleFleeAttemptEvent(
-  override val battle: PokemonBattle,
-  val player: PlayerBattleActor
-) : BattleEvent {
-  val context = mutableMapOf<String, MoValue>(
-    "battle" to battle.struct,
-    "players" to battle.actors.filter { it.type == ActorType.PLAYER }.asArrayValue { it.struct },
-    "npcs" to battle.actors.filter { it.type == ActorType.NPC }.asArrayValue { it.struct },
-    "wild_pokemon" to battle.actors.filter { it.type == ActorType.WILD }.asArrayValue { it.struct }
-  )
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/interaction/PokemonInteractions.kt

@@ -59,32 +59,40 @@ object PokemonInteractions : JsonDataRegistry<PokemonInteractionSet> {
         .setPrettyPrinting()
         .create()
 
-    val interactions = mutableListOf<PokemonInteractionSet>()
+    val speciesInteractions = mutableListOf<PokemonInteractionSet>()
+    val generalInteractions = mutableListOf<PokemonInteractionSet>()
 
     override fun sync(player: ServerPlayer) {
-        PokemonInteractionsSyncPacket(interactions).sendToPlayer(player)
+        PokemonInteractionsSyncPacket(
+            speciesInteractions,
+            generalInteractions,
+        ).sendToPlayer(player)
     }
 
     override fun reload(data: Map<ResourceLocation, PokemonInteractionSet>) {
-        interactions.clear()
-        val split = data.entries
-            .partition {
-                it.value.requirements.any { requirement -> requirement is PokemonPropertiesRequirement && requirement.target.species != null }
-            }
-
-        // Put the species specific interactions first as they take priority
-        interactions.addAll(split.first.map {it.value})
-        interactions.addAll(split.second.map {it.value})
-
-        Cobblemon.LOGGER.info("Loaded {} Pokémon interaction sets", interactions.size)
+        speciesInteractions.clear()
+        generalInteractions.clear()
+        val split = data.entries.partition { it.value.requirements.any { requirement -> requirement is PokemonPropertiesRequirement && requirement.target.species != null } }
+        speciesInteractions.addAll(split.first.map {it.value})
+        generalInteractions.addAll(split.second.map {it.value})
+        Cobblemon.LOGGER.info("Loaded {} Pokémon interaction sets", data.size)
     }
 
     fun findInteraction(pokemon: PokemonEntity): PokemonInteraction? {
         val setCheck: (PokemonInteractionSet) -> Boolean = { it.requirements.all { req -> req.check(pokemon.pokemon) }}
         val interactionCheck: (PokemonInteraction) -> Boolean = { it.requirements.all { req -> req.check(pokemon.pokemon) } && !pokemon.pokemon.isOnInteractionCooldown(it.grouping)  }
-        return interactions
+        // species-specific interactions take priority
+        val validInteractions = speciesInteractions
             .filter(setCheck)
             .flatMap { it.interactions }
-            .firstOrNull(interactionCheck)
+            .filter(interactionCheck)
+            .toMutableList()
+        if (validInteractions.isEmpty()) { // if all species-specific interactions are absent/on cooldown, fallback to more generic ones
+            validInteractions.addAll(generalInteractions.filter(setCheck).flatMap { it.interactions }
+                .filter(interactionCheck)
+            )
+        }
+
+        return validInteractions.randomOrNull()
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/interaction/PokemonInteration.kt

@@ -43,9 +43,17 @@ data class PokemonInteractionSet(
 
     companion object {
         fun decode(buffer: FriendlyByteBuf): PokemonInteractionSet {
-            val requirements = buffer.readList(CobblemonRequirementAdapter::decode)
-            val interactions = buffer.readList(PokemonInteraction::decode)
-            return PokemonInteractionSet(requirements, interactions)
+            val requirements = buffer.readList { it ->
+                CobblemonRequirementAdapter.decode(it)
+            }
+            val interactions = buffer.readList { it ->
+                PokemonInteraction.decode(it)
+            }
+
+            return PokemonInteractionSet(
+                requirements,
+                interactions,
+            )
         }
     }
 }

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

@@ -145,7 +145,6 @@ import net.minecraft.world.entity.item.ItemEntity
 import net.minecraft.world.entity.monster.Monster
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.enchantment.EnchantmentHelper
 import net.minecraft.world.level.ClipContext
 import net.minecraft.world.level.GameType
 import net.minecraft.world.level.Level
@@ -369,11 +368,6 @@ object MoLangFunctions {
             val b = format.parse(dateB)
             DoubleValue(a.after(b))
         },
-        "get_move_from_id" to java.util.function.Function { params ->
-            val moveId = params.getString(0)
-            val moveTemplate = Moves.getByName(moveId)
-            return@Function moveTemplate?.struct ?: DoubleValue.ZERO
-        },
         "create_simple_party_provider" to java.util.function.Function { params ->
             val partyProvider = SimplePartyProvider()
             return@Function partyProvider.struct
@@ -384,13 +378,6 @@ object MoLangFunctions {
             val pickupItem = ObtainableItem(item = item, pickupPriority = pickupPriority)
             return@Function pickupItem.struct
         },
-        "create_itemstack" to java.util.function.Function { params ->
-            val itemId = params.getString(0).asIdentifierDefaultingNamespace()
-            val item = BuiltInRegistries.ITEM.get(itemId) ?: return@Function DoubleValue.ZERO
-            val count = params.getIntOrNull(1) ?: 1
-            val itemStack = ItemStack(item, count)
-            return@Function ObjectValue(itemStack)
-        },
         "file" to java.util.function.Function { MoLangLoadedFilesCache.struct }
     )
     val biomeFunctions = mutableListOf<(Holder<Biome>) -> HashMap<String, java.util.function.Function<MoParams, Any>>>()
@@ -596,62 +583,6 @@ object MoLangFunctions {
                 }
                 return@put items
             }
-            map.put("has_inventory_space") { _ ->
-                val inventory = player.inventory
-                return@put if (inventory.getFreeSlot() != -1) DoubleValue.ONE else DoubleValue.ZERO
-            }
-            map.put("set_inventory_slot") { params ->
-                val slot = params.getInt(0)
-                val inventory = player.inventory
-                if (slot !in 0 until inventory.containerSize) return@put DoubleValue.ZERO
-
-                val value = params.getOrNull<MoValue>(1) ?: return@put DoubleValue.ZERO
-
-                val stack: ItemStack? = when (value) {
-                    is ObjectValue<*> -> value.obj as? ItemStack
-                    is StringValue -> {
-                        val id = ResourceLocation.parse(value.value)
-                        val item = player.registryAccess().registryOrThrow(Registries.ITEM).get(id) ?: return@put DoubleValue.ZERO
-                        ItemStack(item)
-                    }
-                    else -> null
-                }
-
-                if (stack == null) return@put DoubleValue.ZERO
-
-                inventory.setItem(slot, stack)
-                return@put DoubleValue.ONE
-            }
-            map.put("give_item") { params ->
-                val inventory = player.inventory
-                val freeSlot = inventory.getFreeSlot()
-                val value = params.getOrNull<MoValue>(0) ?: return@put DoubleValue.ZERO
-                val dropIfFull = params.getBooleanOrNull(1) ?: false
-
-                val stack: ItemStack? = when (value) {
-                    is ObjectValue<*> -> value.obj as? ItemStack
-                    is StringValue -> {
-                        val id = ResourceLocation.parse(value.value)
-                        val item = player.registryAccess().registryOrThrow(Registries.ITEM).get(id) ?: return@put DoubleValue.ZERO
-                        ItemStack(item)
-                    }
-                    else -> null
-                }
-
-                if (stack == null) return@put DoubleValue.ZERO
-
-                if (freeSlot == -1) {
-                    if (dropIfFull) {
-                        player.drop(stack, false)
-                        return@put DoubleValue.ONE
-                    } else {
-                        return@put DoubleValue.ZERO
-                    }
-                }
-
-                inventory.setItem(freeSlot, stack)
-                return@put DoubleValue.ONE
-            }
             map.put("face") { params -> ObjectValue(PlayerDialogueFaceProvider(player.uuid, params.getBooleanOrNull(0) != false)) }
             map.put("swing_hand") { _ -> player.swing(player.usedItemHand) }
             map.put("food_level") { _ -> DoubleValue(player.foodData.foodLevel) }
@@ -695,7 +626,8 @@ object MoLangFunctions {
                 }
                 map.put("active_dialogue") { _ ->
                     if (player.isInDialogue) {
-                        return@put player.activeDialogue?.toMoLangStruct() ?: DoubleValue.ZERO
+                        player.activeDialogue?.dialogueId.toString()
+                        return@put DoubleValue.ONE
                     } else {
                         DoubleValue.ZERO
                     }
@@ -872,8 +804,6 @@ object MoLangFunctions {
 
                     DoubleValue(value)
                 }
-                map.put("get_starter_uuid") { _ -> Cobblemon.playerDataManager.getGenericData(player).starterUUID?.let{ StringValue(it.toString()) } ?: DoubleValue.ZERO }
-                map.put("has_chosen_starter") { _ -> DoubleValue(Cobblemon.playerDataManager.getGenericData(player).starterSelected) }
             }
             map
         }
@@ -894,15 +824,6 @@ object MoLangFunctions {
             map.put("is_of") { params -> DoubleValue(holder.`is`(params.getString(0).asIdentifierDefaultingNamespace())) }
             map.put("is_in") { params -> DoubleValue(holder.`is`(TagKey.create(Registries.ITEM, params.getString(0).replace("#", "").asIdentifierDefaultingNamespace()))) }
             map.put("is_food") { params -> DoubleValue(stack.has(DataComponents.FOOD)) }
-            map.put("is_enchanted") { params -> DoubleValue(stack.hasFoil()) }
-            map.put("has_enchantment") { params ->
-                val enchantmentId = params.getString(0).asIdentifierDefaultingNamespace()
-                val minLevel = params.getIntOrNull(1) ?: 1
-                val enchantmentRegistry = registryAccess.registryOrThrow(Registries.ENCHANTMENT)
-                val holder = enchantmentRegistry.getHolder(enchantmentId).orElse(null) ?: return@put DoubleValue.ZERO
-                val level = EnchantmentHelper.getItemEnchantmentLevel(holder, stack)
-                return@put DoubleValue(level >= minLevel)
-            }
             return@mutableListOf map
         }
     )
@@ -1842,30 +1763,6 @@ object MoLangFunctions {
             map.put("remove_cosmetic_item") { _ ->
                 pokemon.removeCosmeticItem()
             }
-            map.put("marks") { _ -> pokemon.marks.asArrayValue { StringValue(it.identifier.toString()) } }
-            map.put("has_mark") { params ->
-                var hasMark = false
-                val identifier = params.getString(0).asIdentifierDefaultingNamespace()
-                val mark = Marks.getByIdentifier(identifier)
-                if (mark != null) {
-                    hasMark = pokemon.marks.contains(mark)
-                }
-
-                DoubleValue(hasMark)
-            }
-            map.put("remove_marks") { params ->
-                var removedMark = false
-                for (param in params.params) {
-                    val identifier = param.asString().asIdentifierDefaultingNamespace()
-                    val mark = Marks.getByIdentifier(identifier)
-                    if (mark != null) {
-                        pokemon.exchangeMark(mark, false)
-                        removedMark = true
-                    }
-                }
-
-                DoubleValue(removedMark)
-            }
             map.put("add_marks") { params ->
                 var appliedMark = false
                 for (param in params.params) {
@@ -2059,13 +1956,9 @@ object MoLangFunctions {
                 }
             }
             map.put("is_sprinting") {
-                if (pokemonEntity.hasControllingPassenger()) { // If its being ridden then the riding state sets the animation
-                    pokemonEntity.ifRidingAvailableSupply(DoubleValue.ZERO) { behaviour, settings, state ->
-                        val moValue = behaviour.asMoLangValue(settings, state, pokemonEntity)
-                        return@ifRidingAvailableSupply moValue.functions.get("sprinting")?.apply(MoParams.EMPTY) as? MoValue ?: DoubleValue.ZERO
-                    }
-                } else {
-                    pokemonEntity.isPokemonSprinting
+                pokemonEntity.ifRidingAvailableSupply(DoubleValue.ZERO) { behaviour, settings, state ->
+                    val moValue = behaviour.asMoLangValue(settings, state, pokemonEntity)
+                    return@ifRidingAvailableSupply moValue.functions.get("sprinting")?.apply(MoParams.EMPTY) as? MoValue ?: DoubleValue.ZERO
                 }
             }
             map.put("is_drifting") {
@@ -2855,8 +2748,8 @@ object MoLangFunctions {
                 }
                 variable
             }
-            else -> VariableStruct()
-        }
+            else -> null
+        } ?: throw IllegalArgumentException("Invalid NBT element type: ${nbt.type}")
     }
 }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/MoveTemplate.kt

@@ -58,15 +58,12 @@ open class MoveTemplate(
     val struct: MoStruct by lazy {
         QueryStruct(hashMapOf())
             .addFunction("name") { StringValue(name) }
-            .addFunction("display_name") { StringValue(displayName.string) }
-            .addFunction("description") { StringValue(description.string) }
             .addFunction("type") { StringValue(elementalType.showdownId) }
             .addFunction("damage_category") { StringValue(damageCategory.name) }
             .addFunction("power") { DoubleValue(power) }
             .addFunction("target") { StringValue(target.name) }
             .addFunction("accuracy") { DoubleValue(accuracy) }
             .addFunction("pp") { DoubleValue(pp) }
-            .addFunction("max_pp") { DoubleValue(maxPp) }
             .addFunction("priority") { DoubleValue(priority) }
             .addFunction("crit_ratio") { DoubleValue(critRatio) }
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt

@@ -289,11 +289,11 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
         createDefault("ancient_great_ball", MultiplierModifier(1.5F), ancient = true)
         createDefault("ancient_ultra_ball", MultiplierModifier(2F), ancient = true)
         createDefault("ancient_heavy_ball", throwPower = 0.75f, ancient = true)
-        createDefault("ancient_leaden_ball", MultiplierModifier(1.5F), throwPower = 0.75f, ancient = true)
-        createDefault("ancient_gigaton_ball", MultiplierModifier(2F), throwPower = 0.75f, ancient = true)
+        createDefault("ancient_leaden_ball", throwPower = 0.75f, ancient = true)
+        createDefault("ancient_gigaton_ball", throwPower = 0.75f, ancient = true)
         createDefault("ancient_feather_ball", throwPower = 2.5f, ancient = true)
-        createDefault("ancient_wing_ball", MultiplierModifier(1.5F), throwPower = 2.5f, ancient = true)
-        createDefault("ancient_jet_ball", MultiplierModifier(2F), throwPower = 2.5f, ancient = true)
+        createDefault("ancient_wing_ball", throwPower = 2.5f, ancient = true)
+        createDefault("ancient_jet_ball", throwPower = 2.5f, ancient = true)
         createDefault("ancient_origin_ball", GuaranteedModifier(), ancient = true)
         // Luxury ball effect, low priority as it must be triggered before soothe bell as of gen 4
         CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(priority = Priority.LOW) { event ->

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

@@ -314,11 +314,11 @@ object PokemonSpecies : JsonDataRegistry<Species> {
         val result = mutableMapOf<String, String>()
         this.species.forEach {species ->
             val baseSpecies = ShowdownSpecies(species, null)
-            result[ShowdownIdentifiable.REGEX.replace(baseSpecies.name.lowercase(), "")] = this.gson.toJson(baseSpecies)
+            result[ShowdownIdentifiable.REGEX.replace(baseSpecies.name, "")] = this.gson.toJson(baseSpecies)
             species.forms.forEach { form ->
                 if (form != species.standardForm) {
                     val formSpecies = ShowdownSpecies(species, form)
-                    result[ShowdownIdentifiable.REGEX.replace(formSpecies.name.lowercase(), "")] = this.gson.toJson(formSpecies)
+                    result[ShowdownIdentifiable.REGEX.replace(formSpecies.name, "")] = this.gson.toJson(formSpecies)
                 }
             }
         }

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

@@ -119,10 +119,7 @@ class RidingController(
     private fun canTransitionToLand(): Boolean {
         if ((entity.isUnderWater)) return false
         if ((entity.isEyeInFluid(FluidTags.WATER) || entity.isEyeInFluid(FluidTags.LAVA))) return false
-        // If the currently in the air but has no land style then don't transition and render the ride useless.
-        // Hover is a good example for this.
-        val shouldStayInAir = entity.pokemon.riding.behaviours?.get(RidingStyle.LAND) == null && context?.style == RidingStyle.AIR
-        return entity.onGround() && !shouldStayInAir
+        return entity.onGround()
     }
 
     private fun canTransitionToLiquid(): Boolean {

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

@@ -213,23 +213,10 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
         val accel = topSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalHover.accelerationExpr!!) * 20.0)
 
         var newVelocity = state.rideVelocity.get()
-        val unrotateVel = vehicle.deltaMovement.yRot(vehicle.yRot)
-
-        val vehicleFrontVec = Vec3(0.0, 0.0, 1.0)
-        val faceVel = Vec3(vehicle.deltaMovement.x, 0.0, vehicle.deltaMovement.z)
-
-        val d = vehicle.deltaMovement.horizontalDistance()
-        val v2 = Vec3(faceVel.dot(Vec3(1.0, 0.0, 0.0)) * d, newVelocity.y, faceVel.dot(Vec3(0.0, 0.0, 1.0)) * d)
 
         // Check for collisions and if found, update the speed to reflect it
-        if (vehicle.horizontalCollision) {
-            val smackingIntoWallSpeed = max( vehicle.deltaMovement.horizontalDistance(), 0.2)
-            newVelocity = Vec3(newVelocity.x, 0.0, newVelocity.z).normalize().scale(smackingIntoWallSpeed).add(0.0, newVelocity.y, 0.0)
-        }
-
-
-        if (vehicle.verticalCollision) {
-            newVelocity = Vec3(newVelocity.x, 0.0, newVelocity.z)
+        if (vehicle.verticalCollision || vehicle.horizontalCollision) {
+            state.speed.set(vehicle.deltaMovement.length())
         }
 
         // align the velocity vector to be in local vehicle space

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

@@ -41,6 +41,10 @@ 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

@@ -187,16 +187,17 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
             return
         }
 
-
+        var newStam = stam
         val stamDrainRate = (1.0f / vehicle.runtime.resolveDouble(settings.staminaExpr ?: globalHorse.staminaExpr!!)).toFloat() / 20.0f
 
-        val newStam = if (state.sprinting.get()) {
-            max(0.0f,stam - stamDrainRate)
+        if (state.sprinting.get()) {
+            newStam = max(0.0f,stam - stamDrainRate)
+
         } else {
-            min(1.0f,stam + stamDrainRate * 4)
+            newStam = min(1.0f,stam + stamDrainRate * 4)
         }
 
-        state.stamina.set(newStam.coerceIn(0F, 1F))
+        state.stamina.set(newStam)
     }
 
     override fun updatePassengerRotation(

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

@@ -100,7 +100,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         driver: Player,
         input: Vec3
     ) {
-        if (vehicle.level().isClientSide) {
+        if(vehicle.level().isClientSide) {
             handleBoosting(state, vehicle)
             tickStamina(settings, state, vehicle)
         }
@@ -147,7 +147,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         val stamDrainRate = (1.0f / boostTime).toFloat()
 
         val newStam = if (state.boosting.get()) max(0.0f,stam - stamDrainRate)
-            else (stam + stamDrainRate).coerceIn(0F, 1F)
+            else min(1.0f,stam + stamDrainRate)
 
         state.stamina.set(newStam)
     }

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

@@ -60,7 +60,7 @@ class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
     val poseProvider = PoseProvider<SubmarineSettings, SubmarineState>(PoseType.FLOAT)
         .with(PoseOption(PoseType.SWIM) { _, state, entity -> state.rideVelocity.get().z > 0.05 && !state.onSurface.get()})
         .with(PoseOption(PoseType.STAND) { _, state, entity -> state.rideVelocity.get().z <= 0.05 && state.onSurface.get()})
-        .with(PoseOption(PoseType.SWIM) { _, state, entity -> state.rideVelocity.get().z > 0.05 && state.onSurface.get()})
+        .with(PoseOption(PoseType.STAND) { _, state, entity -> state.rideVelocity.get().z > 0.05 && state.onSurface.get()})
 
     override fun isActive(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Boolean {
         return vehicle.isInWater || !vehicle.onGround()
@@ -191,17 +191,11 @@ class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
          * Calculate Forward Velocity
          *********************************************/
         val currZVel = state.rideVelocity.get().z
-        var newZVel = when {
+        val newZVel = when {
             driver.zza > 0.0 -> min(topSpeed, currZVel + accel)
-            driver.zza < 0.0 -> max( -strafeSpeed, currZVel - strafeAccel)
-            else -> lerp(currZVel, 0.0, 0.02)
+            driver.zza < 0.0 -> max( -strafeSpeed, currZVel - strafeAccel) //TODO: Might need to be applied in addition to the normal braking force?
+            else -> lerp(currZVel, 0.0, 0.05)
         }
-
-        // If trying to brake then add the friction to the braking force
-        if (driver.zza != 0.0f && driver.zza.sign.toDouble() != newZVel.sign) {
-            newZVel = lerp(newZVel, 0.0, 0.02)
-        }
-
         currVel = Vec3(currVel.x, currVel.y, newZVel)
 
         /*********************************************
@@ -212,20 +206,14 @@ class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
         val gravity = (9.8 / ( 20.0)) * 0.2 * 0.4
         val terminalYVel = 2.0
         val driverYInput = if(driver.jumping) 1.0 else if (driver.isShiftKeyDown) -1.0 else 0.0
-        var newYVel = when {
+        val newYVel = when {
             (!vehicle.isInWater) -> max(-terminalYVel, currYVel - gravity)
             //(vehicle.isInWater && !vehicle.isUnderWater && currYVel > 0.001) -> lerp(currYVel, 0.0, 0.1) // Make sure that yVel is above a threshold before doing this otherwise it'll block submerging.
             //driverYInput != 0.0 && currYVel > 0.001 && driverYInput.sign != currYVel.sign -> lerp(currYVel, 0.0, 0.05)
             driverYInput > 0.0 -> min(vertTopSpeed, currYVel + strafeAccel)
             driverYInput < 0.0 -> max(-vertTopSpeed, currYVel - strafeAccel)
-            else -> lerp(currYVel, 0.0, 0.02)
+            else -> lerp(currYVel, 0.0, 0.05)
         }
-
-        // If trying to brake then add the friction to the braking force
-        if (driverYInput != 0.0 && driverYInput != newYVel.sign) {
-            newYVel = lerp(newYVel, 0.0, 0.02)
-        }
-
         currVel = Vec3(currVel.x, newYVel, currVel.z)
 
         /*********************************************
@@ -233,17 +221,11 @@ class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
          *********************************************/
         val currXVel = state.rideVelocity.get().x
         val horzTopSpeed = strafeSpeed
-        var newXVel = when {
+        val newXVel = when {
             driver.xxa > 0.0 -> min(horzTopSpeed, currXVel + strafeAccel)
             driver.xxa < 0.0 -> max( -horzTopSpeed, currXVel - strafeAccel)
-            else -> lerp(currXVel, 0.0, 0.02)
+            else -> lerp(currXVel, 0.0, 0.01)
         }
-
-        // If trying to brake then add the friction to the braking force
-        if (driver.xxa != 0.0f && driver.xxa.sign.toDouble() != newZVel.sign) {
-            newXVel = lerp(newXVel, 0.0, 0.02)
-        }
-
         currVel = Vec3(newXVel, currVel.y, currVel.z)
 
         // Set the new velocity
@@ -323,6 +305,81 @@ class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
 
     }
 
+    private fun correctOrientation(
+        settings: SubmarineSettings,
+        state: SubmarineState,
+        vehicle: PokemonEntity,
+        controller: OrientationController,
+        driver: Player,
+        deltaTime: Double
+    ) {
+
+// TODO: remove if not needed
+
+//        // Calculate correcting roll force.
+//        // If the ride is moving then have the correction rate be an equal proportion of:
+//        // - how rolled are you
+//        // - how long has it been since last mouse input (higher is stronger correction)
+//        // Also the correction is proportional as a whole to how NOT pitched are you so you don't spin endlessly when looking up or down
+//        val howRolledAmI =  sqrt(abs((cos(controller.roll.toRadians()) - 1.0f) * 0.5f)) // sqrt so it trends towards one pretty quickly
+//        val maxRollCorrectionRate =
+//            if (state.rideVelocity.get().length() < 0.2) 10.0f * abs(cos(controller.pitch.toRadians()))
+//            else 10.0f * cos(controller.pitch.toRadians()).pow(2) * (
+//                    howRolledAmI*1.0f +
+//                            (state.noInputTime.get() - rollCorrectionTimer).coerceIn(0.0, 1.0).pow(2).toFloat()*0.5f
+//                    )
+//        val maxRollForce = maxRollCorrectionRate / 40.0f
+//        val rollArrivalDeg = 60.0f
+//        val desiredRoll = 0.0f
+//
+//        // Calculate the signed error (how far and in what direction)
+//        val rollError = Mth.wrapDegrees(desiredRoll.angleDifference(controller.roll))
+//
+//        // Use the absolute error to     calculate the magnitude of the influence
+//        val influenceMagnitude = (min(rollArrivalDeg, abs(rollError)) / rollArrivalDeg)
+//        val desiredRollForce = maxRollCorrectionRate * influenceMagnitude * -rollError.sign
+//        var steeredRollForce = desiredRollForce - state.currRollCorrectionForce.get()
+//
+//        // Ensure the 'steering' correction force doesn't exceed our maxForce
+//        if (abs(steeredRollForce) > maxRollForce) {
+//            steeredRollForce = steeredRollForce.sign * maxRollForce
+//        }
+//
+//        // Apply the 'steered' force (its really not a steering force I need a better name)
+//        state.currRollCorrectionForce.set(
+//            state.currRollCorrectionForce.get() + steeredRollForce
+//        )
+
+        //Calculate correcting pitch force.
+//        val rollCorrectionTimer = vehicle.runtime.resolveDouble(settings.timeToRollCorrect ?: globalSubmarine.timeToRollCorrect!!)
+//        val maxPitchCorrectionRate = 5.0f * (state.noInputTime.get() - rollCorrectionTimer).coerceIn(0.0, 1.0).pow(2).toFloat()*0.5f
+//        val maxPitchForce = maxPitchCorrectionRate / 40.0f
+//        val pitchArrivalDeg = 45.0f
+//        val desiredPitch = 0.0f
+//
+//        if(state.rideVelocity.get().length() < 0.1 && state.noInputTime.get() > rollCorrectionTimer) {
+//            val pitchErrror = Mth.wrapDegrees(desiredPitch.angleDifference(controller.pitch))
+//            val arrivalInfluence = (min(pitchArrivalDeg,abs(pitchErrror)) / pitchArrivalDeg)
+//            val desiredPitchForce = maxPitchCorrectionRate * arrivalInfluence * -pitchErrror.sign
+//            var steeredPitchForce = desiredPitchForce - state.currPitchCorrectionForce.get()
+//
+//            // Ensure the 'steering' correction force doesn't exceed our maxForce
+//            if (abs(steeredPitchForce) > maxPitchForce) {
+//                steeredPitchForce = steeredPitchForce.sign * maxPitchForce
+//            }
+//
+//            // Apply the 'steered' force (its really not a steering force I need a better name)
+//            state.currPitchCorrectionForce.set(
+//                state.currPitchCorrectionForce.get() + steeredPitchForce
+//            )
+//        } else {
+//            state.currPitchCorrectionForce.set(
+//                //reduce rollCorrection gradually
+//                lerp(state.currPitchCorrectionForce.get(), 0.0, deltaTime * 0.98)
+//            )
+//        }
+    }
+
     override fun rotationOnMouseXY(
         settings: SubmarineSettings,
         state: SubmarineState,

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

@@ -54,6 +54,8 @@ class RidingAnimationData(val ride: PokemonEntity)
     fun update() {
         val activeRide = ride.hasControllingPassenger()
 
+        if (!activeRide) return
+
         var currRot = Vec3.ZERO
         var angDelta = Vec3.ZERO
 
@@ -151,16 +153,14 @@ class RidingAnimationData(val ride: PokemonEntity)
         /******************************************************
          * Update springs
          *****************************************************/
-        if (activeRide) {
-            val driver = ride.controllingPassenger
-            val vertInput = when {
-                driver != null && driver.jumping-> 1.0
-                driver != null && driver.isShiftKeyDown -> -1.0
-                else -> 0.0
-            }
-            val input = if(driver != null) Vec3(driver.xxa.toDouble() * -1, vertInput, driver.zza.toDouble()) else Vec3.ZERO
-            driverInputSpring.update(input, stiffness * 2, damping)
+        val driver = ride.controllingPassenger
+        val vertInput = when {
+            driver != null && driver.jumping-> 1.0
+            driver != null && driver.isShiftKeyDown -> -1.0
+            else -> 0.0
         }
+        val input = if(driver != null) Vec3(driver.xxa.toDouble() * -1, vertInput, driver.zza.toDouble()) else Vec3.ZERO
+        driverInputSpring.update(input, stiffness * 2, damping)
         rotDeltaSpring.update(angDelta, stiffness, damping)
         velocitySpring.update(currentVelocity, stiffness, damping)
         rotSpring.update(currRot, stiffness, damping)

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

@@ -44,7 +44,6 @@ import com.cobblemon.mod.common.api.spawning.preset.BestSpawnerConfig
 import com.cobblemon.mod.common.api.spawning.preset.PokemonSpawnDetailPreset
 import com.cobblemon.mod.common.api.spawning.selection.SpawningSelector
 import com.cobblemon.mod.common.api.spawning.spawner.BasicSpawner
-import com.cobblemon.mod.common.api.spawning.spawner.FishingSpawnerFactory
 import com.cobblemon.mod.common.api.spawning.spawner.FixedAreaSpawner
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory
@@ -140,6 +139,19 @@ object BestSpawner {
 
     fun onServerStarted(server: MinecraftServer) {
         CobblemonSpawnPools.onServerLoad(server)
-        fishingSpawner = FishingSpawnerFactory.createSharedSpawner()
+        fishingSpawner = BasicSpawner(
+            name = "fishing",
+            spawnPool = CobblemonSpawnPools.WORLD_SPAWN_POOL
+        ).also {
+            it.influences.add(
+                BucketMultiplyingInfluence(
+                    multipliers = mapOf(
+                        "uncommon" to 2.25f,
+                        "rare" to 5.5f,
+                        "ultra-rare" to 5.5f,
+                    )
+                )
+            )
+        }
     }
 }

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

@@ -26,7 +26,7 @@ import net.minecraft.world.entity.Entity
 /**
  * A [SpawningInfluence] that applies some number of SpawnBait effects.
  *
- * @author Hiroku, Plastered_Crab, ppVon
+ * @author Hiroku, Plastered_Crab
  * @since March 18th, 2025
  */
 open class SpawnBaitInfluence(val effects: List<SpawnBait.Effect>, val onUsed: (time: Int, entity: PokemonEntity?) -> Unit = { _, _ -> }) : SpawningInfluence {
@@ -50,84 +50,85 @@ open class SpawnBaitInfluence(val effects: List<SpawnBait.Effect>, val onUsed: (
         }
     }
 
-    // EV, Type, and Egg Group related bait effects
+    // EV related bait effects
     override fun affectWeight(detail: SpawnDetail, spawnablePosition: SpawnablePosition, weight: Float): Float {
         val merged = SpawnBaitUtils.mergeEffects(effects)
 
-        val hasRelevantEffects =
-            merged.any { it.type == Effects.EV } ||
-            merged.any { it.type == Effects.TYPING } ||
-            merged.any { it.type == Effects.EGG_GROUP }
-
-        if (!hasRelevantEffects) {
-            return super.affectWeight(detail, spawnablePosition, weight)
-        }
-
-        val pokemonDetail = detail as? PokemonSpawnDetail
-            ?: return super.affectWeight(detail, spawnablePosition, weight)
-
-        val detailSpecies = pokemonDetail.pokemon.species
-            ?.let { PokemonSpecies.getByName(it) }
-            ?: return super.affectWeight(detail, spawnablePosition, weight)
-
-        val formData = detailSpecies.getForm(pokemonDetail.pokemon.aspects)
-
-        var newWeight = weight
-        var used = false
-
         // if bait exists and any effects are related to EV yields
-        if (merged.any { it.type == Effects.EV }) {
-            val evEffect = effects.firstOrNull { it.type == Effects.EV }
-            val baitEVStat = evEffect?.subcategory?.path?.let { Stats.getStat(it) }
+        if (merged.any { it.type == Effects.EV }){
+            if (detail is PokemonSpawnDetail) {
+                val detailSpecies = detail.pokemon.species?.let { PokemonSpecies.getByName(it) }
+                val baitEVStat = effects.firstOrNull { it.type == Effects.EV }?.subcategory?.path?.let { Stats.getStat(it) }
 
-            if (baitEVStat != null) {
-                val evYieldValue = formData.evYield[baitEVStat]?.toFloat() ?: 0f
-                used = true
-
-                if (evYieldValue <= 0f) {
-                    newWeight = 0f
-                } else {
-                    LOGGER.debug("Boosted weight value");
+                if (detailSpecies != null && baitEVStat != null) {
+                    val detailAspects = detail.pokemon.aspects
+                    val formData = detailSpecies.getForm(detailAspects)
+                    val evYieldValue = formData.evYield[baitEVStat]?.toFloat() ?: 0f
+                    return when {
+                        evYieldValue > 0 -> {
+                            markUsed()
+                            super.affectWeight(detail, spawnablePosition, weight)
+                        }
+                        else -> {
+                            markUsed()
+                            super.affectWeight(detail, spawnablePosition, 0f)
+                        }
+                    }
                 }
             }
         }
-
         // if bait exists and any effects are related to Typing
-        if (newWeight > 0f && merged.any { it.type == Effects.TYPING }) {
-            val baitEffect = effects.firstOrNull { it.type == Effects.TYPING }
-            val baitTypingEffect = baitEffect?.subcategory?.path?.let { ElementalTypes.get(it) }
+        if (merged.any { it.type == Effects.TYPING }){
+            if (detail is PokemonSpawnDetail) {
+                val detailSpecies = detail.pokemon.species?.let { PokemonSpecies.getByName(it) }
+                val baitEffect = effects.firstOrNull { it.type == Effects.TYPING }
+                val baitTypingEffect = baitEffect?.subcategory?.path?.let { ElementalTypes.get(it) }
 
-            if (baitEffect != null && baitTypingEffect != null) {
-                val isMatchingType = formData.types.contains(baitTypingEffect)
-                used = true
-
-                if (isMatchingType) {
-                    newWeight *= baitEffect.value.toFloat()
+                if (detailSpecies != null && baitTypingEffect != null) {
+                    val detailAspects = detail.pokemon.aspects
+                    val formData = detailSpecies.getForm(detailAspects)
+                    val isMatchingType = formData.types.contains(baitTypingEffect)
+                    return when {
+                        isMatchingType -> {
+                            markUsed()
+                            super.affectWeight(detail, spawnablePosition, weight * baitEffect.value.toFloat())
+                        }
+                        else -> super.affectWeight(detail, spawnablePosition, weight)
+                    }
                 }
             }
         }
-
         // if bait exists and any effects are related to Egg Groups
-        if (newWeight > 0f && merged.any { it.type == Effects.EGG_GROUP }) {
-            val eggGroupEffects = effects.filter { it.type == Effects.EGG_GROUP }
+        if (merged.any { it.type == Effects.EGG_GROUP }) {
+            if (detail is PokemonSpawnDetail) {
+                val detailSpecies = detail.pokemon.species?.let { PokemonSpecies.getByName(it) }
 
-            val matchingEffect = eggGroupEffects.firstOrNull { effect ->
-                val key = effect.subcategory?.path ?: return@firstOrNull false
-                val eggGroup = EggGroup.fromIdentifier(key)
-                if (eggGroup == null) {
-                    LOGGER.warn("Unknown egg group identifier: $key")
-                    return@firstOrNull false
+                if (detailSpecies != null) {
+                    val detailAspects = detail.pokemon.aspects
+                    val formData = detailSpecies.getForm(detailAspects)
+
+                    // Collect all the egg group effects
+                    val eggGroupEffects = effects.filter { it.type == Effects.EGG_GROUP }
+
+                    // Check if any of the egg group effects match the species' egg groups
+                    val matchingEffect = eggGroupEffects.firstOrNull { effect ->
+                        val effectEggGroupKey = effect.subcategory?.path ?: return@firstOrNull false
+                        val eggGroup = EggGroup.fromIdentifier(effectEggGroupKey)
+                        if (eggGroup == null) {
+                            LOGGER.warn("Unknown egg group identifier: $effectEggGroupKey")
+                            return@firstOrNull false
+                        }
+                        formData.eggGroups.contains(eggGroup)
+                    }
+
+                    if (matchingEffect != null) {
+                        markUsed()
+                        val multiplier = matchingEffect.value
+                        return super.affectWeight(detail, spawnablePosition, (weight * multiplier).toFloat())
+                    }
                 }
-                formData.eggGroups.contains(eggGroup)
-            }
-
-            if (matchingEffect != null) {
-                used = true
-                newWeight *= matchingEffect.value.toFloat()
             }
         }
-
-        if (used) markUsed()
-        return super.affectWeight(detail, spawnablePosition, newWeight)
+        return super.affectWeight(detail, spawnablePosition, weight)
     }
 }

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

@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.spawning.spawner
-
-import com.cobblemon.mod.common.api.spawning.CobblemonSpawnPools
-import com.cobblemon.mod.common.api.spawning.CobblemonSpawnRules
-import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
-import com.cobblemon.mod.common.api.spawning.influence.BucketMultiplyingInfluence
-import com.cobblemon.mod.common.api.spawning.influence.BucketNormalizingInfluence
-import com.cobblemon.mod.common.api.spawning.influence.PlayerLevelRangeInfluence
-import com.cobblemon.mod.common.api.spawning.influence.PlayerLevelRangeInfluence.Companion.TYPICAL_VARIATION
-import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
-import com.cobblemon.mod.common.util.mutableLazy
-import net.minecraft.core.BlockPos
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.item.ItemStack
-import com.cobblemon.mod.common.api.spawning.BestSpawner;
-import com.cobblemon.mod.common.api.spawning.position.FishingSpawnablePosition
-
-
-/**
- * This isn't really a factory, one FishingSpawner is created as a field on [BestSpawner] on
- * server start.  However, this emulates the systems that PlayerSpawner uses so extenders can
- * add influences that affect all fishing encounters.
- *
- * Responsible for creating [BasicSpawner]s for Fishing with whatever appropriate settings.
- * You can swap over the spawn pool and the influences here, and it will apply to all newly-generated
- * [BasicSpawner]s for Fishing.  Has a global every-cast influence list, as well as a context-sensitive
- * influence list.
- *
- * @author Andy
- * @since January 23rd, 2026
- */
-object FishingSpawnerFactory {
-    var spawnPool: SpawnPool by mutableLazy {
-        CobblemonSpawnPools.WORLD_SPAWN_POOL
-    }
-
-    data class Context(
-        val player: ServerPlayer,
-        val rodStack: ItemStack,
-        val lureLevel: Int,
-        val luckOfTheSeaLevel: Int,
-        val world: ServerLevel,
-        val pos: BlockPos,
-        val spawner: BasicSpawner
-    )
-
-    /**
-     * List of influences for a new cast of the fishing rod. Context is provided at
-     * build time in [buildPositionInfluences]
-     */
-    var positionInfluenceBuilders = mutableListOf<(ctx: Context) -> SpawningInfluence?>(
-        { ctx -> PlayerLevelRangeInfluence(ctx.player, TYPICAL_VARIATION) },
-        { ctx -> BucketNormalizingInfluence(tier = ctx.lureLevel + ctx.luckOfTheSeaLevel) }
-    )
-
-    fun createSharedSpawner(): BasicSpawner {
-        return BasicSpawner(
-            name = "fishing",
-            spawnPool = spawnPool
-        ).also { spawner ->
-            spawner.influences += BucketMultiplyingInfluence(
-                multipliers = mapOf(
-                    "uncommon" to 2.25f,
-                    "rare" to 5.5f,
-                    "ultra-rare" to 5.5f,
-                )
-            )
-        }
-    }
-
-    /**
-     * Builds the per-cast influences for [FishingSpawnablePosition]
-     */
-    fun buildPositionInfluences(ctx: Context): MutableList<SpawningInfluence> {
-        return positionInfluenceBuilders.mapNotNullTo(mutableListOf()) { it(ctx) }
-    }
-}

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

@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.spawning.spawner
-
-import com.cobblemon.mod.common.api.fishing.SpawnBait
-import com.cobblemon.mod.common.api.spawning.CobblemonSpawnPools
-import com.cobblemon.mod.common.api.spawning.CobblemonSpawnRules
-import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
-import com.cobblemon.mod.common.api.spawning.influence.BucketMultiplyingInfluence
-import com.cobblemon.mod.common.api.spawning.influence.BucketNormalizingInfluence
-import com.cobblemon.mod.common.api.spawning.influence.SpawnBaitInfluence
-import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
-import com.cobblemon.mod.common.api.spawning.rules.SpawnRule
-import com.cobblemon.mod.common.util.mutableLazy
-import net.minecraft.core.BlockPos
-import net.minecraft.server.level.ServerLevel
-
-/**
- * Responsible for creating [FixedAreaSpawner]s for PokeSnacks with whatever appropriate settings.
- * You can swap over the spawn pool and the influences here, and it will apply to all newly-generated
- * [FixedAreaSpawner]s for PokeSnacks.
- *
- * @author Andy
- * @since January 23rd, 2026
- */
-object PokeSnackSpawnerFactory {
-    var spawnPool: SpawnPool by mutableLazy {
-        CobblemonSpawnPools.WORLD_SPAWN_POOL
-    }
-
-    data class Context(
-        val world: ServerLevel,
-        val pos: BlockPos,
-        val horizontalRadius: Int,
-        val verticalRadius: Int,
-        val maxPokemonPerChunk: Float,
-        val name: String,
-        val baitEffects: List<SpawnBait.Effect>
-    )
-
-    /**
-     * The list of influences for a new [FixedAreaSpawner] for a PokeSnack.
-     * The influences will be added to the spawner in the order they are added to this list.
-     */
-    var influenceBuilders = mutableListOf<(ctx: Context) -> SpawningInfluence?>(
-        { ctx ->
-            val stackedLureTier = ctx.baitEffects
-                .filter { it.type == SpawnBait.Effects.RARITY_BUCKET }
-                .sumOf { it.value }
-                .toInt()
-
-            if (stackedLureTier <= 0) null else BucketNormalizingInfluence(
-                tier = stackedLureTier,
-                gradient = 0.2F,
-                firstTier = 1.2F
-            )
-        },
-        { _ ->
-            BucketMultiplyingInfluence(
-                mapOf(
-                    "uncommon" to 2.25f,
-                    "rare" to 5.5f,
-                    "ultra-rare" to 5.5f,
-                )
-            )
-        },
-        { ctx ->
-            SpawnBaitInfluence(effects = ctx.baitEffects)
-        },
-    )
-
-    fun create(ctx: Context): FixedAreaSpawner {
-        val influences = influenceBuilders.mapNotNull { it(ctx) }
-
-        return FixedAreaSpawner(
-            name = ctx.name,
-            spawnPool = spawnPool,
-            world = ctx.world,
-            position = ctx.pos,
-            horizontalRadius = ctx.horizontalRadius,
-            verticalRadius = ctx.verticalRadius,
-            maxPokemonPerChunk = ctx.maxPokemonPerChunk
-        ).also { spawner ->
-            spawner.influences.addAll(influences)
-
-            // TODO(Andy): PokeSnacks currently bypass pokemon spawn rules, should that be true?
-            // Adding this rule will change that
-            spawner.influences.addAll(
-                CobblemonSpawnRules.rules.values
-                    .filter(SpawnRule::enabled)
-                    .flatMap(SpawnRule::components)
-            )
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/GeneralPlayerData.kt

@@ -28,7 +28,6 @@ data class GeneralPlayerData(
     var starterUUID: UUID?,
     var keyItems: MutableSet<ResourceLocation>,
     var battleTheme: ResourceLocation?,
-    var partySelectTutorialDone: Boolean = false,
     val extraData: MutableMap<String, PlayerDataExtension>,
 ) : InstancedPlayerData {
     var advancementData: PlayerAdvancementData = PlayerAdvancementData()
@@ -54,8 +53,7 @@ data class GeneralPlayerData(
             starterSelected,
             starterUUID,
             advancementData.totalBattleVictoryCount == 0,
-            battleTheme,
-            partySelectTutorialDone
+            battleTheme
         )
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/PlayerDataJsonBackend.kt

@@ -36,8 +36,7 @@ class PlayerDataJsonBackend: JsonBackedPlayerDataStoreBackend<GeneralPlayerData>
         starterUUID =  null,
         keyItems = Cobblemon.config.defaultKeyItems,
         extraData = mutableMapOf(),
-        battleTheme = CobblemonSounds.PVP_BATTLE.location,
-        partySelectTutorialDone = false
+        battleTheme = CobblemonSounds.PVP_BATTLE.location
     )}
 
     override val gson = GsonBuilder()

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/PlayerDataMongoBackend.kt

@@ -37,8 +37,7 @@ class PlayerDataMongoBackend(mongoClient: MongoClient, databaseName: String, col
         starterUUID =  null,
         keyItems = Cobblemon.config.defaultKeyItems,
         extraData = mutableMapOf(),
-        battleTheme = CobblemonSounds.PVP_BATTLE.location,
-        partySelectTutorialDone = false
+        battleTheme = CobblemonSounds.PVP_BATTLE.location
     )}
 
     override val gson = GsonBuilder()

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/client/ClientGeneralPlayerData.kt

@@ -34,8 +34,7 @@ data class ClientGeneralPlayerData(
     var starterSelected: Boolean = false,
     var starterUUID: UUID? = null,
     var showChallengeLabel: Boolean = true,
-    val battleTheme: ResourceLocation? = null,
-    var partySelectTutorialDone: Boolean = false
+    val battleTheme: ResourceLocation? = null
 ) : ClientInstancedPlayerData {
 
     override fun encode(buf: RegistryFriendlyByteBuf) {
@@ -47,7 +46,6 @@ data class ClientGeneralPlayerData(
         buf.writeNullable(starterUUID) { pb, value -> pb.writeString(value.toString()) }
         buf.writeNullable(resetStarters) { pb, value -> pb.writeBoolean(value) }
         buf.writeNullable(battleTheme) {pb, value -> pb.writeIdentifier(value)}
-        buf.writeBoolean(partySelectTutorialDone)
     }
     companion object {
         fun decode(buffer: RegistryFriendlyByteBuf): SetClientPlayerDataPacket {
@@ -59,7 +57,6 @@ data class ClientGeneralPlayerData(
             val starterUUID = buffer.readNullable { it.readString() }?.let { UUID.fromString(it) }
             val resetStarterPrompt = buffer.readNullable { it.readBoolean() }
             val battleTheme = buffer.readNullable { it.readIdentifier() }
-            val partySelectTutorialDone = buffer.readBoolean()
             val data = ClientGeneralPlayerData(
                 resetStarterPrompt,
                 promptStarter,
@@ -67,8 +64,7 @@ data class ClientGeneralPlayerData(
                 starterSelected,
                 starterUUID,
                 showChallengeLabel,
-                battleTheme,
-                partySelectTutorialDone
+                battleTheme
             )
             //Weird to do this, but since the flag doesn't get passed to the decoded obj, do it here
             //Should be fine, as long as decode doesn't get run on the server for some reason

common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleRegistry.kt

@@ -221,7 +221,6 @@ object BattleRegistry {
     fun closeBattle(battle: PokemonBattle) {
         battle.onEndHandlers.forEach { it(battle) }
         battleMap.remove(battle.battleId)
-        ShowdownService.service.endBattle(battle)
     }
 
     @JvmStatic

common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownActionRequest.kt

@@ -94,8 +94,7 @@ enum class ShowdownActionResponseType(val loader: (RegistryFriendlyByteBuf) -> S
     PASS({ PassActionResponse }),
     SHIFT({ ShiftActionResponse()}),
     HEAL_ITEM({ HealItemActionResponse("potion") }),
-    FORFEIT({ ForfeitActionResponse() }),
-    FLEE_ATTEMPT({ FleeAttemptActionResponse() }),
+    FORFEIT({ ForfeitActionResponse() });
 }
 
 abstract class ShowdownActionResponse(val type: ShowdownActionResponseType) {
@@ -281,11 +280,6 @@ class ForfeitActionResponse : ShowdownActionResponse(ShowdownActionResponseType.
     override fun toShowdownString(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?) = "forfeit"
 }
 
-class FleeAttemptActionResponse : ShowdownActionResponse(ShowdownActionResponseType.FLEE_ATTEMPT) {
-    override fun isValid(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?, forceSwitch: Boolean) = true
-    override fun toShowdownString(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?) = "flee-attempt"
-}
-
 class ShowdownMoveset {
     lateinit var moves: List<InBattleMove>
     var trapped = false

common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownThread.kt

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.battles
 
 import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.battles.runner.ShowdownService
-import net.minecraft.CrashReport
 import java.util.*
 import java.util.concurrent.CountDownLatch
 
@@ -38,15 +37,8 @@ class ShowdownThread : Thread("Cobblemon Showdown") {
 
     override fun run() {
         LOGGER.info("Starting showdown service...")
-        try {
-            ShowdownService.service.openConnection()
-            LOGGER.info("Showdown has been started!")
-        } catch (e: Exception) {
-            LOGGER.error("Failed to start showdown service!", e)
-        } finally {
-            this.latch.countDown()
-            throw RuntimeException("Showdown service failed to initialize...")
-        }
-
+        ShowdownService.service.openConnection()
+        LOGGER.info("Showdown has been started!")
+        this.latch.countDown()
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/battles/actor/MultiPokemonBattleActor.kt

@@ -18,7 +18,7 @@ import java.util.UUID
 import net.minecraft.network.chat.MutableComponent
 import net.minecraft.network.chat.Component
 
-open class MultiPokemonBattleActor(
+class MultiPokemonBattleActor(
     pokemonList: List<BattlePokemon>,
     artificialDecider: BattleAI = RandomBattleAI(),
     uuid: UUID = UUID.randomUUID()

common/src/main/kotlin/com/cobblemon/mod/common/battles/actor/PokemonBattleActor.kt

@@ -24,14 +24,17 @@ import net.minecraft.network.chat.MutableComponent
 import net.minecraft.network.chat.Component
 import net.minecraft.world.phys.Vec3
 
-open class PokemonBattleActor(
+class PokemonBattleActor(
     uuid: UUID,
     val pokemon: BattlePokemon,
     override val fleeDistance: Float,
-    artificialDecider: BattleAI = RandomBattleAI(),
+    artificialDecider: BattleAI = RandomBattleAI()
 ) : AIBattleActor(uuid, listOf(pokemon), artificialDecider), EntityBackedBattleActor<PokemonEntity>, FleeableBattleActor {
 
-    override val initialPos: Vec3? = pokemon.entity?.position()
+    override val initialPos: Vec3?
+    init {
+        initialPos = entity?.position()
+    }
     override fun getName() = pokemon.effectedPokemon.species.translatedName
     override fun nameOwned(name: String): MutableComponent = Component.literal(name)
     override fun getWorldAndPosition(): Pair<ServerLevel, Vec3>? {

common/src/main/kotlin/com/cobblemon/mod/common/battles/actor/TrainerBattleActor.kt

@@ -17,7 +17,7 @@ import com.cobblemon.mod.common.util.battleLang
 import java.util.UUID
 import net.minecraft.network.chat.MutableComponent
 
-open class TrainerBattleActor(
+class TrainerBattleActor(
     val trainerName: String,
     uuid: UUID,
     pokemonList: List<BattlePokemon>,

common/src/main/kotlin/com/cobblemon/mod/common/battles/ai/StrongBattleAI.kt

@@ -31,6 +31,7 @@ import kotlin.collections.associateWith
 import kotlin.collections.partition
 import kotlin.math.absoluteValue
 
+
 /**
  * AI that tries to choose the best move for the given situations. Based off of the Pokemon Trainer Tournament Simulator Github
  * https://github.com/cRz-Shadows/Pokemon_Trainer_Tournament_Simulator/blob/main/pokemon-showdown/sim/examples/Simulation-test-1.ts#L330
@@ -48,7 +49,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
     private val hpWeightConsideration = 0.25 // how much HP difference is a consideration for switchins
     private val hpFractionCoefficient = 0.4 // how much HP differences should be taken into account for switch ins
     private val boostWeightCoefficient = 1 // the amount of boosts considered a baseline to be removed
-    private val switchOutMatchupThreshold = -2 // todo change this to get it feeling just right (-7 never switches)
+    private val switchOutMatchupThreshold = 0 // todo change this to get it feeling just right (-7 never switches)
     private val selfKoMoveMatchupThreshold = 0.3
     private val trickRoomThreshold = 85
     private val recoveryMoveThreshold = 0.50
@@ -218,14 +219,19 @@ class StrongBattleAI(skill: Int) : BattleAI {
             .filter { it.second.canBeSentOut() }
 
         if (forceSwitch || activeBattlePokemon.isGone()) {
-            // When forced to switch, pick the Pokemon with the best matchup estimation
-            val bestSwitchScore = availableSwitches.maxOfOrNull { estimateMatchup(activeBattlePokemon, aiSide, battle, it.first) }
-                ?: return PassActionResponse
-            val bestSwitch = availableSwitches.firstOrNull { estimateMatchup(activeBattlePokemon, aiSide, battle, it.first) == bestSwitchScore }
-                ?: return PassActionResponse
+            if (battle.turn == 1) {
+                val switchTo = activeBattlePokemon.actor.pokemonList.filter { it.canBeSentOut() }.randomOrNull()
+                        ?: return DefaultActionResponse()
+                switchTo.willBeSwitchedIn = true
+                return SwitchActionResponse(switchTo.uuid)
+            }
+            else {
+                val bestEstimation = availableSwitches.maxByOrNull { estimateMatchup(activeBattlePokemon, aiSide, battle, it.first) }
+                    ?: return PassActionResponse
 
-            bestSwitch.second.willBeSwitchedIn = true
-            return SwitchActionResponse(bestSwitch.second.uuid)
+                bestEstimation.second.willBeSwitchedIn = true
+                return SwitchActionResponse(bestEstimation.second.uuid)
+            }
         }
         if (moveset == null) {
             return PassActionResponse
@@ -253,9 +259,9 @@ class StrongBattleAI(skill: Int) : BattleAI {
 
         if (!checkSkillLevel()){
             val move = availableMoves
-                .filter { it.first.target.targetList(activeBattlePokemon)?.isEmpty() != true }
-                .randomOrNull()
-                ?: return MoveActionResponse("struggle")
+                    .filter { it.first.target.targetList(activeBattlePokemon)?.isEmpty() != true }
+                    .randomOrNull()
+                    ?: return MoveActionResponse("struggle")
 
             return chooseMove(move.first, activeBattlePokemon)
         }
@@ -264,6 +270,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
         if (checkSwitchOutSkill() && shouldSwitchOut(aiSide, battle, activeBattlePokemon, moveset)) {
             considerSwitching(activeBattlePokemon, activeTrackerPokemon, opponents, availableMoves, availableSwitches, battle, aiSide)
         }
+        activeTrackerPokemon.firstTurn = false
 
         // If HP is below 30% and not switching out, always use the most damaging move
         if (activeTrackerPokemon.currentHpPercent < 0.3 && !shouldSwitchOut(aiSide, battle, activeBattlePokemon, moveset)) {
@@ -289,6 +296,8 @@ class StrongBattleAI(skill: Int) : BattleAI {
                 return chooseMove(fakeOut.first, activeBattlePokemon, targets.firstOrNull { validTarget != null && validTarget.id == it.battlePokemon!!.uuid})
             }
 
+            activeTrackerPokemon.firstTurn = false
+
 
             // Explosion/Self destruct
             availableMoves.firstOrNull {
@@ -306,7 +315,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
 
             // Deal with non-weather related field changing effects
             for (move in availableMoves) {
-
+                
                 // Tailwind
                 if (move.first.id == "tailwind" && move.first.id != activeTracker.alliedSide.tailwindCondition &&
                     availableSwitches.size > 2) {
@@ -315,21 +324,21 @@ class StrongBattleAI(skill: Int) : BattleAI {
 
                 // Trick room
                 if (move.first.id == "trickroom" && move.first.id != activeTracker.currentRoom
-                    && availableSwitches.count { statEstimationActive(it.first, Stats.SPEED) <= trickRoomThreshold } >= 2) {
+                        && availableSwitches.count { statEstimationActive(it.first, Stats.SPEED) <= trickRoomThreshold } >= 2) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
 
                 // todo find a way to get list of active screens
                 // Aurora veil
                 if (move.first.id == "auroraveil" && move.first.id != activeTracker.alliedSide.screenCondition
-                    && activeTracker.currentWeather in listOf("hail", "snow")) {
+                        && activeTracker.currentWeather in listOf("hail", "snow")) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
 
                 // todo find a way to get list of active screens
                 // Light Screen
                 if (move.first.id == "lightscreen" && move.first.id != activeTracker.alliedSide.screenCondition
-                    && opponents.any { (it.species?.baseStats?.get(Stats.SPECIAL_ATTACK) ?: 0) > (it.species?.baseStats?.get(Stats.ATTACK) ?: 0) }
+                    && opponents.any { (it.species?.baseStats?.get(Stats.SPECIAL_ATTACK) ?: 0) > (it.species?.baseStats?.get(Stats.ATTACK) ?: 0) } 
                     && availableSwitches.size > 1) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
@@ -347,13 +356,13 @@ class StrongBattleAI(skill: Int) : BattleAI {
             for (move in availableMoves) {
                 // Setup
                 if (nOppRemainingMons >= 3 && move.first.id in AIUtility.entryHazards
-                    && !activeTracker.opponentSide.sideHazards.contains(move.first.id)) {
+                        && !activeTracker.opponentSide.sideHazards.contains(move.first.id)) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
 
                 // Removal
                 if (nRemainingMons >= 2 && move.first.id in AIUtility.antiHazardsMoves
-                    && activeTracker.alliedSide.sideHazards.isNotEmpty()) {
+                        && activeTracker.alliedSide.sideHazards.isNotEmpty()) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
             }
@@ -363,10 +372,10 @@ class StrongBattleAI(skill: Int) : BattleAI {
             // Court Change
             for (move in availableMoves) {
                 if (move.first.id == "courtchange"
-                    && (!AIUtility.entryHazards.none { it in activeTracker.alliedSide.sideHazards }
-                            || setOf("tailwind", "lightscreen", "reflect").any { it in activeTracker.opponentSide.sideHazards })
-                    && setOf("tailwind", "lightscreen", "reflect").none { it in activeTracker.opponentSide.sideHazards }
-                    && AIUtility.entryHazards.none { it in activeTracker.opponentSide.sideHazards }) {
+                        && (!AIUtility.entryHazards.none { it in activeTracker.alliedSide.sideHazards }
+                                || setOf("tailwind", "lightscreen", "reflect").any { it in activeTracker.opponentSide.sideHazards })
+                        && setOf("tailwind", "lightscreen", "reflect").none { it in activeTracker.opponentSide.sideHazards }
+                        && AIUtility.entryHazards.none { it in activeTracker.opponentSide.sideHazards }) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
             }
@@ -374,7 +383,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
             // Strength Sap
             for (move in availableMoves) {
                 if (move.first.id == "strengthsap" && activeTrackerPokemon.currentHpPercent < 0.5
-                    && activeTrackerPokemon.species!!.baseStats.getOrDefault(Stats.ATTACK, 0) > 80) {
+                        && activeTrackerPokemon.species!!.baseStats.getOrDefault(Stats.ATTACK, 0) > 80) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
             }
@@ -382,10 +391,10 @@ class StrongBattleAI(skill: Int) : BattleAI {
             // Belly Drum
             for (move in availableMoves) {
                 if (move.first.id == "bellydrum"
-                    && (activeTrackerPokemon.currentHpPercent > 0.6
-                            && activeTrackerPokemon.pokemon!!.heldItem().item == CobblemonItems.SITRUS_BERRY
-                            || activeTrackerPokemon.currentHpPercent > 0.8)
-                    && activeTrackerPokemon.boosts.getOrDefault(Stats.ATTACK, 0) < 1) {
+                        && (activeTrackerPokemon.currentHpPercent > 0.6
+                                && activeTrackerPokemon.pokemon!!.heldItem().item == CobblemonItems.SITRUS_BERRY
+                        || activeTrackerPokemon.currentHpPercent > 0.8)
+                        && activeTrackerPokemon.boosts.getOrDefault(Stats.ATTACK, 0) < 1) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
             }
@@ -395,8 +404,8 @@ class StrongBattleAI(skill: Int) : BattleAI {
             for (move in availableMoves) {
                 AIUtility.weatherSetupMoves[move.first.id]?.let { requiredWeather ->
                     if (activeTracker.currentWeather != requiredWeather.lowercase() &&
-                        !(activeTracker.currentWeather == "primordialsea" && requiredWeather == "raindance") &&
-                        !(activeTracker.currentWeather == "desolateland" && requiredWeather == "sunnyday")) {
+                            !(activeTracker.currentWeather == "primordialsea" && requiredWeather == "raindance") &&
+                            !(activeTracker.currentWeather == "desolateland" && requiredWeather == "sunnyday")) {
                         return chooseMove(move.first, activeBattlePokemon)
                     }
                 }
@@ -422,8 +431,8 @@ class StrongBattleAI(skill: Int) : BattleAI {
                     // Stall out side conditions
                     if ((activeTracker.opponentSide.screenCondition != null || activeTracker.opponentSide.tailwindCondition != null) &&
                         (activeTracker.alliedSide.screenCondition == null || activeTracker.alliedSide.tailwindCondition == null)  ||
-                        opponents.any { it.currentStatus == null } &&
-                        activeTrackerPokemon.protectCount == 0 && opponents.none { it.currentAbility?.name == "unseenfist"}) {
+                            opponents.any { it.currentStatus == null } &&
+                            activeTrackerPokemon.protectCount == 0 && opponents.none { it.currentAbility?.name == "unseenfist"}) {
                         activeTrackerPokemon.protectCount = 3
                         return chooseMove(move.first, activeBattlePokemon)
                     }
@@ -451,10 +460,10 @@ class StrongBattleAI(skill: Int) : BattleAI {
         activeTrackerPokemon.firstTurn = false
 
         val move = availableMoves
-            .filter { it.first.canBeUsed() }
-            .filter { it.first.mustBeUsed() || it.first.target.targetList(activeBattlePokemon)?.isEmpty() != true }
-            .randomOrNull()
-            ?: return MoveActionResponse("struggle")
+                .filter { it.first.canBeUsed() }
+                .filter { it.first.mustBeUsed() || it.first.target.targetList(activeBattlePokemon)?.isEmpty() != true }
+                .randomOrNull()
+                ?: return MoveActionResponse("struggle")
 
         return chooseMove(move.first, activeBattlePokemon)
     }
@@ -511,10 +520,6 @@ class StrongBattleAI(skill: Int) : BattleAI {
             return false
 
         val activeTrackerPokemon = activeTracker.alliedSide.activePokemon.first { it.id == activeBattlePokemon.battlePokemon!!.uuid }
-
-        // Don't switch out if we just switched in
-        if (activeTrackerPokemon.firstTurn)
-            return false
         val actorTracker = activeTracker.alliedSide.actors.first { activeTrackerPokemon in it.activePokemon }
         val availableSwitches = actorTracker.party.filter { it.currentHp!! > 0 }
         val currentAbility = activeTrackerPokemon.pokemon!!.ability
@@ -527,7 +532,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
         // Only switch if a switch-in is significantly better than the current Pokémon
         val currentScore = estimateMatchup(activeBattlePokemon, side, battle)
         val bestSwitchScore = availableSwitches.maxOfOrNull { estimateMatchup(activeBattlePokemon, side, battle, it) } ?: currentScore
-        val improvementThreshold = currentScore.absoluteValue * 0.5 + 3
+        val improvementThreshold = currentScore.absoluteValue * 0.25 + 2
         if (bestSwitchScore <= currentScore + improvementThreshold) {
             return false
         }
@@ -562,7 +567,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
         if (availableSwitches.isEmpty() || availableSwitches.none { estimateMatchup(activeBattlePokemon, side, battle, it) > 0 })
             return false
 
-
+        
 
         // ...and a 'good' reason to switch out
         if (opponentActiveTracker.any { it.boosts.getOrDefault(Stats.ACCURACY, 0) <= accuracySwitchThreshold } ||
@@ -990,4 +995,6 @@ class StrongBattleAI(skill: Int) : BattleAI {
             return MoveActionResponse(move.id, chosenTarget.getPNX())
         }
     }
-}
+}
+
+

common/src/main/kotlin/com/cobblemon/mod/common/battles/ai/strongBattleAI/ActiveTracker.kt

@@ -132,7 +132,6 @@ class TrackerActor(val uuid: UUID) {
         actor.activePokemon.filter { newActive -> activePokemon.none { it.id == newActive.battlePokemon?.uuid } }.forEach {
             val active = party.firstOrNull { trackMon -> trackMon.id == it.battlePokemon?.uuid } ?: return@forEach
             party.remove(active)
-            active.firstTurn = true // Reset firstTurn when switching in
             activePokemon.add(active)
         }
         val swappedOut = activePokemon.filter { trackMon -> actor.activePokemon.none { it.battlePokemon?.uuid == trackMon.id } }
@@ -146,7 +145,6 @@ class TrackerActor(val uuid: UUID) {
         actor.activePokemon.filter { newActive -> activePokemon.none { it.id == newActive.battlePokemon?.uuid } }.forEach {
             val active = party.firstOrNull { trackMon -> trackMon.id == it.battlePokemon?.uuid } ?: return@forEach
             party.remove(active)
-            active.firstTurn = true // Reset firstTurn when switching in
             activePokemon.add(active)
         }
         val swappedOut = activePokemon.filter { trackMon -> actor.activePokemon.none { it.battlePokemon?.uuid == trackMon.id } }

common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/FaintInstruction.kt

@@ -51,7 +51,6 @@ class FaintInstruction(battle: PokemonBattle, val message: BattleMessage) : Inte
 
             preamble.thenAccept {
                 faintingPokemon.effectedPokemon.currentHealth = 0
-                faintingPokemon.faintedAt = battle.faintCounter++
                 faintingPokemon.sendUpdate()
                 CobblemonEvents.BATTLE_FAINTED.post(BattleFaintedEvent(battle, pokemon, context, pnx))
                 battle.getActorAndActiveSlotFromPNX(pnx).second.battlePokemon = null

common/src/main/kotlin/com/cobblemon/mod/common/battles/pokemon/BattlePokemon.kt

@@ -110,9 +110,6 @@ open class BattlePokemon(
     /** A set of all the BattlePokemon that they faced during the battle (for exp purposes) */
     val facedOpponents = mutableSetOf<BattlePokemon>()
 
-    /** The faint sequence number within the battle, or null if this pokemon has not fainted. */
-    var faintedAt: Int? = null
-
     /**
      * The [HeldItemManager] backing this [BattlePokemon].
      */

common/src/main/kotlin/com/cobblemon/mod/common/battles/runner/ShowdownService.kt

@@ -27,7 +27,6 @@ interface ShowdownService {
     fun openConnection()
     fun closeConnection()
     fun startBattle(battle: PokemonBattle, messages: Array<String>)
-    fun endBattle(battle: PokemonBattle)
     fun send(battleId: UUID, messages: Array<String>)
     fun getRegistryData(type: String): JsonArray
     fun sendRegistryData(data: Map<String, String>, type: String)

common/src/main/kotlin/com/cobblemon/mod/common/battles/runner/graal/GraalShowdownService.kt

@@ -129,11 +129,6 @@ class GraalShowdownService : ShowdownService {
         startBattleFunction.execute(this, battle.battleId.toString(), messages)
     }
 
-    override fun endBattle(battle: PokemonBattle) {
-        val endBattleFunction = context.getBindings("js").getMember("endBattle")
-        endBattleFunction.execute(battle.battleId.toString())
-    }
-
     override fun send(battleId: UUID, messages: Array<String>) {
         sendToShowdown(battleId, messages)
     }

common/src/main/kotlin/com/cobblemon/mod/common/battles/runner/socket/SocketShowdownService.kt

@@ -62,11 +62,6 @@ class SocketShowdownService(val host: String = "localhost", val port: Int = 1846
         send(battle.battleId, messages)
     }
 
-    override fun endBattle(battle: PokemonBattle) {
-        writer.write(">endbattle ${battle.battleId}\n")
-        acknowledge { Cobblemon.LOGGER.error("Failed to end battle ${battle.battleId}!") }
-    }
-
     override fun send(battleId: UUID, messages: Array<String>) {
         for (message in messages) {
             writer.write("$battleId~$message\n")

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

@@ -133,10 +133,7 @@ class ApricornBlock(settings: Properties, val apricorn: Apricorn) : HorizontalDi
     override fun isBonemealSuccess(world: Level, random: RandomSource, pos: BlockPos, state: BlockState) = true
 
     override fun performBonemeal(world: ServerLevel, random: RandomSource, pos: BlockPos, state: BlockState) {
-        val curAge = state.getValue(AGE)
-        val newAge = curAge + 1
-        if (newAge > MAX_AGE) return
-        world.setBlock(pos, state.setValue(AGE, newAge), UPDATE_CLIENTS)
+        world.setBlock(pos, state.setValue(AGE, state.getValue(AGE) + 1), 2)
     }
 
     override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
@@ -189,17 +186,17 @@ class ApricornBlock(settings: Properties, val apricorn: Apricorn) : HorizontalDi
      * This uses [Block.dropResources] to handle the drops.
      * It will also reset the [BlockState] of this block at the given location to the start of growth.
      *
-     * @param world The [Level] the apricorn is in.
+     * @param world The [World] the apricorn is in.
      * @param state The [BlockState] of the apricorn.
      * @param pos The [BlockPos] of the apricorn.
      * @return The [BlockState] after harvest.
      */
     fun harvest(world: Level, state: BlockState, pos: BlockPos): BlockState {
         // Uses loot tables, to change the drops use 'data/cobblemon/loot_tables/blocks/<color>_apricorn.json'
-        dropResources(state, world, pos)
+        Block.dropResources(state, world, pos)
         // Don't use default as we want to keep the facing
         val resetState = state.setValue(AGE, MIN_AGE)
-        world.setBlock(pos, resetState, UPDATE_CLIENTS)
+        world.setBlock(pos, resetState, Block.UPDATE_CLIENTS)
         return resetState
     }
 

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

@@ -81,32 +81,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
 
     override fun isBonemealSuccess(world: Level, random: RandomSource, pos: BlockPos, state: BlockState) = !this.isMaxAge(state)
 
-    // Use Random Tick instead of BlockEntityTicker for performance optimization
-    override fun <T : BlockEntity> getTicker(world: Level, blockState: BlockState, blockWithEntityType: BlockEntityType<T>): BlockEntityTicker<T>? = null
-
-    // Enable Random Tick: only immature and non-rooted berries need to tick
-    override fun isRandomlyTicking(state: BlockState): Boolean {
-        return state.getValue(AGE) < FRUIT_AGE && !state.getValue(IS_ROOTED)
-    }
-
-    // Random Tick handler: uses time compensation to ensure correct growth speed
-    @Deprecated("Deprecated in Java")
-    override fun randomTick(state: BlockState, world: ServerLevel, pos: BlockPos, random: RandomSource) {
-        val blockEntity = world.getBlockEntity(pos) as? BerryBlockEntity ?: return
-        
-        // processTick calculates elapsed time and updates timer, returns whether growth is needed
-        if (blockEntity.processTick(world, pos, state) && !world.getBlockTicks().hasScheduledTick(pos, this)) {
-            // Schedule growth for next tick to avoid tick scheduler conflicts during randomTick
-            world.scheduleTick(pos, this, 1)
-        }
-    }
-
-    // Scheduled tick handler: performs the actual growth
-    @Deprecated("Deprecated in Java")
-    override fun tick(state: BlockState, world: ServerLevel, pos: BlockPos, random: RandomSource) {
-        if (state.getValue(IS_ROOTED)) return
-        growHelper(world, random, pos, state)
-    }
+    override fun <T : BlockEntity> getTicker(world: Level, blockState: BlockState, blockWithEntityType: BlockEntityType<T>): BlockEntityTicker<T>? = createTickerHelper(blockWithEntityType, CobblemonBlockEntities.BERRY, BerryBlockEntity.TICKER)
 
     init {
         registerDefaultState(stateDefinition.any()

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

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.block
+
+import net.minecraft.world.item.Item
+import net.minecraft.core.dispenser.DispenseItemBehavior
+import net.minecraft.world.item.Items
+import net.minecraft.world.item.alchemy.PotionContents
+import net.minecraft.world.item.alchemy.Potions
+import net.minecraft.world.level.block.DispenserBlock
+
+object DispenserBehaviorRegistry {
+    private val behaviors = mutableMapOf<Item, DispenseItemBehavior>()
+
+    fun register(items: List<Item>, behaviorProvider: (Item) -> DispenseItemBehavior) {
+        for (item in items) {
+            behaviors[item] = behaviorProvider(item)
+        }
+    }
+
+    fun applyBehaviors() {
+        behaviors.forEach { (item, behavior) ->
+            DispenserBlock.registerBehavior(item, behavior)
+        }
+    }
+
+    // TODO: Seems like there can only 1 behavior per item, so registering the leaves with the honey bottle overrode the honey bottle behavior for the log.
+    //  Registering a new behavior with `DispenserBlock.registerBehavior` will override any existing ones for that item, possibly even ones from Minecraft and other mods
+    //  Will probably need to use an alternate way of implementing this to avoid conflicts.
+    fun registerDispenserBehaviors() {
+        // register(listOf(PotionContents.createItemStack(Items.POTION, Potions.WATER).item)) { SaccharineLogSlatheredBlock.createBehavior() }
+        // register(listOf(Items.HONEY_BOTTLE)) { SaccharineLogBlock.createBehavior() }
+        // register(listOf(Items.HONEY_BOTTLE, Items.GLASS_BOTTLE)) { item -> SaccharineLeafBlock.createBehavior(item)}
+        applyBehaviors()
+    }
+}

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

@@ -28,8 +28,6 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
-import net.minecraft.world.item.alchemy.PotionContents
-import net.minecraft.world.item.alchemy.Potions
 import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.LevelAccessor
@@ -69,16 +67,9 @@ class SaccharineLeafBlock(settings: Properties) : LeavesBlock(settings) {
 
                 if (blockState.block is SaccharineLeafBlock) {
                     val currentAge = blockState.getValue(AGE)
-
-                    val waterBottle = PotionContents.createItemStack(Items.POTION, Potions.WATER).item
-
-                    val newAge = when (item) {
-                        Items.HONEY_BOTTLE if currentAge < MAX_AGE ->
-                            (currentAge + 2).coerceAtMost(MAX_AGE)
-
-                        waterBottle if currentAge > MIN_AGE ->
-                            (currentAge - 2).coerceAtLeast(MIN_AGE)
-
+                    val newAge = when {
+                        item == Items.HONEY_BOTTLE && currentAge < MAX_AGE -> (currentAge + 2).coerceAtMost(MAX_AGE)
+                        item == Items.GLASS_BOTTLE && currentAge > MIN_AGE -> (currentAge - 2).coerceAtLeast(MIN_AGE)
                         else -> currentAge
                     }
 
@@ -88,23 +79,21 @@ class SaccharineLeafBlock(settings: Properties) : LeavesBlock(settings) {
                         stack.shrink(1)
 
                         val dispenserEntity = source.blockEntity
-                        val outputItem = Items.GLASS_BOTTLE
+                        val outputItem = if (item == Items.HONEY_BOTTLE) Items.GLASS_BOTTLE else Items.HONEY_BOTTLE
                         val outputStack = ItemStack(outputItem)
                         var added = false
 
-                        if (dispenserEntity != null) {
-                            for (i in 0 until dispenserEntity.containerSize) {
-                                val slotStack = dispenserEntity.getItem(i)
+                        for (i in 0 until dispenserEntity.containerSize) {
+                            val slotStack = dispenserEntity.getItem(i)
 
-                                if (slotStack.isEmpty) {
-                                    dispenserEntity.setItem(i, outputStack.copy())
-                                    added = true
-                                    break
-                                } else if (slotStack.`is`(outputItem) && slotStack.count < slotStack.maxStackSize) {
-                                    slotStack.grow(1)
-                                    added = true
-                                    break
-                                }
+                            if (slotStack.isEmpty) {
+                                dispenserEntity.setItem(i, outputStack.copy())
+                                added = true
+                                break
+                            } else if (slotStack.`is`(outputItem) && slotStack.count < slotStack.maxStackSize) {
+                                slotStack.grow(1)
+                                added = true
+                                break
                             }
                         }
 

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

@@ -25,7 +25,6 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
 import net.minecraft.world.level.Level
-import net.minecraft.world.level.block.DispenserBlock
 import net.minecraft.world.level.block.HorizontalDirectionalBlock
 import net.minecraft.world.level.block.RotatedPillarBlock
 import net.minecraft.world.level.block.state.BlockState
@@ -38,7 +37,7 @@ class SaccharineLogBlock(properties: Properties) : RotatedPillarBlock(properties
         fun createBehavior(): DispenseItemBehavior {
             return DispenseItemBehavior { source, stack ->
                 val level = source.level
-                val facing = source.state.getValue(DispenserBlock.FACING)
+                val facing = source.state.getValue(HorizontalDirectionalBlock.FACING)
                 val pos = source.pos.relative(facing)
                 val blockState = level.getBlockState(pos)
 
@@ -51,13 +50,7 @@ class SaccharineLogBlock(properties: Properties) : RotatedPillarBlock(properties
             }
         }
 
-        fun changeLogTypeDispenser(
-            level: ServerLevel,
-            pos: BlockPos,
-            newState: BlockState,
-            stack: ItemStack,
-            source: BlockSource
-        ) {
+        fun changeLogTypeDispenser(level: ServerLevel, pos: BlockPos, newState: BlockState, stack: ItemStack, source: BlockSource) {
             level.setBlock(pos, newState, 3)
             level.gameEvent(null, GameEvent.BLOCK_CHANGE, pos)
 
@@ -82,23 +75,11 @@ class SaccharineLogBlock(properties: Properties) : RotatedPillarBlock(properties
             }
 
             if (!added) {
-                Containers.dropItemStack(
-                    level,
-                    source.pos.x.toDouble(),
-                    source.pos.y.toDouble(),
-                    source.pos.z.toDouble(),
-                    glassBottle
-                )
+                Containers.dropItemStack(level, source.pos.x.toDouble(), source.pos.y.toDouble(), source.pos.z.toDouble(), glassBottle)
             }
         }
 
-        fun changeLogType(
-            level: Level,
-            pos: BlockPos,
-            newState: BlockState,
-            player: Player? = null,
-            itemStack: ItemStack? = null
-        ) {
+        fun changeLogType(level: Level, pos: BlockPos, newState: BlockState, player: Player? = null, itemStack: ItemStack? = null) {
             level.setBlock(pos, newState, 3)
             level.gameEvent(null, GameEvent.BLOCK_CHANGE, pos)
 
@@ -112,15 +93,7 @@ class SaccharineLogBlock(properties: Properties) : RotatedPillarBlock(properties
         }
     }
 
-    override fun useItemOn(
-        stack: ItemStack,
-        state: BlockState,
-        level: Level,
-        pos: BlockPos,
-        player: Player,
-        hand: InteractionHand,
-        hitResult: BlockHitResult
-    ): ItemInteractionResult {
+    override fun useItemOn(stack: ItemStack, state: BlockState, level: Level, pos: BlockPos, player: Player, hand: InteractionHand, hitResult: BlockHitResult): ItemInteractionResult {
         val axis = state.getValue(AXIS)
         val itemStack = player.getItemInHand(hand)
         if (!level.isClientSide && itemStack.`is`(Items.HONEY_BOTTLE) && axis == Direction.Axis.Y) {

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

@@ -16,9 +16,7 @@ import net.minecraft.core.Direction
 import net.minecraft.util.StringRepresentable
 import net.minecraft.world.item.context.BlockPlaceContext
 import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.LevelAccessor
 import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.Blocks
 import net.minecraft.world.level.block.HorizontalDirectionalBlock
 import net.minecraft.world.level.block.SimpleWaterloggedBlock
 import net.minecraft.world.level.block.state.BlockState
@@ -26,8 +24,6 @@ import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING
 import net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED
 import net.minecraft.world.level.block.state.properties.IntegerProperty
-import net.minecraft.world.level.material.FluidState
-import net.minecraft.world.level.material.Fluids
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.Shapes
 import net.minecraft.world.phys.shapes.VoxelShape
@@ -49,7 +45,7 @@ class StackableItemBlock(settings: Properties, val type: StackableItemBlockType)
     }
 
     companion object {
-        val MAX_AMOUNT: Int = 4
+        val MAX_AMOUNT: Int = 8
         val AMOUNT: IntegerProperty = IntegerProperty.create("amount", 1, MAX_AMOUNT)
 
         val CODEC: MapCodec<StackableItemBlock> = RecordCodecBuilder.mapCodec { it.group(
@@ -167,16 +163,6 @@ class StackableItemBlock(settings: Properties, val type: StackableItemBlockType)
         builder.add(HORIZONTAL_FACING, AMOUNT, WATERLOGGED)
     }
 
-    override fun getFluidState(blockState: BlockState): FluidState? = if (blockState.getValue(WATERLOGGED)) Fluids.WATER.getSource(false) else super.getFluidState(blockState)
-
-    override fun updateShape(state: BlockState, direction: Direction, neighborState: BlockState, world: LevelAccessor, pos: BlockPos, neighborPos: BlockPos): BlockState {
-        if (state.getValue(WATERLOGGED)) {
-            world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world))
-        }
-        return if (state.getValue(HORIZONTAL_FACING).opposite == direction && !state.canSurvive(world, pos)) Blocks.AIR.defaultBlockState()
-        else super.updateShape(state, direction, neighborState, world, pos, neighborPos)
-    }
-
     override fun getCollisionShape(state: BlockState, level: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape {
         val direction = state.getValue(HORIZONTAL_FACING)
         val count = state.getValue(AMOUNT)
@@ -189,9 +175,8 @@ class StackableItemBlock(settings: Properties, val type: StackableItemBlockType)
 
     override fun getStateForPlacement(context: BlockPlaceContext): BlockState? {
         val blockState = context.level.getBlockState(context.clickedPos)
-        val fluidState = context.level.getFluidState(context.clickedPos)
         return if (blockState.`is`(this)) blockState.setValue(AMOUNT, min(getMaxAmount(type), (blockState.getValue(AMOUNT) + 1)))
-            else super.getStateForPlacement(context)?.setValue(HORIZONTAL_FACING, context.horizontalDirection.opposite)?.setValue(WATERLOGGED, fluidState.type === Fluids.WATER)
+            else super.getStateForPlacement(context)?.setValue(HORIZONTAL_FACING, context.horizontalDirection.opposite)
     }
 
     override fun canBeReplaced(state: BlockState, useContext: BlockPlaceContext): Boolean {

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

@@ -8,6 +8,8 @@
 
 package com.cobblemon.mod.common.block
 
+import com.cobblemon.mod.common.block.StackableItemBlock.Companion.AMOUNT
+import com.cobblemon.mod.common.block.StackableItemBlock.Companion.MAX_AMOUNT
 import com.cobblemon.mod.common.util.rotateShape
 import com.mojang.serialization.MapCodec
 import com.mojang.serialization.codecs.RecordCodecBuilder
@@ -21,7 +23,6 @@ import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING
 import net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED
-import net.minecraft.world.level.block.state.properties.IntegerProperty
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.Shapes
 import net.minecraft.world.phys.shapes.VoxelShape
@@ -39,9 +40,6 @@ class WallAttachedStackableItemBlock(settings: Properties, val type: WallStackab
     }
 
     companion object {
-        val MAX_AMOUNT: Int = 8
-        val AMOUNT: IntegerProperty = IntegerProperty.create("amount", 1, MAX_AMOUNT)
-
         val CODEC: MapCodec<WallAttachedStackableItemBlock> = RecordCodecBuilder.mapCodec { it.group(
             propertiesCodec(),
             WallStackableItemBlockType.CODEC.fieldOf("type").forGetter(WallAttachedStackableItemBlock::type)

common/src/main/kotlin/com/cobblemon/mod/common/block/campfirepot/CampfireBlock.kt

@@ -151,15 +151,13 @@ class CampfireBlock(settings: Properties, val isSoul: Boolean) : BaseEntityBlock
     override fun placeLiquid(level: LevelAccessor, pos: BlockPos, state: BlockState, fluidState: FluidState): Boolean {
         val blockEntity = level.getBlockEntity(pos)
         if (fluidState.type === Fluids.WATER && blockEntity is CampfireBlockEntity) {
-            if (level is Level) {
-                if (!level.isClientSide) {
-                    removePotItem(blockEntity, state, level, pos, null, true)
-                    level.playSoundServer(pos.center, SoundEvents.GENERIC_EXTINGUISH_FIRE, SoundSource.BLOCKS, 1.0F, 1.0F)
-                }
-
-                if (level.isClientSide) for (i in 0..19) MCCampfireBlock.makeParticles(level, pos, false, true)
+            if (!level.isClientSide) {
+                removePotItem(blockEntity, state, level as Level, pos, null, true)
+                level.playSoundServer(pos.center, SoundEvents.GENERIC_EXTINGUISH_FIRE, SoundSource.BLOCKS, 1.0F, 1.0F)
             }
 
+            if (level.isClientSide) for (i in 0..19) MCCampfireBlock.makeParticles(level as Level, pos, false, true)
+
             level.scheduleTick(pos, fluidState.type, fluidState.type.getTickDelay(level))
             return true
         } else {

common/src/main/kotlin/com/cobblemon/mod/common/block/dispenser/ChainedDispenseItemBehavior.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.block.dispenser
-
-import net.minecraft.core.dispenser.BlockSource
-import net.minecraft.core.dispenser.DispenseItemBehavior
-import net.minecraft.world.item.ItemStack
-import java.util.concurrent.CopyOnWriteArrayList
-
-class ChainedDispenseItemBehavior(private val base: DispenseItemBehavior) : DispenseItemBehavior {
-    private val extras = CopyOnWriteArrayList<DispenseItemBehavior>()
-
-    fun add(behavior: DispenseItemBehavior) {
-        extras.add(behavior)
-    }
-
-    override fun dispense(blockSource: BlockSource, itemStack: ItemStack): ItemStack {
-
-        var current = itemStack
-        for (b in extras) {
-            val prev = current.copy()
-            val next = try {
-                b.dispense(blockSource, current)
-            } catch (t: Throwable) {
-                continue
-            }
-            current = next
-            if (handled(prev, current)) {
-                return current
-            }
-        }
-
-        val beforeBase = current.copy()
-        val afterBase = try {
-            base.dispense(blockSource, current)
-        } catch (_: Throwable) {
-            return current
-        }
-
-        if (handled(beforeBase, afterBase)) {
-            return afterBase
-        }
-
-        return afterBase
-    }
-
-    private fun handled(before: ItemStack, after: ItemStack): Boolean {
-        return !ItemStack.matches(before, after)
-    }
-
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/dispenser/DispenserBehaviorRegistry.kt

@@ -1,90 +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.block.dispenser
-
-import com.cobblemon.mod.common.block.SaccharineLeafBlock
-import com.cobblemon.mod.common.block.SaccharineLogBlock
-import com.cobblemon.mod.common.block.SaccharineLogSlatheredBlock
-import com.cobblemon.mod.common.mixin.accessor.DispenserBlockAccessor
-import net.minecraft.core.dispenser.DispenseItemBehavior
-import net.minecraft.world.item.Item
-import net.minecraft.world.item.Items
-import net.minecraft.world.item.alchemy.PotionContents
-import net.minecraft.world.item.alchemy.Potions
-import net.minecraft.world.level.block.DispenserBlock
-
-object DispenserBehaviorRegistry {
-    private val behaviors = mutableMapOf<Item, DispenseItemBehavior>()
-
-    fun register(items: List<Item>, behaviorProvider: (Item) -> DispenseItemBehavior) {
-        register(behaviorProvider, items = items)
-    }
-
-    fun register(vararg behaviorProviders: (Item) -> DispenseItemBehavior, items: List<Item>) {
-        for (item in items) {
-            val providedBehaviors = behaviorProviders.map { provider -> provider(item) }
-
-            val existingLocal = behaviors[item]
-            if (existingLocal is ChainedDispenseItemBehavior) {
-                providedBehaviors.forEach { existingLocal.add(it) }
-                continue
-            }
-
-            val currentRegistered = getCurrentRegisteredBehavior(item)
-            if (currentRegistered is ChainedDispenseItemBehavior) {
-                behaviors[item] = currentRegistered
-                providedBehaviors.forEach { currentRegistered.add(it) }
-                continue
-            }
-
-            val base = currentRegistered ?: DispenseItemBehavior.NOOP
-            val chained = ChainedDispenseItemBehavior(base)
-            providedBehaviors.forEach { chained.add(it) }
-
-            behaviors[item] = chained
-            DispenserBlock.registerBehavior(item, chained)
-        }
-    }
-
-    private fun getCurrentRegisteredBehavior(item: Item): DispenseItemBehavior? {
-        return try {
-            val map = DispenserBlockAccessor.getItemBehaviors()
-            map[item]
-        } catch (t: Throwable) {
-            DispenseItemBehavior.LOGGER.error("Failed to read existing dispenser behaviors via mixin accessor", t)
-            null
-        }
-    }
-
-    fun registerDispenserBehaviors() {
-        register(
-            { SaccharineLogSlatheredBlock.createBehavior() },
-            items = listOf(
-                PotionContents.createItemStack(
-                    Items.POTION,
-                    Potions.WATER
-                ).item
-            )
-        )
-        register(
-            { SaccharineLogBlock.createBehavior() },
-            items = listOf(Items.HONEY_BOTTLE)
-        )
-        register(
-            { item -> SaccharineLeafBlock.createBehavior(item) },
-            items = listOf(
-                Items.HONEY_BOTTLE,
-                PotionContents.createItemStack(
-                    Items.POTION,
-                    Potions.WATER
-                ).item
-            )
-        )
-    }
-}

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

@@ -65,9 +65,6 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon
     private val growthPoints = arrayListOf<ResourceLocation>()
     var mulchVariant = MulchVariant.NONE
 
-    // For Random Tick compensation: records the game time of last tick
-    var lastTickTime: Long = 0L
-
     /**
      * The idea behind the growth point sequence is it's a 16-long string of
      * hexadecimal numbers. They represent the order of the growth points that
@@ -270,7 +267,6 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon
             } catch (ignored: ResourceLocationException) {}
         }
         this.mulchDuration = nbt.getInt(MULCH_DURATION)
-        this.lastTickTime = nbt.getLong(LAST_TICK_TIME)
         this.wasLoading = false
         if (nbt.contains(GROWTH_POINTS_SEQUENCE)) {
             growthPointSequence = nbt.getString(GROWTH_POINTS_SEQUENCE)
@@ -291,7 +287,6 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon
         nbt.putInt(MULCH_DURATION, mulchDuration)
         nbt.putString(GROWTH_POINTS_SEQUENCE, growthPointSequence)
         nbt.putString(MULCH_VARIANT, mulchVariant.toString())
-        nbt.putLong(LAST_TICK_TIME, lastTickTime)
     }
 
     override fun setChanged() {
@@ -351,39 +346,24 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon
         return
     }
 
-    /**
-     * Process Random Tick compensation logic.
-     * Calculates elapsed time since last tick and batch-decrements stageTimer.
-     */
-    fun processTick(world: ServerLevel, pos: BlockPos, state: BlockState): Boolean {
-        if (state.getValue(BerryBlock.IS_ROOTED)) return false
-        
-        val currentTime = world.gameTime
-        val elapsed = if (lastTickTime > 0L) {
-            (currentTime - lastTickTime).toInt().coerceAtLeast(1)
-        } else {
-            1 // First tick, only decrement by 1
-        }
-        lastTickTime = currentTime
-        
-        // Batch decrement the timer
-        if (stageTimer > 0) {
-            stageTimer = (stageTimer - elapsed).coerceAtLeast(0)
-        }
-        
-        // Return whether growth is needed
-        return stageTimer <= 0
-    }
-
     //Using a similar approach to ComputerCraft, implement this client side
     interface RenderState : AutoCloseable {
         var needsRebuild: Boolean
     }
 
     companion object {
+        internal val TICKER = BlockEntityTicker<BerryBlockEntity> { world, pos, state, blockEntity ->
+            if (world.isClientSide) return@BlockEntityTicker
+            if (state.getValue(BerryBlock.IS_ROOTED)) return@BlockEntityTicker
+            if (blockEntity.stageTimer >= 0) {
+                blockEntity.stageTimer--
+            }
+            if (blockEntity.stageTimer <= 0) {
+                (state.block as BerryBlock).growHelper(world as ServerLevel, world.random, pos, state)
+            }
+        }
         //private const val LIFE_CYCLES = "life_cycles"
         private const val GROWTH_POINTS = "GrowthPoints"
-        private const val LAST_TICK_TIME = "LastTickTime"
         private const val GROWTH_POINTS_SEQUENCE = "GrowthPointsSequence"
         private const val GROWTH_TIMER = "GrowthTimer"
         private const val STAGE_TIMER = "StageTimer"

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

@@ -29,7 +29,6 @@ import com.cobblemon.mod.common.api.spawning.influence.SpawnBaitInfluence
 import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.api.spawning.spawner.FixedAreaSpawner
-import com.cobblemon.mod.common.api.spawning.spawner.PokeSnackSpawnerFactory
 import com.cobblemon.mod.common.block.PokeSnackBlock
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.item.components.BaitEffectsComponent
@@ -63,22 +62,41 @@ open class PokeSnackBlockEntity(pos: BlockPos, state: BlockState) :
     }
 
     val spawner: FixedAreaSpawner by lazy {
-        val server = level as ServerLevel
-
-        val baitEffects = getBaitEffects()
-
-        val ctx = PokeSnackSpawnerFactory.Context(
-            world = server,
-            pos = blockPos,
+        FixedAreaSpawner(
+            name = "poke_snack_spawner_${level?.dimension()?.location()}}_$blockPos",
+            spawnPool = CobblemonSpawnPools.WORLD_SPAWN_POOL,
+            world = level as ServerLevel,
+            position = blockPos,
             horizontalRadius = RADIUS,
             verticalRadius = RADIUS,
-            maxPokemonPerChunk = Cobblemon.config.pokeSnackPokemonPerChunk,
-            name = "poke_snack_spawner_${server.dimension().location()}_$blockPos",
-            baitEffects = baitEffects
-        )
+            maxPokemonPerChunk = Cobblemon.config.pokeSnackPokemonPerChunk
+        ).also {
+            it.influences.add(this)
 
-        PokeSnackSpawnerFactory.create(ctx).also { spawner ->
-            spawner.influences.add(this)
+            val baitEffects = getBaitEffects()
+
+            val stackedLureTier = baitEffects
+                .filter { it.type == SpawnBait.Effects.RARITY_BUCKET }
+                .sumOf { it.value }
+                .toInt()
+
+            if (stackedLureTier > 0) {
+                it.influences += BucketNormalizingInfluence(
+                    tier = stackedLureTier,
+                    gradient = 0.2F,
+                    firstTier = 1.2F
+                )
+            }
+
+            it.influences += BucketMultiplyingInfluence(
+                mapOf(
+                    "uncommon" to 2.25f,
+                    "rare" to 5.5f,
+                    "ultra-rare" to 5.5f,
+                )
+            )
+
+            it.influences += SpawnBaitInfluence(effects = baitEffects)
         }
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/block/multiblock/FossilMultiblockStructure.kt

@@ -128,11 +128,11 @@ class FossilMultiblockStructure (
 
                 if(pokemon != null) {
                     pokemon.caughtBall = ballType
+                    player.party().add(pokemon)
                     this.fossilState.growthState = "Taken"
                     player.playSound(CobblemonSounds.FOSSIL_MACHINE_RETRIEVE_POKEMON, 1.0F, 1.0F)
                     CobblemonEvents.FOSSIL_REVIVED.post(FossilRevivedEvent(pokemon, player))
                     CobblemonCriteria.RESURRECT_POKEMON.trigger(player, pokemon)
-                    player.party().add(pokemon)
                 }
 
                 // Turn the monitor off

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

@@ -27,7 +27,6 @@ import com.cobblemon.mod.common.client.gui.PartyOverlayDataControl
 import com.cobblemon.mod.common.client.gui.RideControlsOverlay
 import com.cobblemon.mod.common.client.gui.battle.BattleOverlay
 import com.cobblemon.mod.common.client.gui.cookingpot.CookingPotScreen
-import com.cobblemon.mod.common.client.gui.party.PartyTutorialToasts
 import com.cobblemon.mod.common.client.particle.BedrockParticleOptionsRepository
 import com.cobblemon.mod.common.client.render.ClientPlayerIcon
 import com.cobblemon.mod.common.client.render.DeferredRenderer
@@ -129,8 +128,6 @@ object CobblemonClient {
         battleOverlay.onLogout()
         ClientTaskTracker.clear()
         checkedStarterScreen = false
-        overlay.resetAttachedToast()
-        PartyTutorialToasts.reset()
 //        CobblemonDataProvider.canReload = true
         DeferredRenderer.clearAll()
         ClientPlayerIcon.clear()
@@ -168,12 +165,13 @@ object CobblemonClient {
         PlatformEvents.CLIENT_TICK_POST.subscribe { event ->
             val player = event.client.player
             if (player != null) {
-                val selectedItem = player.inventory.getItem(player.inventory.selected)
+                var selectedItem = player.inventory.getItem(player.inventory.selected)
                 if (pokedexUsageContext.scanningGuiOpen &&
                     !(selectedItem.`is`(CobblemonItemTags.POKEDEX)) &&
                     !(player.offhandItem.`is`(CobblemonItemTags.POKEDEX) &&
-                            player.isUsingItem &&
-                            player.usedItemHand == InteractionHand.OFF_HAND)
+                            player.isUsingItem == true &&
+                            player.usedItemHand == InteractionHand.OFF_HAND
+                            )
                 ) {
                     // Stop using Pokédex in main hand if player switches to a different slot in hotbar
                     pokedexUsageContext.stopUsing(PokedexUsageContext.OPEN_SCANNER_BUFFER_TICKS + 1)
@@ -218,7 +216,7 @@ object CobblemonClient {
     }
 
     fun registerColors() {
-        this.implementation.registerBlockColors(BlockColor { _, view, blockPos, _ ->
+        this.implementation.registerBlockColors(BlockColor { blockState, view, blockPos, tintIndex ->
             blockPos?.let { pos ->
                 view?.getBlockEntity(pos)?.let { blockEntity ->
                     if (blockEntity is TintBlockEntity) return@BlockColor blockEntity.getTint()

common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt

@@ -507,7 +507,9 @@ class PokemonClientDelegate : PosableState(), PokemonSideDelegate {
 
     override fun positionRider(passenger: Entity, positionUpdater: MoveFunction) {
         val locatorName = getSeatLocator(passenger)
-        val locator = this.locatorStates[locatorName] ?: return
+        val locator = this.locatorStates[locatorName]
+
+        if (locator == null) return
 
         val offset = locator.matrix.getTranslation(Vector3f())
             .sub(

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

@@ -12,17 +12,16 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.gui.drawPosablePortrait
-import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.api.text.darkGray
 import com.cobblemon.mod.common.api.text.red
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.battle.BattleGUI
-import com.cobblemon.mod.common.client.gui.party.PartyTutorialToasts
 import com.cobblemon.mod.common.client.gui.toast.CobblemonToast
 import com.cobblemon.mod.common.client.keybind.boundKey
-import com.cobblemon.mod.common.client.keybind.keybinds.*
+import com.cobblemon.mod.common.client.keybind.keybinds.HidePartyBinding
+import com.cobblemon.mod.common.client.keybind.keybinds.SummaryBinding
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.client.render.getDepletableRedGreen
 import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
@@ -30,7 +29,6 @@ import com.cobblemon.mod.common.client.render.renderScaledGuiItemIcon
 import com.cobblemon.mod.common.pokemon.Gender
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
-import com.cobblemon.mod.common.util.toAssetPath
 import java.util.UUID
 import net.minecraft.client.DeltaTracker
 import net.minecraft.client.Minecraft
@@ -40,7 +38,6 @@ import net.minecraft.client.gui.components.toasts.AdvancementToast
 import net.minecraft.client.gui.components.toasts.Toast
 import net.minecraft.client.gui.screens.ChatScreen
 import net.minecraft.client.gui.screens.Screen
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.Mth
 import kotlin.math.ceil
 import kotlin.math.floor
@@ -151,9 +148,6 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
         val portraitFrameOffsetY = 2
         val selectedSlot = CobblemonClient.storage.selectedSlot
 
-        val partySize = party.slots.count { it != null }
-        PartyTutorialToasts.onOverlayRender(partySize)
-
         party.forEachIndexed { index, pokemon ->
             if (pokemon != null) {
                 val selectedOffsetX = if (selectedSlot == index) 6 else 0
@@ -230,7 +224,7 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
                 var levelScrollOffset = 0F
                 var levelScrollPositionOffset = 0F
                 var levelScrollSize = 17F
-                if (expGainedData?.oldLevel != null) {
+                if (expGainedData != null && expGainedData.oldLevel != null) {
                     val ticksWithDelta = (expGainedData.ticks + partialDeltaTicks) - (PartyOverlayDataControl.BAR_UPDATE_BEFORE_TIME + PartyOverlayDataControl.BAR_FLASH_TIME)
                     val transition = ticksWithDelta / PartyOverlayDataControl.LEVEL_UP_PORTRAIT_TIME
                     if ((0F..<1F).contains(transition)) {
@@ -404,48 +398,10 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
                     blue = expBlue
                 )
 
-                //Handling EXP Text
-
-                var expGained = 0
-                var expTextTransparency = 0F
-                var expTextOffset = 0F
-
-                if (expGainedData != null) {
-                    expGained = expGainedData.expGained
-                    val ticksWithDelta = expGainedData.ticks + partialDeltaTicks
-                    if (ticksWithDelta <= PartyOverlayDataControl.EXP_POPUP_TIME.fadeIn) {
-                        val transition = ticksWithDelta / PartyOverlayDataControl.EXP_POPUP_TIME.fadeIn
-                        val step = (floor(transition * 3)) + 1
-                        expTextTransparency = step * 0.25F
-                        expTextOffset = 4 - step
-                    } else if (ticksWithDelta <= PartyOverlayDataControl.EXP_POPUP_TIME.fadeIn + PartyOverlayDataControl.EXP_POPUP_TIME.hold) {
-                        expTextTransparency = 1F
-                        expTextOffset = 0F
-                    } else {
-                        val adjustedTicks = ticksWithDelta - (PartyOverlayDataControl.EXP_POPUP_TIME.fadeIn + PartyOverlayDataControl.EXP_POPUP_TIME.hold)
-                        val transition = adjustedTicks / PartyOverlayDataControl.EXP_POPUP_TIME.fadeOut
-                        val step = (floor(transition * 3)) + 1
-                        expTextTransparency = 1F - (step * 0.25F)
-                        expTextOffset = -step
-                    }
-                }
-
-                if (expTextTransparency > 0) {
-                    drawScaledText(
-                        context = context,
-                        text = lang("ui.exp.number", expGained.toString()).bold(),
-                        x = panelX + selectedOffsetX + 57F,
-                        y = indexY + 17F + expTextOffset,
-                        scale = SCALE,
-                        shadow = true,
-                        opacity = expTextTransparency
-                    )
-                }
-
-                //Handling Popups
                 var ticksForMove = -1F
                 var ticksForEvo = -1F
 
+                //Handling Popups
                 if (expGainedData != null) {
                     val ticksWithDelta = expGainedData.ticks + partialDeltaTicks
                     val ticks = ticksWithDelta - (PartyOverlayDataControl.BAR_UPDATE_BEFORE_TIME + PartyOverlayDataControl.BAR_FLASH_TIME)
@@ -476,7 +432,7 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
                             return 0F to 1F
                         } else {
                             val adjustedPopupTicks = ticks - (PartyOverlayDataControl.POPUP_TIME.fadeIn + PartyOverlayDataControl.POPUP_TIME.hold)
-                            val transition = adjustedPopupTicks / PartyOverlayDataControl.POPUP_TIME.fadeOut
+                            val transition = adjustedPopupTicks / PartyOverlayDataControl.POPUP_TIME.fadeIn
                             val step = (floor(transition * 3)) + 1
                             return (-step) to (1F - (step * 0.25F))
                         }
@@ -490,7 +446,7 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
                     blitk(
                         matrixStack = matrices,
                         texture = newEvoPopup,
-                        x = (panelX + selectedOffsetX + (if (expTextTransparency > 0 && movePopupTransparency > 0) 78F else 56.5F)) / SCALE,
+                        x = (panelX + selectedOffsetX + 56.5F) / SCALE,
                         y = (indexY + 4 + evoPopupYOffset) / SCALE,
                         width = 37,
                         height = 20,
@@ -503,7 +459,7 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
                         matrixStack = matrices,
                         texture = newMovesPopup,
                         x = (panelX + selectedOffsetX + 56.5F) / SCALE,
-                        y = (indexY + (if (expTextTransparency > 0) 4 else 17) + movePopupYOffset) / SCALE,
+                        y = (indexY + 17 + movePopupYOffset) / SCALE,
                         width = 37,
                         height = 20,
                         scale = SCALE,
@@ -511,7 +467,7 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
                     )
                 }
 
-                val ballIcon = pokemon.caughtBall.name.toAssetPath("textures/gui/ball/", ".png")
+                val ballIcon = cobblemonResource("textures/gui/ball/" + pokemon.caughtBall.name.path + ".png")
                 val ballHeight = 22
                 blitk(
                     matrixStack = matrices,

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

@@ -19,10 +19,10 @@ object PartyOverlayDataControl {
     const val BAR_UPDATE_BEFORE_TIME = 15
     const val BAR_UPDATE_AFTER_TIME = 15
     const val BAR_FLASH_TIME = 2
-    const val BAR_UPDATE_NO_LEVEL_TIME = BAR_UPDATE_BEFORE_TIME + BAR_UPDATE_AFTER_TIME + BAR_FLASH_TIME
     val POPUP_TIME = FadeTimings(3, 40, 3)
     const val LEVEL_UP_PORTRAIT_TIME = 10
-    val EXP_POPUP_TIME = FadeTimings(3, BAR_UPDATE_BEFORE_TIME + BAR_FLASH_TIME + POPUP_TIME.total() - 6, 3)
+
+    val BAR_UPDATE_NO_LEVEL_TIME = BAR_UPDATE_BEFORE_TIME + BAR_UPDATE_AFTER_TIME + BAR_FLASH_TIME
 
     private enum class RenderTarget {
         NONE,
@@ -35,19 +35,21 @@ object PartyOverlayDataControl {
 
     private var barFillupSound: SoundInstance? = null
     private var levelUpJingleSound: SoundInstance? = null
-    private var levelUpJingleSoundType: SoundEvent? = null
 
     fun pokemonGainedExp(pokemonUuid : UUID, oldLevel: Int?, expGained: Int, countOfMovesLearned: Int, countOfEvosUnlocked: Int = 0) {
+        var time = BAR_UPDATE_NO_LEVEL_TIME
+        if (countOfMovesLearned > 0 || countOfEvosUnlocked > 0) {
+            time = BAR_UPDATE_BEFORE_TIME + BAR_FLASH_TIME + POPUP_TIME.total()
+        }
+
         val data = overlayData[pokemonUuid]
-        val newData = ExpGainedData(oldLevel, expGained, countOfMovesLearned, countOfEvosUnlocked).also { it.ticksMax = BAR_UPDATE_BEFORE_TIME + BAR_FLASH_TIME + POPUP_TIME.total() }
+        val newData = ExpGainedData(oldLevel, expGained, countOfMovesLearned, countOfEvosUnlocked).also { it.ticksMax = time }
         if (data != null) {
-            if (data.movesGainedData != null) { //Absorb Data
+            if (data.movesGainedData != null) {
                 newData.countOfMovesLearned += data.movesGainedData!!.movesCount
-                data.movesGainedData = null
             }
-            if (data.evoGainedData != null) { //Absorb Data
+            if (data.evoGainedData != null) {
                 newData.countOfEvosUnlocked += data.evoGainedData!!.evolutionCount
-                data.evoGainedData = null
             }
 
             val expData = data.expGainedData
@@ -70,7 +72,8 @@ object PartyOverlayDataControl {
         val data = overlayData[pokemonUuid]
         val newData = EvolutionGainedData(evoCount).also { it.ticksMax = POPUP_TIME.total() }
         if (data != null) {
-            if (data.expGainedData != null) {
+            if (data.expGainedData != null && data.expGainedData!!.ticks < BAR_UPDATE_BEFORE_TIME + BAR_FLASH_TIME) {
+                data.expGainedData!!.ticksMax = BAR_UPDATE_BEFORE_TIME + BAR_FLASH_TIME + POPUP_TIME.total()
                 data.expGainedData!!.countOfEvosUnlocked += evoCount
                 return
             }
@@ -90,7 +93,8 @@ object PartyOverlayDataControl {
         val data = overlayData[pokemonUuid]
         val newData = MovesGainedData(movesCount).also { it.ticksMax = POPUP_TIME.total() }
         if (data != null) {
-            if (data.expGainedData != null) {
+            if (data.expGainedData != null && data.expGainedData!!.ticks < BAR_UPDATE_BEFORE_TIME + BAR_FLASH_TIME) {
+                data.expGainedData!!.ticksMax = BAR_UPDATE_BEFORE_TIME + BAR_FLASH_TIME + POPUP_TIME.total()
                 data.expGainedData!!.countOfMovesLearned += movesCount
                 return
             }
@@ -133,28 +137,13 @@ object PartyOverlayDataControl {
     fun tick(paused: Boolean) {
         val deletion = mutableListOf<UUID>()
         if (paused) return
-
-        if (levelUpJingleSound != null && !Minecraft.getInstance().soundManager.isActive(levelUpJingleSound!!)) {
-            levelUpJingleSound = null
-            levelUpJingleSoundType = null
-        }
-
         overlayData.forEach { (id, data) ->
             if (data.expGainedData != null) { // We update this in order and render these in order, and as such we don't tick others
                 val expGainedData = data.expGainedData!!
                 expGainedData.ticks += 1
                 if (expGainedData.ticks == BAR_UPDATE_BEFORE_TIME && expGainedData.oldLevel != null) {
-                    if (expGainedData.countOfEvosUnlocked > 0) {
-                        stopSound(levelUpJingleSound)
-                        levelUpJingleSound = playSound(CobblemonSounds.EVOLUTION_NOTIFICATION)
-                        levelUpJingleSoundType = CobblemonSounds.EVOLUTION_NOTIFICATION
-                    } else {
-                        if (levelUpJingleSoundType != CobblemonSounds.EVOLUTION_NOTIFICATION) {
-                            stopSound(levelUpJingleSound)
-                            levelUpJingleSound = playSound(CobblemonSounds.LEVELUP)
-                            levelUpJingleSoundType = CobblemonSounds.LEVELUP
-                        }
-                    }
+                    stopSound(levelUpJingleSound)
+                    levelUpJingleSound = playSound(CobblemonSounds.LEVELUP)
                 }
                 if (expGainedData.ticks >= expGainedData.ticksMax) {
                     data.expGainedData = null
@@ -177,7 +166,6 @@ object PartyOverlayDataControl {
             }
             if (getCurrentRenderTarget(id) == RenderTarget.NONE) deletion.add(id)
         }
-
         deletion.forEach {
             overlayData.remove(it)
         }
@@ -228,7 +216,7 @@ object PartyOverlayDataControl {
     //SOUNDS
     private fun playSound(soundEvent: SoundEvent): SoundInstance? {
         if (!PartyOverlay.canRender()) return null
-        val soundInstance = SimpleSoundInstance.forUI(soundEvent, 1F, 1F)
+        val soundInstance = SimpleSoundInstance.forUI(soundEvent, 1F)
         Minecraft.getInstance().soundManager.play(soundInstance)
         return soundInstance
     }

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

@@ -47,7 +47,6 @@ fun drawProfilePokemon(
     a: Float = 1F,
     headYaw: Float = 0f,
     headPitch: Float = 0f,
-    blockLight: Int = 13
 ) = drawProfilePokemon(
     species = renderablePokemon.species.resourceIdentifier,
     matrixStack = matrixStack,
@@ -64,7 +63,6 @@ fun drawProfilePokemon(
     a = a,
     headYaw = headYaw,
     headPitch = headPitch,
-    blockLight = blockLight
 )
 
 fun drawProfilePokemon(
@@ -84,7 +82,6 @@ fun drawProfilePokemon(
     a: Float = 1F,
     headYaw: Float = 0f,
     headPitch: Float = 0f,
-    blockLight: Int = 13
 ) {
     RenderSystem.applyModelViewMatrix()
     matrixStack.scale(scale, scale, -scale)
@@ -141,7 +138,7 @@ fun drawProfilePokemon(
         val light1 = Vector3f(-1F, 1F, 1.0F)
         val light2 = Vector3f(1.3F, -1F, 1.0F)
         RenderSystem.setShaderLights(light1, light2)
-        val packedLight = LightTexture.pack(blockLight, 0)
+        val packedLight = LightTexture.pack(11, 7)
 
         val colour = toHex(r, g, b, a)
         model.withLayerContext(bufferSource, state, VaryingModelRepository.getLayers(species, state)) {

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

@@ -1,153 +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
-
-import com.cobblemon.mod.common.api.gui.blitk
-import net.minecraft.client.gui.GuiGraphics
-import net.minecraft.client.gui.components.AbstractWidget
-import net.minecraft.client.gui.components.events.GuiEventListener
-import net.minecraft.client.gui.narration.NarrationElementOutput
-import net.minecraft.network.chat.CommonComponents
-import net.minecraft.resources.ResourceLocation
-import kotlin.math.floor
-
-open class VariableObjectSelectionList(x: Int, y: Int, width: Int, height: Int): AbstractWidget(x, y, width, height, CommonComponents.EMPTY) {
-    val children = mutableListOf<Entry>()
-
-    var listHeight = 0
-    var scrollAmount = 0.0
-
-    fun updateScroll(offset: Double) {
-        setScroll(scrollAmount + offset)
-    }
-
-    fun getMaxScroll(): Int {
-        return (listHeight - height).coerceAtLeast(0)
-    }
-
-    fun setScroll(scroll: Double) {
-        scrollAmount = scroll.coerceIn(0.0, getMaxScroll().toDouble())
-    }
-
-    fun removeEntry(index: Int) {
-        listHeight -= children[index].height
-        children.removeAt(index)
-        updatePositions()
-    }
-
-    fun removeEntry(entry: Entry) {
-        listHeight -= entry.height
-        children.remove(entry)
-        updatePositions()
-    }
-
-    fun removeLastEntry() {
-        listHeight -= children.last().height
-        children.removeLast()
-    }
-
-    fun updatePositions() {
-        var stackHeight = 0
-        children.forEach {
-            it.scrolledY = stackHeight
-            stackHeight += it.height
-        }
-        updateScroll(0.0)
-    }
-
-    fun addEntry(entry: Entry) {
-        children.add(entry)
-        entry.scrolledY = listHeight
-        listHeight += entry.height
-    }
-
-    override fun renderWidget(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, partialTick: Float) {
-        var stackHeight = -scrollAmount.toInt()
-        guiGraphics.enableScissor(x, y, x + width, y + height)
-        children.forEachIndexed { index, entry ->
-            if (stackHeight in 1..<height || stackHeight + entry.height in 1..<height) {
-                entry.render(guiGraphics, index, x, y + stackHeight, mouseX, mouseY, partialTick)
-            }
-            stackHeight += entry.height
-        }
-        guiGraphics.disableScissor()
-    }
-
-    fun getEntryAtPosition(mouseX: Int, mouseY: Int): Entry? {
-        if (mouseX in x..(x + width) && mouseY in y..(y + height)) {
-            var stackHeight = -scrollAmount
-            children.forEach {
-                if (mouseY.toDouble() in (y + stackHeight)..(y + stackHeight + it.height)) {
-                    return it
-                }
-                stackHeight += it.height
-            }
-        }
-        return null
-    }
-
-    fun ensureVisible(index: Int) {
-        val entry = children[index]
-        if (entry.scrolledY - scrollAmount < 0) {
-            setScroll(entry.scrolledY.toDouble())
-        } else if (entry.scrolledY + entry.height > height) {
-            setScroll(entry.scrolledY.toDouble() + entry.height)
-        }
-    }
-
-    override fun mouseScrolled(mouseX: Double, mouseY: Double, horizontalAmount: Double, verticalAmount: Double): Boolean {
-        updateScroll(-verticalAmount * (listHeight / children.size / 2))
-        return true
-    }
-
-    override fun mouseClicked(pMouseX: Double, pMouseY: Double, pButton: Int): Boolean {
-        val entry = getEntryAtPosition(pMouseX.toInt(), pMouseY.toInt())
-        if (entry != null) {
-            return entry.mouseClicked(pMouseX, pMouseY, pButton)
-        }
-        return false
-    }
-
-    override fun mouseReleased(pMouseX: Double, pMouseY: Double, pButton: Int): Boolean {
-        return children.any {
-            it.mouseReleased(pMouseX, pMouseY, pButton)
-        } || super.mouseReleased(pMouseX, pMouseY, pButton)
-    }
-
-    fun getRowTop(entry: Entry): Int {
-        var stackHeight = -scrollAmount.toInt()
-        children.forEach {
-            if (it == entry) {
-                return y + stackHeight
-            }
-            stackHeight += it.height
-        }
-        return y
-    }
-
-    override fun defaultButtonNarrationText(pNarrationElementOutput: NarrationElementOutput) {}
-    override fun updateWidgetNarration(narrationElementOutput: NarrationElementOutput) {}
-
-    abstract inner class Entry(var height: Int): GuiEventListener {
-        var scrolledY: Int = 0
-        private var widgetFocused = false
-
-        override fun setFocused(focused: Boolean) {
-            this.widgetFocused = focused
-        }
-
-        override fun isFocused(): Boolean = widgetFocused
-
-        abstract fun render(guiGraphics: GuiGraphics, index: Int, x: Int, y: Int, mouseX: Int, mouseY: Int, partialTick: Float)
-    }
-
-    inner class EmptySeparator(height: Int): Entry(height) {
-        override fun render(guiGraphics: GuiGraphics, index: Int, x: Int, y: Int, mouseX: Int, mouseY: Int, partialTick: Float) {}
-    }
-}

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

@@ -1,100 +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
-
-import com.cobblemon.mod.common.api.gui.blitk
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.client.gui.GuiGraphics
-import net.minecraft.client.gui.components.AbstractWidget
-import net.minecraft.client.gui.narration.NarrationElementOutput
-import net.minecraft.client.sounds.SoundManager
-import net.minecraft.network.chat.CommonComponents
-import net.minecraft.resources.ResourceLocation
-
-class VariableObjectSelectionScrollbar(var parent: VariableObjectSelectionList, x: Int, y: Int, width: Int, height: Int): AbstractWidget(x, y, width, height, CommonComponents.EMPTY) {
-    companion object {
-        private val scrollerResource: ResourceLocation = ResourceLocation("minecraft", "textures/gui/sprites/widget/scroller.png")
-        private val scrollerBackgroundResource: ResourceLocation = ResourceLocation("minecraft", "textures/gui/sprites/widget/scroller_background.png")
-
-        private const val SCROLLER_HEIGHT = 32
-    }
-
-    private var scrolling = false
-    private var scrollHoldOffset = 0.0
-
-    fun scrollbarVisible(): Boolean = parent.getMaxScroll() > 0
-
-    override fun renderWidget(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, partialTick: Float) {
-        if (scrollbarVisible()) {
-            val scrollPosition = (parent.scrollAmount / parent.getMaxScroll()) * (height - SCROLLER_HEIGHT)
-
-            blitk(
-                matrixStack = guiGraphics.pose(),
-                texture = scrollerBackgroundResource,
-                x = x,
-                y = y,
-                width = width,
-                height = height,
-            )
-
-            blitk(
-                matrixStack = guiGraphics.pose(),
-                texture = scrollerResource,
-                x = x,
-                y = y + scrollPosition,
-                width = width,
-                height = SCROLLER_HEIGHT,
-                textureWidth = 6,
-                textureHeight = SCROLLER_HEIGHT
-            )
-        }
-    }
-
-    override fun mouseScrolled(mouseX: Double, mouseY: Double, scrollX: Double, scrollY: Double): Boolean {
-        return parent.mouseScrolled(mouseX, mouseY, scrollX, scrollY)
-    }
-
-    override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
-        if (mouseX.toInt() in x..(x + width) && mouseY.toInt() in y..(y + height)) {
-            if (button == 0) {
-                var scrollPosition = (parent.scrollAmount / parent.getMaxScroll()) * (height - SCROLLER_HEIGHT)
-                if (mouseY !in (y + scrollPosition)..(y + scrollPosition + SCROLLER_HEIGHT)) {
-                    val scrollRatio =
-                        ((mouseY - y - SCROLLER_HEIGHT / 2) / (height - SCROLLER_HEIGHT)).coerceIn(0.0, 1.0)
-                    parent.setScroll(scrollRatio * parent.getMaxScroll())
-                    scrollPosition = (parent.scrollAmount / parent.getMaxScroll()) * (height - SCROLLER_HEIGHT)
-                }
-                scrollHoldOffset = mouseY - y - scrollPosition
-                scrolling = true
-                return true
-            }
-        }
-        return false
-    }
-
-    override fun mouseDragged(mouseX: Double, mouseY: Double, button: Int, dragX: Double, dragY: Double): Boolean {
-        if (button == 0 && scrolling) {
-            val scrollRatio = ((mouseY - y - scrollHoldOffset) / (height - SCROLLER_HEIGHT)).coerceIn(0.0,1.0)
-            parent.setScroll(scrollRatio * parent.getMaxScroll())
-            return true
-        }
-        return false
-    }
-
-    override fun mouseReleased(mouseX: Double, mouseY: Double, button: Int): Boolean {
-        if (button == 0 && scrolling) {
-            scrolling = false
-            return true
-        }
-        return false
-    }
-
-    override fun playDownSound(handler: SoundManager) {}
-    override fun updateWidgetNarration(narrationElementOutput: NarrationElementOutput) {}
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleGeneralActionSelection.kt

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.client.gui.battle.subscreen
 
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.battles.model.actor.ActorType
-import com.cobblemon.mod.common.battles.FleeAttemptActionResponse
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.battle.SingleActionRequest
 import com.cobblemon.mod.common.client.gui.battle.BattleGUI
@@ -66,7 +65,7 @@ class BattleGeneralActionSelection(
 
                 addOption(rank++, battleLang("ui.run"), BattleGUI.runResource) {
                     CobblemonClient.battle?.minimised = true
-                    battleGUI.selectAction(request, FleeAttemptActionResponse())
+                    Minecraft.getInstance().player?.displayClientMessage(battleLang("run_prompt"), false)
                     playDownSound(Minecraft.getInstance().soundManager)
                 }
             } else {

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleSwitchPokemonSelection.kt

@@ -31,14 +31,12 @@ import com.cobblemon.mod.common.util.battleLang
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
 import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
-import com.cobblemon.mod.common.util.toAssetPath
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.narration.NarratableEntry
 import net.minecraft.client.gui.narration.NarrationElementOutput
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.client.sounds.SoundManager
-import net.minecraft.resources.ResourceLocation
 import org.joml.Quaternionf
 import org.joml.Vector3f
 
@@ -233,7 +231,7 @@ class BattleSwitchPokemonSelection(
                     textureHeight = SELECT_HEIGHT * 2,
                 )
 
-                val ballIcon = pokemon.caughtBall.name.toAssetPath("textures/gui/ball/", ".png")
+                val ballIcon = cobblemonResource("textures/gui/ball/" + pokemon.caughtBall.name.path + ".png")
                 val ballHeight = 22
                 blitk(
                     matrixStack = matrixStack,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/partyselect/PartySlotButton.kt

@@ -24,13 +24,11 @@ import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
 import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
-import com.cobblemon.mod.common.util.toAssetPath
 import com.google.common.collect.Lists
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
 import net.minecraft.client.sounds.SoundManager
 import net.minecraft.network.chat.Component
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.FormattedCharSequence
 import net.minecraft.world.item.ItemStack
 import org.joml.Quaternionf
@@ -113,7 +111,7 @@ class PartySlotButton(
         )
         context.pose().popPose()
 
-        val ballIcon = pokemon.pokeball!!.asIdentifierDefaultingNamespace().toAssetPath("textures/gui/ball/", ".png")
+        val ballIcon = cobblemonResource("textures/gui/ball/" + pokemon.pokeball!!.asIdentifierDefaultingNamespace().path + ".png")
         val ballHeight = 22
         blitk(
             matrixStack = matrices,

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

@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.gui.party
-
-import com.cobblemon.mod.common.CobblemonItems
-import com.cobblemon.mod.common.api.text.darkGray
-import com.cobblemon.mod.common.api.text.red
-import com.cobblemon.mod.common.client.CobblemonClient
-import com.cobblemon.mod.common.client.gui.toast.CobblemonToast
-import com.cobblemon.mod.common.client.keybind.boundKey
-import com.cobblemon.mod.common.client.keybind.keybinds.DownShiftPartyBinding
-import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding
-import com.cobblemon.mod.common.client.keybind.keybinds.UpShiftPartyBinding
-import com.cobblemon.mod.common.net.messages.server.storage.party.PartyTutorialPacket
-import com.cobblemon.mod.common.util.lang
-import com.mojang.blaze3d.platform.InputConstants
-import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.components.toasts.Toast
-import net.minecraft.client.gui.components.toasts.AdvancementToast
-import net.minecraft.network.chat.Component
-import net.minecraft.util.Mth
-
-object PartyTutorialToasts {
-
-    private var toastAttached = false
-
-    val upKey = UpShiftPartyBinding.boundKey()
-    val downKey = DownShiftPartyBinding.boundKey()
-
-    val upDisplay =
-        if (upKey.type == InputConstants.Type.KEYSYM && upKey.value == InputConstants.KEY_UP)
-            Component.literal("↑")
-        else upKey.displayName
-
-    val downDisplay =
-        if (downKey.type == InputConstants.Type.KEYSYM && downKey.value == InputConstants.KEY_DOWN)
-            Component.literal("↓")
-        else downKey.displayName
-
-    private val toast = CobblemonToast(
-        Mth.createInsecureUUID(),
-        CobblemonItems.POKEDEX_RED.defaultInstance,
-        lang("ui.party.party_select_title").red(),
-        lang(
-            "ui.party.party_select_description",
-            upDisplay,
-            downDisplay,
-            PartySendBinding.boundKey().displayName
-        ).darkGray(),
-        AdvancementToast.BACKGROUND_SPRITE,
-        -1F,
-        0
-    )
-
-    fun reset() {
-        toastAttached = false
-    }
-
-    fun onOverlayRender(partySize: Int) {
-        if (partySize <= 1) return
-
-        if (!CobblemonClient.clientPlayerData.partySelectTutorialDone) {
-            showToast()
-        }
-    }
-
-    fun onArrowKeySwitchedSlot() {
-        if (CobblemonClient.clientPlayerData.partySelectTutorialDone) return
-        if (CobblemonClient.storage.party.count { it != null } < 2) return
-        PartyTutorialPacket().sendToServer()
-        hideToast()
-    }
-
-    fun onHoldKeyScrollSwitchedSlot() {
-        if (CobblemonClient.clientPlayerData.partySelectTutorialDone) return
-        if (CobblemonClient.storage.party.count { it != null } < 2) return
-        PartyTutorialPacket().sendToServer()
-        hideToast()
-    }
-
-    private fun showToast() {
-        val minecraft = Minecraft.getInstance()
-        if (!toastAttached) {
-            toast.nextVisibility = Toast.Visibility.SHOW
-            minecraft.toasts.addToast(toast)
-            toastAttached = true
-        }
-    }
-
-    private fun hideToast() {
-        if (toastAttached) toast.nextVisibility = Toast.Visibility.HIDE
-    }
-}

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

@@ -40,7 +40,6 @@ import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.isInventoryKeyPressed
 import com.cobblemon.mod.common.util.lang
-import com.cobblemon.mod.common.util.toAssetPath
 import com.mojang.blaze3d.platform.InputConstants
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
@@ -464,7 +463,7 @@ class PCGUI(
             )
 
             // Poké Ball
-            val ballResource = pokemon.caughtBall.name.toAssetPath("textures/item/poke_balls/", ".png")
+            val ballResource = cobblemonResource("textures/item/poke_balls/" + pokemon.caughtBall.name.path + ".png")
             blitk(
                 matrixStack = matrices,
                 texture = ballResource,

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

@@ -375,8 +375,7 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
                 matrixStack =  matrices,
                 partialTicks = delta,
                 rotation = Quaternionf().fromEulerXYZDegrees(rotationVector),
-                state = state,
-                blockLight = 15
+                state = state
             )
 
             matrices.popPose()

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

@@ -237,11 +237,9 @@ class StatsWidget(val pX: Int, val pY: Int) : SoundlessWidget(
             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)
 
-            val rideStyle = selectedBehaviour.value.key.path.toString().split("/").last().lowercase()
             drawScaledText(
                 context = context,
-                text = lang("ui.ride_style.${selectedBehaviour.key.toString().lowercase()}.${rideStyle}")
-                    .append(" | ").append(lang("ui.ride_style.${selectedBehaviour.key.toString().lowercase()}")).bold(),
+                text = lang("ui.ride_style.${selectedBehaviour.key.name.lowercase()}").bold(),
                 x = pX + 69.5,
                 y = pY + 3,
                 colour = 0x3A96B6,

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

@@ -15,19 +15,18 @@ import com.cobblemon.mod.common.api.gui.ColourLibrary
 import com.cobblemon.mod.common.api.gui.MultiLineLabelK
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.text.bold
-import com.cobblemon.mod.common.api.text.text
-import com.cobblemon.mod.common.api.types.ElementalType
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.CobblemonRenderable
-import com.cobblemon.mod.common.client.gui.ExitButton
-import com.cobblemon.mod.common.client.gui.TypeIcon
-import com.cobblemon.mod.common.client.gui.VariableObjectSelectionScrollbar
 import com.cobblemon.mod.common.client.gui.startselection.widgets.CategoryList
-import com.cobblemon.mod.common.client.gui.startselection.widgets.SelectionButton
+import com.cobblemon.mod.common.client.gui.startselection.widgets.ExitButton
+import com.cobblemon.mod.common.client.gui.startselection.widgets.preview.ArrowButton
+import com.cobblemon.mod.common.client.gui.startselection.widgets.preview.SelectionButton
 import com.cobblemon.mod.common.client.gui.startselection.widgets.preview.StarterRoundabout
-import com.cobblemon.mod.common.client.gui.summary.Summary.Companion.PARTY
 import com.cobblemon.mod.common.client.gui.summary.widgets.ModelWidget
+import com.cobblemon.mod.common.client.gui.summary.widgets.type.DualTypeWidget
+import com.cobblemon.mod.common.client.gui.summary.widgets.type.SingleTypeWidget
+import com.cobblemon.mod.common.client.gui.summary.widgets.type.TypeWidget
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.config.starter.RenderableStarterCategory
 import com.cobblemon.mod.common.net.messages.server.SelectStarterPacket
@@ -35,14 +34,13 @@ import com.cobblemon.mod.common.pokemon.RenderablePokemon
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
+import com.cobblemon.mod.common.util.math.toRGB
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.toasts.Toast
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.sounds.SoundEvent
-import java.io.FileNotFoundException
+import net.minecraft.network.chat.Component
 
 /**
  * Starterselection Screen Thingy
@@ -51,31 +49,32 @@ import java.io.FileNotFoundException
  * @since 2022-06-18
  */
 class StarterSelectionScreen(private val categories: List<RenderableStarterCategory>): Screen("cobblemon.ui.starter.title".asTranslated()), CobblemonRenderable {
+
     companion object {
         // Size of UI at scale 1
-        private const val BASE_WIDTH = 239
-        private const val BASE_HEIGHT = 197
+        private const val BASE_WIDTH = 200
+        private const val BASE_HEIGHT = 175
 
         // Resources
-        private val baseResource = cobblemonResource("textures/gui/starterselection/base.png")
-        private val backgroundResource = cobblemonResource("textures/gui/starterselection/background.png")
-        private val backgroundBallResource = cobblemonResource("textures/gui/starterselection/background_poke_ball.png")
+        private val base = cobblemonResource("textures/gui/starterselection/starterselection_base.png")
+        private val baseUnderlay = cobblemonResource("textures/gui/starterselection/starterselection_base_underlay.png")
+        private val baseFrame = cobblemonResource("textures/gui/starterselection/starterselection_base_frame.png")
 
-        private val platformResource = cobblemonResource("textures/gui/starterselection/platform_base.png")
-        private val platformShadow = cobblemonResource("textures/gui/pokedex/platform_shadow.png")
-        private val typeSpacerResource = cobblemonResource("textures/gui/starterselection/type_spacer_single.png")
-        private val ballResource = cobblemonResource("textures/item/poke_balls/poke_ball.png")
+        // Type Backgrounds
+        private val singleTypeBackground = cobblemonResource("textures/gui/starterselection/starterselection_type_slot1.png")
+        private val doubleTypeBackground = cobblemonResource("textures/gui/starterselection/starterselection_type_slot2.png")
     }
 
-    var currentSelection = 0
-    lateinit var currentCategory: RenderableStarterCategory
+    private var currentSelection = 0
+    private lateinit var currentCategory: RenderableStarterCategory
     private lateinit var modelWidget: ModelWidget
     private lateinit var currentPokemon: RenderablePokemon
+    private lateinit var typeWidget: TypeWidget
+    private lateinit var starterRoundaboutCenter: StarterRoundabout
+    private lateinit var starterRoundaboutLeft: StarterRoundabout
+    private lateinit var starterRoundaboutRight: StarterRoundabout
 
-    var ticksElapsed = 0
-    var currentBallBackgroundFrame = 0
-
-    override fun renderBlurredBackground(delta: Float) {}
+    override fun renderBlurredBackground(delta: Float) { }
 
     override fun renderMenuBackground(context: GuiGraphics) {}
 
@@ -96,24 +95,55 @@ class StarterSelectionScreen(private val categories: List<RenderableStarterCateg
             return
         }
 
+        addRenderableWidget(
+            CategoryList(
+                paneWidth = 71, paneHeight = BASE_HEIGHT - 11,
+                topOffset = 6,
+                entryHeight = 20, entryWidth = 57,
+                categories = categories,
+                listX = x - 2, listY = y + 8,
+                starterSelectionScreen = this
+            )
+        )
+
+        val rightButton = ArrowButton(
+            pX = x + 183, pY = y + 151,
+            pWidth = 9, pHeight = 14,
+            right = true
+        ) {
+            right()
+        }
+
+        val leftButton = ArrowButton(
+            pX = x + 72, pY = y + 151,
+            pWidth = 9, pHeight = 14,
+            right = false
+        ) {
+            left()
+        }
+
+        addRenderableWidget(rightButton)
+        addRenderableWidget(leftButton)
+
         currentCategory = categories.first()
         currentPokemon = currentCategory.pokemon[currentSelection]
 
         with(currentPokemon) {
             modelWidget = ModelWidget(
-                pX = x + 6, pY = y + 17,
-                pWidth = 118, pHeight = 100,
+                pX = x + 85, pY = y + 50,
+                pWidth = 102, pHeight = 100,
                 pokemon = this,
-                baseScale = 2.7f,
+                baseScale = 2.0f,
                 playCryOnClick = true,
-                offsetY = -12.0
             )
+
+            typeWidget = typeWidget(this, x, y)
         }
 
         addRenderableWidget(modelWidget)
 
         val selectionButton = SelectionButton(
-            pX = x + 13, pY = y + 180,
+            pX = x + 106, pY = y + 124,
             pWidth = SelectionButton.BUTTON_WIDTH, pHeight = SelectionButton.BUTTON_HEIGHT
         ) {
             CobblemonNetwork.sendToServer(
@@ -122,214 +152,182 @@ class StarterSelectionScreen(private val categories: List<RenderableStarterCateg
                     selected = currentSelection
                 )
             )
-            playSound(CobblemonSounds.GUI_CLICK)
-            onClose()
+            Minecraft.getInstance().setScreen(null)
         }
+
         addRenderableWidget(selectionButton)
 
-        // Add Exit Button
+        starterRoundaboutCenter = StarterRoundabout(
+            pX = x + 119, pY = height / 2 + 84,
+            pWidth = StarterRoundabout.MODEL_WIDTH, pHeight = StarterRoundabout.MODEL_HEIGHT,
+            pokemon = currentPokemon,
+            rotationVector = this.modelWidget.rotationVector
+        )
+
+        starterRoundaboutLeft = StarterRoundabout(
+            pX = x + 89, pY = height / 2 + 84,
+            pWidth = StarterRoundabout.MODEL_WIDTH, pHeight = StarterRoundabout.MODEL_HEIGHT,
+            pokemon = currentCategory.pokemon[leftOfCurrentSelection()],
+            clickAction = { _, _ -> this.left()  },
+            rotationVector = this.modelWidget.rotationVector
+        )
+
+        starterRoundaboutRight = StarterRoundabout(
+            pX = x + 149, pY = height / 2 + 84,
+            pWidth = StarterRoundabout.MODEL_WIDTH, pHeight = StarterRoundabout.MODEL_HEIGHT,
+            pokemon = currentCategory.pokemon[rightOfCurrentSelection()],
+            clickAction = { _, _ -> this.right()  },
+            rotationVector = this.modelWidget.rotationVector
+        )
+
+        addRenderableWidget(starterRoundaboutLeft)
+        addRenderableWidget(starterRoundaboutCenter)
+        addRenderableWidget(starterRoundaboutRight)
+
         addRenderableWidget(
-            ExitButton(pX = x + 210, pY = y + 181) {
-                playSound(CobblemonSounds.GUI_CLICK)
-                onClose()
+            ExitButton(
+                pX = x + 181, pY = y + 2,
+                pWidth = 16, pHeight = 12,
+                pXTexStart = 0, pYTexStart = 0, pYDiffText = 0
+            ) {
+                Minecraft.getInstance().setScreen(null)
+                Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.GUI_CLICK, 1.0F))
             }
         )
-
-        val categoryList = CategoryList(
-            paneWidth = 97, paneHeight = 145,
-            categories = categories,
-            listX = x + 134, listY = y + 27,
-            starterSelectionScreen = this
-        )
-        addRenderableWidget(categoryList)
-
-        addRenderableWidget(VariableObjectSelectionScrollbar(
-            parent = categoryList,
-            x = x + 231,
-            y = y + 27,
-            width = 3,
-            height = 145
-        ))
     }
 
     override fun render(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
         val matrices = context.pose()
         val x = (width - BASE_WIDTH) / 2
         val y = (height - BASE_HEIGHT) / 2
-
-        //Background
+        // Render Underlay
         blitk(
             matrixStack = matrices,
-            texture = backgroundResource,
-            x = x + 6,
-            y = y + 17,
-            width = 118,
-            height = 100
+            texture = baseUnderlay,
+            x = x, y = y,
+            width = BASE_WIDTH, height = BASE_HEIGHT
         )
-
+        // Render Base
         blitk(
             matrixStack = matrices,
-            texture = backgroundBallResource,
-            x = x + 10.5,
-            y = y + 12.5,
-            width = 109,
-            height = 109,
-            textureHeight = 1744,
-            vOffset = currentBallBackgroundFrame * 109
+            texture = base,
+            x = x, y = y,
+            width = BASE_WIDTH, height = BASE_HEIGHT
         )
-
-        //Platform
+        // Render Frame
+        val (r, g, b) = currentPokemon.form.primaryType.hue.toRGB()
         blitk(
             matrixStack = matrices,
-            texture = platformResource,
-            x = x + 8.5,
-            y = y + 88,
-            width = 113,
-            height = 32
+            texture = baseFrame,
+            red = r,
+            green = g,
+            blue = b,
+            x = x, y = y,
+            width = BASE_WIDTH, height = BASE_HEIGHT
         )
-        val typePlatform = getPlatformResource(currentPokemon.form.primaryType)
-        if (typePlatform != null) {
-            blitk(
-                matrixStack = matrices,
-                texture = typePlatform,
-                x = x + 8.5,
-                y = y + 82,
-                width = 113,
-                height = 30
-            )
-        }
-        blitk(
-            matrixStack = matrices,
-            texture = platformShadow,
-            x = (x + 43) / 0.5F,
-            y = (y + 93.5) / 0.5F,
-            width = 90,
-            height = 20,
-            scale = 0.5F
-        )
-
-        //Base
-        blitk(
-            matrixStack = matrices,
-            texture = baseResource,
-            x = x,
-            y = y,
-            width = BASE_WIDTH,
-            height = BASE_HEIGHT
-        )
-
-        //Type Icon
-        TypeIcon(
-            x = x + 65,
-            y = y + 120,
-            type = currentPokemon.form.primaryType,
-            secondaryType = currentPokemon.form.secondaryType,
-            centeredX = true
-        ).render(context)
-
-        if (currentPokemon.form.secondaryType == null) {
-            blitk(
-                matrixStack = matrices,
-                texture = typeSpacerResource,
-                x = x + 47,
-                y = y + 123,
-                width = 36,
-                height = 12
-            )
-        }
-
-        //Name
-        blitk(
-            matrixStack = matrices,
-            texture = ballResource,
-            x = (x + 4) / 0.5F,
-            y = (y + 3) / 0.5F,
-            width = 16,
-            height = 16,
-            scale = 0.5F
-        )
-
-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = currentPokemon.species.translatedName.bold(),
-            x = x + 14,
-            y = y + 2,
-            shadow = true
-        )
-
-        // Pokédex Number
-        // Add preceding zeroes if Pokédex number is less than 4 digits
-        var dexNo = currentPokemon.species.nationalPokedexNumber.toString()
-        while (dexNo.length < 4) {
-            dexNo = "0$dexNo"
-        }
-        dexNo = "#$dexNo"
-
-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = dexNo.text().bold(),
-            x = x + 79,
-            y = y + 1,
-            shadow = true
-        )
-
-        //"Title"
+        // Render Text
         drawScaledText(
             context = context,
             font = CobblemonResources.DEFAULT_LARGE,
             text = lang("ui.starter.title").bold(),
-            x = x + 172,
-            y = y + 11,
-            shadow = true,
-            centered = true
+            x = x + 125, y = y + 3F,
+            centered = true,
+            scale = 1.4F,
+            maxCharacterWidth = 120,
+            shadow = true
         )
 
-        //Description Text
-        val smallTextScale = 0.5F
+        // Render Name
+        val pokemonName = currentPokemon.species.translatedName
+        val scale = 0.8F
+        drawScaledText(
+            context = context,
+            text = pokemonName,
+            centered = true,
+            scale = scale,
+            maxCharacterWidth = 50,
+            x = x + 94,
+            y = y + 19.5,
+            shadow = false
+        )
 
+        // Render Description
+        val scale2 = 0.60F
         matrices.pushPose()
-        matrices.scale(smallTextScale, smallTextScale, 1F)
+        matrices.scale(scale2, scale2, 1F)
+
+        // TODO use all pokedex lines across multiple clickable pages in this screen
         MultiLineLabelK.create(
             component = currentPokemon.form.pokedex.first().asTranslated(),
-            width = 114 / smallTextScale,
-            maxLines = 5
+            width = 127,
+            maxLines = 4
         ).renderLeftAligned(
             context = context,
-            x = (x + 8) / smallTextScale,
-            y = (y + 143) / smallTextScale,
-            ySpacing = 5.5 / smallTextScale,
-            colour = ColourLibrary.WHITE,
-            shadow = true
+            x = (x + 119) / scale2 + 4, y = (y + 18) / scale2 + 4.0,
+            ySpacing = (8.0 / scale2) - 1.25,
+            colour = ColourLibrary.WHITE, shadow = false
         )
         matrices.popPose()
 
+        // Render the type background
+        blitk(
+            matrixStack = matrices,
+            texture = currentPokemon.form.secondaryType?.let { doubleTypeBackground } ?: singleTypeBackground,
+            x = (currentPokemon.form.secondaryType?.let { x + 76.75 } ?: (x + 85.25)), y = y + 29.4,
+            width = currentPokemon.form.secondaryType?.let { 35.25 } ?: 19, height = 19.25
+        )
+        // Render the type widget
+        typeWidget.render(context, mouseX, mouseY, delta)
+        // Render the rest
         super.render(context, mouseX, mouseY, delta)
     }
 
-    fun getPlatformResource(type: ElementalType): ResourceLocation? {
-        return try {
-            cobblemonResource("textures/gui/starterselection/starter_platform_base_${type.showdownId}.png")
-        } catch (error: FileNotFoundException) {
-            null
-        }
+    fun changeCategory(category: RenderableStarterCategory) {
+        currentCategory = category
+        currentSelection = 0
+        updateSelection()
     }
 
-    fun selectPokemon(category: RenderableStarterCategory, slot: Int) {
-        currentCategory = category
-        currentSelection = slot
+    private fun right() {
+        Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.GUI_CLICK, 1.0F))
+        currentSelection = rightOfCurrentSelection()
+        updateSelection()
+    }
+
+    private fun rightOfCurrentSelection() : Int = if (currentSelection + 1 <= currentCategory.pokemon.size - 1) currentSelection + 1 else 0
+
+    private fun left() {
+        Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.GUI_CLICK, 1.0F))
+        currentSelection = leftOfCurrentSelection()
+        updateSelection()
+    }
+
+    private fun leftOfCurrentSelection() : Int = if (currentSelection - 1 == -1) currentCategory.pokemon.size - 1 else currentSelection - 1
+
+    private fun updateSelection() {
         currentPokemon = currentCategory.pokemon[currentSelection].also {
             modelWidget.pokemon = it
+            typeWidget = typeWidget(it, (width - BASE_WIDTH) / 2, (height - BASE_HEIGHT) / 2)
         }
+        starterRoundaboutLeft.pokemon = currentCategory.pokemon[leftOfCurrentSelection()]
+        starterRoundaboutCenter.pokemon = currentPokemon
+        starterRoundaboutRight.pokemon = currentCategory.pokemon[rightOfCurrentSelection()]
     }
 
-    override fun tick() {
-        ticksElapsed++
-
-        val delay = 3
-        if (ticksElapsed % delay == 0) currentBallBackgroundFrame++
-        if (currentBallBackgroundFrame == 16) currentBallBackgroundFrame = 0
+    private fun typeWidget(pokemon: RenderablePokemon, x: Int, y: Int) : TypeWidget {
+        return pokemon.form.secondaryType?.let {
+            DualTypeWidget(
+                pX = x + 77, pY = y + 30,
+                pWidth = 18, pHeight = 18,
+                pMessage = Component.literal("What?"),
+                mainType = pokemon.form.primaryType, secondaryType = it
+            )
+        } ?: SingleTypeWidget(
+            pX = x + 85, pY = y + 30,
+            pWidth = 18, pHeight = 18,
+            type = pokemon.form.primaryType,
+            renderText = false
+        )
     }
 
     override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
@@ -342,8 +340,4 @@ class StarterSelectionScreen(private val categories: List<RenderableStarterCateg
     }
 
     override fun isPauseScreen() = true
-
-    fun playSound(soundEvent: SoundEvent) {
-        Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(soundEvent, 1.0F))
-    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/startselection/widgets/CategoryList.kt

@@ -8,212 +8,126 @@
 
 package com.cobblemon.mod.common.client.gui.startselection.widgets
 
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.gui.blitk
-import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.client.gui.CobblemonRenderable
-import com.cobblemon.mod.common.client.gui.PokemonGUIAnimationStyle
-import com.cobblemon.mod.common.client.gui.VariableObjectSelectionList
-import com.cobblemon.mod.common.client.gui.drawProfilePokemon
 import com.cobblemon.mod.common.client.gui.startselection.StarterSelectionScreen
 import com.cobblemon.mod.common.client.render.drawScaledText
-import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
 import com.cobblemon.mod.common.config.starter.RenderableStarterCategory
 import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.client.gui.components.ObjectSelectionList
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
-import org.joml.Quaternionf
-import org.joml.Vector3f
+import net.minecraft.network.chat.Component
 
 class CategoryList(
     private val paneWidth: Int,
     private val paneHeight: Int,
+    topOffset: Int,
+    private val entryWidth: Int,
+    entryHeight: Int,
     private val categories: List<RenderableStarterCategory>,
     val listX: Int,
     val listY: Int,
     private val minecraft: Minecraft = Minecraft.getInstance(),
     private val starterSelectionScreen: StarterSelectionScreen
-) : VariableObjectSelectionList(
-    listX,
-    listY,
+) : ObjectSelectionList<CategoryList.Category>(
+    minecraft,
     paneWidth,
-    paneHeight
+    paneHeight,
+    topOffset,
+    entryHeight
 ), CobblemonRenderable {
 
     companion object {
-        private val headerResource = cobblemonResource("textures/gui/starterselection/selection_container_header.png")
-        private val footerResource = cobblemonResource("textures/gui/starterselection/selection_container_footer.png")
-        private val edgeResource = cobblemonResource("textures/gui/starterselection/selection_container_edge.png")
-        private val containerResource = cobblemonResource("textures/gui/starterselection/selection_container.png")
-
-        private val buttonResource = cobblemonResource("textures/gui/starterselection/starter_selection.png")
-        private val buttonActiveResource = cobblemonResource("textures/gui/starterselection/starter_selection_active.png")
-
-        const val MARGIN = 4
-        const val HEADER_HEIGHT = 7
-        const val BUTTON_SEPERATION = 3
-        const val CONTAINER_BUTTON_SIZE = 25
-        const val CONTAINER_WIDTH = 89
+        private const val CATEGORY_BUTTON_WIDTH = 51.5f
+        private const val CATEGORY_BUTTON_HEIGHT = 16f
+        private const val ENTRY_X_OFFSET = 10f
+        private val categoryResource = cobblemonResource("textures/gui/starterselection/starterselection_slot.png")
     }
 
     init {
-        addEntry(EmptySeparator(MARGIN))
-        createEntries().forEach {
-            addEntry(it)
-            addEntry(EmptySeparator(MARGIN))
-        }
+        this.x = listX
+        this.y = listY
+        this.correctSize()
+        createEntries().forEach { addEntry(it) }
+        //this.setRenderBackground(false)
     }
 
-    private fun createEntries() = categories.map { category ->
-        val rows = (category.pokemon.size - 1) / 3 + 1
-        val height = CONTAINER_BUTTON_SIZE * rows + BUTTON_SEPERATION * (rows + 1) + HEADER_HEIGHT + 3
-        Category(category, height)
+    private fun createEntries() = categories.map {
+        Category(it)
     }
 
-    inner class Category(private val category: RenderableStarterCategory, height: Int) : Entry(height) {
+    override fun renderListBackground(context: GuiGraphics) {}
+
+    override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+        super.renderWidget(context, mouseX, mouseY, delta)
+        correctSize()
+    }
+
+    private fun correctSize() {
+        this.setRectangle(this.paneWidth, this.paneHeight, this.listX, this.listY)
+    }
+
+    private fun scale(n: Int): Int = (this.minecraft.window.guiScale * n).toInt()
+    override fun getRowWidth() = this.entryWidth
+    override fun getScrollbarPosition(): Int {
+        return this.listX + this.width - 5
+    }
+
+
+    inner class Category(private val category: RenderableStarterCategory) : Entry<Category>() {
 
         override fun render(
-            guiGraphics: GuiGraphics,
+            context: GuiGraphics,
             index: Int,
-            x: Int,
             y: Int,
+            x: Int,
+            entryWidth: Int,
+            entryHeight: Int,
             mouseX: Int,
             mouseY: Int,
-            partialTick: Float
+            hovered: Boolean,
+            tickDelta: Float
         ) {
-            val rows = (category.pokemon.size - 1) / 3 + 1
-            val matrices = guiGraphics.pose()
-            //Header
-            blitk(
-                matrixStack = matrices,
-                texture = headerResource,
-                x = x + MARGIN,
-                y = y,
-                width = CONTAINER_WIDTH,
-                height = HEADER_HEIGHT
-            )
-
-            val smallTextScale = 0.5F
-            drawScaledText(
-                context = guiGraphics,
-                text = category.displayNameText.bold(),
-                x = x + MARGIN + CONTAINER_WIDTH / 2,
-                y = y + 2,
-                shadow = true,
-                centered = true,
-                scale = smallTextScale
-            )
-
-            //Container
-            var stackHeight = HEADER_HEIGHT
-            blitk(
-                matrixStack = matrices,
-                texture = edgeResource,
-                x = x + MARGIN,
-                y = y + stackHeight,
-                width = CONTAINER_WIDTH,
-                height = 1
-            )
-            stackHeight += 1
-
-            val containerInnerHeight = CONTAINER_BUTTON_SIZE * rows + BUTTON_SEPERATION * (rows + 1)
-
-            blitk(
-                matrixStack = matrices,
-                texture = containerResource,
-                x = x + MARGIN,
-                y = y + stackHeight,
-                width = CONTAINER_WIDTH,
-                height = containerInnerHeight
-            )
-            stackHeight += containerInnerHeight
-
-            blitk(
-                matrixStack = matrices,
-                texture = edgeResource,
-                x = x + MARGIN,
-                y = y + stackHeight,
-                width = CONTAINER_WIDTH,
-                height = 1
-            )
-            stackHeight += 1
-
-            //Footer
-            blitk(
-                matrixStack = matrices,
-                texture = footerResource,
-                x = x + MARGIN,
-                y = y + stackHeight,
-                width = CONTAINER_WIDTH,
-                height = 1
-            )
-
-            //Buttons
-            for (index in 0..<category.pokemon.size) {
-                val row = index / 3
-                val column = index % 3
-
-                val startX = x + MARGIN + 5 + column * (CONTAINER_BUTTON_SIZE + 2)
-                val startY = y + HEADER_HEIGHT + 1 + BUTTON_SEPERATION + row * (BUTTON_SEPERATION + CONTAINER_BUTTON_SIZE)
-
-                val active = starterSelectionScreen.currentCategory == category && starterSelectionScreen.currentSelection == index
-                val hovered = getEntryAtPosition(mouseX, mouseY) == this && mouseX in startX..(startX + CONTAINER_BUTTON_SIZE) && mouseY in startY..(startY + CONTAINER_BUTTON_SIZE)
-
+            val matrices = context.pose()
+            val isHovered = mouseX >= x && mouseY >= y && mouseX < x + entryWidth && mouseY < y + (entryHeight - 1)
+            if (isHovered) {
                 blitk(
                     matrixStack = matrices,
-                    texture = if (active) buttonActiveResource else buttonResource,
-                    x = startX,
-                    y = startY,
-                    width = CONTAINER_BUTTON_SIZE,
-                    height = CONTAINER_BUTTON_SIZE,
-                    textureHeight = CONTAINER_BUTTON_SIZE * 2,
-                    vOffset = if (hovered) CONTAINER_BUTTON_SIZE else 0
+                    x = x + 2.5f, y = y,
+                    texture = categoryResource,
+                    width = CATEGORY_BUTTON_WIDTH, height = CATEGORY_BUTTON_HEIGHT,
+                    red = 0.75f, green = 0.75f, blue = 0.75f
                 )
-
-                matrices.pushPose()
-                matrices.translate(startX + (CONTAINER_BUTTON_SIZE / 2.0), startY.toDouble() - 6, 0.0)
-                matrices.scale(3.5F, 3.5F, 1F)
-
-                val state = FloatingState()
-                drawProfilePokemon(
-                    species = category.pokemon[index].species.resourceIdentifier,
+            } else
+                blitk(
                     matrixStack = matrices,
-                    rotation = Quaternionf().fromEulerXYZDegrees(Vector3f(13F, 35F, 0F)),
-                    state = state,
-                    scale = 4.5F,
-                    partialTicks = 0F
+                    x = x + 2.5f, y = y,
+                    texture = categoryResource,
+                    width = CATEGORY_BUTTON_WIDTH, height = CATEGORY_BUTTON_HEIGHT
                 )
-                matrices.popPose()
-            }
+            drawScaledText(
+                context = context,
+                text = category.displayNameText,
+                x = x + 28,
+                y = y + 4.5F,
+                scale = 1F,
+                maxCharacterWidth = 50,
+                shadow = true,
+                centered = true
+            )
         }
 
         override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
-            val entryY = getRowTop(this)
-            val hoveredButton = getButtonHovered(x, entryY, mouseX, mouseY)
-            if (hoveredButton != -1) {
-                starterSelectionScreen.selectPokemon(category, hoveredButton)
-                Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.GUI_CLICK, 1.0F))
-                return true
-            }
-            return false
+            starterSelectionScreen.changeCategory(category = category)
+            minecraft.soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.GUI_CLICK, 1.0F))
+            return true
         }
 
-        private fun getButtonHovered(x: Int, y: Int, mouseX: Double, mouseY: Double): Int {
-            for (index in 0..<category.pokemon.size) {
-                val row = index / 3
-                val column = index % 3
-
-                val startX = x + MARGIN + 5 + column * (CONTAINER_BUTTON_SIZE + 2)
-                val startY = y + HEADER_HEIGHT + 1 + BUTTON_SEPERATION + row * (BUTTON_SEPERATION + CONTAINER_BUTTON_SIZE)
-
-                if (getEntryAtPosition(mouseX.toInt(), mouseY.toInt()) == this && mouseX.toInt() in startX..(startX + CONTAINER_BUTTON_SIZE) && mouseY.toInt() in startY..(startY + CONTAINER_BUTTON_SIZE)) {
-                    return index
-                }
-            }
-            return -1
+        override fun getNarration(): Component {
+            return Component.literal("Yes")
         }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/startselection/widgets/preview/SelectionButton.kt

@@ -6,13 +6,11 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package com.cobblemon.mod.common.client.gui.startselection.widgets
+package com.cobblemon.mod.common.client.gui.startselection.widgets.preview
 
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.gui.ColourLibrary
 import com.cobblemon.mod.common.api.gui.blitk
-import com.cobblemon.mod.common.api.text.bold
-import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.util.cobblemonResource
@@ -28,39 +26,45 @@ class SelectionButton(
     pX: Int, pY: Int,
     pWidth: Int, pHeight: Int,
     onPress: OnPress
-): Button(pX, pY, pWidth, pHeight, Component.literal("SelectionButton"), onPress, DEFAULT_NARRATION),
-    CobblemonRenderable {
+): Button(pX, pY, pWidth, pHeight, Component.literal("SelectionButton"), onPress, DEFAULT_NARRATION), CobblemonRenderable {
 
     companion object {
-        private val buttonResource = cobblemonResource("textures/gui/starterselection/choose_button.png")
-        const val BUTTON_WIDTH = 106
-        const val BUTTON_HEIGHT = 14
-        const val TEXT_HEIGHT = 10
+        private val buttonTexture = cobblemonResource("textures/gui/starterselection/starterselection_button.png")
+        const val BUTTON_WIDTH = 56
+        const val BUTTON_HEIGHT = 12
+        private const val SCALE = 0.7f
     }
 
-    override fun playDownSound(soundManager: SoundManager) {}
+    override fun playDownSound(soundManager: SoundManager) {
+        Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.GUI_CLICK, 1.0F))
+    }
 
     override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
         val matrices = context.pose()
-        blitk(
-            matrixStack = matrices,
-            texture = buttonResource,
-            x = x,
-            y = y,
-            width = BUTTON_WIDTH,
-            height = BUTTON_HEIGHT,
-            textureHeight = BUTTON_HEIGHT * 2,
-            vOffset = if (isHovered) BUTTON_HEIGHT else 0
-        )
-
+        if (isHovered)
+            blitk(
+                matrixStack = matrices,
+                texture = buttonTexture,
+                x = x + 0.6, y = y + 0.6,
+                width = BUTTON_WIDTH - 0.25, height = BUTTON_HEIGHT - 0.25,
+                red = 0.75f, green = 0.75f, blue = 0.75f
+            )
+        else
+            blitk(
+                matrixStack = matrices,
+                texture = buttonTexture,
+                x = x + 0.6, y = y + 0.6,
+                width = BUTTON_WIDTH - 0.25, height = BUTTON_HEIGHT - 0.25
+            )
         drawScaledText(
             context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = lang("ui.starter.choosebutton").bold(),
-            x = x + BUTTON_WIDTH / 2,
-            y = y + BUTTON_HEIGHT / 2 - TEXT_HEIGHT / 2,
-            shadow = true,
-            centered = true
+            text = lang("ui.starter.choosebutton"),
+            x = x + BUTTON_WIDTH / 2, y = y + BUTTON_HEIGHT / 2 - 2.4,
+            colour = ColourLibrary.WHITE,
+            centered = true,
+            maxCharacterWidth = 68,
+            scale = SCALE,
+            shadow = true
         )
     }
 }

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

@@ -45,7 +45,6 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.isInventoryKeyPressed
 import com.cobblemon.mod.common.util.lang
-import com.cobblemon.mod.common.util.toAssetPath
 import com.mojang.blaze3d.platform.InputConstants
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
@@ -559,7 +558,7 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
         }
 
         // Poké Ball
-        val ballResource = selectedPokemon.caughtBall.name.toAssetPath("textures/item/poke_balls/", ".png")
+        val ballResource = cobblemonResource("textures/item/poke_balls/" + selectedPokemon.caughtBall.name.path + ".png")
         blitk(
             matrixStack = matrices,
             texture = ballResource,

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

@@ -31,7 +31,6 @@ class ModelWidget(
     var offsetY: Double = 0.0,
     val playCryOnClick: Boolean = false,
     val shouldFollowCursor: Boolean = false,
-    val blockLight: Int = 13
 ): SoundlessWidget(pX, pY, pWidth, pHeight, Component.literal("Summary - ModelWidget")) {
 
     companion object {
@@ -116,7 +115,6 @@ class ModelWidget(
             partialTicks = partialTicks,
             headYaw = currentYawAndPitch.first,
             headPitch = currentYawAndPitch.second,
-            blockLight = blockLight
         )
 
         heldItemRenderer.renderOnModel(

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

@@ -24,7 +24,6 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
 import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
-import com.cobblemon.mod.common.util.toAssetPath
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
@@ -108,7 +107,7 @@ class PartySlotWidget(
                 )
             }
 
-            val ballIcon = slotPokemon.caughtBall.name.toAssetPath("textures/gui/ball/", ".png")
+            val ballIcon = cobblemonResource("textures/gui/ball/" + slotPokemon.caughtBall.name.path + ".png")
             val ballHeight = 22
             blitk(
                 matrixStack = matrices,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/screens/moves/MovesWidget.kt

@@ -19,11 +19,11 @@ import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.net.messages.server.RequestMoveSwapPacket
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
-import java.math.RoundingMode
-import java.text.DecimalFormat
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.network.chat.Component
+import java.math.RoundingMode
+import java.text.DecimalFormat
 
 class MovesWidget(
     pX: Int, pY: Int,

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

@@ -66,7 +66,6 @@ class StatWidget(
         private const val MARKER_WIDTH = 8
         private const val WIDTH = 134
         private const val HEIGHT = 148
-        private const val RIDE_ICON_SIZE = 32
         const val SCALE = 0.5F
 
         private const val WHITE = 0x00FFFFFF
@@ -337,16 +336,14 @@ class StatWidget(
                         colour = pentagonColour
                     )
 
-                    val rideStyle = selectedBehaviour.value.key.path.toString().split("/").last().lowercase()
-                    val iconResource = cobblemonResource("textures/gui/summary/icon_ride_${selectedBehaviour.key.toString().lowercase()}_${rideStyle}.png")
-                    blitk(
-                        matrixStack = matrices,
-                        texture = iconResource,
-                        x= (x + 59) / SCALE,
-                        y = (y + 62.5) / SCALE,
-                        width = RIDE_ICON_SIZE,
-                        height = RIDE_ICON_SIZE,
-                        scale = SCALE
+                    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
@@ -371,16 +368,6 @@ class StatWidget(
                         verticesOffset = pentagonVerticesOffset,
                         offsetY = 5.5
                     )
-
-                    if (pMouseX >= (x + 59) && pMouseY >= (y + 62.5) && pMouseX <= ((x + 59) + (RIDE_ICON_SIZE * SCALE)) && pMouseY <= ((y + 62.5) + (RIDE_ICON_SIZE * SCALE))) {
-                        context.renderTooltip(
-                            Minecraft.getInstance().font,
-                            lang("ui.ride_style.${selectedBehaviour.key.toString().lowercase()}.${rideStyle}")
-                                .append(" | ").append(lang("ui.ride_style.${selectedBehaviour.key.toString().lowercase()}")),
-                            pMouseX,
-                            pMouseY
-                        )
-                    }
                 }
 
             } else {

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

@@ -20,8 +20,6 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.Mth
 import java.util.*
 import kotlin.math.min
-import net.minecraft.client.gui.Font
-import net.minecraft.util.FormattedCharSequence
 
 @Environment(EnvType.CLIENT)
 class CobblemonToast(
@@ -40,18 +38,11 @@ class CobblemonToast(
     private var lastTime = 0L
     internal var nextVisibility: Toast.Visibility = Toast.Visibility.SHOW
 
-    fun getLines(font: Font, maxWidth: Int): List<FormattedCharSequence> {
-        return font.split(this.description, maxWidth)
-    }
-
     override fun render(context: GuiGraphics, manager: ToastComponent, startTime: Long): Toast.Visibility {
-        val maxWidth = 125
+        context.blitSprite(this.frameTexture, 0, 0, this.width(), this.height())
         val textRenderer = manager.minecraft.font
-
-        context.blitSprite(this.frameTexture, 0, 0, this.width(), this.height() + (getLines(textRenderer, maxWidth).size - 1) * 10)
-
         context.drawString(textRenderer, this.title, 30, 7, this.title.style.color?.value ?: -1, false)
-        context.drawWordWrap(textRenderer, this.description, 30, 18, maxWidth, this.description.style.color?.value ?: -1)
+        context.drawString(textRenderer, this.description, 30, 18, this.description.style.color?.value ?: -1, false)
         context.renderFakeItem(this.icon, 8, 8)
         if (this.hasProgressBar()) {
             context.fill(3, 28, 157, 29, -1)

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

@@ -32,7 +32,6 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
-import com.cobblemon.mod.common.util.toAssetPath
 import com.mojang.blaze3d.platform.InputConstants
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
@@ -585,7 +584,7 @@ class TradeGUI(
 
             // Poké Ball
             val nameXOffset = if (isOpposing) 75 else 0
-            val ballResource = pokemon.caughtBall.name.toAssetPath("textures/item/poke_balls/", ".png")
+            val ballResource = cobblemonResource("textures/item/poke_balls/" + pokemon.caughtBall.name.path + ".png")
             blitk(
                 matrixStack = context.pose(),
                 texture = ballResource,

common/src/main/kotlin/com/cobblemon/mod/common/client/keybind/keybinds/DownShiftPartyBinding.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.client.keybind.keybinds
 
 import com.cobblemon.mod.common.client.CobblemonClient
-import com.cobblemon.mod.common.client.gui.party.PartyTutorialToasts
 import com.cobblemon.mod.common.client.keybind.CobblemonKeyBinding
 import com.cobblemon.mod.common.client.keybind.KeybindCategories
 import com.mojang.blaze3d.platform.InputConstants
@@ -22,6 +21,5 @@ object DownShiftPartyBinding : CobblemonKeyBinding(
 ) {
     override fun onPress() {
         CobblemonClient.storage.shiftSelected(true)
-        PartyTutorialToasts.onArrowKeySwitchedSlot()
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/keybind/keybinds/UpShiftPartyBinding.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.client.keybind.keybinds
 
 import com.cobblemon.mod.common.client.CobblemonClient
-import com.cobblemon.mod.common.client.gui.party.PartyTutorialToasts
 import com.cobblemon.mod.common.client.keybind.CobblemonKeyBinding
 import com.cobblemon.mod.common.client.keybind.KeybindCategories
 import com.mojang.blaze3d.platform.InputConstants
@@ -22,6 +21,5 @@ object UpShiftPartyBinding : CobblemonKeyBinding(
 ) {
     override fun onPress() {
         CobblemonClient.storage.shiftSelected(false)
-        PartyTutorialToasts.onArrowKeySwitchedSlot()
     }
 }

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

@@ -16,8 +16,10 @@ object SetClientPlayerDataHandler : ClientNetworkPacketHandler<SetClientPlayerDa
     override fun handle(packet: SetClientPlayerDataPacket, client: Minecraft) {
         if (packet.isIncremental) {
             packet.type.incrementalAfterDecodeAction.invoke(packet.playerData)
-        } else {
+        }
+        else {
             packet.type.afterDecodeAction.invoke(packet.playerData)
         }
+
     }
 }

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

@@ -0,0 +1,27 @@
+/*
+ * 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.interaction.PokemonInteractions
+import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler
+import com.cobblemon.mod.common.net.messages.client.data.PokemonInteractionsSyncPacket
+import net.minecraft.client.Minecraft
+
+object PokemonInteractionsSyncHandler : ClientNetworkPacketHandler<PokemonInteractionsSyncPacket> {
+
+    override fun handle(
+        packet: PokemonInteractionsSyncPacket,
+        client: Minecraft,
+    ) {
+        PokemonInteractions.speciesInteractions.clear()
+        PokemonInteractions.speciesInteractions.addAll(packet.speciesInteractions)
+        PokemonInteractions.generalInteractions.clear()
+        PokemonInteractions.generalInteractions.addAll(packet.generalInteractions)
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/net/debug/ClientboundUpdateObsAvoidHandler.kt

@@ -1,25 +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.debug
-
-import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler
-import com.cobblemon.mod.common.client.render.debug.LineState
-import com.cobblemon.mod.common.client.render.debug.SteerForceRenderer
-import com.cobblemon.mod.common.net.messages.client.debug.ClientboundUpdateObsAvoidPacket
-import net.minecraft.client.Minecraft
-
-object S2CUpdateObsAvoidHandler : ClientNetworkPacketHandler<ClientboundUpdateObsAvoidPacket> {
-    override fun handle(packet: ClientboundUpdateObsAvoidPacket, client: Minecraft) {
-        client.executeIfPossible {
-            //ObjectAvoidanceRenderer.avoidanceLines[packet.entityId] = packet.lines
-            val lineState = SteerForceRenderer.lineStates.getOrPut(packet.entityId) { LineState() }
-            lineState.update(packet.lines)
-        }
-    }
-}

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

@@ -17,33 +17,35 @@ import net.minecraft.util.Mth
 
 object ClientboundUpdateOrientationHandler : ClientNetworkPacketHandler<ClientboundUpdateOrientationPacket> {
     override fun handle(packet: ClientboundUpdateOrientationPacket, client: Minecraft) {
-        val level = client.level ?: return
-        val player = client.player ?: return
-        val vehicle = level.getEntity(packet.entityId)
-        val vehicleController = if (vehicle is OrientationControllable) vehicle.orientationController else return
+        client.executeIfPossible {
+            val level = client.level ?: return@executeIfPossible
+            val player = client.player ?: return@executeIfPossible
+            val vehicle = level.getEntity(packet.entityId)
+            val vehicleController = if (vehicle is OrientationControllable) vehicle.orientationController else return@executeIfPossible
 
-        // If the client is also the driver of this entity then don't update it as the driver is the source
-        // of truth on vehicle orientation updates.
-        if (vehicle.controllingPassenger != player) {
-            packet.active?.let { shouldUseCustomOrientation ->
+            // If the client is also the driver of this entity then don't update it as the driver is the source
+            // of truth on vehicle orientation updates.
+            if (vehicle.controllingPassenger != player) {
+                packet.active?.let { shouldUseCustomOrientation ->
 
-                val playerIsPassenger = vehicle.passengers.contains(player)
+                    val playerIsPassenger = vehicle.passengers.contains(player)
 
-                // If the player has just switched to riding a custom orientation ride then set their
-                // ride x and y rots local to the vehicle rots(if the controller wasn't active and will now be active)
-                // This ensures that on transition your camera stays in the same spot
-                if (!vehicleController.isActive() && shouldUseCustomOrientation && playerIsPassenger) {
-                    // Set local to the vehicle x and yrot
-                    val playerRotater = player as RidePassenger?
-                    if (playerRotater != null) {
-                        playerRotater.`cobblemon$setRideXRot`(Mth.wrapDegrees(player.getXRot() - vehicle.getXRot()))
-                        playerRotater.`cobblemon$setRideYRot`(Mth.wrapDegrees(player.getYRot() - vehicle.getYRot()))
+                    // If the player has just switched to riding a custom orientation ride then set their
+                    // ride x and y rots local to the vehicle rots(if the controller wasn't active and will now be active)
+                    // This ensures that on transition your camera stays in the same spot
+                    if (!vehicleController.isActive() && shouldUseCustomOrientation && playerIsPassenger) {
+                        // Set local to the vehicle x and yrot
+                        val playerRotater = player as RidePassenger?
+                        if (playerRotater != null) {
+                            playerRotater.`cobblemon$setRideXRot`(Mth.wrapDegrees(player.getXRot() - vehicle.getXRot()))
+                            playerRotater.`cobblemon$setRideYRot`(Mth.wrapDegrees(player.getYRot() - vehicle.getYRot()))
+                        }
                     }
-                }
 
-                vehicle.orientationController.active = shouldUseCustomOrientation
+                    vehicle.orientationController.active = shouldUseCustomOrientation
+                }
+                vehicle.orientationController.updateOrientation { _ -> packet.orientation }
             }
-            vehicle.orientationController.updateOrientation { _ -> packet.orientation }
         }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/net/pokemon/update/ClientboundUpdateRidingStateHandler.kt

@@ -15,14 +15,16 @@ import net.minecraft.client.Minecraft
 
 object ClientboundUpdateRidingStateHandler : ClientNetworkPacketHandler<ClientboundUpdateRidingStatePacket> {
     override fun handle(packet: ClientboundUpdateRidingStatePacket, client: Minecraft) {
-        val player = client.player ?: return
-        val entity = player.level().getEntity(packet.entity) ?: return
-        if (entity !is PokemonEntity) return
-        if (entity.controllingPassenger == player) return
-        val buffer = packet.data ?: return
-        if (entity.ridingController?.context?.settings?.key != packet.behaviour) {
-            entity.ridingController?.changeBehaviour(packet.behaviour)
+        client.executeIfPossible {
+            val player = client.player ?: return@executeIfPossible
+            val entity = player.level().getEntity(packet.entity) ?: return@executeIfPossible
+            if (entity !is PokemonEntity) return@executeIfPossible
+            if (entity.controllingPassenger == player) return@executeIfPossible
+            val buffer = packet.data ?: return@executeIfPossible
+            if (entity.ridingController?.context?.settings?.key != packet.behaviour) {
+                entity.ridingController?.changeBehaviour(packet.behaviour)
+            }
+            entity.ridingController?.context?.state?.decode(buffer)
         }
-        entity.ridingController?.context?.state?.decode(buffer)
     }
 }