The great java annotation

Fix super potion ingredients tag

See merge request cable-mc/cobblemon!2121

changelogs/CHANGELOG-1.7.1.md

@@ -0,0 +1,61 @@
+# Changelog
+## [1.7.1 (November 29th, 2025)](#1-7-1)
+
+### Additions
+- Added trades for Saccharine Saplings, Hearty Grains, Chipped Pot, and Masterpiece Teacup to the Wandering Trader.
+- Added brewing recipe for Throat Spray.
+- Added vanilla sprinting's field of view change to Pokémon land mounts.
+- Added a customizable keybind for the riding freelook button.
+- Added double tap to sprint on land mounts.
+
+### Changes
+- Made Jet pitch turning 1.5x faster across all Pokémon.
+- Party Pokémon now attack only mobs that are attacking their owner, instead of randomly targeting unrelated mobs and getting themselves hurt.
+- Reduced the cost of the Vivichoke Seed trade with the Wandering Trader.
+
+### Fixes
+- Fixed incorrect camera pivot on Bird, Jet, and Dolphin mounts, leading to some disorienting riding.
+- Fixed players suffocating while on vanilla mounts.
+- Fixed a graphics crash that could occur on some machines when campfire pots were nearby.
+- Fixed ride controls overlay being displayed to passengers. The passengers probably don't need to know about those.
+- Fixed mount jumping so that it doesn't switch back to ground animations.
+- Fixed ridden Pokémon land collision and some issues around stepping up blocks. Land mounts are smoother overall now.
+- Fixed Furfrou's pink and magenta trims being swapped. Only a man could make that mistake.
+- Fixed friendship being reset to the default value when evolving a Pokémon.
+- Fixed Combees not depositing honey upon leaving a hive if they entered it with nectar.
+- Fixed pastured Combees not moving during the night or in rain.
+- Fixed a case in which a Combee might try to path to a flower that no longer exists.
+- Fixed Combees attempting to enter a full hive.
+- Fixed a crash involving Combees and hives. 500 bee bugs. Bugged bees? We can be bees. Mark, this is good news.
+- Fixed a crash related to NPC navigation.
+- Fixed a crash when opening a PC box with certain wallpapers while using *VulkanMod*.
+- Fixed a crash when you place a block in the way of hearty grains 2nd block.
+- Fixed passengers hearing the shiny noise of a ridden shiny Pokémon.
+- Ponigiri can no longer be eaten at full hunger.
+- Fixed Poké Snack spawning sounds not coming from the block.
+- Medicinal Brew's Campfire Pot recipe now correctly displays that it can be made using an empty glass bottle or a filled bottle.
+- Fixed glass bottle not being returned when slathering honey on a saccharine leaf block.
+- Fixed saccharine hanging signs sometimes dropping their oak wood counterpart when being broken.
+- Fixed a bunch of incompatibilities with NeoForge mods.
+- Fixed a bug where wind charges hitting pasture blocks would recall all Pokémon in it.
+- Fixed the Home on the Range advancement triggering when opening the Pokémon interaction wheel.
+- Fixed recipes that use concrete not working on NeoForge.
+- Fixed Boltund's model.
+- Fixed Cyclizar's textures.
+
+### Developer
+
+### Molang & Datapacks
+- Removed automatic generation of PC wallpaper screen glow if no asset is provided; it is now optional.
+    - This is because there's no practical way to do this without blowing up things like *VulkanMod*.
+
+### Particles
+
+### Localization
+- Updated translations for:
+    - French
+    - Japanese
+    - Korean
+    - Brazilian Portuguese
+    - Simplified Chinese
+    - Traditional Chinese

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

@@ -11,12 +11,15 @@ package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.CobblemonMemories;
 import com.cobblemon.mod.common.api.ai.config.task.PathToBeeHiveTaskConfig;
+import com.cobblemon.mod.common.api.pokemon.PokemonProperties;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.cobblemon.mod.common.world.feature.SaccharineTreeFeature;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
 import net.minecraft.world.item.component.CustomData;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.BeehiveBlock;
@@ -41,7 +44,21 @@ public abstract class BeeOccupantMixin {
         if (cir.getReturnValue() == null) {
             final BeehiveBlockEntity.Occupant occupant = (BeehiveBlockEntity.Occupant) (Object) this;
             CompoundTag compoundTag = occupant.entityData().copyTag();
-            Entity entity = EntityType.loadEntityRecursive(compoundTag, level, (entityx) -> entityx);
+            String id = compoundTag.getString("id");
+            Entity entity = null;
+            if (id.equals(SaccharineTreeFeature.Companion.getPOKEMON_PLACEHOLD_ID())) {
+                // Special case for Pokemon stuffed into a beenest upon world gen.
+                // For technical reasons we cannot create them as full entities during world gen.
+                // So we look for this special id tag and complete the entity when it attempts to exit a hive.
+                if (compoundTag.contains("pokemonProperties")) {
+                    String properties = compoundTag.getString("pokemonProperties");
+                    PokemonProperties pokemon = PokemonProperties.Companion.parse(properties);
+                    entity = pokemon.createEntity(level);
+                }
+            } else {
+                entity = EntityType.loadEntityRecursive(compoundTag, level, (entityx) -> entityx);
+            }
+
             if (entity instanceof PokemonEntity pokemonEntity) {
                 var state = level.getBlockState(pos);
                 var newPos = Vec3.ZERO;
@@ -52,7 +69,9 @@ public abstract class BeeOccupantMixin {
                     var facing = state.getValue(HorizontalDirectionalBlock.FACING);
                     newPos = pos.relative(facing).getCenter();
                     newYaw = facing.toYRot();
-                    brain.setMemory(CobblemonMemories.HIVE_LOCATION, pos); // This needs to be set in the case that the hive was picked up and moved.
+                    if (brain.checkMemory(CobblemonMemories.HIVE_LOCATION, MemoryStatus.REGISTERED)) {
+                        brain.setMemory(CobblemonMemories.HIVE_LOCATION, pos); // This needs to be set in the case that the hive was picked up and moved.
+                    }
                 } else {
                     // Block has likely been destroyed
                     var center = pos.getCenter();
@@ -62,25 +81,31 @@ public abstract class BeeOccupantMixin {
                             center.z + level.random.nextFloat() * 0.6 - 0.3
                     );
                     newYaw = level.random.nextFloat() * 360F;
-                    brain.eraseMemory(CobblemonMemories.HIVE_LOCATION);
+                    if (brain.checkMemory(CobblemonMemories.HIVE_LOCATION, MemoryStatus.REGISTERED)) {
+                        brain.eraseMemory(CobblemonMemories.HIVE_LOCATION);
+                    }
                 }
                 entity.yRotO = newYaw;
                 entity.setPos(newPos);
                 // Do honey logic
-                var hasNectar = brain.getMemory(CobblemonMemories.HAS_NECTAR).orElse(false);
-                if (hasNectar) {
-                    // Remove nectar and reset got to hive cooldown
-                    brain.eraseMemory(CobblemonMemories.HAS_NECTAR);
-                    brain.setMemoryWithExpiry(CobblemonMemories.HIVE_COOLDOWN, true, PathToBeeHiveTaskConfig.STAY_OUT_OF_HIVE_COOLDOWN);
-                    // Increment honey level of the hive
-                    if (state.is(BlockTags.BEEHIVES, (blockStateBase) -> blockStateBase.hasProperty(BeehiveBlock.HONEY_LEVEL))) {
-                        int i = state.getValue(BeehiveBlock.HONEY_LEVEL);
-                        if (i < 5) {
-                            int j = level.random.nextInt(100) == 0 ? 2 : 1;
-                            if (i + j > 5) {
-                                --j;
+                if (brain.checkMemory(CobblemonMemories.HAS_NECTAR, MemoryStatus.REGISTERED)) {
+                    var hasNectar = brain.getMemory(CobblemonMemories.HAS_NECTAR).orElse(false);
+                    if (hasNectar) {
+                        // Remove nectar and reset got to hive cooldown
+                        brain.eraseMemory(CobblemonMemories.HAS_NECTAR);
+                        if (brain.checkMemory(CobblemonMemories.HIVE_LOCATION, MemoryStatus.REGISTERED)) {
+                            brain.setMemoryWithExpiry(CobblemonMemories.HIVE_COOLDOWN, true, PathToBeeHiveTaskConfig.STAY_OUT_OF_HIVE_COOLDOWN);
+                        }
+                        // Increment honey level of the hive
+                        if (state.is(BlockTags.BEEHIVES, (blockStateBase) -> blockStateBase.hasProperty(BeehiveBlock.HONEY_LEVEL))) {
+                            int i = state.getValue(BeehiveBlock.HONEY_LEVEL);
+                            if (i < 5) {
+                                int j = level.random.nextInt(100) == 0 ? 2 : 1;
+                                if (i + j > 5) {
+                                    --j;
+                                }
+                                level.setBlockAndUpdate(pos, state.setValue(BeehiveBlock.HONEY_LEVEL, i + j));
                             }
-                            level.setBlockAndUpdate(pos, state.setValue(BeehiveBlock.HONEY_LEVEL, i + j));
                         }
                     }
                 }
@@ -92,12 +117,13 @@ public abstract class BeeOccupantMixin {
     @Inject(method = "of", at = @At("HEAD"), cancellable = true)
     private static void cobblemon$of(Entity entity, CallbackInfoReturnable<BeehiveBlockEntity.Occupant> cir) {
         if (entity instanceof PokemonEntity pokemonEntity) {
-            List<String> IGNORED_BEE_TAGS = Arrays.asList("Air", "ArmorDropChances", "ArmorItems", "Brain", "CanPickUpLoot", "DeathTime", "FallDistance", "FallFlying", "Fire", "HandDropChances", "HandItems", "HurtByTimestamp", "HurtTime", "LeftHanded", "Motion", "NoGravity", "OnGround", "PortalCooldown", "Pos", "Rotation", "Passengers", "leash", "UUID");
+            List<String> IGNORED_BEE_TAGS = Arrays.asList("Air", "ArmorDropChances", "ArmorItems", "CanPickUpLoot", "DeathTime", "FallDistance", "FallFlying", "Fire", "HandDropChances", "HandItems", "HurtByTimestamp", "HurtTime", "LeftHanded", "Motion", "NoGravity", "OnGround", "PortalCooldown", "Pos", "Rotation", "Passengers", "leash", "UUID");
             CompoundTag compoundTag = new CompoundTag();
             entity.save(compoundTag);
             Objects.requireNonNull(compoundTag);
             IGNORED_BEE_TAGS.forEach(compoundTag::remove);
-            Boolean hasNectar = pokemonEntity.getBrain().getMemory(CobblemonMemories.HAS_NECTAR).orElse(false);
+            boolean hasNectar = pokemonEntity.getBrain().checkMemory(CobblemonMemories.HAS_NECTAR, MemoryStatus.REGISTERED)
+                    && pokemonEntity.getBrain().getMemory(CobblemonMemories.HAS_NECTAR).orElse(false);
             cir.setReturnValue(new BeehiveBlockEntity.Occupant(CustomData.of(compoundTag), 0, hasNectar ? 2400 : 600));
             cir.cancel();
         }

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

@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.block.PreEmptsExplosion;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Explosion;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.state.BlockState;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(value = Explosion.class)
-public class ExplosionMixin {
-
-    @Redirect(
-            method = "finalizeExplosion",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/world/level/Level;getBlockState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState;",
-                    ordinal = 0
-            )
-    )
-    public BlockState cobblemon$whenExploded(Level world, BlockPos pos) {
-        BlockState blockState = world.getBlockState(pos);
-        if(blockState.getBlock() instanceof PreEmptsExplosion preExplosionBlock) {
-            preExplosionBlock.whenExploded(world, blockState, pos);
-        }
-        return blockState;
-    }
-}

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

@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import net.minecraft.stats.RecipeBookSettings;
-import net.minecraft.world.inventory.RecipeBookType;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Map;
-
-@Mixin(RecipeBookSettings.class)
-public class RecipeBookSettingsMixin {
-
-
-    @Shadow @Final public Map<RecipeBookType, RecipeBookSettings.TypeSettings> states;
-
-    @Inject(method = "<init>", at = @At("TAIL"))
-    private void cobblemon$init(CallbackInfo ci) {
-        states.put(RecipeBookType.valueOf("COOKING_POT"), new RecipeBookSettings.TypeSettings(true, true));
-    }
-}

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

@@ -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;
+    }
 }

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

@@ -33,7 +33,7 @@ public class SimpleBlockFeatureMixin {
         if (!(blockState.getBlock() instanceof HeartyGrainsBlock)) {
             return;
         }
-        if (blockState.getValue(HeartyGrainsBlock.Companion.getAGE()) <= HeartyGrainsBlock.AGE_AFTER_HARVEST) {
+        if (blockState.getValue(HeartyGrainsBlock.AGE) <= HeartyGrainsBlock.AGE_AFTER_HARVEST) {
             return; //block is too young to be double
         }
         if (!worldGenLevel.isEmptyBlock(blockPos.above())) {
@@ -43,4 +43,4 @@ public class SimpleBlockFeatureMixin {
         DoublePlantBlock.placeAt(worldGenLevel, blockState, blockPos, Block.UPDATE_CLIENTS);
         cir.setReturnValue(true);
     }
-}
+}

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

@@ -33,7 +33,7 @@ public class AbstractClientPlayerMixin {
             cir.setReturnValue(usageContext.getFovMultiplier());
         } else {
             // Only modify fov through riding if the pokedex is not open
-            LocalPlayer player = (LocalPlayer) (Object) this;
+            AbstractClientPlayer player = (AbstractClientPlayer) (Object) this;
             // Only modify fov for the driver and not the passengers
             if (player != null && player.isPassenger() && player.getVehicle() instanceof PokemonEntity && player.getVehicle().getControllingPassenger() == player) {
                 PokemonEntity ride = (PokemonEntity) player.getVehicle();

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

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.client.CobblemonClient;
 import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding;
+import com.cobblemon.mod.common.client.keybind.keybinds.RidingFreelookBinding;
 import com.cobblemon.mod.common.duck.RidePassenger;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext;
@@ -156,7 +157,7 @@ public abstract class MouseHandlerMixin {
         }
 
         var vehicleController = controllableVehicle.getOrientationController();
-        var lookaroundButtonPressed = Minecraft.getInstance().mouseHandler.isMiddlePressed();
+        var freeLooking = RidingFreelookBinding.INSTANCE.isDown();
         Pair<Boolean, Boolean> mouseShouldModifyDriver = ((PokemonEntity) vehicle).ifRidingAvailableSupply(new Pair(false, false), (behaviour, settings, state) -> {
             return behaviour.mouseModifiesDriverRotation(
                     settings,
@@ -170,7 +171,7 @@ public abstract class MouseHandlerMixin {
         // affect the vehicle orientation when looking around.
         // If the client is a passenger it will modify these rotations and return
         //-------------------------------------------------------------------------
-        if (lookaroundButtonPressed || player.getControlledVehicle() == null) {
+        if (freeLooking || player.getControlledVehicle() == null) {
             // Modify driver rotations
             cobblemon$setDriverRotations(player, cursorDeltaX, cursorDeltaY);
 
@@ -192,10 +193,10 @@ public abstract class MouseHandlerMixin {
         // Smoothly return driver rotations to zero when needed
         //-------------------------------------------------------------------------
         var playerRotater = (RidePassenger)player;
-        if( !lookaroundButtonPressed && !mouseShouldModifyDriver.getFirst()){
+        if( !freeLooking && !mouseShouldModifyDriver.getFirst()){
             playerRotater.cobblemon$setRideYRot(lerp(min(5.0f * (float)movementTime, 1.0f), Mth.wrapDegrees(playerRotater.cobblemon$getRideYRot()), 0.0f));
         }
-        if( !lookaroundButtonPressed && !mouseShouldModifyDriver.getSecond()) {
+        if( !freeLooking && !mouseShouldModifyDriver.getSecond()) {
             playerRotater.cobblemon$setRideXRot(lerp(min(5.0f * (float)movementTime, 1.0f), Mth.wrapDegrees(playerRotater.cobblemon$getRideXRot()), 0.0f));
         }
 

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

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.mixin.entity;
 import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.duck.RidePassenger;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.cobblemon.mod.common.pokemon.Pokemon;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.player.LocalPlayer;
@@ -23,6 +24,7 @@ import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -48,16 +50,8 @@ public abstract class EntityMixin {
             )
     )
     public boolean cobblemon$forceOnGroundForStepUp(Entity entity, Operation<Boolean> original) {
-        if (entity instanceof PokemonEntity && entity.hasControllingPassenger()) {
-            BlockPos below = entity.blockPosition().below();
-            Level level = entity.level();
-            var blockStateBelow = level.getBlockState(below);
-            boolean isAirOrLiquid = blockStateBelow.isAir() || !blockStateBelow.getFluidState().isEmpty();
-            boolean canSupportEntity = blockStateBelow.isFaceSturdy(level, below, Direction.UP);
-            boolean standingOnSolid = canSupportEntity && !isAirOrLiquid;
-            if (standingOnSolid) {
-                return true;
-            }
+        if (entity instanceof PokemonEntity vehicle && entity.hasControllingPassenger()) {
+            return true;
         }
         return original.call(entity);
     }
@@ -68,18 +62,7 @@ public abstract class EntityMixin {
             cancellable = true
     )
     private void cobblemon$modifyEyePosition_partial(float partialTicks, CallbackInfoReturnable<Vec3> cir) {
-        var entity = (Entity)(Object)this;
-        if (entity.level().isClientSide) return;
-        if (!(entity instanceof Player player)) return;
-        if (!(player instanceof RidePassenger ridePassenger)) return;
-        if (!(player.getVehicle() instanceof OrientationControllable vehicle)) return;
-        var vehicleController = vehicle.getOrientationController();
-        if (vehicleController == null) return;
-
-
-        // TODO: Determine if it needs partialtick involved.
-        Vec3 customEyePos = ridePassenger.cobblemon$getRideEyePos();
-        cir.setReturnValue(customEyePos);
+        cobblemon$getCustomEyePos(cir);
     }
 
     @Inject(
@@ -88,15 +71,20 @@ public abstract class EntityMixin {
             cancellable = true
     )
     private void cobblemon$modifyEyePosition_noPartial(CallbackInfoReturnable<Vec3> cir) {
+        cobblemon$getCustomEyePos(cir);
+    }
+
+    @Unique
+    private void cobblemon$getCustomEyePos(CallbackInfoReturnable<Vec3> cir) {
         var entity = (Entity)(Object)this;
         if (entity.level().isClientSide) return;
         if (!(entity instanceof Player player)) return;
         if (!(player instanceof RidePassenger ridePassenger)) return;
         if (!(player.getVehicle() instanceof OrientationControllable vehicle)) return;
+        if (!(vehicle instanceof PokemonEntity)) return;
         var vehicleController = vehicle.getOrientationController();
         if (vehicleController == null) return;
 
-        // TODO: Determine if it needs partialtick involved.
         Vec3 customEyePos = ridePassenger.cobblemon$getRideEyePos();
         cir.setReturnValue(customEyePos);
     }

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

@@ -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
@@ -96,7 +91,7 @@ import com.cobblemon.mod.common.pokemon.feature.SlowpokeTailRegrowthSpeciesFeatu
 import com.cobblemon.mod.common.pokemon.feature.TagSeasonResolver
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.pokemon.properties.*
-import com.cobblemon.mod.common.pokemon.properties.tags.PokemonFlagProperty
+import com.cobblemon.mod.common.pokemon.properties.LabelProperty
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
 import com.cobblemon.mod.common.util.*
@@ -169,7 +164,7 @@ object Cobblemon {
 
     val statistics: CobblemonStats = CobblemonStats
 
-    @JvmStatic
+    @JvmField
     val builtinPacks = listOf<CobblemonPack>(
         CobblemonPack(id = "adorncompatibility", name = "Adorn Compatibility", packType = PackType.CLIENT_RESOURCES, activationBehaviour = ResourcePackActivationBehaviour.ALWAYS_ENABLED, neededMods = setOf("adorn")),
         CobblemonPack(id = "gyaradosjump", name = "Gyarados Jump Patterns", packType = PackType.CLIENT_RESOURCES, activationBehaviour = ResourcePackActivationBehaviour.DEFAULT_ENABLED),
@@ -206,6 +201,7 @@ object Cobblemon {
         implementation.registerEntityDataSerializers()
         implementation.registerCriteria()
         implementation.registerEntitySubPredicates()
+        implementation.registerMobEffects()
         DispenserBehaviorRegistry.registerDispenserBehaviors()
 
         DropEntry.register("command", CommandDropEntry::class.java)
@@ -319,7 +315,7 @@ object Cobblemon {
 
         CustomPokemonProperty.register(UncatchableProperty)
         CustomPokemonProperty.register(BattleCloneProperty)
-        CustomPokemonProperty.register(PokemonFlagProperty)
+        CustomPokemonProperty.register(LabelProperty)
         CustomPokemonProperty.register(HiddenAbilityPropertyType)
         CustomPokemonProperty.register(AspectPropertyType)
         CustomPokemonProperty.register(UnaspectPropertyType)
@@ -573,4 +569,4 @@ object Cobblemon {
         this.implementation.registerCommandArgument(cobblemonResource("model_part"), ModelPartArgumentType::class, SingletonArgumentInfo.contextFree(ModelPartArgumentType::modelPart))
     }
 
-}
+}

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

@@ -215,7 +215,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val SACCHARINE_WALL_SIGN = this.create("saccharine_wall_sign", CobblemonWallSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SIGN), SACCHARINE_WOOD_TYPE))
     @JvmField
-    val SACCHARINE_HANGING_SIGN = this.create("saccharine_hanging_sign", CobblemonHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN), SACCHARINE_WOOD_TYPE))
+    val SACCHARINE_HANGING_SIGN = this.create("saccharine_hanging_sign", CobblemonHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_HANGING_SIGN), SACCHARINE_WOOD_TYPE))
     @JvmField
     val SACCHARINE_WALL_HANGING_SIGN = this.create("saccharine_wall_hanging_sign", CobblemonWallHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_HANGING_SIGN), SACCHARINE_WOOD_TYPE))
     @JvmField

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

@@ -117,6 +117,11 @@ interface CobblemonImplementation {
 
     fun registerEntitySubPredicates()
 
+    /**
+     * TODO
+     */
+    fun registerMobEffects()
+
 
     /**
      * Add a feature to the current platform implementation.

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common
+
+import com.cobblemon.mod.common.api.cooking.effects.CleanseAllEffect
+import com.cobblemon.mod.common.api.cooking.effects.CleanseNegativeEffect
+import com.cobblemon.mod.common.api.cooking.effects.MentalRestorationEffect
+import com.cobblemon.mod.common.platform.PlatformRegistry
+import net.minecraft.core.Registry
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.core.registries.Registries
+import net.minecraft.resources.ResourceKey
+import net.minecraft.world.effect.MobEffect
+
+object CobblemonMobEffects : PlatformRegistry<Registry<MobEffect>, ResourceKey<Registry<MobEffect>>, MobEffect>() {
+    override val registry: Registry<MobEffect> = BuiltInRegistries.MOB_EFFECT
+    override val resourceKey: ResourceKey<Registry<MobEffect>> = Registries.MOB_EFFECT
+
+    @JvmField
+    val CLEANSE_NEGATIVE = create("cleanse_negative", CleanseNegativeEffect())
+
+    @JvmField
+    val MENTAL_RESTORATION = create("mental_restoration", MentalRestorationEffect())
+
+    @JvmField
+    val CLEANSE_ALL = create("cleanse_all", CleanseAllEffect())
+}

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

@@ -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()))

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

@@ -9,14 +9,15 @@
 package com.cobblemon.mod.common
 
 import net.minecraft.client.RecipeBookCategories
+import net.minecraft.world.inventory.RecipeBookType
 
 enum class CobblemonRecipeCategories {
 
-    COOKING_POT_SEARCH("COOKING_POT_SEARCH"),
-    COOKING_POT_FOODS("COOKING_POT_FOODS"),
-    COOKING_POT_MEDICINES("COOKING_POT_MEDICINES"),
-    COOKING_POT_COMPLEX_DISHES("COOKING_POT_COMPLEX_DISHES"),
-    COOKING_POT_MISC("COOKING_POT_MISC");
+    COOKING_POT_SEARCH("COBBLEMON_COOKING_POT_SEARCH"),
+    COOKING_POT_FOODS("COBBLEMON_COOKING_POT_FOODS"),
+    COOKING_POT_MEDICINES("COBBLEMON_COOKING_POT_MEDICINES"),
+    COOKING_POT_COMPLEX_DISHES("COBBLEMON_COOKING_POT_COMPLEX_DISHES"),
+    COOKING_POT_MISC("COBBLEMON_COOKING_POT_MISC");
 
     companion object {
         val customAggregateCategories: Map<RecipeBookCategories, List<RecipeBookCategories>> = mapOf(
@@ -35,6 +36,9 @@ enum class CobblemonRecipeCategories {
     fun toVanillaCategory(): RecipeBookCategories {
         return RecipeBookCategories.valueOf(this.id)
     }
+}
 
-
+object CobblemonRecipeBookTypes {
+    const val COOKING_POT_NAME = "COBBLEMON_COOKING_POT"
+    val COOKING_POT: RecipeBookType = RecipeBookType.valueOf(COOKING_POT_NAME)
 }

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

@@ -89,7 +89,14 @@ object CobblemonTradeOffers {
      * @return The resulting list.
      */
     fun resolveWanderingTradeOffers(): List<WandererTradeOffer> = listOf(
-        WandererTradeOffer(false, listOf(VillagerTrades.ItemsForEmeralds(CobblemonItems.VIVICHOKE_SEEDS, 24, 1, 1, 6)))
+        WandererTradeOffer(false, listOf(
+            VillagerTrades.ItemsForEmeralds(CobblemonItems.VIVICHOKE_SEEDS, 6, 1, 1, 6),
+            VillagerTrades.ItemsForEmeralds(CobblemonItems.SACCHARINE_SAPLING, 5, 1, 4, 1),
+            VillagerTrades.ItemsForEmeralds(CobblemonItems.HEARTY_GRAINS, 1, 1, 12, 1),
+
+            VillagerTrades.ItemsForEmeralds(CobblemonItems.CHIPPED_POT, 5, 1, 1, 2),
+            VillagerTrades.ItemsForEmeralds(CobblemonItems.MASTERPIECE_TEACUP, 5, 1, 1, 2)
+        ))
     )
 
     /**

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/AspectCriterion.kt

@@ -23,6 +23,7 @@ class AspectCriterion(
 ): SimpleCriterionCondition<MutableMap<ResourceLocation, MutableSet<String>>>(playerCtx) {
 
     companion object {
+        @JvmField
         val CODEC: Codec<AspectCriterion> = RecordCodecBuilder.create { it.group(
             //All three of these codecs used to use Codecs.createStrictOptionalFieldCodec, that no longer exists
             ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(AspectCriterion::playerCtx),
@@ -35,4 +36,4 @@ class AspectCriterion(
         val caughtAspects = context.getOrDefault(species, mutableSetOf())
         return this.aspects.all { it in caughtAspects }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/BattleCountableCriterion.kt

@@ -25,6 +25,7 @@ class BattleCountableCriterion(
 ): CountableCriterion<BattleCountableContext>(playerCtx, count) {
 
     companion object {
+        @JvmField
         val CODEC: Codec<BattleCountableCriterion> = RecordCodecBuilder.create { it.group(
             ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(BattleCountableCriterion::playerCtx),
             Codec.STRING.listOf().optionalFieldOf("battle_types", listOf("any")).forGetter(BattleCountableCriterion::battleTypes),

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/CastPokeRodCriterionCondition.kt

@@ -25,6 +25,7 @@ class CastPokeRodCriterionCondition(
 ): SimpleCriterionCondition<CastPokeRodContext>(playerCtx) {
 
     companion object {
+        @JvmField
         val CODEC: Codec<CastPokeRodCriterionCondition> = RecordCodecBuilder.create { it.group(
                 EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(CastPokeRodCriterionCondition::playerCtx),
                 Codec.STRING.optionalFieldOf("baitId", "empty_bait").forGetter(CastPokeRodCriterionCondition::baitId)
@@ -34,4 +35,4 @@ class CastPokeRodCriterionCondition(
     override fun matches(player: ServerPlayer, context: CastPokeRodContext): Boolean {
         return (context.baitId == this.baitId.asIdentifierDefaultingNamespace() || this.baitId == "empty_bait")
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/CatchPokemonCriterion.kt

@@ -31,6 +31,7 @@ class CaughtPokemonCriterion(
 ): CountableCriterion<CountablePokemonTypeContext>(playerCtx, count) {
 
     companion object {
+        @JvmField
         val CODEC: Codec<CaughtPokemonCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(CaughtPokemonCriterion::playerCtx),
             Codec.STRING.optionalFieldOf("type", "any").forGetter(CaughtPokemonCriterion::type),
@@ -42,4 +43,4 @@ class CaughtPokemonCriterion(
     override fun matches(player: ServerPlayer, context: CountablePokemonTypeContext): Boolean {
         return super.matches(player, context) && (context.type == type || type == "any")// && (context.species == species || species == "any")
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/CountableCriterion.kt

@@ -23,6 +23,7 @@ open class CountableCriterion<T : CountableContext>(
 ): SimpleCriterionCondition<T>(playerCtx) {
 
     companion object {
+        @JvmField
         val CODEC: Codec<CountableCriterion<CountableContext>> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(CountableCriterion<CountableContext>::playerCtx),
             Codec.INT.optionalFieldOf("count", 0).forGetter(CountableCriterion<CountableContext>::count)

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/EvolvePokemonCriterion.kt

@@ -26,6 +26,7 @@ class EvolvePokemonCriterion(
 ): CountableCriterion<EvolvePokemonContext>(playerCtx, count) {
 
     companion object {
+        @JvmField
         val CODEC: Codec<EvolvePokemonCriterion> = RecordCodecBuilder.create { it.group(
             ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(EvolvePokemonCriterion::playerCtx),
             Codec.STRING.optionalFieldOf("species", "any").forGetter(EvolvePokemonCriterion::species),

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/LevelUpCriterion.kt

@@ -25,6 +25,7 @@ class LevelUpCriterion(
 ): SimpleCriterionCondition<LevelUpContext>(playerCtx) {
 
     companion object {
+        @JvmField
         val CODEC: Codec<LevelUpCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(LevelUpCriterion::playerCtx),
             Codec.INT.optionalFieldOf("level", 0).forGetter(LevelUpCriterion::level),
@@ -42,4 +43,4 @@ class LevelUpCriterion(
         return level == context.level && evolutionCheck == evolved
     }
 
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/PartyCheckCriterion.kt

@@ -24,6 +24,7 @@ class PartyCheckCriterion(
 ): SimpleCriterionCondition<PlayerPartyStore>(playerCtx) {
 
     companion object {
+        @JvmField
         val CODEC: Codec<PartyCheckCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PartyCheckCriterion::playerCtx),
             ResourceLocation.CODEC.listOf().optionalFieldOf("party", listOf()).forGetter(PartyCheckCriterion::party)
@@ -47,4 +48,4 @@ class PartyCheckCriterion(
         }
         return matches.containsAll(party) && matches.size == party.size
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/PlantTumblestoneCriterionCondition.kt

@@ -23,6 +23,7 @@ class PlantTumblestoneCriterion(
 ): SimpleCriterionCondition<PlantTumblestoneContext>(playerCtx) {
 
     companion object {
+        @JvmField
         val CODEC: Codec<PlantTumblestoneCriterion> = RecordCodecBuilder.create { it.group(
             ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(PlantTumblestoneCriterion::playerCtx)
         ).apply(it, ::PlantTumblestoneCriterion) }

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/PokemonCriterion.kt

@@ -24,6 +24,7 @@ class PokemonCriterion(
 ): SimpleCriterionCondition<Pokemon>(playerCtx) {
 
     companion object {
+        @JvmField
         val CODEC: Codec<PokemonCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PokemonCriterion::playerCtx),
             Codec.STRING.optionalFieldOf("species", "any").forGetter(PokemonCriterion::species),
@@ -35,4 +36,4 @@ class PokemonCriterion(
         var speciesCheck = (species.equals(context.species.resourceIdentifier.path) || species.equals(context.species.resourceIdentifier.toString())) || species.equals("any")
         return speciesCheck && properties.matches(context)
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/PokemonInteractCriterion.kt

@@ -25,6 +25,7 @@ class PokemonInteractCriterion(
     val item: String
 ): SimpleCriterionCondition<PokemonInteractContext>(playerCtx) {
     companion object {
+        @JvmField
         val CODEC: Codec<PokemonInteractCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PokemonInteractCriterion::playerCtx),
             Codec.STRING.optionalFieldOf("species", "any").forGetter(PokemonInteractCriterion::species),
@@ -35,4 +36,4 @@ class PokemonInteractCriterion(
     override fun matches(player: ServerPlayer, context: PokemonInteractContext): Boolean {
         return (context.species == this.species.asIdentifierDefaultingNamespace() || this.species == "any") && (context.item == this.item.asIdentifierDefaultingNamespace() || this.item == "any")
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/ReelInPokemonCriterionCondition.kt

@@ -26,6 +26,7 @@ class ReelInPokemonCriterionCondition(
 ) : SimpleCriterionCondition<ReelInPokemonContext>(playerCtx) {
 
     companion object {
+        @JvmField
         val CODEC: Codec<ReelInPokemonCriterionCondition> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter { it.playerCtx },
             Codec.STRING.optionalFieldOf("species", "any").forGetter { it.species },
@@ -37,4 +38,4 @@ class ReelInPokemonCriterionCondition(
         return (context.species == this.species.asIdentifierDefaultingNamespace() || this.species == "any")
                 && (context.baitId == this.baitId.asIdentifierDefaultingNamespace() || this.baitId == "any" || this.baitId == "empty_bait")
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/TradePokemonCriterionCondition.kt

@@ -28,6 +28,7 @@ class TradePokemonCriterion(
 ): SimpleCriterionCondition<TradePokemonContext>(playerCtx) {
 
     companion object {
+        @JvmField
         val CODEC: Codec<TradePokemonCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(TradePokemonCriterion::playerCtx),
             Codec.STRING.optionalFieldOf("traded", "any").forGetter(TradePokemonCriterion::traded),

common/src/main/kotlin/com/cobblemon/mod/common/advancement/predicate/CobblemonEntitySubPredicates.kt

@@ -18,7 +18,7 @@ import net.minecraft.resources.ResourceKey
 
 object CobblemonEntitySubPredicates : PlatformRegistry<Registry<MapCodec<out EntitySubPredicate>>, ResourceKey<Registry<MapCodec<out EntitySubPredicate>>>, MapCodec<out EntitySubPredicate>>() {
 
-    @JvmStatic
+    @JvmField
     val POKE_POBBER = this.create("poke_bobber", FishingBobberPredicate.CODEC)
 
     override val registry: Registry<MapCodec<out EntitySubPredicate>> = BuiltInRegistries.ENTITY_SUB_PREDICATE_TYPE

common/src/main/kotlin/com/cobblemon/mod/common/advancement/predicate/FishingBobberPredicate.kt

@@ -24,7 +24,7 @@ class FishingBobberPredicate(val inOpenWater: Boolean) : EntitySubPredicate {
         return (entity as? PokeRodFishingBobberEntity)?.inOpenWater == this.inOpenWater
     }
     companion object {
-        @JvmStatic
+        @JvmField
         val CODEC: MapCodec<FishingBobberPredicate> = RecordCodecBuilder.mapCodec { instance ->
             instance.group(
                 Codec.BOOL.fieldOf("in_open_water").forGetter(FishingBobberPredicate::inOpenWater)

common/src/main/kotlin/com/cobblemon/mod/common/api/Priority.kt

@@ -22,7 +22,7 @@ enum class Priority : StringRepresentable {
 
     companion object {
 
-        @JvmStatic
+        @JvmField
         val CODEC: Codec<Priority> = StringRepresentable.fromEnum(Priority::values)
 
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/abilities/Ability.kt

@@ -104,7 +104,7 @@ open class Ability internal constructor(var template: AbilityTemplate, forced: B
 
     companion object {
 
-        @JvmStatic
+        @JvmField
         val CODEC: Codec<Ability> = RecordCodecBuilder.create {
             it.group(
                 AbilityTemplate.CODEC.fieldOf(DataKeys.POKEMON_ABILITY_NAME).forGetter(Ability::template),

common/src/main/kotlin/com/cobblemon/mod/common/api/abilities/AbilityTemplate.kt

@@ -47,7 +47,7 @@ class AbilityTemplate(
 
     companion object {
 
-        @JvmStatic
+        @JvmField
         val CODEC: Codec<AbilityTemplate> = CodecUtils.createByStringCodec(
             Abilities::getOrDummy,
             AbilityTemplate::name

common/src/main/kotlin/com/cobblemon/mod/common/api/abilities/PotentialAbility.kt

@@ -29,6 +29,7 @@ interface PotentialAbility {
     val type: PotentialAbilityType<*>
     fun isSatisfiedBy(aspects: Set<String>): Boolean
     companion object {
+        @JvmField
         val types = mutableListOf<PotentialAbilityType<*>>()
     }
 }
@@ -51,5 +52,4 @@ open class CommonAbility(override val template: AbilityTemplate) : PotentialAbil
     override val priority = Priority.LOWEST
     override val type = CommonAbilityType
     override fun isSatisfiedBy(aspects: Set<String>) = true
-}
-
+}

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

@@ -26,8 +26,9 @@ class AttackHostileMobsTaskConfig : SingleTaskConfig {
     ): BehaviorControl<in LivingEntity>? {
         return AttackHostileMobsTask.create()
     }
-    
+
     companion object {
+        @JvmField
         val CODEC: Codec<AttackHostileMobsTaskConfig> = Codec.unit(AttackHostileMobsTaskConfig())
     }
 }

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.DefendOwnerTask
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+
+class DefendOwnerTaskConfig : SingleTaskConfig {
+
+    override fun getVariables(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): List<MoLangConfigVariable> {
+        return emptyList()
+    }
+
+    override fun createTask(
+        entity: LivingEntity,
+        behaviourConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        behaviourConfigurationContext.addMemories(
+            MemoryModuleType.ATTACK_TARGET,
+            CobblemonMemories.NEAREST_VISIBLE_ATTACKER,
+        )
+
+        return WrapperLivingEntityTask(
+            DefendOwnerTask.create(),
+            PokemonEntity::class.java
+        )
+    }
+}

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

@@ -109,7 +109,7 @@ class PollinateFlowerTaskConfig : SingleTaskConfig {
             }
 
             override fun stop(level: ServerLevel, entity: LivingEntity, gameTime: Long) {
-
+                hoverPos = null
                 if (successfulPollinationTicks > REQUIRED_SUCCESSFUL_POLLINATION_TICKS) {
                     entity.brain.setMemory(CobblemonMemories.HAS_NECTAR, true)
                 }

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

@@ -105,6 +105,7 @@ interface TaskConfig {
             cobblemonResource("go_to_land") to GoToLandTaskConfig::class.java,
             cobblemonResource("manage_flight_in_battle") to ManageFlightInBattleTaskConfig::class.java,
             cobblemonResource("attack_hostile_mobs") to AttackHostileMobsTaskConfig::class.java,
+            cobblemonResource("defend_owner") to DefendOwnerTaskConfig::class.java,
             cobblemonResource("move_to_sweet_berry_bush") to MoveToSweetBerryBushTaskConfig::class.java,
             cobblemonResource("stop_moving_to_sweet_berry_bush") to StopTryingToReachSweetBerryBushTaskConfig::class.java,
             cobblemonResource("harvest_sweet_berry_bush") to HarvestSweetBerryBushTaskConfig::class.java,

common/src/main/kotlin/com/cobblemon/mod/common/api/apricorn/Apricorn.kt

@@ -99,6 +99,7 @@ enum class Apricorn : StringRepresentable {
     override fun getSerializedName() = this.name.lowercase()
 
     companion object {
+        @JvmField
         val CODEC: Codec<Apricorn> = StringRepresentable.fromValues(::values)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/berry/spawncondition/AllBiomeCondition.kt

@@ -24,6 +24,7 @@ class AllBiomeCondition(val minGroveSize: Int, val maxGroveSize: Int) : BerrySpa
     }
 
     companion object {
+        @JvmField
         val ID = cobblemonResource("all_biome")
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/berry/spawncondition/PreferredBiomeCondition.kt

@@ -26,6 +26,7 @@ class PreferredBiomeCondition(val minGroveSize: Int, val maxGroveSize: Int) : Be
     }
 
     companion object {
+        @JvmField
         val ID = cobblemonResource("preferred_biome")
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/berry/spawncondition/SpecificBiomeCondition.kt

@@ -24,6 +24,7 @@ class SpecificBiomeCondition : BerrySpawnCondition {
     override fun getGroveSize(random: RandomSource) = random.nextIntBetweenInclusive(minGroveSize, maxGroveSize)
 
     companion object {
+        @JvmField
         val ID = cobblemonResource("specific_biome")
     }
 }

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

@@ -27,6 +27,7 @@ enum class Flavour(val colour: Int): StringRepresentable {
 
     override fun getSerializedName() = name
     companion object {
+        @JvmField
         val CODEC = StringRepresentable.fromEnum<Flavour> { Flavour.entries.toTypedArray() }
     }
-}
+}

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

@@ -9,13 +9,8 @@
 package com.cobblemon.mod.common.api.cooking
 
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.util.math.geometry.toDegrees
-import com.cobblemon.mod.common.util.math.geometry.toRadians
 import net.minecraft.util.FastColor
 import net.minecraft.world.item.ItemStack
-import kotlin.math.atan2
-import kotlin.math.cos
-import kotlin.math.sin
 
 private val colourMap = mapOf(
     Flavour.SPICY to 0xFEB37D,
@@ -34,27 +29,30 @@ private val bubbleColourMap = mapOf(
 )
 
 fun getColourMixFromSeasonings(seasonings: List<ItemStack>, forBubbles: Boolean = false): Int? {
-    val flavors = seasonings
-            .mapNotNull { Seasonings.getFlavoursFromItemStack(it) }
-            .flatMap { it.entries }
-            .groupingBy { it.key }
-            .fold(0) { acc, entry -> acc + entry.value }
+    val flavourValues = mutableMapOf<Flavour, Int>()
+    for (seasoning in seasonings) {
+        val flavours = Seasonings.getFlavoursFromItemStack(seasoning) ?: continue
+        for ((flavour, value) in flavours.entries) {
+            flavourValues[flavour] = (flavourValues[flavour] ?: 0) + value
+        }
+    }
 
-    if (flavors.isEmpty()) return null
+    if (flavourValues.isEmpty()) {
+        return null
+    }
 
-    val maxFlavorValue = flavors.values.maxOrNull()
-    val dominantFlavors = flavors.filter { it.value == maxFlavorValue }.map { it.key }
+    val maxFlavorValue = flavourValues.values.maxOrNull()
+    val dominantFlavours = flavourValues.filter { it.value == maxFlavorValue }.map { it.key }
 
-    return getColourMixFromFlavours(dominantFlavors, forBubbles)
+    return getColourMixFromFlavours(dominantFlavours, forBubbles)
 }
 
 fun getColourMixFromFlavours(dominantFlavours: List<Flavour>, forBubbles: Boolean = false): Int? {
     val colors =
-        dominantFlavours.mapNotNull { if (forBubbles) bubbleColourMap[it] else colourMap[it] }
+        dominantFlavours
+            .mapNotNull { if (forBubbles) bubbleColourMap[it] else colourMap[it] }
             .map { FastColor.ARGB32.opaque(it) }
 
-    if (colors.isEmpty()) return null
-
     return getColourMixFromColors(colors)
 }
 
@@ -62,104 +60,33 @@ fun getColourMixFromRideStatBoosts(dominantBoosts: Iterable<RidingStat>, forBubb
     return getColourMixFromFlavours(dominantBoosts.map { it.flavour }, forBubbles)
 }
 
-// Mixing RGB colors directly often gives poor results
-// Converting them to HSL and averaging hues circularly produces more natural blends
 fun getColourMixFromColors(colors: List<Int>): Int? {
     if (colors.isEmpty()) return null
     if (colors.size == 1) return colors[0]
 
-    val hslColors = colors.map {
-        val red = FastColor.ARGB32.red(it)
-        val green = FastColor.ARGB32.green(it)
-        val blue = FastColor.ARGB32.blue(it)
+    val firstWeight = 0.7f
+    val otherWeightTotal = 1f - firstWeight
+    val otherWeight = otherWeightTotal / (colors.size - 1)
 
-        rgbToHsl(red, green, blue)
+    var alphaSum = 0f
+    var redSum = 0f
+    var greenSum = 0f
+    var blueSum = 0f
+
+    for (i in colors.indices) {
+        val weight = if (i == 0) firstWeight else otherWeight
+        val color = colors[i]
+
+        alphaSum += FastColor.ARGB32.alpha(color) * weight
+        redSum += FastColor.ARGB32.red(color) * weight
+        greenSum += FastColor.ARGB32.green(color) * weight
+        blueSum += FastColor.ARGB32.blue(color) * weight
     }
 
-    val hues = hslColors.map { it.h.toDouble() }
-    val huesAverage = hueAverage(hues).toFloat()
-    val saturations = hslColors.map { it.s }
-    val saturationsAverage = average(saturations)
-    val lightness = hslColors.map { it.l }
-    val lightnessAverage = average(lightness)
-
-    val rgbColor = hslToRgb(huesAverage, saturationsAverage, lightnessAverage)
-
-    return FastColor.ARGB32.color(rgbColor.r, rgbColor.g, rgbColor.b)
-}
-
-// Based on https://iter.ca/post/hue-avg
-fun hueAverage(hues: List<Double>): Float {
-    val points = hues.map { hue ->
-        val rad = hue.toRadians()
-        Pair(cos(rad), sin(rad))
-    }
-
-    val avgX = points.sumOf { it.first.toDouble() } / points.size
-    val avgY = points.sumOf { it.second.toDouble() } / points.size
-
-    var degrees = atan2(avgY, avgX).toDegrees()
-    if (degrees < 0) {
-        degrees += 360f
-    } else if (degrees > 360) {
-        degrees -= 360f
-    }
-
-    return degrees
-}
-
-fun average(values: List<Float>): Float {
-    if (values.isEmpty()) return 0f
-    return values.sum() / values.size
-}
-
-data class HSL(val h: Float, val s: Float, val l: Float)
-
-fun rgbToHsl(r: Int, g: Int, b: Int): HSL {
-    val rf = r / 255f
-    val gf = g / 255f
-    val bf = b / 255f
-
-    val max = maxOf(rf, gf, bf)
-    val min = minOf(rf, gf, bf)
-    val delta = max - min
-
-    var h = 0f
-    val l = (max + min) / 2f
-    val s = if (delta == 0f) 0f else delta / (1f - kotlin.math.abs(2f * l - 1f))
-
-    if (delta != 0f) {
-        h = when (max) {
-            rf -> ((gf - bf) / delta) % 6f
-            gf -> ((bf - rf) / delta) + 2f
-            else -> ((rf - gf) / delta) + 4f
-        }
-        h *= 60f
-        if (h < 0) h += 360f
-    }
-
-    return HSL(h, s, l)
-}
-
-data class RGB(val r: Int, val g: Int, val b: Int)
-
-fun hslToRgb(h: Float, s: Float, l: Float): RGB {
-    val c = (1f - kotlin.math.abs(2f * l - 1f)) * s
-    val x = c * (1f - kotlin.math.abs((h / 60f) % 2f - 1f))
-    val m = l - c / 2f
-
-    val (rf, gf, bf) = when {
-        h < 60f -> Triple(c, x, 0f)
-        h < 120f -> Triple(x, c, 0f)
-        h < 180f -> Triple(0f, c, x)
-        h < 240f -> Triple(0f, x, c)
-        h < 300f -> Triple(x, 0f, c)
-        else -> Triple(c, 0f, x)
-    }
-
-    return RGB(
-        ((rf + m) * 255).toInt().coerceIn(0, 255),
-        ((gf + m) * 255).toInt().coerceIn(0, 255),
-        ((bf + m) * 255).toInt().coerceIn(0, 255)
+    return FastColor.ARGB32.color(
+        alphaSum.toInt(),
+        redSum.toInt(),
+        greenSum.toInt(),
+        blueSum.toInt()
     )
 }

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

@@ -17,6 +17,7 @@ data class Food(
         val saturation: Float = 0f,
 ) {
     companion object {
+        @JvmField
         val CODEC: Codec<Food> = RecordCodecBuilder.create { builder ->
             builder.group(
                     Codec.INT.optionalFieldOf("hunger", 0).forGetter { it.hunger },

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

@@ -38,6 +38,7 @@ data class Seasoning(
     val mobEffects: List<SerializableMobEffectInstance>? = null
 ) {
     companion object {
+        @JvmField
         val CODEC: Codec<Seasoning> = RecordCodecBuilder.create { builder ->
             builder.group(
                 ITEM_REGISTRY_LIKE_CODEC.fieldOf("ingredient").forGetter { it.ingredient },
@@ -58,6 +59,7 @@ data class Seasoning(
             }
         }
 
+        @JvmField
         val STREAM_CODEC: StreamCodec<ByteBuf, Seasoning> = ByteBufCodecs.fromCodec(CODEC)
     }
-}
+}

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

@@ -31,6 +31,7 @@ data class SerializableMobEffectInstance(
     }
 
     companion object {
+        @JvmField
         val CODEC: Codec<SerializableMobEffectInstance> = RecordCodecBuilder.create { builder ->
             builder.group(
                     ResourceLocation.CODEC.fieldOf("effect").forGetter { it.effect },
@@ -42,4 +43,4 @@ data class SerializableMobEffectInstance(
             ).apply(builder, ::SerializableMobEffectInstance)
         }
     }
-}
+}

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

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.cooking.effects
+
+import net.minecraft.world.effect.MobEffect
+import net.minecraft.world.effect.MobEffectCategory
+import net.minecraft.world.entity.Entity
+import net.minecraft.world.entity.LivingEntity
+
+class CleanseAllEffect : MobEffect(MobEffectCategory.BENEFICIAL, 0xFFFFFF) {
+    override fun isInstantenous() = true
+    override fun applyInstantenousEffect(source: Entity?, indirect: Entity?, target: LivingEntity, amplifier: Int, proximity: Double) {
+        target.removeAllEffects()
+    }
+    override fun shouldApplyEffectTickThisTick(duration: Int, amplifier: Int) = false
+}

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

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.cooking.effects
+
+import net.minecraft.world.effect.MobEffect
+import net.minecraft.world.effect.MobEffectCategory
+import net.minecraft.world.entity.Entity
+import net.minecraft.world.entity.LivingEntity
+
+class CleanseNegativeEffect : MobEffect(MobEffectCategory.BENEFICIAL, 0xFFFFFF) {
+    override fun isInstantenous() = true
+    override fun applyInstantenousEffect(source: Entity?, indirect: Entity?, target: LivingEntity, amplifier: Int, proximity: Double) {
+        val snapshot = target.activeEffects.toList()
+        for (ei in snapshot) {
+            if (ei.effect.value().category == MobEffectCategory.HARMFUL) {
+                target.removeEffect(ei.effect)
+            }
+        }
+    }
+    override fun shouldApplyEffectTickThisTick(duration: Int, amplifier: Int) = false
+}

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.cooking.effects
+
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.stats.Stats
+import net.minecraft.world.effect.MobEffect
+import net.minecraft.world.effect.MobEffectCategory
+import net.minecraft.world.entity.LivingEntity
+
+class MentalRestorationEffect : MobEffect(MobEffectCategory.BENEFICIAL, 0xAA66FF) {
+    override fun applyEffectTick(entity: LivingEntity, amplifier: Int): Boolean {
+        if (entity is ServerPlayer) {
+            val stats = entity.stats
+            val statType = Stats.CUSTOM.get(Stats.TIME_SINCE_REST)
+            val current = stats.getValue(statType)
+            val reduction = 31 * (amplifier + 1)// reduce by half a minute every second per level (30 ticks removed per tick + 1 to account for the tick passing)
+            val newValue = Math.max(current - reduction, 0)
+            stats.setValue(entity, statType, newValue)
+        }
+        return true
+    }
+
+    override fun shouldApplyEffectTickThisTick(duration: Int, amplifier: Int): Boolean {
+        return true
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/dialogue/Dialogue.kt

@@ -26,9 +26,11 @@ class Dialogue(
     val initializationAction: DialogueAction = FunctionDialogueAction { _, _ -> }
 ) {
     companion object {
+        @JvmField
         val DEFAULT_BACKGROUND = cobblemonResource("textures/gui/dialogue/dialogue_box.png")
 
         @JvmOverloads
+        @JvmStatic
         fun of(
             pages: Iterable<DialoguePage>,
             background: ResourceLocation = DEFAULT_BACKGROUND,
@@ -44,6 +46,7 @@ class Dialogue(
         }
 
         @JvmOverloads
+        @JvmStatic
         fun of(
             pages: Iterable<DialoguePage>,
             background: ResourceLocation = DEFAULT_BACKGROUND,

common/src/main/kotlin/com/cobblemon/mod/common/api/dialogue/DialogueAction.kt

@@ -23,7 +23,7 @@ import com.cobblemon.mod.common.util.resolve
  */
 interface DialogueAction {
     companion object {
-        @JvmStatic
+        @JvmField
         val types = mutableMapOf<String, Class<out DialogueAction>>()
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/dialogue/DialogueFace.kt

@@ -23,6 +23,7 @@ sealed interface DialogueFaceProvider {
     val isLeftSide: Boolean
 
     companion object {
+        @JvmField
         val types = mutableMapOf(
             "artificial" to ArtificialDialogueFaceProvider::class.java,
             "player" to PlayerDialogueFaceProvider::class.java,

common/src/main/kotlin/com/cobblemon/mod/common/api/dialogue/DialogueManager.kt

@@ -58,4 +58,9 @@ object DialogueManager {
         DialogueClosedPacket(activeDialogue.dialogueId).sendToPlayer(playerEntity)
         activeDialogues.remove(playerEntity.uuid)
     }
+
+    @JvmStatic
+    fun getDialogue(playerEntity: ServerPlayer): ActiveDialogue? {
+        return activeDialogues[playerEntity.uuid]
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/dialogue/DialoguePage.kt

@@ -38,6 +38,7 @@ class DialoguePage(
 ) {
     companion object {
         @JvmOverloads
+        @JvmStatic
         fun of(
             /** The ID is optional, but if you want to be able to jump to this page from other pages then you probably want to set this. */
             id: String = "",
@@ -78,4 +79,4 @@ class DialoguePage(
             )
         )
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/dialogue/DialoguePredicate.kt

@@ -20,6 +20,7 @@ import com.cobblemon.mod.common.util.resolveBoolean
  */
 interface DialoguePredicate {
     companion object {
+        @JvmField
         val types = mutableMapOf<String, Class<out DialoguePredicate>>()
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/dialogue/DialogueText.kt

@@ -24,6 +24,7 @@ import net.minecraft.network.chat.MutableComponent
  */
 interface DialogueText {
     companion object {
+        @JvmField
         val types = mutableMapOf<String, Class<out DialogueText>>(
             "expression" to ExpressionLikeDialogueText::class.java,
         )

common/src/main/kotlin/com/cobblemon/mod/common/api/drop/DropEntry.kt

@@ -26,7 +26,10 @@ interface DropEntry {
     companion object {
         val entryTypes = mutableMapOf<String, Class<out DropEntry>>()
         var defaultType: Class<out DropEntry>? = null
+        @JvmStatic
         fun getByName(name: String) = entryTypes[name]
+        @JvmOverloads
+        @JvmStatic
         fun <T : DropEntry> register(name: String, clazz: Class<T>, isDefault: Boolean = false) {
             entryTypes[name] = clazz
             if (isDefault) {

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

@@ -63,13 +63,16 @@ interface EntityEffect {
             register(TransformEffect.ID, TransformEffect::class, ::TransformEffect)
         }
 
+        @JvmStatic
         fun <T : EntityEffect> register(id: String, type: KClass<T>, default: () -> T) {
             effects[id] = type
             defaults[id] = default
         }
 
+        @JvmStatic
         fun createDefault(id: String): EntityEffect? = defaults[id]?.invoke()
 
+        @JvmStatic
         fun loadFromNbt(nbt: CompoundTag, registryLookup: HolderLookup.Provider): EntityEffect? {
             if (nbt.contains(DataKeys.ENTITY_EFFECT_ID)) {
                 val id = nbt.getString(DataKeys.ENTITY_EFFECT_ID)
@@ -100,4 +103,4 @@ interface MocKEffect : PhysicalEffect {
 
     val exposedBall: PokeBall?
         get() = this.mock.pokeball?.let { PokeBalls.getPokeBall(it.asIdentifierDefaultingNamespace()) }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/events/battles/instruction/FormeChangeEvent.kt

@@ -8,12 +8,10 @@
 
 package com.cobblemon.mod.common.api.events.battles.instruction
 
-import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.battles.model.actor.ActorType
 import com.cobblemon.mod.common.api.events.battles.BattleEvent
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.util.asArrayValue
 
@@ -25,7 +23,8 @@ import com.cobblemon.mod.common.util.asArrayValue
 data class FormeChangeEvent(
     override val battle: PokemonBattle,
     val pokemon: BattlePokemon,
-    val formeName: String
+    val formeName: String,
+    val pnx: String
 ) : BattleEvent {
     val context = mutableMapOf(
         "battle" to battle.struct,
@@ -33,6 +32,7 @@ data class FormeChangeEvent(
         "npcs" to battle.actors.filter { it.type == ActorType.NPC }.asArrayValue { it.struct },
         "wild_pokemon" to battle.actors.filter { it.type == ActorType.WILD }.asArrayValue { it.struct },
         "pokemon" to pokemon.struct,
-        "forme" to StringValue(formeName)
+        "forme" to StringValue(formeName),
+        "pnx" to StringValue(pnx)
     )
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/fishing/SpawnBait.kt

@@ -35,6 +35,7 @@ class SpawnBait(
         constructor(type: ResourceLocation, subcategory: Optional<ResourceLocation>, chance: Double, value: Double) : this(type, subcategory.orElse(null), chance, value)
 
         companion object {
+            @JvmField
             val CODEC = RecordCodecBuilder.create<Effect> { instance ->
                 instance.group(
                     ResourceLocation.CODEC.fieldOf("type").forGetter { it.type },
@@ -47,6 +48,7 @@ class SpawnBait(
     }
 
     companion object {
+        @JvmField
         val CODEC = RecordCodecBuilder.create<SpawnBait> { instance ->
             instance.group(
                 ITEM_REGISTRY_LIKE_CODEC.fieldOf("item").forGetter { it.item },
@@ -54,6 +56,7 @@ class SpawnBait(
             ).apply(instance, ::SpawnBait)
         }
 
+        @JvmField
         val STREAM_CODEC = ByteBufCodecs.fromCodec(CODEC)
     }
 
@@ -96,6 +99,4 @@ class SpawnBait(
             }
         }
     }
-}
-
-
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/gui/GuiUtils.kt

@@ -37,8 +37,6 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.FormattedCharSequence
 import org.joml.Matrix4f
 import org.joml.Vector3f
-import org.lwjgl.opengl.GL30
-import java.nio.ByteBuffer
 
 @JvmOverloads
 fun blitk(
@@ -357,10 +355,10 @@ fun renderSprite(matrixStack: PoseStack, sprite: ResourceLocation) {
     val matrix: PoseStack.Pose = matrixStack.last()
     matrix.pose().translate(-1f, 0f, 0f)
 
-    RenderSystem.setShaderTexture(0, sprite);
+    RenderSystem.setShaderTexture(0, sprite)
     RenderSystem.setShader(GameRenderer::getPositionTexShader)
 
-    var buffer = Tesselator.getInstance().begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX)
+    val buffer = Tesselator.getInstance().begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX)
 
     buffer.addVertex(matrix, 2f, 0f, 0.0f).setUv(1f, 0f)
     buffer.addVertex(matrix, 0f, 0f, 0.0f).setUv(0f, 0f)
@@ -369,25 +367,3 @@ fun renderSprite(matrixStack: PoseStack, sprite: ResourceLocation) {
 
     BufferUploader.drawWithShader(buffer.buildOrThrow())
 }
-
-fun getPixelRGB(x: Int, y: Int): Triple<Int, Int, Int> {
-    val window = Minecraft.getInstance().window
-    val scale = window.guiScale
-    val buffer = ByteBuffer.allocateDirect(4)
-
-    RenderSystem.readPixels(
-        (x * scale).toInt(),
-        (window.height - y * scale - scale).toInt(),
-        1,
-        1,
-        GL30.GL_RGBA,
-        GL30.GL_UNSIGNED_BYTE,
-        buffer
-    )
-
-    return Triple(
-        buffer[0].toInt() and 0xFF,
-        buffer[1].toInt() and 0xFF,
-        buffer[2].toInt() and 0xFF
-    )
-}

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

@@ -9,13 +9,14 @@
 package com.cobblemon.mod.common.api.interaction
 
 import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
 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
@@ -29,6 +30,11 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.util.LowerCaseEnumTypeAdapterFactory
+import net.minecraft.world.item.Item
+import net.minecraft.world.level.biome.Biome
+import net.minecraft.world.level.block.Block
+import net.minecraft.world.level.levelgen.structure.Structure
+import net.minecraft.world.level.material.Fluid
 
 object PokemonInteractions : JsonDataRegistry<PokemonInteractionSet> {
     override val id = cobblemonResource("pokemon_interactions")
@@ -43,6 +49,11 @@ object PokemonInteractions : JsonDataRegistry<PokemonInteractionSet> {
         .registerTypeAdapter(Requirement::class.java, CobblemonRequirementAdapter)
         .registerTypeAdapter(InteractionEffect::class.java, InteractionEffectAdapter)
         .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
+        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
+        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)
+        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
+        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Structure::class.java).type, StructureLikeConditionAdapter)
+        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Fluid::class.java).type, FluidLikeConditionAdapter)
         .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
         .registerTypeAdapterFactory(LowerCaseEnumTypeAdapterFactory())
         .setPrettyPrinting()
@@ -51,7 +62,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()

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

@@ -15,11 +15,11 @@ 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 com.google.gson.annotations.SerializedName
 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 +28,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 +121,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,25 +141,54 @@ 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?,
+    @SerializedName("playAround") private val _playAround: Boolean?,
+    @SerializedName("distance") private val _distance: Double?,
+    @SerializedName("volume") private val _volume: Float?,
+    @SerializedName("pitch") private val _pitch: Float?,
+) : 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)
         }
     }
 
+    val playAround: Boolean
+        get() = _playAround != false
+
+    val distance: Double
+        get() = _distance ?: 64.0
+
+    val volume: Float
+        get() = _volume ?: 1.0F
+
+    val pitch: Float
+        get() = _pitch ?: 1.0F
+
     companion object {
         val ID = "play_sound"
     }
 }
 
-class ShrinkItemEffect(val amount: Int = 1): InteractionEffect {
+class ShrinkItemEffect(val amount: Int = 1) : InteractionEffect {
     override fun applyEffect(
         pokemon: PokemonEntity,
         player: ServerPlayer
@@ -120,7 +204,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

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

@@ -223,6 +223,7 @@ abstract class RequestManager<T : ServerPlayerActionRequest> {
     companion object {
         private val managers = mutableListOf<RequestManager<*>>()
 
+        @JvmStatic
         fun register(manager: RequestManager<*>) = managers.add(manager)
 
         fun onLogoff(player: ServerPlayer) = managers.forEach { it.onLogoff(player) }

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

@@ -59,7 +59,7 @@ interface AbilityChanger<T : PotentialAbility> {
          *
          * While this can be used in custom data scenarios this functions most "game-like" if the Pokémon only has 2 common abilities.
          */
-        @JvmStatic
+        @JvmField
         val COMMON_ABILITY: AbilityChanger<CommonAbility> = AbilityTypeChanger(CommonAbilityType) { other -> other == CommonAbilityType }
 
         /**
@@ -67,7 +67,7 @@ interface AbilityChanger<T : PotentialAbility> {
          *
          * While this can be used in custom data scenarios this functions most "game-like" if the Pokémon only has 1 hidden ability.
          */
-        @JvmStatic
+        @JvmField
         val HIDDEN_ABILITY: AbilityChanger<HiddenAbility> = AbilityTypeChanger(HiddenAbilityType) { other -> other == CommonAbilityType || other == HiddenAbilityType }
 
     }

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

@@ -35,10 +35,11 @@ interface ExpressionLike {
     fun resolveObject(runtime: MoLangRuntime) = resolve(runtime) as ObjectValue<*>
 
     companion object {
+        @JvmField
         val CODEC: Codec<ExpressionLike> = Codec.STRING.xmap({
             it.asExpressionLike()
         }) {
             it.getString()
         }
     }
-}
+}

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

@@ -311,7 +311,7 @@ object MoLangFunctions {
             runtime.environment.variable = params.environment.variable
             val args = params.params.subList(1, params.params.size)
             runtime.environment.context = ContextStruct(
-                params.environment.context.map + args.mapIndexed { index, value -> "arg_${index + 1}" to value }.toMap()
+                (params.environment.context?.map ?: emptyMap()) + args.mapIndexed { index, value -> "arg_${index + 1}" to value }.toMap()
             )
             val script = params.getString(0).asIdentifierDefaultingNamespace()
             // store the args in the
@@ -324,13 +324,24 @@ object MoLangFunctions {
             runtime.environment.context = params.environment.context
             val expression = params.getString(0).asExpressionLike()
             val delayInSeconds = params.getDoubleOrNull(1)?.toFloat() ?: 0.0f
+
+            fun evaluate(): MoValue {
+                return try {
+                    runtime.resolve(expression)
+                } catch (ex: Exception) {
+                    Cobblemon.LOGGER.warn("Failed to evaluate MoLang expression${if (delayInSeconds > 0.0f) " (delayed)" else ""}: $expression", ex)
+                    DoubleValue.ZERO
+                }
+            }
+
             if (delayInSeconds > 0.0f) {
                 val tracker = if (Cobblemon.implementation.environment() == Environment.SERVER) ServerTaskTracker else ClientTaskTracker
                 tracker.after(delayInSeconds) {
-                    runtime.resolve(expression)
+                    evaluate()
                 }
+                DoubleValue.ONE
             } else {
-                runtime.resolve(expression)
+                evaluate()
             }
         },
         "system_time_millis" to java.util.function.Function { _ ->
@@ -340,19 +351,19 @@ object MoLangFunctions {
         "date_local_time" to java.util.function.Function { _ ->
             val time = System.currentTimeMillis()
             val date = java.util.Date(time)
-            val formatted = java.text.SimpleDateFormat("DD/MM/YYYY").format(date)
+            val formatted = java.text.SimpleDateFormat("dd/MM/yyyy").format(date)
             StringValue(formatted)
         },
         "date_of" to java.util.function.Function { params ->
             val time = params.getDouble(0).toLong()
             val date = java.util.Date(time)
-            val formatted = java.text.SimpleDateFormat("DD/MM/YYYY").format(date)
+            val formatted = java.text.SimpleDateFormat("dd/MM/yyyy").format(date)
             StringValue(formatted)
         },
         "date_is_after" to java.util.function.Function { params ->
             val dateA = params.getString(0)
             val dateB = params.getString(1)
-            val format = java.text.SimpleDateFormat("DD/MM/YYYY")
+            val format = java.text.SimpleDateFormat("dd/MM/yyyy")
             val a = format.parse(dateA)
             val b = format.parse(dateB)
             DoubleValue(a.after(b))
@@ -779,6 +790,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
         }
@@ -1739,22 +1764,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) {

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

@@ -112,7 +112,7 @@ class BenchedMoves : Iterable<BenchedMove> {
     }
 
     companion object {
-        @JvmStatic
+        @JvmField
         val CODEC: Codec<BenchedMoves> = Codec.list(BenchedMove.CODEC)
             .xmap(
                 { moveList ->
@@ -144,6 +144,7 @@ data class BenchedMove(val moveTemplate: MoveTemplate, val ppRaisedStages: Int)
     }
 
     companion object {
+        @JvmStatic
         fun loadFromNBT(nbt: CompoundTag): BenchedMove {
             val name = nbt.getString(DataKeys.POKEMON_MOVESET_MOVENAME)
             return BenchedMove(
@@ -152,6 +153,7 @@ data class BenchedMove(val moveTemplate: MoveTemplate, val ppRaisedStages: Int)
             )
         }
 
+        @JvmStatic
         fun loadFromJSON(json: JsonObject): BenchedMove {
             val name = json.get(DataKeys.POKEMON_MOVESET_MOVENAME).asString
             return BenchedMove(
@@ -160,6 +162,7 @@ data class BenchedMove(val moveTemplate: MoveTemplate, val ppRaisedStages: Int)
             )
         }
 
+        @JvmStatic
         fun loadFromBuffer(buffer: RegistryFriendlyByteBuf): BenchedMove {
             val name = buffer.readString()
             return BenchedMove(
@@ -168,7 +171,7 @@ data class BenchedMove(val moveTemplate: MoveTemplate, val ppRaisedStages: Int)
             )
         }
 
-        @JvmStatic
+        @JvmField
         val CODEC: Codec<BenchedMove> = RecordCodecBuilder.create { it.group(
             MoveTemplate.BY_STRING_CODEC.fieldOf(DataKeys.POKEMON_MOVESET_MOVENAME).forGetter(BenchedMove::moveTemplate),
             Codec.intRange(0, 3).fieldOf(DataKeys.POKEMON_MOVESET_RAISED_PP_STAGES).forGetter(BenchedMove::ppRaisedStages)

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

@@ -149,12 +149,14 @@ open class Move(
     }
 
     companion object {
+        @JvmStatic
         fun loadFromNBT(nbt: CompoundTag): Move {
             val moveName = nbt.getString(DataKeys.POKEMON_MOVESET_MOVENAME)
             val template = Moves.getByNameOrDummy(moveName)
             return template.create(nbt.getInt(DataKeys.POKEMON_MOVESET_MOVEPP), nbt.getInt(DataKeys.POKEMON_MOVESET_RAISED_PP_STAGES))
         }
 
+        @JvmStatic
         fun loadFromJSON(json: JsonObject): Move {
             val moveName = json.get(DataKeys.POKEMON_MOVESET_MOVENAME).asString
             val template = Moves.getByNameOrDummy(moveName)
@@ -163,6 +165,7 @@ open class Move(
             return Move(template, currentPp, raisedPpStages)
         }
 
+        @JvmStatic
         fun loadFromBuffer(buffer: RegistryFriendlyByteBuf): Move {
             val moveName = buffer.readString()
             val currentPp = buffer.readSizedInt(IntSize.U_BYTE)
@@ -171,7 +174,7 @@ open class Move(
             return template.create(currentPp, raisedPpStages)
         }
 
-        @JvmStatic
+        @JvmField
         val CODEC: Codec<Move> = RecordCodecBuilder.create { it.group(
             MoveTemplate.BY_STRING_CODEC.fieldOf(DataKeys.POKEMON_MOVESET_MOVENAME).forGetter(Move::template),
             Codec.intRange(0, Int.MAX_VALUE).fieldOf(DataKeys.POKEMON_MOVESET_MOVEPP).forGetter(Move::currentPp),

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

@@ -208,7 +208,7 @@ class MoveSet : Iterable<Move> {
 
     companion object {
         const val MOVE_COUNT = 4
-        @JvmStatic
+        @JvmField
         val CODEC: Codec<MoveSet> = Codec.list(Move.CODEC, 0, MOVE_COUNT)
             .xmap(
                 { moveList ->

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

@@ -90,9 +90,10 @@ open class MoveTemplate(
     )
 
     companion object {
+        @JvmStatic
         fun dummy(name: String) = Dummy(name)
 
-        @JvmStatic
+        @JvmField
         val BY_STRING_CODEC: Codec<MoveTemplate> = CodecUtils.createByStringCodec(
             Moves::getByNameOrDummy,
             MoveTemplate::name
@@ -157,4 +158,4 @@ open class MoveTemplate(
         }
         return this.elementalType
     }
-}
+}

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

@@ -32,6 +32,7 @@ class ActionEffectTimeline(
     val condition: ExpressionLike = "true".asExpressionLike()
 ) {
     companion object {
+        @JvmField
         val NONE = ActionEffectTimeline()
     }
 
@@ -98,4 +99,4 @@ interface EntityProvider {
 //    val sound: ResourceLocation? = null,
 //    val animation: List<AnimationWithMoments> = listOf(),
 //    val effects: List<ActionEffect> = listOf()
-//)
+//)

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ActionEffectKeyframe.kt

@@ -21,8 +21,10 @@ import java.util.concurrent.CompletableFuture
  */
 interface ActionEffectKeyframe {
     companion object {
+        @JvmField
         val types = mutableMapOf<String, Class<out ActionEffectKeyframe>>()
 
+        @JvmStatic
         inline fun <reified T : ActionEffectKeyframe> register(type: String) {
             types[type] = T::class.java
         }
@@ -31,4 +33,4 @@ interface ActionEffectKeyframe {
     fun play(context: ActionEffectContext): CompletableFuture<Unit>
     fun interrupt(context: ActionEffectContext) {}
     fun skip(): CompletableFuture<Unit> = CompletableFuture.completedFuture(Unit)
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/mulch/MulchVariant.kt

@@ -32,4 +32,4 @@ enum class MulchVariant(val duration: Int = -1) : StringRepresentable {
     companion object {
         const val GROWTH_TIME_MULTIPLIER = 0.5
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCClasses.kt

@@ -109,6 +109,7 @@ object NPCClasses : JsonDataRegistry<NPCClass> {
      * @param name The path of the NPC class asset.
      * @return The [NPCClass] if existing.
      */
+    @JvmStatic
     fun getByName(name: String) = this.getByIdentifier(cobblemonResource(name))
 
     /**

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCPartyProvider.kt

@@ -25,6 +25,7 @@ import net.minecraft.server.level.ServerPlayer
  */
 interface NPCPartyProvider {
     companion object {
+        @JvmField
         val types = mutableMapOf<String, (String) -> NPCPartyProvider>(
             SimplePartyProvider.TYPE to { SimplePartyProvider() },
             PoolPartyProvider.TYPE to { PoolPartyProvider() },

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/configuration/NPCInteractConfiguration.kt

@@ -34,6 +34,7 @@ interface NPCInteractConfiguration {
     companion object {
         val types = mutableMapOf<String, NPCInteractConfigurationType<out NPCInteractConfiguration>>()
 
+        @JvmStatic
         fun register(type: String, displayName: MutableComponent, clazz: Class<out NPCInteractConfiguration>) {
             types[type] = NPCInteractConfigurationType(displayName, clazz)
         }

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/variation/NPCVariationProvider.kt

@@ -34,6 +34,7 @@ interface NPCVariationProvider {
             "random" to RandomNPCVariationProvider::class.java
         )
 
+        @JvmStatic
         fun register(type: String, clazz: Class<out NPCVariationProvider>) {
             types[type] = clazz
         }

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

@@ -23,8 +23,11 @@ import kotlin.math.sign
 open class OrientationController(val entity: LivingEntity) {
 
     companion object {
+        @JvmField
         val FORWARDS: Vector3f = Vector3f(0.0f, 0.0f, -1.0f)
+        @JvmField
         val UP: Vector3f = Vector3f(0.0f, 1.0f, 0.0f)
+        @JvmField
         val LEFT: Vector3f = Vector3f(-1.0f, 0.0f, 0.0f)
     }
 
@@ -129,4 +132,4 @@ open class OrientationController(val entity: LivingEntity) {
         return@updateOrientation Matrix3f().set(resultQuat)
     }
 
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/permission/PermissionLevel.kt

@@ -25,6 +25,7 @@ enum class PermissionLevel(val numericalValue: Int) {
     ALL_COMMANDS(4);
 
     companion object {
+        @JvmStatic
         fun byNumericValue(value: Int): PermissionLevel {
             return entries.first { it.numericalValue == value }
         }

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

@@ -23,6 +23,8 @@ data class CaptureContext(
          * @param critical If the capture is a critical capture, defaults to false.
          * @return The generated [CaptureContext].
          */
+        @JvmOverloads
+        @JvmStatic
         fun successful(critical: Boolean = false): CaptureContext {
             if (critical) {
                 return CaptureContext(numberOfShakes = 1, isSuccessfulCapture = true, isCriticalCapture = true)

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/FormDexRecord.kt

@@ -37,6 +37,7 @@ import net.minecraft.network.RegistryFriendlyByteBuf
  */
 class FormDexRecord {
     companion object {
+        @JvmField
         val CODEC: Codec<FormDexRecord> = RecordCodecBuilder.create { instance ->
             instance.group(
                 ListCodec(Codec.STRING, 0, 3).fieldOf("genders").forGetter { it.genders.map { it.name } },

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/PokedexEntryProgress.kt

@@ -26,10 +26,11 @@ enum class PokedexEntryProgress : StringRepresentable, Comparable<PokedexEntryPr
 
     override fun getSerializedName() = this.name
     companion object {
+        @JvmField
         val CODEC: Codec<PokedexEntryProgress> = RecordCodecBuilder.create { instance ->
             instance.map ({
                 PokedexEntryProgress.valueOf(it)
             }, PrimitiveCodec.STRING.fieldOf("name").forGetter { it.name })
         }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/PokedexManager.kt

@@ -70,6 +70,7 @@ class PokedexManager(
     }
 
     companion object {
+        @JvmField
         val CODEC = RecordCodecBuilder.create<PokedexManager> { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("uuid").forGetter { it.uuid.toString() },

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/SpeciesDexRecord.kt

@@ -33,6 +33,7 @@ import net.minecraft.resources.ResourceLocation
  */
 class SpeciesDexRecord {
     companion object {
+        @JvmField
         val CODEC: Codec<SpeciesDexRecord> = RecordCodecBuilder.create { instance ->
             instance.group(
                 ListCodec(PrimitiveCodec.STRING, 0, 512).fieldOf("aspects").forGetter { it.aspects.toList() },

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/def/AggregatePokedexDef.kt

@@ -76,7 +76,9 @@ class AggregatePokedexDef(
     }
 
     companion object {
+        @JvmField
         val ID = cobblemonResource("aggregate_pokedex_def")
+        @JvmField
         val CODEC: MapCodec<AggregatePokedexDef> = RecordCodecBuilder.mapCodec { instance ->
             instance.group(
                 ResourceLocation.CODEC.fieldOf("id").forGetter { it.id },

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/def/PokedexDef.kt

@@ -34,9 +34,12 @@ abstract class PokedexDef: ClientDataSynchronizer<PokedexDef> {
     abstract fun getEntries(): List<PokedexEntry>
 
     companion object {
+        @JvmField
         val CODEC: Codec<PokedexDef> = ResourceLocation.CODEC.dispatch("type", PokedexDef::typeId, PokedexDef::getCodecById)
+        @JvmField
         val PACKET_CODEC: StreamCodec<ByteBuf, PokedexDef> = ResourceLocation.STREAM_CODEC.dispatch({ it.typeId }, ::getPacketCodecById)
 
+        @JvmStatic
         fun getPacketCodecById(id: ResourceLocation): StreamCodec<ByteBuf, out PokedexDef> {
             return when (id) {
                 SimplePokedexDef.ID -> SimplePokedexDef.PACKET_CODEC
@@ -45,6 +48,7 @@ abstract class PokedexDef: ClientDataSynchronizer<PokedexDef> {
             }
         }
 
+        @JvmStatic
         fun getCodecById(id: ResourceLocation): MapCodec<out PokedexDef> {
             return when (id) {
                 SimplePokedexDef.ID -> SimplePokedexDef.CODEC

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/def/SimplePokedexDef.kt

@@ -64,7 +64,9 @@ class SimplePokedexDef(
     }
 
     companion object {
+        @JvmField
         val ID = cobblemonResource("simple_pokedex_def")
+        @JvmField
         val CODEC: MapCodec<SimplePokedexDef> = RecordCodecBuilder.mapCodec { instance ->
             instance.group(
                 ResourceLocation.CODEC.fieldOf("id").forGetter { it.id },
@@ -78,6 +80,7 @@ class SimplePokedexDef(
             }
         }
 
+        @JvmField
         val PACKET_CODEC: StreamCodec<ByteBuf, SimplePokedexDef> = StreamCodec.composite(
             ResourceLocation.STREAM_CODEC, SimplePokedexDef::id,
             ByteBufCodecs.INT, SimplePokedexDef::sortOrder,

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

@@ -82,13 +82,13 @@ import kotlin.jvm.optionals.getOrNull
 open class PokemonProperties {
     companion object {
 
-        @JvmStatic
+        @JvmField
         val CODEC: Codec<PokemonProperties> = Codec.STRING.xmap(
             { parse(it) },
             { it.asString() }
         )
 
-        @JvmStatic
+        @JvmField
         val CUSTOM_PROPERTIES_CODEC: Codec<MutableList<CustomPokemonProperty>> = Codec.list(Codec.STRING)
             .xmap(
                 { string -> parse(string.joinToString(" ")).customProperties },
@@ -96,6 +96,7 @@ open class PokemonProperties {
             )
 
         @JvmOverloads
+        @JvmStatic
         fun parse(string: String, delimiter: String = " ", assigner: String = "="): PokemonProperties {
             val props = PokemonProperties()
             props.originalString = string
@@ -409,13 +410,7 @@ open class PokemonProperties {
         shiny?.let { pokemon.shiny = it }
         gender?.let { pokemon.gender = it }
         level?.let { pokemon.level = it }
-        friendship.also {
-            if (it != null) {
-                pokemon.setFriendship(it)
-            } else {
-                pokemon.setFriendship(pokemon.form.baseFriendship)
-            }
-        }
+        friendship?.also { pokemon.setFriendship(it) }
         fullness?.let { pokemon.currentFullness = it }
         pokeball?.let { PokeBalls.getPokeBall(it.asIdentifierDefaultingNamespace())?.let { pokeball -> pokemon.caughtBall = pokeball } }
         nature?.let  { Natures.getNature(it.asIdentifierDefaultingNamespace())?.let { nature -> pokemon.nature = nature } }

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

@@ -22,10 +22,14 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 interface AspectProvider {
     companion object {
         val providers = mutableListOf<AspectProvider>()
+
+        @JvmStatic
         fun register(provider: AspectProvider): AspectProvider {
             providers.add(provider)
             return provider
         }
+
+        @JvmStatic
         fun unregister(provider: AspectProvider) {
             providers.remove(provider)
         }

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

@@ -21,6 +21,7 @@ import com.cobblemon.mod.common.pokemon.Pokemon
  */
 interface SingleConditionalAspectProvider : AspectProvider {
     companion object {
+        @JvmStatic
         fun getForFeature(name: String): SingleConditionalAspectProvider {
             return object : SingleConditionalAspectProvider {
                 override val aspect: String = name

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

@@ -38,6 +38,7 @@ enum class EggGroup(val showdownID: String) {
             it.showdownID.lowercase().replace(" ", "_").replace("-", "_")
         }
 
+        @JvmStatic
         fun fromIdentifier(identifier: String): EggGroup? {
             val key = identifier.lowercase().replace(" ", "_").replace("-", "_")
             return identifierMap[key]

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

@@ -26,9 +26,9 @@ interface PreEvolution {
     val form: FormData
 
     companion object {
-
+        @JvmOverloads
+        @JvmStatic
         fun of(species: Species, form: FormData = species.standardForm): PreEvolution = StandardPreEvolution(species, form)
-
     }
 
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/progress/EvolutionProgressTypes.kt

@@ -25,15 +25,15 @@ object EvolutionProgressTypes {
         ResourceKey.createRegistryKey(cobblemonResource("evolution_progress")), Lifecycle.stable()
     )
 
-    @JvmStatic
+    @JvmField
     val DAMAGE_TAKEN = this.registerType(DamageTakenEvolutionProgress.ID, EvolutionProgressType(DamageTakenEvolutionProgress.CODEC))
-    @JvmStatic
+    @JvmField
     val DEFEAT = this.registerType(DefeatEvolutionProgress.ID, EvolutionProgressType(DefeatEvolutionProgress.CODEC))
-    @JvmStatic
+    @JvmField
     val LAST_BATTLE_CRITICAL_HITS = this.registerType(LastBattleCriticalHitsEvolutionProgress.ID, EvolutionProgressType(LastBattleCriticalHitsEvolutionProgress.CODEC))
-    @JvmStatic
+    @JvmField
     val RECOIL = this.registerType(RecoilEvolutionProgress.ID, EvolutionProgressType(RecoilEvolutionProgress.CODEC))
-    @JvmStatic
+    @JvmField
     val USE_MOVE = this.registerType(UseMoveEvolutionProgress.ID, EvolutionProgressType(UseMoveEvolutionProgress.CODEC))
 
     /**

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

@@ -80,7 +80,9 @@ open class ChoiceSpeciesFeatureProvider(
 
     internal constructor(): this(emptyList())
 
-    override fun get(pokemon: Pokemon) = pokemon.getFeature<StringSpeciesFeature>(keys.first())
+    override fun get(pokemon: Pokemon): StringSpeciesFeature? {
+        return pokemon.features.filterIsInstance<StringSpeciesFeature>().find { it.name in keys }
+    }
 
     override fun invoke(pokemon: Pokemon): StringSpeciesFeature? {
         val existing = get(pokemon)
@@ -101,15 +103,15 @@ open class ChoiceSpeciesFeatureProvider(
     }
 
     override fun invoke(nbt: CompoundTag): StringSpeciesFeature? {
-        return if (nbt.contains(keys.first())) {
-            StringSpeciesFeature(keys.first(), "").also { it.loadFromNBT(nbt) }
-        } else null
+        val key = keys.find { nbt.contains(it) }
+        if (key == null) return null
+        return StringSpeciesFeature(key, "").also { it.loadFromNBT(nbt) }
     }
 
     override fun invoke(json: JsonObject): StringSpeciesFeature? {
-        return if (json.has(keys.first())) {
-            StringSpeciesFeature(keys.first(), "").also { it.loadFromJSON(json) }
-        } else null
+        val key = keys.find { json.has(it) }
+        if (key == null) return null
+        return StringSpeciesFeature(key, "").also { it.loadFromJSON(json) }
     }
 
     override fun fromString(value: String?): StringSpeciesFeature? {
@@ -131,7 +133,7 @@ open class ChoiceSpeciesFeatureProvider(
 
     override fun provide(properties: PokemonProperties): Set<String> {
         return if (isAspect) {
-            val feature = properties.customProperties.filterIsInstance<StringSpeciesFeature>().find { it.name == keys.first() }
+            val feature = properties.customProperties.filterIsInstance<StringSpeciesFeature>().find { it.name in keys }
             if (feature != null) {
                 setOf(getAspect(feature))
             } else {

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

@@ -132,7 +132,9 @@ class FlagSpeciesFeatureProvider : SynchronizedSpeciesFeatureProvider<FlagSpecie
 
     constructor(vararg keys: String) : this(keys.toList())
 
-    override fun get(pokemon: Pokemon) = pokemon.getFeature<FlagSpeciesFeature>(keys.first())
+    override fun get(pokemon: Pokemon): FlagSpeciesFeature? {
+        return pokemon.features.filterIsInstance<FlagSpeciesFeature>().find { it.name in keys }
+    }
 
     override fun invoke(pokemon: Pokemon): FlagSpeciesFeature? {
         return get(pokemon)
@@ -144,15 +146,15 @@ class FlagSpeciesFeatureProvider : SynchronizedSpeciesFeatureProvider<FlagSpecie
     }
 
     override fun invoke(nbt: CompoundTag): FlagSpeciesFeature? {
-        return if (nbt.contains(keys.first())) {
-            FlagSpeciesFeature(keys.first(), false).also { it.loadFromNBT(nbt) }
-        } else null
+        val key = keys.find { nbt.contains(it) }
+        if (key == null) return null
+        return FlagSpeciesFeature(key, false).also { it.loadFromNBT(nbt) }
     }
 
     override fun invoke(json: JsonObject): FlagSpeciesFeature? {
-        return if (json.has(keys.first())) {
-            FlagSpeciesFeature(keys.first(), false).also { it.loadFromJSON(json) }
-        } else null
+        val key = keys.find { json.has(it) }
+        if (key == null) return null
+        return FlagSpeciesFeature(key, false).also { it.loadFromJSON(json) }
     }
 
     override fun fromString(value: String?): FlagSpeciesFeature? {
@@ -170,16 +172,26 @@ class FlagSpeciesFeatureProvider : SynchronizedSpeciesFeatureProvider<FlagSpecie
     }
 
     override fun provide(pokemon: Pokemon): Set<String> {
-        return if (isAspect && pokemon.getFeature<FlagSpeciesFeature>(keys.first())?.enabled == true) {
-            setOf(keys.first())
+        return if (isAspect) {
+            val feature = pokemon.features.filterIsInstance<FlagSpeciesFeature>().find { it.name in keys }
+            if (feature != null && feature.enabled) {
+                setOf(keys.first())
+            } else {
+                emptySet()
+            }
         } else {
             emptySet()
         }
     }
 
     override fun provide(properties: PokemonProperties): Set<String> {
-        return if (isAspect && properties.customProperties.filterIsInstance<FlagSpeciesFeature>().find { it.name == keys.first() }?.enabled == true) {
-            setOf(keys.first())
+        return if (isAspect) {
+            val feature = properties.customProperties.filterIsInstance<FlagSpeciesFeature>().find { it.name in keys }
+            if (feature != null && feature.enabled) {
+                setOf(keys.first())
+            } else {
+                emptySet()
+            }
         } else {
             emptySet()
         }