mk2 bird flight controller

Initial bird controller changes and refactoring of how riding controllers control rotation mouse+rotVel
Add updated version of Helicopter ride controller. Tie in some static pokemonentity functions to be riding configurable. Modify the cameramixins, currently there is a temp change to them on this branch.
2025-02-13 00:05:03 -06:00 · 2025-02-12 20:01:57 -06:00 · 2025-02-12 12:29:35 -06:00 · 2025-02-08 03:02:35 -06:00 · 2025-02-05 19:30:21 -06:00
431 changed files with 4983 additions and 9379 deletions
@@ -1,16 +0,0 @@
-### Additions
-
- Added ability to rename PC Boxes by clicking on the name of a box
- Added ability to set wallpapers per PC Box by clicking the button right to the box name
- Added sorting by Name, Level and type by clicking the button left of the box name (shift reverses order)
- Added filtering/search functionality in PC UI, which also supports pokemon properties (e.g. shiny=yes shows all shinies)
- Added /changewallpaper <player> <boxNumber> <wallpaper> command to change a wallpaper through commands
- Added /renamebox <player> <boxNumber> <name> command to rename a PC box through commands
-
-### Developer
-
- Added RenamePCBoxEvent.Pre/Post events to prevent players from renaming a box or change their input
- Added ChangePCBoxWallpaperEvent.Pre/Post to prevent players from changing to a wallpaper or change their selection
- Added WallpaperCollectionEvent which gets called when clients connect to a server, allowing the server which of the clients found wallpapers it's allowed to move (collected wallpapers can be removed for example to make it "vanish" client-side)
- Wallpapers are loaded from `assets/<namespace>/textures/gui/pc/wallpaper/` and all wallpapers in this folder are available to the client to  choose by default
- Renamed `SetPCBoxPokemonPacket` and the respective handler to `SetPCBoxPacket`
@@ -1,3 +0,0 @@
-### Additions
-
- Added the ability to ride Pokémon by shift-right clicking and selecting the ride option.
@@ -1,10 +0,0 @@
-
-### Additions
- Added support for NPCs to use Pokémon models and vice versa. This will require changes in addons that add fossil types due to naming conflicts between fossils and the Pokémon species.
- Added `/changejointscale` command to change the scale of a joint in a model. Unbelievably funny.
-
-### Developer
- Removed all VaryingModelRepository subclasses into the parent class. 
-
-### Addons
- Added `transformedParts` to the root of poser JSONs so it now exists in both poses and the model overall. 
@@ -1,59 +1,14 @@
 # Changelog
 ## [1.7.0 (Month xth, 2025)](#1-7-0)

-### Additions
- Added an in-game configuration screen, allowing all settings from `main.json` to be edited directly in-game.
- Added `/cobblemonconfig reload` command to reload `main.json` configuration. **Note:** Some settings require a server restart to take effect; use this command cautiously.
- Added `blacklisted_items_to_hold` and `whitelisted_items_to_hold` tags to allow for controlling which items players can give to their Pokémon. If the whitelist is empty, it will consider all item as allowed (unless they are in the blacklist).
- Pokémon now follow the mouse cursor on the Summary screen, with an option to disable this in the settings.
- Pokémon's held items can now be rendered, with a visibility toggle in the Summary screen.
- Added cosmetic item functionality for Pokémon. Certain cosmetic items can be given to applicable Pokémon via the interact menu.
-  - Added the various log blocks as cosmetic items for Timburr and Komala.
- Added `visibility/hidden`, `visibility/hat` and `visibility/face` tags to control where and how certain items are rendered.
-
-### Changes
- Renamed `chargeGainedPerTick` config to `secondsToChargeHealingMachine`.
-
 ### Fixes
 - Fixed Particles sometimes facing the wrong direction (looking at you, Swords Dance)
 - Fixed PCs always opening at box 2 instead of box 1.
- Fixed not being able to do complex item requirements aside from just NBT with evolution conditions, requirements and fossil items.
- Fixed the usage `hiddenability` in `pokegive` or other spawn commands resulting in a forced hidden ability
- Fixed the consumption of friendship berries (or EV berries) not making any noise
- Fixed Instantly breaking and replacing a fossil analyzer with any block entity crashing the game in a complete multi-structure
- Fixed players getting disconnected when sidemods update a Pokémon's teratype
- Fixed fling not using Item Names for minecraft held items that substitute Pokémon items
- Fixed evolutions sometimes preventing players from logging in to servers
- Fixed rendering of shoulder-mounted Pokémon desyncing between clients
- Fixed apricorn chest boats forgetting their inventories when being unloaded
- Fixed moves not updating correctly between form changes resulting in illegal movesets
- Fixed crash sometimes occurring with the "Oritech" mod
- Fixed crashes due to an incorrect Java version handing out an obscure crash.
- Fixed some berries being able to rarely get too many berries and cause a crash.
- Fixed status curing berries not playing the berry eating sound, same for healing berries used mid-battle.
- Fixed owned Pokémon sometimes being un-interactable after the player relogs fast
- Fixed field name in evolution requirements for Spewpa Pokeball.
- Fixed LevelUpCriterion logic to correctly check that the Pokémon is a preEvo.

 ### Developer
 - A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
 - Dialogues are correctly removed from memory when they are stopped.
 - Dialogues with variably-set initial pages now properly start timeout tracking.
- Added `EvGainedEvent.Pre` and `EvGainedEvent.Post`.
- Deprecated `EVs#add(Stat, Int)`, you will not be able to compile against this code please migrate to the `EVs#add(Stat, Int, EvSource)` you most likely want to use `SidemodEvSource` but please check other implementations or make your own.
- Removed the NbtItemPredicate class, all the mod usages now use the vanilla item predicate solution, this causes breaking changes on Fossil, HeldItemRequirement & ItemInteractionEvolution
- Renamed Cobblemon's creative tabs to start with "Cobblemon: " to distinguish Cobblemon's tabs from tabs for other mods.
- Various items now have a rarity value.
-
-### Changes
- When using the `cobblemon` or `generation_9` capture calculators a critical capture with a single shake will always play for successful captures when you've already registered the Pokémon as caught in your Pokédex.
-
-### MoLang & Datapacks
- The following usages for item predicates can now use item conditions like advancements do, you can learn about them in the [Minecraft wiki](https://minecraft.wiki/w/Advancement_definition#minecraft:filled_bucket)
-  - The `requiredContext` for an item interaction evolution
-  - The `itemCondition` for a held item evolution requirement
-  - The `fossils` for a fossil entry
- Added MoLang flows for `poke_ball_capture_calculated`, `evolution_tested`, `evolution_accepted`, `evolution_completed`

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

@@ -2174,4 +2129,4 @@ Thank you so much to all of our community translators that bring the mod to the
 - Added species, ability, and move translations for `ko_ko`, `jp_jp`, `fr_fr`, `es_es`, `it_it`, and `zh_cn`.

 ## [1.0.0 (November 12th, 2022)](#1-0-0)
- Initial release.
+- Initial release.
@@ -1,6 +1,6 @@
 # Cobblemon

-An open-source Pokémon mod for Minecraft Java Edition, written in Kotlin for Fabric and NeoForge.
+An open-source Pokémon mod for Minecraft Java Edition, written in Kotlin for Fabric and Forge.

 ## Getting started

@@ -41,7 +41,7 @@ dependencies {

    // Integrations
    compileOnlyApi(libs.jei.api)
-    modCompileOnly(libs.bundles.common.integrations.compileOnly) {
+    modCompileOnly(libs.bundles.fabric.integrations.compileOnly) {
        isTransitive = false
    }
    // Flywheel has no common dep so just pick one and don't use any platform specific code in common
@@ -8,7 +8,8 @@

 package com.cobblemon.mod.common;

-import net.minecraft.util.Mth;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix3f;
 import org.joml.Vector3f;
@@ -17,17 +18,16 @@ import java.util.function.Function;

 public interface Rollable {

-    // From Minecraft's Camera
-    Vector3f FORWARDS = new Vector3f(0.0F, 0.0F, -1.0F);
-    Vector3f UP = new Vector3f(0.0F, 1.0F, 0.0F);
-    Vector3f LEFT = new Vector3f(-1.0F, 0.0F, 0.0F);
+    Vector3f FORWARDS = new Vector3f(0, 0, 1);
+    Vector3f LEFT = new Vector3f(1, 0, 0);
+    Vector3f UP = new Vector3f(0, 1, 0);

    @Nullable Matrix3f getOrientation();

    Rollable updateOrientation(Function<Matrix3f, Matrix3f> update);

    /**
-     * @return The forward vector (0, 0, -1) after the rotation matrix is applied.
+     * @return The forward vector (0, 0, 1) after the rotation matrix is applied.
     */
    default Vector3f getForwardVector() {
        if (getOrientation() == null) return new Vector3f(FORWARDS);
@@ -35,7 +35,7 @@ public interface Rollable {
    }

    /**
-     * @return The left vector (-1, 0, 0) after the rotation matrix is applied.
+     * @return The left vector (1, 0, 0) after the rotation matrix is applied.
     */
    default Vector3f getLeftVector() {
        if (getOrientation() == null) return new Vector3f(LEFT);
@@ -92,33 +92,44 @@ public interface Rollable {
        return rotateYaw(yaw).rotatePitch(pitch).rotateRoll(roll);
    }

+
    /**
-     * @return The pitch angle in degrees as a float.
-     * Value is between [-180, 180] with 0 being South, 90 being West, 180/-180 being North, and -90 being East
+    * @return The yaw angle in degrees as a float.
+    * Value is between [-90, 90] with 0 being straight forward, 90 being straight down, and -90 being straight up
     */
    default float getYaw() {
-        return (float) Mth.wrapDegrees(-Math.toDegrees(FORWARDS.angleSigned(getForwardVector(), UP)) + 180);
+        return (float) (180F - Math.toDegrees(FORWARDS.angleSigned(getForwardVector(), UP)));
    }

    /**
-     * @return The yaw angle in degrees as a float.
-     * Value is between [-90, 90] with 0 being straight forward, 90 being straight down, and -90 being straight up
+     * Get the pitch angle in degrees as a float.
+     * Value is between [-180, 180] with 0 being South, 90 being West, 180/-180 being North, and -90 being East
     */
    default float getPitch() {
-        return (float) Mth.wrapDegrees(-Math.toDegrees(Math.asin(getForwardVector().y)));
+        return (float) Math.toDegrees(Math.asin(getForwardVector().y));
    }

    /**
-     * @return The roll angle in degrees as a float.
+     * Get the roll angle in degrees as a float.
     * Value is between [-180, 180] with 0 being no roll (normal), 90 being 90 degrees CW, 180/-180 being 180 degrees CW/CCW, and -90 being 90 degrees CCW
     */
    default float getRoll() {
-        //Cobblemon.LOGGER.info("{}", (float) Math.toDegrees(getUpVector().angleSigned(UP, getForwardVector())));
-        return (float) Mth.wrapDegrees(-Math.toDegrees(getUpVector().angleSigned(UP, getForwardVector())));
+        var upVector = getUpVector();
+        var forwardVector = getForwardVector();
+        return (float) Math.toDegrees(upVector.angleSigned(UP, forwardVector));
    }

+    /**
+     * Get the angular velocity in degrees per second as a Vec3
+     */
+    Vec3 angRollVel();
+
+    public void rotationOnMouseXY( double yMouse, double xMouse );
+
    boolean shouldRoll();

+    boolean useMouseInputRoll();
+
    void clearRotation();

 }
@@ -6,21 +6,12 @@
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

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

 import com.cobblemon.mod.common.Rollable;
-import com.cobblemon.mod.common.api.riding.Rideable;
-import com.cobblemon.mod.common.api.riding.Seat;
-import com.cobblemon.mod.common.client.entity.PokemonClientDelegate;
-import com.cobblemon.mod.common.client.render.MatrixWrapper;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
-import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.phys.Vec3;
 import org.joml.Matrix3f;
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
@@ -34,7 +25,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(Camera.class)
 public abstract class CameraMixin {
-    @Shadow @Final private static float DEFAULT_CAMERA_DISTANCE;

    @Shadow private Entity entity;
    @Shadow @Final private Quaternionf rotation;
@@ -45,11 +35,8 @@ public abstract class CameraMixin {
    @Shadow private float yRot;

    @Shadow public abstract float getXRot();
-    @Shadow public abstract float getYRot();

-    @Shadow private Vec3 position;
-    @Shadow private float eyeHeight;
-    @Shadow private float eyeHeightOld;
+    @Shadow public abstract float getYRot();

    @Unique private float returnTimer = 0;
    @Unique private float rollAngleStart = 0;
@@ -92,48 +79,6 @@ public abstract class CameraMixin {
        ci.cancel();
    }

-    //If you want to move this to a delagate you need an AW for position
-    @WrapOperation(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;setPosition(DDD)V"))
-    public void positionCamera(Camera instance, double x, double y, double z, Operation<Void> original){
-        Entity entity = instance.getEntity();
-        Entity vehicle = entity.getVehicle();
-
-        if(vehicle instanceof Rideable){
-            //RidingCameraDelagate.INSTANCE.positionCamera(instance, x, y, z, original);
-            if(!(vehicle instanceof PokemonEntity)){
-                original.call(instance, x, y, z);
-                return;
-            }
-            PokemonEntity pokemon = (PokemonEntity) vehicle;
-
-            int seatIndex = pokemon.getPassengers().indexOf(entity);
-            Seat seat = pokemon.getSeats().get(seatIndex);
-            PokemonClientDelegate delegate = (PokemonClientDelegate) pokemon.getDelegate();
-            MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
-            if(locator == null){
-                original.call(instance, x, y, z);
-                return;
-            }
-
-            Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
-
-            Vec3 entityPos = new Vec3(
-                    Mth.lerp(instance.getPartialTickTime(), pokemon.xOld, pokemon.getX()),
-                    Mth.lerp(instance.getPartialTickTime(), pokemon.yOld, pokemon.getY()),
-                    Mth.lerp(instance.getPartialTickTime(), pokemon.zOld, pokemon.getZ())
-            );
-
-            Rollable rollable = (Rollable) entity;
-            float currEyeHeight = Mth.lerp(instance.getPartialTickTime(), eyeHeightOld, eyeHeight);
-            Matrix3f orientation = rollable.shouldRoll() && rollable.getOrientation() != null ? rollable.getOrientation() : new Matrix3f();
-            Vec3 rotatedEyeHeight = new Vec3(orientation.transform(new Vector3f(0f, currEyeHeight, 0f)));
-
-            position = locatorOffset.add(entityPos).add(rotatedEyeHeight);
-        } else {
-            original.call(instance, x, y, z);
-        }
-    }
-
    @Unique
    private void applyRotation(){
        if (!(this.entity instanceof Rollable rollable) || rollable.getOrientation() == null) return;
@@ -6,7 +6,7 @@
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

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

 import com.cobblemon.mod.common.api.scheduling.ClientTaskTracker;
 import net.minecraft.client.DeltaTracker;
@@ -6,7 +6,7 @@
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

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

 import com.cobblemon.mod.common.client.render.player.MountedPlayerRenderer;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
@@ -6,11 +6,12 @@
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

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

 import com.cobblemon.mod.common.Rollable;
 import com.cobblemon.mod.common.item.PokedexItem;
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Axis;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.renderer.ItemInHandRenderer;
@@ -6,7 +6,7 @@
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

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

 import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.ModAPI;
@@ -40,8 +40,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 */
@Mixin(ItemRenderer.class)
 public abstract class ItemRendererMixin {
-    // ignore the hint saying implmentation is never null, if something crashes then it is null and causes red herrings
-    @Unique private final String MODEL_PATH = (Cobblemon.implementation != null && Cobblemon.implementation.getModAPI() == ModAPI.FABRIC) ? "fabric_resource" : "standalone";
+    @Unique private final String MODEL_PATH = Cobblemon.implementation.getModAPI() == ModAPI.FABRIC ? "fabric_resource" : "standalone";

    @Shadow @Final private ItemModelShaper itemModelShaper;

@@ -12,9 +12,15 @@ import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffectRegistry;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+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.ModifyArg;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(LivingEntity.class)
@@ -28,4 +34,70 @@ public abstract class LivingEntityMixin {
        }
    }

+    /*
+    @Inject(method = "travelRidden", at = @At(value = "HEAD"))
+    private void cobblemon$altTravelRidden(Player player, Vec3 travelVector)
+    {
+        this.setSpeed(this.getRiddenSpeed(player));
+        this.travel(vec3);
+    }
+
+    /*
+    // Shadow the original method so we can call it.
+    @Shadow
+    protected abstract boolean isControlledByLocalInstance();
+
+    /**
+     * Redirect the call to isControlledByLocalInstance() within travelRidden.
+     * When travelRidden calls isControlledByLocalInstance(), it will get our modified result.
+     */
+
+    /*
+    @Redirect(
+            method = "travelRidden(Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/phys/Vec3;)V",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/world/entity/LivingEntity;isControlledByLocalInstance()Z"
+            )
+    )
+    private boolean redirectIsControlledByLocalInstance(LivingEntity instance) {
+        // Return true if either the original method returns true or our custom condition is true.
+        return this.isControlledByLocalInstance() || this.b;
+    }
+
+
+
+    @Overwrite
+    private void travelRidden(Player player, Vec3 travelVector) {
+        Vec3 vec3 = this.getRiddenInput(player, travelVector);
+        this.tickRidden(player, vec3);
+        if (this.isControlledByLocalInstance()) {
+            this.setSpeed(this.getRiddenSpeed(player));
+            this.travel(vec3);
+        } else {
+            this.calculateEntityAnimation(false);
+            this.setDeltaMovement(Vec3.ZERO);
+            this.tryCheckInsideBlocks();
+        }
+    }
+
+
+    @ModifyArg(
+            method = "travelRidden",
+            at = @At(
+                    value = "INVOKE",
+                    target = "setDeltaMovement(Lnet/minecraft/world/phys/Vec3;)V"
+            ),
+            index = 0 // the first (and only) argument
+    )
+    private Vec3 modifyDeltaMovementArgument(Vec3 original) {
+        // Optionally, check if original is Vec3.ZERO, to only replace that call:
+        if (original.equals(Vec3.ZERO)) {
+            // Return your custom vector instead of Vec3.ZERO
+            return original;
+        }
+        // Otherwise, return the original value
+        return original;
+    }
+     */
 }
@@ -6,7 +6,7 @@
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

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

 import com.cobblemon.mod.common.client.CobblemonBakingOverrides;
 import java.util.List;
@@ -6,7 +6,7 @@
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

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

 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone;
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext;
@@ -6,7 +6,7 @@
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

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

 import com.cobblemon.mod.common.Rollable;
 import com.cobblemon.mod.common.client.CobblemonClient;
@@ -33,8 +33,11 @@ public class MouseHandlerMixin {
    @Shadow private double accumulatedScrollY;
    @Shadow @Final private Minecraft minecraft;

+    @Unique SmoothDouble xMouseSmoother = new SmoothDouble();
+    @Unique SmoothDouble yMouseSmoother = new SmoothDouble();
    @Unique SmoothDouble pitchSmoother = new SmoothDouble();
    @Unique SmoothDouble rollSmoother = new SmoothDouble();
+    @Unique SmoothDouble yawSmoother = new SmoothDouble();

    @Shadow @Final private SmoothDouble smoothTurnY;

@@ -109,16 +112,48 @@ public class MouseHandlerMixin {
        }

        if (!(player instanceof Rollable rollable)) return true;
+
        if (!rollable.shouldRoll()) {
+            xMouseSmoother.reset();
+            yMouseSmoother.reset();
            pitchSmoother.reset();
            rollSmoother.reset();
+            yawSmoother.reset();
            return true;
        }

-        var pitch = pitchSmoother.getNewDeltaValue(cursorDeltaY * 0.15f, d);
-        var roll = rollSmoother.getNewDeltaValue(cursorDeltaX * 0.15f, d);
-        rollable.rotate(0.0F, (float)pitch, (float)roll);
+        //maybe have a rollable x mouse and rollable y mouse that take the xmousesmoother
+        //and y mouse smoother ( which are right now named pichsmoother and roll smoother)
+        // values and feed it to those rollable functions which will be called by the
+        //specific ride controller where rollable.rotate can then be called and used
+        //controller specific.
+        var yMouse = yMouseSmoother.getNewDeltaValue(cursorDeltaY * 0.15f, d);
+        var xMouse = xMouseSmoother.getNewDeltaValue(cursorDeltaX * 0.15f, d);
+        rollable.rotationOnMouseXY( yMouse, xMouse );
+
+        //get the current angular velocity requested to be applied
+        //by the ride controller
+        var angRot = rollable.angRollVel();
+        //Multiply against deltatime to get a consistent turn
+        //independent of framerate
+        if( angRot != null ) {
+            //var yaw = angRot.x * d;
+            //Add the yaw to the mouse here... this all needs changed. It should
+            //just map which 0 1 or 2 of the three it is going to modulate with
+            //what
+
+            var yaw = yawSmoother.getNewDeltaValue(angRot.x * 0.5f, d);
+            //yaw += yawSmoother.getNewDeltaValue(cursorDeltaX * 0.15f, d);
+            //var pitch = angRot.y * d;
+            var pitch = pitchSmoother.getNewDeltaValue(angRot.y * 0.5f, d);
+            //pitch += pitchSmoother.getNewDeltaValue(cursorDeltaY * 0.15f, d);
+            //var roll = angRot.z * d;
+            var roll = rollSmoother.getNewDeltaValue(angRot.z * 0.5f, d);
+            rollable.rotate((float) yaw, (float) pitch, (float) roll);
+        }
        return false;
+
+
    }

    @Inject(method = "handleAccumulatedMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MouseHandler;isMouseGrabbed()Z", ordinal = 0))
@@ -47,6 +47,7 @@ import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix3f;
 import org.objectweb.asm.Opcodes;
@@ -55,6 +56,7 @@ 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.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

@@ -178,7 +180,8 @@ public abstract class PlayerMixin extends LivingEntity implements Rollable, Scan

    @Inject(method = "isInvulnerableTo", at = @At("HEAD"), cancellable = true)
    public void isInvulnerableTo(DamageSource source, CallbackInfoReturnable<Boolean> ci) {
-        if (!level().isClientSide && (Object) this instanceof ServerPlayer player) {
+        if (!level().isClientSide) {
+            ServerPlayer player = (ServerPlayer)(Object)this;
            boolean invulnerableInBattle = this.level().getGameRules().getBoolean(CobblemonGameRules.BATTLE_INVULNERABILITY);
            boolean inBattle = Cobblemon.INSTANCE.getBattleRegistry().getBattleByParticipatingPlayer(player) != null;
            if (invulnerableInBattle && inBattle) {
@@ -271,6 +274,7 @@ public abstract class PlayerMixin extends LivingEntity implements Rollable, Scan

    @Override
    public Rollable updateOrientation(Function<Matrix3f, Matrix3f> update) {
+        //Disabled to allow non mouse inputs to modify roll
        if (!shouldRoll()) return this;

        if (this.orientation == null) {
@@ -280,6 +284,8 @@ public abstract class PlayerMixin extends LivingEntity implements Rollable, Scan
        this.orientation = update.apply(this.orientation);
        setYRot(this.getYaw());
        setXRot(this.getPitch());
+        this.yRotO = this.getYRot();
+        this.xRotO = this.getXRot();
        return this;
    }

@@ -296,6 +302,45 @@ public abstract class PlayerMixin extends LivingEntity implements Rollable, Scan
        return pokemonEntity.getRiding().shouldRoll(pokemonEntity);
    }

+    @Override
+    public void rotationOnMouseXY( double yMouse, double xMouse ) {
+        LocalPlayer player = Minecraft.getInstance().player;
+        if (!this.equals(player)) return;
+
+        var playerVehicle = player.getVehicle();
+        if (playerVehicle == null) return;
+        if (!(playerVehicle instanceof PokemonEntity pokemonEntity)) return;
+
+        pokemonEntity.getRiding().rotationOnMouseXY(pokemonEntity, player, yMouse, xMouse);
+    }
+
+    @Override
+    public boolean useMouseInputRoll() {
+        LocalPlayer player = Minecraft.getInstance().player;
+        if (!this.equals(player)) return true;
+        if (player.isHolding(Items.DIAMOND)) return false;
+
+        var playerVehicle = player.getVehicle();
+        if (playerVehicle == null) return true;
+        if (!(playerVehicle instanceof PokemonEntity pokemonEntity)) return true;
+
+        return pokemonEntity.getRiding().useMouseInputRoll(pokemonEntity);
+    }
+
+    @Override
+    public Vec3 angRollVel() {
+        var ret = new Vec3(0.0, 0.0, 0.0);
+        LocalPlayer player = Minecraft.getInstance().player;
+        if (!this.equals(player)) return ret;
+
+        var playerVehicle = player.getVehicle();
+        if (playerVehicle == null) return ret;
+        if (!(playerVehicle instanceof PokemonEntity pokemonEntity)) return ret;
+
+        return pokemonEntity.getRiding().angRollVel(pokemonEntity, player);
+    }
+
+
    @Override
    public void clearRotation() {
        this.orientation = null;
@@ -0,0 +1,55 @@
+/*
+ * 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.Rollable;
+import com.cobblemon.mod.common.client.render.ClientPlayerIcon;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.player.AbstractClientPlayer;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.entity.player.PlayerRenderer;
+import org.joml.Matrix4f;
+import org.joml.Vector3f;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(PlayerRenderer.class)
+public class PlayerRendererMixin {
+    private static boolean disableRollableRenderDebug = false;
+
+    @Inject(method = "render", at = @At(value = "HEAD"))
+    public void renderPlayer$head(AbstractClientPlayer player, float f, float g, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, CallbackInfo ci) {
+        if(player instanceof Rollable && !disableRollableRenderDebug) {
+            Rollable rollable = (Rollable) player;
+            if(rollable.shouldRoll()){
+                poseStack.pushPose();
+                Matrix4f transformationMatrix = new Matrix4f();
+                Vector3f center = new Vector3f(0, player.getBbHeight()/2, 0);
+                transformationMatrix.translate(center);
+
+                //transformationMatrix.rotate(180f.toRadians() - (rollable.getYaw()).toRadians(), rollable.getUpVector(), transformationMatrix);
+                transformationMatrix.rotate((float) Math.toRadians(-rollable.getPitch()), rollable.getLeftVector(), transformationMatrix);
+                transformationMatrix.rotate((float) Math.toRadians(-rollable.getRoll()), rollable.getForwardVector(), transformationMatrix);
+
+                transformationMatrix.translate(center.negate(new Vector3f()));
+                poseStack.mulPose(transformationMatrix);
+            }
+        }
+    }
+
+        @Inject(method = "render", at = @At(value = "TAIL"))
+    public void renderPlayer$tail(AbstractClientPlayer player, float f, float g, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, CallbackInfo ci) {
+        ClientPlayerIcon.Companion.onRenderPlayer(player);
+        if(player instanceof Rollable && !disableRollableRenderDebug && ((Rollable) player).shouldRoll()){
+            poseStack.popPose();
+        }
+    }
+}
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.client;
-import com.cobblemon.mod.common.api.riding.Rideable;
-import com.cobblemon.mod.common.api.riding.RidingManager;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import net.minecraft.client.model.PlayerModel;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(PlayerModel.class)
-public class PlayerModelMixin {
-    @Inject(method = "setupAnim(Lnet/minecraft/world/entity/LivingEntity;FFFFF)V", at = @At(value = "HEAD"))
-    private void cobblemon$setHeadRotation(LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, CallbackInfo ci){
-        if (!(entity instanceof Player)) return;
-        Entity vehicle = entity.getVehicle();
-
-        if (!(vehicle instanceof PokemonEntity)) return;
-        RidingManager ridingManager = ((Rideable) vehicle).getRiding();
-        if (ridingManager.shouldRotatePlayerHead((PokemonEntity) vehicle)) return;
-
-        netHeadYaw = 0f;
-        headPitch = 0f;
-    }
-}
@@ -0,0 +1,30 @@
+/*
+ * 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.renderer;
+
+import net.minecraft.client.renderer.entity.LivingEntityRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+
+/**
+ * @author landonjw
+ */
+@Mixin(LivingEntityRenderer.class)
+public abstract class LivingEntityRendererMixin {
+//    @Redirect(
+//            method = "render(Lnet/minecraft/entity/LivingEntity;FFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V",
+//            at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;hasVehicle()Z"),
+//            slice = @Slice(
+//                    from = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/MathHelper;lerpAngleDegrees(FFF)F"),
+//                    to = @At(value = "TAIL")
+//            )
+//    )
+//    private boolean dodgeRenderer(LivingEntity instance) {
+//        return false;
+//    }
+}
@@ -6,39 +6,34 @@
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

-package com.cobblemon.mod.common.mixin.client;
+package com.cobblemon.mod.common.mixin.renderer;
+

-import com.cobblemon.mod.common.client.render.ClientPlayerIcon;
 import com.cobblemon.mod.common.client.render.player.MountedPlayerRenderer;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.player.PlayerRenderer;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

+/**
+ * @author landonjw
+ */
@Mixin(PlayerRenderer.class)
-public class PlayerRendererMixin {
-    @Inject(method = "render(Lnet/minecraft/world/entity/LivingEntity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V", at = @At(value = "TAIL"))
-    public void cobblemon$clientPlayerIcon(LivingEntity entity, float entityYaw, float partialTicks, PoseStack poseStack, MultiBufferSource buffer, int packedLight, CallbackInfo ci) {
-        ClientPlayerIcon.Companion.onRenderPlayer((Player) entity);
-    }
-
+public class PlayerEntityRendererMixin {
    @Inject(
            method = "setupRotations(Lnet/minecraft/client/player/AbstractClientPlayer;Lcom/mojang/blaze3d/vertex/PoseStack;FFFF)V",
            at = @At("HEAD")
    )
-    private void cobblemon$modifyRoll(AbstractClientPlayer player, PoseStack poseStack, float a, float b, float partialTicks, float i, CallbackInfo ci) {
+    private void doABibarelRoll$modifyRoll(AbstractClientPlayer player, PoseStack poseStack, float a, float b, float partialTicks, float i, CallbackInfo ci) {
        if (player.isPassenger()) {
            var vehicle = player.getVehicle();
            if (vehicle instanceof PokemonEntity entity) {
-                MountedPlayerRenderer.INSTANCE.render(player, entity, poseStack, a, b, partialTicks, i);
+                MountedPlayerRenderer.INSTANCE.render(player, entity, poseStack);
            }
        }
    }
-}
+}
@@ -12,6 +12,14 @@ object CobblemonBuildDetails {
    const val BRANCH = "{{ branch | default("Not Specified") }}"

    fun smallCommitHash(): String {
+        if(this.GIT_COMMIT.equals("Not Specified")) {
+            return "Unknown"
+        }
+
        return this.GIT_COMMIT.substring(0, 7)
    }
+
+    fun version(): String {
+        return this.VERSION + if(this.SNAPSHOT) "+${this.smallCommitHash()}" else ""
+    }
 }
@@ -62,7 +62,11 @@ import com.cobblemon.mod.common.api.storage.player.adapter.PlayerDataMongoBacken
 import com.cobblemon.mod.common.api.storage.player.factory.CachedPlayerDataStoreFactory
 import com.cobblemon.mod.common.api.tags.CobblemonEntityTypeTags
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
-import com.cobblemon.mod.common.battles.*
+import com.cobblemon.mod.common.battles.BagItems
+import com.cobblemon.mod.common.battles.BattleFormat
+import com.cobblemon.mod.common.battles.BattleRegistry
+import com.cobblemon.mod.common.battles.BattleSide
+import com.cobblemon.mod.common.battles.ShowdownThread
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.client.CobblemonPack
@@ -80,17 +84,27 @@ import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacke
 import com.cobblemon.mod.common.permission.LaxPermissionValidator
 import com.cobblemon.mod.common.platform.events.PlatformEvents
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.aspects.COSMETIC_SLOT_ASPECT
 import com.cobblemon.mod.common.pokemon.aspects.GENDER_ASPECT
 import com.cobblemon.mod.common.pokemon.aspects.SHINY_ASPECT
 import com.cobblemon.mod.common.pokemon.evolution.variants.BlockClickEvolution
 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.AspectPropertyType
+import com.cobblemon.mod.common.pokemon.properties.BattleCloneProperty
+import com.cobblemon.mod.common.pokemon.properties.FreezeFrameProperty
+import com.cobblemon.mod.common.pokemon.properties.HiddenAbilityPropertyType
+import com.cobblemon.mod.common.pokemon.properties.NoAIProperty
+import com.cobblemon.mod.common.pokemon.properties.UnaspectPropertyType
+import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
 import com.cobblemon.mod.common.pokemon.properties.tags.PokemonFlagProperty
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
-import com.cobblemon.mod.common.util.*
+import com.cobblemon.mod.common.util.DataKeys
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.ifDedicatedServer
+import com.cobblemon.mod.common.util.isLaterVersion
+import com.cobblemon.mod.common.util.party
+import com.cobblemon.mod.common.util.server
 import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
 import com.cobblemon.mod.common.world.feature.ore.CobblemonOrePlacedFeatures
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
@@ -98,27 +112,25 @@ import com.mongodb.ConnectionString
 import com.mongodb.MongoClientSettings
 import com.mongodb.client.MongoClient
 import com.mongodb.client.MongoClients
+import java.io.File
+import java.io.FileReader
+import java.io.FileWriter
+import java.io.PrintWriter
+import java.util.UUID
+import kotlin.math.roundToInt
+import kotlin.properties.Delegates
+import kotlin.reflect.full.memberProperties
+import kotlin.reflect.jvm.isAccessible
+import kotlin.reflect.jvm.javaField
 import net.minecraft.client.Minecraft
 import net.minecraft.commands.synchronization.SingletonArgumentInfo
 import net.minecraft.resources.ResourceKey
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.world.item.NameTagItem
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.storage.LevelResource
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
-import java.io.File
-import java.io.FileReader
-import java.io.FileWriter
-import java.io.PrintWriter
-import java.util.*
-import kotlin.math.roundToInt
-import kotlin.properties.Delegates
-import kotlin.reflect.full.memberProperties
-import kotlin.reflect.jvm.isAccessible
-import kotlin.reflect.jvm.javaField

 object Cobblemon {
    const val MODID = CobblemonBuildDetails.MOD_ID
@@ -152,7 +164,6 @@ object Cobblemon {
    var permissionValidator: PermissionValidator by Delegates.observable(LaxPermissionValidator().also { it.initialize() }) { _, _, newValue -> newValue.initialize() }
    var statProvider: StatProvider = CobblemonStatProvider
    var seasonResolver: SeasonResolver = TagSeasonResolver
-    var wallpapers = mapOf<UUID, List<ResourceLocation>>()

    @JvmStatic
    val builtinPacks = listOf<CobblemonPack>(
@@ -209,8 +220,7 @@ object Cobblemon {
            storage.onPlayerDataSync(it)
            playerDataManager.syncAllToPlayer(it)
            starterHandler.handleJoin(it)
-            it.requestWallpapers()
-            sendServerSettingsPacketToPlayer(it)
+            ServerSettingsPacket(this.config.preventCompletePartyDeposit, this.config.displayEntityLevelLabel, this.config.displayEntityNameLabel, this.config.maxPokemonLevel, this.config.maxPokemonFriendship, this.config.maxDynamaxLevel).sendToPlayer(it)
        }
        PlatformEvents.SERVER_PLAYER_LOGOUT.subscribe {
            PCLinkManager.removeLink(it.player.uuid)
@@ -258,17 +268,8 @@ object Cobblemon {
        }

        HeldItemProvider.register(CobblemonHeldItemManager, Priority.LOWEST)
-    }

-    fun sendServerSettingsPacketToPlayer(player: ServerPlayer) {
-        ServerSettingsPacket(
-            this.config.preventCompletePartyDeposit,
-            this.config.displayEntityLevelLabel,
-            this.config.displayEntityNameLabel,
-            this.config.maxPokemonLevel,
-            this.config.maxPokemonFriendship,
-            this.config.maxDynamaxLevel,
-        ).sendToPlayer(player)
+
    }

    fun initialize() {
@@ -279,7 +280,6 @@ object Cobblemon {

        SHINY_ASPECT.register()
        GENDER_ASPECT.register()
-        COSMETIC_SLOT_ASPECT.register()

        SpeciesFeatures.types["choice"] = ChoiceSpeciesFeatureProvider::class.java
        SpeciesFeatures.types["flag"] = FlagSpeciesFeatureProvider::class.java
@@ -429,23 +429,7 @@ object Cobblemon {
        }
    }

-    private fun initializeConfig() {
-        loadCobblemonConfig()
-        saveConfig(this.config)
-        PokemonSpecies.observable.subscribe { starterConfig = this.loadStarterConfig() }
-    }
-
    fun loadConfig() {
-        initializeConfig()
-        bestSpawner.init()
-    }
-
-    fun reloadConfig() {
-        initializeConfig()
-        bestSpawner.reloadConfig()
-    }
-
-    private fun loadCobblemonConfig() {
        val configFile = File(CONFIG_PATH)
        configFile.parentFile.mkdirs()

@@ -488,6 +472,12 @@ object Cobblemon {
        } else {
            this.config = CobblemonConfig()
        }
+
+        config.lastSavedVersion = VERSION
+        this.saveConfig()
+
+        bestSpawner.loadConfig()
+        PokemonSpecies.observable.subscribe { starterConfig = this.loadStarterConfig() }
    }

    fun loadStarterConfig(): StarterConfig {
@@ -510,14 +500,12 @@ object Cobblemon {
        }
    }

-    fun saveConfig(config: CobblemonConfig) {
-        config.lastSavedVersion = VERSION
-
+    fun saveConfig() {
        try {
            val configFile = File(CONFIG_PATH)
            val fileWriter = FileWriter(configFile)
            // Put the config to json then flush the writer to commence writing.
-            CobblemonConfig.GSON.toJson(config, fileWriter)
+            CobblemonConfig.GSON.toJson(this.config, fileWriter)
            fileWriter.flush()
            fileWriter.close()
        } catch (exception: Exception) {
@@ -539,4 +527,4 @@ object Cobblemon {
        this.implementation.registerCommandArgument(cobblemonResource("npc_class"), NPCClassArgumentType::class, SingletonArgumentInfo.contextFree(NPCClassArgumentType::npcClass))
    }

-}
+}
@@ -23,7 +23,6 @@ object CobblemonCommands {
        ChangeEyeHeight.register(dispatcher)
        ChangeScaleAndSize.register(dispatcher)
        ChangeWalkSpeed.register(dispatcher)
-        ChangeJointScaleCommand.register(dispatcher)
        TestCommand.register(dispatcher)
        ReloadShowdownCommand.register(dispatcher)
        ClickTextCommand.register(dispatcher)
@@ -57,10 +56,7 @@ object CobblemonCommands {
        AbandonMultiTeam.register(dispatcher)
        FreezePokemonCommand.register(dispatcher)
        ApplyPlayerTextureCommand.register(dispatcher)
-        RenameBoxCommand.register(dispatcher)
-        ChangeBoxWallpaperCommand.register(dispatcher)
        RunMolangScriptCommand.register(dispatcher)
-        CobblemonConfigCommand.register(dispatcher)

        // Possibly lock down registration if and only if under dev environment or running in an environment
        // with a certain system environment variable set
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common
-
-import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.data.CosmeticItemAssignmentSyncPacket
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.cosmetic.CosmeticItemAssignment
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.cobblemon.mod.common.util.adapters.ItemLikeConditionAdapter
-import com.cobblemon.mod.common.util.adapters.PokemonPropertiesAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import net.minecraft.core.RegistryAccess
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-import net.minecraft.world.item.Item
-import net.minecraft.world.item.ItemStack
-
-object CobblemonCosmeticItems : JsonDataRegistry<CosmeticItemAssignment> {
-    override val id = cobblemonResource("cosmetic_items")
-    override val type = PackType.SERVER_DATA
-    override val observable = SimpleObservable<CobblemonCosmeticItems>()
-    override val typeToken = TypeToken.get(CosmeticItemAssignment::class.java)
-    override val resourcePath = "cosmetic_items"
-
-    override val gson = GsonBuilder()
-        .setPrettyPrinting()
-        .registerTypeAdapter(PokemonProperties::class.java, PokemonPropertiesAdapter(saveLong = false))
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
-        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-        .create()
-
-    val cosmeticItems = mutableListOf<CosmeticItemAssignment>()
-
-    override fun reload(data: Map<ResourceLocation, CosmeticItemAssignment>) {
-        cosmeticItems.clear()
-        data.entries.forEach { (id, value) -> value.id = id }
-        cosmeticItems.addAll(data.values)
-    }
-
-    override fun sync(player: ServerPlayer) {
-        CosmeticItemAssignmentSyncPacket(cosmeticItems).sendToPlayer(player)
-    }
-
-    fun findValidForPokemon(pokemon: Pokemon) = cosmeticItems.filter { it.pokemon.any { it.matches(pokemon) } }
-    fun findValidCosmeticForPokemonAndItem(registryAccess: RegistryAccess, pokemon: Pokemon, itemStack: ItemStack) = cosmeticItems
-        .filter { it.pokemon.any { it.matches(pokemon) } }
-        .flatMap { it.cosmeticItems }
-        .firstOrNull { it.consumedItem.fits(itemStack.item, registryAccess.registryOrThrow(Registries.ITEM)) }
-}
@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common

 import com.bedrockk.molang.runtime.MoLangRuntime
-import com.bedrockk.molang.runtime.MoParams
 import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
 import com.cobblemon.mod.common.api.data.DataRegistry
@@ -87,20 +86,13 @@ object CobblemonFlows : DataRegistry {
        observable.emit(this)
    }

-    fun run(
-        eventResourceLocation: ResourceLocation,
-        context: Map<String, MoValue>,
-        functions: Map<String, (MoParams) -> Any> = emptyMap(),
-        cancelable: Cancelable? = null
-    ) {
+    fun run(eventResourceLocation: ResourceLocation, context: Map<String, MoValue>, cancelable: Cancelable? = null) {
        if (cancelable == null) {
            runtime.environment.query.functions.remove("cancel")
        } else {
            runtime.environment.query.addFunction("cancel") { cancelable }
        }

-        functions.forEach { (name, function) -> runtime.environment.query.addFunction(name, function) }
-
        flows[eventResourceLocation]?.forEach {
            if (cancelable != null && cancelable.isCanceled) {
                return
@@ -35,6 +35,7 @@ import com.cobblemon.mod.common.pokeball.PokeBall
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.core.Registry
+import net.minecraft.core.component.DataComponents
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
 import net.minecraft.network.chat.Component
@@ -268,7 +269,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val MONITOR = blockItem("monitor", CobblemonBlocks.MONITOR)
    @JvmField
-    val HEALING_MACHINE = blockItem("healing_machine", CobblemonBlocks.HEALING_MACHINE, Rarity.UNCOMMON)
+    val HEALING_MACHINE = blockItem("healing_machine", CobblemonBlocks.HEALING_MACHINE)
    @JvmField
    val PC = blockItem("pc", CobblemonBlocks.PC)
    @JvmField
@@ -397,7 +398,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It

    // Medicine
    @JvmField
-    val RARE_CANDY = candyItem("rare_candy", Rarity.RARE) { _, pokemon -> pokemon.getExperienceToNextLevel() }
+    val RARE_CANDY = candyItem("rare_candy") { _, pokemon -> pokemon.getExperienceToNextLevel() }
    @JvmField
    val EXPERIENCE_CANDY_XS = candyItem("exp_candy_xs") { _, _ -> CandyItem.DEFAULT_XS_CANDY_YIELD }
    @JvmField
@@ -882,48 +883,48 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It

    // Archaeology
    @JvmField
-    val ARMOR_FOSSIL = itemWithRarity("armor_fossil", Rarity.UNCOMMON)
+    val ARMOR_FOSSIL = noSettingsItem("armor_fossil")
    @JvmField
-    val FOSSILIZED_BIRD = itemWithRarity("fossilized_bird", Rarity.UNCOMMON)
+    val FOSSILIZED_BIRD = noSettingsItem("fossilized_bird")
    @JvmField
-    val CLAW_FOSSIL = itemWithRarity("claw_fossil", Rarity.UNCOMMON)
+    val CLAW_FOSSIL = noSettingsItem("claw_fossil")
    @JvmField
-    val COVER_FOSSIL = itemWithRarity("cover_fossil", Rarity.UNCOMMON)
+    val COVER_FOSSIL = noSettingsItem("cover_fossil")
    @JvmField
-    val FOSSILIZED_DINO = itemWithRarity("fossilized_dino", Rarity.UNCOMMON)
+    val FOSSILIZED_DINO = noSettingsItem("fossilized_dino")
    @JvmField
-    val DOME_FOSSIL = itemWithRarity("dome_fossil", Rarity.UNCOMMON)
+    val DOME_FOSSIL = noSettingsItem("dome_fossil")
    @JvmField
-    val FOSSILIZED_DRAKE = itemWithRarity("fossilized_drake", Rarity.UNCOMMON)
+    val FOSSILIZED_DRAKE = noSettingsItem("fossilized_drake")
    @JvmField
-    val FOSSILIZED_FISH = itemWithRarity("fossilized_fish", Rarity.UNCOMMON)
+    val FOSSILIZED_FISH = noSettingsItem("fossilized_fish")
    @JvmField
-    val HELIX_FOSSIL = itemWithRarity("helix_fossil", Rarity.UNCOMMON)
+    val HELIX_FOSSIL = noSettingsItem("helix_fossil")
    @JvmField
-    val JAW_FOSSIL = itemWithRarity("jaw_fossil", Rarity.UNCOMMON)
+    val JAW_FOSSIL = noSettingsItem("jaw_fossil")
    @JvmField
-    val OLD_AMBER_FOSSIL = itemWithRarity("old_amber_fossil", Rarity.UNCOMMON)
+    val OLD_AMBER_FOSSIL = noSettingsItem("old_amber_fossil")
    @JvmField
-    val PLUME_FOSSIL = itemWithRarity("plume_fossil", Rarity.UNCOMMON)
+    val PLUME_FOSSIL = noSettingsItem("plume_fossil")
    @JvmField
-    val ROOT_FOSSIL = itemWithRarity("root_fossil", Rarity.UNCOMMON)
+    val ROOT_FOSSIL = noSettingsItem("root_fossil")
    @JvmField
-    val SAIL_FOSSIL = itemWithRarity("sail_fossil", Rarity.UNCOMMON)
+    val SAIL_FOSSIL = noSettingsItem("sail_fossil")
    @JvmField
-    val SKULL_FOSSIL = itemWithRarity("skull_fossil", Rarity.UNCOMMON)
+    val SKULL_FOSSIL = noSettingsItem("skull_fossil")

    @JvmField
-    val BYGONE_SHERD = itemWithRarity("bygone_sherd", Rarity.UNCOMMON)
+    val BYGONE_SHERD = noSettingsItem("bygone_sherd")
    @JvmField
-    val CAPTURE_SHERD = itemWithRarity("capture_sherd",Rarity.UNCOMMON)
+    val CAPTURE_SHERD = noSettingsItem("capture_sherd")
    @JvmField
-    val DOME_SHERD = itemWithRarity("dome_sherd", Rarity.UNCOMMON)
+    val DOME_SHERD = noSettingsItem("dome_sherd")
    @JvmField
-    val HELIX_SHERD = itemWithRarity("helix_sherd", Rarity.UNCOMMON)
+    val HELIX_SHERD = noSettingsItem("helix_sherd")
    @JvmField
-    val NOSTALGIC_SHERD = itemWithRarity("nostalgic_sherd",Rarity.UNCOMMON)
+    val NOSTALGIC_SHERD = noSettingsItem("nostalgic_sherd")
    @JvmField
-    val SUSPICIOUS_SHERD = itemWithRarity("suspicious_sherd", Rarity.UNCOMMON)
+    val SUSPICIOUS_SHERD = noSettingsItem("suspicious_sherd")

    @JvmField
    val TUMBLESTONE = this.create("tumblestone", TumblestoneItem(Item.Properties(), CobblemonBlocks.SMALL_BUDDING_TUMBLESTONE))
@@ -1143,11 +1144,11 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val DREAM_ROD = pokerodItem(cobblemonResource("dream_rod"))
    @JvmField
-    val BEAST_ROD = pokerodItem(cobblemonResource("beast_rod"), Rarity.RARE)
+    val BEAST_ROD = pokerodItem(cobblemonResource("beast_rod"))
    @JvmField
-    val MASTER_ROD = pokerodItem(cobblemonResource("master_rod"), Rarity.EPIC)
+    val MASTER_ROD = pokerodItem(cobblemonResource("master_rod"))
    @JvmField
-    val CHERISH_ROD = pokerodItem(cobblemonResource("cherish_rod"), Rarity.EPIC)
+    val CHERISH_ROD = pokerodItem(cobblemonResource("cherish_rod"))
    @JvmField
    val ANCIENT_POKE_ROD = pokerodItem(cobblemonResource("ancient_poke_rod"))
    @JvmField
@@ -1179,7 +1180,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    @JvmField
    val ANCIENT_GIGATON_ROD = pokerodItem(cobblemonResource("ancient_gigaton_rod"))
    @JvmField
-    val ANCIENT_ORIGIN_ROD = pokerodItem(cobblemonResource("ancient_origin_rod"), Rarity.EPIC)
+    val ANCIENT_ORIGIN_ROD = pokerodItem(cobblemonResource("ancient_origin_rod"))

    // Misc
    @JvmField
@@ -1231,12 +1232,10 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
    //@JvmField
    //val BINDING_SOIL = blockItem("binding_soil", CobblemonBlocks.BINDING_SOIL)

-    private fun blockItem(name: String, block: Block, rarity: Rarity = Rarity.COMMON): BlockItem = this.create(name, BlockItem(block, Item.Properties().rarity(rarity)))
+    private fun blockItem(name: String, block: Block): BlockItem = this.create(name, BlockItem(block, Item.Properties()))

    private fun noSettingsItem(name: String): CobblemonItem = this.create(name, CobblemonItem(Item.Properties()))

-    private fun itemWithRarity(name: String, rarity: Rarity): CobblemonItem = this.create(name, CobblemonItem(Item.Properties().rarity(rarity)))
-    
    fun berries() = this.berries.toMap()

    private fun mulchItem(name: String, mulchVariant: MulchVariant): MulchItem = this.create(name, MulchItem(mulchVariant))
@@ -1248,10 +1247,10 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
        return item
    }

-    private fun candyItem(name: String, rarity: Rarity = Rarity.COMMON, calculator: CandyItem.Calculator): CandyItem  = this.create(name, CandyItem(rarity, calculator))
+    private fun candyItem(name: String, calculator: CandyItem.Calculator): CandyItem  = this.create(name, CandyItem(calculator))

-    private fun pokerodItem(pokeRodId: ResourceLocation, rarity: Rarity = Rarity.COMMON): PokerodItem {
-        val settings = Item.Properties().stacksTo(1).durability(256).rarity(rarity)
+    private fun pokerodItem(pokeRodId: ResourceLocation): PokerodItem {
+        val settings = Item.Properties().stacksTo(1).durability(256)
        val item = create(pokeRodId.path, PokerodItem(pokeRodId, settings))
        pokeRods.add(item)
        return item
@@ -34,7 +34,6 @@ 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.pokedex.ServerConfirmedRegisterHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.PokemonUpdatePacketHandler
-import com.cobblemon.mod.common.client.net.settings.OpenCobblemonConfigEditorHandler
 import com.cobblemon.mod.common.client.net.settings.ServerSettingsPacketHandler
 import com.cobblemon.mod.common.client.net.sound.UnvalidatedPlaySoundS2CPacketHandler
 import com.cobblemon.mod.common.client.net.spawn.SpawnExtraDataEntityHandler
@@ -45,7 +44,12 @@ import com.cobblemon.mod.common.client.net.storage.party.InitializePartyHandler
 import com.cobblemon.mod.common.client.net.storage.party.MoveClientPartyPokemonHandler
 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.storage.pc.ClosePCHandler
+import com.cobblemon.mod.common.client.net.storage.pc.InitializePCHandler
+import com.cobblemon.mod.common.client.net.storage.pc.MoveClientPCPokemonHandler
+import com.cobblemon.mod.common.client.net.storage.pc.OpenPCHandler
+import com.cobblemon.mod.common.client.net.storage.pc.SetPCBoxPokemonHandler
+import com.cobblemon.mod.common.client.net.storage.pc.SetPCPokemonHandler
 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
@@ -69,6 +73,9 @@ import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueOpenedPacke
 import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
 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.fishing.FishingBaitRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.fossil.FossilRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.fossil.NaturalMaterialRegistrySyncPacket
 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.pasture.ClosePasturePacket
@@ -80,7 +87,6 @@ import com.cobblemon.mod.common.net.messages.client.pokemon.update.*
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.AddEvolutionPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClearEvolutionsPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.RemoveEvolutionPacket
-import com.cobblemon.mod.common.net.messages.client.settings.OpenCobblemonConfigScreenPacket
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
 import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
 import com.cobblemon.mod.common.net.messages.client.spawn.SpawnGenericBedrockPacket
@@ -98,12 +104,8 @@ 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.SetPCBoxPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
-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.toast.ToastPacket
 import com.cobblemon.mod.common.net.messages.client.trade.TradeAcceptanceChangedPacket
 import com.cobblemon.mod.common.net.messages.client.trade.TradeCancelledPacket
@@ -146,7 +148,6 @@ 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.SetItemHiddenPacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetNicknamePacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
 import com.cobblemon.mod.common.net.messages.server.starter.RequestStarterScreenPacket
@@ -154,7 +155,12 @@ import com.cobblemon.mod.common.net.messages.server.storage.SwapPCPartyPokemonPa
 import com.cobblemon.mod.common.net.messages.server.storage.party.MovePartyPokemonPacket
 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.storage.pc.MovePCPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonToPartyPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePartyPokemonToPCPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.ReleasePCPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.SwapPCPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.UnlinkPlayerFromPCPacket
 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
@@ -188,7 +194,6 @@ 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.SetItemHiddenHandler
 import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetNicknameHandler
 import com.cobblemon.mod.common.net.serverhandling.starter.RequestStarterScreenHandler
 import com.cobblemon.mod.common.net.serverhandling.starter.SelectStarterPacketHandler
@@ -199,7 +204,12 @@ import com.cobblemon.mod.common.net.serverhandling.storage.SwapPCPartyPokemonHan
 import com.cobblemon.mod.common.net.serverhandling.storage.party.MovePartyPokemonHandler
 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.storage.pc.MovePCPokemonHandler
+import com.cobblemon.mod.common.net.serverhandling.storage.pc.MovePCPokemonToPartyHandler
+import com.cobblemon.mod.common.net.serverhandling.storage.pc.MovePartyPokemonToPCHandler
+import com.cobblemon.mod.common.net.serverhandling.storage.pc.ReleasePartyPokemonHandler
+import com.cobblemon.mod.common.net.serverhandling.storage.pc.SwapPCPokemonHandler
+import com.cobblemon.mod.common.net.serverhandling.storage.pc.UnlinkPlayerFromPCHandler
 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
@@ -218,11 +228,13 @@ import net.minecraft.server.level.ServerPlayer
 * @since November 27th, 2021
 */
 object CobblemonNetwork {
+    //private val logger = LogUtils.getLogger()

    fun ServerPlayer.sendPacket(packet: NetworkPacket<*>) {
        sendPacketToPlayer(this, packet)
    }
    fun sendToServer(packet: NetworkPacket<*>) {
+        //logger.info("[C->S] ${packet.type()}")
        Cobblemon.implementation.networkManager.sendToServer(packet)
    }
    fun sendToAllPlayers(packet: NetworkPacket<*>) = sendPacketToPlayers(server()!!.playerList.players, packet)
@@ -258,10 +270,6 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(SpeciesFeatureUpdatePacket.ID, SpeciesFeatureUpdatePacket::decode, PokemonUpdatePacketHandler()))
        list.add(PacketRegisterInfo(OriginalTrainerUpdatePacket.ID, OriginalTrainerUpdatePacket::decode, PokemonUpdatePacketHandler()))
        list.add(PacketRegisterInfo(FormUpdatePacket.ID, FormUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(TeraTypeUpdatePacket.ID, TeraTypeUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(DmaxLevelUpdatePacket.ID, DmaxLevelUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(GmaxFactorUpdatePacket.ID, GmaxFactorUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(CosmeticItemUpdatePacket.ID, CosmeticItemUpdatePacket::decode, PokemonUpdatePacketHandler()))

        // Evolution start
        list.add(PacketRegisterInfo(AddEvolutionPacket.ID, AddEvolutionPacket::decode, PokemonUpdatePacketHandler()))
@@ -276,18 +284,13 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(SetPartyReferencePacket.ID, SetPartyReferencePacket::decode, SetPartyReferenceHandler))
        list.add(PacketRegisterInfo(InitializePCPacket.ID, InitializePCPacket::decode, InitializePCHandler))
        list.add(PacketRegisterInfo(MoveClientPCPokemonPacket.ID, MoveClientPCPokemonPacket::decode, MoveClientPCPokemonHandler))
-        list.add(PacketRegisterInfo(SetPCBoxPacket.ID, SetPCBoxPacket::decode, SetPCBoxHandler))
+        list.add(PacketRegisterInfo(SetPCBoxPokemonPacket.ID, SetPCBoxPokemonPacket::decode, SetPCBoxPokemonHandler))
        list.add(PacketRegisterInfo(SetPCPokemonPacket.ID, SetPCPokemonPacket::decode, SetPCPokemonHandler))
        list.add(PacketRegisterInfo(OpenPCPacket.ID, OpenPCPacket::decode, OpenPCHandler))
        list.add(PacketRegisterInfo(ClosePCPacket.ID, ClosePCPacket::decode, ClosePCHandler))
        list.add(PacketRegisterInfo(SwapClientPokemonPacket.ID, SwapClientPokemonPacket::decode, SwapClientPokemonHandler))
        list.add(PacketRegisterInfo(RemoveClientPokemonPacket.ID, RemoveClientPokemonPacket::decode, RemoveClientPokemonHandler))

-        list.add(PacketRegisterInfo(RenamePCBoxPacket.ID, RenamePCBoxPacket::decode, RenamePCBoxHandler))
-        list.add(PacketRegisterInfo(RequestPCBoxWallpapersPacket.ID, RequestPCBoxWallpapersPacket::decode, RequestPCBoxWallpapersHandler))
-        list.add(PacketRegisterInfo(SetPCBoxWallpapersPacket.ID, SetPCBoxWallpapersPacket::decode, SetPCBoxWallpapersHandler))
-        list.add(PacketRegisterInfo(ChangePCBoxWallpaperPacket.ID, ChangePCBoxWallpaperPacket::decode, ChangePCBoxWallpaperHandler))
-
        // UI Packets
        list.add(PacketRegisterInfo(SummaryUIPacket.ID, SummaryUIPacket::decode, SummaryUIPacketHandler))
        list.add(PacketRegisterInfo(InteractPokemonUIPacket.ID, InteractPokemonUIPacket::decode, InteractPokemonUIPacketHandler))
@@ -325,13 +328,11 @@ object CobblemonNetwork {
        // MultiBattleTeam Packets
        list.add(PacketRegisterInfo(TeamRequestNotificationPacket.ID, TeamRequestNotificationPacket::decode, TeamRequestNotificationHandler))
        list.add(PacketRegisterInfo(TeamRequestExpiredPacket.ID, TeamRequestExpiredPacket::decode, TeamRequestExpiredHandler))
-        list.add(PacketRegisterInfo(TeamMemberAddNotificationPacket.ID, TeamMemberAddNotificationPacket::decode, TeamMemberAddNotificationHandler))
        list.add(PacketRegisterInfo(TeamMemberRemoveNotificationPacket.ID, TeamMemberRemoveNotificationPacket::decode, TeamMemberRemoveNotificationHandler))
        list.add(PacketRegisterInfo(TeamJoinNotificationPacket.ID, TeamJoinNotificationPacket::decode, TeamJoinNotificationHandler))

        // Settings packets
        list.add(PacketRegisterInfo(ServerSettingsPacket.ID, ServerSettingsPacket::decode, ServerSettingsPacketHandler))
-        list.add(PacketRegisterInfo(OpenCobblemonConfigScreenPacket.ID, OpenCobblemonConfigScreenPacket::decode, OpenCobblemonConfigEditorHandler))

        // Data registries
        list.add(PacketRegisterInfo(AbilityRegistrySyncPacket.ID, AbilityRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
@@ -352,7 +353,6 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(DexEntrySyncPacket.ID, DexEntrySyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(FishingBaitRegistrySyncPacket.ID, FishingBaitRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(FlowRegistrySyncPacket.ID, FlowRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(CosmeticItemAssignmentSyncPacket.ID, CosmeticItemAssignmentSyncPacket::decode, DataRegistrySyncPacketHandler()))

        // Effects
        list.add(PacketRegisterInfo(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler))
@@ -412,7 +412,6 @@ object CobblemonNetwork {
        val list = mutableListOf<PacketRegisterInfo<*>>()
        // Pokemon Update Packets
        list.add(PacketRegisterInfo(SetNicknamePacket.ID, SetNicknamePacket::decode, SetNicknameHandler))
-        list.add(PacketRegisterInfo(SetItemHiddenPacket.ID, SetItemHiddenPacket::decode, SetItemHiddenHandler))

        // Evolution Packets
        list.add(PacketRegisterInfo(AcceptEvolutionPacket.ID, AcceptEvolutionPacket::decode, AcceptEvolutionHandler))
@@ -437,10 +436,6 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(ReleasePCPokemonPacket.ID, ReleasePCPokemonPacket::decode, ReleasePCPokemonHandler))
        list.add(PacketRegisterInfo(UnlinkPlayerFromPCPacket.ID, UnlinkPlayerFromPCPacket::decode, UnlinkPlayerFromPCHandler))

-        list.add(PacketRegisterInfo(RequestRenamePCBoxPacket.Companion.ID, RequestRenamePCBoxPacket.Companion::decode, RequestRenamePCBoxHandler))
-        list.add(PacketRegisterInfo(PCBoxWallpapersPacket.ID, PCBoxWallpapersPacket::decode, PCBoxWallpapersHandler))
-        list.add(PacketRegisterInfo(RequestChangePCBoxWallpaperPacket.ID, RequestChangePCBoxWallpaperPacket::decode, RequestChangePCBoxWallpaperHandler))
-
        // Starter packets
        list.add(PacketRegisterInfo(SelectStarterPacket.ID, SelectStarterPacket::decode, SelectStarterPacketHandler))
        list.add(PacketRegisterInfo(RequestStarterScreenPacket.ID, RequestStarterScreenPacket::decode, RequestStarterScreenHandler))
@@ -453,8 +448,6 @@ object CobblemonNetwork {

        list.add(PacketRegisterInfo(SwapPCPartyPokemonPacket.ID, SwapPCPartyPokemonPacket::decode, SwapPCPartyPokemonHandler))

-        list.add(PacketRegisterInfo(SortPCBoxPacket.ID, SortPCBoxPacket::decode, SortPCBoxHandler))
-
        // Battle packets
        list.add(PacketRegisterInfo(BattleSelectActionsPacket.ID, BattleSelectActionsPacket::decode, BattleSelectActionsHandler))
        list.add(PacketRegisterInfo(SpectateBattlePacket.ID, SpectateBattlePacket::decode, SpectateBattleHandler))
@@ -506,6 +499,7 @@ object CobblemonNetwork {
    }

    fun sendPacketToPlayer(player: ServerPlayer, packet: NetworkPacket<*>) {
+        //logger.info("[S->C] ${packet.type()}")
        Cobblemon.implementation.networkManager.sendPacketToPlayer(player, packet)
    }
 }
@@ -33,7 +33,7 @@ class LevelUpCriterion(
    }

    override fun matches(player: ServerPlayer, context: LevelUpContext): Boolean {
-        val preEvo = context.pokemon.preEvolution != null
+        val preEvo = context.pokemon.preEvolution == null
        val hasEvolution = !context.pokemon.evolutions.none()
        var evolutionCheck = true
        if (preEvo || hasEvolution) {
@@ -43,3 +43,27 @@ class LevelUpCriterion(
    }

 }
+
+/*class LevelUpCriterionCondition(id: Identifier, entity: LootContextPredicate) : SimpleCriterionCondition<LevelUpContext>(id, entity) {
+    var level = 0
+    var evolved = true
+    override fun toJson(json: JsonObject) {
+        json.addProperty("level", level)
+        json.addProperty("has_evolved", evolved)
+    }
+
+    override fun fromJson(json: JsonObject) {
+        level = json.get("level")?.asInt ?: 0
+        evolved = json.get("has_evolved")?.asBoolean ?: true
+    }
+
+    override fun matches(player: ServerPlayer, context: LevelUpContext): Boolean {
+        val preEvo = context.pokemon.preEvolution == null
+        val hasEvolution = !context.pokemon.evolutions.none()
+        var evolutionCheck = true
+        if (preEvo || hasEvolution) {
+            evolutionCheck = !(preEvo == hasEvolution)
+        }
+        return level == context.level && evolutionCheck == evolved
+    }
+}*/
@@ -43,8 +43,7 @@ interface SleepDepth {
            "comatose" to comatose,
            "normal" to normal
        )
-
-        val adapter = StringIdentifiedObjectAdapter({ depths[it] ?: throw IllegalArgumentException("Unknown sleep depth: $it") })
+        val adapter = StringIdentifiedObjectAdapter { depths[it] ?: throw IllegalArgumentException("Unknown sleep depth: $it") }
    }

    fun canSleep(pokemonEntity: PokemonEntity): Boolean
@@ -8,9 +8,6 @@

 package com.cobblemon.mod.common.api.battles.interpreter

-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.queryStructOf
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon

 /**
@@ -33,13 +30,6 @@ interface BattleContext {
    /** The [BattlePokemon] that directly or indirectly caused this [BattleContext]. */
    val origin: BattlePokemon?

-    fun getStruct() = queryStructOf(
-        "type" to { StringValue(type.name) },
-        "origin" to { origin?.struct ?: DoubleValue(0.0) },
-        "id" to { StringValue(id) },
-        "turn_created" to { DoubleValue(turn.toDouble()) }
-    )
-
    /**
     * The type of [BattleContext].
     *
@@ -23,7 +23,6 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.battles.BattleFledEvent
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.net.NetworkPacket
-import com.cobblemon.mod.common.api.pokemon.stats.BattleEvSource
 import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.api.text.red
@@ -273,7 +272,7 @@ open class PokemonBattle(
                            opponent.awardExperience(opponentPokemon, experience)
                        }
                        Cobblemon.evYieldCalculator.calculate(opponentPokemon, faintedPokemon).forEach { (stat, amount) ->
-                            pokemon.evs.add(stat, amount, BattleEvSource(this, opponentPokemon.facedOpponents.toList(), pokemon))
+                            pokemon.evs.add(stat, amount)
                        }

                    }
@@ -99,6 +99,7 @@ class Berry(
    val weight: Float,
    val boneMealChance: Float
 ) {
+
    @Transient
    var identifier: ResourceLocation = identifier
        internal set
@@ -158,7 +159,7 @@ class Berry(
     * Calculates the yield for a berry tree being planted or replanted after a life cycle.
     * Triggers [BerryYieldCalculationEvent].
     *
-     * @param world The [Level] the tree is present in.
+     * @param world The [World] the tree is present in.
     * @param state The [BlockState] of the tree.
     * @param pos The [BlockPos] of the tree.
     * @param placer The [LivingEntity] tending to the tree, if any.
@@ -172,10 +173,9 @@ class Berry(
        if (BerryBlock.getMulch(treeEntity) == MulchVariant.RICH) {
            //I hope the upper bound isnt exclusive, especially when there's a method called nextBetweenExclusive
            // update: it was meant to be exclusive, which caused #1124. I've lowered the upper bound from 3 to 2.
-            yield += world.random.nextIntBetweenInclusive(RICH_MULCH_MIN, RICH_MULCH_MAX)
+            yield += world.random.nextIntBetweenInclusive(1, 2)
            treeEntity.decrementMulchDuration(world, pos, state)
        }
-        yield = yield.coerceAtMost(growthPoints.size)
        val event = BerryYieldCalculationEvent(this, world, state, pos, placer, yield, bonus.second)
        CobblemonEvents.BERRY_YIELD.post(event) { yield = it.yield }
        return yield
@@ -193,7 +193,7 @@ class Berry(
     *
     * @return The maximum possible yield.
     */
-    fun maxYield() = this.baseYield.last + this.growthFactors.sumOf { it.maxYield() } + RICH_MULCH_MAX
+    fun maxYield() = this.baseYield.last + this.growthFactors.sumOf { it.maxYield() }

    /**
     * Checks if this berry can mutate with the given [partner].
@@ -231,7 +231,6 @@ class Berry(
    }

    // A cheat since gson doesn't invoke init block
-    // well I actually suspect it does but
    internal fun validate() {
        if (this.baseYield.first < 0 || this.baseYield.last < 0) {
            throw IllegalArgumentException("A berry base yield must be a positive range")
@@ -248,6 +247,10 @@ class Berry(
        }
         */
        this.growthFactors.forEach { it.validateArguments() }
+        val maxYield = this.maxYield()
+        if (this.growthPoints.size < maxYield) {
+            throw IllegalArgumentException("Anchor points must have enough elements for the max possible yield of $maxYield you've provided ${this.growthPoints.size} points")
+        }
        this.shapedFlower = hashMapOf()
        this.shapedFruit = hashMapOf()
        this.sproutShape = this.createAndUniteShapes(this.sproutShapeBoxes)
@@ -336,8 +339,6 @@ class Berry(
    }

    companion object {
-        const val RICH_MULCH_MIN = 1
-        const val RICH_MULCH_MAX = 2

        internal fun decode(buffer: RegistryFriendlyByteBuf): Berry {
            val identifier = buffer.readIdentifier()
@@ -15,10 +15,12 @@ package com.cobblemon.mod.common.api.berry
 * @author Licious
 * @since November 28th, 2022
 */
-enum class Flavor(val colour: Int) {
-    SPICY(0x00FF00),
-    DRY(0xFF0000),
-    SWEET(0x0000FF),
-    BITTER(0xFFFF00),
-    SOUR(0xFF00FF);
+enum class Flavor {
+
+    SPICY,
+    DRY,
+    SWEET,
+    BITTER,
+    SOUR
+
 }
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.conditional
-
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import com.cobblemon.mod.common.util.codec.CodecUtils
-import com.mojang.serialization.Codec
-import net.minecraft.core.Registry
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
-import net.minecraft.tags.TagKey
-
-val ITEM_REGISTRY_LIKE_CODEC = makeCodecForRegistryLikeCondition("item", Registries.ITEM)
-
-fun <T : Any> makeCodecForRegistryLikeCondition(name: String, registryKey: ResourceKey<Registry<T>>): Codec<RegistryLikeCondition<T>> {
-    return CodecUtils.createByStringCodec(
-        from = { str ->
-            if (str.startsWith("#")) {
-                return@createByStringCodec RegistryLikeTagCondition<T>(TagKey.create(registryKey, str.substring(1).asIdentifierDefaultingNamespace()))
-            } else {
-                return@createByStringCodec RegistryLikeIdentifierCondition<T>(str.asIdentifierDefaultingNamespace())
-            }
-        },
-        to = { condition ->
-            if (condition is RegistryLikeTagCondition) {
-                "#${condition.tag.location}"
-            } else {
-                (condition as RegistryLikeIdentifierCondition).identifier.toString()
-            }
-        },
-        errorSupplier = { "Unknown $name condition: $it. Should be # followed by a tag, or $name resource location e.g. #minecraft:ladders or minecraft:grass_block." }
-    )
-}
@@ -26,13 +26,13 @@ open class RegistryLikeTagCondition<T : Any>(val tag: TagKey<T>) : RegistryLikeC
    companion object {
        const val PREFIX = "#"
        fun <T : Any> resolver(
-            resourceKey: ResourceKey<Registry<T>>,
+            ResourceKey: ResourceKey<Registry<T>>,
            constructor: (TagKey<T>) -> RegistryLikeTagCondition<T>
        ): (JsonElement) -> RegistryLikeTagCondition<T>? = {
            val firstSymbol = it.asString.substring(0, 1)
            if (firstSymbol == PREFIX) {
                val identifier = ResourceLocation.parse(it.asString.substring(1))
-                constructor(TagKey.create(resourceKey, identifier))
+                constructor(TagKey.create(ResourceKey, identifier))
            } else {
                null
            }
@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.drop

 import com.cobblemon.mod.common.api.serialization.StringIdentifiedObjectAdapter
-import com.google.gson.annotations.SerializedName

 /**
 * The way an item will be dropped.
@@ -29,9 +28,6 @@ enum class ItemDropMethod(val methodName: String) {
    TO_INVENTORY("to-inventory");

    companion object {
-        val adapter = StringIdentifiedObjectAdapter(
-            { str -> ItemDropMethod.entries.firstOrNull { it.methodName == str } },
-            { value -> (value ?: ON_ENTITY).methodName },
-        )
+        val adapter = StringIdentifiedObjectAdapter { str -> values().firstOrNull { it.methodName == str } }
    }
 }
@@ -11,8 +11,6 @@ package com.cobblemon.mod.common.api.entity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.Pokemon
 import net.minecraft.world.damagesource.DamageSource
-import net.minecraft.world.entity.Entity
-import net.minecraft.world.entity.Entity.MoveFunction
 import net.minecraft.world.entity.player.Player

 interface PokemonSideDelegate : EntitySideDelegate<PokemonEntity> {
@@ -8,10 +8,6 @@

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

-import com.bedrockk.molang.runtime.MoParams
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.MoValue
-
 /**
 * Something that can be canceled. This is a highly complex class and should only be read by professional engineers.
 *
@@ -25,9 +21,4 @@ abstract class Cancelable {
    fun cancel() {
        isCanceled = true
    }
-
-    val cancelFunc: Pair<String, (MoParams) -> MoValue> = "cancel" to {
-        cancel()
-        DoubleValue.ONE
-    }
 }
@@ -42,10 +42,7 @@ import com.cobblemon.mod.common.api.events.pokemon.healing.PokemonHealedEvent
 import com.cobblemon.mod.common.api.events.pokemon.interaction.ExperienceCandyUseEvent
 import com.cobblemon.mod.common.api.events.pokemon.interaction.PokemonInteractionGUICreationEvent
 import com.cobblemon.mod.common.api.events.starter.StarterChosenEvent
-import com.cobblemon.mod.common.api.events.storage.ChangePCBoxWallpaperEvent
 import com.cobblemon.mod.common.api.events.storage.ReleasePokemonEvent
-import com.cobblemon.mod.common.api.events.storage.RenamePCBoxEvent
-import com.cobblemon.mod.common.api.events.storage.WallpaperCollectionEvent
 import com.cobblemon.mod.common.api.events.world.BigRootPropagatedEvent
 import com.cobblemon.mod.common.api.reactive.CancelableObservable
 import com.cobblemon.mod.common.api.reactive.EventObservable
@@ -162,29 +159,11 @@ object CobblemonEvents {
    @JvmField
    val EXPERIENCE_CANDY_USE_POST = EventObservable<ExperienceCandyUseEvent.Post>()

-    @JvmField
-    val EV_GAINED_EVENT_PRE = CancelableObservable<EvGainedEvent.Pre>()
-    @JvmField
-    val EV_GAINED_EVENT_POST = EventObservable<EvGainedEvent.Post>()
-
    @JvmField
    val POKEMON_RELEASED_EVENT_PRE = CancelableObservable<ReleasePokemonEvent.Pre>()
    @JvmField
    val POKEMON_RELEASED_EVENT_POST = EventObservable<ReleasePokemonEvent.Post>()

-    @JvmField
-    val RENAME_PC_BOX_EVENT_PRE = CancelableObservable<RenamePCBoxEvent.Pre>()
-    @JvmField
-    val RENAME_PC_BOX_EVENT_POST = EventObservable<RenamePCBoxEvent.Post>()
-
-    @JvmField
-    val WALLPAPER_COLLECTION_EVENT = EventObservable<WallpaperCollectionEvent>()
-
-    @JvmField
-    val CHANGE_PC_BOX_WALLPAPER_EVENT_PRE = CancelableObservable<ChangePCBoxWallpaperEvent.Pre>()
-    @JvmField
-    val CHANGE_PC_BOX_WALLPAPER_EVENT_POST = EventObservable<ChangePCBoxWallpaperEvent.Post>()
-
    @JvmField
    val LOOT_DROPPED = CancelableObservable<LootDroppedEvent>()
    @JvmField
@@ -212,10 +191,6 @@ object CobblemonEvents {
    val HELD_ITEM_PRE = CancelableObservable<HeldItemEvent.Pre>()
    @JvmField
    val HELD_ITEM_POST = EventObservable<HeldItemEvent.Post>()
-    @JvmField
-    val COSMETIC_ITEM_PRE = CancelableObservable<HeldItemEvent.Pre>()
-    @JvmField
-    val COSMETIC_ITEM_POST = EventObservable<HeldItemEvent.Post>()

    @JvmField
    val POKEMON_GAINED = EventObservable<PokemonGainedEvent>()
@@ -8,12 +8,16 @@

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

+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.MoValue
+import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.battles.model.actor.ActorType
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.util.asArrayValue
+import java.util.function.Function

 /**
 * Event fired when a [BattlePokemon] faints. Exposes the [BattlePokemon] that fainted and the [BattleContext]
@@ -33,6 +37,13 @@ data class BattleFaintedEvent(
        "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 killed.struct,
-        "context" to context.getStruct()
+        "context" to QueryStruct(
+            hashMapOf(
+                "type" to Function { StringValue(context.type.name) },
+                "origin" to Function { context.origin?.struct ?: DoubleValue(0.0) },
+                "id" to Function { StringValue(context.id) },
+                "turn_created" to Function { DoubleValue(context.turn.toDouble()) },
+            )
+        )
    )
 }
@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.events.battles
 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.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.util.asArrayValue
 import net.minecraft.network.chat.MutableComponent

@@ -31,8 +30,6 @@ data class BattleStartedPreEvent (override val battle: PokemonBattle, var reason
        "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 }
    )
-
-    val functions = moLangFunctionMap(cancelFunc)
 }

 /**
@@ -26,7 +26,7 @@ data class TerastallizationEvent(
    val battle: PokemonBattle,
    val pokemon: BattlePokemon,
    val teraType: TeraType
-) {
+    ) {
    val context = mutableMapOf<String, MoValue>(
        "battle" to battle.struct,
        "players" to battle.actors.filter { it.type == ActorType.PLAYER }.asArrayValue { it.struct },
@@ -8,15 +8,9 @@

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

-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.MoValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.api.pokeball.catching.CaptureContext
 import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.getBooleanOrNull
-import com.cobblemon.mod.common.util.getIntOrNull
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.entity.LivingEntity

@@ -38,34 +32,4 @@ class PokeBallCaptureCalculatedEvent(
            action(this, thrower)
        }
    }
-
-    val context = mutableMapOf<String, MoValue>(
-        "thrower" to thrower.asMostSpecificMoLangValue(),
-        "pokemon" to pokemonEntity.struct,
-        "poke_ball" to pokeBallEntity.struct,
-        "is_successful_capture" to DoubleValue(captureResult.isSuccessfulCapture),
-        "is_critical_capture" to DoubleValue(captureResult.isCriticalCapture),
-    )
-
-    val functions = moLangFunctionMap(
-        "set_shakes" to { params ->
-            val numShakes = params.getInt(0)
-            val successful = params.getBooleanOrNull(1) ?: (numShakes == 4)
-            captureResult = CaptureContext(
-                numberOfShakes = numShakes,
-                isSuccessfulCapture = successful,
-                isCriticalCapture = false
-            )
-            DoubleValue.ONE
-        },
-        "set_critical_capture" to { params ->
-            val numShakes = params.getIntOrNull(0) ?: 1
-            captureResult = CaptureContext(
-                numberOfShakes = numShakes,
-                isSuccessfulCapture = true,
-                isCriticalCapture = true
-            )
-            DoubleValue.ONE
-        }
-    )
 }
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.pokemon
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.pokemon.stats.EvSource
-import com.cobblemon.mod.common.api.pokemon.stats.Stat
-import com.cobblemon.mod.common.pokemon.Pokemon
-
-/**
- * Fired during EV mutation.
- *
- * @see [Pre]
- * @see [Post]
- */
-interface EvGainedEvent {
-
-    /**
-     * The [Stat] having EVs added to itself.
-     */
-    val stat: Stat
-
-    /**
-     * @see EvSource.pokemon
-     */
-    val pokemon: Pokemon get() = this.source.pokemon
-
-    /**
-     * The [EvSource] that fired this event.
-     */
-    val source: EvSource
-
-    /**
-     * Fired before EV mutation occurs, cancelling will cause the mutation to be flagged as not successful (returns 0).
-     *
-     * @property stat See [EvGainedEvent.stat].
-     * @property amount The amount of EVs that will be gained.
-     * @property source See [EvGainedEvent.source].
-     */
-    class Pre(override val stat: Stat, var amount: Int, override val source: EvSource) : EvGainedEvent, Cancelable()
-
-    /**
-     * Fired after EV mutation occurs, this is purely for notification purposes.
-     *
-     * @property stat See [EvGainedEvent.stat].
-     * @property amount The final amount of EVs gained.
-     * @property source See [EvGainedEvent.source].
-     */
-    class Post(override val stat: Stat, val amount: Int, override val source: EvSource) : EvGainedEvent
-
-}
@@ -20,7 +20,8 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 data class FriendshipUpdatedEvent(
    val pokemon: Pokemon,
    val newFriendshipInitial: Int
-) {
+)
+{
    var newFriendship: Int = newFriendshipInitial
        set(value) {
            field = value.coerceIn(0, Cobblemon.config.maxPokemonFriendship)
@@ -9,11 +9,13 @@
 package com.cobblemon.mod.common.api.events.pokemon

 import com.cobblemon.mod.common.api.events.Cancelable
+import com.cobblemon.mod.common.api.events.pokemon.HeldItemEvent.Post
+import com.cobblemon.mod.common.api.events.pokemon.HeldItemEvent.Pre
 import com.cobblemon.mod.common.pokemon.Pokemon
 import net.minecraft.world.item.ItemStack

 /**
- * The base for all the events related to held items and cosmetic items.
+ * The base for all the events related to held items.
 *
 * @see [Pre]
 * @see [Post]
@@ -26,7 +28,7 @@ interface HeldItemEvent {
    val pokemon: Pokemon

    /**
-     * Fired at the start of [Pokemon.swapHeldItem] and [Pokemon.swapCosmeticItem].
+     * Fired at the start of [Pokemon.swapHeldItem].
     *
     * This event should be used to mutate the results of this transaction.
     *
@@ -42,7 +44,7 @@ interface HeldItemEvent {
    data class Pre(override val pokemon: Pokemon, var receiving: ItemStack, var returning: ItemStack, var decrement: Boolean) : HeldItemEvent, Cancelable()

    /**
-     * Fired at the end of [Pokemon.swapHeldItem] and [Pokemon.swapCosmeticItem].
+     * Fired at the end of [Pokemon.swapHeldItem].
     *
     * @property pokemon The [Pokemon] triggering this event.
     * @property received The [ItemStack] considered as received and set to the [pokemon]. This is a copy and mutation will not be taken into account.
@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.events.pokemon

 import com.bedrockk.molang.runtime.value.DoubleValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.pokemon.Pokemon

 /**
@@ -24,11 +23,4 @@ class LevelUpEvent(val pokemon: Pokemon, val oldLevel: Int, var newLevel: Int) {
        "old_level" to DoubleValue(oldLevel.toDouble()),
        "new_level" to DoubleValue(newLevel.toDouble())
    )
-
-    val functions = moLangFunctionMap(
-        "set_new_level" to {
-            newLevel = it.getInt(0)
-            DoubleValue.ONE
-        }
-    )
 }
@@ -13,7 +13,6 @@ import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
 import com.cobblemon.mod.common.api.pokedex.FormDexRecord
 import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
@@ -48,9 +47,7 @@ sealed interface PokedexDataChangedEvent {
        override val knowledge: PokedexEntryProgress,
        override val playerUUID: UUID,
        override val record: FormDexRecord
-    ) : PokedexDataChangedEvent, Cancelable() {
-        val functions = moLangFunctionMap(cancelFunc)
-    }
+    ) : PokedexDataChangedEvent, Cancelable()

    class Post(
        override val dataSource: PokedexEntityData,
@@ -8,12 +8,8 @@

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

-import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.server
 import java.util.UUID

 data class PokemonGainedEvent(
@@ -24,8 +20,4 @@ data class PokemonGainedEvent(
        "player_id" to StringValue(playerId.toString()),
        "pokemon" to pokemon.struct
    )
-
-    val functions = moLangFunctionMap(
-        "player" to { server()?.playerList?.getPlayer(playerId)?.asMoLangValue() ?: DoubleValue.ZERO },
-    )
 }
@@ -8,10 +8,7 @@

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

-import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.pokemon.Pokemon

@@ -28,11 +25,4 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 data class EvolutionAcceptedEvent(
    override val pokemon: Pokemon,
    override val evolution: Evolution
-) : Cancelable(), EvolutionEvent {
-    val context = mutableMapOf<String, MoValue>(
-        "pokemon" to pokemon.struct,
-        "evolution" to evolution.asMoLangValue()
-    )
-
-    val functions = moLangFunctionMap(cancelFunc)
-}
+) : Cancelable(), EvolutionEvent
@@ -8,8 +8,6 @@

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

-import com.bedrockk.molang.runtime.value.MoValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.pokemon.Pokemon

@@ -25,9 +23,4 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 data class EvolutionCompleteEvent(
    override val pokemon: Pokemon,
    override val evolution: Evolution
-) : EvolutionEvent {
-    val context = mutableMapOf<String, MoValue>(
-        "pokemon" to pokemon.struct,
-        "evolution" to evolution.asMoLangValue()
-    )
-}
+) : EvolutionEvent
@@ -8,13 +8,8 @@

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

-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.MoValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.getBoolean

 /**
 * An event fired when [Evolution.test] has been performed.
@@ -30,18 +25,4 @@ data class EvolutionTestedEvent(
    override val evolution: Evolution,
    val originalResult: Boolean,
    var result: Boolean
-) : EvolutionEvent {
-    val context = mutableMapOf<String, MoValue>(
-        "pokemon" to pokemon.struct,
-        "evolution" to evolution.asMoLangValue(),
-        "original_result" to DoubleValue(originalResult),
-    )
-
-    val functions = moLangFunctionMap(
-        "result" to { DoubleValue(result) },
-        "set_result" to {
-            result = it.getBoolean(0)
-            DoubleValue.ONE
-        }
-    )
-}
+) : EvolutionEvent
@@ -16,9 +16,6 @@ import java.util.UUID
 data class PokemonInteractionGUICreationEvent(
    val pokemonID: UUID,
    val mountShoulder: Boolean,
-    val giveHeld: Boolean,
-    val giveCosmetic: Boolean,
-    val canRide: Boolean,
    val options: Multimap<Orientation, InteractWheelOption>
 ) {
    fun addFillingOption(option: InteractWheelOption) {
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.storage
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.storage.pc.PCBox
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-
-/**
- * Events fired whenever a player changes their PC Wallpaper.
- * Has a cancelable [Pre] event and a [Post] which gets fired after the change.
- *
- * @author JustAHuman-xD
- * @since February 14th, 2025
- */
-interface ChangePCBoxWallpaperEvent {
-
-    /**
-     * The [ServerPlayer] who is changing their wallpaper
-     */
-    val player: ServerPlayer
-
-    /**
-     * The [PCBox] whose wallpaper is being changed
-     */
-    val box: PCBox
-
-    /**
-     * The location of the wallpaper that is being changed to. Can be modified in the [Pre] event.
-     * NOTE: Changing this to a wallpaper that does not exist on the client, will result in a purple/black fallback texture being displayed.
-     */
-    val wallpaper: ResourceLocation
-
-    class Pre(
-        override val player: ServerPlayer,
-        override val box: PCBox,
-        override var wallpaper: ResourceLocation
-    ) : ChangePCBoxWallpaperEvent, Cancelable()
-
-    class Post(
-        override val player: ServerPlayer,
-        override val box: PCBox,
-        override val wallpaper: ResourceLocation
-    ) : ChangePCBoxWallpaperEvent
-}
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.storage
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.storage.pc.PCBox
-import net.minecraft.server.level.ServerPlayer
-
-/**
- * Events fired whenever a player renames one of their PC boxes.
- * Has a cancelable [Pre] event and a [Post] which gets fired after the change.
- *
- * @author JustAHuman-xD
- * @since February 14th, 2025
- */
-interface RenamePCBoxEvent {
-
-    /**
-     * The [ServerPlayer] who is changing their wallpaper
-     */
-    val player: ServerPlayer
-
-    /**
-     * The [PCBox] whose wallpaper is being changed
-     */
-    val box: PCBox
-
-    /**
-     * The new box name being used. This can be modified in the [Pre] event.
-     */
-    val name: String
-
-    class Pre(
-        override val player: ServerPlayer,
-        override val box: PCBox,
-        override var name: String
-    ) : RenamePCBoxEvent, Cancelable()
-
-    class Post(
-        override val player: ServerPlayer,
-        override val box: PCBox,
-        override val name: String
-    ) : RenamePCBoxEvent
-}
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.storage
-
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-
-/**
- * Event being fired whenever the client connects to a server and "requests" what wallpapers are available for it to choose from.
- * Mods can listen to this event and remove available options from the client when they connect, essentially causing them to not exist client-side
- *
- * NOTE: Adding wallpapers here that do not exist on the client, will result in the purple/black fallback texture being displayed client-side.
- *
- * @author JustAHuman-xD
- * @since February 14th, 2025
- */
-data class WallpaperCollectionEvent(
-    val player: ServerPlayer,
-    val wallpapers: MutableList<ResourceLocation>
-)
@@ -11,7 +11,7 @@ package com.cobblemon.mod.common.api.fishing
 import com.cobblemon.mod.common.CobblemonItemComponents
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.data.FishingBaitRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.fishing.FishingBaitRegistrySyncPacket
 import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.Gson
@@ -9,7 +9,7 @@
 package com.cobblemon.mod.common.api.fossil

 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import net.minecraft.advancements.critereon.ItemPredicate
+import com.cobblemon.mod.common.pokemon.evolution.predicate.NbtItemPredicate
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
 import net.minecraft.resources.ResourceLocation
@@ -19,7 +19,7 @@ import net.minecraft.world.item.ItemStack
 class Fossil(
    identifier: ResourceLocation,
    val result: PokemonProperties,
-    val fossils: List<ItemPredicate>
+    val fossils: List<NbtItemPredicate>
 ): StringRepresentable {

    @Transient
@@ -13,15 +13,15 @@ import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.data.FossilRegistrySyncPacket
-import com.cobblemon.mod.common.pokemon.evolution.adapters.LegacyItemConditionWrapperAdapter
+import com.cobblemon.mod.common.net.messages.client.fossil.FossilRegistrySyncPacket
+import com.cobblemon.mod.common.pokemon.evolution.adapters.NbtItemPredicateAdapter
+import com.cobblemon.mod.common.pokemon.evolution.predicate.NbtItemPredicate
 import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.adapters.ItemLikeConditionAdapter
 import com.cobblemon.mod.common.util.adapters.pokemonPropertiesShortAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
-import net.minecraft.advancements.critereon.ItemPredicate
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
@@ -40,7 +40,7 @@ object Fossils: JsonDataRegistry<Fossil> {
        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
        .registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
-        .registerTypeAdapter(ItemPredicate::class.java, LegacyItemConditionWrapperAdapter)
+        .registerTypeAdapter(NbtItemPredicate::class.java, NbtItemPredicateAdapter)
        .create()

    override val typeToken: TypeToken<Fossil> = TypeToken.get(Fossil::class.java)
@@ -10,7 +10,7 @@ package com.cobblemon.mod.common.api.fossil

 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.data.NaturalMaterialRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.fossil.NaturalMaterialRegistrySyncPacket
 import com.cobblemon.mod.common.registry.ItemTagCondition
 import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.adapters.ItemLikeConditionAdapter
@@ -12,10 +12,12 @@ import com.cobblemon.mod.common.api.text.font
 import com.cobblemon.mod.common.client.gui.battle.BattleOverlay.Companion.PORTRAIT_DIAMETER
 import com.cobblemon.mod.common.client.render.SpriteType
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.util.toHex
+import com.mojang.authlib.minecraft.client.MinecraftClient
 import com.mojang.blaze3d.platform.GlStateManager
 import com.mojang.blaze3d.platform.Lighting
 import com.mojang.blaze3d.systems.RenderSystem
@@ -207,6 +209,7 @@ fun drawPosablePortrait(
    contextScale: Float = 1F,
    reversed: Boolean = false,
    state: PosableState,
+    repository: VaryingModelRepository<*>,
    partialTicks: Float,
    limbSwing: Float = 0F,
    limbSwingAmount: Float = 0F,
@@ -224,16 +227,16 @@ fun drawPosablePortrait(
    matrixStack.scale(scale, scale, -scale)
    matrixStack.translate(0.0, -PORTRAIT_DIAMETER / 18.0, 0.0)

-    val sprite = VaryingModelRepository.getSprite(identifier, state, SpriteType.PORTRAIT);
+    val sprite = repository.getSprite(identifier, state, SpriteType.PORTRAIT);

    if (sprite == null) {
-        val model = VaryingModelRepository.getPoser(identifier, state)
+        val model = repository.getPoser(identifier, state)
        state.currentModel = model
-        val texture = VaryingModelRepository.getTexture(identifier, state)
+        val texture = repository.getTexture(identifier, state)

        val context = RenderContext()
        model.context = context
-        VaryingModelRepository.getTextureNoSubstitute(identifier, state).let { context.put(RenderContext.TEXTURE, it) }
+        repository.getTextureNoSubstitute(identifier, state).let { context.put(RenderContext.TEXTURE, it) }
        context.put(RenderContext.SCALE, contextScale)
        context.put(RenderContext.SPECIES, identifier)
        context.put(RenderContext.ASPECTS, state.currentAspects)
@@ -252,7 +255,7 @@ fun drawPosablePortrait(

        matrixStack.translate(
            model.portraitTranslation.x * if (reversed) -1F else 1F,
-            model.portraitTranslation.y + 1.5 * model.portraitScale,
+            model.portraitTranslation.y,
            model.portraitTranslation.z - 4
        )
        matrixStack.scale(model.portraitScale, model.portraitScale, 1 / model.portraitScale)
@@ -269,7 +272,7 @@ fun drawPosablePortrait(
        val packedLight = LightTexture.pack(11, 7)

        val colour = toHex(r, g, b, a)
-        model.withLayerContext(immediate, state, VaryingModelRepository.getLayers(identifier, state)) {
+        model.withLayerContext(immediate, state, repository.getLayers(identifier, state)) {
            model.render(context, matrixStack, buffer, packedLight, OverlayTexture.NO_OVERLAY, colour)
            immediate.endBatch()
        }
@@ -285,6 +288,7 @@ fun drawPosablePortrait(
 }

 fun drawProfile(
+    repository: VaryingModelRepository<*>,
    resourceIdentifier: ResourceLocation,
    matrixStack: PoseStack,
    state: PosableState,
@@ -294,16 +298,16 @@ fun drawProfile(
    RenderSystem.applyModelViewMatrix()
    matrixStack.scale(scale, scale, -scale)

-    val sprite = VaryingModelRepository.getSprite(resourceIdentifier, state, SpriteType.PROFILE)
+    val sprite = repository.getSprite(resourceIdentifier, state, SpriteType.PROFILE)

    if (sprite == null) {

-        val model = VaryingModelRepository.getPoser(resourceIdentifier, state)
-        val texture = VaryingModelRepository.getTexture(resourceIdentifier, state)
+        val model = repository.getPoser(resourceIdentifier, state)
+        val texture = repository.getTexture(resourceIdentifier, state)

        val context = RenderContext()
        model.context = context
-        VaryingModelRepository.getTextureNoSubstitute(resourceIdentifier, state).let { context.put(RenderContext.TEXTURE, it) }
+        repository.getTextureNoSubstitute(resourceIdentifier, state).let { context.put(RenderContext.TEXTURE, it) }
        context.put(RenderContext.SCALE, 1F)
        context.put(RenderContext.SPECIES, resourceIdentifier)
        context.put(RenderContext.ASPECTS, state.currentAspects)
@@ -315,11 +319,7 @@ fun drawProfile(
        state.setPoseToFirstSuitable(PoseType.PORTRAIT)
        state.updatePartialTicks(partialTicks)
        model.applyAnimations(null, state, 0F, 0F, 0F, 0F, 0F)
-        matrixStack.translate(
-            model.profileTranslation.x,
-            model.profileTranslation.y + 1.5 * model.profileScale,
-            model.profileTranslation.z - 4.0
-        )
+        matrixStack.translate(model.profileTranslation.x, model.profileTranslation.y, model.profileTranslation.z - 4.0)
        matrixStack.scale(model.profileScale, model.profileScale, 1 / model.profileScale)
 //    matrixStack.multiply(rotation)
        val quaternion1 = Axis.YP.rotationDegrees(-32F * if (false) -1F else 1F)
@@ -337,7 +337,7 @@ fun drawProfile(
        RenderSystem.setShaderLights(light1, light2)
        val packedLight = LightTexture.pack(11, 7)

-        model.withLayerContext(bufferSource, state, VaryingModelRepository.getLayers(resourceIdentifier, state)) {
+        model.withLayerContext(bufferSource, state, repository.getLayers(resourceIdentifier, state)) {
            model.render(context, matrixStack, buffer, packedLight, OverlayTexture.NO_OVERLAY, -0x1)
            bufferSource.endBatch()
        }
@@ -36,8 +36,6 @@ import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
 import com.cobblemon.mod.common.api.pokedex.PokedexManager
 import com.cobblemon.mod.common.api.pokedex.SeenCount
 import com.cobblemon.mod.common.api.pokedex.SeenPercent
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.scripting.CobblemonScripts
 import com.cobblemon.mod.common.api.spawning.context.SpawningContext
@@ -62,12 +60,8 @@ import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimati
 import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
 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.pokemon.Gender
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.pokemon.Species
-import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolution
-import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
-import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
 import com.cobblemon.mod.common.util.*
 import com.mojang.datafixers.util.Either
 import java.util.UUID
@@ -1008,82 +1002,6 @@ object MoLangFunctions {
        }
    )

-    val pokemonPropertiesFunctions: MutableList<(PokemonProperties) -> HashMap<String, java.util.function.Function<MoParams, Any>>> = mutableListOf(
-        { props ->
-            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
-
-            map.put("level") { DoubleValue(props.level?.toDouble() ?: 0) }
-            map.put("set_level") { params ->
-                props.level = params.getIntOrNull(0)
-                return@put DoubleValue.ONE
-            }
-            map.put("shiny") { DoubleValue(props.shiny) }
-            map.put("set_shiny") { params ->
-                props.shiny = params.getBooleanOrNull(0)
-                return@put DoubleValue.ONE
-            }
-            map.put("species") { props.species?.let { StringValue(it) } ?: DoubleValue.ZERO }
-            map.put("set_species") { params ->
-                props.species = params.getStringOrNull(0)
-                return@put DoubleValue.ONE
-            }
-            map.put("gender") { props.gender?.let { StringValue(it.name) } ?: DoubleValue.ZERO }
-            map.put("set_gender") { params ->
-                props.gender = params.getStringOrNull(0)?.let { Gender.valueOf(it) }
-                return@put DoubleValue.ONE
-            }
-            map.put("form") { props.form?.let { StringValue(it) } ?: DoubleValue.ZERO }
-            map.put("ivs") {
-                val ivs = props.ivs
-                if (ivs == null) {
-                    return@put DoubleValue.ZERO
-                } else {
-                    return@put ivs.struct
-                }
-            }
-            map.put("evs") {
-                val evs = props.evs
-                if (evs == null) {
-                    return@put DoubleValue.ZERO
-                } else {
-                    return@put evs.struct
-                }
-            }
-            map.put("friendship") { DoubleValue(props.friendship?.toDouble() ?: DoubleValue.ZERO) }
-            map.put("set_friendship") { params ->
-                props.friendship = params.getIntOrNull(0)
-                return@put DoubleValue.ONE
-            }
-            map.put("create") { params ->
-                val pokemon = props.create()
-                return@put pokemon.struct
-            }
-
-            map
-        }
-    )
-
-    val evolutionFunctions: MutableList<(Evolution) -> HashMap<String, java.util.function.Function<MoParams, Any>>> = mutableListOf(
-        { evolution ->
-            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
-
-            map.put("result") { evolution.result.asMoLangValue() }
-
-            if (evolution is LevelUpEvolution) {
-                map.put("is_level_up") { DoubleValue.ONE }
-            } else if (evolution is TradeEvolution) {
-                map.put("is_trade") { DoubleValue.ONE }
-            } else if (evolution is ItemInteractionEvolution) {
-                map.put("is_item") { DoubleValue.ONE }
-            }
-
-            map.put("is_optional") { DoubleValue(evolution.optional) }
-            map.put("consumes_held_item") { DoubleValue(evolution.consumeHeldItem) }
-
-            map
-        }
-    )
-
    fun Holder<Biome>.asBiomeMoLangValue() = asMoLangValue(Registries.BIOME).addFunctions(biomeFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
    fun Holder<Level>.asWorldMoLangValue() = asMoLangValue(Registries.DIMENSION).addFunctions(worldFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
    fun Holder<Block>.asBlockMoLangValue() = asMoLangValue(Registries.BLOCK).addFunctions(blockFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
@@ -1116,24 +1034,6 @@ object MoLangFunctions {
        return value
    }

-    fun PokemonProperties.asMoLangValue(): ObjectValue<PokemonProperties> {
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.asString() }
-        )
-        value.addFunctions(pokemonPropertiesFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
-        return value
-    }
-
-    fun Evolution.asMoLangValue(): ObjectValue<Evolution> {
-        val value = ObjectValue(
-            obj = this,
-            stringify = { it.toString() }
-        )
-        value.addFunctions(evolutionFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
-        return value
-    }
-
    fun PCStore.asMoLangValue(): ObjectValue<PCStore> {
        val value = ObjectValue(
            obj = this,
@@ -1270,24 +1170,6 @@ object MoLangFunctions {
        return this
    }

-    fun moLangFunctionMap(
-        vararg functions: Pair<String, (MoParams) -> MoValue>
-    ): Map<String, (MoParams) -> MoValue> {
-        return functions.toMap()
-    }
-
-    fun queryStructOf(
-        vararg functions: Pair<String, (MoParams) -> MoValue>
-    ): QueryStruct {
-        return QueryStruct(
-            hashMapOf<String, java.util.function.Function<MoParams, Any>>(
-                *functions.map { (name, func) ->
-                    name to java.util.function.Function<MoParams, Any> { params -> func(params) }
-                }.toTypedArray()
-            )
-        )
-    }
-
    fun MoLangRuntime.setup(): MoLangRuntime {
        environment.query.addStandardFunctions()
        return this
@@ -320,7 +320,7 @@ a single battle challenge and this is a dynamic party, there will also be a `q.p
            "pokemon": "weedle",
            "weight": "10",
            "selectableTimes": "2",
-            "levelVariation": "2",
+            "levelVariation": "2"
            "npcLevels": "1-8"
          },
          {
@@ -8,6 +8,8 @@

 package com.cobblemon.mod.common.api.permission

+import com.cobblemon.mod.common.command.AbandonMultiTeam
+
 object CobblemonPermissions {

    private const val COMMAND_PREFIX = "command."
@@ -16,7 +18,6 @@ object CobblemonPermissions {
    val CHANGE_EYE_HEIGHT = this.create("${COMMAND_PREFIX}changeeyeheight", PermissionLevel.ALL_COMMANDS)
    val CHANGE_SCALE_AND_SIZE = this.create("${COMMAND_PREFIX}changescaleandsize", PermissionLevel.ALL_COMMANDS)
    val CHANGE_WALK_SPEED = this.create("${COMMAND_PREFIX}changewalkspeed", PermissionLevel.ALL_COMMANDS)
-    val CHANGE_JOINT_SCALE = this.create("${COMMAND_PREFIX}changejointscale", PermissionLevel.ALL_COMMANDS)
    val CHECKSPAWNS = this.create("${COMMAND_PREFIX}checkspawns", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)

    val GET_NBT = this.create("${COMMAND_PREFIX}getnbt", PermissionLevel.ALL_COMMANDS)
@@ -63,9 +64,6 @@ object CobblemonPermissions {

    val POKEBOX = this.create("${COMMAND_PREFIX}pokebox", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)

-    val RENAMEBOX = this.create("${COMMAND_PREFIX}renamebox", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
-    val CHANGE_WALLPAPER = this.create("${COMMAND_PREFIX}changewallpaper", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
-
    val TEST_STORE = this.create("${COMMAND_PREFIX}teststore", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)

    val QUERY_LEARNSET = this.create("${COMMAND_PREFIX}querylearnset", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
@@ -86,8 +84,6 @@ object CobblemonPermissions {

    val RUN_MOLANG_SCRIPT = this.create("${COMMAND_PREFIX}runmolangscript", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)

-    val COBBLEMON_CONFIG_RELOAD = this.create("${COMMAND_PREFIX}cobblemonconfig.reload", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
-
    fun all(): Iterable<Permission> = this.permissions

    private fun create(node: String, level: PermissionLevel): Permission {
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.pokeball.catching.calculators
-
-import com.cobblemon.mod.common.api.pokeball.catching.CaptureContext
-import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.pokedex
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.entity.LivingEntity
-
-/**
- * An influencer on capture results based on Pokedex data.
- */
-interface PokedexStatusCaptureInfluencer {
-
-    /**
-     * Attempts to influence the [context] of a capture.
-     *
-     * @param thrower The [LivingEntity] that threw the Pokeball
-     * @param target The [PokemonEntity] attempting to capture.
-     * @param context The calculated [CaptureContext].
-     * @return The final [CaptureContext].
-     */
-    fun influence(thrower: LivingEntity, target: PokemonEntity, context: CaptureContext): CaptureContext {
-        if (!context.isSuccessfulCapture) {
-            return context
-        }
-        val player = thrower as? ServerPlayer ?: return context
-        val pokedex = player.pokedex()
-        val speciesId = target.pokemon.species.resourceIdentifier
-        val formName = target.pokemon.form.name
-        val hasCaughtStatus = pokedex.getOrCreateSpeciesRecord(speciesId)
-            .getOrCreateFormRecord(formName)
-            .knowledge == PokedexEntryProgress.CAUGHT
-        // In modern games when the catch is a success and the Pokémon has already been registered to the Pokédex
-        // the catch becomes a critical capture and only requires one shake
-        return if (hasCaughtStatus) {
-            CaptureContext(
-                numberOfShakes = 1,
-                isSuccessfulCapture = true,
-                isCriticalCapture = true
-            )
-        } else context
-    }
-
-}
@@ -8,6 +8,9 @@

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

+import com.bedrockk.molang.runtime.struct.VariableStruct
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.abilities.Abilities
 import com.cobblemon.mod.common.api.abilities.Ability
@@ -772,6 +775,17 @@ open class PokemonProperties {
        return pieces.joinToString(separator)
    }

+    fun asStruct(): VariableStruct {
+        val struct = VariableStruct()
+        species?.let { struct.setDirectly("species", StringValue(it)) }
+        level?.let { struct.setDirectly("level", DoubleValue(it)) }
+        shiny?.let { struct.setDirectly("shiny", DoubleValue(it)) }
+        // add more of the optional properties to the struct as doubles or strings
+        gender?.let { struct.setDirectly("gender", StringValue(it.name)) }
+        friendship?.let { struct.setDirectly("friendship", DoubleValue(it)) }
+        return struct
+    }
+
    fun updateAspects() {
        val aspects = mutableSetOf<String>()
        AspectProvider.providers.forEach { aspects.addAll(it.provide(this)) }
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.pokemon
-
-import com.cobblemon.mod.common.pokemon.Pokemon
-
-enum class PokemonSortMode(val comparator: Comparator<Pokemon?>, val reverseComparator: Comparator<Pokemon?>) {
-    NAME( { it?.getDisplayName()?.string } ),
-    LEVEL( { it?.level } ),
-    TYPE( { it?.primaryType?.name } );
-
-    constructor(mapper: (Pokemon?) -> Comparable<*>?) : this(compareBy({ it == null }, mapper),
-        compareBy<Pokemon?> { it == null }.thenComparing(compareBy(mapper).reversed()))
-
-    fun comparator(descending: Boolean) = if (descending) reverseComparator else comparator
-}
@@ -34,7 +34,6 @@ import com.cobblemon.mod.common.api.pokemon.stats.Stat
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.riding.controller.RideController
-import com.cobblemon.mod.common.api.riding.stats.RidingStatDefinition
 import com.cobblemon.mod.common.api.spawning.TimeRange
 import com.cobblemon.mod.common.api.types.ElementalType
 import com.cobblemon.mod.common.api.types.adapters.ElementalTypeAdapter
@@ -45,19 +44,18 @@ import com.cobblemon.mod.common.pokemon.SpeciesAdditions
 import com.cobblemon.mod.common.pokemon.evolution.adapters.CobblemonEvolutionAdapter
 import com.cobblemon.mod.common.pokemon.evolution.adapters.CobblemonPreEvolutionAdapter
 import com.cobblemon.mod.common.pokemon.evolution.adapters.CobblemonRequirementAdapter
-import com.cobblemon.mod.common.pokemon.evolution.adapters.LegacyItemConditionWrapperAdapter
+import com.cobblemon.mod.common.pokemon.evolution.adapters.NbtItemPredicateAdapter
+import com.cobblemon.mod.common.pokemon.evolution.predicate.NbtItemPredicate
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.util.adapters.*
-import com.cobblemon.mod.common.util.adapters.RideControllerAdapter
+import com.cobblemon.mod.common.util.adapters.riding.RideControllerAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.common.collect.HashBasedTable
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
-import net.minecraft.advancements.critereon.ItemPredicate
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.nbt.CompoundTag
-import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
@@ -98,16 +96,14 @@ object PokemonSpecies : JsonDataRegistry<Species> {
        .registerTypeAdapter(DropEntry::class.java, DropEntryAdapter)
        .registerTypeAdapter(CompoundTag::class.java, NbtCompoundAdapter)
        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
-        .registerTypeAdapter(Component::class.java, TextAdapter)
        .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(EggGroup::class.java, EggGroupAdapter)
        .registerTypeAdapter(MobEffect::class.java, RegistryElementAdapter<MobEffect>(BuiltInRegistries::MOB_EFFECT))
-        .registerTypeAdapter(ItemPredicate::class.java, LegacyItemConditionWrapperAdapter)
+        .registerTypeAdapter(NbtItemPredicate::class.java, NbtItemPredicateAdapter)
        .registerTypeAdapter(RideController::class.java, RideControllerAdapter)
-        .registerTypeAdapter(RidingStatDefinition::class.java, RidingStatDefinitionAdapter)
        .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
        .disableHtmlEscaping()
        .enableComplexMapKeySerialization()
@@ -105,9 +105,6 @@ interface Evolution : EvolutionLike {
     * @param pokemon The [Pokemon] being evolved.
     */
    fun evolve(pokemon: Pokemon): Boolean {
-        if (this.consumeHeldItem) {
-            pokemon.swapHeldItem(ItemStack.EMPTY)
-        }
        if (this.optional) {
            // All the networking is handled under the hood, see EvolutionController.
            return pokemon.evolutionProxy.server().add(this)
@@ -223,6 +220,10 @@ interface Evolution : EvolutionLike {

        this.shed(pokemon)

+        if (this.consumeHeldItem) {
+            pokemon.swapHeldItem(ItemStack.EMPTY)
+        }
+
        val ownerPlayer = pokemon.getOwnerPlayer()
        if (ownerPlayer != null && ownerPlayer.level().gameRules.getBoolean(CobblemonGameRules.DO_POKEMON_LOOT)) {
            drops.drop(
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.pokemon.stats
-
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
-import com.cobblemon.mod.common.pokemon.Pokemon
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.item.ItemStack
-
-interface EvSource {
-
-    /**
-     * The [Pokemon] being affected.
-     */
-    val pokemon: Pokemon
-
-    /**
-     * Utility function that checks if the source is an implementation of [BattleEvSource].
-     */
-    fun isBattle() = this is BattleEvSource
-
-    /**
-     * Utility function that checks if the source is an implementation of [ItemEvSource].
-     */
-    fun isInteraction() = this is ItemEvSource
-
-    /**
-     * Utility function that checks if the source is an implementation of [SidemodEvSource].
-     */
-    fun isSidemod() = this is SidemodEvSource
-
-}
-
-/**
- * Triggered by sidemods.
- *
- * @property sidemodId The mod ID of the sidemod triggering this source.
- * @property pokemon See [EvSource.pokemon].
- */
-open class SidemodEvSource(
-    val sidemodId: String,
-    override val pokemon: Pokemon
-) : EvSource
-
-/**
- * An Ev source fired when using Ev mutating items.
- *
- * @property player The [ServerPlayer] using the item.
- * @property stack The [ItemStack] being consumed.
- * @property pokemon See [EvSource.pokemon].
- */
-open class ItemEvSource(
-    val player: ServerPlayer,
-    val stack: ItemStack,
-    override val pokemon: Pokemon
-) : EvSource
-
-/**
- * An Ev source fired in battles.
- *
- * @property battle The associated [PokemonBattle].
- * @property facedPokemon The [BattlePokemon]s that the [pokemon] faced.
- * @property pokemon See [EvSource.pokemon], comes from the original [BattlePokemon.effectedPokemon].
- */
-open class BattleEvSource(
-    val battle: PokemonBattle,
-    val facedPokemon: List<BattlePokemon>,
-    override val pokemon: Pokemon
-) : EvSource
@@ -45,15 +45,4 @@ open class CancelableObservable<T : Cancelable> : EventObservable<T>() {
            }
        }
    }
-
-    inline fun postThenFinally(event: T, ifCanceled: (T) -> Unit = {}, finally: (T) -> Unit = {},ifSucceeded: (T) -> Unit) {
-        post(event) {
-            if (it.isCanceled) {
-                ifCanceled(it)
-            } else {
-                ifSucceeded(it)
-            }
-            finally(it)
-        }
-    }
 }
@@ -13,7 +13,7 @@ import net.minecraft.world.entity.PlayerRideableJumping
 /**
 * Represents an entity that supports riding.
 *
- * @since 1.7.0
+ * @since 1.5.0
 */
 interface Rideable : PlayerRideableJumping {

@@ -10,15 +10,19 @@ package com.cobblemon.mod.common.api.riding

 import com.bedrockk.molang.runtime.MoLangRuntime
 import com.bedrockk.molang.runtime.value.DoubleValue
+import com.cobblemon.mod.common.Rollable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.riding.controller.RideController
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.ChatFormatting
+import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
+import kotlin.math.sin

 data class RidingManager(val entity: PokemonEntity) {
    var lastSpeed = 0F
@@ -58,8 +62,11 @@ data class RidingManager(val entity: PokemonEntity) {

        val pose = controller.pose(entity)
        entity.entityData.set(PokemonEntity.POSE_TYPE, pose)
+        //val speedPlayer = driver.deltaMovement.horizontalDistance()
+        //driver.displayClientMessage(Component.literal("Speed player: ").withStyle { it.withColor(ChatFormatting.GREEN) }.append(Component.literal("$speedPlayer b/t")), true)
+        val speedEntity = entity.deltaMovement.horizontalDistance()
+        driver.displayClientMessage(Component.literal("Speed Entity: ").withStyle { it.withColor(ChatFormatting.GREEN) }.append(Component.literal("${String.format("%.2f", speedEntity)} b/t")), true)

-//        driver.displayClientMessage(Component.literal("Speed: ").withStyle { it.withColor(ChatFormatting.GREEN) }.append(Component.literal("$lastSpeed b/t")), true)
    }

    fun speed(entity: PokemonEntity, driver: Player): Float {
@@ -111,18 +118,32 @@ data class RidingManager(val entity: PokemonEntity) {
        return controller.shouldRoll(entity)
    }

-    fun shouldRotatePlayerHead(entity: PokemonEntity): Boolean {
-        val controller = getController(entity) ?: return false
-        return controller.shouldRotatePlayerHead()
+    fun rotationOnMouseXY( entity: PokemonEntity, driver: Player, yMouse: Double, xMouse: Double ){
+        val controller = getController(entity) ?: return
+        controller.rotationOnMouseXY( entity, driver, yMouse, xMouse )
    }

-    fun shouldRotatePokemonHead(entity: PokemonEntity): Boolean {
+    /**
+     * Determines whether mouse input will affect the rotation of
+     * the rollable object
+     */
+    fun useMouseInputRoll(entity: PokemonEntity): Boolean {
+        val controller = getController(entity) ?: return true
+        return controller.useMouseInputRoll(entity)
+    }
+
+    fun turnOffOnGround(entity: PokemonEntity): Boolean {
        val controller = getController(entity) ?: return false
-        return controller.shouldRotatePokemonHead()
+        return controller.turnOffOnGround(entity)
+    }
+
+    fun angRollVel(entity: PokemonEntity, driver: Player): Vec3 {
+        val controller = getController(entity) ?: return Vec3(0.0, 0.0, 0.0)
+        return controller.angRollVel(entity, driver)
    }

-    //FIXME: Make this not just be false for all controllers lol
    fun dismountOnShift(): Boolean {
-        return false
+        val controller = getController(entity) ?: return false
+        return controller.dismountOnShift(entity)
    }
 }
@@ -10,9 +10,7 @@ package com.cobblemon.mod.common.api.riding

 import com.bedrockk.molang.Expression
 import com.cobblemon.mod.common.api.riding.controller.RideController
-import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.api.riding.stats.RidingStatDefinition
-import com.cobblemon.mod.common.util.adapters.RideControllerAdapter
+import com.cobblemon.mod.common.util.adapters.riding.RideControllerAdapter
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.getString
 import com.cobblemon.mod.common.util.readIdentifier
@@ -21,17 +19,12 @@ import com.cobblemon.mod.common.util.writeString
 import net.minecraft.network.RegistryFriendlyByteBuf

 class RidingProperties(
-    val stats: Map<RidingStat, RidingStatDefinition> = mapOf(),
    val seats: List<Seat> = listOf(),
    val conditions: List<Expression> = listOf(),
    val controller: RideController? = null
 ) {
    companion object {
        fun decode(buffer: RegistryFriendlyByteBuf): RidingProperties {
-            val stats: Map<RidingStat, RidingStatDefinition> = buffer.readMap(
-                { buffer.readEnum<RidingStat>(RidingStat::class.java) },
-                { RidingStatDefinition.decode(buffer) }
-            )
            val seats: List<Seat> = buffer.readList { _ -> Seat.decode(buffer) }
            val conditions = buffer.readList { buffer.readString().asExpression() }
            val controller = buffer.readNullable { _ ->
@@ -41,7 +34,7 @@ class RidingProperties(
                return@readNullable controller
            }

-            return RidingProperties(stats = stats, seats = seats, conditions = conditions, controller = controller)
+            return RidingProperties(seats = seats, conditions = conditions, controller = controller)
        }
    }

@@ -49,22 +42,8 @@ class RidingProperties(
        get() = seats.isNotEmpty() && controller != null

    fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeMap(
-            stats,
-            { _, stat -> buffer.writeEnum(stat) },
-            { _, stat -> stat.encode(buffer) }
-        )
        buffer.writeCollection(seats) { _, seat -> seat.encode(buffer) }
        buffer.writeCollection(conditions) { _, condition -> buffer.writeString(condition.getString()) }
        buffer.writeNullable(controller) { _, controller -> controller.encode(buffer) }
    }
-
-    fun calculate(stat: RidingStat, style: RidingStyle, boosts: Int): Float {
-        val definitions = stats[stat] ?: return 0F
-        return definitions.calculate(style, boosts)
-    }
-
-    fun hasStat(stat: RidingStat, style: RidingStyle): Boolean {
-        return stats[stat]?.ranges?.containsKey(style) == true
-    }
 }
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding
-
-/**
- * A general medium for riding. Mainly used for categorizing which stats to pull from and for
- * presenting a simplified view of riding to users.
- *
- * @author Hiroku
- * @since February 17th, 2025
- */
-enum class RidingStyle {
-    LAND,
-    LIQUID,
-    AIR
-}
@@ -20,7 +20,7 @@ import net.minecraft.world.phys.Vec3
 * Seat Properties are responsible for the base information that would then be used to construct a Seat on an entity.
 */
 data class Seat(
-    val locator: String = "seat_1",
+    val locator: String = "seat1",
    val offset: Vec3 = Vec3.ZERO,
    val poseOffsets: MutableList<SeatPoseOffset> = mutableListOf(),
    val poseAnimations: MutableList<SeatPoseAnimations> = mutableListOf()
@@ -8,6 +8,7 @@

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

+import com.cobblemon.mod.common.Rollable
 import com.cobblemon.mod.common.api.net.Decodable
 import com.cobblemon.mod.common.api.net.Encodable
 import com.cobblemon.mod.common.api.riding.RidingState
@@ -29,7 +30,7 @@ import net.minecraft.world.phys.Vec3
 * the pokemon experience drifting after movement, or generic movement. It's up to the
 * controller to decide how the pokemon behaves.
 *
- * @since 1.7.0
+ * @since x.x.x
 */
 interface RideController : Encodable, Decodable {

@@ -71,6 +72,14 @@ interface RideController : Encodable, Decodable {
     */
    fun rotation(entity: PokemonEntity, driver: LivingEntity) : Vec2

+    /**
+     * Sets the change current change in rotation for that tick in three
+     * dimensions
+     */
+    fun angRollVel(entity: PokemonEntity, driver: Player): Vec3 {
+        return Vec3(0.0, 0.0, 0.0)
+    }
+
    fun clampPassengerRotation(entity: PokemonEntity, driver: LivingEntity) {}

    fun updatePassengerRotation(entity: PokemonEntity, driver: LivingEntity) {
@@ -91,10 +100,22 @@ interface RideController : Encodable, Decodable {

    fun shouldRoll(entity: PokemonEntity): Boolean = false

-    fun getRuntime(entity: PokemonEntity) = entity.riding.runtime
+    fun useMouseInputRoll(entity: PokemonEntity): Boolean = false

-    fun shouldRotatePokemonHead(): Boolean = false
-    fun shouldRotatePlayerHead(): Boolean = false
+    //If function is not overwritten by controllers then just perform the defualt
+    //rolling function
+    fun rotationOnMouseXY( entity: PokemonEntity, driver: Player, yMouse: Double, xMouse: Double ){
+        if(driver !is Rollable) return
+
+        val rollable = driver as Rollable
+        rollable.rotate(0.0f, yMouse.toFloat(), xMouse.toFloat())
+    }
+
+    fun turnOffOnGround(entity: PokemonEntity): Boolean = false
+
+    fun dismountOnShift(entity: PokemonEntity): Boolean = false
+
+    fun getRuntime(entity: PokemonEntity) = entity.riding.runtime

    fun <T : RidingState> getState(entity: PokemonEntity, constructor: (PokemonEntity) -> T): T {
        return entity.riding.getState(key, constructor)
@@ -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.api.riding.stats
-
-import com.cobblemon.mod.common.api.berry.Flavor
-import com.cobblemon.mod.common.util.lang
-import net.minecraft.network.chat.Component
-
-/**
- * A stat that is used for riding Pokémon. The exact implementation of each of these depends on the [com.cobblemon.mod.common.api.riding.controller.RideController].
- *
- * @author Hiroku
- * @since February 17th, 2025
- */
-enum class RidingStat(
-    val flavour: Flavor
-) {
-    SPEED(Flavor.SWEET),
-    ACCELERATION(Flavor.SPICY),
-    SKILL(Flavor.DRY),
-    JUMP(Flavor.BITTER),
-    STAMINA(Flavor.SOUR);
-
-    companion object {
-        fun getByName(name: String) = RidingStat.entries.firstOrNull { it.name.equals(name, ignoreCase = true) }
-    }
-
-    val displayName: Component
-        get() = lang("riding.stat.${name.lowercase()}.name")
-    val description: Component
-        get() = lang("riding.stat.${name.lowercase()}.desc")
-}
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.riding.stats
-
-import com.cobblemon.mod.common.api.riding.RidingStyle
-import com.cobblemon.mod.common.net.IntSize
-import com.cobblemon.mod.common.util.readSizedInt
-import com.cobblemon.mod.common.util.readText
-import com.cobblemon.mod.common.util.writeSizedInt
-import com.cobblemon.mod.common.util.writeText
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.network.chat.Component
-
-/**
- * The definition of all the different information related to a specific [RidingStat] on a Pokémon species.
- *
- * @author Hiroku
- * @since February 17th, 2025
- */
-class RidingStatDefinition {
-    // This object gets read from a JSON adapter manually (field-by-field) so don't add fields without updating the adapter.
-
-    /** A map from [RidingStyle] to a minimum and maximum value for this stat. */
-    val ranges = mutableMapOf<RidingStyle, IntRange>()
-    /** Display name for the stat, if null falls back to [RidingStat.displayName]. */
-    var displayName: Component? = null
-    /** Description for the stat, if null falls back to [RidingStat.description]. */
-    var description: Component? = null
-
-    fun calculate(style: RidingStyle, aprijuiceBoost: Int): Float {
-        val range = ranges[style] ?: ranges[RidingStyle.LAND] ?: return 0F
-        val boostQuotient = aprijuiceBoost / 255F
-        return range.first + (range.last - range.first) * boostQuotient
-    }
-
-    fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeNullable(displayName) { _, it -> buffer.writeText(it) }
-        buffer.writeNullable(description) { _, it -> buffer.writeText(it) }
-        buffer.writeMap(
-            ranges,
-            { _, it -> buffer.writeEnum(it) },
-            { _, it ->
-                buffer.writeSizedInt(IntSize.U_BYTE, it.first)
-                buffer.writeSizedInt(IntSize.U_BYTE, it.last)
-            }
-        )
-    }
-
-    companion object {
-        fun decode(buffer: RegistryFriendlyByteBuf): RidingStatDefinition {
-            val displayName = buffer.readNullable { buffer.readText() }
-            val description = buffer.readNullable { buffer.readText() }
-            val ranges = buffer.readMap<RidingStyle, IntRange>(
-                { buffer.readEnum<RidingStyle>(RidingStyle::class.java) },
-                { IntRange(buffer.readSizedInt(IntSize.U_BYTE), buffer.readSizedInt(IntSize.U_BYTE)) }
-            )
-            return RidingStatDefinition().apply {
-                this.displayName = displayName
-                this.description = description
-                this.ranges.putAll(ranges)
-            }
-        }
-    }
-}
@@ -11,9 +11,6 @@ package com.cobblemon.mod.common.api.serialization
 import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
-import com.google.gson.JsonPrimitive
-import com.google.gson.JsonSerializationContext
-import com.google.gson.JsonSerializer
 import java.lang.reflect.Type

 /**
@@ -22,13 +19,6 @@ import java.lang.reflect.Type
 * @author Hiroku
 * @since July 18th, 2022
 */
-class StringIdentifiedObjectAdapter<T>(
-    val fromString: (String) -> T,
-    val toString: ((T) -> String)? = null,
-) : JsonDeserializer<T>, JsonSerializer<T> {
+class StringIdentifiedObjectAdapter<T>(val fromString: (String) -> T) : JsonDeserializer<T> {
    override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext) = fromString(json.asString)
-    override fun serialize(src: T, type: Type?, ctx: JsonSerializationContext?): JsonElement? {
-        val stringValue = toString?.invoke(src) ?: throw IllegalStateException("No toString function provided for serialization.")
-        return JsonPrimitive(stringValue)
-    }
 }
@@ -83,9 +83,8 @@ object BestSpawner {
    var defaultPokemonDespawner: Despawner<PokemonEntity> = CobblemonAgingDespawner(getAgeTicks = { it.ticksLived })
    lateinit var fishingSpawner: FishingSpawner

-    fun init() {
+    fun loadConfig() {
        LOGGER.info("Starting the Best Spawner...")
-
        SpawningCondition.register(BasicSpawningCondition.NAME, BasicSpawningCondition::class.java)
        SpawningCondition.register(AreaSpawningCondition.NAME, AreaSpawningCondition::class.java)
        SpawningCondition.register(SubmergedSpawningCondition.NAME, SubmergedSpawningCondition::class.java)
@@ -95,7 +94,6 @@ object BestSpawner {
        SpawningCondition.register(FishingSpawningCondition.NAME, FishingSpawningCondition::class.java)

        LOGGER.info("Loaded ${SpawningCondition.conditionTypes.size} spawning condition types.")
-
        SpawningContextCalculator.register(GroundedSpawningContextCalculator)
        SpawningContextCalculator.register(SeafloorSpawningContextCalculator)
        SpawningContextCalculator.register(LavafloorSpawningContextCalculator)
@@ -115,23 +113,14 @@ object BestSpawner {
        SpawnDetail.registerSpawnType(name = NPCSpawnDetail.TYPE, NPCSpawnDetail::class.java)
        LOGGER.info("Loaded ${SpawnDetail.spawnDetailTypes.size} spawn detail types.")

-        loadConfig()
+        config = BestSpawnerConfig.load()

        SpawnDetailPresets.registerPresetType(BasicSpawnDetailPreset.NAME, BasicSpawnDetailPreset::class.java)
        SpawnDetailPresets.registerPresetType(PokemonSpawnDetailPreset.NAME, PokemonSpawnDetailPreset::class.java)
    }

-    fun loadConfig() {
-        config = BestSpawnerConfig.load()
-    }
-
-    fun reloadConfig() {
-        loadConfig()
-        spawnerManagers.forEach(SpawnerManager::onConfigReload)
-    }
-
    fun onServerStarted() {
        spawnerManagers.forEach(SpawnerManager::onServerStarted)
        fishingSpawner = FishingSpawner()
    }
-}
+}
@@ -96,4 +96,4 @@ object SpawnDetailPresets : JsonDataRegistry<SpawnDetailPreset> {
        this.presets = data.toMutableMap()
        Cobblemon.LOGGER.info("Loaded ${presets.size} spawn detail presets.")
    }
-}
+}
@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.spawning

 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
-import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner
 import com.cobblemon.mod.common.api.spawning.spawner.Spawner
 import com.cobblemon.mod.common.api.spawning.spawner.TickingSpawner
 import com.cobblemon.mod.common.util.server
@@ -59,12 +58,6 @@ open class SpawnerManager {
        }
    }

-    open fun onConfigReload() {
-        spawners.filterIsInstance<PlayerSpawner>().forEach {
-            it.ticksBetweenSpawns = Cobblemon.config.ticksBetweenSpawnAttempts
-        }
-    }
-
    open fun onServerStarted() {
        spawners.clear()
    }
@@ -161,4 +161,4 @@ abstract class SpawningCondition<T : SpawningContext> {
            return false
        return true
    }
-}
+}
@@ -221,4 +221,4 @@ abstract class SpawningContext {
        }
        return false
    }
-}
+}
@@ -64,4 +64,4 @@ open class SpawningContextInput(
    val cause: SpawnCause,
    /** The [Level] the spawning context exists in. */
    val world: ServerLevel
-)
+)
@@ -8,11 +8,9 @@

 package com.cobblemon.mod.common.api.spawning.detail

-import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.Cobblemon.config
 import com.cobblemon.mod.common.api.drop.DropTable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.spawning.context.SpawningContext
@@ -22,8 +20,8 @@ import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.lang
 import com.google.gson.annotations.SerializedName
-import kotlin.math.ceil
 import net.minecraft.network.chat.MutableComponent
+import kotlin.math.ceil

 /**
 * A [SpawnDetail] for spawning a [PokemonEntity].
@@ -71,9 +69,7 @@ class PokemonSpawnDetail : SpawnDetail() {
    }

    override fun autoLabel() {
-        struct.addFunction("pokemon") { pokemon.asMoLangValue() }
-        struct.addFunction("min_level") { DoubleValue(getDerivedLevelRange().start.toDouble()) }
-        struct.addFunction("max_level") { DoubleValue(getDerivedLevelRange().endInclusive.toDouble()) }
+        val pokemonStruct = pokemon.asStruct()
        if (pokemon.species != null) {
            val species = PokemonSpecies.getByIdentifier(pokemon.species!!.asIdentifierDefaultingNamespace())
            if (species != null) {
@@ -92,6 +88,7 @@ class PokemonSpawnDetail : SpawnDetail() {
            }
        }

+        struct.setDirectly("pokemon", pokemonStruct)
        super.autoLabel()
    }

@@ -8,12 +8,12 @@

 package com.cobblemon.mod.common.api.spawning.detail

-import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.bedrockk.molang.runtime.struct.ArrayStruct
+import com.bedrockk.molang.runtime.struct.VariableStruct
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.api.ModDependant
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.queryStructOf
 import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.condition.CompositeSpawningCondition
 import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
@@ -21,7 +21,6 @@ import com.cobblemon.mod.common.api.spawning.context.RegisteredSpawningContext
 import com.cobblemon.mod.common.api.spawning.context.SpawningContext
 import com.cobblemon.mod.common.api.spawning.multiplier.WeightMultiplier
 import com.cobblemon.mod.common.api.text.text
-import com.cobblemon.mod.common.util.asArrayValue
 import com.cobblemon.mod.common.util.asTranslated

 /**
@@ -56,21 +55,21 @@ abstract class SpawnDetail : ModDependant {

    var labels = mutableListOf<String>()

-    val struct: QueryStruct = queryStructOf(
-        "weight" to { DoubleValue(weight) },
-        "percentage" to { DoubleValue(percentage) },
-        "id" to { StringValue(id) },
-        "bucket" to { StringValue(bucket.name) },
-        "width" to { DoubleValue(width.toDouble()) },
-        "height" to { DoubleValue(height.toDouble()) },
-        "context" to { StringValue(context.name) },
-        "labels" to { labels.asArrayValue { StringValue(it) } }
-    )
+    val struct: VariableStruct = VariableStruct()

    override var neededInstalledMods = listOf<String>()
    override var neededUninstalledMods = listOf<String>()

-    open fun autoLabel() {}
+    open fun autoLabel() {
+        struct.setDirectly("weight", DoubleValue(weight.toDouble()))
+        struct.setDirectly("percentage", DoubleValue(percentage.toDouble()))
+        struct.setDirectly("id", StringValue(id))
+        struct.setDirectly("bucket", StringValue(bucket.name))
+        struct.setDirectly("width", DoubleValue(width.toDouble()))
+        struct.setDirectly("height", DoubleValue(height.toDouble()))
+        struct.setDirectly("context", StringValue(context.name))
+        struct.setDirectly("labels", ArrayStruct(labels.mapIndexed { index, s -> "$index" to StringValue(s) }.toMap()))
+    }

    open fun getName() = displayName?.asTranslated() ?: id.text()

@@ -104,4 +103,4 @@ abstract class SpawnDetail : ModDependant {
    }

    abstract fun doSpawn(ctx: SpawningContext): SpawnAction<*>
-}
+}
@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.api.spawning.rules.component
 import com.bedrockk.molang.Expression
 import com.bedrockk.molang.ast.BooleanExpression
 import com.bedrockk.molang.runtime.MoLangRuntime
+import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.spawning.context.SpawningContext
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
@@ -33,7 +34,7 @@ class FilterRuleComponent : SpawnRuleComponent {

    val spawnSelector: SpawnDetailSelector = AllSpawnDetailSelector
    val contextSelector: SpawningContextSelector = AllSpawningContextSelector
-    val allow: Expression = BooleanExpression(true)
+    val allow: Expression = BooleanExpression(false)

    override fun affectSpawnable(detail: SpawnDetail, ctx: SpawningContext): Boolean {
        return if (spawnSelector.selects(detail) && contextSelector.selects(ctx)) {
@@ -167,10 +167,10 @@ open class PlayerPartyStore(
        }

        // Shoulder validation code
-        if (player.shoulderEntityLeft.isPokemonEntity() && !validateShoulder(player, true)) {
+        if (player.shoulderEntityLeft.isPokemonEntity() && !validateShoulder(player.shoulderEntityLeft, true)) {
            player.respawnEntityOnShoulder(player.shoulderEntityLeft)
        }
-        if (player.shoulderEntityRight.isPokemonEntity() && !validateShoulder(player, false)) {
+        if (player.shoulderEntityRight.isPokemonEntity() && !validateShoulder(player.shoulderEntityRight, false)) {
            player.respawnEntityOnShoulder(player.shoulderEntityRight)
        }

@@ -182,14 +182,11 @@ open class PlayerPartyStore(
        }
    }

-    private fun validateShoulder(player: ServerPlayer, isLeft: Boolean): Boolean {
-        val shoulderEntity = if(isLeft) player.shoulderEntityLeft else player.shoulderEntityRight
+    fun validateShoulder(shoulderEntity: CompoundTag, isLeft: Boolean): Boolean {
        val pokemon = find { it.uuid == shoulderEntity.getCompound("Pokemon").getUUID(DataKeys.POKEMON_UUID) }
-        // No longer valid if (in order): not in party, not the correct shoulder, no longer shoulder mountable
-        if (pokemon == null || (pokemon.state as? ShoulderedState)?.isLeftShoulder != isLeft || !pokemon.form.shoulderMountable) {
+        if (pokemon == null || (pokemon.state as? ShoulderedState)?.isLeftShoulder != isLeft) {
            return false
        }
-        player.updateShoulderNbt(pokemon)
        return true
    }

@@ -8,19 +8,16 @@

 package com.cobblemon.mod.common.api.storage.pc

-import com.cobblemon.mod.common.api.pokemon.PokemonSortMode
 import com.cobblemon.mod.common.api.reactive.Observable.Companion.stopAfter
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.storage.InvalidSpeciesException
 import com.cobblemon.mod.common.api.storage.StoreCoordinates
-import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCBoxPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCBoxPokemonPacket
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.JsonObject
 import net.minecraft.core.RegistryAccess
 import net.minecraft.nbt.CompoundTag
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer

 /**
@@ -37,18 +34,6 @@ open class PCBox(val pc: PCStore) : Iterable<Pokemon> {

    protected var emit = true

-    var name : String? = null
-        set(value) {
-            field = value
-            if (emit) boxChangeEmitter.emit(Unit)
-        }
-
-    var wallpaper : ResourceLocation = cobblemonResource("textures/gui/pc/pc_screen_overlay.png")
-        set(value) {
-            field = value
-            if (emit) boxChangeEmitter.emit(Unit)
-        }
-
    protected val pokemon = Array<Pokemon?>(POKEMON_PER_BOX) { null }

    open operator fun get(index: Int): Pokemon? {
@@ -103,13 +88,6 @@ open class PCBox(val pc: PCStore) : Iterable<Pokemon> {
        boxChangeEmitter.subscribe { pc.pcChangeObservable.emit(Unit) }
    }

-    fun sort(sortMode: PokemonSortMode, descending: Boolean) {
-        pokemon.sortWith(sortMode.comparator(descending))
-        pokemon.forEachIndexed { slot, pokemon ->
-            pokemon?.storeCoordinates?.set(StoreCoordinates(pc, PCPosition(boxNumber, slot)))
-        }
-    }
-
    fun trackPokemon(pokemon: Pokemon) {
        pokemon.getChangeObservable()
            .pipe(
@@ -122,14 +100,10 @@ open class PCBox(val pc: PCStore) : Iterable<Pokemon> {
    }

    fun sendTo(player: ServerPlayer) {
-        SetPCBoxPacket(this).sendToPlayer(player)
+        SetPCBoxPokemonPacket(this).sendToPlayer(player)
    }

    open fun saveToNBT(nbt: CompoundTag, registryAccess: RegistryAccess): CompoundTag {
-        name?.let {
-            nbt.putString(DataKeys.STORE_BOX_NAME, it)
-        }
-        nbt.putString(DataKeys.STORE_BOX_WALLPAPER, wallpaper.toString())
        for (slot in 0 until POKEMON_PER_BOX) {
            val pokemon = pokemon[slot] ?: continue
            nbt.put(DataKeys.STORE_SLOT + slot, pokemon.saveToNBT(registryAccess))
@@ -138,10 +112,6 @@ open class PCBox(val pc: PCStore) : Iterable<Pokemon> {
    }

    open fun saveToJSON(json: JsonObject, registryAccess: RegistryAccess): JsonObject {
-        name?.let {
-            json.addProperty(DataKeys.STORE_BOX_NAME, it)
-        }
-        json.addProperty(DataKeys.STORE_BOX_WALLPAPER, wallpaper.toString())
        for (slot in 0 until POKEMON_PER_BOX) {
            val pokemon = pokemon[slot] ?: continue
            json.add(DataKeys.STORE_SLOT + slot, pokemon.saveToJSON(registryAccess))
@@ -149,16 +119,7 @@ open class PCBox(val pc: PCStore) : Iterable<Pokemon> {
        return json
    }

-
    open fun loadFromJSON(json: JsonObject, registryAccess: RegistryAccess): PCBox {
-        if (json.has(DataKeys.STORE_BOX_NAME)) {
-            name = json.getAsJsonPrimitive(DataKeys.STORE_BOX_NAME).asString
-        }
-
-        if (json.has(DataKeys.STORE_BOX_WALLPAPER)) {
-            wallpaper = ResourceLocation.parse(json.getAsJsonPrimitive(DataKeys.STORE_BOX_WALLPAPER).asString)
-        }
-
        for (slot in 0 until POKEMON_PER_BOX) {
            if (json.has(DataKeys.STORE_SLOT + slot)) {
                val pokemonJson = json.getAsJsonObject(DataKeys.STORE_SLOT + slot)
@@ -173,14 +134,6 @@ open class PCBox(val pc: PCStore) : Iterable<Pokemon> {
    }

    open fun loadFromNBT(nbt: CompoundTag, registryAccess: RegistryAccess): PCBox {
-        if (nbt.contains(DataKeys.STORE_BOX_NAME)) {
-            name = nbt.getString(DataKeys.STORE_BOX_NAME)
-        }
-
-        if (nbt.contains(DataKeys.STORE_BOX_WALLPAPER)) {
-            wallpaper = ResourceLocation.parse(nbt.getString(DataKeys.STORE_BOX_WALLPAPER))
-        }
-
        for (slot in 0 until POKEMON_PER_BOX) {
            if (nbt.contains(DataKeys.STORE_SLOT + slot)) {
                val pokemonNBT = nbt.getCompound(DataKeys.STORE_SLOT + slot)
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.storage.pc.search
-
-import com.cobblemon.mod.common.pokemon.Pokemon
-
-/**
- * Functional interface used in [Search]es
- */
-fun interface PokemonFilter {
-    fun test(pokemon: Pokemon): Boolean
-
-    fun inverted(): PokemonFilter {
-        return PokemonFilter { pokemon -> !this.test(pokemon) }
-    }
-}
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.storage.pc.search
-
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.pokemon.Pokemon
-import java.util.HashSet
-import java.util.Locale
-import java.util.UUID
-
-/**
- * Client-side class containing currently applied filters, and cached results of which Pokémon pass or fail those filters.
- * Used in [com.cobblemon.mod.common.client.gui.pc.PCGUI]
- */
-class Search(
-    private val filters: Set<PokemonFilter>,
-    private val passed: MutableSet<UUID> = HashSet(),
-    private val failed: MutableSet<UUID> = HashSet()
-) {
-    companion object {
-        val DEFAULT = Search(setOf())
-        fun of(search: String): Search {
-            if (search.isBlank()) return DEFAULT
-
-            val split = search.lowercase(Locale.ROOT).trim().split(" ")
-            val filters = HashSet<PokemonFilter>()
-
-            for (piece in split) {
-                var filter = piece
-                val inverted = filter.startsWith("!")
-                if (inverted) {
-                    filter = filter.substring(1)
-                }
-                
-                val pokemonFilter: PokemonFilter = when (filter) {
-                    "holding" -> PokemonFilter { pokemon -> !pokemon.heldItem().isEmpty }
-                    "fainted" -> PokemonFilter { pokemon -> pokemon.isFainted() }
-                    "legendary" -> PokemonFilter { pokemon -> pokemon.isLegendary() }
-                    "mythical" -> PokemonFilter { pokemon -> pokemon.isMythical() }
-                    "ultrabeast", "ultra_beast" -> PokemonFilter { pokemon -> pokemon.isUltraBeast() }
-                    else -> PokemonFilter { pokemon -> PokemonProperties.parse(filter).matches(pokemon) }
-                }
-
-                if (inverted) {
-                    filters.add(pokemonFilter.inverted())
-                } else {
-                    filters.add(pokemonFilter)
-                }
-            }
-
-            return Search(filters)
-        }
-    }
-
-    fun passes(pokemon: Pokemon?): Boolean {
-        if (pokemon == null) return false
-        val uuid = pokemon.uuid
-        if (passed.contains(uuid)) return true
-        if (failed.contains(uuid)) return false
-        val passes = filters.all { it.test(pokemon) }
-        val set = if (passes) passed else failed
-        set.add(uuid)
-        return passes
-    }
-}
@@ -111,9 +111,6 @@ object CobblemonItemTags {
    @JvmField val EXPERIENCE_SHARE = create("held/experience_share")
    @JvmField val IS_FRIENDSHIP_BOOSTER = create("is_friendship_booster")
    @JvmField val ANY_HELD_ITEM = create("held/is_held_item")
-    @JvmField val BLACKLISTED_ITEMS_TO_HOLD = create("held/blacklisted_items_to_hold")
-    @JvmField val WHITELISTED_ITEMS_TO_HOLD = create("held/whitelisted_items_to_hold")
-
    /** Tag that flags items as being able to "create" [CobblemonItems.LEFTOVERS]. */
    @JvmField val LEAVES_LEFTOVERS = create("held/leaves_leftovers")
    @JvmField val LUCKY_EGG = create("held/lucky_egg")
@@ -124,10 +121,7 @@ object CobblemonItemTags {
    @JvmField val POWER_LENS = create("held/power_lens")
    @JvmField val POWER_WEIGHT = create("held/power_weight")
    @JvmField val TERRAIN_SEEDS = create("held/terrain_seeds")
-    //Held Item Visibility Tags
-    @JvmField val WEARABLE_FACE_ITEMS = create("held/visibility/face")
-    @JvmField val WEARABLE_HAT_ITEMS = create("held/visibility/hat")
-    @JvmField val HIDDEN_ITEMS = create("held/visibility/hidden")
+


    private fun create(path: String) = TagKey.create(Registries.ITEM, cobblemonResource(path))
@@ -109,7 +109,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
            determineMutation(world, random, pos, newState)
        }

-        world.setBlock(pos, newState, UPDATE_CLIENTS)
+        world.setBlock(pos, newState, Block.UPDATE_CLIENTS)
        convertMulchToEntity(world, newState, pos)
        treeEntity.goToNextStageTimer(FRUIT_AGE - curAge)
        treeEntity.setChanged()
@@ -102,7 +102,7 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon
        mulchDuration = if (newDuration <= 0) {
            mulchVariant = MulchVariant.NONE
            this.setChanged()
-            world.sendBlockUpdated(pos, state, state, UPDATE_CLIENTS)
+            world.sendBlockUpdated(pos, state, state, Block.UPDATE_CLIENTS)
            0
        } else {
            newDuration
@@ -313,10 +313,6 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon
        val berryPoints = arrayListOf<Pair<Berry, GrowthPoint>>()
        val sequenceIndices = growthPointSequence.toCharArray().filter { it.digitToInt(16) < baseBerry.growthPoints.size }
        for ((index, identifier) in this.growthPoints.withIndex()) {
-            // Don't brick old broken worlds that had too many
-            if (index >= sequenceIndices.size) {
-                break
-            }
            val berry = Berries.getByIdentifier(identifier) ?: continue
            val sequenceIndexHex = sequenceIndices[index].digitToInt(16)
            berryPoints.add(berry to baseBerry.growthPoints[sequenceIndexHex])
@@ -42,7 +42,7 @@ open class FossilMultiblockEntity(
            if(masterBlockPos != null && masterBlockPos != blockPos) {
                val chunkPos = ChunkPos(masterBlockPos)
                if (level?.chunkSource?.hasChunk(chunkPos.x, chunkPos.z) == true) {
-                    val entity: FossilMultiblockEntity? = level?.getBlockEntity(masterBlockPos) as? FossilMultiblockEntity?
+                    val entity: FossilMultiblockEntity? = level?.getBlockEntity(masterBlockPos) as FossilMultiblockEntity?
                    field = entity?.multiblockStructure
                }
            }
@@ -308,12 +308,9 @@ class HealingMachineBlockEntity(
            } else {
                // Recharging
                if (blockEntity.healingCharge < blockEntity.maxCharge) {
-                    val secondsToChargeHealingMachine = (Cobblemon.config.secondsToChargeHealingMachine).coerceAtLeast(0.0)
-                    val totalTicks = secondsToChargeHealingMachine * 20
-                    val chargePerTick = if (totalTicks > 0) blockEntity.maxCharge / totalTicks else 0.0
-
+                    val chargePerTick = (Cobblemon.config.chargeGainedPerTick).coerceAtLeast(0F)
                    blockEntity.healingCharge =
-                        (blockEntity.healingCharge + chargePerTick.toFloat()).coerceIn(0F..blockEntity.maxCharge)
+                        (blockEntity.healingCharge + chargePerTick).coerceIn(0F..blockEntity.maxCharge)
                    blockEntity.updateBlockChargeLevel()
                    blockEntity.updateRedstoneSignal()
                    blockEntity.markUpdated()
@@ -40,8 +40,13 @@ import com.cobblemon.mod.common.client.render.item.PokemonItemRenderer
 import com.cobblemon.mod.common.client.render.layer.PokemonOnShoulderRenderer
 import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockAnimationRepository
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.BerryModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.BlockEntityModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.FossilModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.GenericBedrockEntityModelRepository
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.MiscModelRepository
-import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.NPCModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokeBallModelRepository
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository
 import com.cobblemon.mod.common.client.render.npc.NPCRenderer
 import com.cobblemon.mod.common.client.render.pokeball.PokeBallRenderer
 import com.cobblemon.mod.common.client.render.pokemon.PokemonRenderer
@@ -72,12 +77,10 @@ import net.minecraft.client.renderer.blockentity.SignRenderer
 import net.minecraft.client.renderer.entity.EntityRenderer
 import net.minecraft.client.renderer.entity.LivingEntityRenderer
 import net.minecraft.client.resources.PlayerSkin
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.packs.resources.ResourceManager
 import net.minecraft.world.InteractionHand
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.AABB
-import java.util.UUID

 object CobblemonClient {

@@ -91,6 +94,15 @@ object CobblemonClient {
    var checkedStarterScreen = false
    var requests = ClientPlayerActionRequests()
    var teamData = ClientPlayerTeamData()
+    var posableModelRepositories = listOf(
+        PokemonModelRepository,
+        PokeBallModelRepository,
+        NPCModelRepository,
+        FossilModelRepository,
+        BlockEntityModelRepository,
+        GenericBedrockEntityModelRepository
+    )
+
    val overlay: PartyOverlay by lazy { PartyOverlay() }
    val battleOverlay: BattleOverlay by lazy { BattleOverlay() }
    val pokedexUsageContext: PokedexUsageContext by lazy { PokedexUsageContext() }
@@ -318,9 +330,9 @@ object CobblemonClient {
        // Animations come next because models need them.
        BedrockAnimationRepository.loadAnimations(
            resourceManager = resourceManager,
-            directories = VaryingModelRepository.animationDirectories
+            directories = posableModelRepositories.flatMap { it.animationDirectories }
        )
-        VaryingModelRepository.reload(resourceManager)
+        posableModelRepositories.forEach { it.reload(resourceManager) }

        BerryModelRepository.reload(resourceManager)
        MiscModelRepository.reload(resourceManager)
Author	SHA1	Message	Date
JacksonB	9497175627	mk2 bird flight controller	2025-02-13 00:05:03 -06:00
JacksonB	0defd2614f	Initial bird controller changes and refactoring of how riding controllers control rotation mouse+rotVel	2025-02-12 20:01:57 -06:00
JacksonB	181af6847d	Add updated version of Helicopter ride controller. Tie in some static pokemonentity functions to be riding configurable. Modify the cameramixins, currently there is a temp change to them on this branch.	2025-02-12 12:29:35 -06:00
JacksonB	ac1cdb0ba6	Add angular velocity constant modifier (roll can now influence yaw so the dolphin can turn). Spruce up dolphin swim controller.	2025-02-08 03:02:35 -06:00
JacksonB	59190209a2	initial commit with a bunch of poking around code	2025-02-05 19:30:21 -06:00