add mood particle assets

update CHANGELOG.md
add mood particle for when pokemon is fleeing from an attacker
2026-03-01 19:33:21 -03:00 · 2025-12-16 17:25:14 -03:00 · 2025-12-16 17:20:19 -03:00 · 2025-12-16 15:11:01 -03:00 · 2025-12-11 17:02:16 -03:00 · 2025-12-08 16:08:48 +00:00
99 changed files with 1182 additions and 337 deletions
@@ -2,22 +2,39 @@
 ## [1.7.2 (MONTH Xth, YEAR)](#1-7-2)

 ### Additions
+- 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 trades for Saccharine Saplings, Hearty Grains, Chipped Pot, and Masterpiece Teacup to the Wandering Trader.
+- Added brewing recipe for Throat Spray.
+- Added mood particles! Pokémon now visually react to certain actions:
+    - Angry particles when attacking a mob.
+    - Annoyed particles when a player tries to feed them while they’re already full.
+    - Sweat droplets when they run out of stamina while being ridden.

 ### Changes
+- Ride sounds have been separated into stereo for passengers and mono for other players. Riding will now sound more spacious.

 ### Fixes
 - 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 PokeSnacks 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 resetting it
+- Fixed mochi items consuming two items at a time
+- Fix item interaction sometimes not working properly when playing on servers.

 ### 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. 

 ### 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

 ### Particles

@@ -11,11 +11,15 @@ package com.cobblemon.mod.common.mixin;
 import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.PlayerSpawnerAccessor;
+import com.cobblemon.mod.common.api.riding.RidingStyle;
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner;
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory;
+import com.cobblemon.mod.common.api.stats.CobblemonStats;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -89,4 +93,32 @@ public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
    private boolean cobblemon$cancelSavingPokemonMounts(boolean original, @Local(ordinal=0) Entity entity) {
        return original && !(entity instanceof PokemonEntity);
    }
+
+    @WrapOperation(method = "checkRidingStatistics", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;getVehicle()Lnet/minecraft/world/entity/Entity;"))
+    public Entity cobblemon$checkRidingStatistics(ServerPlayer player, Operation<Entity> original, @Local int distance) {
+        var entity = original.call(player);
+        if (!(entity instanceof PokemonEntity pokemonEntity)) {
+            return entity;
+        }
+
+        var ridingController = pokemonEntity.getRidingController();
+        if (ridingController == null) return entity;
+
+        var activeContext = ridingController.getContext();
+        if (activeContext == null) return entity;
+
+        var ridingStyle = activeContext.getStyle();
+        CobblemonStats.CobblemonStat stat = switch (ridingStyle) {
+            case RidingStyle.LAND -> CobblemonStats.RIDING_LAND;
+            case RidingStyle.AIR -> CobblemonStats.RIDING_AIR;
+            case RidingStyle.LIQUID -> CobblemonStats.RIDING_LIQUID;
+            default -> null;
+        };
+
+        if (stat != null) {
+            player.awardStat(CobblemonStats.getStat(stat), distance);
+        }
+
+        return entity;
+    }
 }
@@ -42,8 +42,8 @@ import com.cobblemon.mod.common.api.scheduling.ServerRealTimeTaskTracker
 import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
 import com.cobblemon.mod.common.api.spawning.BestSpawner
 import com.cobblemon.mod.common.api.spawning.CobblemonSpawningZoneGenerator
-import com.cobblemon.mod.common.api.spawning.position.AreaSpawnablePositionResolver
 import com.cobblemon.mod.common.api.spawning.SpawningZoneGenerator
+import com.cobblemon.mod.common.api.spawning.position.AreaSpawnablePositionResolver
 import com.cobblemon.mod.common.api.starter.StarterHandler
 import com.cobblemon.mod.common.api.stats.CobblemonStats
 import com.cobblemon.mod.common.api.storage.PokemonStoreManager
@@ -76,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.EntityCallbackHandler
-import com.cobblemon.mod.common.events.CallbackHandler
-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
@@ -21,15 +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.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
@@ -37,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
@@ -59,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
@@ -83,20 +69,12 @@ import com.cobblemon.mod.common.net.messages.client.data.*
 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
@@ -116,43 +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.BattleChallengePacket
-import com.cobblemon.mod.common.net.messages.server.BattleChallengeResponsePacket
-import com.cobblemon.mod.common.net.messages.server.BenchMovePacket
-import com.cobblemon.mod.common.net.messages.server.RequestMoveSwapPacket
-import com.cobblemon.mod.common.net.messages.server.RequestPlayerInteractionsPacket
-import com.cobblemon.mod.common.net.messages.server.SelectStarterPacket
-import com.cobblemon.mod.common.net.messages.server.SendOutPokemonPacket
-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.*
+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
@@ -177,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
@@ -192,21 +142,11 @@ import com.cobblemon.mod.common.net.messages.server.storage.party.MovePartyPokem
 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
@@ -232,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
@@ -250,12 +186,7 @@ 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.ServerPlayer

@@ -401,6 +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, 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()))
@@ -12,10 +12,10 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.api.pokemon.requirement.OwnerQueryRequirement
 import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.net.messages.client.data.PokemonInteractionsSyncPacket
 import com.cobblemon.mod.common.pokemon.adapters.CobblemonRequirementAdapter
 import com.cobblemon.mod.common.pokemon.evolution.adapters.LegacyItemConditionWrapperAdapter
 import com.cobblemon.mod.common.pokemon.requirements.PokemonPropertiesRequirement
@@ -51,7 +51,12 @@ object PokemonInteractions : JsonDataRegistry<PokemonInteractionSet> {
    val speciesInteractions = mutableListOf<PokemonInteractionSet>()
    val generalInteractions = mutableListOf<PokemonInteractionSet>()

-    override fun sync(player: ServerPlayer) {}
+    override fun sync(player: ServerPlayer) {
+        PokemonInteractionsSyncPacket(
+            speciesInteractions,
+            generalInteractions,
+        ).sendToPlayer(player)
+    }

    override fun reload(data: Map<ResourceLocation, PokemonInteractionSet>) {
        speciesInteractions.clear()
@@ -15,11 +15,10 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.giveOrDropItemStack
-import com.cobblemon.mod.common.util.withPlayerValue
-import com.cobblemon.mod.common.util.withQueryValue
+import com.cobblemon.mod.common.pokemon.adapters.CobblemonRequirementAdapter
+import com.cobblemon.mod.common.util.*
 import net.minecraft.core.registries.Registries
+import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.sounds.SoundSource
@@ -28,30 +27,83 @@ import net.minecraft.world.entity.EquipmentSlot
 import net.minecraft.world.entity.item.ItemEntity
 import net.minecraft.world.item.ItemStack

-/**
- * A
- */
 data class PokemonInteractionSet(
    val requirements: List<Requirement> = listOf(),
-    val interactions: List<PokemonInteraction> = listOf()
-)
+    val interactions: List<PokemonInteraction> = listOf(),
+) {
+    fun encode(buffer: FriendlyByteBuf) {
+        buffer.writeCollection(requirements) { it, requirement ->
+            CobblemonRequirementAdapter.encode(requirement, it)
+        }
+        buffer.writeCollection(interactions) { it, interaction ->
+            interaction.encode(it)
+        }
+    }
+
+    companion object {
+        fun decode(buffer: FriendlyByteBuf): PokemonInteractionSet {
+            val requirements = buffer.readList { it ->
+                CobblemonRequirementAdapter.decode(it)
+            }
+            val interactions = buffer.readList { it ->
+                PokemonInteraction.decode(it)
+            }
+
+            return PokemonInteractionSet(
+                requirements,
+                interactions,
+            )
+        }
+    }
+}
+
 data class PokemonInteraction(
    val grouping: ResourceLocation,
    val requirements: List<Requirement> = listOf(),
    val effects: List<InteractionEffect> = listOf(),
    val cooldown: ExpressionLike = "0".asExpressionLike()
-)
+) {
+    fun encode(buffer: FriendlyByteBuf) {
+        buffer.writeResourceLocation(grouping)
+        buffer.writeCollection(requirements) { it, requirement ->
+            CobblemonRequirementAdapter.encode(requirement, it)
+        }
+        buffer.writeExpressionLike(cooldown)
+    }
+
+    companion object {
+        fun decode(buffer: FriendlyByteBuf): PokemonInteraction {
+            val grouping = buffer.readResourceLocation()
+            val requirements = buffer.readList { it ->
+                CobblemonRequirementAdapter.decode(it)
+            }
+
+            // No need to sync these for now
+            val effects = emptyList<InteractionEffect>()
+            val cooldown = buffer.readExpressionLike()
+
+            return PokemonInteraction(
+                grouping,
+                requirements,
+                effects,
+                cooldown,
+            )
+        }
+    }
+}

 interface InteractionEffect {
    fun applyEffect(pokemon: PokemonEntity, player: ServerPlayer)
 }

-class DropItemEffect(val item: ResourceLocation, val amount: IntRange?): InteractionEffect {
+class DropItemEffect(val item: ResourceLocation, val amount: IntRange?) : InteractionEffect {
    override fun applyEffect(
        pokemon: PokemonEntity,
        player: ServerPlayer
    ) {
-        val item = player.registryAccess().registryOrThrow(Registries.ITEM).get(item) ?: throw IllegalArgumentException("Cannot load item with id: $item")
+        val item = player.registryAccess().registryOrThrow(Registries.ITEM).get(item) ?: throw IllegalArgumentException(
+            "Cannot load item with id: $item"
+        )
        val stack = ItemStack(item)
        stack.count = amount?.randomOrNull() ?: 1
        if (stack.isEmpty)
@@ -68,12 +120,14 @@ class DropItemEffect(val item: ResourceLocation, val amount: IntRange?): Interac
    }
 }

-class GiveItemEffect(val item: ResourceLocation, val amount: IntRange?): InteractionEffect {
+class GiveItemEffect(val item: ResourceLocation, val amount: IntRange?) : InteractionEffect {
    override fun applyEffect(
        pokemon: PokemonEntity,
        player: ServerPlayer
    ) {
-        val item = player.registryAccess().registryOrThrow(Registries.ITEM).get(item) ?: throw IllegalArgumentException("Cannot load item with id: $item")
+        val item = player.registryAccess().registryOrThrow(Registries.ITEM).get(item) ?: throw IllegalArgumentException(
+            "Cannot load item with id: $item"
+        )
        val stack = ItemStack(item)
        stack.count = amount?.randomOrNull() ?: 1
        if (stack.isEmpty)
@@ -86,14 +140,29 @@ class GiveItemEffect(val item: ResourceLocation, val amount: IntRange?): Interac
    }
 }

-class PlaySoundEffect(val sound: ResourceLocation, val soundSource: SoundSource?, val playAround: Boolean = true, val distance: Double = 64.0, val volume: Float = 1.0F, val pitch: Float = 1.0F): InteractionEffect {
+class PlaySoundEffect(
+    val sound: ResourceLocation,
+    val soundSource: SoundSource?,
+    val playAround: Boolean = true,
+    val distance: Double = 64.0,
+    val volume: Float = 1.0F,
+    val pitch: Float = 1.0F
+) : InteractionEffect {
    override fun applyEffect(
        pokemon: PokemonEntity,
        player: ServerPlayer
    ) {
-        val packet = UnvalidatedPlaySoundS2CPacket(sound, soundSource ?: SoundSource.NEUTRAL, pokemon.x, pokemon.y, pokemon.z, volume, pitch)
+        val packet = UnvalidatedPlaySoundS2CPacket(
+            sound,
+            soundSource ?: SoundSource.NEUTRAL,
+            pokemon.x,
+            pokemon.y,
+            pokemon.z,
+            volume,
+            pitch
+        )
        if (playAround) {
-            packet.sendToPlayersAround( pokemon.x, pokemon.y, pokemon.z, distance, pokemon.level().dimension())
+            packet.sendToPlayersAround(pokemon.x, pokemon.y, pokemon.z, distance, pokemon.level().dimension())
        } else {
            packet.sendToPlayer(player)
        }
@@ -104,7 +173,7 @@ class PlaySoundEffect(val sound: ResourceLocation, val soundSource: SoundSource?
    }
 }

-class ShrinkItemEffect(val amount: Int = 1): InteractionEffect {
+class ShrinkItemEffect(val amount: Int = 1) : InteractionEffect {
    override fun applyEffect(
        pokemon: PokemonEntity,
        player: ServerPlayer
@@ -120,7 +189,7 @@ class ShrinkItemEffect(val amount: Int = 1): InteractionEffect {
    }
 }

-class ScriptEffect(val script: ExpressionLike): InteractionEffect {
+class ScriptEffect(val script: ExpressionLike) : InteractionEffect {
    override fun applyEffect(
        pokemon: PokemonEntity,
        player: ServerPlayer
@@ -92,13 +92,17 @@ interface PokemonAndMoveSelectingItem {
    }

    fun canUseOnPokemon(stack: ItemStack, pokemon: Pokemon): Boolean {
-        if (stack.`is`(CobblemonItemTags.POKE_FOOD)) {
-            return !pokemon.isFull()
+        if (pokemon.entity == null && stack.`is`(CobblemonItemTags.POKE_FOOD) && pokemon.isFull()) {
+            return false
        }
+
        return true
    }

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

@@ -107,13 +107,16 @@ interface PokemonSelectingItem {
    }

    fun canUseOnPokemon(stack: ItemStack, pokemon: Pokemon): Boolean {
-        if (stack.`is`(CobblemonItemTags.POKE_FOOD)) {
-            return !pokemon.isFull()
+        if (pokemon.entity == null && stack.`is`(CobblemonItemTags.POKE_FOOD) && pokemon.isFull()) {
+            return false
        }
+
        return true
    }

-    fun canUseOnBattlePokemon(stack: ItemStack, battlePokemon: BattlePokemon): Boolean = bagItem!!.canUse(stack, battlePokemon.actor.battle, battlePokemon)
+    fun canUseOnBattlePokemon(stack: ItemStack, battlePokemon: BattlePokemon): Boolean {
+        return bagItem!!.canUse(stack, battlePokemon.actor.battle, battlePokemon)
+    }

    fun interactWithSpecificBattle(player: ServerPlayer, stack: ItemStack, battlePokemon: BattlePokemon): InteractionResultHolder<ItemStack> {
        return if (canUseOnBattlePokemon(stack, battlePokemon)) {
@@ -779,6 +779,20 @@ object MoLangFunctions {
                    battleStartResult.ifSuccessful { returnValue = it.struct }
                    return@put returnValue
                }
+                map.put("get_custom_stat") { params ->
+                    val statName = params.getString(0)
+
+                    val resourceLocation = ResourceLocation.tryParse(statName) ?: return@put DoubleValue.ZERO
+                    val statResourceLocation = BuiltInRegistries.CUSTOM_STAT.get(resourceLocation) ?: return@put DoubleValue.ZERO
+
+                    val exists = net.minecraft.stats.Stats.CUSTOM.contains(statResourceLocation)
+                    if (!exists) return@put DoubleValue.ZERO
+
+                    val stat = net.minecraft.stats.Stats.CUSTOM.get(statResourceLocation)
+                    val value = player.stats.getValue(stat)
+
+                    DoubleValue(value)
+                }
            }
            map
        }
@@ -1552,8 +1566,9 @@ object MoLangFunctions {
            }
            map.put("feed_pokemon") { params ->
                val amount = params.getDouble(0)
-                val playSound = params.getBooleanOrNull(1) ?: true
-                pokemon.feedPokemon(amount.toInt(), playSound)
+                val playSound = params.getBooleanOrNull(1) != false
+                val playMoodParticles = params.getBooleanOrNull(2) != false
+                return@put DoubleValue(pokemon.feedPokemon(amount.toInt(), playSound, playMoodParticles))
            }
            map.put("behaviour") { pokemon.form.behaviour.struct }
            map.put("behavior") { pokemon.form.behaviour.struct } // Inferior
@@ -1739,22 +1754,35 @@ object MoLangFunctions {
                pokemon.removeCosmeticItem()
            }
            map.put("add_marks") { params ->
+                var appliedMark = false
                for (param in params.params) {
                    val identifier = param.asString().asIdentifierDefaultingNamespace()
                    val mark = Marks.getByIdentifier(identifier)
-                    if (mark != null) pokemon.exchangeMark(mark, true)
+                    if (mark != null) {
+                        pokemon.exchangeMark(mark, true)
+                        appliedMark = true
+                    }
                }
+
+                DoubleValue(appliedMark)
            }
            map.put("add_marks_with_chance") { params ->
+                var appliedMark = false
                for (param in params.params) {
                    val identifier = param.asString().asIdentifierDefaultingNamespace()
                    val mark = Marks.getByIdentifier(identifier)
+
                    mark?.let {
                        val probability = it.chance.coerceIn(0F, 1F) * 100
                        val randomValue = Random.nextDouble(0.0, 100.0)
-                        if (randomValue < probability) pokemon.exchangeMark(it, true)
+                        if (randomValue < probability) {
+                            pokemon.exchangeMark(it, true)
+                            appliedMark = true
+                        }
                    }
                }
+
+                DoubleValue(appliedMark)
            }
            map.put("add_potential_marks") { params ->
                for (param in params.params) {
@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.pokemon.Pokemon
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.player.Player

 /**
 * A [Requirement] that expects a [LivingEntity] to be attached to the [Pokemon].
@@ -26,7 +27,7 @@ interface OwnerQueryRequirement : Requirement {
    override fun check(pokemon: Pokemon): Boolean {
        val owner = pokemon.getOwnerEntity() ?: return false
        return when (owner) {
-            is ServerPlayer -> {
+            is Player -> {
                this.checkPlayer(pokemon, owner)
            }
            is NPCEntity -> {
@@ -37,13 +38,13 @@ interface OwnerQueryRequirement : Requirement {
    }

    /**
-     * Checks if the given [Pokemon] & [ServerPlayer] satisfies the requirement.
+     * Checks if the given [Pokemon] & [Player] satisfies the requirement.
     *
     * @param pokemon The [Pokemon] being queried.
-     * @param owner The [ServerPlayer] that owns this [Pokemon].
+     * @param owner The [Player] that owns this [Pokemon].
     * @return If the requirement was satisfied.
     */
-    fun checkPlayer(pokemon: Pokemon, owner: ServerPlayer): Boolean
+    fun checkPlayer(pokemon: Pokemon, owner: Player): Boolean

    /**
     * Checks if the given [Pokemon] & [NPCEntity] satisfies the requirement.
@@ -12,6 +12,7 @@ package com.cobblemon.mod.common.api.riding.sound
 import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeState
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.util.getIsSubmerged
 import com.cobblemon.mod.common.util.resolveDouble
 import net.minecraft.client.Minecraft
 import net.minecraft.client.resources.sounds.AbstractTickableSoundInstance
@@ -65,6 +66,21 @@ class RideLoopSound(val ride: PokemonEntity, val soundSettings: RideSoundSetting
            return
        }

+        // Mute the sound if it's not meant to play for the passenger
+        if (this.isPassenger && !this.soundSettings.playForPassengers) {
+            this.volume = 0.0f
+            return
+        }
+
+        // Mute sounds when submerged unless they support underwater sounds, underwater sounds don't play above water
+        if (this.ride.getIsSubmerged() && !this.soundSettings.submerged) {
+            this.volume = 0.0f
+            return
+        } else if (!this.ride.getIsSubmerged() && this.soundSettings.submerged) {
+            this.volume = 0.0f
+            return
+        }
+
        // Perform data driven pitch and volume calculation
        this.volume = ((soundSettings.volumeExpr.let { ride.runtime.resolveDouble(it) })).toFloat()
        this.volume *= this.fade
@@ -27,7 +27,9 @@ data class RideSoundSettings(
    val soundLocation: ResourceLocation,
    @SerializedName("volumeExpr") private val _volumeExpr: Expression? = "1.0".asExpression(),
    @SerializedName("pitchExpr") private val _pitchExpr: Expression? = "1.0".asExpression(),
+    val playForPassengers: Boolean = true,
    val playForNonPassengers: Boolean = false,
+    val submerged: Boolean = false,
    val muffleEnabled: Boolean = false,
    @SerializedName("attenuationModel") private val _attenuationModel: RideAttenuationModel? = RideAttenuationModel.NONE
 ): Encodable {
@@ -46,7 +48,9 @@ data class RideSoundSettings(
        buffer.writeResourceLocation(soundLocation)
        buffer.writeExpression(volumeExpr)
        buffer.writeExpression(pitchExpr)
+        buffer.writeBoolean(playForPassengers)
        buffer.writeBoolean(playForNonPassengers)
+        buffer.writeBoolean(submerged)
        buffer.writeBoolean(muffleEnabled)
        buffer.writeEnum(attenuationModel)
    }
@@ -57,7 +61,9 @@ data class RideSoundSettings(
            val soundLocation = buffer.readResourceLocation()
            val volumeExpr = buffer.readExpression()
            val pitchExpr = buffer.readExpression()
+            val playForPassengers = buffer.readBoolean()
            val playForNonPassengers = buffer.readBoolean()
+            val submerged = buffer.readBoolean()
            val muffleEnabled = buffer.readBoolean()
            val attenuationModel = buffer.readEnum(RideAttenuationModel::class.java)

@@ -65,7 +71,9 @@ data class RideSoundSettings(
                soundLocation,
                volumeExpr,
                pitchExpr,
+                playForPassengers,
                playForNonPassengers,
+                submerged,
                muffleEnabled,
                attenuationModel
            )
@@ -8,30 +8,58 @@

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

+import com.cobblemon.mod.common.Cobblemon
+import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.stats.StatFormatter

 object CobblemonStats {
-    val stats = mutableMapOf<String,  ResourceLocation>()
+    val stats = mutableMapOf<String, CobblemonStat>()

-    var CAPTURED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "captured") //makeCustomStat("captured", StatFormatter.DEFAULT)
-    val SHINIES_CAPTURED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "shinies_captured") //makeCustomStat("shinies_captured", StatFormatter.DEFAULT)
-    val RELEASED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "released") //makeCustomStat("released", StatFormatter.DEFAULT)
-    val EVOLVED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "evolved") //makeCustomStat("evolved", StatFormatter.DEFAULT)
-    val LEVEL_UP: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "level_up") //makeCustomStat("level_up", StatFormatter.DEFAULT)
-    val BATTLES_WON: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "battles_won") //makeCustomStat("battles_won", StatFormatter.DEFAULT)
-    val BATTLES_LOST: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "battles_lost") //makeCustomStat("battles_lost", StatFormatter.DEFAULT)
-    val BATTLES_FLED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "battles_fled") //makeCustomStat("battles_fled", StatFormatter.DEFAULT)
-    val BATTLES_TOTAL: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "battles_total") //makeCustomStat("battles_total", StatFormatter.DEFAULT)
-    val DEX_ENTRIES: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "dex_entries") //makeCustomStat("dex_entries", StatFormatter.DEFAULT)
-    val EGGS_COLLECTED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "eggs_collected") //makeCustomStat("eggs_collected", StatFormatter.DEFAULT)
-    val EGGS_HATCHED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "eggs_hatched") //makeCustomStat("eggs_hatched", StatFormatter.DEFAULT)
-    val TRADED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "traded") //makeCustomStat("traded", StatFormatter.DEFAULT)
-    val FOSSILS_REVIVED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "fossils_revived") //makeCustomStat("fossils_revived", StatFormatter.DEFAULT)
-    val TIMES_RIDDEN: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "times_ridden")
-    val ROD_CASTS: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "rod_casts")
-    val REEL_INS: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "reel_ins")
-    val POKEMON_INTERACTED_WITH: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "pokemon_interacted_with") //makeCustomStat("pokemon_interacted_with", StatFormatter.DEFAULT)
-    //TODO block, stats (interact, gimmi), riding (styles?)
+    @JvmField
+    var CAPTURED: CobblemonStat = CobblemonStat("captured")
+    @JvmField
+    val SHINIES_CAPTURED: CobblemonStat = CobblemonStat("shinies_captured")
+    @JvmField
+    val RELEASED: CobblemonStat = CobblemonStat("released")
+    @JvmField
+    val EVOLVED: CobblemonStat = CobblemonStat("evolved")
+    @JvmField
+    val LEVEL_UP: CobblemonStat = CobblemonStat("level_up")
+    @JvmField
+    val BATTLES_WON: CobblemonStat = CobblemonStat("battles_won")
+    @JvmField
+    val BATTLES_LOST: CobblemonStat = CobblemonStat("battles_lost")
+    @JvmField
+    val BATTLES_FLED: CobblemonStat = CobblemonStat("battles_fled")
+    @JvmField
+    val BATTLES_TOTAL: CobblemonStat = CobblemonStat("battles_total")
+    @JvmField
+    val DEX_ENTRIES: CobblemonStat = CobblemonStat("dex_entries")
+    @JvmField
+    val EGGS_COLLECTED: CobblemonStat = CobblemonStat("eggs_collected")
+    @JvmField
+    val EGGS_HATCHED: CobblemonStat = CobblemonStat("eggs_hatched")
+    @JvmField
+    val TRADED: CobblemonStat = CobblemonStat("traded")
+    @JvmField
+    val FOSSILS_REVIVED: CobblemonStat = CobblemonStat("fossils_revived")
+    @JvmField
+    val TIMES_RIDDEN: CobblemonStat = CobblemonStat("times_ridden")
+    @JvmField
+    val ROD_CASTS: CobblemonStat = CobblemonStat("rod_casts")
+    @JvmField
+    val REEL_INS: CobblemonStat = CobblemonStat("reel_ins")
+    @JvmField
+    val POKEMON_INTERACTED_WITH: CobblemonStat = CobblemonStat("pokemon_interacted_with")
+    @JvmField
+    val RIDING_LAND: CobblemonStat = CobblemonStat("riding_land", StatFormatter.DISTANCE)
+    @JvmField
+    val RIDING_AIR: CobblemonStat = CobblemonStat("riding_air", StatFormatter.DISTANCE)
+    @JvmField
+    val RIDING_LIQUID: CobblemonStat = CobblemonStat("riding_liquid", StatFormatter.DISTANCE)
+
+    //TODO block, stats (interact, gimmi)

    fun registerStats() {
        stats["captured"] = CAPTURED
@@ -52,5 +80,22 @@ object CobblemonStats {
        stats["rod_casts"] = ROD_CASTS
        stats["reel_ins"] = REEL_INS
        stats["pokemon_interacted_with"] = POKEMON_INTERACTED_WITH
+        stats["riding_land"] = RIDING_LAND
+        stats["riding_air"] = RIDING_AIR
+        stats["riding_liquid"] = RIDING_LIQUID
+    }
+
+    @JvmStatic
+    fun getStat(cobblemonStat: CobblemonStat) : ResourceLocation {
+        val resourceLocation = cobblemonStat.resourceLocation
+        val stat = BuiltInRegistries.CUSTOM_STAT.get(resourceLocation)
+        if (stat == null) {
+            Cobblemon.LOGGER.error("Could not find stat with id {}", resourceLocation)
+        }
+        return stat ?: throw NullPointerException("Could not find stat with id $resourceLocation")
+    }
+
+    data class CobblemonStat(val path: String, val formatter: StatFormatter = StatFormatter.DEFAULT) {
+        val resourceLocation: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", path);
    }
 }
@@ -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)
+    }
+}
@@ -8,6 +8,8 @@

 package com.cobblemon.mod.common.client.persisted

+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.config.CobblemonConfig
 import java.io.BufferedReader
 import java.io.BufferedWriter
@@ -31,7 +33,14 @@ object ClientPersistedData {
    fun readSnapshotsData() : SnapshotAcknowledgementData? {
        if (snapshotsPath.exists()) {
            BufferedReader(InputStreamReader(FileInputStream(snapshotsPath.toFile()))).use { reader ->
-                return gson.fromJson(reader, SnapshotAcknowledgementData::class.java)
+                try {
+                    return gson.fromJson(reader, SnapshotAcknowledgementData::class.java)
+                } catch (exception: Exception) {
+                    LOGGER.error("Failed to load snapshots.json... Resetting File")
+                    val data = SnapshotAcknowledgementData(Cobblemon.VERSION, false)
+                    writeSnapshotsData(data)
+                    return data
+                }
            }
        }

@@ -46,16 +55,23 @@ object ClientPersistedData {
    fun readRidingPerspectivesData() : RidingPerspectiveData? {
        if (ridingPerspectivesPath.exists()) {
            BufferedReader(InputStreamReader(FileInputStream(ridingPerspectivesPath.toFile()))).use { reader ->
-                return gson.fromJson(reader, RidingPerspectiveData::class.java)
+                try {
+                    return gson.fromJson(reader, RidingPerspectiveData::class.java)
+                } catch (exception: Exception) {
+                    LOGGER.error("Failed to load riding_perspectives.json... Resetting File")
+                    val data = RidingPerspectiveData()
+                    saveRidingPerspectivesData(data)
+                    return data
+                }
            }
        }

        return null
    }

-    fun saveRidingPerspectivesData() {
+    fun saveRidingPerspectivesData(data: RidingPerspectiveData) {
        ridingPerspectivesPath.toFile().parentFile.mkdirs()
-        BufferedWriter(FileWriter(ridingPerspectivesPath.toFile())).use { writer -> gson.toJson(ridingPerspectives, writer) }
+        BufferedWriter(FileWriter(ridingPerspectivesPath.toFile())).use { writer -> gson.toJson(data, writer) }
    }

    data class SnapshotAcknowledgementData(val version: String, val dontShowAgain: Boolean)
@@ -64,7 +80,7 @@ object ClientPersistedData {
    ) {
        fun updatePerspective(key: ResourceLocation, cameraType: CameraType) {
            perspectives[key] = cameraType
-            saveRidingPerspectivesData()
+            saveRidingPerspectivesData(this)
        }
    }
 }
@@ -9,7 +9,10 @@
 package com.cobblemon.mod.common.entity.ai

 import com.bedrockk.molang.Expression
+import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.util.getMemorySafely
 import com.cobblemon.mod.common.util.mainThreadRuntime
 import com.cobblemon.mod.common.util.resolveInt
 import com.cobblemon.mod.common.util.withQueryValue
@@ -29,12 +32,23 @@ object FleeFromAttackerTask {
                Trigger { _, entity, _ ->
                    val hurtByEntity = it.get(hurtByEntity)
                    val avoidTarget = it.tryGet(avoidTarget).orElse(null)
-                    if (avoidTarget != null && avoidTarget == hurtByEntity.uuid) {
+
+                    if (avoidTarget != null && avoidTarget == hurtByEntity) {
                        return@Trigger false
                    }
+
                    mainThreadRuntime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
                    val avoidDurationTicks = mainThreadRuntime.resolveInt(avoidDurationTicks)
+
+                    val pokemonEntity = entity as? PokemonEntity
+                    pokemonEntity?.let {
+                        it.after(1.0f) {
+                            it.playMoodParticle("mood_stress")
+                        }
+                    }
+
                    entity.brain.setMemoryWithExpiry(MemoryModuleType.AVOID_TARGET, hurtByEntity, avoidDurationTicks.toLong())
+
                    return@Trigger true
                }
            }
@@ -8,6 +8,7 @@

 package com.cobblemon.mod.common.entity.ai

+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.OneShot
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
@@ -24,6 +25,10 @@ object GetAngryAtAttackerTask {
                Trigger { _, entity, _ ->
                    val hurtByEntity = it.get(hurtByEntity)
                    val angryAt = it.tryGet(angryAt).orElse(null)
+                    if (angryAt == null && hurtByEntity != null) {
+                        (entity as PokemonEntity?)?.playMoodParticle("mood_anger_steam")
+                    }
+
                    if (angryAt != null && angryAt == hurtByEntity.uuid) {
                        return@Trigger false
                    }
@@ -82,6 +82,7 @@ import com.cobblemon.mod.common.entity.pokemon.effects.EffectTracker
 import com.cobblemon.mod.common.entity.pokemon.effects.IllusionEffect
 import com.cobblemon.mod.common.net.messages.client.OpenBehaviourEditorPacket
 import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
+import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
 import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
 import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.ui.InteractPokemonUIPacket
@@ -419,6 +420,9 @@ open class PokemonEntity(

    var occupiedSeats = arrayOfNulls<Entity>(seats.size)

+    var moodParticleLock = false
+    var playedZeroStaminaParticle = false
+
    init {
        delegate.initialize(this)
        delegate.changePokemon(pokemon)
@@ -833,6 +837,28 @@ open class PokemonEntity(
        return future
    }

+    fun playMoodParticle(particleName: String) {
+        if (moodParticleLock) return
+
+        cry()
+        SpawnSnowstormEntityParticlePacket(
+            cobblemonResource(particleName),
+            id,
+            listOf("head", "top")
+        ).sendToPlayersAround(
+            x,
+            y,
+            z,
+            64.0,
+            level().dimension()
+        )
+
+        moodParticleLock = true
+        after(5.0f) {
+            moodParticleLock = false
+        }
+    }
+
    override fun saveWithoutId(nbt: CompoundTag): CompoundTag {
        val tethering = this.tethering
        if (tethering != null) {
@@ -1208,14 +1234,13 @@ open class PokemonEntity(
            }
        }

-        if (hand == InteractionHand.MAIN_HAND && player is ServerPlayer) {
-            if (player.isShiftKeyDown) {
+        if (hand == InteractionHand.MAIN_HAND) {
+            if (player.isShiftKeyDown && player is ServerPlayer) {
                showInteractionWheel(player, itemStack)
                return InteractionResult.sidedSuccess(level().isClientSide)
            }
-            else if (pokemon.getOwnerPlayer() == player) {
-                // TODO #105
-                if (this.attemptItemInteraction(player, player.getItemInHand(hand))) return InteractionResult.SUCCESS
+            else if (this.ownerUUID == player.uuid && this.attemptItemInteraction(player, player.getItemInHand(hand))) {
+                return InteractionResult.sidedSuccess(level().isClientSide)
            }
        }

@@ -1391,18 +1416,24 @@ open class PokemonEntity(
            return bagItemLike.handleInteraction(player, battlePokemon, stack)
        }

-        if (player !is ServerPlayer || this.isBusy) {
+        if (this.isBusy) {
            return false
        }

        val interaction = PokemonInteractions.findInteraction(this)
-
        if (interaction != null && !pokemon.isOnInteractionCooldown(interaction.grouping)) {
-            interaction.effects.forEach { it.applyEffect(this, player) }
-            pokemon.interactionCooldowns.put(interaction.grouping, runtime.resolveInt(interaction.cooldown))
+            if (player is ServerPlayer) {
+                interaction.effects.forEach { it.applyEffect(this, player) }
+                pokemon.interactionCooldowns.put(interaction.grouping, runtime.resolveInt(interaction.cooldown))
+            }
+
            return true
        }

+        if (player !is ServerPlayer) {
+            return false
+        }
+
        // Evolution item logic
        if (pokemon.getOwnerPlayer() == player) {
            val context = ItemInteractionEvolution.ItemInteractionContext(stack, player.level())
@@ -2208,6 +2239,8 @@ open class PokemonEntity(
            ifRidingAvailable { _, _, state ->
                state.stamina.set(entityData.get(RIDE_STAMINA))
            }
+
+            playedZeroStaminaParticle = false
        }
    }

@@ -2236,12 +2269,26 @@ open class PokemonEntity(

    override fun tickRidden(driver: Player, movementInput: Vec3) {
        super.tickRidden(driver, movementInput)
+
        ifRidingAvailable { behaviour, settings, state ->
            behaviour.tick(settings, state, this, driver, movementInput)
            if (entityData.get(RIDE_STAMINA) == -1F) {
                state.stamina.set(1F, forced = true)
            }

+            if (!level().isClientSide) {
+                val stamina = state.stamina.get()
+
+                if (stamina <= 0f) {
+                    if (!playedZeroStaminaParticle) {
+                        playMoodParticle("mood_stress")
+                        playedZeroStaminaParticle = true
+                    }
+                } else {
+                    playedZeroStaminaParticle = false
+                }
+            }
+
            if (!this.level().isClientSide) {
                val pose = behaviour.pose(settings, state, this)
                if (pose != this.entityData.get(POSE_TYPE)) {
@@ -44,6 +44,11 @@ class DefendOwnerSensor : Sensor<PokemonEntity>(10) {
            return@findClosest false
        }.map { mob -> mob as LivingEntity }

+        val previousAttacker = entity.brain.getMemorySafely(CobblemonMemories.NEAREST_VISIBLE_ATTACKER)
+        if (nearestAttacker.isPresent && previousAttacker.isEmpty) {
+            entity.playMoodParticle("mood_anger_steam")
+        }
+
        entity.brain.setMemory(CobblemonMemories.NEAREST_VISIBLE_ATTACKER, nearestAttacker)
    }
 }
@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.entity.pokemon.ai.tasks

 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.util.getMemorySafely
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.Mob
 import net.minecraft.world.entity.ai.behavior.OneShot
@@ -60,7 +61,12 @@ object AttackHostileMobsTask {
                }

                if (hostile != null) {
+                    if (currentTarget == null) {
+                        (entity as? PokemonEntity)?.playMoodParticle("mood_anger_steam")
+                    }
+
                    entity.brain.setMemory(MemoryModuleType.ATTACK_TARGET, hostile)
+
                    true
                } else {
                    false
@@ -91,7 +91,7 @@ class EatHeldItemTask(entity: PokemonEntity) : Behavior<PokemonEntity>(
                    }
                    this.timelastEaten = time
                    if (itemConfig != null && itemConfig.fullnessValue > 0) {
-                        entity.pokemon.feedPokemon(itemConfig.fullnessValue, false)
+                        entity.pokemon.feedPokemon(itemConfig.fullnessValue, false, false)
                    }
                    // Check if the result item is something that should be dropped
                    resultItemStack = entity.pokemon.heldItem()
@@ -30,21 +30,13 @@ 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.fishing.PokerodCastEvent
 import com.cobblemon.mod.common.api.events.fishing.PokerodReelEvent
-import com.cobblemon.mod.common.api.events.pokemon.CollectEggEvent
-import com.cobblemon.mod.common.api.events.pokemon.FossilRevivedEvent
-import com.cobblemon.mod.common.api.events.pokemon.HatchEggEvent
-import com.cobblemon.mod.common.api.events.pokemon.LevelUpEvent
-import com.cobblemon.mod.common.api.events.pokemon.PokemonCapturedEvent
-import com.cobblemon.mod.common.api.events.pokemon.PokemonGainedEvent
-import com.cobblemon.mod.common.api.events.pokemon.RidePokemonEvent
-import com.cobblemon.mod.common.api.events.pokemon.TradeEvent
+import com.cobblemon.mod.common.api.events.pokemon.*
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEvent
 import com.cobblemon.mod.common.api.events.storage.ReleasePokemonEvent
+import com.cobblemon.mod.common.api.stats.CobblemonStats.getStat
 import com.cobblemon.mod.common.util.getPlayer
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
-import java.util.UUID
+import java.util.*

 object StatHandler : EventHandler {
    override fun registerListeners() {
@@ -100,13 +92,13 @@ object StatHandler : EventHandler {

    fun onBattleStart(event : BattleStartedEvent) {
        event.battle.players.forEach { player ->
-            player.awardStat(this.getStat(getStat(Cobblemon.statistics.BATTLES_TOTAL)))
+            player.awardStat(getStat(Cobblemon.statistics.BATTLES_TOTAL))
        }
    }

    fun onDexEntryGain(event : PokemonGainedEvent) {
        val player = event.pokemon.getOwnerPlayer()
-        player?.awardStat(getStat(getStat(Cobblemon.statistics.DEX_ENTRIES)))
+        player?.awardStat(getStat(Cobblemon.statistics.DEX_ENTRIES))
    }

    fun onCollectEgg(event : CollectEggEvent) {
@@ -139,12 +131,4 @@ object StatHandler : EventHandler {
    fun onReelIn(event : PokerodReelEvent) {
        event.player.awardStat(getStat(Cobblemon.statistics.REEL_INS))
    }
-
-    fun getStat(resourceLocation: ResourceLocation) : ResourceLocation {
-        val stat = BuiltInRegistries.CUSTOM_STAT.get(resourceLocation)
-        if (stat == null) {
-            Cobblemon.LOGGER.error("Could not find stat with id {}", resourceLocation)
-        }
-        return stat ?: throw NullPointerException("Could not find stat with id $resourceLocation")
-    }
 }
@@ -13,7 +13,9 @@ import com.cobblemon.mod.common.api.apricorn.Apricorn
 import com.cobblemon.mod.common.api.item.PokemonSelectingItem
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.client.pot.CookingQuality
+import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
 import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.server.level.ServerPlayer
@@ -91,7 +93,9 @@ class AprijuiceItem(val type: Apricorn): CobblemonItem(Properties().stacksTo(16)
            return InteractionResultHolder.fail(stack)
        }

-        pokemon.feedPokemon(1)
+        if (!pokemon.feedPokemon(1)) {
+            return InteractionResultHolder.fail(stack)
+        }
        
        val boosts = getBoosts(stack)
        pokemon.addRideBoosts(boosts.mapValues { it.value.toFloat() })
@@ -96,8 +96,9 @@ class PokePuffItem : Item(Properties().stacksTo(64)), PokemonSelectingItem {
            return InteractionResultHolder.fail(stack)
        }

-        // Feed the Pokémon 4 fullness points
-        pokemon.feedPokemon(4)
+        if (!pokemon.feedPokemon(4)) {
+            return InteractionResultHolder.fail(stack)
+        }

        val friendshipChange = PokePuffUtils.calculateFriendshipChange(stack, pokemon.nature)

@@ -54,14 +54,16 @@ class FriendshipRaisingBerryItem(block: BerryBlock, val stat: Stat) : BerryItem(
        val evLowerAmount = max(genericRuntime.resolveInt(CobblemonMechanics.berries.evLowerAmount), 0)
        val decreasedEVs = pokemon.evs.add(stat, -evLowerAmount, ItemEvSource(player, stack, pokemon)) != 0

-        return if (increasedFriendship || decreasedEVs) {
-            pokemon.feedPokemon(1)
-
-            stack.consume(1, player)
-            InteractionResultHolder.success(stack)
-        } else {
-            InteractionResultHolder.pass(stack)
+        if (!increasedFriendship && !decreasedEVs) {
+            return InteractionResultHolder.pass(stack)
        }
+
+        if (!pokemon.feedPokemon(1)) {
+            return InteractionResultHolder.fail(stack)
+        }
+
+        stack.consume(1, player)
+        return InteractionResultHolder.success(stack)
    }

    override fun use(world: Level, user: Player, hand: InteractionHand): InteractionResultHolder<ItemStack> {
@@ -54,7 +54,10 @@ class HealingBerryItem(block: BerryBlock, val amount: () -> ExpressionLike): Ber
            return InteractionResultHolder.fail(stack)
        }

-        pokemon.feedPokemon(1)
+        if (!pokemon.feedPokemon(1)) {
+            return InteractionResultHolder.fail(stack)
+        }
+
        pokemon.currentHealth = Integer.min(pokemon.currentHealth + genericRuntime.resolveInt(amount(), pokemon), pokemon.maxHealth)
        stack.consume(1, player)
        return InteractionResultHolder.success(stack)
@@ -62,7 +65,7 @@ class HealingBerryItem(block: BerryBlock, val amount: () -> ExpressionLike): Ber

    override fun applyToBattlePokemon(player: ServerPlayer, stack: ItemStack, battlePokemon: BattlePokemon) {
        super.applyToBattlePokemon(player, stack, battlePokemon)
-        battlePokemon.originalPokemon.feedPokemon(1)
+        battlePokemon.originalPokemon.feedPokemon(1, playMoodParticle = false)
    }

    override fun use(world: Level, user: Player, hand: InteractionHand): InteractionResultHolder<ItemStack> {
@@ -48,21 +48,26 @@ class PPRestoringBerryItem(block: BerryBlock, val amount: () -> ExpressionLike):
            && super.canUseOnPokemon(stack, pokemon)

    override fun applyToPokemon(player: ServerPlayer, stack: ItemStack, pokemon: Pokemon, move: Move) {
-        if (canUseOnPokemon(stack, pokemon) && canUseOnMove(stack, move)) {
-            pokemon.feedPokemon(1)
-            val moveToRecover = pokemon.moveSet.find { it.template == move.template }
-            if (moveToRecover != null && moveToRecover.currentPp < moveToRecover.maxPp) {
-                moveToRecover.currentPp =
-                    min(moveToRecover.maxPp, moveToRecover.currentPp + genericRuntime.resolveInt(amount(), pokemon))
+        if (!canUseOnPokemon(stack, pokemon) && canUseOnMove(stack, move)) {
+            return
+        }

-                stack.consume(1, player)
-            }
+        if (!pokemon.feedPokemon(1)) {
+            return
+        }
+
+        val moveToRecover = pokemon.moveSet.find { it.template == move.template }
+        if (moveToRecover != null && moveToRecover.currentPp < moveToRecover.maxPp) {
+            moveToRecover.currentPp =
+                min(moveToRecover.maxPp, moveToRecover.currentPp + genericRuntime.resolveInt(amount(), pokemon))
+
+            stack.consume(1, player)
        }
    }

    override fun applyToBattlePokemon(player: ServerPlayer, stack: ItemStack, battlePokemon: BattlePokemon, move: Move) {
        super.applyToBattlePokemon(player, stack, battlePokemon, move)
-        battlePokemon.originalPokemon.feedPokemon(1)
+        battlePokemon.originalPokemon.feedPokemon(1, playMoodParticle = false)
    }

    override fun use(world: Level, user: Player, hand: InteractionHand): InteractionResultHolder<ItemStack> {
@@ -59,7 +59,9 @@ class PortionHealingBerryItem(block: BerryBlock, val canCauseConfusion: Boolean,
        }

        // count these berries as multiple feedings due to the amount they heal
-        pokemon.feedPokemon(5)
+        if (!pokemon.feedPokemon(5)) {
+            return InteractionResultHolder.fail(stack)
+        }

        var amount = Integer.min(pokemon.currentHealth + (genericRuntime.resolveFloat(portion(), pokemon) * pokemon.maxHealth).toInt(), pokemon.maxHealth)
        CobblemonEvents.POKEMON_HEALED.postThen(PokemonHealedEvent(pokemon, amount, this), { cancelledEvent -> return InteractionResultHolder.fail(stack)}) { event ->
@@ -73,7 +75,7 @@ class PortionHealingBerryItem(block: BerryBlock, val canCauseConfusion: Boolean,

    override fun applyToBattlePokemon(player: ServerPlayer, stack: ItemStack, battlePokemon: BattlePokemon) {
        super.applyToBattlePokemon(player, stack, battlePokemon)
-        battlePokemon.originalPokemon.feedPokemon(5)
+        battlePokemon.originalPokemon.feedPokemon(5, playMoodParticle = false)
    }

    override fun use(world: Level, user: Player, hand: InteractionHand): InteractionResultHolder<ItemStack> {
@@ -58,19 +58,23 @@ class StatusCuringBerryItem(block: BerryBlock, vararg val status: Status): Berry
        stack: ItemStack,
        pokemon: Pokemon
    ): InteractionResultHolder<ItemStack>? {
-        return if (canUseOnPokemon(stack, pokemon)) {
-            pokemon.feedPokemon(1)
-            pokemon.status = null
-            stack.consume(1, player)
-            InteractionResultHolder.success(stack)
-        } else {
-            InteractionResultHolder.fail(stack)
+        if (!canUseOnPokemon(stack, pokemon)) {
+            return InteractionResultHolder.fail(stack)
        }
+
+        if (!pokemon.feedPokemon(1)) {
+            return InteractionResultHolder.fail(stack)
+        }
+
+        pokemon.status = null
+        stack.consume(1, player)
+
+        return InteractionResultHolder.success(stack)
    }

    override fun applyToBattlePokemon(player: ServerPlayer, stack: ItemStack, battlePokemon: BattlePokemon) {
        super.applyToBattlePokemon(player, stack, battlePokemon)
-        battlePokemon.originalPokemon.feedPokemon(1)
+        battlePokemon.originalPokemon.feedPokemon(1, playMoodParticle = false)
    }

    override fun use(world: Level, user: Player, hand: InteractionHand): InteractionResultHolder<ItemStack> {
@@ -53,7 +53,10 @@ class BerryJuiceItem : CobblemonItem(Properties()), PokemonSelectingItem, Healin
        if (!canUseOnPokemon(stack, pokemon)) {
            return InteractionResultHolder.fail(stack)
        }
-        pokemon.feedPokemon(1)
+
+        if (!pokemon.feedPokemon(1)) {
+            return InteractionResultHolder.fail(stack)
+        }

        var amount = Integer.min(pokemon.currentHealth + 20, pokemon.maxHealth)
        CobblemonEvents.POKEMON_HEALED.postThen(PokemonHealedEvent(pokemon, amount, this), { cancelledEvent -> return InteractionResultHolder.fail(stack)}) { event ->
@@ -74,7 +77,9 @@ class BerryJuiceItem : CobblemonItem(Properties()), PokemonSelectingItem, Healin

    override fun applyToBattlePokemon(player: ServerPlayer, stack: ItemStack, battlePokemon: BattlePokemon) {
        super.applyToBattlePokemon(player, stack, battlePokemon)
-        battlePokemon.originalPokemon.feedPokemon(1)
+
+        battlePokemon.originalPokemon.feedPokemon(1, playMoodParticle = false)
+
        if (!player.hasInfiniteMaterials())  {
            val woodenBowlItemStack = ItemStack(Items.BOWL)
            if (!player.inventory.add(woodenBowlItemStack)) {
@@ -33,7 +33,10 @@ class FreshStartMochiItem : CobblemonItem(Properties()), PokemonSelectingItem {
            return InteractionResultHolder.fail(stack)
        }

-        pokemon.feedPokemon(1)
+        if (!pokemon.feedPokemon(1)) {
+            return InteractionResultHolder.fail(stack)
+        }
+
        pokemon.evs.forEach {
            pokemon.evs[it.key] = 0
        }
@@ -24,10 +24,10 @@ class MochiItem(stat: Stats): EVIncreaseItem(stat, 4) {
            return InteractionResultHolder.fail(stack)
        }

-        pokemon.feedPokemon(1)
-
-        stack.consume(1, player)
-
+        if (!pokemon.feedPokemon(1)) {
+            return InteractionResultHolder.fail(stack)
+        }
+        
        return super.applyToPokemon(player, stack, pokemon)
    }
 }
@@ -0,0 +1,48 @@
+/*
+ * 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.net.messages.client.data
+
+import com.cobblemon.mod.common.api.interaction.PokemonInteractionSet
+import com.cobblemon.mod.common.api.net.NetworkPacket
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.network.RegistryFriendlyByteBuf
+
+class PokemonInteractionsSyncPacket(
+    val speciesInteractions: List<PokemonInteractionSet>,
+    val generalInteractions: List<PokemonInteractionSet>,
+) : NetworkPacket<PokemonInteractionsSyncPacket> {
+    override val id = ID
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeCollection(speciesInteractions) { it, speciesInteraction ->
+            speciesInteraction.encode(it)
+        }
+        buffer.writeCollection(generalInteractions) { it, generalInteraction ->
+            generalInteraction.encode(it)
+        }
+    }
+
+    companion object {
+        val ID = cobblemonResource("pokemon_interactions_sync")
+
+        fun decode(buffer: RegistryFriendlyByteBuf): PokemonInteractionsSyncPacket {
+            val speciesInteractions = buffer.readList { it ->
+                PokemonInteractionSet.decode(it)
+            }
+            val generalInteractions = buffer.readList { it ->
+                PokemonInteractionSet.decode(it)
+            }
+
+            return PokemonInteractionsSyncPacket(
+                speciesInteractions,
+                generalInteractions,
+            )
+        }
+    }
+}
@@ -21,7 +21,9 @@ class PokemonStateUpdatePacket(pokemon: () -> Pokemon?, value: PokemonState): Si
        value.writeToBuffer(buffer)
    }

-    override fun set(pokemon: Pokemon, value: PokemonState) { pokemon.state = value }
+    override fun set(pokemon: Pokemon, value: PokemonState) {
+        pokemon.state = value
+    }

    companion object {
        val ID = cobblemonResource("state_update")
@@ -13,30 +13,24 @@ import com.cobblemon.mod.common.api.mark.Marks
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
+import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.entity.PlatformType
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.Gender
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.readEnumConstant
-import com.cobblemon.mod.common.util.readIdentifier
-import com.cobblemon.mod.common.util.readString
-import com.cobblemon.mod.common.util.readText
-import com.cobblemon.mod.common.util.writeEnumConstant
-import com.cobblemon.mod.common.util.writeIdentifier
-import com.cobblemon.mod.common.util.writeString
-import com.cobblemon.mod.common.util.writeText
-import java.util.UUID
+import com.cobblemon.mod.common.util.*
 import net.minecraft.client.multiplayer.ClientLevel
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.network.chat.MutableComponent
 import net.minecraft.network.protocol.game.ClientboundAddEntityPacket
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.Entity
+import java.util.*

 class SpawnPokemonPacket(
    var ownerId: UUID?,
    var pokemonUUID: UUID,
+    var storageUUID: UUID?,
    var scaleModifier: Float,
    var speciesId: ResourceLocation,
    var gender: Gender,
@@ -61,6 +55,7 @@ class SpawnPokemonPacket(
    var tickSpawned: Int,
    var rideBoosts: Map<RidingStat, Float>,
    var rideStamina: Float,
+    var silent: Boolean,
    vanillaSpawnPacket: ClientboundAddEntityPacket,
 ) : SpawnExtraDataEntityPacket<SpawnPokemonPacket, PokemonEntity>(vanillaSpawnPacket) {

@@ -69,6 +64,7 @@ class SpawnPokemonPacket(
    constructor(entity: PokemonEntity, vanillaSpawnPacket: ClientboundAddEntityPacket) : this(
        entity.ownerUUID,
        entity.pokemon.uuid,
+        entity.pokemon.storeCoordinates.get()?.store?.uuid,
        entity.pokemon.scaleModifier,
        entity.exposedSpecies.resourceIdentifier,
        entity.pokemon.gender,
@@ -93,12 +89,14 @@ class SpawnPokemonPacket(
        entity.tickCount,
        entity.entityData.get(PokemonEntity.RIDE_BOOSTS),
        entity.entityData.get(PokemonEntity.RIDE_STAMINA),
+        entity.isSilent,
        vanillaSpawnPacket
    )

    override fun encodeEntityData(buffer: RegistryFriendlyByteBuf) {
        buffer.writeNullable(ownerId) { _, v -> buffer.writeUUID(v) }
        buffer.writeUUID(this.pokemonUUID)
+        buffer.writeNullable(this.storageUUID) { pb, value -> pb.writeUUID(value) }
        buffer.writeFloat(this.scaleModifier)
        buffer.writeIdentifier(this.speciesId)
        buffer.writeEnumConstant(this.gender)
@@ -127,10 +125,21 @@ class SpawnPokemonPacket(
            { _, value -> buffer.writeFloat(value) }
        )
        buffer.writeFloat(rideStamina)
+        buffer.writeBoolean(silent)
    }

    override fun applyData(entity: PokemonEntity, level: ClientLevel) {
        entity.ownerUUID = ownerId
+
+        // Reuse the stored Pokémon instance to avoid creating a duplicate,
+        // preventing client/entity desync issues.
+        this@SpawnPokemonPacket.storageUUID?.let {
+            val storedPokemon = CobblemonClient.storage.locatePokemon(it, this@SpawnPokemonPacket.pokemonUUID)
+            if (storedPokemon != null) {
+                entity.pokemon = storedPokemon
+            }
+        }
+
        entity.pokemon.apply {
            uuid = this@SpawnPokemonPacket.pokemonUUID
            scaleModifier = this@SpawnPokemonPacket.scaleModifier
@@ -162,6 +171,7 @@ class SpawnPokemonPacket(
        entity.entityData.set(PokemonEntity.RIDE_BOOSTS, rideBoosts)
        entity.entityData.set(PokemonEntity.RIDE_STAMINA, rideStamina)
        entity.entityData.set(PokemonEntity.SCALE_MODIFIER, scaleModifier)
+        entity.isSilent = silent

        entity.ejectPassengers()
        passengers.forEach {
@@ -179,6 +189,7 @@ class SpawnPokemonPacket(
        fun decode(buffer: RegistryFriendlyByteBuf): SpawnPokemonPacket {
            val ownerId = buffer.readNullable { buffer.readUUID() }
            val pokemonUUID = buffer.readUUID()
+            val storageUUID = buffer.readNullable { buffer.readUUID() }
            val scaleModifier = buffer.readFloat()
            val speciesId = buffer.readIdentifier()
            val gender = buffer.readEnumConstant(Gender::class.java)
@@ -206,11 +217,13 @@ class SpawnPokemonPacket(
                { buffer.readFloat() }
            )
            val rideStamina = buffer.readFloat()
+            val silent = buffer.readBoolean()
            val vanillaPacket = decodeVanillaPacket(buffer)

            return SpawnPokemonPacket(
                ownerId,
                pokemonUUID,
+                storageUUID,
                scaleModifier,
                speciesId,
                gender,
@@ -235,6 +248,7 @@ class SpawnPokemonPacket(
                tickSpawned,
                rideBoosts,
                rideStamina,
+                silent,
                vanillaPacket
            )
        }
@@ -897,6 +897,10 @@ open class Pokemon : ShowdownIdentifiable {
        this.recall()
    }

+    fun playMoodParticle(particleName: String) {
+        entity?.playMoodParticle(particleName)
+    }
+
    fun heal() {
        CobblemonEvents.POKEMON_HEALED.postThen(PokemonHealedEvent(this)) { event ->
            this.currentHealth = maxHealth
@@ -964,23 +968,13 @@ open class Pokemon : ShowdownIdentifiable {
        else -> 0 // For weights less than 0.1
    }

-    fun feedPokemon(feedCount: Int, playSound: Boolean = true) {
-        // play sounds from the entity first (itemstack is consumed outside of this function)
-        if (this.entity != null && playSound) {
-            val fullnessPercent = ((this.currentFullness).toFloat() / (this.getMaxFullness()).toFloat()) * (.5f)
-
-            if (this.currentFullness >= this.getMaxFullness()) {
-                this.entity?.playSound(CobblemonSounds.BERRY_EAT_FULL, 1F, 1F)
-            }
-            else {
-                this.entity?.playSound(CobblemonSounds.BERRY_EAT, 1F, 1F + fullnessPercent)
-            }
-        }
+    fun feedPokemon(feedCount: Int, playSound: Boolean = true, playMoodParticle: Boolean = true): Boolean {
+        playFullnessEffects(playSound, playMoodParticle)

        // if it is already full we don't need to do anything
        // TODO this can happen when feeding in battle since we are temporarily ignoring fullness checks for pp/hp/status berries
        if (isFull()) {
-            return
+            return false
        }

        this.currentFullness = (this.currentFullness + feedCount).coerceIn(0, this.getMaxFullness())
@@ -989,6 +983,31 @@ open class Pokemon : ShowdownIdentifiable {
        if (this.currentFullness == 1) {
            this.resetMetabolismCycle()
        }
+
+        return true
+    }
+
+    private fun playFullnessEffects(playSound: Boolean = true, playMoodParticle: Boolean = true) {
+        if (!playSound && !playMoodParticle) return
+
+        val pokemonEntity = entity ?: return
+        val fullnessPercent = ((this.currentFullness).toFloat() / (this.getMaxFullness()).toFloat()) * (.5f)
+
+        if (!isFull()) {
+            if (playSound) {
+                pokemonEntity.playSound(CobblemonSounds.BERRY_EAT, 1F, 1F + fullnessPercent)
+            }
+
+            return
+        }
+
+        if (playSound) {
+            pokemonEntity.playSound(CobblemonSounds.BERRY_EAT_FULL, 1F, 1F)
+
+            if (playMoodParticle) {
+                pokemonEntity.playMoodParticle("mood_annoyed")
+            }
+        }
    }

    // decrease a pokemon's Fullness value by a certain amount
@@ -1437,6 +1456,11 @@ open class Pokemon : ShowdownIdentifiable {
    }

    fun getOwnerEntity(): LivingEntity? {
+        if (isClient) {
+            val ownerUUID = entity?.ownerUUID ?: return null
+            return entity?.level()?.getPlayerByUUID(ownerUUID)
+        }
+
        return storeCoordinates.get()?.let {
            if (isPlayerOwned()) {
                server()?.playerList?.getPlayer(it.store.uuid)
@@ -8,13 +8,22 @@

 package com.cobblemon.mod.common.pokemon.adapters

+import com.cobblemon.mod.common.api.interaction.InteractionEffect
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.adapters.RequirementAdapter
 import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
+import com.cobblemon.mod.common.pokemon.evolution.adapters.LegacyItemConditionWrapperAdapter
 import com.cobblemon.mod.common.pokemon.requirements.*
+import com.cobblemon.mod.common.util.adapters.*
+import com.cobblemon.mod.common.util.readString
+import com.cobblemon.mod.common.util.writeString
 import com.google.common.collect.HashBiMap
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonElement
-import com.google.gson.JsonSerializationContext
+import com.google.gson.*
+import net.minecraft.advancements.critereon.ItemPredicate
+import net.minecraft.network.FriendlyByteBuf
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.util.LowerCaseEnumTypeAdapterFactory
 import java.lang.reflect.Type
 import kotlin.reflect.KClass

@@ -60,21 +69,60 @@ object CobblemonRequirementAdapter : RequirementAdapter {
        this.registerType(OwnerHoldsItemRequirement.ADAPTER_VARIANT, OwnerHoldsItemRequirement::class)
    }

+    val gson: Gson by lazy {
+        GsonBuilder()
+            .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+            .registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
+            .registerTypeAdapter(ItemPredicate::class.java, LegacyItemConditionWrapperAdapter)
+            .registerTypeAdapter(Requirement::class.java, CobblemonRequirementAdapter)
+            .registerTypeAdapter(InteractionEffect::class.java, InteractionEffectAdapter)
+            .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
+            .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
+            .registerTypeAdapterFactory(LowerCaseEnumTypeAdapterFactory())
+            .setPrettyPrinting()
+            .create()
+    }
+
    override fun <T : Requirement> registerType(id: String, type: KClass<T>) {
        this.types[id.lowercase()] = type
    }

    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Requirement {
        val variant = json.asJsonObject.get(VARIANT).asString.lowercase()
-        val type = this.types[variant] ?: throw IllegalArgumentException("Cannot resolve evolution requirement type for variant $variant")
+        val type = getRequirementType(variant)
        return context.deserialize(json, type.java)
    }

-    override fun serialize(src: Requirement, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
-        val json = context.serialize(src, src::class.java).asJsonObject
-        val variant = this.types.inverse()[src::class] ?: throw IllegalArgumentException("Cannot resolve evolution requirement for type ${src::class.qualifiedName}")
+    override fun serialize(requirement: Requirement, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
+        val json = context.serialize(requirement, requirement::class.java).asJsonObject
+        val variant = getVariant(requirement)
        json.addProperty(VARIANT, variant)
        return json
    }

+    fun encode(requirement: Requirement, buffer: FriendlyByteBuf) {
+        buffer.writeString(gson.toJson(requirement, Requirement::class.java))
+    }
+
+    fun decode(buffer: FriendlyByteBuf): Requirement {
+        return gson.fromJson(buffer.readString(), Requirement::class.java)
+    }
+
+    private fun getVariant(requirement: Requirement): String {
+        val variant = this.types.inverse()[requirement::class]
+        if (variant == null) {
+            throw IllegalArgumentException("Cannot resolve evolution requirement for type ${requirement::class.qualifiedName}")
+        }
+
+        return variant
+    }
+
+    private fun getRequirementType(variant: String): KClass<out Requirement> {
+        val requirementType = this.types[variant]
+        if (requirementType == null) {
+            throw IllegalArgumentException("Cannot resolve evolution requirement type for variant $variant")
+        }
+
+        return requirementType
+    }
 }
@@ -11,9 +11,9 @@ package com.cobblemon.mod.common.pokemon.requirements
 import com.cobblemon.mod.common.api.pokemon.requirement.OwnerQueryRequirement
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.pokemon.Pokemon
-import net.minecraft.server.level.ServerPlayer
 import net.minecraft.resources.ResourceLocation
-import kotlin.collections.iterator
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.world.entity.player.Player

 /**
 * An [com.cobblemon.mod.common.api.pokemon.requirement.Requirement] that checks if the player has a certain [net.minecraft.advancements.Advancement]
@@ -26,13 +26,16 @@ class AdvancementRequirement(val requiredAdvancement: ResourceLocation) : OwnerQ

    override fun checkPlayer(
        pokemon: Pokemon,
-        owner: ServerPlayer
+        owner: Player
    ): Boolean {
-        for (entry in owner.advancements.progress) {
+        val serverPlayer = owner as? ServerPlayer ?: return false
+
+        for (entry in serverPlayer.advancements.progress) {
            if (entry.key.id == requiredAdvancement && entry.value.isDone) {
                return true
            }
        }
+
        return false
    }

@@ -12,11 +12,9 @@ import com.cobblemon.mod.common.api.pokemon.requirement.OwnerQueryRequirement
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.pokemon.Pokemon
 import net.minecraft.advancements.critereon.ItemPredicate
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.InteractionHand
 import net.minecraft.world.entity.LivingEntity
-import kotlin.collections.iterator
+import net.minecraft.world.entity.player.Player

 /**
 * An [OwnerQueryRequirement] that checks if the player/npc is holding a certain [ItemPredicate]
@@ -30,7 +28,7 @@ class OwnerHoldsItemRequirement(val itemCondition: ItemPredicate)

    override fun checkPlayer(
        pokemon: Pokemon,
-        owner: ServerPlayer
+        owner: Player
    ): Boolean {
        return checkItem(owner)
    }
@@ -8,22 +8,22 @@

 package com.cobblemon.mod.common.util.adapters

-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonSerializationContext
-import com.google.gson.JsonSerializer
+import com.google.gson.*
 import com.mojang.serialization.Codec
-import com.mojang.serialization.JsonOps
 import java.lang.reflect.Type

 class CodecBackedAdapter<T>(val codec: Codec<T>) : JsonDeserializer<T>, JsonSerializer<T> {
+
    override fun deserialize(
        jElement: JsonElement,
        typeOfT: Type,
        context: JsonDeserializationContext
    ): T {
-        return JsonOps.INSTANCE.withDecoder(codec).apply(jElement).result().get().first as T
+        val ops = RegistryOpsProvider.getOpsWithDefaultFallback()
+        val result = ops.withDecoder(codec).apply(jElement)
+        return result.result().orElseThrow {
+            IllegalStateException("Failed to deserialize $jElement: ${result.error().orElse(null)}")
+        }.first
    }

    override fun serialize(
@@ -31,6 +31,10 @@ class CodecBackedAdapter<T>(val codec: Codec<T>) : JsonDeserializer<T>, JsonSeri
        typeOfSrc: Type?,
        context: JsonSerializationContext?
    ): JsonElement {
-        return JsonOps.INSTANCE.withEncoder(codec).apply(src).result().get()
+        val ops = RegistryOpsProvider.getOpsWithDefaultFallback()
+        val result = ops.withEncoder(codec).apply(src)
+        return result.result().orElseThrow {
+            IllegalStateException("Failed to serialize $src: ${result.error().orElse(null)}")
+        }
    }
 }
@@ -0,0 +1,41 @@
+/*
+ * 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.util.adapters
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.Environment
+import com.cobblemon.mod.common.util.server
+import com.google.gson.JsonElement
+import com.mojang.serialization.DynamicOps
+import com.mojang.serialization.JsonOps
+import net.minecraft.client.Minecraft
+import net.minecraft.resources.RegistryOps
+
+/**
+ * Utility for obtaining RegistryOps with the correct client/server registry access.
+ * Used when manually encoding/decoding registry-backed values (e.g., items, predicates).
+ */
+object RegistryOpsProvider {
+    fun getOpsWithDefaultFallback(): DynamicOps<JsonElement> {
+        if (Cobblemon.implementation.environment() == Environment.CLIENT) {
+            val minecraft = Minecraft.getInstance()
+            if (minecraft != null && minecraft.level != null)
+                return RegistryOps.create(JsonOps.INSTANCE, minecraft.level!!.registryAccess())
+        }
+
+
+        if (Cobblemon.implementation.environment() == Environment.SERVER) {
+            val server = server()
+            if (server != null)
+                return RegistryOps.create(JsonOps.INSTANCE, server.registryAccess())
+        }
+
+        return JsonOps.INSTANCE
+    }
+}
@@ -0,0 +1,55 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:mood_anger_steam",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/mood/steam_center_double"
+			}
+		},
+		"events": {
+			"veins": {
+				"particle_effect": {
+					"effect": "cobblemon:mood_anger_veins",
+					"type": "emitter"
+				}
+			}
+		},
+		"components": {
+			"minecraft:emitter_rate_instant": {
+				"num_particles": 1
+			},
+			"minecraft:emitter_lifetime_looping": {
+				"active_time": 1,
+				"sleep_time": 0.25
+			},
+			"minecraft:emitter_lifetime_events": {
+				"creation_event": "veins"
+			},
+			"minecraft:emitter_shape_point": {
+				"offset": [0, "math.clamp((v.entity_radius*1.2),0.48,0.96)*0.75", 0]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": 1
+			},
+			"minecraft:particle_initial_speed": 0,
+			"minecraft:particle_motion_dynamic": {},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["math.clamp((v.entity_radius*1.5),0.9,2.4)", "math.clamp((v.entity_radius*0.5),0.3,0.8)"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 48,
+					"texture_height": 176,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [48, 16],
+						"step_UV": [0, 16],
+						"max_frame": 11,
+						"stretch_to_lifetime": true
+					}
+				}
+			}
+		}
+	}
+}
@@ -0,0 +1,66 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:mood_anger_veins",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/mood/vein_red"
+			}
+		},
+		"components": {
+			"minecraft:emitter_initialization": {
+				"creation_expression": "v.particle_size = math.clamp((v.entity_radius*0.75),0.15,0.4);"
+			},
+			"minecraft:emitter_rate_steady": {
+				"spawn_rate": 1,
+				"max_particles": 1
+			},
+			"minecraft:emitter_lifetime_looping": {
+				"active_time": 1,
+				"sleep_time": 0.25
+			},
+			"minecraft:emitter_shape_point": {
+				"direction": ["math.random(-1,1)", 1.5, "math.random(-1,1)"]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": 1.25
+			},
+			"minecraft:particle_initial_spin": {
+				"rotation": "math.random_integer(-1,2)*90"
+			},
+			"minecraft:particle_initial_speed": "v.particle_size*13",
+			"minecraft:particle_motion_dynamic": {
+				"linear_acceleration": [0, 0.75, 0],
+				"linear_drag_coefficient": "v.particle_size*15"
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["math.clamp((v.entity_radius*0.75),0.15,0.3)", "math.clamp((v.entity_radius*0.75),0.15,0.3)"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 22,
+					"texture_height": 11,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [11, 11],
+						"step_UV": [11, 0],
+						"frames_per_second": 6,
+						"max_frame": 2,
+						"loop": true
+					}
+				}
+			},
+			"minecraft:particle_motion_collision": {},
+			"minecraft:particle_appearance_lighting": {},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age/v.particle_lifetime",
+					"gradient": {
+						"0.86": "#ffffffff",
+						"1.0": "#FF000000"
+					}
+				}
+			}
+		}
+	}
+}
@@ -0,0 +1,49 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:mood_annoyed",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/mood/scribble_purple"
+			}
+		},
+		"components": {
+			"minecraft:emitter_initialization": {
+				"creation_expression": "v.particle_size = math.clamp((v.entity_radius*0.75),0.2,0.5);"
+			},
+			"minecraft:emitter_rate_instant": {
+				"num_particles": 1
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 2
+			},
+			"minecraft:emitter_shape_point": {
+				"direction": [0, 1, 0]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": 1
+			},
+			"minecraft:particle_initial_speed": "v.particle_size*10",
+			"minecraft:particle_motion_dynamic": {
+				"linear_drag_coefficient": 3
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["math.clamp((v.entity_radius*0.75),0.2,0.5)", "math.clamp((v.entity_radius*0.75),0.2,0.5)"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 168,
+					"texture_height": 14,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [14, 14],
+						"step_UV": [14, 0],
+						"frames_per_second": 10,
+						"max_frame": 12
+					}
+				}
+			},
+			"minecraft:particle_appearance_lighting": {}
+		}
+	}
+}
@@ -0,0 +1,47 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:mood_stress",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/mood/sweat_blue"
+			}
+		},
+		"components": {
+			"minecraft:emitter_initialization": {
+				"creation_expression": "v.particle_height = math.clamp((v.entity_radius*1.2),0.48,0.96);"
+			},
+			"minecraft:emitter_rate_instant": {
+				"num_particles": 1
+			},
+			"minecraft:emitter_lifetime_looping": {
+				"active_time": 1
+			},
+			"minecraft:emitter_shape_point": {
+				"offset": [0, "math.clamp((v.entity_radius*1.2),0.48,0.96)*0.75", 0]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": 0.45
+			},
+			"minecraft:particle_initial_speed": 0,
+			"minecraft:particle_motion_dynamic": {},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["math.clamp((v.entity_radius*1.2),0.48,0.96)", "math.clamp((v.entity_radius*0.65),0.26,0.52)"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 216,
+					"texture_height": 13,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [24, 13],
+						"step_UV": [24, 0],
+						"max_frame": 9,
+						"stretch_to_lifetime": true
+					}
+				}
+			},
+			"minecraft:particle_appearance_lighting": {}
+		}
+	}
+}
@@ -9445,5 +9445,8 @@
  "stat.cobblemon.traded": "Pokémon Traded",
  "stat.cobblemon.times_ridden": "Pokémon Ridden",
  "stat.cobblemon.rod_casts": "PokéRod Casts",
-  "stat.cobblemon.reel_ins": "PokéRod Catches"
+  "stat.cobblemon.reel_ins": "PokéRod Catches",
+  "stat.cobblemon.riding_land": "Distance by Pokémon on Land",
+  "stat.cobblemon.riding_air": "Distance by Pokémon in Air",
+  "stat.cobblemon.riding_liquid": "Distance by Pokémon in Liquid"
 }
@@ -1517,76 +1517,139 @@
      { "name": "cobblemon:animation/wings/steel_wing_flap_medium_8", "volume": 0.25 }
    ]
  },
-  "ride.loop.wind": {
+  "ride.loop.wind.mono": {
    "sounds": [
      {
-        "name": "cobblemon:ride/loop/wind_loop",
+        "name": "cobblemon:ride/loop/wind_loop_mono",
        "stream": true,
        "attenuation_distance": 48.0,
        "volume": 0.15
      }
    ]
  },
-  "ride.loop.leather": {
+  "ride.loop.wind.stereo": {
    "sounds": [
      {
-        "name": "cobblemon:ride/loop/leather_flight_loop",
+        "name": "cobblemon:ride/loop/wind_loop_stereo",
+        "stream": true,
+        "volume": 0.04
+      }
+    ]
+  },
+  "ride.loop.leather.mono": {
+    "sounds": [
+      {
+        "name": "cobblemon:ride/loop/leather_flight_loop_mono",
        "stream": true,
        "attenuation_distance": 48.0,
        "volume": 0.25
      }
    ]
  },
-  "ride.loop.plumage": {
+  "ride.loop.leather.stereo": {
    "sounds": [
      {
-        "name": "cobblemon:ride/loop/plumage_flight_loop",
+        "name": "cobblemon:ride/loop/leather_flight_loop_stereo",
+        "stream": true,
+        "volume": 0.05
+      }
+    ]
+  },
+  "ride.loop.plumage.mono": {
+    "sounds": [
+      {
+        "name": "cobblemon:ride/loop/plumage_flight_loop_mono",
        "stream": true,
        "attenuation_distance": 48.0,
        "volume": 0.25
      }
    ]
  },
-  "ride.loop.saucer": {
+  "ride.loop.plumage.stereo": {
    "sounds": [
      {
-        "name": "cobblemon:ride/loop/saucer_flight_loop",
+        "name": "cobblemon:ride/loop/plumage_flight_loop_stereo",
+        "stream": true,
+        "volume": 0.05
+      }
+    ]
+  },
+  "ride.loop.saucer.mono": {
+    "sounds": [
+      {
+        "name": "cobblemon:ride/loop/saucer_flight_loop_mono",
        "stream": true,
        "attenuation_distance": 48.0,
        "volume": 0.25
      }
    ]
  },
-  "ride.loop.rocket": {
+  "ride.loop.saucer.stereo": {
    "sounds": [
      {
-        "name": "cobblemon:ride/loop/rocket_flight_loop",
+        "name": "cobblemon:ride/loop/saucer_flight_loop_stereo",
+        "stream": true,
+        "volume": 0.1
+      }
+    ]
+  },
+  "ride.loop.rocket.mono": {
+    "sounds": [
+      {
+        "name": "cobblemon:ride/loop/rocket_flight_loop_mono",
        "stream": true,
        "attenuation_distance": 48.0,
        "volume": 0.4
      }
    ]
  },
-  "ride.loop.water_surface": {
+  "ride.loop.rocket.stereo": {
    "sounds": [
      {
-        "name": "cobblemon:ride/loop/water_surface_loop",
+        "name": "cobblemon:ride/loop/rocket_flight_loop_stereo",
+        "stream": true,
+        "volume": 0.3
+      }
+    ]
+  },
+  "ride.loop.water_surface.mono": {
+    "sounds": [
+      {
+        "name": "cobblemon:ride/loop/water_surface_loop_mono",
        "stream": true,
        "attenuation_distance": 32.0,
        "volume": 0.4
      }
    ]
  },
-  "ride.loop.underwater": {
+  "ride.loop.water_surface.stereo": {
    "sounds": [
      {
-        "name": "cobblemon:ride/loop/underwater_loop",
+        "name": "cobblemon:ride/loop/water_surface_loop_stereo",
+        "stream": true,
+        "volume": 0.13
+      }
+    ]
+  },
+  "ride.loop.underwater.mono": {
+    "sounds": [
+      {
+        "name": "cobblemon:ride/loop/underwater_loop_mono",
        "stream": true,
        "attenuation_distance": 16.0,
        "volume": 0.4
      }
    ]
  },
+  "ride.loop.underwater.stereo": {
+    "sounds": [
+      {
+        "name": "cobblemon:ride/loop/underwater_loop_stereo",
+        "stream": true,
+        "volume": 0.2
+      }
+    ]
+  },
  "pokemon.bulbasaur.ambient": {
    "sounds": [ "cobblemon:pokemon/bulbasaur/bulbasaur_ambient" ]
  },
@@ -0,0 +1,41 @@
+t.ticks_between_checks = 20 * 10;
+math.mod(q.player.world.game_time, t.ticks_between_checks) != 0 ? {
+    return 0;
+};
+
+t.steps_required = 10000;
+t.friendship_required = 200;
+
+t.total_blocks =
+    q.player.get_custom_stat('minecraft:walk_one_cm') +
+    q.player.get_custom_stat('minecraft:crouch_one_cm') +
+    q.player.get_custom_stat('minecraft:sprint_one_cm') +
+    q.player.get_custom_stat('minecraft:walk_on_water_one_cm') +
+    q.player.get_custom_stat('minecraft:fall_one_cm') +
+    q.player.get_custom_stat('minecraft:climb_one_cm') +
+    q.player.get_custom_stat('minecraft:fly_one_cm') +
+    q.player.get_custom_stat('minecraft:walk_under_water_one_cm') +
+    q.player.get_custom_stat('minecraft:minecart_one_cm') +
+    q.player.get_custom_stat('minecraft:boat_one_cm') +
+    q.player.get_custom_stat('minecraft:pig_one_cm') +
+    q.player.get_custom_stat('minecraft:horse_one_cm') +
+    q.player.get_custom_stat('minecraft:aviate_one_cm') +
+    q.player.get_custom_stat('minecraft:swim_one_cm') +
+    q.player.get_custom_stat('minecraft:strider_one_cm') +
+    q.player.get_custom_stat('cobblemon:riding_land') +
+    q.player.get_custom_stat('cobblemon:riding_air') +
+    q.player.get_custom_stat('cobblemon:riding_liquid');
+
+t.total_blocks = t.total_blocks / 100.0;
+t.player_data = q.player.data();
+
+math.floor(t.total_blocks / t.steps_required) > math.floor(t.player_data.last_partner_mark_check / t.steps_required) ? {
+    t.party = q.player.party;
+    for_each(t.pokemon, t.party.pokemon, {
+        t.pokemon.friendship >= t.friendship_required ? {
+            t.pokemon.add_marks_with_chance('cobblemon:mark_partner');
+        };
+    });
+};
+
+t.player_data.last_partner_mark_check = t.total_blocks;
@@ -4,5 +4,6 @@
 	"titleColor": "40B282",
 	"description": "cobblemon.mark.mark_partner.desc",
 	"texture": "cobblemon:textures/gui/mark/mark_partner.png",
-	"indexNumber": 104
+	"indexNumber": 104,
+	"chance": 0.01
 }
@@ -57,15 +57,33 @@
          {
            "muffleEnabled": true,
            "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
-            "playForNonPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.wind",
+            "playForPassengers": true,
+            "playForNonPassengers": false,
+            "soundLocation": "cobblemon:ride.loop.wind.stereo",
            "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
          },
          {
            "muffleEnabled": true,
            "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
+            "playForPassengers": false,
            "playForNonPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.leather",
+            "soundLocation": "cobblemon:ride.loop.wind.mono",
+            "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
+          },
+          {
+            "muffleEnabled": true,
+            "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
+            "playForPassengers": true,
+            "playForNonPassengers": false,
+            "soundLocation": "cobblemon:ride.loop.leather.stereo",
+            "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
+          },
+          {
+            "muffleEnabled": true,
+            "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
+            "playForPassengers": false,
+            "playForNonPassengers": true,
+            "soundLocation": "cobblemon:ride.loop.leather.mono",
            "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
          }
        ],
@@ -58,14 +58,18 @@
          {
            "muffleEnabled": true,
            "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
+            "playForPassengers": true,
            "playForNonPassengers": true,
+            "submerged": false,
            "soundLocation": "cobblemon:ride.loop.wind",
            "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
          },
          {
            "muffleEnabled": true,
            "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
+            "playForPassengers": true,
            "playForNonPassengers": true,
+            "submerged": false,
            "soundLocation": "cobblemon:ride.loop.leather",
            "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
          }
@@ -93,7 +97,44 @@
      },
      "LIQUID": {
        "key": "cobblemon:liquid/dolphin",
-        "rideSounds": [],
+        "rideSounds": [
+          {
+            "muffleEnabled": true,
+            "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
+            "playForPassengers": true,
+            "playForNonPassengers": false,
+            "submerged": false,
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
+            "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
+          },
+          {
+            "muffleEnabled": true,
+            "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
+            "playForPassengers": false,
+            "playForNonPassengers": true,
+            "submerged": false,
+            "soundLocation": "cobblemon:ride.loop.water_surface.mono",
+            "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
+          },
+          {
+            "muffleEnabled": true,
+            "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
+            "playForPassengers": true,
+            "playForNonPassengers": false,
+            "submerged": true,
+            "soundLocation": "cobblemon:ride.loop.underwater.stereo",
+            "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
+          },
+          {
+            "muffleEnabled": true,
+            "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
+            "playForPassengers": false,
+            "playForNonPassengers": true,
+            "submerged": true,
+            "soundLocation": "cobblemon:ride.loop.underwater.mono",
+            "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
+          }
+        ],
        "stats": {
          "ACCELERATION": "30-65",
          "JUMP": "55-85",
@@ -1,7 +1,7 @@
 {
  "parent": "adorn:block/templates/bench_leg",
  "textures": {
-    "log": "cobblemon:block/apricorn_log",
-    "end": "cobblemon:block/apricorn_log_top"
+    "log": "cobblemon:block/wood/apricorn_log",
+    "end": "cobblemon:block/wood/apricorn_log_top"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/bench_top",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks"
+    "planks": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/chair_lower",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks"
+    "planks": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/chair_upper",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks"
+    "planks": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,8 +1,8 @@
 {
  "parent": "adorn:block/templates/coffee_table",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks",
-    "leg": "cobblemon:block/apricorn_log",
-    "rim": "cobblemon:block/apricorn_log"
+    "planks": "cobblemon:block/wood/apricorn_planks",
+    "leg": "cobblemon:block/wood/apricorn_log",
+    "rim": "cobblemon:block/wood/apricorn_log"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/drawer",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks"
+    "planks": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/kitchen_counter",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks"
+    "planks": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/kitchen_counter_connection_left",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks"
+    "planks": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/kitchen_counter_connection_right",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks"
+    "planks": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/kitchen_cupboard_door",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks"
+    "planks": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/kitchen_sink",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks"
+    "planks": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/platform",
  "textures": {
-    "texture": "cobblemon:block/apricorn_planks"
+    "texture": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/post",
  "textures": {
-    "texture": "cobblemon:block/apricorn_planks"
+    "texture": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/shelf",
  "textures": {
-    "texture": "cobblemon:block/apricorn_planks"
+    "texture": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/step",
  "textures": {
-    "texture": "cobblemon:block/apricorn_planks"
+    "texture": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/table",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks"
+    "planks": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:block/templates/table_leg",
  "textures": {
-    "log": "cobblemon:block/apricorn_log"
+    "log": "cobblemon:block/wood/apricorn_log"
  }
 }
@@ -1,8 +1,8 @@
 {
  "parent": "adorn:item/templates/bench",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks",
-    "log": "cobblemon:block/apricorn_log",
-    "end": "cobblemon:block/apricorn_log_top"
+    "planks": "cobblemon:block/wood/apricorn_planks",
+    "log": "cobblemon:block/wood/apricorn_log",
+    "end": "cobblemon:block/wood/apricorn_log_top"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:item/templates/chair",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks"
+    "planks": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,6 +1,6 @@
 {
  "parent": "adorn:item/templates/kitchen_cupboard",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks"
+    "planks": "cobblemon:block/wood/apricorn_planks"
  }
 }
@@ -1,7 +1,7 @@
 {
  "parent": "adorn:item/templates/table",
  "textures": {
-    "planks": "cobblemon:block/apricorn_planks",
-    "log": "cobblemon:block/apricorn_log"
+    "planks": "cobblemon:block/wood/apricorn_planks",
+    "log": "cobblemon:block/wood/apricorn_log"
  }
 }
@@ -68,6 +68,7 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.server.packs.resources.PreparableReloadListener
 import net.minecraft.server.packs.resources.ResourceManager
+import net.minecraft.stats.Stats
 import net.minecraft.tags.TagKey
 import net.minecraft.util.profiling.ProfilerFiller
 import net.minecraft.world.InteractionResult
@@ -92,8 +93,10 @@ object CobblemonFabric : CobblemonImplementation {
        Cobblemon.preInitialize(this)

        Cobblemon.statistics.registerStats()
-        Cobblemon.statistics.stats.forEach {
-            Registry.register(BuiltInRegistries.CUSTOM_STAT, it.value, it.value)
+        Cobblemon.statistics.stats.forEach { entry ->
+            val cobblemonStat = entry.value
+            Registry.register(BuiltInRegistries.CUSTOM_STAT, cobblemonStat.resourceLocation, cobblemonStat.resourceLocation)
+            Stats.CUSTOM.get(cobblemonStat.resourceLocation, cobblemonStat.formatter)
        }

        Cobblemon.initialize()
@@ -16,14 +16,7 @@ import com.cobblemon.mod.common.CobblemonRecipeCategories.COOKING_POT_MISC
 import com.cobblemon.mod.common.CobblemonRecipeCategories.COOKING_POT_SEARCH
 import com.cobblemon.mod.common.advancement.CobblemonCriteria
 import com.cobblemon.mod.common.advancement.predicate.CobblemonEntitySubPredicates
-import com.cobblemon.mod.common.api.net.serializers.IdentifierDataSerializer
-import com.cobblemon.mod.common.api.net.serializers.NPCPlayerTextureSerializer
-import com.cobblemon.mod.common.api.net.serializers.PlatformTypeDataSerializer
-import com.cobblemon.mod.common.api.net.serializers.PoseTypeDataSerializer
-import com.cobblemon.mod.common.api.net.serializers.RideBoostsDataSerializer
-import com.cobblemon.mod.common.api.net.serializers.StringSetDataSerializer
-import com.cobblemon.mod.common.api.net.serializers.UUIDSetDataSerializer
-import com.cobblemon.mod.common.api.net.serializers.Vec3DataSerializer
+import com.cobblemon.mod.common.api.net.serializers.*
 import com.cobblemon.mod.common.item.group.CobblemonItemGroups
 import com.cobblemon.mod.common.loot.LootInjector
 import com.cobblemon.mod.common.particle.CobblemonParticles
@@ -42,13 +35,9 @@ import com.cobblemon.mod.neoforge.net.CobblemonNeoForgeNetworkManager
 import com.cobblemon.mod.neoforge.permission.ForgePermissionValidator
 import com.cobblemon.mod.neoforge.worldgen.CobblemonBiomeModifiers
 import com.mojang.brigadier.arguments.ArgumentType
-import java.util.Optional
-import java.util.UUID
 import net.minecraft.commands.synchronization.ArgumentTypeInfo
 import net.minecraft.commands.synchronization.ArgumentTypeInfos
-import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
-import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.MinecraftServer
@@ -63,6 +52,7 @@ import net.minecraft.server.packs.repository.Pack
 import net.minecraft.server.packs.repository.Pack.Position
 import net.minecraft.server.packs.repository.PackSource
 import net.minecraft.server.packs.resources.PreparableReloadListener
+import net.minecraft.stats.Stats
 import net.minecraft.tags.TagKey
 import net.minecraft.world.item.CreativeModeTab
 import net.minecraft.world.item.CreativeModeTab.TabVisibility
@@ -83,12 +73,7 @@ import net.neoforged.neoforge.client.event.RegisterRecipeBookCategoriesEvent
 import net.neoforged.neoforge.common.ItemAbilities
 import net.neoforged.neoforge.common.NeoForge
 import net.neoforged.neoforge.common.NeoForgeMod
-import net.neoforged.neoforge.event.AddPackFindersEvent
-import net.neoforged.neoforge.event.AddReloadListenerEvent
-import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent
-import net.neoforged.neoforge.event.LootTableLoadEvent
-import net.neoforged.neoforge.event.OnDatapackSyncEvent
-import net.neoforged.neoforge.event.RegisterCommandsEvent
+import net.neoforged.neoforge.event.*
 import net.neoforged.neoforge.event.entity.EntityAttributeCreationEvent
 import net.neoforged.neoforge.event.entity.player.PlayerEvent
 import net.neoforged.neoforge.event.entity.player.PlayerWakeUpEvent
@@ -101,6 +86,7 @@ import net.neoforged.neoforge.registries.NeoForgeRegistries
 import net.neoforged.neoforge.registries.RegisterEvent
 import net.neoforged.neoforge.server.ServerLifecycleHooks
 import thedarkcolour.kotlinforforge.neoforge.forge.MOD_BUS
+import java.util.*
 import kotlin.reflect.KClass

@Mod(Cobblemon.MODID)
@@ -228,8 +214,10 @@ class CobblemonNeoForge : CobblemonImplementation {

        event.register(Registries.CUSTOM_STAT) { registry ->
            Cobblemon.statistics.registerStats()
-            Cobblemon.statistics.stats.forEach { (key, value) ->
-                registry.register(value, ResourceLocation.fromNamespaceAndPath("cobblemon", key))
+            Cobblemon.statistics.stats.forEach { entry ->
+                val cobblemonStat = entry.value
+                registry.register(cobblemonStat.resourceLocation, cobblemonStat.resourceLocation)
+                Stats.CUSTOM.get(cobblemonStat.resourceLocation, cobblemonStat.formatter)
            }
        }
    }
Author	SHA1	Message	Date
Guilherme Pereira	2ce1b465d4	add mood particle assets	2026-03-01 19:33:21 -03:00
Guilherme Pereira	1e35b7c1ae	update CHANGELOG.md	2025-12-16 17:25:14 -03:00
Guilherme Pereira	d4f2070d1f	add mood particle for when pokemon is fleeing from an attacker	2025-12-16 17:20:19 -03:00
Guilherme Pereira	dcc162fd98	make all fullness items play mood particles	2025-12-16 15:11:01 -03:00
Guilherme Pereira	2287c7718e	add mood particles	2025-12-11 17:02:16 -03:00
Polymeta	28c0f8ab7d	Merge branch 'item-interactions-sync' into 'main' Item interactions sync See merge request cable-mc/cobblemon!2068	2025-12-08 16:08:48 +00:00
lionandPolymeta	fcbe0db568	Item interactions sync	2025-12-08 16:08:48 +00:00
Polymeta	83cefe476e	Merge branch 'partner-mark' into 'main' Add Partner Mark See merge request cable-mc/cobblemon!2034	2025-12-08 15:57:21 +00:00
Guilherme Pereira	690ccbd260	refactor check riding statistics method for server player mixin	2025-12-08 12:06:20 -03:00
Polymeta	63846d53fb	Merge branch 'main' into 'main' Fixed shiny Pokémon not respecting the silent flag on spawn. See merge request cable-mc/cobblemon!2064	2025-12-08 13:07:25 +00:00
Polymeta	86cb865742	fixed mochi items being consumed twice Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>	2025-12-08 13:01:14 +00:00
Polymeta	1a0c9b6a82	Merge branch 'malformed-jsons-no-more' into 'main' Fixes a crash caused by malformed riding prespectives json file when trying to ride a pokemon See merge request cable-mc/cobblemon!2077	2025-12-08 12:59:22 +00:00
Polymeta	985eb103fe	Merge branch 'sterr/ride-sound-changes' into 'main' New ride sound stuff See merge request cable-mc/cobblemon!2065	2025-12-08 11:44:22 +00:00
Polymeta	aec76a78da	Merge branch 'restore_adorn_texturing' into 'main' Restore adorn texturing Closes #1833 See merge request cable-mc/cobblemon!2078	2025-12-08 11:36:41 +00:00
Jacob Hartmann	17f3edf2be	Changelog	2025-12-07 20:35:11 -07:00
Jacob Hartmann	9c5bfda20f	Updating texture paths	2025-12-07 20:34:09 -07:00
Gertimoshka	6d545fc1ca	Fixes a crash caused by malformed riding prespectives json file when trying to ride a pokemon	2025-12-07 11:47:04 +02:00
Khvrram	7e6ca7be5e	Merge branch cobblemon:main into main	2025-12-04 01:59:17 +00:00
Sterrezo	a575c6bc3d	Update CHANGELOG.md	2025-12-01 15:47:34 +01:00
Sterrezo	9c102a7850	Merge branch 'main' into sterr/ride-sound-changes	2025-12-01 15:45:40 +01:00
Sterrezo	22a1eaab19	Volume balancing	2025-12-01 15:35:22 +01:00
Sterrezo	0118ace5fc	Implemented stereo flight loops	2025-12-01 15:09:37 +01:00
Sterrezo	d4a93abbf7	Added support for submerged ride sounds	2025-12-01 14:27:55 +01:00
Sterrezo	d0ee3f3e9d	Added an option for ride sounds to not play for the passengers	2025-12-01 13:56:56 +01:00
Khvrram	46ae53f565	Merge branch cobblemon:main into main	2025-12-01 04:25:52 +00:00
Khurram Valiyev	4d123b6e4b	Fixed shiny Pokémon not respecting the silent flag on spawn.	2025-11-29 22:50:52 -05:00
Guilherme Pereira	29b560d244	Merge branch 'main' of gitlab.com:cable-mc/cobblemon into partner-mark	2025-11-27 18:21:19 -03:00
Guilherme Pereira	7cedfb9047	update CHANGELOG.md	2025-11-22 22:02:14 -03:00
Guilherme Pereira	a7ab2e37c2	Merge branch 'main' of gitlab.com:cable-mc/cobblemon into partner-mark	2025-11-22 21:57:49 -03:00
Guilherme Pereira	4723f91500	add riding stats	2025-11-22 21:57:25 -03:00
Guilherme Pereira	e23aa6b066	add partner mark molang callback	2025-11-22 19:39:21 -03:00